From 3c8f16b4c84084840b296df93e9c5b424daa3ff6 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Fri, 11 Aug 2017 16:12:51 +0800 Subject: [PATCH 1/4] Add a test case against confignetwork --- .../autotest/testcase/confignetwork/cases0 | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/xCAT-test/autotest/testcase/confignetwork/cases0 b/xCAT-test/autotest/testcase/confignetwork/cases0 index f0a21ea0e..535bd9245 100644 --- a/xCAT-test/autotest/testcase/confignetwork/cases0 +++ b/xCAT-test/autotest/testcase/confignetwork/cases0 @@ -936,3 +936,23 @@ check:rc==0 cmd:if grep SUSE /etc/*release;then xdsh $$CN "cp -f /tmp/backupnet/* /etc/sysconfig/network/"; elif grep "Red Hat" /etc/*release;then xdsh $$CN "cp -f /tmp/backupnet/* /etc/sysconfig/network-scripts/"; elif grep Ubuntu /etc/*release;then xdsh $$CN "cp -f /tmp/backupnet/* /etc/network/interfaces.d/;cp -f /tmp/interfaces /etc/network/";else echo "Sorry,this is not supported os"; fi cmd:xdsh $$CN "rm -rf /tmp/backupnet/ /tmp/interfaces" end + +start:confignetwork_static_installnic +description:Reconfigure installnic without dhclient lease file +cmd:lsdef $$CN -z && lsdef -l $$CN -z >/tmp/CN.stanza +check:rc==0 +cmd:xdsh $$CN "mkdir -p /tmp/backupnet" +check:rc==0 +cmd:if grep SUSE /etc/*release;then xdsh $$CN "cp -f /etc/sysconfig/network/ifcfg-* /tmp/backupnet/"; elif grep "Red Hat" /etc/*release;then xdsh $$CN "cp -f /etc/sysconfig/network-scripts/ifcfg-* /tmp/backupnet/"; elif grep Ubuntu /etc/*release;then xdsh $$CN "cp -f /etc/network/interfaces.d/* /tmp/backupnet/;cp -f /etc/network/interfaces /tmp";else echo "Sorry,this is not supported os"; fi +check:rc==0 +cmd:xdsh $$CN 'rm -f /var/lib/dhcp/dhclient.leases /var/lib/dhclient/dhclient.leases' +check:rc==0 +cmd:updatenode $$CN 'confignetwork -s' +check:rc==0 +cmd:xdsh $$CN date +check:rc==0 +# Clean up +cmd:test -e /tmp/CN.stanza && rmdef $$CN && mkdef -z Date: Thu, 17 Aug 2017 15:45:21 +0800 Subject: [PATCH 2/4] Revise the test case confignetwork_static_installnic --- xCAT-test/autotest/testcase/confignetwork/cases0 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/xCAT-test/autotest/testcase/confignetwork/cases0 b/xCAT-test/autotest/testcase/confignetwork/cases0 index 535bd9245..4ccd5bb3e 100644 --- a/xCAT-test/autotest/testcase/confignetwork/cases0 +++ b/xCAT-test/autotest/testcase/confignetwork/cases0 @@ -945,6 +945,8 @@ cmd:xdsh $$CN "mkdir -p /tmp/backupnet" check:rc==0 cmd:if grep SUSE /etc/*release;then xdsh $$CN "cp -f /etc/sysconfig/network/ifcfg-* /tmp/backupnet/"; elif grep "Red Hat" /etc/*release;then xdsh $$CN "cp -f /etc/sysconfig/network-scripts/ifcfg-* /tmp/backupnet/"; elif grep Ubuntu /etc/*release;then xdsh $$CN "cp -f /etc/network/interfaces.d/* /tmp/backupnet/;cp -f /etc/network/interfaces /tmp";else echo "Sorry,this is not supported os"; fi check:rc==0 +cmd:xdsh $$CN 'killall dhclient' +cmd:xdsh $$CN 'killall -KILL dhclient' cmd:xdsh $$CN 'rm -f /var/lib/dhcp/dhclient.leases /var/lib/dhclient/dhclient.leases' check:rc==0 cmd:updatenode $$CN 'confignetwork -s' @@ -955,4 +957,5 @@ check:rc==0 cmd:test -e /tmp/CN.stanza && rmdef $$CN && mkdef -z Date: Tue, 22 Aug 2017 15:10:58 +0800 Subject: [PATCH 3/4] Revise the test case confignetwork_static_installnic --- xCAT-test/autotest/testcase/confignetwork/cases0 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/xCAT-test/autotest/testcase/confignetwork/cases0 b/xCAT-test/autotest/testcase/confignetwork/cases0 index 4ccd5bb3e..f468fae74 100644 --- a/xCAT-test/autotest/testcase/confignetwork/cases0 +++ b/xCAT-test/autotest/testcase/confignetwork/cases0 @@ -945,9 +945,9 @@ cmd:xdsh $$CN "mkdir -p /tmp/backupnet" check:rc==0 cmd:if grep SUSE /etc/*release;then xdsh $$CN "cp -f /etc/sysconfig/network/ifcfg-* /tmp/backupnet/"; elif grep "Red Hat" /etc/*release;then xdsh $$CN "cp -f /etc/sysconfig/network-scripts/ifcfg-* /tmp/backupnet/"; elif grep Ubuntu /etc/*release;then xdsh $$CN "cp -f /etc/network/interfaces.d/* /tmp/backupnet/;cp -f /etc/network/interfaces /tmp";else echo "Sorry,this is not supported os"; fi check:rc==0 -cmd:xdsh $$CN 'killall dhclient' -cmd:xdsh $$CN 'killall -KILL dhclient' -cmd:xdsh $$CN 'rm -f /var/lib/dhcp/dhclient.leases /var/lib/dhclient/dhclient.leases' +cmd:xdsh $$CN "kill $(ps -A | awk '/dhclient/ { print $1 }')" +cmd:xdsh $$CN "kill -KILL $(ps -A | awk '/dhclient/ { print $1 }')" +cmd:xdsh $$CN 'rm -f /var/lib/dhcp/dhclient*.lease* /var/lib/dhclient/dhclient*.lease*' check:rc==0 cmd:updatenode $$CN 'confignetwork -s' check:rc==0 @@ -957,5 +957,5 @@ check:rc==0 cmd:test -e /tmp/CN.stanza && rmdef $$CN && mkdef -z Date: Thu, 24 Aug 2017 15:34:09 +0800 Subject: [PATCH 4/4] Revise the test case confignetwork_static_installnic --- xCAT-test/autotest/testcase/confignetwork/cases0 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xCAT-test/autotest/testcase/confignetwork/cases0 b/xCAT-test/autotest/testcase/confignetwork/cases0 index f468fae74..4615c4555 100644 --- a/xCAT-test/autotest/testcase/confignetwork/cases0 +++ b/xCAT-test/autotest/testcase/confignetwork/cases0 @@ -945,8 +945,8 @@ cmd:xdsh $$CN "mkdir -p /tmp/backupnet" check:rc==0 cmd:if grep SUSE /etc/*release;then xdsh $$CN "cp -f /etc/sysconfig/network/ifcfg-* /tmp/backupnet/"; elif grep "Red Hat" /etc/*release;then xdsh $$CN "cp -f /etc/sysconfig/network-scripts/ifcfg-* /tmp/backupnet/"; elif grep Ubuntu /etc/*release;then xdsh $$CN "cp -f /etc/network/interfaces.d/* /tmp/backupnet/;cp -f /etc/network/interfaces /tmp";else echo "Sorry,this is not supported os"; fi check:rc==0 -cmd:xdsh $$CN "kill $(ps -A | awk '/dhclient/ { print $1 }')" -cmd:xdsh $$CN "kill -KILL $(ps -A | awk '/dhclient/ { print $1 }')" +cmd:xdsh $$CN "ps -A --format pid,comm | awk '/dhclient/ { print \$1 }' | xargs -r -n 1 kill" +cmd:xdsh $$CN "ps -A --format pid,comm | awk '/dhclient/ { print \$1 }' | xargs -r -n 1 kill -KILL" cmd:xdsh $$CN 'rm -f /var/lib/dhcp/dhclient*.lease* /var/lib/dhclient/dhclient*.lease*' check:rc==0 cmd:updatenode $$CN 'confignetwork -s' @@ -957,5 +957,5 @@ check:rc==0 cmd:test -e /tmp/CN.stanza && rmdef $$CN && mkdef -z