From f6fd10a00c564e30224ac527a9b6b5890df0cd28 Mon Sep 17 00:00:00 2001 From: linggao Date: Wed, 27 May 2015 16:30:21 -0400 Subject: [PATCH] standalize switchtype attribut for switch object --- perl-xCAT/xCAT/Schema.pm | 2 +- xCAT-server/lib/xcat/plugins/switchdiscover.pm | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/perl-xCAT/xCAT/Schema.pm b/perl-xCAT/xCAT/Schema.pm index 228562a34..e8e68f1d3 100755 --- a/perl-xCAT/xCAT/Schema.pm +++ b/perl-xCAT/xCAT/Schema.pm @@ -680,7 +680,7 @@ noderes => { sshusername => 'The remote login user name. It can be for ssh or telnet. If it is for telnet, please set protocol to "telnet".', sshpassword => 'The remote login password. It can be for ssh or telnet. If it is for telnet, please set protocol to "telnet".', protocol => 'Prorocol for running remote commands for the switch. The valid values are: ssh, telnet. ssh is the default. Leave it blank or set to "ssh" for Mellanox IB switch.', - switchtype => 'The type of switch. It is used to identify the file name that implements the functions for this swithc. The valid values are: MellanoxIB etc.', + switchtype => 'The type of switch. It is used to identify the file name that implements the functions for this swithc. The valid values are: Mellanox, Cisco, BNT and Jun (for Juniper).', }, }, nodetype => { diff --git a/xCAT-server/lib/xcat/plugins/switchdiscover.pm b/xCAT-server/lib/xcat/plugins/switchdiscover.pm index bfbfbad28..3d22d34e1 100755 --- a/xCAT-server/lib/xcat/plugins/switchdiscover.pm +++ b/xCAT-server/lib/xcat/plugins/switchdiscover.pm @@ -32,7 +32,7 @@ my %global_switch_type = ( Juniper => "Jun", Cisco => "Cisco", BNT => "BNT", - Mellanox => "MellanoxIB" + Mellanox => "Mellanox" ); #------------------------------------------------------------------------------- @@ -668,7 +668,7 @@ sub get_hostname { Arguments: vendor: switch vendor Returns: - stype: type of switch, supports JUN, Cisco, BNT and MellanoxIB + stype: type of switch, supports Jun, Cisco, BNT and Mellanox =cut #-------------------------------------------------------------------------------- sub get_switchtype {