replace aai keywords with aai lib

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

diff --git a/robot/resources/aai/create_complex.robot b/robot/resources/aai/create_complex.robot
index 8fed0c7..43a641a 100644 (file)
--- a/robot/resources/aai/create_complex.robot
+++ b/robot/resources/aai/create_complex.robot
@@ -4,7 +4,8 @@ Documentation     Create A&AI Customer API.
 Resource    aai_interface.robot
 Library    OperatingSystem
 Library    Collections
-Library    ONAPLibrary.Templating    
+Library    ONAPLibrary.Templating    WITH NAME    Templating
+Library    ONAPLibrary.AAI    WITH NAME    AAI
 
 
 *** Variables ***
@@ -18,7 +19,8 @@ ${AAI_ADD_COMPLEX_BODY}    aai/add_complex_body.jinja
 Inventory Complex If Not Exists
     [Documentation]    Creates a service in A&AI if it doesn't exist
     [Arguments]    ${complex_name}   ${physical_location_id}   ${cloud_owner}   ${region}   ${owner_defined_type}
-    ${get_resp}=    Run A&AI Get Request     ${COMPLEX_INDEX_PATH}${ROOT_COMPLEX_PATH}/${physical_location_id}
+    ${auth}=  Create List  ${GLOBAL_AAI_USERNAME}    ${GLOBAL_AAI_PASSWORD}
+    ${get_resp}=    AAI.Run Get Request     ${AAI_FRONTEND_ENDPOINT}    ${COMPLEX_INDEX_PATH}${ROOT_COMPLEX_PATH}/${physical_location_id}        auth=${auth}
     Return From Keyword If    '${get_resp.status_code}' == '200'
     Inventory Complex  ${complex_name}   ${physical_location_id}   ${cloud_owner}   ${region}   ${owner_defined_type}
 
@@ -32,32 +34,36 @@ Inventory Complex
     Set To Dictionary   ${arguments}     owner_defined_type=${owner_defined_type}
     Create Environment    aai    ${GLOBAL_TEMPLATE_FOLDER}
     ${data}=   Apply Template    aai   ${AAI_ADD_COMPLEX_BODY}    ${arguments}
-       ${put_resp}=    Run A&AI Put Request     ${COMPLEX_INDEX_PATH}${ROOT_COMPLEX_PATH}/${physical_location_id}     ${data}
+    ${auth}=  Create List  ${GLOBAL_AAI_USERNAME}    ${GLOBAL_AAI_PASSWORD}
+       ${put_resp}=    AAI.Run Put Request     ${AAI_FRONTEND_ENDPOINT}    ${COMPLEX_INDEX_PATH}${ROOT_COMPLEX_PATH}/${physical_location_id}     ${data}        auth=${auth}
     ${status_string}=    Convert To String    ${put_resp.status_code}
     Should Match Regexp    ${status_string}    ^(201|200)$
 
 Delete Complex If Exists
     [Documentation]    Removes a complex
     [Arguments]    ${physical_location_id}
-    ${get_resp}=    Run A&AI Get Request     ${COMPLEX_INDEX_PATH}${ROOT_COMPLEX_PATH}/${physical_location_id}
+    ${get_resp}=    AAI.Run Get Request     ${AAI_FRONTEND_ENDPOINT}    ${COMPLEX_INDEX_PATH}${ROOT_COMPLEX_PATH}/${physical_location_id}
     Run Keyword If    '${get_resp.status_code}' == '200'    Delete Complex    ${physical_location_id}   ${get_resp.json()}
 
 Delete Complex
     [Arguments]    ${physical_location_id}    ${json}
     ${resource_version}=   Catenate   ${json['resource-version']}
-    ${put_resp}=    Run A&AI Delete Request    ${COMPLEX_INDEX_PATH}${ROOT_COMPLEX_PATH}/${physical_location_id}    ${resource_version}
+    ${auth}=  Create List  ${GLOBAL_AAI_USERNAME}    ${GLOBAL_AAI_PASSWORD}
+    ${put_resp}=    AAI.Run Delete Request     ${AAI_FRONTEND_ENDPOINT}    ${COMPLEX_INDEX_PATH}${ROOT_COMPLEX_PATH}/${physical_location_id}    ${resource_version}        auth=${auth}
     Should Be Equal As Strings         ${put_resp.status_code}         204
 
 Get Complex
     [Documentation]   Return a complex
     [Arguments]    ${physical_location_id}
-       ${resp}=    Run A&AI Get Request     ${COMPLEX_INDEX_PATH}${ROOT_COMPLEX_PATH}/${physical_location_id}
+    ${auth}=  Create List  ${GLOBAL_AAI_USERNAME}    ${GLOBAL_AAI_PASSWORD}
+       ${resp}=    AAI.Run Get Request     ${AAI_FRONTEND_ENDPOINT}    ${COMPLEX_INDEX_PATH}${ROOT_COMPLEX_PATH}/${physical_location_id}        auth=${auth}
     Should Be Equal As Strings         ${resp.status_code}     200
        [Return]  ${resp.json()}
 
 Get Complexes
     [Documentation]   Return all complexes
-       ${resp}=    Run A&AI Get Request     ${COMPLEX_INDEX_PATH}${ROOT_COMPLEXES_PATH}
+    ${auth}=  Create List  ${GLOBAL_AAI_USERNAME}    ${GLOBAL_AAI_PASSWORD}
+       ${resp}=    AAI.Run Get Request     ${AAI_FRONTEND_ENDPOINT}    ${COMPLEX_INDEX_PATH}${ROOT_COMPLEXES_PATH}        auth=${auth}
     Should Be Equal As Strings         ${resp.status_code}     200
     Log    ${resp.json()}
        [Return]  ${resp.json()}
\ No newline at end of file