From 23905cb311b4029803f7f61a8318b904550938de Mon Sep 17 00:00:00 2001
From: xq2005 <qxuqxu@cn.ibm.com>
Date: Fri, 1 Nov 2013 03:33:39 -0700
Subject: [PATCH] use ip address to find the network name

---
 xCAT/postscripts/configeth  |  91 ----------------------------
 xCAT/postscripts/confignics | 103 ++++++++++++++++++++++++++------
 xCAT/postscripts/xcatlib.sh | 114 ++++++++++++++++++++++++++++++++++++
 3 files changed, 198 insertions(+), 110 deletions(-)

diff --git a/xCAT/postscripts/configeth b/xCAT/postscripts/configeth
index d66ec3d15..8ffb78c77 100755
--- a/xCAT/postscripts/configeth
+++ b/xCAT/postscripts/configeth
@@ -3,97 +3,6 @@ str_dir_name=`dirname $0`
 
 . $str_dir_name/xcatlib.sh
 
-#tranfer the netmask to prefix for ipv4
-function v4mask2prefix(){
-    local num_bits=0
-    local old_ifs=$IFS
-    IFS=$'.'
-    local array_num_temp=($1)
-    IFS=$old_ifs
-    for num_dec in ${array_num_temp[@]}
-    do
-        case $num_dec in
-            255) let num_bits+=8;;
-            254) let num_bits+=7;;
-            252) let num_bits+=6;; 
-            248) let num_bits+=5;;
-            240) let num_bits+=4;;
-            224) let num_bits+=3;;
-            192) let num_bits+=2;;
-            128) let num_bits+=1;;
-            0) ;;
-            *) echo "Error: $dec is not recognised"; exit 1
-        esac
-    done
-    echo "$num_bits"
-}
-
-function v4prefix2mask(){
-    local a=$1
-    local b=0
-    local num_index=1
-    local str_temp=''
-    local str_mask=''
-
-    while [[ $num_index -le 4 ]]
-    do
-        if [ $a -ge 8 ];then
-            b=8
-            a=$((a-8))
-        else
-            b=$a
-            a=0
-        fi
-        case $b in
-            0) str_temp="0";;
-            1) str_temp="128";;
-            2) str_temp="192";;
-            3) str_temp="224";;
-            4) str_temp="240";;
-            5) str_temp="248";;
-            6) str_temp="252";;
-            7) str_temp="254";;
-            8) str_temp="255";;
-        esac
-
-        str_mask=$str_mask$str_temp"."
-
-        num_index=$((num_index+1))
-    done
-
-    str_mask=`echo $str_mask | sed 's/.$//'`
-    echo "$str_mask"
-}
-
-function v4calcbcase(){
-    local str_mask=$2
-    echo $str_mask | grep '\.'
-    if [ $? -ne 0 ];then
-        str_mask=$(v4prefix2mask $str_mask)
-    fi
-    local str_bcast=''
-    local str_temp=''
-    local str_ifs=$IFS
-    IFS=$'.'
-    local array_ip=($1)
-    local array_mask=($str_mask)
-    IFS=$str_ifs
-
-    if [ ${#array_ip[*]} -ne 4 -o ${#array_mask[*]} -ne 4 ];then
-        echo "255.255.255.255"
-        return
-    fi
-
-    for index in {0..3}
-    do
-        str_temp=`echo $[ ${array_ip[$index]}|(${array_mask[$index]} ^ 255) ]`
-        str_bcast=$str_bcast$str_temp"."
-    done
-
-    str_bcast=`echo $str_bcast | sed 's/.$//'`
-    echo "$str_bcast"
-}
-
 function configipv4(){
     str_if_name=$1
     str_v4ip=$2
diff --git a/xCAT/postscripts/confignics b/xCAT/postscripts/confignics
index 37fe95bd8..5a3960c82 100755
--- a/xCAT/postscripts/confignics
+++ b/xCAT/postscripts/confignics
@@ -41,6 +41,69 @@ function splitconfig(){
     done
 }
 
+function findnetwork(){
+    str_ip=$1
+    str_network=''
+    local num_i=1
+    while [ $num_i -le $NETWORKS_LINES ];do
+        eval str_temp=\$NETWORKS_LINE$num_i
+        str_net=`echo $str_temp | awk -F'net=' '{print $2}' | awk -F'|' '{print $1}'`
+        str_mask=`echo $str_temp | awk -F'mask=' '{print $2}' | awk -F'|' '{print $1}' | sed 's:^/::'`
+        echo $str_net | grep ':' > /dev/null
+        if [ $? -ne 0 ];then
+            str_temp_net1=$(v4calcnet $str_ip $str_mask)
+            str_temp_net2=$(v4calcnet $str_net $str_mask)
+            if [ "$str_temp_net1" = "$str_temp_net2" ];then
+                str_network=`echo $str_temp  | awk -F'netname=' '{print $2}' | awk -F'|' '{print $1}'`
+                echo "$str_network"
+                return
+            fi
+        fi
+        num_i=$((num_i+1))
+    done
+    
+    echo "Error: Can not find the corresponding network defination for ip address: $str_ip ."
+}
+
+function checknetwork(){
+    old_ifs=$IFS
+    IFS=$'|'
+    array_ip=($1)
+    array_networkname=($2)
+    IFS=$old_ifs
+    str_ret=''
+
+    num_length=${#array_ip[@]}
+    num_index=0
+    while [ $num_index -lt $num_length ]
+    do
+        str_ip=${array_ip[$num_index]}
+        str_networkname=${array_networkname[$num_index]}
+        echo "$str_ip" | grep ':' > /dev/null
+        if [ $? -ne 0 ];then
+            if [ -z "$str_networkname" ];then
+                str_networkname=$(findnetwork $str_ip)
+                echo "$str_networkname" | grep -i 'error' > /dev/null
+                if [ $? -eq 0 ];then
+                    echo "$str_networkname"
+                    return
+                fi
+            fi
+            str_ret="${str_ret}${str_networkname},"
+        else
+            if [ -z "$str_networkname" ];then
+                echo "Error: ipv6 address should define networks name, the ip is $str_ip ."
+                return
+            fi
+            str_ret="${str_ret}${str_networkname},"
+        fi
+        num_index=$((num_index+1))
+    done
+
+    str_ret=`echo $str_ret | sed 's/.$//'`
+    echo "$str_ret"
+}
+
 bool_cfg_inst_nic=0
 str_inst_nic=''
 str_ib_nics=''
@@ -149,7 +212,6 @@ if [ $bool_exit_flag -eq 1 ];then
 fi
 
 splitconfig $NICIPS
-splitconfig $NICTYPES
 splitconfig $NICNETWORKS
 splitconfig $NICCUSTOMSCRIPTS
 
@@ -227,30 +289,33 @@ do
     array_temp=($str_value)
     IFS=$old_ifs
 
-    if [ "${array_temp[3]}" ];then
-        logger -t xcat -p local4.info "confignics: processing custom scripts: ${array_temp[3]} for interface $key" 
-        echo "confignics on $NODE: processing custom scripts: ${array_temp[3]} for interface $key"
-        ${array_temp[3]}
+    if [ -n "${array_temp[2]}" ];then
+        logger -t xcat -p local4.info "confignics: processing custom scripts: ${array_temp[2]} for interface $key" 
+        echo "confignics on $NODE: processing custom scripts: ${array_temp[2]} for interface $key"
+        ${array_temp[2]}
     else
-        if [ -z "${array_temp[2]}" ];then
-            logger -t xcat -p local4.info "confignics: ip address,nic type and network are required. $key: $str_value ."
-            echo "confignics on $NODE: ip address,nic type and network are required. $key: $str_value ."
+        if [ `echo $key | grep -E '(eth|en)[0-9]+'` ];then
+            str_nic_type="ethernet"
+        elif [ `echo $KEY | grep -E 'ib[0-9]+'` ];then
+            str_nic_type="infiniband"
+        else
+            logger -t xcat -p local4.info "confignics: unknown nic type for $key: $str_value ."
+            echo "confignics on $NODE: unknown nic type for $key: $str_value ."
             continue
         fi
-        if [ -n "${array_temp[1]}" ];then
-            str_nic_type=`echo ${array_temp[1]} | tr "[A-Z]" "[a-z]"`
-        else
-            if [ `echo $key | grep -E '(eth|en)[0-9]+'` ];then
-                str_nic_type="ethernet"
-            elif [ `echo $KEY | grep -E 'ib[0-9]+'` ];then
-                str_nic_type="infiniband"
-            fi
+
+        str_network=$(checknetwork ${array_temp[0]} ${array_temp[1]})
+        echo "$str_network" | grep -i 'error' > /dev/null
+        if [ $? -eq 0 ];then
+            logger -t xcat -p local4.info "$str_network"
+            echo "confignics on $NODE: $str_network"
+            continue
         fi
 
         if [ "$str_nic_type" = "ethernet" ];then
-             logger -t xcat -p local4.info "confignics: call 'configeth $key ${array_temp[0]} ${array_temp[2]}'"
-             echo "confignics on $NODE: call 'configeth $key ${array_temp[0]} ${array_temp[2]}'"
-             configeth $key ${array_temp[0]} ${array_temp[2]}
+             logger -t xcat -p local4.info "confignics: call 'configeth $key ${array_temp[0]} $str_network'"
+             echo "confignics on $NODE: call 'configeth $key ${array_temp[0]} $str_network'"
+             #configeth $key ${array_temp[0]} $str_network
         elif [ "$str_nic_type" = "infiniband" ];then
             if [ $str_ib_nics ];then
                 str_ib_nics=$str_ib_nics","$key
diff --git a/xCAT/postscripts/xcatlib.sh b/xCAT/postscripts/xcatlib.sh
index 17a5adf6f..d3d253760 100644
--- a/xCAT/postscripts/xcatlib.sh
+++ b/xCAT/postscripts/xcatlib.sh
@@ -71,3 +71,117 @@ function debianpreconf(){
     done
 }
 
+#tranfer the netmask to prefix for ipv4
+function v4mask2prefix(){
+    local num_bits=0
+    local old_ifs=$IFS
+    IFS=$'.'
+    local array_num_temp=($1)
+    IFS=$old_ifs
+    for num_dec in ${array_num_temp[@]}
+    do
+        case $num_dec in
+            255) let num_bits+=8;;
+            254) let num_bits+=7;;
+            252) let num_bits+=6;;
+            248) let num_bits+=5;;
+            240) let num_bits+=4;;
+            224) let num_bits+=3;;
+            192) let num_bits+=2;;
+            128) let num_bits+=1;;
+            0) ;;
+            *) echo "Error: $dec is not recognised"; exit 1
+        esac
+    done
+    echo "$num_bits"
+}
+
+function v4prefix2mask(){
+    local a=$1
+    local b=0
+    local num_index=1
+    local str_temp=''
+    local str_mask=''
+
+    while [[ $num_index -le 4 ]]
+    do
+        if [ $a -ge 8 ];then
+            b=8
+            a=$((a-8))
+        else
+            b=$a
+            a=0
+        fi
+        case $b in
+            0) str_temp="0";;
+            1) str_temp="128";;
+            2) str_temp="192";;
+            3) str_temp="224";;
+            4) str_temp="240";;
+            5) str_temp="248";;
+            6) str_temp="252";;
+            7) str_temp="254";;
+            8) str_temp="255";;
+        esac
+
+        str_mask=$str_mask$str_temp"."
+
+        num_index=$((num_index+1))
+    done
+
+    str_mask=`echo $str_mask | sed 's/.$//'`
+    echo "$str_mask"
+}
+
+function v4calcbcase(){
+    local str_mask=$2
+    echo $str_mask | grep '\.' > /dev/null
+    if [ $? -ne 0 ];then
+        str_mask=$(v4prefix2mask $str_mask)
+    fi
+    local str_bcast=''
+    local str_temp=''
+    local str_ifs=$IFS
+    IFS=$'.'
+    local array_ip=($1)
+    local array_mask=($str_mask)
+    IFS=$str_ifs
+
+    if [ ${#array_ip[*]} -ne 4 -o ${#array_mask[*]} -ne 4 ];then
+        echo "255.255.255.255"
+        return
+    fi
+
+    for index in {0..3}
+    do
+        str_temp=`echo $[ ${array_ip[$index]}|(${array_mask[$index]} ^ 255) ]`
+        str_bcast=$str_bcast$str_temp"."
+    done
+
+    str_bcast=`echo $str_bcast | sed 's/.$//'`
+    echo "$str_bcast"
+}
+
+function v4calcnet(){
+    local str_mask=$2
+    echo $str_mask | grep '\.' > /dev/null
+    if [ $? -ne 0 ];then
+        str_mask=$(v4prefix2mask $str_mask)
+    fi
+    local str_net=''
+    local str_temp=''
+    local str_ifs=$IFS
+    IFS=$'.'
+    local array_ip=($1)
+    local array_mask=($str_mask)
+    IFS=$str_ifs
+
+    for index in {0..3}
+    do
+        str_temp=`echo $[ ${array_ip[$index]}&${array_mask[$index]} ]`
+        str_net=$str_net$str_temp"."
+    done
+
+    str_net=`echo $str_net | sed 's/.$//'`
+    echo "$str_net"
+}