Skip to content

Commit

Permalink
smoke: use different macs for the linux net devs
Browse files Browse the repository at this point in the history
Make it easier to distinguish the br side from the linux side by using
different mac addresses.

Signed-off-by: Robin Jarry <[email protected]>
  • Loading branch information
rjarry committed Jun 6, 2024
1 parent f8f6f2e commit 790c36b
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 10 deletions.
5 changes: 3 additions & 2 deletions smoke/ip_forward_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
p0=${run_id}0
p1=${run_id}1

br-cli add interface port $p0 devargs net_tap0,iface=$p0
br-cli add interface port $p1 devargs net_tap1,iface=$p1
br-cli add interface port $p0 devargs net_tap0,iface=$p0 mac f0:0d:ac:dc:00:01
br-cli add interface port $p1 devargs net_tap1,iface=$p1 mac f0:0d:ac:dc:00:02
br-cli add ip address 172.16.0.1/24 iface $p0
br-cli add ip address 172.16.1.1/24 iface $p1

Expand All @@ -17,6 +17,7 @@ for n in 0 1; do
ip netns add $p
echo ip netns del $p >> $tmp/cleanup
ip link set $p netns $p
ip -n $p link set $p address ba:d0:ca:ca:00:0$n
ip -n $p link set $p up
ip -n $p addr add 172.16.$n.2/24 dev $p
ip -n $p route add default via 172.16.$n.1
Expand Down
8 changes: 6 additions & 2 deletions smoke/ipip_encap_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ p0=${run_id}0
p1=${run_id}1
iptun=${run_id}tun1

br-cli add interface port $p0 devargs net_tap0,iface=$p0
br-cli add interface port $p1 devargs net_tap1,iface=$p1
br-cli add interface port $p0 devargs net_tap0,iface=$p0 mac f0:0d:ac:dc:00:01
br-cli add interface port $p1 devargs net_tap1,iface=$p1 mac f0:0d:ac:dc:00:02
br-cli add ip address 10.99.0.1/24 iface $p0
br-cli add ip address 172.16.1.1/24 iface $p1
br-cli add interface ipip $iptun local 172.16.1.1 remote 172.16.1.2
Expand All @@ -18,19 +18,23 @@ br-cli add ip address 10.98.0.1/24 iface $iptun
ip netns add $p0
echo ip netns del $p0 >> $tmp/cleanup
ip link set $p0 netns $p0
ip -n $p0 link set $p0 address ba:d0:ca:ca:00:01
ip -n $p0 link set $p0 up
ip -n $p0 addr add 10.99.0.2/24 dev $p0
ip -n $p0 route add default via 10.99.0.1
ip -n $p0 addr show

ip netns add $p1
echo ip netns del $p1 >> $tmp/cleanup
ip link set $p1 netns $p1
ip -n $p1 link set $p1 address ba:d0:ca:ca:00:02
ip -n $p1 link set $p1 up
ip -n $p1 addr add 172.16.1.2/24 dev $p1
ip -n $p1 tunnel add $iptun mode ipip local 172.16.1.2 remote 172.16.1.1
ip -n $p1 link set $iptun up
ip -n $p1 addr add 10.98.0.2/24 dev $iptun
ip -n $p1 route add default via 10.98.0.1
ip -n $p1 addr show

ip netns exec $p0 ping -i0.01 -c3 10.98.0.2
ip netns exec $p1 ping -i0.01 -c3 10.99.0.2
5 changes: 3 additions & 2 deletions smoke/vlan_forward_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ p1=${run_id}1
v0=$p0.42
v1=$p1.43

br-cli add interface port $p0 devargs net_tap0,iface=$p0
br-cli add interface port $p1 devargs net_tap1,iface=$p1
br-cli add interface port $p0 devargs net_tap0,iface=$p0 mac f0:0d:ac:dc:00:01
br-cli add interface port $p1 devargs net_tap1,iface=$p1 mac f0:0d:ac:dc:00:02
br-cli add interface vlan $v0 parent $p0 vlan_id 42
br-cli add interface vlan $v1 parent $p1 vlan_id 43
br-cli add ip address 172.16.0.1/24 iface $v0
Expand All @@ -23,6 +23,7 @@ for n in 0 1; do
echo ip netns del $p >> $tmp/cleanup
ip link set $p netns $p
ip -n $p link add $v link $p type vlan id $((n+42))
ip -n $p link set $p address ba:d0:ca:ca:00:0$n
ip -n $p link set $p up
ip -n $p link set $v up
ip -n $p addr add 172.16.$n.2/24 dev $v
Expand Down
10 changes: 6 additions & 4 deletions smoke/vrf_forward_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ p1=${run_id}1
p2=${run_id}2
p3=${run_id}3

br-cli add interface port $p0 devargs net_tap0,iface=$p0 vrf 1
br-cli add interface port $p1 devargs net_tap1,iface=$p1 vrf 1
br-cli add interface port $p2 devargs net_tap2,iface=$p2 vrf 2
br-cli add interface port $p3 devargs net_tap3,iface=$p3 vrf 2
br-cli add interface port $p0 devargs net_tap0,iface=$p0 vrf 1 mac f0:0d:ac:dc:01:01
br-cli add interface port $p1 devargs net_tap1,iface=$p1 vrf 1 mac f0:0d:ac:dc:01:02
br-cli add interface port $p2 devargs net_tap2,iface=$p2 vrf 2 mac f0:0d:ac:dc:02:01
br-cli add interface port $p3 devargs net_tap3,iface=$p3 vrf 2 mac f0:0d:ac:dc:02:02
br-cli add ip address 172.16.0.1/24 iface $p0
br-cli add ip address 172.16.1.1/24 iface $p1
br-cli add ip address 172.16.0.1/24 iface $p2
Expand All @@ -23,6 +23,7 @@ for n in 0 1; do
ip netns add $p
echo ip netns del $p >> $tmp/cleanup
ip link set $p netns $p
ip -n $p link set $p address ba:d0:ca:ca:01:0$n
ip -n $p link set $p up
ip -n $p addr add 172.16.$((n % 2)).2/24 dev $p
ip -n $p route add default via 172.16.$((n % 2)).1
Expand All @@ -35,6 +36,7 @@ for n in 2 3; do
ip netns add $p
echo ip netns del $p >> $tmp/cleanup
ip link set $p netns $p
ip -n $p link set $p address ba:d0:ca:ca:02:0$n
ip -n $p link set $p up
ip -n $p addr add 172.16.$((n % 2)).2/24 dev $p
ip -n $p route add default via 172.16.$((n % 2)).1
Expand Down

0 comments on commit 790c36b

Please sign in to comment.