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>

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

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'

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