s/remove_/delete_/ for consistency
Change-Id: I9f6f97e007a702859913f39c51f01a32b56c5bf7
diff --git a/admin.py b/admin.py
index 2c74577..446e3d3 100644
--- a/admin.py
+++ b/admin.py
@@ -83,8 +83,8 @@
help = "Add a new switch to the system",
nargs = 1,
metavar = "<name>")
-switch_group.add_option("--remove_switch",
- dest = "remove_switch",
+switch_group.add_option("--delete_switch",
+ dest = "delete_switch",
action = "store",
type = "int",
help = "Remove an existing switch from the system",
@@ -130,8 +130,8 @@
help = "Add a new port to the system",
nargs = 2,
metavar = "<switch_id> <name>")
-port_group.add_option("--remove_port",
- dest = "remove_port",
+port_group.add_option("--delete_port",
+ dest = "delete_port",
action = "store",
type = "int",
help = "Remove an existing port from the system",
@@ -218,8 +218,8 @@
help = "Add a new vlan to the system",
nargs = 3,
metavar = "<name> <tag> <is_base_vlan>")
-vlan_group.add_option("--remove_vlan",
- dest = "remove_vlan",
+vlan_group.add_option("--delete_vlan",
+ dest = "delete_vlan",
action = "store",
type = "int",
help = "Remove an existing vlan from the system",
@@ -284,15 +284,15 @@
print 'Created vlan_id %d' % vlan_id
except InputError as inst:
print 'Failed: %s' % inst
-elif opts.remove_switch is not None:
+elif opts.delete_switch is not None:
try:
- switch_id = db.delete_switch(opts.remove_switch)
+ switch_id = db.delete_switch(opts.delete_switch)
print 'Deleted switch_id %d' % switch_id
except InputError as inst:
print 'Failed: %s' % inst
-elif opts.remove_port is not None:
+elif opts.delete_port is not None:
try:
- port_id = db.delete_port(opts.remove_port)
+ port_id = db.delete_port(opts.delete_port)
print 'Deleted port_id %d' % port_id
except InputError as inst:
print 'Failed: %s' % inst