Update ns_vnfs,ns_vls to vnfs,vls

Change-Id: Ib29844ddf718df41b478d85d590434ca0fc31e09
Issue-ID: VFC-1041
Signed-off-by: fujinhua <fu.jinhua@zte.com.cn>

diff --git a/lcm/ns/tests/test_ns_instant.py b/lcm/ns/tests/test_ns_instant.py
index 48f505d..38c2875 100644 (file)
--- a/lcm/ns/tests/test_ns_instant.py
+++ b/lcm/ns/tests/test_ns_instant.py
@@ -63,7 +63,7 @@ class TestNsInstant(TestCase):
         }
         self.nsd_model = nsd_model
         self.updated_nsd_model = {
-            "ns_vnfs": [{
+            "vnfs": [{
                 "dependencies": [{
                     "vl_id": "5"
                 }],
@@ -73,7 +73,7 @@ class TestNsInstant(TestCase):
                     "id": "vnfd1"
                 }
             }],
-            "ns_vls": [{
+            "vls": [{
                 "vl_id": "5",
                 "properties": {
                     "location_info": {

diff --git a/lcm/ns_sfcs/biz/create_portpairgp.py b/lcm/ns_sfcs/biz/create_portpairgp.py
index 532deb6..0157b0a 100644 (file)
--- a/lcm/ns_sfcs/biz/create_portpairgp.py
+++ b/lcm/ns_sfcs/biz/create_portpairgp.py
@@ -261,7 +261,7 @@ class CreatePortPairGroup(object):
                 return cp_model_info
 
     def get_vnf_model_info_by_vnf_id(self, vnfid):
-        for vnf_model_info in self.ns_model_data["ns_vnfs"]:
+        for vnf_model_info in self.ns_model_data["vnfs"]:
             if (vnf_model_info["vnf_id"] == vnfid):
                 return vnf_model_info
 

diff --git a/lcm/ns_sfcs/tests/test_data.py b/lcm/ns_sfcs/tests/test_data.py
index 246b570..72f0b43 100644 (file)
--- a/lcm/ns_sfcs/tests/test_data.py
+++ b/lcm/ns_sfcs/tests/test_data.py
@@ -26,7 +26,7 @@ nsd_model = {
         "param2": "22",
     },
 
-    "ns_vnfs": [
+    "vnfs": [
         {
             "type": "tosca.nodes.nfv.ext.VNF.FireWall",
             "vnf_id": "vnf_1",
@@ -129,7 +129,7 @@ nsd_model = {
         }
     ],
 
-    "ns_vls": [
+    "vls": [
         {
             "vl_id": "vldId1",
             "description": "",
@@ -520,7 +520,7 @@ vnfd_model_dict1 = {
             'dependencies': [
 
             ],
-            'ns_vls': [
+            'vls': [
 
             ],
             'cps': [
@@ -571,7 +571,7 @@ vnfd_model_dict1 = {
             'dependencies': [
 
             ],
-            'ns_vls': [
+            'vls': [
 
             ],
             'cps': [
@@ -622,7 +622,7 @@ vnfd_model_dict1 = {
             'dependencies': [
 
             ],
-            'ns_vls': [
+            'vls': [
 
             ],
             'cps': [
@@ -673,7 +673,7 @@ vnfd_model_dict1 = {
             'dependencies': [
 
             ],
-            'ns_vls': [
+            'vls': [
 
             ],
             'cps': [
@@ -724,7 +724,7 @@ vnfd_model_dict1 = {
             'dependencies': [
 
             ],
-            'ns_vls': [
+            'vls': [
 
             ],
             'cps': [
@@ -775,7 +775,7 @@ vnfd_model_dict1 = {
             'dependencies': [
 
             ],
-            'ns_vls': [
+            'vls': [
 
             ],
             'cps': [
@@ -826,7 +826,7 @@ vnfd_model_dict1 = {
             'dependencies': [
 
             ],
-            'ns_vls': [
+            'vls': [
 
             ],
             'cps': [
@@ -905,7 +905,7 @@ vnfd_model_dict1 = {
             'image_file_id': u'sss'
         }
     ],
-    'ns_vls': [
+    'vls': [
 
     ],
     'cps': [
@@ -974,7 +974,7 @@ vnfd_model_dict2 = {
             'dependencies': [
 
             ],
-            'ns_vls': [
+            'vls': [
 
             ],
             'cps': [
@@ -1025,7 +1025,7 @@ vnfd_model_dict2 = {
             'dependencies': [
 
             ],
-            'ns_vls': [
+            'vls': [
 
             ],
             'cps': [
@@ -1076,7 +1076,7 @@ vnfd_model_dict2 = {
             'dependencies': [
 
             ],
-            'ns_vls': [
+            'vls': [
 
             ],
             'cps': [
@@ -1127,7 +1127,7 @@ vnfd_model_dict2 = {
             'dependencies': [
 
             ],
-            'ns_vls': [
+            'vls': [
 
             ],
             'cps': [
@@ -1178,7 +1178,7 @@ vnfd_model_dict2 = {
             'dependencies': [
 
             ],
-            'ns_vls': [
+            'vls': [
 
             ],
             'cps': [
@@ -1229,7 +1229,7 @@ vnfd_model_dict2 = {
             'dependencies': [
 
             ],
-            'ns_vls': [
+            'vls': [
 
             ],
             'cps': [
@@ -1280,7 +1280,7 @@ vnfd_model_dict2 = {
             'dependencies': [
 
             ],
-            'ns_vls': [
+            'vls': [
 
             ],
             'cps': [
@@ -1359,7 +1359,7 @@ vnfd_model_dict2 = {
             'image_file_id': u'sss'
         }
     ],
-    'ns_vls': [
+    'vls': [
 
     ],
     'cps': [

diff --git a/lcm/ns_sfcs/tests/test_sfc.py b/lcm/ns_sfcs/tests/test_sfc.py
index d4c35a5..ccc080c 100644 (file)
--- a/lcm/ns_sfcs/tests/test_sfc.py
+++ b/lcm/ns_sfcs/tests/test_sfc.py
@@ -1166,7 +1166,7 @@ nsd_model = {
         "param2": "22",
     },
 
-    "ns_vnfs": [
+    "vnfs": [
         {
             "type": "tosca.nodes.nfv.ext.VNF.FireWall",
             "vnf_id": "vnf_1",

diff --git a/lcm/ns_vls/tests/tests.py b/lcm/ns_vls/tests/tests.py
index ef670a3..0e07fdc 100644 (file)
--- a/lcm/ns_vls/tests/tests.py
+++ b/lcm/ns_vls/tests/tests.py
@@ -39,8 +39,8 @@ class TestVlViews(TestCase):
                       "end_ip": "190.168.100.100", "gateway_ip": "190.168.100.1", "start_ip": "190.168.100.2",
                       "cidr": "190.168.100.0/24", "mtu": 1500, "network_name": "sub_mnet", "ip_version": 4}
         self.context = {
-            "ns_vls": [{"vl_id": self.vl_id_1, "description": "", "properties": properties, "route_external": False},
-                       {"vl_id": self.vl_id_2, "description": "", "properties": properties, "route_external": False}],
+            "vls": [{"vl_id": self.vl_id_1, "description": "", "properties": properties, "route_external": False},
+                    {"vl_id": self.vl_id_2, "description": "", "properties": properties, "route_external": False}],
             "vnffgs": [{"vnffg_id": self.vnffg_id, "description": "",
                         "properties": {"vendor": "zte", "version": "1.1.2", "number_of_endpoints": 7,
                                        "dependent_virtual_link": [self.vl_id_2, self.vl_id_1],

diff --git a/lcm/ns_vnfs/tests/vnf_tests.py b/lcm/ns_vnfs/tests/vnf_tests.py
index 1e4fda6..4c08894 100644 (file)
--- a/lcm/ns_vnfs/tests/vnf_tests.py
+++ b/lcm/ns_vnfs/tests/vnf_tests.py
@@ -110,7 +110,7 @@ class VnfGrantViewTest(unittest.TestCase):
                 "external_cps": [],
                 "forward_cps": []
             },
-            "ns_vls": [],
+            "vls": [],
             "cps": [],
             "metadata": {
                 "designer": "sdno",