commit 812688aa7438308b70d2ae385cdde44caf967d31
author Matteo Scandolo <teo@opennetworking.org> Wed Dec 11 09:16:53 2019 -0800
committer Matteo Scandolo <teo@opennetworking.org> Tue Dec 17 21:00:37 2019 +0000
tree f7e2bfed6f57c34b146f34b1e0e0f725383dfe9b
parent eb0fb67a7183bfd4c95504c78a443f6a17f18f39

[SEBA-882] Exposing sadis-server in BBSim so that ONOS can query it

Change-Id: Icba0e6e6fb5d4e940ae8162e750114e0eb941a01

bbsim/Chart.yaml

diff --git a/bbsim/Chart.yaml b/bbsim/Chart.yaml
index ca069e9..3f84279 100644
--- a/bbsim/Chart.yaml
+++ b/bbsim/Chart.yaml
@@ -16,5 +16,5 @@
 description: Broadband Simulator
 icon: https://guide.opencord.org/logos/cord.svg
 
-version: 3.0.5
+version: 3.0.6
 appVersion: 0.0.8

bbsim/templates/deployment.yaml

diff --git a/bbsim/templates/deployment.yaml b/bbsim/templates/deployment.yaml
index a257bad..99c4015 100644
--- a/bbsim/templates/deployment.yaml
+++ b/bbsim/templates/deployment.yaml
@@ -58,10 +58,18 @@
             "-delay", "{{ .Values.delay }}"
           ]
           ports:
-            - name: "bbsim-olt-id-{{ .Values.olt_id }}"
+            - name: "bbsim-{{ .Values.olt_id }}"
               containerPort: {{ .Values.olt_tcp_port }}
               port: {{ .Values.olt_tcp_port }}
               protocol: TCP
+            - name: "bbsim-{{ .Values.olt_id }}-api"
+              containerPort: {{ .Values.bbsim_api_port }}
+              port: {{ .Values.bbsim_api_port }}
+              protocol: TCP
+            - name: "bbsim-{{ .Values.olt_id }}-sadis"
+              containerPort: {{ .Values.bbsim_sadis_port }}
+              port: {{ .Values.bbsim_sadis_port }}
+              protocol: TCP
           env:
             - name: POD_IP
               valueFrom:

bbsim/templates/service.yaml

diff --git a/bbsim/templates/service.yaml b/bbsim/templates/service.yaml
index d82a397..b27e169 100644
--- a/bbsim/templates/service.yaml
+++ b/bbsim/templates/service.yaml
@@ -26,12 +26,15 @@
 spec:
   type: ClusterIP
   ports:
-    - name: "bbsim-olt-id-{{ .Values.olt_id }}"
+    - name: "bbsim-{{ .Values.olt_id }}"
       port: {{ .Values.olt_tcp_port }}
       protocol: TCP
-    - name: "bbsim-olt-id-{{ .Values.olt_id }}-api"
+    - name: "bbsim-{{ .Values.olt_id }}-api"
       port: {{ .Values.bbsim_api_port }}
       protocol: TCP
+    - name: "bbsim-{{ .Values.olt_id }}-sadis"
+      port: {{ .Values.bbsim_sadis_port }}
+      protocol: TCP
   selector:
     app: {{ template "bbsim.name" . }}
     release: {{ .Release.Name }}

bbsim/values.yaml

diff --git a/bbsim/values.yaml b/bbsim/values.yaml
index c75b8d2..7aeed41 100644
--- a/bbsim/values.yaml
+++ b/bbsim/values.yaml
@@ -27,6 +27,7 @@
 # TODO read this values in the config
 olt_tcp_port: 50060
 bbsim_api_port: 50070
+bbsim_sadis_port: 50074
 
 images:
   bbsim: