Bug fixes and performance improvements

When facing any kind of errors on retrieving PNF and service-instance objects from
A&AI, BBSep now logs the error and keeps the reactive stream active. Synchronized
access in tasks when there is a configuration update. Performance improvements in
polling from DMaaP.

Change-Id: I654fd1a7267f2b723cc66b0a93e4855003af2914
Issue-ID: DCAEGEN2-1354
Signed-off-by: Stavros Kanarakis <stavros.kanarakis@nokia.com>

5 files changed, 72 insertions, 0 deletions

diff --git a/components/bbs-event-processor/src/test/java/org/onap/bbs/event/processor/config/ApplicationConfigurationTest.java b/components/bbs-event-processor/src/test/java/org/onap/bbs/event/processor/config/ApplicationConfigurationTest.java
index 59feacaa..7b81b1be 100644
--- a/components/bbs-event-processor/src/test/java/org/onap/bbs/event/processor/config/ApplicationConfigurationTest.java
+++ b/components/bbs-event-processor/src/test/java/org/onap/bbs/event/processor/config/ApplicationConfigurationTest.java
@@ -95,6 +95,12 @@ import org.springframework.test.context.TestPropertySource;
         "configs.security.enableAaiCertAuth=true",
         "configs.application.pipelinesPollingIntervalSec=30",
         "configs.application.pipelinesTimeoutSec=15",
+        "configs.application.policyVersion=1.0.0",
+        "configs.application.clTargetType=VM",
+        "configs.application.clEventStatus=ONSET",
+        "configs.application.clVersion=1.0.2",
+        "configs.application.clTarget=vserver.vserver-name",
+        "configs.application.clOriginator=DCAE-bbs-event-processor",
         "configs.application.re-registration.policyScope=reRegPolicyScope",
         "configs.application.re-registration.clControlName=reRegControlName",
         "configs.application.cpe-authentication.policyScope=cpeAuthPolicyScope",
