Allon Mureinik has uploaded a new change for review.
Change subject: core: Remove GetAgentFenceOptions2Query
......................................................................
core: Remove GetAgentFenceOptions2Query
GetAgentFenceOptionsQuery and GetAgentFenceOptions2Query are completely
identical except for the usage of different APIs of VdsFenceOptions.
Since GetAgentFenceOptions is not used anywhere, it is removed, and
GetAgentFenceOptions2 loses it "2" and get a name the better suits
conventions (not to mention common sense).
This patch includes:
1. Removing the old GetAgentFenceOptionsQuery class and renaming
GetAgentFenceOptions2Query to take its place.
2. Removing the old GetAgentFenceOptions constant in the VdsQueryTye
enum, and renaming GetAgentFenceOptions2 to take its place.
3. Clearing up the VdsFenceOptions class from methods with "2" in their
name - either by removing unused methods, or by renaming them to a
more sensible name.
Change-Id: Id2d7f15c16257f39f162b52d22f7c2faf8eb291a
Signed-off-by: Allon Mureinik <amure...@redhat.com>
---
D
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAgentFenceOptions2Query.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAgentFenceOptionsQuery.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/VdcQueryType.java
M
backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/queries/VdcQueryTypeTest.java
M
backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/pm/VdsFenceOptions.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java
6 files changed, 8 insertions(+), 44 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/06/13606/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAgentFenceOptions2Query.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAgentFenceOptions2Query.java
deleted file mode 100644
index a764fb9..0000000
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAgentFenceOptions2Query.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package org.ovirt.engine.core.bll;
-
-import java.util.HashMap;
-
-import org.ovirt.engine.core.common.queries.VdcQueryParametersBase;
-import org.ovirt.engine.core.utils.pm.VdsFenceOptions;
-
-public class GetAgentFenceOptions2Query<P extends VdcQueryParametersBase>
extends FenceQueryBase<P> {
-
- public GetAgentFenceOptions2Query(P parameters) {
- super(parameters);
- }
-
- @Override
- protected void executeQueryCommand() {
- VdsFenceOptions options = new VdsFenceOptions();
- HashMap<String, HashMap<String, String>> map =
options.getFencingOptionMappingMap2();
- getQueryReturnValue().setReturnValue(map);
- getQueryReturnValue().setSucceeded(map.size() > 0);
- }
-}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAgentFenceOptionsQuery.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAgentFenceOptionsQuery.java
index 92f88ee..040eb37 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAgentFenceOptionsQuery.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAgentFenceOptionsQuery.java
@@ -1,6 +1,7 @@
package org.ovirt.engine.core.bll;
-import org.ovirt.engine.core.common.queries.ValueObjectMap;
+import java.util.HashMap;
+
import org.ovirt.engine.core.common.queries.VdcQueryParametersBase;
import org.ovirt.engine.core.utils.pm.VdsFenceOptions;
@@ -13,8 +14,8 @@
@Override
protected void executeQueryCommand() {
VdsFenceOptions options = new VdsFenceOptions();
- ValueObjectMap map = options.getFencingOptionMappingMap();
+ HashMap<String, HashMap<String, String>> map =
options.getFencingOptionMappingMap();
getQueryReturnValue().setReturnValue(map);
- getQueryReturnValue().setSucceeded(map.asMap().size() > 0);
+ getQueryReturnValue().setSucceeded(map.size() > 0);
}
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/VdcQueryType.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/VdcQueryType.java
index bfa0144..7e3bbee 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/VdcQueryType.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/VdcQueryType.java
@@ -24,7 +24,6 @@
GetVdsFenceStatus,
GetNewVdsFenceStatus,
GetAgentFenceOptions,
- GetAgentFenceOptions2,
GetAllChildVlanInterfaces,
GetAllSiblingVlanInterfaces,
GetVlanParent,
diff --git
a/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/queries/VdcQueryTypeTest.java
b/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/queries/VdcQueryTypeTest.java
index acb1184..b4620c5 100644
---
a/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/queries/VdcQueryTypeTest.java
+++
b/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/queries/VdcQueryTypeTest.java
@@ -12,8 +12,8 @@
@Test
public void testForValue() {
assertEquals("wrong value",
-
VdcQueryType.forValue(VdcQueryType.GetAgentFenceOptions2.getValue()),
- VdcQueryType.GetAgentFenceOptions2);
+
VdcQueryType.forValue(VdcQueryType.GetAgentFenceOptions.getValue()),
+ VdcQueryType.GetAgentFenceOptions);
}
@Test
diff --git
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/pm/VdsFenceOptions.java
b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/pm/VdsFenceOptions.java
index d7a283a..db4f782 100644
---
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/pm/VdsFenceOptions.java
+++
b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/pm/VdsFenceOptions.java
@@ -73,23 +73,8 @@
fencingAgentInstanceOptions = (value != null) ? new HashMap<String,
String>(value.asMap()) : null;
}
- public ValueObjectMap getFencingOptionMappingMap() {
- return new ValueObjectMap(fencingOptionMapping, true);
- }
-
- @SuppressWarnings("unchecked")
- public void setFencingOptionMappingMap(ValueObjectMap value) {
- fencingOptionMapping = (value != null) ? new HashMap<String,
HashMap<String, String>>(
- value.asMap())
- : null;
- }
-
- public HashMap<String, HashMap<String, String>>
getFencingOptionMappingMap2() {
+ public HashMap<String, HashMap<String, String>>
getFencingOptionMappingMap() {
return fencingOptionMapping;
- }
-
- public void setFencingOptionMappingMap2(HashMap<String, HashMap<String,
String>> value) {
- fencingOptionMapping = value;
}
public ValueObjectMap getFencingOptionTypesMap() {
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java
index 101fdc4..8a18aa0 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java
@@ -1495,7 +1495,7 @@
}
};
aQuery.setData(new Object[] { pmType });
- Frontend.RunQuery(VdcQueryType.GetAgentFenceOptions2, new
VdcQueryParametersBase(), aQuery);
+ Frontend.RunQuery(VdcQueryType.GetAgentFenceOptions, new
VdcQueryParametersBase(), aQuery);
}
public static void GetNetworkList(AsyncQuery aQuery, Guid dataCenterId) {
--
To view, visit http://gerrit.ovirt.org/13606
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id2d7f15c16257f39f162b52d22f7c2faf8eb291a
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Allon Mureinik <amure...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
