diff options
Diffstat (limited to 'tests')
8 files changed, 414 insertions, 53 deletions
diff --git a/tests/dcaegen2-services-pmsh/testcases/assets/cbs-expectation-unlocked-config.json b/tests/dcaegen2-services-pmsh/testcases/assets/cbs-expectation-unlocked-config.json new file mode 100644 index 00000000..6f6972f4 --- /dev/null +++ b/tests/dcaegen2-services-pmsh/testcases/assets/cbs-expectation-unlocked-config.json @@ -0,0 +1,119 @@ +[ + { + "httpRequest": { + "path": "/service_component_all/.*" + }, + "httpResponse": { + "statusCode": 200, + "headers": { + "content-type": [ + "application/json" + ] + }, + "body": { + "type": "JSON", + "json": { + "policy": { + "subscription": { + "subscriptionName": "ExtraPM-All-gNB-R2B", + "administrativeState": "UNLOCKED", + "fileBasedGP": 15, + "fileLocation": "/pm/pm.xml", + "nfFilter": { + "swVersions": [ + "1.0.0", + "1.0.1" + ], + "nfNames": [ + "^pnf.*", + "^vnf.*" + ] + }, + "measurementGroups": [ + { + "measurementGroup": { + "measurementTypes": [ + { + "measurementType": "countera" + }, + { + "measurementType": "counterb" + } + ], + "managedObjectDNsBasic": [ + { + "DN": "dna" + }, + { + "DN": "dnb" + } + ] + } + }, + { + "measurementGroup": { + "measurementTypes": [ + { + "measurementType": "counterc" + }, + { + "measurementType": "counterd" + } + ], + "managedObjectDNsBasic": [ + { + "DN": "dnc" + }, + { + "DN": "dnd" + } + ] + } + } + ] + } + }, + "config": { + "control_loop_name": "pmsh-control-loop", + "operational_policy_name": "pmsh-operational-policy", + "cert_path": "/opt/app/pmsh/etc/certs/cert.pem", + "streams_publishes": { + "policy_pm_publisher": { + "dmaap_info": { + "client_id": "1475976809466", + "client_role": "org.onap.dcae.pmPublisher", + "topic_url": "https://mr-sim:1080/events/org.onap.dmaap.mr.PM_SUBSCRIPTIONS", + "location": "san-francisco" + }, + "type": "message_router" + } + }, + "streams_subscribes": { + "aai_subscriber": { + "type": "message_router", + "dmaap_info": { + "client_id": "1575976809466", + "client_role": "org.onap.dcae.aaiSub", + "topic_url": "https://mr-sim:1080/events/AAI_EVENT", + "location": "san-francisco" + } + }, + "policy_pm_subscriber": { + "dmaap_info": { + "location": "san-francisco", + "topic_url": "https://mr-sim:1080/events/org.onap.dmaap.mr.PM_SUBSCRIPTIONS", + "client_role": "org.onap.dcae.pmSubscriber", + "client_id": "1575876809456" + }, + "type": "message_router" + } + }, + "key_path": "/opt/app/pmsh/etc/certs/key.pem", + "aaf_identity": "dcae@dcae.onap.org", + "aaf_password": "demo123456!" + } + } + } + } + } +] diff --git a/tests/dcaegen2-services-pmsh/testcases/assets/mr-expectation-aai-pnf-created.json b/tests/dcaegen2-services-pmsh/testcases/assets/mr-expectation-aai-pnf-created.json new file mode 100644 index 00000000..9c9dc6e5 --- /dev/null +++ b/tests/dcaegen2-services-pmsh/testcases/assets/mr-expectation-aai-pnf-created.json @@ -0,0 +1,36 @@ +[ + { + "httpRequest": { + "path": "/events/AAI_EVENT/dcae_pmsh_cg/AAI-EVENT" + }, + "httpResponse": { + "statusCode": 200, + "headers": { + "content-type": [ + "application/json" + ] + }, + "body": [ + "{\"cambria.partition\":\"AAI\",\"event-header\":{\"severity\":\"NORMAL\",\"entity-type\":\"pnf\",\"top-entity-type\":\"pnf\",\"entity-link\":\"/aai/v16/network/pnfs/pnf/pnf_newly_discovered\",\"event-type\":\"AAI-EVENT\",\"domain\":\"dev\",\"action\":\"UPDATE\",\"sequence-number\":\"0\",\"id\":\"db09e090-196e-4f84-9645-e449b1cd3640\",\"source-name\":\"dcae-curl\",\"version\":\"v16\",\"timestamp\":\"20200203-15:14:08:807\"},\"entity\":{\"ipaddress-v4-oam\":\"10.10.10.37\",\"nf-role\":\"gNB\",\"equip-type\":\"val8\",\"relationship-list\":{\"relationship\":[{\"related-to\":\"service-instance\",\"relationship-data\":[{\"relationship-value\":\"Demonstration\",\"relationship-key\":\"customer.global-customer-id\"},{\"relationship-value\":\"vCPE\",\"relationship-key\":\"service-subscription.service-type\"},{\"relationship-value\":\"2c03b2a8-e31a-4749-9e99-3089ab441400\",\"relationship-key\":\"service-instance.service-instance-id\"}],\"related-link\":\"/aai/v16/business/customers/customer/Demonstration/service-subscriptions/service-subscription/vCPE/service-instances/service-instance/2c03b2a8-e31a-4749-9e99-3089ab441400\",\"relationship-label\":\"org.onap.relationships.inventory.ComposedOf\",\"related-to-property\":[{\"property-key\":\"service-instance.service-instance-name\",\"property-value\":\"Svc6_1\"}]}]},\"equip-vendor\":\"Ericsson\",\"serial-number\":\"6061ZW3\",\"ipaddress-v6-oam\":\"2001:0db8:0:0:0:0:1428:57ab\",\"equip-model\":\"val6\",\"in-maint\":false,\"resource-version\":\"1578668956804\",\"sw-version\":\"val7\",\"pnf-id\":\"eabcfaf7-b7f3-45fb-94e7-e6112fb3e8b8\",\"pnf-name\":\"pnf_newly_discovered\",\"orchestration-status\":\"Active\"}}" + ] + }, + "times": { + "remainingTimes": 1, + "unlimited": false + } + }, + { + "httpRequest": { + "path": "/events/AAI_EVENT/dcae_pmsh_cg/AAI-EVENT" + }, + "httpResponse": { + "statusCode": 200, + "headers": { + "content-type": [ + "application/json" + ] + }, + "body": "{}" + } + } +] diff --git a/tests/dcaegen2-services-pmsh/testcases/assets/mr-expectation-aai-pnf-deleted.json b/tests/dcaegen2-services-pmsh/testcases/assets/mr-expectation-aai-pnf-deleted.json new file mode 100644 index 00000000..c0accc8c --- /dev/null +++ b/tests/dcaegen2-services-pmsh/testcases/assets/mr-expectation-aai-pnf-deleted.json @@ -0,0 +1,36 @@ +[ + { + "httpRequest": { + "path": "/events/AAI_EVENT/dcae_pmsh_cg/AAI-EVENT" + }, + "httpResponse": { + "statusCode": 200, + "headers": { + "content-type": [ + "application/json" + ] + }, + "body": [ + "{\"cambria.partition\":\"AAI\",\"event-header\":{\"severity\":\"NORMAL\",\"entity-type\":\"pnf\",\"top-entity-type\":\"pnf\",\"entity-link\":\"/aai/v16/network/pnfs/pnf/pnf_newly_discovered\",\"event-type\":\"AAI-EVENT\",\"domain\":\"dev\",\"action\":\"DELETE\",\"sequence-number\":\"0\",\"id\":\"db09e090-196e-4f84-9645-e449b1cd3640\",\"source-name\":\"dcae-curl\",\"version\":\"v16\",\"timestamp\":\"20200203-15:14:08:807\"},\"entity\":{\"ipaddress-v4-oam\":\"10.10.10.37\",\"nf-role\":\"gNB\",\"equip-type\":\"val8\",\"relationship-list\":{\"relationship\":[{\"related-to\":\"service-instance\",\"relationship-data\":[{\"relationship-value\":\"Demonstration\",\"relationship-key\":\"customer.global-customer-id\"},{\"relationship-value\":\"vCPE\",\"relationship-key\":\"service-subscription.service-type\"},{\"relationship-value\":\"2c03b2a8-e31a-4749-9e99-3089ab441400\",\"relationship-key\":\"service-instance.service-instance-id\"}],\"related-link\":\"/aai/v16/business/customers/customer/Demonstration/service-subscriptions/service-subscription/vCPE/service-instances/service-instance/2c03b2a8-e31a-4749-9e99-3089ab441400\",\"relationship-label\":\"org.onap.relationships.inventory.ComposedOf\",\"related-to-property\":[{\"property-key\":\"service-instance.service-instance-name\",\"property-value\":\"Svc6_1\"}]}]},\"equip-vendor\":\"Ericsson\",\"serial-number\":\"6061ZW3\",\"ipaddress-v6-oam\":\"2001:0db8:0:0:0:0:1428:57ab\",\"equip-model\":\"val6\",\"in-maint\":false,\"resource-version\":\"1578668956804\",\"sw-version\":\"val7\",\"pnf-id\":\"eabcfaf7-b7f3-45fb-94e7-e6112fb3e8b8\",\"pnf-name\":\"pnf_newly_discovered\",\"orchestration-status\":\"Active\"}}" + ] + }, + "times": { + "remainingTimes": 1, + "unlimited": false + } + }, + { + "httpRequest": { + "path": "/events/AAI_EVENT/dcae_pmsh_cg/AAI-EVENT" + }, + "httpResponse": { + "statusCode": 200, + "headers": { + "content-type": [ + "application/json" + ] + }, + "body": "{}" + } + } +] diff --git a/tests/dcaegen2-services-pmsh/testcases/assets/mr-expectation-policy-subscription-created-pnf-existing.json b/tests/dcaegen2-services-pmsh/testcases/assets/mr-expectation-policy-subscription-created-pnf-existing.json new file mode 100644 index 00000000..cc14f3c9 --- /dev/null +++ b/tests/dcaegen2-services-pmsh/testcases/assets/mr-expectation-policy-subscription-created-pnf-existing.json @@ -0,0 +1,39 @@ +[ + { + "httpRequest": { + "path": "/events/org.onap.dmaap.mr.PM_SUBSCRIPTIONS/dcae_pmsh_cg/policy_response_consumer" + }, + "httpResponse": { + "statusCode": 200, + "headers": { + "content-type": [ + "application/json" + ] + }, + "body": [ + "{\"name\": \"ResponseEvent\", \"nameSpace\": \"org.onap.policy.apex.onap.pmcontrol\", \"source\": \"APEX\", \"target\": \"DCAE\", \"version\": \"0.0.1\", \"status\": {\"subscriptionName\": \"ExtraPM-All-gNB-R2B\", \"nfName\": \"pnf-existing\", \"changeType\": \"CREATE\", \"message\": \"success\"}}" + ] + }, + "times": { + "remainingTimes": 1, + "unlimited": false + } + }, + { + "httpRequest": { + "path": "/events/org.onap.dmaap.mr.PM_SUBSCRIPTIONS/dcae_pmsh_cg/policy_response_consumer" + }, + "httpResponse": { + "statusCode": 200, + "headers": { + "content-type": [ + "application/json" + ] + }, + "body": { + "type": "JSON", + "json": {} + } + } + } +] diff --git a/tests/dcaegen2-services-pmsh/testcases/assets/mr-expectation-policy-subscription-created-pnf-new.json b/tests/dcaegen2-services-pmsh/testcases/assets/mr-expectation-policy-subscription-created-pnf-new.json new file mode 100644 index 00000000..79bfb44f --- /dev/null +++ b/tests/dcaegen2-services-pmsh/testcases/assets/mr-expectation-policy-subscription-created-pnf-new.json @@ -0,0 +1,39 @@ +[ + { + "httpRequest": { + "path": "/events/org.onap.dmaap.mr.PM_SUBSCRIPTIONS/dcae_pmsh_cg/policy_response_consumer" + }, + "httpResponse": { + "statusCode": 200, + "headers": { + "content-type": [ + "application/json" + ] + }, + "body": [ + "{\"name\": \"ResponseEvent\", \"nameSpace\": \"org.onap.policy.apex.onap.pmcontrol\", \"source\": \"APEX\", \"target\": \"DCAE\", \"version\": \"0.0.1\", \"status\": {\"subscriptionName\": \"ExtraPM-All-gNB-R2B\", \"nfName\": \"pnf_new\", \"changeType\": \"CREATE\", \"message\": \"success\"}}" + ] + }, + "times": { + "remainingTimes": 1, + "unlimited": false + } + }, + { + "httpRequest": { + "path": "/events/org.onap.dmaap.mr.PM_SUBSCRIPTIONS/dcae_pmsh_cg/policy_response_consumer" + }, + "httpResponse": { + "statusCode": 200, + "headers": { + "content-type": [ + "application/json" + ] + }, + "body": { + "type": "JSON", + "json": {} + } + } + } +] diff --git a/tests/dcaegen2-services-pmsh/testcases/pmsh.robot b/tests/dcaegen2-services-pmsh/testcases/pmsh.robot index 74a575cd..95b78c25 100644 --- a/tests/dcaegen2-services-pmsh/testcases/pmsh.robot +++ b/tests/dcaegen2-services-pmsh/testcases/pmsh.robot @@ -1,38 +1,163 @@ *** Settings *** Documentation Testing PMSH functionality + Library OperatingSystem Library RequestsLibrary Library String +Library Process + +Resource ../../common.robot -Test Setup Create Session pmsh_session ${PMSH_BASE_URL} +Test Setup CreateSessions Test Teardown Delete All Sessions *** Variables *** + ${PMSH_BASE_URL} https://${PMSH_IP}:8443 +${MR_BASE_URL} http://${MR_SIM_IP_ADDRESS}:1080 +${CBS_BASE_URL} http://${CBS_SIM_IP_ADDRESS}:1080 ${HEALTHCHECK_ENDPOINT} /healthcheck +${MR_EXPECTATION_AAI_PNF_CREATED} %{WORKSPACE}/tests/dcaegen2-services-pmsh/testcases/assets/mr-expectation-aai-pnf-created.json +${MR_EXPECTATION_AAI_PNF_REMOVED} %{WORKSPACE}/tests/dcaegen2-services-pmsh/testcases/assets/mr-expectation-aai-pnf-deleted.json +${MR_EXPECTATION_POLICY_RESPONSE_PNF_NEW} %{WORKSPACE}/tests/dcaegen2-services-pmsh/testcases/assets/mr-expectation-policy-subscription-created-pnf-new.json +${MR_EXPECTATION_POLICY_RESPONSE_PNF_EXISTING} %{WORKSPACE}/tests/dcaegen2-services-pmsh/testcases/assets/mr-expectation-policy-subscription-created-pnf-existing.json +${CBS_EXPECTATION_ADMIN_STATE_UNLOCKED} %{WORKSPACE}/tests/dcaegen2-services-pmsh/testcases/assets/cbs-expectation-unlocked-config.json + +${ADMIN_STATE_LOCKED_PATTERN} 'administrativeState': 'LOCKED' +${ADMIN_STATE_UNLOCKED_PATTERN} 'administrativeState': 'UNLOCKED' +${CLI_EXEC_GET_CBS_CONFIG_FIRST} docker exec pmsh /bin/sh -c "grep -m 1 'PMSH Configuration from Configbinding Service' /var/log/ONAP/dcaegen2/services/pmsh/debug.log" +${CLI_EXEC_GET_CBS_CONFIG_LAST} docker exec pmsh /bin/sh -c "grep 'PMSH Configuration from Configbinding Service' /var/log/ONAP/dcaegen2/services/pmsh/debug.log | tail -1" + +${DB_CMD_NETWORK_FUNCTIONS_COUNT} docker exec db bash -c "psql -U pmsh -d pmsh -A -t -c 'select count(*) from network_functions;'" +${DB_CMD_NF_TO_SUB_REL_COUNT} docker exec db bash -c "psql -U pmsh -d pmsh -A -t -c 'select count(*) from nf_to_sub_rel;'" +${DB_CMD_SUBSCRIPTIONS_COUNT} docker exec db bash -c "psql -U pmsh -d pmsh -A -t -c 'select count(*) from subscriptions;'" + +${CLI_GET_NETWORK_FUNCTIONS_DB_TABLE} docker exec db bash -c "psql -U pmsh -d pmsh -A -t -c 'select nf_name, orchestration_status from network_functions;'" +${CLI_GET_NF_TO_SUB_REL_DB_TABLE} docker exec db bash -c "psql -U pmsh -d pmsh -A -t -c 'select subscription_name, nf_name, nf_sub_status from nf_to_sub_rel;'" +${CLI_GET_SUBSCRIPTIONS_DB_TABLE} docker exec db bash -c "psql -U pmsh -d pmsh -A -t -c 'select subscription_name, status from subscriptions;'" + *** Test Cases *** -Verify Health Check returns 200 when a REST GET request to healthcheck url + +Verify PMSH health check returns 200 and has a status of healthy [Tags] PMSH_01 - [Documentation] Verify Health Check returns 200 when a REST GET request to healthcheck url - [Timeout] 1 minute + [Documentation] Verify the PMSH health check api call functions correctly + [Timeout] 10 seconds ${resp}= Get Request pmsh_session ${HEALTHCHECK_ENDPOINT} - VerifyResponse ${resp.status_code} 200 + Should Be True ${resp.status_code} == 200 + Should Match Regexp ${resp.text} healthy -Verify Health Check response includes healthy status +Verify Administrative State in PMSH log file is LOCKED [Tags] PMSH_02 - [Documentation] Verify Health Check response includes healthy status - [Timeout] 1 minute - ${resp}= Get Request pmsh_session ${HEALTHCHECK_ENDPOINT} - VerifyResponseContains ${resp.text} healthy + [Documentation] Verify Administrative State as logged in PMSH log file is LOCKED + [Timeout] 10 seconds + Sleep 3 Allow time for PMSH to flush to logs + ${cli_cmd_output}= Run Process ${CLI_EXEC_GET_CBS_CONFIG_FIRST} shell=yes + Should Be True ${cli_cmd_output.rc} == 0 + Should Contain ${cli_cmd_output.stdout} ${ADMIN_STATE_LOCKED_PATTERN} + +Verify database tables exist and are empty + [Tags] PMSH_03 + [Documentation] Verify database has been created and is empty + [Timeout] 10 seconds + VerifyDatabaseEmpty + +Verify PNF detected in AAI when administrative state unlocked + [Tags] PMSH_04 + [Documentation] Verify PNF detected when administrative state unlocked + [Timeout] 40 seconds + SetAdministrativeStateToUnlocked + Sleep 31 Allow PMSH time to pick up changes in CBS config + VerifyCommandOutputContains ${CLI_EXEC_GET_CBS_CONFIG_LAST} ${ADMIN_STATE_UNLOCKED_PATTERN} + VerifyCommandOutputIs ${cli_get_subscriptions_db_table} ExtraPM-All-gNB-R2B|UNLOCKED + VerifyCommandOutputIs ${cli_get_network_functions_db_table} pnf-existing|Active + VerifyCommandOutputIs ${cli_get_nf_to_sub_rel_db_table} ExtraPM-All-gNB-R2B|pnf-existing|PENDING_CREATE + +Verify Policy response on MR is handled + [Tags] PMSH_05 + [Documentation] Verify policy response on MR is handled + [Timeout] 40 seconds + SimulatePolicyResponse ${MR_EXPECTATION_POLICY_RESPONSE_PNF_EXISTING} + Sleep 7 seconds Ensure Policy response on MR is picked up + VerifyCommandOutputIs ${cli_get_nf_to_sub_rel_db_table} ExtraPM-All-gNB-R2B|pnf-existing|CREATED + +Verify AAI event on MR detailing new PNF being detected is handled + [Tags] PMSH_06 + [Documentation] Verify PNF created AAI event on MR is handled + [Timeout] 30 seconds + SimulateNewPNF + Sleep 12 seconds Ensure AAI event on MR is picked up + VerifyCommandOutputIs ${CLI_GET_SUBSCRIPTIONS_DB_TABLE} ExtraPM-All-gNB-R2B|UNLOCKED + VerifyCommandOutputIs ${CLI_GET_NETWORK_FUNCTIONS_DB_TABLE} pnf-existing|Active\npnf_newly_discovered|Active + VerifyCommandOutputIs ${CLI_GET_NF_TO_SUB_REL_DB_TABLE} ExtraPM-All-gNB-R2B|pnf-existing|CREATED\nExtraPM-All-gNB-R2B|pnf_newly_discovered|PENDING_CREATE + +Verify AAI event on MR detailing PNF being deleted is handled + [Tags] PMSH_07 + [Documentation] Verify PNF deleted AAI event on MR is handled + [Timeout] 30 seconds + SimulateDeletedPNF + Sleep 12 seconds Ensure AAI event on MR is picked up + VerifyNumberOfRecordsInDbTable ${DB_CMD_NETWORK_FUNCTIONS_COUNT} 1 + VerifyNumberOfRecordsInDbTable ${DB_CMD_NF_TO_SUB_REL_COUNT} 1 *** Keywords *** -VerifyResponse - [Arguments] ${actual_response_value} ${expected_response_value} - Should Be Equal As Strings ${actual_response_value} ${expected_response_value} -VerifyResponseContains - [Arguments] ${response_content} ${string_to_check_for} - Should Contain ${response_content} ${string_to_check_for} +CreateSessions + Create Session pmsh_session ${PMSH_BASE_URL} + Create Session mr_sim_session ${MR_BASE_URL} + Create Session cbs_sim_session ${CBS_BASE_URL} + +SetAdministrativeStateToUnlocked + ${data}= Get Data From File ${CBS_EXPECTATION_ADMIN_STATE_UNLOCKED} + ${resp} = Put Request cbs_sim_session /clear data={"path": "/service_component_all/.*"} + Should Be True ${resp.status_code} == 200 + Sleep 2 Allow CBS time to set expectation + ${resp} = Put Request cbs_sim_session /expectation data=${data} + Should Be True ${resp.status_code} == 201 + +VerifyCommandOutputContains + [Arguments] ${cli_command} ${string_to_check_for} + ${cli_cmd_output}= Run Process ${cli_command} shell=yes + Should Be True ${cli_cmd_output.rc} == 0 + Should Contain ${cli_cmd_output.stdout} ${string_to_check_for} + +VerifyCommandOutputIs + [Arguments] ${cli_cmd} ${expected_contents} + ${cli_cmd_output}= Run Process ${cli_cmd} shell=yes + Log ${cli_cmd_output.stdout} + Should Be True ${cli_cmd_output.rc} == 0 + Should Be Equal As Strings ${cli_cmd_output.stdout} ${expected_contents} + +SimulateNewPNF + ${data}= Get Data From File ${MR_EXPECTATION_AAI_PNF_CREATED} + ${resp} = Put Request mr_sim_session /clear data={"path": "/events/AAI_EVENT/dcae_pmsh_cg/AAI-EVENT"} + Should Be True ${resp.status_code} == 200 + ${resp} = Put Request mr_sim_session /expectation data=${data} + Should Be True ${resp.status_code} == 201 + +SimulatePolicyResponse + [Arguments] ${expected_contents} + ${data}= Get Data From File ${expected_contents} + ${resp} = Put Request mr_sim_session /clear data={"path": "/events/org.onap.dmaap.mr.PM_SUBSCRIPTIONS/dcae_pmsh_cg/policy_response_consumer"} + Should Be True ${resp.status_code} == 200 + ${resp} = Put Request mr_sim_session /expectation data=${data} + Should Be True ${resp.status_code} == 201 + +SimulateDeletedPNF + ${data}= Get Data From File ${MR_EXPECTATION_AAI_PNF_REMOVED} + ${resp} = Put Request mr_sim_session /clear data={"path": "/events/AAI_EVENT/dcae_pmsh_cg/AAI-EVENT"} + Should Be True ${resp.status_code} == 200 + ${resp} = Put Request mr_sim_session /expectation data=${data} + Should Be True ${resp.status_code} == 201 + +VerifyNumberOfRecordsInDbTable + [Arguments] ${db_query} ${expected_count} + ${db_count} Run Process ${db_query} shell=yes + Should Be True ${db_count.stdout} == ${expected_count} + +VerifyDatabaseEmpty + VerifyNumberOfRecordsInDbTable ${DB_CMD_NETWORK_FUNCTIONS_COUNT} 0 + VerifyNumberOfRecordsInDbTable ${DB_CMD_NF_TO_SUB_REL_COUNT} 0 + VerifyNumberOfRecordsInDbTable ${DB_CMD_SUBSCRIPTIONS_COUNT} 0 diff --git a/tests/sdc-dcae-d/dcaed/common.robot b/tests/sdc-dcae-d/dcaed/common.robot index 5b85570f..6f67de7e 100644 --- a/tests/sdc-dcae-d/dcaed/common.robot +++ b/tests/sdc-dcae-d/dcaed/common.robot @@ -1,9 +1,6 @@ *** Variables *** ${SDC_DESIGNER_USER_ID} cs0008 -${SDC_TESTER_USER_ID} jm0007 -${SDC_GOVERNOR_USER_ID} gv0001 -${SDC_OPS_USER_ID} op0001 ${GLOBAL_APPLICATION_ID} robot diff --git a/tests/sdc-dcae-d/dcaed/sdc_interface.robot b/tests/sdc-dcae-d/dcaed/sdc_interface.robot index 6853fcca..94c3bbde 100755 --- a/tests/sdc-dcae-d/dcaed/sdc_interface.robot +++ b/tests/sdc-dcae-d/dcaed/sdc_interface.robot @@ -83,7 +83,7 @@ Generate Unique Postfix # Directly copied from testsuite/robot/resources/sdc_interface.robot Certify SDC Catalog Resource [Documentation] Certifies an SDC Catalog Resource by its id and returns the new id - [Arguments] ${catalog_resource_id} ${user_id}=${SDC_TESTER_USER_ID} + [Arguments] ${catalog_resource_id} ${user_id}=${SDC_DESIGNER_USER_ID} ${map}= Create Dictionary user_remarks=Robot remarks Templating.Create Environment sdc_user_remarks ${ASSETS_DIR} ${data}= Templating.Apply Template sdc_user_remarks ${SDC_USER_REMARKS_TEMPLATE} ${map} @@ -114,15 +114,12 @@ Create Monitoring Configuration ${vfi_uuid} ${vfi_name} Add SDC Resource Instance ${cs_unique_id} ${vf_unique_id} ${vf_name} [return] ${cs_unique_id} ${cs_uuid} ${vfi_name} +# Directly copied from testsuite/robot/resources/sdc_interface.robot Certify And Approve SDC Catalog Service [Documentation] Perform the required steps to certify and approve the given SDC catalog service [Arguments] ${cs_unique_id} - Checkin SDC Catalog Service ${cs_unique_id} - Request Certify SDC Catalog Service ${cs_unique_id} - Start Certify SDC Catalog Service ${cs_unique_id} - ${cert_cs_unique_id}= Certify SDC Catalog Service ${cs_unique_id} - Approve SDC Catalog Service ${cert_cs_unique_id} + Wait Until Keyword Succeeds 60s 10s Certify SDC Catalog Service ${cs_unique_id} # All the following methods are adjusted from sdc_interface.robot @@ -137,39 +134,12 @@ Checkin SDC Catalog Service Should Be Equal As Strings ${resp.status_code} 200 [Return] ${resp.json()} -Request Certify SDC Catalog Service - [Documentation] Requests certification of an SDC Catalog Service by its id - [Arguments] ${catalog_service_id} - ${map}= Create Dictionary user_remarks=Robot remarks - Templating.Create Environment sdc_user_remarks ${ASSETS_DIR} - ${data}= Templating.Apply Template sdc_user_remarks ${SDC_USER_REMARKS_TEMPLATE} ${map} - ${resp}= SDC.Run Post Request ${SDC_BE_ENDPOINT} ${SDC_CATALOG_SERVICES_PATH}/${catalog_service_id}${SDC_CATALOG_LIFECYCLE_PATH}/certificationRequest ${data} ${SDC_DESIGNER_USER_ID} - Should Be Equal As Strings ${resp.status_code} 200 - [Return] ${resp.json()} - -Start Certify SDC Catalog Service - [Documentation] Start certification of an SDC Catalog Service by its id - [Arguments] ${catalog_service_id} - ${resp}= SDC.Run Post Request ${SDC_BE_ENDPOINT} ${SDC_CATALOG_SERVICES_PATH}/${catalog_service_id}${SDC_CATALOG_LIFECYCLE_PATH}/startCertification ${None} ${SDC_TESTER_USER_ID} - Should Be Equal As Strings ${resp.status_code} 200 - [Return] ${resp.json()} - Certify SDC Catalog Service [Documentation] Certifies an SDC Catalog Service by its id and returns the new id [Arguments] ${catalog_service_id} ${map}= Create Dictionary user_remarks=Robot remarks Templating.Create Environment sdc_user_remarks ${ASSETS_DIR} ${data}= Templating.Apply Template sdc_user_remarks ${SDC_USER_REMARKS_TEMPLATE} ${map} - ${resp}= SDC.Run Post Request ${SDC_BE_ENDPOINT} ${SDC_CATALOG_SERVICES_PATH}/${catalog_service_id}${SDC_CATALOG_LIFECYCLE_PATH}/certify ${data} ${SDC_TESTER_USER_ID} + ${resp}= SDC.Run Post Request ${SDC_BE_ENDPOINT} ${SDC_CATALOG_SERVICES_PATH}/${catalog_service_id}${SDC_CATALOG_LIFECYCLE_PATH}/certify ${data} ${SDC_DESIGNER_USER_ID} Should Be Equal As Strings ${resp.status_code} 200 [Return] ${resp.json()['uniqueId']} - -Approve SDC Catalog Service - [Documentation] Approves an SDC Catalog Service by its id - [Arguments] ${catalog_service_id} - ${map}= Create Dictionary user_remarks=Robot remarks - Templating.Create Environment sdc_user_remarks ${ASSETS_DIR} - ${data}= Templating.Apply Template sdc_user_remarks ${SDC_USER_REMARKS_TEMPLATE} ${map} - ${resp}= SDC.Run Post Request ${SDC_BE_ENDPOINT} ${SDC_CATALOG_SERVICES_PATH}/${catalog_service_id}${SDC_CATALOG_SERVICE_DISTRIBUTION_STATE_PATH}${SDC_DISTRIBUTION_STATE_APPROVE_PATH} ${data} ${SDC_GOVERNOR_USER_ID} - Should Be Equal As Strings ${resp.status_code} 200 - [Return] ${resp.json()} |