Commit 10

Author: Srivastava, Piyush

debian/rules

@@ -17,6 +17,7 @@ override_dh_auto_build:
 	mvn clean package -Psystemvm,developer -Dsystemvm \
 	    -Dcs.replace.properties=replace.properties.tmp \
 	    -Dmaven.repo.local=$(HOME)/.m2/repository \
+	    -DskipTests
 	     ${ACS_BUILD_OPTS}
 
 override_dh_auto_clean:

plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/driver/OntapPrimaryDatastoreDriver.java

@@ -255,7 +255,9 @@ private String createManagedNfsVolume(DataStore dataStore, DataObject dataObject
         Map<String, String> details = storagePoolDetailsDao.listDetailsKeyPairs(dataStore.getId());
         StorageStrategy storageStrategy = getStrategyByStoragePoolDetails(details);
 
-        String ontapVolumeName = "cloudstack_vol_" + volumeUuid;
+        String incomingName = "cloudstack_vol_" + volumeInfo.getName();
+        String sanitizedName = incomingName.replace('-', '_'); // replaces all '-' with '_'
+        String ontapVolumeName = "cloudstack_vol_" + sanitizedName;
         String junctionPath = "/" + ontapVolumeName;
         long sizeInBytes = volumeInfo.getSize();