Handle case correction for Windows plugin (#2022)

client_plugin/utils/plugin_utils/plugin_utils.go

@@ -17,6 +17,7 @@ package plugin_utils
 // This file holds utility/helper methods required in plugin module
 
 import (
+	"runtime"
 	"strings"
 
 	log "github.com/Sirupsen/logrus"
@@ -68,9 +69,14 @@ func IsFullVolName(volName string) bool {
 // Optionally returns datastore and volume metadata if retrieved from ESX.
 // If Volume Metadata is nil then caller can use getVolume()
 func GetVolumeInfo(name string, datastoreName string, d drivers.VolumeDriver) (*VolumeInfo, error) {
-	// if fullname already, return
+	// If fullname already, return for Linux, convert to short name for Windows
+	// so, the correct datastore name is used here.
 	if IsFullVolName(name) {
-		return &VolumeInfo{name, "", nil}, nil
+		if runtime.GOOS == "windows" {
+			name = strings.Split(name, "@")[0]
+		} else {
+			return &VolumeInfo{name, "", nil}, nil
+		}
 	}
 
 	// if datastore name is provided, append and return