test-ovs-dpdk-hot-upgrade.sh: Update to match ovs hotupgrade changes

Following [1], update to use systemctl reload ovs-vswitchd.

[1] https://git-nbu.nvidia.com/r/c/sdn/ovs/+/1159522

Change-Id: I4297fdd6859a5b32df20405634a8031c2353b84e
Signed-off-by: Roi Dayan <roid@nvidia.com>

Author: roidayan

common.sh

@@ -2138,8 +2138,18 @@ function service_ovs() {
     else
         systemctl $action $ovs
     fi
+    __update_ovs_pid
+}
+
+function service_ovs_vswitchd() {
+    local action=$1
+    systemctl $action ovs-vswitchd
+    __update_ovs_pid
+}
+
+function __update_ovs_pid() {
     OVS_PID_FILE="/var/run/openvswitch/ovs-vswitchd.pid"
-    if [ "$action" == "start" ] && [ -f $OVS_PID_FILE ]; then
+    if [ -f $OVS_PID_FILE ]; then
         OVS_PID=`cat $OVS_PID_FILE`
     fi
 }
@@ -2290,6 +2300,10 @@ function start_clean_openvswitch() {
     __ovs_used=1
 }
 
+function reload_ovs_vswitchd() {
+    bf_wrap_exec 'service_ovs_vswitchd reload'
+}
+
 function wait_for_ifaces() {
     local i
     local max=4

ovs-dpdk-tests/test-ovs-dpdk-hot-upgrade.sh

@@ -6,7 +6,6 @@
 my_dir="$(dirname "$0")"
 . $my_dir/common-dpdk.sh
 
-OVS_HOTUPGRADE='/usr/share/openvswitch/scripts/ovs-hotupgrade'
 OVS_RUNDIR='/var/run/openvswitch'
 PIDFILE="$OVS_RUNDIR/ovs-vswitchd.pid"
 PIDFILE_UPGRADING="$OVS_RUNDIR/ovs-vswitchd.upgrading.pid"
@@ -15,11 +14,6 @@ config_sriov 2
 enable_switchdev
 
 function check_supported() {
-    if [ ! -f $OVS_HOTUPGRADE ]; then
-        warn "Cannot find $OVS_HOTUPGRADE. consider as not supported."
-        return 1
-    fi
-
     if [ ! -f $PIDFILE ]; then
         err "Cannot find $PIDFILE"
         return 1
@@ -45,12 +39,12 @@ function case_with_bridge() {
 }
 
 function run() {
-    title "Execute $OVS_HOTUPGRADE"
+    title "Hotupgrade ovs-vswitchd"
 
     local pid1=`cat $PIDFILE`
     log "Current pid: $pid1"
 
-    $OVS_HOTUPGRADE || err "ovs-hotupgrade script failed."
+    reload_ovs_vswitchd || err "ovs-vswitchd hotupgrade failed."
     sleep 2
 
     title "Wait for the upgrading pid file to be removed."
@@ -66,7 +60,7 @@ function run() {
     done
 
     local pid2=`cat $PIDFILE`
-    log "pid after ovs-hotupgrade: $pid2"
+    log "pid after ovs-vswitchd reload: $pid2"
     if [ -z "$pid2" ] || [ "$pid1" == "$pid2" ]; then
         err "Expected a new pid. skip rest of the checks."
         return