X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=tests%2Faaf%2Faafapi%2Faafapi.robot;h=0f2267be73f089e0baa8d49f448919333523967d;hb=73fcc3958c2d61646392b2c0bccc4f7017a531eb;hp=b1f8e746d01539cbe5b09a090824cf6e93d1021b;hpb=c078eea2b2809a22aad21f1b4f8c49d018ece7b6;p=integration%2Fcsit.git

diff --git a/tests/aaf/aafapi/aafapi.robot b/tests/aaf/aafapi/aafapi.robot
index b1f8e746..0f2267be 100644
--- a/tests/aaf/aafapi/aafapi.robot
+++ b/tests/aaf/aafapi/aafapi.robot
@@ -1,63 +1,45 @@
 *** Settings ***
-Library           OperatingSystem
+Suite Setup       Run keywords    Created header    Created session
 Library           RequestsLibrary
-Library           requests
 Library           Collections
-Library           String
 
 *** Variables ***
-${TARGETURL_NAMESPACE}     http://${AAF_IP}:8101/authz/nss/org.openecomp
-${TARGETURL_PERMS}         http://${AAF_IP}:8101/authz/perms/user/dgl@openecomp.org
-${TARGETURL_ROLES}         http://${AAF_IP}:8101/authz/roles/user/dgl@openecomp.org
-${username}               dgl@openecomp.org 
-${password}               ecomp_admin
-
 
 *** Test Cases ***
-View Namesapce
-    [Tags]    get
-    CreateSession    aaf    http://${AAF_IP}:8101
-    &{headers}=  Create Dictionary    Authorization=Basic ZGdsQG9wZW5lY29tcC5vcmc6ZWNvbXBfYWRtaW4=    Content-Type=application/json    Accept=application/json
-    ${resp}=    Get Request    aaf    /authz/nss/org.openecomp    headers=&{headers}
-    Should Be Equal As Strings    ${resp.status_code}    200
-    log    		                  	'JSON Response Code :'${resp.text}	
-	
-View by User Permission 
-    [Tags]    get
-    CreateSession    aaf    http://${AAF_IP}:8101
-    &{headers}=  Create Dictionary    Authorization=Basic ZGdsQG9wZW5lY29tcC5vcmc6ZWNvbXBfYWRtaW4=    Content-Type=application/json    Accept=application/json
-    ${resp}=    Get Request    aaf    authz/perms/user/dgl@openecomp.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    http://${AAF_IP}:8101
-    &{headers}=  Create Dictionary    Authorization=Basic ZGdsQG9wZW5lY29tcC5vcmc6ZWNvbXBfYWRtaW4=    Content-Type=application/json    Accept=application/json
-    ${resp}=    Get Request    aaf    authz/roles/user/dgl@openecomp.org    headers=&{headers}
-    Should Be Equal As Strings    ${resp.status_code}    200
-    log    		                  	'JSON Response Code :'${resp.text}	
+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) 
+Cleanup Namespace ( 424 Response - Delete dependencies and try again )
     [Tags]    delete
-    CreateSession    aaf    http://${AAF_IP}:8101
-    &{headers}=  Create Dictionary    Authorization=Basic ZGdsQG9wZW5lY29tcC5vcmc6ZWNvbXBfYWRtaW4=    Content-Type=application/json    Accept=application/json
-    ${resp}=    Delete Request    aaf    authz/ns/org.openecomp.dmaapBC   headers=&{headers}
+    ${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 Data ( Add Admin to Namespace Explicit ) 
-    [Tags]    post
-    CreateSession    aaf    http://${AAF_IP}:8101
-    &{headers}=  Create Dictionary    Authorization=Basic ZGdsQG9wZW5lY29tcC5vcmc6ZWNvbXBfYWRtaW4=    Content-Type=application/json    Accept=application/json
-    ${resp}=    Post Request    aaf    authz/ns/org.openecomp.dmaapBC/admin/alexD@openecomp.org   headers=&{headers}
-    Should Be Equal As Strings    ${resp.status_code}    403
-    log    		                  	'JSON Response Code :'${resp.text}	
-	
-View Explicit Permission 
-    [Tags]    post
-    CreateSession    aaf    http://${AAF_IP}:8101
-    &{headers}=  Create Dictionary    Authorization=Basic ZGdsQG9wZW5lY29tcC5vcmc6ZWNvbXBfYWRtaW4=    Content-Type=application/json    Accept=application/json
-    ${resp}=    Post Request    aaf    authz/perms/user/m99751@dmaapBC.openecomp.org   headers=&{headers}
-    Should Be Equal As Strings    ${resp.status_code}    406
-    log    		                  	'JSON Response Code :'${resp.text}	
\ No newline at end of file
+
+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}
+    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}