return self.uri
else:
raise KeyError("Invalid key '{}'".format(index))
-
+
def __setitem__(self, index, value):
if index == 'tenant':
self.tenant_id_name = value
self.tenant = None # force to reload tenant with different credentials
self.datacenter = None # force to reload datacenter with different credentials
- def _parse(self, descriptor, descriptor_format, response=False):
+ @staticmethod
+ def _parse(descriptor, descriptor_format, response=False):
if descriptor_format and descriptor_format != "json" and descriptor_format != "yaml":
raise ROClientException("'descriptor_format' must be a 'json' or 'yaml' text")
if descriptor_format != "json":
if response:
raise ROClientException(error_text)
raise ROClientException(error_text)
-
- def _parse_yaml(self, descriptor, response=False):
+
+ @staticmethod
+ def _parse_error_yaml(descriptor):
+ json_error = None
+ try:
+ json_error = yaml.load(descriptor, Loader=yaml.Loader)
+ return json_error["error"]["description"]
+ except Exception:
+ return str(json_error or descriptor)
+
+ @staticmethod
+ def _parse_yaml(descriptor, response=False):
try:
return yaml.load(descriptor, Loader=yaml.Loader)
except yaml.YAMLError as exc:
def _get_ref(desc):
# return an identification for the network or vm. Try vim_id if exist, if not descriptor id for net
if desc.get("vim_net_id"):
- return "'vim-id={}'".format(desc["vim_net_id"])
+ return "'vim-net-id={}'".format(desc["vim_net_id"])
elif desc.get("ns_net_osm_id"):
return "'nsd-vld-id={}'".format(desc["ns_net_osm_id"])
elif desc.get("vnf_net_osm_id"):
return "'vnfd-vld-id={}'".format(desc["vnf_net_osm_id"])
# for VM
elif desc.get("vim_vm_id"):
- return "'vim-id={}'".format(desc["vim_vm_id"])
+ return "'vim-vm-id={}'".format(desc["vim_vm_id"])
elif desc.get("vdu_osm_id"):
return "'vnfd-vdu-id={}'".format(desc["vdu_osm_id"])
else:
total["networks"] = len(ns_descriptor["nets"])
for net in ns_descriptor["nets"]:
if net["status"] in ("ERROR", "VIM_ERROR"):
- error_list.append("VIM network ({}) on error: {}".format(_get_ref(net), net["error_msg"]))
+ error_list.append("Error at VIM network {}: {}".format(_get_ref(net), net["error_msg"]))
elif net["status"] == "ACTIVE":
done["networks"] += 1
total["SDN_networks"] = len(ns_descriptor["sdn_nets"])
for sdn_net in ns_descriptor["sdn_nets"]:
if sdn_net["status"] in ("ERROR", "VIM_ERROR", "WIM_ERROR"):
- error_list.append("SDN network ({}) on error: {}".format(_get_sdn_ref(sdn_net.get("sce_net_id")),
- sdn_net["error_msg"]))
+ error_list.append("Error at SDN network {}: {}".format(_get_sdn_ref(sdn_net.get("sce_net_id")),
+ sdn_net["error_msg"]))
elif sdn_net["status"] == "ACTIVE":
done["SDN_networks"] += 1
for vm in vnf["vms"]:
total["VMs"] += 1
if vm["status"] in ("ERROR", "VIM_ERROR"):
- error_list.append("VIM VM ({}) on error: {}".format(_get_ref(vm), vm["error_msg"]))
+ error_list.append("Error at VIM VM {}: {}".format(_get_ref(vm), vm["error_msg"]))
elif vm["status"] == "ACTIVE":
done["VMs"] += 1
if error_list:
- return "ERROR", "; ".join(error_list)
+ # skip errors caused because other dependendent task is on error
+ return "ERROR", "; ".join([el for el in error_list if "because depends on failed ACTION" not in el])
if all(total[x] == done[x] for x in total): # DONE == TOTAL for all items
return "ACTIVE", str({x: total[x] for x in total if total[x]}) # print only those which value is not 0
else:
raise ROClientException("No {} found with id '{}'".format(item[:-1], item_id_name),
http_code=404)
if response.status >= 300:
- raise ROClientException(response_text, http_code=response.status)
+ raise ROClientException(self._parse_error_yaml(response_text), http_code=response.status)
content = self._parse_yaml(response_text, response=True)
if item_id:
response_text = await response.read()
self.logger.debug("GET {} [{}] {}".format(url, response.status, response_text[:100]))
if response.status >= 300:
- raise ROClientException(response_text, http_code=response.status)
+ raise ROClientException(self._parse_error_yaml(response_text), http_code=response.status)
return self._parse_yaml(response_text, response=True)
if not self.tenant:
self.tenant = await self._get_item_uuid(session, "tenants", self.tenant_id_name, None)
return self.tenant
-
+
async def _get_datacenter(self, session):
if not self.tenant:
await self._get_tenant(session)
response_text = await response.read()
self.logger.debug("POST {} [{}] {}".format(url, response.status, response_text[:100]))
if response.status >= 300:
- raise ROClientException(response_text, http_code=response.status)
+ raise ROClientException(self._parse_error_yaml(response_text), http_code=response.status)
return self._parse_yaml(response_text, response=True)
response_text = await response.read()
self.logger.debug("DELETE {} [{}] {}".format(url, response.status, response_text[:100]))
if response.status >= 300:
- raise ROClientException(response_text, http_code=response.status)
+ raise ROClientException(self._parse_error_yaml(response_text), http_code=response.status)
return self._parse_yaml(response_text, response=True)
response_text = await response.read()
self.logger.debug("GET {} [{}] {}".format(url, response.status, response_text[:100]))
if response.status >= 300:
- raise ROClientException(response_text, http_code=response.status)
+ raise ROClientException(self._parse_error_yaml(response_text), http_code=response.status)
return self._parse_yaml(response_text, response=True)
tenant_text = "/" + self.tenant
payload_req = yaml.safe_dump(descriptor)
-
+
# print payload_req
url = "{}{}/{}/{}".format(self.uri, tenant_text, item, item_id)
self.logger.debug("RO PUT %s %s", url, payload_req)
response_text = await response.read()
self.logger.debug("PUT {} [{}] {}".format(url, response.status, response_text[:100]))
if response.status >= 300:
- raise ROClientException(response_text, http_code=response.status)
+ raise ROClientException(self._parse_error_yaml(response_text), http_code=response.status)
return self._parse_yaml(response_text, response=True)
"""
try:
response_text = ""
- async with aiohttp.ClientSession(loop=self.loop) as session:
+ async with aiohttp.ClientSession() as session:
url = "{}/version".format(self.uri)
self.logger.debug("RO GET %s", url)
# timeout = aiohttp.ClientTimeout(total=self.timeout_short)
response_text = await response.read()
self.logger.debug("GET {} [{}] {}".format(url, response.status, response_text[:100]))
if response.status >= 300:
- raise ROClientException(response_text, http_code=response.status)
+ raise ROClientException(self._parse_error_yaml(response_text), http_code=response.status)
for word in str(response_text).split(" "):
if "." in word:
async def get_list(self, item, all_tenants=False, filter_by=None):
"""
- Obtain a list of items filtering by the specigy filter_by.
+ List of items filtered by the contents in the dictionary "filter_by".
:param item: can be 'tenant', 'vim', 'vnfd', 'nsd', 'ns'
:param all_tenants: True if not filtering by tenant. Only allowed for admin
:param filter_by: dictionary with filtering
response_text = await response.read()
self.logger.debug("POST {} [{}] {}".format(url, response.status, response_text[:100]))
if response.status >= 300:
- raise ROClientException(response_text, http_code=response.status)
+ raise ROClientException(self._parse_error_yaml(response_text), http_code=response.status)
response_desc = self._parse_yaml(response_text, response=True)
desc = remove_envelop(item, response_desc)
url = "{}/{tenant}/{item}/{datacenter}".format(self.uri, tenant=tenant,
item=self.client_to_RO[item], datacenter=item_id)
self.logger.debug("RO DELETE %s", url)
-
+
# timeout = aiohttp.ClientTimeout(total=self.timeout_large)
async with session.delete(url, headers=self.headers_req) as response:
response_text = await response.read()
self.logger.debug("DELETE {} [{}] {}".format(url, response.status, response_text[:100]))
if response.status >= 300:
- raise ROClientException(response_text, http_code=response.status)
-
+ raise ROClientException(self._parse_error_yaml(response_text), http_code=response.status)
+
response_desc = self._parse_yaml(response_text, response=True)
desc = remove_envelop(item, response_desc)
return desc
self.logger.debug("GET %s", url)
mano_response = requests.get(url, headers=self.headers_req)
self.logger.debug("RO response: %s", mano_response.text)
- content = self._parse_yaml(mano_response.text, response=True)
+ content = self._parse_yaml(mano_response.text, response=True)
if mano_response.status_code == 200:
return content
else:
- raise ROClientException(str(content), http_code=mano_response.status)
+ raise ROClientException(str(content), http_code=mano_response.status)
elif action == "get" or action == "show":
url = "{}{}/vim/{}/{}/{}".format(self.uri, tenant_text, datacenter, item, uuid)
self.logger.debug("GET %s", url)
mano_response = requests.get(url, headers=self.headers_req)
self.logger.debug("RO response: %s", mano_response.text)
- content = self._parse_yaml(mano_response.text, response=True)
+ content = self._parse_yaml(mano_response.text, response=True)
if mano_response.status_code == 200:
return content
else:
- raise ROClientException(str(content), http_code=mano_response.status)
+ raise ROClientException(str(content), http_code=mano_response.status)
elif action == "delete":
url = "{}{}/vim/{}/{}/{}".format(self.uri, tenant_text, datacenter, item, uuid)
self.logger.debug("DELETE %s", url)
mano_response = requests.delete(url, headers=self.headers_req)
self.logger.debug("RO response: %s", mano_response.text)
- content = self._parse_yaml(mano_response.text, response=True)
+ content = self._parse_yaml(mano_response.text, response=True)
if mano_response.status_code == 200:
return content
else:
- raise ROClientException(str(content), http_code=mano_response.status)
+ raise ROClientException(str(content), http_code=mano_response.status)
elif action == "create":
if "descriptor" in kwargs:
if isinstance(kwargs["descriptor"], str):
descriptor = {item[:-1]: {"name": kwargs["name"]}}
else:
raise ROClientException("Missing descriptor")
-
+
if item[:-1] not in descriptor or len(descriptor) != 1:
raise ROClientException("Descriptor must contain only one 'tenant' field")
if "name" in kwargs:
projects / osm / LCM.git / blobdiff