xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-06-18 12:20:40 +00:00
Code Issues Releases Wiki Activity

incorrect petitboot configuration for nodeset shell in flat #3548

Browse Source
This commit is contained in:
junxiawang
2017-08-10 08:35:44 -04:00
parent 55699e81c4
commit 0b29b4629a
2 changed files with 86 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
xCAT-test/autotest/testcase/genesis/cases0
View File

@ -30,19 +30,14 @@ cmd:perl /opt/xcat/share/xcat/tools/autotest/testcase/genesis/genesistest.pl -n
check:rc==0
cmd:cat /tmp/genesistestlog/*
end
start:nodeset_shell_incorrectmasterip
description:very if computenode need to do nodeset shell in different net with master will success
cmd:chdef testnode arch=ppc64le cons=ipmi groups=all ip=60.1.1.1 netboot=petitboot
cmd:masterip=`lsdef -t site -i master -c 2>&1 | awk -F'=' '{print \$2}'`;echo $masterip;masternet=`ifconfig |awk "BEGIN{RS=\"\"}/\<$masterip\>/{print \$1}"|head -n 1 | awk -F ":" '{print \$1}'`;echo $masternet;net2=` netstat -i |grep -v Kernel|grep -v Iface |grep -v lo|grep -v $masternet|head -n 1|awk '{print \$1}'`;echo $net2;net2ip=`ifconfig $net2 |grep inet|grep -v inet6`;ifconfig $net2 60.3.3.3 ;makenetworks;makehosts;nodeset testnode shell;cat /tftpboot/petitboot/testnode |grep "xcatd=60.3.3.3:3001 destiny=shell";if [[ $? -eq 0 ]] ;then if [[ -z $net2ip ]];then ifconfig $net2 0.0.0.0;exit 0;else ifconfig $net2 $net2ip;exit 0;fi ;else exit 1;fi
cmd:/opt/xcat/share/xcat/tools/autotest/testcase/genesis/test.sh -cd xnba
check:rc==0
cmd:chdef testnode arch=x86_64 netboot=xnba
cmd:masterip=`lsdef -t site -i master -c 2>&1 | awk -F'=' '{print \$2}'`;echo $masterip;masternet=`ifconfig |awk "BEGIN{RS=\"\"}/\<$masterip\>/{print \$1}"|head -n 1 | awk -F ":" '{print \$1}'`;echo $masternet;net2=` netstat -i |grep -v Kernel|grep -v Iface |grep -v lo|grep -v $masternet|head -n 1|awk '{print \$1}'`;echo $net2;net2ip=`ifconfig $net2 |grep inet|grep -v inet6`;ifconfig $net2 60.3.3.3 ;makenetworks;makehosts;nodeset testnode shell;cat /tftpboot/xcat/xnba/nodes/testnode |grep "xcatd=60.3.3.3:3001 destiny=shell";if [[ $? -eq 0 ]] ;then if [[ -z $net2ip ]];then ifconfig $net2 0.0.0.0;exit 0;else ifconfig $net2 $net2ip;exit 0;fi ;else exit 1;fi
cmd:/opt/xcat/share/xcat/tools/autotest/testcase/genesis/test.sh -cd grub2
check:rc==0
cmd:chdef testnode arch=x86_64 netboot=grub2
cmd:masterip=`lsdef -t site -i master -c 2>&1 | awk -F'=' '{print \$2}'`;echo $masterip;masternet=`ifconfig |awk "BEGIN{RS=\"\"}/\<$masterip\>/{print \$1}"|head -n 1 | awk -F ":" '{print \$1}'`;echo $masternet;net2=` netstat -i |grep -v Kernel|grep -v Iface |grep -v lo|grep -v $masternet|head -n 1|awk '{print \$1}'`;echo $net2;net2ip=`ifconfig $net2 |grep inet|grep -v inet6`;ifconfig $net2 60.3.3.3 ;makenetworks;makehosts;nodeset testnode shell; cat /tftpboot/boot/grub2/testnode |grep "xcatd=60.3.3.3:3001 destiny=shell";if [[ $? -eq 0 ]] ;then if [[ -z $net2ip ]];then ifconfig $net2 0.0.0.0;exit 0;else ifconfig $net2 $net2ip;exit 0;fi ;else exit 1;fi
cmd:/opt/xcat/share/xcat/tools/autotest/testcase/genesis/test.sh -cd petitboot
check:rc==0
cmd:/opt/xcat/share/xcat/tools/autotest/testcase/genesis/test.sh -c
check:rc==0
cmd:makehosts -d testnode
cmd:rmdef testnode
cmd:rmdef -t network 60_0_0_0-255_0_0_0
end

81
xCAT-test/autotest/testcase/genesis/test.sh Executable file
View File

@ -0,0 +1,81 @@
#!/bin/bash
function check_destiny(){
chdef testnode arch=ppc64le cons=ipmi groups=all ip=60.1.1.1 netboot=$NETBOOT;
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}'`;echo net2 is $net2;
net2ip="";
if [[ -z $net2 ]];then
echo null
return 1;
else
net2ipstring=`ifconfig $net2 |grep inet|grep -v inet6`;
if [[ $? -eq 0 ]];then
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
ifconfig $net2 60.3.3.3 ;
makenetworks;
makehosts testnode;
nodeset testnode shell;
ifconfig $net2 "$net2ip";
cat "$SHELLFOLDER"testnode |grep "xcatd=60.3.3.3:3001 destiny=shell";
if [[ $? -eq 0 ]] ;then
return 0;
else
echo wrong;
return 1;
fi
fi
}
function clear_env(){
makehosts -d testnode
rmdef testnode
rmdef -t network 60_0_0_0-255_0_0_0
if [[ $? -eq 0 ]];then
return 0;
else
return 1;
fi
}
NETBOOT=""
SHELLFOLDER=""
while [ "$#" -gt "0" ]
do
case $1 in
"-cd"|"--check" )
NETBOOT=$2;
if [[ $NETBOOT =~ petitboot ]];then
SHELLFOLDER="/tftpboot/petitboot/";
elif [[ $NETBOOT =~ xnba ]];then
SHELLFOLDER="/tftpboot/xcat/xnba/nodes/"
else
SHELLFOLDER="/tftpboot/boot/grub2/";
fi
check_destiny ;
if [[ $? -eq 1 ]];then
exit 1
else
exit 0
fi
;;
"-c"|"--clear" )
clear_env;
if [[ $? -eq 1 ]];then
exit 1
else
exit 0
fi
;;
*)
echo
echo "Please Insert $0: -cd|-c"
echo
exit 1;
;;
esac
done