Bump default API version to 1.21

Update Makefile to run tests against dind 1.9.0
Update network tests to account for latest API changes

Signed-off-by: Joffrey F <[email protected]>

Author: shin-

Makefile

@@ -29,14 +29,14 @@ integration-test-py3: build-py3
 	docker run -v /var/run/docker.sock:/var/run/docker.sock docker-py3 py.test tests/integration
 
 integration-dind: build build-py3
-	docker run -d --name dpy-dind --env="DOCKER_HOST=tcp://localhost:2375" --privileged dockerswarm/dind:1.8.1 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.9.0 docker -d -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.8.1 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.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 --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_test.py
 	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_test.py
 	docker rm -vf dpy-dind-ssl dpy-dind-certs

docker/constants.py

@@ -1,4 +1,4 @@
-DEFAULT_DOCKER_API_VERSION = '1.20'
+DEFAULT_DOCKER_API_VERSION = '1.21'
 DEFAULT_TIMEOUT_SECONDS = 60
 STREAM_HEADER_SIZE_BYTES = 8
 CONTAINER_LIMITS_KEYS = [

tests/integration/network_test.py

@@ -10,8 +10,8 @@
 @requires_api_version('1.21')
 class TestNetworks(api_test.BaseTestCase):
     def create_network(self, *args, **kwargs):
-        net_name = 'dockerpy{}'.format(random.getrandbits(24))[:14]
-        net_id = self.client.create_network(net_name, *args, **kwargs)['id']
+        net_name = u'dockerpy{}'.format(random.getrandbits(24))[:14]
+        net_id = self.client.create_network(net_name, *args, **kwargs)['Id']
         self.tmp_networks.append(net_id)
         return (net_name, net_id)
 
@@ -23,23 +23,26 @@ def test_list_networks(self):
 
         networks = self.client.networks()
         self.assertEqual(len(networks), initial_size + 1)
-        self.assertTrue(net_id in [n['id'] for n in networks])
+        self.assertTrue(net_id in [n['Id'] for n in networks])
 
         networks_by_name = self.client.networks(names=[net_name])
-        self.assertEqual([n['id'] for n in networks_by_name], [net_id])
+        self.assertEqual([n['Id'] for n in networks_by_name], [net_id])
 
         networks_by_partial_id = self.client.networks(ids=[net_id[:8]])
-        self.assertEqual([n['id'] for n in networks_by_partial_id], [net_id])
+        self.assertEqual([n['Id'] for n in networks_by_partial_id], [net_id])
 
     def test_inspect_network(self):
         net_name, net_id = self.create_network()
 
         net = self.client.inspect_network(net_id)
         self.assertEqual(net, {
-            u'name': net_name,
-            u'id': net_id,
-            u'driver': 'bridge',
-            u'containers': {},
+            u'Name': net_name,
+            u'Id': net_id,
+            u'Driver': 'bridge',
+            u'Containers': {},
+            u'IPAM': {u'Config': [{}], u'Driver': 'default'},
+            u'Options': {},
+            u'Scope': 'local'
         })
 
     def test_create_network_with_host_driver_fails(self):
@@ -65,17 +68,17 @@ def test_connect_and_disconnect_container(self):
         self.client.start(container)
 
         network_data = self.client.inspect_network(net_id)
-        self.assertFalse(network_data.get('containers'))
+        self.assertFalse(network_data.get('Containers'))
 
         self.client.connect_container_to_network(container, net_id)
         network_data = self.client.inspect_network(net_id)
         self.assertEqual(
-            list(network_data['containers'].keys()),
+            list(network_data['Containers'].keys()),
             [container['Id']])
 
         self.client.disconnect_container_from_network(container, net_id)
         network_data = self.client.inspect_network(net_id)
-        self.assertFalse(network_data.get('containers'))
+        self.assertFalse(network_data.get('Containers'))
 
     def test_connect_on_container_create(self):
         net_name, net_id = self.create_network()
@@ -90,9 +93,9 @@ def test_connect_on_container_create(self):
 
         network_data = self.client.inspect_network(net_id)
         self.assertEqual(
-            list(network_data['containers'].keys()),
+            list(network_data['Containers'].keys()),
             [container['Id']])
 
         self.client.disconnect_container_from_network(container, net_id)
         network_data = self.client.inspect_network(net_id)
-        self.assertFalse(network_data.get('containers'))
+        self.assertFalse(network_data.get('Containers'))