X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fdcaegen2-services%2Fcomponents%2Fdcae-son-handler%2Fvalues.yaml;h=bd684e3db54b6c8631a5d610e10a349a94f49333;hb=40b16678354f7c2f2665650ecaec7e93d8d94937;hp=420814f6c2f6994b72fbe718323c43c9698dc14c;hpb=0de14cb83a3963c76f98e38fc37e57dd26697079;p=oom.git

diff --git a/kubernetes/dcaegen2-services/components/dcae-son-handler/values.yaml b/kubernetes/dcaegen2-services/components/dcae-son-handler/values.yaml
index 420814f6c2..bd684e3db5 100644
--- a/kubernetes/dcaegen2-services/components/dcae-son-handler/values.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-son-handler/values.yaml
@@ -1,6 +1,7 @@
 # ============= LICENSE_START ================================================
 # ============================================================================
-# Copyright (C) 2021 Wipro Limited.
+# Copyright (C) 2021-2022 Wipro Limited.
+# Copyright (c) 2022 J. F. Lucas. All rights reserved.
 # ============================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -21,6 +22,7 @@
 global:
   nodePortPrefix: 302
   nodePortPrefixExt: 304
+  centralizedLoggingEnabled: true
 
 #################################################################
 # Filebeat Configuration Defaults.
@@ -38,6 +40,11 @@ secrets:
     login: '{{ .Values.aafCreds.identity }}'
     password: '{{ .Values.aafCreds.password }}'
     passwordPolicy: required
+  - uid: &cpsCredsUID cpscreds
+    type: basicAuth
+    login: '{{ .Values.cpsCreds.identity }}'
+    password: '{{ .Values.cpsCreds.password }}'
+    passwordPolicy: required
   - uid: &pgUserCredsSecretUid pg-user-creds
     name: &pgUserCredsSecretName '{{ include "common.release" . }}-sonhms-pg-user-creds'
     type: basicAuth
@@ -50,18 +57,20 @@ secrets:
 # InitContainer Images.
 #################################################################
 tlsImage: onap/org.onap.dcaegen2.deployments.tls-init-container:2.1.0
-consulLoaderImage: onap/org.onap.dcaegen2.deployments.consul-loader-container:1.1.1
 
 #################################################################
 # Application Configuration Defaults.
 #################################################################
 # Application Image
-image: onap/org.onap.dcaegen2.services.son-handler:2.1.4
+image: onap/org.onap.dcaegen2.services.son-handler:2.1.11
 pullPolicy: Always
 
 # Log directory where logging sidecar should look for log files
-# if absent, no sidecar will be deployed
-logDirectory: /var/log/ONAP/dcaegen2/services/sonhms
+# if path is set to null sidecar won't be deployed in spite of
+# global.centralizedLoggingEnabled setting.
+log:
+  path: /var/log/ONAP/dcaegen2/services/sonhms
+logConfigMapNamePrefix: '{{ include "common.fullname" . }}'
 
 # Directory where TLS certs should be stored
 # if absent, no certs will be retrieved and stored
@@ -70,21 +79,20 @@ certDirectory: /opt/app/sonhms/etc/certs
 # TLS role -- set to true if microservice acts as server
 # If true, an init container will retrieve a server cert
 # and key from AAF and mount them in certDirectory.
-tlsServer: true
+tlsServer: false
 
-# Policy configuraiton properties
+# Optional Policy configuration properties
 # if present, policy-sync side car will be deployed
-dcaePolicySyncImage: onap/org.onap.dcaegen2.deployments.dcae-services-policy-sync:1.0.1
-policies:
-  policyID: |
-    '["com.Config_PCIMS_CONFIG_POLICY"]'
+#dcaePolicySyncImage: onap/org.onap.dcaegen2.deployments.dcae-services-policy-sync:1.0.1
+#policies:
+#  policyID: |
+#    '["com.Config_PCIMS_CONFIG_POLICY"]'
 
 # Dependencies
 readinessCheck:
   wait_for:
-    - dcae-config-binding-service
-    - aaf-cm
     - &postgresName dcae-sonhms-postgres
+    - message-router
 
 # Probe Configuration
 readiness:
@@ -92,7 +100,7 @@ readiness:
   periodSeconds: 15
   timeoutSeconds: 1
   path: /healthcheck
-  scheme: HTTPS
+  scheme: HTTP
   port: 8080
 
 # Service Configuration
@@ -100,7 +108,7 @@ service:
   type: ClusterIP
   name: dcae-son-handler
   ports:
-    - name: https
+    - name: http
       port: 8080
       port_protocol: http
 
