From 4c1c6891ed6cd4a9e5c2e0b3bacd0c2df89364a7 Mon Sep 17 00:00:00 2001 From: Jorge Hernandez Date: Tue, 19 Feb 2019 20:05:31 -0600 Subject: Support for lab contextual topic names. This work allows a drools application, with its drl template to refer to the topic name by its invariable canonical name, ie. POLICY-CL-MGT. Since the drl is a design time artifact, it is desired to know topics by its canonical non-changeable name. The actual per lab environment topic name may change on a per deployment basis, for example POLICY-CL-MGT-WINDRIVER or POLICY-CL-MGT-TLAB. The template can still use POLICY-CL-MGT without modification but the actual installation configuration would use the "effectiveTopic" property to point to the right topic on a per lab basis. This also helps with installation (long story) since the canonical topics will be known ahead of time. Change-Id: I8322bf7e427569c37a76eea5ce6d5b9547cb2ff3 Issue-ID: POLICY-1534 Signed-off-by: Jorge Hernandez --- .../policy/common/endpoints/event/comm/TopicEndpointProxyTest.json | 6 ++++++ .../common/endpoints/event/comm/bus/internal/BusTopicBaseTest.json | 1 + .../endpoints/event/comm/bus/internal/InlineBusTopicSinkTest.json | 1 + .../endpoints/event/comm/bus/internal/InlineDmaapTopicSinkTest.json | 1 + .../endpoints/event/comm/bus/internal/InlineUebTopicSinkTest.json | 1 + .../event/comm/bus/internal/SingleThreadedBusTopicSourceTest.json | 1 + .../event/comm/bus/internal/SingleThreadedDmaapTopicSourceTest.json | 1 + .../event/comm/bus/internal/SingleThreadedUebTopicSourceTest.json | 1 + .../common/endpoints/event/comm/bus/internal/TopicBaseTest.json | 1 + 9 files changed, 14 insertions(+) (limited to 'policy-endpoints/src/test/resources/org/onap/policy') diff --git a/policy-endpoints/src/test/resources/org/onap/policy/common/endpoints/event/comm/TopicEndpointProxyTest.json b/policy-endpoints/src/test/resources/org/onap/policy/common/endpoints/event/comm/TopicEndpointProxyTest.json index 11624af0..3402a524 100644 --- a/policy-endpoints/src/test/resources/org/onap/policy/common/endpoints/event/comm/TopicEndpointProxyTest.json +++ b/policy-endpoints/src/test/resources/org/onap/policy/common/endpoints/event/comm/TopicEndpointProxyTest.json @@ -4,6 +4,7 @@ "topicSources" : [ { "servers" : [ "my-server" ], "topic" : "ueb-source", + "effectiveTopic" : "my-effective-topic", "recentEvents" : [ ], "alive" : false, "locked" : false, @@ -19,6 +20,7 @@ }, { "servers" : [ "my-server" ], "topic" : "dmaap-source", + "effectiveTopic" : "my-effective-topic", "recentEvents" : [ ], "alive" : false, "locked" : false, @@ -34,6 +36,7 @@ }, { "servers" : [ "my-server" ], "topic" : "noop-source", + "effectiveTopic" : "noop-source", "recentEvents" : [ ], "alive" : false, "locked" : false, @@ -42,6 +45,7 @@ "topicSinks" : [ { "servers" : [ "my-server" ], "topic" : "ueb-sink", + "effectiveTopic" : "my-effective-topic", "recentEvents" : [ ], "alive" : false, "locked" : false, @@ -54,6 +58,7 @@ }, { "servers" : [ "my-server" ], "topic" : "dmaap-sink", + "effectiveTopic" : "my-effective-topic", "recentEvents" : [ ], "alive" : false, "locked" : false, @@ -66,6 +71,7 @@ }, { "servers" : [ "my-server" ], "topic" : "noop-sink", + "effectiveTopic" : "noop-sink", "recentEvents" : [ ], "alive" : false, "locked" : false, diff --git a/policy-endpoints/src/test/resources/org/onap/policy/common/endpoints/event/comm/bus/internal/BusTopicBaseTest.json b/policy-endpoints/src/test/resources/org/onap/policy/common/endpoints/event/comm/bus/internal/BusTopicBaseTest.json index 49eafaf1..dd0b8924 100644 --- a/policy-endpoints/src/test/resources/org/onap/policy/common/endpoints/event/comm/bus/internal/BusTopicBaseTest.json +++ b/policy-endpoints/src/test/resources/org/onap/policy/common/endpoints/event/comm/bus/internal/BusTopicBaseTest.json @@ -1,6 +1,7 @@ { "servers" : [ "svra", "svrb" ], "topic" : "my-topic", + "effectiveTopic" : "my-effective-topic", "recentEvents" : [ ], "alive" : false, "locked" : false, diff --git a/policy-endpoints/src/test/resources/org/onap/policy/common/endpoints/event/comm/bus/internal/InlineBusTopicSinkTest.json b/policy-endpoints/src/test/resources/org/onap/policy/common/endpoints/event/comm/bus/internal/InlineBusTopicSinkTest.json index 98318751..8e39fddf 100644 --- a/policy-endpoints/src/test/resources/org/onap/policy/common/endpoints/event/comm/bus/internal/InlineBusTopicSinkTest.json +++ b/policy-endpoints/src/test/resources/org/onap/policy/common/endpoints/event/comm/bus/internal/InlineBusTopicSinkTest.json @@ -1,6 +1,7 @@ { "servers" : [ "svra", "svrb" ], "topic" : "my-topic", + "effectiveTopic" : "my-effective-topic", "recentEvents" : [ ], "alive" : false, "locked" : false, diff --git a/policy-endpoints/src/test/resources/org/onap/policy/common/endpoints/event/comm/bus/internal/InlineDmaapTopicSinkTest.json b/policy-endpoints/src/test/resources/org/onap/policy/common/endpoints/event/comm/bus/internal/InlineDmaapTopicSinkTest.json index a83f5c97..2bed3347 100644 --- a/policy-endpoints/src/test/resources/org/onap/policy/common/endpoints/event/comm/bus/internal/InlineDmaapTopicSinkTest.json +++ b/policy-endpoints/src/test/resources/org/onap/policy/common/endpoints/event/comm/bus/internal/InlineDmaapTopicSinkTest.json @@ -1,6 +1,7 @@ { "servers" : [ "svra", "svrb" ], "topic" : "my-topic", + "effectiveTopic" : "my-effective-topic", "recentEvents" : [ ], "alive" : false, "locked" : false, diff --git a/policy-endpoints/src/test/resources/org/onap/policy/common/endpoints/event/comm/bus/internal/InlineUebTopicSinkTest.json b/policy-endpoints/src/test/resources/org/onap/policy/common/endpoints/event/comm/bus/internal/InlineUebTopicSinkTest.json index 4ec0c80f..e7419d88 100644 --- a/policy-endpoints/src/test/resources/org/onap/policy/common/endpoints/event/comm/bus/internal/InlineUebTopicSinkTest.json +++ b/policy-endpoints/src/test/resources/org/onap/policy/common/endpoints/event/comm/bus/internal/InlineUebTopicSinkTest.json @@ -1,6 +1,7 @@ { "servers" : [ "svra", "svrb" ], "topic" : "my-topic", + "effectiveTopic" : "my-effective-topic", "recentEvents" : [ ], "alive" : false, "locked" : false, diff --git a/policy-endpoints/src/test/resources/org/onap/policy/common/endpoints/event/comm/bus/internal/SingleThreadedBusTopicSourceTest.json b/policy-endpoints/src/test/resources/org/onap/policy/common/endpoints/event/comm/bus/internal/SingleThreadedBusTopicSourceTest.json index 4f880257..aeb233bc 100644 --- a/policy-endpoints/src/test/resources/org/onap/policy/common/endpoints/event/comm/bus/internal/SingleThreadedBusTopicSourceTest.json +++ b/policy-endpoints/src/test/resources/org/onap/policy/common/endpoints/event/comm/bus/internal/SingleThreadedBusTopicSourceTest.json @@ -1,6 +1,7 @@ { "servers" : [ "svra", "svrb" ], "topic" : "my-topic", + "effectiveTopic" : "my-effective-topic", "recentEvents" : [ ], "alive" : false, "locked" : false, diff --git a/policy-endpoints/src/test/resources/org/onap/policy/common/endpoints/event/comm/bus/internal/SingleThreadedDmaapTopicSourceTest.json b/policy-endpoints/src/test/resources/org/onap/policy/common/endpoints/event/comm/bus/internal/SingleThreadedDmaapTopicSourceTest.json index 82e4b3ff..07aa916a 100644 --- a/policy-endpoints/src/test/resources/org/onap/policy/common/endpoints/event/comm/bus/internal/SingleThreadedDmaapTopicSourceTest.json +++ b/policy-endpoints/src/test/resources/org/onap/policy/common/endpoints/event/comm/bus/internal/SingleThreadedDmaapTopicSourceTest.json @@ -1,6 +1,7 @@ { "servers" : [ "svra", "svrb" ], "topic" : "my-topic", + "effectiveTopic" : "my-effective-topic", "recentEvents" : [ ], "alive" : false, "locked" : false, diff --git a/policy-endpoints/src/test/resources/org/onap/policy/common/endpoints/event/comm/bus/internal/SingleThreadedUebTopicSourceTest.json b/policy-endpoints/src/test/resources/org/onap/policy/common/endpoints/event/comm/bus/internal/SingleThreadedUebTopicSourceTest.json index 4eeacc6d..6a6e8f52 100644 --- a/policy-endpoints/src/test/resources/org/onap/policy/common/endpoints/event/comm/bus/internal/SingleThreadedUebTopicSourceTest.json +++ b/policy-endpoints/src/test/resources/org/onap/policy/common/endpoints/event/comm/bus/internal/SingleThreadedUebTopicSourceTest.json @@ -1,6 +1,7 @@ { "servers" : [ "svra", "svrb" ], "topic" : "my-topic", + "effectiveTopic" : "my-effective-topic", "recentEvents" : [ ], "alive" : false, "locked" : false, diff --git a/policy-endpoints/src/test/resources/org/onap/policy/common/endpoints/event/comm/bus/internal/TopicBaseTest.json b/policy-endpoints/src/test/resources/org/onap/policy/common/endpoints/event/comm/bus/internal/TopicBaseTest.json index 7431854d..b72b4efd 100644 --- a/policy-endpoints/src/test/resources/org/onap/policy/common/endpoints/event/comm/bus/internal/TopicBaseTest.json +++ b/policy-endpoints/src/test/resources/org/onap/policy/common/endpoints/event/comm/bus/internal/TopicBaseTest.json @@ -1,6 +1,7 @@ { "servers" : [ "svra", "svrb" ], "topic" : "my-topic", + "effectiveTopic" : "my-topic", "recentEvents" : [ ], "alive" : false, "locked" : false, -- cgit 1.2.3-korg