From: fengyuanxing Date: Wed, 7 Mar 2018 09:09:51 +0000 (+0800) Subject: Fix a bug and modify test cases X-Git-Tag: v1.1.0~74 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F73%2F34473%2F1;p=vfc%2Fnfvo%2Flcm.git Fix a bug and modify test cases Change-Id: Ice7d75ed231edd4c36383b185a4c307df942607e Issue-ID: VFC-784 Signed-off-by: fengyuanxing --- diff --git a/lcm/pub/tests/test_scaleaspect.py b/lcm/pub/tests/test_scaleaspect.py index 58fca5a4..400e31d0 100644 --- a/lcm/pub/tests/test_scaleaspect.py +++ b/lcm/pub/tests/test_scaleaspect.py @@ -223,6 +223,9 @@ class TestScaleAspect(TestCase): self.add_another_nf_instance() result = set_scacle_vnf_instance_id(self.vnf_scale_info_list) self.assertEqual(3, result.__len__()) + self.assertEqual("231", result[0]["vnfInstanceId"]) + self.assertEqual("232", result[1]["vnfInstanceId"]) + self.assertEqual("233", result[2]["vnfInstanceId"]) def test_get_nsdId(self): nsd_id = get_nsdId("1") diff --git a/lcm/pub/utils/scaleaspect.py b/lcm/pub/utils/scaleaspect.py index e642ab01..941d1b48 100644 --- a/lcm/pub/utils/scaleaspect.py +++ b/lcm/pub/utils/scaleaspect.py @@ -219,10 +219,10 @@ def set_scacle_vnf_instance_id(vnf_scale_info_list): vnf_scale_info = vnf_scale_info_list[i] vnfd_id = vnf_scale_info["vnfd_id"] vnf_instance_id_list = get_vnf_instance_id_list(vnfd_id) - copy_vnf_scale_info = copy.deepcopy(vnf_scale_info) - copy_vnf_scale_info.pop("vnfd_id") index = 0 while index < vnf_instance_id_list.__len__(): + copy_vnf_scale_info = copy.deepcopy(vnf_scale_info) + copy_vnf_scale_info.pop("vnfd_id") copy_vnf_scale_info["vnfInstanceId"] = vnf_instance_id_list[index] index += 1 scale_vnf_data_info_list.append(copy_vnf_scale_info)