From cbcc00cf78a9b1d80275ccc2ff9d38896104fbab Mon Sep 17 00:00:00 2001
From: Venkata Harish K Kajur <vk250x@att.com>
Date: Sat, 9 Sep 2017 20:30:04 -0400
Subject: Add pserver suite and fix host ip in pserver suite

Issue-ID: AAI-155

Change-Id: Iea7d6ff9a3c11990a9752982543f2737df179afe
Signed-off-by: Venkata Harish K Kajur <vk250x@att.com>
---
 test/csit/tests/aai/resources/suite1/pserver.robot | 39 +++++++++++-----------
 1 file changed, 19 insertions(+), 20 deletions(-)

(limited to 'test/csit/tests/aai/resources/suite1/pserver.robot')

diff --git a/test/csit/tests/aai/resources/suite1/pserver.robot b/test/csit/tests/aai/resources/suite1/pserver.robot
index 5a1d9d3ba..55e57bccb 100644
--- a/test/csit/tests/aai/resources/suite1/pserver.robot
+++ b/test/csit/tests/aai/resources/suite1/pserver.robot
@@ -5,62 +5,61 @@ Library       requests
 Library       Collections
 
 *** Variables ***
-${TARGETURL}  https://${HOST_IP}:8443/v11/cloud-infrastructure/pservers/pserver/pserver-test1
+${TARGETURL}  https://${HOST_IP}:8443/aai/v11/cloud-infrastructure/pservers/pserver/pserver-test1
 ${PSERVERDATA}  {"hostname": "pserver-test1"}
 
 *** Test Cases ***
 
 Run AAI Put Pserver
-    [Documentation]             Create an index and verify success
+    [Documentation]             Create an pserver object
     ${resp}=                    PutWithCert              ${TARGETURL}              ${PSERVERDATA}
+    log                         ${TARGETURL}
+    log                         ${resp.text}
     Should Be Equal As Strings  ${resp.status_code}      201
 
 Run AAI Get Pserver
-    [Documentation]             Get the document that was just created
+    [Documentation]             Get the pserver object just created
     ${resp}                     GetWithCert              ${TARGETURL}
-    ${content}=                 Evaluate                 $resp.json()
+    log                         ${resp}
+    log                         ${resp.json()}
     Should Be Equal As Strings  ${resp.status_code}      200
-    ${resource_version}=        Evaluate                 $resp.json()['resource-version']
+    ${resource_version}=        Evaluate                 $resp.json().get('resource-version')
+    Set Global Variable			${resource_version}
 
 Run AAI Delete Pserver
-    [Documentation]             Delete the index
+    [Documentation]             Delete the pserver just created
     ${resp}=                    DeleteWithCert           ${TARGETURL}?resource-version=${resource_version}
+    log                         ${resp.text}
     Should Be Equal As Strings  ${resp.status_code}      204
 
 *** Keywords ***
 PutWithCert
     [Arguments]      ${url}      ${data}
-    ${auth}=         Create List  AAI AAI
-    ${uuid}=         Generate UUID
-    ${headers}=      Create Dictionary     Accept=application/json    Content-Type=application/json    X-TransactionId=${uuid}    X-FromAppId=integration-aai
+    ${headers}=      Create Dictionary     Accept=application/json    Content-Type=application/json    X-TransactionId=integration-aai    X-FromAppId=integration-aai   Authorization=Basic QUFJOkFBSQ==
     ${certinfo}=     Evaluate    ('${CURDIR}/aai.crt', '${CURDIR}/aai.key')
-    ${resp}=         Evaluate    requests.put('${url}', data='${data}', auth=${auth}, headers=${headers}, cert=${certinfo}, verify=False)    requests
+    ${resp}=         Evaluate    requests.put('${url}', data='${data}', headers=${headers}, cert=${certinfo}, verify=False)    requests
     [return]         ${resp}
 
 PostWithCert
     [Arguments]      ${url}      ${data}
     ${auth}=         Create List  AAI AAI
-    ${uuid}=         Generate UUID
-    ${headers}=      Create Dictionary     Accept=application/json    Content-Type=application/json    X-TransactionId=${uuid}    X-FromAppId=integration-aai
+    ${headers}=      Create Dictionary     Accept=application/json    Content-Type=application/json    X-TransactionId=integration-aai    X-FromAppId=integration-aai   Authorization=Basic QUFJOkFBSQ==
     ${certinfo}=     Evaluate    ('${CURDIR}/aai.crt', '${CURDIR}/aai.key')
-    ${resp}=         Evaluate    requests.post('${url}', data='${data}', auth=${auth}, headers=${headers}, cert=${certinfo}, verify=False)    requests
+    ${resp}=         Evaluate    requests.post('${url}', data='${data}', headers=${headers}, cert=${certinfo}, verify=False)    requests
     [return]         ${resp}
 
 GetWithCert
     [Arguments]      ${url}
-    ${auth}=         Create List  AAI AAI
-    ${uuid}=         Generate UUID
-    ${headers}=      Create Dictionary     Accept=application/json    Content-Type=application/json    X-TransactionId=${uuid}    X-FromAppId=integration-aai
+    ${headers}=      Create Dictionary     Accept=application/json    Content-Type=application/json    X-TransactionId=integration-aai    X-FromAppId=integration-aai   Authorization=Basic QUFJOkFBSQ==
     ${certinfo}=     Evaluate    ('${CURDIR}/aai.crt', '${CURDIR}/aai.key')
-    ${resp}=         Evaluate    requests.get('${url}', auth=${auth}, headers=${headers}, cert=${certinfo}, verify=False)    requests
+    ${resp}=         Evaluate    requests.get('${url}', headers=${headers}, cert=${certinfo}, verify=False)    requests
     [return]         ${resp}
 
 DeleteWithCert
     [Arguments]      ${url}
     ${auth}=         Create List  AAI AAI
-    ${uuid}=         Generate UUID
-    ${headers}=      Create Dictionary     Accept=application/json    Content-Type=application/json    X-TransactionId=${uuid}    X-FromAppId=integration-aai
+    ${headers}=      Create Dictionary     Accept=application/json    Content-Type=application/json    X-TransactionId=integration-aai    X-FromAppId=integration-aai   Authorization=Basic QUFJOkFBSQ==
     ${certinfo}=     Evaluate    ('${CURDIR}/aai.crt', '${CURDIR}/aai.key')
-    ${resp}=         Evaluate    requests.delete('${url}', auth=${auth}, headers=${headers}, cert=${certinfo}, verify=False)    requests
+    ${resp}=         Evaluate    requests.delete('${url}', headers=${headers}, cert=${certinfo}, verify=False)    requests
     [return]         ${resp}
     
-- 
cgit 1.2.3-korg