diff options
Diffstat (limited to 'extras/hs-test/infra/suite_cpu_pinning.go')
| -rw-r--r-- | extras/hs-test/infra/suite_cpu_pinning.go | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/extras/hs-test/infra/suite_cpu_pinning.go b/extras/hs-test/infra/suite_cpu_pinning.go index 629d2dac3ed..e829efa950b 100644 --- a/extras/hs-test/infra/suite_cpu_pinning.go +++ b/extras/hs-test/infra/suite_cpu_pinning.go @@ -13,6 +13,7 @@ var cpuPinningSoloTests = map[string][]func(s *CpuPinningSuite){} type CpuPinningSuite struct { HstSuite + previousMaxContainerCount int } func RegisterCpuPinningTests(tests ...func(s *CpuPinningSuite)) { @@ -31,12 +32,22 @@ func (s *CpuPinningSuite) SetupSuite() { func (s *CpuPinningSuite) SetupTest() { // Skip if we cannot allocate 3 CPUs for test container - s.SkipIfNotEnoughAvailableCpus(1, 3) - s.CpuPerVpp = 3 + s.previousMaxContainerCount = s.CpuAllocator.maxContainerCount + s.CpuCount = 3 + s.CpuAllocator.maxContainerCount = 1 + s.SkipIfNotEnoughAvailableCpus() + s.HstSuite.SetupTest() container := s.GetContainerByName(SingleTopoContainerVpp) vpp, err := container.newVppInstance(container.AllocatedCpus) s.AssertNotNil(vpp, fmt.Sprint(err)) +} + +func (s *CpuPinningSuite) TearDownTest() { + // reset vars + s.CpuCount = *NConfiguredCpus + s.CpuAllocator.maxContainerCount = s.previousMaxContainerCount + s.HstSuite.TearDownTest() } |