X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FRO.git;a=blobdiff_plain;f=RO%2Fosm_ro%2Fwim%2Fwim_thread.py;h=7d57d5589996d427cb0afc4b9ceee3612db0a56c;hp=bf35837e78bb0bf0477bcc32270e442dbeff468b;hb=7277486065c905f91477bb064da86855a8fa269a;hpb=667d158c0d3ee7b4c176ad0b27ac428c81b0ddbc diff --git a/RO/osm_ro/wim/wim_thread.py b/RO/osm_ro/wim/wim_thread.py index bf35837e..7d57d558 100644 --- a/RO/osm_ro/wim/wim_thread.py +++ b/RO/osm_ro/wim/wim_thread.py @@ -59,9 +59,9 @@ from .errors import ( InvalidParameters as Invalid, UndefinedAction, ) -from .failing_connector import FailingConnector -from .sdnconn import SdnConnectorError -from .wimconn_dummy import DummyConnector +from osm_ro_plugin.sdn_failing import SdnFailingConnector +from osm_ro_plugin.sdnconn import SdnConnectorError +from osm_ro_plugin.sdn_dummy import SdnDummyConnector ACTIONS = { 'instance_wim_nets': wan_link_actions.ACTIONS @@ -69,7 +69,7 @@ ACTIONS = { CONNECTORS = { # "odl": wimconn_odl.OdlConnector, - "dummy": DummyConnector, + "dummy": SdnDummyConnector, # Add extra connectors here not managed via plugins } @@ -111,7 +111,7 @@ class WimThread(threading.Thread): super(WimThread, self).__init__(name=name) self.plugins = plugins if "rosdn_dummy" not in self.plugins: - self.plugins["rosdn_dummy"] = DummyConnector + self.plugins["rosdn_dummy"] = SdnDummyConnector self.name = name self.connector = None @@ -183,7 +183,7 @@ class WimThread(threading.Thread): error_msg_extra = ('Any task targeting WIM account {} ({}) will fail.' .format(account_id, self.wim_account.get('name'))) self.logger.warning(error_msg_extra) - return FailingConnector(error_msg + '\n' + error_msg_extra) + return SdnFailingConnector(error_msg + '\n' + error_msg_extra) @contextmanager def avoid_exceptions(self): @@ -388,7 +388,7 @@ class WimThread(threading.Thread): self.process_list('refresh')): sleep(self.WAITING_TIME) - if isinstance(self.connector, FailingConnector): + if isinstance(self.connector, SdnFailingConnector): # Wait sometime to try instantiating the connector # again and restart # Increase the recovery time if restarting is not