From 9c6db589475ee0f9219f6502b84084b802dd758c Mon Sep 17 00:00:00 2001
From: bobz965 <zhangbingbing2_yewu@cmss.chinamobile.com>
Date: Fri, 18 Aug 2023 10:41:16 +0800
Subject: [PATCH] add dpdk probe

---
 charts/templates/ovn-dpdk-ds.yaml | 4 ++++
 dist/images/install.sh            | 8 ++++++++
 dist/images/start-ovs-dpdk-v2.sh  | 6 ++++--
 dist/images/start-ovs-dpdk.sh     | 7 +++++--
 dist/images/start-ovs.sh          | 4 ++--
 yamls/ovn-dpdk.yaml               | 4 ++++
 6 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/charts/templates/ovn-dpdk-ds.yaml b/charts/templates/ovn-dpdk-ds.yaml
index 714bbb69ff6..b487d60d796 100644
--- a/charts/templates/ovn-dpdk-ds.yaml
+++ b/charts/templates/ovn-dpdk-ds.yaml
@@ -56,6 +56,10 @@ spec:
                   fieldPath: spec.nodeName
             - name: OVN_DB_IPS
               value: "{{ .Values.MASTER_NODES }}"
+            - name: OVN_REMOTE_PROBE_INTERVAL
+              value: "{{ .Values.networking.OVN_REMOTE_PROBE_INTERVAL }}"
+            - name: OVN_REMOTE_OPENFLOW_INTERVAL
+              value: "{{ .Values.networking.OVN_REMOTE_OPENFLOW_INTERVAL }}"
           volumeMounts:
             - mountPath: /opt/ovs-config
               name: host-config-ovs
diff --git a/dist/images/install.sh b/dist/images/install.sh
index 1e854fe73bd..7078b6e015b 100755
--- a/dist/images/install.sh
+++ b/dist/images/install.sh
@@ -3376,6 +3376,10 @@ spec:
                   fieldPath: spec.nodeName
             - name: OVN_DB_IPS
               value: $addresses
+            - name: OVN_REMOTE_PROBE_INTERVAL
+              value: "10000" 
+            - name: OVN_REMOTE_OPENFLOW_INTERVAL
+              value: "180"
           volumeMounts:
             - mountPath: /var/run/netns
               name: host-ns
@@ -3717,6 +3721,10 @@ spec:
                   fieldPath: spec.nodeName
             - name: OVN_DB_IPS
               value: $addresses
+            - name: OVN_REMOTE_PROBE_INTERVAL
+              value: "10000" 
+            - name: OVN_REMOTE_OPENFLOW_INTERVAL
+              value: "180"
           volumeMounts:
             - mountPath: /opt/ovs-config
               name: host-config-ovs
diff --git a/dist/images/start-ovs-dpdk-v2.sh b/dist/images/start-ovs-dpdk-v2.sh
index 0dd6ddc0b13..d7665efe047 100755
--- a/dist/images/start-ovs-dpdk-v2.sh
+++ b/dist/images/start-ovs-dpdk-v2.sh
@@ -1,6 +1,8 @@
 #!/bin/bash
 
 set -euo pipefail
+echo "OVN_REMOTE_PROBE_INTERVAL is set to $OVN_REMOTE_PROBE_INTERVAL"
+echo "OVN_REMOTE_OPENFLOW_INTERVAL is set to $OVN_REMOTE_OPENFLOW_INTERVAL"
 
 DPDK_TUNNEL_IFACE=${DPDK_TUNNEL_IFACE:-br-phy}
 TUNNEL_TYPE=${TUNNEL_TYPE:-geneve}
@@ -121,8 +123,8 @@ ovn-ctl restart_controller
 
 # Set remote ovn-sb for ovn-controller to connect to
 ovs-vsctl set open . external-ids:ovn-remote=tcp:"${OVN_SB_SERVICE_HOST}":"${OVN_SB_SERVICE_PORT}"