@@ -108,6 +116,9 @@ service:
 aafCreds:
   identity: dcae@dcae.onap.org
   password: demo123456!
+cpsCreds:
+  identity: cps
+  password: cpsr0cks!
 
 credentials:
 - name: AAF_IDENTITY
@@ -116,6 +127,12 @@ credentials:
 - name: AAF_PASSWORD
   uid: *aafCredsUID
   key: password
+- name: CPS_IDENTITY
+  uid: *cpsCredsUID
+  key: login
+- name: CPS_PASSWORD
+  uid: *cpsCredsUID
+  key: password
 - name: PG_USERNAME
   uid:  *pgUserCredsSecretUid
   key: login
@@ -130,6 +147,8 @@ applicationConfig:
   postgres.port: 5432
   postgres.username: ${PG_USERNAME}
   postgres.password: ${PG_PASSWORD}
+  cps.username: ${CPS_IDENTITY}
+  cps.password: ${CPS_PASSWORD}
   sonhandler.pollingInterval: 20
   sonhandler.pollingTimeout: 60
   cbsPollingInterval: 60
@@ -145,6 +164,13 @@ applicationConfig:
   sonhandler.bufferTime: 60
   sonhandler.cg: sonhms-cg
   sonhandler.cid: sonhms-cid
+  sonhandler.clientType: cps
+  sonhandler.nearRtricUrl: "https://a1-policy-management:30294/a1-policy/v2/policies"
+  cps.service.url: http://cps-tbdmt:8080
+  cps.get.celldata: execute/cps-ran-schemaset/get-cell-data
+  cps.get.nbr.list.url: execute/cps-ran-schemaset/get-nbr-list
+  cps.get.pci.url: execute/ran-network-schemaset/get-pci
+  cps.get.pnf.url: execute/ran-network-schemaset/get-pnf
   sonhandler.configDb.service: http://configdb:8080
   sonhandler.oof.service: https://oof-osdf:8698
   sonhandler.oof.endpoint: /api/oof/v1/pci
@@ -161,35 +187,25 @@ applicationConfig:
   streams_publishes:
     CL_topic:
       type: message-router
-      aaf_username: ${AAF_IDENTITY}
-      aaf_password: ${AAF_PASSWORD}
       dmaap_info:
-        topic_url: https://message-router:3905/events/unauthenticated.DCAE_CL_OUTPUT
+        topic_url: http://message-router:3904/events/unauthenticated.DCAE_CL_OUTPUT
   streams_subscribes:
     performance_management_topic:
       type: message-router
-      aaf_username: ${AAF_IDENTITY}
-      aaf_password: ${AAF_PASSWORD}
       dmaap_info:
-        topic_url: https://message-router:3905/events/unauthenticated.VES_MEASUREMENT_OUTPUT
+        topic_url: http://message-router:3904/events/unauthenticated.VES_MEASUREMENT_OUTPUT
     fault_management_topic:
       type: message-router
-      aaf_username: ${AAF_IDENTITY}
-      aaf_password: ${AAF_PASSWORD}
       dmaap_info:
-        topic_url: https://message-router:3905/events/unauthenticated.SEC_FAULT_OUTPUT
+        topic_url: http://message-router:3904/events/unauthenticated.SEC_FAULT_OUTPUT
     nbr_list_change_topic:
       type: message-router
-      aaf_username: ${AAF_IDENTITY}
-      aaf_password: ${AAF_PASSWORD}
       dmaap_info:
-        topic_url: https://message-router:3905/events/PCI-NOTIF-TOPIC-NGHBR-LIST-CHANGE-INFO
+        topic_url: http://message-router:3904/events/PCI-NOTIF-TOPIC-NGHBR-LIST-CHANGE-INFO
     dcae_cl_response_topic:
       type: message-router
-      aaf_username: ${AAF_IDENTITY}
-      aaf_password: ${AAF_PASSWORD}
       dmaap_info:
-        topic_url: https://message-router:3905/events/DCAE_CL_RSP
+        topic_url: http://message-router:3904/events/DCAE_CL_RSP
   service_calls:
       sdnr-getpnfname: []
       sdnr-getpci: []
@@ -199,6 +215,9 @@ applicationConfig:
       policy-req: []
 
 applicationEnv:
+  CBS_CLIENT_CONFIG_PATH: '/app-config-input/application_config.yaml'
+  #Temporary Dummy CBS Port Value until internal SDK library is updated
+  CONFIG_BINDING_SERVICE_SERVICE_PORT: '0000'
   STANDALONE: 'false'
 
 # Resource Limit Flavor -By Default Using Small