update to support ofagent-go as default and kafka cluster
diff --git a/.gitignore b/.gitignore
index 8016a81..bec83fd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,5 @@
voltha-debug-dump-minimal*
voltha-system-tests
voltha-debug-dump-*
+minimal-env.sh
+full-env.sh
diff --git a/full-values.yaml b/full-values.yaml
index 865f158..1250b55 100644
--- a/full-values.yaml
+++ b/full-values.yaml
@@ -23,6 +23,22 @@
defaults:
image_tag: master
+# OFAGENT IMPLEMENTATION
+# ----------------------
+# There are currently two implementations of OFAGENT: the original written in
+# Python and the reimplementation written in Go. The variable `use_ofagent_go`
+# can be used to optionally select the implementation. The Go version is the
+# version to be part of the official release and is the default. The Python
+# verison has been deprecated and is no longer being actively workes, but is
+# being left as an option for this release.
+#
+# Along with this change you will also may need to set the Docker image
+# information below (search for START_OFAGENT_GO).
+use_ofagent_go: true
+
+ofagent:
+ log_level: debug
+
replicas:
cli: ~
@@ -56,27 +72,36 @@
# repository: voltha/voltha-adapter-simulated-onu
# tag: 2.1.1
# bbsim:
-# repository: voltha/voltha-bbsim
-# tag: 2.1.0
-# afrouter:
-# repository: voltha/voltha-afrouter
-# tag: 2.1.1
-# afrouterd:
-# repository: voltha/voltha-afrouterd
-# tag: 2.1.1
-# cli:
-# repository: voltha/voltha-cli
-# tag: 2.1.1
+# repository: voltha/bbsim
+# tag: master
+# START_OFAGENT_GO - Comment the following block to use the Python implementation
+# of the ofagent
+ ofagent:
+ repository: voltha/ofagent-go
+ tag: master
+# END_OFAGENT_GO
# ofagent:
# repository: voltha/voltha-ofagent
# tag: 2.1.1
-# ro_core:
-# repository: voltha/voltha-ro-core
-# tag: 2.1.1
# rw_core:
# repository: voltha/voltha-rw-core
# tag: 2.1.1
+deployments:
+ etcdOperator: true
+ backupOperator: true
+ restoreOperator: true
+
+voltha-etcd-cluster:
+ clusterSize: 3
+ autoCompactionRetention: 1
+
+kafka:
+ configurationOverrides:
+ "default.replication.factor": 3
+ "offsets.topic.replication.factor": 3
+ replicas: 3
+
onos_env:
- name: POD_IP
valueFrom:
@@ -134,14 +159,14 @@
# kube-monkey/kill-mode: fixed
# kube-monkey/kill-value: 1
#
-#ro_core_deployment_labels:
+#ofagent_deployment_labels:
# kube-monkey/enabled: enabled
# kube-monkey/identifier: monkey-victim
# kube-monkey/mtbf: 1
# kube-monkey/kill-mode: fixed
# kube-monkey/kill-value: 1
#
-#ro_core_pod_labels:
+#ofagent_pod_labels:
# kube-monkey/enabled: enabled
# kube-monkey/identifier: monkey-victim
# kube-monkey/mtbf: 1
diff --git a/minimal-values.yaml b/minimal-values.yaml
index bdcb47f..ae4dae2 100644
--- a/minimal-values.yaml
+++ b/minimal-values.yaml
@@ -27,10 +27,14 @@
# ----------------------
# There are currently two implementations of OFAGENT: the original written in
# Python and the reimplementation written in Go. The variable `use_ofagent_go`
-# can be used to optionally use the new Go implementation. This is done by
-# setting that value to `true`. Along with this change you will also need
-# to set the Docker image information below (search for START_OFAGENT_GO).
-use_ofagent_go: false
+# can be used to optionally select the implementation. The Go version is the
+# version to be part of the official release and is the default. The Python
+# verison has been deprecated and is no longer being actively workes, but is
+# being left as an option for this release.
+#
+# Along with this change you will also may need to set the Docker image
+# information below (search for START_OFAGENT_GO).
+use_ofagent_go: true
ofagent:
log_level: debug
@@ -63,33 +67,21 @@
# tag: 2.1.0
# adapter_simulated_olt:
# repository: voltha/voltha-adapter-simulated-olt
-# tag: master
+# tag: 2.1.1
# adapter_simulated_onu:
# repository: voltha/voltha-adapter-simulated-onu
-# tag: master
+# tag: 2.1.1
# bbsim:
# repository: voltha/bbsim
# tag: master
-# afrouter:
-# repository: voltha/voltha-afrouter
-# tag: master
-# afrouterd:
-# repository: voltha/voltha-afrouterd
-# tag: master
-# cli:
-# repository: voltha/voltha-cli
-# tag: 2.1.1
-# START_OFAGENT_GO - Uncomment the following block to use the Go implementation
+# START_OFAGENT_GO - Comment the following block to use the Python implementation
# of the ofagent
-# ofagent:
-# repository: voltha/ofagent-go
-# tag: master
+ ofagent:
+ repository: voltha/ofagent-go
+ tag: master
# END_OFAGENT_GO
# ofagent:
-# repository: volta/voltha-ofagent-go
-# tag: 2.1.1
-# ro_core:
-# repository: voltha/voltha-ro-core
+# repository: voltha/voltha-ofagent
# tag: 2.1.1
# rw_core:
# repository: voltha/voltha-rw-core
@@ -104,6 +96,12 @@
clusterSize: 1
autoCompactionRetention: 1
+kafka:
+ configurationOverrides:
+ "default.replication.factor": 1
+ "offsets.topic.replication.factor": 1
+ replicas: 1
+
onos_env:
- name: POD_IP
valueFrom:
@@ -161,20 +159,6 @@
# kube-monkey/kill-mode: fixed
# kube-monkey/kill-value: 1
#
-#ro_core_deployment_labels:
-# kube-monkey/enabled: enabled
-# kube-monkey/identifier: monkey-victim
-# kube-monkey/mtbf: 1
-# kube-monkey/kill-mode: fixed
-# kube-monkey/kill-value: 1
-#
-#ro_core_pod_labels:
-# kube-monkey/enabled: enabled
-# kube-monkey/identifier: monkey-victim
-# kube-monkey/mtbf: 1
-# kube-monkey/kill-mode: fixed
-# kube-monkey/kill-value: 1
-#
#ofagent_deployment_labels:
# kube-monkey/enabled: enabled
# kube-monkey/identifier: monkey-victim
diff --git a/voltha b/voltha
index 1fb4393..aa2a893 100755
--- a/voltha
+++ b/voltha
@@ -1307,9 +1307,9 @@
voltha-kafka-.* \
voltha-zookeeper-.*"
if [ "$ONLY_ONE" == "yes" ]; then
- EXPECT=$(test "$TYPE" == "minimal" && echo "5" || echo "7")
+ EXPECT=$(test "$TYPE" == "minimal" && echo "5" || echo "9")
else
- EXPECT=$(test "$TYPE" == "minimal" && echo "8" || echo "10")
+ EXPECT=$(test "$TYPE" == "minimal" && echo "8" || echo "12")
fi
wait_for_pods - "voltha" $EXPECT "includes" -1 "Waiting for VOLTHA Core to start" $VOLTHA
if [ "$WITH_TIMINGS" == "yes" ]; then