Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
NAT44: asymmetrical static mapping rule (VPP-1135)
[vpp.git]
/
test
/
vpp_papi_provider.py
diff --git
a/test/vpp_papi_provider.py
b/test/vpp_papi_provider.py
index
c6157d3
..
13dccc9
100644
(file)
--- a/
test/vpp_papi_provider.py
+++ b/
test/vpp_papi_provider.py
@@
-759,7
+759,7
@@
class VppPapiProvider(object):
is_local=0,
is_classify=0,
is_multipath=0,
is_local=0,
is_classify=0,
is_multipath=0,
- is_
l2_bridged
=0,
+ is_
dvr
=0,
is_udp_encap=0,
is_source_lookup=0):
"""
is_udp_encap=0,
is_source_lookup=0):
"""
@@
-780,7
+780,7
@@
class VppPapiProvider(object):
:param is_multipath: (Default value = 0)
:param is_resolve_host: (Default value = 0)
:param is_resolve_attached: (Default value = 0)
:param is_multipath: (Default value = 0)
:param is_resolve_host: (Default value = 0)
:param is_resolve_attached: (Default value = 0)
- :param is_
l2_bridged
: (Default value = 0)
+ :param is_
dvr
: (Default value = 0)
:param is_source_lookup: (Default value = 0)
:param next_hop_weight: (Default value = 1)
:param is_source_lookup: (Default value = 0)
:param next_hop_weight: (Default value = 1)
@@
-802,7
+802,7
@@
class VppPapiProvider(object):
'is_multipath': is_multipath,
'is_resolve_host': is_resolve_host,
'is_resolve_attached': is_resolve_attached,
'is_multipath': is_multipath,
'is_resolve_host': is_resolve_host,
'is_resolve_attached': is_resolve_attached,
- 'is_
l2_bridged': is_l2_bridged
,
+ 'is_
dvr': is_dvr
,
'is_source_lookup': is_source_lookup,
'is_udp_encap': is_udp_encap,
'next_hop_weight': next_hop_weight,
'is_source_lookup': is_source_lookup,
'is_udp_encap': is_udp_encap,
'next_hop_weight': next_hop_weight,
@@
-1235,6
+1235,7
@@
class VppPapiProvider(object):
vrf_id=0,
protocol=0,
twice_nat=0,
vrf_id=0,
protocol=0,
twice_nat=0,
+ out2in_only=0,
is_add=1):
"""Add/delete NAT44 static mapping
is_add=1):
"""Add/delete NAT44 static mapping
@@
-1247,6
+1248,7
@@
class VppPapiProvider(object):
:param vrf_id: VRF ID
:param protocol: IP protocol (Default value = 0)
:param twice_nat: 1 if translate external host address and port
:param vrf_id: VRF ID
:param protocol: IP protocol (Default value = 0)
:param twice_nat: 1 if translate external host address and port
+ :param out2in_only: if 1 rule is matching only out2in direction
:param is_add: 1 if add, 0 if delete (Default value = 1)
"""
return self.api(
:param is_add: 1 if add, 0 if delete (Default value = 1)
"""
return self.api(
@@
-1260,7
+1262,8
@@
class VppPapiProvider(object):
'external_sw_if_index': external_sw_if_index,
'vrf_id': vrf_id,
'protocol': protocol,
'external_sw_if_index': external_sw_if_index,
'vrf_id': vrf_id,
'protocol': protocol,
- 'twice_nat': twice_nat})
+ 'twice_nat': twice_nat,
+ 'out2in_only': out2in_only})
def nat44_add_del_identity_mapping(
self,
def nat44_add_del_identity_mapping(
self,
@@
-1420,6
+1423,7
@@
class VppPapiProvider(object):
protocol,
vrf_id=0,
twice_nat=0,
protocol,
vrf_id=0,
twice_nat=0,
+ out2in_only=0,
local_num=0,
locals=[],
is_add=1):
local_num=0,
locals=[],
is_add=1):
@@
-1436,6
+1440,7
@@
class VppPapiProvider(object):
'protocol': protocol,
'vrf_id': vrf_id,
'twice_nat': twice_nat,
'protocol': protocol,
'vrf_id': vrf_id,
'twice_nat': twice_nat,
+ 'out2in_only': out2in_only,
'local_num': local_num,
'locals': locals})
'local_num': local_num,
'locals': locals})
@@
-1818,6
+1823,17
@@
class VppPapiProvider(object):
{'ip4_addr': ip4,
'ip6_addr': ip6})
{'ip4_addr': ip4,
'ip6_addr': ip6})
+ def dslite_set_b4_addr(self, ip6, ip4):
+ """Set DS-Lite B4 IPv6 address
+
+ :param ip4: IPv4 address
+ :param ip6: IPv6 address
+ """
+ return self.api(
+ self.papi.dslite_set_b4_addr,
+ {'ip4_addr': ip4,
+ 'ip6_addr': ip6})
+
def dslite_add_del_pool_addr_range(
self,
start_addr,
def dslite_add_del_pool_addr_range(
self,
start_addr,
@@
-2315,6
+2331,7
@@
class VppPapiProvider(object):
psid_offset=0,
psid_length=0,
is_translation=0,
psid_offset=0,
psid_length=0,
is_translation=0,
+ is_rfc6052=0,
mtu=1280):
return self.api(
self.papi.map_add_domain,
mtu=1280):
return self.api(
self.papi.map_add_domain,
@@
-2329,6
+2346,7
@@
class VppPapiProvider(object):
'psid_offset': psid_offset,
'psid_length': psid_length,
'is_translation': is_translation,
'psid_offset': psid_offset,
'psid_length': psid_length,
'is_translation': is_translation,
+ 'is_rfc6052': is_rfc6052,
'mtu': mtu
})
'mtu': mtu
})