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>

3 files changed, 93 insertions, 15 deletions

diff --git a/components/bbs-event-processor/dpo/blueprints/bbs-event-processor-input.yaml b/components/bbs-event-processor/dpo/blueprints/bbs-event-processor-input.yaml
index 97bb138e..36e69cf6 100644
--- a/components/bbs-event-processor/dpo/blueprints/bbs-event-processor-input.yaml
+++ b/components/bbs-event-processor/dpo/blueprints/bbs-event-processor-input.yaml
@@ -25,5 +25,5 @@ application_rereg_cl_control_name: clControlNameReReg
 application_cpeAuth_policy_scope: policyScopeCpeAuth
 application_cpeAuth_cl_control_name: clControlNameCpeAuth
 application_cbs_polling_interval_sec: 120
-dmaap_consumer_id: c12 
+dmaap_consumer_id: c12
 dmaap_consumer_group: OpenDcae-c12
diff --git a/components/bbs-event-processor/dpo/blueprints/k8s-bbs-event-processor.yaml-template b/components/bbs-event-processor/dpo/blueprints/k8s-bbs-event-processor.yaml-template
index 3468d7f6..e9550314 100644
--- a/components/bbs-event-processor/dpo/blueprints/k8s-bbs-event-processor.yaml-template
+++ b/components/bbs-event-processor/dpo/blueprints/k8s-bbs-event-processor.yaml-template
@@ -21,7 +21,7 @@ tosca_definitions_version: cloudify_dsl_1_3
 
 imports:
   - "http://www.getcloudify.org/spec/cloudify/3.4/types.yaml"
-  - {{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/k8splugin/1.4.5/k8splugin_types.yaml
+  - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R3/k8splugin/1.4.4/k8splugin_types.yaml
 
 inputs:
   aai_enrichment_host:
@@ -47,7 +47,31 @@ inputs:
   cpe_authentication_url:
     type: string
   close_loop_url:
-    type: string  
+    type: string
+  application_policy_version:
+    description: Policy version value for building CL events
+    type: string
+    default: "1.0.0.5"
+  application_cl_target_type:
+    description: Close Loop target type value for building CL events
+    type: string
+    default: "VM"
+  application_cl_event_status:
+    description: Close Loop event status value for building CL events
+    type: string
+    default: "ONSET"
+  application_cl_version:
+    description: Close Loop version value for building CL events
+    type: string
+    default: "1.0.2"
+  application_cl_target:
+    description: Close Loop target value for building CL events
+    type: string
+    default: "vserver.vserver-name"
+  application_cl_originator:
+    description: Close Loop originator value for building CL events
+    type: string
+    default: "DCAE-BBS-ep"
   application_rereg_policy_scope:
     description: Policy Scope value for building PNF relocation CL event
     type: string
@@ -101,6 +125,12 @@ node_templates:
         application.pipelinesPollingIntervalSec: 30
         application.pipelinesTimeoutSec: 15
         application.cbsPollingIntervalSec: { get_input: application_cbs_polling_interval_sec }
+        application.policyVersion: { get_input: application_policy_version }
+        application.clTargetType: { get_input: application_cl_target_type }
+        application.clEventStatus: { get_input: application_cl_event_status }
+        application.clVersion: { get_input: application_cl_version }
+        application.clTarget: { get_input: application_cl_target }
+        application.clOriginator: { get_input: application_cl_originator }
         application.reregistration.policyScope: { get_input: application_rereg_policy_scope }
         application.reregistration.clControlName: { get_input: application_rereg_cl_control_name }
         application.cpe.authentication.policyScope: { get_input: application_cpeAuth_policy_scope }
@@ -127,4 +157,4 @@ node_templates:
         log_directory: "/opt/app/bbs-event-processor/logs"
       tls_info:
         cert_directory: '/opt/app/bbs-event-processor/etc/cert/'
-        use_tls: false
+        use_tls: false
\ No newline at end of file
diff --git a/components/bbs-event-processor/dpo/spec/bbs-event-processor-spec.json b/components/bbs-event-processor/dpo/spec/bbs-event-processor-spec.json
index b1329bef..8710a877 100644
--- a/components/bbs-event-processor/dpo/spec/bbs-event-processor-spec.json
+++ b/components/bbs-event-processor/dpo/spec/bbs-event-processor-spec.json
@@ -52,7 +52,7 @@
       "designer_editable": true,
       "policy_editable": false,
       "sourced_at_deployment": false,
-      "description": "DmaaP protocol used for any DMaaP interaction"
+      "description": "DMaaP protocol used for any DMaaP interaction"
     },
     {
       "name": "dmaap.contentType",
@@ -60,7 +60,7 @@
       "designer_editable": true,
       "policy_editable": false,
       "sourced_at_deployment": false,
-      "description": "DmaaP content type"
+      "description": "DMaaP content type"
     },
     {
       "name": "dmaap.consumer.consumerId",
@@ -68,7 +68,7 @@
       "designer_editable": true,
       "policy_editable": false,
       "sourced_at_deployment": true,
-      "description": "DmaaP consumer consumer ID"
+      "description": "DMaaP consumer consumer ID"
     },
     {
       "name": "dmaap.consumer.consumerGroup",
@@ -76,7 +76,7 @@
       "designer_editable": true,
       "policy_editable": false,
       "sourced_at_deployment": true,
-      "description": "DmaaP consumer consumer group"
+      "description": "DMaaP consumer consumer group"
     },
     {
       "name": "dmaap.messageLimit",
@@ -84,7 +84,7 @@
       "designer_editable": true,
       "policy_editable": false,
       "sourced_at_deployment": false,
-      "description": "DmaaP message limit"
+      "description": "DMaaP message limit"
     },
     {
       "name": "dmaap.timeoutMs",
@@ -92,7 +92,7 @@
       "designer_editable": true,
       "policy_editable": false,
       "sourced_at_deployment": false,
-      "description": "DmaaP timeout in millis"
+      "description": "DMaaP timeout in millis"
     },
     {
       "name": "aai.host",
@@ -168,7 +168,7 @@
       "value": 300,
       "constraints": [
         {
-          "greater_or_equal": 20
+          "greater_or_equal": 30
         }
       ],
       "designer_editable": true,
@@ -177,12 +177,60 @@
       "description": "Polling interval in seconds for fetching configuration from Consul via CBS service"
     },
     {
+      "name": "application.policyVersion",
+      "value": "1.0.0.5",
+      "designer_editable": false,
+      "policy_editable": true,
+      "sourced_at_deployment": true,
+      "description": "Policy Version parameter in Policy triggering event to be published"
+    },
+    {
+      "name": "application.clTargetType",
+      "value": "VM",
+      "designer_editable": false,
+      "policy_editable": true,
+      "sourced_at_deployment": true,
+      "description": "Close Loop target type parameter in Policy triggering event to be published"
+    },
+    {
+      "name": "application.clEventStatus",
+      "value": "ONSET",
+      "designer_editable": false,
+      "policy_editable": true,
+      "sourced_at_deployment": true,
+      "description": "Close Loop event status parameter in Policy triggering event to be published"
+    },
+    {
+      "name": "application.clVersion",
+      "value": "1.0.2",
+      "designer_editable": false,
+      "policy_editable": true,
+      "sourced_at_deployment": true,
+      "description": "Close Loop version parameter in Policy triggering event to be published"
+    },
+    {
+      "name": "application.clTarget",
+      "value": "vserver.vserver-name",
+      "designer_editable": false,
+      "policy_editable": true,
+      "sourced_at_deployment": true,
+      "description": "Close Loop target parameter in Policy triggering event to be published"
+    },
+    {
+      "name": "application.clOriginator",
+      "value": "DCAE-BBS-ep",
+      "designer_editable": false,
+      "policy_editable": true,
+      "sourced_at_deployment": true,
+      "description": "Close Loop originator parameter in Policy triggering event to be published"
+    },
+    {
       "name": "application.reregistration.policyScope",
       "value": "policyScope",
       "designer_editable": false,
       "policy_editable": true,
       "sourced_at_deployment": true,
-      "description": "Hard-coded value for Policy Scope parameter in Policy triggering event to be published"
+      "description": "Policy Scope parameter in Policy triggering event to be published"
     },
     {
       "name": "application.reregistration.clControlName",
@@ -190,7 +238,7 @@
       "designer_editable": false,
       "policy_editable": true,
       "sourced_at_deployment": true,
-      "description": "Hard-coded value for CL control name parameter in Policy triggering event to be published"
+      "description": "Close Loop control name parameter in Policy triggering event to be published"
     },
     {
       "name": "application.cpe.authentication.policyScope",
@@ -198,7 +246,7 @@
       "designer_editable": false,
       "policy_editable": true,
       "sourced_at_deployment": true,
-      "description": "Hard-coded value for CL control nam parameter in Policy triggering event to be published"
+      "description": "Policy Scope parameter in Policy triggering event to be published"
     },
     {
       "name": "application.cpe.authentication.clControlName",
@@ -206,7 +254,7 @@
       "designer_editable": false,
       "policy_editable": true,
       "sourced_at_deployment": true,
-      "description": "Hard-coded value for CL control nam parameter in Policy triggering event to be published"
+      "description": "Close Loop control nam parameter in Policy triggering event to be published"
     },
     {
       "name": "application.reregistration.configKey",