Revisão | ff0dd5ed9efc45138813c1d2dde7f64b287d54cd (tree) |
---|---|
Hora | 2010-10-22 10:24:10 |
Autor | 6638678 <6638678@1ed6...> |
Commiter | 6638678 |
bug fix
git-svn-id: http://10.144.169.20/repos/um/branches/l7vsd-3.x-ramiel-epoll-cond@10402 1ed66053-1c2d-0410-8867-f7571e6e31d3
@@ -1,6 +1,6 @@ | ||
1 | 1 | #!/bin/bash |
2 | 2 | . ${SET_DEFAULT_CONF} |
3 | -\cp ./materials/C-10-IPv4v4-l7directord.cf ${L7DIRECTORD_CONF_DIR}/l7directord.cf | |
3 | +\cp ./materials/C-10-IPv6v6-l7directord.cf ${L7DIRECTORD_CONF_DIR}/l7directord.cf | |
4 | 4 | |
5 | 5 | VS="[::1]" |
6 | 6 | RS="[::1]" |
@@ -1,6 +1,6 @@ | ||
1 | 1 | #!/bin/bash |
2 | 2 | . ${SET_DEFAULT_CONF} |
3 | -\cp ./materials/C-8-IPv4v4-l7directord.cf ${L7DIRECTORD_CONF_DIR}/l7directord.cf | |
3 | +\cp ./materials/C-8-IPv6v6-l7directord.cf ${L7DIRECTORD_CONF_DIR}/l7directord.cf | |
4 | 4 | |
5 | 5 | VS="[::1]" |
6 | 6 | RS="[::1]" |
@@ -47,14 +47,13 @@ then | ||
47 | 47 | fi |
48 | 48 | |
49 | 49 | #Make 10M.dat in materials |
50 | -dd if=/dev/zero of=materials/10M.dat bs=1024 count=10240 | |
50 | +dd if=/dev/zero of=${TMP_DIR}/10M.dat bs=1024 count=10240 | |
51 | 51 | |
52 | 52 | #Get The File |
53 | -$WGET http://127.0.0.1:40001 --post-file materials/10M.dat -t 1 | |
53 | +$WGET http://127.0.0.1:40001 --post-file ${TMP_DIR}/10M.dat -t 1 | |
54 | 54 | if [ $? -ne 0 ] |
55 | 55 | then |
56 | 56 | echo "Test failed: $WGET http://127.0.0.1:40001 --post-file 10M.dat" |
57 | - \rm -f materials/10M.dat | |
58 | 57 | exit 1 |
59 | 58 | fi |
60 | 59 |
@@ -68,8 +67,6 @@ RET=`cat ${L7VS_LOG_DIR}/snmpagent-1-19-snmptrapd.log | grep -e "SNMPv2-SMI::e | ||
68 | 67 | if [ -z "${RET}" ] |
69 | 68 | then |
70 | 69 | echo "Test failed: cat ${L7VS_LOG_DIR}/snmpagent-1-19-snmptrapd.log" |
71 | - \rm -f materials/10M.dat | |
72 | 70 | exit 1 |
73 | 71 | fi |
74 | -\rm -f materials/10M.dat | |
75 | 72 | exit 0 |
@@ -47,14 +47,13 @@ then | ||
47 | 47 | fi |
48 | 48 | |
49 | 49 | #Make 10M.dat in materials |
50 | -dd if=/dev/zero of=materials/10M.dat bs=1024 count=10240 | |
50 | +dd if=/dev/zero of=${TMP_DIR}/10M.dat bs=1024 count=10240 | |
51 | 51 | |
52 | 52 | #Get The File |
53 | -$WGET http://127.0.0.1:40001 --post-file materials/10M.dat -t 1 | |
53 | +$WGET http://127.0.0.1:40001 --post-file ${TMP_DIR}/10M.dat -t 1 | |
54 | 54 | if [ $? -ne 0 ] |
55 | 55 | then |
56 | 56 | echo "Test failed: $WGET http://127.0.0.1:40001 --post-file 10M.dat" |
57 | - \rm -f materials/10M.dat | |
58 | 57 | exit 1 |
59 | 58 | fi |
60 | 59 | usleep 1000000 |
@@ -65,10 +64,7 @@ RET=`cat ${L7VS_LOG_DIR}/snmpagent-1-19-snmptrapd.log | grep -e "SNMPv2-SMI::e | ||
65 | 64 | if [ -z "${RET}" ] |
66 | 65 | then |
67 | 66 | echo "Test failed: cat ${L7VS_LOG_DIR}/snmpagent-1-19-snmptrapd.log" |
68 | - \rm -f materials/10M.dat | |
69 | 67 | exit 1 |
70 | 68 | fi |
71 | 69 | |
72 | -\rm -f materials/10M.dat | |
73 | - | |
74 | 70 | exit 0 |