X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=extras%2Fhs-test%2Fvcl_test.go;h=fe55af1866abc43d46aa3f065aff4817ccf02f4f;hb=bc4dc16a5ce891649211200f0e346c76cdef4c56;hp=6c809f4caec767f7ad5b3e673556dc7f5479fca4;hpb=ffa3f60290499bdacc37a97c49f2e794b5e1f18c;p=vpp.git

diff --git a/extras/hs-test/vcl_test.go b/extras/hs-test/vcl_test.go
index 6c809f4caec..fe55af1866a 100644
--- a/extras/hs-test/vcl_test.go
+++ b/extras/hs-test/vcl_test.go
@@ -20,26 +20,24 @@ func (s *VethsSuite) TestVclEchoTcp() {
 }
 
 func (s *VethsSuite) testVclEcho(proto string) {
-	serverVethAddress := s.veths["vppsrv"].Address()
+	serverVethAddress := s.netInterfaces["vppsrv"].ip4AddressString()
 	uri := proto + "://" + serverVethAddress + "/12344"
 
 	echoSrvContainer := s.getContainerByName("server-application")
 	serverCommand := "vpp_echo server TX=RX" +
-		" socket-name " + echoSrvContainer.GetContainerWorkDir() + "/var/run/app_ns_sockets/1" +
+		" socket-name " + echoSrvContainer.getContainerWorkDir() + "/var/run/app_ns_sockets/1" +
 		" use-app-socket-api" +
 		" uri " + uri
 	s.log(serverCommand)
-	err := echoSrvContainer.execServer(serverCommand)
-	s.assertNil(err)
+	echoSrvContainer.execServer(serverCommand)
 
 	echoClnContainer := s.getContainerByName("client-application")
 
 	clientCommand := "vpp_echo client" +
-		" socket-name " + echoClnContainer.GetContainerWorkDir() + "/var/run/app_ns_sockets/2" +
+		" socket-name " + echoClnContainer.getContainerWorkDir() + "/var/run/app_ns_sockets/2" +
 		" use-app-socket-api uri " + uri
 	s.log(clientCommand)
-	o, err := echoClnContainer.exec(clientCommand)
-	s.assertNil(err)
+	o := echoClnContainer.exec(clientCommand)
 
 	s.log(o)
 }
