From 49a696aba0240b68e534b65f896eaf535b231a8c Mon Sep 17 00:00:00 2001 From: jhh Date: Tue, 3 Mar 2020 18:15:17 -0600 Subject: decouple topics from controllers native policies will require topics configured at installation (there's no policy to add them). This configuration style also cleans the installation tidier (topics can be overriden or new ones added when being placed in the mounted config directory). Issue-ID: POLICY-2181 Signed-off-by: jhh Change-Id: I87fd6889c651147e9229b3487db8c95b34516dfd --- .../main/feature/config/APPC-CL-topic.properties | 26 +++++++++++++++++ .../feature/config/APPC-LCM-READ-topic.properties | 22 ++++++++++++++ .../feature/config/APPC-LCM-WRITE-topic.properties | 22 ++++++++++++++ .../feature/config/DCAE_CL_RSP-topic.properties | 22 ++++++++++++++ .../feature/config/DCAE_TOPIC-topic.properties | 24 +++++++++++++++ .../feature/config/POLICY-CL-MGT-topic.properties | 21 +++++++++++++ .../feature/config/SDNR-CL-RSP-topic.properties | 21 +++++++++++++ .../main/feature/config/SDNR-CL-topic.properties | 23 +++++++++++++++ .../feature/config/usecases-controller.properties | 34 +++++----------------- 9 files changed, 188 insertions(+), 27 deletions(-) create mode 100644 controlloop/common/feature-controlloop-management/src/main/feature/config/APPC-CL-topic.properties create mode 100644 controlloop/common/feature-controlloop-management/src/main/feature/config/APPC-LCM-READ-topic.properties create mode 100644 controlloop/common/feature-controlloop-management/src/main/feature/config/APPC-LCM-WRITE-topic.properties create mode 100644 controlloop/common/feature-controlloop-management/src/main/feature/config/DCAE_CL_RSP-topic.properties create mode 100644 controlloop/common/feature-controlloop-management/src/main/feature/config/DCAE_TOPIC-topic.properties create mode 100644 controlloop/common/feature-controlloop-management/src/main/feature/config/POLICY-CL-MGT-topic.properties create mode 100644 controlloop/common/feature-controlloop-management/src/main/feature/config/SDNR-CL-RSP-topic.properties create mode 100644 controlloop/common/feature-controlloop-management/src/main/feature/config/SDNR-CL-topic.properties diff --git a/controlloop/common/feature-controlloop-management/src/main/feature/config/APPC-CL-topic.properties b/controlloop/common/feature-controlloop-management/src/main/feature/config/APPC-CL-topic.properties new file mode 100644 index 000000000..080dcd9c6 --- /dev/null +++ b/controlloop/common/feature-controlloop-management/src/main/feature/config/APPC-CL-topic.properties @@ -0,0 +1,26 @@ +# ============LICENSE_START======================================================= +# ONAP +# ================================================================================ +# Copyright (C) 2020 AT&T Intellectual Property. All rights reserved. +# ================================================================================ +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# ============LICENSE_END========================================================= + +dmaap.source.topics=APPC-CL +dmaap.sink.topics=APPC-CL + +dmaap.source.topics.APPC-CL.servers=${env:DMAAP_SERVERS} +dmaap.source.topics.APPC-CL.https=true + +dmaap.sink.topics.APPC-CL.servers=${env:DMAAP_SERVERS} +dmaap.sink.topics.APPC-CL.https=true diff --git a/controlloop/common/feature-controlloop-management/src/main/feature/config/APPC-LCM-READ-topic.properties b/controlloop/common/feature-controlloop-management/src/main/feature/config/APPC-LCM-READ-topic.properties new file mode 100644 index 000000000..1be069303 --- /dev/null +++ b/controlloop/common/feature-controlloop-management/src/main/feature/config/APPC-LCM-READ-topic.properties @@ -0,0 +1,22 @@ +# ============LICENSE_START======================================================= +# ONAP +# ================================================================================ +# Copyright (C) 2020 AT&T Intellectual Property. All rights reserved. +# ================================================================================ +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# ============LICENSE_END========================================================= + +dmaap.sink.topics=APPC-LCM-READ + +dmaap.sink.topics.APPC-LCM-READ.servers=${env:DMAAP_SERVERS} +dmaap.sink.topics.APPC-LCM-READ.https=true diff --git a/controlloop/common/feature-controlloop-management/src/main/feature/config/APPC-LCM-WRITE-topic.properties b/controlloop/common/feature-controlloop-management/src/main/feature/config/APPC-LCM-WRITE-topic.properties new file mode 100644 index 000000000..1eb330357 --- /dev/null +++ b/controlloop/common/feature-controlloop-management/src/main/feature/config/APPC-LCM-WRITE-topic.properties @@ -0,0 +1,22 @@ +# ============LICENSE_START======================================================= +# ONAP +# ================================================================================ +# Copyright (C) 2020 AT&T Intellectual Property. All rights reserved. +# ================================================================================ +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# ============LICENSE_END========================================================= + +dmaap.source.topics=APPC-LCM-WRITE + +dmaap.source.topics.APPC-LCM-WRITE.servers=${env:DMAAP_SERVERS} +dmaap.source.topics.APPC-LCM-WRITE.https=true diff --git a/controlloop/common/feature-controlloop-management/src/main/feature/config/DCAE_CL_RSP-topic.properties b/controlloop/common/feature-controlloop-management/src/main/feature/config/DCAE_CL_RSP-topic.properties new file mode 100644 index 000000000..890110f36 --- /dev/null +++ b/controlloop/common/feature-controlloop-management/src/main/feature/config/DCAE_CL_RSP-topic.properties @@ -0,0 +1,22 @@ +# ============LICENSE_START======================================================= +# ONAP +# ================================================================================ +# Copyright (C) 2020 AT&T Intellectual Property. All rights reserved. +# ================================================================================ +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# ============LICENSE_END========================================================= + +dmaap.sink.topics=DCAE_CL_RSP + +dmaap.sink.topics.DCAE_CL_RSP.servers=${env:DMAAP_SERVERS} +dmaap.sink.topics.DCAE_CL_RSP.https=true diff --git a/controlloop/common/feature-controlloop-management/src/main/feature/config/DCAE_TOPIC-topic.properties b/controlloop/common/feature-controlloop-management/src/main/feature/config/DCAE_TOPIC-topic.properties new file mode 100644 index 000000000..d038f8760 --- /dev/null +++ b/controlloop/common/feature-controlloop-management/src/main/feature/config/DCAE_TOPIC-topic.properties @@ -0,0 +1,24 @@ +# ============LICENSE_START======================================================= +# ONAP +# ================================================================================ +# Copyright (C) 2020 AT&T Intellectual Property. All rights reserved. +# ================================================================================ +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# ============LICENSE_END========================================================= + +dmaap.source.topics=DCAE_TOPIC + +dmaap.source.topics.DCAE_TOPIC.effectiveTopic=${env:DCAE_TOPIC} +dmaap.source.topics.DCAE_TOPIC.servers=${env:DMAAP_SERVERS} +dmaap.source.topics.DCAE_TOPIC.consumerGroup=${env:DCAE_CONSUMER_GROUP} +dmaap.source.topics.DCAE_TOPIC.https=true diff --git a/controlloop/common/feature-controlloop-management/src/main/feature/config/POLICY-CL-MGT-topic.properties b/controlloop/common/feature-controlloop-management/src/main/feature/config/POLICY-CL-MGT-topic.properties new file mode 100644 index 000000000..e9975bcfb --- /dev/null +++ b/controlloop/common/feature-controlloop-management/src/main/feature/config/POLICY-CL-MGT-topic.properties @@ -0,0 +1,21 @@ +# ============LICENSE_START======================================================= +# ONAP +# ================================================================================ +# Copyright (C) 2020 AT&T Intellectual Property. All rights reserved. +# ================================================================================ +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# ============LICENSE_END========================================================= + +dmaap.sink.topics=POLICY-CL-MGT +dmaap.sink.topics.POLICY-CL-MGT.servers=${env:DMAAP_SERVERS} +dmaap.sink.topics.POLICY-CL-MGT.https=true diff --git a/controlloop/common/feature-controlloop-management/src/main/feature/config/SDNR-CL-RSP-topic.properties b/controlloop/common/feature-controlloop-management/src/main/feature/config/SDNR-CL-RSP-topic.properties new file mode 100644 index 000000000..ec1b1349d --- /dev/null +++ b/controlloop/common/feature-controlloop-management/src/main/feature/config/SDNR-CL-RSP-topic.properties @@ -0,0 +1,21 @@ +# ============LICENSE_START======================================================= +# ONAP +# ================================================================================ +# Copyright (C) 2020 AT&T Intellectual Property. All rights reserved. +# ================================================================================ +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# ============LICENSE_END========================================================= + +dmaap.source.topics=SDNR-CL-RSP +dmaap.source.topics.SDNR-CL-RSP.servers=${env:DMAAP_SERVERS} +dmaap.source.topics.SDNR-CL-RSP.https=true diff --git a/controlloop/common/feature-controlloop-management/src/main/feature/config/SDNR-CL-topic.properties b/controlloop/common/feature-controlloop-management/src/main/feature/config/SDNR-CL-topic.properties new file mode 100644 index 000000000..4d2a0bb1e --- /dev/null +++ b/controlloop/common/feature-controlloop-management/src/main/feature/config/SDNR-CL-topic.properties @@ -0,0 +1,23 @@ +# ============LICENSE_START======================================================= +# ONAP +# ================================================================================ +# Copyright (C) 2020 AT&T Intellectual Property. All rights reserved. +# ================================================================================ +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# ============LICENSE_END========================================================= + +dmaap.sink.topics=SDNR-CL + +dmaap.sink.topics.SDNR-CL.servers=${env:DMAAP_SERVERS} +dmaap.sink.topics.SDNR-CL.https=true + diff --git a/controlloop/common/feature-controlloop-usecases/src/main/feature/config/usecases-controller.properties b/controlloop/common/feature-controlloop-usecases/src/main/feature/config/usecases-controller.properties index 174e8f202..fd31ece5b 100644 --- a/controlloop/common/feature-controlloop-usecases/src/main/feature/config/usecases-controller.properties +++ b/controlloop/common/feature-controlloop-usecases/src/main/feature/config/usecases-controller.properties @@ -2,7 +2,7 @@ # ============LICENSE_START======================================================= # ONAP # ================================================================================ -# Copyright (C) 2018-2019 AT&T Intellectual Property. All rights reserved. +# Copyright (C) 2018-2020 AT&T Intellectual Property. All rights reserved. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -21,61 +21,41 @@ controller.name=usecases dmaap.source.topics=DCAE_TOPIC,APPC-CL,APPC-LCM-WRITE,SDNR-CL-RSP +dmaap.sink.topics=APPC-CL,APPC-LCM-READ,POLICY-CL-MGT,SDNR-CL,DCAE_CL_RSP -dmaap.source.topics.DCAE_TOPIC.effectiveTopic=${env:DCAE_TOPIC} -dmaap.source.topics.DCAE_TOPIC.servers=${env:DMAAP_SERVERS} -dmaap.source.topics.DCAE_TOPIC.consumerGroup=${env:DCAE_CONSUMER_GROUP} dmaap.source.topics.DCAE_TOPIC.events=org.onap.policy.controlloop.CanonicalOnset,org.onap.policy.controlloop.CanonicalAbated dmaap.source.topics.DCAE_TOPIC.events.org.onap.policy.controlloop.CanonicalOnset.filter=[?($.closedLoopEventStatus == 'ONSET')] dmaap.source.topics.DCAE_TOPIC.events.org.onap.policy.controlloop.CanonicalAbated.filter=[?($.closedLoopEventStatus == 'ABATED')] dmaap.source.topics.DCAE_TOPIC.events.custom.gson=org.onap.policy.controlloop.util.Serialization,gson -dmaap.source.topics.DCAE_TOPIC.https=true -dmaap.source.topics.APPC-CL.servers=${env:DMAAP_SERVERS} 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=true -dmaap.source.topics.APPC-LCM-WRITE.servers=${env:DMAAP_SERVERS} dmaap.source.topics.APPC-LCM-WRITE.events=org.onap.policy.appclcm.AppcLcmDmaapWrapper dmaap.source.topics.APPC-LCM-WRITE.events.org.onap.policy.appclcm.AppcLcmDmaapWrapper.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=true - -dmaap.sink.topics=APPC-CL,APPC-LCM-READ,POLICY-CL-MGT,SDNR-CL,DCAE_CL_RSP -dmaap.sink.topics.APPC-CL.servers=${env:DMAAP_SERVERS} 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=true -dmaap.sink.topics.APPC-LCM-READ.servers=${env:DMAAP_SERVERS} dmaap.sink.topics.APPC-LCM-READ.events=org.onap.policy.appclcm.AppcLcmDmaapWrapper dmaap.sink.topics.APPC-LCM-READ.events.custom.gson=org.onap.policy.appclcm.util.Serialization,gson -dmaap.sink.topics.APPC-LCM-READ.https=true -dmaap.sink.topics.POLICY-CL-MGT.servers=${env:DMAAP_SERVERS} 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=true - -rules.groupId=${project.groupId} -rules.artifactId=controller-usecases -rules.version=${project.version} -dmaap.sink.topics.SDNR-CL.servers=${env:DMAAP_SERVERS} dmaap.sink.topics.SDNR-CL.events=org.onap.policy.sdnr.PciRequestWrapper dmaap.sink.topics.SDNR-CL.events.custom.gson=org.onap.policy.sdnr.util.Serialization,gson -dmaap.sink.topics.SDNR-CL.https=true -dmaap.sink.topics.DCAE_CL_RSP.servers=${env:DMAAP_SERVERS} dmaap.sink.topics.DCAE_CL_RSP.events=org.onap.policy.controlloop.ControlLoopResponse dmaap.sink.topics.DCAE_CL_RSP.events.custom.gson=org.onap.policy.controlloop.util.Serialization,gsonPretty -dmaap.sink.topics.DCAE_CL_RSP.https=true -dmaap.source.topics.SDNR-CL-RSP.servers=${env:DMAAP_SERVERS} dmaap.source.topics.SDNR-CL-RSP.events=org.onap.policy.sdnr.PciResponseWrapper dmaap.source.topics.SDNR-CL-RSP.events.org.onap.policy.sdnr.PciResponseWrapper.filter=[?($.type == 'response')] dmaap.source.topics.SDNR-CL-RSP.events.custom.gson=org.onap.policy.sdnr.util.Serialization,gson -dmaap.source.topics.SDNR-CL-RSP.https=true + +rules.groupId=${project.groupId} +rules.artifactId=controller-usecases +rules.version=${project.version} + -- cgit 1.2.3-korg