jyapayne/compose
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make the default network name '{project name}_default'

Browse source 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
This commit is contained in:
Aanand Prasad 2016-01-12 16:25:15 +00:00
commit 1a66543461
4 changed files with 18 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
tests/acceptance/cli_test.py
View file

@ -355,7 +355,7 @@ class CLITestCase(DockerClientTestCase):
services = self.project.get_services()
networks = self.client.networks(names=[self.project.name])
networks = self.client.networks(names=[self.project.default_network_name])
for n in networks:
self.addCleanup(self.client.remove_network, n['Id'])
self.assertEqual(len(networks), 1)
@ -649,7 +649,7 @@ class CLITestCase(DockerClientTestCase):
self.dispatch(['--x-networking', 'run', 'simple', 'true'], None)
service = self.project.get_service('simple')
container, = service.containers(stopped=True, one_off=True)
networks = self.client.networks(names=[self.project.name])
networks = self.client.networks(names=[self.project.default_network_name])
for n in networks:
self.addCleanup(self.client.remove_network, n['Id'])
self.assertEqual(len(networks), 1)

8
tests/integration/project_test.py
View file

@ -108,10 +108,14 @@ class ProjectTest(DockerClientTestCase):
assert project.get_network() is None
def test_get_network(self):
network_name = 'network_does_exist'
project = Project(network_name, [], self.client)
project_name = 'network_does_exist'
network_name = '{}_default'.format(project_name)
project = Project(project_name, [], self.client)
self.client.create_network(network_name)
self.addCleanup(self.client.remove_network, network_name)
assert isinstance(project.get_network(), dict)
assert project.get_network()['Name'] == network_name
def test_net_from_service(self):

2
tests/unit/project_test.py
View file

@ -346,7 +346,7 @@ class ProjectTest(unittest.TestCase):
self.assertEqual(service.net.mode, 'container:' + container_name)
def test_uses_default_network_true(self):
web = Service('web', project='test', image="alpine", net=Net('test'))
web = Service('web', project='test', image="alpine", net=Net('test_default'))
db = Service('web', project='test', image="alpine", net=Net('other'))
project = Project('test', [web, db], None)
assert project.uses_default_network()