[Engine-patches] Change in ovirt-engine[master]: restapi: remote-viewer version check

[tjelinek]

Tomas Jelinek has uploaded a new change for review.

Change subject: restapi: remote-viewer version check
......................................................................

restapi: remote-viewer version check

Change-Id: I0b3fe2dfa3e254968dc7d14e82497dec7005bd15
Signed-off-by: Tomas Jelinek <tjeli...@redhat.com>
---
M 
backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmGraphicsConsoleResource.java
1 file changed, 15 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/48/41948/1

diff --git 
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmGraphicsConsoleResource.java
 
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmGraphicsConsoleResource.java
index 14bf067..5777d68 100644
--- 
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmGraphicsConsoleResource.java
+++ 
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmGraphicsConsoleResource.java
@@ -6,6 +6,7 @@
 import org.ovirt.engine.api.resource.VmGraphicsConsoleResource;
 import org.ovirt.engine.api.resource.VmGraphicsConsolesResource;
 import org.ovirt.engine.api.restapi.utils.HexUtils;
+import org.ovirt.engine.core.branding.BrandingManager;
 import org.ovirt.engine.core.common.console.ConsoleOptions;
 import org.ovirt.engine.core.common.queries.ConfigureConsoleOptionsParams;
 import org.ovirt.engine.core.common.queries.ConsoleOptionsParams;
@@ -14,6 +15,9 @@
 
 import javax.ws.rs.WebApplicationException;
 import javax.ws.rs.core.Response;
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URL;
 import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.List;
@@ -61,8 +65,18 @@
 
         ConsoleOptions consoleOptions = new ConsoleOptions(graphicsType);
         consoleOptions.setVmId(vmGuid);
+        ConfigureConsoleOptionsParams queryParams = new 
ConfigureConsoleOptionsParams(consoleOptions, true);
+        try {
+            URI baseUri = getUriInfo().getBaseUri();
+            URL engineBaseUrl = new URL(baseUri.getScheme(), 
baseUri.getHost(), baseUri.getPort(), "");
+            queryParams.setEngineBaseUrl(engineBaseUrl.toString());
+        } catch (MalformedURLException e) {
+            // just don't pass it
+        }
+        
queryParams.setConsoleClientResourcesUrl(BrandingManager.getInstance().getMessage("obrand.common.console_client_resources_url"));
+
         ConsoleOptions configuredOptions = 
runQuery(VdcQueryType.ConfigureConsoleOptions,
-                new ConfigureConsoleOptionsParams(consoleOptions, 
true)).getReturnValue();
+                queryParams).getReturnValue();
 
         String descriptor = runQuery(VdcQueryType.GetConsoleDescriptorFile, 
new ConsoleOptionsParams(configuredOptions))
                 .getReturnValue();


-- 
To view, visit https://gerrit.ovirt.org/41948
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0b3fe2dfa3e254968dc7d14e82497dec7005bd15
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Tomas Jelinek <tjeli...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches