[Engine-patches] Change in ovirt-engine[ovirt-engine-3.3]: frontend: adjust SPICE channels name

[fkobzik]

Frank Kobzik has uploaded a new change for review.

Change subject: frontend: adjust SPICE channels name
......................................................................

frontend: adjust SPICE channels name

This patch correct legacy SPICE channels names passing to clients.

Change-Id: Ia7d49e2bcf24b5190197e36e4f6d000b9cde54a3
Signed-off-by: Frantisek Kobzik <fkob...@redhat.com>
---
M 
frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/AbstractSpice.java
A 
frontend/webadmin/modules/gwt-common/src/test/java/org/ovirt/engine/ui/common/uicommon/AbstractSpiceTest.java
2 files changed, 53 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/31/22531/1

diff --git 
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/AbstractSpice.java
 
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/AbstractSpice.java
index 0579f96..39bcb21 100644
--- 
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/AbstractSpice.java
+++ 
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/AbstractSpice.java
@@ -1,8 +1,10 @@
 package org.ovirt.engine.ui.common.uicommon;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
+import org.ovirt.engine.core.compat.StringHelper;
 import org.ovirt.engine.core.compat.Version;
 import org.ovirt.engine.ui.uicommonweb.models.vms.SpiceConsoleModel;
 import org.ovirt.engine.ui.uicommonweb.models.vms.WANDisableEffects;
@@ -231,7 +233,28 @@
     }
 
     public void setSslChanels(String sslChanels) {
-        this.sslChanels = sslChanels;
+        this.sslChanels = adjustLegacySecureChannels(sslChanels);
+    }
+
+    /**
+     * Reformat secure channels string if they are in legacy ('s'-prefixed) 
format.
+     * @param legacySecureChannels (e.g. "smain,sinput")
+     * @return secure channels in correct format (e.g. "main,input")
+     */
+    static String adjustLegacySecureChannels(String legacySecureChannels) {
+        if (StringHelper.isNullOrEmpty(legacySecureChannels)) {
+            return legacySecureChannels;
+        }
+
+        String secureChannels = legacySecureChannels;
+        List<String> legacyChannels = Arrays.asList(
+                new String[]{"smain", "sdisplay", "sinputs", "scursor", 
"splayback", "srecord", "ssmartcard", "susbredir"}); // $NON-NLS-1$ $NON-NLS-2$ 
$NON-NLS-3$ $NON-NLS-4$ $NON-NLS-5$ $NON-NLS-6$ $NON-NLS-7$ $NON-NLS-8$
+
+        for (String channel : legacyChannels) {
+            secureChannels = secureChannels.replace(channel, 
channel.substring(1));
+        }
+
+        return secureChannels;
     }
 
     public String getCipherSuite() {
diff --git 
a/frontend/webadmin/modules/gwt-common/src/test/java/org/ovirt/engine/ui/common/uicommon/AbstractSpiceTest.java
 
b/frontend/webadmin/modules/gwt-common/src/test/java/org/ovirt/engine/ui/common/uicommon/AbstractSpiceTest.java
new file mode 100644
index 0000000..9cfc0ca
--- /dev/null
+++ 
b/frontend/webadmin/modules/gwt-common/src/test/java/org/ovirt/engine/ui/common/uicommon/AbstractSpiceTest.java
@@ -0,0 +1,29 @@
+package org.ovirt.engine.ui.common.uicommon;
+
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+
+public class AbstractSpiceTest {
+    @Test
+    public void testAdjustLegacySecureChannels() throws Exception {
+        String legacyChannels = 
"smain,sdisplay,sinputs,scursor,splayback,srecord,ssmartcard,susbredir"; 
//$NON-NLS-1$
+        String correctChannels = 
"main,display,inputs,cursor,playback,record,smartcard,usbredir";//$NON-NLS-1$
+
+        assertEquals(correctChannels, 
AbstractSpice.adjustLegacySecureChannels(legacyChannels));
+    }
+
+    @Test
+    public void testAdjustLegacySecureChannelsWithEmptyChannels() throws 
Exception {
+        String legacyChannels = "";//$NON-NLS-1$
+        String correctChannels = "";//$NON-NLS-1$
+        assertEquals(correctChannels, 
AbstractSpice.adjustLegacySecureChannels(legacyChannels));
+    }
+
+    @Test
+    public void testAdjustLegacySecureChannelsWithNullChannels() throws 
Exception {
+        String legacyChannels = null;
+        String correctChannels = null;
+        assertEquals(correctChannels, 
AbstractSpice.adjustLegacySecureChannels(legacyChannels));
+    }
+}


-- 
To view, visit http://gerrit.ovirt.org/22531
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia7d49e2bcf24b5190197e36e4f6d000b9cde54a3
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: ovirt-engine-3.3
Gerrit-Owner: Frank Kobzik <fkob...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches