[VOL-4025] Exposing event_topic in rw-core, openolt and openonu adapter charts
[VOL-4135] Exposing device-refresh-interval in ofAgent and defaulting to
15 seconds
Change-Id: I071944972a8deb3ad16fc9035538946b83c9fb30
diff --git a/examples/tt-values.yaml b/examples/tt-values.yaml
index 027ae14..4f47c15 100644
--- a/examples/tt-values.yaml
+++ b/examples/tt-values.yaml
@@ -16,6 +16,63 @@
# override ONOS config
onos:
+ netcfg: >
+ {
+ "apps" : {
+ "org.opencord.igmpproxy" : {
+ "igmpproxy":{
+ "FastLeave":"true",
+ "LastQueryInterval":1,
+ "MaxResp":1,
+ "enableIgmpProvisioning":"false",
+ "globalConnectPointMode":"true",
+ "globalConnectPoint" : "of:0000000000000001/3",
+ "sourceDeviceAndPort":"of:0000000000000001/3",
+ "outgoingIgmpVlanId":550,
+ "outgoingIgmpInnerVlanId":55,
+ "outgoingIgmpWithV3":"true",
+ "IgmpCos":5,
+ "IgmpUniCos":5,
+ "PeriodicQuery":"true",
+ "KeepAliveInterval":60,
+ "KeepAliveCount":5,
+ "requestDsIgmpPackets":false
+ }
+ },
+ "org.opencord.dhcpl2relay" : {
+ "dhcpl2relay" : {
+ "useOltUplinkForServerPktInOut" : true
+ }
+ },
+ "org.opencord.kafka": {
+ "kafka" : {
+ "bootstrapServers" : "{{ .Release.Name }}-kafka.{{ .Release.Namespace }}.svc:9092"
+ }
+ },
+ "org.opencord.sadis": {
+ "sadis": {
+ "integration": {
+ "url": "http://bbsim-sadis-server.{{ .Release.Namespace }}.svc:58080/subscribers/%s",
+ "cache": {
+ "enabled": true,
+ "maxsize": 50,
+ "ttl": "PT1m"
+ }
+ }
+ },
+ "bandwidthprofile": {
+ "integration": {
+ "url": "http://bbsim-sadis-server.{{ .Release.Namespace }}.svc:58080/profiles/%s",
+ "cache": {
+ "enabled": true,
+ "maxsize": 50,
+ "ttl": "PT1m"
+ }
+ }
+ }
+ }
+ }
+ }
componentConfig:
"org.opencord.olt.impl.OltFlowService": >
{
diff --git a/voltha-adapter-openolt/Chart.yaml b/voltha-adapter-openolt/Chart.yaml
index 24fcaa8..08ac6aa 100644
--- a/voltha-adapter-openolt/Chart.yaml
+++ b/voltha-adapter-openolt/Chart.yaml
@@ -14,7 +14,7 @@
---
apiVersion: "v1"
name: "voltha-adapter-openolt"
-version: "2.9.0"
+version: "2.9.1"
description: "A Helm chart for Voltha OpenOLT Adapter"
keywords:
- "onf"
diff --git a/voltha-adapter-openolt/templates/openolt-deploy.yaml b/voltha-adapter-openolt/templates/openolt-deploy.yaml
index 873e822..4c9a34b 100644
--- a/voltha-adapter-openolt/templates/openolt-deploy.yaml
+++ b/voltha-adapter-openolt/templates/openolt-deploy.yaml
@@ -94,6 +94,7 @@
- "--kafka_cluster_address={{ tpl .Values.services.kafka.cluster.address . }}"
- "--core_topic={{ tpl .Values.adapter_open_olt.topics.core_topic . }}"
- "--adapter_topic={{ tpl .Values.adapter_open_olt.topics.adapter_open_olt_topic . }}"
+ - "--event_topic={{ .Values.adapter_open_olt.topics.event_topic }}"
- "--kv_store_address={{ tpl .Values.services.etcd.address . }}"
- "--kv_store_request_timeout={{ tpl .Values.adapter_open_olt.kv_store_timeout . }}"
- "--heartbeat_check_interval={{ tpl .Values.adapter_open_olt.heartbeat_check_interval . }}"
diff --git a/voltha-adapter-openolt/values.yaml b/voltha-adapter-openolt/values.yaml
index 5ccf920..8e9acc1 100644
--- a/voltha-adapter-openolt/values.yaml
+++ b/voltha-adapter-openolt/values.yaml
@@ -90,6 +90,7 @@
topics:
core_topic: "{{ .Values.global.stack_name }}_rwcore"
adapter_open_olt_topic: "{{ .Values.global.stack_name }}_openolt"
+ event_topic: "voltha.events"
images:
adapter_open_olt:
diff --git a/voltha-adapter-openonu/Chart.yaml b/voltha-adapter-openonu/Chart.yaml
index a2e6b69..4e23f38 100644
--- a/voltha-adapter-openonu/Chart.yaml
+++ b/voltha-adapter-openonu/Chart.yaml
@@ -14,7 +14,7 @@
---
apiVersion: "v1"
name: "voltha-adapter-openonu"
-version: "2.8.0"
+version: "2.8.1"
description: "A Helm chart for Voltha OpenONU Adapter"
keywords:
- "onf"
diff --git a/voltha-adapter-openonu/templates/openonu-go-deploy.yaml b/voltha-adapter-openonu/templates/openonu-go-deploy.yaml
index 1ea2980..4c2826b 100644
--- a/voltha-adapter-openonu/templates/openonu-go-deploy.yaml
+++ b/voltha-adapter-openonu/templates/openonu-go-deploy.yaml
@@ -86,6 +86,7 @@
- "--kafka_cluster_address={{ tpl .Values.services.kafka.cluster.address . }}"
- "--core_topic={{ tpl .Values.adapter_open_onu.topics.core_topic . }}"
- "--adapter_topic={{ tpl .Values.adapter_open_onu.topics.adapter_open_onu_topic . }}"
+ - "--event_topic={{ .Values.adapter_open_onu.topics.event_topic }}"
- "--kv_store_address={{ tpl .Values.services.etcd.address . }}"
- "--kv_store_request_timeout={{ tpl .Values.adapter_open_onu.kv_store_timeout . }}"
- "--log_level={{ $log_level }}"
diff --git a/voltha-adapter-openonu/values.yaml b/voltha-adapter-openonu/values.yaml
index 972ffe0..5b618d6 100644
--- a/voltha-adapter-openonu/values.yaml
+++ b/voltha-adapter-openonu/values.yaml
@@ -115,6 +115,7 @@
topics:
core_topic: "{{ .Values.global.stack_name }}_rwcore"
adapter_open_onu_topic: "{{ .Values.global.stack_name }}_brcm_openomci_onu"
+ event_topic: "voltha.events"
images:
adapter_open_onu_go:
diff --git a/voltha-stack/Chart.yaml b/voltha-stack/Chart.yaml
index 8ca0cb9..b4d175a 100644
--- a/voltha-stack/Chart.yaml
+++ b/voltha-stack/Chart.yaml
@@ -28,18 +28,18 @@
name: voltha-stack
appVersion: "2.8-dev"
-version: 0.2.3
+version: 0.2.4
dependencies:
- name: voltha
repository: file://../voltha
- version: 2.9.3
+ version: 2.9.4
condition: voltha.enabled
- name: voltha-adapter-openonu
repository: file://../voltha-adapter-openonu
- version: 2.8.0
+ version: 2.8.1
condition: voltha-adapter-openonu.enabled
- name: voltha-adapter-openolt
repository: file://../voltha-adapter-openolt
- version: 2.9.0
+ version: 2.9.1
condition: voltha-adapter-openolt.enabled
diff --git a/voltha/Chart.yaml b/voltha/Chart.yaml
index 23eb305..b3a9a71 100644
--- a/voltha/Chart.yaml
+++ b/voltha/Chart.yaml
@@ -14,7 +14,7 @@
---
apiVersion: "v1"
name: "voltha"
-version: "2.9.3"
+version: "2.9.4"
description: "A Helm chart for Voltha based on K8S resources in Voltha project"
keywords:
- "onf"
diff --git a/voltha/templates/core-deploy.yaml b/voltha/templates/core-deploy.yaml
index ba729f5..55d36c5 100644
--- a/voltha/templates/core-deploy.yaml
+++ b/voltha/templates/core-deploy.yaml
@@ -93,6 +93,7 @@
- "--kafka_adapter_address={{ tpl .Values.services.kafka.adapter.address . }}"
- "--kafka_cluster_address={{ tpl .Values.services.kafka.cluster.address . }}"
- "--rw_core_topic={{ tpl .Values.rw_core.topics.core_topic . }}"
+ - "--event_topic={{ .Values.rw_core.topics.event_topic }}"
- "--core_timeout={{ tpl .Values.rw_core.core_timeout . }}"
- "--timeout_long_request={{ tpl .Values.rw_core.timeout_long_request . }}"
- "--timeout_request={{ tpl .Values.rw_core.timeout_request . }}"
diff --git a/voltha/templates/ofagent-deploy.yaml b/voltha/templates/ofagent-deploy.yaml
index 87f76f3..b091224 100644
--- a/voltha/templates/ofagent-deploy.yaml
+++ b/voltha/templates/ofagent-deploy.yaml
@@ -89,6 +89,7 @@
- "--kv_store_type=etcd"
- "--kv_store_request_timeout=60s"
- "--log_level={{ $log_level }}"
+ - "--device-refresh-interval={{ .Values.ofagent.device_refresh_interval }}"
- "--probe=:8080"
- "--trace_enabled={{ .Values.global.tracing.enabled }}"
- "--trace_agent_address={{ tpl .Values.services.tracing_agent.address . }}"
diff --git a/voltha/values.yaml b/voltha/values.yaml
index c88888e..b185c16 100644
--- a/voltha/values.yaml
+++ b/voltha/values.yaml
@@ -84,9 +84,11 @@
stack_id: "{{ .Values.global.stack_name }}"
topics:
core_topic: "{{ .Values.global.stack_name }}_rwcore"
+ event_topic: "voltha.events"
ofagent:
log_level: '{{ .Values.global.log_level }}'
+ device_refresh_interval: '15s'
# Define Docker images to be used
images: