From 93c1b83f6616ea95153afd5457b2507d8563aacd Mon Sep 17 00:00:00 2001 From: Wai Yee Wong Date: Sun, 10 May 2020 21:29:15 -0400 Subject: [PATCH 1/2] Add testing of nicips and nicaliases for xcat-core Issue 6676 --- xCAT-test/autotest/testcase/makehosts/cases0 | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/xCAT-test/autotest/testcase/makehosts/cases0 b/xCAT-test/autotest/testcase/makehosts/cases0 index acdc1a4b6..d64a42f3e 100644 --- a/xCAT-test/autotest/testcase/makehosts/cases0 +++ b/xCAT-test/autotest/testcase/makehosts/cases0 @@ -20,18 +20,30 @@ label:mn_only,ci_test,dns cmd:cp -f /etc/hosts /etc/hosts.xcatbakautotest cmd:chtab node=nouse_compute hosts.ip="|node(\d+)|1.2.3.(\$1+0)|" hosts.hostnames="|(.*)|(\$1).cluster.net|" check:rc==0 +cmd:chtab node=nouse_compute nics.nicaliases='ib0!|node(\d+)|m($1)-ib0|' nics.nicips='ib0!|node(\d+)|10.0.0.($1+20)|' +check:rc==0 cmd:mkdef -t node -o node01,node02 groups="nouse_compute" check:rc==0 -cmd:sleep 30 cmd:XCATBYPASS=1 makehosts check:rc==0 -cmd:sleep 30 +cmd:sleep 10 cmd:cat /etc/hosts -check:output=~1.2.3.2 check:output=~1.2.3.1 +check:rc==0 +check:output=~1.2.3.2 +check:rc==0 check:output=~node01 +check:rc==0 +check:output=~m01-ib0 +check:rc==0 check:output=~node02 +check:rc==0 +check:output=~m01-ib0 +check:rc==0 +check:output=~10.0.0.22 +check:rc==0 cmd:chtab -d node=nouse_compute hosts +cmd:chtab -d node=nouse_compute nics cmd:rmdef node01 cmd:rmdef node02 cmd:mv -f /etc/hosts.xcatbakautotest /etc/hosts From d41c86debffb5e23f94f4017c2bd6e9492adb45e Mon Sep 17 00:00:00 2001 From: Wai Yee Wong Date: Mon, 11 May 2020 12:54:41 -0400 Subject: [PATCH 2/2] correction: m01-ib0 should be m02-ib0 for node02. --- xCAT-test/autotest/testcase/makehosts/cases0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-test/autotest/testcase/makehosts/cases0 b/xCAT-test/autotest/testcase/makehosts/cases0 index d64a42f3e..6740d6bb9 100644 --- a/xCAT-test/autotest/testcase/makehosts/cases0 +++ b/xCAT-test/autotest/testcase/makehosts/cases0 @@ -38,7 +38,7 @@ check:output=~m01-ib0 check:rc==0 check:output=~node02 check:rc==0 -check:output=~m01-ib0 +check:output=~m02-ib0 check:rc==0 check:output=~10.0.0.22 check:rc==0