summaryrefslogtreecommitdiffstats
path: root/controlloop/packages
diff options
context:
space:
mode:
Diffstat (limited to 'controlloop/packages')
-rw-r--r--controlloop/packages/artifacts/pom.xml2
-rw-r--r--controlloop/packages/basex/src/files/bin/create-cl-legacy (renamed from controlloop/packages/basex/src/files/bin/create-closed-loop-demo.sh)3
-rw-r--r--controlloop/packages/basex/src/files/config/vDNS-controller.properties20
-rw-r--r--controlloop/packages/basex/src/files/config/vFW-controller.properties20
4 files changed, 22 insertions, 23 deletions
diff --git a/controlloop/packages/artifacts/pom.xml b/controlloop/packages/artifacts/pom.xml
index cce85c710..27ec28a84 100644
--- a/controlloop/packages/artifacts/pom.xml
+++ b/controlloop/packages/artifacts/pom.xml
@@ -146,7 +146,7 @@
</dependency>
<dependency>
<groupId>org.onap.policy.drools-applications</groupId>
- <artifactId>archetype-closedloop-demo-rules</artifactId>
+ <artifactId>archetype-cl-legacy</artifactId>
<version>${project.version}</version>
<type>jar</type>
</dependency>
diff --git a/controlloop/packages/basex/src/files/bin/create-closed-loop-demo.sh b/controlloop/packages/basex/src/files/bin/create-cl-legacy
index be9801294..9aaa3c875 100644
--- a/controlloop/packages/basex/src/files/bin/create-closed-loop-demo.sh
+++ b/controlloop/packages/basex/src/files/bin/create-cl-legacy
@@ -199,7 +199,7 @@ if [ ! -w "${DIR_TMP}" ]; then
fi
ARCHETYPE_GROUP_ID="org.onap.policy.drools-applications"
-ARCHETYPE_ARTIFACT_ID="archetype-closedloop-demo-rules"
+ARCHETYPE_ARTIFACT_ID="archetype-cl-legacy"
if [ -d "${DIR_TMP}/${ARTIFACTID}/" ]; then
if [ "$(ls -A "${DIR_TMP}/${ARTIFACTID}"/)" ]; then
@@ -234,7 +234,6 @@ cd "${DIR_TMP}"
mvn archetype:generate \
-B \
- -DarchetypeCatalog=local \
-DarchetypeGroupId="${ARCHETYPE_GROUP_ID}" \
-DarchetypeArtifactId="${ARCHETYPE_ARTIFACT_ID}" \
-DarchetypeVersion="${VERSION}" \
diff --git a/controlloop/packages/basex/src/files/config/vDNS-controller.properties b/controlloop/packages/basex/src/files/config/vDNS-controller.properties
index 7da128f29..8f1371dc5 100644
--- a/controlloop/packages/basex/src/files/config/vDNS-controller.properties
+++ b/controlloop/packages/basex/src/files/config/vDNS-controller.properties
@@ -20,16 +20,16 @@
controller.name=vDNS
-ueb.source.topics=DCAE-CL-EVENT,APPC-CL
+ueb.source.topics=${{DCAE_TOPIC}},APPC-CL
-ueb.source.topics.DCAE-CL-EVENT.servers=vm1.mr.simpledemo.openecomp.org
-ueb.source.topics.DCAE-CL-EVENT.apiKey=
-ueb.source.topics.DCAE-CL-EVENT.apiSecret=
-ueb.source.topics.DCAE-CL-EVENT.events=org.onap.policy.controlloop.VirtualControlLoopEvent
-ueb.source.topics.DCAE-CL-EVENT.events.org.onap.policy.controlloop.VirtualControlLoopEvent.filter=closedLoopEventStatus\=.*,closedLoopControlName\=.*DNS.*
-ueb.source.topics.DCAE-CL-EVENT.events.custom.gson=org.onap.policy.controlloop.util.Serialization,gsonPretty
+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}}.events=org.onap.policy.controlloop.VirtualControlLoopEvent
+ueb.source.topics.${{DCAE_TOPIC}}.events.org.onap.policy.controlloop.VirtualControlLoopEvent.filter=closedLoopEventStatus\=.*,closedLoopControlName\=.*DNS.*
+ueb.source.topics.${{DCAE_TOPIC}}.events.custom.gson=org.onap.policy.controlloop.util.Serialization,gsonPretty
-ueb.source.topics.APPC-CL.servers=vm1.mr.simpledemo.openecomp.org
+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
@@ -38,13 +38,13 @@ ueb.source.topics.APPC-CL.events.custom.gson=org.onap.policy.appc.util.Serializa
ueb.sink.topics=APPC-CL,POLICY-CL-MGT
-ueb.sink.topics.APPC-CL.servers=vm1.mr.simpledemo.openecomp.org
+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
-ueb.sink.topics.POLICY-CL-MGT.servers=vm1.mr.simpledemo.openecomp.org
+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
diff --git a/controlloop/packages/basex/src/files/config/vFW-controller.properties b/controlloop/packages/basex/src/files/config/vFW-controller.properties
index 8b8587504..10a0bf474 100644
--- a/controlloop/packages/basex/src/files/config/vFW-controller.properties
+++ b/controlloop/packages/basex/src/files/config/vFW-controller.properties
@@ -20,16 +20,16 @@
controller.name=vFW
-ueb.source.topics=DCAE-CL-EVENT,APPC-CL
+ueb.source.topics=${{DCAE_TOPIC}},APPC-CL
-ueb.source.topics.DCAE-CL-EVENT.servers=vm1.mr.simpledemo.openecomp.org
-ueb.source.topics.DCAE-CL-EVENT.apiKey=
-ueb.source.topics.DCAE-CL-EVENT.apiSecret=
-ueb.source.topics.DCAE-CL-EVENT.events=org.onap.policy.controlloop.VirtualControlLoopEvent
-ueb.source.topics.DCAE-CL-EVENT.events.org.onap.policy.controlloop.VirtualControlLoopEvent.filter=closedLoopEventStatus\=.*,closedLoopControlName\=.*FRWL.*
-ueb.source.topics.DCAE-CL-EVENT.events.custom.gson=org.onap.policy.controlloop.util.Serialization,gsonPretty
+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}}.events=org.onap.policy.controlloop.VirtualControlLoopEvent
+ueb.source.topics.${{DCAE_TOPIC}}.events.org.onap.policy.controlloop.VirtualControlLoopEvent.filter=closedLoopEventStatus\=.*,closedLoopControlName\=.*FRWL.*
+ueb.source.topics.${{DCAE_TOPIC}}.events.custom.gson=org.onap.policy.controlloop.util.Serialization,gsonPretty
-ueb.source.topics.APPC-CL.servers=vm1.mr.simpledemo.openecomp.org
+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
@@ -38,13 +38,13 @@ ueb.source.topics.APPC-CL.events.custom.gson=org.onap.policy.appc.util.Serializa
ueb.sink.topics=APPC-CL,POLICY-CL-MGT
-ueb.sink.topics.APPC-CL.servers=vm1.mr.simpledemo.openecomp.org
+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
-ueb.sink.topics.POLICY-CL-MGT.servers=vm1.mr.simpledemo.openecomp.org
+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