Commit 849729bb authored Jul 01, 2015 by Scott Feldman Committed by Stefan Hajnoczi Jul 07, 2015

rocker: tests: don't need to specify master/self when setting vlans



4.1 Linux kernel doesn't require specifying "master" or "self" when setting
vlans on a port, so clean these up from the tests that use vlans.

Signed-off-by: Scott Feldman <sfeldma@gmail.com>
Message-id: 1435746792-41278-6-git-send-email-sfeldma@gmail.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>

parent d0d25558

tests/rocker/bridge-vlan

+2 −2

Original line number	Diff line number	Diff line
		@@ -20,8 +20,8 @@ simp ssh tut sw1 --cmd "echo 1 \| sudo dd of=/sys/class/net/br0/bridge/vlan_filte

		# add both ports to VLAN 57

		simp ssh tut sw1 --cmd "sudo /sbin/bridge vlan add vid 57 dev sw1p1 master self"
		simp ssh tut sw1 --cmd "sudo /sbin/bridge vlan add vid 57 dev sw1p2 master self"
		simp ssh tut sw1 --cmd "sudo /sbin/bridge vlan add vid 57 dev sw1p1"
		simp ssh tut sw1 --cmd "sudo /sbin/bridge vlan add vid 57 dev sw1p2"

		# turn off learning and flooding in SW

tests/rocker/bridge-vlan-stp

+2 −2

Original line number	Diff line number	Diff line
		@@ -21,8 +21,8 @@ simp ssh tut sw1 --cmd "echo 1 \| sudo dd of=/sys/class/net/br0/bridge/vlan_filte

		# add both ports to VLAN 57

		simp ssh tut sw1 --cmd "sudo /sbin/bridge vlan add vid 57 dev sw1p1 master self"
		simp ssh tut sw1 --cmd "sudo /sbin/bridge vlan add vid 57 dev sw1p2 master self"
		simp ssh tut sw1 --cmd "sudo /sbin/bridge vlan add vid 57 dev sw1p1"
		simp ssh tut sw1 --cmd "sudo /sbin/bridge vlan add vid 57 dev sw1p2"

		# turn off learning and flooding in SW