Update aaf csit plans latest images
Adjust teardown.sh
Issue-ID: AAF-388
Change-Id: Iaa9c384f38877e158309e4c25d96b2fed5ae61b9
Signed-off-by: Sai Gandham <sg481n@att.com>
diff --git a/tests/aaf/aafapi/aafapi.robot b/tests/aaf/aafapi/aafapi.robot
index 0f2267b..93b6ce3 100644
--- a/tests/aaf/aafapi/aafapi.robot
+++ b/tests/aaf/aafapi/aafapi.robot
@@ -1,45 +1,39 @@
*** Settings ***
-Suite Setup Run keywords Created header Created session
+Library OperatingSystem
Library RequestsLibrary
+Library requests
Library Collections
+Library String
*** Variables ***
+${TARGETURL_NAMESPACE} https://${AAF_IP}:8100/authz/nss/org.osaaf.people
+${TARGETURL_PERMS} https://${AAF_IP}:8100/authz/perms/user/aaf_admin@people.osaaf.org
+${TARGETURL_ROLES} https://${AAF_IP}:8100/authz/roles/user/aaf_admin@people.osaaf.org
+${username} aaf_admin@people.osaaf.org
+${password} demo123456!
+
*** Test Cases ***
-View information from app
- [Template] Get template
- /authz/nss/org.openecomp
- authz/perms/user/dgl@openecomp.org
- authz/roles/user/dgl@openecomp.org
-
-Cleanup Namespace ( 424 Response - Delete dependencies and try again )
- [Tags] delete
- ${resp}= Delete Request ${suite_aaf_session} authz/ns/org.openecomp.dmaapBC headers=${suite_headers}
- Should Be Equal As Strings ${resp.status_code} 424
- log 'JSON Response Code :'${resp.text}
-
-Add information to app
- [Template] Post template
- authz/ns/org.openecomp.dmaapBC/admin/alexD@openecomp.org 403
- authz/perms/user/m99751@dmaapBC.openecomp.org 406
-
-*** Keywords ***
-Created session
- Create Session aaf_session http://${AAF_IP}:8101
- Set Suite Variable ${suite_aaf_session} aaf_session
-
-Created header
- ${headers}= Create Dictionary Authorization=Basic ZGdsQG9wZW5lY29tcC5vcmc6ZWNvbXBfYWRtaW4= Content-Type=application/json Accept=application/json
- Set Suite Variable ${suite_headers} ${headers}
-
-Get template
- [Arguments] ${topic}
- ${resp}= Get Request ${suite_aaf_session} ${topic} headers=${suite_headers}
+View Namesapce
+ [Tags] get
+ CreateSession aaf https://${AAF_IP}:8100
+ &{headers}= Create Dictionary Authorization=Basic YWFmX2FkbWluQHBlb3BsZS5vc2FhZi5vcmc6ZGVtbzEyMzQ1NiE= Content-Type=application/json Accept=application/json
+ ${resp}= Get Request aaf /authz/nss/org.osaaf.people headers=&{headers}
Should Be Equal As Strings ${resp.status_code} 200
- log 'JSON Response Code :'${resp.text}
-
-Post template
- [Arguments] ${topic} ${response_status_code}
- ${resp}= Post Request ${suite_aaf_session} ${topic} headers=${suite_headers}
- Should Be Equal As Strings ${resp.status_code} ${response_status_code}
- log 'JSON Response Code :'${resp.text}
+ log 'JSON Response Code :'${resp.text}
+
+View by User Permission
+ [Tags] get
+ CreateSession aaf https://${AAF_IP}:8100
+ &{headers}= Create Dictionary Authorization=Basic YWFmX2FkbWluQHBlb3BsZS5vc2FhZi5vcmc6ZGVtbzEyMzQ1NiE= Content-Type=application/json Accept=application/json
+ ${resp}= Get Request aaf authz/perms/user/aaf_admin@people.osaaf.org headers=&{headers}
+ Should Be Equal As Strings ${resp.status_code} 200
+ log 'JSON Response Code :'${resp.text}
+
+View by User Role
+ [Tags] get
+ CreateSession aaf https://${AAF_IP}:8100
+ &{headers}= Create Dictionary Authorization=Basic YWFmX2FkbWluQHBlb3BsZS5vc2FhZi5vcmc6ZGVtbzEyMzQ1NiE= Content-Type=application/json Accept=application/json
+ ${resp}= Get Request aaf authz/roles/user/aaf_admin@people.osaaf.org headers=&{headers}
+ Should Be Equal As Strings ${resp.status_code} 200
+ log 'JSON Response Code :'${resp.text}
\ No newline at end of file