From 60e2f8ab26479b38ef86ac8c8006cc5496e24450 Mon Sep 17 00:00:00 2001
From: Mark Gurevich <gurevich@us.ibm.com>
Date: Mon, 11 Dec 2017 09:49:13 -0500
Subject: [PATCH 1/2] Usage and man page update for rspconfig dump

---
 .../references/man1/rspconfig.1.rst           | 51 +++++++++++++++++++
 perl-xCAT/xCAT/Usage.pm                       |  1 +
 xCAT-client/pods/man1/rspconfig.1.pod         | 31 +++++++++++
 3 files changed, 83 insertions(+)

diff --git a/docs/source/guides/admin-guides/references/man1/rspconfig.1.rst b/docs/source/guides/admin-guides/references/man1/rspconfig.1.rst
index dab879fa5..b641ea5f6 100644
--- a/docs/source/guides/admin-guides/references/man1/rspconfig.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/rspconfig.1.rst
@@ -49,6 +49,8 @@ OpenBMC specific:
 
 \ **rspconfig**\  \ *noderange*\  {\ **ipsrc | ip | netmask | gateway | hostname | vlan | sshcfg**\ }
 
+\ **rspconfig**\  \ *noderange*\  \ **dump**\  [\ **-l | -**\ **-list**\ ] [\ **-g | -**\ **-generate**\ ] [\ **-c | -**\ **-clear**\  {\ *id*\ |\ **all**\ }] [\ **-d | -**\ **-download**\  \ *id*\ ]
+
 
 MPA specific:
 =============
@@ -430,6 +432,13 @@ OPTIONS
  
 
 
+\ **dump**\ 
+ 
+ Manage OpenBMC system dumps. If no suboption is provided, will generate, wait and download the dump files to /var/log/xcat/dump.
+ \ **-c**\  will clear a single or all dumps on the BMC. \ **-l**\  will list all the generated dumps on the BMC. \ **-g**\  will generate a new dump on the BMC. Dump generation can take a few minutes. \ **-d**\  will download a single dump from the BMC to /var/log/xcat/dump on management or service node.
+ 
+
+
 \ **network**\ ={[\ *ip*\ ],[\ *host*\ ],[\ *gateway*\ ],[\ *netmask*\ ]|\*}
  
  For MPA:  get or set the MPA network parameters. If '\*' is specified, all parameters are read from the xCAT database.
@@ -1230,6 +1239,48 @@ EXAMPLES
  
 
 
+31. To list BMC dumps available for download:
+ 
+ 
+ .. code-block:: perl
+ 
+   rspconfig p9euh02 dump -l
+ 
+ 
+ Output is similar to:
+ 
+ 
+ .. code-block:: perl
+ 
+   p9euh02: [1] Generated: 09/06/2017 14:31:49, Size: 4528
+   p9euh02: [2] Generated: 09/06/2017 14:31:55, Size: 4516
+   p9euh02: [3] Generated: 09/06/2017 14:32:01, Size: 4236
+   p9euh02: [4] Generated: 09/06/2017 14:32:07, Size: 4248
+   p9euh02: [5] Generated: 09/06/2017 14:32:11, Size: 4268
+ 
+ 
+
+
+32. To generate and download BMC dump:
+ 
+ 
+ .. code-block:: perl
+ 
+   rspconfig p9euh02 dump -l
+ 
+ 
+ Output is similar to:
+ 
+ 
+ .. code-block:: perl
+ 
+   Capturing BMC Diagnostic information, this will take some time...
+   p9euh02: Dump requested. Target ID is 6, waiting for BMC to generate...
+   p9euh02: Dump 6 generated. Downloading to /var/log/xcat/dump/20171211-0951_p9euh02_dump_6.tar.xz
+ 
+ 
+
+
 
 ********
 SEE ALSO
