Michael Pasternak has uploaded a new change for review. Change subject: restapi: User login filter problem #848767 ......................................................................
restapi: User login filter problem #848767 $ curl -X GET -H "Filter: true" -u user@domain:pass http://url/api <fault> <reason>Operation Failed</reason> <detail>Entity not found: VdcVersion</detail> </fault> https://bugzilla.redhat.com/show_bug.cgi?id=848767 Change-Id: Ib7e8188f37f215b364a241cb446734af7522a590 Signed-off-by: Michael Pasternak <[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/BackendApiResource.java 2 files changed, 18 insertions(+), 17 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/18/7418/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 cdca3a9..7ac2988 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 @@ -5,7 +5,7 @@ MaxNumOfVmSockets(ConfigAuthType.User), MaxNumOfCpuPerSocket(ConfigAuthType.User), VirtualMachineDomainName, - VdcVersion, + VdcVersion(ConfigAuthType.User), // GetAllAdDomains, SSLEnabled(ConfigAuthType.User), CipherSuite(ConfigAuthType.User), diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendApiResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendApiResource.java index 56639fe..f61423d 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendApiResource.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendApiResource.java @@ -398,28 +398,29 @@ } private API addSummary(API api) { - HashMap<String, Integer> stats = getSystemStatistics(); + if (!isFiltered()) { + HashMap<String, Integer> stats = getSystemStatistics(); - ApiSummary summary = new ApiSummary(); + ApiSummary summary = new ApiSummary(); - summary.setVMs(new VMs()); - summary.getVMs().setTotal(get(stats, "total_vms")); - summary.getVMs().setActive(get(stats, "active_vms")); + summary.setVMs(new VMs()); + summary.getVMs().setTotal(get(stats, "total_vms")); + summary.getVMs().setActive(get(stats, "active_vms")); - summary.setHosts(new Hosts()); - summary.getHosts().setTotal(get(stats, "total_vds")); - summary.getHosts().setActive(get(stats, "active_vds")); + summary.setHosts(new Hosts()); + summary.getHosts().setTotal(get(stats, "total_vds")); + summary.getHosts().setActive(get(stats, "active_vds")); - summary.setUsers(new Users()); - summary.getUsers().setTotal(get(stats, "total_users")); - summary.getUsers().setActive(get(stats, "active_users")); + summary.setUsers(new Users()); + summary.getUsers().setTotal(get(stats, "total_users")); + summary.getUsers().setActive(get(stats, "active_users")); - summary.setStorageDomains(new StorageDomains()); - summary.getStorageDomains().setTotal(get(stats, "total_storage_domains")); - summary.getStorageDomains().setActive(get(stats, "active_storage_domains")); + summary.setStorageDomains(new StorageDomains()); + summary.getStorageDomains().setTotal(get(stats, "total_storage_domains")); + summary.getStorageDomains().setActive(get(stats, "active_storage_domains")); - api.setSummary(summary); - + api.setSummary(summary); + } return api; } -- To view, visit http://gerrit.ovirt.org/7418 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib7e8188f37f215b364a241cb446734af7522a590 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Michael Pasternak <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
