add possible to set a name for a local primary storage

Author: DK101010

api/src/main/java/com/cloud/agent/api/StoragePoolInfo.java

@@ -52,6 +52,13 @@ public StoragePoolInfo(String uuid, String host, String hostPath, String localPa
         this.details = details;
     }
 
+    public StoragePoolInfo(String uuid, String host, String hostPath, String localPath, StoragePoolType poolType, long capacityBytes, long availableBytes,
+            Map<String, String> details, String name) {
+        this(uuid, host, hostPath, localPath, poolType, capacityBytes, availableBytes);
+        this.details = details;
+        this.name = name;
+    }
+
     public long getCapacityBytes() {
         return capacityBytes;
     }

server/src/main/java/com/cloud/storage/StorageManagerImpl.java

@@ -678,7 +678,8 @@ private DataStore createLocalStorage(Map<String, Object> poolInfos) throws Conne
                                                     StoragePoolType.Filesystem,
                                                     capacityBytes,
                                                     0,
-                                                    (Map<String,String>)poolInfos.get("details"));
+                                                    (Map<String,String>)poolInfos.get("details"),
+                                                    poolInfos.get("name").toString());
 
         return createLocalStorage(host, pInfo);
     }
@@ -728,7 +729,7 @@ public DataStore createLocalStorage(Host host, StoragePoolInfo pInfo) throws Con
             DataStoreLifeCycle lifeCycle = provider.getDataStoreLifeCycle();
             if (pool == null) {
                 Map<String, Object> params = new HashMap<String, Object>();
-                String name = createLocalStoragePoolName(host, pInfo);
+                String name = pInfo.getName() != null ? pInfo.getName() : createLocalStoragePoolName(host, pInfo);
                 params.put("zoneId", host.getDataCenterId());
                 params.put("clusterId", host.getClusterId());
                 params.put("podId", host.getPodId());