From 29065eadcfd111c6fefecdbed38e3ef27bd068ea Mon Sep 17 00:00:00 2001 From: "adheli.tavares" Date: Wed, 24 Apr 2024 10:27:48 +0100 Subject: Fix topic configurations. - adjust kafka configurations - remove UEB references Issue-ID: POLICY-4955 Change-Id: Ie3ff62a0ba5531ae4c0d123f214a50bb7f721807 Signed-off-by: adheli.tavares --- feature-healthcheck/pom.xml | 3 ++- .../config/feature-legacy-config.properties | 4 ++-- .../feature/config/feature-lifecycle.properties | 24 ++++++++++---------- .../config/feature-pooling-messages.properties | 26 +++++++++++----------- .../onap/policy/drools/pooling/PoolingFeature.java | 2 +- .../onap/policy/drools/pooling/PoolingManager.java | 4 ++-- .../policy/drools/pooling/PoolingManagerImpl.java | 10 ++++----- .../policy/drools/pooling/EndToEndFeatureTest.java | 20 ++++++++--------- .../onap/policy/drools/pooling/FeatureTest.java | 9 ++++---- packages/install/src/files/base.conf | 6 ++--- .../src/files/feature-pooling-messages.conf | 2 +- packages/install/src/files/policy-management.conf | 1 - .../org/onap/policy/drools/core/PolicySession.java | 2 +- .../drools/features/PolicyEngineFeatureApi.java | 3 ++- .../drools/persistence/FileSystemPersistence.java | 5 +++-- .../protocol/configuration/PdpdConfiguration.java | 4 ++-- .../onap/policy/drools/system/PolicyEngine.java | 8 +++---- .../internal/AggregatedPolicyController.java | 8 +++---- .../src/main/resources/openapi/openapi.yaml | 12 +++------- .../src/main/resources/swagger/swagger.json | 12 +++++----- .../main/server-gen/bin/add-secured-participant | 2 +- .../src/main/server-gen/bin/create-api-key | 2 +- .../src/main/server-gen/bin/create-secured-topic | 2 +- policy-management/src/main/server-gen/bin/features | 2 +- .../src/main/server-gen/bin/pdpd-configuration | 7 +++--- .../policy/drools/system/PolicyEngineTest.java | 4 ++++ 26 files changed, 91 insertions(+), 93 deletions(-) diff --git a/feature-healthcheck/pom.xml b/feature-healthcheck/pom.xml index 77b29ac7..a07ef0a0 100644 --- a/feature-healthcheck/pom.xml +++ b/feature-healthcheck/pom.xml @@ -3,7 +3,7 @@ ONAP ================================================================================ Copyright (C) 2017-2022 AT&T Intellectual Property. All rights reserved. - Modifications Copyright (C) 2023 Nordix Foundation. + Modifications Copyright (C) 2023-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. @@ -38,6 +38,7 @@ + org.apache.maven.plugins maven-assembly-plugin diff --git a/feature-legacy-config/src/main/feature/config/feature-legacy-config.properties b/feature-legacy-config/src/main/feature/config/feature-legacy-config.properties index 47a4e229..9cb73c58 100644 --- a/feature-legacy-config/src/main/feature/config/feature-legacy-config.properties +++ b/feature-legacy-config/src/main/feature/config/feature-legacy-config.properties @@ -17,7 +17,7 @@ # limitations under the License. # ============LICENSE_END========================================================= -kafka.source.topics=pdpd-configuration +kafka.source.topics=${envd:PDPD_CONFIGURATION_TOPIC} kafka.source.topics.fetchTimeout=15000 kafka.source.topics.pdpd-configuration.servers=${envd:KAFKA_SERVERS} kafka.source.topics.pdpd-configuration.effectiveTopic=${envd:PDPD_CONFIGURATION_TOPIC} @@ -26,4 +26,4 @@ kafka.source.topics.pdpd-configuration.apiSecret=${envd:PDPD_CONFIGURATION_API_S kafka.source.topics.pdpd-configuration.consumerGroup=${envd:PDPD_CONFIGURATION_CONSUMER_GROUP} kafka.source.topics.pdpd-configuration.consumerInstance=${envd:PDPD_CONFIGURATION_CONSUMER_INSTANCE} kafka.source.topics.pdpd-configuration.managed=false -kafka.source.topics.pdpd-configuration.https=${envd:KAFKA_HTTPS:true} +kafka.source.topics.pdpd-configuration.https=${envd:KAFKA_HTTPS:false} diff --git a/feature-lifecycle/src/main/feature/config/feature-lifecycle.properties b/feature-lifecycle/src/main/feature/config/feature-lifecycle.properties index 06fa87e5..4a60650c 100644 --- a/feature-lifecycle/src/main/feature/config/feature-lifecycle.properties +++ b/feature-lifecycle/src/main/feature/config/feature-lifecycle.properties @@ -23,17 +23,17 @@ lifecycle.pdp.type=${envd:POLICY_PDP_PAP_TYPE:drools} # Mandatory policy types that this PDP-D must support at a minimum lifecycle.pdp.policytypes=${envd:POLICY_PDP_PAP_POLICYTYPES} -kafka.source.topics=POLICY-PDP-PAP -kafka.sink.topics=POLICY-PDP-PAP +kafka.source.topics=${envd:POLICY_PDP_PAP_TOPIC} +kafka.sink.topics=${envd:POLICY_PDP_PAP_TOPIC} -kafka.source.topics.POLICY-PDP-PAP.servers=${envd:KAFKA_SERVERS} -kafka.source.topics.POLICY-PDP-PAP.effectiveTopic=${envd:POLICY_PDP_PAP_TOPIC} -kafka.source.topics.POLICY-PDP-PAP.apiKey=${envd:POLICY_PDP_PAP_API_KEY} -kafka.source.topics.POLICY-PDP-PAP.apiSecret=${envd:POLICY_PDP_PAP_API_SECRET} -kafka.source.topics.POLICY-PDP-PAP.https=${envd:KAFKA_HTTPS:true} +kafka.source.topics.policy-pdp-pap.servers=${envd:KAFKA_SERVERS} +kafka.source.topics.policy-pdp-pap.effectiveTopic=${envd:POLICY_PDP_PAP_TOPIC} +kafka.source.topics.policy-pdp-pap.apiKey=${envd:POLICY_PDP_PAP_API_KEY} +kafka.source.topics.policy-pdp-pap.apiSecret=${envd:POLICY_PDP_PAP_API_SECRET} +kafka.source.topics.policy-pdp-pap.https=${envd:KAFKA_HTTPS:false} -kafka.sink.topics.POLICY-PDP-PAP.servers=${envd:KAFKA_SERVERS} -kafka.sink.topics.POLICY-PDP-PAP.effectiveTopic=${envd:POLICY_PDP_PAP_TOPIC} -kafka.sink.topics.POLICY-PDP-PAP.apiKey=${envd:POLICY_PDP_PAP_API_KEY} -kafka.sink.topics.POLICY-PDP-PAP.apiSecret=${envd:POLICY_PDP_PAP_API_SECRET} -kafka.sink.topics.POLICY-PDP-PAP.https=${envd:KAFKA_HTTPS:true} +kafka.sink.topics.policy-pdp-pap.servers=${envd:KAFKA_SERVERS} +kafka.sink.topics.policy-pdp-pap.effectiveTopic=${envd:POLICY_PDP_PAP_TOPIC} +kafka.sink.topics.policy-pdp-pap.apiKey=${envd:POLICY_PDP_PAP_API_KEY} +kafka.sink.topics.policy-pdp-pap.apiSecret=${envd:POLICY_PDP_PAP_API_SECRET} +kafka.sink.topics.policy-pdp-pap.https=${envd:KAFKA_HTTPS:false} diff --git a/feature-pooling-messages/src/main/feature/config/feature-pooling-messages.properties b/feature-pooling-messages/src/main/feature/config/feature-pooling-messages.properties index 925d1698..8497538e 100644 --- a/feature-pooling-messages/src/main/feature/config/feature-pooling-messages.properties +++ b/feature-pooling-messages/src/main/feature/config/feature-pooling-messages.properties @@ -72,18 +72,18 @@ # be enabled at the same time. pooling.usecases.enabled=true -pooling.usecases.topic=${env:POOLING_TOPIC} +pooling.usecases.topic=${envd:POOLING_TOPIC} # the list of sources and sinks should be identical -kafka.source.topics=POOLING_TOPIC -kafka.sink.topics=POOLING_TOPIC - -kafka.source.topics.POOLING_TOPIC.servers=${env:KAFKA_SERVERS} -kafka.source.topics.POOLING_TOPIC.effectiveTopic=${env:POOLING_TOPIC} -kafka.source.topics.POOLING_TOPIC.apiKey= -kafka.source.topics.POOLING_TOPIC.apiSecret= - -kafka.sink.topics.POOLING_TOPIC.servers=${env:kafka_SERVERS} -kafka.sink.topics.POOLING_TOPIC.effectiveTopic=${env:POOLING_TOPIC} -kafka.sink.topics.POOLING_TOPIC.apiKey= -kafka.sink.topics.POOLING_TOPIC.apiSecret= +kafka.source.topics=${envd:POOLING_TOPIC} +kafka.sink.topics=${envd:POOLING_TOPIC} + +kafka.source.topics.policy-pdp-pooling.servers=${envd:KAFKA_SERVERS} +kafka.source.topics.policy-pdp-pooling.effectiveTopic=${envd:POOLING_TOPIC} +kafka.source.topics.policy-pdp-pooling.apiKey= +kafka.source.topics.policy-pdp-pooling.apiSecret= + +kafka.sink.topics.policy-pdp-pooling.servers=${envd:KAFKA_SERVERS} +kafka.sink.topics.policy-pdp-pooling.effectiveTopic=${envd:POOLING_TOPIC} +kafka.sink.topics.policy-pdp-pooling.apiKey= +kafka.sink.topics.policy-pdp-pooling.apiSecret= diff --git a/feature-pooling-messages/src/main/java/org/onap/policy/drools/pooling/PoolingFeature.java b/feature-pooling-messages/src/main/java/org/onap/policy/drools/pooling/PoolingFeature.java index 6411dd81..a1368d8c 100644 --- a/feature-pooling-messages/src/main/java/org/onap/policy/drools/pooling/PoolingFeature.java +++ b/feature-pooling-messages/src/main/java/org/onap/policy/drools/pooling/PoolingFeature.java @@ -52,7 +52,7 @@ import org.slf4j.LoggerFactory; * hosts, instead of all running on a single, active host. * *

