diff --git a/xCAT-test/autotest/testcase/genesis/test.sh b/xCAT-test/autotest/testcase/genesis/test.sh index 8c8a97acb..28d59879f 100755 --- a/xCAT-test/autotest/testcase/genesis/test.sh +++ b/xCAT-test/autotest/testcase/genesis/test.sh @@ -30,39 +30,27 @@ function check_destiny() { MASTERIP=`lsdef -t site -i master -c 2>&1 | awk -F'=' '{print $2}'`; MASTERNET=`ifconfig | awk "BEGIN{RS=\"\"}/\<$MASTERIP\>/{print \$1}"|head -n 1 | awk -F ' ' '{print $1}'|awk -F ":" '{print \$1}' 2>&1`; NET2=`netstat -i -a|grep -v Kernel|grep -v Iface |grep -v lo|grep -v $MASTERNET|head -n 1|awk '{print $1}'`; - NET2IP=""; echo "MASTERIP=$MASTERIP" echo "MASTERNET=$MASTERNET" echo "NET2=$NET2" - echo "NET2IP=$NET2IP" if [[ -z $NET2 ]];then echo "There is no second network, could not verify the test" return 1; else - NET2IPstring=`ifconfig $NET2 |grep inet|grep -v inet6`; - if [[ $? -eq 0 ]];then - echo "Something is set for $NET2IPstring ... using it." - NET2IP=`ifconfig $NET2 |grep inet|grep -v inet6|awk -F ' ' '{print $2}'|awk -F ":" '{print $2}'`; - if [[ -z $NET2IP ]];then - NET2IP=`ifconfig $NET2 |grep inet|grep -v inet6|awk -F ' ' '{print $2}'`; - fi - else - NET2IP=0.0.0.0; - fi - - # Seems like this NET2IP doesn't do anything with it, what happens if it's not in the 60 network - echo "The original NET2 IP is $NET2IP" - cmd="ifconfig $NET2 $MASTER_PRIVATE_IP netmask $MASTER_PRIVATE_NETMASK"; + echo "Add ip addr $MASTER_PRIVATE_IP/$MASTER_PRIVATE_NETMASK to $NET2" + cmd="ip addr add $MASTER_PRIVATE_IP/$MASTER_PRIVATE_NETMASK dev $NET2"; runcmd $cmd; + echo "Running makenetworks command" cmd="makenetworks"; runcmd $cmd; makehosts ${TESTNODE} grep ${TESTNODE} /etc/hosts cmd="nodeset ${TESTNODE} shell"; runcmd $cmd; - cmd="ifconfig $NET2 $NET2IP"; + echo "Delete ip addr $MASTER_PRIVATE_IP/$MASTER_PRIVATE_NETMASK from $NET2" + cmd="ip addr del $MASTER_PRIVATE_IP/$MASTER_PRIVATE_NETMASK dev $NET2"; runcmd $cmd; echo "Check if 'nodeset ${TESTNODE} shell' is added to ${SHELLFOLDER}/${TESTNODE}" echo "==============================================="