X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=RO-VIM-openstack%2Fosm_rovim_openstack%2Fvimconn_openstack.py;h=9e6f7aab633ff4b4ac6bf8ac83e95add6a84cef3;hb=0bb2d81cc74ef6f98500b7e89083b4f34dc5c41d;hp=1fa99548eea87bcad2e3636fe4b31267ace6917e;hpb=e829d8c551d35efff3756217c564711ec6a83f4b;p=osm%2FRO.git diff --git a/RO-VIM-openstack/osm_rovim_openstack/vimconn_openstack.py b/RO-VIM-openstack/osm_rovim_openstack/vimconn_openstack.py index 1fa99548..9e6f7aab 100644 --- a/RO-VIM-openstack/osm_rovim_openstack/vimconn_openstack.py +++ b/RO-VIM-openstack/osm_rovim_openstack/vimconn_openstack.py @@ -1393,10 +1393,6 @@ class vimconnector(vimconn.VimConnector): extra_specs (dict): Extra specs dict to be updated """ - # If there is not any numa, numas_nodes equals to 0. - if not numa_nodes: - extra_specs["vmware:extra_config"] = '{"numa.nodeAffinity":"0"}' - # If there are several numas, we do not define specific affinity. extra_specs["vmware:latency_sensitivity_level"] = "high" @@ -2198,6 +2194,7 @@ class vimconnector(vimconn.VimConnector): existing_vim_volumes: list, created_items: dict, vm_av_zone: list, + block_device_mapping: dict, disk_list: list = None, ) -> None: """Prepare all volumes for new VM instance. @@ -2207,6 +2204,7 @@ class vimconnector(vimconn.VimConnector): existing_vim_volumes (list): List of existing volumes created_items (dict): All created items belongs to VM vm_av_zone (list): VM availability zone + block_device_mapping (dict): Block devices to be attached to VM disk_list (list): List of disks """ @@ -2215,7 +2213,6 @@ class vimconnector(vimconn.VimConnector): boot_volume_id = None elapsed_time = 0 - block_device_mapping = {} for disk in disk_list: if "image_id" in disk: # Root persistent volume @@ -2624,7 +2621,7 @@ class vimconnector(vimconn.VimConnector): external_network = [] # List of ports with port-security disabled no_secured_ports = [] - block_device_mapping = None + block_device_mapping = {} existing_vim_volumes = [] server_group_id = None scheduller_hints = {} @@ -2657,6 +2654,7 @@ class vimconnector(vimconn.VimConnector): existing_vim_volumes=existing_vim_volumes, created_items=created_items, vm_av_zone=vm_av_zone, + block_device_mapping=block_device_mapping, disk_list=disk_list, )