Merge "move instantiate NS test json from code to indepandent file"

7 files changed, 262 insertions, 168 deletions

diff --git a/lcm/ns/tests/data/instantiate_ns.json b/lcm/ns/tests/data/instantiate_ns.json
new file mode 100644
index 00000000..b30078c4
--- /dev/null
+++ b/lcm/ns/tests/data/instantiate_ns.json
@@ -0,0 +1,17 @@
+{
+    "additionalParamForNs": {
+        "sdnControllerId": "2"
+    },
+    "nsFlavourId": 12345,
+    "localizationLanguage": [{
+        "vnfProfileId": "vnfd1",
+        "locationConstraints": {
+            "countryCode": "countryCode",
+            "civicAddressElement": [
+                        {"caType": "type1",
+                         "caValue": 1
+                         }
+            ]
+        }
+    }]
+}
diff --git a/lcm/ns/tests/data/job.json b/lcm/ns/tests/data/job.json
new file mode 100644
index 00000000..35f5db9a
--- /dev/null
+++ b/lcm/ns/tests/data/job.json
@@ -0,0 +1,6 @@
+{
+    "jobId": "1",
+    "responseDescriptor": {
+        "progress": 100
+    }
+}
diff --git a/lcm/ns/tests/data/nsd_model.json b/lcm/ns/tests/data/nsd_model.json
new file mode 100644
index 00000000..a206f09e
--- /dev/null
+++ b/lcm/ns/tests/data/nsd_model.json
@@ -0,0 +1,16 @@
+{
+    "vnfs": [{
+        "vnf_id": "vnf1",
+        "properties": {
+            "id": "vnfd1",
+            "nf_type": "xgw"
+        },
+        "dependencies": [{
+            "vl_id": "5"
+        }]
+    }],
+    "vls": [{
+            "vl_id": "5",
+            "properties": {}
+            }]
+}
diff --git a/lcm/ns/tests/data/nsd_model_with_pnf.json b/lcm/ns/tests/data/nsd_model_with_pnf.json
new file mode 100644
index 00000000..13063afa
--- /dev/null
+++ b/lcm/ns/tests/data/nsd_model_with_pnf.json
@@ -0,0 +1,168 @@
+{
+    "vnffgs": [],
+    "inputs": {},
+    "pnfs": [
+        {
+            "pnf_id": "du",
+            "networks": [
+            ],
+            "description":"",
+            "properties":{
+                "descriptor_id": "zte_ran_du_0001",
+                "descriptor_invariant_id": "1111",
+                "provider": "ZTE",
+                "version": "1.0",
+                "function_description": "RAN DU Function",
+                "name": "ZTE RAN DU"
+            }
+        }
+    ],
+    "ns_exposed": {
+        "external_cps": [],
+        "forward_cps": []
+    },
+    "graph": {
+        "cucp": [],
+        "du": [],
+        "vl_flat_net": [
+            "cucp",
+            "cuup"
+        ],
+        "vl_ext_net": [
+            "cucp",
+            "cuup"
+        ],
+        "cuup": []
+    },
+    "vnfs": [
+        {
+            "networks": [
+                {
+                    "key_name": "ran_ext_net",
+                    "vl_id": "vl_ext_net"
+                },
+                {
+                    "key_name": "ran_flat_net",
+                    "vl_id": "vl_flat_net"
+                }
+            ],
+            "dependencies": [
+                {
+                    "key_name": "ran_ext_net",
+                    "vl_id": "vl_ext_net"
+                },
+                {
+                    "key_name": "ran_flat_net",
+                    "vl_id": "vl_flat_net"
+                }
+            ],
+            "vnf_id": "cucp",
+            "description": "",
+            "properties": {
+                "descriptor_id": "zte_ran_cucp_0001",
+                "flavour_description": "default",
+                "software_version": "1.0.1",
+                "flavour_id": "1",
+                "descriptor_version": "1.0",
+                "provider": "ZTE",
+                "id": "zte_ran_cucp_0001",
+                "vnfm_info": [
+                    "GVNFM-Driver"
+                ],
+                "product_name":"ran"
+            }
+        },
+        {
+            "networks": [
+                {
+                    "key_name": "ran_ext_net",
+                    "vl_id": "vl_ext_net"
+                },
+                {
+                    "key_name": "ran_flat_net",
+                    "vl_id": "vl_flat_net"
+                }
+            ],
+            "dependencies": [
+                {
+                    "key_name": "ran_ext_net",
+                    "vl_id": "vl_ext_net"
+                },
+                {
+                    "key_name": "ran_flat_net",
+                    "vl_id": "vl_flat_net"
+                }
+            ],
+            "vnf_id": "cuup",
+            "description": "",
+            "properties": {
+                "descriptor_id": "zte_ran_cuup_0001",
+                "flavour_description": "default",
+                "software_version": "1.0.1",
+                "flavour_id": "1",
+                "descriptor_version": "1.0",
+                "provider": "ZTE",
+                "id": "zte_ran_cuup_0001",
+                "vnfm_info": [
+                    "GVNFM-Driver"
+                ],
+                "product_name":"ran"
+            }
+        }
+    ],
+    "fps": [],
+    "vls": [
+        {
+            "vl_id": "vl_ext_net",
+            "description": "",
+            "properties": {
+                "connectivity_type": {
+                    "layer_protocol": "ipv4"
+                },
+                "vl_profile": {
+                    "cidr": "10.0.0.0/24",
+                    "max_bit_rate_requirements": {
+                        "root": 10000000,
+                        "leaf": 10000000
+                    },
+                    "networkName": "ran_ext_net",
+                    "min_bit_rate_requirements": {
+                        "root": 10000000,
+                        "leaf": 10000000
+                    },
+                    "dhcpEnabled": false
+                },
+                "version": "1.0.1"
+            }
+        },
+        {
+            "vl_id": "vl_flat_net",
+            "description": "",
+            "properties": {
+                "connectivity_type": {
+                    "layer_protocol": "ipv4"
+                },
+                "vl_profile": {
+                    "cidr": "10.1.0.0/24",
+                    "max_bit_rate_requirements": {
+                        "root": 10000000,
+                        "leaf": 10000000
+                    },
+                    "networkName": "ran_flat_net",
+                    "min_bit_rate_requirements": {
+                        "root": 10000000,
+                        "leaf": 10000000
+                    },
+                    "dhcpEnabled": false
+                },
+                "version": "1.0.1"
+            }
+        }
+    ],
+    "nested_ns": [],
+    "metadata": {
+        "template_name": "RAN-NS",
+        "template_version": "1.0",
+        "template_author": "ZTE"
+    }
+}
diff --git a/lcm/ns/tests/data/vnfm_in_aai.json b/lcm/ns/tests/data/vnfm_in_aai.json
new file mode 100644
index 00000000..6e136416
--- /dev/null
+++ b/lcm/ns/tests/data/vnfm_in_aai.json
@@ -0,0 +1,16 @@
+{
+    "type": "xgw",
+    "vim-id": "3",
+    "vnfm-id": "4",
+    "certificate-url": "http://127.0.0.0/ztevnfm/v1/auth",
+    "esr-system-info-list": {
+        "esr-system-info": [{
+            "type": "xgw",
+                    "vendor": "zte",
+                    "version": "1.0",
+                    "service-url": "http://127.0.0.0/ztevnfm/v1",
+                    "user-name": "admin",
+                    "password": "admin123"
+        }]
+    }
+}
diff --git a/lcm/ns/tests/data/vnfms_list_in_aai.json b/lcm/ns/tests/data/vnfms_list_in_aai.json
new file mode 100644
index 00000000..bf0aaa43
--- /dev/null
+++ b/lcm/ns/tests/data/vnfms_list_in_aai.json
@@ -0,0 +1,5 @@
+{
+    "esr-vnfm": [{
+        "vnfm-id": "4"
+    }]
+}
diff --git a/lcm/ns/tests/test_ns_instant.py b/lcm/ns/tests/test_ns_instant.py
index e5ad9cab..62eab8ae 100644
--- a/lcm/ns/tests/test_ns_instant.py
+++ b/lcm/ns/tests/test_ns_instant.py
@@ -14,6 +14,7 @@
 
 import json
 import mock
