From c19a0a85bbbc8dcf0633a32d26f4128f6c8c4544 Mon Sep 17 00:00:00 2001 From: emartin Date: Thu, 27 Feb 2020 13:56:52 +0000 Subject: Update PM subscription event for PMSH * Add control loop name * Remove invariant id reference Issue-ID: DCAEGEN2-2100 Signed-off-by: emartin Change-Id: I6bbb757e07f3d930ecd28bd3106df307a264ff65 --- .../tests/data/cbs_data_1.json | 3 +- .../tests/data/cbs_data_2.json | 1 - .../tests/data/pm_subscription_event.json | 54 ++++++++++++++++++++++ 3 files changed, 56 insertions(+), 2 deletions(-) create mode 100755 components/pm-subscription-handler/tests/data/pm_subscription_event.json (limited to 'components/pm-subscription-handler/tests/data') diff --git a/components/pm-subscription-handler/tests/data/cbs_data_1.json b/components/pm-subscription-handler/tests/data/cbs_data_1.json index ccc0626d..8dc225dc 100644 --- a/components/pm-subscription-handler/tests/data/cbs_data_1.json +++ b/components/pm-subscription-handler/tests/data/cbs_data_1.json @@ -5,7 +5,6 @@ "administrativeState":"UNLOCKED", "fileBasedGP":15, "fileLocation":"\/pm\/pm.xml", - "nfTypeModelInvariantId":"2829292", "nfFilter":{ "swVersions":[ "1.0.0", @@ -61,6 +60,8 @@ } }, "config":{ + "control_loop_name": "pmsh-control-loop", + "operational_policy_name": "pmsh-operational-policy", "aaf_password":"demo123456!", "aaf_identity":"dcae@dcae.onap.org", "cert_path":"/opt/app/pm-mapper/etc/certs/cert.pem", diff --git a/components/pm-subscription-handler/tests/data/cbs_data_2.json b/components/pm-subscription-handler/tests/data/cbs_data_2.json index 43f67e88..c223ddea 100755 --- a/components/pm-subscription-handler/tests/data/cbs_data_2.json +++ b/components/pm-subscription-handler/tests/data/cbs_data_2.json @@ -6,7 +6,6 @@ "administrativeState": "UNLOCKED", "fileBasedGP": 15, "fileLocation": "c:\/\/PM", - "nfTypeModelInvariantId": "2829292", "nfFilter": { "swVersions": [ "A21", diff --git a/components/pm-subscription-handler/tests/data/pm_subscription_event.json b/components/pm-subscription-handler/tests/data/pm_subscription_event.json new file mode 100755 index 00000000..e190aa26 --- /dev/null +++ b/components/pm-subscription-handler/tests/data/pm_subscription_event.json @@ -0,0 +1,54 @@ +{ + "nfName":"pnf_1", + "policyName":"pmsh-operational-policy", + "changeType":"CREATE", + "closedLoopControlName":"pmsh-control-loop", + "subscription":{ + "subscriptionName":"ExtraPM-All-gNB-R2B", + "administrativeState":"UNLOCKED", + "fileBasedGP":15, + "fileLocation":"/pm/pm.xml", + "measurementGroups":[ + { + "measurementGroup":{ + "measurementTypes":[ + { + "measurementType":"countera" + }, + { + "measurementType":"counterb" + } + ], + "managedObjectDNsBasic":[ + { + "DN":"dna" + }, + { + "DN":"dnb" + } + ] + } + }, + { + "measurementGroup":{ + "measurementTypes":[ + { + "measurementType":"counterc" + }, + { + "measurementType":"counterd" + } + ], + "managedObjectDNsBasic":[ + { + "DN":"dnc" + }, + { + "DN":"dnd" + } + ] + } + } + ] + } +} \ No newline at end of file -- cgit 1.2.3-korg