Merge "DDD implementation"

4 files changed, 81 insertions, 131 deletions

diff --git a/plans/aaf/aafapi/setup.sh b/plans/aaf/aafapi/setup.sh
index add9ae17..dd6cb29e 100644
--- a/plans/aaf/aafapi/setup.sh
+++ b/plans/aaf/aafapi/setup.sh
@@ -44,8 +44,7 @@ export cassandra_service=$(get_docker_compose_service cassandra_container)
 for i in {1..12}; do
 
 	if [ $(docker inspect --format '{{ .State.Running }}' $aaf_service) ] && \
-		[ $(docker inspect --format '{{ .State.Running }}' $cassandra_service) ] && \
-		[ $(docker inspect --format '{{ .State.Running }}' $aaf_service) ]
+		[ $(docker inspect --format '{{ .State.Running }}' $cassandra_service) ]
 	then
 		echo "AAF Service Running"
 		break
diff --git a/plans/aaf/sms-test-plan/teardown.sh b/plans/aaf/sms-test-plan/teardown.sh
index 2c8b3e89..fa5c218f 100644
--- a/plans/aaf/sms-test-plan/teardown.sh
+++ b/plans/aaf/sms-test-plan/teardown.sh
@@ -15,11 +15,5 @@
 # limitations under the License.
 #
 
-docker cp sms:/sms/sms.log .
-cat sms.log
-rm sms.log
-rm -rf config
-docker stop sms vault
-docker rm sms vault
-docker rmi nexus3.onap.org:10001/onap/aaf/sms
-docker rmi docker.io/vault:0.10.0
+kill-instance.sh sms
+kill-instance.sh vault
diff --git a/tests/aaf/aaf-sms-suite/aaf-sms-test.robot b/tests/aaf/aaf-sms-suite/aaf-sms-test.robot
index 78e35222..a88b84f7 100644
--- a/tests/aaf/aaf-sms-suite/aaf-sms-test.robot
+++ b/tests/aaf/aaf-sms-suite/aaf-sms-test.robot
@@ -1,94 +1,69 @@
 *** Settings ***
+Suite Setup       Run keywords      SMS Check SMS API Docker Container      Created header    Created session
 Library       OperatingSystem
 Library       RequestsLibrary
-Library       json
 
 *** Variables ***
-${MESSAGE}    {"ping": "ok"}
 
-#global variables
+*** Test Cases ***
+Create Domain
+    [Template]      Post template
+    /v1/sms/domain      create_domain.json
+    /v1/sms/domain/curltestdomain/secret        create_secret.json
 
+Get information from Domain
+    [Template]  Get template
+    /v1/sms/quorum/status
+    /v1/sms/domain/curltestdomain/secret
+    /v1/sms/domain/curltestdomain/secret/curltestsecret1
 
-*** Test Cases ***
-SMS Check SMS API Docker Container
-    [Documentation]    Checks if SMS docker container is running
-    ${rc}    ${output}=    Run and Return RC and Output    docker ps
-    Log To Console              *********************
-    Log To Console              retrurn_code = ${rc}
-    Log To Console              output = ${output}
-    Should Be Equal As Integers    ${rc}    0
-    Should Contain    ${output}    nexus3.onap.org:10001/onap/aaf/sms
+Delete from Domain
+    [Template]  Delete template
+    /v1/sms/domain/curltestdomain/secret/curltestsecret1
+    /v1/sms/domain/curltestdomain
 
-SMS GetStatus
-    [Documentation]    Gets Backend Status
-    Create Session   SMS            ${SMS_HOSTNAME}:${SMS_PORT}
-    &{headers}=      Create Dictionary  Content-Type=application/json  Accept=application/json
-    ${resp}=         Get Request        SMS   /v1/sms/quorum/status   headers=${headers}
-    Log To Console              *********************
-    Log To Console              response = ${resp}
-    Log To Console              body = ${resp.text}
-    Should Be Equal As Integers    ${resp.status_code}    200
+*** Keywords ***
+Created session
+    Create Session      aaf_sms_session     ${SMS_HOSTNAME}:${SMS_PORT}
+    Set Suite Variable    ${suite_aaf_sms_session}    aaf_sms_session
 
-SMS CreateDomain
-    [Documentation]    Creates a Secret Domain to hold Secrets
-    Create Session   SMS            ${SMS_HOSTNAME}:${SMS_PORT}
-    ${data}          Get Binary File    ${CURDIR}${/}data${/}create_domain.json
-    &{headers}=      Create Dictionary  Content-Type=application/json  Accept=application/json
-    ${resp}=         Post Request        SMS   /v1/sms/domain   data=${data} headers=${headers}
-    Log To Console              *********************
-    Log To Console              response = ${resp}
-    Log To Console              body = ${resp.text}
-    Should Be Equal As Integers    ${resp.status_code}    201
+Created header
+    ${headers}=  Create Dictionary   Content-Type=application/json    Accept=application/json
+    Set Suite Variable    ${suite_headers}    ${headers}
 
