projects
/
osm
/
RO.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix bug 2154 to select correct WIM connector class and prevent exceptions with missin...
[osm/RO.git]
/
RO-SDN-dpb
/
osm_rosdn_dpb
/
wimconn_dpb.py
diff --git
a/RO-SDN-dpb/osm_rosdn_dpb/wimconn_dpb.py
b/RO-SDN-dpb/osm_rosdn_dpb/wimconn_dpb.py
index
e08cdfd
..
075b1a8
100755
(executable)
--- a/
RO-SDN-dpb/osm_rosdn_dpb/wimconn_dpb.py
+++ b/
RO-SDN-dpb/osm_rosdn_dpb/wimconn_dpb.py
@@
-27,16
+27,15
@@
import json
import logging
import json
import logging
-import paramiko
-import requests
import struct
import struct
-# import sys
from osm_ro_plugin.sdnconn import SdnConnectorBase, SdnConnectorError
from osm_ro_plugin.sdnconn import SdnConnectorBase, SdnConnectorError
+import paramiko
+import requests
class DpbSshInterface:
class DpbSshInterface:
- """
Communicate with the DPB via SSH
"""
+ """
Communicate with the DPB via SSH
"""
__LOGGER_NAME_EXT = ".ssh"
__FUNCTION_MAP_POS = 1
__LOGGER_NAME_EXT = ".ssh"
__FUNCTION_MAP_POS = 1
@@
-191,7
+190,7
@@
class DpbSshInterface:
class DpbRestInterface:
class DpbRestInterface:
- """
Communicate with the DPB via the REST API
"""
+ """
Communicate with the DPB via the REST API
"""
__LOGGER_NAME_EXT = ".rest"
__FUNCTION_MAP_POS = 0
__LOGGER_NAME_EXT = ".rest"
__FUNCTION_MAP_POS = 0
@@
-230,7
+229,7
@@
class DpbRestInterface:
class DpbConnector(SdnConnectorBase):
class DpbConnector(SdnConnectorBase):
- """
Use the DPB to establish multipoint connections
"""
+ """
Use the DPB to establish multipoint connections
"""
__LOGGER_NAME = "ro.sdn.dpb"
__SUPPORTED_SERV_TYPES = ["ELAN (L2)", "ELINE (L2)"]
__LOGGER_NAME = "ro.sdn.dpb"
__SUPPORTED_SERV_TYPES = ["ELAN (L2)", "ELINE (L2)"]