Implement "bos removehost"

Signed-off-by: David Howells <dhowells@redhat.com>

diff --git a/suite/commands/bos/addhost.py b/suite/commands/bos/addhost.py
index e5118bf987d046b43a82d3d7b33959160de34e65..7bc037d0a5ca465a085c28e1ff93a3938186abee 100644 (file)
--- a/suite/commands/bos/addhost.py
+++ b/suite/commands/bos/addhost.py
@@ -28,7 +28,7 @@ help = "Add a database server machine to the CellServDB file"
 
 command_arguments = [
     [ "server",         get_bosserver,          "rs",         "<machine name>" ],
-    [ "host",           get_vlservers,          "rm",         "<host name>" ],
+    [ "host",           get_vlservers,          "rm",         "<host name>+" ],
     [ "cell",           get_cell,               "os",         "<cell name>" ],
     [ "clone",          get_dummy,              "fn" ],
     [ "noauth",         get_auth,               "fn" ],

diff --git a/suite/commands/bos/removehost.py b/suite/commands/bos/removehost.py
new file mode 100644 (file)
index 0000000..2c31f80
--- /dev/null
+++ b/suite/commands/bos/removehost.py
@@ -0,0 +1,57 @@
+#
+# AFS Server management toolkit: Remove a Volume Location server
+# -*- coding: utf-8 -*-
+#
+
+__copyright__ = """
+Copyright (C) 2014 Red Hat, Inc. All Rights Reserved.
+Written by David Howells (dhowells@redhat.com)
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public Licence version 2 as
+published by the Free Software Foundation.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public Licence for more details.
+
+You should have received a copy of the GNU General Public Licence
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+"""
+
+from afs.argparse import *
+import kafs
+import sys
+
+help = "Remove a database server machine from the CellServDB file"
+
+command_arguments = [
+    [ "server",         get_bosserver,          "rs",         "<machine name>" ],
+    [ "host",           get_vlservers,          "rm",         "<host name>+" ],
+    [ "cell",           get_cell,               "os",         "<cell name>" ],
+    [ "noauth",         get_auth,               "fn" ],
+    [ "localauth",      get_auth,               "fn" ],
+    [ "verbose",        get_dummy,              "fn" ],
+    [ "encrypt",        get_dummy,              "fn" ],
+]
+
+cant_combine_arguments = [
+    ( "cell",           "localauth" ),
+    ( "noauth",         "localauth" ),
+]
+
+description = r"""
+Remove a database server machine from the CellServDB file
+"""
+
+def main(params):
+    cell = params["cell"]
+    bos_conn = cell.open_bos_server(params["server"], params)
+
+    for i in params["host"]:
+        try:
+            ret = kafs.BOZO_DeleteCellHost(bos_conn, i.name())
+        except kafs.AbortBZNOENT:
+            print("bos: failed to delete host", i.name(), "(no such entity)", file=sys.stderr)