@@ -144,8 +144,6 @@ def __init__(self, name=None, keeptb=False):
144
144
self .rtd = ['fpmsyncd' , 'zebra' ]
145
145
self .teamd = ['teamsyncd' , 'teammgrd' ]
146
146
self .alld = self .basicd + self .swssd + self .syncd + self .rtd + self .teamd
147
- self .mount = "/var/run/redis-vs"
148
- self .redis_sock = self .mount + '/' + "redis.sock"
149
147
self .client = docker .from_env ()
150
148
151
149
self .ctn = None
@@ -191,6 +189,11 @@ def __init__(self, name=None, keeptb=False):
191
189
server = VirtualServer (self .ctn_sw .name , self .ctn_sw_pid , i )
192
190
self .servers .append (server )
193
191
192
+ # mount redis to base to unique directory
193
+ self .mount = "/var/run/redis-vs/{}" .format (self .ctn_sw .name )
194
+ os .system ("mkdir -p {}" .format (self .mount ))
195
+ self .redis_sock = self .mount + '/' + "redis.sock"
196
+
194
197
# create virtual switch container
195
198
self .ctn = self .client .containers .run ('docker-sonic-vs' , privileged = True , detach = True ,
196
199
network_mode = "container:%s" % self .ctn_sw .name ,
@@ -215,6 +218,7 @@ def destroy(self):
215
218
if self .cleanup :
216
219
self .ctn .remove (force = True )
217
220
self .ctn_sw .remove (force = True )
221
+ os .system ("rm -rf {}" .format (self .mount ))
218
222
for s in self .servers :
219
223
s .destroy ()
220
224
0 commit comments