diff options
| author | Pravin B Shelar <pshelar@ovn.org> | 2016-03-24 11:04:57 -0700 |
|---|---|---|
| committer | Pravin B Shelar <pshelar@ovn.org> | 2016-03-24 11:37:26 -0700 |
| commit | 56e18591d40301f557ccdf081369e6389e0f4f9e (patch) | |
| tree | 17f8a2d9946e2980b59fb2417c66757d5d5cd57a | |
| parent | ec6c537986b4c7dc852575107e32184b33d974e8 (diff) | |
| download | openvswitch-56e18591d40301f557ccdf081369e6389e0f4f9e.tar.gz | |
tunnel-tests: Fix travis build failure.
Travis does not allow tcpdump utility which causes the neighbour
discovery and ARP verification tests failures. Following patch
fixes the issue by using ovs-pcap utility instead of tcpdump.
Suggested-by: Daniele Di Proietto <diproiettod@vmware.com>
Signed-off-by: Pravin B Shelar <pshelar@ovn.org>
Acked-by: Ben Pfaff <blp@ovn.org>
| -rw-r--r-- | tests/tunnel-push-pop-ipv6.at | 10 | ||||
| -rw-r--r-- | tests/tunnel-push-pop.at | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/tests/tunnel-push-pop-ipv6.at b/tests/tunnel-push-pop-ipv6.at index 94e61598e..ee8c48f4e 100644 --- a/tests/tunnel-push-pop-ipv6.at +++ b/tests/tunnel-push-pop-ipv6.at @@ -42,13 +42,13 @@ dnl Check Neighbour discovery. AT_CHECK([ovs-vsctl -- set Interface p0 options:pcap=p0.pcap]) AT_CHECK([ovs-appctl netdev-dummy/receive int-br 'in_port(2),eth(src=aa:55:aa:55:00:00,dst=f8:bc:12:ff:ff:ff),eth_type(0x0800),ipv4(src=1.1.3.92,dst=1.1.3.88,proto=1,tos=0,ttl=64,frag=no),icmp(type=0,code=0)']) -AT_CHECK([tcpdump -vntr p0.pcap > p0.pcap.txt 2>&1]) +AT_CHECK([ovs-pcap p0.pcap > p0.pcap.txt 2>&1]) -AT_CHECK([cat p0.pcap.txt | grep ff02::1:ff00:92 | uniq], [0], [dnl -IP6 (hlim 255, next-header ICMPv6 (58) payload length: 32) 2001:cafe::88 > ff02::1:ff00:92: [[icmp6 sum ok]] ICMP6, neighbor solicitation, length 32, who has 2001:cafe::92 +AT_CHECK([cat p0.pcap.txt | grep 92aa55aa55000086dd6000000000203aff2001cafe | uniq], [0], [dnl +3333ff000092aa55aa55000086dd6000000000203aff2001cafe000000000000000000000088ff0200000000000000000001ff00009287004d48000000002001cafe0000000000000000000000920101aa55aa550000 ]) -AT_CHECK([cat p0.pcap.txt | grep ff02::1:ff00:93 | uniq], [0], [dnl -IP6 (hlim 255, next-header ICMPv6 (58) payload length: 32) 2001:cafe::88 > ff02::1:ff00:93: [[icmp6 sum ok]] ICMP6, neighbor solicitation, length 32, who has 2001:cafe::93 +AT_CHECK([cat p0.pcap.txt | grep 93aa55aa55000086dd6000000000203aff2001cafe | uniq], [0], [dnl +3333ff000093aa55aa55000086dd6000000000203aff2001cafe000000000000000000000088ff0200000000000000000001ff00009387004d46000000002001cafe0000000000000000000000930101aa55aa550000 ]) dnl Check ARP Snoop diff --git a/tests/tunnel-push-pop.at b/tests/tunnel-push-pop.at index ed249daa4..a7909d326 100644 --- a/tests/tunnel-push-pop.at +++ b/tests/tunnel-push-pop.at @@ -43,13 +43,13 @@ dnl Check ARP request AT_CHECK([ovs-vsctl -- set Interface p0 options:pcap=p0.pcap]) AT_CHECK([ovs-appctl netdev-dummy/receive int-br 'in_port(2),eth(src=aa:55:aa:55:00:00,dst=f8:bc:12:ff:ff:ff),eth_type(0x0800),ipv4(src=1.1.3.92,dst=1.1.3.88,proto=1,tos=0,ttl=64,frag=no),icmp(type=0,code=0)']) -AT_CHECK([tcpdump -vntr p0.pcap > p0.pcap.txt 2>&1]) +AT_CHECK([ovs-pcap p0.pcap > p0.pcap.txt 2>&1]) -AT_CHECK([cat p0.pcap.txt | grep 1.1.2.92 | uniq], [0], [dnl -ARP, Ethernet (len 6), IPv4 (len 4), Request who-has 1.1.2.92 tell 1.1.2.88, length 28 +AT_CHECK([cat p0.pcap.txt | grep 101025c | uniq], [0], [dnl +ffffffffffffaa55aa55000008060001080006040001aa55aa550000010102580000000000000101025c ]) -AT_CHECK([cat p0.pcap.txt | grep 1.1.2.93 | uniq], [0], [dnl -ARP, Ethernet (len 6), IPv4 (len 4), Request who-has 1.1.2.93 tell 1.1.2.88, length 28 +AT_CHECK([cat p0.pcap.txt | grep 101025d | uniq], [0], [dnl +ffffffffffffaa55aa55000008060001080006040001aa55aa550000010102580000000000000101025d ]) dnl Check ARP Snoop |