aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorAlexander Chernavin <achernavin@netgate.com>2022-05-13 08:34:34 +0000
committerAlexander Chernavin <achernavin@netgate.com>2022-05-13 08:34:34 +0000
commitd0e0e06984f0ac0c26129484708c10a66f2d6ab5 (patch)
tree4635e4d06e4ad29e48e2ffb1485767489a0b45ef /test
parente0f901a0483f7b10d2409075e694d91cf4fb42c5 (diff)
tests: fix pnat tests formatting
Type: fix Signed-off-by: Alexander Chernavin <achernavin@netgate.com> Change-Id: I944dc8418e7ab541ae96141c15e04abb33635ac4
Diffstat (limited to 'test')
-rw-r--r--test/test_pnat.py104
1 files changed, 53 insertions, 51 deletions
diff --git a/test/test_pnat.py b/test/test_pnat.py
index 2bf34052325..970249489d3 100644
--- a/test/test_pnat.py
+++ b/test/test_pnat.py
@@ -249,96 +249,98 @@ class TestPNAT(VppTestCase):
"""
PNAT_IP4_INPUT = VppEnum.vl_api_pnat_attachment_point_t.PNAT_IP4_INPUT
- PNAT_IP4_OUTPUT = \
- VppEnum.vl_api_pnat_attachment_point_t.PNAT_IP4_OUTPUT
+ PNAT_IP4_OUTPUT = VppEnum.vl_api_pnat_attachment_point_t.PNAT_IP4_OUTPUT
tests = [
{
- 'input': PNAT_IP4_INPUT,
- 'sw_if_index': self.pg0.sw_if_index,
- 'match': {'mask': 0x2, 'dst': '10.10.10.10'},
- 'rewrite': {'mask': 0x2, 'dst': self.pg1.remote_ip4},
- 'send': (IP(src=self.pg0.remote_ip4, dst='10.10.10.10')),
- 'reply': (IP(src=self.pg0.remote_ip4, dst=self.pg1.remote_ip4))
+ "input": PNAT_IP4_INPUT,
+ "sw_if_index": self.pg0.sw_if_index,
+ "match": {"mask": 0x2, "dst": "10.10.10.10"},
+ "rewrite": {"mask": 0x2, "dst": self.pg1.remote_ip4},
+ "send": (IP(src=self.pg0.remote_ip4, dst="10.10.10.10")),
+ "reply": (IP(src=self.pg0.remote_ip4, dst=self.pg1.remote_ip4)),
},
{
- 'input': PNAT_IP4_OUTPUT,
- 'sw_if_index': self.pg1.sw_if_index,
- 'match': {'mask': 0x1, 'src': self.pg0.remote_ip4},
- 'rewrite': {'mask': 0x1, 'src': '11.11.11.11'},
- 'send': (IP(src=self.pg0.remote_ip4, dst=self.pg1.remote_ip4)),
- 'reply': (IP(src='11.11.11.11', dst=self.pg1.remote_ip4))
+ "input": PNAT_IP4_OUTPUT,
+ "sw_if_index": self.pg1.sw_if_index,
+ "match": {"mask": 0x1, "src": self.pg0.remote_ip4},
+ "rewrite": {"mask": 0x1, "src": "11.11.11.11"},
+ "send": (IP(src=self.pg0.remote_ip4, dst=self.pg1.remote_ip4)),
+ "reply": (IP(src="11.11.11.11", dst=self.pg1.remote_ip4)),
},
]
p_ether = Ether(src=self.pg0.remote_mac, dst=self.pg0.local_mac)
for t in tests:
- rv = self.vapi.pnat_binding_add(match=t['match'],
- rewrite=t['rewrite'])
- self.vapi.pnat_binding_attach(sw_if_index=t['sw_if_index'],
- attachment=t['input'],
- binding_index=rv.binding_index)
+ rv = self.vapi.pnat_binding_add(match=t["match"], rewrite=t["rewrite"])
+ self.vapi.pnat_binding_attach(
+ sw_if_index=t["sw_if_index"],
+ attachment=t["input"],
+ binding_index=rv.binding_index,
+ )
- reply = t['reply']
+ reply = t["reply"]
reply[IP].ttl -= 1
- rx = self.send_and_expect(self.pg0, p_ether / t['send'] * 1,
- self.pg1)
+ rx = self.send_and_expect(self.pg0, p_ether / t["send"] * 1, self.pg1)
for p in rx:
self.validate(p[1], reply)
self.ping_check()
- self.vapi.pnat_binding_detach(sw_if_index=t['sw_if_index'],
- attachment=t['input'],
- binding_index=rv.binding_index)
+ self.vapi.pnat_binding_detach(
+ sw_if_index=t["sw_if_index"],
+ attachment=t["input"],
+ binding_index=rv.binding_index,
+ )
self.vapi.pnat_binding_del(binding_index=rv.binding_index)
def test_pnat_wildcard_proto_v2(self):
- """ PNAT test wildcard IP protocol using pnat_binding_add_v2"""
+ """PNAT test wildcard IP protocol using pnat_binding_add_v2"""
PNAT_IP4_INPUT = VppEnum.vl_api_pnat_attachment_point_t.PNAT_IP4_INPUT
- PNAT_IP4_OUTPUT = \
- VppEnum.vl_api_pnat_attachment_point_t.PNAT_IP4_OUTPUT
+ PNAT_IP4_OUTPUT = VppEnum.vl_api_pnat_attachment_point_t.PNAT_IP4_OUTPUT
tests = [
{
- 'input': PNAT_IP4_INPUT,
- 'sw_if_index': self.pg0.sw_if_index,
- 'match': {'mask': 0x42, 'dst': '10.10.10.10'},
- 'rewrite': {'mask': 0x42, 'dst': self.pg1.remote_ip4},
- 'send': (IP(src=self.pg0.remote_ip4, dst='10.10.10.10')),
- 'reply': (IP(src=self.pg0.remote_ip4, dst=self.pg1.remote_ip4))
+ "input": PNAT_IP4_INPUT,
+ "sw_if_index": self.pg0.sw_if_index,
+ "match": {"mask": 0x42, "dst": "10.10.10.10"},
+ "rewrite": {"mask": 0x42, "dst": self.pg1.remote_ip4},
+ "send": (IP(src=self.pg0.remote_ip4, dst="10.10.10.10")),
+ "reply": (IP(src=self.pg0.remote_ip4, dst=self.pg1.remote_ip4)),
},
{
- 'input': PNAT_IP4_OUTPUT,
- 'sw_if_index': self.pg1.sw_if_index,
- 'match': {'mask': 0x41, 'src': self.pg0.remote_ip4},
- 'rewrite': {'mask': 0x41, 'src': '11.11.11.11'},
- 'send': (IP(src=self.pg0.remote_ip4, dst=self.pg1.remote_ip4)),
- 'reply': (IP(src='11.11.11.11', dst=self.pg1.remote_ip4))
+ "input": PNAT_IP4_OUTPUT,
+ "sw_if_index": self.pg1.sw_if_index,
+ "match": {"mask": 0x41, "src": self.pg0.remote_ip4},
+ "rewrite": {"mask": 0x41, "src": "11.11.11.11"},
+ "send": (IP(src=self.pg0.remote_ip4, dst=self.pg1.remote_ip4)),
+ "reply": (IP(src="11.11.11.11", dst=self.pg1.remote_ip4)),
},
]
p_ether = Ether(src=self.pg0.remote_mac, dst=self.pg0.local_mac)
for t in tests:
- rv = self.vapi.pnat_binding_add_v2(match=t['match'],
- rewrite=t['rewrite'])
- self.vapi.pnat_binding_attach(sw_if_index=t['sw_if_index'],
- attachment=t['input'],
- binding_index=rv.binding_index)
+ rv = self.vapi.pnat_binding_add_v2(match=t["match"], rewrite=t["rewrite"])
+ self.vapi.pnat_binding_attach(
+ sw_if_index=t["sw_if_index"],
+ attachment=t["input"],
+ binding_index=rv.binding_index,
+ )
- reply = t['reply']
+ reply = t["reply"]
reply[IP].ttl -= 1
- rx = self.send_and_expect(self.pg0, p_ether / t['send'] * 1,
- self.pg1)
+ rx = self.send_and_expect(self.pg0, p_ether / t["send"] * 1, self.pg1)
for p in rx:
self.validate(p[1], reply)
self.ping_check()
- self.vapi.pnat_binding_detach(sw_if_index=t['sw_if_index'],
- attachment=t['input'],
- binding_index=rv.binding_index)
+ self.vapi.pnat_binding_detach(
+ sw_if_index=t["sw_if_index"],
+ attachment=t["input"],
+ binding_index=rv.binding_index,
+ )
self.vapi.pnat_binding_del(binding_index=rv.binding_index)