@@ -50,39 +48,36 @@ func (s *VethsSuite) TestVclRetryAttach() {
 }
 
 func (s *VethsSuite) testRetryAttach(proto string) {
-	srvVppContainer := s.getContainerCopyByName("server-vpp")
+	srvVppContainer := s.getTransientContainerByName("server-vpp")
 
 	echoSrvContainer := s.getContainerByName("server-application")
 
-	serverVclConfContent := fmt.Sprintf(vclTemplate, echoSrvContainer.GetContainerWorkDir(), "1")
+	serverVclConfContent := fmt.Sprintf(vclTemplate, echoSrvContainer.getContainerWorkDir(), "1")
 	echoSrvContainer.createFile("/vcl.conf", serverVclConfContent)
 
 	echoSrvContainer.addEnvVar("VCL_CONFIG", "/vcl.conf")
-	err := echoSrvContainer.execServer("vcl_test_server -p " + proto + " 12346")
-	s.assertNil(err)
+	echoSrvContainer.execServer("vcl_test_server -p " + proto + " 12346")
 
 	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.veths[serverInterfaceName]
-	serverVethAddress := serverVeth.Address()
+	serverVeth := s.netInterfaces[serverInterfaceName]
+	serverVethAddress := serverVeth.ip4AddressString()
 
-	echoClnContainer := s.getContainerCopyByName("client-application")
-	clientVclConfContent := fmt.Sprintf(vclTemplate, echoClnContainer.GetContainerWorkDir(), "2")
+	echoClnContainer := s.getTransientContainerByName("client-application")
+	clientVclConfContent := fmt.Sprintf(vclTemplate, echoClnContainer.getContainerWorkDir(), "2")
 	echoClnContainer.createFile("/vcl.conf", clientVclConfContent)
 
 	testClientCommand := "vcl_test_client -U -p " + proto + " " + serverVethAddress + " 12346"
 	echoClnContainer.addEnvVar("VCL_CONFIG", "/vcl.conf")
-	o, err := echoClnContainer.exec(testClientCommand)
+	o := echoClnContainer.exec(testClientCommand)
 	s.log(o)
-	s.assertNil(err)
 	s.log("... First test ended. Stopping VPP server now.")
 
 	// Stop server-vpp-instance, start it again and then run vcl-test-client once more
 	srvVppContainer.vppInstance.disconnect()
 	stopVppCommand := "/bin/bash -c 'ps -C vpp_main -o pid= | xargs kill -9'"
-	_, err = srvVppContainer.exec(stopVppCommand)
-	s.assertNil(err)
+	srvVppContainer.exec(stopVppCommand)
 
 	s.setupServerVpp()
 
@@ -90,47 +85,33 @@ func (s *VethsSuite) testRetryAttach(proto string) {
 	time.Sleep(30 * time.Second) // Wait a moment for the re-attachment to happen
 
 	s.log("... Running second echo client test, after disconnect and re-attachment.")
-	o, err = echoClnContainer.exec(testClientCommand)
+	o = echoClnContainer.exec(testClientCommand)
 	s.log(o)
-	s.assertNil(err)
 	s.log("Done.")
 }
 
 func (s *VethsSuite) TestTcpWithLoss() {
-	serverContainer := s.getContainerByName("server-vpp")
+	serverVpp := s.getContainerByName("server-vpp").vppInstance
 
-	serverVpp := NewVppInstance(serverContainer)
-	s.assertNotNil(serverVpp)
-	serverVpp.set2VethsServer()
-	err := serverVpp.start()
-	s.assertNil(err, "starting VPP failed")
+	serverVeth := s.netInterfaces[serverInterfaceName]
+	serverVpp.vppctl("test echo server uri tcp://%s/20022",
+		serverVeth.ip4AddressString())
 
-	serverVeth := s.veths[serverInterfaceName]
-	_, err = serverVpp.vppctl("test echo server uri tcp://%s/20022", serverVeth.Address())
-	s.assertNil(err, "starting echo server failed")
-
-	clientContainer := s.getContainerByName("client-vpp")
-
-	clientVpp := NewVppInstance(clientContainer)
-	s.assertNotNil(clientVpp)
-	clientVpp.set2VethsClient()
-	err = clientVpp.start()
-	s.assertNil(err, "starting VPP failed")
+	clientVpp := s.getContainerByName("client-vpp").vppInstance
 
 	// Ensure that VPP doesn't abort itself with NSIM enabled
 	// Warning: Removing this ping will make the test fail!
-	_, err = serverVpp.vppctl("ping 10.10.10.2")
-	s.assertNil(err, "ping failed")
+	clientVpp.vppctl("ping %s", serverVeth.ip4AddressString())
 
 	// Add loss of packets with Network Delay Simulator
-	_, err = clientVpp.vppctl("set nsim poll-main-thread delay 0.01 ms bandwidth 40 gbit packet-size 1400 packets-per-drop 1000")
-	s.assertNil(err, "configuring NSIM failed")
-	_, err = clientVpp.vppctl("nsim output-feature enable-disable host-vppcln")
-	s.assertNil(err, "enabling NSIM failed")
+	clientVpp.vppctl("set nsim poll-main-thread delay 0.01 ms bandwidth 40 gbit" +
+		" packet-size 1400 packets-per-drop 1000")
+
+	clientVpp.vppctl("nsim output-feature enable-disable host-vppcln")
 
 	// Do echo test from client-vpp container
-	output, err := clientVpp.vppctl("test echo client uri tcp://10.10.10.1/20022 mbytes 50")
-	s.assertNil(err)
+	output := clientVpp.vppctl("test echo client uri tcp://%s/20022 mbytes 50",
+		serverVeth.ip4AddressString())
 	s.assertEqual(true, len(output) != 0)
 	s.assertNotContains(output, "failed: timeout")
 	s.log(output)