X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=RO%2Fosm_ro%2Fwim%2Fopenflow_conn.py;h=c7195bd186978ca7fcd9baaa591b0240382cc78d;hb=b15b4fa3f3de9fb5abc73253ae8330620f1ef03f;hp=7d029f7f9161f5a13972609a16c623f2373bfdea;hpb=ed3e4d4fc2819e425bb8b165e43fcbac259d3f1b;p=osm%2FRO.git diff --git a/RO/osm_ro/wim/openflow_conn.py b/RO/osm_ro/wim/openflow_conn.py index 7d029f7f..c7195bd1 100644 --- a/RO/osm_ro/wim/openflow_conn.py +++ b/RO/osm_ro/wim/openflow_conn.py @@ -86,8 +86,7 @@ class OpenflowConn: self.name = "openflow_conector" self.pp2ofi = {} # From Physical Port to OpenFlow Index self.ofi2pp = {} # From OpenFlow Index to Physical Port - self.logger = logging.getLogger('openflow_conn') - self.logger.setLevel(getattr(logging, params.get("of_debug", "ERROR"))) + self.logger = logging.getLogger('openmano.sdn.openflow_conn') def get_of_switches(self): """" @@ -161,7 +160,7 @@ class SdnConnectorOpenFlow(SdnConnectorBase): flow_fields = ('priority', 'vlan', 'ingress_port', 'actions', 'dst_mac', 'src_mac', 'net_id') def __init__(self, wim, wim_account, config=None, logger=None, of_connector=None): - self.logger = logger or logging.getLogger('openmano.sdnconn.openflow') + self.logger = logger or logging.getLogger('openmano.sdn.openflow_conn') self.of_connector = of_connector self.of_controller_nets_with_same_vlan = config.get("of_controller_nets_with_same_vlan", False) @@ -308,7 +307,7 @@ class SdnConnectorOpenFlow(SdnConnectorBase): except OpenflowConnNotFoundException: pass except OpenflowConnException as e: - error_text = "Cannot remove rule '{}': {}".format(flow['name'], e) + error_text = "Cannot remove rule '{}': {}".format(flow_id, e) error_list.append(error_text) self.logger.error(error_text) created_items["installed_rules_ids"] = new_installed_rules_ids @@ -322,8 +321,9 @@ class SdnConnectorOpenFlow(SdnConnectorBase): except (SdnConnectorError, OpenflowConnException) as e: raise SdnConnectorError("Error while {}: {}".format(step, e)) from e except Exception as e: + error_text = "Error while {}: {}".format(step, e) self.logger.critical(error_text, exc_info=True) - raise SdnConnectorError("Error while {}: {}".format(step, e)) + raise SdnConnectorError(error_text) def _compute_net_flows(self, net_id, ports): new_flows = []