From 0891b6aa449cca525b61d0cc23759b2efcd158dc Mon Sep 17 00:00:00 2001 From: Fahad Naeem Date: Tue, 10 May 2022 01:03:52 -0500 Subject: pnat: add support to wildcard IP Protocol field if not specified - add pnat_binding_add_v2 which explicitly requires match mask to set to PNAT_PROTO if we want to match on IP Protocol - fix pnat_binding_add backward compatibility i.e. no need to set match mast to PNAT_PROTO Type: improvement Signed-off-by: Fahad Naeem Change-Id: I5a23244be55b7d4c10552c555881527a4b2f325f --- test/test_pnat.py | 99 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 99 insertions(+) (limited to 'test') diff --git a/test/test_pnat.py b/test/test_pnat.py index faf66e6ed53..2bf34052325 100644 --- a/test/test_pnat.py +++ b/test/test_pnat.py @@ -242,6 +242,105 @@ class TestPNAT(VppTestCase): ) self.vapi.pnat_binding_del(binding_index=binding_index[i]) + def test_pnat_wildcard_proto(self): + """ + PNAT test wildcard IP protocol, PNAT_PROTO for mask should be set by + handler + """ + + 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 + + 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_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) + + reply = t['reply'] + reply[IP].ttl -= 1 + 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_del(binding_index=rv.binding_index) + + def test_pnat_wildcard_proto_v2(self): + """ 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 + + 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_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) + + reply = t['reply'] + reply[IP].ttl -= 1 + 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_del(binding_index=rv.binding_index) + if __name__ == "__main__": unittest.main(testRunner=VppTestRunner) -- cgit 1.2.3-korg