From edb43107269ee03094d3dcbee01997427772a21c Mon Sep 17 00:00:00 2001 From: chamarty Date: Wed, 11 Jan 2017 01:45:58 +0000 Subject: [PATCH] Adapt SO to RO schema changes Change-Id: I36ca40bc8c0cf3a6b83410056a70a38902fc999e Signed-off-by: chamarty --- .../python/rift/openmano/rift2openmano.py | 43 +++++-------------- 1 file changed, 10 insertions(+), 33 deletions(-) diff --git a/models/openmano/python/rift/openmano/rift2openmano.py b/models/openmano/python/rift/openmano/rift2openmano.py index 65678bdd..37b2f061 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":{}} @@ -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) -- 2.25.1