Replace json_templater usage

[integration/csit.git] / tests / sdc-dcae-d / dcaed / asdc_interface.robot

diff --git a/tests/sdc-dcae-d/dcaed/asdc_interface.robot b/tests/sdc-dcae-d/dcaed/asdc_interface.robot
index 88053e8..c01dc09 100644 (file)
--- a/tests/sdc-dcae-d/dcaed/asdc_interface.robot
+++ b/tests/sdc-dcae-d/dcaed/asdc_interface.robot
@@ -3,7 +3,7 @@ Library           Collections
 Library           OperatingSystem
 Library           RequestsLibrary
 Library           ONAPLibrary.Utilities
-
+Library           ONAPLibrary.Templating    WITH NAME    Templating
 Resource          common.robot
 
 ***Variables ***
@@ -14,14 +14,11 @@ ${ASDC_CATALOG_SERVICE_RESOURCE_INSTANCE_PATH}    /resourceInstance
 ${ASDC_CATALOG_SERVICE_DISTRIBUTION_STATE_PATH}    /distribution-state
 ${ASDC_DISTRIBUTION_STATE_APPROVE_PATH}    /approve
 
-${ASDC_CATALOG_RESOURCE_TEMPLATE}   ${ASSETS_DIR}component_catalog_resource.template
-${ASDC_CATALOG_SERVICE_TEMPLATE}    ${ASSETS_DIR}catalog_service.template
-${ASDC_ARTIFACT_UPLOAD_TEMPLATE}    ${ASSETS_DIR}artifact_upload.template
-${ASDC_USER_REMARKS_TEMPLATE}    ${ASSETS_DIR}user_remarks.template
-${DCAE_VFCMT_TEMPLATE}   ${ASSETS_DIR}create_vfcmt.template
-${DCAE_COMPOSITION_TEMPLATE}   ${ASSETS_DIR}dcae_composition.template
-${DCAE_MONITORING_CONFIGURATION_TEMPLATE}   ${ASSETS_DIR}dcae_monitoring_configuration.template
-${ASDC_RESOURCE_INSTANCE_TEMPLATE}    ${ASSETS_DIR}resource_instance.template
+${SDC_CATALOG_RESOURCE_TEMPLATE}   component_catalog_resource.jinja
+${SDC_CATALOG_SERVICE_TEMPLATE}    catalog_service.jinja
+${SDC_ARTIFACT_UPLOAD_TEMPLATE}    artifact_upload.jinja
+${SDC_USER_REMARKS_TEMPLATE}    user_remarks.jinja
+${SDC_RESOURCE_INSTANCE_TEMPLATE}    resource_instance.jinja
 
 ${ASDC_BE_ENDPOINT}  http://localhost:8080
 
@@ -31,7 +28,8 @@ Create Catalog Resource Data
     [Documentation]    Creates and returns data for ASDC Catalog Resource
     [Arguments]    ${resource_name}    ${vendor_name}
     ${map}=    Create Dictionary    resource_name=${resource_name}    vendor_name=${vendor_name}
-    ${data}=   json_templater.Fill JSON Template File    ${ASDC_CATALOG_RESOURCE_TEMPLATE}    ${map}
+    Templating.Create Environment    sdc_catalog_resource    ${ASSETS_DIR}
+    ${data}=   Templating.Apply Template    sdc_catalog_resource   ${SDC_CATALOG_RESOURCE_TEMPLATE}    ${map}
     [Return]    ${data}
 
 # Based on testsuite/robot/resources/asdc_interface.robot's 'Post ASDC Resource Request' keyword
@@ -59,13 +57,15 @@ Run ASDC MD5 Post Request Unauthenticated
     [Documentation]    Runs an ASDC post request with MD5 Checksum header without authentication and returns the HTTP response
     [Arguments]    ${data_path}    ${data}    ${user}=${ASDC_DESIGNER_USER_ID}   ${MY_ASDC_BE_ENDPOINT}=${ASDC_BE_ENDPOINT}
     Log    Creating session ${MY_ASDC_BE_ENDPOINT}
+    # This is needed to ensure that the data is in dict format - otherwise the checksum will not match
+    ${dict_data}=     evaluate  json.loads('''${data}''')    json
     ${session}=    Create Session       asdc    ${MY_ASDC_BE_ENDPOINT}
     ${uuid}=    Generate UUID4
-    ${data_string}=   Evaluate    json.dumps(${data})     json
+    ${data_string}=   Evaluate    json.dumps(${dict_data})     json
     ${md5checksum}=   Evaluate    md5.new('''${data_string}''').hexdigest()   modules=md5
     ${base64md5checksum}=  Evaluate     base64.b64encode("${md5checksum}")     modules=base64
     ${headers}=  Create Dictionary     Accept=application/json    Content-Type=application/json    USER_ID=${user}    X-TransactionId=${GLOBAL_APPLICATION_ID}-${uuid}    X-FromAppId=${GLOBAL_APPLICATION_ID}   Content-MD5=${base64md5checksum}
