Remove all non-external networks on down.

Also moves the shutdown test fixtures to be a more general v2-full fixture.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
This commit is contained in:
Daniel Nephin 2016-01-14 14:35:02 -05:00
commit 0f234154c2
6 changed files with 39 additions and 22 deletions

View file

@ -65,7 +65,10 @@ class Network(object):
)
def remove(self):
# TODO: don't remove external networks
if self.external_name:
log.info("Network %s is external, skipping", self.full_name)
return
log.info("Removing network {}".format(self.full_name))
self.client.remove_network(self.full_name)

View file

@ -275,7 +275,7 @@ class Project(object):
def down(self, remove_image_type, include_volumes):
self.stop()
self.remove_stopped(v=include_volumes)
self.remove_default_network()
self.remove_networks()
if include_volumes:
self.remove_volumes()
@ -286,11 +286,11 @@ class Project(object):
for service in self.get_services():
service.remove_image(remove_image_type)
def remove_default_network(self):
def remove_networks(self):
if not self.use_networking:
return
if self.uses_default_network():
self.default_network.remove()
for network in self.networks:
network.remove()
def remove_volumes(self):
for volume in self.volumes: