diff options
9 files changed, 64 insertions, 60 deletions
diff --git a/com.gluster.storage.management.client/src/com/gluster/storage/management/client/GlusterDataModelManager.java b/com.gluster.storage.management.client/src/com/gluster/storage/management/client/GlusterDataModelManager.java index ccad0429..45e61e8e 100644 --- a/com.gluster.storage.management.client/src/com/gluster/storage/management/client/GlusterDataModelManager.java +++ b/com.gluster.storage.management.client/src/com/gluster/storage/management/client/GlusterDataModelManager.java @@ -78,13 +78,14 @@ public class GlusterDataModelManager { return instance; } + // Renamed preferredInterfaceName to interfaceName private GlusterServer addGlusterServer(List<GlusterServer> servers, Entity parent, String name, - SERVER_STATUS status, String preferredInterfaceName, int numOfCPUs, double cpuUsage, double totalMemory, + SERVER_STATUS status, String interfaceName, int numOfCPUs, double cpuUsage, double totalMemory, double memoryInUse) { GlusterServer glusterServer = new GlusterServer(name, parent, status, numOfCPUs, cpuUsage, totalMemory, memoryInUse); - NetworkInterface networkInterface = addNetworkInterface(glusterServer, preferredInterfaceName); - glusterServer.setPreferredNetworkInterface(networkInterface); + NetworkInterface networkInterface = addNetworkInterface(glusterServer, interfaceName); // Renamed preferredInterfaceName to interfaceName + // glusterServer.setPreferredNetworkInterface(networkInterface); servers.add(glusterServer); return glusterServer; diff --git a/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/GlusterDummyModel.java b/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/GlusterDummyModel.java index 8c1c8877..11d31553 100644 --- a/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/GlusterDummyModel.java +++ b/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/GlusterDummyModel.java @@ -50,13 +50,14 @@ public class GlusterDummyModel { return instance; } + // Renamed preferredInterfaceName to interfaceName private GlusterServer addGlusterServer(List<GlusterServer> servers, Entity parent, String name, - SERVER_STATUS status, String preferredInterfaceName, int numOfCPUs, double cpuUsage, double totalMemory, + SERVER_STATUS status, String interfaceName, int numOfCPUs, double cpuUsage, double totalMemory, double memoryInUse) { GlusterServer glusterServer = new GlusterServer(name, parent, status, numOfCPUs, cpuUsage, totalMemory, memoryInUse); - NetworkInterface networkInterface = addNetworkInterface(glusterServer, preferredInterfaceName); - glusterServer.setPreferredNetworkInterface(networkInterface); + NetworkInterface networkInterface = addNetworkInterface(glusterServer, interfaceName); // Renamed preferredInterfaceName to interfaceName + // glusterServer.setPreferredNetworkInterface(networkInterface); servers.add(glusterServer); return glusterServer; diff --git a/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/GlusterServer.java b/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/GlusterServer.java index 44c6b260..fd4e58c9 100644 --- a/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/GlusterServer.java +++ b/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/GlusterServer.java @@ -23,33 +23,34 @@ import javax.xml.bind.annotation.XmlTransient; import com.gluster.storage.management.core.utils.StringUtil; -@XmlRootElement(name="glusterServer") +@XmlRootElement(name = "glusterServer") public class GlusterServer extends Server { public enum SERVER_STATUS { ONLINE, OFFLINE }; + private static final String[] STATUS_STR = new String[] { "Online", "Offline" }; private String uuid; private SERVER_STATUS status; - private NetworkInterface preferredNetworkInterface; + // private NetworkInterface preferredNetworkInterface; private Cluster cluster; public GlusterServer() { } - + public GlusterServer(String name) { super(name); } - - public GlusterServer(String name, Entity parent, SERVER_STATUS status, int numOfCPUs, double cpuUsage, double totalMemory, - double memoryInUse) { + + public GlusterServer(String name, Entity parent, SERVER_STATUS status, int numOfCPUs, double cpuUsage, + double totalMemory, double memoryInUse) { super(name, parent, numOfCPUs, cpuUsage, totalMemory, memoryInUse); setStatus(status); } - public GlusterServer(String name, Entity parent, SERVER_STATUS status, int numOfCPUs, double cpuUsage, double totalMemory, - double memoryInUse, Cluster cluster) { + public GlusterServer(String name, Entity parent, SERVER_STATUS status, int numOfCPUs, double cpuUsage, + double totalMemory, double memoryInUse, Cluster cluster) { this(name, parent, status, numOfCPUs, cpuUsage, totalMemory, memoryInUse); setCluster(cluster); } @@ -61,7 +62,7 @@ public class GlusterServer extends Server { public SERVER_STATUS getStatus() { return status; } - + public void setStatus(SERVER_STATUS status) { this.status = status; } @@ -74,15 +75,17 @@ public class GlusterServer extends Server { this.uuid = uuid; } - public NetworkInterface getPreferredNetworkInterface() { - return preferredNetworkInterface; - } - - public void setPreferredNetworkInterface(NetworkInterface preferredNetworkInterface) { - this.preferredNetworkInterface = preferredNetworkInterface; - preferredNetworkInterface.setPreferred(true); - } + +// public NetworkInterface getPreferredNetworkInterface() { +// return preferredNetworkInterface; +// } +// +// public void setPreferredNetworkInterface(NetworkInterface preferredNetworkInterface) { +// this.preferredNetworkInterface = preferredNetworkInterface; +// preferredNetworkInterface.setPreferred(true); +// } + @XmlTransient public Cluster getCluster() { return cluster; @@ -93,12 +96,11 @@ public class GlusterServer extends Server { } /** - * Filter matches if any of the properties name, status, preferred network interface, and primary/secondary/third + * Filter matches if any of the properties name, status and primary/secondary/third * DNS contains the filter string */ @Override public boolean filter(String filterString, boolean caseSensitive) { - return StringUtil.filterString(getName() + getStatusStr() + getPreferredNetworkInterface().getName(), - filterString, caseSensitive); + return StringUtil.filterString(getName() + getStatusStr(), filterString, caseSensitive); } } diff --git a/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/NetworkInterface.java b/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/NetworkInterface.java index e1eb614a..882dfe09 100644 --- a/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/NetworkInterface.java +++ b/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/NetworkInterface.java @@ -25,19 +25,19 @@ public class NetworkInterface extends Entity { private String ipAddress; private String netMask; private String defaultGateway; - private boolean isPreferred; +// private boolean isPreferred; public NetworkInterface() { } - public boolean isPreferred() { - return isPreferred; - } - - public void setPreferred(boolean isPreferred) { - this.isPreferred = isPreferred; - } +// public boolean isPreferred() { +// return isPreferred; +// } +// +// public void setPreferred(boolean isPreferred) { +// this.isPreferred = isPreferred; +// } public String getIpAddress() { return ipAddress; diff --git a/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/GlusterServerTableLabelProvider.java b/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/GlusterServerTableLabelProvider.java index c07a6c8e..3fc2dfa0 100644 --- a/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/GlusterServerTableLabelProvider.java +++ b/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/GlusterServerTableLabelProvider.java @@ -64,7 +64,7 @@ public class GlusterServerTableLabelProvider extends TableLabelProviderAdapter { return (columnIndex == GLUSTER_SERVER_TABLE_COLUMN_INDICES.NAME.ordinal() ? server.getName() : columnIndex == GLUSTER_SERVER_TABLE_COLUMN_INDICES.STATUS.ordinal() ? server.getStatusStr() - : columnIndex == GLUSTER_SERVER_TABLE_COLUMN_INDICES.PREFERRED_NETWORK.ordinal() ? server.getPreferredNetworkInterface().getName() + // : columnIndex == GLUSTER_SERVER_TABLE_COLUMN_INDICES.PREFERRED_NETWORK.ordinal() ? server.getPreferredNetworkInterface().getName() : columnIndex == GLUSTER_SERVER_TABLE_COLUMN_INDICES.NUM_OF_CPUS.ordinal() ? "" + server.getNumOfCPUs() //: columnIndex == SERVER_DISK_TABLE_COLUMN_INDICES.CPU_USAGE.ordinal() ? "" + server.getCpuUsage() : columnIndex == GLUSTER_SERVER_TABLE_COLUMN_INDICES.TOTAL_MEMORY.ordinal() ? "" + server.getTotalMemory() diff --git a/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/NetworkInterfaceTableLabelProvider.java b/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/NetworkInterfaceTableLabelProvider.java index 98da1019..d7b700d4 100644 --- a/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/NetworkInterfaceTableLabelProvider.java +++ b/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/NetworkInterfaceTableLabelProvider.java @@ -34,7 +34,7 @@ public class NetworkInterfaceTableLabelProvider extends TableLabelProviderAdapte : columnIndex == NETWORK_INTERFACE_TABLE_COLUMN_INDICES.IP_ADDRESS.ordinal() ? networkInterface.getIpAddress() : columnIndex == NETWORK_INTERFACE_TABLE_COLUMN_INDICES.NETMASK.ordinal() ? networkInterface.getNetMask() : columnIndex == NETWORK_INTERFACE_TABLE_COLUMN_INDICES.GATEWAY.ordinal() ? networkInterface.getDefaultGateway() - : columnIndex == NETWORK_INTERFACE_TABLE_COLUMN_INDICES.PREFERRED.ordinal() ? (networkInterface.isPreferred() ? "Yes" : "No") + // : columnIndex == NETWORK_INTERFACE_TABLE_COLUMN_INDICES.PREFERRED.ordinal() ? (networkInterface.isPreferred() ? "Yes" : "No") : "Invalid"); } } diff --git a/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/details/GlusterServersPage.java b/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/details/GlusterServersPage.java index c8b33f83..01766115 100644 --- a/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/details/GlusterServersPage.java +++ b/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/details/GlusterServersPage.java @@ -51,11 +51,11 @@ public class GlusterServersPage extends Composite { private GUIHelper guiHelper = GUIHelper.getInstance(); public enum GLUSTER_SERVER_TABLE_COLUMN_INDICES { - NAME, PREFERRED_NETWORK, IP_ADDRESSES, NUM_OF_CPUS, TOTAL_MEMORY, TOTAL_DISK_SPACE, STATUS + NAME, IP_ADDRESSES, NUM_OF_CPUS, TOTAL_MEMORY, TOTAL_DISK_SPACE, STATUS // Removed PREFERRED_NETWORK }; - private static final String[] GLUSTER_SERVER_TABLE_COLUMN_NAMES = new String[] { "Name", "Preferred\nNetwork", - "IP Address(es)", "Number\nof CPUs", "Total\nMemory (GB)", "Total Disk\n Space (GB)", "Status" }; + private static final String[] GLUSTER_SERVER_TABLE_COLUMN_NAMES = new String[] { "Name", + "IP Address(es)", "Number\nof CPUs", "Total\nMemory (GB)", "Total Disk\n Space (GB)", "Status" }; // Removed "Preferred\nNetwork", public GlusterServersPage(Composite parent, int style) { super(parent, style); @@ -112,7 +112,7 @@ public class GlusterServersPage extends Composite { setColumnProperties(table, GLUSTER_SERVER_TABLE_COLUMN_INDICES.NAME, SWT.CENTER, 100); setColumnProperties(table, GLUSTER_SERVER_TABLE_COLUMN_INDICES.STATUS, SWT.CENTER, 70); - setColumnProperties(table, GLUSTER_SERVER_TABLE_COLUMN_INDICES.PREFERRED_NETWORK, SWT.CENTER, 90); + // setColumnProperties(table, GLUSTER_SERVER_TABLE_COLUMN_INDICES.PREFERRED_NETWORK, SWT.CENTER, 90); setColumnProperties(table, GLUSTER_SERVER_TABLE_COLUMN_INDICES.NUM_OF_CPUS, SWT.CENTER, 90); //setColumnProperties(table, SERVER_DISK_TABLE_COLUMN_INDICES.CPU_USAGE, SWT.CENTER, 90); setColumnProperties(table, GLUSTER_SERVER_TABLE_COLUMN_INDICES.TOTAL_MEMORY, SWT.CENTER, 90); diff --git a/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/details/tabcreators/GlusterServerTabCreator.java b/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/details/tabcreators/GlusterServerTabCreator.java index 4f97290d..e1aa59ff 100644 --- a/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/details/tabcreators/GlusterServerTabCreator.java +++ b/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/details/tabcreators/GlusterServerTabCreator.java @@ -58,18 +58,18 @@ import com.richclientgui.toolbox.gauges.CoolGauge; public class GlusterServerTabCreator implements TabCreator { public enum NETWORK_INTERFACE_TABLE_COLUMN_INDICES { - INTERFACE, IP_ADDRESS, NETMASK, GATEWAY, PREFERRED + INTERFACE, IP_ADDRESS, NETMASK, GATEWAY }; private static final String[] NETWORK_INTERFACE_TABLE_COLUMN_NAMES = { "Interface", "IP Address", "Netmask", - "Gateway", "Preferred?" }; + "Gateway" }; private static final GUIHelper guiHelper = GUIHelper.getInstance(); private void createServerSummarySection(GlusterServer server, FormToolkit toolkit, final ScrolledForm form) { Composite section = guiHelper.createSection(form, toolkit, "Summary", null, 2, false); - toolkit.createLabel(section, "Preferred Network: ", SWT.NONE); - toolkit.createLabel(section, server.getPreferredNetworkInterface().getName(), SWT.NONE); +// toolkit.createLabel(section, "Preferred Network: ", SWT.NONE); +// toolkit.createLabel(section, server.getPreferredNetworkInterface().getName(), SWT.NONE); boolean online = server.getStatus() == SERVER_STATUS.ONLINE; @@ -171,7 +171,7 @@ public class GlusterServerTabCreator implements TabCreator { setColumnProperties(table, NETWORK_INTERFACE_TABLE_COLUMN_INDICES.IP_ADDRESS, SWT.CENTER, 100); setColumnProperties(table, NETWORK_INTERFACE_TABLE_COLUMN_INDICES.NETMASK, SWT.CENTER, 70); setColumnProperties(table, NETWORK_INTERFACE_TABLE_COLUMN_INDICES.GATEWAY, SWT.CENTER, 70); - setColumnProperties(table, NETWORK_INTERFACE_TABLE_COLUMN_INDICES.PREFERRED, SWT.CENTER, 70); + // setColumnProperties(table, NETWORK_INTERFACE_TABLE_COLUMN_INDICES.PREFERRED, SWT.CENTER, 70); } /** @@ -217,19 +217,19 @@ public class GlusterServerTabCreator implements TabCreator { private Composite createNetworkInterfacesSection(GlusterServer server, FormToolkit toolkit, ScrolledForm form) { final Composite section = guiHelper.createSection(form, toolkit, "Network Interfaces", null, 1, false); createNetworkInterfacesTableViewer(createTableViewerComposite(section), server); - Hyperlink changePreferredNetworkLink = toolkit.createHyperlink(section, "Change Preferred Network", SWT.NONE); - changePreferredNetworkLink.addHyperlinkListener(new HyperlinkAdapter() { - - @Override - public void linkActivated(HyperlinkEvent e) { - new MessageDialog( - section.getShell(), - "Gluster Storage Platform", - guiHelper.getImage(IImageKeys.SERVER), - "This will show additional controls to help user choose a new network interface. TO BE IMPLEMENTED.", - MessageDialog.INFORMATION, new String[] { "OK" }, 0).open(); - } - }); +// Hyperlink changePreferredNetworkLink = toolkit.createHyperlink(section, "Change Preferred Network", SWT.NONE); +// changePreferredNetworkLink.addHyperlinkListener(new HyperlinkAdapter() { +// +// @Override +// public void linkActivated(HyperlinkEvent e) { +// new MessageDialog( +// section.getShell(), +// "Gluster Storage Platform", +// guiHelper.getImage(IImageKeys.SERVER), +// "This will show additional controls to help user choose a new network interface. TO BE IMPLEMENTED.", +// MessageDialog.INFORMATION, new String[] { "OK" }, 0).open(); +// } +// }); return section; } diff --git a/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/GlusterServersResource.java b/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/GlusterServersResource.java index 55a7725e..6204bf9b 100644 --- a/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/GlusterServersResource.java +++ b/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/GlusterServersResource.java @@ -53,7 +53,7 @@ public class GlusterServersResource extends AbstractServersResource { for (GlusterServer server : glusterServers) { if (server.getStatus() == SERVER_STATUS.ONLINE) { fetchServerDetails(server); - server.setPreferredNetworkInterface(server.getNetworkInterfaces().get(0)); + // server.setPreferredNetworkInterface(server.getNetworkInterfaces().get(0)); } } return glusterServers; @@ -71,7 +71,7 @@ public class GlusterServersResource extends AbstractServersResource { public GlusterServer getGlusterServer(@PathParam("serverName") String serverName) { GlusterServer server = new GlusterServer(serverName); fetchServerDetails(server); - server.setPreferredNetworkInterface(server.getNetworkInterfaces().get(0)); + // server.setPreferredNetworkInterface(server.getNetworkInterfaces().get(0)); server.setStatus(SERVER_STATUS.ONLINE); return server; } |