def constituent_vnfds(self):
return self._nsd.constituent_vnfd
+ @property
+ def scaling_group_descriptor(self):
+ return self._nsd.scaling_group_descriptor
+
@property
def vlds(self):
return self._nsd.vld
return vnfd_name + "__" + str(member_idx)
-def rift2openmano_nsd(rift_nsd, rift_vnfds, openmano_vnfd_ids):
- for vnfd_id in rift_nsd.vnfd_ids:
- if vnfd_id not in rift_vnfds:
- raise VNFNotFoundError("VNF id %s not provided" % vnfd_id)
+def rift2openmano_nsd(rift_nsd, rift_vnfds, openmano_vnfd_ids, rift_vnfd_id=None):
+ if rift_vnfd_id is None:
+ for vnfd_id in rift_nsd.vnfd_ids:
+ if vnfd_id not in rift_vnfds:
+ raise VNFNotFoundError("VNF id %s not provided" % vnfd_id)
openmano = {}
openmano["name"] = rift_nsd.name
+ if rift_vnfd_id is not None:
+ for scaling_groups in rift_nsd.scaling_group_descriptor:
+ openmano["name"] += scaling_groups.name
openmano["description"] = rift_nsd.description
topology = {}
openmano["topology"] = topology
topology["nodes"] = {}
for vnfd in rift_nsd.constituent_vnfds:
vnfd_id = vnfd.vnfd_id_ref
+ if rift_vnfd_id is not None and rift_vnfd_id != vnfd_id:
+ continue
rift_vnfd = rift_vnfds[vnfd_id]
member_idx = vnfd.member_vnf_index
openmano_vnfd_id = openmano_vnfd_ids.get(vnfd_id,None)
vnf_ref: vnfd_cp.vnfd_connection_point_ref
}
)
-
return openmano
+def rift2openmano_vnfd_nsd(rift_nsd, rift_vnfds, openmano_vnfd_ids,rift_vnfd_id=None):
+
+ if rift_vnfd_id not in rift_vnfds:
+ raise VNFNotFoundError("VNF id %s not provided" % rift_vnfd_id)
+
+ openmano_vnfd_nsd = {}
+ for groups in rift_nsd.scaling_group_descriptor:
+ openmano_vnfd_nsd["name"] = rift_vnfd_id+'__'+'scaling_group'+'__'+groups.name
+ openmano_vnfd_nsd["description"] = "Scaling Group"
+ topology = {}
+ openmano_vnfd_nsd["topology"] = topology
+ topology["connections"] = {}
+ topology["nodes"] = {}
+ tst_index = []
+ openmano_vnfd_id = openmano_vnfd_ids.get(rift_vnfd_id,None)
+ for rvnfd_id in rift_nsd.constituent_vnfds:
+ if rvnfd_id.vnfd_id_ref == rift_vnfd_id:
+ topology["nodes"][rift_vnfd_id+'__'+str(rvnfd_id.member_vnf_index)] = {
+ "type": "VNF",
+ "vnf_id": openmano_vnfd_id
+ }
+
+ for vld in rift_nsd.vlds:
+
+ # Create a connections entry for each external VLD
+ topology["connections"][vld.name] = {}
+ topology["connections"][vld.name]["nodes"] = []
+ if True:
+ if vld.name not in topology["nodes"]:
+ topology["nodes"][vld.name] = {
+ "type": "external_network",
+ "model": vld.name,
+ }
+ topology["connections"][vld.name]["nodes"].append(
+ {vld.name: "0"}
+ )
+
+
+
+ for vnfd_cp in vld.vnfd_connection_point_ref:
+ if not rift_vnfd_id in vnfd_cp.vnfd_id_ref:
+ continue
+ if rift_vnfd_id in vnfd_cp.vnfd_id_ref:
+
+ # Get the RIFT VNF for this external VLD connection point
+ vnfd = rift_vnfds[vnfd_cp.vnfd_id_ref]
+
+
+ # For each VNF in this connection, use the same interface name
+ topology["connections"][vld.name]["type"] = "link"
+ # Vnf ref is the vnf name with the member_vnf_idx appended
+ member_idx = vnfd_cp.member_vnf_index_ref
+ vnf_ref = rift_vnfd_id + "__" + str(member_idx)
+ topology["connections"][vld.name]["nodes"].append(
+ {
+ vnf_ref: vnfd_cp.vnfd_connection_point_ref
+ }
+ )
+ return openmano_vnfd_nsd
+
+
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)
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
+ return cloud_init_msg
- logger.debug("Current cloud init dict is {}".format(cloud_init_dict))
+def config_file_init(rift_vnfd_id, vdu, cfg_file):
+ """ Populate config file init with file provided
+ """
+ vnfd_package_store = rift.package.store.VnfdPackageFilesystemStore(logger)
- 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
+ # Get script contents from the file provided in the cloud_init directory
+ logger.debug("config file script provided in file {}".format(cfg_file))
+ filename = cfg_file
+ vnfd_package_store.refresh()
+ stored_package = vnfd_package_store.get_package(rift_vnfd_id)
+ cloud_init_extractor = rift.package.cloud_init.PackageCloudInitExtractor(logger)
+ try:
+ cfg_file_msg = cloud_init_extractor.read_script(stored_package, filename)
+ except rift.package.cloud_init.CloudInitExtractionError as e:
+ raise ValueError(e)
+
+ logger.debug("Current config file msg is {}".format(cfg_file_msg))
+ return cfg_file_msg
def rift2openmano_vnfd(rift_vnfd, rift_nsd):
openmano_vnf = {"vnf":{}}
connection = {
"name": vld.name,
"description": vld.description,
- "type": "data",
+ "type": "bridge",
"elements": [],
}
if vdu.vm_flavor.has_field("vcpu_count"):
vnfc["numas"][0]["cores"] = max(vdu.vm_flavor.vcpu_count, 1)
- else:
- if vdu.vm_flavor.has_field("vcpu_count") and vdu.vm_flavor.vcpu_count:
- vnfc["vcpus"] = vdu.vm_flavor.vcpu_count
+ if vdu.vm_flavor.has_field("vcpu_count") and vdu.vm_flavor.vcpu_count:
+ vnfc["vcpus"] = vdu.vm_flavor.vcpu_count
- if vdu.vm_flavor.has_field("memory_mb") and vdu.vm_flavor.memory_mb:
- vnfc["ram"] = vdu.vm_flavor.memory_mb
+ if vdu.vm_flavor.has_field("memory_mb") and vdu.vm_flavor.memory_mb:
+ vnfc["ram"] = vdu.vm_flavor.memory_mb
if vdu.has_field("hypervisor_epa"):
else:
# Add Openmano devices
device = {}
- device["type"] = volume.guest_params.device_type
- device["image"] = volume.image
+ device["type"] = volume.device_type
+ device["image name"] = volume.image
+ if volume.has_field("image_checksum"):
+ device["image checksum"] = volume.image_checksum
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)
-
- if vdu.has_field("custom_boot_data"):
- if vdu.custom_boot_data.has_field('custom_drive'):
- if vdu.custom_boot_data.custom_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.custom_boot_data.custom_drive
- if vdu.custom_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.custom_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)
+ 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_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
+
+ if vdu.supplemental_boot_data.has_field('config_file'):
+ om_cfgfile_list = list()
+ for custom_config_file in vdu.supplemental_boot_data.config_file:
+ cfg_source = config_file_init(rift_vnfd.id, vdu, custom_config_file.source)
+ om_cfgfile_list.append({"dest":custom_config_file.dest, "content": cfg_source})
+ vnfc['boot-data']['config-files'] = om_cfgfile_list
+
vnf["VNFC"].append(vnfc)
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
def main(argv=sys.argv[1:]):
args = parse_args(argv)
-
nsd = None
openmano_vnfr_ids = dict()
vnf_dict = None
nsd = create_nsd_from_file(args.nsd_file_hdl)
openmano_nsd = rift2openmano_nsd(nsd, vnf_dict, openmano_vnfr_ids)
-
+ vnfd_nsd = rift2openmano_vnfd_nsd(nsd, vnf_dict, openmano_vnfr_ids)
write_yaml_to_file(openmano_nsd["name"], args.outdir, openmano_nsd)
-
+ write_yaml_to_file(vnfd_nsd["name"], args.outdir, vnfd_nsd)
for vnf in vnf_dict.values():
openmano_vnf = rift2openmano_vnfd(vnf, nsd)
write_yaml_to_file(openmano_vnf["vnf"]["name"], args.outdir, openmano_vnf)
projects / osm / SO.git / blobdiff