From 0080fa4309a40599b7d239b53bab9a74182ae500 Mon Sep 17 00:00:00 2001 From: efiacor Date: Tue, 8 Sep 2020 16:26:50 +0100 Subject: [PMSSH] Add sdnc model info to event publish Signed-off-by: efiacor Change-Id: I89e25e99a2d541a29cf4a8dde986fab5b1812c9e Issue-ID: DCAEGEN2-2405 --- .../tests/data/aai_model_info.json | 36 ++++++++++++++++ .../tests/data/aai_model_info_no_sdnc.json | 34 +++++++++++++++ .../tests/data/cbs_data_1.json | 2 +- .../tests/data/filter_test_data.json | 50 ++++++---------------- .../tests/data/pm_subscription_event.json | 2 + 5 files changed, 85 insertions(+), 39 deletions(-) create mode 100644 components/pm-subscription-handler/tests/data/aai_model_info.json create mode 100644 components/pm-subscription-handler/tests/data/aai_model_info_no_sdnc.json (limited to 'components/pm-subscription-handler/tests/data') diff --git a/components/pm-subscription-handler/tests/data/aai_model_info.json b/components/pm-subscription-handler/tests/data/aai_model_info.json new file mode 100644 index 00000000..625de52a --- /dev/null +++ b/components/pm-subscription-handler/tests/data/aai_model_info.json @@ -0,0 +1,36 @@ +{ + "model-version-id": "6d25b637-8bca-47e2-af1a-61258424183d", + "model-name": "PNF102", + "model-version": "1.0", + "model-description": "sartgserg", + "sdnc-model-name": "pm_control", + "sdnc-model-version": "1.0.0", + "resource-version": "1598626661947", + "relationship-list": { + "relationship": [ + { + "related-to": "model-element", + "relationship-label": "org.onap.relationships.inventory.IsA", + "related-link": "/aai/v20/service-design-and-creation/models/model/c1a44771-3aa8-4888-a4f4-be89d1caa0cb/model-vers/model-ver/7256a992-10a7-4ac8-8c2c-63c67e5c48c8/model-elements/model-element/fddc70fe-8343-48c1-af2e-b54f551a32ee/model-elements/model-element/7bff45b7-8254-44e5-b7ad-6e10dee6dfc3", + "relationship-data": [ + { + "relationship-key": "model.model-invariant-id", + "relationship-value": "c1a44771-3aa8-4888-a4f4-be89d1caa0cb" + }, + { + "relationship-key": "model-ver.model-version-id", + "relationship-value": "7256a992-10a7-4ac8-8c2c-63c67e5c48c8" + }, + { + "relationship-key": "model-element.model-element-uuid", + "relationship-value": "fddc70fe-8343-48c1-af2e-b54f551a32ee" + }, + { + "relationship-key": "model-element.model-element-uuid", + "relationship-value": "7bff45b7-8254-44e5-b7ad-6e10dee6dfc3" + } + ] + } + ] + } +} \ No newline at end of file diff --git a/components/pm-subscription-handler/tests/data/aai_model_info_no_sdnc.json b/components/pm-subscription-handler/tests/data/aai_model_info_no_sdnc.json new file mode 100644 index 00000000..fffdfa92 --- /dev/null +++ b/components/pm-subscription-handler/tests/data/aai_model_info_no_sdnc.json @@ -0,0 +1,34 @@ +{ + "model-version-id": "b7469cc5-be51-41cc-b37f-361537656771", + "model-name": "PNF104", + "model-version": "1.0", + "model-description": "aervaer", + "resource-version": "1599053901976", + "relationship-list": { + "relationship": [ + { + "related-to": "model-element", + "relationship-label": "org.onap.relationships.inventory.IsA", + "related-link": "/aai/v20/service-design-and-creation/models/model/9f751399-59f7-46e4-aaf4-f78b7bf8af84/model-vers/model-ver/135b8bab-b24c-4c6d-b042-dcd7fcd937ba/model-elements/model-element/3c323039-c6ab-47bb-b8e0-d1e57a78fbea/model-elements/model-element/8a424916-020f-4c83-b785-7c04ac06567a", + "relationship-data": [ + { + "relationship-key": "model.model-invariant-id", + "relationship-value": "9f751399-59f7-46e4-aaf4-f78b7bf8af84" + }, + { + "relationship-key": "model-ver.model-version-id", + "relationship-value": "135b8bab-b24c-4c6d-b042-dcd7fcd937ba" + }, + { + "relationship-key": "model-element.model-element-uuid", + "relationship-value": "3c323039-c6ab-47bb-b8e0-d1e57a78fbea" + }, + { + "relationship-key": "model-element.model-element-uuid", + "relationship-value": "8a424916-020f-4c83-b785-7c04ac06567a" + } + ] + } + ] + } +} \ No newline at end of file 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 5c2e0296..86515343 100644 --- a/components/pm-subscription-handler/tests/data/cbs_data_1.json +++ b/components/pm-subscription-handler/tests/data/cbs_data_1.json @@ -10,7 +10,7 @@ "^pnf.*", "^vnf.*" ], - "modelInvariantUUIDs": [ + "modelInvariantIDs": [ ], "modelVersionIDs": [ diff --git a/components/pm-subscription-handler/tests/data/filter_test_data.json b/components/pm-subscription-handler/tests/data/filter_test_data.json index 28dc61d1..0d8fc7c8 100644 --- a/components/pm-subscription-handler/tests/data/filter_test_data.json +++ b/components/pm-subscription-handler/tests/data/filter_test_data.json @@ -6,7 +6,7 @@ "^pnf.*", "^vnf.*" ], - "modelInvariantUUIDs": [ + "modelInvariantIDs": [ ], "modelVersionIDs": [ @@ -16,7 +16,6 @@ "nfName": "pnf1", "modelInvariantUUID": "7129e420-d396-4efb-af02-6b83499b12f8", "modelVersionID": "e80a6ae3-cafd-4d24-850d-e14c084a5ca9", - "orchestration_status": "Active", "expectedResult": true }, { @@ -26,7 +25,7 @@ "^pnf.*", "^vnf.*" ], - "modelInvariantUUIDs": [ + "modelInvariantIDs": [ ], "modelVersionIDs": [ @@ -36,15 +35,14 @@ "nfName": "PNF-33", "modelInvariantUUID": "7129e420-d396-4efb-af02-6b83499b12f8", "modelVersionID": "e80a6ae3-cafd-4d24-850d-e14c084a5ca9", - "orchestration_status": "Active", "expectedResult": false }, { - "testName": "test_filter_true_on_modelInvariantUUIDs", + "testName": "test_filter_true_on_modelInvariantIDs", "nfFilter":{ "nfNames":[ ], - "modelInvariantUUIDs": [ + "modelInvariantIDs": [ "5845y423-g654-6fju-po78-8n53154532k6", "7129e420-d396-4efb-af02-6b83499b12f8" ], @@ -55,15 +53,14 @@ "nfName": "pnf1", "modelInvariantUUID": "7129e420-d396-4efb-af02-6b83499b12f8", "modelVersionID": "e80a6ae3-cafd-4d24-850d-e14c084a5ca9", - "orchestration_status": "Active", "expectedResult": true }, { - "testName": "test_filter_false_on_modelInvariantUUIDs", + "testName": "test_filter_false_on_modelInvariantIDs", "nfFilter":{ "nfNames":[ ], - "modelInvariantUUIDs": [ + "modelInvariantIDs": [ "5845y423-g654-6fju-po78-8n53154532k6", "7129e420-d396-4efb-af02-6b83499b12f8" ], @@ -74,17 +71,16 @@ "nfName": "pnf1", "modelInvariantUUID": "WrongModelInvariantUUID", "modelVersionID": "e80a6ae3-cafd-4d24-850d-e14c084a5ca9", - "orchestration_status": "Active", "expectedResult": false }, { - "testName": "test_filter_false_on_modelInvariantUUIDs_being_false_and_pnfname_being_true", + "testName": "test_filter_false_on_modelInvariantIDs_being_false_and_pnfname_being_true", "nfFilter":{ "nfNames":[ "^pnf.*", "^vnf.*" ], - "modelInvariantUUIDs": [ + "modelInvariantIDs": [ "7129e420-d396-4efb-af02-6b83499b12f8" ], "modelVersionIDs": [ @@ -94,7 +90,6 @@ "nfName": "pnf1", "modelInvariantUUID": "WrongModelInvariantUUID", "modelVersionID": "e80a6ae3-cafd-4d24-850d-e14c084a5ca9", - "orchestration_status": "Active", "expectedResult": false }, { @@ -102,7 +97,7 @@ "nfFilter":{ "nfNames":[ ], - "modelInvariantUUIDs": [ + "modelInvariantIDs": [ ], "modelVersionIDs": [ "e80a6ae3-cafd-4d24-850d-e14c084a5ca9" @@ -111,7 +106,6 @@ "nfName": "pnf1", "modelInvariantUUID": "7129e420-d396-4efb-af02-6b83499b12f8", "modelVersionID": "e80a6ae3-cafd-4d24-850d-e14c084a5ca9", - "orchestration_status": "Active", "expectedResult": true }, { @@ -119,7 +113,7 @@ "nfFilter":{ "nfNames":[ ], - "modelInvariantUUIDs": [ + "modelInvariantIDs": [ ], "modelVersionIDs": [ "e80a6ae3-cafd-4d24-850d-e14c084a5ca9" @@ -128,7 +122,6 @@ "nfName": "pnf1", "modelInvariantUUID": "7129e420-d396-4efb-af02-6b83499b12f8", "modelVersionID": "WrongModelVersionID", - "orchestration_status": "Active", "expectedResult": false }, { @@ -138,7 +131,7 @@ "^pnf.*", "^vnf.*" ], - "modelInvariantUUIDs": [ + "modelInvariantIDs": [ ], "modelVersionIDs": [ "e80a6ae3-cafd-4d24-850d-e14c084a5ca9" @@ -147,25 +140,6 @@ "nfName": "pnf1", "modelInvariantUUID": "7129e420-d396-4efb-af02-6b83499b12f8", "modelVersionID": "WrongModelVersionID", - "orchestration_status": "Active", - "expectedResult": false - }, - { - "testName": "test_filter_false_on_OrchestrationStatus", - "nfFilter":{ - "nfNames":[ - "^pnf.*", - "^vnf.*" - ], - "modelInvariantUUIDs": [ - ], - "modelVersionIDs": [ - ] - }, - "nfName": "pnf1", - "modelInvariantUUID": "7129e420-d396-4efb-af02-6b83499b12f8", - "modelVersionID": "e80a6ae3-cafd-4d24-850d-e14c084a5ca9", - "orchestration_status": "Inventoried", "expectedResult": false } - ] \ No newline at end of file +] diff --git a/components/pm-subscription-handler/tests/data/pm_subscription_event.json b/components/pm-subscription-handler/tests/data/pm_subscription_event.json index e190aa26..9416ec28 100755 --- a/components/pm-subscription-handler/tests/data/pm_subscription_event.json +++ b/components/pm-subscription-handler/tests/data/pm_subscription_event.json @@ -1,5 +1,7 @@ { "nfName":"pnf_1", + "blueprintName": "some-name", + "blueprintVersion": "some-version", "policyName":"pmsh-operational-policy", "changeType":"CREATE", "closedLoopControlName":"pmsh-control-loop", -- cgit 1.2.3-korg