Merge pull request #132 from NetApp/bugfix/CSTACKEX-361

CSTACKEX-361: ONTAP NFS volume created from snapshot loses its path and cannot be attached to a VM

Author: sp16743

engine/storage/datamotion/src/main/java/org/apache/cloudstack/storage/motion/StorageSystemDataMotionStrategy.java

@@ -1787,7 +1787,11 @@ else if (HypervisorType.KVM.equals(snapshotInfo.getHypervisorType())) {
                 VolumeObjectTO newVolume = new VolumeObjectTO();
 
                 newVolume.setSize(volumeInfo.getSize());
-                newVolume.setPath(volumeInfo.get_iScsiName());
+                String path = volumeInfo.get_iScsiName();
+                if (path == null) {
+                    path = volumeInfo.getPath();
+                }
+                newVolume.setPath(path);
                 newVolume.setFormat(volumeInfo.getFormat());
 
                 copyCmdAnswer = new CopyCmdAnswer(newVolume);