replace aai keywords with aai lib

[testsuite.git] / robot / resources / aai / create_service.robot

diff --git a/robot/resources/aai/create_service.robot b/robot/resources/aai/create_service.robot
index cbf0467..b4e21bb 100644 (file)
--- a/robot/resources/aai/create_service.robot
+++ b/robot/resources/aai/create_service.robot
@@ -4,7 +4,8 @@ Documentation     Create A&AI Customer API.
 Resource    aai_interface.robot
 Library    Collections
 Library           ONAPLibrary.Utilities
-Library           ONAPLibrary.Templating    
+Library    ONAPLibrary.Templating    WITH NAME    Templating
+Library    ONAPLibrary.AAI    WITH NAME    AAI
 
 
 *** Variables ***
@@ -27,14 +28,14 @@ Create Service
     [Arguments]    ${service_type}
     ${uuid}=    Generate UUID4
     ${arguments}=    Create Dictionary    service_type=${service_type}    UUID=${uuid}
-    Create Environment    aai    ${GLOBAL_TEMPLATE_FOLDER}
-    ${data}=   Apply Template    aai   ${AAI_ADD_SERVICE_BODY}    ${arguments}
+    Templating.Create Environment    aai    ${GLOBAL_TEMPLATE_FOLDER}
+    ${data}=   Templating.Apply Template    aai   ${AAI_ADD_SERVICE_BODY}    ${arguments}
     ${fullpath}=    Catenate         ${INDEX PATH}${ROOT_SERVICE_PATH}/service/${uuid}
-       ${put_resp}=    Run A&AI Put Request     ${fullpath}    ${data}
+    ${auth}=  Create List  ${GLOBAL_AAI_USERNAME}    ${GLOBAL_AAI_PASSWORD}
+       ${put_resp}=    AAI.Run Put Request     ${AAI_FRONTEND_ENDPOINT}    ${fullpath}    ${data}        auth=${auth}
     Should Be Equal As Strings         ${put_resp.status_code}         201
        [Return]  ${put_resp.status_code}
 
-
 Delete Service If Exists
     [Documentation]    Deletes a service in A&AI if it exists
     [Arguments]    ${service_type}
@@ -48,13 +49,14 @@ Delete Service
     ${uuid}=    Get From Dictionary    ${dict}     service-id
     ${resource_version}=    Get From Dictionary    ${dict}     resource-version
     ${fullpath}=    Catenate         ${INDEX PATH}${ROOT_SERVICE_PATH}/service/${uuid}
-       ${resp}=    Run A&AI Delete Request    ${fullpath}    ${resource_version}
+    ${auth}=  Create List  ${GLOBAL_AAI_USERNAME}    ${GLOBAL_AAI_PASSWORD}
+       ${resp}=    AAI.Run Delete Request    ${AAI_FRONTEND_ENDPOINT}    ${fullpath}    ${resource_version}        auth=${auth}
     Should Be Equal As Strings         ${resp.status_code}     204
 
-
 Get Services
     [Documentation]    Creates a service in A&AI
-       ${resp}=    Run A&AI Get Request     ${INDEX PATH}${ROOT_SERVICE_PATH}
+    ${auth}=  Create List  ${GLOBAL_AAI_USERNAME}    ${GLOBAL_AAI_PASSWORD}
+       ${resp}=    AAI.Run Get Request     ${AAI_FRONTEND_ENDPOINT}    ${INDEX PATH}${ROOT_SERVICE_PATH}        auth=${auth}
        ${dict}=    Create Dictionary
     ${status}    ${value}=    Run Keyword And Ignore Error    Should Be Equal As Strings       ${resp.status_code}     200
     Run Keyword If    '${status}' == 'PASS'    Update Service Dictionary    ${dict}    ${resp.json()}
@@ -62,10 +64,8 @@ Get Services
 
 Update Service Dictionary
     [Arguments]    ${dict}    ${json}
-    ${list}=    Evaluate    ${json}['service']
+    @{list}=  Copy List   ${json['service']}
     :FOR   ${map}    IN    @{list}
     \    ${status}    ${service_type}=     Run Keyword And Ignore Error    Get From Dictionary    ${map}    service-description
     \    Run Keyword If    '${status}' == 'PASS'    Set To Dictionary    ${dict}    ${service_type}=${map}
-    Log    ${dict}
-
-
+    Log    ${dict}
\ No newline at end of file