Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
test framework: vpp_papi_provider.py - further cleanup
[vpp.git]
/
test
/
test_nat.py
diff --git
a/test/test_nat.py
b/test/test_nat.py
index
4fb462c
..
e368fe0
100644
(file)
--- a/
test/test_nat.py
+++ b/
test/test_nat.py
@@
-62,7
+62,7
@@
class HANATStateSync(Packet):
IntField("sequence_number", 1),
IntField("thread_index", 0),
PacketListField("events", [], Event,
IntField("sequence_number", 1),
IntField("thread_index", 0),
PacketListField("events", [], Event,
- count_from=lambda pkt:pkt.count)]
+ count_from=lambda pkt:
pkt.count)]
class MethodHolder(VppTestCase):
class MethodHolder(VppTestCase):
@@
-103,12
+103,13
@@
class MethodHolder(VppTestCase):
interfaces = self.vapi.nat44_interface_addr_dump()
for intf in interfaces:
interfaces = self.vapi.nat44_interface_addr_dump()
for intf in interfaces:
- self.vapi.nat44_add_interface_addr(intf.sw_if_index,
- twice_nat=intf.twice_nat,
- is_add=0)
+ self.vapi.nat44_add_
del_
interface_addr(intf.sw_if_index,
+
twice_nat=intf.twice_nat,
+
is_add=0)
- self.vapi.nat_ipfix(enable=0, src_port=self.ipfix_src_port,
- domain_id=self.ipfix_domain_id)
+ self.vapi.nat_ipfix_enable_disable(enable=0,
+ src_port=self.ipfix_src_port,
+ domain_id=self.ipfix_domain_id)
self.ipfix_src_port = 4739
self.ipfix_domain_id = 1
self.ipfix_src_port = 4739
self.ipfix_domain_id = 1
@@
-1519,8
+1520,8
@@
class TestNAT44(MethodHolder):
cls.pg1.configure_ipv4_neighbors()
cls.overlapping_interfaces = list(list(cls.pg_interfaces[4:7]))
cls.pg1.configure_ipv4_neighbors()
cls.overlapping_interfaces = list(list(cls.pg_interfaces[4:7]))
- cls.vapi.ip_table_add_del(
10, is_add=1
)
- cls.vapi.ip_table_add_del(
20, is_add=1
)
+ cls.vapi.ip_table_add_del(
is_add=1, table_id=10
)
+ cls.vapi.ip_table_add_del(
is_add=1, table_id=20
)
cls.pg4._local_ip4 = "172.16.255.1"
cls.pg4._local_ip4n = socket.inet_pton(socket.AF_INET, i.local_ip4)
cls.pg4._local_ip4 = "172.16.255.1"
cls.pg4._local_ip4n = socket.inet_pton(socket.AF_INET, i.local_ip4)
@@
-1545,9
+1546,9
@@
class TestNAT44(MethodHolder):
cls.pg9.generate_remote_hosts(2)
cls.pg9.config_ip4()
ip_addr_n = socket.inet_pton(socket.AF_INET, "10.0.0.1")
cls.pg9.generate_remote_hosts(2)
cls.pg9.config_ip4()
ip_addr_n = socket.inet_pton(socket.AF_INET, "10.0.0.1")
- cls.vapi.sw_interface_add_del_address(
cls.pg9.sw_if_index,
-
ip_addr_n,
-
24)
+ cls.vapi.sw_interface_add_del_address(
+
sw_if_index=cls.pg9.sw_if_index, address=
ip_addr_n,
+
address_length=
24)
cls.pg9.admin_up()
cls.pg9.resolve_arp()
cls.pg9._remote_hosts[1]._ip4 = cls.pg9._remote_hosts[0]._ip4
cls.pg9.admin_up()
cls.pg9.resolve_arp()
cls.pg9._remote_hosts[1]._ip4 = cls.pg9._remote_hosts[0]._ip4
@@
-2577,7
+2578,7
@@
class TestNAT44(MethodHolder):
def test_interface_addr(self):
""" Acquire NAT44 addresses from interface """
def test_interface_addr(self):
""" Acquire NAT44 addresses from interface """
- self.vapi.nat44_add_interface_addr(self.pg7.sw_if_index)
+ self.vapi.nat44_add_
del_
interface_addr(self.pg7.sw_if_index)
# no address in NAT pool
adresses = self.vapi.nat44_address_dump()
# no address in NAT pool
adresses = self.vapi.nat44_address_dump()
@@
-2598,7
+2599,7
@@
class TestNAT44(MethodHolder):
""" Static mapping with addresses from interface """
tag = "testTAG"
""" Static mapping with addresses from interface """
tag = "testTAG"
- self.vapi.nat44_add_interface_addr(self.pg7.sw_if_index)
+ self.vapi.nat44_add_
del_
interface_addr(self.pg7.sw_if_index)
self.nat44_add_static_mapping(
'1.2.3.4',
external_sw_if_index=self.pg7.sw_if_index,
self.nat44_add_static_mapping(
'1.2.3.4',
external_sw_if_index=self.pg7.sw_if_index,
@@
-2658,7
+2659,7
@@
class TestNAT44(MethodHolder):
""" Identity NAT with addresses from interface """
port = 53053
""" Identity NAT with addresses from interface """
port = 53053
- self.vapi.nat44_add_interface_addr(self.pg7.sw_if_index)
+ self.vapi.nat44_add_
del_
interface_addr(self.pg7.sw_if_index)
self.vapi.nat44_add_del_identity_mapping(
sw_if_index=self.pg7.sw_if_index,
port=port,
self.vapi.nat44_add_del_identity_mapping(
sw_if_index=self.pg7.sw_if_index,
port=port,
@@
-2707,8
+2708,8
@@
class TestNAT44(MethodHolder):
path_mtu=512,
template_interval=10,
collector_port=colector_port)
path_mtu=512,
template_interval=10,
collector_port=colector_port)
- self.vapi.nat_ipfix(domain_id=self.ipfix_domain_id,
- src_port=self.ipfix_src_port)
+ self.vapi.nat_ipfix
_enable_disable
(domain_id=self.ipfix_domain_id,
+
src_port=self.ipfix_src_port)
pkts = self.create_stream_in(self.pg0, self.pg1)
self.pg0.add_stream(pkts)
pkts = self.create_stream_in(self.pg0, self.pg1)
self.pg0.add_stream(pkts)
@@
-2746,8
+2747,8
@@
class TestNAT44(MethodHolder):
src_address=self.pg3.local_ip4n,
path_mtu=512,
template_interval=10)
src_address=self.pg3.local_ip4n,
path_mtu=512,
template_interval=10)
- self.vapi.nat_ipfix(domain_id=self.ipfix_domain_id,
- src_port=self.ipfix_src_port)
+ self.vapi.nat_ipfix
_enable_disable
(domain_id=self.ipfix_domain_id,
+
src_port=self.ipfix_src_port)
p = (Ether(src=self.pg0.remote_mac, dst=self.pg0.local_mac) /
IP(src=self.pg0.remote_ip4, dst=self.pg1.remote_ip4) /
p = (Ether(src=self.pg0.remote_mac, dst=self.pg0.local_mac) /
IP(src=self.pg0.remote_ip4, dst=self.pg1.remote_ip4) /
@@
-2804,8
+2805,8
@@
class TestNAT44(MethodHolder):
src_address=self.pg3.local_ip4n,
path_mtu=512,
template_interval=10)
src_address=self.pg3.local_ip4n,
path_mtu=512,
template_interval=10)
- self.vapi.nat_ipfix(domain_id=self.ipfix_domain_id,
- src_port=self.ipfix_src_port)
+ self.vapi.nat_ipfix
_enable_disable
(domain_id=self.ipfix_domain_id,
+
src_port=self.ipfix_src_port)
p = (Ether(dst=self.pg0.local_mac, src=self.pg0.remote_mac) /
IP(src=self.pg0.remote_ip4, dst=self.pg1.remote_ip4) /
p = (Ether(dst=self.pg0.local_mac, src=self.pg0.remote_mac) /
IP(src=self.pg0.remote_ip4, dst=self.pg1.remote_ip4) /
@@
-2932,8
+2933,8
@@
class TestNAT44(MethodHolder):
self.pg0.unconfig_ip4()
self.pg1.unconfig_ip4()
self.pg0.unconfig_ip4()
self.pg1.unconfig_ip4()
- self.vapi.ip_table_add_del(
vrf_id1, is_add=
1)
- self.vapi.ip_table_add_del(
vrf_id2, is_add=1
)
+ self.vapi.ip_table_add_del(
is_add=1, table_id=vrf_id
1)
+ self.vapi.ip_table_add_del(
is_add=1, table_id=vrf_id2
)
self.pg0.set_table_ip4(vrf_id1)
self.pg1.set_table_ip4(vrf_id2)
self.pg0.config_ip4()
self.pg0.set_table_ip4(vrf_id1)
self.pg1.set_table_ip4(vrf_id2)
self.pg0.config_ip4()
@@
-2974,8
+2975,8
@@
class TestNAT44(MethodHolder):
self.pg1.config_ip4()
self.pg0.resolve_arp()
self.pg1.resolve_arp()
self.pg1.config_ip4()
self.pg0.resolve_arp()
self.pg1.resolve_arp()
- self.vapi.ip_table_add_del(
vrf_id1, is_add=0
)
- self.vapi.ip_table_add_del(
vrf_id2, is_add=0
)
+ self.vapi.ip_table_add_del(
is_add=0, table_id=vrf_id1
)
+ self.vapi.ip_table_add_del(
is_add=0, table_id=vrf_id2
)
def test_vrf_feature_independent(self):
""" NAT44 tenant VRF independent address pool mode """
def test_vrf_feature_independent(self):
""" NAT44 tenant VRF independent address pool mode """
@@
-3532,7
+3533,7
@@
class TestNAT44(MethodHolder):
def test_frag_forwarding(self):
""" NAT44 forwarding fragment test """
def test_frag_forwarding(self):
""" NAT44 forwarding fragment test """
- self.vapi.nat44_add_interface_addr(self.pg1.sw_if_index)
+ self.vapi.nat44_add_
del_
interface_addr(self.pg1.sw_if_index)
self.vapi.nat44_interface_add_del_feature(self.pg0.sw_if_index)
self.vapi.nat44_interface_add_del_feature(self.pg1.sw_if_index,
is_inside=0)
self.vapi.nat44_interface_add_del_feature(self.pg0.sw_if_index)
self.vapi.nat44_interface_add_del_feature(self.pg1.sw_if_index,
is_inside=0)
@@
-3663,8
+3664,8
@@
class TestNAT44(MethodHolder):
src_address=self.pg3.local_ip4n,
path_mtu=512,
template_interval=10)
src_address=self.pg3.local_ip4n,
path_mtu=512,
template_interval=10)
- self.vapi.nat_ipfix(domain_id=self.ipfix_domain_id,
- src_port=self.ipfix_src_port)
+ self.vapi.nat_ipfix
_enable_disable
(domain_id=self.ipfix_domain_id,
+
src_port=self.ipfix_src_port)
data = "A" * 4 + "B" * 16 + "C" * 3
self.tcp_port_in = random.randint(1025, 65535)
data = "A" * 4 + "B" * 16 + "C" * 3
self.tcp_port_in = random.randint(1025, 65535)
@@
-3707,8
+3708,8
@@
class TestNAT44(MethodHolder):
self.pg1.unconfig_ip4()
self.pg2.unconfig_ip4()
self.pg1.unconfig_ip4()
self.pg2.unconfig_ip4()
- self.vapi.ip_table_add_del(
vrf_id1, is_add=
1)
- self.vapi.ip_table_add_del(
vrf_id2, is_add=1
)
+ self.vapi.ip_table_add_del(
is_add=1, table_id=vrf_id
1)
+ self.vapi.ip_table_add_del(
is_add=1, table_id=vrf_id2
)
self.pg1.set_table_ip4(vrf_id1)
self.pg2.set_table_ip4(vrf_id2)
self.pg1.config_ip4()
self.pg1.set_table_ip4(vrf_id1)
self.pg2.set_table_ip4(vrf_id2)
self.pg1.config_ip4()
@@
-4210,16
+4211,16
@@
class TestNAT44EndpointDependent(MethodHolder):
cls.pg4.generate_remote_hosts(2)
cls.pg4.config_ip4()
ip_addr_n = socket.inet_pton(socket.AF_INET, "10.0.0.1")
cls.pg4.generate_remote_hosts(2)
cls.pg4.config_ip4()
ip_addr_n = socket.inet_pton(socket.AF_INET, "10.0.0.1")
- cls.vapi.sw_interface_add_del_address(
cls.pg4.sw_if_index,
-
ip_addr_n,
-
24)
+ cls.vapi.sw_interface_add_del_address(
+
sw_if_index=cls.pg4.sw_if_index, address=
ip_addr_n,
+
address_length=
24)
cls.pg4.admin_up()
cls.pg4.resolve_arp()
cls.pg4._remote_hosts[1]._ip4 = cls.pg4._remote_hosts[0]._ip4
cls.pg4.resolve_arp()
zero_ip4n = socket.inet_pton(socket.AF_INET, "0.0.0.0")
cls.pg4.admin_up()
cls.pg4.resolve_arp()
cls.pg4._remote_hosts[1]._ip4 = cls.pg4._remote_hosts[0]._ip4
cls.pg4.resolve_arp()
zero_ip4n = socket.inet_pton(socket.AF_INET, "0.0.0.0")
- cls.vapi.ip_table_add_del(
1, is_ad
d=1)
+ cls.vapi.ip_table_add_del(
is_add=1, table_i
d=1)
cls.pg5._local_ip4 = "10.1.1.1"
cls.pg5._local_ip4n = socket.inet_pton(socket.AF_INET,
cls.pg5._local_ip4 = "10.1.1.1"
cls.pg5._local_ip4n = socket.inet_pton(socket.AF_INET,
@@
-5285,8
+5286,8
@@
class TestNAT44EndpointDependent(MethodHolder):
port_in1 = port_in
port_in2 = port_in
else:
port_in1 = port_in
port_in2 = port_in
else:
- port_in1 = port_in
+
1
- port_in2 = port_in
+
2
+ port_in1 = port_in
+
1
+ port_in2 = port_in
+
2
port_out = 80
eh_port_out = 4567
port_out = 80
eh_port_out = 4567
@@
-5448,7
+5449,8
@@
class TestNAT44EndpointDependent(MethodHolder):
def test_twice_nat_interface_addr(self):
""" Acquire twice NAT44 addresses from interface """
def test_twice_nat_interface_addr(self):
""" Acquire twice NAT44 addresses from interface """
- self.vapi.nat44_add_interface_addr(self.pg3.sw_if_index, twice_nat=1)
+ self.vapi.nat44_add_del_interface_addr(self.pg3.sw_if_index,
+ twice_nat=1)
# no address in NAT pool
adresses = self.vapi.nat44_address_dump()
# no address in NAT pool
adresses = self.vapi.nat44_address_dump()
@@
-5964,9
+5966,9
@@
class TestNAT44EndpointDependent(MethodHolder):
local_port, external_port, vrf_id=1,
proto=IP_PROTOS.tcp, out2in_only=1)
self.nat44_add_static_mapping(
local_port, external_port, vrf_id=1,
proto=IP_PROTOS.tcp, out2in_only=1)
self.nat44_add_static_mapping(
-
self.pg0.remote_ip4, external_sw_if_index=self.pg0.sw_if_index,
-
local_port=local_port, vrf_id=0, external_port=external_port,
-
proto=IP_PROTOS.tcp, out2in_only=1)
+ self.pg0.remote_ip4, external_sw_if_index=self.pg0.sw_if_index,
+ local_port=local_port, vrf_id=0, external_port=external_port,
+ proto=IP_PROTOS.tcp, out2in_only=1)
# from client to service (both VRF1)
p = (Ether(src=self.pg6.remote_mac, dst=self.pg6.local_mac) /
# from client to service (both VRF1)
p = (Ether(src=self.pg6.remote_mac, dst=self.pg6.local_mac) /
@@
-6340,8
+6342,8
@@
class TestNAT44EndpointDependent(MethodHolder):
self.pg_start()
capture = self.pg1.get_capture(len(pkts))
self.pg_start()
capture = self.pg1.get_capture(len(pkts))
- self.vapi.nat_ipfix(domain_id=self.ipfix_domain_id,
- src_port=self.ipfix_src_port)
+ self.vapi.nat_ipfix
_enable_disable
(domain_id=self.ipfix_domain_id,
+
src_port=self.ipfix_src_port)
p = (Ether(src=self.pg0.remote_mac, dst=self.pg0.local_mac) /
IP(src=self.pg0.remote_ip4, dst=self.pg1.remote_ip4) /
p = (Ether(src=self.pg0.remote_mac, dst=self.pg0.local_mac) /
IP(src=self.pg0.remote_ip4, dst=self.pg1.remote_ip4) /
@@
-6453,7
+6455,7
@@
class TestNAT44Out2InDPO(MethodHolder):
cls.pg1.config_ip6()
cls.pg1.resolve_ndp()
cls.pg1.config_ip6()
cls.pg1.resolve_ndp()
- cls.vapi.ip_add_del_route(is_ipv6=True, dst_address='\x00'
*
16,
+ cls.vapi.ip_add_del_route(is_ipv6=True, dst_address='\x00'
*
16,
dst_address_length=0,
next_hop_address=cls.pg1.remote_ip6n,
next_hop_sw_if_index=cls.pg1.sw_if_index)
dst_address_length=0,
next_hop_address=cls.pg1.remote_ip6n,
next_hop_sw_if_index=cls.pg1.sw_if_index)
@@
-7043,7
+7045,7
@@
class TestDeterministicNAT(MethodHolder):
src_address=self.pg2.local_ip4n,
path_mtu=512,
template_interval=10)
src_address=self.pg2.local_ip4n,
path_mtu=512,
template_interval=10)
- self.vapi.nat_ipfix()
+ self.vapi.nat_ipfix
_enable_disable
()
pkts = []
for port in range(1025, 2025):
pkts = []
for port in range(1025, 2025):
@@
-7103,7
+7105,7
@@
class TestDeterministicNAT(MethodHolder):
"""
Clear deterministic NAT configuration.
"""
"""
Clear deterministic NAT configuration.
"""
- self.vapi.nat_ipfix(enable=0)
+ self.vapi.nat_ipfix
_enable_disable
(enable=0)
self.vapi.nat_set_timeouts()
deterministic_mappings = self.vapi.nat_det_map_dump()
for dsm in deterministic_mappings:
self.vapi.nat_set_timeouts()
deterministic_mappings = self.vapi.nat_det_map_dump()
for dsm in deterministic_mappings:
@@
-7166,7
+7168,8
@@
class TestNAT64(MethodHolder):
cls.ip6_interfaces.append(cls.pg_interfaces[2])
cls.ip4_interfaces = list(cls.pg_interfaces[1:2])
cls.ip6_interfaces.append(cls.pg_interfaces[2])
cls.ip4_interfaces = list(cls.pg_interfaces[1:2])
- cls.vapi.ip_table_add_del(cls.vrf1_id, is_add=1, is_ipv6=1)
+ cls.vapi.ip_table_add_del(is_ipv6=1, is_add=1,
+ table_id=cls.vrf1_id)
cls.pg_interfaces[2].set_table_ip6(cls.vrf1_id)
cls.pg_interfaces[2].set_table_ip6(cls.vrf1_id)
@@
-8160,7
+8163,7
@@
class TestNAT64(MethodHolder):
def test_interface_addr(self):
""" Acquire NAT64 pool addresses from interface """
def test_interface_addr(self):
""" Acquire NAT64 pool addresses from interface """
- self.vapi.nat64_add_interface_addr(self.pg4.sw_if_index)
+ self.vapi.nat64_add_
del_
interface_addr(self.pg4.sw_if_index)
# no address in NAT64 pool
adresses = self.vapi.nat44_address_dump()
# no address in NAT64 pool
adresses = self.vapi.nat44_address_dump()
@@
-8212,8
+8215,8
@@
class TestNAT64(MethodHolder):
src_address=self.pg3.local_ip4n,
path_mtu=512,
template_interval=10)
src_address=self.pg3.local_ip4n,
path_mtu=512,
template_interval=10)
- self.vapi.nat_ipfix(domain_id=self.ipfix_domain_id,
- src_port=self.ipfix_src_port)
+ self.vapi.nat_ipfix
_enable_disable
(domain_id=self.ipfix_domain_id,
+
src_port=self.ipfix_src_port)
p = (Ether(src=self.pg0.remote_mac, dst=self.pg0.local_mac) /
IPv6(src=src, dst=remote_host_ip6) /
p = (Ether(src=self.pg0.remote_mac, dst=self.pg0.local_mac) /
IPv6(src=src, dst=remote_host_ip6) /
@@
-8277,8
+8280,8
@@
class TestNAT64(MethodHolder):
src_address=self.pg3.local_ip4n,
path_mtu=512,
template_interval=10)
src_address=self.pg3.local_ip4n,
path_mtu=512,
template_interval=10)
- self.vapi.nat_ipfix(domain_id=self.ipfix_domain_id,
- src_port=self.ipfix_src_port)
+ self.vapi.nat_ipfix
_enable_disable
(domain_id=self.ipfix_domain_id,
+
src_port=self.ipfix_src_port)
data = 'a' * 200
pkts = self.create_stream_frag_ip6(self.pg0, self.pg1.remote_ip4,
data = 'a' * 200
pkts = self.create_stream_frag_ip6(self.pg0, self.pg1.remote_ip4,
@@
-8325,8
+8328,8
@@
class TestNAT64(MethodHolder):
src_address=self.pg3.local_ip4n,
path_mtu=512,
template_interval=10)
src_address=self.pg3.local_ip4n,
path_mtu=512,
template_interval=10)
- self.vapi.nat_ipfix(domain_id=self.ipfix_domain_id,
- src_port=self.ipfix_src_port)
+ self.vapi.nat_ipfix
_enable_disable
(domain_id=self.ipfix_domain_id,
+
src_port=self.ipfix_src_port)
# Create
p = (Ether(src=self.pg0.remote_mac, dst=self.pg0.local_mac) /
# Create
p = (Ether(src=self.pg0.remote_mac, dst=self.pg0.local_mac) /
@@
-8439,8
+8442,9
@@
class TestNAT64(MethodHolder):
"""
Clear NAT64 configuration.
"""
"""
Clear NAT64 configuration.
"""
- self.vapi.nat_ipfix(enable=0, src_port=self.ipfix_src_port,
- domain_id=self.ipfix_domain_id)
+ self.vapi.nat_ipfix_enable_disable(enable=0,
+ src_port=self.ipfix_src_port,
+ domain_id=self.ipfix_domain_id)
self.ipfix_src_port = 4739
self.ipfix_domain_id = 1
self.ipfix_src_port = 4739
self.ipfix_domain_id = 1