From: tierno Date: Tue, 11 Aug 2020 11:19:44 +0000 (+0000) Subject: fix 1190 enhanced reported error text X-Git-Tag: v8.0.1rc1^0 X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=d9287d36a6c3daf2b853e6b4db1cbc77bdb8342a;p=osm%2FRO.git fix 1190 enhanced reported error text Change-Id: I0c65daa0b934694c3b741952bee95d7c4b976365 Signed-off-by: tierno --- diff --git a/RO-VIM-openstack/osm_rovim_openstack/vimconn_openstack.py b/RO-VIM-openstack/osm_rovim_openstack/vimconn_openstack.py index 61398b40..99cb64f1 100644 --- a/RO-VIM-openstack/osm_rovim_openstack/vimconn_openstack.py +++ b/RO-VIM-openstack/osm_rovim_openstack/vimconn_openstack.py @@ -410,13 +410,16 @@ class vimconnector(vimconn.VimConnector): """Transform a keystone, nova, neutron exception into a vimconn exception discovering the cause""" message_error = str(exception) + tip = "" if isinstance(exception, (neExceptions.NetworkNotFoundClient, nvExceptions.NotFound, ksExceptions.NotFound, gl1Exceptions.HTTPNotFound)): raise vimconn.VimConnNotFoundException(type(exception).__name__ + ": " + message_error) elif isinstance(exception, (HTTPException, gl1Exceptions.HTTPException, gl1Exceptions.CommunicationError, ConnectionError, ksExceptions.ConnectionError, neExceptions.ConnectionFailed)): - raise vimconn.VimConnConnectionException(type(exception).__name__ + ": " + message_error) + if type(exception).__name__ == "SSLError": + tip = " (maybe option 'insecure' must be added to the VIM)" + raise vimconn.VimConnConnectionException("Invalid URL or credentials{}: {}".format(tip, message_error)) elif isinstance(exception, (KeyError, nvExceptions.BadRequest, ksExceptions.BadRequest)): raise vimconn.VimConnException(type(exception).__name__ + ": " + message_error) elif isinstance(exception, (nvExceptions.ClientException, ksExceptions.ClientException, @@ -566,9 +569,10 @@ class vimconnector(vimconn.VimConnector): provider_physical_network = provider_physical_network[0] if not provider_physical_network: - raise vimconn.VimConnConflictException("You must provide a 'dataplane_physical_net' at VIM_config " - "for creating underlay networks. or use the NS instantiation" - " parameter provider-network:physical-network for the VLD") + raise vimconn.VimConnConflictException( + "missing information needed for underlay networks. Provide 'dataplane_physical_net' " + "configuration at VIM or use the NS instantiation parameter 'provider-network.physical-network'" + " for the VLD") if not self.config.get('multisegment_support'): network_dict["provider:physical_network"] = provider_physical_network diff --git a/RO/osm_ro/nfvo.py b/RO/osm_ro/nfvo.py index 74258af6..29b9dccd 100644 --- a/RO/osm_ro/nfvo.py +++ b/RO/osm_ro/nfvo.py @@ -490,9 +490,9 @@ def rollback(mydb, vims, rollback_list): logger.error("Error in rollback. Not possible to delete %s '%s' from DB. Message: %s", item['what'], item["uuid"], str(e)) undeleted_items.append("{} '{}'".format(item['what'], item["uuid"])) if len(undeleted_items)==0: - return True," Rollback successful." + return True, "Rollback successful." else: - return False," Rollback fails to delete: " + str(undeleted_items) + return False, "Rollback fails to delete: " + str(undeleted_items) def check_vnf_descriptor(vnf_descriptor, vnf_descriptor_version=1): @@ -3789,7 +3789,7 @@ def create_instance(mydb, tenant_id, instance_dict): returned_instance["action_id"] = instance_action_id return returned_instance except (NfvoException, vimconn.VimConnException, sdnconn.SdnConnectorError, db_base_Exception) as e: - message = rollback(mydb, myvims, rollbackList) + _, message = rollback(mydb, myvims, rollbackList) if isinstance(e, db_base_Exception): error_text = "database Exception" elif isinstance(e, vimconn.VimConnException): @@ -3797,8 +3797,8 @@ def create_instance(mydb, tenant_id, instance_dict): elif isinstance(e, sdnconn.SdnConnectorError): error_text = "WIM Exception" else: - error_text = "Exception" - error_text += " {} {}. {}".format(type(e).__name__, str(e), message) + error_text = "Exception " + str(type(e).__name__) + error_text += " {}. {}".format(e, message) # logger.error("create_instance: %s", error_text) logger.exception(e) raise NfvoException(error_text, e.http_code)