projects
/
osm
/
RO.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix at vim_dummy delete network
[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
..
3303a4d
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,7
+20,7
@@
"""
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
from .floodlight_of import OfConnFloodLight
@@
-33,7
+33,7
@@
class SdnConnectorFloodLightOf(SdnConnectorOpenFlow):
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"],
}