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 2156 to select correct WIM connector class and prevent exceptions with missin...
[osm/RO.git]
/
NG-RO
/
osm_ng_ro
/
ns_thread.py
diff --git
a/NG-RO/osm_ng_ro/ns_thread.py
b/NG-RO/osm_ng_ro/ns_thread.py
index
d1db698
..
d2b00d6
100644
(file)
--- a/
NG-RO/osm_ng_ro/ns_thread.py
+++ b/
NG-RO/osm_ng_ro/ns_thread.py
@@
-1055,11
+1055,15
@@
class VimInteractionSdnNet(VimInteractionBase):
try:
# CREATE
params = task["params"]
try:
# CREATE
params = task["params"]
- vlds_to_connect = params
["vlds"]
- associated_vim = params
["target_vim"]
+ vlds_to_connect = params
.get("vlds", [])
+ associated_vim = params
.get("target_vim")
# external additional ports
additional_ports = params.get("sdn-ports") or ()
# external additional ports
additional_ports = params.get("sdn-ports") or ()
- _, _, vim_account_id = associated_vim.partition(":")
+ _, _, vim_account_id = (
+ (None, None, None)
+ if associated_vim is None
+ else associated_vim.partition(":")
+ )
if associated_vim:
# get associated VIM
if associated_vim:
# get associated VIM
@@
-1830,7
+1834,7
@@
class NsWorker(threading.Thread):
persistent_info={},
)
else: # sdn
persistent_info={},
)
else: # sdn
- plugin_name = "rosdn_" +
vim["type"]
+ plugin_name = "rosdn_" +
(vim.get("type") or vim.get("wim_type"))
step = "Loading plugin '{}'".format(plugin_name)
vim_module_conn = self._load_plugin(plugin_name, "sdn")
step = "Loading {}'".format(target_id)
step = "Loading plugin '{}'".format(plugin_name)
vim_module_conn = self._load_plugin(plugin_name, "sdn")
step = "Loading {}'".format(target_id)