[CSIT] PMSH Supporting New Monitoring Policy Key Update

Issue-ID: INT-1905
Signed-off-by: ajay_dp001 <ajay.deep.singh@est.tech>
Change-Id: I4720aeaef66ac64d8573b9fa776728df22b0939a

diff --git a/plans/dcaegen2-services-pmsh/testsuite/assets/cbs_sim/cbs-initializer.json b/plans/dcaegen2-services-pmsh/testsuite/assets/cbs_sim/cbs-initializer.json
index 5bb2e6f..6826962 100644 (file)
--- a/plans/dcaegen2-services-pmsh/testsuite/assets/cbs_sim/cbs-initializer.json
+++ b/plans/dcaegen2-services-pmsh/testsuite/assets/cbs_sim/cbs-initializer.json
@@ -13,77 +13,75 @@
       "body": {
         "type": "JSON",
         "json": {
-          "policy": {
-            "subscription": {
-              "subscriptionName": "ExtraPM-All-gNB-R2B",
-              "administrativeState": "LOCKED",
-              "fileBasedGP": 15,
-              "fileLocation": "/pm/pm.xml",
-              "nfFilter": {
-                "nfNames": [
-                  "^pnf.*",
-                  "^vnf.*"
-                ],
-                "modelInvariantIDs": [
-                  "7129e420-d396-4efb-af02-6b83499b12f8"
-                ],
-                "modelVersionIDs": [
-
-                ],
-                "modelNames": [
-
-                ]
-              },
-              "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",
             "enable_tls": true,
             "ca_cert_path": "/opt/app/pmsh/etc/certs/cacert.pem",
+            "pmsh_policy": {
+              "subscription": {
+                "subscriptionName": "ExtraPM-All-gNB-R2B",
+                "administrativeState": "LOCKED",
+                "fileBasedGP": 15,
+                "fileLocation":"\/pm\/pm.xml",
+                "nfFilter": {
+                  "nfNames": [
+                    "^pnf.*",
+                    "^vnf.*"
+                  ],
+                  "modelInvariantIDs": [
+                    "7129e420-d396-4efb-af02-6b83499b12f8"
+                  ],
+                  "modelVersionIDs": [
+                  ],
+                  "modelNames": [
+                  ]
+                },
+                "measurementGroups": [
+                  {
+                    "measurementGroup": {
+                      "measurementTypes": [
+                        {
+                          "measurementType": "countera"
+                        },
+                        {
+                          "measurementType": "counterb"
+                        }
+                      ],
+                      "managedObjectDNsBasic": [
+                        {
+                          "DN": "dna"
+                        },
+                        {
+                          "DN": "dnb"
+                        }
+                      ]
+                    }
+                  },
+                  {
+                    "measurementGroup": {
+                      "measurementTypes": [
+                        {
+                          "measurementType": "counterc"
+                        },
+                        {
+                          "measurementType": "counterd"
+                        }
+                      ],
+                      "managedObjectDNsBasic": [
+                        {
+                          "DN": "dnc"
+                        },
+                        {
+                          "DN": "dnd"
+                        }
+                      ]
+                    }
+                  }
+                ]
+              }
+            },
             "streams_publishes": {
               "policy_pm_publisher": {
                 "dmaap_info": {

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
index f22d456..60ac2aa 100644 (file)
--- a/tests/dcaegen2-services-pmsh/testcases/assets/cbs-expectation-unlocked-config.json
+++ b/tests/dcaegen2-services-pmsh/testcases/assets/cbs-expectation-unlocked-config.json
@@ -13,77 +13,75 @@
       "body": {
         "type": "JSON",
         "json": {
-          "policy": {
-            "subscription": {
-              "subscriptionName": "ExtraPM-All-gNB-R2B",
-              "administrativeState": "UNLOCKED",
-              "fileBasedGP": 15,
-              "fileLocation": "/pm/pm.xml",
-              "nfFilter": {
-                "nfNames": [
-                  "^pnf.*",
-                  "^vnf.*"
-                ],
-                "modelInvariantIDs": [
-                  "7129e420-d396-4efb-af02-6b83499b12f8"
-                ],
-                "modelVersionIDs": [
-
-                ],
-                "modelNames": [
-
-                ]
-              },
-              "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",
             "enable_tls": true,
             "ca_cert_path": "/opt/app/pmsh/etc/certs/cacert.pem",
+            "pmsh_policy": {
+              "subscription": {
+                "subscriptionName": "ExtraPM-All-gNB-R2B",
+                "administrativeState": "UNLOCKED",
+                "fileBasedGP": 15,
+                "fileLocation":"\/pm\/pm.xml",
+                "nfFilter": {
+                  "nfNames": [
+                    "^pnf.*",
+                    "^vnf.*"
+                  ],
+                  "modelInvariantIDs": [
+                    "7129e420-d396-4efb-af02-6b83499b12f8"
+                  ],
+                  "modelVersionIDs": [
+                  ],
+                  "modelNames": [
+                  ]
+                },
+                "measurementGroups": [
+                  {
+                    "measurementGroup": {
+                      "measurementTypes": [
+                        {
+                          "measurementType": "countera"
+                        },
+                        {
+                          "measurementType": "counterb"
+                        }
+                      ],
+                      "managedObjectDNsBasic": [
+                        {
+                          "DN": "dna"
+                        },
+                        {
+                          "DN": "dnb"
+                        }
+                      ]
+                    }
+                  },
+                  {
+                    "measurementGroup": {
+                      "measurementTypes": [
+                        {
+                          "measurementType": "counterc"
+                        },
+                        {
+                          "measurementType": "counterd"
+                        }
+                      ],
+                      "managedObjectDNsBasic": [
+                        {
+                          "DN": "dnc"
+                        },
+                        {
+                          "DN": "dnd"
+                        }
+                      ]
+                    }
+                  }
+                ]
+              }
+            },
             "streams_publishes": {
               "policy_pm_publisher": {
                 "dmaap_info": {