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 <mondreji@cisco.com>

1 files changed, 41 insertions, 1 deletions

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)
 }