From 1f6008f39921246db95ce4d8a33d5474b658a203 Mon Sep 17 00:00:00 2001 From: lukegleeson Date: Thu, 18 May 2023 16:40:04 +0100 Subject: Improve error scenarios SubscriptionEventForwarder - Added placeholder for emtpy outcome response when no cmhandles match targets Issue-ID: CPS-1564 Signed-off-by: lukegleeson Change-Id: Ia04bb656c639946d259da779971ab29b6e91acea --- .../avcsubscription/SubscriptionEventForwarder.java | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) (limited to 'cps-ncmp-service/src/main/java') diff --git a/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/events/avcsubscription/SubscriptionEventForwarder.java b/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/events/avcsubscription/SubscriptionEventForwarder.java index 4afa051d30..4654b148c6 100644 --- a/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/events/avcsubscription/SubscriptionEventForwarder.java +++ b/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/events/avcsubscription/SubscriptionEventForwarder.java @@ -56,7 +56,8 @@ public class SubscriptionEventForwarder { private final ScheduledExecutorService executorService = Executors.newSingleThreadScheduledExecutor(); - private static final String DMI_AVC_SUBSCRIPTION_TOPIC_PREFIX = "ncmp-dmi-cm-avc-subscription-"; + @Value("${app.ncmp.avc.subscription-forward-topic-prefix}") + private String dmiAvcSubscriptionTopicPrefix; @Value("${ncmp.timers.subscription-forwarding.dmi-response-timeout-ms:30000}") private int dmiResponseTimeoutInMs; @@ -82,8 +83,15 @@ public class SubscriptionEventForwarder { = DmiServiceNameOrganizer.getDmiPropertiesPerCmHandleIdPerServiceName(yangModelCmHandles); final Set dmisToRespond = new HashSet<>(dmiPropertiesPerCmHandleIdPerServiceName.keySet()); - startResponseTimeout(subscriptionEvent, dmisToRespond); - forwardEventToDmis(dmiPropertiesPerCmHandleIdPerServiceName, subscriptionEvent); + if (dmisToRespond.isEmpty()) { + log.info("placeholder to create full outcome response for subscriptionEventId: {}.", + subscriptionEvent.getEvent().getSubscription().getClientID() + + subscriptionEvent.getEvent().getSubscription().getName()); + //TODO outcome response with no cmhandles + } else { + startResponseTimeout(subscriptionEvent, dmisToRespond); + forwardEventToDmis(dmiPropertiesPerCmHandleIdPerServiceName, subscriptionEvent); + } } private void forwardEventToDmis(final Map>> dmiNameCmHandleMap, @@ -91,8 +99,8 @@ public class SubscriptionEventForwarder { dmiNameCmHandleMap.forEach((dmiName, cmHandlePropertiesMap) -> { subscriptionEvent.getEvent().getPredicates().setTargets(Collections.singletonList(cmHandlePropertiesMap)); final String eventKey = createEventKey(subscriptionEvent, dmiName); - eventsPublisher.publishEvent( - DMI_AVC_SUBSCRIPTION_TOPIC_PREFIX + dmiName, eventKey, subscriptionEvent); + final String dmiAvcSubscriptionTopic = dmiAvcSubscriptionTopicPrefix + dmiName; + eventsPublisher.publishEvent(dmiAvcSubscriptionTopic, eventKey, subscriptionEvent); }); } -- cgit 1.2.3-korg