[SEBA-837] First version of the chart to deploy the bbsim rewrite
Change-Id: Ib557aa159ad2e3e92fbcc6811de2a9a29e994615
diff --git a/bbsim/templates/NOTES.txt b/bbsim/templates/NOTES.txt
index 1359652..700b9b7 100644
--- a/bbsim/templates/NOTES.txt
+++ b/bbsim/templates/NOTES.txt
@@ -1,5 +1,9 @@
BBSim deployed with release name: {{ .Release.Name }}
-OLT ID: {{ .Values.olt_id }}, on TCP port: {{ .Values.olt_tcp_port }}
-# of PON Ports: {{ .Values.pon_ports }}
-ONUs per PON Port: {{ .Values.onus_per_pon_port }} (total: {{ mul .Values.pon_ports .Values.onus_per_pon_port}})
+OLT ID: {{ .Values.olt_id }}
+# of NNI Ports: {{ .Values.nni }}
+# of PON Ports: {{ .Values.pon }}
+# of ONU Ports: {{ .Values.onu }}
+Total ONUs: (total: {{ mul .Values.pon .Values.onu}})
+
+OLT is listening on: "bbsim:{{ .Values.olt_tcp_port }}"
diff --git a/bbsim/templates/deployment.yaml b/bbsim/templates/deployment.yaml
index 8156ed2..89c6118 100644
--- a/bbsim/templates/deployment.yaml
+++ b/bbsim/templates/deployment.yaml
@@ -45,14 +45,10 @@
privileged: true
command: [
"/app/bbsim",
- "-n", "{{ .Values.onus_per_pon_port }}",
- "-m", "{{ .Values.emulation_mode }}",
- "-H", ":{{ .Values.olt_tcp_port }}",
- "-id", "{{ .Values.olt_id }}",
- "-i", "{{ .Values.pon_ports }}",
- "-aw", "{{ .Values.wpa_wait }}",
- "-dw", "{{ .Values.dhcp_wait }}",
- "-k", "{{ .Values.kafka_broker }}",
+ "-olt_id", "{{ .Values.olt_id }}",
+ "-nni", "{{ .Values.nni }}",
+ "-pon", "{{ .Values.pon }}",
+ "-onu", "{{ .Values.onu }}",
]
ports:
- name: "bbsim-olt-id-{{ .Values.olt_id }}"
diff --git a/bbsim/templates/service.yaml b/bbsim/templates/service.yaml
index d63c129..d82a397 100644
--- a/bbsim/templates/service.yaml
+++ b/bbsim/templates/service.yaml
@@ -29,6 +29,9 @@
- name: "bbsim-olt-id-{{ .Values.olt_id }}"
port: {{ .Values.olt_tcp_port }}
protocol: TCP
+ - name: "bbsim-olt-id-{{ .Values.olt_id }}-api"
+ port: {{ .Values.bbsim_api_port }}
+ protocol: TCP
selector:
app: {{ template "bbsim.name" . }}
release: {{ .Release.Name }}
diff --git a/bbsim/templates/tests/test-bbsim.yaml b/bbsim/templates/tests/test-bbsim.yaml
deleted file mode 100644
index 93d30d0..0000000
--- a/bbsim/templates/tests/test-bbsim.yaml
+++ /dev/null
@@ -1,41 +0,0 @@
----
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-apiVersion: v1
-kind: Pod
-metadata:
- name: "{{ .Release.Name }}-api-test"
- annotations:
- "helm.sh/hook": test-success
-spec:
- restartPolicy: Never
- containers:
- - name: {{ .Release.Name }}-api-test
- image: {{ .Values.images.xos_api_tester.repository }}:{{ .Values.images.xos_api_tester.tag }}
- imagePullPolicy: {{ .Values.images.xos_api_tester.pullPolicy }}
- volumeMounts:
- - name: log-volume
- mountPath: /src/cord-api/Tests/Log/
- env:
- - name: SERVER_IP
- value: 'xos-chameleon'
- - name: SERVER_PORT
- value: '9101'
- command: ["robot", "-d", "Log", "-T", "-v", "number_of_onus:{{ .Values.onus_per_pon_port }}", "WorkflowValidations/BBSIM.robot"]
- volumes:
- - name: log-volume
- hostPath:
- path: /tmp/helm_test_bbsim_logs_{{ dateInZone "20060102T030405.00Z" (now) "UTC" }}
- type: DirectoryOrCreate