diff options
author | Jim Hahn <jrh3@att.com> | 2020-10-29 18:15:51 -0400 |
---|---|---|
committer | Jim Hahn <jrh3@att.com> | 2020-11-02 18:17:49 -0500 |
commit | dc6c4a21d46909dad59f4bd16cb6d4fc29fcce77 (patch) | |
tree | ef6bd7f152e189913c802d07aea43c83f3dc97e2 /feature-pooling-dmaap/src/main/feature | |
parent | d418aff3a9fd547941e40978c648d6209d332e37 (diff) |
Make feature-pooling-dmaap work without filtering
As DMaaP server-side filtering has been deprecated, modified
feature-pooling-dmaap to work without it. The new design assumes that
each pdp gets its own unique consumer group, thus all pdps receive all
events. Each pdp then uses the bucket assignments to determine whether
or not to process the event. Note: this means that events no longer
have to be forwarded to the correct host, thus the "Forward" class has
been deleted.
Other than that, the code already did post-filtering of events so most
of it still works even without server-side filtering. As a result, most
of the effort was in simply removing code that no longer applies.
Per review comments:
Modified code to use the event hash code instead of the request ID has
code when routing events. This eliminated the need for the extractor
classes and related properties.
Replaced amsterdam and beijing properties with usecases properties.
Issue-ID: POLICY-2881
Change-Id: I87e4f98c14f419593879c278d7da053c80575553
Signed-off-by: Jim Hahn <jrh3@att.com>
Diffstat (limited to 'feature-pooling-dmaap/src/main/feature')
-rw-r--r-- | feature-pooling-dmaap/src/main/feature/config/feature-pooling-dmaap.properties | 49 |
1 files changed, 19 insertions, 30 deletions
diff --git a/feature-pooling-dmaap/src/main/feature/config/feature-pooling-dmaap.properties b/feature-pooling-dmaap/src/main/feature/config/feature-pooling-dmaap.properties index 2786a613..59c4b472 100644 --- a/feature-pooling-dmaap/src/main/feature/config/feature-pooling-dmaap.properties +++ b/feature-pooling-dmaap/src/main/feature/config/feature-pooling-dmaap.properties @@ -2,14 +2,14 @@ # ============LICENSE_START======================================================= # feature-pooling-dmaap # ================================================================================ -# 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. # 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. @@ -65,34 +65,23 @@ # Topic used for inter-host communication for a particular controller # pooling.<controller-name>.topic=XXX -# These specify how the request id is to be extracted from each type of -# object that may be presented to a controller from shared topics -# (i.e., topics where hosts do not all receive a copy of the event) -extractor.requestId.org.onap.policy.controlloop.VirtualControlLoopEvent=${requestId} - - # Each controller that is enabled should have its own topic and the -# corresponding ueb.xxx properties. However, for now, just assume that -# the amsterdam-cl and beijing-cl features will not both be enabled -# at the same time. - -pooling.amsterdam.enabled=true -pooling.amsterdam.topic=${env:POOLING_TOPIC} - -pooling.beijing.enabled=true -pooling.beijing.topic=${env:POOLING_TOPIC} +# corresponding dmaap.xxx properties. However, for now, just assume that +# the usecases features will not both be enabled at the same time. +pooling.usecases.enabled=true +pooling.usecases.topic=${env:POOLING_TOPIC} # the list of sources and sinks should be identical -ueb.source.topics=POOLING_TOPIC -ueb.sink.topics=POOLING_TOPIC - -ueb.source.topics.POOLING_TOPIC.servers=${env:DMAAP_SERVERS} -ueb.source.topics.POOLING_TOPIC.effectiveTopic=${env:POOLING_TOPIC} -ueb.source.topics.POOLING_TOPIC.apiKey= -ueb.source.topics.POOLING_TOPIC.apiSecret= - -ueb.sink.topics.POOLING_TOPIC.servers=${env:DMAAP_SERVERS} -ueb.sink.topics.POOLING_TOPIC.effectiveTopic=${env:POOLING_TOPIC} -ueb.sink.topics.POOLING_TOPIC.apiKey= -ueb.sink.topics.POOLING_TOPIC.apiSecret= +dmaap.source.topics=POOLING_TOPIC +dmaap.sink.topics=POOLING_TOPIC + +dmaap.source.topics.POOLING_TOPIC.servers=${env:DMAAP_SERVERS} +dmaap.source.topics.POOLING_TOPIC.effectiveTopic=${env:POOLING_TOPIC} +dmaap.source.topics.POOLING_TOPIC.apiKey= +dmaap.source.topics.POOLING_TOPIC.apiSecret= + +dmaap.sink.topics.POOLING_TOPIC.servers=${env:DMAAP_SERVERS} +dmaap.sink.topics.POOLING_TOPIC.effectiveTopic=${env:POOLING_TOPIC} +dmaap.sink.topics.POOLING_TOPIC.apiKey= +dmaap.sink.topics.POOLING_TOPIC.apiSecret= |