-    ${resp}=    Post Request    asdc    ${data_path}     data=${data}    headers=${headers}
+    ${resp}=    Post Request    asdc    ${data_path}     data=${dict_data}    headers=${headers}
     Log   Received response from asdc: ${resp.text}
     [Return]    ${resp}
 
@@ -76,7 +76,8 @@ Add Tosca Artifact To Resource
     ${blueprint_data}    OperatingSystem.Get File    ${ASSETS_DIR}${artifact}.yaml
     ${payloadData}=   Evaluate   base64.b64encode('''${blueprint_data}'''.encode('utf-8'))   modules=base64
     ${dict}=    Create Dictionary  artifactLabel=${artifact}  artifactName=${artifact}.yaml   artifactType=DCAE_TOSCA  artifactGroupType=DEPLOYMENT  description=${artifact}.yaml  payloadData=${payloadData}
-    ${data}=   Fill JSON Template File    ${ASDC_ARTIFACT_UPLOAD_TEMPLATE}    ${dict}
+    Templating.Create Environment    sdc_artifact_upload    ${ASSETS_DIR}
+    ${data}=   Templating.Apply Template    sdc_artifact_upload   ${SDC_ARTIFACT_UPLOAD_TEMPLATE}    ${dict}
     # POST artifactUpload to resource
     ${resp}=    Run ASDC MD5 Post Request Unauthenticated    ${ASDC_CATALOG_RESOURCES_PATH}/${vf_id}/artifacts    ${data}   ${ASDC_DESIGNER_USER_ID}
     Should Be Equal As Strings  ${resp.status_code}     200
@@ -87,7 +88,8 @@ Certify ASDC Catalog Resource
     [Documentation]    Certifies an ASDC Catalog Resource by its id and returns the new id
     [Arguments]    ${catalog_resource_id}    ${user_id}=${ASDC_TESTER_USER_ID}
     ${map}=    Create Dictionary    user_remarks=Robot remarks
-    ${data}=   Fill JSON Template File    ${ASDC_USER_REMARKS_TEMPLATE}    ${map}
+    Templating.Create Environment    sdc_user_remarks    ${ASSETS_DIR}
+    ${data}=   Templating.Apply Template    sdc_user_remarks   ${SDC_USER_REMARKS_TEMPLATE}    ${map}
     ${resp}=    Run ASDC Post Request Unauthenticated    ${ASDC_CATALOG_RESOURCES_PATH}/${catalog_resource_id}${ASDC_CATALOG_LIFECYCLE_PATH}/certify    ${data}    ${user_id}
     Should Be Equal As Strings  ${resp.status_code}     200
     [Return]    ${resp.json()['uniqueId']}   ${resp.json()['uuid']}
@@ -96,7 +98,8 @@ Add Catalog Service For Monitoring Template
     [Documentation]    Creates an ASDC Catalog Service for Monitoring Template with given name
     [Arguments]   ${service_name}
     ${map}=    Create Dictionary    service_name=${service_name}
-    ${data}=   Fill JSON Template File    ${ASDC_CATALOG_SERVICE_TEMPLATE}    ${map}
+    Templating.Create Environment    sdc_catalog_service    ${ASSETS_DIR}
+    ${data}=   Templating.Apply Template    sdc_catalog_service   ${SDC_CATALOG_SERVICE_TEMPLATE}    ${map}
     ${resp}=    Run ASDC Post Request Unauthenticated    ${ASDC_CATALOG_SERVICES_PATH}    ${data}
     Should Be Equal As Strings  ${resp.status_code}     201
     [Return]    ${resp.json()['uniqueId']}   ${resp.json()['uuid']}
@@ -109,7 +112,8 @@ Add ASDC Resource Instance
     ${xoffset}=    Set Variable   ${xoffset+306}
     ${yoffset}=    Set Variable   ${yoffset+248}
     ${map}=    Create Dictionary    catalog_resource_id=${catalog_resource_id}    catalog_resource_name=${catalog_resource_name}    milli_timestamp=${milli_timestamp}   posX=${xoffset}    posY=${yoffset}    originType=${resourceType}
