summaryrefslogtreecommitdiffstats
path: root/robot/resources/stack_validation
diff options
context:
space:
mode:
Diffstat (limited to 'robot/resources/stack_validation')
-rw-r--r--robot/resources/stack_validation/validate_common.robot57
-rw-r--r--robot/resources/stack_validation/validate_vfw.robot6
2 files changed, 59 insertions, 4 deletions
diff --git a/robot/resources/stack_validation/validate_common.robot b/robot/resources/stack_validation/validate_common.robot
index 24f9fe33..6c97fac1 100644
--- a/robot/resources/stack_validation/validate_common.robot
+++ b/robot/resources/stack_validation/validate_common.robot
@@ -32,7 +32,7 @@ Get Server Ip
${server_name}= Get From Dictionary ${stack_info} ${key_name}
${server}= Get From Dictionary ${server_list} ${server_name}
Log Entering Get Openstack Server Ip
- ${ip}= Get Openstack Server Ip ${server} network_name=${network_name}
+ ${ip}= Search Addresses ${server} ${network_name}
Log Returned Get Openstack Server Ip
[Return] ${ip}
@@ -45,3 +45,58 @@ Find And Reboot The Server
Reboot Server auth ${vfw_server_id}
+Search Addresses
+ [Arguments] ${server} ${network_name}
+ ${addresses} Get From Dictionary ${server} addresses
+ ${status} ${server_ip}= Run Keyword And Ignore Error Find Rackspace ${addresses} ${network_name}
+ Return From Keyword If '${status}'=='PASS' ${server_ip}
+ ${status} ${server_ip}= Run Keyword And Ignore Error Find Openstack ${addresses} ${network_name}
+ Return From Keyword If '${status}'=='PASS' ${server_ip}
+ ${status} ${server_ip}= Run Keyword And Ignore Error Find Openstack 2 ${addresses} ${network_name}
+ Return From Keyword If '${status}'=='PASS' ${server_ip}
+ Fail ${server}/${network_name} Not Found
+
+Find Rackspace
+ [Arguments] ${addresses} ${network_name}
+ ${ips} Get From Dictionary ${addresses} ${network_name}
+ ${ip}= Get V4 IP ${ips}
+ [Return] ${ip}
+
+Find Openstack
+ [Arguments] ${addresses} ${network_name}
+ ${network_name}= Set Variable If '${network_name}' == 'public' external ${network_name}
+ ${ip}= Get V4 IP Openstack ${addresses} ${network_name}
+ [Return] ${ip}
+
+Find Openstack 2
+ [Arguments] ${addresses} ${network_name}
+ ${network_name}= Set Variable If '${network_name}' == 'public' floating ${network_name}
+ ${ipmaps}= Get From Dictionary ${addresses} ${GLOBAL_INJECTED_NETWORK}
+ ${ip}= Get V4 IP Openstack 2 ${ipmaps} ${network_name}
+ [Return] ${ip}
+
+Get V4 IP
+ [Arguments] ${ipmaps}
+ :for ${ipmap} in @{ipmaps}
+ \ ${ip} Get From Dictionary ${ipmap} addr
+ \ ${version} Get From Dictionary ${ipmap} version
+ \ Return from Keyword if '${version}' == '4' ${ip}
+ Fail No Version 4 IP
+
+Get V4 IP Openstack
+ [Arguments] ${addresses} ${testtype}
+ ${ipmaps}= Get From Dictionary ${addresses} ${testtype}
+ :for ${ipmap} in @{ipmaps}
+ \ ${ip} Get From Dictionary ${ipmap} addr
+ \ ${version} Get From Dictionary ${ipmap} version
+ \ Return from Keyword if '${version}'=='4' ${ip}
+ Fail No Version 4 IP
+
+Get V4 IP Openstack 2
+ [Arguments] ${ipmaps} ${testtype}
+ :for ${ipmap} in @{ipmaps}
+ \ ${type} Get From Dictionary ${ipmap} OS-EXT-IPS:type
+ \ ${ip} Get From Dictionary ${ipmap} addr
+ \ ${version} Get From Dictionary ${ipmap} version
+ \ Return from Keyword if '${version}'=='4' and '${type}'=='${testtype}' ${ip}
+ Fail No Version 4 IP
diff --git a/robot/resources/stack_validation/validate_vfw.robot b/robot/resources/stack_validation/validate_vfw.robot
index b0d591fb..e1627202 100644
--- a/robot/resources/stack_validation/validate_vfw.robot
+++ b/robot/resources/stack_validation/validate_vfw.robot
@@ -60,18 +60,18 @@ Wait For Packets
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}
Wait For Packet Sink
[Documentation] Wait for the defined packet sink processes to come up
[Arguments] ${ip}
- Log noting to check on ${ip}
+ Wait for Process on Host /usr/sbin/darkstat ${ip}