+import os
 from mock import MagicMock
 from django.test import TestCase
 from rest_framework import status
@@ -21,228 +22,93 @@ from rest_framework.test import APIClient
 from lcm.ns.biz.ns_instant import BuildInWorkflowThread
 from lcm.ns.biz.ns_instant import InstantNSService
 from lcm.pub.database.models import NSInstModel
-from lcm.pub.utils import restcall
+from lcm.pub.utils import restcall, fileutil
 from lcm.pub.config import config
 
-nsd_model = json.dumps({
-    "model": json.dumps({
-        "vnfs": [{
-            "vnf_id": "vnf1",
-            "properties": {
-                "id": "vnfd1",
-                "nf_type": "xgw"
-            },
-            "dependencies": [{
-                "vl_id": "5"
-            }]
-        }],
-        "vls": [{
-            "vl_id": "5",
-            "properties": {}
-        }]
-    })
-})
-
 
 class TestNsInstant(TestCase):
 
+    cur_path = os.path.dirname(os.path.abspath(__file__))
+    nsd_model = fileutil.read_json_file(cur_path + '/data/nsd_model.json')
+    nsd_model_json = json.dumps({"model": json.dumps(nsd_model)})
+    nsd_model_with_pnf_json = json.dumps(fileutil.read_json_file(cur_path + '/data/nsd_model_with_pnf.json'))
+    vnfm_list_in_aai = fileutil.read_json_file(cur_path + '/data/vnfm_list_in_aai.json')
+    vnfm_in_aai = fileutil.read_json_file(cur_path + '/data/vnfm_in_aai.json')
+    job = fileutil.read_json_file(cur_path + '/data/job.json')
+    instantiate_ns_with_pnf = fileutil.read_json_file(cur_path + '/data/instantiate_ns_with_pnf.json')
+    instantiate_ns_json = fileutil.read_json_file(cur_path + '/data/instantiate_ns.json')
+    vnfminfo = {"vnfmId": "1"}
+
     def setUp(self):
         self.client = APIClient()
         NSInstModel.objects.filter().delete()
