Enable generic-vnf-name = host name

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

2 files changed, 75 insertions, 6 deletions

diff --git a/robot/resources/stack_validation/validate_vfw.robot b/robot/resources/stack_validation/validate_vfw.robot
index e1627202..40374da0 100644
--- a/robot/resources/stack_validation/validate_vfw.robot
+++ b/robot/resources/stack_validation/validate_vfw.robot
@@ -50,26 +50,26 @@ Validate Firewall Stack
 Wait For Packets
     [Documentation]    Final vfw validation that packets are flowing from the pgn VM  to the snk VM
     [Arguments]   ${vpg_public_ip}   ${vpg_unprotected_ip}   ${vsn_protected_ip}   ${vsn_public_ip}
-    ${resp}=    Enable Stream    ${vpg_public_ip}
-    Should Be Equal As Strings    ${resp.status_code}    200
+    #${resp}=    Enable Stream    ${vpg_public_ip}
+    #Should Be Equal As Strings    ${resp.status_code}    200
     ${syslog_message}=    Catenate    UDP: short packet: From ${vpg_unprotected_ip}:.* to ${vsn_protected_ip}:.*
     Tail File on Host Until    ${vsn_public_ip}    UDP:    /var/log/syslog    ${syslog_message}    timeout=120s
-    Disable All Streams    ${vpg_public_ip}
+    #Disable All Streams    ${vpg_public_ip}
 
 
 Wait For Firewall
     [Documentation]     Wait for the defined firewall processes to come up
     [Arguments]    ${ip}
-    ##Wait for Process on Host    ./vpp_measurement_reporter    ${ip}
+    Wait for Process on Host    ./vpp_measurement_reporter    ${ip}
     Wait for Process on Host    vpp -c /etc/vpp/startup.conf    ${ip}
 
 Wait For Packet Generator
     [Documentation]     Wait for the defined packet generator processes to come up
     [Arguments]    ${ip}
     Wait for Process on Host    vpp -c /etc/vpp/startup.conf    ${ip}
-    ##Wait Until Keyword Succeeds    180s    5s    Tail File on Host Until    ${ip}    Honeycomb    /var/log/honeycomb/honeycomb.log    - Honeycomb initialized   options=-c +0    timeout=120s
+    Wait Until Keyword Succeeds    180s    5s    Tail File on Host Until    ${ip}    Honeycomb    /var/log/honeycomb/honeycomb.log    Honeycomb initialized   options=-c +0    timeout=120s
     Run Keyword And Ignore Error    Wait for Process on Host    run_traffic_fw_demo.sh    ${ip}    timeout=60s
-    Pkill Process On Host    "/bin/bash ./run_traffic_fw_demo.sh"    ${ip}
+    ##Pkill Process On Host    "/bin/bash ./run_traffic_fw_demo.sh"    ${ip}
 
 Wait For Packet Sink
     [Documentation]     Wait for the defined packet sink processes to come up
diff --git a/robot/resources/stack_validation/validate_vfwcl.robot b/robot/resources/stack_validation/validate_vfwcl.robot
new file mode 100644
index 00000000..2671d453
--- /dev/null
+++ b/robot/resources/stack_validation/validate_vfwcl.robot
@@ -0,0 +1,69 @@
+*** Settings ***
+Documentation	  Testing openstack.
+Library    OperatingSystem
+Library    SSHLibrary
+Library    RequestsLibrary
+Library    JSONUtils
+Library    OpenstackLibrary
+Library    HEATUtils
+Library    Collections
+Resource          ../../resources/openstack/keystone_interface.robot
+Resource          ../../resources/openstack/nova_interface.robot
+Resource          ../../resources/openstack/heat_interface.robot
+Resource          ../../resources/ssh/files.robot
+Resource          ../../resources/ssh/processes.robot
+Resource          ../appc_interface.robot
+Resource          packet_generator_interface.robot
+Resource          validate_common.robot
+Resource          validate_vfw.robot
+
+
+*** Variables ***
+${TV_VFW_PUBLIC_IP}
+${TV_VSN_PUBLIC_IP}
+
+*** Keywords ***
+Validate FirewallPKG Stack
+    [Documentation]    Identifies and validates the firewall servers in the VFW Stack
+    [Arguments]    ${STACK_NAME}
+    Run Openstack Auth Request    auth
+    ${stack_info}=    Wait for Stack to Be Deployed    auth    ${STACK_NAME}
+    ${stack_id}=    Get From Dictionary    ${stack_info}    id
+    ${server_list}=    Get Openstack Servers    auth
+
+    ${vpg_unprotected_ip}=    Get From Dictionary    ${stack_info}    vpg_private_ip_0
+    ${vsn_protected_ip}=    Get From Dictionary    ${stack_info}    vsn_private_ip_0
+    ${vpg_name_0}=    Get From Dictionary    ${stack_info}    vpg_name_0
+    ${vnf_id}=    Get From Dictionary    ${stack_info}    vnf_id
+    
+    ${vpg_public_ip}=    Get Server Ip    ${server_list}    ${stack_info}   vpg_name_0    network_name=public
+    Wait For Server    ${vpg_public_ip}
+    Log    Accessed all servers
+    Wait For Packet Generator    ${vpg_public_ip}
+    Log    All server processes up
+    ${vpg_oam_ip}=    Get From Dictionary    ${stack_info}    vpg_private_ip_1
+    
+    ${appc}=    Create Mount Point In APPC    ${vnf_id}    ${vpg_oam_ip}
+    Wait For Packets   ${vpg_public_ip}   ${vpg_unprotected_ip}   ${vsn_protected_ip}   ${TV_VSN_PUBLIC_IP}
+
+Validate FirewallSNK Stack
+    [Documentation]    Identifies and validates the firewall servers in the VFW Stack
+    [Arguments]    ${STACK_NAME}
+    Run Openstack Auth Request    auth
+    ${stack_info}=    Wait for Stack to Be Deployed    auth    ${STACK_NAME}
+    ${stack_id}=    Get From Dictionary    ${stack_info}    id
+    ${server_list}=    Get Openstack Servers    auth
+
+    ${vfw_public_ip}=    Get Server Ip    ${server_list}    ${stack_info}   vfw_name_0    network_name=public
+    ${vsn_public_ip}=    Get Server Ip    ${server_list}    ${stack_info}   vsn_name_0    network_name=public
+
+    Wait For Server    ${vfw_public_ip}
+    Log    Accessed all servers
+    Wait For Firewall    ${vfw_public_ip}
+    Wait For Packet Sink    ${vsn_public_ip}
+    # Save for teh PKG validation
+    Set Test Variable   ${TV_VFW_PUBLIC_IP}   ${vfw_public_ip}
+    Set Test Variable   ${TV_VSN_PUBLIC_IP}   ${vsn_public_ip}
+    Log    All server processes up
+
+