From 4b2b1445bef3b760ed29efa1c7c78977dde73452 Mon Sep 17 00:00:00 2001
From: egernug <gerard.nugent@est.tech>
Date: Wed, 14 Oct 2020 08:52:49 +0100
Subject: [PMSH] Add Resource Name to filter options

Issue-ID: DCAEGEN2-2402
Change-Id: I2242d36ca34e0b8ac085ce790b19b7ad51352c63
Signed-off-by: egernug <gerard.nugent@est.tech>
---
 .../tests/data/filter_test_data.json               | 76 ++++++++++++++++++++++
 1 file changed, 76 insertions(+)

(limited to 'components/pm-subscription-handler/tests/data')

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 0d8fc7c8..2033624e 100644
--- a/components/pm-subscription-handler/tests/data/filter_test_data.json
+++ b/components/pm-subscription-handler/tests/data/filter_test_data.json
@@ -1,4 +1,48 @@
 [
+    {
+      "testName": "test_filter_model_name_true",
+      "nfFilter":{
+            "nfNames":[
+                 "^pnf.*",
+                 "^vnf.*"
+            ],
+            "modelInvariantIDs": [
+            ],
+            "modelVersionIDs": [
+
+            ],
+            "modelNames": [
+                "pnf102"
+            ]
+         },
+      "nfName": "pnf1",
+      "modelInvariantUUID": "7129e420-d396-4efb-af02-6b83499b12f8",
+      "modelVersionID": "e80a6ae3-cafd-4d24-850d-e14c084a5ca9",
+      "modelName": "pnf102",
+      "expectedResult": true
+    },
+    {
+      "testName": "test_filter_model_name_false",
+      "nfFilter":{
+            "nfNames":[
+                 "^pnf.*",
+                 "^vnf.*"
+            ],
+            "modelInvariantIDs": [
+            ],
+            "modelVersionIDs": [
+
+            ],
+            "modelNames": [
+                "pnf102"
+            ]
+         },
+      "nfName": "pnf1",
+      "modelInvariantUUID": "7129e420-d396-4efb-af02-6b83499b12f8",
+      "modelVersionID": "e80a6ae3-cafd-4d24-850d-e14c084a5ca9",
+      "modelName": "Wrong_Model_Name",
+      "expectedResult": false
+    },
     {
       "testName": "test_filter_true_on_xnf",
       "nfFilter":{
@@ -11,11 +55,15 @@
             ],
             "modelVersionIDs": [
 
+            ],
+            "modelNames": [
+
             ]
          },
       "nfName": "pnf1",
       "modelInvariantUUID": "7129e420-d396-4efb-af02-6b83499b12f8",
       "modelVersionID": "e80a6ae3-cafd-4d24-850d-e14c084a5ca9",
+      "modelName": "pnf102",
       "expectedResult": true
     },
     {
@@ -30,11 +78,15 @@
             ],
             "modelVersionIDs": [
 
+            ],
+            "modelNames": [
+
             ]
          },
       "nfName": "PNF-33",
       "modelInvariantUUID": "7129e420-d396-4efb-af02-6b83499b12f8",
       "modelVersionID": "e80a6ae3-cafd-4d24-850d-e14c084a5ca9",
+      "modelName": "pnf102",
       "expectedResult": false
     },
     {
@@ -48,11 +100,15 @@
             ],
             "modelVersionIDs": [
 
+            ],
+            "modelNames": [
+
             ]
          },
       "nfName": "pnf1",
       "modelInvariantUUID": "7129e420-d396-4efb-af02-6b83499b12f8",
       "modelVersionID": "e80a6ae3-cafd-4d24-850d-e14c084a5ca9",
+      "modelName": "pnf102",
       "expectedResult": true
     },
     {
@@ -66,11 +122,15 @@
             ],
             "modelVersionIDs": [
 
+            ],
+            "modelNames": [
+
             ]
          },
       "nfName": "pnf1",
       "modelInvariantUUID": "WrongModelInvariantUUID",
       "modelVersionID": "e80a6ae3-cafd-4d24-850d-e14c084a5ca9",
+      "modelName": "pnf102",
       "expectedResult": false
     },
     {
@@ -85,11 +145,15 @@
             ],
             "modelVersionIDs": [
 
+            ],
+            "modelNames": [
+
             ]
          },
       "nfName": "pnf1",
       "modelInvariantUUID": "WrongModelInvariantUUID",
       "modelVersionID": "e80a6ae3-cafd-4d24-850d-e14c084a5ca9",
+      "modelName": "pnf102",
       "expectedResult": false
     },
     {
@@ -101,11 +165,15 @@
             ],
             "modelVersionIDs": [
                 "e80a6ae3-cafd-4d24-850d-e14c084a5ca9"
+            ],
+            "modelNames": [
+
             ]
          },
       "nfName": "pnf1",
       "modelInvariantUUID": "7129e420-d396-4efb-af02-6b83499b12f8",
       "modelVersionID": "e80a6ae3-cafd-4d24-850d-e14c084a5ca9",
+      "modelName": "pnf102",
       "expectedResult": true
     },
     {
@@ -117,11 +185,15 @@
             ],
             "modelVersionIDs": [
                 "e80a6ae3-cafd-4d24-850d-e14c084a5ca9"
+            ],
+            "modelNames": [
+
             ]
          },
       "nfName": "pnf1",
       "modelInvariantUUID": "7129e420-d396-4efb-af02-6b83499b12f8",
       "modelVersionID": "WrongModelVersionID",
+      "modelName": "pnf102",
       "expectedResult": false
     },
     {
@@ -135,11 +207,15 @@
             ],
             "modelVersionIDs": [
                 "e80a6ae3-cafd-4d24-850d-e14c084a5ca9"
+            ],
+            "modelNames": [
+
             ]
          },
       "nfName": "pnf1",
       "modelInvariantUUID": "7129e420-d396-4efb-af02-6b83499b12f8",
       "modelVersionID": "WrongModelVersionID",
+      "modelName": "pnf102",
       "expectedResult": false
     }
 ]
-- 
cgit 1.2.3-korg