X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=extras%2Fhs-test%2Fhst_suite.go;h=7f93b15f50a52cf67466a35c36b731c1957ea7b2;hb=a1bd50c7a2c2c2d69d92cef167a64a1a5ddc4af7;hp=12a66e44d46f3e40712eff58d2e97c07f6af89ca;hpb=af1ddd39f1f5fa6a00e70356bac2b0bd38f76566;p=vpp.git

diff --git a/extras/hs-test/hst_suite.go b/extras/hs-test/hst_suite.go
index 12a66e44d46..7f93b15f50a 100644
--- a/extras/hs-test/hst_suite.go
+++ b/extras/hs-test/hst_suite.go
@@ -221,13 +221,15 @@ func (s *HstSuite) loadContainerTopology(topologyName string) {
 	for _, elem := range yamlTopo.Volumes {
 		volumeMap := elem["volume"].(VolumeConfig)
 		hostDir := volumeMap["host-dir"].(string)
+		workingVolumeDir := logDir + s.T().Name() + volumeDir
+		volDirReplacer := strings.NewReplacer("$HST_VOLUME_DIR", workingVolumeDir)
+		hostDir = volDirReplacer.Replace(hostDir)
 		s.volumes = append(s.volumes, hostDir)
 	}
 
 	s.containers = make(map[string]*Container)
 	for _, elem := range yamlTopo.Containers {
-		newContainer, err := newContainer(elem)
-		newContainer.suite = s
+		newContainer, err := newContainer(s, elem)
 		if err != nil {
 			s.T().Fatalf("container config error: %v", err)
 		}