diff options
Diffstat (limited to 'src')
2 files changed, 16 insertions, 15 deletions
diff --git a/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/GlusterDataModelManager.java b/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/GlusterDataModelManager.java index 9a27b085..82b05a91 100644 --- a/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/GlusterDataModelManager.java +++ b/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/GlusterDataModelManager.java @@ -441,4 +441,18 @@ public class GlusterDataModelManager { } return disk.getStatusStr(); } + + public List<String> getVolumesOfServer(String serverName) { + List<String> volumeNames = new ArrayList<String>(); + Cluster cluster = model.getCluster(); + for (Volume volume : cluster.getVolumes()) { + for (Brick brick : volume.getBricks()) { + if (serverName.equals(brick.getServerName())) { + volumeNames.add(volume.getName()); + break; + } + } + } + return volumeNames; + } } diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/RemoveServerAction.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/RemoveServerAction.java index 0ca5627c..f8f611fb 100644 --- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/RemoveServerAction.java +++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/RemoveServerAction.java @@ -33,6 +33,7 @@ import org.eclipse.swt.widgets.Display; import com.gluster.storage.management.client.GlusterDataModelManager; import com.gluster.storage.management.client.GlusterServersClient; import com.gluster.storage.management.core.constants.CoreConstants; +import com.gluster.storage.management.core.model.Brick; import com.gluster.storage.management.core.model.Cluster; import com.gluster.storage.management.core.model.GlusterServer; import com.gluster.storage.management.core.model.Status; @@ -106,7 +107,7 @@ public class RemoveServerAction extends AbstractActionDelegate { private boolean validate(IAction action, Set<GlusterServer> selectedServers) { Map<GlusterServer, List<String>> usedServers = new HashMap<GlusterServer, List<String>>(); for (GlusterServer server : selectedServers) { - List<String> configuredVolumes = getServerVolumeNames(server.getName()); + List<String> configuredVolumes = modelManager.getVolumesOfServer(server.getName()); if (configuredVolumes.size() > 0) { usedServers.put(server, configuredVolumes); @@ -132,20 +133,6 @@ public class RemoveServerAction extends AbstractActionDelegate { return true; } - private List<String> getServerVolumeNames(String serverName) { - Cluster cluster = modelManager.getModel().getCluster(); - List<String> volumeNames = new ArrayList<String>(); - for (Volume volume : cluster.getVolumes()) { - for (String brick : volume.getDisks()) { - if (serverName.equals(brick.split(":")[0])) { - volumeNames.add(volume.getName()); - break; - } - } - } - return volumeNames; - } - public void dispose() { } |