Fixes for New Policy API

fix private key for Wait For Server

Issue-ID: INT-1071
Change-Id: I3c6e6e59dc3c6f3fe53887f48cd20ba16b50f402
Signed-off-by: Brian Freeman <bf1936@att.com>

diff --git a/robot/resources/policy_interface.robot b/robot/resources/policy_interface.robot
index d488281..c532c17 100644 (file)
--- 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 6c97fac..8b29213 100644 (file)
--- 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}