From aaf1fb8c94322f8268560d407a0212ba6b73a6da Mon Sep 17 00:00:00 2001
From: vmaneagit <79709341+vmaneagit@users.noreply.github.com>
Date: Mon, 22 Mar 2021 12:01:24 +0200
Subject: [PATCH 01/16] Update collective.ronn

Changes made for Option chapter:
 - added -h command
---
 confluent_client/doc/man/collective.ronn | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/confluent_client/doc/man/collective.ronn b/confluent_client/doc/man/collective.ronn
index 2c462c61..f5aaf0db 100644
--- a/confluent_client/doc/man/collective.ronn
+++ b/confluent_client/doc/man/collective.ronn
@@ -37,6 +37,9 @@ on circumstances.
 
  * `-i`:
     Provide the token as an argument rather than interactively.
+    
+* `-h`, `--help`:
+  Show help message and exit    
    
 ## EXAMPLES
  * Inviting a server called mgt2:

From 7470d9b55c582a4639e11099e6381b8b3b61f2ac Mon Sep 17 00:00:00 2001
From: vmaneagit <79709341+vmaneagit@users.noreply.github.com>
Date: Mon, 22 Mar 2021 12:06:57 +0200
Subject: [PATCH 02/16] Update nodesupport.ronn

Changes made for Option chapter:
 - updated -m command
 - added -h command
---
 confluent_client/doc/man/nodesupport.ronn | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/confluent_client/doc/man/nodesupport.ronn b/confluent_client/doc/man/nodesupport.ronn
index bb4ebab3..1f0d7cf5 100644
--- a/confluent_client/doc/man/nodesupport.ronn
+++ b/confluent_client/doc/man/nodesupport.ronn
@@ -21,9 +21,12 @@ specific suffixes added to any file produced.
 
 ## OPTIONS
 
-* `-m`, `--maxnodes`:
+* `-m MAXNODES`, `--maxnodes=MAXNODES`:
   Specify a maximum number of nodes to download diagnostic data from, prompting
-    if over the threshold
+  if over the threshold
+  
+* `-h`, `--help`:
+  Show help message and exit  
 
 ## EXAMPLES
 

From b4d26c3c4e2e346509d0ee5b94ccaec82e3621a9 Mon Sep 17 00:00:00 2001
From: vmaneagit <79709341+vmaneagit@users.noreply.github.com>
Date: Mon, 22 Mar 2021 12:21:28 +0200
Subject: [PATCH 03/16] Update nodersync.ronn

Changes made for Option chapter:
 - updated -m command
 - added -h command
---
 confluent_client/doc/man/nodersync.ronn | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/confluent_client/doc/man/nodersync.ronn b/confluent_client/doc/man/nodersync.ronn
index 170c3bab..aa698744 100644
--- a/confluent_client/doc/man/nodersync.ronn
+++ b/confluent_client/doc/man/nodersync.ronn
@@ -17,7 +17,9 @@ noderange. This will present progress as percentage for all nodes.
   exceeds the count, then excess nodes will wait until one of the
   active count completes. 
   
-* `-m`, `--maxnodes`:
+* `-m MAXNODES`, `--maxnodes=MAXNODES`:
   Specify a maximum number of nodes to run rsync to, prompting if over the
   threshold
   
+* `-h`, `--help`:
+  Show help message and exit

From 7fa0016536b8931790c78b5acca8cab060525215 Mon Sep 17 00:00:00 2001
From: vmaneagit <79709341+vmaneagit@users.noreply.github.com>
Date: Mon, 22 Mar 2021 12:26:51 +0200
Subject: [PATCH 04/16] Update nodersync.ronn

Changes made for Option chapter:
 - updated -m command
 - added -h command
---
 confluent_client/doc/man/nodersync.ronn | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/confluent_client/doc/man/nodersync.ronn b/confluent_client/doc/man/nodersync.ronn
index 170c3bab..aa698744 100644
--- a/confluent_client/doc/man/nodersync.ronn
+++ b/confluent_client/doc/man/nodersync.ronn
@@ -17,7 +17,9 @@ noderange. This will present progress as percentage for all nodes.
   exceeds the count, then excess nodes will wait until one of the
   active count completes. 
   
