Update dmaap config

Update DMAAP configuration to use new SdncDhcpEvent handler

Change-Id: I71bca9ef7beb0dd0b2357d451932869918e301c4
Issue-ID: SDNC-165
Signed-off-by: Dan Timoney <dtimoney@att.com>
Former-commit-id: cc150b20f4c5be8de45577405ae80238846109b0

diff --git a/installation/dmaap-listener/src/main/properties/dhcpalert.properties b/installation/dmaap-listener/src/main/properties/dhcpalert.properties
index 485972a..7b93278 100755 (executable)
--- a/installation/dmaap-listener/src/main/properties/dhcpalert.properties
+++ b/installation/dmaap-listener/src/main/properties/dhcpalert.properties
@@ -1,21 +1,22 @@
 TransportType=HTTPAAF
-Latitude =40.397443
-Longitude =-74.135602
+Latitude =50.000000
+Longitude =-100.000000
 Version =1.0
-ServiceName =dmaap.onap.org/events
-Environment =DEV
-Partner =
+ServiceName =dmaap-v1.dev.dmaap.dt.saat.acsi.openecomp.org/events
+Environment =TEST
+Partner = BOT_R
+routeOffer=MR1
 SubContextPath =/
 Protocol =http
 MethodType =GET
-username =sdnc
-password =Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U
+username =admin
+password =admin
 contenttype =application/json
-authKey=VCisJnH4Zh772CLs:kcrM5mGlb7a0R+jlPN6gYUCKXrk=
-authDate=2016-05-10T13:13:50-0700
+authKey=01234567890abcde:01234567890abcdefghijklmn
+authDate=2016-02-18T13:57:37-0800
 host=dmaap.onap.org:3904
-topic=com.att.instar.edgeRouterStatusChange-v1
-group=sdnc_st
+topic=VCPE-DHCP-EVENT
+group=jmsgrp
 id=sdnc_mtsnjv9sdma01
 timeout=15000
 limit=1000

diff --git a/installation/dmaap-listener/src/main/properties/dmaap-listener.preferredRoute.txt b/installation/dmaap-listener/src/main/properties/dmaap-listener.preferredRoute.txt
index ddd4e86..1400ee2 100755 (executable)
--- a/installation/dmaap-listener/src/main/properties/dmaap-listener.preferredRoute.txt
+++ b/installation/dmaap-listener/src/main/properties/dmaap-listener.preferredRoute.txt
@@ -1 +1 @@
-preferredRouteKey=MR1SBSFD_1
\ No newline at end of file
+preferredRouteKey=MR1

diff --git a/installation/dmaap-listener/src/main/properties/dmaap-listener.properties b/installation/dmaap-listener/src/main/properties/dmaap-listener.properties
index 0879ac7..1ab386f 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.SdncFlatJsonDmaapConsumer:dhcpalert.properties
+subscriptions=org.onap.ccsdk.sli.northbound.dmaapclient.SdncDmaapConsumer:dhcpalert.properties

diff --git a/installation/sdnc/src/main/resources/sdnctl.dump b/installation/sdnc/src/main/resources/sdnctl.dump
index 1ac22d2..9949c88 100644 (file)
--- a/installation/sdnc/src/main/resources/sdnctl.dump
+++ b/installation/sdnc/src/main/resources/sdnctl.dump
@@ -3286,6 +3286,14 @@ CREATE TABLE `WAN_COMBO_ALLOWABLE` (
 ) ENGINE=InnoDB AUTO_INCREMENT=147 DEFAULT CHARSET=latin1;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
+DROP TABLE IF EXISTS `DHCP_MAP`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `DHCP_MAP` (
+  `mac_addr` varchar(128) NOT NULL,
+  `ip_addr` varchar(128) DEFAULT NULL,
+  PRIMARY KEY (`mac_addr`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
 
 /*!40101 SET character_set_client = @saved_cs_client */;
 /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;