Yair Zaslavsky has uploaded a new change for review. Change subject: api: Fixing RSDL issue ......................................................................
api: Fixing RSDL issue Master was broken and gluster's RSDL was returned also in "virt only" and "all" modes. This patch fixes the issues Change-Id: I03f836e0784ce3a1b86fd7fc410acf07f4d5c8e1 Signed-off-by: Yair Zaslavsky <[email protected]> --- M backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/rsdl/RsdlManager.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/security/auth/SessionProcessor.java 2 files changed, 5 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/28/28628/1 diff --git a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/rsdl/RsdlManager.java b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/rsdl/RsdlManager.java index d8d9811..f770d62 100644 --- a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/rsdl/RsdlManager.java +++ b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/rsdl/RsdlManager.java @@ -70,8 +70,8 @@ public static RSDL loadRsdl(ApplicationMode applicationMode) throws IOException { String fileName = - applicationMode == ApplicationMode.AllModes ? ("/" + RsdlIOManager.RSDL_RESOURCE_NAME) - : ("/" + RsdlIOManager.GLUSTER_RSDL_RESOURCE_NAME); + applicationMode == ApplicationMode.GlusterOnly ? ("/" + RsdlIOManager.GLUSTER_RSDL_RESOURCE_NAME) + : ("/" + RsdlIOManager.RSDL_RESOURCE_NAME); InputStream rsdlAsStrem = null; try { rsdlAsStrem = RsdlIOManager.loadAsStream(fileName); diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/security/auth/SessionProcessor.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/security/auth/SessionProcessor.java index 5534c90..7061103 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/security/auth/SessionProcessor.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/security/auth/SessionProcessor.java @@ -17,6 +17,7 @@ import org.ovirt.engine.core.common.config.ConfigCommon; import org.ovirt.engine.core.common.constants.SessionConstants; import org.ovirt.engine.core.common.interfaces.BackendLocal; +import org.ovirt.engine.core.common.mode.ApplicationMode; import org.ovirt.engine.core.common.queries.ConfigurationValues; import org.ovirt.engine.core.common.queries.GetConfigurationValueParameters; import org.ovirt.engine.core.common.queries.GetValueBySessionQueryParameters; @@ -59,9 +60,9 @@ this.request = request; sessionHelper.setSessionId(engineSessionId); - current.set(backend.runPublicQuery(VdcQueryType.GetConfigurationValue, + current.set(ApplicationMode.from((Integer) backend.runPublicQuery(VdcQueryType.GetConfigurationValue, new GetConfigurationValueParameters(ConfigurationValues.ApplicationMode, - ConfigCommon.defaultConfigurationVersion))); + ConfigCommon.defaultConfigurationVersion)).getReturnValue())); current.set(backend.runPublicQuery( VdcQueryType.GetValueBySession, new GetValueBySessionQueryParameters(engineSessionId, "user") -- To view, visit http://gerrit.ovirt.org/28628 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I03f836e0784ce3a1b86fd7fc410acf07f4d5c8e1 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Yair Zaslavsky <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