-        self.url = "/api/nslcm/v1/ns/2/instantiate"
-        self.req_data = {
-            "additionalParamForNs": {
-                "sdnControllerId": "2"
-            },
-            "nsFlavourId": 12345,
-            "localizationLanguage": [{
-                "vnfProfileId": "vnfd1",
-                "locationConstraints": {
-                    "countryCode": "countryCode",
-                    # "vimId": "3",
-                    "civicAddressElement": [
-                        {"caType": "type1",
-                         "caValue": 1
-                         }
-                    ]
-                }
-            }]
-        }
-        self.nsd_model = nsd_model
-        self.updated_nsd_model = {
-            "vnfs": [{
-                "dependencies": [{
-                    "vl_id": "5"
-                }],
-                "vnf_id": "vnf1",
-                "properties": {
-                    "nf_type": "xgw",
-                    "id": "vnfd1"
-                }
-            }],
-            "vls": [{
-                "vl_id": "5",
-                "properties": {
-                    "location_info": {
-                        "vimid": "3"
-                    }
-                }
-            }]
-        }
-        self.vnfms = json.dumps({
-            "esr-vnfm": [{
-                "vnfm-id": "4"
-            }]
-        })
-        self.vnfm = json.dumps({
-            "type": "xgw",
-            "vim-id": "3",
-            "vnfm-id": "4",
-            "certificate-url": "http://127.0.0.0/ztevnfm/v1/auth",
-            "esr-system-info-list": {
-                "esr-system-info": [{
-                    "type": "xgw",
-                    "vendor": "zte",
-                    "version": "1.0",
-                    "service-url": "http://127.0.0.0/ztevnfm/v1",
-                    "user-name": "admin",
-                    "password": "admin123"
-                }]
-            }
-        })
+        self.url = "/api/nslcm/v1/ns/%s/instantiate" % "2"
         NSInstModel(id="2", nspackage_id="7", nsd_id="2", status="active").save()
 
     def tearDown(self):
         pass
 
     @mock.patch.object(restcall, 'call_req')
