Merge pull request #335 from akutz/bugfix/scaleio-attachment-fix

ScaleIO Get Volumes Attachment States Fix

drivers/storage/scaleio/storage/scaleio_storage.go

@@ -164,7 +164,7 @@ func (d *driver) Volumes(
 	opts *types.VolumesOpts) ([]*types.Volume, error) {
 
 	sdcMappedVolumes := make(map[string]string)
-	if opts.Attachments.Requested() {
+	if opts.Attachments.Devices() {
 		if ld, ok := context.LocalDevices(ctx); ok {
 			sdcMappedVolumes = ld.DeviceMap
 		}
@@ -195,8 +195,8 @@ func (d *driver) Volumes(
 			return ""
 		}
 
-		if protectionDomain, ok := mapProtectionDomainName[pool.ProtectionDomainID]; ok {
-			return protectionDomain.Name
+		if pd, ok := mapProtectionDomainName[pool.ProtectionDomainID]; ok {
+			return pd.Name
 		}
 		return ""
 	}
@@ -209,22 +209,22 @@ func (d *driver) Volumes(
 	var volumesSD []*types.Volume
 	for _, volume := range volumes {
 		var attachmentsSD []*types.VolumeAttachment
-		for _, attachment := range volume.MappedSdcInfo {
-			var deviceName string
-			if _, exists := sdcMappedVolumes[volume.ID]; exists {
-				deviceName = sdcMappedVolumes[volume.ID]
-			}
-			instanceID := &types.InstanceID{
-				ID:     attachment.SdcID,
-				Driver: d.Name(),
+		if opts.Attachments.Requested() {
+			for _, attachment := range volume.MappedSdcInfo {
+				instanceID := &types.InstanceID{
+					ID:     attachment.SdcID,
+					Driver: d.Name(),
+				}
+				attachmentSD := &types.VolumeAttachment{
+					VolumeID:   volume.ID,
+					InstanceID: instanceID,
+					Status:     "",
+				}
+				if devName, ok := sdcMappedVolumes[volume.ID]; ok {
+					attachmentSD.DeviceName = devName
+				}
+				attachmentsSD = append(attachmentsSD, attachmentSD)
 			}
-			attachmentSD := &types.VolumeAttachment{
-				VolumeID:   volume.ID,
-				InstanceID: instanceID,
-				DeviceName: deviceName,
-				Status:     "",
-			}
-			attachmentsSD = append(attachmentsSD, attachmentSD)
 		}
 
 		var IOPS int64