[VOL-4673] Add schema-mount file path to bbf-adapter
Change-Id: I9e8b8c5ca0838414cced2d54cc7be22d76bf9057
diff --git a/VERSION b/VERSION
index fd2a018..8d70082 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.1.0
+3.1.1-dev
diff --git a/voltha-northbound-bbf-adapter/Chart.yaml b/voltha-northbound-bbf-adapter/Chart.yaml
index 05d2f34..1ba3c04 100644
--- a/voltha-northbound-bbf-adapter/Chart.yaml
+++ b/voltha-northbound-bbf-adapter/Chart.yaml
@@ -22,5 +22,5 @@
- "voltha"
- "bbf"
- "adapter"
-version: 0.0.1-dev2
+version: 0.0.1-dev3
appVersion: 0.0.1
diff --git a/voltha-northbound-bbf-adapter/templates/configmap-startup.yaml b/voltha-northbound-bbf-adapter/templates/configmap-startup.yaml
index 5d7c66a..8cee9ad 100644
--- a/voltha-northbound-bbf-adapter/templates/configmap-startup.yaml
+++ b/voltha-northbound-bbf-adapter/templates/configmap-startup.yaml
@@ -21,9 +21,13 @@
data:
startup.sh: |-
#!/bin/sh
-
- netopeer2-server
-
+
+ {{- if .Values.voltha_northbound_bbf_adapter.log_netopeer2 }}
+ netopeer2-server -x {{ .Values.voltha_northbound_bbf_adapter.schema_mount_path }} -d -v3 > /netopeer2.log 2>&1 &
+ {{- else }}
+ netopeer2-server -x {{ .Values.voltha_northbound_bbf_adapter.schema_mount_path }}
+ {{- end }}
+
exec /app/bbf-adapter \
--log_level={{ $log_level }} \
--probe_address=:8080 \
@@ -35,4 +39,5 @@
--tls_verify={{ .Values.voltha_northbound_bbf_adapter.tls_verify }} \
--onos_rest_endpoint={{ .Values.global.voltha_infra_name }}-onos-classic-hs.{{ .Values.global.voltha_infra_namespace }}.svc:{{ .Values.voltha_northbound_bbf_adapter.onos_rest_port }} \
--onos_user={{ .Values.voltha_northbound_bbf_adapter.onos_user }} \
- --onos_pass={{ .Values.voltha_northbound_bbf_adapter.onos_pass }}
\ No newline at end of file
+ --onos_pass={{ .Values.voltha_northbound_bbf_adapter.onos_pass }} \
+ --schema_mount_path={{ .Values.voltha_northbound_bbf_adapter.schema_mount_path }}
\ No newline at end of file
diff --git a/voltha-northbound-bbf-adapter/values.yaml b/voltha-northbound-bbf-adapter/values.yaml
index 6743265..e886002 100644
--- a/voltha-northbound-bbf-adapter/values.yaml
+++ b/voltha-northbound-bbf-adapter/values.yaml
@@ -62,6 +62,7 @@
bbf_adapter: 1
voltha_northbound_bbf_adapter:
+ log_netopeer2: false # If set to true netopeer2.log is created in the root of the container
log_level: '{{ .Values.global.log_level }}'
voltha_nbi_port: 55555
tls_enabled: false
@@ -69,6 +70,7 @@
onos_rest_port: 8181
onos_user: onos
onos_pass: rocks
+ schema_mount_path: "/schema-mount.xml"
images:
voltha_northbound_bbf_adapter: