diff options
| author | Matthew Berry <mtberry89@gmail.com> | 2017-07-13 23:20:24 -0500 |
|---|---|---|
| committer | Joffrey F <f.joffrey@gmail.com> | 2017-08-17 13:38:40 -0700 |
| commit | a23cd3d8e874635718e93b121dec58a08c8f766c (patch) | |
| tree | db8aaeba9a9f91c6c1d68a4056c9683b12730035 | |
| parent | e0c7e4d60e1e76cdfceeb782bbcc91d87d2a5d0d (diff) | |
| download | docker-py-a23cd3d8e874635718e93b121dec58a08c8f766c.tar.gz | |
Fix #1673 check resource error in container network API
Container network functions checked 'image' as resource ID and not
'container'. This caused a traceback when using container as named
argument.
Signed-off-by: Matthew Berry <mtberry89@gmail.com>
| -rw-r--r-- | docker/api/network.py | 4 | ||||
| -rw-r--r-- | tests/unit/api_network_test.py | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/docker/api/network.py b/docker/api/network.py index 5ebb41a..5549bf0 100644 --- a/docker/api/network.py +++ b/docker/api/network.py @@ -200,7 +200,7 @@ class NetworkApiMixin(object): res = self._get(url, params=params) return self._result(res, json=True) - @check_resource('image') + @check_resource('container') @minimum_version('1.21') def connect_container_to_network(self, container, net_id, ipv4_address=None, ipv6_address=None, @@ -237,7 +237,7 @@ class NetworkApiMixin(object): res = self._post_json(url, data=data) self._raise_for_status(res) - @check_resource('image') + @check_resource('container') @minimum_version('1.21') def disconnect_container_from_network(self, container, net_id, force=False): diff --git a/tests/unit/api_network_test.py b/tests/unit/api_network_test.py index f997a1b..96cdc4b 100644 --- a/tests/unit/api_network_test.py +++ b/tests/unit/api_network_test.py @@ -147,8 +147,8 @@ class NetworkTest(BaseAPIClientTest): with mock.patch('docker.api.client.APIClient.post', post): self.client.connect_container_to_network( - {'Id': container_id}, - network_id, + container={'Id': container_id}, + net_id=network_id, aliases=['foo', 'bar'], links=[('baz', 'quux')] ) @@ -176,7 +176,7 @@ class NetworkTest(BaseAPIClientTest): with mock.patch('docker.api.client.APIClient.post', post): self.client.disconnect_container_from_network( - {'Id': container_id}, network_id) + container={'Id': container_id}, net_id=network_id) self.assertEqual( post.call_args[0][0], |