[ovs-dev] [clone optmization 4/7] ofproto-dpif: Remove dpif/disable-truncate command.

[Andy Zhou]

Use 'dpif/set-dp-features' command instead.

Signed-off-by: Andy Zhou <azhou at ovn.org>
---
 ofproto/ofproto-dpif.c  | 21 ---------------------
 tests/system-traffic.at |  8 ++------
 2 files changed, 2 insertions(+), 27 deletions(-)

diff --git a/ofproto/ofproto-dpif.c b/ofproto/ofproto-dpif.c
index ff67f18710b7..c4f97edc7ce1 100644
--- a/ofproto/ofproto-dpif.c
+++ b/ofproto/ofproto-dpif.c
@@ -5508,24 +5508,6 @@ disable_tnl_push_pop(struct unixctl_conn *conn OVS_UNUSED, int argc OVS_UNUSED,
 }
 
 static void
-disable_datapath_truncate(struct unixctl_conn *conn OVS_UNUSED,
-                          int argc OVS_UNUSED,
-                          const char *argv[] OVS_UNUSED,
-                          void *aux OVS_UNUSED)
-{
-    const struct shash_node **backers;
-    int i;
-
-    backers = shash_sort(&all_dpif_backers);
-    for (i = 0; i < shash_count(&all_dpif_backers); i++) {
-        struct dpif_backer *backer = backers[i]->data;
-        backer->rt_support.trunc = false;
-    }
-    free(backers);
-    unixctl_command_reply(conn, "Datapath truncate action diabled");
-}
-
-static void
 ofproto_unixctl_dpif_show_dp_features(struct unixctl_conn *conn,
                                       int argc, const char *argv[],
                                       void *aux OVS_UNUSED)
@@ -5602,9 +5584,6 @@ ofproto_unixctl_init(void)
 
     unixctl_command_register("ofproto/tnl-push-pop", "[on]|[off]", 1, 1,
                              disable_tnl_push_pop, NULL);
-
-    unixctl_command_register("dpif/disable-truncate", "", 0, 0,
-                             disable_datapath_truncate, NULL);
 }
 
 static odp_port_t
diff --git a/tests/system-traffic.at b/tests/system-traffic.at
index b2393f5f4241..a47b9b78bef6 100644
--- a/tests/system-traffic.at
+++ b/tests/system-traffic.at
@@ -569,9 +569,7 @@ n_bytes=542
 
 dnl SLOW_ACTION: disable kernel datapath truncate support
 dnl Repeat the test above, but exercise the SLOW_ACTION code path
-AT_CHECK([ovs-appctl dpif/disable-truncate], [0],
-[Datapath truncate action diabled
-])
+AT_CHECK([ovs-appctl dpif/set-dp-features br0 truncate false], [0])
 
 dnl SLOW_ACTION test1: check datapatch actions
 AT_CHECK([ovs-ofctl del-flows br0])
@@ -692,9 +690,7 @@ AT_CHECK([ovs-ofctl dump-flows br0 | grep "in_port=4" | ofctl_strip], [0], [dnl
 
 dnl SLOW_ACTION: disable datapath truncate support
 dnl Repeat the test above, but exercise the SLOW_ACTION code path
-AT_CHECK([ovs-appctl dpif/disable-truncate], [0],
-[Datapath truncate action diabled
-])
+AT_CHECK([ovs-appctl dpif/set-dp-features br0 truncate false], [0])
 
 dnl SLOW_ACTION test1: check datapatch actions
 AT_CHECK([ovs-ofctl del-flows br0])
-- 
1.8.3.1