Change-Id: I4abe0ad302d40b297f40005d4c73b82ea6c1678c
Issue-ID: VFC-1085
Signed-off-by: Huang Haibin <haibin.huang@intel.com>
def set_location(self, apply_result):
vim_connections = ignore_case_get(apply_result, "vimConnections")
vnfid = ignore_case_get(apply_result, "vnfInstanceId")
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")
vim_assets = ignore_case_get(apply_result, "vimAssets")
access_info = ignore_case_get(vim_connections[0], "accessInfo")
tenant = ignore_case_get(access_info, "tenant")
cloud_owner, cloud_regionid = vimid.split("_")
vdu_info = []
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"],
vdu_info.append({"vduName": flavor["resourceProviderId"],
"flavorName": flavor["vimFlavourId"],
- "directive": directive})
for resource_type in ['vdus', 'vls']:
for resource in ignore_case_get(self.vnfd_info, resource_type):
for resource_type in ['vdus', 'vls']:
for resource in ignore_case_get(self.vnfd_info, resource_type):
"vnfId": "413aa1fe-b4d1-11e8-8268-dff5aab95c63",\r
"vimAssets":\r
{\r
"vnfId": "413aa1fe-b4d1-11e8-8268-dff5aab95c63",\r
"vimAssets":\r
{\r
- "vimComputeResourceFlavour": [\r
+ "computeResourceFlavours": [\r
{\r
"resourceProviderId": "vgw",\r
"vimFlavourId": "yui",\r
{\r
"resourceProviderId": "vgw",\r
"vimFlavourId": "yui",\r
+ "vimConnectionId": ""\r