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

Fix typo in create_network 

Signed-off-by: Joffrey F <joffrey@docker.com>
This commit is contained in:
Joffrey F 2016-12-05 16:52:22 -08:00
parent 2b85fbf120
commit b71f34e948
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
docker/api/network.py
View File

@ -38,7 +38,7 @@ class NetworkApiMixin(object):
@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, internal=False, labels=None, check_duplicate=None, internal=False, labels=None,
enable_ipv6=False, attachable=None): enable_ipv6=False, attachable=None, scope=None):
""" """
Create a network. Similar to the ``docker network create``. Create a network. Similar to the ``docker network create``.
@ -119,10 +119,11 @@ class NetworkApiMixin(object):
'supported in API version < 1.22') 'supported in API version < 1.22')
data['Internal'] = True data['Internal'] = True
if attachable is not None if attachable is not None:
if version_lt(self._version, '1.24'): if version_lt(self._version, '1.24'):
raise InvalidVersion('Attachable is not ' raise InvalidVersion(
'supported in API version < 1.24') 'attachable is not supported in API version < 1.24'
)
data['Attachable'] = attachable data['Attachable'] = attachable
url = self._url("/networks/create") url = self._url("/networks/create")

11
tests/integration/api_network_test.py
View File

@ -7,6 +7,10 @@ from .base import BaseAPIIntegrationTest
class TestNetworks(BaseAPIIntegrationTest): class TestNetworks(BaseAPIIntegrationTest):
def tearDown(self):
super(TestNetworks, self).tearDown()
self.client.leave_swarm(force=True)
def create_network(self, *args, **kwargs): def create_network(self, *args, **kwargs):
net_name = random_name() net_name = random_name()
net_id = self.client.create_network(net_name, *args, **kwargs)['Id'] net_id = self.client.create_network(net_name, *args, **kwargs)['Id']
@ -434,3 +438,10 @@ class TestNetworks(BaseAPIIntegrationTest):
_, net_id = self.create_network(enable_ipv6=True) _, net_id = self.create_network(enable_ipv6=True)
net = self.client.inspect_network(net_id) net = self.client.inspect_network(net_id)
assert net['EnableIPv6'] is True assert net['EnableIPv6'] is True
@requires_api_version('1.24')
def test_create_network_attachable(self):
assert self.client.init_swarm('eth0')
_, net_id = self.create_network(driver='overlay', attachable=True)
net = self.client.inspect_network(net_id)
assert net['Attachable'] is True