From c967dd69ee01fe702ffd25ba3f04c15f7af19b2a Mon Sep 17 00:00:00 2001 From: Brian Freeman Date: Tue, 30 Apr 2019 09:47:44 -0500 Subject: Updates for new policy Fix for APPC mount of multiple VM VNFs Issue-ID: POLICY-1685 Change-Id: If8de8ecaa2052044af0512206fe8b326b21f50c4 Signed-off-by: Brian Freeman --- robot/resources/demo_preload.robot | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'robot/resources/demo_preload.robot') diff --git a/robot/resources/demo_preload.robot b/robot/resources/demo_preload.robot index ee09dc5b..74ee63ba 100644 --- a/robot/resources/demo_preload.robot +++ b/robot/resources/demo_preload.robot @@ -176,7 +176,7 @@ APPC Mount Point Instantiate VNF [Arguments] ${service} ${vf_module_label}=NULL Setup Orchestrate VNF ${GLOBAL_AAI_CLOUD_OWNER} SharedNode OwnerType v1 CloudZone - ${vf_module_name} ${service} ${generic_vnfs}= Orchestrate VNF DemoCust ${service} ${service} ${TENANT_NAME} + ${vf_module_name_list} ${service} ${generic_vnfs}= Orchestrate VNF DemoCust ${service} ${service} ${TENANT_NAME} Save For Delete Log to Console Customer Name=${CUSTOMER_NAME} Log to Console VNF Module Name=${vf_module_name} @@ -186,9 +186,11 @@ Instantiate VNF :for ${vf_module} in @{generic_vnfs} \ ${generic_vnf}= Get From Dictionary ${generic_vnfs} ${vf_module} \ ${model_invariant_id}= Set Variable If '${vf_module_label}' in '${vf_module}' ${generic_vnf['model-invariant-id']} ${model_invariant_id} - Log to Console ModelInvariantID=${model_invariant_id} + Log to Console Update old vFWCL Policy for ModelInvariantID=${model_invariant_id} ${status} ${value}= Run Keyword And Ignore Error Update vVFWCL Policy ${model_invariant_id} - ${status} ${value}= Run Keyword And Ignore Error APPC Mount Point ${vf_module_name} + :FOR ${vf_module_name} IN @{vf_module_name_list} + \ Log To Console APPC Mount Point for VNF Module Name=${vf_module_name} + \ ${status} ${value}= Run Keyword And Ignore Error APPC Mount Point ${vf_module_name} Instantiate Demo VNF [Arguments] ${service} ${vf_module_label}=NULL -- cgit 1.2.3-korg