From: Greg Rose <gvrose8192@gmail.com>
Date: Fri, 29 Jun 2018 18:18:14 +0000 (-0700)
Subject: utilities: Fix conntrack flush command
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=265d70310c69be81ef1a5797087277e19bea1540;p=ovs.git

utilities: Fix conntrack flush command

This patch fixes two problems.

1) The 'action "ovs-appctl dpctl/flush-conntrack"' does not do
anything because a command does not follow it.

2) Even after adding the command it still doesn't work - it must be
done before the stop_forwarding command.

In addition, make the message more human friendly.

Signed-off-by: Greg Rose <gvrose8192@gmail.com>
Acked-by: Aaron Conole <aconole@redhat.com>
Signed-off-by: Justin Pettit <jpettit@ovn.org>
---

diff --git a/utilities/ovs-lib.in b/utilities/ovs-lib.in
index 6a958cbdf..92f98ad92 100644
--- a/utilities/ovs-lib.in
+++ b/utilities/ovs-lib.in
@@ -605,6 +605,7 @@ force_reload_kmod () {
     stop_ovsdb
     start_ovsdb || return 1
 
+    action "Flush old conntrack entries" ovs-appctl dpctl/flush-conntrack
     stop_forwarding
 
     if action "Saving interface configuration" save_interfaces; then
@@ -620,7 +621,6 @@ force_reload_kmod () {
     for dp in `ovs-dpctl dump-dps`; do
         action "Removing datapath: $dp" ovs-dpctl del-dp "$dp"
     done
-    action "ovs-appctl dpctl/flush-conntrack"
 
     ovs_kmod_ctl remove