X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=models%2Fopenmano%2Fpython%2Frift%2Fopenmano%2Frift2openmano.py;h=28eb4836c28ef6432f437927ad69e799940dbaa8;hb=6844a400ed2fd0d261def4f3181a07f522db50bf;hp=65678bdd0e25edd55101939be7a4f95842434837;hpb=df4e972f5e6581a85dd5a072ac4da8585b4c83e6;p=osm%2FSO.git

diff --git a/models/openmano/python/rift/openmano/rift2openmano.py b/models/openmano/python/rift/openmano/rift2openmano.py
index 65678bdd..28eb4836 100755
--- a/models/openmano/python/rift/openmano/rift2openmano.py
+++ b/models/openmano/python/rift/openmano/rift2openmano.py
@@ -314,7 +314,7 @@ def rift2openmano_nsd(rift_nsd, rift_vnfds, openmano_vnfd_ids):
     return openmano
 
 def cloud_init(rift_vnfd_id, vdu):
-    """ Populate cloud_init with cloud-config script from
+    """ Populate cloud_init with script from
          either the inline contents or from the file provided
     """
     vnfd_package_store = rift.package.store.VnfdPackageFilesystemStore(logger)
@@ -339,20 +339,7 @@ def cloud_init(rift_vnfd_id, vdu):
         return
 
     logger.debug("Current cloud init msg is {}".format(cloud_init_msg))
-    if cloud_init_msg:
-        try:
-            cloud_init_dict = yaml.load(cloud_init_msg)
-        except Exception as e:
-            logger.exception(e)
-            logger.error("Error loading cloud init Yaml file with exception %s", str(e))
-            return cloud_init_msg
-
-    logger.debug("Current cloud init dict is {}".format(cloud_init_dict))
-
-    cloud_msg = yaml.safe_dump(cloud_init_dict,width=1000,default_flow_style=False)
-    cloud_init = "#cloud-config\n"+cloud_msg
-    logger.debug("Cloud init msg is {}".format(cloud_init))
-    return cloud_init
+    return cloud_init_msg
 
 def rift2openmano_vnfd(rift_vnfd, rift_nsd):
     openmano_vnf = {"vnf":{}}
@@ -430,7 +417,7 @@ def rift2openmano_vnfd(rift_vnfd, rift_nsd):
         connection = {
             "name": vld.name,
             "description": vld.description,
-            "type": "data",
+            "type": "bridge",
             "elements": [],
             }
 
@@ -539,29 +526,19 @@ def rift2openmano_vnfd(rift_vnfd, rift_nsd):
                     device["image"] = volume.image
                     vnfc["devices"].append(device)   
 
-        vnfc_cloud_config_init = False
+        vnfc_boot_data_init = False
         if vdu.has_field("cloud_init") or vdu.has_field("cloud_init_file"):
-            vnfc['cloud-config'] = dict()
-            vnfc_cloud_config_init = True
-            vnfc['cloud-config']['user-data'] = cloud_init(rift_vnfd.id, vdu)
+            vnfc['boot-data'] = dict()
+            vnfc_boot_data_init = True
+            vnfc['boot-data']['user-data'] = cloud_init(rift_vnfd.id, vdu)
 
         if vdu.has_field("supplemental_boot_data"):
             if vdu.supplemental_boot_data.has_field('boot_data_drive'):
                 if vdu.supplemental_boot_data.boot_data_drive is True:
-                    if vnfc_cloud_config_init is False:
-                        vnfc['cloud-config'] = dict()
-                        vnfc_cloud_config_init = True
-                    vnfc['cloud-config']['config-drive'] = vdu.supplemental_boot_data.boot_data_drive
-            if vdu.supplemental_boot_data.has_field('custom_meta_data'):
-                if vnfc_cloud_config_init is False:
-                    vnfc['cloud-config'] = dict()
-                    vnfc_cloud_config_init = True
-                vnfc['cloud-config']['meta-data'] = list()
-                for metaitem in vdu.supplemental_boot_data.custom_meta_data:
-                    openmano_metaitem = dict()
-                    openmano_metaitem['key'] = metaitem.name
-                    openmano_metaitem['value'] = metaitem.value
-                    vnfc['cloud-config']['meta-data'].append(openmano_metaitem)
+                    if vnfc_boot_data_init is False:
+                        vnfc['boot-data'] = dict()
+                        vnfc_boot_data_init = True
+                    vnfc['boot-data']['boot-data-drive'] = vdu.supplemental_boot_data.boot_data_drive
 
         vnf["VNFC"].append(vnfc)
 
@@ -602,6 +579,9 @@ def rift2openmano_vnfd(rift_vnfd, rift_nsd):
                         if bps/x[1] >= 1:
                             intf["bandwidth"] = "{} {}bps".format(math.ceil(bps/x[1]), x[0])
 
+        # Sort bridge-ifaces-list TODO sort others
+        newlist = sorted(vnfc["bridge-ifaces"], key=lambda k: k['name'])
+        vnfc["bridge-ifaces"] = newlist
 
     return openmano_vnf