Merge "Fix: SnapshotStatus missing in Cinder"

cinder/tests/unit/consistencygroup/test_cg.py

@@ -508,7 +508,7 @@ class ConsistencyGroupTestCase(base.BaseVolumeTestCase):
             snap.user_id = fake.USER_ID
             snap.project_id = fake.PROJECT_ID
             snap.volume_id = volume_id
-            snap.status = "available"
+            snap.status = fields.SnapshotStatus.AVAILABLE
             snap.cgsnapshot_id = cgsnap.id
             snap.create()
             snaps.append(snap)

cinder/tests/unit/objects/test_snapshot.py

@@ -129,7 +129,7 @@ class TestSnapshot(test_objects.BaseObjectsTestCase):
         snapshot_destroy.assert_called_once_with(self.context,
                                                  fake.SNAPSHOT_ID)
         self.assertTrue(snapshot.deleted)
-        self.assertEqual('deleted', snapshot.status)
+        self.assertEqual(fields.SnapshotStatus.DELETED, snapshot.status)
         self.assertEqual(utcnow_mock.return_value.replace(tzinfo=pytz.UTC),
                          snapshot.deleted_at)
 
@@ -233,7 +233,7 @@ class TestSnapshot(test_objects.BaseObjectsTestCase):
     @ddt.data('1.1', '1.3')
     def test_obj_make_compatible(self, version):
         snapshot = objects.Snapshot(context=self.context)
-        snapshot.status = 'unmanaging'
+        snapshot.status = fields.SnapshotStatus.UNMANAGING
         primitive = snapshot.obj_to_primitive(version)
         snapshot = objects.Snapshot.obj_from_primitive(primitive)
         if version == '1.3':

cinder/tests/unit/volume/test_snapshot.py

@@ -55,7 +55,7 @@ def create_snapshot(volume_id, size=1, metadata=None, ctxt=None,
     snap.user_id = fake.USER_ID
     snap.project_id = fake.PROJECT_ID
     snap.volume_id = volume_id
-    snap.status = "creating"
+    snap.status = fields.SnapshotStatus.CREATING
     if metadata is not None:
         snap.metadata = metadata
     snap.update(kwargs)

cinder/tests/unit/volume/test_volume.py

@@ -75,7 +75,7 @@ def create_snapshot(volume_id, size=1, metadata=None, ctxt=None,
     snap.user_id = fake.USER_ID
     snap.project_id = fake.PROJECT_ID
     snap.volume_id = volume_id
-    snap.status = "creating"
+    snap.status = fields.SnapshotStatus.CREATING
     if metadata is not None:
         snap.metadata = metadata
     snap.update(kwargs)

cinder/tests/unit/volume/test_volume_migration.py

@@ -28,6 +28,7 @@ from cinder import context
 from cinder import db
 from cinder import exception
 from cinder import objects
+from cinder.objects import fields
 from cinder import quota
 from cinder.tests.unit.api import fakes
 from cinder.tests.unit import fake_constants as fake
@@ -56,7 +57,7 @@ def create_snapshot(volume_id, size=1, metadata=None, ctxt=None,
     snap.user_id = kwargs.get('user_id', fake.USER_ID)
     snap.project_id = kwargs.get('project_id', fake.PROJECT_ID)
     snap.volume_id = volume_id
-    snap.status = "creating"
+    snap.status = fields.SnapshotStatus.CREATING
     if metadata is not None:
         snap.metadata = metadata
     snap.update(kwargs)

cinder/tests/unit/windows/test_smbfs.py

@@ -23,6 +23,7 @@ from oslo_utils import units
 from cinder import context
 from cinder import exception
 from cinder.image import image_utils
+from cinder.objects import fields
 from cinder import test
 from cinder.tests.unit import fake_snapshot
 from cinder.tests.unit import fake_volume
@@ -610,7 +611,7 @@ class WindowsSmbFsTestCase(test.TestCase):
                                                    mock.sentinel.src_vol)
 
     def test_create_volume_from_unavailable_snapshot(self):
-        self.snapshot.status = 'error'
+        self.snapshot.status = fields.SnapshotStatus.ERROR
         self.assertRaises(
             exception.InvalidSnapshot,
             self._smbfs_driver.create_volume_from_snapshot,

cinder/volume/flows/manager/manage_existing_snapshot.py

@@ -22,6 +22,7 @@ from cinder import exception
 from cinder import flow_utils
 from cinder.i18n import _
 from cinder import objects
+from cinder.objects import fields
 from cinder import quota
 from cinder import quota_utils
 from cinder.volume.flows import common as flow_common
@@ -253,7 +254,7 @@ class ManageExistingTask(flow_utils.CinderTask):
             raise
 
         return {'snapshot': snapshot_ref,
-                'new_status': 'available'}
+                'new_status': fields.SnapshotStatus.AVAILABLE}
 
 
 class CreateSnapshotOnFinishTask(NotifySnapshotActionTask):