diff --git a/perl-xCAT/xCAT/Usage.pm b/perl-xCAT/xCAT/Usage.pm
index 67d1bee90..5b38089b0 100755
--- a/perl-xCAT/xCAT/Usage.pm
+++ b/perl-xCAT/xCAT/Usage.pm
@@ -146,6 +146,7 @@ my %usage = (
        rspconfig <noderange> [userid=<userid> username=<username> password=<password>]
    OpenBMC specific:
        rspconfig <noderange> [ipsrc|ip|netmask|gateway|hostname|vlan]
+       rspconfig <noderange> dump [-l|--list] [-g|--generate] [-c|--clear {<id>|all}] [-d|--download <id>]
    iDataplex specific:
        rspconfig <noderange> [thermprofile]
        rspconfig <noderange> [thermprofile=<two digit number from chassis>]
diff --git a/xCAT-client/pods/man1/rspconfig.1.pod b/xCAT-client/pods/man1/rspconfig.1.pod
index a61149197..571609a2e 100644
--- a/xCAT-client/pods/man1/rspconfig.1.pod
+++ b/xCAT-client/pods/man1/rspconfig.1.pod
@@ -26,6 +26,8 @@ B<rspconfig> I<noderange> B<garp>=I<time>
 
 B<rspconfig> I<noderange> {B<ipsrc>|B<ip>|B<netmask>|B<gateway>|B<hostname>|B<vlan>|B<sshcfg>}
 
+B<rspconfig> I<noderange> B<dump> [B<-l>|B<--list>] [B<-g>|B<--generate>] [B<-c>|B<--clear> {I<id>|B<all>}] [B<-d>|B<--download> I<id>]
+
 =head2 MPA specific:
 
 B<rspconfig> I<noderange> {B<sshcfg>|B<snmpcfg>|B<pd1>|B<pd2>|B<network>|B<swnet>|B<ntp>|B<textid>|B<frame>}
@@ -324,6 +326,11 @@ Select whether each memory bank should be enabled or disabled. State changes tak
 
 The subnet mask.
 
+=item B<dump>
+
+Manage OpenBMC system dumps. If no suboption is provided, will generate, wait and download the dump files to /var/log/xcat/dump.
+B<-c> will clear a single or all dumps on the BMC. B<-l> will list all the generated dumps on the BMC. B<-g> will generate a new dump on the BMC. Dump generation can take a few minutes. B<-d> will download a single dump from the BMC to /var/log/xcat/dump on management or service node.
+
 =item B<network>={[I<ip>],[I<host>],[I<gateway>],[I<netmask>]|*}
 
 For MPA:  get or set the MPA network parameters. If '*' is specified, all parameters are read from the xCAT database.
@@ -813,6 +820,30 @@ Output is similar to:
 
  fsp: Success
 
+=item 31.
+To list BMC dumps available for download:
+
+ rspconfig p9euh02 dump -l
+
+Output is similar to:
+
+ p9euh02: [1] Generated: 09/06/2017 14:31:49, Size: 4528
+ p9euh02: [2] Generated: 09/06/2017 14:31:55, Size: 4516
+ p9euh02: [3] Generated: 09/06/2017 14:32:01, Size: 4236
+ p9euh02: [4] Generated: 09/06/2017 14:32:07, Size: 4248
+ p9euh02: [5] Generated: 09/06/2017 14:32:11, Size: 4268
+
+=item 32.
+To generate and download BMC dump:
+
+ rspconfig p9euh02 dump -l
+
+Output is similar to:
+
+ Capturing BMC Diagnostic information, this will take some time...
+ p9euh02: Dump requested. Target ID is 6, waiting for BMC to generate...
+ p9euh02: Dump 6 generated. Downloading to /var/log/xcat/dump/20171211-0951_p9euh02_dump_6.tar.xz
+
 =back
 
 =head1 SEE ALSO

From 63eb3b5d1eaaa3a1cac64d5c636d5b7c9d6f9688 Mon Sep 17 00:00:00 2001
From: Mark Gurevich <gurevich@us.ibm.com>
Date: Tue, 12 Dec 2017 14:54:26 -0500
Subject: [PATCH 2/2] Fixes after the review

---
 .../references/man1/rspconfig.1.rst           | 22 ++++++++++++++++---
 xCAT-client/pods/man1/rspconfig.1.pod         | 21 +++++++++++++++---
 2 files changed, 37 insertions(+), 6 deletions(-)

diff --git a/docs/source/guides/admin-guides/references/man1/rspconfig.1.rst b/docs/source/guides/admin-guides/references/man1/rspconfig.1.rst
index b641ea5f6..b6956de5d 100644
--- a/docs/source/guides/admin-guides/references/man1/rspconfig.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/rspconfig.1.rst
@@ -434,8 +434,24 @@ OPTIONS
 
 \ **dump**\ 
  
- Manage OpenBMC system dumps. If no suboption is provided, will generate, wait and download the dump files to /var/log/xcat/dump.
- \ **-c**\  will clear a single or all dumps on the BMC. \ **-l**\  will list all the generated dumps on the BMC. \ **-g**\  will generate a new dump on the BMC. Dump generation can take a few minutes. \ **-d**\  will download a single dump from the BMC to /var/log/xcat/dump on management or service node.
+ Manage OpenBMC system dumps. If no sub-option is provided, will generate, wait, and download the dump.
+ 
+ 
+ \ **-c**\  will clear a single specified dump, or use 'all' to clear all dumps on the BMC.
+ 
+ 
+ 
+ \ **-l**\  will list all the generated dumps on the BMC.
+ 
+ 
+ 
+ \ **-g**\  will generate a new dump on the BMC. Dump generation can take a few minutes.
+ 
+ 
+ 
+ \ **-d**\  will download a single dump from the BMC to /var/log/xcat/dump on management or service node.
+ 
+ 
  
 
 
@@ -1266,7 +1282,7 @@ EXAMPLES
  
  .. code-block:: perl
  
-   rspconfig p9euh02 dump -l
+   rspconfig p9euh02 dump
  
  
  Output is similar to:
diff --git a/xCAT-client/pods/man1/rspconfig.1.pod b/xCAT-client/pods/man1/rspconfig.1.pod
index 571609a2e..fbd1fa6f0 100644
--- a/xCAT-client/pods/man1/rspconfig.1.pod
+++ b/xCAT-client/pods/man1/rspconfig.1.pod
@@ -328,8 +328,23 @@ The subnet mask.
 
 =item B<dump>
 
-Manage OpenBMC system dumps. If no suboption is provided, will generate, wait and download the dump files to /var/log/xcat/dump.
-B<-c> will clear a single or all dumps on the BMC. B<-l> will list all the generated dumps on the BMC. B<-g> will generate a new dump on the BMC. Dump generation can take a few minutes. B<-d> will download a single dump from the BMC to /var/log/xcat/dump on management or service node.
+Manage OpenBMC system dumps. If no sub-option is provided, will generate, wait, and download the dump.
+
+=over 4
+
+=item 
+B<-c> will clear a single specified dump, or use 'all' to clear all dumps on the BMC.
+
+=item 
+B<-l> will list all the generated dumps on the BMC. 
+
+=item 
+B<-g> will generate a new dump on the BMC. Dump generation can take a few minutes. 
+
+=item
+B<-d> will download a single dump from the BMC to /var/log/xcat/dump on management or service node.
+
+=back
 
 =item B<network>={[I<ip>],[I<host>],[I<gateway>],[I<netmask>]|*}
 
@@ -836,7 +851,7 @@ Output is similar to:
 =item 32.
 To generate and download BMC dump:
 
- rspconfig p9euh02 dump -l
+ rspconfig p9euh02 dump
 
 Output is similar to: