mirror of
				https://github.com/xcat2/xcat-core.git
				synced 2025-10-31 11:22:27 +00:00 
			
		
		
		
	Remove trailing spaces in file xCAT-server/share/xcat/scripts/configBNT
This commit is contained in:
		| @@ -41,8 +41,8 @@ $::SWITCH_TYPE="EthSwitch::BNT"; | ||||
| if ( | ||||
|     !GetOptions( | ||||
|                 'h|help'     => \$::HELP, | ||||
|                 'switches=s' => \$::SWITCH,   | ||||
|                 'port=s'     => \$::PORT,   | ||||
|                 'switches=s' => \$::SWITCH, | ||||
|                 'port=s'     => \$::PORT, | ||||
|                 'vlan=s'     => \$::VLAN, | ||||
|                 'user=s'     => \$::USER, | ||||
|                 'password=s' => \$::PASSWORD, | ||||
| @@ -102,7 +102,7 @@ if ($::SWITCH) { | ||||
|     foreach my $fsw (@filternodes)  { | ||||
|         if (($switchhash->{$fsw}->[0]->{switchtype}) =~ /BNT/) { | ||||
|             # use switches table first | ||||
|             if ((!defined($switchhash->{$fsw}->[0]->{sshusername})) &&  | ||||
|             if ((!defined($switchhash->{$fsw}->[0]->{sshusername})) && | ||||
|                 (!defined($switchhash->{$fsw}->[0]->{sshpassword})) ) { | ||||
|                 if (defined($passwd_ent[0]->{username})) { | ||||
|                    $switchhash->{$fsw}->[0]->{sshusername} = $passwd_ent[0]->{username}; | ||||
| @@ -315,7 +315,7 @@ sub config_hostname { | ||||
|     } | ||||
| } | ||||
|  | ||||
| #setup secure SNMP v3  | ||||
| #setup secure SNMP v3 | ||||
| sub config_snmp { | ||||
|     my $snmp_user; | ||||
|     my $snmp_passwd; | ||||
| @@ -364,7 +364,7 @@ sub config_snmp { | ||||
|             $login_cmd = "ssh $username\@$switch\r"; | ||||
|         } | ||||
|  | ||||
|         #get hostname on the switch in case hostname is different  | ||||
|         #get hostname on the switch in case hostname is different | ||||
|         my $ccmd = "snmpwalk -Os -v1 -c $snmppass $switch 1.3.6.1.2.1.1.5"; | ||||
|         my $result = xCAT::Utils->runcmd($ccmd, 0); | ||||
|         my ($desc,$switchhost) = split /: /, $result; | ||||
| @@ -378,7 +378,7 @@ sub config_snmp { | ||||
|             if ($rc == 0){ | ||||
|                 push (@config_switches, $switch); | ||||
|             } | ||||
|             next;  | ||||
|             next; | ||||
|         } | ||||
|  | ||||
|         my $enable_cmd="enable\r"; | ||||
| @@ -511,8 +511,8 @@ sub config_G8264 { | ||||
|     my $snmp_group = shift; | ||||
|     my $cmd; | ||||
|  | ||||
|     $cmd="xdsh $switch --devicetype EthSwitch::BNT '/cfg/sys/ssnmp/snmpv3/usm 5/name $snmp_user;/cfg/sys/ssnmp/snmpv3/usm 5/auth sha;/cfg/sys/ssnmp/snmpv3/usm 5/priv none;/cfg/sys/ssnmp/snmpv3/group 5/model usm;/cfg/sys/ssnmp/snmpv3/group 5/uname $snmp_user;/cfg/sys/ssnmp/snmpv3/group 5/gname $snmp_group;/cfg/sys/ssnmp/snmpv3/access 5/name $snmp_group;/cfg/sys/ssnmp/snmpv3/access 5/model usm;/cfg/sys/ssnmp/snmpv3/access 5/level authNoPriv;apply' ";  | ||||
|      | ||||
|     $cmd="xdsh $switch --devicetype EthSwitch::BNT '/cfg/sys/ssnmp/snmpv3/usm 5/name $snmp_user;/cfg/sys/ssnmp/snmpv3/usm 5/auth sha;/cfg/sys/ssnmp/snmpv3/usm 5/priv none;/cfg/sys/ssnmp/snmpv3/group 5/model usm;/cfg/sys/ssnmp/snmpv3/group 5/uname $snmp_user;/cfg/sys/ssnmp/snmpv3/group 5/gname $snmp_group;/cfg/sys/ssnmp/snmpv3/access 5/name $snmp_group;/cfg/sys/ssnmp/snmpv3/access 5/model usm;/cfg/sys/ssnmp/snmpv3/access 5/level authNoPriv;apply' "; | ||||
|  | ||||
|     $rc= xCAT::Utils->runcmd($cmd, 0); | ||||
|  | ||||
|     #use expect to set password | ||||
| @@ -589,7 +589,7 @@ sub config_vlan { | ||||
| } | ||||
|  | ||||
| sub config_desc { | ||||
|     # checking for port number, switches is checked earlier  | ||||
|     # checking for port number, switches is checked earlier | ||||
|     if ($::PORT) { | ||||
|        $port = $::PORT; | ||||
|     } else { | ||||
| @@ -601,7 +601,7 @@ sub config_desc { | ||||
|     my $cmd_prefix = "xdsh $switches --devicetype $::SWITCH_TYPE"; | ||||
|     my $cmd; | ||||
|  | ||||
|     # Build up the commands for easier readability  | ||||
|     # Build up the commands for easier readability | ||||
|     $cmd = $cmd . "enable\;"; | ||||
|     $cmd = $cmd . "configure terminal\;"; | ||||
|     $cmd = $cmd . "interface port $port\;"; | ||||
| @@ -609,9 +609,9 @@ sub config_desc { | ||||
|     $cmd = $cmd . "write memory\;"; | ||||
|     $cmd = $cmd . "exit\;exit\;"; | ||||
|  | ||||
|     my $final_cmd = $cmd_prefix . " \"" . $cmd . "\"";  | ||||
|     my $final_cmd = $cmd_prefix . " \"" . $cmd . "\""; | ||||
|     print "Setting description=\"$::DESC\" on port $port of switches=$switches\n"; | ||||
|     if ($::VERBOSE) {  | ||||
|     if ($::VERBOSE) { | ||||
|         print "Executing cmd: \n==> $final_cmd\n"; | ||||
|     } | ||||
|     $rc= xCAT::Utils->runcmd($final_cmd, 0); | ||||
| @@ -632,16 +632,16 @@ sub config_desc { | ||||
| sub usage | ||||
| { | ||||
|     print "Usage: | ||||
|     configBNT -h│--help  | ||||
|     configBNT --switches switchnames --ip  | ||||
|     configBNT --switches switchnames --name   | ||||
|     configBNT -h│--help | ||||
|     configBNT --switches switchnames --ip | ||||
|     configBNT --switches switchnames --name | ||||
|     configBNT --switches switchnames --snmp [--user snmp_user] [--password snmp_password] [--group snmp_group] | ||||
|     configBNT --switches switchnames --port port --vlan vlan | ||||
|  | ||||
|     To set the IP address, hostname and config snmp: | ||||
|         configBNT --switches switchnames --all  | ||||
|         configBNT --switches switchnames --all | ||||
|  | ||||
|     To set the description for a port on the switch:  | ||||
|     To set the description for a port on the switch: | ||||
|         configBNT --switches switchnames --port port --desc \"description\" | ||||
|     \n"; | ||||
| } | ||||
|   | ||||
		Reference in New Issue
	
	Block a user