Align SOL003 data for vnflcm

Change-Id: I4abe0ad302d40b297f40005d4c73b82ea6c1678c
Issue-ID: VFC-1085
Signed-off-by: Huang Haibin <haibin.huang@intel.com>

diff --git a/lcm/lcm/nf/biz/instantiate_vnf.py b/lcm/lcm/nf/biz/instantiate_vnf.py
index 606dbab..364eaff 100644 (file)
--- a/lcm/lcm/nf/biz/instantiate_vnf.py
+++ b/lcm/lcm/nf/biz/instantiate_vnf.py
@@ -163,7 +163,6 @@ class InstantiateVnf(Thread):
     def set_location(self, apply_result):
         vim_connections = ignore_case_get(apply_result, "vimConnections")
         vnfid = ignore_case_get(apply_result, "vnfInstanceId")
-        directive = ignore_case_get(apply_result, "directive")
         vim_assets = ignore_case_get(apply_result, "vimAssets")
         access_info = ignore_case_get(vim_connections[0], "accessInfo")
         tenant = ignore_case_get(access_info, "tenant")
@@ -171,10 +170,13 @@ class InstantiateVnf(Thread):
         cloud_owner, cloud_regionid = vimid.split("_")
         vdu_info = []
 
-        for flavor in ignore_case_get(vim_assets, "vimComputeResourceFlavour"):
+        for flavor in ignore_case_get(vim_assets, "computeResourceFlavours"):
+            oof_vimid = flavor["vimConnectionId"]
+            if oof_vimid and oof_vimid != "none":
+                vimid = oof_vimid
             vdu_info.append({"vduName": flavor["resourceProviderId"],
                              "flavorName": flavor["vimFlavourId"],
-                             "directive": directive})
+                             "vimid": vimid})
 
         for resource_type in ['vdus', 'vls']:
             for resource in ignore_case_get(self.vnfd_info, resource_type):

diff --git a/lcm/lcm/nf/tests/test_instantiate_vnf.py b/lcm/lcm/nf/tests/test_instantiate_vnf.py
index 4784fa2..b54a135 100644 (file)
--- a/lcm/lcm/nf/tests/test_instantiate_vnf.py
+++ b/lcm/lcm/nf/tests/test_instantiate_vnf.py
@@ -48,11 +48,11 @@ class TestNFInstantiate(TestCase):
             "vnfId": "413aa1fe-b4d1-11e8-8268-dff5aab95c63",\r
             "vimAssets":\r
             {\r
-                "vimComputeResourceFlavour": [\r
+                "computeResourceFlavours": [\r
                     {\r
                         "resourceProviderId": "vgw",\r
                         "vimFlavourId": "yui",\r
-                        "directive": ""\r
+                        "vimConnectionId": ""\r
                     },\r
                 ]\r
             }\r