From 8c8b64f563853cbe8db1c8667cb747db034f7496 Mon Sep 17 00:00:00 2001
From: Christoph Galuschka <christoph.galuschka@chello.at>
Date: Dec 29 2013 11:55:17 +0000
Subject: changed test to also run on EL-versions > 6


---

diff --git a/tests/p_network/networking_vlan_test.sh b/tests/p_network/networking_vlan_test.sh
index 79ab3a9..97c1e07 100755
--- a/tests/p_network/networking_vlan_test.sh
+++ b/tests/p_network/networking_vlan_test.sh
@@ -1,56 +1,57 @@
 #!/bin/sh
 # Author: Christoph Galuschka <christoph.galuschka@chello.at>
 
-t_Log "Running $0 - create VLAN IF, assign IP on VLAN IF and tear down VLAN IF using IP command test (C6 only)"
+t_Log "Running $0 - create VLAN IF, assign IP on VLAN IF and tear down VLAN IF using IP command test (not on C5)"
 ret_val=0
 
-if [ $centos_ver == 6 ]
+if [ $centos_ver -lt 6 ]
+then
+  t_Log ' This is a C5 system, skipping test'
+  exit 0
+fi  
+
+t_Log 'This is no C5-system, commencing test'
+# create VLAN-IF 10 on eth0
+ip link add dev eth0.10 link eth0 type vlan id 10
+ip addr list | grep -q eth0.10
+if [ $? == 1 ]
   then
-  t_Log 'This is  a C6-system, commencing test'
-  # create VLAN-IF 10 on eth0
-  ip link add dev eth0.10 link eth0 type vlan id 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 "VLAN-IF creation failed"
+  ret_val=1
+else
+  t_Log "VLAN-IF successfully created"
+fi
 
-  #assign IP address on VLAN-IF
-  ip address add 172.16.30.1/32 dev eth0.10
-  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
+ip address add 172.16.30.1/32 dev eth0.10
+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
-  ip link delete 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
+ip link delete eth0.10
+ip addr list | grep -q eth0.10
+if [ $? == 0 ]
+  then
+  t_Log "Removing VLAN IF failed"
+  ret_val=1
 else
-  t_Log ' This is a C5 system, skipping test'
+  t_Log "Removing of VLAN IF worked"
 fi
 
 t_CheckExitStatus $ret_val