diff options
Diffstat (limited to 'policy-management/src/main')
16 files changed, 99 insertions, 499 deletions
diff --git a/policy-management/src/main/java/org/onap/policy/drools/controller/IndexedDroolsControllerFactory.java b/policy-management/src/main/java/org/onap/policy/drools/controller/IndexedDroolsControllerFactory.java index 1965e22f..7f28f9bb 100644 --- a/policy-management/src/main/java/org/onap/policy/drools/controller/IndexedDroolsControllerFactory.java +++ b/policy-management/src/main/java/org/onap/policy/drools/controller/IndexedDroolsControllerFactory.java @@ -258,13 +258,7 @@ class IndexedDroolsControllerFactory implements DroolsControllerFactory { private String getPropertyTopicPrefix(Topic topic) { boolean isSource = topic instanceof TopicSource; var commInfra = topic.getTopicCommInfrastructure(); - if (commInfra == CommInfrastructure.UEB) { - if (isSource) { - return PolicyEndPointProperties.PROPERTY_UEB_SOURCE_TOPICS + "."; - } else { - return PolicyEndPointProperties.PROPERTY_UEB_SINK_TOPICS + "."; - } - } else if (commInfra == CommInfrastructure.NOOP) { + if (commInfra == CommInfrastructure.NOOP) { if (isSource) { return PolicyEndPointProperties.PROPERTY_NOOP_SOURCE_TOPICS + "."; } else { 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/persistence/SystemPersistenceConstants.java b/policy-management/src/main/java/org/onap/policy/drools/persistence/SystemPersistenceConstants.java index ba6c5e71..dba6d4c1 100644 --- a/policy-management/src/main/java/org/onap/policy/drools/persistence/SystemPersistenceConstants.java +++ b/policy-management/src/main/java/org/onap/policy/drools/persistence/SystemPersistenceConstants.java @@ -32,7 +32,7 @@ public final class SystemPersistenceConstants { public static final String DEFAULT_CONFIGURATION_DIR = "config"; /** - * Persistence Manager. For now it is a file-based properties management, In the future, it will + * Persistence Manager. For now, it is a file-based properties management, In the future, it will * probably be DB based, so manager implementation will change. */ @Getter 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/server/restful/RestManager.java b/policy-management/src/main/java/org/onap/policy/drools/server/restful/RestManager.java index ec06882f..48cd8140 100644 --- a/policy-management/src/main/java/org/onap/policy/drools/server/restful/RestManager.java +++ b/policy-management/src/main/java/org/onap/policy/drools/server/restful/RestManager.java @@ -1392,7 +1392,7 @@ public class RestManager implements SwaggerApi, DefaultApi, FeaturesApi, InputsA */ @Override @GET - @Path("engine/topics/sources/{comm: ueb|kafka|noop}") + @Path("engine/topics/sources/{comm: kafka|noop}") public Response commSources( @PathParam("comm") String comm) { if (!checkValidNameInput(comm)) { @@ -1405,9 +1405,6 @@ public class RestManager implements SwaggerApi, DefaultApi, FeaturesApi, InputsA List<TopicSource> sources = new ArrayList<>(); var status = Status.OK; switch (CommInfrastructure.valueOf(comm.toUpperCase())) { - case UEB: - sources.addAll(TopicEndpointManager.getManager().getUebTopicSources()); - break; case NOOP: sources.addAll(TopicEndpointManager.getManager().getNoopTopicSources()); break; @@ -1427,7 +1424,7 @@ public class RestManager implements SwaggerApi, DefaultApi, FeaturesApi, InputsA */ @Override @GET - @Path("engine/topics/sinks/{comm: ueb|kafka|noop}") + @Path("engine/topics/sinks/{comm: kafka|noop}") public Response commSinks( @PathParam("comm") String comm) { if (!checkValidNameInput(comm)) { @@ -1440,9 +1437,6 @@ public class RestManager implements SwaggerApi, DefaultApi, FeaturesApi, InputsA List<TopicSink> sinks = new ArrayList<>(); var status = Status.OK; switch (CommInfrastructure.valueOf(comm.toUpperCase())) { - case UEB: - sinks.addAll(TopicEndpointManager.getManager().getUebTopicSinks()); - break; case NOOP: sinks.addAll(TopicEndpointManager.getManager().getNoopTopicSinks()); break; @@ -1462,7 +1456,7 @@ public class RestManager implements SwaggerApi, DefaultApi, FeaturesApi, InputsA */ @Override @GET - @Path("engine/topics/sources/{comm: ueb|kafka|noop}/{topic}") + @Path("engine/topics/sources/{comm: kafka|noop}/{topic}") public Response sourceTopic( @PathParam("comm") String comm, @PathParam("topic") String topic) { @@ -1478,7 +1472,7 @@ public class RestManager implements SwaggerApi, DefaultApi, FeaturesApi, InputsA */ @Override @GET - @Path("engine/topics/sinks/{comm: ueb|kafka|noop}/{topic}") + @Path("engine/topics/sinks/{comm: kafka|noop}/{topic}") public Response sinkTopic( @PathParam("comm") String comm, @PathParam("topic") String topic) { @@ -1494,7 +1488,7 @@ public class RestManager implements SwaggerApi, DefaultApi, FeaturesApi, InputsA */ @Override @GET - @Path("engine/topics/sources/{comm: ueb|kafka|noop}/{topic}/events") + @Path("engine/topics/sources/{comm: kafka|noop}/{topic}/events") public Response sourceEvents( @PathParam("comm") String comm, @PathParam("topic") String topic) { @@ -1510,7 +1504,7 @@ public class RestManager implements SwaggerApi, DefaultApi, FeaturesApi, InputsA */ @Override @GET - @Path("engine/topics/sinks/{comm: ueb|kafka|noop}/{topic}/events") + @Path("engine/topics/sinks/{comm: kafka|noop}/{topic}/events") public Response sinkEvents( @PathParam("comm") String comm, @PathParam("topic") String topic) { @@ -1526,7 +1520,7 @@ public class RestManager implements SwaggerApi, DefaultApi, FeaturesApi, InputsA */ @Override @GET - @Path("engine/topics/sources/{comm: ueb|kafka|noop}/{topic}/switches") + @Path("engine/topics/sources/{comm: kafka|noop}/{topic}/switches") public Response commSourceTopicSwitches( @PathParam("comm") String comm, @PathParam("topic") String topic) { @@ -1538,7 +1532,7 @@ public class RestManager implements SwaggerApi, DefaultApi, FeaturesApi, InputsA */ @Override @GET - @Path("engine/topics/sinks/{comm: ueb|kafka|noop}/{topic}/switches") + @Path("engine/topics/sinks/{comm: kafka|noop}/{topic}/switches") public Response commSinkTopicSwitches( @PathParam("comm") String comm, @PathParam("topic") String topic) { @@ -1550,7 +1544,7 @@ public class RestManager implements SwaggerApi, DefaultApi, FeaturesApi, InputsA */ @Override @PUT - @Path("engine/topics/sources/{comm: ueb|kafka|noop}/{topic}/switches/lock") + @Path("engine/topics/sources/{comm: kafka|noop}/{topic}/switches/lock") public Response commSourceTopicLock( @PathParam("comm") String comm, @PathParam("topic") String topic) { @@ -1564,7 +1558,7 @@ public class RestManager implements SwaggerApi, DefaultApi, FeaturesApi, InputsA */ @Override @DELETE - @Path("engine/topics/sources/{comm: ueb|kafka|noop}/{topic}/switches/lock") + @Path("engine/topics/sources/{comm: kafka|noop}/{topic}/switches/lock") public Response commSourceTopicUnlock( @PathParam("comm") String comm, @PathParam("topic") String topic) { @@ -1578,7 +1572,7 @@ public class RestManager implements SwaggerApi, DefaultApi, FeaturesApi, InputsA */ @Override @PUT - @Path("engine/topics/sources/{comm: ueb|kafka|noop}/{topic}/switches/activation") + @Path("engine/topics/sources/{comm: kafka|noop}/{topic}/switches/activation") public Response commSourceTopicActivation( @PathParam("comm") String comm, @PathParam("topic") String topic) { @@ -1592,7 +1586,7 @@ public class RestManager implements SwaggerApi, DefaultApi, FeaturesApi, InputsA */ @Override @DELETE - @Path("engine/topics/sources/{comm: ueb|kafka|noop}/{topic}/switches/activation") + @Path("engine/topics/sources/{comm: kafka|noop}/{topic}/switches/activation") public Response commSourceTopicDeactivation( @PathParam("comm") String comm, @PathParam("topic") String topic) { @@ -1606,7 +1600,7 @@ public class RestManager implements SwaggerApi, DefaultApi, FeaturesApi, InputsA */ @Override @PUT - @Path("engine/topics/sinks/{comm: ueb|kafka|noop}/{topic}/switches/lock") + @Path("engine/topics/sinks/{comm: kafka|noop}/{topic}/switches/lock") public Response commSinkTopicLock( @PathParam("comm") String comm, @PathParam("topic") String topic) { @@ -1620,7 +1614,7 @@ public class RestManager implements SwaggerApi, DefaultApi, FeaturesApi, InputsA */ @Override @DELETE - @Path("engine/topics/sinks/{comm: ueb|kafka|noop}/{topic}/switches/lock") + @Path("engine/topics/sinks/{comm: kafka|noop}/{topic}/switches/lock") public Response commSinkTopicUnlock( @PathParam("comm") String comm, @PathParam("topic") String topic) { @@ -1634,7 +1628,7 @@ public class RestManager implements SwaggerApi, DefaultApi, FeaturesApi, InputsA */ @Override @PUT - @Path("engine/topics/sinks/{comm: ueb|kafka|noop}/{topic}/switches/activation") + @Path("engine/topics/sinks/{comm: kafka|noop}/{topic}/switches/activation") public Response commSinkTopicActivation( @PathParam("comm") String comm, @PathParam("topic") String topic) { @@ -1648,7 +1642,7 @@ public class RestManager implements SwaggerApi, DefaultApi, FeaturesApi, InputsA */ @Override @DELETE - @Path("engine/topics/sinks/{comm: ueb|kafka|noop}/{topic}/switches/activation") + @Path("engine/topics/sinks/{comm: kafka|noop}/{topic}/switches/activation") public Response commSinkTopicDeactivation( @PathParam("comm") String comm, @PathParam("topic") String topic) { @@ -1676,7 +1670,7 @@ public class RestManager implements SwaggerApi, DefaultApi, FeaturesApi, InputsA */ @Override @PUT - @Path("engine/topics/sources/{comm: ueb|kafka|noop}/{topic}/events") + @Path("engine/topics/sources/{comm: kafka|noop}/{topic}/events") @Consumes(MediaType.TEXT_PLAIN) public Response commEventOffer( @PathParam("comm") String comm, diff --git a/policy-management/src/main/java/org/onap/policy/drools/system/Main.java b/policy-management/src/main/java/org/onap/policy/drools/system/Main.java index 3d167352..f0530d05 100644 --- a/policy-management/src/main/java/org/onap/policy/drools/system/Main.java +++ b/policy-management/src/main/java/org/onap/policy/drools/system/Main.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. @@ -124,7 +125,7 @@ public class Main { try { engineProperties = SystemPersistenceConstants.getManager().getEngineProperties(); } catch (IllegalArgumentException iae) { - logger.warn("Main: engine properties not found. Using default configuration.", iae); + logger.warn("Main: engine properties not found. Using default configuration. {}", iae.getMessage()); engineProperties = PolicyEngineConstants.getManager().defaultTelemetryConfig(); } 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. <br> + * 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. <br> * PolicyEngine 1 --- * PolicyController 1 --- 1 DroolsController 1 --- 1 PolicyContainer 1 --- * * PolicySession <br> PolicyEngine 1 --- 1 TopicEndpointManager 1 -- * TopicReader 1 --- 1 - * UebTopicReader <br> PolicyEngine 1 --- 1 TopicEndpointManager 1 -- * TopicReader 1 --- 1 - * DmaapTopicReader <br> PolicyEngine 1 --- 1 TopicEndpointManager 1 -- * TopicWriter 1 --- 1 - * DmaapTopicWriter <br> PolicyEngine 1 --- 1 TopicEndpointManager 1 -- * TopicReader 1 --- 1 * RestTopicReader <br> PolicyEngine 1 --- 1 TopicEndpointManager 1 -- * TopicWriter 1 --- 1 * RestTopicWriter <br> 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 80a3ae63..da1b17d9 100644 --- a/policy-management/src/main/resources/openapi/openapi.yaml +++ b/policy-management/src/main/resources/openapi/openapi.yaml @@ -2238,7 +2238,7 @@ paths: tags: - pdp-d-telemetry summary: Retrieves the managed topic sources - description: Network Topic Sources Agregation + description: Network Topic Sources Aggregation operationId: sources responses: 200: @@ -2255,7 +2255,7 @@ paths: tags: - pdp-d-telemetry summary: Retrieves the managed topic sinks - description: Network Topic Sinks Agregation + description: Network Topic Sinks Aggregation operationId: sinks responses: 200: @@ -2338,7 +2338,7 @@ paths: description: Communication Mechanism required: true schema: - pattern: ueb|dmaap|noop + pattern: kafka|noop type: string responses: 200: @@ -2363,7 +2363,7 @@ paths: description: Communication Mechanism required: true schema: - pattern: ueb|dmaap|noop + pattern: kafka|noop type: string responses: 200: @@ -2389,7 +2389,7 @@ paths: description: Communication Mechanism required: true schema: - pattern: ueb|dmaap|noop + pattern: kafka|noop type: string - name: topic in: path @@ -2412,7 +2412,7 @@ paths: tags: - pdp-d-telemetry summary: Retrieves a managed topic sink - description: This is a Network Communicaton Endpoint destination of messages + description: This is a Network Communication Endpoint destination of messages from the Engine operationId: sinkTopic parameters: @@ -2421,7 +2421,7 @@ paths: description: Communication Mechanism required: true schema: - pattern: ueb|dmaap|noop + pattern: kafka|noop type: string - name: topic in: path @@ -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: @@ -2453,7 +2453,7 @@ paths: description: Communication Mechanism required: true schema: - pattern: ueb|dmaap|noop + pattern: kafka|noop type: string - name: topic in: path @@ -2483,7 +2483,7 @@ paths: description: Communication Mechanism required: true schema: - pattern: ueb|dmaap|noop + pattern: kafka|noop type: string - name: topic in: path @@ -2523,8 +2523,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: sinkEvents parameters: @@ -2533,7 +2533,7 @@ paths: description: Communication Mechanism required: true schema: - pattern: ueb|dmaap|noop + pattern: kafka|noop type: string - name: topic in: path @@ -2563,7 +2563,7 @@ paths: description: Communication Mechanism required: true schema: - pattern: ueb|dmaap|noop + pattern: kafka|noop type: string - name: topic in: path @@ -2596,7 +2596,7 @@ paths: description: Communication Mechanism required: true schema: - pattern: ueb|dmaap|noop + pattern: kafka|noop type: string - name: topic in: path @@ -2631,7 +2631,7 @@ paths: description: Communication Mechanism required: true schema: - pattern: ueb|dmaap|noop + pattern: kafka|noop type: string - name: topic in: path @@ -2662,7 +2662,7 @@ paths: description: Communication Mechanism required: true schema: - pattern: ueb|dmaap|noop + pattern: kafka|noop type: string - name: topic in: path @@ -2692,7 +2692,7 @@ paths: description: Communication Mechanism required: true schema: - pattern: ueb|dmaap|noop + pattern: kafka|noop type: string - name: topic in: path @@ -2725,7 +2725,7 @@ paths: description: Communication Mechanism required: true schema: - pattern: ueb|dmaap|noop + pattern: kafka|noop type: string - name: topic in: path @@ -2759,7 +2759,7 @@ paths: description: Communication Mechanism required: true schema: - pattern: ueb|dmaap|noop + pattern: kafka|noop type: string - name: topic in: path @@ -2792,7 +2792,7 @@ paths: description: Communication Mechanism required: true schema: - pattern: ueb|dmaap|noop + pattern: kafka|noop type: string - name: topic in: path @@ -2826,7 +2826,7 @@ paths: description: Communication Mechanism required: true schema: - pattern: ueb|dmaap|noop + pattern: kafka|noop type: string - name: topic in: path @@ -2859,7 +2859,7 @@ paths: description: Communication Mechanism required: true schema: - pattern: ueb|dmaap|noop + pattern: kafka|noop type: string - name: topic in: path @@ -2886,7 +2886,7 @@ paths: tags: - pdp-d-legacy summary: Legacy Engine Configuration Properties - description: Used for booststrapping the engine + description: Used for bootstrapping the engine operationId: properties responses: 200: @@ -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 @@ -3822,80 +3818,6 @@ components: $ref: '#/components/schemas/CoderFilters' customCoder: $ref: '#/components/schemas/CustomCoder' - DmaapTopicSink: - type: object - properties: - partitionKey: - type: string - apiKey: - type: string - apiSecret: - type: string - effectiveTopic: - type: string - recentEvents: - type: array - items: - type: string - topic: - type: string - servers: - type: array - items: - type: string - topicCommInfrastructure: - type: string - enum: - - UEB - - DMAAP - - KAFKA - - NOOP - - REST - alive: - type: boolean - locked: - type: boolean - DmaapTopicSource: - type: object - properties: - consumerInstance: - type: string - consumerGroup: - type: string - fetchTimeout: - type: integer - format: int32 - fetchLimit: - type: integer - format: int32 - apiKey: - type: string - apiSecret: - type: string - effectiveTopic: - type: string - recentEvents: - type: array - items: - type: string - topic: - type: string - servers: - type: array - items: - type: string - topicCommInfrastructure: - type: string - enum: - - UEB - - DMAAP - - KAFKA - - NOOP - - REST - alive: - type: boolean - locked: - type: boolean KafkaTopicSink: type: object properties: @@ -3920,8 +3842,6 @@ components: topicCommInfrastructure: type: string enum: - - UEB - - DMAAP - KAFKA - NOOP - REST @@ -3961,8 +3881,6 @@ components: topicCommInfrastructure: type: string enum: - - UEB - - DMAAP - KAFKA - NOOP - REST @@ -3992,8 +3910,6 @@ components: topicCommInfrastructure: type: string enum: - - UEB - - DMAAP - KAFKA - NOOP - REST @@ -4019,26 +3935,12 @@ components: topicCommInfrastructure: type: string enum: - - UEB - - DMAAP - KAFKA - NOOP - REST TopicEndpoint: type: object properties: - uebTopicSources: - type: array - items: - $ref: '#/components/schemas/UebTopicSource' - uebTopicSinks: - type: array - items: - $ref: '#/components/schemas/UebTopicSink' - dmaapTopicSinks: - type: array - items: - $ref: '#/components/schemas/DmaapTopicSink' kafkaTopicSinks: type: array items: @@ -4047,10 +3949,6 @@ components: type: array items: $ref: '#/components/schemas/NoopTopicSink' - dmaapTopicSources: - type: array - items: - $ref: '#/components/schemas/DmaapTopicSource' kafkaTopicSources: type: array items: @@ -4071,80 +3969,6 @@ components: type: boolean locked: type: boolean - UebTopicSink: - type: object - properties: - partitionKey: - type: string - apiKey: - type: string - apiSecret: - type: string - effectiveTopic: - type: string - recentEvents: - type: array - items: - type: string - topic: - type: string - servers: - type: array - items: - type: string - topicCommInfrastructure: - type: string - enum: - - UEB - - DMAAP - - KAFKA - - NOOP - - REST - alive: - type: boolean - locked: - type: boolean - UebTopicSource: - type: object - properties: - consumerInstance: - type: string - consumerGroup: - type: string - fetchTimeout: - type: integer - format: int32 - fetchLimit: - type: integer - format: int32 - apiKey: - type: string - apiSecret: - type: string - effectiveTopic: - type: string - recentEvents: - type: array - items: - type: string - topic: - type: string - servers: - type: array - items: - type: string - topicCommInfrastructure: - type: string - enum: - - UEB - - DMAAP - - KAFKA - - NOOP - - REST - alive: - type: boolean - locked: - type: boolean PdpdConfiguration: type: object properties: diff --git a/policy-management/src/main/resources/swagger/swagger.json b/policy-management/src/main/resources/swagger/swagger.json index 9fb709b9..b3433208 100644 --- a/policy-management/src/main/resources/swagger/swagger.json +++ b/policy-management/src/main/resources/swagger/swagger.json @@ -3187,7 +3187,7 @@ "get" : { "tags" : [ "pdp-d-telemetry" ], "summary" : "Retrieves the managed topic sources", - "description" : "Network Topic Sources Agregation", + "description" : "Network Topic Sources Aggregation", "operationId" : "sources", "responses" : { "200" : { @@ -3212,7 +3212,7 @@ "get" : { "tags" : [ "pdp-d-telemetry" ], "summary" : "Retrieves the managed topic sinks", - "description" : "Network Topic Sinks Agregation", + "description" : "Network Topic Sinks Aggregation", "operationId" : "sinks", "responses" : { "200" : { @@ -3328,7 +3328,7 @@ "style" : "simple", "explode" : false, "schema" : { - "pattern" : "ueb|dmaap|noop", + "pattern" : "kafka|noop", "type" : "string" } } ], @@ -3365,7 +3365,7 @@ "style" : "simple", "explode" : false, "schema" : { - "pattern" : "ueb|dmaap|noop", + "pattern" : "kafka|noop", "type" : "string" } } ], @@ -3402,7 +3402,7 @@ "style" : "simple", "explode" : false, "schema" : { - "pattern" : "ueb|dmaap|noop", + "pattern" : "kafka|noop", "type" : "string" } }, { @@ -3439,7 +3439,7 @@ "get" : { "tags" : [ "pdp-d-telemetry" ], "summary" : "Retrieves a managed topic sink", - "description" : "This is a Network Communicaton Endpoint destination of messages from the Engine", + "description" : "This is a Network Communication Endpoint destination of messages from the Engine", "operationId" : "sinkTopic", "parameters" : [ { "name" : "comm", @@ -3449,7 +3449,7 @@ "style" : "simple", "explode" : false, "schema" : { - "pattern" : "ueb|dmaap|noop", + "pattern" : "kafka|noop", "type" : "string" } }, { @@ -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", @@ -3496,7 +3496,7 @@ "style" : "simple", "explode" : false, "schema" : { - "pattern" : "ueb|dmaap|noop", + "pattern" : "kafka|noop", "type" : "string" } }, { @@ -3541,7 +3541,7 @@ "style" : "simple", "explode" : false, "schema" : { - "pattern" : "ueb|dmaap|noop", + "pattern" : "kafka|noop", "type" : "string" } }, { @@ -3601,8 +3601,8 @@ "/topics/sinks/{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" : "sinkEvents", "parameters" : [ { "name" : "comm", @@ -3612,7 +3612,7 @@ "style" : "simple", "explode" : false, "schema" : { - "pattern" : "ueb|dmaap|noop", + "pattern" : "kafka|noop", "type" : "string" } }, { @@ -3658,7 +3658,7 @@ "style" : "simple", "explode" : false, "schema" : { - "pattern" : "ueb|dmaap|noop", + "pattern" : "kafka|noop", "type" : "string" } }, { @@ -3706,7 +3706,7 @@ "style" : "simple", "explode" : false, "schema" : { - "pattern" : "ueb|dmaap|noop", + "pattern" : "kafka|noop", "type" : "string" } }, { @@ -3757,7 +3757,7 @@ "style" : "simple", "explode" : false, "schema" : { - "pattern" : "ueb|dmaap|noop", + "pattern" : "kafka|noop", "type" : "string" } }, { @@ -3804,7 +3804,7 @@ "style" : "simple", "explode" : false, "schema" : { - "pattern" : "ueb|dmaap|noop", + "pattern" : "kafka|noop", "type" : "string" } }, { @@ -3850,7 +3850,7 @@ "style" : "simple", "explode" : false, "schema" : { - "pattern" : "ueb|dmaap|noop", + "pattern" : "kafka|noop", "type" : "string" } }, { @@ -3898,7 +3898,7 @@ "style" : "simple", "explode" : false, "schema" : { - "pattern" : "ueb|dmaap|noop", + "pattern" : "kafka|noop", "type" : "string" } }, { @@ -3948,7 +3948,7 @@ "style" : "simple", "explode" : false, "schema" : { - "pattern" : "ueb|dmaap|noop", + "pattern" : "kafka|noop", "type" : "string" } }, { @@ -3996,7 +3996,7 @@ "style" : "simple", "explode" : false, "schema" : { - "pattern" : "ueb|dmaap|noop", + "pattern" : "kafka|noop", "type" : "string" } }, { @@ -4046,7 +4046,7 @@ "style" : "simple", "explode" : false, "schema" : { - "pattern" : "ueb|dmaap|noop", + "pattern" : "kafka|noop", "type" : "string" } }, { @@ -4094,7 +4094,7 @@ "style" : "simple", "explode" : false, "schema" : { - "pattern" : "ueb|dmaap|noop", + "pattern" : "kafka|noop", "type" : "string" } }, { @@ -4135,7 +4135,7 @@ "get" : { "tags" : [ "pdp-d-legacy" ], "summary" : "Legacy Engine Configuration Properties", - "description" : "Used for booststrapping the engine", + "description" : "Used for bootstrapping the engine", "operationId" : "properties", "responses" : { "200" : { @@ -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" @@ -5486,101 +5486,6 @@ } } }, - "DmaapTopicSink" : { - "type" : "object", - "properties" : { - "partitionKey" : { - "type" : "string" - }, - "apiKey" : { - "type" : "string" - }, - "apiSecret" : { - "type" : "string" - }, - "effectiveTopic" : { - "type" : "string" - }, - "recentEvents" : { - "type" : "array", - "items" : { - "type" : "string" - } - }, - "topic" : { - "type" : "string" - }, - "servers" : { - "type" : "array", - "items" : { - "type" : "string" - } - }, - "topicCommInfrastructure" : { - "type" : "string", - "enum" : [ "UEB", "DMAAP", "KAFKA", "NOOP", "REST" ] - }, - "alive" : { - "type" : "boolean" - }, - "locked" : { - "type" : "boolean" - } - } - }, - "DmaapTopicSource" : { - "type" : "object", - "properties" : { - "consumerInstance" : { - "type" : "string" - }, - "consumerGroup" : { - "type" : "string" - }, - "fetchTimeout" : { - "type" : "integer", - "format" : "int32" - }, - "fetchLimit" : { - "type" : "integer", - "format" : "int32" - }, - "apiKey" : { - "type" : "string" - }, - "apiSecret" : { - "type" : "string" - }, - "effectiveTopic" : { - "type" : "string" - }, - "recentEvents" : { - "type" : "array", - "items" : { - "type" : "string" - } - }, - "topic" : { - "type" : "string" - }, - "servers" : { - "type" : "array", - "items" : { - "type" : "string" - } - }, - "topicCommInfrastructure" : { - "type" : "string", - "enum" : [ "UEB", "DMAAP", "KAFKA", "NOOP", "REST" ] - }, - "alive" : { - "type" : "boolean" - }, - "locked" : { - "type" : "boolean" - } - } - }, "KafkaTopicSink" : { "type" : "object", "properties" : { @@ -5613,7 +5518,7 @@ }, "topicCommInfrastructure" : { "type" : "string", - "enum" : [ "UEB", "DMAAP", "KAFKA", "NOOP", "REST" ] + "enum" : [ "KAFKA", "NOOP", "REST" ] }, "alive" : { "type" : "boolean" @@ -5666,7 +5571,7 @@ }, "topicCommInfrastructure" : { "type" : "string", - "enum" : [ "UEB", "DMAAP", "KAFKA", "NOOP", "REST" ] + "enum" : [ "KAFKA", "NOOP", "REST" ] }, "alive" : { "type" : "boolean" @@ -5705,7 +5610,7 @@ }, "topicCommInfrastructure" : { "type" : "string", - "enum" : [ "UEB", "DMAAP", "KAFKA", "NOOP", "REST" ] + "enum" : [ "KAFKA", "NOOP", "REST" ] } } }, @@ -5738,31 +5643,13 @@ }, "topicCommInfrastructure" : { "type" : "string", - "enum" : [ "UEB", "DMAAP", "KAFKA", "NOOP", "REST" ] + "enum" : [ "KAFKA", "NOOP", "REST" ] } } }, "TopicEndpoint" : { "type" : "object", "properties" : { - "uebTopicSources" : { - "type" : "array", - "items" : { - "$ref" : "#/components/schemas/UebTopicSource" - } - }, - "uebTopicSinks" : { - "type" : "array", - "items" : { - "$ref" : "#/components/schemas/UebTopicSink" - } - }, - "dmaapTopicSinks" : { - "type" : "array", - "items" : { - "$ref" : "#/components/schemas/DmaapTopicSink" - } - }, "kafkaTopicSinks" : { "type" : "array", "items" : { @@ -5775,12 +5662,6 @@ "$ref" : "#/components/schemas/NoopTopicSink" } }, - "dmaapTopicSources" : { - "type" : "array", - "items" : { - "$ref" : "#/components/schemas/DmaapTopicSource" - } - }, "kafkaTopicSources" : { "type" : "array", "items" : { @@ -5813,101 +5694,6 @@ } } }, - "UebTopicSink" : { - "type" : "object", - "properties" : { - "partitionKey" : { - "type" : "string" - }, - "apiKey" : { - "type" : "string" - }, - "apiSecret" : { - "type" : "string" - }, - "effectiveTopic" : { - "type" : "string" - }, - "recentEvents" : { - "type" : "array", - "items" : { - "type" : "string" - } - }, - "topic" : { - "type" : "string" - }, - "servers" : { - "type" : "array", - "items" : { - "type" : "string" - } - }, - "topicCommInfrastructure" : { - "type" : "string", - "enum" : [ "UEB", "DMAAP", "KAFKA", "NOOP", "REST" ] - }, - "alive" : { - "type" : "boolean" - }, - "locked" : { - "type" : "boolean" - } - } - }, - "UebTopicSource" : { - "type" : "object", - "properties" : { - "consumerInstance" : { - "type" : "string" - }, - "consumerGroup" : { - "type" : "string" - }, - "fetchTimeout" : { - "type" : "integer", - "format" : "int32" - }, - "fetchLimit" : { - "type" : "integer", - "format" : "int32" - }, - "apiKey" : { - "type" : "string" - }, - "apiSecret" : { - "type" : "string" - }, - "effectiveTopic" : { - "type" : "string" - }, - "recentEvents" : { - "type" : "array", - "items" : { - "type" : "string" - } - }, - "topic" : { - "type" : "string" - }, - "servers" : { - "type" : "array", - "items" : { - "type" : "string" - } - }, - "topicCommInfrastructure" : { - "type" : "string", - "enum" : [ "UEB", "DMAAP", "KAFKA", "NOOP", "REST" ] - }, - "alive" : { - "type" : "boolean" - }, - "locked" : { - "type" : "boolean" - } - } - }, "PdpdConfiguration" : { "type" : "object", "properties" : { 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 |