projects
/
osm
/
RO.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into Azure
[osm/RO.git]
/
osm_ro
/
wim
/
wim_thread.py
diff --git
a/osm_ro/wim/wim_thread.py
b/osm_ro/wim/wim_thread.py
index
a13d6a2
..
f37aba7
100644
(file)
--- 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 six import reraise
from six.moves import queue
-from . import wan_link_actions
, wimconn_odl # wimconn_tapi
+from . import wan_link_actions
from ..utils import ensure, partition, pipe
from .actions import IGNORE, PENDING, REFRESH
from .errors import (
from ..utils import ensure, partition, pipe
from .actions import IGNORE, PENDING, REFRESH
from .errors import (
@@
-62,14
+62,19
@@
from .errors import (
)
from .failing_connector import FailingConnector
from .wimconn import WimConnectorError
)
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 = {
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
}
# Add extra connectors here
}