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

Raise exceptions for API errors on network connect/disconnect 

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
This commit is contained in:
Aanand Prasad 2016-01-25 18:19:32 +00:00
parent ce8a02f713
commit 403d271cc2
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docker/api/network.py
View File

@ -57,11 +57,13 @@ class NetworkApiMixin(object):
},
}
url = self._url("/networks/{0}/connect", net_id)
self._post_json(url, data=data)
res = self._post_json(url, data=data)
self._raise_for_status(res)
@check_resource
@minimum_version('1.21')
def disconnect_container_from_network(self, container, net_id):
data = {"container": container}
url = self._url("/networks/{0}/disconnect", net_id)
self._post_json(url, data=data)
res = self._post_json(url, data=data)
self._raise_for_status(res)

6
tests/integration/network_test.py
View File

@ -117,10 +117,16 @@ class TestNetworks(helpers.BaseTestCase):
list(network_data['Containers'].keys()),
[container['Id']])
with pytest.raises(docker.errors.APIError):
self.client.connect_container_to_network(container, net_id)
self.client.disconnect_container_from_network(container, net_id)
network_data = self.client.inspect_network(net_id)
self.assertFalse(network_data.get('Containers'))
with pytest.raises(docker.errors.APIError):
self.client.disconnect_container_from_network(container, net_id)
@requires_api_version('1.22')
def test_connect_with_aliases(self):
net_name, net_id = self.create_network()