Skip to content

Commit 6e76e9b

Browse files
authored
[vstest]: fix redis mount point with --dvsname option (sonic-net#654)
Signed-off-by: Guohan Lu <[email protected]>
1 parent 3d4bed1 commit 6e76e9b

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

tests/conftest.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,8 @@ def __init__(self, name=None, keeptb=False):
176176
server = VirtualServer(ctn_sw_name, self.ctn_sw_pid, i)
177177
self.servers.append(server)
178178

179+
self.mount = "/var/run/redis-vs/"
180+
179181
self.restart()
180182
else:
181183
self.ctn_sw = self.client.containers.run('debian:jessie', privileged=True, detach=True,
@@ -192,14 +194,14 @@ def __init__(self, name=None, keeptb=False):
192194
# mount redis to base to unique directory
193195
self.mount = "/var/run/redis-vs/{}".format(self.ctn_sw.name)
194196
os.system("mkdir -p {}".format(self.mount))
195-
self.redis_sock = self.mount + '/' + "redis.sock"
196197

197198
# create virtual switch container
198199
self.ctn = self.client.containers.run('docker-sonic-vs', privileged=True, detach=True,
199200
network_mode="container:%s" % self.ctn_sw.name,
200201
volumes={ self.mount: { 'bind': '/var/run/redis', 'mode': 'rw' } })
201202

202203
self.appldb = None
204+
self.redis_sock = self.mount + '/' + "redis.sock"
203205
try:
204206
# temp fix: remove them once they are moved to vs start.sh
205207
self.ctn.exec_run("sysctl -w net.ipv6.conf.default.disable_ipv6=0")

0 commit comments

Comments
 (0)