From: Huang Haibin <haibin.huang@intel.com>
Date: Thu, 1 Nov 2018 06:52:41 +0000 (+0800)
Subject: Align SOL003 data for vnflcm
X-Git-Tag: 1.2.1~17
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=vfc%2Fgvnfm%2Fvnflcm.git;a=commitdiff_plain;h=2e7b4ae13e0f0802a34bfbfc030dd67aef1ee203

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 606dbab0..364eaffc 100644
--- 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 4784fa29..b54a1359 100644
--- 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",
             "vimAssets":
             {
-                "vimComputeResourceFlavour": [
+                "computeResourceFlavours": [
                     {
                         "resourceProviderId": "vgw",
                         "vimFlavourId": "yui",
-                        "directive": ""
+                        "vimConnectionId": ""
                     },
                 ]
             }