Commit 73da0232 authored by Scott Feldman's avatar Scott Feldman Committed by Stefan Hajnoczi
Browse files

rocker: update tests using hw-derived interface names 



With previous patch to support phy name attribute for each port, the OS
can name port interfaces using the hw-derived name.  So update rocker
tests to use the new hw-derived interface names.

Signed-off-by: default avatarScott Feldman <sfeldma@gmail.com>
Reviewed-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
Message-id: 1433985681-56138-3-git-send-email-sfeldma@gmail.com
Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
parent 77349536

tests/rocker/bridge

+10 −15
Original line number Diff line number Diff line
@@ -9,8 +9,8 @@ while ! simp ssh tut h2 --cmd "ping -c 1 localhost >/dev/null"; do sleep 1; done 
# configure a 2-port bridge



simp ssh tut sw1 --cmd "sudo /sbin/ip link add name br0 type bridge"

simp ssh tut sw1 --cmd "sudo /sbin/ip link set dev swp1 master br0"

simp ssh tut sw1 --cmd "sudo /sbin/ip link set dev swp2 master br0"

simp ssh tut sw1 --cmd "sudo /sbin/ip link set dev sw1p1 master br0"

simp ssh tut sw1 --cmd "sudo /sbin/ip link set dev sw1p2 master br0"



# turn off vlan default_pvid on br0
@@ -18,28 +18,23 @@ simp ssh tut sw1 --cmd "echo 0 | sudo dd of=/sys/class/net/br0/bridge/default_pv 


# turn off learning and flooding in SW



simp ssh tut sw1 --cmd "sudo /sbin/bridge link set dev swp1 learning off"

simp ssh tut sw1 --cmd "sudo /sbin/bridge link set dev swp2 learning off"

simp ssh tut sw1 --cmd "sudo /sbin/bridge link set dev sw1p1 learning off"

simp ssh tut sw1 --cmd "sudo /sbin/bridge link set dev sw1p2 learning off"



simp ssh tut sw1 --cmd "sudo /sbin/bridge link set dev swp1 flood off"

simp ssh tut sw1 --cmd "sudo /sbin/bridge link set dev swp2 flood off"



# turn on learning in HW



simp ssh tut sw1 --cmd "sudo /sbin/bridge link set dev swp1 learning on self"

simp ssh tut sw1 --cmd "sudo /sbin/bridge link set dev swp2 learning on self"

simp ssh tut sw1 --cmd "sudo /sbin/bridge link set dev sw1p1 flood off"

simp ssh tut sw1 --cmd "sudo /sbin/bridge link set dev sw1p2 flood off"



# bring up bridge and ports



simp ssh tut sw1 --cmd "sudo ifconfig br0 up"

simp ssh tut sw1 --cmd "sudo ifconfig swp1 up"

simp ssh tut sw1 --cmd "sudo ifconfig swp2 up"

simp ssh tut sw1 --cmd "sudo ifconfig sw1p1 up"

simp ssh tut sw1 --cmd "sudo ifconfig sw1p2 up"

simp ssh tut sw1 --cmd "sudo ifconfig br0 11.0.0.3/24"



# config IP on hosts



simp ssh tut h1 --cmd "sudo ifconfig swp1 11.0.0.1/24"

simp ssh tut h2 --cmd "sudo ifconfig swp1 11.0.0.2/24"

simp ssh tut h1 --cmd "sudo ifconfig sw1p1 11.0.0.1/24"

simp ssh tut h2 --cmd "sudo ifconfig sw1p1 11.0.0.2/24"



# test...

tests/rocker/bridge-stp

+10 −15
Original line number Diff line number Diff line
@@ -10,8 +10,8 @@ while ! simp ssh tut h2 --cmd "ping -c 1 localhost >/dev/null"; do sleep 1; done 


simp ssh tut sw1 --cmd "sudo /sbin/ip link add name br0 type bridge"

simp ssh tut sw1 --cmd "sudo brctl stp br0 on"

simp ssh tut sw1 --cmd "sudo /sbin/ip link set dev swp1 master br0"

simp ssh tut sw1 --cmd "sudo /sbin/ip link set dev swp2 master br0"

simp ssh tut sw1 --cmd "sudo /sbin/ip link set dev sw1p1 master br0"

simp ssh tut sw1 --cmd "sudo /sbin/ip link set dev sw1p2 master br0"



# turn off vlan default_pvid on br0
@@ -19,27 +19,22 @@ simp ssh tut sw1 --cmd "echo 0 | sudo dd of=/sys/class/net/br0/bridge/default_pv 


# turn off learning and flooding in SW



simp ssh tut sw1 --cmd "sudo /sbin/bridge link set dev swp1 learning off"

simp ssh tut sw1 --cmd "sudo /sbin/bridge link set dev swp2 learning off"

simp ssh tut sw1 --cmd "sudo /sbin/bridge link set dev sw1p1 learning off"

simp ssh tut sw1 --cmd "sudo /sbin/bridge link set dev sw1p2 learning off"