-* `-m`, `--maxnodes`:
+* `-m MAXNODES`, `--maxnodes=MAXNODES`:
   Specify a maximum number of nodes to run rsync to, prompting if over the
   threshold
   
+* `-h`, `--help`:
+  Show help message and exit

From 1605169b924429f4f910a0f17f2f01c8acb3cb29 Mon Sep 17 00:00:00 2001
From: vmaneagit <79709341+vmaneagit@users.noreply.github.com>
Date: Mon, 22 Mar 2021 12:28:17 +0200
Subject: [PATCH 05/16] Update nodereseat.ronn

Changes made for Option chapter:
 - updated -m command
 - added -h command
---
 confluent_client/doc/man/nodereseat.ronn | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/confluent_client/doc/man/nodereseat.ronn b/confluent_client/doc/man/nodereseat.ronn
index 6982a2ba..fe26b318 100644
--- a/confluent_client/doc/man/nodereseat.ronn
+++ b/confluent_client/doc/man/nodereseat.ronn
@@ -13,8 +13,11 @@ the chassis and putting it back in, but without actually having to do so.
 
 ## OPTIONS
 
-* `-m`, `--maxnodes`:
+* `-m MAXNODES`, `--maxnodes=MAXNODES`:
     Specify a maximum number of nodes to reseat, prompting if over the threshold
+    
+* `-h`, `--help`:
+  Show help message and exit    
 
 ## EXAMPLES
 

From fa0e216c7ee20384460448bca5ead04b59741ab2 Mon Sep 17 00:00:00 2001
From: vmaneagit <79709341+vmaneagit@users.noreply.github.com>
Date: Mon, 22 Mar 2021 12:29:35 +0200
Subject: [PATCH 06/16] Update noderemove.ronn

Changes made for Option chapter:
 - updated -m command
 - added -h command
---
 confluent_client/doc/man/noderemove.ronn | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/confluent_client/doc/man/noderemove.ronn b/confluent_client/doc/man/noderemove.ronn
index b1588fe5..7d49d4c3 100644
--- a/confluent_client/doc/man/noderemove.ronn
+++ b/confluent_client/doc/man/noderemove.ronn
@@ -11,9 +11,12 @@ noderemove(8) -- Remove nodes from the confluent management service
 
 ## OPTIONS
 
-* `-m`, `--maxnodes`:
+* `-m MAXNODES`, `--maxnodes=MAXNODES`:
     Specify a maximum number of nodes to delete, prompting if over the
     threshold
+    
+* `-h`, `--help`:
+  Show help message and exit    
 
 ## EXAMPLES
 
@@ -27,4 +30,3 @@ noderemove(8) -- Remove nodes from the confluent management service
     `r2u3: deleted`  
     `r2u2: deleted`  
     `r2u1: deleted`  
-

From 195db5c6e8f6bc5d9822bb4ef82e9ab0fd87c208 Mon Sep 17 00:00:00 2001
From: vmaneagit <79709341+vmaneagit@users.noreply.github.com>
Date: Mon, 22 Mar 2021 12:34:23 +0200
Subject: [PATCH 07/16] Update nodepower.ronn

Changes made for Option chapter:
 - added -m command
---
 confluent_client/doc/man/nodepower.ronn | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/confluent_client/doc/man/nodepower.ronn b/confluent_client/doc/man/nodepower.ronn
index 7bb7ec9a..f8b83615 100644
--- a/confluent_client/doc/man/nodepower.ronn
+++ b/confluent_client/doc/man/nodepower.ronn
@@ -31,6 +31,10 @@ off will not react to this request.
 * `-p`, '--showprevious':
    Show previous power state for all directives that may change power state.
    
+* `-m MAXNODES`, `--maxnodes=MAXNODES`:
+   Specify a maximum number of nodes to change power state, prompting if
+   over the threshold
+   
 * `-h`, `--help`:
   Show help message and exit   
 

From 1616999cb9ee2c876efdef042b9fd05370074d98 Mon Sep 17 00:00:00 2001
From: vmaneagit <79709341+vmaneagit@users.noreply.github.com>
Date: Mon, 22 Mar 2021 12:36:24 +0200
Subject: [PATCH 08/16] Update nodelicense.ronn

