From: Dan Timoney Date: Wed, 29 May 2019 14:58:49 +0000 (+0000) Subject: Merge "Fix bug associated with DMAAP listener properties" X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=ce259eb94d8195d126a2faec4c9b03fdab5529fd;hp=d62222b32cb04696dd11917f893397a01c3ba49f;p=sdnc%2Foam.git Merge "Fix bug associated with DMAAP listener properties" --- diff --git a/installation/dmaap-listener/src/main/properties/dmaap-consumer-oofpcipoc.properties b/installation/dmaap-listener/src/main/properties/dmaap-consumer-oofpcipoc.properties index 2c92257e..f933edee 100644 --- a/installation/dmaap-listener/src/main/properties/dmaap-consumer-oofpcipoc.properties +++ b/installation/dmaap-listener/src/main/properties/dmaap-consumer-oofpcipoc.properties @@ -1,25 +1,25 @@ -TransportType=HTTPAUTH +TransportType=HTTPNOAUTH Latitude =50.000000 Longitude =-100.000000 Version =1.0 -ServiceName =localhost/events +ServiceName =message-router.onap:3904/events Environment =TEST Partner = routeOffer=MR1 SubContextPath =/ Protocol =http MethodType =GET -username = -password = +username =admin +password =admin contenttype =application/json authKey=fs20cKwalJ6ry4kX:7Hqm6BDZK47IKxGRkOPFk33qMYs= authDate=2019-04-09T04:28:40-05:00 -host=localhost:3904 +host=message-router.onap:3904 topic=SDNR-CL group=users -id=fs20cKwalJ6ry4kX -timeout=20000 -limit=10000 +id=sdnc1 +timeout=15000 +limit=1000 filter= AFT_DME2_EXCHANGE_REQUEST_HANDLERS=com.att.nsa.test.PreferredRouteRequestHandler AFT_DME2_EXCHANGE_REPLY_HANDLERS=com.att.nsa.test.PreferredRouteReplyHandler @@ -32,4 +32,4 @@ sessionstickinessrequired=NO DME2preferredRouterFilePath=/opt/onap/sdnc/data/properties/dmaap-listener.preferredRoute.txt sdnc.odl.user=admin sdnc.odl.password=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U -sdnc.odl.url-base=http://127.0.0.1:8282/restconf/operations +sdnc.odl.url-base=http://sdnc.onap:8282/restconf/operations diff --git a/installation/dmaap-listener/src/main/properties/dmaap-listener.properties b/installation/dmaap-listener/src/main/properties/dmaap-listener.properties index acc4b6c5..dd1b2328 100755 --- a/installation/dmaap-listener/src/main/properties/dmaap-listener.properties +++ b/installation/dmaap-listener/src/main/properties/dmaap-listener.properties @@ -1 +1 @@ -subscriptions=org.onap.ccsdk.sli.northbound.dmaapclient.SdncDhcpEventConsumer:dhcpalert.properties;org.onap.ccsdk.sli.northbound.dmaapclient.SdncLcmDmaapConsumer:lcm.properties;org.onap.ccsdk.sli.northbound.dmaapclient.SdncAaiDmaapConsumer:aai.properties;org.onap.ccsdk.sli.northbound.dmaapclient.PciChangesFromPolicyToSDNRDmaapConsumer:dmaap-consumer-oofpcipoc.properties;org.onap.ccsdk.sli.northbound.dmaapclient.ANRChangesFromPolicyToSDNRDmaapConsumer:dmaap-consumer-oofpcipoc.properties +subscriptions=org.onap.ccsdk.sli.northbound.dmaapclient.SdncDhcpEventConsumer:dhcpalert.properties;org.onap.ccsdk.sli.northbound.dmaapclient.SdncLcmDmaapConsumer:lcm.properties;org.onap.ccsdk.sli.northbound.dmaapclient.SdncAaiDmaapConsumer:aai.properties;org.onap.ccsdk.sli.northbound.dmaapclient.OofPciPocDmaapConsumers:dmaap-consumer-oofpcipoc.properties