commit 07f3172ef24dab2c7c47c9a8e726f1f9876f13b3
author Felipe Vicens <felipe.vicens@atos.net> Mon Oct 29 15:16:44 2018 +0100
committer Felipe Vicens <felipe.vicens@atos.net> Fri Nov 16 15:34:31 2018 +0100
tree 0be2d686e8e5670c006a9ae6b039ed985056fc37
parent b57758d4a3fd88baa348cfa0812e9f4a742761d1

Adding NSI operations (Create, Read, Delete)

Change-Id: I013e3d54014ed266e6232e5410ad53ddf8df70ea
Signed-off-by: Felipe Vicens <felipe.vicens@atos.net>

osm_nbi/nbi.py

diff --git a/osm_nbi/nbi.py b/osm_nbi/nbi.py
index e8f2246..1354f2c 100644
--- a/osm_nbi/nbi.py
+++ b/osm_nbi/nbi.py
@@ -675,9 +675,7 @@
                 force = kwargs.pop("FORCE")
             else:
                 force = False
-
             self._check_valid_url_method(method, main_topic, version, topic, _id, item, *args)
-
             if main_topic == "admin" and topic == "tokens":
                 return self.token(method, _id, kwargs)
 
@@ -712,8 +710,7 @@
                 engine_topic = "vim_accounts"
 
             if method == "GET":
-                if item in ("nsd_content", "package_content", "artifacts", "vnfd", "nsd", "nst", "nst_content", 
-                            "netslice_instances"):
+                if item in ("nsd_content", "package_content", "artifacts", "vnfd", "nsd", "nst", "nst_content"):
                     if item in ("vnfd", "nsd", "nst"):
                         path = "$DESCRIPTOR"
                     elif args:
@@ -759,14 +756,14 @@
                     outdata = {"id": _id}
                     cherrypy.response.status = HTTPStatus.ACCEPTED.value
                 elif topic == "netslice_instances_content":
-                    # creates NSI
+                    # creates NetSlice_Instance_record (NSIR)
                     _id = self.engine.new_item(rollback, session, engine_topic, indata, kwargs, force=force)
-                    # creates nsilcmop
+                    self._set_location_header(main_topic, version, topic, _id)
                     indata["lcmOperationType"] = "instantiate"
                     indata["nsiInstanceId"] = _id
-                    self.engine.new_item(rollback, session, "nsilcmops", indata, None)
-                    self._set_location_header(main_topic, version, topic, _id)
+                    self.engine.new_item(rollback, session, "nsilcmops", indata, kwargs)
                     outdata = {"id": _id}
+                    
                 elif topic == "netslice_instances" and item:
                     indata["lcmOperationType"] = item
                     indata["nsiInstanceId"] = _id