aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--robot/resources/global_properties.robot3
-rw-r--r--robot/resources/stack_validation/policy_check_vfw.robot1
-rw-r--r--robot/resources/stack_validation/validate_common.robot26
-rw-r--r--robot/resources/stack_validation/validate_dns_scaling.robot1
-rw-r--r--robot/resources/stack_validation/validate_vfw.robot1
-rw-r--r--robot/resources/stack_validation/validate_vlb.robot1
-rw-r--r--robot/resources/stack_validation/validate_vvg.robot1
7 files changed, 13 insertions, 21 deletions
diff --git a/robot/resources/global_properties.robot b/robot/resources/global_properties.robot
index 819f56a4..953f5283 100644
--- a/robot/resources/global_properties.robot
+++ b/robot/resources/global_properties.robot
@@ -19,4 +19,5 @@ ${GLOBAL_OPENSTACK_NEUTRON_SERVICE_TYPE} network
${GLOBAL_OPENSTACK_GLANCE_SERVICE_TYPE} image
${GLOBAL_OPENSTACK_KEYSTONE_SERVICE_TYPE} identity
${GLOBAL_AAI_CLOUD_OWNER} Rackspace
-${GLOBAL_BUILD_NUMBER} 0 \ No newline at end of file
+${GLOBAL_BUILD_NUMBER} 0
+${GLOBAL_VM_PRIVATE_KEY} ${EXECDIR}/robot/assets/keys/robot_ssh_private_key.pvt \ No newline at end of file
diff --git a/robot/resources/stack_validation/policy_check_vfw.robot b/robot/resources/stack_validation/policy_check_vfw.robot
index 126f437e..22340729 100644
--- a/robot/resources/stack_validation/policy_check_vfw.robot
+++ b/robot/resources/stack_validation/policy_check_vfw.robot
@@ -21,7 +21,6 @@ Resource ../../resources/test_templates/vnf_orchestration_test_template
*** Variables ***
-${ASSETS} ${EXECDIR}/robot/assets/
*** Keywords ***
Policy Check Firewall Stack
diff --git a/robot/resources/stack_validation/validate_common.robot b/robot/resources/stack_validation/validate_common.robot
index eb7f9f5a..24f9fe33 100644
--- a/robot/resources/stack_validation/validate_common.robot
+++ b/robot/resources/stack_validation/validate_common.robot
@@ -16,36 +16,32 @@ Resource packet_generator_interface.robot
*** Variables ***
-${ASSETS} ${EXECDIR}/robot/assets/
-${VFW_STACK_NAME} EcompETE_VFWStack
-${VLB_STACK_NAME} EcompETE_VLBStack
-${DNS_STACK_NAME} EcompETE_DNSStack
*** Keywords ***
Wait For Server
- [Documentation] Attempts to login to the passed server info and verify (??). Uses server info to get public ip and locate corresponding provate key file
+ [Documentation] Attempts to login to the passed server info and verify (??). Uses server info to get public ip and locate corresponding provate key file
[Arguments] ${server_ip} ${timeout}=300s
- ${file}= Catenate ${ASSETS}keys/robot_ssh_private_key.pvt
+ ${file}= Catenate ${GLOBAL_VM_PRIVATE_KEY}
Wait Until Keyword Succeeds ${timeout} 5 sec Open Connection And Log In ${server_ip} root ${file}
- ${lines}= Grep Local File "Accepted publickey" /var/log/auth.log
- Log ${lines}
+ ${lines}= Grep Local File "Accepted publickey" /var/log/auth.log
+ Log ${lines}
Should Not Be Empty ${lines}
-
-Get Server Ip
+
+Get Server Ip
[Arguments] ${server_list} ${stack_info} ${key_name} ${network_name}=public
${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}= Get Openstack Server Ip ${server} network_name=${network_name}
Log Returned Get Openstack Server Ip
- [Return] ${ip}
+ [Return] ${ip}
Find And Reboot The Server
- [Documentation] Code to reboot the server by teh heat server name parameter value
+ [Documentation] Code to reboot the server by teh heat server name parameter value
[Arguments] ${stack_info} ${server_list} ${server_name_parameter}
${server_name}= Get From Dictionary ${stack_info} ${server_name_parameter}
${vfw_server}= Get From Dictionary ${server_list} ${server_name}
${vfw_server_id}= Get From Dictionary ${vfw_server} id
Reboot Server auth ${vfw_server_id}
-
-
+
+
diff --git a/robot/resources/stack_validation/validate_dns_scaling.robot b/robot/resources/stack_validation/validate_dns_scaling.robot
index 41c04633..b4556591 100644
--- a/robot/resources/stack_validation/validate_dns_scaling.robot
+++ b/robot/resources/stack_validation/validate_dns_scaling.robot
@@ -17,7 +17,6 @@ Resource validate_common.robot
*** Variables ***
-${ASSETS} ${EXECDIR}/robot/assets/
*** Keywords ***
Validate Dns Scaling Stack
diff --git a/robot/resources/stack_validation/validate_vfw.robot b/robot/resources/stack_validation/validate_vfw.robot
index a5322efb..b0d591fb 100644
--- a/robot/resources/stack_validation/validate_vfw.robot
+++ b/robot/resources/stack_validation/validate_vfw.robot
@@ -18,7 +18,6 @@ Resource validate_common.robot
*** Variables ***
-${ASSETS} ${EXECDIR}/robot/assets/
*** Keywords ***
Validate Firewall Stack
diff --git a/robot/resources/stack_validation/validate_vlb.robot b/robot/resources/stack_validation/validate_vlb.robot
index eef578ab..bab15648 100644
--- a/robot/resources/stack_validation/validate_vlb.robot
+++ b/robot/resources/stack_validation/validate_vlb.robot
@@ -8,7 +8,6 @@ Resource validate_common.robot
*** Variables ***
-${ASSETS} ${EXECDIR}/robot/assets/
*** Keywords ***
Validate vLB Stack
diff --git a/robot/resources/stack_validation/validate_vvg.robot b/robot/resources/stack_validation/validate_vvg.robot
index 47d9600a..05b1e8a5 100644
--- a/robot/resources/stack_validation/validate_vvg.robot
+++ b/robot/resources/stack_validation/validate_vvg.robot
@@ -7,7 +7,6 @@ Resource validate_common.robot
*** Variables ***
-${ASSETS} ${EXECDIR}/robot/assets/
*** Keywords ***
Validate vVG Stack