diff options
| author |   Gary Wu <gary.i.wu@huawei.com> | 2018-11-09 12:13:51 -0800 |
|---|---|---|
| committer | Gary Wu <gary.i.wu@huawei.com> | 2018-11-09 13:02:19 -0800 |
| commit | 2b8a20c2653864dd4fe90d16caa67e33201ccbe0 (patch) | |
| tree | 9782798fb62e3830258fd7e7e93f3b9b081bac3e /robot/resources/demo_preload.robot | |
| parent | a94b1d5512b72ac1d52e4c8ec9bc6be70d632858 (diff) | |
Get model-invariant-id from AAI for vFWCL
Change-Id: I6364bb71d9ec88e0e0bcb962b9d7531df09652c6
Issue-ID: INT-715
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
Diffstat (limited to 'robot/resources/demo_preload.robot')
| -rw-r--r-- | robot/resources/demo_preload.robot | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/robot/resources/demo_preload.robot b/robot/resources/demo_preload.robot index 5b03a0b5..41936a04 100644 --- a/robot/resources/demo_preload.robot +++ b/robot/resources/demo_preload.robot @@ -47,7 +47,7 @@ Load OwningEntity ${uuid}= Generate UUID ${headers}= Create Dictionary Accept=application/json Content-Type=application/json USER_ID=${GLOBAL_VID_USERNAME} X-TransactionId=${GLOBAL_APPLICATION_ID}-${uuid} X-FromAppId=${GLOBAL_APPLICATION_ID} ${resp}= Post Request vid ${data_path} data=${vid_data} headers=${headers} - + Load Customer [Documentation] Use openECOMP to Orchestrate a service. [Arguments] ${customer_name} @@ -156,11 +156,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} @@ -168,11 +173,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} - ${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} |