-    @mock.patch('lcm.pub.msapi.sdc_run_catalog.parse_nsd', MagicMock(return_value=nsd_model))
+    @mock.patch('lcm.pub.msapi.sdc_run_catalog.parse_nsd', MagicMock(return_value=nsd_model_json))
     @mock.patch.object(BuildInWorkflowThread, 'run')
     def test_ns_instantiate_when_succeed_to_enter_workflow(self, mock_run, mock_call_req):
         config.WORKFLOW_OPTION = "buildin"
         mock_call_req.side_effect = [
-            [0, self.nsd_model, '200'],
-            [0, self.vnfms, '200'],
-            [0, self.vnfm, '200']
+            [0, TestNsInstant.nsd_model_json, '200'],
+            [0, TestNsInstant.vnfm_list_in_aai, '200'],
+            [0, TestNsInstant.vnfm_in_aai, '200']
         ]
-        resp = self.client.post(self.url, data=self.req_data, format='json')
+        instantiate_ns_json = fileutil.read_json_file(self.cur_path + '/data/instantiate_ns.json')
+        resp = self.client.post(self.url, data=instantiate_ns_json, format='json')
         self.assertEqual(status.HTTP_200_OK, resp.status_code)
         self.assertIn("jobId", resp.data)
 
     @mock.patch.object(InstantNSService, 'do_biz')
     def test_ns_instantiate_normal(self, mock_do_biz):
-        mock_do_biz.return_value = dict(data={'jobId': "1"}, status=status.HTTP_200_OK)
-        resp = self.client.post(self.url, data=self.req_data, format='json')
+        mock_do_biz.return_value = dict(data=TestNsInstant.job, status=status.HTTP_200_OK)
+        instantiate_ns_json = fileutil.read_json_file(self.cur_path + '/data/instantiate_ns.json')
+        resp = self.client.post(self.url, data=instantiate_ns_json, format='json')
         self.failUnlessEqual(status.HTTP_200_OK, resp.status_code)
-        self.assertEqual({'jobId': "1"}, resp.data)
+        self.assertEqual(TestNsInstant.job, resp.data)
 
     @mock.patch.object(restcall, 'call_req')
     def test_ns_instantiate_when_fail_to_parse_nsd(self, mock_call_req):
         mock_call_req.return_value = [1, "Failed to parse nsd", '500']
-        resp = self.client.post(self.url, data=self.req_data, format='json')
+        resp = self.client.post(self.url, data=TestNsInstant.instantiate_ns_json, format='json')
         self.assertEqual(resp.status_code, status.HTTP_500_INTERNAL_SERVER_ERROR)
         self.assertIn("error", resp.data)
 
