From b39a45cb5f59d3d331b2d12218183941b5421abb Mon Sep 17 00:00:00 2001 From: caomengmeng Date: Wed, 4 Jan 2017 03:22:24 -0500 Subject: [PATCH 1/5] complete --- xCAT-test/autotest/testcase/prsync/cases0 | 8 ++++++++ xCAT-test/autotest/testcase/psh/cases0 | 16 +++++++++------- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/xCAT-test/autotest/testcase/prsync/cases0 b/xCAT-test/autotest/testcase/prsync/cases0 index babccfcf1..45a99984b 100644 --- a/xCAT-test/autotest/testcase/prsync/cases0 +++ b/xCAT-test/autotest/testcase/prsync/cases0 @@ -1,16 +1,22 @@ start:prsync_h +description: prsync -h +os:Linux cmd:prsync -h check:rc==0 check:output=~Usage end start:prsync_v +description: prsync -v +os:Linux cmd:prsync -v check:rc==0 check:output=~Version end start:prsync_dir_node +description: run prsync -o to copy files in dir from MN to CN +os:Linux cmd: mkdir -p /tmp/pscp check:rc==0 cmd:echo "test" > /tmp/pscp/pscp.tmp @@ -34,6 +40,8 @@ check:rc==0 end start:prsync_file_node +description: run prsync -o to copy file from MN to CN +os:Linux cmd: echo "prsync-test" > prsync.test check:rc==0 cmd:prsync prsync.test $$CN:/tmp/ diff --git a/xCAT-test/autotest/testcase/psh/cases0 b/xCAT-test/autotest/testcase/psh/cases0 index d65fde5b5..02b636f71 100644 --- a/xCAT-test/autotest/testcase/psh/cases0 +++ b/xCAT-test/autotest/testcase/psh/cases0 @@ -1,4 +1,6 @@ start:psh_h +description: psh -h and psh -help +os:Linux cmd:psh -h check:rc==0 check:output=~Usage @@ -8,17 +10,16 @@ check:output=~Usage end start:psh_v +description: psh -v +os:Linux cmd:psh -v -check:rc==0 -end - -start:psh_i -cmd:psh -i __GETNODEATTR($$CN,mgtifname)__ $$CN 'uptime' +check:output=~Version check:rc==0 end start:psh_node_cmd_linux -os:Aix +description: psh CN 'pwd' in linux +os:Linux cmd:psh $$CN 'pwd' check:rc==0 check:output=~$$CN @@ -26,7 +27,8 @@ check:output=~/ end start:psh_node_cmd_aix -os:Linux +description: psh CN 'pwd' in AIX +os:Aix cmd:psh $$CN 'pwd' check:rc==0 check:output=~$$CN From e218b9b06b37b160daf10af18864970ab86882bb Mon Sep 17 00:00:00 2001 From: caomengmeng Date: Tue, 10 Jan 2017 03:49:32 -0500 Subject: [PATCH 2/5] update after review --- xCAT-test/autotest/testcase/prsync/cases0 | 4 ++-- xCAT-test/autotest/testcase/psh/cases0 | 17 +++++++++++++++++ 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/xCAT-test/autotest/testcase/prsync/cases0 b/xCAT-test/autotest/testcase/prsync/cases0 index 45a99984b..2bbdd053c 100644 --- a/xCAT-test/autotest/testcase/prsync/cases0 +++ b/xCAT-test/autotest/testcase/prsync/cases0 @@ -15,7 +15,7 @@ check:output=~Version end start:prsync_dir_node -description: run prsync -o to copy files in dir from MN to CN +description: run prsync to copy files in dir from MN to CN os:Linux cmd: mkdir -p /tmp/pscp check:rc==0 @@ -40,7 +40,7 @@ check:rc==0 end start:prsync_file_node -description: run prsync -o to copy file from MN to CN +description: run prsync to copy file from MN to CN os:Linux cmd: echo "prsync-test" > prsync.test check:rc==0 diff --git a/xCAT-test/autotest/testcase/psh/cases0 b/xCAT-test/autotest/testcase/psh/cases0 index 02b636f71..686c49b47 100644 --- a/xCAT-test/autotest/testcase/psh/cases0 +++ b/xCAT-test/autotest/testcase/psh/cases0 @@ -35,3 +35,20 @@ check:output=~$$CN check:output=~/root end +start:psh_l +description: psh -l user CN 'uptime' in linux +os:Linux +cmd:psh -l root $$CN 'uptime' +check:rc==0 +check:output=~$$CN +end + + +start:psh_i +description: psh -i interface CN 'uptime' in linux +os:Linux +cmd:interface=`xdsh $$CN 'ifconfig' | sed -n 1p | awk -F : '{print $2}' | awk -F ' ' '{print $1}'`;sed -i "s/com $$CN/com $$CN $$CN-$interface/g" '/etc/hosts';psh -i $interface $$CN 'uptime' +check:output=~$$CN +check:rc==0 +end + From ea87a2bacbdc765d894714fc9b08179ff834e1ad Mon Sep 17 00:00:00 2001 From: caomengmeng Date: Tue, 10 Jan 2017 03:51:50 -0500 Subject: [PATCH 3/5] update checkout commands --- xCAT-test/autotest/testcase/prsync/cases0 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xCAT-test/autotest/testcase/prsync/cases0 b/xCAT-test/autotest/testcase/prsync/cases0 index 2bbdd053c..3d2120028 100644 --- a/xCAT-test/autotest/testcase/prsync/cases0 +++ b/xCAT-test/autotest/testcase/prsync/cases0 @@ -23,7 +23,7 @@ cmd:echo "test" > /tmp/pscp/pscp.tmp check:rc==0 cmd:prsync -o "crz" /tmp/pscp $$CN:/tmp/ check:rc==0 -check:$$CN: done +check:output=~$$CN: done cmd:xdsh $$CN "ls -l /tmp |grep pscp" check:rc==0 check:output=~pscp @@ -46,7 +46,7 @@ cmd: echo "prsync-test" > prsync.test check:rc==0 cmd:prsync prsync.test $$CN:/tmp/ check:rc==0 -check:$$CN: done +check:output=~$$CN: done cmd:xdsh $$CN "ls -l /tmp |grep prsync.test" check:rc==0 check:output=~prsync.test From 1724c7ea0462abbdae6cdef39d2881bf267b293b Mon Sep 17 00:00:00 2001 From: caomengmeng Date: Wed, 11 Jan 2017 02:49:09 -0500 Subject: [PATCH 4/5] completed --- xCAT-test/autotest/testcase/psh/cases0 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/xCAT-test/autotest/testcase/psh/cases0 b/xCAT-test/autotest/testcase/psh/cases0 index 686c49b47..24b24b120 100644 --- a/xCAT-test/autotest/testcase/psh/cases0 +++ b/xCAT-test/autotest/testcase/psh/cases0 @@ -47,8 +47,13 @@ end start:psh_i description: psh -i interface CN 'uptime' in linux os:Linux +cmd:cp /etc/hosts /etc/hostsBK +check:rc==0 cmd:interface=`xdsh $$CN 'ifconfig' | sed -n 1p | awk -F : '{print $2}' | awk -F ' ' '{print $1}'`;sed -i "s/com $$CN/com $$CN $$CN-$interface/g" '/etc/hosts';psh -i $interface $$CN 'uptime' check:output=~$$CN check:rc==0 +cmd:rm -rf /etc/hosts +cmd:cp /etc/hostsBK /etc/hosts +check:rc==0 end From d6e19230feafa02098607be2104b9b380f001f7f Mon Sep 17 00:00:00 2001 From: caomengmeng Date: Wed, 11 Jan 2017 02:58:27 -0500 Subject: [PATCH 5/5] add cases to bundle files --- xCAT-test/autotest/bundle/rhels6.8_ppc64.bundle | 9 +++++++++ xCAT-test/autotest/bundle/rhels6.8_x86_64.bundle | 9 +++++++++ xCAT-test/autotest/bundle/rhels7.2_ppc64.bundle | 9 +++++++++ xCAT-test/autotest/bundle/rhels7.2_ppc64le.bundle | 9 +++++++++ xCAT-test/autotest/bundle/rhels7.2_x86_64.bundle | 9 +++++++++ xCAT-test/autotest/bundle/rhels7.3_ppc64.bundle | 9 +++++++++ xCAT-test/autotest/bundle/rhels7.3_ppc64le.bundle | 9 +++++++++ xCAT-test/autotest/bundle/rhels7.3_x86_64.bundle | 9 +++++++++ xCAT-test/autotest/bundle/sles11.4_ppc64.bundle | 9 +++++++++ xCAT-test/autotest/bundle/sles11.4_x86_64.bundle | 9 +++++++++ xCAT-test/autotest/bundle/sles12.1_ppc64le.bundle | 9 +++++++++ xCAT-test/autotest/bundle/sles12.1_x86_64.bundle | 9 +++++++++ xCAT-test/autotest/bundle/sles12.2_ppc64le.bundle | 9 +++++++++ xCAT-test/autotest/bundle/sles12.2_x86_64.bundle | 9 +++++++++ xCAT-test/autotest/bundle/ubuntu14.04.4_ppc64le.bundle | 9 +++++++++ xCAT-test/autotest/bundle/ubuntu14.04.4_x86_64.bundle | 9 +++++++++ xCAT-test/autotest/bundle/ubuntu16.04.1_ppc64le.bundle | 9 +++++++++ xCAT-test/autotest/bundle/ubuntu16.04.1_x86_64.bundle | 9 +++++++++ 18 files changed, 162 insertions(+) diff --git a/xCAT-test/autotest/bundle/rhels6.8_ppc64.bundle b/xCAT-test/autotest/bundle/rhels6.8_ppc64.bundle index a3693a1f2..3d27a17b1 100644 --- a/xCAT-test/autotest/bundle/rhels6.8_ppc64.bundle +++ b/xCAT-test/autotest/bundle/rhels6.8_ppc64.bundle @@ -265,6 +265,15 @@ xdsh_t xdsh_q xdsh_T xdsh_o +psh_h +psh_v +psh_node_cmd_linux +psh_l +psh_i +prsync_h +prsync_v +prsync_dir_node +prsync_file_node switchdiscover_range_default switchdiscover_h switchdiscover_range_s diff --git a/xCAT-test/autotest/bundle/rhels6.8_x86_64.bundle b/xCAT-test/autotest/bundle/rhels6.8_x86_64.bundle index 1efa04506..96f9b67e8 100644 --- a/xCAT-test/autotest/bundle/rhels6.8_x86_64.bundle +++ b/xCAT-test/autotest/bundle/rhels6.8_x86_64.bundle @@ -192,6 +192,15 @@ xdsh_t xdsh_q xdsh_T xdsh_o +psh_h +psh_v +psh_node_cmd_linux +psh_l +psh_i +prsync_h +prsync_v +prsync_dir_node +prsync_file_node switchdiscover_range_default switchdiscover_h switchdiscover_range_s diff --git a/xCAT-test/autotest/bundle/rhels7.2_ppc64.bundle b/xCAT-test/autotest/bundle/rhels7.2_ppc64.bundle index a3693a1f2..3d27a17b1 100644 --- a/xCAT-test/autotest/bundle/rhels7.2_ppc64.bundle +++ b/xCAT-test/autotest/bundle/rhels7.2_ppc64.bundle @@ -265,6 +265,15 @@ xdsh_t xdsh_q xdsh_T xdsh_o +psh_h +psh_v +psh_node_cmd_linux +psh_l +psh_i +prsync_h +prsync_v +prsync_dir_node +prsync_file_node switchdiscover_range_default switchdiscover_h switchdiscover_range_s diff --git a/xCAT-test/autotest/bundle/rhels7.2_ppc64le.bundle b/xCAT-test/autotest/bundle/rhels7.2_ppc64le.bundle index b59fd61ce..72e0bfe20 100644 --- a/xCAT-test/autotest/bundle/rhels7.2_ppc64le.bundle +++ b/xCAT-test/autotest/bundle/rhels7.2_ppc64le.bundle @@ -194,6 +194,15 @@ xdsh_t xdsh_q xdsh_T xdsh_o +psh_h +psh_v +psh_node_cmd_linux +psh_l +psh_i +prsync_h +prsync_v +prsync_dir_node +prsync_file_node switchdiscover_range_default switchdiscover_h switchdiscover_range_s diff --git a/xCAT-test/autotest/bundle/rhels7.2_x86_64.bundle b/xCAT-test/autotest/bundle/rhels7.2_x86_64.bundle index 60987c4ba..1457aa03f 100644 --- a/xCAT-test/autotest/bundle/rhels7.2_x86_64.bundle +++ b/xCAT-test/autotest/bundle/rhels7.2_x86_64.bundle @@ -192,6 +192,15 @@ xdsh_t xdsh_q xdsh_T xdsh_o +psh_h +psh_v +psh_node_cmd_linux +psh_l +psh_i +prsync_h +prsync_v +prsync_dir_node +prsync_file_node switchdiscover_range_default switchdiscover_h switchdiscover_range_s diff --git a/xCAT-test/autotest/bundle/rhels7.3_ppc64.bundle b/xCAT-test/autotest/bundle/rhels7.3_ppc64.bundle index a3693a1f2..3d27a17b1 100644 --- a/xCAT-test/autotest/bundle/rhels7.3_ppc64.bundle +++ b/xCAT-test/autotest/bundle/rhels7.3_ppc64.bundle @@ -265,6 +265,15 @@ xdsh_t xdsh_q xdsh_T xdsh_o +psh_h +psh_v +psh_node_cmd_linux +psh_l +psh_i +prsync_h +prsync_v +prsync_dir_node +prsync_file_node switchdiscover_range_default switchdiscover_h switchdiscover_range_s diff --git a/xCAT-test/autotest/bundle/rhels7.3_ppc64le.bundle b/xCAT-test/autotest/bundle/rhels7.3_ppc64le.bundle index e5b2e18bf..1b3103b19 100644 --- a/xCAT-test/autotest/bundle/rhels7.3_ppc64le.bundle +++ b/xCAT-test/autotest/bundle/rhels7.3_ppc64le.bundle @@ -194,6 +194,15 @@ xdsh_t xdsh_q xdsh_T xdsh_o +psh_h +psh_v +psh_node_cmd_linux +psh_l +psh_i +prsync_h +prsync_v +prsync_dir_node +prsync_file_node switchdiscover_range_default switchdiscover_h switchdiscover_range_s diff --git a/xCAT-test/autotest/bundle/rhels7.3_x86_64.bundle b/xCAT-test/autotest/bundle/rhels7.3_x86_64.bundle index b06475ed0..497756717 100644 --- a/xCAT-test/autotest/bundle/rhels7.3_x86_64.bundle +++ b/xCAT-test/autotest/bundle/rhels7.3_x86_64.bundle @@ -198,6 +198,15 @@ xdsh_t xdsh_q xdsh_T xdsh_o +psh_h +psh_v +psh_node_cmd_linux +psh_l +psh_i +prsync_h +prsync_v +prsync_dir_node +prsync_file_node switchdiscover_range_default switchdiscover_h switchdiscover_range_s diff --git a/xCAT-test/autotest/bundle/sles11.4_ppc64.bundle b/xCAT-test/autotest/bundle/sles11.4_ppc64.bundle index 6084ed160..66b390c1d 100644 --- a/xCAT-test/autotest/bundle/sles11.4_ppc64.bundle +++ b/xCAT-test/autotest/bundle/sles11.4_ppc64.bundle @@ -247,6 +247,15 @@ xdsh_t xdsh_q xdsh_T xdsh_o +psh_h +psh_v +psh_node_cmd_linux +psh_l +psh_i +prsync_h +prsync_v +prsync_dir_node +prsync_file_node switchdiscover_range_default switchdiscover_h switchdiscover_range_s diff --git a/xCAT-test/autotest/bundle/sles11.4_x86_64.bundle b/xCAT-test/autotest/bundle/sles11.4_x86_64.bundle index b0129f2f0..620a1d9a4 100644 --- a/xCAT-test/autotest/bundle/sles11.4_x86_64.bundle +++ b/xCAT-test/autotest/bundle/sles11.4_x86_64.bundle @@ -196,6 +196,15 @@ xdsh_t xdsh_q xdsh_T xdsh_o +psh_h +psh_v +psh_node_cmd_linux +psh_l +psh_i +prsync_h +prsync_v +prsync_dir_node +prsync_file_node switchdiscover_range_default switchdiscover_h switchdiscover_range_s diff --git a/xCAT-test/autotest/bundle/sles12.1_ppc64le.bundle b/xCAT-test/autotest/bundle/sles12.1_ppc64le.bundle index 8eba88837..65ff91ea2 100644 --- a/xCAT-test/autotest/bundle/sles12.1_ppc64le.bundle +++ b/xCAT-test/autotest/bundle/sles12.1_ppc64le.bundle @@ -200,6 +200,15 @@ xdsh_t xdsh_q xdsh_T xdsh_o +psh_h +psh_v +psh_node_cmd_linux +psh_l +psh_i +prsync_h +prsync_v +prsync_dir_node +prsync_file_node switchdiscover_range_default switchdiscover_h switchdiscover_range_s diff --git a/xCAT-test/autotest/bundle/sles12.1_x86_64.bundle b/xCAT-test/autotest/bundle/sles12.1_x86_64.bundle index 3efef26d7..4003012a6 100644 --- a/xCAT-test/autotest/bundle/sles12.1_x86_64.bundle +++ b/xCAT-test/autotest/bundle/sles12.1_x86_64.bundle @@ -196,6 +196,15 @@ xdsh_t xdsh_q xdsh_T xdsh_o +psh_h +psh_v +psh_node_cmd_linux +psh_l +psh_i +prsync_h +prsync_v +prsync_dir_node +prsync_file_node switchdiscover_range_default switchdiscover_h switchdiscover_range_s diff --git a/xCAT-test/autotest/bundle/sles12.2_ppc64le.bundle b/xCAT-test/autotest/bundle/sles12.2_ppc64le.bundle index 8eba88837..65ff91ea2 100644 --- a/xCAT-test/autotest/bundle/sles12.2_ppc64le.bundle +++ b/xCAT-test/autotest/bundle/sles12.2_ppc64le.bundle @@ -200,6 +200,15 @@ xdsh_t xdsh_q xdsh_T xdsh_o +psh_h +psh_v +psh_node_cmd_linux +psh_l +psh_i +prsync_h +prsync_v +prsync_dir_node +prsync_file_node switchdiscover_range_default switchdiscover_h switchdiscover_range_s diff --git a/xCAT-test/autotest/bundle/sles12.2_x86_64.bundle b/xCAT-test/autotest/bundle/sles12.2_x86_64.bundle index 3efef26d7..4003012a6 100644 --- a/xCAT-test/autotest/bundle/sles12.2_x86_64.bundle +++ b/xCAT-test/autotest/bundle/sles12.2_x86_64.bundle @@ -196,6 +196,15 @@ xdsh_t xdsh_q xdsh_T xdsh_o +psh_h +psh_v +psh_node_cmd_linux +psh_l +psh_i +prsync_h +prsync_v +prsync_dir_node +prsync_file_node switchdiscover_range_default switchdiscover_h switchdiscover_range_s diff --git a/xCAT-test/autotest/bundle/ubuntu14.04.4_ppc64le.bundle b/xCAT-test/autotest/bundle/ubuntu14.04.4_ppc64le.bundle index 714b7c4a4..be6932c9d 100644 --- a/xCAT-test/autotest/bundle/ubuntu14.04.4_ppc64le.bundle +++ b/xCAT-test/autotest/bundle/ubuntu14.04.4_ppc64le.bundle @@ -236,6 +236,15 @@ xdsh_t xdsh_q xdsh_T xdsh_o +psh_h +psh_v +psh_node_cmd_linux +psh_l +psh_i +prsync_h +prsync_v +prsync_dir_node +prsync_file_node switchdiscover_range_default switchdiscover_h switchdiscover_range_s diff --git a/xCAT-test/autotest/bundle/ubuntu14.04.4_x86_64.bundle b/xCAT-test/autotest/bundle/ubuntu14.04.4_x86_64.bundle index a260e16b7..72d300f72 100644 --- a/xCAT-test/autotest/bundle/ubuntu14.04.4_x86_64.bundle +++ b/xCAT-test/autotest/bundle/ubuntu14.04.4_x86_64.bundle @@ -244,6 +244,15 @@ xdsh_t xdsh_q xdsh_T xdsh_o +psh_h +psh_v +psh_node_cmd_linux +psh_l +psh_i +prsync_h +prsync_v +prsync_dir_node +prsync_file_node switchdiscover_range_default switchdiscover_h switchdiscover_range_s diff --git a/xCAT-test/autotest/bundle/ubuntu16.04.1_ppc64le.bundle b/xCAT-test/autotest/bundle/ubuntu16.04.1_ppc64le.bundle index 154fb92c9..74df70cbe 100644 --- a/xCAT-test/autotest/bundle/ubuntu16.04.1_ppc64le.bundle +++ b/xCAT-test/autotest/bundle/ubuntu16.04.1_ppc64le.bundle @@ -236,6 +236,15 @@ xdsh_t xdsh_q xdsh_T xdsh_o +psh_h +psh_v +psh_node_cmd_linux +psh_l +psh_i +prsync_h +prsync_v +prsync_dir_node +prsync_file_node switchdiscover_range_default switchdiscover_h switchdiscover_range_s diff --git a/xCAT-test/autotest/bundle/ubuntu16.04.1_x86_64.bundle b/xCAT-test/autotest/bundle/ubuntu16.04.1_x86_64.bundle index bbbfa0091..51decc528 100644 --- a/xCAT-test/autotest/bundle/ubuntu16.04.1_x86_64.bundle +++ b/xCAT-test/autotest/bundle/ubuntu16.04.1_x86_64.bundle @@ -244,6 +244,15 @@ xdsh_t xdsh_q xdsh_T xdsh_o +psh_h +psh_v +psh_node_cmd_linux +psh_l +psh_i +prsync_h +prsync_v +prsync_dir_node +prsync_file_node switchdiscover_range_default switchdiscover_h switchdiscover_range_s