Make geneeric vnf name/host name lower case.

Issue-ID: TEST-72
Change-Id: I62508d8f53cd9380ce0ebda1ae07ca18afe4a73b
Signed-off-by: Jerry Flood <jf9860@att.com>

diff --git a/robot/resources/stack_validation/validate_vfwcl.robot b/robot/resources/stack_validation/validate_vfwcl.robot
index 2671d45..076e2f0 100644 (file)
--- 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 14bba6b..049d4cc 100644 (file)
--- 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}