With each controller, there is an - * associated DMaaP topic that is used for internal communication between the different hosts + * associated topic that is used for internal communication between the different hosts * serving the controller. */ public class PoolingFeature implements PolicyEngineFeatureApi, PolicyControllerFeatureApi, DroolsControllerFeatureApi { diff --git a/feature-pooling-messages/src/main/java/org/onap/policy/drools/pooling/PoolingManager.java b/feature-pooling-messages/src/main/java/org/onap/policy/drools/pooling/PoolingManager.java index 5e358e61..20f51023 100644 --- a/feature-pooling-messages/src/main/java/org/onap/policy/drools/pooling/PoolingManager.java +++ b/feature-pooling-messages/src/main/java/org/onap/policy/drools/pooling/PoolingManager.java @@ -46,10 +46,10 @@ public interface PoolingManager { String getHost(); /** - * Gets the name of the internal DMaaP topic used by this manager to communicate with + * Gets the name of the internal topic used by this manager to communicate with * its other hosts. * - * @return the name of the internal DMaaP topic + * @return the name of the internal topic */ String getTopic(); diff --git a/feature-pooling-messages/src/main/java/org/onap/policy/drools/pooling/PoolingManagerImpl.java b/feature-pooling-messages/src/main/java/org/onap/policy/drools/pooling/PoolingManagerImpl.java index 7c0436eb..fec6ba81 100644 --- a/feature-pooling-messages/src/main/java/org/onap/policy/drools/pooling/PoolingManagerImpl.java +++ b/feature-pooling-messages/src/main/java/org/onap/policy/drools/pooling/PoolingManagerImpl.java @@ -91,13 +91,13 @@ public class PoolingManagerImpl implements PoolingManager, TopicListener { private final Serializer serializer; /** - * Internal DMaaP topic used by this controller. + * Internal topic used by this controller. */ @Getter private final String topic; /** - * Manager for the internal DMaaP topic. + * Manager for the internal topic. */ private final TopicMessageManager topicMessageManager; @@ -157,7 +157,7 @@ public class PoolingManagerImpl implements PoolingManager, TopicListener { throw new PoolingFeatureRtException(e); } catch (PoolingFeatureException e) { - logger.error("failed to attach internal DMaaP topic to controller {}", controller.getName()); + logger.error("failed to attach internal topic to controller {}", controller.getName()); throw new PoolingFeatureRtException(e); } } @@ -598,9 +598,9 @@ public class PoolingManagerImpl implements PoolingManager, TopicListener { } /** - * Creates a DMaaP manager. + * Creates a topic manager. * - * @param topic name of the internal DMaaP topic + * @param topic name of the internal topic * @return a new topic messages manager * @throws PoolingFeatureException if an error occurs */ diff --git a/feature-pooling-messages/src/test/java/org/onap/policy/drools/pooling/EndToEndFeatureTest.java b/feature-pooling-messages/src/test/java/org/onap/policy/drools/pooling/EndToEndFeatureTest.java index ac2b31a8..1ad5d513 100644 --- a/feature-pooling-messages/src/test/java/org/onap/policy/drools/pooling/EndToEndFeatureTest.java +++ b/feature-pooling-messages/src/test/java/org/onap/policy/drools/pooling/EndToEndFeatureTest.java @@ -64,11 +64,11 @@ import org.slf4j.LoggerFactory; /** * End-to-end tests of the pooling feature. Launches one or more "hosts", each one having its own - * feature object. Uses real feature objects, as well as real DMaaP sources and sinks. However, the + * feature object. Uses real feature objects, as well as real sources and sinks. However, the * following are not:

PolicyEngine, PolicyController, DroolsController
mocked
*
* - *

The following fields must be set before executing this:

  • UEB_SERVERS
    • + *

    The following fields must be set before executing this:

    • SERVER
      • *
    • INTERNAL_TOPIC
    • EXTERNAL_TOPIC
    */ public class EndToEndFeatureTest { @@ -252,18 +252,18 @@ public class EndToEndFeatureTest { private static Properties makeSourceProperties(String topic) { Properties props = new Properties(); - props.setProperty(PolicyEndPointProperties.PROPERTY_UEB_SOURCE_TOPICS, topic); + props.setProperty(PolicyEndPointProperties.PROPERTY_KAFKA_SOURCE_TOPICS, topic); - props.setProperty(PolicyEndPointProperties.PROPERTY_UEB_SOURCE_TOPICS + "." + topic + props.setProperty(PolicyEndPointProperties.PROPERTY_KAFKA_SOURCE_TOPICS + "." + topic + PolicyEndPointProperties.PROPERTY_TOPIC_SERVERS_SUFFIX, SERVER); - props.setProperty(PolicyEndPointProperties.PROPERTY_UEB_SOURCE_TOPICS + "." + topic + props.setProperty(PolicyEndPointProperties.PROPERTY_KAFKA_SOURCE_TOPICS + "." + topic + PolicyEndPointProperties.PROPERTY_TOPIC_SOURCE_FETCH_LIMIT_SUFFIX, FETCH_LIMIT); - props.setProperty(PolicyEndPointProperties.PROPERTY_UEB_SOURCE_TOPICS + "." + topic + props.setProperty(PolicyEndPointProperties.PROPERTY_KAFKA_SOURCE_TOPICS + "." + topic + PolicyEndPointProperties.PROPERTY_MANAGED_SUFFIX, "false"); if (EXTERNAL_TOPIC.equals(topic)) { // consumer group is a constant - props.setProperty(PolicyEndPointProperties.PROPERTY_UEB_SOURCE_TOPICS + "." + topic + props.setProperty(PolicyEndPointProperties.PROPERTY_KAFKA_SOURCE_TOPICS + "." + topic + PolicyEndPointProperties.PROPERTY_TOPIC_SOURCE_CONSUMER_GROUP_SUFFIX, EXTERNAL_GROUP); // consumer instance is generated by the BusConsumer code @@ -520,8 +520,8 @@ public class EndToEndFeatureTest { } /** - * Starts threads for the host so that it begins consuming from both the external "DMaaP" - * topic and its own internal "DMaaP" topic. + * Starts threads for the host so that it begins consuming from both the external + * topic and its own internal topic. */ public void start() { feature.beforeStart(engine); @@ -775,7 +775,7 @@ public class EndToEndFeatureTest { } /** - * DMaaP Manager with overrides. + * TopicManager with overrides. */ private static class TopicMessageManagerImpl extends TopicMessageManager { diff --git a/feature-pooling-messages/src/test/java/org/onap/policy/drools/pooling/FeatureTest.java b/feature-pooling-messages/src/test/java/org/onap/policy/drools/pooling/FeatureTest.java index c507b68a..f1b48b3e 100644 --- a/feature-pooling-messages/src/test/java/org/onap/policy/drools/pooling/FeatureTest.java +++ b/feature-pooling-messages/src/test/java/org/onap/policy/drools/pooling/FeatureTest.java @@ -68,7 +68,6 @@ import org.slf4j.LoggerFactory; * End-to-end tests of the pooling feature. Launches one or more "hosts", each one having * its own feature object. Uses real feature objects. However, the following are not: *
    - *
    DMaaP sources and sinks
    *
    simulated using queues. There is one queue for the external topic, and one queue * for each host's internal topic. Messages published to the "admin" channel are simply * sent to all of the hosts' internal topic queues
    @@ -430,13 +429,13 @@ class FeatureTest { private final AtomicBoolean sawMsg = new AtomicBoolean(false); /** - * This host's internal "DMaaP" topic. + * This host's internal topic. */ private final BlockingQueue msgQueue = new LinkedBlockingQueue<>(); /** - * Queue for the external "DMaaP" topic. + * Queue for the external topic. */ @Getter private final BlockingQueue externalTopic = new LinkedBlockingQueue(); @@ -486,7 +485,7 @@ class FeatureTest { /** * Starts threads for the host so that it begins consuming from both the external - * "DMaaP" topic and its own internal "DMaaP" topic. + * topic and its own internal topic. */ public void start() { @@ -987,7 +986,7 @@ class FeatureTest { } /** - * DMaaP Manager with overrides. + * TopicManager with overrides. */ private static class TopicMessageManagerImpl extends TopicMessageManager { diff --git a/packages/install/src/files/base.conf b/packages/install/src/files/base.conf index 3b447647..a0bacfa3 100644 --- a/packages/install/src/files/base.conf +++ b/packages/install/src/files/base.conf @@ -138,10 +138,10 @@ DCAE_TOPIC= DCAE_SERVERS= DCAE_CONSUMER_GROUP= -# Open DMaaP +# Kafka -# DMAAP_SERVERS= -# DMAAP_HTTPS=true +KAFKA_SERVERS= +KAFKA_HTTPS=false # AAI diff --git a/packages/install/src/files/feature-pooling-messages.conf b/packages/install/src/files/feature-pooling-messages.conf index 0ef81951..eb5a5434 100644 --- a/packages/install/src/files/feature-pooling-messages.conf +++ b/packages/install/src/files/feature-pooling-messages.conf @@ -17,4 +17,4 @@ # limitations under the License. # ============LICENSE_END========================================================= ### -POOLING_TOPIC=POLICY-PDP-POOLING +POOLING_TOPIC=policy-pdp-pooling diff --git a/packages/install/src/files/policy-management.conf b/packages/install/src/files/policy-management.conf index 12ad0f43..b44bc49d 100644 --- a/packages/install/src/files/policy-management.conf +++ b/packages/install/src/files/policy-management.conf @@ -22,4 +22,3 @@ CONTROLLER_ARTIFACT_ID=policy-management CONTROLLER_NAME=policy-management-controller CONTROLLER_PORT=9696 RULES_ARTIFACT=org.onap.policy:dummy-artifact:1.0.0-SNAPSHOT -UEB_TOPIC=policyengine-develop diff --git a/policy-core/src/main/java/org/onap/policy/drools/core/PolicySession.java b/policy-core/src/main/java/org/onap/policy/drools/core/PolicySession.java index 0c10e984..760f9533 100644 --- a/policy-core/src/main/java/org/onap/policy/drools/core/PolicySession.java +++ b/policy-core/src/main/java/org/onap/policy/drools/core/PolicySession.java @@ -47,7 +47,7 @@ import org.slf4j.LoggerFactory; * This class is a wrapper around 'KieSession', which adds the following: * *

    1) A thread running 'KieSession.fireUntilHalt()' - * 2) Access to UEB + * 2) Access to topic * 3) Logging of events */ public class PolicySession implements AgendaEventListener, RuleRuntimeEventListener { diff --git a/policy-management/src/main/java/org/onap/policy/drools/features/PolicyEngineFeatureApi.java b/policy-management/src/main/java/org/onap/policy/drools/features/PolicyEngineFeatureApi.java index 87001ad6..8edf394e 100644 --- a/policy-management/src/main/java/org/onap/policy/drools/features/PolicyEngineFeatureApi.java +++ b/policy-management/src/main/java/org/onap/policy/drools/features/PolicyEngineFeatureApi.java @@ -3,6 +3,7 @@ * ONAP * ================================================================================ * Copyright (C) 2017-2019 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. @@ -232,7 +233,7 @@ public interface PolicyEngineFeatureApi extends OrderedService { } /** - * Intercept an event from UEB/DMaaP before the PolicyEngine processes it. + * Intercept an event from Bus before the PolicyEngine processes it. * * @return True if this feature intercepts and takes ownership of the operation * preventing the invocation of lower priority features. False, otherwise. diff --git a/policy-management/src/main/java/org/onap/policy/drools/persistence/FileSystemPersistence.java b/policy-management/src/main/java/org/onap/policy/drools/persistence/FileSystemPersistence.java index d35f5469..9fb76d87 100644 --- a/policy-management/src/main/java/org/onap/policy/drools/persistence/FileSystemPersistence.java +++ b/policy-management/src/main/java/org/onap/policy/drools/persistence/FileSystemPersistence.java @@ -3,6 +3,7 @@ * ONAP * ================================================================================ * Copyright (C) 2017-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. @@ -152,13 +153,13 @@ public class FileSystemPersistence implements SystemPersistence { protected Properties getProperties(Path propertiesPath) { if (!Files.exists(propertiesPath)) { - throw new IllegalArgumentException("properties for " + propertiesPath.toString() + " are not persisted."); + throw new IllegalArgumentException("properties for " + propertiesPath + " are not persisted."); } try { return PropertyUtil.getProperties(propertiesPath.toFile()); } catch (final Exception e) { - throw new IllegalArgumentException("can't read properties for " + propertiesPath.toString(), e); + throw new IllegalArgumentException("can't read properties for " + propertiesPath, e); } } diff --git a/policy-management/src/main/java/org/onap/policy/drools/protocol/configuration/PdpdConfiguration.java b/policy-management/src/main/java/org/onap/policy/drools/protocol/configuration/PdpdConfiguration.java index 1201c26e..f008407c 100644 --- a/policy-management/src/main/java/org/onap/policy/drools/protocol/configuration/PdpdConfiguration.java +++ b/policy-management/src/main/java/org/onap/policy/drools/protocol/configuration/PdpdConfiguration.java @@ -242,7 +242,7 @@ public class PdpdConfiguration { } else { throw new IllegalArgumentException( "property \"requestID\" is of type \"java.lang.String\", but got " - + value.getClass().toString()); + + value.getClass()); } } @@ -257,7 +257,7 @@ public class PdpdConfiguration { } else { throw new IllegalArgumentException( "property \"entity\" is of type \"java.lang.String\", but got " - + value.getClass().toString()); + + value.getClass()); } } diff --git a/policy-management/src/main/java/org/onap/policy/drools/system/PolicyEngine.java b/policy-management/src/main/java/org/onap/policy/drools/system/PolicyEngine.java index 75e7c74a..3fc2e292 100644 --- a/policy-management/src/main/java/org/onap/policy/drools/system/PolicyEngine.java +++ b/policy-management/src/main/java/org/onap/policy/drools/system/PolicyEngine.java @@ -3,6 +3,7 @@ * ONAP * ================================================================================ * Copyright (C) 2017-2022 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. @@ -41,13 +42,10 @@ import org.onap.policy.drools.stats.PolicyStatsManager; /** * Policy Engine, the top abstraction for the Drools PDP Policy Engine. It abstracts away a Drools - * PDP Engine from management purposes. This is the best place to looking at the code from a top - * down approach. Other managed entities can be obtained from the PolicyEngine, hierarchically.
    + * PDP Engine from management purposes. This is the best place to looking at the code from a top-down + * approach. Other managed entities can be obtained from the PolicyEngine, hierarchically.
    * PolicyEngine 1 --- * PolicyController 1 --- 1 DroolsController 1 --- 1 PolicyContainer 1 --- * * PolicySession
    PolicyEngine 1 --- 1 TopicEndpointManager 1 -- * TopicReader 1 --- 1 - * UebTopicReader
    PolicyEngine 1 --- 1 TopicEndpointManager 1 -- * TopicReader 1 --- 1 - * DmaapTopicReader
    PolicyEngine 1 --- 1 TopicEndpointManager 1 -- * TopicWriter 1 --- 1 - * DmaapTopicWriter
    PolicyEngine 1 --- 1 TopicEndpointManager 1 -- * TopicReader 1 --- 1 * RestTopicReader
    PolicyEngine 1 --- 1 TopicEndpointManager 1 -- * TopicWriter 1 --- 1 * RestTopicWriter
    PolicyEngine 1 --- 1 ManagementServer */ diff --git a/policy-management/src/main/java/org/onap/policy/drools/system/internal/AggregatedPolicyController.java b/policy-management/src/main/java/org/onap/policy/drools/system/internal/AggregatedPolicyController.java index 06b3f4ea..2c85c26e 100644 --- a/policy-management/src/main/java/org/onap/policy/drools/system/internal/AggregatedPolicyController.java +++ b/policy-management/src/main/java/org/onap/policy/drools/system/internal/AggregatedPolicyController.java @@ -3,7 +3,7 @@ * ONAP * ================================================================================ * Copyright (C) 2017-2021 AT&T Intellectual Property. All rights reserved. - * Modifications Copyright (C) 2021 Nordix Foundation. + * Modifications Copyright (C) 2021, 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. @@ -140,9 +140,9 @@ public class AggregatedPolicyController implements PolicyController, TopicListen this.name = name; /* - * 1. Register read topics with network infrastructure (ueb, dmaap, rest) 2. Register write - * topics with network infrastructure (ueb, dmaap, rest) 3. Register with drools - * infrastructure + * 1. Register read topics with network infrastructure + * 2. Register write topics with network infrastructure + * 3. Register with drools infrastructure */ // Create/Reuse Readers/Writers for all event sources endpoints diff --git a/policy-management/src/main/resources/openapi/openapi.yaml b/policy-management/src/main/resources/openapi/openapi.yaml index 2e20dd98..da1b17d9 100644 --- a/policy-management/src/main/resources/openapi/openapi.yaml +++ b/policy-management/src/main/resources/openapi/openapi.yaml @@ -2443,8 +2443,8 @@ paths: get: tags: - pdp-d-telemetry - summary: Retrieves the latest events received by an UEB topic - description: This is a Network Communicaton Endpoint source of messages for + summary: Retrieves the latest events received by a topic + description: This is a Network Communication Endpoint source of messages for the Engine operationId: sourceEvents parameters: @@ -2523,7 +2523,7 @@ paths: get: tags: - pdp-d-telemetry - summary: Retrieves the latest events received by an UEB topic + summary: Retrieves the latest events received by a topic description: This is a Network Communication Endpoint source of messages for the Engine operationId: sinkEvents @@ -2935,8 +2935,6 @@ components: topicCommInfrastructure: type: string enum: - - UEB - - DMAAP - KAFKA - NOOP - REST @@ -3008,8 +3006,6 @@ components: topicCommInfrastructure: type: string enum: - - UEB - - DMAAP - KAFKA - NOOP - REST @@ -3885,8 +3881,6 @@ components: topicCommInfrastructure: type: string enum: - - UEB - - DMAAP - KAFKA - NOOP - REST diff --git a/policy-management/src/main/resources/swagger/swagger.json b/policy-management/src/main/resources/swagger/swagger.json index 844c6c2d..b3433208 100644 --- a/policy-management/src/main/resources/swagger/swagger.json +++ b/policy-management/src/main/resources/swagger/swagger.json @@ -3485,8 +3485,8 @@ "/topics/sources/{comm}/{topic}/events" : { "get" : { "tags" : [ "pdp-d-telemetry" ], - "summary" : "Retrieves the latest events received by an UEB topic", - "description" : "This is a Network Communicaton Endpoint source of messages for the Engine", + "summary" : "Retrieves the latest events received by a topic", + "description" : "This is a Network Communication Endpoint source of messages for the Engine", "operationId" : "sourceEvents", "parameters" : [ { "name" : "comm", @@ -3601,7 +3601,7 @@ "/topics/sinks/{comm}/{topic}/events" : { "get" : { "tags" : [ "pdp-d-telemetry" ], - "summary" : "Retrieves the latest events received by an UEB topic", + "summary" : "Retrieves the latest events received by a topic", "description" : "This is a Network Communication Endpoint source of messages for the Engine", "operationId" : "sinkEvents", "parameters" : [ { @@ -4207,7 +4207,7 @@ }, "topicCommInfrastructure" : { "type" : "string", - "enum" : [ "UEB", "DMAAP", "KAFKA", "NOOP", "REST" ] + "enum" : [ "KAFKA", "NOOP", "REST" ] }, "alive" : { "type" : "boolean" @@ -4299,7 +4299,7 @@ }, "topicCommInfrastructure" : { "type" : "string", - "enum" : [ "UEB", "DMAAP", "KAFKA", "NOOP", "REST" ] + "enum" : [ "KAFKA", "NOOP", "REST" ] }, "alive" : { "type" : "boolean" @@ -5571,7 +5571,7 @@ }, "topicCommInfrastructure" : { "type" : "string", - "enum" : [ "UEB", "DMAAP", "KAFKA", "NOOP", "REST" ] + "enum" : [ "KAFKA", "NOOP", "REST" ] }, "alive" : { "type" : "boolean" diff --git a/policy-management/src/main/server-gen/bin/add-secured-participant b/policy-management/src/main/server-gen/bin/add-secured-participant index 3ddc120f..579f4d47 100644 --- a/policy-management/src/main/server-gen/bin/add-secured-participant +++ b/policy-management/src/main/server-gen/bin/add-secured-participant @@ -73,7 +73,7 @@ until [ -z "$1" ]; do done if [ -z "${BUS_HOST}" ]; then - echo "An UEB/KAFKA server must be provided." + echo "A KAFKA server must be provided." echo usage exit 1 diff --git a/policy-management/src/main/server-gen/bin/create-api-key b/policy-management/src/main/server-gen/bin/create-api-key index e57c1e92..6d320729 100644 --- a/policy-management/src/main/server-gen/bin/create-api-key +++ b/policy-management/src/main/server-gen/bin/create-api-key @@ -53,7 +53,7 @@ until [ -z "$1" ]; do done if [ -z "${BUS_HOST}" ]; then - echo "An UEB/KAFKA server must be provided." + echo "A KAFKA server must be provided." echo usage exit 1 diff --git a/policy-management/src/main/server-gen/bin/create-secured-topic b/policy-management/src/main/server-gen/bin/create-secured-topic index 2aed99ae..f5c640f2 100644 --- a/policy-management/src/main/server-gen/bin/create-secured-topic +++ b/policy-management/src/main/server-gen/bin/create-secured-topic @@ -72,7 +72,7 @@ until [ -z "$1" ]; do done if [ -z "${BUS_HOST}" ]; then - echo "An UEB/KAFKA server must be provided." + echo "A KAFKA server must be provided." echo usage exit 1 diff --git a/policy-management/src/main/server-gen/bin/features b/policy-management/src/main/server-gen/bin/features index 93f58239..3343ffc4 100644 --- a/policy-management/src/main/server-gen/bin/features +++ b/policy-management/src/main/server-gen/bin/features @@ -773,7 +773,7 @@ function disableFeatureDeps() rm -f "${LIB}"/"${depJarName}" # case there were multiple features using this library - # re-enable link fron an enabled feature + # re-enable link from an enabled feature for aDepsEnabledMap in ${xDepsEnabledMap}; do if [ $(basename "${aDepsEnabledMap}") = ${depJarName} ]; then ln -s -f "${aDepsEnabledMap}" "${LIB}/" diff --git a/policy-management/src/main/server-gen/bin/pdpd-configuration b/policy-management/src/main/server-gen/bin/pdpd-configuration index 5182f3ad..0be7cef3 100644 --- a/policy-management/src/main/server-gen/bin/pdpd-configuration +++ b/policy-management/src/main/server-gen/bin/pdpd-configuration @@ -38,9 +38,10 @@ function usage() { echo "" } -BUS_PORT=9092 +BUS_PORT=29092 +BUS_HOST=kafka REQUEST_ID="7f5474ca-16a9-42ac-abc0-d86f62296fbc" -TOPIC="PDPD-CONFIGURATION" +TOPIC="pdpd-configuration" # command line options parsing until [ -z "$1" ]; do @@ -88,7 +89,7 @@ until [ -z "$1" ]; do done if [ -z "${BUS_HOST}" ]; then - echo "An UEB/KAFKA server must be provided." + echo "A KAFKA server must be provided." echo usage exit 1 diff --git a/policy-management/src/test/java/org/onap/policy/drools/system/PolicyEngineTest.java b/policy-management/src/test/java/org/onap/policy/drools/system/PolicyEngineTest.java index 20622091..b4915ef4 100644 --- a/policy-management/src/test/java/org/onap/policy/drools/system/PolicyEngineTest.java +++ b/policy-management/src/test/java/org/onap/policy/drools/system/PolicyEngineTest.java @@ -25,6 +25,7 @@ import static org.awaitility.Awaitility.await; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.onap.policy.drools.system.PolicyEngineConstants.TELEMETRY_SERVER_DEFAULT_NAME; import java.io.File; import java.io.IOException; @@ -48,6 +49,7 @@ import org.onap.policy.drools.protocol.coders.EventProtocolCoderConstants; import org.onap.policy.drools.protocol.coders.EventProtocolParams; import org.onap.policy.drools.protocol.coders.JsonProtocolFilter; import org.onap.policy.drools.protocol.configuration.DroolsConfiguration; +import org.onap.policy.drools.server.restful.RestManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -151,6 +153,8 @@ class PolicyEngineTest { void test100Configure() { var manager = (PolicyEngineManager) PolicyEngineConstants.getManager(); var engineProps = manager.defaultTelemetryConfig(); + engineProps.put(PolicyEndPointProperties.PROPERTY_HTTP_SERVER_SERVICES + "." + TELEMETRY_SERVER_DEFAULT_NAME + + PolicyEndPointProperties.PROPERTY_HTTP_REST_CLASSES_SUFFIX, RestManager.class.getName()); /* override default port */ engineProps.put(PolicyEndPointProperties.PROPERTY_HTTP_SERVER_SERVICES + "." -- cgit 1.2.3-korg