Martin Sivák has uploaded a new change for review. Change subject: core: Remove support for ib700 watchdog ......................................................................
core: Remove support for ib700 watchdog This watchdog is no longer supported as it is an ISA device. Change-Id: I83242f3ccd7c2fc6ed7c4321ecaa89fca0140093 Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1014531 Signed-off-by: Martin Sivak <[email protected]> --- M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmWatchdogType.java M backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/model/WatchdogModel.java M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendWatchdogsResourceTest.java M backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/WatchdogMapper.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 6 files changed, 5 insertions(+), 12 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/33/20933/1 diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmWatchdogType.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmWatchdogType.java index 68fdefa..408aa4f 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmWatchdogType.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmWatchdogType.java @@ -1,8 +1,8 @@ package org.ovirt.engine.core.common.businessentities; public enum VmWatchdogType { - i6300esb, - ib700; + i6300esb; + public static VmWatchdogType getByName(String name) { if (name == null || name.length() == 0) { return null; diff --git a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/model/WatchdogModel.java b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/model/WatchdogModel.java index 553abf7..f5eecd1 100644 --- a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/model/WatchdogModel.java +++ b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/model/WatchdogModel.java @@ -3,8 +3,8 @@ import org.apache.commons.lang.StringUtils; public enum WatchdogModel { - I6300ESB, - IB700; + I6300ESB; + public String value() { return this.name().toLowerCase(); } diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendWatchdogsResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendWatchdogsResourceTest.java index 7f9a414..52b19e1 100644 --- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendWatchdogsResourceTest.java +++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendWatchdogsResourceTest.java @@ -106,7 +106,7 @@ private WatchDog getModel(int i) { WatchDog watchDog = new WatchDog(); watchDog.setAction(WatchdogAction.RESET.name().toLowerCase()); - watchDog.setModel(WatchdogModel.IB700.name().toLowerCase()); + watchDog.setModel(WatchdogModel.I6300ESB.name().toLowerCase()); watchDog.setId(PARENT_ID.toString()); return watchDog; } diff --git a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/WatchdogMapper.java b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/WatchdogMapper.java index 3de1a80..a971f87 100644 --- a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/WatchdogMapper.java +++ b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/WatchdogMapper.java @@ -89,8 +89,6 @@ switch (model) { case I6300ESB: return VmWatchdogType.i6300esb; - case IB700: - return VmWatchdogType.ib700; default: return null; } @@ -101,8 +99,6 @@ switch (model) { case i6300esb: return WatchdogModel.I6300ESB; - case ib700: - return WatchdogModel.IB700; default: return null; } 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 1abb917..1ba3fef 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 @@ -795,8 +795,6 @@ String VmWatchdogType___i6300esb(); - String VmWatchdogType___ib700(); - String VmWatchdogAction___NONE(); String VmWatchdogAction___RESET(); 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 e823ed8..37fd2ab 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 @@ -395,7 +395,6 @@ GlusterServiceStatus___NOT_AVAILABLE=Not Installed GlusterServiceStatus___UNKNOWN=Unknown VmWatchdogType___i6300esb=i6300esb -VmWatchdogType___ib700=ib700 VmWatchdogAction___NONE=none VmWatchdogAction___RESET=reset VmWatchdogAction___POWEROFF=poweroff -- To view, visit http://gerrit.ovirt.org/20933 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I83242f3ccd7c2fc6ed7c4321ecaa89fca0140093 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.3 Gerrit-Owner: Martin Sivák <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
