From 3f951433b89df4639bb2ae8f297aee90c70cebf5 Mon Sep 17 00:00:00 2001
From: Filip Tehlar <ftehlar@cisco.com>
Date: Fri, 13 Jan 2023 21:33:43 +0100
Subject: hs-test: restrict concurrency on envoy

Type: test

Signed-off-by: Filip Tehlar <ftehlar@cisco.com>
Change-Id: I8b06f4554a6ee5b13de829e47eaa82431a76c332
---
 extras/hs-test/container.go            | 21 ++++++++++++++-------
 extras/hs-test/proxy_test.go           |  2 +-
 extras/hs-test/topo-containers/ns.yaml |  1 +
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/extras/hs-test/container.go b/extras/hs-test/container.go
index 4ad454848fa..874ce3d1750 100644
--- a/extras/hs-test/container.go
+++ b/extras/hs-test/container.go
@@ -14,12 +14,13 @@ type Volume struct {
 }
 
 type Container struct {
-	isOptional bool
-	name       string
-	image      string
-	workDir    string
-	volumes    map[string]Volume
-	envVars    map[string]string
+	isOptional       bool
+	name             string
+	image            string
+	workDir          string
+	extraRunningArgs string
+	volumes          map[string]Volume
+	envVars          map[string]string
 }
 
 func NewContainer(yamlInput ContainerConfig) (*Container, error) {
@@ -40,6 +41,12 @@ func NewContainer(yamlInput ContainerConfig) (*Container, error) {
 		container.image = "hs-test/vpp"
 	}
 
+	if args, ok := yamlInput["extra-args"]; ok {
+		container.extraRunningArgs = args.(string)
+	} else {
+		container.extraRunningArgs = ""
+	}
+
 	if isOptional, ok := yamlInput["is-optional"]; ok {
 		container.isOptional = isOptional.(bool)
 	} else {
@@ -77,7 +84,7 @@ func (c *Container) getRunCommand() string {
 	cmd += syncPath
 	cmd += c.getVolumesAsCliOption()
 	cmd += c.getEnvVarsAsCliOption()
-	cmd += " --name " + c.name + " " + c.image
+	cmd += " --name " + c.name + " " + c.image + " " + c.extraRunningArgs
 	return cmd
 }
 
diff --git a/extras/hs-test/proxy_test.go b/extras/hs-test/proxy_test.go
index 70fb526e14f..f592426cf47 100644
--- a/extras/hs-test/proxy_test.go
+++ b/extras/hs-test/proxy_test.go
@@ -30,7 +30,7 @@ func testProxyHttpTcp(s *NsSuite) error {
 
 	s.log("http server started...")
 
-	c := fmt.Sprintf("ip netns exec client wget --retry-connrefused --retry-on-http-error=503 --tries=10 -O %s 10.0.0.2:555/%s", outputFile, srcFile)
+	c := fmt.Sprintf("ip netns exec client wget --no-proxy --retry-connrefused --retry-on-http-error=503 --tries=10 -O %s 10.0.0.2:555/%s", outputFile, srcFile)
 	_, err = exechelper.CombinedOutput(c)
 	s.assertNil(err, "failed to run wget")
 	stopServer <- struct{}{}
diff --git a/extras/hs-test/topo-containers/ns.yaml b/extras/hs-test/topo-containers/ns.yaml
index bdba5605e87..e472531c8f7 100644
--- a/extras/hs-test/topo-containers/ns.yaml
+++ b/extras/hs-test/topo-containers/ns.yaml
@@ -25,4 +25,5 @@ containers:
       - name: "VCL_CONFIG"
         value: "/tmp/vcl.conf"
     image: "envoyproxy/envoy-contrib:v1.21-latest"
+    extra-args: "--concurrency 2 -c /etc/envoy/envoy.yaml"
     is-optional: true
-- 
cgit 1.2.3-korg