xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-08-23 19:50:21 +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-16 08:49:43 -04:00
parent 0b29b4629a
commit 2516628c9a
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -32,11 +32,11 @@ 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:/opt/xcat/share/xcat/tools/autotest/testcase/genesis/test.sh -cd xnba
cmd:/opt/xcat/share/xcat/tools/autotest/testcase/genesis/test.sh -check xnba
check:rc==0
cmd:/opt/xcat/share/xcat/tools/autotest/testcase/genesis/test.sh -cd grub2
cmd:/opt/xcat/share/xcat/tools/autotest/testcase/genesis/test.sh -check grub2
check:rc==0
cmd:/opt/xcat/share/xcat/tools/autotest/testcase/genesis/test.sh -cd petitboot
cmd:/opt/xcat/share/xcat/tools/autotest/testcase/genesis/test.sh -check petitboot
check:rc==0
cmd:/opt/xcat/share/xcat/tools/autotest/testcase/genesis/test.sh -c
check:rc==0

6
xCAT-test/autotest/testcase/genesis/test.sh
View File

@@ -6,7 +6,7 @@ masternet=`ifconfig | awk "BEGIN{RS=\"\"}/\<$masterip\>/{print \$1}"|head -n 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
echo "could not verify the test"
return 1;
else
net2ipstring=`ifconfig $net2 |grep inet|grep -v inet6`;
@@ -19,7 +19,6 @@ net2ip="";
net2ip=0.0.0.0;
fi
ifconfig $net2 60.3.3.3 ;
makenetworks;
makehosts testnode;
nodeset testnode shell;
ifconfig $net2 "$net2ip";
@@ -35,7 +34,6 @@ net2ip="";
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
@@ -47,7 +45,7 @@ SHELLFOLDER=""
while [ "$#" -gt "0" ]
do
case $1 in
"-cd"|"--check" )
"-check"|"--check" )
NETBOOT=$2;
if [[ $NETBOOT =~ petitboot ]];then
SHELLFOLDER="/tftpboot/petitboot/";