session: add api cb for listen and unlisten

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

diff --git a/extras/hs-test/suite_veth_test.go b/extras/hs-test/suite_veth_test.go
index be79ce2..4158c76 100644 (file)
--- a/extras/hs-test/suite_veth_test.go
+++ b/extras/hs-test/suite_veth_test.go
@@ -6,8 +6,8 @@ import (
 
 const (
        // These correspond to names used in yaml config
-       serverInterfaceName = "vppsrv"
-       clientInterfaceName = "vppcln"
+       serverInterfaceName = "srv"
+       clientInterfaceName = "cln"
 )
 
 type VethsSuite struct {
@@ -16,22 +16,18 @@ type VethsSuite struct {
 
 func (s *VethsSuite) SetupSuite() {
        time.Sleep(1 * time.Second)
-
+       s.HstSuite.SetupSuite()
        s.configureNetworkTopology("2peerVeth")
-
        s.loadContainerTopology("2peerVeth")
 }
 
 func (s *VethsSuite) 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").close()
@@ -39,49 +35,38 @@ func (s *VethsSuite) SetupTest() {
        // ... For server
        serverContainer := s.getContainerByName("server-vpp")
 
-       serverVpp, _ := serverContainer.newVppInstance(startupConfig)
-       s.assertNotNil(serverVpp)
+       cpus := s.AllocateCpus()
+       serverVpp, err := serverContainer.newVppInstance(cpus, sessionConfig)
+       s.assertNotNil(serverVpp, err)
 
        s.setupServerVpp()
 
        // ... For client
        clientContainer := s.getContainerByName("client-vpp")
 
-       clientVpp, _ := clientContainer.newVppInstance(startupConfig)
-       s.assertNotNil(clientVpp)
+       cpus = s.AllocateCpus()
+       clientVpp, err := clientContainer.newVppInstance(cpus, sessionConfig)
+       s.assertNotNil(clientVpp, err)
 
        s.setupClientVpp()
 }
 
 func (s *VethsSuite) setupServerVpp() {
        serverVpp := s.getContainerByName("server-vpp").vppInstance
-
-       err := serverVpp.start()
-       s.assertNil(err)
+       s.assertNil(serverVpp.start())
 
        serverVeth := s.netInterfaces[serverInterfaceName]
        idx, err := serverVpp.createAfPacket(serverVeth)
-       s.assertNil(err)
+       s.assertNil(err, err)
        s.assertNotEqual(0, idx)
-
-       namespaceSecret := "1"
-       err = serverVpp.addAppNamespace(1, idx, namespaceSecret)
-       s.assertNil(err)
-
 }
 
 func (s *VethsSuite) setupClientVpp() {
        clientVpp := s.getContainerByName("client-vpp").vppInstance
-
-       err := clientVpp.start()
-       s.assertNil(err)
+       s.assertNil(clientVpp.start())
 
        clientVeth := s.netInterfaces[clientInterfaceName]
        idx, err := clientVpp.createAfPacket(clientVeth)
-       s.assertNil(err)
+       s.assertNil(err, err)
        s.assertNotEqual(0, idx)
-
-       clientNamespaceSecret := "2"
-       err = clientVpp.addAppNamespace(2, idx, clientNamespaceSecret)
-       s.assertNil(err)
 }