X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=RO-SDN-arista_cloudvision%2Fosm_rosdn_arista_cloudvision%2Fwimconn_arista.py;h=6be47e166f8b42fa7eb261ab378168c78981cb9e;hb=7b521f73dd996a279f23b2f512cd89a42c1c79f6;hp=314c6733e18d3f26940687f4a2cef0d41fdec1a7;hpb=80135b928ab442c38898750b4751480205b4affc;p=osm%2FRO.git diff --git a/RO-SDN-arista_cloudvision/osm_rosdn_arista_cloudvision/wimconn_arista.py b/RO-SDN-arista_cloudvision/osm_rosdn_arista_cloudvision/wimconn_arista.py index 314c6733..6be47e16 100644 --- a/RO-SDN-arista_cloudvision/osm_rosdn_arista_cloudvision/wimconn_arista.py +++ b/RO-SDN-arista_cloudvision/osm_rosdn_arista_cloudvision/wimconn_arista.py @@ -27,28 +27,21 @@ # This work has been performed in the context of Arista Telefonica OSM PoC. ## -from osm_ro_plugin.sdnconn import SdnConnectorBase, SdnConnectorError -import re -import socket - -# Required by compare function import difflib - -# Library that uses Levenshtein Distance to calculate the differences -# between strings. -# from fuzzywuzzy import fuzz - +from enum import Enum import logging +import re +import socket import uuid -from enum import Enum -from requests import RequestException, ConnectionError, ConnectTimeout, Timeout -from cvprac.cvp_client import CvpClient -from cvprac.cvp_api import CvpApi -from cvprac.cvp_client_errors import CvpLoginError, CvpSessionLogOutError, CvpApiError -from cvprac import __version__ as cvprac_version +from cvprac import __version__ as cvprac_version +from cvprac.cvp_api import CvpApi +from cvprac.cvp_client import CvpClient +from cvprac.cvp_client_errors import CvpApiError, CvpLoginError, CvpSessionLogOutError +from osm_ro_plugin.sdnconn import SdnConnectorBase, SdnConnectorError from osm_rosdn_arista_cloudvision.aristaConfigLet import AristaSDNConfigLet from osm_rosdn_arista_cloudvision.aristaTask import AristaCVPTask +from requests import ConnectionError, ConnectTimeout, RequestException, Timeout class SdnError(Enum): @@ -639,8 +632,8 @@ class AristaSdnConnector(SdnConnectorBase): try: self.__addMetadata(s_uid, service_type, s_connInf["vlan_id"]) - except Exception: - pass + except Exception as e: + self.logger.exception(f"{e} occured.") return (s_uid, s_connInf) except CvpLoginError as e: @@ -966,7 +959,6 @@ class AristaSdnConnector(SdnConnectorBase): self.logger.error( "Error removing configlets from device {}: {}".format(s, e) ) - pass for s in self.switches: if allLeafConfigured[s]: @@ -1143,7 +1135,7 @@ class AristaSdnConnector(SdnConnectorBase): found_in_cvp = True except CvpApiError as error: if "Entity does not exist" in error.msg: - pass + self.logger.exception(f"{error} occured.") else: raise error @@ -1363,7 +1355,7 @@ class AristaSdnConnector(SdnConnectorBase): found_in_cvp = True except CvpApiError as error: if "Entity does not exist" in error.msg: - pass + self.logger.exception(f"{error} occured.") else: raise error @@ -1385,7 +1377,6 @@ class AristaSdnConnector(SdnConnectorBase): service_uuid, str(e) ) ) - pass def __removeMetadata(self, service_uuid): """Removes the connectivity service from 'OSM_metadata' configLet""" @@ -1396,7 +1387,7 @@ class AristaSdnConnector(SdnConnectorBase): found_in_cvp = True except CvpApiError as error: if "Entity does not exist" in error.msg: - pass + self.logger.exception(f"{error} occured.") else: raise error @@ -1419,7 +1410,6 @@ class AristaSdnConnector(SdnConnectorBase): service_uuid, str(e) ) ) - pass def edit_connectivity_service( self, service_uuid, conn_info=None, connection_points=None, **kwargs @@ -1612,7 +1602,7 @@ class AristaSdnConnector(SdnConnectorBase): found_in_cvp = True except CvpApiError as error: if "Entity does not exist" in error.msg: - pass + self.logger.exception(f"{error} occured.") else: raise error @@ -1633,7 +1623,7 @@ class AristaSdnConnector(SdnConnectorBase): found_in_cvp = True except CvpApiError as error: if "Entity does not exist" in error.msg: - pass + self.logger.exception(f"{error} occured.") else: raise error @@ -1663,7 +1653,7 @@ class AristaSdnConnector(SdnConnectorBase): found_in_cvp = True except CvpApiError as error: if "Entity does not exist" in error.msg: - pass + self.logger.exception(f"{error} occured.") else: raise error