X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Ftest_ipsec_esp.py;h=c1bed91759e5aad9d07b9d9bb757e9f7cab994a3;hb=c7d50475ecf53e8c65d875710c8a97be7dd11bd9;hp=54b877112e9953a5e499fa6223b6a195b7060f50;hpb=d9b0c6fbf7aa5bd9af84264105b39c82028a4a29;p=vpp.git diff --git a/test/test_ipsec_esp.py b/test/test_ipsec_esp.py index 54b877112e9..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,12 +201,12 @@ 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], self.pg1.remote_addr[addr_type], - 0, + socket.IPPROTO_RAW, priority=10, policy=e.IPSEC_API_SPD_ACTION_PROTECT, is_outbound=0, @@ -216,12 +216,12 @@ 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, remote_tun_if_host, - 0, + socket.IPPROTO_RAW, policy=e.IPSEC_API_SPD_ACTION_PROTECT, priority=10, ) @@ -230,12 +230,12 @@ 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], self.pg0.local_addr[addr_type], - 0, + socket.IPPROTO_RAW, priority=20, policy=e.IPSEC_API_SPD_ACTION_PROTECT, is_outbound=0, @@ -245,12 +245,12 @@ 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, remote_tun_if_host, - 0, + socket.IPPROTO_RAW, policy=e.IPSEC_API_SPD_ACTION_PROTECT, priority=20, ) @@ -332,12 +332,12 @@ 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], self.tra_if.remote_addr[addr_type], - 0, + socket.IPPROTO_RAW, priority=10, policy=e.IPSEC_API_SPD_ACTION_PROTECT, is_outbound=0, @@ -347,12 +347,12 @@ 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], self.tra_if.remote_addr[addr_type], - 0, + socket.IPPROTO_RAW, policy=e.IPSEC_API_SPD_ACTION_PROTECT, priority=10, ) @@ -447,12 +447,12 @@ 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, p6.remote_tun_if_host4, - 0, + socket.IPPROTO_RAW, priority=10, policy=e.IPSEC_API_SPD_ACTION_PROTECT, is_outbound=1, @@ -482,12 +482,12 @@ 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, p4.remote_tun_if_host6, - 0, + socket.IPPROTO_RAW, priority=10, policy=e.IPSEC_API_SPD_ACTION_PROTECT, is_outbound=1, @@ -648,7 +648,7 @@ class TestIpsecEspAsync(TemplateIpsecEsp): self.pg1.remote_addr[self.p_sync.addr_type], self.p_sync.remote_tun_if_host, self.p_sync.remote_tun_if_host, - 0, + socket.IPPROTO_RAW, priority=1, policy=e.IPSEC_API_SPD_ACTION_PROTECT, is_outbound=1, @@ -707,7 +707,7 @@ class TestIpsecEspAsync(TemplateIpsecEsp): self.pg1.remote_addr[self.p_async.addr_type], self.p_async.remote_tun_if_host, self.p_async.remote_tun_if_host, - 0, + socket.IPPROTO_RAW, priority=2, policy=e.IPSEC_API_SPD_ACTION_PROTECT, is_outbound=1, @@ -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)