diff --git a/tests/p_vconfig/10_test_vconfig.sh b/tests/p_vconfig/10_test_vconfig.sh index 7c244e4..192b853 100755 --- a/tests/p_vconfig/10_test_vconfig.sh +++ b/tests/p_vconfig/10_test_vconfig.sh @@ -5,52 +5,54 @@ t_Log "Running $0 - create VLAN IF, assign IP on VLAN IF and tear down VLAN IF test" ret_val=0 -if [ $centos_ver -lt 7 ] +if [ $centos_ver -gt 6 ] then - # create VLAN-IF 10 on eth0 - vconfig add eth0 10 - ip addr list | grep -q eth0.10 - if [ $? == 1 ] - then - t_Log "VLAN-IF creation failed" - ret_val=1 - else - t_Log "VLAN-IF successfully created" - fi + t_Log 'vconfig is only supported on C5 and C6, skipping' + t_CheckExitStatus $ret_val + exit 0 +fi + +# create VLAN-IF 10 on eth0 +vconfig add eth0 10 +ip addr list | grep -q eth0.10 +if [ $? == 1 ] + then + t_Log "VLAN-IF creation failed" + ret_val=1 +else + t_Log "VLAN-IF successfully created" +fi - #assign IP address on VLAN-IF - ifconfig eth0.10 172.16.30.1 netmask 255.255.255.255 - ip addr list | grep -q 172.16.30.1 - if [ $? == 1 ] - then - t_Log "IP address assignment on eth0.10 failed" - ret_val=1 - else - t_Log "IP address successfully assigned on eth1.10" - fi +#assign IP address on VLAN-IF +ifconfig eth0.10 172.16.30.1 netmask 255.255.255.255 +ip addr list | grep -q 172.16.30.1 +if [ $? == 1 ] + then + t_Log "IP address assignment on eth0.10 failed" + ret_val=1 +else + t_Log "IP address successfully assigned on eth1.10" +fi - #testing address with ping - ping -c 4 -q 172.16.30.1 | grep -q '4 received' - if [ $? == 1 ] - then - t_Log "pinging on eth0.10 failed" - ret_val=1 - else - t_Log "local ping on VLAN IF worked" - fi +#testing address with ping +ping -c 4 -q 172.16.30.1 | grep -q '4 received' +if [ $? == 1 ] + then + t_Log "pinging on eth0.10 failed" + ret_val=1 +else + t_Log "local ping on VLAN IF worked" +fi - # delete VLAN-IF 10 on eth0 - vconfig rem eth0.10 - ip addr list | grep -q eth0.10 - if [ $? == 0 ] - then - t_Log "Removing VLAN IF failed" - ret_val=1 - else - t_Log "Removing of VLAN IF worked" - fi +# delete VLAN-IF 10 on eth0 +vconfig rem eth0.10 +ip addr list | grep -q eth0.10 +if [ $? == 0 ] + then + t_Log "Removing VLAN IF failed" + ret_val=1 else - t_Log 'vconfig is only supported on C5 and C6, skipping' + t_Log "Removing of VLAN IF worked" fi t_CheckExitStatus $ret_val