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