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 2268: Authentication error when instantiating NS on GCP.
[osm/RO.git]
/
RO-SDN-floodlight_openflow
/
osm_rosdn_floodlightof
/
sdnconn_floodlightof.py
diff --git
a/RO-SDN-floodlight_openflow/osm_rosdn_floodlightof/sdnconn_floodlightof.py
b/RO-SDN-floodlight_openflow/osm_rosdn_floodlightof/sdnconn_floodlightof.py
index
395b18d
..
78ce606
100644
(file)
--- a/
RO-SDN-floodlight_openflow/osm_rosdn_floodlightof/sdnconn_floodlightof.py
+++ b/
RO-SDN-floodlight_openflow/osm_rosdn_floodlightof/sdnconn_floodlightof.py
@@
-20,20
+20,20
@@
"""
import logging
"""
import logging
-from osm_ro.wim.openflow_conn import SdnConnectorOpenFlow
+
+from osm_ro_plugin.openflow_conn import SdnConnectorOpenFlow
+
from .floodlight_of import OfConnFloodLight
class SdnConnectorFloodLightOf(SdnConnectorOpenFlow):
from .floodlight_of import OfConnFloodLight
class SdnConnectorFloodLightOf(SdnConnectorOpenFlow):
-
def __init__(self, wim, wim_account, config=None, logger=None):
def __init__(self, wim, wim_account, config=None, logger=None):
- """Creates a connectivity based on pro-active openflow rules
- """
- self.logger = logging.getLogger('openmano.sdnconn.floodlightof')
+ """Creates a connectivity based on pro-active openflow rules"""
+ self.logger = logging.getLogger("ro.sdn.floodlightof")
super().__init__(wim, wim_account, config, logger)
of_params = {
"of_url": wim["wim_url"],
super().__init__(wim, wim_account, config, logger)
of_params = {
"of_url": wim["wim_url"],
- "of_dpid": config.get("dpid"),
+ "of_dpid": config.get("dpid")
or config.get("switch_id")
,
"of_user": wim_account["user"],
"of_password": wim_account["password"],
}
"of_user": wim_account["user"],
"of_password": wim_account["password"],
}