Ramesh N has uploaded a new change for review. Change subject: gluster: change the value in RaidType to String ......................................................................
gluster: change the value in RaidType to String Changing the type of value in RaidType to String from int. VDSM expects these values to be string instead of int. Change-Id: I84d2eaf3e20a81035740e313fdc101d373029011 Bug-Url: https://bugzilla.redhat.com/1215000 Signed-off-by: Ramesh Nachimuthu <rnach...@redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/CreateBrickCommand.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/CreateBrickCommandTest.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/RaidType.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/CreateBrickModel.java M frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/LocalizedEnums.java M frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/LocalizedEnums.properties M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/popup/gluster/CreateBrickPopupPresenterWidget.java 7 files changed, 31 insertions(+), 31 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/32/41532/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/CreateBrickCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/CreateBrickCommand.java index 2fbd2e6..0d305db 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/CreateBrickCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/CreateBrickCommand.java @@ -91,11 +91,11 @@ protected void executeCommand() { Map<String, Object> raidParams = new HashMap<>(); - if (!getParameters().getRaidType().equals(RaidType.None) - && !getParameters().getRaidType().equals(RaidType.Raid0)) { + if (!getParameters().getRaidType().equals(RaidType.NONE) + && !getParameters().getRaidType().equals(RaidType.RAID0)) { raidParams.put("type", getParameters().getRaidType().getValue()); //$NON-NLS-1$ raidParams.put("pdCount", getParameters().getNoOfPhysicalDisksInRaidVolume()); //$NON-NLS-1$ - raidParams.put("stripSize", getParameters().getStripeSize()); //$NON-NLS-1$ + raidParams.put("stripeSize", getParameters().getStripeSize()); //$NON-NLS-1$ } VDSReturnValue returnValue = runVdsCommand( diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/CreateBrickCommandTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/CreateBrickCommandTest.java index b000e56..b30846e 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/CreateBrickCommandTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/CreateBrickCommandTest.java @@ -60,7 +60,7 @@ cmd = spy(new CreateBrickCommand(new CreateBrickParameters(HOST_ID, "brick1", "/gluster-bricks/brick1", - RaidType.Raid0, + RaidType.RAID0, null, null, Arrays.asList(getStorageDevice("sda", null))))); prepareMocks(cmd, VDSStatus.Up); @@ -97,7 +97,7 @@ cmd = spy(new CreateBrickCommand(new CreateBrickParameters(HOST_ID, "brick1", "/gluster-bricks/brick1", - RaidType.Raid0, + RaidType.RAID0, null, null, Collections.EMPTY_LIST))); prepareMocks(cmd, VDSStatus.Up); @@ -111,7 +111,7 @@ cmd = spy(new CreateBrickCommand(new CreateBrickParameters(HOST_ID, "brick1", "/gluster-bricks/brick1", - RaidType.Raid0, + RaidType.RAID0, null, null, Arrays.asList(storageDevice)))); prepareMocks(cmd, VDSStatus.Up); @@ -127,7 +127,7 @@ cmd = spy(new CreateBrickCommand(new CreateBrickParameters(HOST_ID, "brick1", "/gluster-bricks/brick1", - RaidType.Raid0, + RaidType.RAID0, null, null, Arrays.asList(storageDevice1, storageDevice2)))); prepareMocks(cmd, VDSStatus.Up); diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/RaidType.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/RaidType.java index 1c9a3e1..f86fac1 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/RaidType.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/RaidType.java @@ -3,13 +3,13 @@ import java.util.HashMap; public enum RaidType { - None(-1), - Raid0(0), - Raid6(6), - Raid10(10); + NONE("-1"), + RAID0("0"), + RAID6("6"), + RAID10("10"); - private int intValue; - private static final HashMap<Integer, RaidType> mappings = new HashMap<Integer, RaidType>(); + private String value; + private static final HashMap<String, RaidType> mappings = new HashMap<String, RaidType>(); static { for (RaidType raidType : values()) { @@ -17,15 +17,15 @@ } } - private RaidType(int value) { - intValue = value; + private RaidType(String value) { + this.value = value; } - public int getValue() { - return intValue; + public String getValue() { + return value; } - public static RaidType forValue(int value) { + public static RaidType forValue(String value) { return mappings.get(value); } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/CreateBrickModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/CreateBrickModel.java index dd7e12c..95aed4f 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/CreateBrickModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/CreateBrickModel.java @@ -46,7 +46,7 @@ setDefaultMountFolder(new EntityModel<String>()); List<RaidType> list = Arrays.asList(RaidType.values()); getRaidTypeList().setItems(list); - getRaidTypeList().setSelectedItem(RaidType.None); + getRaidTypeList().setSelectedItem(RaidType.NONE); getNoOfPhysicalDisksInRaidVolume().setIsAvailable(false); getStripeSize().setIsAvailable(false); initSize(); @@ -71,8 +71,8 @@ getRaidTypeList().getSelectedItemChangedEvent().addListener(new IEventListener() { @Override public void eventRaised(Event ev, Object sender, EventArgs args) { - if (getRaidTypeList().getSelectedItem() != RaidType.None - && getRaidTypeList().getSelectedItem() != RaidType.Raid0) { + if (getRaidTypeList().getSelectedItem() != RaidType.NONE + && getRaidTypeList().getSelectedItem() != RaidType.RAID0) { getNoOfPhysicalDisksInRaidVolume().setIsAvailable(true); getStripeSize().setIsAvailable(true); } else { diff --git a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/LocalizedEnums.java b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/LocalizedEnums.java index 1c83469..ab7b503 100644 --- a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/LocalizedEnums.java +++ b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/LocalizedEnums.java @@ -996,13 +996,13 @@ String GlusterServiceStatus___UNKNOWN(); - String RaidType___None(); + String RaidType___NONE(); - String RaidType___Raid0(); + String RaidType___RAID0(); - String RaidType___Raid6(); + String RaidType___RAID6(); - String RaidType___Raid10(); + String RaidType___RAID10(); String VmWatchdogType___i6300esb(); diff --git a/frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/LocalizedEnums.properties b/frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/LocalizedEnums.properties index 10a4218..4bb6682 100644 --- a/frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/LocalizedEnums.properties +++ b/frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/LocalizedEnums.properties @@ -498,10 +498,10 @@ GlusterServiceStatus___MIXED=Partially Up GlusterServiceStatus___NOT_AVAILABLE=Not Installed GlusterServiceStatus___UNKNOWN=Unknown -RaidType___None=None -RaidType___Raid0=Raid0 -RaidType___Raid6=Raid6 -RaidType___Raid10=Raid10 +RaidType___NONE=None +RaidType___RAID0=RAID 0 +RaidType___RAID6=RAID 6 +RaidType___RAID10=RAID 10 VmWatchdogType___i6300esb=i6300esb VmWatchdogAction___NONE=none VmWatchdogAction___RESET=reset diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/popup/gluster/CreateBrickPopupPresenterWidget.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/popup/gluster/CreateBrickPopupPresenterWidget.java index d7e421d..52710ca 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/popup/gluster/CreateBrickPopupPresenterWidget.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/popup/gluster/CreateBrickPopupPresenterWidget.java @@ -33,8 +33,8 @@ EventArgs args) { String propName = ((PropertyChangedEventArgs) args).propertyName; if ("raidTypeChanged".equals(propName)) { //$NON-NLS-1$ - if (model.getRaidTypeList().getSelectedItem() != RaidType.None - && model.getRaidTypeList().getSelectedItem() != RaidType.Raid0) { + if (model.getRaidTypeList().getSelectedItem() != RaidType.NONE + && model.getRaidTypeList().getSelectedItem() != RaidType.RAID0) { getView().setDeviceInfoText(model.getRaidTypeList().getSelectedItem().name()); getView().setDeviceInfoVisibility(true); } else { -- To view, visit https://gerrit.ovirt.org/41532 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I84d2eaf3e20a81035740e313fdc101d373029011 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.5-gluster Gerrit-Owner: Ramesh N <rnach...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
