9 files changed, 13 insertions, 12 deletions
diff --git a/glance_store/_drivers/cinder.py b/glance_store/_drivers/cinder.py
index 1a612f8..f91072c 100644
--- a/glance_store/_drivers/cinder.py
+++ b/glance_store/_drivers/cinder.py
@@ -131,7 +131,7 @@ class Store(glance_store.driver.Store):
 
     """Cinder backend store adapter."""
 
-    _CAPABILITIES = capabilities.DRIVER_REUSABLE
+    _CAPABILITIES = capabilities.BitMasks.DRIVER_REUSABLE
     OPTIONS = _CINDER_OPTS
     EXAMPLE_URL = "cinder://<VOLUME_ID>"
 
diff --git a/glance_store/_drivers/filesystem.py b/glance_store/_drivers/filesystem.py
index 7816def..5460102 100644
--- a/glance_store/_drivers/filesystem.py
+++ b/glance_store/_drivers/filesystem.py
@@ -149,9 +149,9 @@ class ChunkedFile(object):
 
 class Store(glance_store.driver.Store):
 
-    _CAPABILITIES = (capabilities.READ_RANDOM |
-                     capabilities.WRITE_ACCESS |
-                     capabilities.DRIVER_REUSABLE)
+    _CAPABILITIES = (capabilities.BitMasks.READ_RANDOM |
+                     capabilities.BitMasks.WRITE_ACCESS |
+                     capabilities.BitMasks.DRIVER_REUSABLE)
     OPTIONS = _FILESYSTEM_CONFIGS
     READ_CHUNKSIZE = 64 * units.Ki
     WRITE_CHUNKSIZE = READ_CHUNKSIZE
diff --git a/glance_store/_drivers/gridfs.py b/glance_store/_drivers/gridfs.py
index 85496e5..bfe4e63 100644
--- a/glance_store/_drivers/gridfs.py
+++ b/glance_store/_drivers/gridfs.py
@@ -81,7 +81,7 @@ class StoreLocation(glance_store.location.StoreLocation):
 class Store(glance_store.driver.Store):
     """GridFS adapter"""
 
-    _CAPABILITIES = capabilities.RW_ACCESS
+    _CAPABILITIES = capabilities.BitMasks.RW_ACCESS
     OPTIONS = _GRIDFS_OPTS
     EXAMPLE_URL = "gridfs://<IMAGE_ID>"
 
diff --git a/glance_store/_drivers/http.py b/glance_store/_drivers/http.py
index 886d981..eef578d 100644
--- a/glance_store/_drivers/http.py
+++ b/glance_store/_drivers/http.py
@@ -112,8 +112,8 @@ class Store(glance_store.driver.Store):
 
     """An implementation of the HTTP(S) Backend Adapter"""
 
-    _CAPABILITIES = (capabilities.READ_ACCESS |
-                     capabilities.DRIVER_REUSABLE)
+    _CAPABILITIES = (capabilities.BitMasks.READ_ACCESS |
+                     capabilities.BitMasks.DRIVER_REUSABLE)
 
     @capabilities.check
     def get(self, location, offset=0, chunk_size=None, context=None):
diff --git a/glance_store/_drivers/rbd.py b/glance_store/_drivers/rbd.py
index 6eceb72..0f93e27 100644
--- a/glance_store/_drivers/rbd.py
+++ b/glance_store/_drivers/rbd.py
@@ -176,7 +176,7 @@ class ImageIterator(object):
 class Store(driver.Store):
     """An implementation of the RBD backend adapter."""
 
-    _CAPABILITIES = capabilities.RW_ACCESS
+    _CAPABILITIES = capabilities.BitMasks.RW_ACCESS
     OPTIONS = _RBD_OPTS
 
     EXAMPLE_URL = "rbd://<FSID>/<POOL>/<IMAGE>/<SNAP>"
diff --git a/glance_store/_drivers/s3.py b/glance_store/_drivers/s3.py
index bca8bb8..2206dd8 100644
--- a/glance_store/_drivers/s3.py
+++ b/glance_store/_drivers/s3.py
@@ -294,7 +294,7 @@ class ChunkedFile(object):
 class Store(glance_store.driver.Store):
     """An implementation of the s3 adapter."""
 
-    _CAPABILITIES = capabilities.RW_ACCESS
+    _CAPABILITIES = capabilities.BitMasks.RW_ACCESS
     OPTIONS = _S3_OPTS
     EXAMPLE_URL = "s3://<ACCESS_KEY>:<SECRET_KEY>@<S3_URL>/<BUCKET>/<OBJ>"
 
diff --git a/glance_store/_drivers/sheepdog.py b/glance_store/_drivers/sheepdog.py
index 18863ab..9ee9cc0 100644
--- a/glance_store/_drivers/sheepdog.py
+++ b/glance_store/_drivers/sheepdog.py
@@ -174,7 +174,8 @@ class ImageIterator(object):
 class Store(glance_store.driver.Store):
     """Sheepdog backend adapter."""
 
-    _CAPABILITIES = (capabilities.RW_ACCESS | capabilities.DRIVER_REUSABLE)
+    _CAPABILITIES = (capabilities.BitMasks.RW_ACCESS |
+                     capabilities.BitMasks.DRIVER_REUSABLE)
     OPTIONS = _SHEEPDOG_OPTS
     EXAMPLE_URL = "sheepdog://image"
 
diff --git a/glance_store/_drivers/swift/store.py b/glance_store/_drivers/swift/store.py
index b054931..9f1995c 100644
--- a/glance_store/_drivers/swift/store.py
+++ b/glance_store/_drivers/swift/store.py
@@ -375,7 +375,7 @@ Store.OPTIONS = _SWIFT_OPTS + sutils.swift_opts
 
 class BaseStore(driver.Store):
 
-    _CAPABILITIES = capabilities.RW_ACCESS
+    _CAPABILITIES = capabilities.BitMasks.RW_ACCESS
     CHUNKSIZE = 65536
     OPTIONS = _SWIFT_OPTS + sutils.swift_opts
 
diff --git a/glance_store/_drivers/vmware_datastore.py b/glance_store/_drivers/vmware_datastore.py
index 2ac2413..e9ea4a1 100644
--- a/glance_store/_drivers/vmware_datastore.py
+++ b/glance_store/_drivers/vmware_datastore.py
@@ -221,7 +221,7 @@ class StoreLocation(location.StoreLocation):
 class Store(glance_store.Store):
     """An implementation of the VMware datastore adapter."""
 
-    _CAPABILITIES = capabilities.RW_ACCESS
+    _CAPABILITIES = capabilities.BitMasks.RW_ACCESS
     OPTIONS = _VMWARE_OPTS
     WRITE_CHUNKSIZE = units.Mi
     # FIXME(arnaud): re-visit this code once the store API is cleaned up.