X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_ro%2Fwim%2Fwim_thread.py;h=f37aba745d1aafca40ba1b289a7d8468cf1ff508;hb=c19c5653c9ca00d27f4a9247973e5a811f14dfde;hp=f8d52bbecd7b8fdb786b4d930900ccf6a01cd84e;hpb=433a63deecc246609abe0b070e6bf75826d03ef2;p=osm%2FRO.git diff --git a/osm_ro/wim/wim_thread.py b/osm_ro/wim/wim_thread.py index f8d52bbe..f37aba74 100644 --- a/osm_ro/wim/wim_thread.py +++ b/osm_ro/wim/wim_thread.py @@ -51,7 +51,7 @@ from time import time, sleep from six import reraise from six.moves import queue -from . import wan_link_actions, wimconn_odl, wimconn_dynpac # wimconn_tapi +from . import wan_link_actions from ..utils import ensure, partition, pipe from .actions import IGNORE, PENDING, REFRESH from .errors import ( @@ -62,16 +62,20 @@ from .errors import ( ) from .failing_connector import FailingConnector from .wimconn import WimConnectorError +from .wimconn_dynpac import DynpacConnector +from .wimconn_fake import FakeConnector +from .wimconn_ietfl2vpn import WimconnectorIETFL2VPN ACTIONS = { 'instance_wim_nets': wan_link_actions.ACTIONS } CONNECTORS = { - "odl": wimconn_odl.OdlConnector, - # "tapi": wimconn_tapi + # "odl": wimconn_odl.OdlConnector, + "dynpac": DynpacConnector, + "fake": FakeConnector, + "tapi": WimconnectorIETFL2VPN, # Add extra connectors here - "dynpac": wimconn_dynpac.DynpacConnector }