ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test: consolidate the multiple versions of send_and_*

Browse Source 
Change-Id: I7fa7d0ebf73dab8264a2e5ddbd412600d78ead05
Signed-off-by: Neale Ranns <nranns@cisco.com>
This commit is contained in:
Neale Ranns
2018-01-08 04:41:42 -08:00
committed by Ole Trøan
parent 07a45bd897
commit 52fae86264
10 changed files with 31 additions and 207 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
test/test_mpls.py
View File

@ -314,13 +314,6 @@ class TestMPLS(VppTestCase):
except:
raise
def send_and_assert_no_replies(self, intf, pkts, remark):
intf.add_stream(pkts)
self.pg_enable_capture(self.pg_interfaces)
self.pg_start()
for i in self.pg_interfaces:
i.assert_nothing_captured(remark=remark)
def test_swap(self):
""" MPLS label swap tests """
@ -1218,7 +1211,13 @@ class TestMPLS(VppTestCase):
#
tx = self.create_stream_labelled_ip6(self.pg0, [34], 255,
dst_ip="ff01::1", hlim=1)
self.send_and_assert_no_replies(self.pg0, tx, "Hop Limt Expired")
self.pg0.add_stream(tx)
self.pg_enable_capture(self.pg_interfaces)
self.pg_start()
rx = self.pg0.get_capture(257)
self.verify_capture_ip6_icmp(self.pg0, rx, tx)
#
# set the RPF-ID of the enrtry to not match the input packet's
@ -1258,14 +1257,6 @@ class TestMPLSDisabled(VppTestCase):
self.pg0.disable_mpls()
super(TestMPLSDisabled, self).tearDown()
def send_and_assert_no_replies(self, intf, pkts, remark):
intf.add_stream(pkts)
self.pg_enable_capture(self.pg_interfaces)
self.pg_start()
for i in self.pg_interfaces:
i.get_capture(0)
i.assert_nothing_captured(remark=remark)
def test_mpls_disabled(self):
""" MPLS Disabled """