simp ssh tut sw1 --cmd "sudo /sbin/bridge link set dev swp1 flood off"

simp ssh tut sw1 --cmd "sudo /sbin/bridge link set dev swp2 flood off"



# turn on learning in HW



simp ssh tut sw1 --cmd "sudo /sbin/bridge link set dev swp1 learning on self"

simp ssh tut sw1 --cmd "sudo /sbin/bridge link set dev swp2 learning on self"

simp ssh tut sw1 --cmd "sudo /sbin/bridge link set dev sw1p1 flood off"

simp ssh tut sw1 --cmd "sudo /sbin/bridge link set dev sw1p2 flood off"



# config IP on hosts



simp ssh tut h1 --cmd "sudo ifconfig swp1 11.0.0.1/24"

simp ssh tut h2 --cmd "sudo ifconfig swp1 11.0.0.2/24"

simp ssh tut h1 --cmd "sudo ifconfig sw1p1 11.0.0.1/24"

simp ssh tut h2 --cmd "sudo ifconfig sw1p1 11.0.0.2/24"



# bring up bridge and ports



simp ssh tut sw1 --cmd "sudo ifconfig br0 up"

simp ssh tut sw1 --cmd "sudo ifconfig swp1 up"

simp ssh tut sw1 --cmd "sudo ifconfig swp2 up"

simp ssh tut sw1 --cmd "sudo ifconfig sw1p1 up"

simp ssh tut sw1 --cmd "sudo ifconfig sw1p2 up"



# test...

tests/rocker/bridge-vlan

+16 −21
Original line number Diff line number Diff line
@@ -9,8 +9,8 @@ while ! simp ssh tut h2 --cmd "ping -c 1 localhost >/dev/null"; do sleep 1; done 
# configure a 2-port bridge



simp ssh tut sw1 --cmd "sudo /sbin/ip link add name br0 type bridge"

simp ssh tut sw1 --cmd "sudo /sbin/ip link set dev swp1 master br0"

simp ssh tut sw1 --cmd "sudo /sbin/ip link set dev swp2 master br0"

simp ssh tut sw1 --cmd "sudo /sbin/ip link set dev sw1p1 master br0"

simp ssh tut sw1 --cmd "sudo /sbin/ip link set dev sw1p2 master br0"



# turn off vlan default_pvid on br0

# turn on vlan filtering on br0
@@ -20,37 +20,32 @@ 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 swp1 master"

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

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"



# turn off learning and flooding in SW



simp ssh tut sw1 --cmd "sudo /sbin/bridge link set dev swp1 learning off"

simp ssh tut sw1 --cmd "sudo /sbin/bridge link set dev swp2 learning off"

simp ssh tut sw1 --cmd "sudo /sbin/bridge link set dev sw1p1 learning off"

simp ssh tut sw1 --cmd "sudo /sbin/bridge link set dev sw1p2 learning off"



simp ssh tut sw1 --cmd "sudo /sbin/bridge link set dev swp1 flood off"

simp ssh tut sw1 --cmd "sudo /sbin/bridge link set dev swp2 flood off"



# turn on learning in HW



simp ssh tut sw1 --cmd "sudo /sbin/bridge link set dev swp1 learning on self"

simp ssh tut sw1 --cmd "sudo /sbin/bridge link set dev swp2 learning on self"

simp ssh tut sw1 --cmd "sudo /sbin/bridge link set dev sw1p1 flood off"

simp ssh tut sw1 --cmd "sudo /sbin/bridge link set dev sw1p2 flood off"



# bring up bridge and ports



simp ssh tut sw1 --cmd "sudo ifconfig br0 up"

simp ssh tut sw1 --cmd "sudo ifconfig swp1 up"

simp ssh tut sw1 --cmd "sudo ifconfig swp2 up"

simp ssh tut sw1 --cmd "sudo ifconfig sw1p1 up"

simp ssh tut sw1 --cmd "sudo ifconfig sw1p2 up"



# config IP on host VLANs



simp ssh tut h1 --cmd "sudo vconfig add swp1 57 >/dev/null 2>&1"

simp ssh tut h1 --cmd "sudo ifconfig swp1 up"

simp ssh tut h1 --cmd "sudo ifconfig swp1.57 11.0.0.1/24"

simp ssh tut h1 --cmd "sudo vconfig add sw1p1 57 >/dev/null 2>&1"

simp ssh tut h1 --cmd "sudo ifconfig sw1p1 up"

simp ssh tut h1 --cmd "sudo ifconfig sw1p1.57 11.0.0.1/24"



simp ssh tut h2 --cmd "sudo vconfig add swp1 57 >/dev/null 2>&1"

simp ssh tut h2 --cmd "sudo ifconfig swp1 up"

simp ssh tut h2 --cmd "sudo ifconfig swp1.57 11.0.0.2/24"

simp ssh tut h2 --cmd "sudo vconfig add sw1p1 57 >/dev/null 2>&1"

