From 2908f8cf07c21f385f80d83fdad826a0eea98977 Mon Sep 17 00:00:00 2001 From: Maros Ondrejicka Date: Thu, 2 Feb 2023 08:58:04 +0100 Subject: hs-test: refactor test cases from ns suite This converts more tests to configure VPP from test context. Type: test Signed-off-by: Maros Ondrejicka Change-Id: Idf26b0c16f87e87c97b198412af39b99d947ced6 --- extras/hs-test/suite_veth_test.go | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) (limited to 'extras/hs-test/suite_veth_test.go') diff --git a/extras/hs-test/suite_veth_test.go b/extras/hs-test/suite_veth_test.go index 81a21a2ce5f..ff79dfae799 100644 --- a/extras/hs-test/suite_veth_test.go +++ b/extras/hs-test/suite_veth_test.go @@ -14,13 +14,6 @@ type VethsSuite struct { HstSuite } -var ConvertedTests = map[string]any{ - "TestVeths/TestEchoBuiltin": "", - "TestVeths/TestHttpCli": "", - "TestVeths/TestVclEchoTcp": "", - "TestVeths/TestVclRetryAttach": "", -} - func (s *VethsSuite) SetupSuite() { time.Sleep(1 * time.Second) @@ -33,11 +26,6 @@ func (s *VethsSuite) SetupTest() { s.SetupVolumes() s.SetupContainers() - // TODO remove this after all tests are converted to configuration from test suite - if _, ok := ConvertedTests[s.T().Name()]; !ok { - return - } - // Setup test conditions var startupConfig Stanza @@ -69,7 +57,7 @@ func (s *VethsSuite) setupServerVpp() { err := serverVpp.start() s.assertNil(err) - serverVeth := s.veths["vppsrv"] + serverVeth := s.netInterfaces[serverInterfaceName] idx, err := serverVpp.createAfPacket(serverVeth) s.assertNil(err) s.assertNotEqual(0, idx) @@ -86,7 +74,7 @@ func (s *VethsSuite) setupClientVpp() { err := clientVpp.start() s.assertNil(err) - clientVeth := s.veths["vppcln"] + clientVeth := s.netInterfaces[clientInterfaceName] idx, err := clientVpp.createAfPacket(clientVeth) s.assertNil(err) s.assertNotEqual(0, idx) -- cgit 1.2.3-korg