From d65e2aac6f3108659db14c83736933c53065b9bc Mon Sep 17 00:00:00 2001 From: Brian Freeman Date: Thu, 26 Jul 2018 11:13:46 -0500 Subject: Updates for vFWCL Setup Issue-ID: TEST-110 Change-Id: If230afd903c51a01dad5a6204dca1a1eee1f8adc Signed-off-by: Brian Freeman --- robot/resources/demo_preload.robot | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'robot/resources/demo_preload.robot') diff --git a/robot/resources/demo_preload.robot b/robot/resources/demo_preload.robot index 102305ab..bab21be1 100644 --- a/robot/resources/demo_preload.robot +++ b/robot/resources/demo_preload.robot @@ -22,6 +22,7 @@ ${AAI_INDEX_PATH} /aai/v8 ${VF_MODULES_NAME} _Demo_VFModules.json ${FILE_CACHE} /share/ ${DEMO_PREFIX} demo +${VPKG_MODULE_LABEL} base_vpkg *** Keywords *** @@ -143,21 +144,23 @@ APPC Mount Point ${stack_id}= Get From Dictionary ${stack_info} id ${server_list}= Get Openstack Servers auth ${vpg_name_0}= Get From Dictionary ${stack_info} vpg_name_0 + ${vnf_id}= Get From Dictionary ${stack_info} vnf_id ${vpg_public_ip}= Get Server Ip ${server_list} ${stack_info} vpg_name_0 network_name=public ${vpg_oam_ip}= Get From Dictionary ${stack_info} vpg_private_ip_1 - ${appc}= Create Mount Point In APPC ${vpg_name_0} ${vpg_oam_ip} + #${appc}= Create Mount Point In APPC ${vpg_name_0} ${vpg_oam_ip} + ${appc}= Create Mount Point In APPC ${vnf_id} ${vpg_oam_ip} Instantiate VNF - [Arguments] ${service} + [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} 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} + ${model_invariant_id}= Run MSO Get ModelInvariantId ${SUITE_SERVICE_MODEL_NAME} ${vf_module_label} Log to Console ModelInvariantID=${model_invariant_id} - Update vVFWCL Policy ${model_invariant_id} - APPC Mount Point ${vf_module_name} + ${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} -- cgit 1.2.3-korg