simp ssh tut h2 --cmd "sudo ifconfig sw1p1 up"

simp ssh tut h2 --cmd "sudo ifconfig sw1p1.57 11.0.0.2/24"



# test...

tests/rocker/bridge-vlan-stp

+16 −21
Original line number Diff line number Diff line
@@ -10,8 +10,8 @@ while ! simp ssh tut h2 --cmd "ping -c 1 localhost >/dev/null"; do sleep 1; done 


simp ssh tut sw1 --cmd "sudo /sbin/ip link add name br0 type bridge"

simp ssh tut sw1 --cmd "sudo brctl stp br0 on"

simp ssh tut sw1 --cmd "sudo /sbin/ip link set dev swp1 master br0"

simp ssh tut sw1 --cmd "sudo /sbin/ip link set dev swp2 master br0"

simp ssh tut sw1 --cmd "sudo /sbin/ip link set dev sw1p1 master br0"

simp ssh tut sw1 --cmd "sudo /sbin/ip link set dev sw1p2 master br0"



# turn off vlan default_pvid on br0

# turn on vlan filtering on br0
@@ -21,37 +21,32 @@ 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 swp1 master"

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

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"



# turn off learning and flooding in SW



simp ssh tut sw1 --cmd "sudo /sbin/bridge link set dev swp1 learning off"

simp ssh tut sw1 --cmd "sudo /sbin/bridge link set dev swp2 learning off"

simp ssh tut sw1 --cmd "sudo /sbin/bridge link set dev sw1p1 learning off"

simp ssh tut sw1 --cmd "sudo /sbin/bridge link set dev sw1p2 learning off"



simp ssh tut sw1 --cmd "sudo /sbin/bridge link set dev swp1 flood off"

simp ssh tut sw1 --cmd "sudo /sbin/bridge link set dev swp2 flood off"



# turn on learning in HW



simp ssh tut sw1 --cmd "sudo /sbin/bridge link set dev swp1 learning on self"

simp ssh tut sw1 --cmd "sudo /sbin/bridge link set dev swp2 learning on self"

simp ssh tut sw1 --cmd "sudo /sbin/bridge link set dev sw1p1 flood off"

simp ssh tut sw1 --cmd "sudo /sbin/bridge link set dev sw1p2 flood off"



# config IP on host VLANs



simp ssh tut h1 --cmd "sudo vconfig add swp1 57 >/dev/null 2>&1"

simp ssh tut h1 --cmd "sudo ifconfig swp1 up"

simp ssh tut h1 --cmd "sudo ifconfig swp1.57 11.0.0.1/24"

simp ssh tut h1 --cmd "sudo vconfig add sw1p1 57 >/dev/null 2>&1"

simp ssh tut h1 --cmd "sudo ifconfig sw1p1 up"

simp ssh tut h1 --cmd "sudo ifconfig sw1p1.57 11.0.0.1/24"



simp ssh tut h2 --cmd "sudo vconfig add swp1 57 >/dev/null 2>&1"

simp ssh tut h2 --cmd "sudo ifconfig swp1 up"

simp ssh tut h2 --cmd "sudo ifconfig swp1.57 11.0.0.2/24"

simp ssh tut h2 --cmd "sudo vconfig add sw1p1 57 >/dev/null 2>&1"

simp ssh tut h2 --cmd "sudo ifconfig sw1p1 up"

simp ssh tut h2 --cmd "sudo ifconfig sw1p1.57 11.0.0.2/24"



# bring up bridge and ports



simp ssh tut sw1 --cmd "sudo ifconfig br0 up"

simp ssh tut sw1 --cmd "sudo ifconfig swp1 up"

simp ssh tut sw1 --cmd "sudo ifconfig swp2 up"

simp ssh tut sw1 --cmd "sudo ifconfig sw1p1 up"

simp ssh tut sw1 --cmd "sudo ifconfig sw1p2 up"



# test...

tests/rocker/port

+4 −4
Original line number Diff line number Diff line
@@ -7,13 +7,13 @@ while ! simp ssh tut h2 --cmd "ping -c 1 localhost >/dev/null"; do sleep 1; done 


# bring up DUT ports



simp ssh tut sw1 --cmd "sudo ifconfig swp1 11.0.0.1/24"

simp ssh tut sw1 --cmd "sudo ifconfig swp2 12.0.0.1/24"

simp ssh tut sw1 --cmd "sudo ifconfig sw1p1 11.0.0.1/24"

simp ssh tut sw1 --cmd "sudo ifconfig sw1p2 12.0.0.1/24"



# config IP on hosts



simp ssh tut h1 --cmd "sudo ifconfig swp1 11.0.0.2/24"

simp ssh tut h2 --cmd "sudo ifconfig swp1 12.0.0.2/24"

simp ssh tut h1 --cmd "sudo ifconfig sw1p1 11.0.0.2/24"

simp ssh tut h2 --cmd "sudo ifconfig sw1p1 12.0.0.2/24"



# test...