From 7550dd268f80334cbb9127feefe35319b9c7e572 Mon Sep 17 00:00:00 2001 From: Maros Ondrejicka Date: Tue, 7 Feb 2023 20:40:27 +0100 Subject: hs-test: refactor test cases from no-topo suite This converts remaining tests to configation of VPP from test context. Type: test Change-Id: I386714f6b290e03d1757c2a033a25fae0340f5d6 Signed-off-by: Maros Ondrejicka --- extras/hs-test/vcl_test.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'extras/hs-test/vcl_test.go') diff --git a/extras/hs-test/vcl_test.go b/extras/hs-test/vcl_test.go index b9ce60afbaf..7cf4ab75dfd 100644 --- a/extras/hs-test/vcl_test.go +++ b/extras/hs-test/vcl_test.go @@ -20,7 +20,7 @@ func (s *VethsSuite) TestVclEchoTcp() { } func (s *VethsSuite) testVclEcho(proto string) { - serverVethAddress := s.netInterfaces["vppsrv"].Ip4AddressString() + serverVethAddress := s.netInterfaces["vppsrv"].IP4AddressString() uri := proto + "://" + serverVethAddress + "/12344" echoSrvContainer := s.getContainerByName("server-application") @@ -62,7 +62,7 @@ func (s *VethsSuite) testRetryAttach(proto string) { s.log("... Running first echo client test, before disconnect.") serverVeth := s.netInterfaces[serverInterfaceName] - serverVethAddress := serverVeth.Ip4AddressString() + serverVethAddress := serverVeth.IP4AddressString() echoClnContainer := s.getTransientContainerByName("client-application") clientVclConfContent := fmt.Sprintf(vclTemplate, echoClnContainer.GetContainerWorkDir(), "2") @@ -95,13 +95,13 @@ func (s *VethsSuite) TestTcpWithLoss() { serverVeth := s.netInterfaces[serverInterfaceName] serverVpp.vppctl("test echo server uri tcp://%s/20022", - serverVeth.Ip4AddressString()) + serverVeth.IP4AddressString()) 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! - clientVpp.vppctl("ping %s", serverVeth.Ip4AddressString()) + clientVpp.vppctl("ping %s", serverVeth.IP4AddressString()) // Add loss of packets with Network Delay Simulator clientVpp.vppctl("set nsim poll-main-thread delay 0.01 ms bandwidth 40 gbit" + @@ -111,7 +111,7 @@ func (s *VethsSuite) TestTcpWithLoss() { // Do echo test from client-vpp container output := clientVpp.vppctl("test echo client uri tcp://%s/20022 mbytes 50", - serverVeth.Ip4AddressString()) + serverVeth.IP4AddressString()) s.assertEqual(true, len(output) != 0) s.assertNotContains(output, "failed: timeout") s.log(output) -- cgit 1.2.3-korg