X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=common%2Fpython%2Frift%2Fmano%2Ftosca_translator%2Frwmano%2Ftosca%2Ftosca_network_network.py;h=88a8a31b5a3de43b15d13e05641861aa195aa2e1;hb=c2fe40c38153248d1a9f436241c65d5f43e5a900;hp=a94624de3f95e64e314afaf37dfd6cf4c325c56e;hpb=d04550842ce8c7eeac9cb6234ba5a931d14d42ba;p=osm%2FSO.git

diff --git a/common/python/rift/mano/tosca_translator/rwmano/tosca/tosca_network_network.py b/common/python/rift/mano/tosca_translator/rwmano/tosca/tosca_network_network.py
index a94624de..88a8a31b 100644
--- a/common/python/rift/mano/tosca_translator/rwmano/tosca/tosca_network_network.py
+++ b/common/python/rift/mano/tosca_translator/rwmano/tosca/tosca_network_network.py
@@ -89,10 +89,10 @@ class ToscaNetwork(ManoResource):
                 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)
@@ -128,7 +128,8 @@ class ToscaNetwork(ManoResource):
         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)