From: John Keeney Date: Tue, 7 Mar 2023 18:32:22 +0000 (+0000) Subject: Merge "Removal of DMAAP configuration for A1 PMS" X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=1298e998c417da23f0725fb8b47e34f88d52541d;hp=b192fa2aac64a4475cfe5f004c42b53e8bec6ea2;p=it%2Fdep.git Merge "Removal of DMAAP configuration for A1 PMS" --- diff --git a/nonrtric/helm/policymanagementservice/resources/data/application_configuration.json b/nonrtric/helm/policymanagementservice/resources/data/application_configuration.json index 8c446fab..0abd1d57 100644 --- a/nonrtric/helm/policymanagementservice/resources/data/application_configuration.json +++ b/nonrtric/helm/policymanagementservice/resources/data/application_configuration.json @@ -1,84 +1,68 @@ { - "config":{ - "controller": [ - { - "name": "controller1", - "baseUrl": "https://a1controller:8383", - "userName": "admin", - "password": "Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U" - } - ], - "ric": [ - { - "name":"ric1", - "baseUrl":"https://a1-sim-osc-0.a1-sim:8185", - "controller": "controller1", - "managedElementIds":[ - "kista_1", - "kista_2" - ] - }, - { - "name":"ric2", - "baseUrl":"https://a1-sim-osc-1.a1-sim:8185", - "controller": "controller1", - "managedElementIds":[ - "kista_1", - "kista_2" - ] - }, - { - "name":"ric3", - "baseUrl":"https://a1-sim-std-0.a1-sim:8185", - "controller": "controller1", - "managedElementIds":[ - "kista_1", - "kista_2" - ] - }, - { - "name":"ric4", - "baseUrl":"https://a1-sim-std-1.a1-sim:8185", - "controller": "controller1", - "managedElementIds":[ - "kista_1", - "kista_2" - ] - }, - { - "name":"ric5", - "baseUrl":"https://a1-sim-std2-0.a1-sim:8185", - "controller": "controller1", - "managedElementIds":[ - "kista_1", - "kista_2" - ] - }, - { - "name":"ric6", - "baseUrl":"https://a1-sim-std2-1.a1-sim:8185", - "controller": "controller1", - "managedElementIds":[ - "kista_1", - "kista_2" - ] - } - ], - "streams_publishes": { - "dmaap_publisher": { - "type":"message_router", - "dmaap_info":{ - "topic_url":"http://message-router.onap:3904/events/A1-POLICY-AGENT-WRITE" - } - } + "config": { + "controller": [ + { + "name": "controller1", + "baseUrl": "https://a1controller:8383", + "userName": "admin", + "password": "Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U" + } + ], + "ric": [ + { + "name": "ric1", + "baseUrl": "https://a1-sim-osc-0.a1-sim:8185", + "controller": "controller1", + "managedElementIds": [ + "kista_1", + "kista_2" + ] + }, + { + "name": "ric2", + "baseUrl": "https://a1-sim-osc-1.a1-sim:8185", + "controller": "controller1", + "managedElementIds": [ + "kista_1", + "kista_2" + ] + }, + { + "name": "ric3", + "baseUrl": "https://a1-sim-std-0.a1-sim:8185", + "controller": "controller1", + "managedElementIds": [ + "kista_1", + "kista_2" + ] + }, + { + "name": "ric4", + "baseUrl": "https://a1-sim-std-1.a1-sim:8185", + "controller": "controller1", + "managedElementIds": [ + "kista_1", + "kista_2" + ] + }, + { + "name": "ric5", + "baseUrl": "https://a1-sim-std2-0.a1-sim:8185", + "controller": "controller1", + "managedElementIds": [ + "kista_1", + "kista_2" + ] }, - "streams_subscribes": { - "dmaap_subscriber":{ - "type":"message_router", - "dmaap_info":{ - "topic_url":"http://message-router.onap:3904/events/A1-POLICY-AGENT-READ/users/policy-agent?timeout=15000&limit=100" - } - } + { + "name": "ric6", + "baseUrl": "https://a1-sim-std2-1.a1-sim:8185", + "controller": "controller1", + "managedElementIds": [ + "kista_1", + "kista_2" + ] } - } -} + ] + } +} \ No newline at end of file