bug 8194: add new storage pool type PreSetup,

anthonyxu · anthonyxu · commit b226861783bb · 2011-02-02T19:33:08.000-08:00
1. user setup SR for xenserver pool
2. in UI, add a new storage pool as PreSetup
   server: "ip of storage "
   path:"name of the SR"
diff --git a/api/src/com/cloud/storage/Storage.java b/api/src/com/cloud/storage/Storage.java
@@ -94,7 +94,9 @@ public static enum StoragePoolType {
         ISO(false),    // for iso image
         LVM(false),    // XenServer local LVM SR
         SharedMountPoint(true),
-        VMFS(true);		// VMware VMFS storage
+        VMFS(true),		// VMware VMFS storage
+        PreSetup(true);  // for XenServer, Storage Pool is set up by customers. 
+        
         
         boolean shared;
         
diff --git a/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java b/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
@@ -5515,6 +5515,8 @@ protected SR getStorageRepository(Connection conn, StorageFilerTO pool) {
                 return getNfsSR(conn, pool);
             } else if (pool.getType() == StoragePoolType.IscsiLUN) {
                 return getIscsiSR(conn, pool);
+            } else if (pool.getType() == StoragePoolType.PreSetup) {
+                throw new CloudRuntimeException("The pool type: " + pool.getType().name() + " uuid " + pool.getUuid() + " doesn't exist");
             } else {
                 throw new CloudRuntimeException("The pool type: " + pool.getType().name() + " is not supported.");
             }
diff --git a/core/src/com/cloud/hypervisor/xen/resource/XenServer56Resource.java b/core/src/com/cloud/hypervisor/xen/resource/XenServer56Resource.java
@@ -174,7 +174,9 @@ protected SR getStorageRepository(Connection conn, StorageFilerTO pool) {
         try {
             SR sr = super.getStorageRepository(conn, pool);
 
-            if (pool.getType() != StoragePoolType.IscsiLUN && pool.getType() != StoragePoolType.NetworkFilesystem) {
+            if (!sr.getShared(conn) || ( pool.getType() != StoragePoolType.IscsiLUN 
+                    && pool.getType() != StoragePoolType.NetworkFilesystem
+                    && pool.getType() != StoragePoolType.PreSetup)) {
                 return sr;
             }
             setupHeartbeatSr(conn, sr, false);
diff --git a/server/src/com/cloud/storage/StorageManagerImpl.java b/server/src/com/cloud/storage/StorageManagerImpl.java
@@ -987,6 +987,8 @@ public StoragePoolVO createPool(CreateStoragePoolCmd cmd) throws ResourceInUseEx
             pool = new StoragePoolVO(StoragePoolType.Filesystem, "localhost", 0, hostPath);
         } else if (scheme.equalsIgnoreCase("sharedMountPoint")) {
             pool = new StoragePoolVO(StoragePoolType.SharedMountPoint, storageHost, 0, hostPath);
+        } else if (scheme.equalsIgnoreCase("PreSetup")) {
+            pool = new StoragePoolVO(StoragePoolType.PreSetup, storageHost, 0, hostPath);
         } else if (scheme.equalsIgnoreCase("iscsi")) {
             String[] tokens = hostPath.split("/");
             int lun = NumbersUtil.parseInt(tokens[tokens.length - 1], -1);
@@ -1052,6 +1054,8 @@ public StoragePoolVO createPool(CreateStoragePoolCmd cmd) throws ResourceInUseEx
         String uuid = null;
         if (scheme.equalsIgnoreCase("sharedmountpoint")) {
             uuid = UUID.randomUUID().toString();
+        } else if (scheme.equalsIgnoreCase("PreSetup")) {
+            uuid = hostPath.replace("/", "");
         } else {
             uuid = UUID.nameUUIDFromBytes(new String(storageHost + hostPath).getBytes()).toString();
         }
@@ -1233,8 +1237,8 @@ public boolean addPoolToHost(long hostId, StoragePoolVO pool) {
         s_logger.debug("Adding pool " + pool.getName() + " to  host " + hostId);
         if (pool.getPoolType() != StoragePoolType.NetworkFilesystem && pool.getPoolType() != StoragePoolType.Filesystem 
         	&& pool.getPoolType() != StoragePoolType.IscsiLUN && pool.getPoolType() != StoragePoolType.Iscsi && pool.getPoolType() != StoragePoolType.VMFS
-        	&& pool.getPoolType() != StoragePoolType.SharedMountPoint) {
-
+        	&& pool.getPoolType() != StoragePoolType.SharedMountPoint && pool.getPoolType() != StoragePoolType.PreSetup) {
+            s_logger.warn(" Doesn't support storage pool type " + pool.getPoolType());
             return true;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -5515,6 +5515,8 @@ protected SR getStorageRepository(Connection conn, StorageFilerTO pool) {`
`5515`	`5515`	`return getNfsSR(conn, pool);`
`5516`	`5516`	`} else if (pool.getType() == StoragePoolType.IscsiLUN) {`
`5517`	`5517`	`return getIscsiSR(conn, pool);`
	`5518`	`+ } else if (pool.getType() == StoragePoolType.PreSetup) {`
	`5519`	`+ throw new CloudRuntimeException("The pool type: " + pool.getType().name() + " uuid " + pool.getUuid() + " doesn't exist");`
`5518`	`5520`	`} else {`
`5519`	`5521`	`throw new CloudRuntimeException("The pool type: " + pool.getType().name() + " is not supported.");`
`5520`	`5522`	`}`