import sys
import tempfile
import yaml
+import ast
+import json
import gi
gi.require_version('RwYang', '1.0')
-gi.require_version('RwVnfdYang', '1.0')
-gi.require_version('RwNsdYang', '1.0')
+gi.require_version('RwProjectVnfdYang', '1.0')
+gi.require_version('RwProjectNsdYang', '1.0')
+gi.require_version('NsdYang', '1.0')
+gi.require_version('VnfdYang', '1.0')
from gi.repository import (
RwYang,
- RwVnfdYang,
- RwNsdYang,
+ RwProjectVnfdYang as RwVnfdYang,
+ RwProjectNsdYang as RwNsdYang,
+ NsdYang as NsdYang,
+ VnfdYang as VnfdYang
)
import rift.package.store
class RiftNSD(object):
- model = RwYang.Model.create_libncx()
+ model = RwYang.Model.create_libyang()
model.load_module('nsd')
- model.load_module('rw-nsd')
-
+
def __init__(self, descriptor):
self._nsd = descriptor
@classmethod
def from_xml_file_hdl(cls, hdl):
hdl.seek(0)
- descriptor = RwNsdYang.YangData_Nsd_NsdCatalog_Nsd()
+ descriptor = NsdYang.YangData_Nsd_NsdCatalog_Nsd()
descriptor.from_xml_v2(RiftNSD.model, hdl.read())
return cls(descriptor)
@classmethod
def from_yaml_file_hdl(cls, hdl):
hdl.seek(0)
- descriptor = RwNsdYang.YangData_Nsd_NsdCatalog_Nsd()
+ descriptor = NsdYang.YangData_Nsd_NsdCatalog_Nsd()
descriptor.from_yaml(RiftNSD.model, hdl.read())
return cls(descriptor)
- @classmethod
- def from_dict(cls, nsd_dict):
- descriptor = RwNsdYang.YangData_Nsd_NsdCatalog_Nsd.from_dict(nsd_dict)
- return cls(descriptor)
+ def from_dict(self):
+ descriptor = NsdYang.YangData_Nsd_NsdCatalog_Nsd.from_dict(self._nsd.as_dict(), ignore_missing_keys=True).to_json_without_namespace(RiftNSD.model)
+ return descriptor
class RiftVNFD(object):
- model = RwYang.Model.create_libncx()
+ model = RwYang.Model.create_libyang()
model.load_module('vnfd')
- model.load_module('rw-vnfd')
-
+
def __init__(self, descriptor):
self._vnfd = descriptor
@classmethod
def from_xml_file_hdl(cls, hdl):
hdl.seek(0)
- descriptor = RwVnfdYang.YangData_Vnfd_VnfdCatalog_Vnfd()
+ descriptor = VnfdYang.YangData_Vnfd_VnfdCatalog_Vnfd()
descriptor.from_xml_v2(RiftVNFD.model, hdl.read())
return cls(descriptor)
@classmethod
def from_yaml_file_hdl(cls, hdl):
hdl.seek(0)
- descriptor = RwVnfdYang.YangData_Vnfd_VnfdCatalog_Vnfd()
+ descriptor = VnfdYang.YangData_Vnfd_VnfdCatalog_Vnfd()
descriptor.from_yaml(RiftVNFD.model, hdl.read())
return cls(descriptor)
- @classmethod
- def from_dict(cls, vnfd_dict):
- descriptor = RwVnfdYang.YangData_Vnfd_VnfdCatalog_Vnfd.from_dict(vnfd_dict)
- return cls(descriptor)
+ def from_dict(self):
+ descriptor = VnfdYang.YangData_Vnfd_VnfdCatalog_Vnfd.from_dict(self._vnfd.as_dict(), ignore_missing_keys=True).to_json_without_namespace(RiftVNFD.model)
+ return descriptor
def is_writable_directory(dir_path):
return vnfd_name + "__" + str(member_idx)
-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)
- if openmano_vnfd_id:
- topology["nodes"][rift_vnfd.name + "__" + str(member_idx)] = {
- "type": "VNF",
- "vnf_id": openmano_vnfd_id
- }
- else:
- topology["nodes"][rift_vnfd.name + "__" + str(member_idx)] = {
- "type": "VNF",
- "VNF model": rift_vnfd.name
- }
-
- for vld in rift_nsd.vlds:
- # Openmano has both bridge_net and dataplane_net models for network types
- # For now, since we are using openmano in developer mode lets just hardcode
- # to bridge_net since it won't matter anyways.
- # topology["nodes"][vld.name] = {"type": "network", "model": "bridge_net"}
- pass
-
- topology["connections"] = {}
- for vld in rift_nsd.vlds:
-
- # Create a connections entry for each external VLD
- topology["connections"][vld.name] = {}
- topology["connections"][vld.name]["nodes"] = []
-
- #if vld.vim_network_name:
- if True:
- if vld.name not in topology["nodes"]:
- topology["nodes"][vld.name] = {
- "type": "external_network",
- "model": vld.name,
- }
-
- # Add the external network to the list of connection points
- topology["connections"][vld.name]["nodes"].append(
- {vld.name: "0"}
- )
- elif vld.provider_network.has_field("physical_network"):
- # Add the external datacenter network to the topology
- # node list if it isn't already added
- ext_net_name = vld.provider_network.physical_network
- ext_net_name_with_seg = ext_net_name
- if vld.provider_network.has_field("segmentation_id"):
- ext_net_name_with_seg += ":{}".format(vld.provider_network.segmentation_id)
-
- if ext_net_name not in topology["nodes"]:
- topology["nodes"][ext_net_name] = {
- "type": "external_network",
- "model": ext_net_name_with_seg,
- }
-
- # Add the external network to the list of connection points
- topology["connections"][vld.name]["nodes"].append(
- {ext_net_name: "0"}
- )
-
-
- for vnfd_cp in vld.vnfd_connection_point_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 = vnfd.name + "__" + str(member_idx)
- topology["connections"][vld.name]["nodes"].append(
- {
- 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:
- rift_vnfd = rift_vnfds[rift_vnfd_id]
- topology["nodes"][rift_vnfd.name +'__'+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 = vnfd.name + "__" + 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):
+def rift2openmano_nsd(rift_nsd, rift_vnfds, openmano_vnfd_ids, http_api, rift_vnfd_id=None):
+ try:
+ 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_nsd_im_body = json.loads(rift_nsd.from_dict())
+ openmano_nsd_api_format = {
+ "nsd:nsd-catalog": {
+ "nsd": [openmano_nsd_im_body['nsd-catalog']['nsd'][0]]
+ }
+ }
+
+ openmano_nsd = http_api.post_nsd_v3(openmano_nsd_api_format)
+
+ return openmano_nsd
+
+ except Exception as e:
+ logger.error(e)
+ raise e
+
+def rift2openmano_vnfd_nsd(rift_nsd, rift_vnfds, openmano_vnfd_ids, http_api, rift_vnfd_id=None):
+ try:
+ if rift_vnfd_id not in rift_vnfds:
+ raise VNFNotFoundError("VNF id %s not provided" % rift_vnfd_id)
+
+ # This is the scaling NSD Descriptor. Can use the NSD IM Model.
+ openmano_nsd_im_body = json.loads(rift_nsd.from_dict())
+
+ openmano_nsd_api_format = {
+ "nsd:nsd-catalog": {
+ "nsd": [openmano_nsd_im_body['nsd-catalog']['nsd'][0]]
+ }
+ }
+
+ openmano_nsd = http_api.post_nsd_v3(openmano_nsd_im_body)
+
+ return openmano_nsd
+
+ except Exception as e:
+ logger.error(e)
+ raise e
+
+
+def cloud_init(rift_vnfd_id, vdu, project_name='default'):
""" Populate cloud_init with script from
either the inline contents or from the file provided
"""
- vnfd_package_store = rift.package.store.VnfdPackageFilesystemStore(logger)
+ vnfd_package_store = rift.package.store.VnfdPackageFilesystemStore(logger, project=project_name)
cloud_init_msg = None
- if vdu.cloud_init is not None:
- logger.debug("cloud_init script provided inline %s", vdu.cloud_init)
- cloud_init_msg = vdu.cloud_init
- elif vdu.cloud_init_file is not None:
- # Get cloud-init script contents from the file provided in the cloud_init_file param
- logger.debug("cloud_init script provided in file %s", vdu.cloud_init_file)
- filename = vdu.cloud_init_file
+ if 'cloud_init' in vdu:
+ logger.debug("cloud_init script provided inline %s", vdu['cloud_init'])
+ cloud_init_msg = vdu['cloud_init']
+ elif 'cloud_init_file' in vdu:
+ # Get cloud-init script contents from the file provided in the cloud_init_file param
+ logger.debug("cloud_init script provided in file %s", vdu['cloud_init_file'])
+ filename = vdu['cloud_init_file']
vnfd_package_store.refresh()
stored_package = vnfd_package_store.get_package(rift_vnfd_id)
cloud_init_extractor = rift.package.cloud_init.PackageCloudInitExtractor(logger)
logger.debug("Current cloud init msg is {}".format(cloud_init_msg))
return cloud_init_msg
-def config_file_init(rift_vnfd_id, vdu, cfg_file):
+def config_file_init(rift_vnfd_id, vdu, cfg_file, project_name='default'):
""" Populate config file init with file provided
"""
- vnfd_package_store = rift.package.store.VnfdPackageFilesystemStore(logger)
+ vnfd_package_store = rift.package.store.VnfdPackageFilesystemStore(logger, project=project_name)
# Get script contents from the file provided in the cloud_init directory
logger.debug("config file script provided in file {}".format(cfg_file))
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":{}}
- vnf = openmano_vnf["vnf"]
-
- vnf["name"] = rift_vnfd.name
- vnf["description"] = rift_vnfd.description
-
- vnf["external-connections"] = []
-
- def find_vdu_and_ext_if_by_cp_ref(cp_ref_name):
- for vdu in rift_vnfd.vdus:
- for ext_if in vdu.external_interface:
- if ext_if.vnfd_connection_point_ref == cp_ref_name:
- return vdu, ext_if
-
- raise ValueError("External connection point reference %s not found" % cp_ref_name)
-
- def find_vdu_and_int_if_by_cp_ref(cp_ref_id):
- for vdu in rift_vnfd.vdus:
- for int_if in vdu.internal_interface:
- if int_if.vdu_internal_connection_point_ref == cp_ref_id:
- return vdu, int_if
-
- raise ValueError("Internal connection point reference %s not found" % cp_ref_id)
-
- def rift2openmano_if_type(ext_if):
-
- cp_ref_name = ext_if.vnfd_connection_point_ref
- for vld in rift_nsd.vlds:
-
- # if it is an explicit mgmt_network then check if the given
- # cp_ref is a part of it
- if not vld.mgmt_network:
- continue
-
- for vld_cp in vld.vnfd_connection_point_ref:
- if vld_cp.vnfd_connection_point_ref == cp_ref_name:
- return "mgmt"
-
-
- rift_type = ext_if.virtual_interface.type_yang
- # Retaining it for backward compatibility!
- if rift_type == "OM_MGMT":
- return "mgmt"
- elif rift_type == "VIRTIO" or rift_type == "E1000":
- return "bridge"
- else:
- return "data"
+def rift2openmano_vnfd(rift_vnfd, rift_nsd, http_api):
+ try:
+ openmano_vnfd_im_body = json.loads(rift_vnfd.from_dict())
+
+ # All type_yang leafs renamed to type
+
+
+ vnfd_dict = openmano_vnfd_im_body['vnfd-catalog']['vnfd'][0]
+
+ if 'vdu' in vnfd_dict:
+ for vdu in vnfd_dict['vdu']:
+ if 'cloud_init_file' in vdu:
+ # Replacing the leaf with the actual contents of the file.
+ # The RO does not have the ability to read files yet.
+ vdu['cloud_init_file'] = cloud_init(openmano_vnfd_im_body.id, vdu)
+ elif 'cloud_init' in vdu:
+ vdu['cloud_init'] = cloud_init(openmano_vnfd_im_body.id, vdu)
+
+ if 'supplemental_boot_data' in vdu:
+ if 'config_file' in vdu['supplemental_boot_data']:
+ for config_file in vdu['supplemental_boot_data']['config_file']:
+ # Replacing the leaf with the actual contents of the file.
+ # The RO does not have the ability to read files yet.
+ config_file['source'] = config_file_init(openmano_vnfd_im_body.id, vdu, config_file['source'])
+
+ openmano_vnfd_api_format = {
+ "vnfd:vnfd-catalog": {
+ "vnfd": [vnfd_dict]
+ }
+ }
+
+ openmano_vnfd = http_api.post_vnfd_v3(openmano_vnfd_api_format)
+
+ return openmano_vnfd
+
+ except Exception as e:
+ logger.error(e)
+ raise e
- def rift2openmano_vif(rift_type):
- if rift_type == "VIRTIO":
- return "virtio"
- elif rift_type == "E1000":
- return "e1000"
- else:
- raise ValueError("VDU Virtual Interface type {} not supported".format(rift_type))
-
- # Add all external connections
- cp_to_port_security_map = {}
-
- for cp in rift_vnfd.cps:
- # Find the VDU and and external interface for this connection point
- vdu, ext_if = find_vdu_and_ext_if_by_cp_ref(cp.name)
- connection = {
- "name": cp.name,
- "type": rift2openmano_if_type(ext_if),
- "VNFC": vdu.name,
- "local_iface_name": ext_if.name,
- "description": "%s iface on VDU %s" % (ext_if.name, vdu.name),
- }
-
- if cp.has_field('port_security_enabled'):
- cp_to_port_security_map[cp.name] = cp.port_security_enabled
- vnf["external-connections"].append(connection)
-
- # Add all internal networks
- for vld in rift_vnfd.internal_vlds:
- connection = {
- "name": vld.name,
- "description": vld.description,
- "type": "bridge",
- "elements": [],
- }
-
- # Add the specific VDU connection points
- for int_cp in vld.internal_connection_point:
- vdu, int_if = find_vdu_and_int_if_by_cp_ref(int_cp.id_ref)
- connection["elements"].append({
- "VNFC": vdu.name,
- "local_iface_name": int_if.name,
- })
- if "internal-connections" not in vnf:
- vnf["internal-connections"] = []
-
- vnf["internal-connections"].append(connection)
-
- # Add VDU's
- vnf["VNFC"] = []
- for vdu in rift_vnfd.vdus:
- vnfc = {
- "name": vdu.name,
- "description": vdu.name,
- "bridge-ifaces": [],
- }
-
- if vdu.vm_flavor.has_field("storage_gb") and vdu.vm_flavor.storage_gb:
- vnfc["disk"] = vdu.vm_flavor.storage_gb
-
- if vdu.has_field("image"):
- if os.path.isabs(vdu.image):
- vnfc["VNFC image"] = vdu.image
- else:
- vnfc["image name"] = vdu.image
- if vdu.has_field("image_checksum"):
- vnfc["image checksum"] = vdu.image_checksum
-
- dedicated_int = False
- for intf in list(vdu.internal_interface) + list(vdu.external_interface):
- if intf.virtual_interface.type_yang in ["SR_IOV", "PCI_PASSTHROUGH"]:
- dedicated_int = True
- if vdu.guest_epa.has_field("numa_node_policy") or dedicated_int:
- vnfc["numas"] = [{
- "memory": max(int(vdu.vm_flavor.memory_mb/1024), 1),
- "interfaces":[],
- }]
- numa_node_policy = vdu.guest_epa.numa_node_policy
- if numa_node_policy.has_field("node"):
- numa_node = numa_node_policy.node[0]
-
- if numa_node.has_field("num_cores"):
- vnfc["numas"][0]["cores"] = numa_node.num_cores
-
- if numa_node.has_field("paired_threads"):
- if numa_node.paired_threads.has_field("num_paired_threads"):
- vnfc["numas"][0]["paired-threads"] = numa_node.paired_threads.num_paired_threads
- if len(numa_node.paired_threads.paired_thread_ids) > 0:
- vnfc["numas"][0]["paired-threads-id"] = []
- for pair in numa_node.paired_threads.paired_thread_ids:
- vnfc["numas"][0]["paired-threads-id"].append(
- [pair.thread_a, pair.thread_b]
- )
-
- if numa_node.has_field("num_threads"):
- vnfc["numas"][0]["threads"] = numa_node.num_threads
- else:
- if vdu.vm_flavor.has_field("vcpu_count"):
- vnfc["numas"][0]["cores"] = max(vdu.vm_flavor.vcpu_count, 1)
-
- 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.has_field("hypervisor_epa"):
- vnfc["hypervisor"] = {}
- if vdu.hypervisor_epa.has_field("type"):
- if vdu.hypervisor_epa.type_yang == "REQUIRE_KVM":
- vnfc["hypervisor"]["type"] = "QEMU-kvm"
-
- if vdu.hypervisor_epa.has_field("version"):
- vnfc["hypervisor"]["version"] = vdu.hypervisor_epa.version
-
- if vdu.has_field("host_epa"):
- vnfc["processor"] = {}
- if vdu.host_epa.has_field("om_cpu_model_string"):
- vnfc["processor"]["model"] = vdu.host_epa.om_cpu_model_string
- if vdu.host_epa.has_field("om_cpu_feature"):
- vnfc["processor"]["features"] = []
- for feature in vdu.host_epa.om_cpu_feature:
- vnfc["processor"]["features"].append(feature.feature)
-
- if vdu.has_field("volumes"):
- vnfc["devices"] = []
- # Sort volumes as device-list is implictly ordered by Openmano
- newvollist = sorted(vdu.volumes, key=lambda k: k.name)
- for iter_num, volume in enumerate(newvollist):
- if iter_num == 0:
- # Convert the first volume to vnfc.image
- if os.path.isabs(volume.image):
- vnfc["VNFC image"] = volume.image
- else:
- vnfc["image name"] = volume.image
- if volume.has_field("image_checksum"):
- vnfc["image checksum"] = volume.image_checksum
- else:
- # Add Openmano devices
- device = {}
- device["type"] = volume.device_type
- if volume.has_field("size"):
- device["size"] = volume.size
- if volume.has_field("image"):
- device["image name"] = volume.image
- if volume.has_field("image_checksum"):
- device["image checksum"] = volume.image_checksum
- vnfc["devices"].append(device)
-
- vnfc_boot_data_init = False
- if vdu.has_field("cloud_init") or vdu.has_field("cloud_init_file"):
- 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)
-
- for int_if in list(vdu.internal_interface) + list(vdu.external_interface):
- intf = {
- "name": int_if.name,
- }
- if int_if.virtual_interface.has_field("vpci"):
- intf["vpci"] = int_if.virtual_interface.vpci
-
- if int_if.virtual_interface.type_yang in ["VIRTIO", "E1000"]:
- intf["model"] = rift2openmano_vif(int_if.virtual_interface.type_yang)
- vnfc["bridge-ifaces"].append(intf)
-
- elif int_if.virtual_interface.type_yang in ["OM_MGMT"]:
- vnfc["bridge-ifaces"].append(intf)
-
- elif int_if.virtual_interface.type_yang == "SR_IOV":
- intf["bandwidth"] = "10 Gbps"
- intf["dedicated"] = "no"
- vnfc["numas"][0]["interfaces"].append(intf)
-
- elif int_if.virtual_interface.type_yang == "PCI_PASSTHROUGH":
- intf["bandwidth"] = "10 Gbps"
- intf["dedicated"] = "yes"
- if "interfaces" not in vnfc["numas"][0]:
- vnfc["numas"][0]["interfaces"] = []
- vnfc["numas"][0]["interfaces"].append(intf)
- else:
- raise ValueError("Interface type %s not supported" % int_if.virtual_interface)
-
- if int_if.virtual_interface.has_field("bandwidth"):
- if int_if.virtual_interface.bandwidth != 0:
- bps = int_if.virtual_interface.bandwidth
-
- # Calculate the bits per second conversion
- for x in [('M', 1000000), ('G', 1000000000)]:
- if bps/x[1] >= 1:
- intf["bandwidth"] = "{} {}bps".format(math.ceil(bps/x[1]), x[0])
-
- for bridge_iface in vnfc["bridge-ifaces"]:
- if bridge_iface['name'] in cp_to_port_security_map:
- bridge_iface['port-security'] = cp_to_port_security_map[bridge_iface['name']]
- # 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 parse_args(argv=sys.argv[1:]):
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