summaryrefslogtreecommitdiffstats
path: root/test/test_ipsec_esp.py
diff options
context:
space:
mode:
authorArthur de Kerhor <arthurdekerhor@gmail.com>2022-11-16 18:45:24 +0100
committerNeale Ranns <neale@graphiant.com>2023-02-06 03:49:14 +0000
commit0df06b6e95b6a3261c8e9c261c7a4a661d6ea25a (patch)
tree16c4f723367566c965bffda369bb1f56dcf566ce /test/test_ipsec_esp.py
parentab412cdc07e19a872037e4034caa522398c4be07 (diff)
ipsec: fix SA names consistency in tests
In some IPsec tests, the SA called scapy_sa designs the SA that encrypts Scapy packets and decrypts them in VPP, and the one called vpp_sa the SA that encrypts VPP packets and decrypts them with Scapy. However, this pattern is not consistent across all tests. Some tests use the opposite logic. Others even mix both correlating scapy_tra_spi with vpp_tra_sa_id and vice-versa. Because of that, sometimes, the SA called vpp_sa_in is used as an outbound SA and vpp_sa_out as an inbound one. This patch forces all the tests to follow the same following logic: - scapy_sa is the SA used to encrypt Scapy packets and decrypt them in VPP. It matches the VPP inbound SA. - vpp_sa is the SA used to encrypt VPP packets and decrypt them in Scapy. It matches the VPP outbound SA. Type: fix Signed-off-by: Arthur de Kerhor <arthurdekerhor@gmail.com> Change-Id: Iadccdccbf98e834add13b5f4ad87af57e2ea3c2a
Diffstat (limited to 'test/test_ipsec_esp.py')
-rw-r--r--test/test_ipsec_esp.py30
1 files changed, 15 insertions, 15 deletions
diff --git a/test/test_ipsec_esp.py b/test/test_ipsec_esp.py
index 90f013f8010..c1bed91759e 100644
--- a/test/test_ipsec_esp.py
+++ b/test/test_ipsec_esp.py
@@ -145,8 +145,8 @@ class ConfigIpsecESP(TemplateIpsec):
crypt_algo_vpp_id,
crypt_key,
self.vpp_esp_protocol,
- self.tun_if.local_addr[addr_type],
self.tun_if.remote_addr[addr_type],
+ self.tun_if.local_addr[addr_type],
tun_flags=tun_flags,
dscp=params.dscp,
flags=flags,
@@ -162,8 +162,8 @@ class ConfigIpsecESP(TemplateIpsec):
crypt_algo_vpp_id,
crypt_key,
self.vpp_esp_protocol,
- self.tun_if.remote_addr[addr_type],
self.tun_if.local_addr[addr_type],
+ self.tun_if.remote_addr[addr_type],
tun_flags=tun_flags,
dscp=params.dscp,
flags=flags,
@@ -201,7 +201,7 @@ class ConfigIpsecESP(TemplateIpsec):
VppIpsecSpdEntry(
self,
self.tun_spd,
- vpp_tun_sa_id,
+ scapy_tun_sa_id,
remote_tun_if_host,
remote_tun_if_host,
self.pg1.remote_addr[addr_type],
@@ -216,7 +216,7 @@ class ConfigIpsecESP(TemplateIpsec):
VppIpsecSpdEntry(
self,
self.tun_spd,
- scapy_tun_sa_id,
+ vpp_tun_sa_id,
self.pg1.remote_addr[addr_type],
self.pg1.remote_addr[addr_type],
remote_tun_if_host,
@@ -230,7 +230,7 @@ class ConfigIpsecESP(TemplateIpsec):
VppIpsecSpdEntry(
self,
self.tun_spd,
- vpp_tun_sa_id,
+ scapy_tun_sa_id,
remote_tun_if_host,
remote_tun_if_host,
self.pg0.local_addr[addr_type],
@@ -245,7 +245,7 @@ class ConfigIpsecESP(TemplateIpsec):
VppIpsecSpdEntry(
self,
self.tun_spd,
- scapy_tun_sa_id,
+ vpp_tun_sa_id,
self.pg0.local_addr[addr_type],
self.pg0.local_addr[addr_type],
remote_tun_if_host,
@@ -332,7 +332,7 @@ class ConfigIpsecESP(TemplateIpsec):
VppIpsecSpdEntry(
self,
self.tra_spd,
- vpp_tra_sa_id,
+ scapy_tra_sa_id,
self.tra_if.local_addr[addr_type],
self.tra_if.local_addr[addr_type],
self.tra_if.remote_addr[addr_type],
@@ -347,7 +347,7 @@ class ConfigIpsecESP(TemplateIpsec):
VppIpsecSpdEntry(
self,
self.tra_spd,
- scapy_tra_sa_id,
+ vpp_tra_sa_id,
self.tra_if.local_addr[addr_type],
self.tra_if.local_addr[addr_type],
self.tra_if.remote_addr[addr_type],
@@ -447,7 +447,7 @@ class TestIpsecEsp1(
VppIpsecSpdEntry(
self,
self.tun_spd,
- p6.scapy_tun_sa_id,
+ p6.vpp_tun_sa_id,
self.pg1.remote_addr[p4.addr_type],
self.pg1.remote_addr[p4.addr_type],
p6.remote_tun_if_host4,
@@ -482,7 +482,7 @@ class TestIpsecEsp1(
VppIpsecSpdEntry(
self,
self.tun_spd,
- p4.scapy_tun_sa_id,
+ p4.vpp_tun_sa_id,
self.pg1.remote_addr[p6.addr_type],
self.pg1.remote_addr[p6.addr_type],
p4.remote_tun_if_host6,
@@ -746,10 +746,10 @@ class TestIpsecEspAsync(TemplateIpsecEsp):
self.assertEqual(len(rxs), len(pkts))
for rx in rxs:
- if rx[ESP].spi == p.scapy_tun_spi:
+ if rx[ESP].spi == p.vpp_tun_spi:
decrypted = p.vpp_tun_sa.decrypt(rx[IP])
elif rx[ESP].spi == self.p_sync.vpp_tun_spi:
- decrypted = self.p_sync.scapy_tun_sa.decrypt(rx[IP])
+ decrypted = self.p_sync.vpp_tun_sa.decrypt(rx[IP])
else:
rx.show()
self.assertTrue(False)
@@ -807,12 +807,12 @@ class TestIpsecEspAsync(TemplateIpsecEsp):
self.assertEqual(len(rxs), len(pkts))
for rx in rxs:
- if rx[ESP].spi == p.scapy_tun_spi:
+ if rx[ESP].spi == p.vpp_tun_spi:
decrypted = p.vpp_tun_sa.decrypt(rx[IP])
elif rx[ESP].spi == self.p_sync.vpp_tun_spi:
- decrypted = self.p_sync.scapy_tun_sa.decrypt(rx[IP])
+ decrypted = self.p_sync.vpp_tun_sa.decrypt(rx[IP])
elif rx[ESP].spi == self.p_async.vpp_tun_spi:
- decrypted = self.p_async.scapy_tun_sa.decrypt(rx[IP])
+ decrypted = self.p_async.vpp_tun_sa.decrypt(rx[IP])
else:
rx.show()
self.assertTrue(False)