-    ${data}=   Fill JSON Template File    ${ASDC_RESOURCE_INSTANCE_TEMPLATE}    ${map}
+    Templating.Create Environment    sdc_resource_instance    ${ASSETS_DIR}
+    ${data}=   Templating.Apply Template    sdc_resource_instance   ${SDC_RESOURCE_INSTANCE_TEMPLATE}    ${map}
     ${resp}=    Run ASDC Post Request Unauthenticated    ${ASDC_CATALOG_SERVICES_PATH}/${catalog_service_id}${ASDC_CATALOG_SERVICE_RESOURCE_INSTANCE_PATH}     ${data}    ${ASDC_DESIGNER_USER_ID}
     Should Be Equal As Strings  ${resp.status_code}     201
     [Return]    ${resp.json()['uniqueId']}   ${resp.json()['name']}
@@ -120,7 +124,8 @@ Checkin ASDC Catalog Service
     [Documentation]    Checks in an ASDC Catalog Service by its id
     [Arguments]    ${catalog_service_id}
     ${map}=    Create Dictionary    user_remarks=Robot remarks
-    ${data}=   Fill JSON Template File    ${ASDC_USER_REMARKS_TEMPLATE}    ${map}
+    Templating.Create Environment    sdc_user_remarks    ${ASSETS_DIR}
+    ${data}=   Templating.Apply Template    sdc_user_remarks   ${SDC_USER_REMARKS_TEMPLATE}    ${map}
     ${resp}=    Run ASDC Post Request Unauthenticated    ${ASDC_CATALOG_SERVICES_PATH}/${catalog_service_id}${ASDC_CATALOG_LIFECYCLE_PATH}/checkin    ${data}    ${ASDC_DESIGNER_USER_ID}
     Should Be Equal As Strings  ${resp.status_code}     200
     [Return]    ${resp.json()}
@@ -129,7 +134,8 @@ Request Certify ASDC Catalog Service
     [Documentation]    Requests certification of an ASDC Catalog Service by its id
     [Arguments]    ${catalog_service_id}
     ${map}=    Create Dictionary    user_remarks=Robot remarks
-    ${data}=   Fill JSON Template File    ${ASDC_USER_REMARKS_TEMPLATE}    ${map}
+    Templating.Create Environment    sdc_user_remarks    ${ASSETS_DIR}
+    ${data}=   Templating.Apply Template    sdc_user_remarks   ${SDC_USER_REMARKS_TEMPLATE}    ${map}
     ${resp}=    Run ASDC Post Request Unauthenticated    ${ASDC_CATALOG_SERVICES_PATH}/${catalog_service_id}${ASDC_CATALOG_LIFECYCLE_PATH}/certificationRequest    ${data}    ${ASDC_DESIGNER_USER_ID}
     Should Be Equal As Strings  ${resp.status_code}     200
     [Return]    ${resp.json()}
@@ -145,7 +151,8 @@ Certify ASDC Catalog Service
     [Documentation]    Certifies an ASDC Catalog Service by its id and returns the new id
     [Arguments]    ${catalog_service_id}
     ${map}=    Create Dictionary    user_remarks=Robot remarks
-    ${data}=   Fill JSON Template File    ${ASDC_USER_REMARKS_TEMPLATE}    ${map}
+    Templating.Create Environment    sdc_user_remarks    ${ASSETS_DIR}
+    ${data}=   Templating.Apply Template    sdc_user_remarks   ${SDC_USER_REMARKS_TEMPLATE}    ${map}
     ${resp}=    Run ASDC Post Request Unauthenticated    ${ASDC_CATALOG_SERVICES_PATH}/${catalog_service_id}${ASDC_CATALOG_LIFECYCLE_PATH}/certify    ${data}    ${ASDC_TESTER_USER_ID}
     Should Be Equal As Strings  ${resp.status_code}     200
     [Return]    ${resp.json()['uniqueId']}
@@ -154,7 +161,8 @@ Approve ASDC Catalog Service
     [Documentation]    Approves an ASDC Catalog Service by its id
     [Arguments]    ${catalog_service_id}
     ${map}=    Create Dictionary    user_remarks=Robot remarks
-    ${data}=   Fill JSON Template File    ${ASDC_USER_REMARKS_TEMPLATE}    ${map}
+    Templating.Create Environment    sdc_user_remarks    ${ASSETS_DIR}
+    ${data}=   Templating.Apply Template    sdc_user_remarks   ${SDC_USER_REMARKS_TEMPLATE}    ${map}
     ${resp}=    Run ASDC Post Request Unauthenticated    ${ASDC_CATALOG_SERVICES_PATH}/${catalog_service_id}${ASDC_CATALOG_SERVICE_DISTRIBUTION_STATE_PATH}${ASDC_DISTRIBUTION_STATE_APPROVE_PATH}    ${data}    ${ASDC_GOVERNOR_USER_ID}
     Should Be Equal As Strings  ${resp.status_code}     200
     [Return]    ${resp.json()}