Merge "Delete useless codes of ns scale"

1 files changed, 0 insertions, 163 deletions

diff --git a/lcm/ns/tests/test_scaleaspect.py b/lcm/ns/tests/test_scaleaspect.py
index f32d22d7..401d249b 100644
--- a/lcm/ns/tests/test_scaleaspect.py
+++ b/lcm/ns/tests/test_scaleaspect.py
@@ -227,166 +227,3 @@ class TestScaleAspect(TestCase):
     def tearDown(self):
         NSInstModel().clean()
         NfInstModel().clean()
-
-    '''
-    def test_get_and_check_params(self):
-        aspect, numberOfSteps, scale_type = check_and_set_params(
-            self.scaleNsData, "1")
-        self.assertEqual(aspect, self.ns_scale_aspect)
-        self.assertEqual(numberOfSteps, self.ns_scale_steps)
-        self.assertEqual(scale_type, self.ns_scale_direction)
-
-    def test_get_scale_vnf_data_from_json(self):
-        vnf_data_package = get_scale_vnf_data_from_json(
-            self.scaling_map_json, "23", "TIC_EDGE_IMS", "1")
-        self.assertIsNotNone(vnf_data_package)
-        self.assertEqual(2, vnf_data_package.__len__())
-        self.assertIsNotNone(vnf_data_package)
-        self.assertEqual(2, vnf_data_package.__len__())
-        self.assertEqual("nf_zte_cscf", vnf_data_package[0]["vnfd_id"])
-        self.assertEqual("1", vnf_data_package[0]["numberOfSteps"])
-        self.assertEqual("gsu", vnf_data_package[0]["vnf_scaleAspectId"])
-        self.assertEqual("nf_zte_hss", vnf_data_package[1]["vnfd_id"])
-        self.assertEqual("3", vnf_data_package[1]["numberOfSteps"])
-        self.assertEqual("gpu", vnf_data_package[1]["vnf_scaleAspectId"])
-
-    def test_get_scale_vnf_data_from_json_2(self):
-        vnf_data_package = get_scale_vnf_data_from_json(
-            self.scaling_map_json, "23", "TIC_EDGE_IMS", "2")
-        self.assertIsNotNone(vnf_data_package)
-        self.assertEqual(2, vnf_data_package.__len__())
-        self.assertEqual("nf_zte_cscf", vnf_data_package[0]["vnfd_id"])
-        self.assertEqual("2", vnf_data_package[0]["numberOfSteps"])
-        self.assertEqual("mpu", vnf_data_package[0]["vnf_scaleAspectId"])
-        self.assertEqual("nf_zte_hss", vnf_data_package[1]["vnfd_id"])
-        self.assertEqual("4", vnf_data_package[1]["numberOfSteps"])
-        self.assertEqual("mpu", vnf_data_package[1]["vnf_scaleAspectId"])
-
-    def test_set_scacle_vnf_instance_id(self):
-        result = set_scacle_vnf_instance_id(self.vnf_scale_info_list)
-        self.assertEqual(2, result.__len__())
-        self.assertEqual(result[0]["numberOfSteps"],
-                         self.vnf_scale_info_list[0]["numberOfSteps"])
-        self.assertEqual(
-            result[0]["vnf_scaleAspectId"],
-            self.vnf_scale_info_list[0]["vnf_scaleAspectId"])
-        self.assertEqual(result[1]["numberOfSteps"],
-                         self.vnf_scale_info_list[1]["numberOfSteps"])
-        self.assertEqual(
-            result[1]["vnf_scaleAspectId"],
-            self.vnf_scale_info_list[1]["vnf_scaleAspectId"])
-        self.assertEqual("231", result[0]["vnfInstanceId"])
-        self.assertEqual("232", result[1]["vnfInstanceId"])
-        self.assertNotIn("vnfd_id", result[0])
-        self.assertNotIn("vnfd_id", result[1])
-
-    def test_set_scacle_vnf_instance_id_2(self):
-        vnf_scale_info_list = [
-            {
-                "vnfd_id": "error1",
-                "vnf_scaleAspectId": "mpu",
-                "numberOfSteps": "1"
-            },
-            {
-                "vnfd_id": "nf_zte_hss",
-                "vnf_scaleAspectId": "mpu",
-                "numberOfSteps": "1"
-            }
-        ]
-        result = set_scacle_vnf_instance_id(vnf_scale_info_list)
-        self.assertEqual(1, result.__len__())
-        self.assertEqual(
-            result[0]["numberOfSteps"],
-            vnf_scale_info_list[0]["numberOfSteps"])
-        self.assertEqual(
-            result[0]["vnf_scaleAspectId"],
-            vnf_scale_info_list[0]["vnf_scaleAspectId"])
-        self.assertEqual("232", result[0]["vnfInstanceId"])
-        self.assertNotIn("vnfd_id", result[0])
-
-    def test_set_scacle_vnf_instance_id_3(self):
-        vnf_scale_info_list = [
-            {
-                "vnfd_id": "error1",
-                "vnf_scaleAspectId": "mpu",
-                "numberOfSteps": "1"
-            },
-            {
-                "vnfd_id": "error2",
-                "vnf_scaleAspectId": "gsu",
-                "numberOfSteps": "1"
-            }
-        ]
-        result = set_scacle_vnf_instance_id(vnf_scale_info_list)
-        self.assertEqual(0, result.__len__())
-
-    def test_set_scacle_vnf_instance_id_4(self):
-        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_set_scaleVnfData_type(self):
-        vnf_scale_list = set_scacle_vnf_instance_id(self.vnf_scale_info_list)
-        result = set_scaleVnfData_type(vnf_scale_list, self.ns_scale_direction)
-        self.assertEqual(2, result.__len__())
-        self.assertNotIn("scaleByStepData", result)
-        self.assertEqual(
-            self.ns_scale_direction,
-            result[0]["scaleByStepData"]["type"])
-        self.assertEqual("mpu", result[0]["scaleByStepData"]["aspectId"])
-        self.assertNotIn("vnf_scaleAspectId", result[0]["scaleByStepData"])
-        self.assertEqual("1", result[0]["scaleByStepData"]["numberOfSteps"])
-        self.assertEqual(
-            self.ns_scale_direction,
-            result[1]["scaleByStepData"]["type"])
-        self.assertEqual("gsu", result[1]["scaleByStepData"]["aspectId"])
-        self.assertNotIn("vnf_scaleAspectId", result[1]["scaleByStepData"])
-        self.assertEqual("2", result[1]["scaleByStepData"]["numberOfSteps"])
-
-    def test_get_nsdId(self):
-        nsd_id = get_nsdId("1")
-        self.assertEqual("23", nsd_id)
-
-    @mock.patch.object(catalog, 'get_scalingmap_json_package')
-    def test_get_scale_vnf_data_info_list(
-            self, mock_get_scalingmap_json_package):
-        mock_get_scalingmap_json_package.return_value = self.scaling_map_json
-
-        scale_vnf_data = get_scale_vnf_data_info_list(self.scaleNsData, "1")
-        self.assertIsNotNone(scale_vnf_data)
-        self.assertEqual(2, scale_vnf_data.__len__())
-
-    @mock.patch.object(catalog, 'get_scalingmap_json_package')
-    def test_get_scale_vnf_data_info_list_2(
-            self, mock_get_scalingmap_json_package):
-        mock_get_scalingmap_json_package.return_value = self.scaling_map_json
-
-        scale_vnf_data = None
-        is_exception_caught = False
-        try:
-            scale_vnf_data = get_scale_vnf_data_info_list(
-                self.scaleNsData2, "1")
-        except Exception:
-            is_exception_caught = True
-        self.assertTrue(is_exception_caught)
-        self.assertIsNone(scale_vnf_data)
-
-    @mock.patch.object(catalog, 'get_scalingmap_json_package')
-    def test_get_scale_vnf_data_info_list_3(
-            self, mock_get_scalingmap_json_package):
-        mock_get_scalingmap_json_package.return_value = self.scaling_map_json
-        self.add_new_vnf_instance()
-
-        scale_vnf_data = None
-        is_exception_caught = False
-        try:
-            scale_vnf_data = get_scale_vnf_data_info_list(
-                self.scaleNsData2, "1")
-        except Exception:
-            is_exception_caught = True
-        self.assertFalse(is_exception_caught)
-        self.assertEqual(2, scale_vnf_data.__len__())
-    '''