From 140ec8a8f12b4800ea12afc180f5d16a1d9db6b5 Mon Sep 17 00:00:00 2001 From: Brian Freeman Date: Tue, 20 Nov 2018 16:07:42 -0500 Subject: Add AAI query for invariant ID back in Issue-ID: INT-601 Change-Id: I457b072fe6cc5dfbf3cbdbdf2a1443b5c4086c23 Signed-off-by: Brian Freeman --- robot/resources/demo_preload.robot | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) (limited to 'robot') diff --git a/robot/resources/demo_preload.robot b/robot/resources/demo_preload.robot index 0f1f60c1..cfaa8638 100644 --- a/robot/resources/demo_preload.robot +++ b/robot/resources/demo_preload.robot @@ -169,11 +169,16 @@ 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}= Orchestrate VNF DemoCust ${service} ${service} ${TENANT_NAME} + ${vf_module_name} ${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} - ${model_invariant_id}= Run MSO Get ModelInvariantId ${SUITE_SERVICE_MODEL_NAME} ${vf_module_label} + # Don't get from MSO for now due to SO-1186 + # ${model_invariant_id}= Run MSO Get ModelInvariantId ${SUITE_SERVICE_MODEL_NAME} ${vf_module_label} + ${model_invariant_id}= Set Variable ${EMPTY} + :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} ${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} @@ -181,10 +186,16 @@ Instantiate VNF Instantiate Demo VNF [Arguments] ${service} ${vf_module_label}=NULL Setup Orchestrate VNF ${GLOBAL_AAI_CLOUD_OWNER} SharedNode OwnerType v1 CloudZone - ${vf_module_name} ${service}= Orchestrate Demo VNF Demonstration ${service} ${service} ${TENANT_NAME} + ${vf_module_name} ${service} ${generic_vnfs}= Orchestrate Demo VNF Demonstration ${service} ${service} ${TENANT_NAME} #Save For Delete Log to Console Customer Name=${CUSTOMER_NAME} Log to Console VNF Module Name=${vf_module_name} + # Don't get from MSO for now due to SO-1186 + # ${model_invariant_id}= Run MSO Get ModelInvariantId ${SUITE_SERVICE_MODEL_NAME} ${vf_module_label} + ${model_invariant_id}= Set Variable ${EMPTY} + :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} ${model_invariant_id}= Run MSO Get ModelInvariantId ${SUITE_SERVICE_MODEL_NAME} ${vf_module_label} Log to Console ModelInvariantID=${model_invariant_id} ${status} ${value}= Run Keyword And Ignore Error Update vVFWCL Policy ${model_invariant_id} -- cgit 1.2.3-korg