Merge "Refactor codes for manual scale ns"

diff --git a/lcm/ns/biz/ns_get.py b/lcm/ns/biz/ns_get.py
index 697d7c4..ce91e78 100644 (file)
--- a/lcm/ns/biz/ns_get.py
+++ b/lcm/ns/biz/ns_get.py
@@ -123,11 +123,11 @@ class GetNSInfoService(object):
                     'nsVirtualLinkDescId': vl.vldid,
                     'nsVirtualLinkProfileId': vl.vldid,
                     'vlInstanceName': vl.vlinstancename,
-                    'resourceHandle': {
-                        'vimId': vl.vimId,
+                    'resourceHandle': [{
+                        'vimId': vl.vimid,
                         'resourceId': vl.relatednetworkid,
                         'vimLevelResourceType': vl.vltype
-                    },
+                    }],
                     # todo 'linkPort': self.get_cp_infos(vl.vlinstanceid,is_sol),
                     'networkId': vl.relatednetworkid,
                     'subNetworkid': vl.relatedsubnetworkid

diff --git a/lcm/ns/biz/ns_instant.py b/lcm/ns/biz/ns_instant.py
index ada85e8..2306081 100644 (file)
--- a/lcm/ns/biz/ns_instant.py
+++ b/lcm/ns/biz/ns_instant.py
@@ -284,8 +284,8 @@ class InstantNSService(object):
         return {'vlCount': str(vls), 'sfcCount': str(sfcs), 'vnfCount': str(vnfs), 'pnfCount': str(pnfs)}
 
     def init_pnf_para(self, plan_dict):
-        pnfs_in_input = ignore_case_get(self.req_data, "addpnfData")
-        pnfs_in_nsd = ignore_case_get(plan_dict, "pnfs")
+        pnfs_in_input = ignore_case_get(self.req_data, "addpnfData", [])
+        pnfs_in_nsd = ignore_case_get(plan_dict, "pnfs", [])
         logger.debug("addpnfData ; %s" % pnfs_in_input)
         logger.debug("pnfs_in_nsd ; %s" % pnfs_in_nsd)
         pnfs = {}