commit b62b7acd1c12e971b6e13d4905d478df8fd3c69f
author tierno <alfonso.tiernosepulveda@telefonica.com> Mon May 28 16:50:20 2018 +0200
committer tierno <alfonso.tiernosepulveda@telefonica.com> Wed May 30 16:02:07 2018 +0200
tree bd3c88a359dfbc41397ce3777e36cdb5853dfb48
parent 956924429d324ed432b2f9bf6ec0ceff437486ad

fix 500 provide vnfr:vnfd-id with vnfd:_id
allow force at DELETE nslcm/vi/ns_instances_content

Change-Id: Ib6dccc65f45f3fdb0a8dcd504db851e43e35cf40
Signed-off-by: tierno <alfonso.tiernosepulveda@telefonica.com>

osm_nbi/nbi.py

diff --git a/osm_nbi/nbi.py b/osm_nbi/nbi.py
index fefb3e9..cb24045 100644
--- a/osm_nbi/nbi.py
+++ b/osm_nbi/nbi.py
@@ -716,7 +716,7 @@
                     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