From 99c6329d9b5f5f83a38eb309181200b80d153949 Mon Sep 17 00:00:00 2001 From: jf9860 Date: Thu, 9 Mar 2017 15:28:42 -0500 Subject: TEST-4 Re-factor openstack region variable Change-Id: Iad9ef0555dbbd921e261bfa2a63806100bcf7c83 Signed-off-by: jf9860 --- robot/resources/demo_preload.robot | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'robot/resources/demo_preload.robot') diff --git a/robot/resources/demo_preload.robot b/robot/resources/demo_preload.robot index eba91f91..02e4ce69 100644 --- a/robot/resources/demo_preload.robot +++ b/robot/resources/demo_preload.robot @@ -22,13 +22,14 @@ ${FILE_CACHE} /share/ Load Customer And Models [Documentation] Use openECOMP to Orchestrate a service. [Arguments] ${customer_name} - Setup Orchestrate VNF ${GLOBAL_AAI_CLOUD_OWNER} ${GLOBAL_OPENSTACK_SERVICE_REGION} SharedNode OwnerType v1 CloudZone + Setup Orchestrate VNF ${GLOBAL_AAI_CLOUD_OWNER} SharedNode OwnerType v1 CloudZone Set Test Variable ${CUSTOMER_NAME} ${customer_name} ${status} ${value}= Run Keyword And Ignore Error Distribute Model vFW demoVFW ${status} ${value}= Run Keyword And Ignore Error Distribute Model vLB demoVLB ## MSO polling is 60 second intervals Sleep 60s - Create Customer For VNF Demo ${CUSTOMER_NAME} ${CUSTOMER_NAME} INFRA ${GLOBAL_AAI_CLOUD_OWNER} ${GLOBAL_OPENSTACK_SERVICE_REGION} ${TENANT_ID} + ${region}= Get Openstack Region + Create Customer For VNF Demo ${CUSTOMER_NAME} ${CUSTOMER_NAME} INFRA ${GLOBAL_AAI_CLOUD_OWNER} ${region} ${TENANT_ID} Distribute Model [Arguments] ${service} ${modelName} -- cgit 1.2.3-korg