X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_nbi%2Fnbi.py;h=cb2404558857b0fc24fe8944a149fc761fcdb5ce;hb=refs%2Fchanges%2F34%2F6234%2F2;hp=ff8cd11bd8ab122b42f2825fa5e47bd6adb51516;hpb=e128118419c3bb413de4cff8445b9b6c5598a5ed;p=osm%2FNBI.git

diff --git a/osm_nbi/nbi.py b/osm_nbi/nbi.py
index ff8cd11..cb24045 100644
--- a/osm_nbi/nbi.py
+++ b/osm_nbi/nbi.py
@@ -59,7 +59,7 @@ URL: /osm                                                       GET     POST
             /ns_instances_content                               O       O
                 /<nsInstanceId>                                 O                       O
             /ns_instances                                       5       5
-                /<nsInstanceId>                                 5                       5
+                /<nsInstanceId>                                 O5                      O5
                     instantiate                                         O5
                     terminate                                           O5
                     action                                              O
@@ -215,7 +215,7 @@ class Server(object):
                                              "<ID>": {"METHODS": ("GET", "DELETE")}
                                              },
                     "ns_instances": {"METHODS": ("GET", "POST"),
-                                     "<ID>": {"TODO": ("GET", "DELETE"),
+                                     "<ID>": {"METHODS": ("GET", "DELETE"),
                                               "scale": {"TODO": "POST"},
                                               "terminate": {"METHODS": "POST"},
                                               "instantiate": {"METHODS": "POST"},
@@ -716,7 +716,7 @@ class Server(object):
                     outdata = self.engine.del_item_list(session, engine_item, kwargs)
                     cherrypy.response.status = HTTPStatus.OK.value
                 else:  # len(args) > 1
-                    if item == "ns_instances_content":
+                    if item == "ns_instances_content" and not force:
                         opp_id = self.engine.ns_operation(session, _id, "terminate", {"autoremove": True}, None)
                         outdata = {"_id": opp_id}
                         cherrypy.response.status = HTTPStatus.ACCEPTED.value