Merge "Improve CinderFixtureNewAttachFlow"

Author: Zuul

nova/tests/fixtures.py

@@ -32,6 +32,7 @@
 from oslo_concurrency import lockutils
 from oslo_config import cfg
 from oslo_db import exception as db_exc
+from oslo_log import log as logging
 import oslo_messaging as messaging
 from oslo_messaging import conffixture as messaging_conffixture
 from oslo_privsep import daemon as privsep_daemon
@@ -69,6 +70,8 @@
 DB_SCHEMA = {'main': "", 'api': ""}
 SESSION_CONFIGURED = False
 
+LOG = logging.getLogger(__name__)
+
 
 class ServiceFixture(fixtures.Fixture):
     """Run a service as a test fixture."""
@@ -1947,18 +1950,26 @@ def fake_attachment_create(_self, context, volume_id, instance_uuid,
             attachment = {'id': attachment_id, 'connection_info': {'data': {}}}
             self.volume_to_attachment[volume_id].append(
                 (attachment_id, instance_uuid))
+            LOG.info('Created attachment %s for volume %s. Total '
+                     'attachments for volume: %d', attachment_id, volume_id,
+                     len(self.volume_to_attachment[volume_id]))
 
             return attachment
 
         def fake_attachment_delete(_self, context, attachment_id):
             # 'attachment' is a tuple defining a attachment-instance mapping
-            _, attachment, attachments = _find_attachment(attachment_id)
+            volume_id, attachment, attachments = (
+                _find_attachment(attachment_id))
             attachments.remove(attachment)
+            LOG.info('Deleted attachment %s for volume %s. Total attachments '
+                     'for volume: %d', attachment_id, volume_id,
+                     len(attachments))
 
         def fake_attachment_update(_self, context, attachment_id, connector,
                                    mountpoint=None):
             # Ensure the attachment exists
             _find_attachment(attachment_id)
+            LOG.info('Updating volume attachment: %s', attachment_id)
             attachment_ref = {'driver_volume_type': 'fake_type',
                               'id': attachment_id,
                               'connection_info': {'data':
@@ -1987,14 +1998,19 @@ def fake_get_all_volume_types(*args, **kwargs):
                 'name': 'lvm-1'
             }]
 
+        def fake_attachment_complete(_self, _context, attachment_id):
+            # Ensure the attachment exists
+            _find_attachment(attachment_id)
+            LOG.info('Completing volume attachment: %s', attachment_id)
+
         self.test.stub_out('nova.volume.cinder.API.attachment_create',
                            fake_attachment_create)
         self.test.stub_out('nova.volume.cinder.API.attachment_delete',
                            fake_attachment_delete)
         self.test.stub_out('nova.volume.cinder.API.attachment_update',
                            fake_attachment_update)
         self.test.stub_out('nova.volume.cinder.API.attachment_complete',
-                           lambda *args, **kwargs: None)
+                           fake_attachment_complete)
         self.test.stub_out('nova.volume.cinder.API.attachment_get',
                            fake_attachment_get)
         self.test.stub_out('nova.volume.cinder.API.begin_detaching',
@@ -2007,7 +2023,7 @@ def fake_get_all_volume_types(*args, **kwargs):
         self.test.stub_out('nova.volume.cinder.API.roll_detaching',
                            lambda *args, **kwargs: None)
         self.test.stub_out('nova.volume.cinder.is_microversion_supported',
-                           lambda *args, **kwargs: None)
+                           lambda ctxt, microversion: None)
         self.test.stub_out('nova.volume.cinder.API.check_attached',
                            lambda *args, **kwargs: None)
         self.test.stub_out('nova.volume.cinder.API.get_all_volume_types',