Merge "Add vfc-nslcm log integration config"

[vfc/nfvo/lcm.git] / lcm / pub / tests / test_scaleaspect.py

diff --git a/lcm/pub/tests/test_scaleaspect.py b/lcm/pub/tests/test_scaleaspect.py
index 1f0ba38..38d4ad2 100644 (file)
--- a/lcm/pub/tests/test_scaleaspect.py
+++ b/lcm/pub/tests/test_scaleaspect.py
@@ -18,7 +18,7 @@ from lcm.pub.utils.scaleaspect import get_nsdId
 from lcm.pub.utils.scaleaspect import get_scale_vnf_data_from_json
 from lcm.pub.utils.scaleaspect import get_scale_vnf_data_info_list
 from lcm.pub.utils.scaleaspect import set_scacle_vnf_instance_id
-from lcm.pub.utils.scaleaspect import get_and_check_params
+from lcm.pub.utils.scaleaspect import check_and_set_params
 from lcm.pub.utils.scaleaspect import set_scaleVnfData_type
 from lcm.pub.database.models import NfInstModel
 from lcm.pub.database.models import NSInstModel
@@ -53,19 +53,27 @@ class TestScaleAspect(TestCase):
         self.ns_scale_aspect = "TIC_EDGE_IMS"
         self.ns_scale_steps = "1"
         self.ns_scale_direction = "SCALE_IN"
-        self.scaleNsData = {
-            "aspectId": self.ns_scale_aspect,
-            "numberOfSteps": self.ns_scale_steps,
-            "scalingDirection": self.ns_scale_direction
-        }
+        self.scaleNsData = [{
+            "scaleNsByStepsData": [
+                {
+                    "aspectId": self.ns_scale_aspect,
+                    "numberOfSteps": self.ns_scale_steps,
+                    "scalingDirection": self.ns_scale_direction
+                }
+            ]
+        }]
 
         self.ns_scale_aspect2 = "TIC_EDGE_HW"
         self.ns_scale_steps2 = "4"
-        self.scaleNsData2 = {
-            "aspectId": self.ns_scale_aspect2,
-            "numberOfSteps": self.ns_scale_steps2,
-            "scalingDirection": self.ns_scale_direction
-        }
+        self.scaleNsData2 = [{
+            "scaleNsByStepsData": [
+                {
+                    "aspectId": self.ns_scale_aspect2,
+                    "numberOfSteps": self.ns_scale_steps2,
+                    "scalingDirection": self.ns_scale_direction
+                }
+            ]
+        }]
 
     def init_scaling_map_json(self):
         curdir_path = os.path.dirname(
@@ -229,7 +237,7 @@ class TestScaleAspect(TestCase):
         NfInstModel().clean()
 
     def test_get_and_check_params(self):
-        aspect, numberOfSteps, scale_type = get_and_check_params(
+        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)