diff options
Diffstat (limited to 'installation')
6 files changed, 29 insertions, 18 deletions
diff --git a/installation/dmaap-listener/src/main/properties/dhcpalert.properties b/installation/dmaap-listener/src/main/properties/dhcpalert.properties index 485972a7..d836c7f2 100755 --- a/installation/dmaap-listener/src/main/properties/dhcpalert.properties +++ b/installation/dmaap-listener/src/main/properties/dhcpalert.properties @@ -1,22 +1,23 @@ -TransportType=HTTPAAF -Latitude =40.397443 -Longitude =-74.135602 +TransportType=HTTPAUTH +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 -host=dmaap.onap.org:3904 -topic=com.att.instar.edgeRouterStatusChange-v1 -group=sdnc_st -id=sdnc_mtsnjv9sdma01 +authKey=fxoW4jZrO7mdLWWa:f4KxkoBtToyoEG7suMoV8KhnkwM= +authDate=2016-02-18T13:57:37-0800 +host=ueb.api.simpledemo.onap.org:3904 +topic=VCPE-DHCP-EVENT +group=jmsgrp +id=sdnc_1 timeout=15000 limit=1000 filter= 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..ed0fd9c3 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.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 06f14058..6a8eb13d 100644 --- 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} 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 */; diff --git a/installation/src/main/properties/generic-resource-api-dg.properties b/installation/src/main/properties/generic-resource-api-dg.properties index 7d6ce821..ecf8c37d 100644 --- a/installation/src/main/properties/generic-resource-api-dg.properties +++ b/installation/src/main/properties/generic-resource-api-dg.properties @@ -18,6 +18,7 @@ restapi.parentsvc.templatefile=parent-provided-allotted-resource.json restapi.network-ar.templatefile=network-provided-allotted-resources.json restapi.vnf-ar.templatefile=vnf-provided-allotted-resources.json restapi.services.templatefile=vcpe-services-service.json +restapi.services.vnf.vfmodule.templatefile=vfmodule-vim-parameters.vgw.json # URLs restapi.cr-allottedresource=/restconf/config/GENERIC-RESOURCE-API:contrail-route-allotted-resources/contrail-route-allotted-resource/{allotted-resource-id}/ restapi.sz-allottedresource=/restconf/config/GENERIC-RESOURCE-API:security-zone-allotted-resources/security-zone-allotted-resource/{allotted-resource-id}/ @@ -32,4 +33,5 @@ restapi.vnf=/restconf/config/GENERIC-RESOURCE-API:services/service/{service-inst restapi.vnf-api.service-information=/restconf/config/VNF-API:vnfs/vnf-list/{vnf-id}/service-data restapi.parent-provided-resource=/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/provided-allotted-resources/provided-allotted-resource/{allotted-resource-id}/ restapi.network-provided-resource=/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/networks/network/{network-id}/network-data/network-provided-allotted-resources/ -restapi.services=/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}
\ No newline at end of file +restapi.services=/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id} +restapi.service.vnf.vfmodule-resource=/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id} |