X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_ro%2Fvimconn_openvim.py;h=b34fdf0a49caff104394b8985a7504d096b7396b;hb=66eba6ece53cd85d0efbe8b4ff4f414c812b347b;hp=e86b54db2734fa6d363252f089d86f603a1064af;hpb=05a8b7bc29197345f9718796c110d6cf3c2ad176;p=osm%2FRO.git diff --git a/osm_ro/vimconn_openvim.py b/osm_ro/vimconn_openvim.py index e86b54db..b34fdf0a 100644 --- a/osm_ro/vimconn_openvim.py +++ b/osm_ro/vimconn_openvim.py @@ -32,6 +32,7 @@ import requests import json import yaml import logging +import math from openmano_schemas import id_schema, name_schema, nameshort_schema, description_schema, \ vlan1000_schema, integer0_schema from jsonschema import validate as js_v, exceptions as js_e @@ -596,6 +597,21 @@ class vimconnector(vimconn.vimconnector): '''Returns the flavor identifier''' try: new_flavor_dict = flavor_data.copy() + for device in new_flavor_dict.get('extended', {}).get('devices', ()): + if 'image name' in device: + del device['image name'] + numas = new_flavor_dict.get('extended', {}).get('numas') + if numas: + numa = numas[0] + # translate memory, cpus to EPA + if "cores" not in numa and "threads" not in numa and "paired-threads" not in numa: + numa["paired-threads"] = new_flavor_dict["vcpus"] + if "memory" not in numa: + numa["memory"] = int(math.ceil(new_flavor_dict["ram"]/1024.0)) + for iface in numa.get("interfaces", ()): + if not iface.get("bandwidth"): + iface["bandwidth"] = "1 Mbps" + new_flavor_dict["name"] = flavor_data["name"][:64] self._get_my_tenant() payload_req = json.dumps({'flavor': new_flavor_dict}) @@ -692,7 +708,6 @@ class vimconnector(vimconn.vimconnector): except (requests.exceptions.RequestException, js_e.ValidationError) as e: self._format_request_exception(e) - def get_image_id_from_path(self, path): '''Get the image id from image path in the VIM database. Returns the image_id''' try: @@ -782,8 +797,9 @@ class vimconnector(vimconn.vimconnector): #print text return -vim_response.status_code,text - def new_vminstance(self,name,description,start,image_id,flavor_id,net_list, cloud_config=None, disk_list=None): - '''Adds a VM instance to VIM + def new_vminstance(self, name, description, start, image_id, flavor_id, net_list, cloud_config=None, disk_list=None, + availability_zone_index=None, availability_zone_list=None): + """Adds a VM instance to VIM Params: start: indicates if VM must start or boot in pause mode. Ignored image_id,flavor_id: image and flavor uuid @@ -794,11 +810,15 @@ class vimconnector(vimconn.vimconnector): model: interface model, virtio, e2000, ... mac_address: use: 'data', 'bridge', 'mgmt' - type: 'virtual', 'PF', 'VF', 'VFnotShared' + type: 'virtual', 'PCI-PASSTHROUGH'('PF'), 'SR-IOV'('VF'), 'VFnotShared' vim_id: filled/added by this function #TODO ip, security groups - Returns the instance identifier - ''' + Returns a tuple with the instance identifier and created_items or raises an exception on error + created_items can be None or a dictionary where this method can include key-values that will be passed to + the method delete_vminstance and action_vminstance. Can be used to store created ports, volumes, etc. + Format is vimconnector dependent, but do not use nested dictionaries and a value of None should be the same + as not present. + """ self.logger.debug("new_vminstance input: image='%s' flavor='%s' nics='%s'", image_id, flavor_id, str(net_list)) try: self._get_my_tenant() @@ -811,12 +831,25 @@ class vimconnector(vimconn.vimconnector): for net in net_list: if not net.get("net_id"): continue - net_dict={'uuid': net["net_id"]} - if net.get("type"): net_dict["type"] = net["type"] - if net.get("name"): net_dict["name"] = net["name"] - if net.get("vpci"): net_dict["vpci"] = net["vpci"] - if net.get("model"): net_dict["model"] = net["model"] - if net.get("mac_address"): net_dict["mac_address"] = net["mac_address"] + net_dict = {'uuid': net["net_id"]} + if net.get("type"): + if net["type"] == "SR-IOV": + net_dict["type"] = "VF" + elif net["type"] == "PCI-PASSTHROUGH": + net_dict["type"] = "PF" + else: + net_dict["type"] = net["type"] + if net.get("name"): + net_dict["name"] = net["name"] + if net.get("vpci"): + net_dict["vpci"] = net["vpci"] + if net.get("model"): + if net["model"] == "VIRTIO": + net_dict["model"] = "virtio" + else: + net_dict["model"] = net["model"] + if net.get("mac_address"): + net_dict["mac_address"] = net["mac_address"] virtio_net_list.append(net_dict) payload_dict={ "name": name[:64], "description": description, @@ -870,7 +903,7 @@ class vimconnector(vimconn.vimconnector): # return result, error_text break - return vminstance_id + return vminstance_id, None except (requests.exceptions.RequestException, js_e.ValidationError) as e: self._format_request_exception(e) @@ -894,7 +927,7 @@ class vimconnector(vimconn.vimconnector): except (requests.exceptions.RequestException, js_e.ValidationError) as e: self._format_request_exception(e) - def delete_vminstance(self, vm_id): + def delete_vminstance(self, vm_id, created_items=None): '''Removes a VM instance from VIM, returns the deleted vm_id''' try: self._get_my_tenant() @@ -1023,7 +1056,7 @@ class vimconnector(vimconn.vimconnector): net_dict[net_id] = net return net_dict - def action_vminstance(self, vm_id, action_dict): + def action_vminstance(self, vm_id, action_dict, created_items={}): '''Send and action over a VM instance from VIM''' '''Returns the status''' try: @@ -1034,7 +1067,7 @@ class vimconnector(vimconn.vimconnector): self.logger.info("Action over VM instance POST %s", url) vim_response = requests.post(url, headers = self.headers_req, data=json.dumps(action_dict) ) self._check_http_request_response(vim_response) - return vm_id + return None except (requests.exceptions.RequestException, js_e.ValidationError) as e: self._format_request_exception(e)