diff options
| author | Joffrey F <f.joffrey@gmail.com> | 2016-03-16 19:55:42 -0700 |
|---|---|---|
| committer | Joffrey F <f.joffrey@gmail.com> | 2016-03-16 19:55:42 -0700 |
| commit | 41acd70fd46f0d50516c78843ca739421cb450e4 (patch) | |
| tree | 8bec2f59259603ee836601d86c39c3d91e693a6f | |
| parent | 8c4546f8c8f52bb2923834783a17beb5bb89a724 (diff) | |
| parent | 5ace6204b4c90d90cf5fb0ea91bf4c9915398c7c (diff) | |
| download | docker-py-41acd70fd46f0d50516c78843ca739421cb450e4.tar.gz | |
Merge pull request #995 from docker/default-version-1.22
Update default API version to 1.22
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | docker/constants.py | 2 | ||||
| -rw-r--r-- | tests/integration/network_test.py | 56 |
3 files changed, 35 insertions, 27 deletions
@@ -32,14 +32,14 @@ integration-test-py3: build-py3 integration-dind: build build-py3 docker rm -vf dpy-dind || : - docker run -d --name dpy-dind --env="DOCKER_HOST=tcp://localhost:2375" --privileged dockerswarm/dind:1.9.0 docker -d -H tcp://0.0.0.0:2375 + docker run -d --name dpy-dind --env="DOCKER_HOST=tcp://localhost:2375" --privileged dockerswarm/dind:1.10.3 docker daemon -H tcp://0.0.0.0:2375 docker run --env="DOCKER_HOST=tcp://docker:2375" --link=dpy-dind:docker docker-py py.test tests/integration docker run --env="DOCKER_HOST=tcp://docker:2375" --link=dpy-dind:docker docker-py3 py.test tests/integration docker rm -vf dpy-dind integration-dind-ssl: build-dind-certs build build-py3 docker run -d --name dpy-dind-certs dpy-dind-certs - docker run -d --env="DOCKER_HOST=tcp://localhost:2375" --env="DOCKER_TLS_VERIFY=1" --env="DOCKER_CERT_PATH=/certs" --volumes-from dpy-dind-certs --name dpy-dind-ssl -v /tmp --privileged dockerswarm/dind:1.9.0 docker daemon --tlsverify --tlscacert=/certs/ca.pem --tlscert=/certs/server-cert.pem --tlskey=/certs/server-key.pem -H tcp://0.0.0.0:2375 + docker run -d --env="DOCKER_HOST=tcp://localhost:2375" --env="DOCKER_TLS_VERIFY=1" --env="DOCKER_CERT_PATH=/certs" --volumes-from dpy-dind-certs --name dpy-dind-ssl -v /tmp --privileged dockerswarm/dind:1.10.3 docker daemon --tlsverify --tlscacert=/certs/ca.pem --tlscert=/certs/server-cert.pem --tlskey=/certs/server-key.pem -H tcp://0.0.0.0:2375 docker run --volumes-from dpy-dind-ssl --env="DOCKER_HOST=tcp://docker:2375" --env="DOCKER_TLS_VERIFY=1" --env="DOCKER_CERT_PATH=/certs" --link=dpy-dind-ssl:docker docker-py py.test tests/integration docker run --volumes-from dpy-dind-ssl --env="DOCKER_HOST=tcp://docker:2375" --env="DOCKER_TLS_VERIFY=1" --env="DOCKER_CERT_PATH=/certs" --link=dpy-dind-ssl:docker docker-py3 py.test tests/integration docker rm -vf dpy-dind-ssl dpy-dind-certs diff --git a/docker/constants.py b/docker/constants.py index 0627ba0..6c381de 100644 --- a/docker/constants.py +++ b/docker/constants.py @@ -1,4 +1,4 @@ -DEFAULT_DOCKER_API_VERSION = '1.21' +DEFAULT_DOCKER_API_VERSION = '1.22' DEFAULT_TIMEOUT_SECONDS = 60 STREAM_HEADER_SIZE_BYTES = 8 CONTAINER_LIMITS_KEYS = [ diff --git a/tests/integration/network_test.py b/tests/integration/network_test.py index a744617..053e4ae 100644 --- a/tests/integration/network_test.py +++ b/tests/integration/network_test.py @@ -238,48 +238,56 @@ class TestNetworks(helpers.BaseTestCase): @requires_api_version('1.22') def test_connect_with_ipv4_address(self): - net_name, net_id = self.create_network() + net_name, net_id = self.create_network( + ipam=create_ipam_config( + driver='default', + pool_configs=[ + create_ipam_pool( + subnet="172.28.0.0/16", iprange="172.28.5.0/24", + gateway="172.28.5.254" + ) + ] + ) + ) container = self.create_and_start( host_config=self.client.create_host_config(network_mode=net_name)) self.client.disconnect_container_from_network(container, net_name) self.client.connect_container_to_network( - container, net_name, - ipv4_address='192.168.0.1') + container, net_name, ipv4_address='172.28.5.24' + ) container_data = self.client.inspect_container(container) + net_data = container_data['NetworkSettings']['Networks'][net_name] self.assertEqual( - container_data['NetworkSettings']['Networks'][net_name] - ['IPAMConfig']['IPv4Address'], - '192.168.0.1') - - self.create_and_start( - name='docker-py-test-upstream', - host_config=self.client.create_host_config(network_mode=net_name)) - - self.execute(container, ['nslookup', 'bar']) + net_data['IPAMConfig']['IPv4Address'], '172.28.5.24' + ) @requires_api_version('1.22') def test_connect_with_ipv6_address(self): - net_name, net_id = self.create_network() + net_name, net_id = self.create_network( + ipam=create_ipam_config( + driver='default', + pool_configs=[ + create_ipam_pool( + subnet="2001:389::1/64", iprange="2001:389::0/96", + gateway="2001:389::ffff" + ) + ] + ) + ) container = self.create_and_start( host_config=self.client.create_host_config(network_mode=net_name)) self.client.disconnect_container_from_network(container, net_name) self.client.connect_container_to_network( - container, net_name, - ipv6_address='2001:389::1') + container, net_name, ipv6_address='2001:389::f00d' + ) container_data = self.client.inspect_container(container) + net_data = container_data['NetworkSettings']['Networks'][net_name] self.assertEqual( - container_data['NetworkSettings']['Networks'][net_name] - ['IPAMConfig']['IPv6Address'], - '2001:389::1') - - self.create_and_start( - name='docker-py-test-upstream', - host_config=self.client.create_host_config(network_mode=net_name)) - - self.execute(container, ['nslookup', 'bar']) + net_data['IPAMConfig']['IPv6Address'], '2001:389::f00d' + ) |