summaryrefslogtreecommitdiffstats
path: root/tosca2heat/heat-translator/translator
diff options
context:
space:
mode:
authorshangxdy <shang.xiaodong@zte.com.cn>2016-08-23 10:57:00 +0800
committerxiaodong shang <shang.xiaodong@zte.com.cn>2016-08-23 16:39:04 +0000
commit9625609529e8e5efcebb8a68b5c23d3f5c3016ff (patch)
tree1df0ff5b2195d004c4fadd457945b9ff1a430feb /tosca2heat/heat-translator/translator
parent212d539d92a8d0b20af4d8ccb153b744fdc6e303 (diff)
Bug: there is not segmentation_id in resource of
tosca.nodes.network.Network In current implementation of tosca.nodes.network.Network translation, the property of segmentation_id is included, but it doesn't exist in hot syntax, so it will be deleted from current code. JIRA:PARSER-96 Change-Id: I2bd32be887a07f77f7dad3fca469464f124e628f Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn> (cherry picked from commit b284ccc46a966ce1f8a6e59363904d69bb8d081e)
Diffstat (limited to 'tosca2heat/heat-translator/translator')
-rw-r--r--tosca2heat/heat-translator/translator/hot/tosca/tosca_network_network.py4
-rw-r--r--tosca2heat/heat-translator/translator/tests/data/hot_output/hot_nfv_sample.yaml10
-rw-r--r--tosca2heat/heat-translator/translator/tests/data/test_tosca_nfv_sample.yaml3
3 files changed, 15 insertions, 2 deletions
diff --git a/tosca2heat/heat-translator/translator/hot/tosca/tosca_network_network.py b/tosca2heat/heat-translator/translator/hot/tosca/tosca_network_network.py
index 2b80313..a4e565e 100644
--- a/tosca2heat/heat-translator/translator/hot/tosca/tosca_network_network.py
+++ b/tosca2heat/heat-translator/translator/hot/tosca/tosca_network_network.py
@@ -57,8 +57,8 @@ class ToscaNetwork(HotResource):
self.existing_resource_id = value
break
elif key == 'segmentation_id':
- net_props['segmentation_id'] = \
- tosca_props['segmentation_id']
+ # net_props['segmentation_id'] = \
+ # tosca_props['segmentation_id']
# Hardcode to vxlan for now until we add the network type
# and physical network to the spec.
net_props['value_specs'] = {'provider:segmentation_id':
diff --git a/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_nfv_sample.yaml b/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_nfv_sample.yaml
index f2d14ed..d66569d 100644
--- a/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_nfv_sample.yaml
+++ b/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_nfv_sample.yaml
@@ -15,6 +15,7 @@ resources:
user_data_format: SOFTWARE_CONFIG
depends_on:
- VDU2
+
VDU2:
type: OS::Nova::Server
properties:
@@ -30,14 +31,22 @@ resources:
fixed_ips:
- ip_address: '192.168.0.55'
network: { get_resource: VL1 }
+
CP2:
type: OS::Neutron::Port
properties:
fixed_ips:
- ip_address: '192.168.0.56'
network: { get_resource: VL1 }
+
VL1:
type: OS::Neutron::Net
+ properties:
+ name: test_net
+ value_specs:
+ provider:network_type: vxlan
+ provider:segmentation_id: 100
+
VL1_subnet:
type: OS::Neutron::Subnet
properties:
@@ -48,5 +57,6 @@ resources:
gateway_ip: 192.168.0.1
cidr: 192.168.0.0/24
network: { get_resource: VL1 }
+
outputs: {}
diff --git a/tosca2heat/heat-translator/translator/tests/data/test_tosca_nfv_sample.yaml b/tosca2heat/heat-translator/translator/tests/data/test_tosca_nfv_sample.yaml
index 538d63d..e5c8d3c 100644
--- a/tosca2heat/heat-translator/translator/tests/data/test_tosca_nfv_sample.yaml
+++ b/tosca2heat/heat-translator/translator/tests/data/test_tosca_nfv_sample.yaml
@@ -73,3 +73,6 @@ topology_template:
start_ip: '192.168.0.50'
end_ip: '192.168.0.200'
gateway_ip: '192.168.0.1'
+ network_name: test_net
+ network_type: vxlan
+ segmentation_id: 100