Changes made for Option chapter:
 - updated -m command
 - added -h command
---
 confluent_client/doc/man/nodelicense.ronn | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/confluent_client/doc/man/nodelicense.ronn b/confluent_client/doc/man/nodelicense.ronn
index a5e09c5e..11a68555 100644
--- a/confluent_client/doc/man/nodelicense.ronn
+++ b/confluent_client/doc/man/nodelicense.ronn
@@ -17,5 +17,8 @@ to allow unique licenses to be specified in a single command.
 
 ## OPTIONS
 
-* `-m`, `--maxnodes`:
+* `-m MAXNODES`, `--maxnodes=MAXNODES`:
   Specify a maximum number of nodes to delete licenses from, prompting if over the threshold
+  
+* `-h`, `--help`:
+  Show help message and exit

From 273c32d4a7f973aa6479678ef9738e470d01621d Mon Sep 17 00:00:00 2001
From: vmaneagit <79709341+vmaneagit@users.noreply.github.com>
Date: Mon, 22 Mar 2021 12:38:55 +0200
Subject: [PATCH 09/16] Update nodelicense.ronn

Changes made for Option chapter:
 - updated -m command
 - added -h command

Update typo in Description chapter: "Using delete will remove the specified license name from  th eBMC."
---
 confluent_client/doc/man/nodelicense.ronn | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/confluent_client/doc/man/nodelicense.ronn b/confluent_client/doc/man/nodelicense.ronn
index a5e09c5e..b7a2980e 100644
--- a/confluent_client/doc/man/nodelicense.ronn
+++ b/confluent_client/doc/man/nodelicense.ronn
@@ -9,7 +9,7 @@ nodelicense(8) -- Manage license keys on BMC
 
 `nodelicense` manages license keys on supported BMCs. Without an argument, the command
 lists currently installed license.  Using `delete` will remove the specified license name
