Story:#15 task:#81 Intergrate interface changes in the server, model and UI

6 files changed, 76 insertions, 40 deletions

diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/constants/CoreConstants.java b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/constants/CoreConstants.java
index b5e25ce7..85a84c4a 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/constants/CoreConstants.java
+++ b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/constants/CoreConstants.java
@@ -31,4 +31,5 @@ public class CoreConstants {
 	public static final String DATE_WITH_TIME_FORMAT = "MM/dd/yyyy HH:mm:ss";
 	public static final String PURE_DATE_FORMAT = "MM/dd/yyyy";
 	public static final String PURE_TIME_FORMAT = "HH:mm:ss.SSS";
+	public static final String NA = "NA";
 }
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Disk.java b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Disk.java
index 9924d596..9acd3d71 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Disk.java
+++ b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Disk.java
@@ -26,10 +26,10 @@ import com.gluster.storage.management.core.utils.StringUtil;
 @XmlRootElement(name="Disk")
 public class Disk extends Entity {
 	public enum DISK_STATUS {
-		READY, UNINITIALIZED, INITIALIZING, OFFLINE
+		READY, UNINITIALIZED, INITIALIZING, IO_ERROR
 	};
 
-	private String[] DISK_STATUS_STR = { "Ready", "Uninitialized", "Initializing", "Offline" };
+	private String[] DISK_STATUS_STR = { "Ready", "Uninitialized", "Initializing", "I/O Error" };
 
 	private String serverName;
 	private Double space;
@@ -52,8 +52,8 @@ public class Disk extends Entity {
 		return getStatus() == DISK_STATUS.UNINITIALIZED;
 	}
 	
-	public boolean isOffline() {
-		return getStatus() == DISK_STATUS.OFFLINE;
+	public boolean hasErrors() {
+		return getStatus() == DISK_STATUS.IO_ERROR;
 	}
 	
 	public boolean isReady() {
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/GlusterDummyModel.java b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/GlusterDummyModel.java
index 09137014..af90b574 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/GlusterDummyModel.java
+++ b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/GlusterDummyModel.java
@@ -56,16 +56,15 @@ public class GlusterDummyModel {
 			double memoryInUse) {
 		GlusterServer glusterServer = new GlusterServer(name, parent, status, numOfCPUs, cpuUsage, totalMemory,
 				memoryInUse);
-		NetworkInterface networkInterface = addNetworkInterface(glusterServer, interfaceName);	// Renamed preferredInterfaceName to interfaceName
-		// glusterServer.setPreferredNetworkInterface(networkInterface);
+		NetworkInterface networkInterface = addNetworkInterface(glusterServer, interfaceName); 
 
 		servers.add(glusterServer);
 		return glusterServer;
 	}
 
 	private NetworkInterface addNetworkInterface(Server server, String interfaceName) {
-		NetworkInterface networkInterface = new NetworkInterface(interfaceName, server, "192.168.1."
-				+ Math.round(Math.random() * 255), "255.255.255.0", "192.168.1.1");
+		NetworkInterface networkInterface = new NetworkInterface(interfaceName, server, "00:00:00:00", "IPV6-IN-IPV4",
+				"1000MB/S", "192.168.1." + Math.round(Math.random() * 255), "255.255.255.0", "192.168.1.1");
 		server.setNetworkInterfaces(Arrays.asList(new NetworkInterface[] { networkInterface }));
 		return networkInterface;
 	}
@@ -148,7 +147,7 @@ public class GlusterDummyModel {
 		s2dc = new Disk(server2, "sdc", 200d, -1d, DISK_STATUS.UNINITIALIZED);
 		s2dd = new Disk(server2, "sdd", 200d, 124.89, DISK_STATUS.READY);
 
-		s3da = new Disk(server3, "NA", -1d, -1d, DISK_STATUS.OFFLINE); // disk name unavailable since server is offline
+		s3da = new Disk(server3, "NA", -1d, -1d, DISK_STATUS.IO_ERROR); // disk name unavailable since server is offline
 
 		s4da = new Disk(server4, "sda", 100d, 85.39, DISK_STATUS.READY);
 
@@ -245,29 +244,29 @@ public class GlusterDummyModel {
 	public static List<LogMessage> getDummyLogMessages() {
 		return logMessages;
 	}
-	
+
 	public Disk getVolumeDisk(String volumeDisk) {
 		List<Disk> allDisks = getReadyDisksOfAllServers();
 		String brickInfo[] = volumeDisk.split(":");
-		for( Disk disk: allDisks) {
+		for (Disk disk : allDisks) {
 			if (disk.getServerName() == brickInfo[0] && disk.getName() == brickInfo[1]) {
 				return disk;
 			}
 		}
 		return null;
 	}
-	
+
 	public List<Disk> getReadyDisksOfVolume(Volume volume) {
-//		List<Disk> disks = new ArrayList<Disk>();
-//		for (Disk disk : volume.getDisks()) {
-//			if (disk.isReady()) {
-//				disks.add(disk);
-//			}
-//		}
-//		return disks;
+		// List<Disk> disks = new ArrayList<Disk>();
+		// for (Disk disk : volume.getDisks()) {
+		// if (disk.isReady()) {
+		// disks.add(disk);
+		// }
+		// }
+		// return disks;
 		Disk disk = null;
 		List<Disk> volumeDisks = new ArrayList<Disk>();
-		for (String volumeDisk : volume.getDisks() ) {
+		for (String volumeDisk : volume.getDisks()) {
 			disk = getVolumeDisk(volumeDisk);
 			if (disk != null && disk.isReady()) {
 				volumeDisks.add(disk);
@@ -290,7 +289,7 @@ public class GlusterDummyModel {
 
 	public List<Disk> getReadyDisksOfAllServersExcluding(List<Disk> excludeDisks) {
 		List<Disk> disks = new ArrayList<Disk>();
-		
+
 		for (Server server : ((Cluster) model.getChildren().get(0)).getServers()) {
 			for (Disk disk : server.getDisks()) {
 				if (disk.isReady() && !excludeDisks.contains(disk)) {
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/GlusterServer.java b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/GlusterServer.java
index fd4e58c9..c7748f9c 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/GlusterServer.java
+++ b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/GlusterServer.java
@@ -33,7 +33,6 @@ public class GlusterServer extends Server {
 
 	private String uuid;
 	private SERVER_STATUS status;
-	// private NetworkInterface preferredNetworkInterface;
 	private Cluster cluster;
 
 	public GlusterServer() {
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/NetworkInterface.java b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/NetworkInterface.java
index 882dfe09..c0521ef3 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/NetworkInterface.java
+++ b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/NetworkInterface.java
@@ -20,24 +20,29 @@ package com.gluster.storage.management.core.model;
 
 import javax.xml.bind.annotation.XmlRootElement;
 
-@XmlRootElement(name="networkInterface")
+@XmlRootElement(name = "networkInterface")
 public class NetworkInterface extends Entity {
+	private String hwAddr;
+	private String model;
+	private String speed;
 	private String ipAddress;
 	private String netMask;
 	private String defaultGateway;
-//	private boolean isPreferred;
-	
+
 	public NetworkInterface() {
-		
+
 	}
 	
-//	public boolean isPreferred() {
-//		return isPreferred;
-//	}
-//
-//	public void setPreferred(boolean isPreferred) {
-//		this.isPreferred = isPreferred;
-//	}
+	public NetworkInterface(String name, Entity parent, String hwAddr, String model, String speed, String ipAddress,
+			String netMask, String defaultGateway) {
+		super(name, parent);
+		setHwAddr(hwAddr);
+		setModel(model);
+		setSpeed(speed);
+		setIpAddress(ipAddress);
+		setNetMask(netMask);
+		setDefaultGateway(defaultGateway);
+	}
 
 	public String getIpAddress() {
 		return ipAddress;
@@ -63,11 +68,28 @@ public class NetworkInterface extends Entity {
 		this.defaultGateway = defaultGateway;
 	}
 
-	public NetworkInterface(String name, Entity parent, String ipAddress, String netMask, String defaultGateway) {
-		super(name, parent);
-		setIpAddress(ipAddress);
-		setNetMask(netMask);
-		setDefaultGateway(defaultGateway);
+	public String getHwAddr() {
+		return hwAddr;
 	}
-	
+
+	public void setHwAddr(String hwAddr) {
+		this.hwAddr = hwAddr;
+	}
+
+	public String getModel() {
+		return model;
+	}
+
+	public void setModel(String model) {
+		this.model = model;
+	}
+
+	public String getSpeed() {
+		return speed;
+	}
+
+	public void setSpeed(String speed) {
+		this.speed = speed;
+	}
+
 }
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Server.java b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Server.java
index 4f870eaf..256b9ec4 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Server.java
+++ b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Server.java
@@ -133,7 +133,7 @@ public class Server extends Entity {
 	}
 
 	public void addDisk(Disk disk) {
-		if (disks.add(disk)) {
+		if (disks.add(disk) && disk.isReady()) {
 			totalDiskSpace += disk.getSpace();
 			diskSpaceInUse += disk.getSpaceInUse();
 		}
@@ -180,4 +180,19 @@ public class Server extends Entity {
 	public boolean filter(String filterString, boolean caseSensitive) {
 		return StringUtil.filterString(getName() + getIpAddressesAsString(), filterString, caseSensitive);
 	}
+	
+	@SuppressWarnings("unchecked")
+	public void copyFrom(Server server) {
+		this.setName(server.getName());
+		this.setParent(server.getParent());
+		this.setChildren(( List<Entity>) server.getChildren());
+		this.setNetworkInterfaces(server.getNetworkInterfaces());
+		this.setNumOfCPUs(server.getNumOfCPUs());
+		this.setCpuUsage(server.getCpuUsage());
+		this.setTotalMemory(server.getTotalMemory());
+		this.setMemoryInUse(server.getMemoryInUse());
+		this.setTotalDiskSpace(server.getTotalDiskSpace());
+		this.setDiskSpaceInUse(server.getDiskSpaceInUse());
+		this.setDisks(server.getDisks());
+	}
 }