From 7df86999bfaee9e5a0fa0c8ee6f5bc897343de9a Mon Sep 17 00:00:00 2001 From: Yulong Pei Date: Mon, 29 Aug 2022 02:54:04 +0000 Subject: Add VPP wireguard async mode test suite Add VPP wireguard async mode test suite to use QAT device for crypto. Also change keyword ipsechw to cryptohw in suite_setup.robot since currently crypto device is not only used by IPSec. Signed-off-by: Yulong Pei Signed-off-by: xinfeng zhao Change-Id: Ibdadb3b09c04b7181415ffd4a248abddc6289075 --- resources/libraries/python/Constants.py | 1 + resources/libraries/python/DUTSetup.py | 9 ++++++--- resources/libraries/robot/shared/suite_setup.robot | 3 ++- resources/libraries/robot/wireguard/wireguard.robot | 8 ++++++++ 4 files changed, 17 insertions(+), 4 deletions(-) (limited to 'resources/libraries') diff --git a/resources/libraries/python/Constants.py b/resources/libraries/python/Constants.py index 4a7084777f..24a1117356 100644 --- a/resources/libraries/python/Constants.py +++ b/resources/libraries/python/Constants.py @@ -448,6 +448,7 @@ class Constants: # TODO CSIT-1481: Crypto HW should be read from topology file instead. NIC_NAME_TO_CRYPTO_HW = { u"Intel-X553": u"HW_C3xxx", + u"Intel-E822CQ": u"HW_C4xxx", u"Intel-X710": u"HW_DH895xcc", u"Intel-XL710": u"HW_DH895xcc", } diff --git a/resources/libraries/python/DUTSetup.py b/resources/libraries/python/DUTSetup.py index c7a560262c..6e3530277a 100644 --- a/resources/libraries/python/DUTSetup.py +++ b/resources/libraries/python/DUTSetup.py @@ -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: @@ -266,7 +266,7 @@ class DUTSetup: initialize or remove VFs on QAT. :param node: DUT node. - :crypto_type: Crypto device type - HW_DH895xcc or HW_C3xxx. + :crypto_type: Crypto device type - HW_DH895xcc, HW_C3xxx or HW_C4xxx. :param numvfs: Number of VFs to initialize, 0 - disable the VFs. :param force_init: If True then try to initialize to specific value. :type node: dict @@ -294,7 +294,7 @@ class DUTSetup: """Init Crypto QAT device virtual functions on DUT. :param node: DUT node. - :crypto_type: Crypto device type - HW_DH895xcc or HW_C3xxx. + :crypto_type: Crypto device type - HW_DH895xcc, HW_C3xxx or HW_C4xxx. :param numvfs: Number of VFs to initialize, 0 - disable the VFs. :type node: dict :type crypto_type: string @@ -308,6 +308,9 @@ class DUTSetup: elif crypto_type == u"HW_C3xxx": kernel_mod = u"qat_c3xxx" kernel_drv = u"c3xxx" + elif crypto_type == u"HW_C4xxx": + kernel_mod = u"qat_c4xxx" + kernel_drv = u"c4xxx" else: raise RuntimeError( f"Unsupported crypto device type on {node[u'host']}" diff --git a/resources/libraries/robot/shared/suite_setup.robot b/resources/libraries/robot/shared/suite_setup.robot index c01233ce05..48845708ad 100644 --- a/resources/libraries/robot/shared/suite_setup.robot +++ b/resources/libraries/robot/shared/suite_setup.robot @@ -271,13 +271,14 @@ | | ${version} = | Get iPerf Version | ${nodes}[TG] | | Export TG Type And Version | ${type} | ${version} -| Additional Suite Setup Action For ipsechw +| Additional Suite Setup Action For cryptohw | | [Documentation] | | ... | Additional Setup for suites which uses QAT HW. | | | | ${numvfs}= | Set Variable If | | ... | '${crypto_type}' == 'HW_DH895xcc' | ${32} | | ... | '${crypto_type}' == 'HW_C3xxx' | ${16} +| | ... | '${crypto_type}' == 'HW_C4xxx' | ${128} | | Configure crypto device on all DUTs | ${crypto_type} | numvfs=${numvfs} | | ... | force_init=${True} | | Configure kernel module on all DUTs | vfio_pci | force_load=${True} diff --git a/resources/libraries/robot/wireguard/wireguard.robot b/resources/libraries/robot/wireguard/wireguard.robot index ca794d0c36..f85c0eb7b1 100644 --- a/resources/libraries/robot/wireguard/wireguard.robot +++ b/resources/libraries/robot/wireguard/wireguard.robot @@ -56,3 +56,11 @@ | | ... | interface=${DUT1_${int}1}[0] | | Vpp Route Add | ${dut2} | ${raddr_ip4} | 8 | gateway=${tg_if2_ip4} | | ... | interface=${DUT2_${int}2}[0] + +| VPP Enable Wireguard Async Mode on all VPP DUTs +| | [Documentation] +| | ... | Enable wireguard async mode on all DUT nodes. +| | +| | FOR | ${dut} | IN | @{duts} +| | | VPP Wireguard Set Async Mode | ${nodes['${dut}']} +| | END -- cgit 1.2.3-korg