diff options
| author | Shireesh Anjal <shireesh@gluster.com> | 2011-03-22 17:53:14 +0530 |
|---|---|---|
| committer | Shireesh Anjal <shireesh@gluster.com> | 2011-03-22 17:53:14 +0530 |
| commit | c0767db8bf79afd62cdb750558ab7db1a227838f (patch) | |
| tree | 86e64122f70f8a03a3a9dbe677ac1be89948490a /com.gluster.storage.management.core | |
| parent | 97964bbc552cf0c3a86d0dff8ba00d930f60fd5d (diff) | |
story#21 Start Volume
Diffstat (limited to 'com.gluster.storage.management.core')
| -rw-r--r-- | com.gluster.storage.management.core/src/com/gluster/storage/management/core/constants/CoreConstants.java | 2 | ||||
| -rw-r--r-- | com.gluster.storage.management.core/src/com/gluster/storage/management/core/constants/RESTConstants.java | 33 | ||||
| -rw-r--r-- | com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/ClusterListener.java (renamed from com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/IClusterListener.java) | 2 | ||||
| -rw-r--r-- | com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/DefaultClusterListener.java | 2 | ||||
| -rw-r--r-- | com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Event.java | 19 | ||||
| -rw-r--r-- | com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Status.java | 1 | ||||
| -rw-r--r-- | com.gluster.storage.management.core/src/com/gluster/storage/management/core/utils/GlusterUtil.java | 11 |
7 files changed, 62 insertions, 8 deletions
diff --git a/com.gluster.storage.management.core/src/com/gluster/storage/management/core/constants/CoreConstants.java b/com.gluster.storage.management.core/src/com/gluster/storage/management/core/constants/CoreConstants.java index abd8ba4b..177334bd 100644 --- a/com.gluster.storage.management.core/src/com/gluster/storage/management/core/constants/CoreConstants.java +++ b/com.gluster.storage.management.core/src/com/gluster/storage/management/core/constants/CoreConstants.java @@ -18,8 +18,6 @@ *******************************************************************************/ package com.gluster.storage.management.core.constants; -import java.util.ArrayList; -import java.util.List; /** * diff --git a/com.gluster.storage.management.core/src/com/gluster/storage/management/core/constants/RESTConstants.java b/com.gluster.storage.management.core/src/com/gluster/storage/management/core/constants/RESTConstants.java new file mode 100644 index 00000000..63cc560a --- /dev/null +++ b/com.gluster.storage.management.core/src/com/gluster/storage/management/core/constants/RESTConstants.java @@ -0,0 +1,33 @@ +/** + * RESTConstants.java + * + * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com> + * This file is part of Gluster Management Console. + * + * Gluster Management Console is free software; you can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License as published + * by the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * Gluster Management Console is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License + * for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see + * <http://www.gnu.org/licenses/>. + */ +package com.gluster.storage.management.core.constants; + +/** + * All constants related to the Gluster REST server and client + */ +public class RESTConstants { + // Constants related to Volumes Resource + public static final String PATH_RESOURCE_VOLUMES = "/cluster/volumes"; + public static final String FORM_PARAM_OPERATION = "operation"; + public static final String FORM_PARAM_VALUE_START = "start"; + public static final String FORM_PARAM_VALUE_STOP = "stop"; + public static final String PATH_PARAM_VOLUME_NAME = "volumeName"; +} diff --git a/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/IClusterListener.java b/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/ClusterListener.java index 46d56ab4..85cdd872 100644 --- a/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/IClusterListener.java +++ b/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/ClusterListener.java @@ -22,7 +22,7 @@ package com.gluster.storage.management.core.model; * Interface for a cluster listener. Every registered listener will be notified * on various events happening on the cluster. */ -public interface IClusterListener { +public interface ClusterListener { public void discoveredServerAdded(Server server); public void discoveredServerRemoved(Server server); diff --git a/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/DefaultClusterListener.java b/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/DefaultClusterListener.java index 46d9ca55..bf76de43 100644 --- a/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/DefaultClusterListener.java +++ b/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/DefaultClusterListener.java @@ -22,7 +22,7 @@ package com.gluster.storage.management.core.model; * Default listener - doesn't do anything. Sub-class and override the method for * the event you want to handle. */ -public class DefaultClusterListener implements IClusterListener { +public class DefaultClusterListener implements ClusterListener { @Override public void serverAdded(GlusterServer server) { diff --git a/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Event.java b/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Event.java index 8435f998..65501a2b 100644 --- a/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Event.java +++ b/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Event.java @@ -23,7 +23,8 @@ public class Event { DISK_ADDED, DISK_REMOVED, NETWORK_INTERFACE_ADDED, - NETWORK_INTERFACE_REMOVED + NETWORK_INTERFACE_REMOVED, + VOLUME_STATUS_CHANGED } private EVENT_TYPE eventType; @@ -33,4 +34,20 @@ public class Event { this.eventType = eventType; this.eventData = eventData; } + + public EVENT_TYPE getEventType() { + return eventType; + } + + public void setEventType(EVENT_TYPE eventType) { + this.eventType = eventType; + } + + public Object getEventData() { + return eventData; + } + + public void setEventData(Object eventData) { + this.eventData = eventData; + } } diff --git a/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Status.java b/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Status.java index 77a3e001..340b297f 100644 --- a/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Status.java +++ b/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Status.java @@ -48,6 +48,7 @@ public class Status { public Status(ProcessResult result) { this.code = result.getExitValue(); + this.message = result.getOutput(); } @XmlElement(name = "code", type = Integer.class) diff --git a/com.gluster.storage.management.core/src/com/gluster/storage/management/core/utils/GlusterUtil.java b/com.gluster.storage.management.core/src/com/gluster/storage/management/core/utils/GlusterUtil.java index 683e6c00..81208eff 100644 --- a/com.gluster.storage.management.core/src/com/gluster/storage/management/core/utils/GlusterUtil.java +++ b/com.gluster.storage.management.core/src/com/gluster/storage/management/core/utils/GlusterUtil.java @@ -117,9 +117,6 @@ public class GlusterUtil { return glusterServerNames; } - /** - * @return - */ private String getPeerStatus() { String output; ProcessResult result = processUtil.executeCommand("gluster", "peer", "status"); @@ -133,6 +130,14 @@ public class GlusterUtil { public ProcessResult addServer(String serverName) { return processUtil.executeCommand("gluster", "peer", "probe", serverName); } + + public ProcessResult startVolume(String volumeName) { + return processUtil.executeCommand("gluster", "volume", "start", volumeName); + } + + public ProcessResult stopVolume(String volumeName) { + return processUtil.executeCommand("gluster", "--mode=script", "volume", "stop", volumeName); + } public static void main(String args[]) { List<String> names = new GlusterUtil().getGlusterServerNames(); |
