Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
hs-test: support for multiple workers
[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
..
bb703df
100644
(file)
--- a/
extras/hs-test/suite_veth_test.go
+++ b/
extras/hs-test/suite_veth_test.go
@@
-16,22
+16,18
@@
type VethsSuite struct {
func (s *VethsSuite) SetupSuite() {
time.Sleep(1 * time.Second)
func (s *VethsSuite) SetupSuite() {
time.Sleep(1 * time.Second)
-
+ s.HstSuite.SetupSuite()
s.configureNetworkTopology("2peerVeth")
s.configureNetworkTopology("2peerVeth")
-
s.loadContainerTopology("2peerVeth")
}
func (s *VethsSuite) SetupTest() {
s.loadContainerTopology("2peerVeth")
}
func (s *VethsSuite) SetupTest() {
- s.skipIfUnconfiguring()
-
- s.setupVolumes()
- s.setupContainers()
+ s.HstSuite.SetupTest()
// Setup test conditions
// Setup test conditions
- var s
tartup
Config Stanza
- s
tartup
Config.
+ var s
ession
Config Stanza
+ s
ession
Config.
newStanza("session").
append("enable").
append("use-app-socket-api").close()
newStanza("session").
append("enable").
append("use-app-socket-api").close()
@@
-39,7
+35,8
@@
func (s *VethsSuite) SetupTest() {
// ... For server
serverContainer := s.getContainerByName("server-vpp")
// ... For server
serverContainer := s.getContainerByName("server-vpp")
- serverVpp, _ := serverContainer.newVppInstance(startupConfig)
+ cpus := s.AllocateCpus()
+ serverVpp, _ := serverContainer.newVppInstance(cpus, sessionConfig)
s.assertNotNil(serverVpp)
s.setupServerVpp()
s.assertNotNil(serverVpp)
s.setupServerVpp()
@@
-47,7
+44,8
@@
func (s *VethsSuite) SetupTest() {
// ... For client
clientContainer := s.getContainerByName("client-vpp")
// ... For client
clientContainer := s.getContainerByName("client-vpp")
- clientVpp, _ := clientContainer.newVppInstance(startupConfig)
+ cpus = s.AllocateCpus()
+ clientVpp, _ := clientContainer.newVppInstance(cpus, sessionConfig)
s.assertNotNil(clientVpp)
s.setupClientVpp()
s.assertNotNil(clientVpp)
s.setupClientVpp()
@@
-67,7
+65,6
@@
func (s *VethsSuite) setupServerVpp() {
namespaceSecret := "1"
err = serverVpp.addAppNamespace(1, idx, namespaceSecret)
s.assertNil(err)
namespaceSecret := "1"
err = serverVpp.addAppNamespace(1, idx, namespaceSecret)
s.assertNil(err)
-
}
func (s *VethsSuite) setupClientVpp() {
}
func (s *VethsSuite) setupClientVpp() {