X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=tests%2Fdcaegen2-services-pmsh%2Ftestcases%2Fassets%2Fcbs-expectation-unlocked-config.json;fp=plans%2Fdcaegen2-services-pmsh%2Ftestsuite%2Fassets%2FinitializerJson.json;h=6f6972f40d3203af2de6fd5708fd1a2d878d4655;hb=48496a511e8aa634c8b13ece136f7d63b659bdc1;hp=222aafd53f906c02c715f635295e6aa86ce18395;hpb=940b6d936da7a3be6cfd5bd903ef40c6da9592ae;p=integration%2Fcsit.git

diff --git a/plans/dcaegen2-services-pmsh/testsuite/assets/initializerJson.json b/tests/dcaegen2-services-pmsh/testcases/assets/cbs-expectation-unlocked-config.json
similarity index 54%
rename from plans/dcaegen2-services-pmsh/testsuite/assets/initializerJson.json
rename to tests/dcaegen2-services-pmsh/testcases/assets/cbs-expectation-unlocked-config.json
index 222aafd5..6f6972f4 100644
--- a/plans/dcaegen2-services-pmsh/testsuite/assets/initializerJson.json
+++ b/tests/dcaegen2-services-pmsh/testcases/assets/cbs-expectation-unlocked-config.json
@@ -19,7 +19,6 @@
               "administrativeState": "UNLOCKED",
               "fileBasedGP": 15,
               "fileLocation": "/pm/pm.xml",
-              "nfTypeModelInvariantId": "2829292",
               "nfFilter": {
                 "swVersions": [
                   "1.0.0",
@@ -75,25 +74,18 @@
             }
           },
           "config": {
+            "control_loop_name": "pmsh-control-loop",
+            "operational_policy_name": "pmsh-operational-policy",
             "cert_path": "/opt/app/pmsh/etc/certs/cert.pem",
             "streams_publishes": {
               "policy_pm_publisher": {
                 "dmaap_info": {
                   "client_id": "1475976809466",
                   "client_role": "org.onap.dcae.pmPublisher",
-                  "topic_url": "https://node:30226/events/org.onap.dmaap.mr.PM_SUBSCRIPTIONS",
+                  "topic_url": "https://mr-sim:1080/events/org.onap.dmaap.mr.PM_SUBSCRIPTIONS",
                   "location": "san-francisco"
                 },
                 "type": "message_router"
-              },
-              "other_publisher": {
-                "dmaap_info": {
-                  "location": "san-francisco",
-                  "topic_url": "https://node:30226/events/org.onap.dmaap.mr.SOME_OTHER_TOPIC",
-                  "client_role": "org.onap.dcae.pmControlPub",
-                  "client_id": "1875976809466"
-                },
-                "type": "message_router"
               }
             },
             "streams_subscribes": {
@@ -102,14 +94,14 @@
                 "dmaap_info": {
                   "client_id": "1575976809466",
                   "client_role": "org.onap.dcae.aaiSub",
-                  "topic_url": "https://node:30226/events/AAI_EVENT",
+                  "topic_url": "https://mr-sim:1080/events/AAI_EVENT",
                   "location": "san-francisco"
                 }
               },
               "policy_pm_subscriber": {
                 "dmaap_info": {
                   "location": "san-francisco",
-                  "topic_url": "https://node:30226/events/org.onap.dmaap.mr.PM_SUBSCRIPTIONS",
+                  "topic_url": "https://mr-sim:1080/events/org.onap.dmaap.mr.PM_SUBSCRIPTIONS",
                   "client_role": "org.onap.dcae.pmSubscriber",
                   "client_id": "1575876809456"
                 },
@@ -123,63 +115,5 @@
         }
       }
     }
-  },
-  {
-    "httpRequest": {
-      "path": "/aai/v16/query.*"
-    },
-    "httpResponse": {
-      "statusCode": 200,
-      "headers": {
-        "content-type": [
-          "application/json"
-        ]
-      },
-      "body": {
-        "type": "JSON",
-        "json": {
-          "results": [
-            {
-              "id": "327736",
-              "node-type": "pnf",
-              "url": "/aai/v16/network/pnfs/pnf/pnf207",
-              "properties": {
-                "pnf-name": "pnf207",
-                "pnf-id": "55e57cd1-ab8b-40cd-97d5-cfc774fef616",
-                "equip-type": "val8",
-                "equip-vendor": "Nokia",
-                "equip-model": "val6",
-                "ipaddress-v4-oam": "10.10.10.26",
-                "sw-version": "val7",
-                "in-maint": false,
-                "serial-number": "6061ZW3",
-                "ipaddress-v6-oam": "2001:0db8:0:0:0:0:1428:57ab",
-                "resource-version": "1573066346347",
-                "nf-role": "gNB"
-              }
-            },
-            {
-              "id": "241864",
-              "node-type": "generic-vnf",
-              "url": "/aai/v16/network/generic-vnfs/generic-vnf/1083ecbb-f3b3-49da-b5f5-b5962140ee99",
-              "properties": {
-                "vnf-id": "1083ecbb-f3b3-49da-b5f5-b5962140ee99",
-                "vnf-name": "vnf",
-                "vnf-type": "demoVCPEvBNG/vCPE_vbng 5eb5661a-0cb6 0",
-                "service-id": "2db01c96-4baa-4393-8d79-af8d7bf4698e",
-                "prov-status": "PREPROV",
-                "orchestration-status": "Inventoried",
-                "in-maint": false,
-                "is-closed-loop-disabled": false,
-                "resource-version": "1575541662410",
-                "model-invariant-id": "7129e420-d396-4efb-af02-6b83499b12f8",
-                "model-version-id": "e80a6ae3-cafd-4d24-850d-e14c084a5ca9",
-                "model-customization-id": "376dbe87-e9c5-4f2b-80e2-a420b373ee87"
-              }
-            }
-          ]
-        }
-      }
-    }
   }
 ]