diff options
Diffstat (limited to 'tests/integration/network_test.py')
| -rw-r--r-- | tests/integration/network_test.py | 31 |
1 files changed, 17 insertions, 14 deletions
diff --git a/tests/integration/network_test.py b/tests/integration/network_test.py index e009660..d0f0f3a 100644 --- a/tests/integration/network_test.py +++ b/tests/integration/network_test.py @@ -10,8 +10,8 @@ from ..base import requires_api_version @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 @@ class TestNetworks(api_test.BaseTestCase): 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 @@ class TestNetworks(api_test.BaseTestCase): 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 @@ class TestNetworks(api_test.BaseTestCase): 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')) |