From 541c931666a25b2e17182ccae41bbebfee0c4e29 Mon Sep 17 00:00:00 2001
From: Ben Pfaff <blp@nicira.com>
Date: Fri, 15 May 2009 15:57:53 -0700
Subject: [PATCH] ovs-dpctl: Remove get-idx and get-name commands.

These commands made some sense when dpctl only accepted numerical datapath
identifiers, but now it accepts names as well as numbers.  These commands
were never really used much, so delete them.
---
 utilities/ovs-dpctl.8.in |  9 ---------
 utilities/ovs-dpctl.c    | 23 -----------------------
 2 files changed, 32 deletions(-)

diff --git a/utilities/ovs-dpctl.8.in b/utilities/ovs-dpctl.8.in
index 61f2c694..72a787f7 100644
--- a/utilities/ovs-dpctl.8.in
+++ b/utilities/ovs-dpctl.8.in
@@ -86,15 +86,6 @@ port (analogous to the local port) with that name.
 Removes each \fInetdev\fR from the list of network devices datapath
 \fIdp\fR monitors.
 
-.TP
-\fBget-idx \fIdp\fR
-Prints the datapath number of datapath \fIdp\fR.
-
-.TP
-\fBget-name \fIdp\fR
-Prints the name of datapath \fIdp\fR, that is, the name of the network
-device acting as its local port.
-
 .TP
 \fBdp-show \fR[\fIdp\fR...]
 Prints a summary of configured datapaths, including their datapath
diff --git a/utilities/ovs-dpctl.c b/utilities/ovs-dpctl.c
index a8c7b1be..207c94b7 100644
--- a/utilities/ovs-dpctl.c
+++ b/utilities/ovs-dpctl.c
@@ -226,27 +226,6 @@ static int if_up(const char *netdev_name)
     return retval;
 }
 
-static void
-do_get_idx(int argc UNUSED, char *argv[])
-{
-    struct dpif dpif;
-    run(dpif_open(argv[1], &dpif), "opening datapath");
-    printf("%u\n", dpif_id(&dpif));
-    dpif_close(&dpif);
-}
-
-static void
-do_get_name(int argc UNUSED, char *argv[])
-{
-    struct dpif dpif;
-    char name[IF_NAMESIZE + 1];
-
-    run(dpif_open(argv[1], &dpif), "opening datapath");
-    run(dpif_get_name(&dpif, name, sizeof name), "getting datapath name");
-    puts(name);
-    dpif_close(&dpif);
-}
-
 static void
 do_add_dp(int argc UNUSED, char *argv[])
 {
@@ -582,8 +561,6 @@ static struct command all_commands[] = {
     { "deldp", 1, 1, do_del_dp },
     { "addif", 2, INT_MAX, do_add_port },
     { "delif", 2, INT_MAX, do_del_port },
-    { "get-idx", 1, 1, do_get_idx },
-    { "get-name", 1, 1, do_get_name },
     { "dp-show", 0, INT_MAX, do_dp_show },
     { "dp-dump-flows", 1, 1, do_dp_dump_flows },
     { "dp-del-flows", 1, 1, do_dp_del_flows },
-- 
2.30.2