tls: mark ho done atomically after ctx init

[vpp.git] / extras / hs-test / suite_ns_test.go

diff --git a/extras/hs-test/suite_ns_test.go b/extras/hs-test/suite_ns_test.go
index 34fc9ec..4e8f497 100644 (file)
--- a/extras/hs-test/suite_ns_test.go
+++ b/extras/hs-test/suite_ns_test.go
@@ -11,35 +11,34 @@ type NsSuite struct {
 }
 
 func (s *NsSuite) SetupSuite() {
+       s.HstSuite.SetupSuite()
        s.configureNetworkTopology("ns")
-
        s.loadContainerTopology("ns")
 }
 
 func (s *NsSuite) SetupTest() {
-       s.skipIfUnconfiguring()
-       s.setupVolumes()
-       s.setupContainers()
+       s.HstSuite.SetupTest()
 
        // Setup test conditions
-       var startupConfig Stanza
-       startupConfig.
+       var sessionConfig Stanza
+       sessionConfig.
                newStanza("session").
                append("enable").
                append("use-app-socket-api").
                append("evt_qs_memfd_seg").
                append("event-queue-length 100000").close()
 
+       cpus := s.AllocateCpus()
        container := s.getContainerByName("vpp")
-       vpp, _ := container.newVppInstance(startupConfig)
-       vpp.start()
+       vpp, _ := container.newVppInstance(cpus, sessionConfig)
+       s.assertNil(vpp.start())
 
        idx, err := vpp.createAfPacket(s.netInterfaces[serverInterface])
-       s.assertNil(err)
+       s.assertNil(err, err)
        s.assertNotEqual(0, idx)
 
        idx, err = vpp.createAfPacket(s.netInterfaces[clientInterface])
-       s.assertNil(err)
+       s.assertNil(err, err)
        s.assertNotEqual(0, idx)
 
        container.exec("chmod 777 -R %s", container.getContainerWorkDir())