vld_prop['name'] = self.name
vld_prop['short-name'] = self.name
vld_prop['type'] = self.get_type()
+ vld_prop['ip_profile_ref'] = "{0}_{1}".format(self.nodetemplate.name, "ip")
if 'description' in specs:
vld_prop['description'] = specs['description']
if 'vendor' in specs:
for mapping in substitution_mapping_list:
if req_key in mapping:
# link the VLD to the connection point
- node = self.get_node_with_name(mapping[req_key][0], nodes)
+ node_vld = self.get_node_with_name(mapping[req_key][0], nodes)
if node:
#print()
prop = {}
- prop['member-vnf-index-ref'] = index_count
- prop['vnfd-connection-point-ref'] = node.cp_name
- prop['vnfd-id-ref'] = node.vnf._id
+ prop['member-vnf-index-ref'] = node.get_member_vnf_index()
+ prop['vnfd-connection-point-ref'] = node_vld.cp_name
+ prop['vnfd-id-ref'] = node_vld.vnf._id
vld_connection_point_list.append(prop)
index_count += 1
if len(vld_connection_point_list) > 1:
def get_ip_profile_props(specs):
ip_profile_prop = {}
ip_profile_param = {}
- if 'name' in specs:
- ip_profile_prop['name'] = specs['name']
- elif 'description' in specs:
- ip_profile_prop['name'] = specs['description']
+ if 'ip_profile_ref' in self._vld:
+ ip_profile_prop['name'] = self._vld['ip_profile_ref']
if 'description' in specs:
ip_profile_prop['description'] = specs['description']
ip_profile_param['gateway-address'] = specs['gateway_ip']
if 'ip_version' in specs:
ip_profile_param['ip-version'] = 'ipv' + str(specs['ip_version'])
- if 'ip_version' in specs:
+ if 'cidr' in specs:
ip_profile_param['subnet-address'] = specs['cidr']
+ ip_profile_prop['ip-profile-params'] = ip_profile_param
- ip_profile_prop['ip-profile-params'] = ip_profile_param
return ip_profile_prop
tosca_props = self.get_tosca_props()
self._vld = get_vld_props(tosca_props)
ip_profile_props = convert_keys_to_python(self._ip_profile)
try:
nsd.vld.add().from_dict(vld_props)
- nsd.ip_profiles.add().from_dict(ip_profile_props)
+ if len(ip_profile_props) > 1:
+ nsd.ip_profiles.add().from_dict(ip_profile_props)
except Exception as e:
err_msg = _("{0} Exception vld from dict {1}: {2}"). \
format(self, props, e)