Merge "Add vnf Grant swagger generate logic"

diff --git a/lcm/pub/tests/test_scaleaspect.py b/lcm/pub/tests/test_scaleaspect.py
index 35fda1d..01571f1 100644 (file)
--- a/lcm/pub/tests/test_scaleaspect.py
+++ b/lcm/pub/tests/test_scaleaspect.py
@@ -1,11 +1,16 @@
 from django.test import TestCase
+from lcm.pub.utils.scaleaspect import get_scale_vnf_data_package
 from lcm.pub.utils.scaleaspect import get_vnf_scale_info_package
 from lcm.pub.utils.scaleaspect import get_vnf_data_package
 from lcm.pub.utils.scaleaspect import get_json_data
+from lcm.pub.utils.scaleaspect import get_nsdId
+from lcm.pub.utils.scaleaspect import deal_vnf_scale_info
 from lcm.pub.database.models import NfInstModel
 from lcm.pub.database.models import NSInstModel
+from lcm.pub.msapi import catalog
 from lcm.pub.utils.timeutil import now_time
 import os
+import mock
 
 
 class TestScaleAspect(TestCase):
@@ -20,6 +25,12 @@ class TestScaleAspect(TestCase):
 
         self.initInstModel()
 
+        self.scaleNsData = {
+            "aspectId": "TIC_EDGE_IMS",
+            "numberOfSteps": "1",
+            "scalingDirection": "UP"
+        }
+
     def initInstModel(self):
         self.nsd_id = "23"
         self.ns_inst_id = "1"
@@ -107,3 +118,39 @@ class TestScaleAspect(TestCase):
             self.scaling_map_json, "23", "TIC_EDGE_IMS", "1")
         self.assertIsNotNone(scale_vnf_info_list)
         self.assertEqual(2, scale_vnf_info_list.__len__())
+
+    @mock.patch.object(catalog, 'get_scalingmap_json_package')
+    def test_get_scale_vnf_data_package(
+            self, mock_get_scalingmap_json_package):
+        mock_get_scalingmap_json_package.return_value = self.scaling_map_json
+
+        scale_vnf_data = get_scale_vnf_data_package(self.scaleNsData, "1")
+        self.assertIsNotNone(scale_vnf_data)
+        self.assertEqual(2, scale_vnf_data.__len__())
+
+    def test_deal_vnf_scale_info(self):
+        vnf_scale_info_list = [
+            {
+                "vnfd_id": "nf_zte_cscf",
+                "vnf_scaleAspectId": "mpu",
+                "numberOfSteps": "1"
+            },
+            {
+                "vnfd_id": "nf_zte_hss",
+                "vnf_scaleAspectId": "mpu",
+                "numberOfSteps": "1"
+            }
+        ]
+        result = deal_vnf_scale_info(vnf_scale_info_list)
+        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(result[1]["numberOfSteps"], vnf_scale_info_list[0]["numberOfSteps"])
+        self.assertEqual(result[1]["vnf_scaleAspectId"], vnf_scale_info_list[0]["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_get_nsdId(self):
+        nsd_id = get_nsdId("1")
+        self.assertEqual("23", nsd_id)