Finalize CSIT script regardless of setup success

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

diff --git a/tests/sdc-dcae-d/dcaed/monitoring_configuration_service_test.robot b/tests/sdc-dcae-d/dcaed/monitoring_configuration_service_test.robot
index 9a4bbc6..49e4faa 100644 (file)
--- a/tests/sdc-dcae-d/dcaed/monitoring_configuration_service_test.robot
+++ b/tests/sdc-dcae-d/dcaed/monitoring_configuration_service_test.robot
@@ -1,78 +1,22 @@
 *** Settings ***
-Library           ONAPLibrary.Utilities
-
-Resource          asdc_interface.robot
-Resource          dcaed_interface.robot
+Resource          sdc_interface.robot
+Resource          sdc_dcaed_interface.robot
 
 *** Test Cases ***
+# For now, this test case implements the steps described in
+# https://wiki.onap.org/display/DW/How+to+Create+a+Service+with+a+Monitoring+Configuration+using+SDC
 Create Service With Monitoring Configuration Test
-    [Tags]  dcaed
-    [Documentation]   Create a service with a monitoring configuration -
-    ...               this test case implements the steps described in
-    ...               https://wiki.onap.org/display/DW/How+to+Create+a+Service+with+a+Monitoring+Configuration+using+SDC
-    ...               excluding distribution of the service
+    [Tags]  sdc-dcae-d
+    [Documentation]   Create a service with a monitoring configuration
 
-    ${unique_postfix}=  Generate Unique Postfix
+    ${unique_postfix}=  sdc_interface.Generate Unique Postfix
     ${test_vf_name}=   Set Variable   TestVF_${unique_postfix}
     ${test_cs_name}=   Set Variable   TestService_${unique_postfix}
     ${test_vfcmt_name}=   Set Variable   TestVFCMT_${unique_postfix}
     ${test_mc_name}=   Set Variable   TestMC_${unique_postfix}
 
-    ${cert_vf_unique_id}    ${cert_vf_uuid}   Onboard DCAE Microservice   ${test_vf_name}
-    ${cert_vfcmt_uuid}   Create Monitoring Template   ${test_vfcmt_name}   ${cert_vf_uuid}
-    ${cs_unique_id}   Create Monitoring Configuration   ${test_cs_name}   ${cert_vf_unique_id}   ${test_vf_name}   ${cert_vfcmt_uuid}   ${test_mc_name}
-    Approve Service    ${cs_unique_id}
-
-*** Keywords ***
-Generate Unique Postfix
-    [Documentation]   Create and return unique postfix to be used in various unique names  
-    ${tmp_id} =   Generate Timestamp
-    ${tmp_str} =   Convert To String   ${tmp_id}
-    [return]    ${tmp_str}
-
-Onboard DCAE Microservice
-    [Documentation]   Create DCAE Microservice with a given name, add Tosca artifacts to it and certify it
-    ...               Return the unique_id and uuid of the certified VF
-    [Arguments]   ${test_vf_name}
-    ${data}=  asdc_interface.Create Catalog Resource Data   ${test_vf_name}   TestVendor
-    ${vf_unique_id}=  asdc_interface.Post ASDC Resource Request Unauthenticated  ${data}
-
-    asdc_interface.Add Tosca Artifact to Resource   template   ${vf_unique_id}
-    asdc_interface.Add Tosca Artifact to Resource   translate   ${vf_unique_id}
-    asdc_interface.Add Tosca Artifact to Resource   schema   ${vf_unique_id}
-
-    ${cert_vf_unique_id}    ${cert_vf_uuid}    asdc_interface.Certify ASDC Catalog Resource   ${vf_unique_id}   ${ASDC_DESIGNER_USER_ID}
-    [return]   ${cert_vf_unique_id}    ${cert_vf_uuid}
-
-Create Monitoring Template
-    [Documentation]   Create a new monitoring template containing the DCAE VF, certify it and return the uuid   
-    [Arguments]   ${vfcmt_name}   ${vf_uuid}
-    ${vfcmt_uuid}   dcaed_interface.Add VFCMT To DCAE-DS   ${vfcmt_name}
-    dcaed_interface.Save Composition   ${vfcmt_uuid}   ${vf_uuid}
-
-    # Note that certification is not instructed in
-    # https://wiki.onap.org/display/DW/How+to+Create+a+Service+with+a+Monitoring+Configuration+using+SDC
-    # due to limitations of GUI so this test case goes beyond the instructions at this certification step
-
-    ${cert_vfcmt_uuid}   dcaed_interface.Certify VFCMT   ${vfcmt_uuid}
-    [return]   ${cert_vfcmt_uuid}
-
-Create Monitoring Configuration
-    [Documentation]   Create a monitoring configuration for a given service based on a previously created VFCMT 
-    ...               Return the unique_id of the created catalog service for the monitoring configuration
-    [Arguments]   ${service_name}   ${vf_unique_id}   ${vf_name}   ${vfcmt_uuid}   ${mc_name}
-    ${cs_unique_id}   ${cs_uuid}    asdc_interface.Add Catalog Service For Monitoring Template   ${service_name}
-    ${vfi_uuid}  ${vfi_name}   asdc_interface.Add ASDC Resource Instance   ${cs_unique_id}   ${vf_unique_id}   ${vf_name}
-    ${mc_uuid}   dcaed_interface.Add Monitoring Configuration To DCAE-DS  ${vfcmt_uuid}   ${cs_uuid}    ${vfi_name}   ${mc_name}
-    dcaed_interface.Submit Monitoring Configuration To DCAE-DS   ${mc_uuid}   ${cs_uuid}  ${vfi_name}
-    [return]   ${cs_unique_id}
-
-Approve Service
-    [Documentation]    Perform the required steps to certify and approve the given ASDC catalog service
-    [Arguments]    ${cs_unique_id}
-    asdc_interface.Checkin ASDC Catalog Service    ${cs_unique_id}
-    asdc_interface.Request Certify ASDC Catalog Service    ${cs_unique_id}
-    asdc_interface.Start Certify ASDC Catalog Service    ${cs_unique_id}
-    ${cert_cs_unique_id}=    asdc_interface.Certify ASDC Catalog Service    ${cs_unique_id}
-    asdc_interface.Approve ASDC Catalog Service    ${cert_cs_unique_id}
-
+    ${cert_vf_unique_id}    ${cert_vf_uuid}   sdc_interface.Onboard DCAE Microservice   ${test_vf_name}
+    ${cert_vfcmt_uuid}   sdc_dcaed_interface.Create Monitoring Template   ${test_vfcmt_name}   ${cert_vf_uuid}
+    ${cs_unique_id}   ${cs_uuid}    ${vfi_name}   sdc_interface.Create Monitoring Configuration   ${test_cs_name}   ${cert_vf_unique_id}   ${test_vf_name}
+    sdc_dcaed_interface.Create Monitoring Configuration To DCAE-DS   ${cert_vfcmt_uuid}   ${cs_uuid}    ${vfi_name}    ${test_mc_name}
+    sdc_interface.Certify And Approve SDC Catalog Service    ${cs_unique_id}