diff options
| author | Selvasundaram <selvam@gluster.com> | 2011-11-07 18:19:55 +0530 |
|---|---|---|
| committer | Selvasundaram <selvam@gluster.com> | 2011-11-07 18:25:41 +0530 |
| commit | 38a110a0b57108dee877fe0ad0f5cc55e10d11ef (patch) | |
| tree | 54d172adbe67025a7f771c37f9595b5ae5e8c228 | |
| parent | 3222bf63755b6e8f0685a84be999915c58b15f20 (diff) | |
Junit tests
2 files changed, 7 insertions, 2 deletions
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Device.java b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Device.java index b0121213..b0de9aa7 100644 --- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Device.java +++ b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Device.java @@ -214,11 +214,13 @@ public class Device extends Entity { public void copyFrom(Device newDevice) { setName(newDevice.getName()); + setParent(newDevice.getParent()); setMountPoint(newDevice.getMountPoint()); setServerName(newDevice.getServerName()); setStatus(newDevice.getStatus()); setFsType(newDevice.getFsType()); setType(newDevice.getType()); + setFsVersion(newDevice.getFsVersion()); setSpace(newDevice.getSpace()); setSpaceInUse(newDevice.getSpaceInUse()); } 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 4b159f37..93485926 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 @@ -117,8 +117,8 @@ public class Disk extends Device { Disk disk = (Disk)obj; - if (!(super.equals(obj) && getDescription().equals(disk.getDescription()) && getDiskInterface().equals( - disk.getDiskInterface()))) { + if (!(super.equals(obj) && getDescription().equals(disk.getDescription()) && (getDiskInterface() == disk.getDiskInterface() || getDiskInterface().equals( + disk.getDiskInterface()) ))) { return false; } @@ -145,6 +145,9 @@ public class Disk extends Device { public void copyFrom(Disk newDisk) { super.copyFrom(newDisk); setDescription(newDisk.getDescription()); + setDiskInterface(newDisk.getDiskInterface()); + setPartitions(newDisk.getPartitions()); + setRaidDisks(newDisk.getRaidDisks()); } @Override |