summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGary Wu <gary.i.wu@huawei.com>2019-05-09 01:38:44 +0000
committerGerrit Code Review <gerrit@onap.org>2019-05-09 01:38:44 +0000
commit295292ebee3c752c9d9e9007eeb5db82d1c1bf51 (patch)
tree3b6d305d83047175f38d05240e5b65135cb20a26
parent01e5ade3799531f9ef6578e353854d0d5493c75b (diff)
parent0d866b5b2fe1a249503a5be66eac97e4836cc374 (diff)
Merge "Fixes for New Policy API"
-rw-r--r--robot/resources/policy_interface.robot2
-rw-r--r--robot/resources/stack_validation/validate_common.robot4
2 files changed, 4 insertions, 2 deletions
diff --git a/robot/resources/policy_interface.robot b/robot/resources/policy_interface.robot
index d4882811..c532c17a 100644
--- a/robot/resources/policy_interface.robot
+++ b/robot/resources/policy_interface.robot
@@ -118,7 +118,7 @@ Update vVFWCL Policy Old
Validate the vFWCL Policy Old
Update vVFWCL Policy
- [Arguments] ${resource_id}
+ [Arguments] ${resource_id}
Log To Console Create vFWCL Monitoring Policy
Create vFirewall Monitoring Policy
Sleep 5s
diff --git a/robot/resources/stack_validation/validate_common.robot b/robot/resources/stack_validation/validate_common.robot
index 6c97fac1..8b292131 100644
--- a/robot/resources/stack_validation/validate_common.robot
+++ b/robot/resources/stack_validation/validate_common.robot
@@ -21,7 +21,9 @@ Resource packet_generator_interface.robot
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
[Arguments] ${server_ip} ${timeout}=300s
- ${file}= Catenate ${GLOBAL_VM_PRIVATE_KEY}
+ #${file}= Catenate ${GLOBAL_VM_PRIVATE_KEY}
+ # Preload is using onap public key
+ ${file}= Catenate ${GLOBAL_ONAP_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}