Fix vnfm_type get logic when upgrade tosca-parser

Change-Id: I0573e6e6468f361db429d54d85212236e2679d8c
Issue-ID: VFC-1197
Signed-off-by: fujinhua <fu.jinhua@zte.com.cn>

diff --git a/lcm/ns/biz/ns_instant.py b/lcm/ns/biz/ns_instant.py
index 419c4d5..2670e25 100644 (file)
--- a/lcm/ns/biz/ns_instant.py
+++ b/lcm/ns/biz/ns_instant.py
@@ -86,11 +86,9 @@ class InstantNSService(object):
                 vnfd_id = vnf['properties']['id']
                 vnfm_type_temp = vnf['properties'].get("vnfm_info", "undefined")
                 logger.debug("vnfd_id: %s, vnfm_type : %s", vnfd_id, vnfm_type_temp)
-                if vnfm_type_temp != "undefined":
-                    if isinstance(vnfm_type_temp, list):
-                        vnfm_type = vnfm_type_temp[0]
-                    if isinstance(vnfm_type_temp, str):
-                        vnfm_type = vnfm_type_temp
+                vnfm_type = vnfm_type_temp
+                if isinstance(vnfm_type_temp, list):
+                    vnfm_type = vnfm_type_temp[0]
                 vimid = self.get_vnf_vim_id(vim_id, location_constraints, vnfd_id)
                 vnfm_info = extsys.select_vnfm(vnfm_type=vnfm_type, vim_id=vimid)