Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
nat: use correct data types for memory sizes
[vpp.git]
/
test
/
test_bier.py
diff --git
a/test/test_bier.py
b/test/test_bier.py
index
93f0e36
..
1c58ee5
100644
(file)
--- a/
test/test_bier.py
+++ b/
test/test_bier.py
@@
-1,23
+1,26
@@
-#!/usr/bin/env python
+#!/usr/bin/env python
3
import unittest
import unittest
-import socket
from framework import VppTestCase, VppTestRunner, running_extended_tests
from vpp_ip import DpoProto
from framework import VppTestCase, VppTestRunner, running_extended_tests
from vpp_ip import DpoProto
-from vpp_ip_route import VppIpRoute, VppRoutePath,
VppMplsRoute,
\
+from vpp_ip_route import VppIpRoute, VppRoutePath, \
VppMplsTable, VppIpMRoute, VppMRoutePath, VppIpTable, \
MRouteEntryFlags, MRouteItfFlags, MPLS_LABEL_INVALID, \
VppMplsTable, VppIpMRoute, VppMRoutePath, VppIpTable, \
MRouteEntryFlags, MRouteItfFlags, MPLS_LABEL_INVALID, \
- VppMplsLabel
-from vpp_bier import *
-from vpp_udp_encap import *
+ VppMplsLabel, FibPathProto, FibPathType
+from vpp_bier import BIER_HDR_PAYLOAD, VppBierImp, VppBierDispEntry, \
+ VppBierDispTable, VppBierTable, VppBierTableID, VppBierRoute
+from vpp_udp_encap import VppUdpEncap
+import scapy.compat
from scapy.packet import Raw
from scapy.layers.l2 import Ether
from scapy.packet import Raw
from scapy.layers.l2 import Ether
-from scapy.layers.inet import IP, UDP
, ICMP
+from scapy.layers.inet import IP, UDP
from scapy.layers.inet6 import IPv6
from scapy.contrib.mpls import MPLS
from scapy.layers.inet6 import IPv6
from scapy.contrib.mpls import MPLS
-from scapy.contrib.bier import *
+from scapy.contrib.bier import BIER, BIERLength, BIFT
+
+NUM_PKTS = 67
class TestBFIB(VppTestCase):
class TestBFIB(VppTestCase):
@@
-29,7
+32,7
@@
class TestBFIB(VppTestCase):
if error:
self.logger.critical(error)
if error:
self.logger.critical(error)
- self.assert
Equal(error.find("Failed"), -1
)
+ self.assert
NotIn("Failed", error
)
class TestBier(VppTestCase):
class TestBier(VppTestCase):
@@
-122,10
+125,11
@@
class TestBier(VppTestCase):
for pkt_size in pkt_sizes:
p = (Ether(dst=self.pg0.local_mac, src=self.pg0.remote_mac) /
MPLS(label=77, ttl=255) /
for pkt_size in pkt_sizes:
p = (Ether(dst=self.pg0.local_mac, src=self.pg0.remote_mac) /
MPLS(label=77, ttl=255) /
- BIER(length=hdr_len_id, BitString=chr(255)*n_bytes) /
+ BIER(length=hdr_len_id,
+ BitString=scapy.compat.chb(255)*n_bytes) /
IPv6(src=self.pg0.remote_ip6, dst=self.pg0.remote_ip6) /
UDP(sport=1234, dport=1234) /
IPv6(src=self.pg0.remote_ip6, dst=self.pg0.remote_ip6) /
UDP(sport=1234, dport=1234) /
- Raw(
chr
(5) * pkt_size))
+ Raw(
scapy.compat.chb
(5) * pkt_size))
pkts = p
self.pg0.add_stream(pkts)
pkts = p
self.pg0.add_stream(pkts)
@@
-159,18
+163,18
@@
class TestBier(VppTestCase):
self.assertEqual(bier_hdr.Proto, 5)
# The bit-string should consist only of the BP given by i.
self.assertEqual(bier_hdr.Proto, 5)
# The bit-string should consist only of the BP given by i.
- byte_array = ['\0'] * (n_bytes)
- byte_val =
chr
(1 << (bp - 1) % 8)
- byte_pos = n_bytes - (((bp - 1) / 8) + 1)
+ byte_array = [
b
'\0'] * (n_bytes)
+ byte_val =
scapy.compat.chb
(1 << (bp - 1) % 8)
+ byte_pos = n_bytes - (((bp - 1) /
/
8) + 1)
byte_array[byte_pos] = byte_val
byte_array[byte_pos] = byte_val
- bitstring = ''.join(byte_array)
+ bitstring =
b
''.join(byte_array)
self.assertEqual(len(bitstring), len(bier_hdr.BitString))
self.assertEqual(bitstring, bier_hdr.BitString)
#
# cleanup. not strictly necessary, but it's much quicker this way
self.assertEqual(len(bitstring), len(bier_hdr.BitString))
self.assertEqual(bitstring, bier_hdr.BitString)
#
# cleanup. not strictly necessary, but it's much quicker this way
- # bec
ua
se the bier_fib_dump and ip_fib_dump will be empty when the
+ # bec
au
se the bier_fib_dump and ip_fib_dump will be empty when the
# auto-cleanup kicks in
#
for br in bier_routes:
# auto-cleanup kicks in
#
for br in bier_routes:
@@
-222,7
+226,7
@@
class TestBier(VppTestCase):
MPLS(label=77, ttl=255) /
BIER(length=BIERLength.BIER_LEN_64,
entropy=ii,
MPLS(label=77, ttl=255) /
BIER(length=BIERLength.BIER_LEN_64,
entropy=ii,
- BitString=
chr
(255)*16) /
+ BitString=
scapy.compat.chb
(255)*16) /
IPv6(src=self.pg0.remote_ip6,
dst=self.pg0.remote_ip6) /
UDP(sport=1234, dport=1234) /
IPv6(src=self.pg0.remote_ip6,
dst=self.pg0.remote_ip6) /
UDP(sport=1234, dport=1234) /
@@
-274,6
+278,7
@@
class TestBier(VppTestCase):
labels=[VppMplsLabel(101)])])
rx = self.send_and_expect(self.pg0, pkts, self.pg1)
labels=[VppMplsLabel(101)])])
rx = self.send_and_expect(self.pg0, pkts, self.pg1)
+
for nh in nhs:
self.assertTrue(sum(p[MPLS].label == nh['label'] for p in rx))
for nh in nhs:
self.assertTrue(sum(p[MPLS].label == nh['label'] for p in rx))
@@
-334,7
+339,7
@@
class TestBier(VppTestCase):
#
# An imposition object with both bit-positions set
#
#
# An imposition object with both bit-positions set
#
- bi = VppBierImp(self, bti, 333,
chr
(0x3) * 32)
+ bi = VppBierImp(self, bti, 333,
scapy.compat.chb
(0x3) * 32)
bi.add_vpp_config()
#
bi.add_vpp_config()
#
@@
-349,7
+354,8
@@
class TestBier(VppTestCase):
MRouteItfFlags.MFIB_ITF_FLAG_ACCEPT),
VppMRoutePath(0xffffffff,
MRouteItfFlags.MFIB_ITF_FLAG_FORWARD,
MRouteItfFlags.MFIB_ITF_FLAG_ACCEPT),
VppMRoutePath(0xffffffff,
MRouteItfFlags.MFIB_ITF_FLAG_FORWARD,
- proto=DpoProto.DPO_PROTO_BIER,
+ proto=FibPathProto.FIB_PATH_NH_PROTO_BIER,
+ type=FibPathType.FIB_PATH_TYPE_BIER_IMP,
bier_imp=bi.bi_index)])
route_ing_232_1_1_1.add_vpp_config()
bier_imp=bi.bi_index)])
route_ing_232_1_1_1.add_vpp_config()
@@
-414,7
+420,7
@@
class TestBier(VppTestCase):
self, bti, 1,
[VppRoutePath("0.0.0.0",
0xffffffff,
self, bti, 1,
[VppRoutePath("0.0.0.0",
0xffffffff,
- proto=
DpoProto.DPO
_PROTO_BIER,
+ proto=
FibPathProto.FIB_PATH_NH
_PROTO_BIER,
nh_table_id=8)])
bier_route_1.add_vpp_config()
nh_table_id=8)])
bier_route_1.add_vpp_config()
@@
-423,7
+429,7
@@
class TestBier(VppTestCase):
#
bier_de_1 = VppBierDispEntry(self, bdt.id, 99,
BIER_HDR_PAYLOAD.BIER_HDR_PROTO_IPV4,
#
bier_de_1 = VppBierDispEntry(self, bdt.id, 99,
BIER_HDR_PAYLOAD.BIER_HDR_PROTO_IPV4,
-
DpoProto.DPO
_PROTO_BIER,
+
FibPathProto.FIB_PATH_NH
_PROTO_BIER,
"0.0.0.0", 0, rpf_id=8192)
bier_de_1.add_vpp_config()
"0.0.0.0", 0, rpf_id=8192)
bier_de_1.add_vpp_config()
@@
-446,7
+452,7
@@
class TestBier(VppTestCase):
p = (Ether(dst=self.pg0.local_mac, src=self.pg0.remote_mac) /
MPLS(label=77, ttl=255) /
BIER(length=BIERLength.BIER_LEN_256,
p = (Ether(dst=self.pg0.local_mac, src=self.pg0.remote_mac) /
MPLS(label=77, ttl=255) /
BIER(length=BIERLength.BIER_LEN_256,
- BitString=
chr
(255)*32,
+ BitString=
scapy.compat.chb
(255)*32,
BFRID=99) /
IP(src="1.1.1.1", dst="232.1.1.1") /
UDP(sport=1234, dport=1234) /
BFRID=99) /
IP(src="1.1.1.1", dst="232.1.1.1") /
UDP(sport=1234, dport=1234) /
@@
-460,7
+466,7
@@
class TestBier(VppTestCase):
p = (Ether(dst=self.pg0.local_mac, src=self.pg0.remote_mac) /
MPLS(label=77, ttl=255) /
BIER(length=BIERLength.BIER_LEN_256,
p = (Ether(dst=self.pg0.local_mac, src=self.pg0.remote_mac) /
MPLS(label=77, ttl=255) /
BIER(length=BIERLength.BIER_LEN_256,
- BitString=
chr
(255)*32,
+ BitString=
scapy.compat.chb
(255)*32,
BFRID=77) /
IP(src="1.1.1.1", dst="232.1.1.1") /
UDP(sport=1234, dport=1234) /
BFRID=77) /
IP(src="1.1.1.1", dst="232.1.1.1") /
UDP(sport=1234, dport=1234) /
@@
-473,7
+479,7
@@
class TestBier(VppTestCase):
#
bier_de_2 = VppBierDispEntry(self, bdt.id, 0,
BIER_HDR_PAYLOAD.BIER_HDR_PROTO_IPV4,
#
bier_de_2 = VppBierDispEntry(self, bdt.id, 0,
BIER_HDR_PAYLOAD.BIER_HDR_PROTO_IPV4,
-
DpoProto.DPO
_PROTO_BIER,
+
FibPathProto.FIB_PATH_NH
_PROTO_BIER,
"0.0.0.0", 0, rpf_id=8192)
bier_de_2.add_vpp_config()
"0.0.0.0", 0, rpf_id=8192)
bier_de_2.add_vpp_config()
@@
-486,7
+492,7
@@
class TestBier(VppTestCase):
# A multicast route to forward post BIER disposition that needs
# a check against sending back into the BIER core
#
# A multicast route to forward post BIER disposition that needs
# a check against sending back into the BIER core
#
- bi = VppBierImp(self, bti, 333,
chr
(0x3) * 32)
+ bi = VppBierImp(self, bti, 333,
scapy.compat.chb
(0x3) * 32)
bi.add_vpp_config()
route_eg_232_1_1_2 = VppIpMRoute(
bi.add_vpp_config()
route_eg_232_1_1_2 = VppIpMRoute(
@@
-497,6
+503,7
@@
class TestBier(VppTestCase):
paths=[VppMRoutePath(0xffffffff,
MRouteItfFlags.MFIB_ITF_FLAG_FORWARD,
proto=DpoProto.DPO_PROTO_BIER,
paths=[VppMRoutePath(0xffffffff,
MRouteItfFlags.MFIB_ITF_FLAG_FORWARD,
proto=DpoProto.DPO_PROTO_BIER,
+ type=FibPathType.FIB_PATH_TYPE_BIER_IMP,
bier_imp=bi.bi_index),
VppMRoutePath(self.pg1.sw_if_index,
MRouteItfFlags.MFIB_ITF_FLAG_FORWARD)])
bier_imp=bi.bi_index),
VppMRoutePath(self.pg1.sw_if_index,
MRouteItfFlags.MFIB_ITF_FLAG_FORWARD)])
@@
-506,7
+513,7
@@
class TestBier(VppTestCase):
p = (Ether(dst=self.pg0.local_mac, src=self.pg0.remote_mac) /
MPLS(label=77, ttl=255) /
BIER(length=BIERLength.BIER_LEN_256,
p = (Ether(dst=self.pg0.local_mac, src=self.pg0.remote_mac) /
MPLS(label=77, ttl=255) /
BIER(length=BIERLength.BIER_LEN_256,
- BitString=
chr
(255)*32,
+ BitString=
scapy.compat.chb
(255)*32,
BFRID=77) /
IP(src="1.1.1.1", dst="232.1.1.2") /
UDP(sport=1234, dport=1234) /
BFRID=77) /
IP(src="1.1.1.1", dst="232.1.1.2") /
UDP(sport=1234, dport=1234) /
@@
-523,10
+530,10
@@
class TestBier(VppTestCase):
bt = VppBierTable(self, bti, 77)
bt.add_vpp_config()
bt = VppBierTable(self, bti, 77)
bt.add_vpp_config()
- lowest = ['\0'] * (n_bytes)
- lowest[-1] =
chr
(1)
- highest = ['\0'] * (n_bytes)
- highest[0] =
chr
(128)
+ lowest = [
b
'\0'] * (n_bytes)
+ lowest[-1] =
scapy.compat.chb
(1)
+ highest = [
b
'\0'] * (n_bytes)
+ highest[0] =
scapy.compat.chb
(128)
#
# Impostion Sets bit strings
#
# Impostion Sets bit strings
@@
-548,7
+555,8
@@
class TestBier(VppTestCase):
MRouteItfFlags.MFIB_ITF_FLAG_ACCEPT),
VppMRoutePath(0xffffffff,
MRouteItfFlags.MFIB_ITF_FLAG_FORWARD,
MRouteItfFlags.MFIB_ITF_FLAG_ACCEPT),
VppMRoutePath(0xffffffff,
MRouteItfFlags.MFIB_ITF_FLAG_FORWARD,
- proto=DpoProto.DPO_PROTO_BIER,
+ proto=FibPathProto.FIB_PATH_NH_PROTO_BIER,
+ type=FibPathType.FIB_PATH_TYPE_BIER_IMP,
bier_imp=bi_low.bi_index)])
route_ing_232_1_1_1.add_vpp_config()
route_ing_232_1_1_2 = VppIpMRoute(
bier_imp=bi_low.bi_index)])
route_ing_232_1_1_1.add_vpp_config()
route_ing_232_1_1_2 = VppIpMRoute(
@@
-560,7
+568,8
@@
class TestBier(VppTestCase):
MRouteItfFlags.MFIB_ITF_FLAG_ACCEPT),
VppMRoutePath(0xffffffff,
MRouteItfFlags.MFIB_ITF_FLAG_FORWARD,
MRouteItfFlags.MFIB_ITF_FLAG_ACCEPT),
VppMRoutePath(0xffffffff,
MRouteItfFlags.MFIB_ITF_FLAG_FORWARD,
- proto=DpoProto.DPO_PROTO_BIER,
+ proto=FibPathProto.FIB_PATH_NH_PROTO_BIER,
+ type=FibPathType.FIB_PATH_TYPE_BIER_IMP,
bier_imp=bi_high.bi_index)])
route_ing_232_1_1_2.add_vpp_config()
bier_imp=bi_high.bi_index)])
route_ing_232_1_1_2.add_vpp_config()
@@
-578,13
+587,15
@@
class TestBier(VppTestCase):
self, bti, 1,
[VppRoutePath("0.0.0.0",
0xffffffff,
self, bti, 1,
[VppRoutePath("0.0.0.0",
0xffffffff,
- proto=
DpoProto.DPO
_PROTO_BIER,
+ proto=
FibPathProto.FIB_PATH_NH
_PROTO_BIER,
nh_table_id=8)])
bier_route_1.add_vpp_config()
nh_table_id=8)])
bier_route_1.add_vpp_config()
- bier_route_max = VppBierRoute(self, bti, max_bp,
- [VppRoutePath("0.0.0.0",
- 0xffffffff,
- nh_table_id=8)])
+ bier_route_max = VppBierRoute(
+ self, bti, max_bp,
+ [VppRoutePath("0.0.0.0",
+ 0xffffffff,
+ proto=FibPathProto.FIB_PATH_NH_PROTO_BIER,
+ nh_table_id=8)])
bier_route_max.add_vpp_config()
#
bier_route_max.add_vpp_config()
#
@@
-593,12
+604,12
@@
class TestBier(VppTestCase):
#
bier_de_1 = VppBierDispEntry(self, bdt.id, 333,
BIER_HDR_PAYLOAD.BIER_HDR_PROTO_IPV4,
#
bier_de_1 = VppBierDispEntry(self, bdt.id, 333,
BIER_HDR_PAYLOAD.BIER_HDR_PROTO_IPV4,
-
DpoProto.DPO
_PROTO_BIER,
+
FibPathProto.FIB_PATH_NH
_PROTO_BIER,
"0.0.0.0", 10, rpf_id=8192)
bier_de_1.add_vpp_config()
bier_de_1 = VppBierDispEntry(self, bdt.id, 334,
BIER_HDR_PAYLOAD.BIER_HDR_PROTO_IPV4,
"0.0.0.0", 10, rpf_id=8192)
bier_de_1.add_vpp_config()
bier_de_1 = VppBierDispEntry(self, bdt.id, 334,
BIER_HDR_PAYLOAD.BIER_HDR_PROTO_IPV4,
-
DpoProto.DPO
_PROTO_BIER,
+
FibPathProto.FIB_PATH_NH
_PROTO_BIER,
"0.0.0.0", 10, rpf_id=8193)
bier_de_1.add_vpp_config()
"0.0.0.0", 10, rpf_id=8193)
bier_de_1.add_vpp_config()
@@
-636,9
+647,9
@@
class TestBier(VppTestCase):
src=self.pg0.remote_mac) /
IP(src="1.1.1.1", dst="232.1.1.1") /
UDP(sport=1234, dport=1234) /
src=self.pg0.remote_mac) /
IP(src="1.1.1.1", dst="232.1.1.1") /
UDP(sport=1234, dport=1234) /
- Raw(
chr
(5) * 32))
+ Raw(
scapy.compat.chb
(5) * 32))
- rx = self.send_and_expect(self.pg0, p*
65
, self.pg1)
+ rx = self.send_and_expect(self.pg0, p*
NUM_PKTS
, self.pg1)
self.assertEqual(rx[0][IP].src, "1.1.1.1")
self.assertEqual(rx[0][IP].dst, "232.1.1.1")
self.assertEqual(rx[0][IP].src, "1.1.1.1")
self.assertEqual(rx[0][IP].dst, "232.1.1.1")
@@
-647,9
+658,9
@@
class TestBier(VppTestCase):
src=self.pg0.remote_mac) /
IP(src="1.1.1.1", dst="232.1.1.2") /
UDP(sport=1234, dport=1234) /
src=self.pg0.remote_mac) /
IP(src="1.1.1.1", dst="232.1.1.2") /
UDP(sport=1234, dport=1234) /
- Raw(
chr
(5) * 512))
+ Raw(
scapy.compat.chb
(5) * 512))
- rx = self.send_and_expect(self.pg0, p*
65
, self.pg1)
+ rx = self.send_and_expect(self.pg0, p*
NUM_PKTS
, self.pg1)
self.assertEqual(rx[0][IP].src, "1.1.1.1")
self.assertEqual(rx[0][IP].dst, "232.1.1.2")
self.assertEqual(rx[0][IP].src, "1.1.1.1")
self.assertEqual(rx[0][IP].dst, "232.1.1.2")
@@
-707,7
+718,7
@@
class TestBier(VppTestCase):
self, bti, 1,
[VppRoutePath("0.0.0.0",
0xFFFFFFFF,
self, bti, 1,
[VppRoutePath("0.0.0.0",
0xFFFFFFFF,
-
is_udp_encap=1
,
+
type=FibPathType.FIB_PATH_TYPE_UDP_ENCAP
,
next_hop_id=udp_encap.id)])
bier_route.add_vpp_config()
next_hop_id=udp_encap.id)])
bier_route.add_vpp_config()
@@
-716,9
+727,9
@@
class TestBier(VppTestCase):
# only use the second, but creating 2 tests with a non-zero
# value index in the route add
#
# only use the second, but creating 2 tests with a non-zero
# value index in the route add
#
- bi = VppBierImp(self, bti, 333,
chr
(0xff) * 32)
+ bi = VppBierImp(self, bti, 333,
scapy.compat.chb
(0xff) * 32)
bi.add_vpp_config()
bi.add_vpp_config()
- bi2 = VppBierImp(self, bti, 334,
chr
(0xff) * 32)
+ bi2 = VppBierImp(self, bti, 334,
scapy.compat.chb
(0xff) * 32)
bi2.add_vpp_config()
#
bi2.add_vpp_config()
#
@@
-733,7
+744,8
@@
class TestBier(VppTestCase):
MRouteItfFlags.MFIB_ITF_FLAG_ACCEPT),
VppMRoutePath(0xffffffff,
MRouteItfFlags.MFIB_ITF_FLAG_FORWARD,
MRouteItfFlags.MFIB_ITF_FLAG_ACCEPT),
VppMRoutePath(0xffffffff,
MRouteItfFlags.MFIB_ITF_FLAG_FORWARD,
- proto=DpoProto.DPO_PROTO_BIER,
+ proto=FibPathProto.FIB_PATH_NH_PROTO_BIER,
+ type=FibPathType.FIB_PATH_TYPE_BIER_IMP,
bier_imp=bi2.bi_index)])
route_ing_232_1_1_1.add_vpp_config()
bier_imp=bi2.bi_index)])
route_ing_232_1_1_1.add_vpp_config()
@@
-787,7
+799,7
@@
class TestBier(VppTestCase):
self, bti, 1,
[VppRoutePath("0.0.0.0",
0xffffffff,
self, bti, 1,
[VppRoutePath("0.0.0.0",
0xffffffff,
- proto=
DpoProto.DPO
_PROTO_BIER,
+ proto=
FibPathProto.FIB_PATH_NH
_PROTO_BIER,
nh_table_id=8)])
bier_route_1.add_vpp_config()
nh_table_id=8)])
bier_route_1.add_vpp_config()
@@
-796,7
+808,7
@@
class TestBier(VppTestCase):
#
bier_de_1 = VppBierDispEntry(self, bdt.id, 99,
BIER_HDR_PAYLOAD.BIER_HDR_PROTO_IPV4,
#
bier_de_1 = VppBierDispEntry(self, bdt.id, 99,
BIER_HDR_PAYLOAD.BIER_HDR_PROTO_IPV4,
-
DpoProto.DPO
_PROTO_BIER,
+
FibPathProto.FIB_PATH_NH
_PROTO_BIER,
"0.0.0.0", 0, rpf_id=8192)
bier_de_1.add_vpp_config()
"0.0.0.0", 0, rpf_id=8192)
bier_de_1.add_vpp_config()
@@
-821,7
+833,7
@@
class TestBier(VppTestCase):
UDP(sport=333, dport=8138) /
BIFT(sd=1, set=0, bsl=2, ttl=255) /
BIER(length=BIERLength.BIER_LEN_256,
UDP(sport=333, dport=8138) /
BIFT(sd=1, set=0, bsl=2, ttl=255) /
BIER(length=BIERLength.BIER_LEN_256,
- BitString=
chr
(255)*32,
+ BitString=
scapy.compat.chb
(255)*32,
BFRID=99) /
IP(src="1.1.1.1", dst="232.1.1.1") /
UDP(sport=1234, dport=1234) /
BFRID=99) /
IP(src="1.1.1.1", dst="232.1.1.1") /
UDP(sport=1234, dport=1234) /