projects
/
osm
/
NBI.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Allow ns-creation params: vim-network, multisite deployement
[osm/NBI.git]
/
osm_nbi
/
engine.py
diff --git
a/osm_nbi/engine.py
b/osm_nbi/engine.py
index
209d9f6
..
38bbe77
100644
(file)
--- a/
osm_nbi/engine.py
+++ b/
osm_nbi/engine.py
@@
-490,6
+490,7
@@
class Engine(object):
"nsd-name-ref": nsd["name"],
"operational-events": [], # "id", "timestamp", "description", "event",
"nsd-ref": nsd["id"],
"nsd-name-ref": nsd["name"],
"operational-events": [], # "id", "timestamp", "description", "event",
"nsd-ref": nsd["id"],
+ "instantiate_params": ns_request,
"ns-instance-config-ref": _id,
"id": _id,
"_id": _id,
"ns-instance-config-ref": _id,
"id": _id,
"_id": _id,
@@
-622,7
+623,7
@@
class Engine(object):
validate_input(indata, "ns_" + action, new=True)
# get ns from nsr_id
nsr = self.get_item(session, "nsrs", nsInstanceId)
validate_input(indata, "ns_" + action, new=True)
# get ns from nsr_id
nsr = self.get_item(session, "nsrs", nsInstanceId)
- if nsr["_admin"]["nsState"] == "NOT_INSTANTIATED":
+ if n
ot nsr["_admin"].get("nsState") or n
sr["_admin"]["nsState"] == "NOT_INSTANTIATED":
if action == "terminate" and indata.get("autoremove"):
# NSR must be deleted
return self.del_item(session, "nsrs", nsInstanceId)
if action == "terminate" and indata.get("autoremove"):
# NSR must be deleted
return self.del_item(session, "nsrs", nsInstanceId)