Merge "Fix Overlay DG testing issue"

Former-commit-id: 4b4e9274a650ead672c14e7a30685e804883ce34

diff --git a/installation/dmaap-listener/src/main/properties/dhcpalert.properties b/installation/dmaap-listener/src/main/properties/dhcpalert.properties
index 7b93278..d836c7f 100755 (executable)
--- a/installation/dmaap-listener/src/main/properties/dhcpalert.properties
+++ b/installation/dmaap-listener/src/main/properties/dhcpalert.properties
@@ -1,4 +1,4 @@
-TransportType=HTTPAAF
+TransportType=HTTPAUTH
 Latitude =50.000000
 Longitude =-100.000000
 Version =1.0
@@ -12,12 +12,12 @@ MethodType =GET
 username =admin
 password =admin
 contenttype =application/json
-authKey=01234567890abcde:01234567890abcdefghijklmn
+authKey=fxoW4jZrO7mdLWWa:f4KxkoBtToyoEG7suMoV8KhnkwM=
 authDate=2016-02-18T13:57:37-0800
-host=dmaap.onap.org:3904
+host=ueb.api.simpledemo.onap.org:3904
 topic=VCPE-DHCP-EVENT
 group=jmsgrp
-id=sdnc_mtsnjv9sdma01
+id=sdnc_1
 timeout=15000
 limit=1000
 filter=

diff --git a/installation/dmaap-listener/src/main/properties/dmaap-listener.properties b/installation/dmaap-listener/src/main/properties/dmaap-listener.properties
index 1ab386f..ed0fd9c 100755 (executable)
--- 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.SdncDmaapConsumer:dhcpalert.properties
+subscriptions=org.onap.ccsdk.sli.northbound.dmaapclient.SdncDhcpEventConsumer:dhcpalert.properties

diff --git a/installation/dmaap-listener/src/main/scripts/start-dmaap-listener.sh b/installation/dmaap-listener/src/main/scripts/start-dmaap-listener.sh
index 06f1405..6a8eb13 100644 (file)
--- a/installation/dmaap-listener/src/main/scripts/start-dmaap-listener.sh
+++ b/installation/dmaap-listener/src/main/scripts/start-dmaap-listener.sh
@@ -45,7 +45,7 @@ do
 done
 
 echo "Starting dmaap-listener"
-exec ${JAVA} ${JAVA_OPTS} -jar ${DMAAPLISTENERROOT}/lib/dmaap-listener*.jar -Dlog4j.configuration=file:${PROPERTY_DIR}/log4j.properties -cp ${LISTENERCLASSPATH}
+exec ${JAVA} ${JAVA_OPTS} -Dlog4j.configuration=file:${PROPERTY_DIR}/log4j.properties -jar ${DMAAPLISTENERROOT}/lib/dmaap-listener*.jar dmaap-listener.properties -cp ${LISTENERCLASSPATH}