Fix DMAAP properties

Fixed 2 issues found in DMAAP properties files :
(1) id cannot contain underbar and should be unique
(2) wrong URL and credentials for back end controller in LCM properties

Change-Id: I3e5ba3af2f59abed62f626b40552e144a945751c
Issue-ID: SDNC-234
Signed-off-by: Timoney, Dan (dt5972) <dt5972@att.com>
Former-commit-id: 19c4698be5e22487de8119fa603e138bb6f35177

diff --git a/installation/dmaap-listener/src/main/properties/dhcpalert.properties b/installation/dmaap-listener/src/main/properties/dhcpalert.properties
index af6a8cc..ae9804f 100755 (executable)
--- a/installation/dmaap-listener/src/main/properties/dhcpalert.properties
+++ b/installation/dmaap-listener/src/main/properties/dhcpalert.properties
@@ -17,7 +17,7 @@ authDate=2016-02-18T13:57:37-0800
 host=ueb.api.simpledemo.onap.org:3904
 topic=VCPE-DHCP-EVENT
 group=jmsgrp
-id=sdnc_1
+id=sdnc1
 timeout=15000
 limit=1000
 filter=

diff --git a/installation/dmaap-listener/src/main/properties/lcm.properties b/installation/dmaap-listener/src/main/properties/lcm.properties
index 95fde40..22dbebe 100755 (executable)
--- a/installation/dmaap-listener/src/main/properties/lcm.properties
+++ b/installation/dmaap-listener/src/main/properties/lcm.properties
@@ -17,7 +17,7 @@ authDate=2016-02-18T13:57:37-0800
 host=ueb.api.simpledemo.onap.org:3904
 topic=SDNC-LCM-READ
 group=jmsgrp
-id=sdnc_1
+id=sdnc2
 timeout=15000
 limit=1000
 filter=
@@ -31,6 +31,6 @@ AFT_DME2_EP_READ_TIMEOUT_MS=50000
 sessionstickinessrequired=NO
 DME2preferredRouterFilePath=/opt/onap/sdnc/data/properties/dmaap-listener.preferredRoute.txt
 sdnc.odl.user=admin
-sdnc.odl.password=admin
-sdnc.odl.url-base=https://sdnchost:8443/restconf/operations
+sdnc.odl.password=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U
+sdnc.odl.url-base=http://sdnhost:8181/restconf/operations
 

diff --git a/installation/src/main/properties/lcm-dg.properties b/installation/src/main/properties/lcm-dg.properties
index d640d7b..9906ada 100644 (file)
--- a/installation/src/main/properties/lcm-dg.properties
+++ b/installation/src/main/properties/lcm-dg.properties
@@ -10,7 +10,7 @@ lcm.upgrade-post-check.playbookname=ansible_postcheck
 lcm.upgrade-software.playbookname=ansible_upgradesw
 restapi.templateDir=/opt/onap/sdnc/restapi/templates
 restapi.lcm.dmaap.publish.templatefile=lcm-dmaap-publish-template.json
-lcm.dmaap.url=http://dmaap-v1.dev.dmaap.dt.saat.acsi.openecomp.org/events/SDNC-LCM-WRITE
+lcm.dmaap.url=http://mr.api.simpledemo.onap.org/events/SDNC-LCM-WRITE
 lcm.dmaap.user=admin
 lcm.dmaap.password=admin
 lcm.dmaap.version=1.0