@@ -191,6 +197,12 @@ class ApplicationConfigurationTest {
         assertAll("Generic Application Properties",
             () -> assertEquals(30, configuration.getPipelinesPollingIntervalInSeconds()),
             () -> assertEquals(15, configuration.getPipelinesTimeoutInSeconds()),
+            () -> assertEquals("1.0.0", configuration.getPolicyVersion()),
+            () -> assertEquals("VM", configuration.getCloseLoopTargetType()),
+            () -> assertEquals("ONSET", configuration.getCloseLoopEventStatus()),
+            () -> assertEquals("1.0.2", configuration.getCloseLoopVersion()),
+            () -> assertEquals("vserver.vserver-name", configuration.getCloseLoopTarget()),
+            () -> assertEquals("DCAE-bbs-event-processor", configuration.getCloseLoopOriginator()),
             () -> assertEquals("reRegPolicyScope", configuration.getReRegistrationCloseLoopPolicyScope()),
             () -> assertEquals("cpeAuthPolicyScope", configuration.getCpeAuthenticationCloseLoopPolicyScope()),
             () -> assertEquals("reRegControlName", configuration.getReRegistrationCloseLoopControlName()),
@@ -261,6 +273,12 @@ class ApplicationConfigurationTest {
                 .pipelinesPollingIntervalSec(20)
                 .pipelinesTimeoutSec(20)
                 .cbsPollingIntervalSec(180)
+                .policyVersion("2.0.0")
+                .closeLoopTargetType("VM2")
+                .closeLoopEventStatus("ONSET-update")
+                .closeLoopVersion("2.0.2")
+                .closeLoopTarget("Target-update")
+                .closeLoopOriginator("Originator-update")
                 .reRegistrationPolicyScope("policyScope-update")
                 .reRegistrationClControlName("controlName-update")
                 .cpeAuthPolicyScope("policyScope-update")
@@ -341,6 +359,12 @@ class ApplicationConfigurationTest {
             () -> assertEquals(20, configuration.getPipelinesPollingIntervalInSeconds()),
             () -> assertEquals(20, configuration.getPipelinesTimeoutInSeconds()),
             () -> assertEquals(180, configuration.getCbsPollingInterval()),
+            () -> assertEquals("2.0.0", configuration.getPolicyVersion()),
+            () -> assertEquals("VM2", configuration.getCloseLoopTargetType()),
+            () -> assertEquals("ONSET-update", configuration.getCloseLoopEventStatus()),
+            () -> assertEquals("2.0.2", configuration.getCloseLoopVersion()),
+            () -> assertEquals("Target-update", configuration.getCloseLoopTarget()),
+            () -> assertEquals("Originator-update", configuration.getCloseLoopOriginator()),
             () -> assertEquals("policyScope-update", configuration.getReRegistrationCloseLoopPolicyScope()),
             () -> assertEquals("policyScope-update", configuration.getCpeAuthenticationCloseLoopPolicyScope()),
             () -> assertEquals("controlName-update", configuration.getReRegistrationCloseLoopControlName()),
diff --git a/components/bbs-event-processor/src/test/java/org/onap/bbs/event/processor/config/ConsulConfigurationGatewayTest.java b/components/bbs-event-processor/src/test/java/org/onap/bbs/event/processor/config/ConsulConfigurationGatewayTest.java
index ee75926b..cd20d1e1 100644
--- a/components/bbs-event-processor/src/test/java/org/onap/bbs/event/processor/config/ConsulConfigurationGatewayTest.java
+++ b/components/bbs-event-processor/src/test/java/org/onap/bbs/event/processor/config/ConsulConfigurationGatewayTest.java
@@ -74,6 +74,12 @@ class ConsulConfigurationGatewayTest {
                 + "\"application.reregistration.clControlName\": \"controlName\","
                 + "\"application.cpe.authentication.policyScope\": \"policyScope\","
                 + "\"application.cpe.authentication.clControlName\": \"controlName\","
+                + "\"application.policyVersion\": \"1.0\","
+                + "\"application.clTargetType\": \"VM\","
+                + "\"application.clEventStatus\": \"ONSET\","
+                + "\"application.clVersion\": \"1.0.2\","
+                + "\"application.clTarget\": \"vserver.vserver-name\","
+                + "\"application.clOriginator\": \"DCAE-bbs-event-processor\","
                 + "\"application.reregistration.configKey\": \"config_key_2\","
                 + "\"application.cpeAuth.configKey\": \"config_key_1\","
                 + "\"application.closeLoop.configKey\": \"config_key_3\","
@@ -186,6 +192,12 @@ class ConsulConfigurationGatewayTest {
                 .reRegistrationClControlName("controlName")
                 .cpeAuthPolicyScope("policyScope")
                 .cpeAuthClControlName("controlName")
+                .policyVersion("1.0")
+                .closeLoopTargetType("VM")
+                .closeLoopEventStatus("ONSET")
+                .closeLoopVersion("1.0.2")
+                .closeLoopTarget("vserver.vserver-name")
+                .closeLoopOriginator("DCAE-bbs-event-processor")
                 .reRegConfigKey("config_key_2")
                 .cpeAuthConfigKey("config_key_1")
                 .closeLoopConfigKey("config_key_3")
diff --git a/components/bbs-event-processor/src/test/java/org/onap/bbs/event/processor/config/GenericPropertiesTest.java b/components/bbs-event-processor/src/test/java/org/onap/bbs/event/processor/config/GenericPropertiesTest.java
index 12e393a1..91ebed8d 100644
--- a/components/bbs-event-processor/src/test/java/org/onap/bbs/event/processor/config/GenericPropertiesTest.java
+++ b/components/bbs-event-processor/src/test/java/org/onap/bbs/event/processor/config/GenericPropertiesTest.java
@@ -36,6 +36,12 @@ import org.springframework.test.context.TestPropertySource;
 @TestPropertySource(properties = {
         "configs.application.pipelinesPollingIntervalSec=30",
         "configs.application.pipelinesTimeoutSec=15",
+        "configs.application.policyVersion=1.0.0",
+        "configs.application.clTargetType=VM",
+        "configs.application.clEventStatus=ONSET",
+        "configs.application.clVersion=1.0.2",
+        "configs.application.clTarget=vserver.vserver-name",
+        "configs.application.clOriginator=DCAE-bbs-event-processor",
         "configs.application.re-registration.policyScope=reRegPolicyScope",
         "configs.application.re-registration.clControlName=reRegControlName",
         "configs.application.cpe-authentication.policyScope=cpeAuthPolicyScope",
@@ -54,6 +60,12 @@ class GenericPropertiesTest {
         assertAll("Generic Application Properties",
             () -> assertEquals(30, genericProperties.getPipelinesPollingIntervalSec()),
             () -> assertEquals(15, genericProperties.getPipelinesTimeoutSec()),
+            () -> assertEquals("1.0.0", genericProperties.getPolicyVersion()),
+            () -> assertEquals("VM", genericProperties.getClTargetType()),
+            () -> assertEquals("ONSET", genericProperties.getClEventStatus()),
+            () -> assertEquals("1.0.2", genericProperties.getClVersion()),
+            () -> assertEquals("vserver.vserver-name", genericProperties.getClTarget()),
+            () -> assertEquals("DCAE-bbs-event-processor", genericProperties.getClOriginator()),
             () -> assertEquals("reRegPolicyScope", genericProperties.getReRegistration().getPolicyScope()),
             () -> assertEquals("cpeAuthPolicyScope",
                     genericProperties.getCpeAuthentication().getPolicyScope()),
diff --git a/components/bbs-event-processor/src/test/java/org/onap/bbs/event/processor/pipelines/CpeAuthenticationPipelineTest.java b/components/bbs-event-processor/src/test/java/org/onap/bbs/event/processor/pipelines/CpeAuthenticationPipelineTest.java
index dbac5bf2..76d9659c 100644
--- a/components/bbs-event-processor/src/test/java/org/onap/bbs/event/processor/pipelines/CpeAuthenticationPipelineTest.java
+++ b/components/bbs-event-processor/src/test/java/org/onap/bbs/event/processor/pipelines/CpeAuthenticationPipelineTest.java
@@ -98,6 +98,18 @@ class CpeAuthenticationPipelineTest {
                 .thenReturn("controlName");
         when(configuration.getCpeAuthenticationCloseLoopPolicyScope())
                 .thenReturn("policyScope");
+        when(configuration.getPolicyVersion())
+                .thenReturn("1.0.0");
+        when(configuration.getCloseLoopTargetType())
+                .thenReturn("VM");
+        when(configuration.getCloseLoopEventStatus())
+                .thenReturn("ONSET");
+        when(configuration.getCloseLoopVersion())
+                .thenReturn("1.0.2");
+        when(configuration.getCloseLoopTarget())
+                .thenReturn("CL-Target");
+        when(configuration.getCloseLoopOriginator())
+                .thenReturn("DCAE-BBS-ep");
 
         pipeline = new CpeAuthenticationPipeline(configuration, consumerTask,
                 publisherTask, aaiClientTask, new HashMap<>());
diff --git a/components/bbs-event-processor/src/test/java/org/onap/bbs/event/processor/pipelines/ReRegistrationPipelineTest.java b/components/bbs-event-processor/src/test/java/org/onap/bbs/event/processor/pipelines/ReRegistrationPipelineTest.java
index dbd1aab1..a1b6b148 100644
--- a/components/bbs-event-processor/src/test/java/org/onap/bbs/event/processor/pipelines/ReRegistrationPipelineTest.java
+++ b/components/bbs-event-processor/src/test/java/org/onap/bbs/event/processor/pipelines/ReRegistrationPipelineTest.java
@@ -98,6 +98,18 @@ class ReRegistrationPipelineTest {
                 .thenReturn("controlName");
         when(configuration.getReRegistrationCloseLoopPolicyScope())
                 .thenReturn("policyScope");
+        when(configuration.getPolicyVersion())
+                .thenReturn("1.0.0");
+        when(configuration.getCloseLoopTargetType())
+                .thenReturn("VM");
+        when(configuration.getCloseLoopEventStatus())
+                .thenReturn("ONSET");
+        when(configuration.getCloseLoopVersion())
+                .thenReturn("1.0.2");
+        when(configuration.getCloseLoopTarget())
+                .thenReturn("CL-Target");
+        when(configuration.getCloseLoopOriginator())
+                .thenReturn("DCAE-BBS-ep");
 
         pipeline = new ReRegistrationPipeline(configuration, consumerTask,
                 publisherTask, aaiClientTask, new HashMap<>());