hs-test: shortened interface names to avoid character limit

[vpp.git] / 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 9051284..97e5ca4 100644 (file)
--- a/extras/hs-test/suite_no_topo_test.go
+++ b/extras/hs-test/suite_no_topo_test.go
@@ -1,10 +1,9 @@
 package main
 
 const (
-       singleTopoContainerVpp   = "vpp"
+       singleTopoContainerVpp = "vpp"
        singleTopoContainerNginx = "nginx"
-
-       tapInterfaceName = "hst_tap_host"
+       tapInterfaceName = "htaphost"
 )
 
 type NoTopoSuite struct {
@@ -12,28 +11,27 @@ type NoTopoSuite struct {
 }
 
 func (s *NoTopoSuite) SetupSuite() {
+       s.HstSuite.SetupSuite()
        s.loadNetworkTopology("tap")
-
        s.loadContainerTopology("single")
 }
 
 func (s *NoTopoSuite) SetupTest() {
-       s.skipIfUnconfiguring()
-       s.SetupVolumes()
-       s.SetupContainers()
+       s.HstSuite.SetupTest()
 
        // Setup test conditions
-       var startupConfig Stanza
-       startupConfig.
-               NewStanza("session").
-               Append("enable").
-               Append("use-app-socket-api").Close()
+       var sessionConfig Stanza
+       sessionConfig.
+               newStanza("session").
+               append("enable").
+               append("use-app-socket-api").close()
 
+       cpus := s.AllocateCpus()
        container := s.getContainerByName(singleTopoContainerVpp)
-       vpp, _ := container.newVppInstance(startupConfig)
-       vpp.start()
+       vpp, _ := container.newVppInstance(cpus, sessionConfig)
+       s.assertNil(vpp.start())
 
        tapInterface := s.netInterfaces[tapInterfaceName]
 
-       vpp.createTap(tapInterface)
+       s.assertNil(vpp.createTap(tapInterface), "failed to create tap interface")
 }