Fixing bug 1437
This patchset fixes bug 1437. There will need to be done extra
changes to make logging better.
Change-Id: I2b0e477093eba798c6cd4ce7bcc105ee78b610ed
Signed-off-by: sousaedu <eduardo.sousa@canonical.com>
diff --git a/RO-plugin/osm_ro_plugin/openflow_conn.py b/RO-plugin/osm_ro_plugin/openflow_conn.py
index f60deea..f46c6cf 100644
--- a/RO-plugin/osm_ro_plugin/openflow_conn.py
+++ b/RO-plugin/osm_ro_plugin/openflow_conn.py
@@ -86,7 +86,7 @@
self.name = "openflow_conector"
self.pp2ofi = {} # From Physical Port to OpenFlow Index
self.ofi2pp = {} # From OpenFlow Index to Physical Port
- self.logger = logging.getLogger('openmano.sdn.openflow_conn')
+ self.logger = logging.getLogger('ro.sdn.openflow_conn')
def get_of_switches(self):
""""
@@ -160,7 +160,7 @@
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.sdn.openflow_conn')
+ self.logger = logger or logging.getLogger('ro.sdn.openflow_conn')
self.of_connector = of_connector
config = config or {}
self.of_controller_nets_with_same_vlan = config.get("of_controller_nets_with_same_vlan", False)
diff --git a/RO-plugin/osm_ro_plugin/sdn_dummy.py b/RO-plugin/osm_ro_plugin/sdn_dummy.py
index a2d189a..687d4ab 100644
--- a/RO-plugin/osm_ro_plugin/sdn_dummy.py
+++ b/RO-plugin/osm_ro_plugin/sdn_dummy.py
@@ -44,7 +44,7 @@
An extra property, ``service_endpoint_mapping`` is created from ``config``.
"""
def __init__(self, wim, wim_account, config=None, logger=None):
- self.logger = logger or logging.getLogger('openmano.sdnconn.dummy')
+ self.logger = logger or logging.getLogger('ro.sdn.dummy')
super(SdnDummyConnector, self).__init__(wim, wim_account, config, self.logger)
self.logger.debug("__init: wim='{}' wim_account='{}'".format(wim, wim_account))
self.connections = {}
diff --git a/RO-plugin/osm_ro_plugin/sdnconn.py b/RO-plugin/osm_ro_plugin/sdnconn.py
index b7b1faa..ccf16b1 100644
--- a/RO-plugin/osm_ro_plugin/sdnconn.py
+++ b/RO-plugin/osm_ro_plugin/sdnconn.py
@@ -92,7 +92,7 @@
wim_id: (internal, do not use)
:param logger (logging.Logger): optional logger object. If none is passed 'openmano.sdn.sdnconn' is used.
"""
- self.logger = logger or logging.getLogger('openmano.sdnconn')
+ self.logger = logger or logging.getLogger('ro.sdn')
self.wim = wim
self.wim_account = wim_account
diff --git a/RO-plugin/osm_ro_plugin/vim_dummy.py b/RO-plugin/osm_ro_plugin/vim_dummy.py
index e90d213..22379b6 100644
--- a/RO-plugin/osm_ro_plugin/vim_dummy.py
+++ b/RO-plugin/osm_ro_plugin/vim_dummy.py
@@ -41,7 +41,7 @@
config={}, persistent_info={}):
super().__init__(uuid, name, tenant_id, tenant_name, url, url_admin, user, passwd, log_level,
config, persistent_info)
- self.logger = logging.getLogger('openmano.vim.dummy')
+ self.logger = logging.getLogger('ro.vim.dummy')
if log_level:
self.logger.setLevel(getattr(logging, log_level))
self.nets = {
diff --git a/RO-plugin/osm_ro_plugin/vimconn.py b/RO-plugin/osm_ro_plugin/vimconn.py
index dd60e46..c71e821 100644
--- a/RO-plugin/osm_ro_plugin/vimconn.py
+++ b/RO-plugin/osm_ro_plugin/vimconn.py
@@ -150,7 +150,7 @@
self.passwd = passwd
self.config = config or {}
self.availability_zone = None
- self.logger = logging.getLogger('openmano.vim')
+ self.logger = logging.getLogger('ro.vim')
if log_level:
self.logger.setLevel(getattr(logging, log_level))
if not self.url_admin: # try to use normal url