From b9c48dca2c093c658867a4ecb13627124f9b5257 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=90=E4=BF=8A=E6=9D=B0?= Date: Tue, 6 Dec 2016 21:09:45 +0800 Subject: [PATCH] Scope is added in volume after docker 1.12 Signed-off-by: pacoxu add ut test for volume scope and no specified name create Signed-off-by: Paco Xu try to fix ut failure of volume creation Signed-off-by: Paco Xu try to fix ut failure of volume creation Signed-off-by: Paco Xu Scope is added in volume after docker 1.12 Signed-off-by: pacoxu Scope is added in volume after docker 1.12 Signed-off-by: pacoxu --- docker/api/volume.py | 3 ++- tests/unit/api_volume_test.py | 10 ++++++++++ tests/unit/fake_api.py | 9 ++++++--- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/docker/api/volume.py b/docker/api/volume.py index 9c6d5f83..a73df187 100644 --- a/docker/api/volume.py +++ b/docker/api/volume.py @@ -64,7 +64,8 @@ class VolumeApiMixin(object): {u'Driver': u'local', u'Labels': {u'key': u'value'}, u'Mountpoint': u'/var/lib/docker/volumes/foobar/_data', - u'Name': u'foobar'} + u'Name': u'foobar', + u'Scope': u'local'} """ url = self._url('/volumes/create') diff --git a/tests/unit/api_volume_test.py b/tests/unit/api_volume_test.py index cb72cb25..fc2a556d 100644 --- a/tests/unit/api_volume_test.py +++ b/tests/unit/api_volume_test.py @@ -89,6 +89,16 @@ class VolumeTest(BaseAPIClientTest): 'perfectcherryblossom', driver_opts='' ) + @requires_api_version('1.24') + def test_create_volume_with_no_specified_name(self): + result = self.client.create_volume(name=None) + self.assertIn('Name', result) + self.assertNotEqual(result['Name'], None) + self.assertIn('Driver', result) + self.assertEqual(result['Driver'], 'local') + self.assertIn('Scope', result) + self.assertEqual(result['Scope'], 'local') + @requires_api_version('1.21') def test_inspect_volume(self): name = 'perfectcherryblossom' diff --git a/tests/unit/fake_api.py b/tests/unit/fake_api.py index cf3f7d7d..2d0a0b45 100644 --- a/tests/unit/fake_api.py +++ b/tests/unit/fake_api.py @@ -389,11 +389,13 @@ def get_fake_volume_list(): { 'Name': 'perfectcherryblossom', 'Driver': 'local', - 'Mountpoint': '/var/lib/docker/volumes/perfectcherryblossom' + 'Mountpoint': '/var/lib/docker/volumes/perfectcherryblossom', + 'Scope': 'local' }, { 'Name': 'subterraneananimism', 'Driver': 'local', - 'Mountpoint': '/var/lib/docker/volumes/subterraneananimism' + 'Mountpoint': '/var/lib/docker/volumes/subterraneananimism', + 'Scope': 'local' } ] } @@ -408,7 +410,8 @@ def get_fake_volume(): 'Mountpoint': '/var/lib/docker/volumes/perfectcherryblossom', 'Labels': { 'com.example.some-label': 'some-value' - } + }, + 'Scope': 'local' } return status_code, response