From 2102560198959215f59e9f0ab1d11b0f69b8bb75 Mon Sep 17 00:00:00 2001 From: tierno Date: Fri, 27 Apr 2018 14:36:23 +0200 Subject: [PATCH] Allow ns-creation params: vim-network, multisite deployement Change-Id: I783f55f80259c1c6ff3df854eb77df9024cd71e7 Signed-off-by: tierno --- osm_nbi/engine.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/osm_nbi/engine.py b/osm_nbi/engine.py index 209d9f6..38bbe77 100644 --- 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"], + "instantiate_params": ns_request, "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) - if nsr["_admin"]["nsState"] == "NOT_INSTANTIATED": + if not nsr["_admin"].get("nsState") or nsr["_admin"]["nsState"] == "NOT_INSTANTIATED": if action == "terminate" and indata.get("autoremove"): # NSR must be deleted return self.del_item(session, "nsrs", nsInstanceId) -- 2.17.1