summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--controlloop/common/feature-controlloop-amsterdam/src/main/feature/config/amsterdam-controller.properties78
-rw-r--r--controlloop/templates/archetype-cl-amsterdam/src/main/resources/archetype-resources/src/main/config/__artifactId__-controller.properties44
2 files changed, 67 insertions, 55 deletions
diff --git a/controlloop/common/feature-controlloop-amsterdam/src/main/feature/config/amsterdam-controller.properties b/controlloop/common/feature-controlloop-amsterdam/src/main/feature/config/amsterdam-controller.properties
index 9bb12f8b4..e1267afa1 100644
--- a/controlloop/common/feature-controlloop-amsterdam/src/main/feature/config/amsterdam-controller.properties
+++ b/controlloop/common/feature-controlloop-amsterdam/src/main/feature/config/amsterdam-controller.properties
@@ -20,49 +20,55 @@
controller.name=amsterdam
-ueb.source.topics=${{DCAE_TOPIC}},APPC-CL,APPC-LCM-WRITE
+dmaap.source.topics=${{DCAE_TOPIC}},APPC-CL,APPC-LCM-WRITE
-ueb.source.topics.${{DCAE_TOPIC}}.servers=${{DCAE_SERVERS}}
-ueb.source.topics.${{DCAE_TOPIC}}.apiKey=
-ueb.source.topics.${{DCAE_TOPIC}}.apiSecret=
-ueb.source.topics.${{DCAE_TOPIC}}.consumerGroup=${{DCAE_CONSUMER_GROUP}}
-ueb.source.topics.${{DCAE_TOPIC}}.events=org.onap.policy.controlloop.VirtualControlLoopEvent
-ueb.source.topics.${{DCAE_TOPIC}}.events.org.onap.policy.controlloop.VirtualControlLoopEvent.filter=closedLoopEventStatus=.*
-ueb.source.topics.${{DCAE_TOPIC}}.events.custom.gson=org.onap.policy.controlloop.util.Serialization,gson
+dmaap.source.topics.${{DCAE_TOPIC}}.servers=${{DCAE_SERVERS}}
+dmaap.source.topics.${{DCAE_TOPIC}}.apiKey=
+dmaap.source.topics.${{DCAE_TOPIC}}.apiSecret=
+dmaap.source.topics.${{DCAE_TOPIC}}.consumerGroup=${{DCAE_CONSUMER_GROUP}}
+dmaap.source.topics.${{DCAE_TOPIC}}.events=org.onap.policy.controlloop.VirtualControlLoopEvent
+dmaap.source.topics.${{DCAE_TOPIC}}.events.org.onap.policy.controlloop.VirtualControlLoopEvent.filter=closedLoopEventStatus=.*
+dmaap.source.topics.${{DCAE_TOPIC}}.events.custom.gson=org.onap.policy.controlloop.util.Serialization,gson
+dmaap.source.topics.${{DCAE_TOPIC}}.https=false
-ueb.source.topics.APPC-CL.servers=${{DMAAP_SERVERS}}
-ueb.source.topics.APPC-CL.apiKey=
-ueb.source.topics.APPC-CL.apiSecret=
-ueb.source.topics.APPC-CL.events=org.onap.policy.appc.Response
-ueb.source.topics.APPC-CL.events.org.onap.policy.appc.Response.filter=CommonHeader\=.*,Status\=.*
-ueb.source.topics.APPC-CL.events.custom.gson=org.onap.policy.appc.util.Serialization,gsonPretty
+dmaap.source.topics.APPC-CL.servers=${{DMAAP_SERVERS}}
+dmaap.source.topics.APPC-CL.apiKey=
+dmaap.source.topics.APPC-CL.apiSecret=
+dmaap.source.topics.APPC-CL.events=org.onap.policy.appc.Response
+dmaap.source.topics.APPC-CL.events.org.onap.policy.appc.Response.filter=CommonHeader\=.*,Status\=.*
+dmaap.source.topics.APPC-CL.events.custom.gson=org.onap.policy.appc.util.Serialization,gsonPretty
+dmaap.source.topics.APPC-CL.servers.https=false
-ueb.source.topics.APPC-LCM-WRITE.servers=${{DMAAP_SERVERS}}
-ueb.source.topics.APPC-LCM-WRITE.apiKey=
-ueb.source.topics.APPC-LCM-WRITE.apiSecret=
-ueb.source.topics.APPC-LCM-WRITE.events=org.onap.policy.appclcm.LcmResponseWrapper
-ueb.source.topics.APPC-LCM-WRITE.events.org.onap.policy.appclcm.LcmResponseWrapper.filter=type\=response
-ueb.source.topics.APPC-LCM-WRITE.events.custom.gson=org.onap.policy.appclcm.util.Serialization,gson
+dmaap.source.topics.APPC-LCM-WRITE.servers=${{DMAAP_SERVERS}}
+dmaap.source.topics.APPC-LCM-WRITE.apiKey=
+dmaap.source.topics.APPC-LCM-WRITE.apiSecret=
+dmaap.source.topics.APPC-LCM-WRITE.events=org.onap.policy.appclcm.LcmResponseWrapper
+dmaap.source.topics.APPC-LCM-WRITE.events.org.onap.policy.appclcm.LcmResponseWrapper.filter=type\=response
+dmaap.source.topics.APPC-LCM-WRITE.events.custom.gson=org.onap.policy.appclcm.util.Serialization,gson
+dmaap.source.topics.APPC-LCM-WRITE.https=false
-ueb.sink.topics=APPC-CL,APPC-LCM-READ,POLICY-CL-MGT
+dmaap.sink.topics=APPC-CL,APPC-LCM-READ,POLICY-CL-MGT
-ueb.sink.topics.APPC-CL.servers=${{DMAAP_SERVERS}}
-ueb.sink.topics.APPC-CL.apiKey=
-ueb.sink.topics.APPC-CL.apiSecret=
-ueb.sink.topics.APPC-CL.events=org.onap.policy.appc.Request
-ueb.sink.topics.APPC-CL.events.custom.gson=org.onap.policy.appc.util.Serialization,gsonPretty
+dmaap.sink.topics.APPC-CL.servers=${{DMAAP_SERVERS}}
+dmaap.sink.topics.APPC-CL.apiKey=
+dmaap.sink.topics.APPC-CL.apiSecret=
+dmaap.sink.topics.APPC-CL.events=org.onap.policy.appc.Request
+dmaap.sink.topics.APPC-CL.events.custom.gson=org.onap.policy.appc.util.Serialization,gsonPretty
+dmaap.sink.topics.APPC-CL.https=false
-ueb.sink.topics.APPC-LCM-READ.servers=${{DMAAP_SERVERS}}
-ueb.sink.topics.APPC-LCM-READ.apiKey=
-ueb.sink.topics.APPC-LCM-READ.apiSecret=
-ueb.sink.topics.APPC-LCM-READ.events=org.onap.policy.appclcm.LcmRequestWrapper
-ueb.sink.topics.APPC-LCM-READ.events.custom.gson=org.onap.policy.appclcm.util.Serialization,gson
+dmaap.sink.topics.APPC-LCM-READ.servers=${{DMAAP_SERVERS}}
+dmaap.sink.topics.APPC-LCM-READ.apiKey=
+dmaap.sink.topics.APPC-LCM-READ.apiSecret=
+dmaap.sink.topics.APPC-LCM-READ.events=org.onap.policy.appclcm.LcmRequestWrapper
+dmaap.sink.topics.APPC-LCM-READ.events.custom.gson=org.onap.policy.appclcm.util.Serialization,gson
+dmaap.sink.topics.APPC-LCM-READ.https=false
-ueb.sink.topics.POLICY-CL-MGT.servers=${{DMAAP_SERVERS}}
-ueb.sink.topics.POLICY-CL-MGT.apiKey=
-ueb.sink.topics.POLICY-CL-MGT.apiSecret=
-ueb.sink.topics.POLICY-CL-MGT.events=org.onap.policy.controlloop.VirtualControlLoopNotification
-ueb.sink.topics.POLICY-CL-MGT.events.custom.gson=org.onap.policy.controlloop.util.Serialization,gsonPretty
+dmaap.sink.topics.POLICY-CL-MGT.servers=${{DMAAP_SERVERS}}
+dmaap.sink.topics.POLICY-CL-MGT.apiKey=
+dmaap.sink.topics.POLICY-CL-MGT.apiSecret=
+dmaap.sink.topics.POLICY-CL-MGT.events=org.onap.policy.controlloop.VirtualControlLoopNotification
+dmaap.sink.topics.POLICY-CL-MGT.events.custom.gson=org.onap.policy.controlloop.util.Serialization,gsonPretty
+dmaap.sink.topics.POLICY-CL-MGT.https=false
rules.groupId=
rules.artifactId=
diff --git a/controlloop/templates/archetype-cl-amsterdam/src/main/resources/archetype-resources/src/main/config/__artifactId__-controller.properties b/controlloop/templates/archetype-cl-amsterdam/src/main/resources/archetype-resources/src/main/config/__artifactId__-controller.properties
index 18d03b79f..6df5034ce 100644
--- a/controlloop/templates/archetype-cl-amsterdam/src/main/resources/archetype-resources/src/main/config/__artifactId__-controller.properties
+++ b/controlloop/templates/archetype-cl-amsterdam/src/main/resources/archetype-resources/src/main/config/__artifactId__-controller.properties
@@ -20,28 +20,31 @@
controller.name=${artifactId}
-ueb.source.topics=${dcaeTopic},APPC-CL,APPC-LCM-WRITE
+dmaap.source.topics=${dcaeTopic},APPC-CL,APPC-LCM-WRITE
-ueb.source.topics.${dcaeTopic}.servers=${dcaeServers}
-ueb.source.topics.${dcaeTopic}.apiKey=
-ueb.source.topics.${dcaeTopic}.apiSecret=
-ueb.source.topics.${dcaeTopic}.events=org.onap.policy.controlloop.VirtualControlLoopEvent
-ueb.source.topics.${dcaeTopic}.events.org.onap.policy.controlloop.VirtualControlLoopEvent.filter=closedLoopEventStatus=.*
-ueb.source.topics.${dcaeTopic}.events.custom.gson=org.onap.policy.controlloop.util.Serialization,gson
+dmaap.source.topics.${dcaeTopic}.servers=${dcaeServers}
+dmaap.source.topics.${dcaeTopic}.apiKey=
+dmaap.source.topics.${dcaeTopic}.apiSecret=
+dmaap.source.topics.${dcaeTopic}.events=org.onap.policy.controlloop.VirtualControlLoopEvent
+dmaap.source.topics.${dcaeTopic}.events.org.onap.policy.controlloop.VirtualControlLoopEvent.filter=closedLoopEventStatus=.*
+dmaap.source.topics.${dcaeTopic}.events.custom.gson=org.onap.policy.controlloop.util.Serialization,gson
+dmaap.source.topics.${dcaeTopic}.https=false
-ueb.source.topics.APPC-CL.servers=${dmaapServers}
-ueb.source.topics.APPC-CL.apiKey=
-ueb.source.topics.APPC-CL.apiSecret=
-ueb.source.topics.APPC-CL.events=org.onap.policy.appc.Response
-ueb.source.topics.APPC-CL.events.org.onap.policy.appc.Response.filter=CommonHeader\=.*,Status\=.*
-ueb.source.topics.APPC-CL.events.custom.gson=org.onap.policy.appc.util.Serialization,gsonPretty
+dmaap.source.topics.APPC-CL.servers=${dmaapServers}
+dmaap.source.topics.APPC-CL.apiKey=
+dmaap.source.topics.APPC-CL.apiSecret=
+dmaap.source.topics.APPC-CL.events=org.onap.policy.appc.Response
+dmaap.source.topics.APPC-CL.events.org.onap.policy.appc.Response.filter=CommonHeader\=.*,Status\=.*
+dmaap.source.topics.APPC-CL.events.custom.gson=org.onap.policy.appc.util.Serialization,gsonPretty
+dmaap.source.topics.APPC-CL.https=false
-ueb.source.topics.APPC-LCM-WRITE.servers=${dmaapServers}
-ueb.source.topics.APPC-LCM-WRITE.apiKey=
-ueb.source.topics.APPC-LCM-WRITE.apiSecret=
-ueb.source.topics.APPC-LCM-WRITE.events=org.onap.policy.appclcm.LcmResponseWrapper
-ueb.source.topics.APPC-LCM-WRITE.events.org.onap.policy.appclcm.LcmResponseWrapper.filter=type\=response
-ueb.source.topics.APPC-LCM-WRITE.events.custom.gson=org.onap.policy.appclcm.util.Serialization,gson
+dmaap.source.topics.APPC-LCM-WRITE.servers=${dmaapServers}
+dmaap.source.topics.APPC-LCM-WRITE.apiKey=
+dmaap.source.topics.APPC-LCM-WRITE.apiSecret=
+dmaap.source.topics.APPC-LCM-WRITE.events=org.onap.policy.appclcm.LcmResponseWrapper
+dmaap.source.topics.APPC-LCM-WRITE.events.org.onap.policy.appclcm.LcmResponseWrapper.filter=type\=response
+dmaap.source.topics.APPC-LCM-WRITE.events.custom.gson=org.onap.policy.appclcm.util.Serialization,gson
+dmaap.source.topics.APPC-LCM-WRITE.https=false
noop.sink.topics=APPC-CL,APPC-LCM-READ,POLICY-CL-MGT
@@ -50,18 +53,21 @@ noop.sink.topics.APPC-CL.apiKey=
noop.sink.topics.APPC-CL.apiSecret=
noop.sink.topics.APPC-CL.events=org.onap.policy.appc.Request
noop.sink.topics.APPC-CL.events.custom.gson=org.onap.policy.appc.util.Serialization,gsonPretty
+noop.sink.topics.APPC-CL.https=false
noop.sink.topics.APPC-LCM-READ.servers=${dmaapServers}
noop.sink.topics.APPC-LCM-READ.apiKey=
noop.sink.topics.APPC-LCM-READ.apiSecret=
noop.sink.topics.APPC-LCM-READ.events=org.onap.policy.appclcm.LcmRequestWrapper
noop.sink.topics.APPC-LCM-READ.events.custom.gson=org.onap.policy.appclcm.util.Serialization,gson
+noop.sink.topics.APPC-LCM-READ.https=false
noop.sink.topics.POLICY-CL-MGT.servers=${dmaapServers}
noop.sink.topics.POLICY-CL-MGT.apiKey=
noop.sink.topics.POLICY-CL-MGT.apiSecret=
noop.sink.topics.POLICY-CL-MGT.events=org.onap.policy.controlloop.VirtualControlLoopNotification
noop.sink.topics.POLICY-CL-MGT.events.custom.gson=org.onap.policy.controlloop.util.Serialization,gsonPretty
+noop.sink.topics.POLICY-CL-MGT.https=false
rules.groupId=${groupId}
rules.artifactId=${artifactId}