saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #31713 from ticosax/fix-dockerng-networking-container_id

Browse source 
[dockerng] Fix dockerng.network_present when container is given by name
This commit is contained in:
Mike Place 2016-03-07 08:14:41 -07:00
commit 604eb87e82
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
salt/states/dockerng.py
View file

@ -2045,6 +2045,8 @@ def network_present(name, driver=None, containers=None):
'comment': ''}
if containers is None:
containers = []
# map containers to container's Ids.
containers = [__salt__['dockerng.inspect_container'](c)['Id'] for c in containers]
networks = __salt__['dockerng.networks'](names=[name])
if networks:
network = networks[0] # we expect network's name to be unique

4
tests/unit/states/dockerng_test.py
View file

@ -566,7 +566,9 @@ class DockerngTestCase(TestCase):
'''
dockerng_create_network = Mock(return_value='created')
dockerng_connect_container_to_network = Mock(return_value='connected')
dockerng_inspect_container = Mock(return_value={'Id': 'abcd'})
__salt__ = {'dockerng.create_network': dockerng_create_network,
'dockerng.inspect_container': dockerng_inspect_container,
'dockerng.connect_container_to_network': dockerng_connect_container_to_network,
'dockerng.networks': Mock(return_value=[]),
}
@ -577,7 +579,7 @@ class DockerngTestCase(TestCase):
containers=['container'],
)
dockerng_create_network.assert_called_with('network_foo', driver=None)
dockerng_connect_container_to_network.assert_called_with('container',
dockerng_connect_container_to_network.assert_called_with('abcd',
'network_foo')
self.assertEqual(ret, {'name': 'network_foo',
'comment': '',