Execution time: 4.308s
Execution time on "main" branch: 3.170s
Signed-off-by: Mark Michelson <mmich...@redhat.com>
---
tests/ovn.at | 49 +++++++++++++++++++++++++++++--------------------
1 file changed, 29 insertions(+), 20 deletions(-)
diff --git a/tests/ovn.at b/tests/ovn.at
index e3568b171..b8156caec 100644
--- a/tests/ovn.at
+++ b/tests/ovn.at
@@ -6384,6 +6384,7 @@ AT_CLEANUP
OVN_FOR_EACH_NORTHD([
AT_SETUP([2 HVs, 3 LRs connected via LS, static routes])
+AT_SKIP_IF([test $HAVE_SCAPY = no])
ovn_start
# Logical network:
@@ -6493,20 +6494,24 @@ wait_for_ports_up
check ovn-nbctl --wait=hv sync
# Send ip packets between foo1 and alice1
-src_mac="f00000010203"
-dst_mac="000001010203"
-src_ip=`ip_to_hex 192 168 1 2`
-dst_ip=`ip_to_hex 172 16 1 2`
-packet=${dst_mac}${src_mac}08004500001c0000000040110000${src_ip}${dst_ip}0035111100080000
+src_mac="f0:00:00:01:02:03"
+dst_mac="00:00:01:01:02:03"
+src_ip=192.168.1.2
+dst_ip=172.16.1.2
+packet=$(fmt_pkt "Ether(dst='${dst_mac}', src='${src_mac}')/ \
+ IP(src='${src_ip}', dst='${dst_ip}')/ \
+ UDP(sport=53, dport=4369)")
as hv1 ovs-appctl netdev-dummy/receive hv1-vif1 $packet
as hv1 ovs-appctl ofproto/trace br-int in_port=1 $packet
# Send ip packets between foo1 and bob1
-src_mac="f00000010203"
-dst_mac="000001010203"
-src_ip=`ip_to_hex 192 168 1 2`
-dst_ip=`ip_to_hex 10 32 1 2`
-packet=${dst_mac}${src_mac}08004500001c0000000040110000${src_ip}${dst_ip}0035111100080000
+src_mac="f0:00:00:01:02:03"
+dst_mac="00:00:01:01:02:03"
+src_ip=192.168.1.2
+dst_ip=10.32.1.2
+packet=$(fmt_pkt "Ether(dst='${dst_mac}', src='${src_mac}')/ \
+ IP(src='${src_ip}', dst='${dst_ip}')/ \
+ UDP(sport=53, dport=4369)")
as hv1 ovs-appctl netdev-dummy/receive hv1-vif1 $packet
echo "---------NB dump-----"
@@ -6534,20 +6539,24 @@ as hv2 ovs-ofctl dump-flows br-int
echo "----------------------------"
# Packet to Expect at bob1
-src_mac="000003010203"
-dst_mac="f00000010205"
-src_ip=`ip_to_hex 192 168 1 2`
-dst_ip=`ip_to_hex 10 32 1 2`
-echo
"${dst_mac}${src_mac}08004500001c000000003e110200${src_ip}${dst_ip}0035111100080000"
> expected
+src_mac="00:00:03:01:02:03"
+dst_mac="f0:00:00:01:02:05"
+src_ip=192.168.1.2
+dst_ip=10.32.1.2
+echo $(fmt_pkt "Ether(dst='${dst_mac}', src='${src_mac}')/ \
+ IP(src='${src_ip}', dst='${dst_ip}', ttl=0x3e)/ \
+ UDP(sport=53, dport=4369)") > expected
OVN_CHECK_PACKETS([hv2/vif1-tx.pcap], [expected])
# Packet to Expect at alice1
-src_mac="000002010203"
-dst_mac="f00000010204"
-src_ip=`ip_to_hex 192 168 1 2`
-dst_ip=`ip_to_hex 172 16 1 2`
-echo
"${dst_mac}${src_mac}08004500001c000000003e110200${src_ip}${dst_ip}0035111100080000"
> expected
+src_mac="00:00:02:01:02:03"
+dst_mac="f0:00:00:01:02:04"
+src_ip=192.168.1.2
+dst_ip=172.16.1.2
+echo $(fmt_pkt "Ether(dst='${dst_mac}', src='${src_mac}')/ \
+ IP(src='${src_ip}', dst='${dst_ip}', ttl=0x3e)/ \
+ UDP(sport=53, dport=4369)") > expected
OVN_CHECK_PACKETS([hv1/vif2-tx.pcap], [expected])
--
2.40.1
_______________________________________________
dev mailing list
d...@openvswitch.org
https://mail.openvswitch.org/mailman/listinfo/ovs-dev
