replace aai, closeloop, sdc with jinja

[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 e1be288..8fed0c7 100644 (file)
--- a/robot/resources/aai/create_complex.robot
+++ b/robot/resources/aai/create_complex.robot
@@ -1,13 +1,10 @@
 *** Settings ***
 Documentation    Create A&AI Customer API.
-...
-...                  Create A&AI Customer API
 
-Resource    ../json_templater.robot
 Resource    aai_interface.robot
 Library    OperatingSystem
 Library    Collections
-
+Library    ONAPLibrary.Templating    
 
 
 *** Variables ***
@@ -15,8 +12,7 @@ ${COMPLEX_INDEX_PATH}     /aai/v11
 ${ROOT_COMPLEXES_PATH}  /cloud-infrastructure/complexes
 ${ROOT_COMPLEX_PATH}  /cloud-infrastructure/complexes/complex
 
-${SYSTEM USER}    robot-ete
-${AAI_ADD_COMPLEX_BODY}=    robot/assets/templates/aai/add_complex_body.template
+${AAI_ADD_COMPLEX_BODY}    aai/add_complex_body.jinja
 
 *** Keywords ***
 Inventory Complex If Not Exists
@@ -27,14 +23,15 @@ Inventory Complex If Not Exists
     Inventory Complex  ${complex_name}   ${physical_location_id}   ${cloud_owner}   ${region}   ${owner_defined_type}
 
 Inventory Complex
-    [Documentation]    Inventorys a COmplex in A&AI
+    [Documentation]    Inventorys a Complex in A&AI
     [Arguments]    ${complex_name}   ${physical_location_id}   ${cloud_owner}   ${region}   ${owner_defined_type}
     ${arguments}=    Create Dictionary     complex_name=${complex_name}
     Set To Dictionary   ${arguments}     physical_location_id=${physical_location_id}
     Set To Dictionary   ${arguments}     cloud_owner=${cloud_owner}
     Set To Dictionary   ${arguments}     region=${region}
     Set To Dictionary   ${arguments}     owner_defined_type=${owner_defined_type}
-    ${data}=   Fill JSON Template File    ${AAI_ADD_COMPLEX_BODY}    ${arguments}
+    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}
     ${status_string}=    Convert To String    ${put_resp.status_code}
     Should Match Regexp    ${status_string}    ^(201|200)$