fup: Make connection_info returned by CinderFixture unique per attachment

Conflicts: Changes applied manually to the CinderFixture in
nova/tests/fixtures.py because nova/tests/fixtures/cinder.py does not
exist in stable/wallaby.

Change-Id: Iff3a3d13fb43357b4ae6fcd52b6197635e1c00fa
(cherry picked from commit d4cc10d)

Author: lyarwood

nova/tests/fixtures.py

@@ -2438,8 +2438,7 @@ class CinderFixture(fixtures.Fixture):
     # This represents a bootable volume backed by iSCSI storage.
     ISCSI_BACKED_VOL = uuidsentinel.iscsi_backed_volume
 
-    # Dict of connection_info for the above volumes key'd by the volume id
-    # TODO(lyarwood): Make this unique and tracked per attachment somehow.
+    # Dict of connection_info for the above volumes keyed by the volume id
     VOLUME_CONNECTION_INFO = {
         uuidsentinel.iscsi_backed_volume: {
             'driver_volume_type': 'iscsi',
@@ -2608,6 +2607,21 @@ def _find_attachment(attachment_id):
             raise exception.VolumeAttachmentNotFound(
                 attachment_id=attachment_id)
 
+        def _find_connection_info(volume_id, attachment_id):
+            """Find the connection_info associated with an attachment
+
+            :returns: A connection_info dict based on a deepcopy associated
+                with the volume_id but containing the attachment_id, making it
+                unique for the attachment.
+            """
+            connection_info = copy.deepcopy(
+                self.VOLUME_CONNECTION_INFO.get(
+                    volume_id, self.VOLUME_CONNECTION_INFO.get('fake')
+                )
+            )
+            connection_info['data']['attachment_id'] = attachment_id
+            return connection_info
+
         def fake_attachment_create(_self, context, volume_id, instance_uuid,
                                    connector=None, mountpoint=None):
             attachment_id = uuidutils.generate_uuid()
@@ -2617,10 +2631,8 @@ def fake_attachment_create(_self, context, volume_id, instance_uuid,
             attachment = {'id': attachment_id}
 
             if connector:
-                connection_info = self.VOLUME_CONNECTION_INFO.get(
-                    volume_id, self.VOLUME_CONNECTION_INFO.get('fake'))
-                attachment['connection_info'] = copy.deepcopy(connection_info)
-
+                attachment['connection_info'] = _find_connection_info(
+                    volume_id, attachment_id)
             self.volume_to_attachment[volume_id][attachment_id] = {
                 'id': attachment_id,
                 'instance_uuid': instance_uuid,
@@ -2658,9 +2670,8 @@ def fake_attachment_update(_self, context, attachment_id, connector,
             LOG.info('Updating volume attachment: %s', attachment_id)
             attachment_ref = {
                 'id': attachment_id,
-                'connection_info': copy.deepcopy(
-                    self.VOLUME_CONNECTION_INFO.get(
-                        volume_id, self.VOLUME_CONNECTION_INFO.get('fake')))
+                'connection_info': _find_connection_info(
+                    volume_id, attachment_id)
             }
             if attachment_id == self.SWAP_ERR_ATTACH_ID:
                 # This intentionally triggers a TypeError for the
@@ -2674,9 +2685,8 @@ def fake_attachment_get(_self, context, attachment_id):
 
             attachment_ref = {
                 'id': attachment_id,
-                'connection_info': copy.deepcopy(
-                    self.VOLUME_CONNECTION_INFO.get(
-                        volume_id, self.VOLUME_CONNECTION_INFO.get('fake')))
+                'connection_info': _find_connection_info(
+                    volume_id, attachment_id)
             }
             return attachment_ref