-    nsd = json.dumps({"vnffgs": [], "inputs": {}, "pnfs": [{"pnf_id": "du", "networks": [], "description": "", "properties": {"descriptor_id": "zte_ran_du_0001", "descriptor_invariant_id": "1111", "provider": "ZTE", "version": "1.0", "function_description": "RAN DU Function", "name": "ZTE RAN DU"}}], "ns_exposed": {"external_cps": [], "forward_cps": []}, "graph": {"cucp": [], "du": [], "vl_flat_net": ["cucp", "cuup"], "vl_ext_net": ["cucp", "cuup"], "cuup": []}, "basepath": "c:\\users\\10030173\\appdata\\local\\temp\\tmpvg5vto", "vnfs": [{"networks": [{"key_name": "ran_ext_net", "vl_id": "vl_ext_net"}, {"key_name": "ran_flat_net", "vl_id": "vl_flat_net"}], "dependencies": [{"key_name": "ran_ext_net", "vl_id": "vl_ext_net"}, {"key_name": "ran_flat_net", "vl_id": "vl_flat_net"}], "vnf_id": "cucp", "description": "", "properties": {"descriptor_id": "zte_ran_cucp_0001", "flavour_description": "default", "software_version": "1.0.1", "flavour_id": "1", "descriptor_version": "1.0", "provider": "ZTE", "id": "zte_ran_cucp_0001", "vnfm_info": ["GVNFM-Driver"], "product_name": "ran"}}, {"networks": [{"key_name": "ran_ext_net", "vl_id": "vl_ext_net"}, {"key_name": "ran_flat_net", "vl_id": "vl_flat_net"}], "dependencies": [{"key_name": "ran_ext_net", "vl_id": "vl_ext_net"}, {"key_name": "ran_flat_net", "vl_id": "vl_flat_net"}], "vnf_id": "cuup", "description": "", "properties": {"descriptor_id": "zte_ran_cuup_0001", "flavour_description": "default", "software_version": "1.0.1", "flavour_id": "1", "descriptor_version": "1.0", "provider": "ZTE", "id": "zte_ran_cuup_0001", "vnfm_info": ["GVNFM-Driver"], "product_name": "ran"}}], "fps": [], "vls": [{"vl_id": "vl_ext_net", "description": "", "properties": {"connectivity_type": {"layer_protocol": "ipv4"}, "vl_profile": {"cidr": "10.0.0.0/24", "max_bit_rate_requirements": {"root": 10000000, "leaf": 10000000}, "networkName": "ran_ext_net", "min_bit_rate_requirements": {"root": 10000000, "leaf": 10000000}, "dhcpEnabled": False}, "version": "1.0.1"}}, {"vl_id": "vl_flat_net", "description": "", "properties": {"connectivity_type": {"layer_protocol": "ipv4"}, "vl_profile": {"cidr": "10.1.0.0/24", "max_bit_rate_requirements": {"root": 10000000, "leaf": 10000000}, "networkName": "ran_flat_net", "min_bit_rate_requirements": {"root": 10000000, "leaf": 10000000}, "dhcpEnabled": False}, "version": "1.0.1"}}], "nested_ns": [], "metadata": {"template_name": "RAN-NS", "template_version": "1.0", "template_author": "ZTE"}})
-    vnfminfo = {"vnfmId": "1"}
-
     @mock.patch('lcm.ns.biz.ns_instantiate_flow.post_deal')
     @mock.patch.object(restcall, 'call_req')
     @mock.patch('lcm.ns.biz.ns_instantiate_flow.update_job')
-    @mock.patch('lcm.pub.msapi.sdc_run_catalog.parse_nsd', MagicMock(return_value=nsd))
+    @mock.patch('lcm.pub.msapi.sdc_run_catalog.parse_nsd', MagicMock(return_value=nsd_model_with_pnf_json))
     @mock.patch('lcm.pub.msapi.extsys.select_vnfm', MagicMock(return_value=vnfminfo))
     def test_ns_instantiate_with_pnf(self, mock_updata_job, mock_call_req, mock_post_deal):
         config.WORKFLOW_OPTION = "grapflow"
         NSInstModel(id="1", name="test_ns", nspackage_id="1", status="created").save()
-        ret = [0, json.JSONEncoder().encode({'jobId': "1", "responseDescriptor": {"progress": 100}}), '200']
+        ret = [0, json.JSONEncoder().encode(TestNsInstant.job), '200']
         mock_call_req.side_effect = [ret for i in range(1, 20)]
-        data = {
-            "additionalParamForNs": {
-                "sdnControllerId": "2",
-                "location": "CPE-DC_Region"
-            },
-            "locationConstraints": [{
-                "vnfProfileId": "zte_ran_cucp_0001",
-                "locationConstraints": {}
-            },
-                {
-                    "vnfProfileId": "zte_ran_cuup_0001",
-                    "locationConstraints": {}
-            }
-            ],
-            "addpnfData": [{
-                "pnfId": 1,
-                "pnfName": "test_pnf",
-                "pnfdId": "zte_ran_du_0001",
-                "pnfProfileId": "du"
-            }]
-        }
-        # response = self.client.post("/api/nslcm/v1/ns/1/instantiate", data=data, format='json')
-        ack = InstantNSService(1, data).do_biz()
+        ack = InstantNSService(1, TestNsInstant.instantiate_ns_with_pnf).do_biz()
         self.assertEqual(ack['status'], status.HTTP_200_OK)
 
     @mock.patch.object(restcall, 'call_req')
