aboutsummaryrefslogtreecommitdiffstats
path: root/robot
diff options
context:
space:
mode:
authorJerry Flood <jf9860@att.com>2017-12-09 09:47:45 -0500
committerJerry Flood <jf9860@att.com>2017-12-09 09:48:04 -0500
commit0de1c87eef1cddad0b59dea8fd2730a28cf8cdee (patch)
tree9d0763c8694f19e611105d17d9949d6c7374c8fa /robot
parentb74b2d957d09b15ea75b3ddccc84293a26c213bb (diff)
Make geneeric vnf name/host name lower case.
Issue-ID: TEST-72 Change-Id: I62508d8f53cd9380ce0ebda1ae07ca18afe4a73b Signed-off-by: Jerry Flood <jf9860@att.com>
Diffstat (limited to 'robot')
-rw-r--r--robot/resources/stack_validation/validate_vfwcl.robot1
-rw-r--r--robot/resources/test_templates/vnf_orchestration_test_template.robot9
2 files changed, 6 insertions, 4 deletions
diff --git a/robot/resources/stack_validation/validate_vfwcl.robot b/robot/resources/stack_validation/validate_vfwcl.robot
index 2671d453..076e2f08 100644
--- a/robot/resources/stack_validation/validate_vfwcl.robot
+++ b/robot/resources/stack_validation/validate_vfwcl.robot
@@ -58,6 +58,7 @@ Validate FirewallSNK Stack
${vsn_public_ip}= Get Server Ip ${server_list} ${stack_info} vsn_name_0 network_name=public
Wait For Server ${vfw_public_ip}
+ Wait For Server ${vsn_public_ip}
Log Accessed all servers
Wait For Firewall ${vfw_public_ip}
Wait For Packet Sink ${vsn_public_ip}
diff --git a/robot/resources/test_templates/vnf_orchestration_test_template.robot b/robot/resources/test_templates/vnf_orchestration_test_template.robot
index 14bba6be..049d4cc7 100644
--- a/robot/resources/test_templates/vnf_orchestration_test_template.robot
+++ b/robot/resources/test_templates/vnf_orchestration_test_template.robot
@@ -67,13 +67,14 @@ Orchestrate VNF
Validate Service Instance ${service_instance_id} ${service} ${customer_name}
${vnflist}= Get From Dictionary ${GLOBAL_SERVICE_VNF_MAPPING} ${service}
${vnfmap}= Create Dictionary
- # For vFWLC closed loop test generic-vnf-name (${vnf_name} will be used as the FWL hostname so we
- # now need to make it be a valid hostname
+ # For vFWLC closed loop test generic-vnf-name (${vnf_name} will be used as the FWL hostname so we
+ # now need to make it be a valid hostname
:for ${vnf} in @{vnflist}
- \ ${shortuuid}= Catenate ${uuid}
+ \ ${shortuuid}= Catenate ${uuid}
\ ${shortuuid}= Replace String ${shortuuid} - ${SPACE}
- \ ${shortuuid}= Get Substring ${shortuuid} -8
+ \ ${shortuuid}= Get Substring ${shortuuid} -8
\ ${vnf_name}= Catenate ${vnf}${shortuuid}
+ \ ${vnf_name}= Convert To Lowercase ${vnf_name}
\ ${vf_module_name}= Catenate Vfmodule_Ete_${vnf}_${uuid}
\ ${vnf_type}= Get VNF Type ${catalog_resources} ${vnf}
\ ${vf_module}= Get VF Module ${catalog_resources} ${vnf}