From bc6ddccbd06e3600d438c58bc45f2629d8920aed Mon Sep 17 00:00:00 2001 From: chenglch Date: Fri, 21 Jul 2017 16:19:24 +0800 Subject: [PATCH] Modify the document and nics schema based on review comments. --- docs/source/advanced/networks/getadapter.rst | 4 ++-- perl-xCAT/xCAT/Schema.pm | 2 +- xCAT-server/lib/xcat/plugins/getadapter.pm | 1 - 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/docs/source/advanced/networks/getadapter.rst b/docs/source/advanced/networks/getadapter.rst index 43cdaa1a9..38188f486 100644 --- a/docs/source/advanced/networks/getadapter.rst +++ b/docs/source/advanced/networks/getadapter.rst @@ -5,7 +5,7 @@ Traditionally, network interfaces in Linux are enumerated as eth[0123…], but these names do not correspond to actual labels on the chassis. Now, most of the linux distribution support naming the adapter with slot information which makes adapter name predictable. xCAT add ``getadapter`` script which can be -running during discovery stage to detect the adapter names and pci slot +run during discovery stage to detect the adapter names and pci slot information to help customer configure the network. @@ -16,7 +16,7 @@ Set the chian table to run ``getadapter`` script :: chdef chain="runcmd=getadapter" -When the discovery completed, the column ``nicsadapter`` of ```nics`` table is +After the discovery completed, the column ``nicsadapter`` of ```nics`` table is updated. View result with ``lsdef`` command :: diff --git a/perl-xCAT/xCAT/Schema.pm b/perl-xCAT/xCAT/Schema.pm index a19207611..832c8566d 100755 --- a/perl-xCAT/xCAT/Schema.pm +++ b/perl-xCAT/xCAT/Schema.pm @@ -1566,7 +1566,7 @@ passed as argument rather than by table value', The xCAT object definition commands support to use nicextraparams. as the sub attributes.', nicdevices => 'Comma-separated list of NIC device per NIC, multiple ethernet devices can be bonded as bond device, these ethernet devices are separated by | . !|,!, e.g. bond0!eth0|eth2,br0!bond0. The xCAT object definition commands support to use nicdevices. as the sub attributes.', nicsadapter => 'Comma-separated list of extra parameters that will be used for each NIC configuration. - !|,!|, for example, eth0!MTU=1500|MTU=1460,ib0!MTU=65520 CONNECTED_MODE=yes.', + !,!, for example, enP3p3s0f1!mac=98:be:94:59:fa:cd linkstate=DOWN,enP3p3s0f2!mac=98:be:94:59:fa:ce candidatename=enP3p3s0f2/enx98be9459face', comments => 'Any user-written notes.', disable => "Set to 'yes' or '1' to comment out this row.", }, diff --git a/xCAT-server/lib/xcat/plugins/getadapter.pm b/xCAT-server/lib/xcat/plugins/getadapter.pm index 9fc989daa..5cf212a2f 100644 --- a/xCAT-server/lib/xcat/plugins/getadapter.pm +++ b/xCAT-server/lib/xcat/plugins/getadapter.pm @@ -19,7 +19,6 @@ use lib "$::XCATROOT/lib/perl"; use xCAT::Table; use xCAT::State; -use Data::Dumper; use strict; #-------------------------------------------------------