X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=tests%2Fdcaegen2-services-pmsh%2Ftestcases%2Fassets%2Fcbs-expectation-unlocked-config.json;h=e6d0ef976aaeb386ece3c3e4ba65b3942b2b27be;hb=5e83a4b0e5e34aa81cb4c96dfabc4375ac0bf16e;hp=b67c0cb16151bf328d5feffddb26a509c03a8ff0;hpb=b360b52498bdfca7b21f8751cd47f9938ebcecab;p=integration%2Fcsit.git

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 b67c0cb1..e6d0ef97 100644
--- 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,80 +13,81 @@
       "body": {
         "type": "JSON",
         "json": {
-          "policy": {
-            "subscription": {
-              "subscriptionName": "ExtraPM-All-gNB-R2B",
-              "administrativeState": "UNLOCKED",
-              "fileBasedGP": 15,
-              "fileLocation": "/pm/pm.xml",
-              "nfFilter": {
-                "nfNames": [
-                  "^pnf.*",
-                  "^vnf.*"
-                ],
-                "modelInvariantUUIDs": [
-                  "7129e420-d396-4efb-af02-6b83499b12f8"
-                ],
-                "modelVersionIDs": [
-
-                ]
-              },
-              "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": {
                   "client_id": "1475976809466",
                   "client_role": "org.onap.dcae.pmPublisher",
-                  "topic_url": "https://mr-sim:3095/events/unauthenticated.DCAE_CL_OUTPUT",
+                  "topic_url": "http://mr-sim:3904/events/unauthenticated.DCAE_CL_OUTPUT",
                   "location": "san-francisco"
                 },
                 "type": "message_router"
@@ -98,14 +99,14 @@
                 "dmaap_info": {
                   "client_id": "1575976809466",
                   "client_role": "org.onap.dcae.aaiSub",
-                  "topic_url": "https://mr-sim:3095/events/AAI_EVENT",
+                  "topic_url": "http://mr-sim:3904/events/AAI-EVENT",
                   "location": "san-francisco"
                 }
               },
               "policy_pm_subscriber": {
                 "dmaap_info": {
                   "location": "san-francisco",
-                  "topic_url": "https://mr-sim:3095/events/unauthenticated.PMSH_CL_INPUT",
+                  "topic_url": "http://mr-sim:3904/events/unauthenticated.PMSH_CL_INPUT",
                   "client_role": "org.onap.dcae.pmSubscriber",
                   "client_id": "1575876809456"
                 },