From 2e08e93f6a99fc4da369377b6f0184c9a0a5a15e Mon Sep 17 00:00:00 2001
From: jjhua <jjhua@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Tue, 5 Feb 2013 06:53:29 +0000
Subject: [PATCH] fixed bug 3338, for aix,  get the ib information with node
 name through iblinkinfo -l on the HSM

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/branches/2.7@15053 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 .../share/xcat/ib/scripts/configiba.2ports    | 35 ++++++++++++-------
 1 file changed, 22 insertions(+), 13 deletions(-)

diff --git a/xCAT-server/share/xcat/ib/scripts/configiba.2ports b/xCAT-server/share/xcat/ib/scripts/configiba.2ports
index 4e78028c2..04eb64677 100755
--- a/xCAT-server/share/xcat/ib/scripts/configiba.2ports
+++ b/xCAT-server/share/xcat/ib/scripts/configiba.2ports
@@ -85,11 +85,17 @@ else
           num0=`expr $num \* 2`
           num1=`expr $num0 + 1`
           `rmdev -d -l ib$num0 >/dev/null 2>&1`
+          `rmdev -d -l iba$num0 >/dev/null 2>&1`
           `rmdev -d -l ib$num1 >/dev/null 2>&1`
+          `rmdev -d -l iba$num1 >/dev/null 2>&1`
           `rmdev -d -l ml$num >/dev/null 2>&1`
           num=`expr $num + 1`
     done
     
+    `rmdev -dl icm >/dev/null 2>&1`  
+    mkdev -c management -s infiniband -t icm
+    cfgmgr
+    
     ib_number=`lsdev -Cc adapter |grep iba |wc -l`
     loop_number=`expr $ib_number \* 2` 
 
@@ -109,8 +115,10 @@ do
     if [ $NODE ]
     then
         hostname="$NODE-$nic"
+        shortname=$NODE;
     else
         hostname="$HOST-$nic"
+        shortname=$HOST;
     fi
     `ifconfig $nic up`
     if [ $PLTFRM == "Linux" ]
@@ -180,19 +188,19 @@ GATEWAY=$gateway" > $dir/ifcfg-$nic
             fi
         elif [ $PLTFRM == "AIX" ]
         then
-            lsdev -C | grep icm | grep Available
-            if [ $? -ne 0 ]
-            then
-                mkdev -c management -s infiniband -t icm
-                if [ $? -ne 0 ]
-                then
-                    mkdev -l icm
-                    if [ $? -ne 0 ]
-                    then
-                        exit $?
-                    fi
-                fi
-            fi
+            #lsdev -C | grep icm | grep Available
+            #if [ $? -ne 0 ]
+            #then
+            #    mkdev -c management -s infiniband -t icm
+            #    if [ $? -ne 0 ]
+            #    then
+            #        mkdev -l icm
+            #        if [ $? -ne 0 ]
+            #        then
+            #            exit $?
+            #        fi
+            #    fi
+            #fi
 
             #Configure the IB interfaces.  Customize the port num.
 
@@ -204,6 +212,7 @@ GATEWAY=$gateway" > $dir/ifcfg-$nic
             else
                 port=2
             fi
+            chdev -l $ib_adapter -a hostname=$shortname
             mkiba -a $ip -i $nic -A $ib_adapter -p $port -P -1 -S up -m $netmask
         fi
     fi