Split the vim_id in LCM

[vfc/nfvo/lcm.git] / lcm / ns / tests / test_ns_instant.py

diff --git a/lcm/ns/tests/test_ns_instant.py b/lcm/ns/tests/test_ns_instant.py
index 48f505d..9629da2 100644 (file)
--- a/lcm/ns/tests/test_ns_instant.py
+++ b/lcm/ns/tests/test_ns_instant.py
@@ -4,7 +4,7 @@
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#         http://www.apache.org/licenses/LICENSE-2.0
+# http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ -54,16 +54,23 @@ class TestNsInstant(TestCase):
             "additionalParamForNs": {
                 "sdnControllerId": "2"
             },
-            "locationConstraints": [{
+            "nsFlavourId": 12345,
+            "localizationLanguage": [{
                 "vnfProfileId": "vnfd1",
                 "locationConstraints": {
-                    "vimId": "3"
+                    "countryCode": "countryCode",
+                    # "vimId": "3",
+                    "civicAddressElement": [
+                        {"caType": "type1",
+                         "caValue": 1
+                         }
+                    ]
                 }
             }]
         }
         self.nsd_model = nsd_model
         self.updated_nsd_model = {
-            "ns_vnfs": [{
+            "vnfs": [{
                 "dependencies": [{
                     "vl_id": "5"
                 }],
@@ -73,7 +80,7 @@ class TestNsInstant(TestCase):
                     "id": "vnfd1"
                 }
             }],
-            "ns_vls": [{
+            "vls": [{
                 "vl_id": "5",
                 "properties": {
                     "location_info": {
@@ -155,11 +162,11 @@ class TestNsInstant(TestCase):
             },
             "locationConstraints": [{
                 "vnfProfileId": "zte_ran_cucp_0001",
-                "locationConstraints": {"vimId": "3"}
+                "locationConstraints": {"vimId": '{"cloud_owner": "VCPE", "cloud_regionid": "RegionOne"}'}
             },
                 {
                     "vnfProfileId": "zte_ran_cuup_0001",
-                    "locationConstraints": {"vimId": "3"}
+                    "locationConstraints": {"vimId": '{"cloud_owner": "VCPE", "cloud_regionid": "RegionOne"}'}
             }
             ],
             "addpnfData": [{