-from th eBMC.  The `save` subcommand will take the passed directory (which may be in the form
+from the BMC.  The `save` subcommand will take the passed directory (which may be in the form
 of /path/to/{node}/ to have the node name substituted for each node) and back up installed licenses
 to that directory. The `install` command will take the specified filename and install.  The filename
 argument may be of the form  xcc_fod_0034_7X21{id.serial}.key to have the serial number substituted
@@ -17,5 +17,8 @@ to allow unique licenses to be specified in a single command.
 
 ## OPTIONS
 
-* `-m`, `--maxnodes`:
+* `-m MAXNODES`, `--maxnodes=MAXNODES`:
   Specify a maximum number of nodes to delete licenses from, prompting if over the threshold
+  
+* `-h`, `--help`:
+  Show help message and exit

From d2f35ccbded861c49564937b2ec9f8ed269af10a Mon Sep 17 00:00:00 2001
From: vmaneagit <79709341+vmaneagit@users.noreply.github.com>
Date: Mon, 22 Mar 2021 12:40:46 +0200
Subject: [PATCH 10/16] Update nodegroupattrib.ronn.tmpl

Changes made for Option chapter:
 - added -h command
---
 confluent_client/doc/man/nodegroupattrib.ronn.tmpl | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/confluent_client/doc/man/nodegroupattrib.ronn.tmpl b/confluent_client/doc/man/nodegroupattrib.ronn.tmpl
index 00e04f53..d574f8ca 100644
--- a/confluent_client/doc/man/nodegroupattrib.ronn.tmpl
+++ b/confluent_client/doc/man/nodegroupattrib.ronn.tmpl
@@ -36,6 +36,9 @@ the attributes are set on the node versus a group to which a node belongs.
   
 * `-p`, `--prompt`:
   Prompt for attribute values interactively
+  
+* `-h`, `--help`:
+  Show help message and exit  
 
 ## EXAMPLES
 

From 304fbba2bbe511a1f7658cbffb4207fe011229a6 Mon Sep 17 00:00:00 2001
From: vmaneagit <79709341+vmaneagit@users.noreply.github.com>
Date: Mon, 22 Mar 2021 13:31:54 +0200
Subject: [PATCH 11/16] Update confetty.ronn

OPTIONS chapter has been updated to match the output from confetty -h
---
 confluent_client/doc/man/confetty.ronn | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/confluent_client/doc/man/confetty.ronn b/confluent_client/doc/man/confetty.ronn
index f4d367c9..858de97f 100644
--- a/confluent_client/doc/man/confetty.ronn
+++ b/confluent_client/doc/man/confetty.ronn
@@ -17,15 +17,18 @@ the various function specific commands.
 
 ## OPTIONS
 
-* `-s`, `--server`:
+* `-s SERVER:PORT`, `--server=SERVER:PORT`:
   Confluent instance to connect to
 
-* `-c`, `--control`:
+* `-c PATH`, `--control=PATH`:
   Path to offer terminal control
 
-* `-m`, `--mintime`:
+* `-m MINTIME`, `--mintime=MINTIME`:
   Minimum time to run or else pause for input (used to
   keep a terminal from closing quickly on error)
+  
+* `-h`, `--help`:
+  Show help message and exit  
 
 ## COMMANDS
 

From c88d8d047ad23ab90dabded52b7de3ed61d86f4e Mon Sep 17 00:00:00 2001
From: vmaneagit <79709341+vmaneagit@users.noreply.github.com>
Date: Mon, 22 Mar 2021 13:38:13 +0200
Subject: [PATCH 12/16] Update collate.ronn

OPTIONS chapter has been updated to match the output from confetty -h
---
 confluent_client/doc/man/collate.ronn | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/confluent_client/doc/man/collate.ronn b/confluent_client/doc/man/collate.ronn
index f50e3330..0133f85d 100644
--- a/confluent_client/doc/man/collate.ronn
+++ b/confluent_client/doc/man/collate.ronn
@@ -22,7 +22,7 @@ node and group names sorted alphanumerically.
    output suggests a large number of nodes are unreachable, abbreviate
    showing 'rack1' as being unreachable may make more obvious a possible cause.
    
-* `-b`, `--base`:
+* `-b BASE`, `--base=BASE`:
    Use given node as reference for comparison when using
    -d, instead of using the most common result      
 
@@ -44,16 +44,19 @@ node and group names sorted alphanumerically.
    
 * `-c`, `--count`:
    Print a count of the number of nodes in an output group under the 
-  noderange.
+   noderange.
   
- * `-r`, `--reverse`:
-    Rather than starting with most common to least common, start with
-    the least common and print the most common last.
+* `-r`, `--reverse`:
+   Rather than starting with most common to least common, start with
+   the least common and print the most common last.
     
-* `-l`, `--log`:
+* `-l LOG`, `--log=LOG`:
    Save output per node to individual log files, replacing {node} in the name
    with the nodename of each
    
+* `-h`, `--help`:
+   Show help message and exit   
+   
 ## EXAMPLES
  * Organizing power state of multiple nodes:  
   `# nodepower n1-n12 | collate`  

From 75e13239c220cc9d0eac52a1d2218891dbb1c76a Mon Sep 17 00:00:00 2001
From: vmaneagit <79709341+vmaneagit@users.noreply.github.com>
Date: Mon, 22 Mar 2021 13:40:49 +0200
Subject: [PATCH 13/16] Update nodesupport.ronn

---
 confluent_client/doc/man/nodesupport.ronn | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/confluent_client/doc/man/nodesupport.ronn b/confluent_client/doc/man/nodesupport.ronn
index bb4ebab3..1f0d7cf5 100644
--- a/confluent_client/doc/man/nodesupport.ronn
+++ b/confluent_client/doc/man/nodesupport.ronn
@@ -21,9 +21,12 @@ specific suffixes added to any file produced.
 
 ## OPTIONS
 
-* `-m`, `--maxnodes`:
+* `-m MAXNODES`, `--maxnodes=MAXNODES`:
   Specify a maximum number of nodes to download diagnostic data from, prompting
-    if over the threshold
+  if over the threshold
+  
+* `-h`, `--help`:
+  Show help message and exit  
 
 ## EXAMPLES
 

From 8543129fb9f01d8a830d72199238fc01fddaf2ce Mon Sep 17 00:00:00 2001
From: Jarrod Johnson <jjohnson2@lenovo.com>
Date: Wed, 5 May 2021 09:17:42 -0400
Subject: [PATCH 14/16] Invalidate sealed token on new token

If a new token grant occurs, do not
retain stale token sealed, as it can be misleading.
---
 confluent_server/confluent/credserver.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/confluent_server/confluent/credserver.py b/confluent_server/confluent/credserver.py
index e0894091..b10e9b1e 100644
--- a/confluent_server/confluent/credserver.py
+++ b/confluent_server/confluent/credserver.py
@@ -88,7 +88,7 @@ class CredServer(object):
                 client.close()
                 return
             echotoken = util.stringify(client.recv(tlv[1]))
-            cfgupdate = {nodename: {'crypted.selfapikey': {'hashvalue': echotoken}, 'deployment.apiarmed': ''}}
+            cfgupdate = {nodename: {'crypted.selfapikey': {'hashvalue': echotoken}, 'deployment.sealedapikey': '', 'deployment.apiarmed': ''}}
             if apiarmed == 'continuous':
                 del cfgupdate[nodename]['deployment.apiarmed']
             self.cfm.set_node_attributes(cfgupdate)

From d69eb6ef122bf56cebd383febbd1f1d3224365d6 Mon Sep 17 00:00:00 2001
From: Jarrod Johnson <jjohnson2@lenovo.com>
Date: Wed, 5 May 2021 17:45:04 -0400
Subject: [PATCH 15/16] Change apiclient to append if outputting to existing
 file

---
 confluent_osdeploy/common/opt/confluent/bin/apiclient | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/confluent_osdeploy/common/opt/confluent/bin/apiclient b/confluent_osdeploy/common/opt/confluent/bin/apiclient
index 5a526c19..5f60c7f3 100644
--- a/confluent_osdeploy/common/opt/confluent/bin/apiclient
+++ b/confluent_osdeploy/common/opt/confluent/bin/apiclient
@@ -143,7 +143,7 @@ if __name__ == '__main__':
     except ValueError:
         data = None
     if outbin:
-        with open(outbin, 'wb') as outf:
+        with open(outbin, 'ab+') as outf:
             reader = HTTPSClient(json=json).grab_url(
                 sys.argv[1], data, returnrsp=True)
             chunk = reader.read(16384)

From aa7701ea3c5a8b2015faa5bb46bc65f99a3690c3 Mon Sep 17 00:00:00 2001
From: Jarrod Johnson <jjohnson2@lenovo.com>
Date: Tue, 11 May 2021 08:02:19 -0400
Subject: [PATCH 16/16] More usefully indicate unfound interfaces

Rather than no data, provide
not found error when requesting a currently unsupported name.
---
 confluent_server/confluent/plugins/hardwaremanagement/ipmi.py | 4 ++++
 .../confluent/plugins/hardwaremanagement/redfish.py           | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/confluent_server/confluent/plugins/hardwaremanagement/ipmi.py b/confluent_server/confluent/plugins/hardwaremanagement/ipmi.py
index 3a1706b2..402293f0 100644
--- a/confluent_server/confluent/plugins/hardwaremanagement/ipmi.py
+++ b/confluent_server/confluent/plugins/hardwaremanagement/ipmi.py
@@ -749,6 +749,10 @@ class IpmiHandler(object):
                             self.node, 'Invalid prefix length given'))
                     else:
                         raise
+        elif len(self.element) == 4 and self.element[-1] != 'management':
+            self.output.put(
+                    msg.ConfluentTargetNotFound(self.node,
+                                                'Interface not found'))
 
     def handle_users(self):
         # Create user
diff --git a/confluent_server/confluent/plugins/hardwaremanagement/redfish.py b/confluent_server/confluent/plugins/hardwaremanagement/redfish.py
index 53cddfc5..09ec17e1 100644
--- a/confluent_server/confluent/plugins/hardwaremanagement/redfish.py
+++ b/confluent_server/confluent/plugins/hardwaremanagement/redfish.py
@@ -608,6 +608,10 @@ class IpmiHandler(object):
                             self.node, 'Invalid prefix length given'))
                     else:
                         raise
+        elif len(self.element) == 4 and self.element[-1] != 'management':
+            self.output.put(
+                    msg.ConfluentTargetNotFound(self.node,
+                                                'Interface not found'))
 
     def handle_users(self):
         # Create user