hs-test: experimental support for multiple test instances
- appending PID to interface and container names
- added a check for used IP addresses
- TestEnvoyProxyHttpTcp and TestTcpWithLoss are broken when running multiple instances
Type: test
Change-Id: Ib917079ec7cf851dee59ff9c67e74f48c7c5e3c6
Signed-off-by: adrianvillin <avillin@cisco.com>
diff --git a/extras/hs-test/vcl_test.go b/extras/hs-test/vcl_test.go
index 281b916..cb6aaa4 100644
--- a/extras/hs-test/vcl_test.go
+++ b/extras/hs-test/vcl_test.go
@@ -35,7 +35,7 @@
port := "12345"
serverVpp := s.getContainerByName("server-vpp").vppInstance
- serverVeth := s.netInterfaces[serverInterfaceName]
+ serverVeth := s.getInterfaceByName(serverInterfaceName)
serverVpp.vppctl("test echo server uri %s://%s/%s fifo-size 64k", proto, serverVeth.ip4AddressString(), port)
echoClnContainer := s.getTransientContainerByName("client-app")
@@ -67,7 +67,7 @@
vclSrvCmd := fmt.Sprintf("vcl_test_server -p %s %s", proto, port)
srvAppCont.execServer(vclSrvCmd)
- serverVeth := s.netInterfaces[serverInterfaceName]
+ serverVeth := s.getInterfaceByName(serverInterfaceName)
serverVethAddress := serverVeth.ip4AddressString()
clientVpp := s.getContainerByName("client-vpp").vppInstance
@@ -85,7 +85,7 @@
srvAppCont.addEnvVar("VCL_CONFIG", "/vcl.conf")
srvAppCont.execServer("vcl_test_server " + port)
- serverVeth := s.netInterfaces[serverInterfaceName]
+ serverVeth := s.getInterfaceByName(serverInterfaceName)
serverVethAddress := serverVeth.ip4AddressString()
echoClnContainer := s.getTransientContainerByName("client-app")
@@ -123,7 +123,7 @@
s.log("This whole test case can take around 3 minutes to run. Please be patient.")
s.log("... Running first echo client test, before disconnect.")
- serverVeth := s.netInterfaces[serverInterfaceName]
+ serverVeth := s.getInterfaceByName(serverInterfaceName)
serverVethAddress := serverVeth.ip4AddressString()
echoClnContainer := s.getTransientContainerByName("client-app")