From a3a92253e83eecc8f7d63852668b51b80333f307 Mon Sep 17 00:00:00 2001 From: James Parker Date: Wed, 27 Jan 2021 22:12:46 -0500 Subject: [PATCH] Added min_microversion to SRIOVNumaAffinity Helper method create_test_server in the test methods for class SRIOVNumaAffinity requires passing the 'host' parameter. This is only supported for compute microversions 2.74 and greater. Adding class variable min_microversion to to class SRIOVNumaAffinity to account for this. Also updated help msg for [whitebox-hardware]/physnet_numa_affinity to be a more accurate description of the parameter. Change-Id: I7fdc7f8fbfd6ee7329fdb4457d35a6ebdf5fe8d7 --- whitebox_tempest_plugin/api/compute/test_sriov.py | 2 ++ whitebox_tempest_plugin/config.py | 5 ++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/whitebox_tempest_plugin/api/compute/test_sriov.py b/whitebox_tempest_plugin/api/compute/test_sriov.py index dc47ed15..6864ad63 100644 --- a/whitebox_tempest_plugin/api/compute/test_sriov.py +++ b/whitebox_tempest_plugin/api/compute/test_sriov.py @@ -28,6 +28,8 @@ LOG = logging.getLogger(__name__) class SRIOVNumaAffinity(base.BaseWhiteboxComputeTest): + min_microversion = '2.74' + required = {'hw:cpu_policy': 'dedicated', 'hw:pci_numa_affinity_policy': 'required'} preferred = {'hw:cpu_policy': 'dedicated', diff --git a/whitebox_tempest_plugin/config.py b/whitebox_tempest_plugin/config.py index 71d776e0..6a1cefd7 100644 --- a/whitebox_tempest_plugin/config.py +++ b/whitebox_tempest_plugin/config.py @@ -225,7 +225,6 @@ hardware_opts = [ cfg.IntOpt( 'physnet_numa_affinity', default=None, - help="A one to one affinity mapping of the parameter sriov_phsynet to " - "its underlying NIC's NUMA Node. A physnet mapping of one to many " - "NUMAs is not supported with this parameter") + help="The NUMA Node ID that has affinity to the NIC connected to the " + "physnet defined in 'sriov_physnet'") ]