From 9d85d0b33ade6b633e6654593b5d5da9e5a75536 Mon Sep 17 00:00:00 2001 From: Brian Freeman Date: Wed, 17 Apr 2019 13:46:53 -0500 Subject: Fixes for RegionThree and Instantiate Direct Issue-ID: INT-1028 Change-Id: I2ffb571da6af9d16077b5d085fa9ae5611209865 Signed-off-by: Brian Freeman --- robot/resources/so/direct_instantiate.robot | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'robot/resources/so') diff --git a/robot/resources/so/direct_instantiate.robot b/robot/resources/so/direct_instantiate.robot index afd99ad6..6e8ba136 100644 --- a/robot/resources/so/direct_instantiate.robot +++ b/robot/resources/so/direct_instantiate.robot @@ -40,10 +40,14 @@ Instantiate Service Direct To SO ${tmp_key2}= Catenate \$ { GLOBAL_INJECTED_UBUNTU_1404_IMAGE } ${tmp_key2}= Evaluate '${tmp_key2}'.replace(' ','') # ecompnet 13 , 14, 15 - Set To Dictionary ${template} ${tmp_key1} 14 ${tmp_key2} ${GLOBAL_INJECTED_UBUNTU_1404_IMAGE} + # use same method as sdnc preload robot script + ${ecompnet}= Evaluate str((${GLOBAL_BUILD_NUMBER}%128)+128) + + Set To Dictionary ${template} ${tmp_key1} ${ecompnet} ${tmp_key2} ${GLOBAL_INJECTED_UBUNTU_1404_IMAGE} Log ${preload_dict} Log ${template} - Create Entire Service ${csar_file} ${vnf_template_file} ${template} ${name_suffix} ${GLOBAL_INJECTED_REGION} ${GLOBAL_INJECTED_OPENSTACK_TENANT_ID} ${heatbridge} - + ${service_instance_id}= Create Entire Service ${csar_file} ${vnf_template_file} ${template} ${name_suffix} ${GLOBAL_INJECTED_REGION} ${GLOBAL_INJECTED_OPENSTACK_TENANT_ID} ${heatbridge} + Log To Console ServiceInstanceId:${service_instance_id} + Should Not Be Equal As Strings ${service_instance_id} None -- cgit 1.2.3-korg