Roy Golan has uploaded a new change for review. Change subject: rest: use engine query for CPU caps parsing ......................................................................
rest: use engine query for CPU caps parsing Capabilities is parsing the engine's config value for CPU list which is redundant as this is handled in GetAllServerCpuListQuery Change-Id: I768f444f4ac6e5ee37ccba191d0588f00b8e3a44 Signed-off-by: Roy Golan <[email protected]> --- M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/ConfigurationValues.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendCapabilitiesResource.java M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendCapabilitiesResourceTest.java M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendCapabilityResourceTest.java 4 files changed, 9 insertions(+), 33 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/10/20610/1 diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/ConfigurationValues.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/ConfigurationValues.java index 77f9381..caf644f 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/ConfigurationValues.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/ConfigurationValues.java @@ -60,7 +60,6 @@ UserDefinedVMProperties(ConfigAuthType.User), PredefinedVMProperties(ConfigAuthType.User), VdsFenceOptionTypes, - ServerCPUList, SupportedClusterLevels(ConfigAuthType.User), OvfUpdateIntervalInMinutes, OvfItemsCountPerUpdate, diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendCapabilitiesResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendCapabilitiesResource.java index 4c228d1..5fd3c84 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendCapabilitiesResource.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendCapabilitiesResource.java @@ -72,6 +72,8 @@ import org.ovirt.engine.api.model.SchedulingPolicyType; import org.ovirt.engine.api.model.ScsiGenericIO; import org.ovirt.engine.api.model.ScsiGenericIoOptions; +import org.ovirt.engine.api.model.SnapshotStatus; +import org.ovirt.engine.api.model.SnapshotStatuses; import org.ovirt.engine.api.model.Stages; import org.ovirt.engine.api.model.StepEnum; import org.ovirt.engine.api.model.StepTypes; @@ -98,8 +100,6 @@ import org.ovirt.engine.api.model.VmStatus; import org.ovirt.engine.api.model.VmType; import org.ovirt.engine.api.model.VmTypes; -import org.ovirt.engine.api.model.SnapshotStatus; -import org.ovirt.engine.api.model.SnapshotStatuses; import org.ovirt.engine.api.model.WatchdogAction; import org.ovirt.engine.api.model.WatchdogActions; import org.ovirt.engine.api.model.WatchdogModel; @@ -113,7 +113,6 @@ import org.ovirt.engine.api.restapi.types.MappingLocator; import org.ovirt.engine.api.restapi.types.NetworkUsage; import org.ovirt.engine.api.restapi.util.FenceOptionsParser; -import org.ovirt.engine.api.restapi.util.ServerCpuParser; import org.ovirt.engine.api.restapi.util.VersionHelper; import org.ovirt.engine.api.restapi.utils.CustomPropertiesParser; import org.ovirt.engine.api.restapi.utils.VersionUtils; @@ -121,6 +120,9 @@ import org.ovirt.engine.core.common.businessentities.ServerCpu; import org.ovirt.engine.core.common.businessentities.VmPauseStatus; import org.ovirt.engine.core.common.queries.ConfigurationValues; +import org.ovirt.engine.core.common.queries.GetAllServerCpuListParameters; +import org.ovirt.engine.core.common.queries.VdcQueryReturnValue; +import org.ovirt.engine.core.common.queries.VdcQueryType; import org.ovirt.engine.core.compat.Guid; public class BackendCapabilitiesResource extends BackendResource implements CapabilitiesResource { @@ -181,7 +183,10 @@ // Not exposing CPU list and power managers on filtered queries if (!isFiltered()) { version.setCpus(new CPUs()); - for (ServerCpu sc : getServerCpuList(v)) { + VdcQueryReturnValue vdcQueryReturnValue = + runQuery(VdcQueryType.GetAllServerCpuList, + new GetAllServerCpuListParameters(new org.ovirt.engine.core.compat.Version(asString(v)))); + for (ServerCpu sc : (List<ServerCpu>)vdcQueryReturnValue.getReturnValue()) { CPU cpu = new CPU(); cpu.setId(sc.getCpuName()); cpu.setLevel(sc.getLevel()); @@ -525,10 +530,6 @@ ret.addAll(CustomPropertiesParser.parse(getConfigurationValue(String.class, ConfigurationValues.PredefinedVMProperties, version), true)); ret.addAll(CustomPropertiesParser.parse(getConfigurationValue(String.class, ConfigurationValues.UserDefinedVMProperties, version), true)); return ret; - } - - private List<ServerCpu> getServerCpuList(Version version) { - return ServerCpuParser.parseCpus(getConfigurationValue(String.class, ConfigurationValues.ServerCPUList, version)); } public List<Version> getSupportedClusterLevels() { diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendCapabilitiesResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendCapabilitiesResourceTest.java index 34e53b1..bd0f39f 100644 --- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendCapabilitiesResourceTest.java +++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendCapabilitiesResourceTest.java @@ -85,18 +85,6 @@ setUpGetEntityExpectations(VdcQueryType.GetConfigurationValue, GetConfigurationValueParameters.class, new String[] { "Version", "ConfigValue" }, - new Object[] { "1.5", ConfigurationValues.ServerCPUList }, - "0:bar:0:foo"); - - setUpGetEntityExpectations(VdcQueryType.GetConfigurationValue, - GetConfigurationValueParameters.class, - new String[] { "Version", "ConfigValue" }, - new Object[] { "10.3", ConfigurationValues.ServerCPUList }, - "15:foo:1,2,3:bar"); - - setUpGetEntityExpectations(VdcQueryType.GetConfigurationValue, - GetConfigurationValueParameters.class, - new String[] { "Version", "ConfigValue" }, new Object[] { "1.5", ConfigurationValues.VdsFenceOptionMapping }, "foo:one=1,two=2"); diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendCapabilityResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendCapabilityResourceTest.java index 736e866..636a7da 100644 --- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendCapabilityResourceTest.java +++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendCapabilityResourceTest.java @@ -88,18 +88,6 @@ setUpGetEntityExpectations(VdcQueryType.GetConfigurationValue, GetConfigurationValueParameters.class, new String[] { "Version", "ConfigValue" }, - new Object[] { "1.5", ConfigurationValues.ServerCPUList }, - "0:bar:0:foo"); - - setUpGetEntityExpectations(VdcQueryType.GetConfigurationValue, - GetConfigurationValueParameters.class, - new String[] { "Version", "ConfigValue" }, - new Object[] { "10.3", ConfigurationValues.ServerCPUList }, - "15:foo:1,2,3:bar"); - - setUpGetEntityExpectations(VdcQueryType.GetConfigurationValue, - GetConfigurationValueParameters.class, - new String[] { "Version", "ConfigValue" }, new Object[] { "1.5", ConfigurationValues.VdsFenceOptionMapping }, "foo:one=1,two=2"); -- To view, visit http://gerrit.ovirt.org/20610 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I768f444f4ac6e5ee37ccba191d0588f00b8e3a44 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Roy Golan <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
