fix(IPsec): fix policy tests

Replace the hardcoded SPD inbound/outbound ranges with values derived
from test inputs.
Add the necessary routes now that the tunnel endpoints are not in the
same subnet. Also add ip neighbor entry on DUT2 for the same reason.
Also replace ipsec sa dump with show ipsec all in teardown of tests
where both SAs and SPDs are configured to improve troubleshooting.

Change-Id: I7d89a99fcf457a701c87bf6ac07364b62802677d
Signed-off-by: Juraj Linkeš <juraj.linkes@pantheon.tech>

diff --git a/resources/libraries/python/IPsecUtil.py b/resources/libraries/python/IPsecUtil.py
index e455dd7..e3b3c88 100644 (file)
--- a/resources/libraries/python/IPsecUtil.py
+++ b/resources/libraries/python/IPsecUtil.py
@@ -1,5 +1,5 @@
-# Copyright (c) 2021 Cisco and/or its affiliates.
-# Copyright (c) 2021 PANTHEON.tech s.r.o.
+# Copyright (c) 2022 Cisco and/or its affiliates.
+# Copyright (c) 2022 PANTHEON.tech s.r.o.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at:
@@ -627,6 +627,7 @@ class IPsecUtil:
         tunnel_src = ip_address(tunnel_src)
         tunnel_dst = ip_address(tunnel_dst)
         traffic_addr = ip_address(traffic_addr)
+        tunnel_dst_prefix = 128 if tunnel_dst.version == 6 else 32
         addr_incr = 1 << (128 - raddr_range) if tunnel_src.version == 6 \
             else 1 << (32 - raddr_range)
 
@@ -636,11 +637,15 @@ class IPsecUtil:
             with open(tmp_filename, 'w') as tmp_file:
                 if_name = Topology.get_interface_name(node, interface)
                 for i in range(n_tunnels):
+                    tunnel_dst_addr = tunnel_dst + i * addr_incr
                     conf = f"exec set interface ip address {if_name} " \
                         f"{tunnel_src + i * addr_incr}/{raddr_range}\n" \
                         f"exec ip route add {traffic_addr + i}/" \
-                        f"{128 if traffic_addr.version == 6 else 32} " \
-                        f"via {tunnel_dst + i * addr_incr} {if_name}\n"
+                        f"{tunnel_dst_prefix} " \
+                        f"via {tunnel_dst_addr} {if_name}\n" \
+                        f"exec ip route add {tunnel_dst_addr}/" \
+                        f"{tunnel_dst_prefix} " \
+                        f"via {tunnel_dst_addr} {if_name}\n"
                     if dst_mac:
                         conf = f"{conf}exec set ip neighbor {if_name} " \
                                f"{tunnel_dst + i * addr_incr} {dst_mac}\n"
@@ -684,20 +689,29 @@ class IPsecUtil:
 
         with PapiSocketExecutor(node) as papi_exec:
             for i in range(n_tunnels):
+                tunnel_dst_addr = tunnel_dst + i * addr_incr
                 args1[u"prefix"] = IPUtil.create_prefix_object(
                     tunnel_src + i * addr_incr, raddr_range
                 )
                 args2[u"route"] = IPUtil.compose_vpp_route_structure(
                     node, traffic_addr + i,
-                    prefix_len=128 if traffic_addr.version == 6 else 32,
-                    interface=interface, gateway=tunnel_dst + i * addr_incr
+                    prefix_len=tunnel_dst_prefix,
+                    interface=interface, gateway=tunnel_dst_addr
                 )
                 history = bool(not 1 < i < n_tunnels - 2)
                 papi_exec.add(cmd1, history=history, **args1).\
                     add(cmd2, history=history, **args2)
+
+                args2[u"route"] = IPUtil.compose_vpp_route_structure(
+                    node, tunnel_dst_addr,
+                    prefix_len=tunnel_dst_prefix,
+                    interface=interface, gateway=tunnel_dst_addr
+                )
+                papi_exec.add(cmd2, history=history, **args2)
+
                 if dst_mac:
                     args3[u"neighbor"][u"ip_address"] = ip_address(
-                        tunnel_dst + i * addr_incr
+                        tunnel_dst_addr
                     )
                     papi_exec.add(cmd3, history=history, **args3)
             papi_exec.get_replies(err_msg)
