summaryrefslogtreecommitdiffstats
path: root/robot/resources
diff options
context:
space:
mode:
authorBrian Freeman <bf1936@att.com>2019-04-17 13:46:53 -0500
committerBrian Freeman <bf1936@att.com>2019-04-17 16:21:05 -0500
commit9d85d0b33ade6b633e6654593b5d5da9e5a75536 (patch)
tree2fd85a79cc22bfa847a80f447f634fdf5d9d813c /robot/resources
parente12b626ab2141e59d74314dc24713b295dac9d53 (diff)
Fixes for RegionThree and Instantiate Direct
Issue-ID: INT-1028 Change-Id: I2ffb571da6af9d16077b5d085fa9ae5611209865 Signed-off-by: Brian Freeman <bf1936@att.com>
Diffstat (limited to 'robot/resources')
-rw-r--r--robot/resources/so/direct_instantiate.robot10
1 files changed, 7 insertions, 3 deletions
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