diff options
| author |   Marcus Williams <marcus.williams@intel.com> | 2017-11-10 22:03:23 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2017-11-10 22:03:23 +0000 |
| commit | aac15baf7fe9b69f70931d0ed076395e19779cf7 (patch) | |
| tree | d49304d7541520b0a74624b0c70d549725662755 | |
| parent | 82b8356453986e93165869dabfecc7d2f73ef38e (diff) | |
| parent | da86c1775bb308e31001d20628b88a457db34e4c (diff) | |
Merge "Update dmaap config"
Former-commit-id: 5f99b3dfbc600ce33f6ffa41eab41bd2f5681682
4 files changed, 22 insertions, 13 deletions
diff --git a/installation/dmaap-listener/src/main/properties/dhcpalert.properties b/installation/dmaap-listener/src/main/properties/dhcpalert.properties index 485972a7..7b93278a 100755 --- 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 ddd4e86d..1400ee2d 100755 --- 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 0879ac79..1ab386f3 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.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 1ac22d28..9949c88c 100644 --- 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 */; |