From cc1d3d352771d1fa35d297e90663539e34b022f6 Mon Sep 17 00:00:00 2001 From: "adheli.tavares" Date: Fri, 26 Jan 2024 15:28:56 +0000 Subject: Removing deprecated DMAAP library Issue-ID: POLICY-4402 Change-Id: I4ce5b303cb3a775010683d3c7102b0bd065280ea Signed-off-by: adheli.tavares --- packages/docker/src/main/docker/pdpd-entrypoint.sh | 8 +------- packages/install/pom.xml | 4 +++- packages/install/src/files/base.conf | 17 +++++------------ .../install/src/files/feature-pooling-dmaap.conf | 20 -------------------- .../install/src/files/feature-pooling-messages.conf | 20 ++++++++++++++++++++ 5 files changed, 29 insertions(+), 40 deletions(-) delete mode 100644 packages/install/src/files/feature-pooling-dmaap.conf create mode 100644 packages/install/src/files/feature-pooling-messages.conf (limited to 'packages') diff --git a/packages/docker/src/main/docker/pdpd-entrypoint.sh b/packages/docker/src/main/docker/pdpd-entrypoint.sh index 112d3cb4..2caca628 100644 --- a/packages/docker/src/main/docker/pdpd-entrypoint.sh +++ b/packages/docker/src/main/docker/pdpd-entrypoint.sh @@ -2,6 +2,7 @@ # ######################################################################## # Copyright 2019-2021 AT&T Intellectual Property. All rights reserved +# Modifications Copyright (C) 2024 Nordix Foundation. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -117,13 +118,6 @@ function security { cp -f "${POLICY_INSTALL_INIT}"/policy-truststore "${POLICY_HOME}"/etc/ssl fi fi - - if [ -f "${POLICY_INSTALL_INIT}"/aaf-cadi.keyfile ]; then - if ! cmp -s "${POLICY_INSTALL_INIT}"/aaf-cadi.keyfile "${POLICY_HOME}"/config/aaf-cadi.keyfile; then - echo "overriding aaf-cadi.keyfile" - cp -f "${POLICY_INSTALL_INIT}"/aaf-cadi.keyfile "${POLICY_HOME}"/config/aaf-cadi.keyfile - fi - fi } function serverConfig { diff --git a/packages/install/pom.xml b/packages/install/pom.xml index 45f15b72..a79aa0ee 100644 --- a/packages/install/pom.xml +++ b/packages/install/pom.xml @@ -4,6 +4,7 @@ ================================================================================ Copyright (C) 2017, 2022 AT&T Intellectual Property. All rights reserved. Modifications Copyright (C) 2020 Bell Canada. + Modifications Copyright (C) 2024 Nordix Foundation. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -40,6 +41,7 @@ + org.apache.maven.plugins maven-assembly-plugin @@ -93,7 +95,7 @@ org.onap.policy.drools-pdp - feature-pooling-dmaap + feature-pooling-messages ${project.version} zip diff --git a/packages/install/src/files/base.conf b/packages/install/src/files/base.conf index 24d95a76..3b447647 100644 --- a/packages/install/src/files/base.conf +++ b/packages/install/src/files/base.conf @@ -4,7 +4,7 @@ # ================================================================================ # Copyright (C) 2017-2022 AT&T Intellectual Property. All rights reserved. # Modifications Copyright (C) 2020 Bell Canada. -# Modifications Copyright (C) 2022 Nordix Foundation. +# Modifications Copyright (C) 2022, 2024 Nordix Foundation. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -87,13 +87,6 @@ JDBC_URL= # add optional JDBC options for the connector to use JDBC_OPTS= -# AAF - -AAF=false -AAF_NAMESPACE=org.onap.policy -AAF_HOST=aaf-onap-test.osaaf.org -CADI_KEYFILE=/opt/app/policy/config/aaf-cadi.keyfile - # Prometheus PROMETHEUS=false @@ -102,7 +95,7 @@ PROMETHEUS=false HTTP_SERVER_HTTPS=false -# PDP-D DMaaP configuration channel +# PDP-D Message Broker configuration channel PDPD_CONFIGURATION_TOPIC=PDPD-CONFIGURATION PDPD_CONFIGURATION_API_KEY= @@ -139,7 +132,7 @@ PDP_CLIENT_USERNAME= PDP_CLIENT_PASSWORD= PDP_ENVIRONMENT= -# DCAE DMaaP +# DCAE Message Broker DCAE_TOPIC= DCAE_SERVERS= @@ -147,8 +140,8 @@ DCAE_CONSUMER_GROUP= # Open DMaaP -DMAAP_SERVERS= -DMAAP_HTTPS=true +# DMAAP_SERVERS= +# DMAAP_HTTPS=true # AAI diff --git a/packages/install/src/files/feature-pooling-dmaap.conf b/packages/install/src/files/feature-pooling-dmaap.conf deleted file mode 100644 index 0ef81951..00000000 --- a/packages/install/src/files/feature-pooling-dmaap.conf +++ /dev/null @@ -1,20 +0,0 @@ -### -# ============LICENSE_START======================================================= -# ONAP POLICY -# ================================================================================ -# Copyright (C) 2018 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========================================================= -### -POOLING_TOPIC=POLICY-PDP-POOLING diff --git a/packages/install/src/files/feature-pooling-messages.conf b/packages/install/src/files/feature-pooling-messages.conf new file mode 100644 index 00000000..0ef81951 --- /dev/null +++ b/packages/install/src/files/feature-pooling-messages.conf @@ -0,0 +1,20 @@ +### +# ============LICENSE_START======================================================= +# ONAP POLICY +# ================================================================================ +# Copyright (C) 2018 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========================================================= +### +POOLING_TOPIC=POLICY-PDP-POOLING -- cgit 1.2.3-korg