From dbb31436fe2f0df2064f3a6398cca91f39a4c8ed Mon Sep 17 00:00:00 2001 From: SagarS Date: Fri, 12 Nov 2021 17:13:18 +0000 Subject: [PATCH] [DCAEGEN2] PMSH CSIT changes for public Subscription APIs Issue-ID: DCAEGEN2-2977 Change-Id: Ia50086ffba96d7f270fb6daf3ba5c732b0b01c28 Signed-off-by: SagarS --- .../assets/create_subscription_bad_request.json | 37 ++++++++++++ .../assets/create_subscription_request.json | 58 +++++++++++++++++++ .../create_subscription_schema_error_request.json | 43 ++++++++++++++ tests/dcaegen2-services-pmsh/testcases/pmsh.robot | 66 +++++++++++++++++----- 4 files changed, 189 insertions(+), 15 deletions(-) create mode 100644 tests/dcaegen2-services-pmsh/testcases/assets/create_subscription_bad_request.json create mode 100644 tests/dcaegen2-services-pmsh/testcases/assets/create_subscription_request.json create mode 100644 tests/dcaegen2-services-pmsh/testcases/assets/create_subscription_schema_error_request.json diff --git a/tests/dcaegen2-services-pmsh/testcases/assets/create_subscription_bad_request.json b/tests/dcaegen2-services-pmsh/testcases/assets/create_subscription_bad_request.json new file mode 100644 index 00000000..bfe9262c --- /dev/null +++ b/tests/dcaegen2-services-pmsh/testcases/assets/create_subscription_bad_request.json @@ -0,0 +1,37 @@ +{ + "subscription": { + "subscriptionName": "subs_02", + "operationalPolicyName":"pmsh-operational-policy", + "controlLoopName":"pmsh-control-loop", + "nfFilter": { + "nfNames": [ + ], + "modelInvariantIDs": [ + ], + "modelVersionIDs": [ + ], + "modelNames": [ + ] + }, + "measurementGroups": [ + { + "measurementGroup": { + "measurementGroupName": "msrmt_grp_name", + "fileBasedGP":15, + "fileLocation":"pm.xml", + "administrativeState": "UNLOCKED", + "measurementTypes": [ + { + "measurementType": "counter_a" + } + ], + "managedObjectDNsBasic": [ + { + "DN": "string" + } + ] + } + } + ] + } +} \ No newline at end of file diff --git a/tests/dcaegen2-services-pmsh/testcases/assets/create_subscription_request.json b/tests/dcaegen2-services-pmsh/testcases/assets/create_subscription_request.json new file mode 100644 index 00000000..d9112e9c --- /dev/null +++ b/tests/dcaegen2-services-pmsh/testcases/assets/create_subscription_request.json @@ -0,0 +1,58 @@ +{ + "subscription": { + "subscriptionName": "subs_01", + "operationalPolicyName":"pmsh-operational-policy", + "controlLoopName":"pmsh-control-loop", + "nfFilter": { + "nfNames": [ + "^pnf.*", + "^vnf.*" + ], + "modelInvariantIDs": [ + + ], + "modelVersionIDs": [ + ], + "modelNames": [ + ] + }, + "measurementGroups": [ + { + "measurementGroup": { + "measurementGroupName": "msrmt_grp_name", + "fileBasedGP":15, + "fileLocation":"pm.xml", + "administrativeState": "UNLOCKED", + "measurementTypes": [ + { + "measurementType": "counter_a" + } + ], + "managedObjectDNsBasic": [ + { + "DN": "string" + } + ] + } + }, + { + "measurementGroup": { + "measurementGroupName": "msrmt_grp_name1", + "fileBasedGP":15, + "fileLocation":"pm.xml", + "administrativeState": "UNLOCKED", + "measurementTypes": [ + { + "measurementType": "counter_a" + } + ], + "managedObjectDNsBasic": [ + { + "DN": "string" + } + ] + } + } + ] + } +} diff --git a/tests/dcaegen2-services-pmsh/testcases/assets/create_subscription_schema_error_request.json b/tests/dcaegen2-services-pmsh/testcases/assets/create_subscription_schema_error_request.json new file mode 100644 index 00000000..027c6e2a --- /dev/null +++ b/tests/dcaegen2-services-pmsh/testcases/assets/create_subscription_schema_error_request.json @@ -0,0 +1,43 @@ +{ + "subscription": { + "subscriptionName": "subs_01", + "operationalPolicyName":"pmsh-operational-policy", + "controlLoopName":"pmsh-control-loop", + "nfFilter": { + "nfNames": [ + "^pnf.*", + "^vnf.*" + ], + "modelInvariantIDs": [ + "8lk4578-d396-4efb-af02-6b83499b12f8", + "687kj45-d396-4efb-af02-6b83499b12f8" + + ], + "modelVersionIDs": [ + "e80a6ae3-cafd-4d24-850d-e14c084a5ca9" + ], + "modelNames": [ + "PNF102" + ] + }, + "measurementGroups": [ + { + "measurementGroup": { + "measurementGroupName": "msrmt_grp_name", + "fileBasedGP":15, + "fileLocation":"pm.xml", + "measurementTypes": [ + { + "measurementType": "counter_a" + } + ], + "managedObjectDNsBasic": [ + { + "DN": "string" + } + ] + } + } + ] + } +} \ No newline at end of file diff --git a/tests/dcaegen2-services-pmsh/testcases/pmsh.robot b/tests/dcaegen2-services-pmsh/testcases/pmsh.robot index 71452350..0514dcf0 100644 --- a/tests/dcaegen2-services-pmsh/testcases/pmsh.robot +++ b/tests/dcaegen2-services-pmsh/testcases/pmsh.robot @@ -16,6 +16,7 @@ ${PMSH_BASE_URL} https://${PMSH_IP}:8443 ${MR_BASE_URL} http://${MR_IP_ADDRESS}:3904 ${CBS_BASE_URL} https://${CBS_SIM_IP_ADDRESS}:10443 ${SUBSCRIPTIONS_ENDPOINT} /subscriptions +${SUBSCRIPTION_ENDPOINT} /subscription ${POLICY_PUBLISH_MR_TOPIC} /events/unauthenticated.PMSH_CL_INPUT ${AAI_MR_TOPIC} /events/AAI_EVENT @@ -23,20 +24,21 @@ ${MR_AAI_PNF_CREATED} %{WORKSPACE}/tests/dcaegen2-services ${MR_AAI_PNF_REMOVED} %{WORKSPACE}/tests/dcaegen2-services-pmsh/testcases/assets/aai-pnf-delete.json ${MR_POLICY_RESPONSE_PNF_EXISTING} %{WORKSPACE}/tests/dcaegen2-services-pmsh/testcases/assets/policy-sub-created-pnf-existing.json ${CBS_EXPECTATION_ADMIN_STATE_UNLOCKED} %{WORKSPACE}/tests/dcaegen2-services-pmsh/testcases/assets/cbs-expectation-unlocked-config.json - +${CREATE_SUBSCRIPTION_DATA} %{WORKSPACE}/tests/dcaegen2-services-pmsh/testcases/assets/create_subscription_request.json +${CREATE_SUBSCRIPTION_BAD_DATA} %{WORKSPACE}/tests/dcaegen2-services-pmsh/testcases/assets/create_subscription_bad_request.json +${CREATE_SUBSCRIPTION_SCHEMA_ERROR_DATA} %{WORKSPACE}/tests/dcaegen2-services-pmsh/testcases/assets/create_subscription_schema_error_request.json ${ADMIN_STATE_LOCKED_PATTERN} 'administrativeState': 'LOCKED' ${CLI_EXEC_GET_CBS_CONFIG_FIRST} docker exec pmsh /bin/sh -c "grep -m 1 'PMSH config from CBS' /var/log/ONAP/dcaegen2/services/pmsh/application.log" *** Test Cases *** -Verify Administrative State in PMSH log file is LOCKED - [Tags] PMSH_01 - [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 Create Subscription API + [Tags] PMSH_07 + [Documentation] Verify Create Subscription API + [Timeout] 60 seconds + ${json_value}= json_from_file ${CREATE_SUBSCRIPTION_DATA} + ${resp}= PostSubscriptionCall ${SUBSCRIPTION_ENDPOINT} ${json_value} + Should Be True ${resp.status_code} == 201 Verify database tables exist and are empty [Tags] PMSH_02 @@ -53,9 +55,9 @@ Verify PNF detected in AAI when administrative state unlocked SetAdministrativeStateToUnlocked Sleep 31 Allow PMSH time to pick up changes in CBS config ${resp}= GetSubsCall ${SUBSCRIPTIONS_ENDPOINT} - Should Be Equal As Strings ${resp.json()[0]['subscription_status']} UNLOCKED - Should Be Equal As Strings ${resp.json()[0]['network_functions'][0]['nf_name']} pnf-existing - Should Be Equal As Strings ${resp.json()[0]['network_functions'][0]['nf_sub_status']} PENDING_CREATE + Should Be Equal As Strings ${resp.json()[1]['subscription_status']} UNLOCKED + Should Be Equal As Strings ${resp.json()[1]['network_functions'][0]['nf_name']} pnf-existing + Should Be Equal As Strings ${resp.json()[1]['network_functions'][0]['nf_sub_status']} PENDING_CREATE Verify Policy response on MR is handled [Tags] PMSH_04 @@ -64,7 +66,7 @@ Verify Policy response on MR is handled SimulatePolicyResponse ${MR_POLICY_RESPONSE_PNF_EXISTING} Sleep 31 seconds Ensure Policy response on MR is picked up ${resp}= GetSubsCall ${SUBSCRIPTIONS_ENDPOINT} - Should Be Equal As Strings ${resp.json()[0]['network_functions'][0]['nf_sub_status']} CREATED + Should Be Equal As Strings ${resp.json()[1]['network_functions'][0]['nf_sub_status']} CREATED Verify AAI event on MR detailing new PNF being detected is handled [Tags] PMSH_05 @@ -73,8 +75,8 @@ Verify AAI event on MR detailing new PNF being detected is handled SimulateNewPNF ${MR_AAI_PNF_CREATED} Sleep 31 seconds Ensure AAI event on MR is picked up ${resp}= GetSubsCall ${SUBSCRIPTIONS_ENDPOINT} - Should Be Equal As Strings ${resp.json()[0]['network_functions'][1]['nf_name']} pnf_newly_discovered - Should Be Equal As Strings ${resp.json()[0]['network_functions'][1]['nf_sub_status']} PENDING_CREATE + Should Be Equal As Strings ${resp.json()[1]['network_functions'][1]['nf_name']} pnf_newly_discovered + Should Be Equal As Strings ${resp.json()[1]['network_functions'][1]['nf_sub_status']} PENDING_CREATE Verify AAI event on MR detailing PNF being deleted is handled [Tags] PMSH_06 @@ -85,6 +87,33 @@ Verify AAI event on MR detailing PNF being deleted is handled ${resp}= GetSubsCall ${SUBSCRIPTIONS_ENDPOINT} Should Not Contain ${resp.text} pnf_newly_discovered +Verify Create Subscription API for duplicate subscription Id + [Tags] PMSH_08 + [Documentation] Verify Create Subscription API + [Timeout] 60 seconds + ${json_value}= json_from_file ${CREATE_SUBSCRIPTION_DATA} + ${resp}= PostSubscriptionCall ${SUBSCRIPTION_ENDPOINT} ${json_value} + Should Be True ${resp.status_code} == 409 + Should Contain ${resp.json()} subscription Name: subs_01 already exists. + +Verify Create Subscription API for schema error + [Tags] PMSH_09 + [Documentation] Verify Create Subscription API + [Timeout] 60 seconds + ${json_value}= json_from_file ${CREATE_SUBSCRIPTION_SCHEMA_ERROR_DATA} + ${resp}= PostSubscriptionCall ${SUBSCRIPTION_ENDPOINT} ${json_value} + Should Be True ${resp.status_code} == 400 + Should Contain ${resp.json()['detail']} 'administrativeState' is a required property - 'subscription.measurementGroups.0.measurementGroup' + +Verify Create Subscription API for filter values missing + [Tags] PMSH_10 + [Documentation] Verify Create Subscription API + [Timeout] 60 seconds + ${json_value}= json_from_file ${CREATE_SUBSCRIPTION_BAD_DATA} + ${resp}= PostSubscriptionCall ${SUBSCRIPTION_ENDPOINT} ${json_value} + Should Be True ${resp.status_code} == 400 + Should Contain ${resp.json()} At least one filter within nfFilter must not be empty + *** Keywords *** SetAdministrativeStateToUnlocked @@ -136,3 +165,10 @@ GetSubsCall Create Session pmsh_session ${PMSH_BASE_URL} verify=false ${resp}= GET On Session pmsh_session url=${url} [Return] ${resp} + +PostSubscriptionCall + [Arguments] ${url} ${data} + Create Session pmsh_sub_session ${PMSH_BASE_URL} verify=false + ${headers}= Create Dictionary Accept=application/json Content-Type=application/json + ${resp}= POST On Session pmsh_sub_session url=${url} json=${data} headers=${headers} expected_status=anything + [Return] ${resp} -- 2.16.6