-    @mock.patch('lcm.pub.msapi.sdc_run_catalog.parse_nsd', MagicMock(return_value=nsd))
+    @mock.patch('lcm.pub.msapi.sdc_run_catalog.parse_nsd', MagicMock(return_value=nsd_model_with_pnf_json))
     @mock.patch('lcm.pub.msapi.extsys.select_vnfm', MagicMock(return_value=vnfminfo))
     def test_ns_instantiate_with_vimid_1(self, mock_call_req):
         config.WORKFLOW_OPTION = "grapflow"
         NSInstModel(id="1", name="test_ns", nspackage_id="1", status="created").save()
-        ret = [0, json.JSONEncoder().encode({'jobId': "1", "responseDescriptor": {"progress": 100}}), '200']
+        ret = [0, json.JSONEncoder().encode(TestNsInstant.job), '200']
         mock_call_req.side_effect = [ret for i in range(1, 20)]
-        data = {
-            "additionalParamForNs": {
-                "sdnControllerId": "2"
-            },
-            "locationConstraints": [{
-                "vnfProfileId": "zte_ran_cucp_0001",
-                "locationConstraints": {
-                    "cloudOwner": "CPE-DC",
-                    "cloudRegionId": "RegionOne"}
-            },
-                {
-                    "vnfProfileId": "zte_ran_cuup_0001",
-                    "locationConstraints": {
-                        "cloudOwner": "CPE-DC",
-                        "cloudRegionId": "RegionOne"}
-            }
-            ],
-            "addpnfData": [{
-                "pnfId": 1,
-                "pnfName": "test_pnf",
-                "pnfdId": "zte_ran_du_0001",
-                "pnfProfileId": "du"
-            }]
-        }
-        ack = InstantNSService(1, data).do_biz()
+        ack = InstantNSService(1, TestNsInstant.instantiate_ns_with_pnf).do_biz()
         self.assertEqual(ack['status'], status.HTTP_200_OK)
 
     @mock.patch.object(restcall, 'call_req')
-    @mock.patch('lcm.pub.msapi.sdc_run_catalog.parse_nsd', MagicMock(return_value=nsd))
+    @mock.patch('lcm.pub.msapi.sdc_run_catalog.parse_nsd', MagicMock(return_value=nsd_model_with_pnf_json))
     @mock.patch('lcm.pub.msapi.extsys.select_vnfm', MagicMock(return_value=vnfminfo))
     def test_ns_instantiate_with_different_vimid_2(self, mock_call_req):
         config.WORKFLOW_OPTION = "grapflow"
         NSInstModel(id="1", name="test_ns", nspackage_id="1", status="created").save()
-        ret = [0, json.JSONEncoder().encode({'jobId': "1", "responseDescriptor": {"progress": 100}}), '200']
+        ret = [0, json.JSONEncoder().encode(TestNsInstant.job), '200']
         mock_call_req.side_effect = [ret for i in range(1, 20)]
-        data = {
-            "additionalParamForNs": {
-                "sdnControllerId": "2"
-            },
-            "locationConstraints": [{
-                "vnfProfileId": "zte_ran_cucp_0001",
-                "locationConstraints": {"vimId": "CPE-DC_RegionOne"}
-            },
-                {
-                    "vnfProfileId": "zte_ran_cuup_0001",
-                    "locationConstraints": {"vimId": "CPE-DC_RegionOne"}
-            }
-            ],
-            "addpnfData": [{
-                "pnfId": 1,
-                "pnfName": "test_pnf",
-                "pnfdId": "zte_ran_du_0001",
-                "pnfProfileId": "du"
-            }]
-        }
-        ack = InstantNSService(1, data).do_biz()
+        ack = InstantNSService(1, TestNsInstant.instantiate_ns_with_pnf).do_biz()
         self.assertEqual(ack['status'], status.HTTP_200_OK)