Add terminate vnf req serializer

[vfc/nfvo/lcm.git] / lcm / ns / ns_instant.py

diff --git a/lcm/ns/ns_instant.py b/lcm/ns/ns_instant.py
index 5241808..5c2d363 100644 (file)
--- a/lcm/ns/ns_instant.py
+++ b/lcm/ns/ns_instant.py
@@ -87,11 +87,7 @@ class InstantNSService(object):
             plan_dict = json.JSONDecoder().decode(dst_plan)
             for vnf in ignore_case_get(plan_dict, "vnfs"):
                 vnfd_id = vnf['properties']['id']
-                # vnfd = NfPackageModel.objects.get(vnfdid=vnfd_id)
-                # vnfpackage_info = query_vnfpackage_by_id(vnfd_id)
-                # vnfd_model = json.JSONDecoder().decode(ignore_case_get(vnfpackage_info["packageInfo"], "vnfdModel"))
-                # vnfm_type = vnfd_model["metadata"].get("vnfmType", "ztevmanagerdriver")
-                vnfm_type = vnf['properties'].get("nf_type", "ztevmanagerdriver")
+                vnfm_type = vnf['properties'].get("nf_type", "undefined")
                 vimid = self.get_vnf_vim_id(vim_id, location_constraints, vnfd_id)
                 vnfm_info = select_vnfm(vnfm_type=vnfm_type, vim_id=vimid)
                 params_vnf.append({