-SMS CreateSecret
-    [Documentation]  Create A Secret within the Domain
-    Create Session   SMS            ${SMS_HOSTNAME}:${SMS_PORT}
-    ${data}          Get Binary File    ${CURDIR}${/}data${/}create_secret.json
-    &{headers}=      Create Dictionary  Content-Type=application/json  Accept=application/json
-    ${resp}=         Post Request       SMS   /v1/sms/domain/curltestdomain/secret   data=${data}  headers=${headers}
+Delete template
+    [Documentation]    Deletes from Domain
+    [Arguments]    ${topic}
+    ${resp}=         Delete Request        ${suite_aaf_sms_session}   ${topic}   headers=${suite_headers}
     Log To Console              *********************
     Log To Console              response = ${resp}
     Log To Console              body = ${resp.text}
-    Should Be Equal As Integers    ${resp.status_code}    201
+    Should Be Equal As Integers    ${resp.status_code}    204
 
-SMS ListSecret
-    [Documentation]    Lists all Secret Names within Domain
-    Create Session   SMS            ${SMS_HOSTNAME}:${SMS_PORT}
-    &{headers}=      Create Dictionary  Content-Type=application/json  Accept=application/json
-    ${resp}=         Get Request        SMS   /v1/sms/domain/curltestdomain/secret   headers=${headers}
+Post template
+    [Documentation]    Create A Domain/Secret Names
+    [Arguments]    ${topic}     ${file}
+    ${data}          Get Binary File    ${CURDIR}${/}data${/}${file}
+    ${resp}=         Post Request       ${suite_aaf_sms_session}   ${topic}   data=${data}  headers=${suite_headers}
     Log To Console              *********************
     Log To Console              response = ${resp}
     Log To Console              body = ${resp.text}
-    Should Be Equal As Integers    ${resp.status_code}    200
+    Should Be Equal As Integers    ${resp.status_code}    201
 
-SMS GetSecret
-    [Documentation]    Gets a single Secret with Values from Domain
-    Create Session   SMS            ${SMS_HOSTNAME}:${SMS_PORT}
-    &{headers}=      Create Dictionary  Content-Type=application/json  Accept=application/json
-    ${resp}=         Get Request        SMS   /v1/sms/domain/curltestdomain/secret/curltestsecret1   headers=${headers}
+Get template
+    [Documentation]    Gets from Domain
+    [Arguments]    ${topic}
+    ${resp}=         Get Request        ${suite_aaf_sms_session}   ${topic}   headers=${suite_headers}
     Log To Console              *********************
     Log To Console              response = ${resp}
     Log To Console              body = ${resp.text}
     Should Be Equal As Integers    ${resp.status_code}    200
 
-SMS DeleteSecret
-    [Documentation]    Deletes a Secret referenced by Name from Domain
-    Create Session   SMS            ${SMS_HOSTNAME}:${SMS_PORT}
-    &{headers}=      Create Dictionary  Content-Type=application/json  Accept=application/json
-    ${resp}=         Delete Request        SMS   /v1/sms/domain/curltestdomain/secret/curltestsecret1   headers=${headers}
-    Log To Console              *********************
-    Log To Console              response = ${resp}
-    Log To Console              body = ${resp.text}
-    Should Be Equal As Integers    ${resp.status_code}    204
-
-SMS DeleteDomain
-    [Documentation]    Deletes a Domain referenced by Name
-    Create Session   SMS            ${SMS_HOSTNAME}:${SMS_PORT}
-    &{headers}=      Create Dictionary  Content-Type=application/json  Accept=application/json
-    ${resp}=         Delete Request        SMS   /v1/sms/domain/curltestdomain   headers=${headers}
+SMS Check SMS API Docker Container
+    [Documentation]    Checks if SMS docker container is running
+    ${rc}    ${output}=    Run and Return RC and Output    docker ps
     Log To Console              *********************
-    Log To Console              response = ${resp}
-    Log To Console              body = ${resp.text}
-    Should Be Equal As Integers    ${resp.status_code}    204
-
-*** Keywords ***
+    Log To Console              retrurn_code = ${rc}
+    Log To Console              output = ${output}
+    Should Be Equal As Integers    ${rc}    0
+    Should Contain    ${output}    nexus3.onap.org:10001/onap/aaf/sms
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}