From 6e76e9b9b29e0c31da7f05e87f59f871e15c9674 Mon Sep 17 00:00:00 2001 From: lguohan Date: Mon, 22 Oct 2018 22:34:20 -0700 Subject: [PATCH] [vstest]: fix redis mount point with --dvsname option (#654) Signed-off-by: Guohan Lu --- tests/conftest.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/conftest.py b/tests/conftest.py index 900db1a46937..0d12d587ab2d 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -176,6 +176,8 @@ def __init__(self, name=None, keeptb=False): server = VirtualServer(ctn_sw_name, self.ctn_sw_pid, i) self.servers.append(server) + self.mount = "/var/run/redis-vs/" + self.restart() else: self.ctn_sw = self.client.containers.run('debian:jessie', privileged=True, detach=True, @@ -192,7 +194,6 @@ def __init__(self, name=None, keeptb=False): # mount redis to base to unique directory self.mount = "/var/run/redis-vs/{}".format(self.ctn_sw.name) os.system("mkdir -p {}".format(self.mount)) - self.redis_sock = self.mount + '/' + "redis.sock" # create virtual switch container self.ctn = self.client.containers.run('docker-sonic-vs', privileged=True, detach=True, @@ -200,6 +201,7 @@ def __init__(self, name=None, keeptb=False): volumes={ self.mount: { 'bind': '/var/run/redis', 'mode': 'rw' } }) self.appldb = None + self.redis_sock = self.mount + '/' + "redis.sock" try: # temp fix: remove them once they are moved to vs start.sh self.ctn.exec_run("sysctl -w net.ipv6.conf.default.disable_ipv6=0")