From 7550dd268f80334cbb9127feefe35319b9c7e572 Mon Sep 17 00:00:00 2001 From: Maros Ondrejicka Date: Tue, 7 Feb 2023 20:40:27 +0100 Subject: hs-test: refactor test cases from no-topo suite This converts remaining tests to configation of VPP from test context. Type: test Change-Id: I386714f6b290e03d1757c2a033a25fae0340f5d6 Signed-off-by: Maros Ondrejicka --- extras/hs-test/suite_no_topo_test.go | 42 +++++++++++++++++++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-) (limited to 'extras/hs-test/suite_no_topo_test.go') diff --git a/extras/hs-test/suite_no_topo_test.go b/extras/hs-test/suite_no_topo_test.go index 421decc1a61..01958b0a804 100644 --- a/extras/hs-test/suite_no_topo_test.go +++ b/extras/hs-test/suite_no_topo_test.go @@ -1,10 +1,50 @@ package main +const ( + singleTopoContainerVpp = "vpp" + singleTopoContainerNginx = "nginx" + + tapNameVpp = "vppTap" + tapNameHost = "hostTap" +) + type NoTopoSuite struct { HstSuite } func (s *NoTopoSuite) SetupSuite() { - s.teardownSuite = func() {} s.loadContainerTopology("single") + + s.addresser = NewAddresser(&s.HstSuite) + + var vppTapDevConfig = NetDevConfig{"name": tapNameVpp} + vppTap, _ := NewTap(vppTapDevConfig, s.addresser) + + var hostTapDevConfig = NetDevConfig{"name": tapNameHost} + hostTap, _ := NewTap(hostTapDevConfig, s.addresser) + + s.netInterfaces = make(map[string]NetInterface) + s.netInterfaces[vppTap.Name()] = &vppTap + s.netInterfaces[hostTap.Name()] = &hostTap +} + +func (s *NoTopoSuite) SetupTest() { + s.SetupVolumes() + s.SetupContainers() + + // Setup test conditions + var startupConfig Stanza + startupConfig. + NewStanza("session"). + Append("enable"). + Append("use-app-socket-api").Close() + + container := s.getContainerByName(singleTopoContainerVpp) + vpp, _ := container.newVppInstance(startupConfig) + vpp.start() + + vppTapAddress := s.netInterfaces[tapNameVpp].AddressWithPrefix() + hostTapAddress := s.netInterfaces[tapNameHost].IP4AddressWithPrefix() + + vpp.createTap("tap0", hostTapAddress, vppTapAddress) } -- cgit 1.2.3-korg