From c9d830bcd05af46df5345476a99f3086094cf44c Mon Sep 17 00:00:00 2001 From: Lee Duncan Date: Thu, 4 Sep 2014 10:01:53 -0700 Subject: [PATCH] isns: Add docs for deregistering discovery domains. Without this update to the isnsadm help message and man page, it can be difficult to figure out how to deregister a registered discovery domain. --- utils/open-isns/doc/isnsadm.8 | 16 ++++++++++++++++ utils/open-isns/isnsadm.c | 2 ++ 2 files changed, 18 insertions(+) diff --git a/utils/open-isns/doc/isnsadm.8 b/utils/open-isns/doc/isnsadm.8 index c3e2b83..88ec4cf 100644 --- a/utils/open-isns/doc/isnsadm.8 +++ b/utils/open-isns/doc/isnsadm.8 @@ -25,6 +25,10 @@ isnsadm \- iSNS client utility .PP .B isnsadm .RB [ ... ] +.RI --dd-deregister " dd-id attr=value +.PP +.B isnsadm +.RB [ ... ] .RI --enroll " client-name attr=value .PP .B isnsadm @@ -452,6 +456,18 @@ Note, in order to add members to an existing domain, you must specify the domain's numeric ID. The domain's symbolic name is not a valid handle when referring to a discovery domain. .\"--------------------------- +.SS Discovery Domain Deregistration mode +In this mode, you can deregister a discoery domain previously registered. +Only the node which registered a discovery domain in the first place is +permitted to remove it, or any of its members. (Control +nodes are not bound by this restriction). +.PP +In Discovery Domain deregistration mode, the argument list consists of +the Discovery Domain ID, followed by a list of +.IB attr = value +pairs. Discovery Domain Deregistration supports the same set of attributes as +query mode. +.\"--------------------------- .SS Client Enrollment This mode only works when the server recognizes the client as having control node capabilities, which is possible in diff --git a/utils/open-isns/isnsadm.c b/utils/open-isns/isnsadm.c index fadd87d..db34f8f 100644 --- a/utils/open-isns/isnsadm.c +++ b/utils/open-isns/isnsadm.c @@ -272,6 +272,8 @@ usage(int exval, const char *msg) "\nThe following actions are supported:\n" " --register Register one or more objects\n" " --deregister Deregister an object (and children)\n" + " --dd-register Register a Discovery Domain (and members)\n" + " --dd-deregister Deregister a Discovery Domain (and members)\n" " --query Query iSNS server for objects\n" " --list List all objects of a given type\n" " --enroll Create a new policy object for a client\n" -- 1.9.3