diff options
Diffstat (limited to 'tests/sdc-dcae-d/dcaed/dcaed_interface.robot')
-rw-r--r-- | tests/sdc-dcae-d/dcaed/dcaed_interface.robot | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/tests/sdc-dcae-d/dcaed/dcaed_interface.robot b/tests/sdc-dcae-d/dcaed/dcaed_interface.robot index e3aa4b91..fb1e7b43 100644 --- a/tests/sdc-dcae-d/dcaed/dcaed_interface.robot +++ b/tests/sdc-dcae-d/dcaed/dcaed_interface.robot @@ -1,16 +1,15 @@ *** Settings *** Library json Library ONAPLibrary.Utilities - -Resource json_templater.robot +Library ONAPLibrary.Templating WITH NAME Templating Resource common.robot *** Variables *** ${DCAE_PATH} /dcae ${DCAE_CREATE_BLUEPRINT_PATH} /SERVICE/createBluePrint -${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 +${DCAE_VFCMT_TEMPLATE} create_vfcmt.jinja +${DCAE_COMPOSITION_TEMPLATE} dcae_composition.jinja +${DCAE_MONITORING_CONFIGURATION_TEMPLATE} dcae_monitoring_configuration.jinja ${DCAE_BE_ENDPOINT} http://localhost:8082 *** Keywords *** @@ -19,7 +18,8 @@ Add VFCMT To DCAE-DS [Documentation] Create VFCMT with the given name and return its uuid [Arguments] ${vfcmt_name} ${map}= Create Dictionary vfcmtName=${vfcmt_name} description=VFCMT created by robot - ${data}= Fill JSON Template File ${DCAE_VFCMT_TEMPLATE} ${map} + Create Environment create_vfcmt ${ASSETS_DIR} + ${data}= Apply Template create_vfcmt ${DCAE_VFCMT_TEMPLATE} ${map} ${resp}= Run DCAE-DS Post Request ${DCAE_PATH}/createVFCMT ${data} ${ASDC_DESIGNER_USER_ID} Should Be Equal As Strings ${resp.status_code} 200 [Return] ${resp.json()['uuid']} @@ -49,7 +49,8 @@ Run DCAE-DS Put Request Save Composition [Arguments] ${vfcmt_uuid} ${vf_uuid} ${map}= Create Dictionary cid=${vfcmt_uuid} vf_id=${vf_uuid} - ${data}= Fill JSON Template File ${DCAE_COMPOSITION_TEMPLATE} ${map} + Create Environment dcae_composition ${ASSETS_DIR} + ${data}= Apply Template dcae_composition ${DCAE_COMPOSITION_TEMPLATE} ${map} ${resp}= Run DCAE-DS Post Request ${DCAE_PATH}/saveComposition/${vfcmt_uuid} ${data} ${ASDC_DESIGNER_USER_ID} Should Be Equal As Strings ${resp.status_code} 200 @@ -62,7 +63,8 @@ Certify VFCMT Add Monitoring Configuration To DCAE-DS [Arguments] ${vfcmt_uuid} ${cs_uuid} ${vfi_name} ${mc_name} ${map}= Create Dictionary template_uuid=${vfcmt_uuid} service_uuid=${cs_uuid} vfi_name=${vfi_name} name=${mc_name} - ${data}= Fill JSON Template File ${DCAE_MONITORING_CONFIGURATION_TEMPLATE} ${map} + Create Environment dcae_monitoring_configuration ${ASSETS_DIR} + ${data}= Apply Template dcae_monitoring_configuration ${DCAE_MONITORING_CONFIGURATION_TEMPLATE} ${map} ${resp}= Run DCAE-DS Post Request ${DCAE_PATH}/importMC ${data} ${ASDC_DESIGNER_USER_ID} Should Be Equal As Strings ${resp.status_code} 200 [Return] ${resp.json()['vfcmt']['uuid']} |