@@ -2136,6 +2150,10 @@ class IPsecUtil:
         sa_id_2 = 200000
         spi_1 = 300000
         spi_2 = 400000
+        dut1_local_outbound_range = ip_network(f"{tunnel_ip1}/8", False).\
+            with_prefixlen
+        dut1_remote_outbound_range = ip_network(f"{tunnel_ip2}/8", False).\
+            with_prefixlen
 
         crypto_key = gen_key(
             IPsecUtil.get_crypto_alg_key_len(crypto_alg)
@@ -2155,11 +2173,13 @@ class IPsecUtil:
         IPsecUtil.vpp_ipsec_spd_add_if(nodes[u"DUT1"], spd_id, interface1)
         IPsecUtil.vpp_ipsec_add_spd_entry(
             nodes[u"DUT1"], spd_id, p_hi, PolicyAction.BYPASS, inbound=False,
-            proto=50, laddr_range=u"100.0.0.0/8", raddr_range=u"100.0.0.0/8"
+            proto=50, laddr_range=dut1_local_outbound_range,
+            raddr_range=dut1_remote_outbound_range
         )
         IPsecUtil.vpp_ipsec_add_spd_entry(
             nodes[u"DUT1"], spd_id, p_hi, PolicyAction.BYPASS, inbound=True,
-            proto=50, laddr_range=u"100.0.0.0/8", raddr_range=u"100.0.0.0/8"
+            proto=50, laddr_range=dut1_remote_outbound_range,
+            raddr_range=dut1_local_outbound_range
         )
 
         IPsecUtil.vpp_ipsec_add_sad_entries(
@@ -2186,21 +2206,22 @@ class IPsecUtil:
         )
 
         if u"DUT2" in nodes.keys():
+            rmac = Topology.get_interface_mac(nodes[u"DUT1"], interface1)
             IPsecUtil.vpp_ipsec_set_ip_route(
                 nodes[u"DUT2"], n_tunnels, tunnel_ip2, raddr_ip1, tunnel_ip1,
-                interface2, raddr_range)
+                interface2, raddr_range, rmac)
 
             IPsecUtil.vpp_ipsec_add_spd(nodes[u"DUT2"], spd_id)
             IPsecUtil.vpp_ipsec_spd_add_if(nodes[u"DUT2"], spd_id, interface2)
             IPsecUtil.vpp_ipsec_add_spd_entry(
                 nodes[u"DUT2"], spd_id, p_hi, PolicyAction.BYPASS,
-                inbound=False, proto=50, laddr_range=u"100.0.0.0/8",
-                raddr_range=u"100.0.0.0/8"
+                inbound=False, proto=50, laddr_range=dut1_remote_outbound_range,
+                raddr_range=dut1_local_outbound_range
             )
             IPsecUtil.vpp_ipsec_add_spd_entry(
                 nodes[u"DUT2"], spd_id, p_hi, PolicyAction.BYPASS,
-                inbound=True, proto=50, laddr_range=u"100.0.0.0/8",
-                raddr_range=u"100.0.0.0/8"
+                inbound=True, proto=50, laddr_range=dut1_local_outbound_range,
+                raddr_range=dut1_remote_outbound_range
             )
 
             IPsecUtil.vpp_ipsec_add_sad_entries(

diff --git a/resources/libraries/robot/shared/test_teardown.robot b/resources/libraries/robot/shared/test_teardown.robot
index 474a6e9..6bfb532 100644 (file)
--- a/resources/libraries/robot/shared/test_teardown.robot
+++ b/resources/libraries/robot/shared/test_teardown.robot
@@ -1,4 +1,4 @@
-# Copyright (c) 2021 Cisco and/or its affiliates.
+# Copyright (c) 2022 Cisco and/or its affiliates.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at:
@@ -130,6 +130,16 @@
 | | | ... | Show Ipsec Security Association | ${nodes['${dut}']}
 | | END
 
+| Additional Test Tear Down Action For ipsec_all
+| | [Documentation]
+| | ... | Additional teardown for tests which use varied IPSec configuration.
+| | ... | Databases.
+| |
+| | FOR | ${dut} | IN | @{duts}
+| | | Run Keyword If Test Failed
+| | | ... | Vpp Ipsec Show All | ${nodes['${dut}']}
+| | END
+
 | Additional Test Tear Down Action For linux_bridge
 | | [Documentation]
 | | ... | Additional teardown for tests which uses linux_bridge.
@@ -222,4 +232,4 @@
 | |
 | | ${vnf_status} | ${value}= | Run Keyword And Ignore Error
 | | ... | Keyword Should Exist | vnf_manager.Kill All VMs
-| | Run Keyword If | '${vnf_status}' == 'PASS' | vnf_manager.Kill All VMs
\ No newline at end of file
+| | Run Keyword If | '${vnf_status}' == 'PASS' | vnf_manager.Kill All VMs

diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000spe-cache-ip4base-policy-outbound-nocrypto-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000spe-cache-ip4base-policy-outbound-nocrypto-ndrpdr.robot
index c28be98..d80c2db 100644 (file)
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000spe-cache-ip4base-policy-outbound-nocrypto-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000spe-cache-ip4base-policy-outbound-nocrypto-ndrpdr.robot
@@ -1,4 +1,4 @@
-# Copyright (c) 2021 PANTHEON.tech s.r.o.
+# Copyright (c) 2022 PANTHEON.tech s.r.o.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at:
@@ -24,7 +24,7 @@
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_all
 |
 | Test Template | Local Template
 |

diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000spe-ip4base-policy-outbound-nocrypto-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000spe-ip4base-policy-outbound-nocrypto-ndrpdr.robot
index aeacb8b..33856f8 100644 (file)
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000spe-ip4base-policy-outbound-nocrypto-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000spe-ip4base-policy-outbound-nocrypto-ndrpdr.robot
@@ -1,4 +1,4 @@
-# Copyright (c) 2021 PANTHEON.tech s.r.o.
+# Copyright (c) 2022 PANTHEON.tech s.r.o.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at:
@@ -23,7 +23,7 @@
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_all
 |
 | Test Template | Local Template
 |

diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-policy-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-policy-aes256gcm-ndrpdr.robot
index 1cb3c8d..a7f513e 100644 (file)
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-policy-aes256gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhw-ip4base-policy-aes256gcm-ndrpdr.robot
@@ -1,4 +1,4 @@
-# Copyright (c) 2021 Cisco and/or its affiliates.
+# Copyright (c) 2022 Cisco and/or its affiliates.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at:
@@ -24,7 +24,7 @@
 | Suite Setup | Setup suite topology interfaces | performance | ipsechw
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance | ipsec_sa
+| Test Teardown | Tear down test | performance | ipsec_all
 |
 | Test Template | Local Template
 |

diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhwasync-ip4base-policy-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhwasync-ip4base-policy-aes256gcm-ndrpdr.robot
index fcf26db..52d3fdc 100644 (file)
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhwasync-ip4base-policy-aes256gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlhwasync-ip4base-policy-aes256gcm-ndrpdr.robot
@@ -1,5 +1,5 @@
-# Copyright (c) 2021 Cisco and/or its affiliates.
-# Copyright (c) 2021 Intel and/or its affiliates.
+# Copyright (c) 2022 Cisco and/or its affiliates.
+# Copyright (c) 2022 Intel and/or its affiliates.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at:
@@ -25,7 +25,7 @@
 | Suite Setup | Setup suite topology interfaces | performance | ipsechw
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance | ipsec_sa
+| Test Teardown | Tear down test | performance | ipsec_all
 |
 | Test Template | Local Template
 |

diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-policy-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-policy-aes256gcm-ndrpdr.robot
index a42ecfe..54b10c0 100644 (file)
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-policy-aes256gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-policy-aes256gcm-ndrpdr.robot
@@ -1,4 +1,4 @@
-# Copyright (c) 2021 Cisco and/or its affiliates.
+# Copyright (c) 2022 Cisco and/or its affiliates.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at:
@@ -24,7 +24,7 @@
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance | ipsec_sa
+| Test Teardown | Tear down test | performance | ipsec_all
 |
 | Test Template | Local Template
 |

diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec100spe-cache-ip4base-policy-outbound-nocrypto-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec100spe-cache-ip4base-policy-outbound-nocrypto-ndrpdr.robot
index 6e1c417..98121f3 100644 (file)
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec100spe-cache-ip4base-policy-outbound-nocrypto-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec100spe-cache-ip4base-policy-outbound-nocrypto-ndrpdr.robot
@@ -1,4 +1,4 @@
-# Copyright (c) 2021 PANTHEON.tech s.r.o.
+# Copyright (c) 2022 PANTHEON.tech s.r.o.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at:
@@ -24,7 +24,7 @@
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_all
 |
 | Test Template | Local Template
 |

diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec100spe-ip4base-policy-outbound-nocrypto-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec100spe-ip4base-policy-outbound-nocrypto-ndrpdr.robot
index f6867f9..9ca8876 100644 (file)
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec100spe-ip4base-policy-outbound-nocrypto-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec100spe-ip4base-policy-outbound-nocrypto-ndrpdr.robot
@@ -1,4 +1,4 @@
-# Copyright (c) 2021 PANTHEON.tech s.r.o.
+# Copyright (c) 2022 PANTHEON.tech s.r.o.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at:
@@ -23,7 +23,7 @@
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_all
 |
 | Test Template | Local Template
 |

diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10spe-cache-ip4base-policy-outbound-nocrypto-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10spe-cache-ip4base-policy-outbound-nocrypto-ndrpdr.robot
index e58b33c..9f54752 100644 (file)
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10spe-cache-ip4base-policy-outbound-nocrypto-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10spe-cache-ip4base-policy-outbound-nocrypto-ndrpdr.robot
@@ -1,4 +1,4 @@
-# Copyright (c) 2021 PANTHEON.tech s.r.o.
+# Copyright (c) 2022 PANTHEON.tech s.r.o.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at:
@@ -24,7 +24,7 @@
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_all
 |
 | Test Template | Local Template
 |

diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10spe-ip4base-policy-outbound-nocrypto-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10spe-ip4base-policy-outbound-nocrypto-ndrpdr.robot
index 80298dd..620d174 100644 (file)
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10spe-ip4base-policy-outbound-nocrypto-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec10spe-ip4base-policy-outbound-nocrypto-ndrpdr.robot
@@ -1,4 +1,4 @@
-# Copyright (c) 2021 PANTHEON.tech s.r.o.
+# Copyright (c) 2022 PANTHEON.tech s.r.o.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at:
@@ -23,7 +23,7 @@
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_all
 |
 | Test Template | Local Template
 |

diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1spe-cache-ip4base-policy-outbound-nocrypto-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1spe-cache-ip4base-policy-outbound-nocrypto-ndrpdr.robot
index 088f834..0cf49f6 100644 (file)
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1spe-cache-ip4base-policy-outbound-nocrypto-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1spe-cache-ip4base-policy-outbound-nocrypto-ndrpdr.robot
@@ -1,4 +1,4 @@
-# Copyright (c) 2021 PANTHEON.tech s.r.o.
+# Copyright (c) 2022 PANTHEON.tech s.r.o.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at:
@@ -24,7 +24,7 @@
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_all
 |
 | Test Template | Local Template
 |

diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1spe-ip4base-policy-outbound-nocrypto-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1spe-ip4base-policy-outbound-nocrypto-ndrpdr.robot
index b05183a..5b88832 100644 (file)
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1spe-ip4base-policy-outbound-nocrypto-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1spe-ip4base-policy-outbound-nocrypto-ndrpdr.robot
@@ -1,4 +1,4 @@
-# Copyright (c) 2021 PANTHEON.tech s.r.o.
+# Copyright (c) 2022 PANTHEON.tech s.r.o.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at:
@@ -23,7 +23,7 @@
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_all
 |
 | Test Template | Local Template
 |

diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-policy-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-policy-aes256gcm-ndrpdr.robot
index 7ca656f..e1d7dbe 100644 (file)
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-policy-aes256gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhw-ip4base-policy-aes256gcm-ndrpdr.robot
@@ -1,4 +1,4 @@
-# Copyright (c) 2021 Cisco and/or its affiliates.
+# Copyright (c) 2022 Cisco and/or its affiliates.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at:
@@ -24,7 +24,7 @@
 | Suite Setup | Setup suite topology interfaces | performance | ipsechw
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance | ipsec_sa
+| Test Teardown | Tear down test | performance | ipsec_all
 |
 | Test Template | Local Template
 |

diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhwasync-ip4base-policy-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhwasync-ip4base-policy-aes256gcm-ndrpdr.robot
index 1067385..2f77cd0 100644 (file)
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhwasync-ip4base-policy-aes256gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlhwasync-ip4base-policy-aes256gcm-ndrpdr.robot
@@ -1,5 +1,5 @@
-# Copyright (c) 2021 Cisco and/or its affiliates.
-# Copyright (c) 2021 Intel and/or its affiliates.
+# Copyright (c) 2022 Cisco and/or its affiliates.
+# Copyright (c) 2022 Intel and/or its affiliates.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at:
@@ -25,7 +25,7 @@
 | Suite Setup | Setup suite topology interfaces | performance | ipsechw
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance | ipsec_sa
+| Test Teardown | Tear down test | performance | ipsec_all
 |
 | Test Template | Local Template
 |

diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-policy-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-policy-aes256gcm-ndrpdr.robot
index 11b5e0d..0d9cb0e 100644 (file)
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-policy-aes256gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec1tnlsw-ip4base-policy-aes256gcm-ndrpdr.robot
@@ -1,4 +1,4 @@
-# Copyright (c) 2021 Cisco and/or its affiliates.
+# Copyright (c) 2022 Cisco and/or its affiliates.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at:
@@ -24,7 +24,7 @@
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance | ipsec_sa
+| Test Teardown | Tear down test | performance | ipsec_all
 |
 | Test Template | Local Template
 |

diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-ip4base-policy-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-ip4base-policy-aes256gcm-ndrpdr.robot
index e35a234..2f1cb19 100644 (file)
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-ip4base-policy-aes256gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec40tnlsw-ip4base-policy-aes256gcm-ndrpdr.robot
@@ -1,4 +1,4 @@
-# Copyright (c) 2021 Cisco and/or its affiliates.
+# Copyright (c) 2022 Cisco and/or its affiliates.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at:
@@ -24,7 +24,7 @@
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance | ipsec_sa
+| Test Teardown | Tear down test | performance | ipsec_all
 |
 | Test Template | Local Template
 |

diff --git a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-ip4base-policy-aes256gcm-ndrpdr.robot b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-ip4base-policy-aes256gcm-ndrpdr.robot
index 518f5b7..0baef3d 100644 (file)
--- a/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-ip4base-policy-aes256gcm-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/10ge2p1x710-ethip4ipsec4tnlsw-ip4base-policy-aes256gcm-ndrpdr.robot
@@ -1,4 +1,4 @@
-# Copyright (c) 2021 Cisco and/or its affiliates.
+# Copyright (c) 2022 Cisco and/or its affiliates.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at:
@@ -24,7 +24,7 @@
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance | ipsec_sa
+| Test Teardown | Tear down test | performance | ipsec_all
 |
 | Test Template | Local Template
 |

diff --git a/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec1000spe-cache-ip4base-policy-outbound-nocrypto-ndrpdr.robot b/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec1000spe-cache-ip4base-policy-outbound-nocrypto-ndrpdr.robot
index 29bc1f0..d1c3611 100644 (file)
--- a/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec1000spe-cache-ip4base-policy-outbound-nocrypto-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec1000spe-cache-ip4base-policy-outbound-nocrypto-ndrpdr.robot
@@ -1,4 +1,4 @@
-# Copyright (c) 2021 PANTHEON.tech s.r.o.
+# Copyright (c) 2022 PANTHEON.tech s.r.o.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at:
@@ -24,7 +24,7 @@
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_all
 |
 | Test Template | Local Template
 |

diff --git a/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec1000spe-ip4base-policy-outbound-nocrypto-ndrpdr.robot b/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec1000spe-ip4base-policy-outbound-nocrypto-ndrpdr.robot
index 49414ea..c446a80 100644 (file)
--- a/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec1000spe-ip4base-policy-outbound-nocrypto-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec1000spe-ip4base-policy-outbound-nocrypto-ndrpdr.robot
@@ -1,4 +1,4 @@
-# Copyright (c) 2021 PANTHEON.tech s.r.o.
+# Copyright (c) 2022 PANTHEON.tech s.r.o.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at:
@@ -23,7 +23,7 @@
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_all
 |
 | Test Template | Local Template
 |

diff --git a/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-policy-aes256gcm-udir-ndrpdr.robot b/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-policy-aes256gcm-udir-ndrpdr.robot
index 5921cd1..2113d26 100644 (file)
--- a/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-policy-aes256gcm-udir-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec1000tnlsw-ip4base-policy-aes256gcm-udir-ndrpdr.robot
@@ -1,4 +1,4 @@
-# Copyright (c) 2021 Cisco and/or its affiliates.
+# Copyright (c) 2022 Cisco and/or its affiliates.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at:
@@ -24,7 +24,7 @@
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance | ipsec_sa
+| Test Teardown | Tear down test | performance | ipsec_all
 |
 | Test Template | Local Template
 |

diff --git a/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec100spe-cache-ip4base-policy-outbound-nocrypto-ndrpdr.robot b/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec100spe-cache-ip4base-policy-outbound-nocrypto-ndrpdr.robot
index 8d30848..c2fd5e4 100644 (file)
--- a/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec100spe-cache-ip4base-policy-outbound-nocrypto-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec100spe-cache-ip4base-policy-outbound-nocrypto-ndrpdr.robot
@@ -1,4 +1,4 @@
-# Copyright (c) 2021 PANTHEON.tech s.r.o.
+# Copyright (c) 2022 PANTHEON.tech s.r.o.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at:
@@ -24,7 +24,7 @@
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_all
 |
 | Test Template | Local Template
 |

diff --git a/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec100spe-ip4base-policy-outbound-nocrypto-ndrpdr.robot b/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec100spe-ip4base-policy-outbound-nocrypto-ndrpdr.robot
index b9780e2..75bb253 100644 (file)
--- a/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec100spe-ip4base-policy-outbound-nocrypto-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec100spe-ip4base-policy-outbound-nocrypto-ndrpdr.robot
@@ -1,4 +1,4 @@
-# Copyright (c) 2021 PANTHEON.tech s.r.o.
+# Copyright (c) 2022 PANTHEON.tech s.r.o.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at:
@@ -23,7 +23,7 @@
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_all
 |
 | Test Template | Local Template
 |

diff --git a/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec10spe-cache-ip4base-policy-outbound-nocrypto-ndrpdr.robot b/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec10spe-cache-ip4base-policy-outbound-nocrypto-ndrpdr.robot
index e7099ab..7eda473 100644 (file)
--- a/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec10spe-cache-ip4base-policy-outbound-nocrypto-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec10spe-cache-ip4base-policy-outbound-nocrypto-ndrpdr.robot
@@ -1,4 +1,4 @@
-# Copyright (c) 2021 PANTHEON.tech s.r.o.
+# Copyright (c) 2022 PANTHEON.tech s.r.o.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at:
@@ -24,7 +24,7 @@
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_all
 |
 | Test Template | Local Template
 |

diff --git a/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec10spe-ip4base-policy-outbound-nocrypto-ndrpdr.robot b/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec10spe-ip4base-policy-outbound-nocrypto-ndrpdr.robot
index 9e2ab54..b623ffd 100644 (file)
--- a/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec10spe-ip4base-policy-outbound-nocrypto-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec10spe-ip4base-policy-outbound-nocrypto-ndrpdr.robot
@@ -1,4 +1,4 @@
-# Copyright (c) 2021 PANTHEON.tech s.r.o.
+# Copyright (c) 2022 PANTHEON.tech s.r.o.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at:
@@ -23,7 +23,7 @@
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_all
 |
 | Test Template | Local Template
 |

diff --git a/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec1spe-cache-ip4base-policy-outbound-nocrypto-ndrpdr.robot b/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec1spe-cache-ip4base-policy-outbound-nocrypto-ndrpdr.robot
index 0cae13a..f78fdce 100644 (file)
--- a/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec1spe-cache-ip4base-policy-outbound-nocrypto-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec1spe-cache-ip4base-policy-outbound-nocrypto-ndrpdr.robot
@@ -1,4 +1,4 @@
-# Copyright (c) 2021 PANTHEON.tech s.r.o.
+# Copyright (c) 2022 PANTHEON.tech s.r.o.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at:
@@ -24,7 +24,7 @@
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_all
 |
 | Test Template | Local Template
 |

diff --git a/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec1spe-ip4base-policy-outbound-nocrypto-ndrpdr.robot b/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec1spe-ip4base-policy-outbound-nocrypto-ndrpdr.robot
index 9a3c82e..94d3b69 100644 (file)
--- a/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec1spe-ip4base-policy-outbound-nocrypto-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec1spe-ip4base-policy-outbound-nocrypto-ndrpdr.robot
@@ -1,4 +1,4 @@
-# Copyright (c) 2021 PANTHEON.tech s.r.o.
+# Copyright (c) 2022 PANTHEON.tech s.r.o.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at:
@@ -23,7 +23,7 @@
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance
+| Test Teardown | Tear down test | performance | ipsec_all
 |
 | Test Template | Local Template
 |

diff --git a/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec1tnlsw-ip4base-policy-aes256gcm-udir-ndrpdr.robot b/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec1tnlsw-ip4base-policy-aes256gcm-udir-ndrpdr.robot
index 7698f93..a65c2b3 100644 (file)
--- a/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec1tnlsw-ip4base-policy-aes256gcm-udir-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec1tnlsw-ip4base-policy-aes256gcm-udir-ndrpdr.robot
@@ -1,4 +1,4 @@
-# Copyright (c) 2021 Cisco and/or its affiliates.
+# Copyright (c) 2022 Cisco and/or its affiliates.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at:
@@ -24,7 +24,7 @@
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance | ipsec_sa
+| Test Teardown | Tear down test | performance | ipsec_all
 |
 | Test Template | Local Template
 |

diff --git a/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec40tnlsw-ip4base-policy-aes256gcm-udir-ndrpdr.robot b/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec40tnlsw-ip4base-policy-aes256gcm-udir-ndrpdr.robot
index 7b68c96..f22ab2c 100644 (file)
--- a/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec40tnlsw-ip4base-policy-aes256gcm-udir-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec40tnlsw-ip4base-policy-aes256gcm-udir-ndrpdr.robot
@@ -1,4 +1,4 @@
-# Copyright (c) 2021 Cisco and/or its affiliates.
+# Copyright (c) 2022 Cisco and/or its affiliates.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at:
@@ -24,7 +24,7 @@
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance | ipsec_sa
+| Test Teardown | Tear down test | performance | ipsec_all
 |
 | Test Template | Local Template
 |

diff --git a/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec4tnlsw-ip4base-policy-aes256gcm-udir-ndrpdr.robot b/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec4tnlsw-ip4base-policy-aes256gcm-udir-ndrpdr.robot
index faee83f..21f357c 100644 (file)
--- a/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec4tnlsw-ip4base-policy-aes256gcm-udir-ndrpdr.robot
+++ b/tests/vpp/perf/crypto/2n1l-10ge2p1x710-ethip4ipsec4tnlsw-ip4base-policy-aes256gcm-udir-ndrpdr.robot
@@ -1,4 +1,4 @@
-# Copyright (c) 2021 Cisco and/or its affiliates.
+# Copyright (c) 2022 Cisco and/or its affiliates.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at:
@@ -24,7 +24,7 @@
 | Suite Setup | Setup suite topology interfaces | performance
 | Suite Teardown | Tear down suite | performance
 | Test Setup | Setup test | performance
-| Test Teardown | Tear down test | performance | ipsec_sa
+| Test Teardown | Tear down test | performance | ipsec_all
 |
 | Test Template | Local Template
 |