Oved Ourfali has uploaded a new change for review. Change subject: rest: Support filtered capabilities (#868949) ......................................................................
rest: Support filtered capabilities (#868949) https://bugzilla.redhat.com/868949 Several config parameters aren't exposed to users (as they aren't relevant). These are used in the capabilities resource. Changing the generation of the capabilities response to not contain these values. Also, exposing the cluster levels, as they may be relevant for users as well. Finally, removing the enable local storage test, as it is always enabled in 3.1. Change-Id: I549e680226f0d802872915b8a46c9e5a8c322b44 Signed-off-by: Oved Ourfali <[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 2 files changed, 10 insertions(+), 14 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/64/8764/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 a25afea..52a85f7 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 @@ -62,7 +62,7 @@ SupportCustomProperties(ConfigAuthType.User), VdsFenceOptionTypes, ServerCPUList, - SupportedClusterLevels, + SupportedClusterLevels(ConfigAuthType.User), ProductRPMVersion(ConfigAuthType.User), RhevhLocalFSPath, CustomPublicConfig_AppsWebSite(ConfigAuthType.User), 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 4c89644..4113983 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 @@ -139,14 +139,16 @@ version.setCpus(new CPUs()); - for (ServerCpu sc : getServerCpuList(v)) { - CPU cpu = new CPU(); - cpu.setId(sc.getCpuName()); - cpu.setLevel(sc.getLevel()); - version.getCpus().getCPUs().add(cpu); + if (!isFiltered()) { + for (ServerCpu sc : getServerCpuList(v)) { + CPU cpu = new CPU(); + cpu.setId(sc.getCpuName()); + cpu.setLevel(sc.getLevel()); + version.getCpus().getCPUs().add(cpu); + } + addPowerManagers(version, getPowerManagers(v)); } - addPowerManagers(version, getPowerManagers(v)); addVmTypes(version, VmType.values()); addStorageTypes(version, getStorageTypes(v)); addStorageDomainTypes(version, StorageDomainType.values()); @@ -359,17 +361,11 @@ ret.add(StorageType.ISCSI); ret.add(StorageType.FCP); ret.add(StorageType.NFS); - if (localStorageEnabled(version)) { - ret.add(StorageType.LOCALFS); - } + ret.add(StorageType.LOCALFS); if (VersionUtils.greaterOrEqual(version, VERSION_3_1)) { ret.add(StorageType.POSIXFS); } return ret; - } - - private boolean localStorageEnabled(Version version) { - return getConfigurationValue(Boolean.class, ConfigurationValues.LocalStorageEnabled, version); } private List<CustomProperty> getVmHooksEnvs(Version version) { -- To view, visit http://gerrit.ovirt.org/8764 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I549e680226f0d802872915b8a46c9e5a8c322b44 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Oved Ourfali <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
