From 12ef155577b19a03bccb6e9a6b1ca4dbb6236a8d Mon Sep 17 00:00:00 2001
From: ertaozh <ertaozh@cn.ibm.com>
Date: Thu, 19 Oct 2017 02:48:04 -0400
Subject: [PATCH] Modify message for rspconfig ipsrc option

---
 .../guides/admin-guides/references/man1/rspconfig.1.rst      | 4 ++--
 xCAT-client/pods/man1/rspconfig.1.pod                        | 4 ++--
 xCAT-server/lib/xcat/plugins/openbmc.pm                      | 5 +----
 3 files changed, 5 insertions(+), 8 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 3c23c3ade..dab879fa5 100644
--- a/docs/source/guides/admin-guides/references/man1/rspconfig.1.rst
+++ b/docs/source/guides/admin-guides/references/man1/rspconfig.1.rst
@@ -408,13 +408,13 @@ OPTIONS
 
 \ **ipsrc**\ 
  
- Get the ip source for OpenBMC.
+ Get the IP source for OpenBMC.
  
 
 
 \ **ip**\ 
  
- The ip address.
+ The IP address.
  
 
 
diff --git a/xCAT-client/pods/man1/rspconfig.1.pod b/xCAT-client/pods/man1/rspconfig.1.pod
index a0c077da9..a61149197 100644
--- a/xCAT-client/pods/man1/rspconfig.1.pod
+++ b/xCAT-client/pods/man1/rspconfig.1.pod
@@ -310,11 +310,11 @@ Get or set vlan ID. For get vlan ID, if vlan is not enabled, 'BMC VLAN disabled'
 
 =item B<ipsrc>
 
-Get the ip source for OpenBMC.
+Get the IP source for OpenBMC.
 
 =item B<ip>
 
-The ip address.
+The IP address.
 
 =item B<memdecfg>={B<configure | deconfigure>:I<processingunit>:I<unit|bank>:I<id,...>}
 
diff --git a/xCAT-server/lib/xcat/plugins/openbmc.pm b/xCAT-server/lib/xcat/plugins/openbmc.pm
index 7ed2b4474..ea707721f 100644
--- a/xCAT-server/lib/xcat/plugins/openbmc.pm
+++ b/xCAT-server/lib/xcat/plugins/openbmc.pm
@@ -630,7 +630,7 @@ sub parse_args {
                 return ([ 1, "Can not configure and display nodes' value at the same time" ]) if ($setorget and $setorget eq "get");
                 my $key = $1;
                 my $value = $2;
-                return ([ 1, "Unsupport to configure ipsrc" ]) if ($key eq "ipsrc");
+                return ([ 1, "Changing ipsrc value is currently not supported." ]) if ($key eq "ipsrc");
                 return ([ 1, "Unsupported command: $command $key" ]) unless ($key =~ /^ip$|^netmask$|^gateway$|^hostname$|^vlan$/);
 
                 my $nodes_num = @$noderange;
@@ -1845,9 +1845,6 @@ sub rspconfig_response {
             if ($adapter_id) {
                 if (defined($content{Address}) and $content{Address}) {
                     unless ($address =~ /n\/a/) {
-                        if ($ipsrc eq "DHCP" and $xcatdebugmode) {
-                            process_debug_info($node, "There is an IP address:$address got through DHCP");
-                        }
                         # We have already processed an entry with adapter information.
                         # This must be a second entry. Display an error. Currently only supporting
                         # an adapter with a single IP address set.