summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoffrey F <joffrey@docker.com>2016-12-05 16:52:22 -0800
committerJoffrey F <joffrey@docker.com>2016-12-06 11:26:53 -0800
commitb71f34e948bdf986660989f3e8a052db7bb1335c (patch)
tree78ea65ab7266c6a91ee367256e7872694f07b84e
parent2b85fbf120fb2fa0a6afa9205f6a495d6b66d989 (diff)
downloaddocker-py-b71f34e948bdf986660989f3e8a052db7bb1335c.tar.gz
Fix typo in create_network
Signed-off-by: Joffrey F <joffrey@docker.com>
-rw-r--r--docker/api/network.py9
-rw-r--r--tests/integration/api_network_test.py11
2 files changed, 16 insertions, 4 deletions
diff --git a/docker/api/network.py b/docker/api/network.py
index ca7cadf..c58ea6e 100644
--- a/docker/api/network.py
+++ b/docker/api/network.py
@@ -38,7 +38,7 @@ class NetworkApiMixin(object):
@minimum_version('1.21')
def create_network(self, name, driver=None, options=None, ipam=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``.
@@ -119,10 +119,11 @@ class NetworkApiMixin(object):
'supported in API version < 1.22')
data['Internal'] = True
- if attachable is not None
+ if attachable is not None:
if version_lt(self._version, '1.24'):
- raise InvalidVersion('Attachable is not '
- 'supported in API version < 1.24')
+ raise InvalidVersion(
+ 'attachable is not supported in API version < 1.24'
+ )
data['Attachable'] = attachable
url = self._url("/networks/create")
diff --git a/tests/integration/api_network_test.py b/tests/integration/api_network_test.py
index b1ac52c..e5a3801 100644
--- a/tests/integration/api_network_test.py
+++ b/tests/integration/api_network_test.py
@@ -7,6 +7,10 @@ from .base import BaseAPIIntegrationTest
class TestNetworks(BaseAPIIntegrationTest):
+ def tearDown(self):
+ super(TestNetworks, self).tearDown()
+ self.client.leave_swarm(force=True)
+
def create_network(self, *args, **kwargs):
net_name = random_name()
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 = self.client.inspect_network(net_id)
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