From e559e9a08491db39756f638809be66e76837d581 Mon Sep 17 00:00:00 2001 From: cxhong Date: Sun, 2 Feb 2020 14:23:16 -0500 Subject: [PATCH 1/2] Remove stty from Expect routine --- xCAT-server/lib/xcat/plugins/onie.pm | 1 - xCAT-server/lib/xcat/plugins/pdu.pm | 5 ++--- xCAT-server/share/xcat/scripts/configBNT | 6 ++++-- xCAT-server/share/xcat/scripts/configonie | 1 - 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/xCAT-server/lib/xcat/plugins/onie.pm b/xCAT-server/lib/xcat/plugins/onie.pm index 2fb8921bc..35cae4d6d 100644 --- a/xCAT-server/lib/xcat/plugins/onie.pm +++ b/xCAT-server/lib/xcat/plugins/onie.pm @@ -382,7 +382,6 @@ sub cumulus_connect { $ssh->debug(0); $ssh->log_stdout(0); # suppress stdout output.. - $ssh->slave->stty(qw(sane -echo)); unless ($ssh->spawn($command, @parameters)) { diff --git a/xCAT-server/lib/xcat/plugins/pdu.pm b/xCAT-server/lib/xcat/plugins/pdu.pm index 6b31ab8e3..78a854f7e 100644 --- a/xCAT-server/lib/xcat/plugins/pdu.pm +++ b/xCAT-server/lib/xcat/plugins/pdu.pm @@ -826,7 +826,6 @@ sub session_connect { $ssh->debug(0); $ssh->log_stdout(0); # suppress stdout output.. - $ssh->slave->stty(qw(sane -echo)); unless ($ssh->spawn($command, @parameters)) { @@ -1485,8 +1484,8 @@ sub netcfg_for_irpdu { my $mypdu = new Expect; - $mypdu->log_stdout(1); # suppress stdout output.. - $mypdu->slave->stty(qw(sane -echo)); + $mypdu->debug(0); + $mypdu->log_stdout(0); # suppress stdout output.. unless ($mypdu->spawn($login_cmd)) { diff --git a/xCAT-server/share/xcat/scripts/configBNT b/xCAT-server/share/xcat/scripts/configBNT index 7cc06582a..f7d25ed8f 100755 --- a/xCAT-server/share/xcat/scripts/configBNT +++ b/xCAT-server/share/xcat/scripts/configBNT @@ -409,7 +409,8 @@ sub config_snmp { my $cfg_access3="snmp-server access 5 security usm\r"; my $cfg_access4="snmp-server access 5 read-view iso\r"; - $mysw->slave->stty(qw(sane -echo)); + $mysw->debug(0); + $mysw->log_stdout(0); # suppress stdout output.. unless ($mysw->spawn($login_cmd)) { @@ -522,7 +523,8 @@ sub config_G8264 { my $main_prompt="Main#"; my $authpw_cmd = "/cfg/sys/ssnmp/snmpv3/usm 5/authpw\r"; - $mysw->slave->stty(qw(sane -echo)); + $mysw->debug(0); + $mysw->log_stdout(0); # suppress stdout output.. unless ($mysw->spawn($login_cmd)) { diff --git a/xCAT-server/share/xcat/scripts/configonie b/xCAT-server/share/xcat/scripts/configonie index debbf89b6..021fef056 100755 --- a/xCAT-server/share/xcat/scripts/configonie +++ b/xCAT-server/share/xcat/scripts/configonie @@ -226,7 +226,6 @@ sub cumulus_connect { $ssh->debug(0); $ssh->log_stdout(0); # suppress stdout output.. - $ssh->slave->stty(qw(sane -echo)); unless ($ssh->spawn($command, @parameters)) { From fc2d810a6eca65fc20ffc07dc6000eb28c1f7c59 Mon Sep 17 00:00:00 2001 From: cxhong Date: Wed, 5 Feb 2020 14:17:41 -0500 Subject: [PATCH 2/2] Modify the confignetwork_2eth_bridge_br22_br33 test cases --- xCAT-test/autotest/testcase/confignetwork/cases0 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/xCAT-test/autotest/testcase/confignetwork/cases0 b/xCAT-test/autotest/testcase/confignetwork/cases0 index 68ba386c5..414883423 100644 --- a/xCAT-test/autotest/testcase/confignetwork/cases0 +++ b/xCAT-test/autotest/testcase/confignetwork/cases0 @@ -842,6 +842,10 @@ cmd:cnip=__GETNODEATTR($$CN,ip)__;echo $cnip;var1=100;var2=`echo $cnip |sed -r ' check:rc==0 cmd:cnip=__GETNODEATTR($$CN,ip)__;echo $cnip;var3=101.;var4=`echo $cnip |awk -F. '{print $2}'`;var5=.0.0;secondnet=$var3$var4$var5;mkdef -t network -o confignetworks_test2 net=$secondnet mask=255.255.0.0 mgtifname=$$THIRDNIC check:rc==0 +cmd:cnip=__GETNODEATTR($$CN,ip)__;echo $cnip;var1=101;var2=`echo $cnip |sed -r 's/[^\.]*(..\..*)/\1/'`;second1ip=$var1$var2;chdef $$CN nicips.$$THIRDNIC=$second1ip nictypes.$$THIRDNIC=Ethernet nicnetworks.$$THIRDNIC=confignetworks_test2 +check:rc==0 +cmd:updatenode $$CN -P confignetwork +check:rc==0 cmd:chdef $$CN nicips.$$SECONDNIC= nictypes.$$SECONDNIC= nicnetworks.$$SECONDNIC= nicips.$$THIRDNIC= nictypes.$$THIRDNIC= nicnetworks.$$THIRDNIC= check:rc==0 cmd:cnip=__GETNODEATTR($$CN,ip)__;echo $cnip;var3=102.;var4=`echo $cnip |awk -F. '{print $2}'`;var5=.0.0;secondnet=$var3$var4$var5;mkdef -t network -o confignetworks_test3 net=$secondnet mask=255.255.0.0