From 0a3104a981aaac7e0896dc89f4ad7e1471a02e87 Mon Sep 17 00:00:00 2001
From: Casandra Qiu <cxhong@us.ibm.com>
Date: Fri, 16 Jun 2017 15:21:27 -0400
Subject: [PATCH] check community string in the switches table

---
 xCAT-server/share/xcat/scripts/configBNT | 27 +++++++++++++++++-------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/xCAT-server/share/xcat/scripts/configBNT b/xCAT-server/share/xcat/scripts/configBNT
index 3b31b975b..c58c1c1f9 100755
--- a/xCAT-server/share/xcat/scripts/configBNT
+++ b/xCAT-server/share/xcat/scripts/configBNT
@@ -72,6 +72,12 @@ my $switchhash;
 my $passwdtab;
 my @passwd_ent;
 
+#set community string for switch
+my $community = "public";
+my @snmpcs = xCAT::TableUtils->get_site_attribute("snmpc");
+my $tmp    = $snmpcs[0];
+if (defined($tmp)) { $community = $tmp }
+
 if ($::SWITCH) {
     my @filternodes = xCAT::NodeRange::noderange( $::SWITCH );
     if (nodesmissed) {
@@ -80,7 +86,7 @@ if ($::SWITCH) {
     }
     # check switch attributes
     $switchestab =  xCAT::Table->new('switches');
-    $switchhash = $switchestab->getNodesAttribs(\@filternodes,['switchtype','sshusername','sshpassword','protocol']);
+    $switchhash = $switchestab->getNodesAttribs(\@filternodes,['switchtype','sshusername','sshpassword','protocol','password','snmpversion']);
 
     # get switch username and password from passwd
     $passwdtab = xCAT::Table->new('passwd');
@@ -98,6 +104,9 @@ if ($::SWITCH) {
                    $switchhash->{$fsw}->[0]->{sshpassword} = $passwd_ent[0]->{password};
                 }
             }
+            if (!defined($switchhash->{$fsw}->[0]->{password})) {
+                $switchhash->{$fsw}->[0]->{password} = $community;
+            }
             push @nodes, $fsw;
         } else {
             xCAT::MsgUtils->message("E","The $fsw is not BNT switch, will not config");
@@ -117,12 +126,6 @@ if ($::SWITCH) {
 my $mactab = xCAT::Table->new("mac");
 my $machash = $mactab->getNodesAttribs(\@nodes,['mac']);
 
-#set community string for switch
-my $community = "public";
-my @snmpcs = xCAT::TableUtils->get_site_attribute("snmpc");
-my $tmp    = $snmpcs[0];
-if (defined($tmp)) { $community = $tmp }
-
 my $switches = join(",",@nodes);
 my $cmd;
 my $vlan;
@@ -330,12 +333,20 @@ sub config_snmp {
         my $username;
         my $passwd;
         my $protocol;
+        my $snmppass;
+        my $snmpversion;
 
         my $login_cmd;
 
         $username = $switchhash->{$switch}->[0]->{sshusername};
         $passwd = $switchhash->{$switch}->[0]->{sshpassword};
         $protocol = $switchhash->{$switch}->[0]->{protocol};
+        if ($switchhash->{$switch}->[0]->{snmpversion} =~ /3/) {
+            $snmppass=$community;
+        } else {
+            $snmppass = $switchhash->{$switch}->[0]->{password};
+        }
+
         if ($protocol =~ /telnet/) {
             $login_cmd = "telnet $switch\r";
         } else {
@@ -343,7 +354,7 @@ sub config_snmp {
         }
 
         #get hostname on the switch in case hostname is different 
-        my $ccmd = "snmpwalk -Os -v1 -c $community $switch 1.3.6.1.2.1.1.5";
+        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;
         if (!$switchhost) {