[BZ 1272328] Allow undeploy of maintenance mode storageNode if other …

…nodes are not waiting for maintenance

modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java

@@ -343,12 +343,27 @@ public void undeployStorageNode(Subject subject, StorageNode storageNode) {
             storageNodeManager.resetInNewTransaction();
             storageNodeOperationsHandler.uninstall(subject, storageNode);
             break;
+            case MAINTENANCE:
+                storageNodeManager.resetInNewTransaction();
+                if(isMaintenanceCompleted(storageNode)) {
+                    storageNodeOperationsHandler.decommissionStorageNode(subject, storageNode);
+                }
+                break;
         default:
             // TODO what do we do with/about maintenance mode
             throw new RuntimeException("Cannot undeploy " + storageNode);
         }
     }
 
+    private boolean isMaintenanceCompleted(StorageNode storageNode) {
+        for (StorageNode node : getClusterNodes()) {
+            if(!node.equals(storageNode) && (node.isMaintenancePending() || node.getOperationMode() == OperationMode.MAINTENANCE)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
     @Override
     @TransactionAttribute(TransactionAttributeType.REQUIRES_NEW)
     public void resetInNewTransaction() {