-ovs-vsctl set open . external-ids:ovn-remote-probe-interval=10000
-ovs-vsctl set open . external-ids:ovn-openflow-probe-interval=180
+ovs-vsctl set open . external-ids:ovn-remote-probe-interval="${OVN_REMOTE_PROBE_INTERVAL}"
+ovs-vsctl set open . external-ids:ovn-openflow-probe-interval="${OVN_REMOTE_OPENFLOW_INTERVAL}"
 ovs-vsctl set open . external-ids:ovn-encap-type="${TUNNEL_TYPE}"
 
 tail --follow=name --retry /var/log/openvswitch/ovs-vswitchd.log
diff --git a/dist/images/start-ovs-dpdk.sh b/dist/images/start-ovs-dpdk.sh
index dbed8a1f10b..7925968da45 100755
--- a/dist/images/start-ovs-dpdk.sh
+++ b/dist/images/start-ovs-dpdk.sh
@@ -10,6 +10,9 @@ trap quit EXIT
 
 CONFIG_FILE=/opt/ovs-config/config.cfg
 
+echo "OVN_REMOTE_PROBE_INTERVAL is set to $OVN_REMOTE_PROBE_INTERVAL"
+echo "OVN_REMOTE_OPENFLOW_INTERVAL is set to $OVN_REMOTE_OPENFLOW_INTERVAL"
+
 # Check if config file exists, create default one if not
 if ! test -f "$CONFIG_FILE"; then
 	mkdir -p $(dirname ${CONFIG_FILE})
@@ -45,8 +48,8 @@ ovn-ctl restart_controller
 
 # Set remote ovn-sb for ovn-controller to connect to
 ovs-vsctl set open . external-ids:ovn-remote=tcp:"${OVN_SB_SERVICE_HOST}":"${OVN_SB_SERVICE_PORT}"
-ovs-vsctl set open . external-ids:ovn-remote-probe-interval=10000
-ovs-vsctl set open . external-ids:ovn-openflow-probe-interval=180
+ovs-vsctl set open . external-ids:ovn-remote-probe-interval="${OVN_REMOTE_PROBE_INTERVAL}"
+ovs-vsctl set open . external-ids:ovn-openflow-probe-interval="${OVN_REMOTE_OPENFLOW_INTERVAL}"
 ovs-vsctl set open . external-ids:ovn-encap-type=geneve
 
 tail --follow=name --retry /var/log/openvswitch/ovs-vswitchd.log
diff --git a/dist/images/start-ovs.sh b/dist/images/start-ovs.sh
index 45b40cef869..23699171d74 100755
--- a/dist/images/start-ovs.sh
+++ b/dist/images/start-ovs.sh
@@ -133,8 +133,8 @@ function gen_conn_str {
 }
 # Set remote ovn-sb for ovn-controller to connect to
 ovs-vsctl set open . external-ids:ovn-remote="$(gen_conn_str 6642)"
-ovs-vsctl set open . external-ids:ovn-remote-probe-interval=10000
-ovs-vsctl set open . external-ids:ovn-openflow-probe-interval=180
+ovs-vsctl set open . external-ids:ovn-remote-probe-interval="${OVN_REMOTE_PROBE_INTERVAL}"
+ovs-vsctl set open . external-ids:ovn-openflow-probe-interval="${OVN_REMOTE_OPENFLOW_INTERVAL}"
 ovs-vsctl set open . external-ids:ovn-encap-type="${TUNNEL_TYPE}"
 ovs-vsctl set open . external-ids:hostname="${KUBE_NODE_NAME}"
 
diff --git a/yamls/ovn-dpdk.yaml b/yamls/ovn-dpdk.yaml
index 13f5efca5fb..e4e6279a62d 100644
--- a/yamls/ovn-dpdk.yaml
+++ b/yamls/ovn-dpdk.yaml
@@ -362,6 +362,10 @@ spec:
               valueFrom:
                 fieldRef:
                   fieldPath: spec.nodeName
+            - name: OVN_REMOTE_PROBE_INTERVAL
+              value: "{{ .Values.networking.OVN_REMOTE_PROBE_INTERVAL }}"
+            - name: OVN_REMOTE_OPENFLOW_INTERVAL
+              value: "{{ .Values.networking.OVN_REMOTE_OPENFLOW_INTERVAL }}"
           volumeMounts:
             - mountPath: /lib/modules
               name: host-modules