Change oof trigger functionality considering multiple PM events

Change-Id: I29ec91238b451263127822480e27c6f423635404
Issue-ID: DCAEGEN2-1513
Signed-off-by: krishna <krishna.moorthy6@wipro.com>

2 files changed, 39 insertions, 4 deletions

diff --git a/dpo/blueprints/k8s-sonhms-inputs.yaml b/dpo/blueprints/k8s-sonhms-inputs.yaml
index e417c01..44b8b2f 100644
--- a/dpo/blueprints/k8s-sonhms-inputs.yaml
+++ b/dpo/blueprints/k8s-sonhms-inputs.yaml
@@ -18,7 +18,7 @@
  
 pgaas_cluster_name: dcae-pg-primary.onap
 database_name: sonhms
-tag_version: nexus3.onap.org:10001/onap/org.onap.dcaegen2.services.son-handler:1.0.0
+tag_version: nexus3.onap.org:10001/onap/org.onap.dcaegen2.services.son-handler:1.1.0
 replicas: 1
 aaf_username: 
 aaf_password: 
@@ -38,7 +38,13 @@ cid: sonhms-cid
 config_db: http://sdnc.onap:8181
 oof: http://oof-osdf.onap:8699
 pci_optimizer: pci
+pci_anr_optimizer: pci_anr
 log_path: /dockerdata-nfs/son-handler
+poorCountThreshold: 3
+badCountThreshold: 3
+oofTriggerCountTimer: 30
+oofTriggerCountThreshold: 5
+policyRespTimer: 10
 policy_id: com.Config_PCIMS_CONFIG_POLICY.1.xml
 topic00_location: onap
 topic00_client_role: son-subscriber
diff --git a/dpo/blueprints/k8s-sonhms.yaml b/dpo/blueprints/k8s-sonhms.yaml
index d77f0fc..0c7ab81 100644
--- a/dpo/blueprints/k8s-sonhms.yaml
+++ b/dpo/blueprints/k8s-sonhms.yaml
@@ -30,7 +30,7 @@ inputs:
   tag_version:
     type: string
     description: docker image name and version
-    default: "nexus3.onap.org:10001/onap/org.onap.dcaegen2.services.son-handler:1.0.0"
+    default: "nexus3.onap.org:10001/onap/org.onap.dcaegen2.services.son-handler:1.1.0"
   pgaas_cluster_name:
     type: string
     description: pg cluster
@@ -107,10 +107,34 @@ inputs:
     type: string
     description: pci optimizer name in oof
     default: pci
+  pci_anr_optimizer:
+    type: string
+    description: pci and anr optimizer name in oof
+    default: pci_anr
   log_path:
     type: string
     description: log location in host
     default: /dockerdata-nfs/son-handler
+  poorCountThreshold:
+    type: integer
+    description: poor neighbor count threshold
+    default: 3
+  badCountThreshold:
+    type: integer
+    description: bad neighbor count threshold
+    default: 3
+  oofTriggerCountTimer:
+    type: integer
+    description: timer for oof triggered count in minutes
+    default: 30
+  oofTriggerCountThreshold:
+    type: integer
+    description: Threshold for oof trigger count
+    default: 5
+  policyRespTimer:
+    type: integer
+    description: policy response wait timer in seconds
+    default: 10
   policy_id:
     type: string
     description: policy id for config policy
@@ -240,8 +264,13 @@ node_templates:
         sonhandler.cid: { get_input: cid }
         sonhandler.configDb.service: { get_input: config_db }
         sonhandler.oof.service: { get_input: oof }
-        sonhandler.optimizers: 
-          - { get_input: pci_optimizer }
+        sonhandler.pciOptimizer: { get_input: pci_optimizer }
+        sonhandler.pciAnrOptimizer: { get_input: pci_anr_optimizer }
+        sonhandler.poorCountThreshold: { get_input: poorCountThreshold}
+        sonhandler.badCountThreshold: { get_input: badCountThreshold}
+        sonhandler.oofTriggerCountTimer: { get_input: oofTriggerCountTimer}
+        sonhandler.oofTriggerCountThreshold: { get_input: oofTriggerCountThreshold}
+        sonhandler.policyRespTimer: { get_input: policyRespTimer}
         service_calls:
           sdnr-getpnfname: []
           sdnr-getpci: []