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

Scope is added in volume after docker 1.12 

Signed-off-by: pacoxu <paco.xu@daocloud.io>

add ut test for volume scope and no specified name create
Signed-off-by: Paco Xu <paco.xu@daocloud.io>

try to fix ut failure of volume creation
Signed-off-by: Paco Xu <paco.xu@daocloud.io>

try to fix ut failure of volume creation
Signed-off-by: Paco Xu <paco.xu@daocloud.io>

Scope is added in volume after docker 1.12
 Signed-off-by: pacoxu <paco.xu@daocloud.io>

Scope is added in volume after docker 1.12
 Signed-off-by: pacoxu <paco.xu@daocloud.io>
This commit is contained in:
徐俊杰 2016-12-06 21:09:45 +08:00 committed by pacoxu
parent dd8ad21c88
commit b9c48dca2c
3 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docker/api/volume.py
View File

@ -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')

10
tests/unit/api_volume_test.py
View File

@ -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'

9
tests/unit/fake_api.py
View File

@ -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