docker
/
docker-py
mirror of https://github.com/docker/docker-py.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'gferon-master'

This commit is contained in:
Joffrey F 2016-03-23 12:02:31 -07:00
parent 456cfdb349 7b17cfaa46
commit 14cc5806c5
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docker/api/network.py
View File

@ -21,7 +21,8 @@ class NetworkApiMixin(object):
return self._result(res, json=True) return self._result(res, json=True)
@minimum_version('1.21') @minimum_version('1.21')
def create_network(self, name, driver=None, options=None, ipam=None): def create_network(self, name, driver=None, options=None, ipam=None,
check_duplicate=None):
if options is not None and not isinstance(options, dict): if options is not None and not isinstance(options, dict):
raise TypeError('options must be a dictionary') raise TypeError('options must be a dictionary')
@ -30,6 +31,7 @@ class NetworkApiMixin(object):
'Driver': driver, 'Driver': driver,
'Options': options, 'Options': options,
'IPAM': ipam, 'IPAM': ipam,
'CheckDuplicate': check_duplicate
} }
url = self._url("/networks/create") url = self._url("/networks/create")
res = self._post_json(url, data=data) res = self._post_json(url, data=data)

7
tests/integration/network_test.py
View File

@ -212,6 +212,13 @@ class TestNetworks(helpers.BaseTestCase):
self.execute(container, ['nslookup', 'bar']) self.execute(container, ['nslookup', 'bar'])
@requires_api_version('1.21')
def test_create_check_duplicate(self):
net_name, net_id = self.create_network()
with self.assertRaises(docker.errors.APIError):
self.client.create_network(net_name, check_duplicate=True)
self.client.create_network(net_name, check_duplicate=False)
@requires_api_version('1.22') @requires_api_version('1.22')
def test_connect_with_links(self): def test_connect_with_links(self):
net_name, net_id = self.create_network() net_name, net_id = self.create_network()