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 <maros.ondrejicka@pantheon.tech>
Change-Id: Idf26b0c16f87e87c97b198412af39b99d947ced6

1 files changed, 36 insertions, 1 deletions

diff --git a/extras/hs-test/suite_ns_test.go b/extras/hs-test/suite_ns_test.go
index cf7f0ec98f1..5bc45c7f80c 100644
--- a/extras/hs-test/suite_ns_test.go
+++ b/extras/hs-test/suite_ns_test.go
@@ -1,10 +1,45 @@
 package main
 
+const (
+	// These correspond to names used in yaml config
+	clientInterface = "hst_client_vpp"
+	serverInterface = "hst_server_vpp"
+)
+
 type NsSuite struct {
 	HstSuite
 }
 
 func (s *NsSuite) SetupSuite() {
-	s.teardownSuite = setupSuite(&s.Suite, "ns")
+	s.configureNetworkTopology("ns")
+
 	s.loadContainerTopology("ns")
 }
+
+func (s *NsSuite) SetupTest() {
+	s.SetupVolumes()
+	s.SetupContainers()
+
+	// Setup test conditions
+	var startupConfig Stanza
+	startupConfig.
+		NewStanza("session").
+		Append("enable").
+		Append("use-app-socket-api").
+		Append("evt_qs_memfd_seg").
+		Append("event-queue-length 100000").Close()
+
+	container := s.getContainerByName("vpp")
+	vpp, _ := container.newVppInstance(startupConfig)
+	vpp.start()
+
+	idx, err := vpp.createAfPacket(s.netInterfaces[serverInterface])
+	s.assertNil(err)
+	s.assertNotEqual(0, idx)
+
+	idx, err = vpp.createAfPacket(s.netInterfaces[clientInterface])
+	s.assertNil(err)
+	s.assertNotEqual(0, idx)
+
+	container.exec("chmod 777 -R %s", container.GetContainerWorkDir())
+}