diff options
| author |   Jim Hahn <jrh3@att.com> | 2020-03-20 17:57:35 -0400 |
|---|---|---|
| committer | Jim Hahn <jrh3@att.com> | 2020-03-23 10:42:00 -0400 |
| commit | dc24e69b789603dd7c8df72a945eaa82e05dd21c (patch) | |
| tree | 86527849f2314aa451cf8ac8e6d614106bd5a258 /controlloop | |
| parent | 61a8fce56dc83def96a0100fd5c135f18a6dbf0c (diff) | |
Fix frankfurt controller properties
Fleshed out more of SDNC properties. Still don't know what the
"path" should be.
Added SDNR.
Removed invalid topic sources and sinks.
Changed some types from source to sink (or vice versa).
Issue-ID: POLICY-2434
Signed-off-by: Jim Hahn <jrh3@att.com>
Change-Id: I80d22243111eaf4cabb59823d327060f83bc2c28
Diffstat (limited to 'controlloop')
3 files changed, 19 insertions, 11 deletions
diff --git a/controlloop/common/controller-frankfurt/src/test/resources/config/event-manager.properties b/controlloop/common/controller-frankfurt/src/test/resources/config/event-manager.properties index 7416d0480..50f337263 100644 --- a/controlloop/common/controller-frankfurt/src/test/resources/config/event-manager.properties +++ b/controlloop/common/controller-frankfurt/src/test/resources/config/event-manager.properties @@ -57,7 +57,13 @@ actor.service.CDS.grpcTimeout=10 actor.service.CDS.operations.xxx.yyy= actor.service.SDNC.clientName=SDNC -actor.service.SDNC.operations.xxx.yyy= +actor.service.SDNC.path= +actor.service.SDNC.operations.BandwidthOnDemand.placeholder= +actor.service.SDNC.operations.Reroute.placeholder= + +actor.service.SDNR.sinkTopic=SDNR-CL +actor.service.SDNR.sourceTopic=SDNR-CL-RSP +actor.service.SDNR.operations.ModifyConfig.placeholder= actor.service.SO.clientName=SO actor.service.SO.pathGet=orchestrationRequests/v5/ diff --git a/controlloop/common/controller-frankfurt/src/test/resources/config/frankfurt-controller.properties b/controlloop/common/controller-frankfurt/src/test/resources/config/frankfurt-controller.properties index 025a60bfa..8ed43c492 100644 --- a/controlloop/common/controller-frankfurt/src/test/resources/config/frankfurt-controller.properties +++ b/controlloop/common/controller-frankfurt/src/test/resources/config/frankfurt-controller.properties @@ -24,7 +24,7 @@ rules.groupId=org.onap.policy.controlloop rules.artifactId=frankfurt rules.version=1.0.0 -noop.source.topics=DCAE_TOPIC,APPC-CL,APPC-LCM-WRITE,SDNR-CL-RSP,POLICY-CL-MGT,APPC-LCM-READ,SDNR-CL,DCAE_CL_RSP +noop.source.topics=DCAE_TOPIC,APPC-CL,APPC-LCM-WRITE,SDNR-CL-RSP,POLICY-CL-MGT,APPC-LCM-READ noop.source.topics.DCAE_TOPIC.events=\ org.onap.policy.controlloop.CanonicalOnset,org.onap.policy.controlloop.CanonicalAbated @@ -53,13 +53,10 @@ noop.source.topics.POLICY-CL-MGT.events.custom.gson=org.onap.policy.controlloop. noop.source.topics.APPC-LCM-READ.events=org.onap.policy.appclcm.AppcLcmDmaapWrapper noop.source.topics.APPC-LCM-READ.events.custom.gson=org.onap.policy.appclcm.util.Serialization,gson -noop.source.topics.SDNR-CL.events=org.onap.policy.sdnr.PciRequestWrapper -noop.source.topics.SDNR-CL.events.custom.gson=org.onap.policy.sdnr.util.Serialization,gson - -noop.source.topics.DCAE_CL_RSP.events=org.onap.policy.controlloop.ControlLoopResponse -noop.source.topics.DCAE_CL_RSP.events.custom.gson=org.onap.policy.controlloop.util.Serialization,gsonPretty - -noop.sink.topics=APPC-CL,APPC-LCM-READ,POLICY-CL-MGT,SDNR-CL,DCAE_CL_RSP +noop.sink.topics=APPC-CL,APPC-LCM-READ,POLICY-CL-MGT,SDNR-CL noop.sink.topics.POLICY-CL-MGT.events=org.onap.policy.controlloop.VirtualControlLoopNotification noop.sink.topics.POLICY-CL-MGT.events.custom.gson=org.onap.policy.controlloop.util.Serialization,gsonPretty + +noop.sink.topics.SDNR-CL.events=org.onap.policy.sdnr.PciRequestWrapper +noop.sink.topics.SDNR-CL.events.custom.gson=org.onap.policy.sdnr.util.Serialization,gson diff --git a/controlloop/common/feature-controlloop-management/src/main/feature/config/event-manager.properties b/controlloop/common/feature-controlloop-management/src/main/feature/config/event-manager.properties index 791bb8947..7c90703ae 100644 --- a/controlloop/common/feature-controlloop-management/src/main/feature/config/event-manager.properties +++ b/controlloop/common/feature-controlloop-management/src/main/feature/config/event-manager.properties @@ -58,8 +58,13 @@ actor.service.CDS.grpcTimeout=10 actor.service.CDS.operations.gRPC.placeholder= actor.service.SDNC.clientName=SDNC -actor.service.SDNC.operations.Reroute.path= -actor.service.SDNC.operations.BandwidthOnDemand.path= +actor.service.SDNC.path= +actor.service.SDNC.operations.Reroute.placeholder= +actor.service.SDNC.operations.BandwidthOnDemand.placeholder= + +actor.service.SDNR.sinkTopic=SDNR-CL +actor.service.SDNR.sourceTopic=SDNR-CL-RSP +actor.service.SDNR.operations.ModifyConfig.placeholder= actor.service.SO.clientName=SO actor.service.SO.pathGet=orchestrationRequests/v5/ |