From 7eae94d0c197075df385d1de3ae5da9f4b4fb25c Mon Sep 17 00:00:00 2001
From: Qiu Jian <qiujian@yunionyun.com>
Date: Thu, 16 Apr 2020 23:14:52 +0800
Subject: [PATCH] fix: decouple climc and webconsole, make climc windows
 buildable

---
 cmd/climc/shell/webconsole.go            |  6 +++---
 pkg/apis/webconsole/consts.go            | 12 ++++++++++++
 pkg/webconsole/session/remote_console.go | 19 ++++++++++---------
 3 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/cmd/climc/shell/webconsole.go b/cmd/climc/shell/webconsole.go
index 4d7b04bd60..6d6297227b 100644
--- a/cmd/climc/shell/webconsole.go
+++ b/cmd/climc/shell/webconsole.go
@@ -22,11 +22,11 @@ import (
 	"yunion.io/x/jsonutils"
 	"yunion.io/x/pkg/utils"
 
+	webconsole_api "yunion.io/x/onecloud/pkg/apis/webconsole"
 	"yunion.io/x/onecloud/pkg/mcclient"
 	"yunion.io/x/onecloud/pkg/mcclient/modules"
 	o "yunion.io/x/onecloud/pkg/mcclient/options"
 	"yunion.io/x/onecloud/pkg/webconsole/command"
-	"yunion.io/x/onecloud/pkg/webconsole/session"
 )
 
 const (
@@ -61,8 +61,8 @@ func init() {
 		}
 		protocol := query.Get("protocol")
 		if !utils.IsInStringArray(protocol, []string{
-			command.PROTOCOL_TTY, session.VNC,
-			session.SPICE, session.WMKS,
+			command.PROTOCOL_TTY, webconsole_api.VNC,
+			webconsole_api.SPICE, webconsole_api.WMKS,
 		}) {
 			fmt.Println(connParams)
 			return nil
diff --git a/pkg/apis/webconsole/consts.go b/pkg/apis/webconsole/consts.go
index bbf71f1504..1f13b11073 100644
--- a/pkg/apis/webconsole/consts.go
+++ b/pkg/apis/webconsole/consts.go
@@ -18,3 +18,15 @@ const (
 	SERVICE_TYPE    = "webconsole"
 	SERVICE_VERSION = ""
 )
+
+const (
+	VNC       = "vnc"
+	ALIYUN    = "aliyun"
+	QCLOUD    = "qcloud"
+	OPENSTACK = "openstack"
+	SPICE     = "spice"
+	WMKS      = "wmks"
+	VMRC      = "vmrc"
+	ZSTACK    = "zstack"
+	CTYUN     = "ctyun"
+)
diff --git a/pkg/webconsole/session/remote_console.go b/pkg/webconsole/session/remote_console.go
index 59638b005a..dca3d1bd37 100644
--- a/pkg/webconsole/session/remote_console.go
+++ b/pkg/webconsole/session/remote_console.go
@@ -19,20 +19,21 @@ import (
 	"net/url"
 	"os/exec"
 
+	api "yunion.io/x/onecloud/pkg/apis/webconsole"
 	"yunion.io/x/onecloud/pkg/mcclient"
 	"yunion.io/x/onecloud/pkg/mcclient/modules"
 )
 
 const (
-	VNC       = "vnc"
-	ALIYUN    = "aliyun"
-	QCLOUD    = "qcloud"
-	OPENSTACK = "openstack"
-	SPICE     = "spice"
-	WMKS      = "wmks"
-	VMRC      = "vmrc"
-	ZSTACK    = "zstack"
-	CTYUN     = "ctyun"
+	VNC       = api.VNC
+	ALIYUN    = api.ALIYUN
+	QCLOUD    = api.QCLOUD
+	OPENSTACK = api.OPENSTACK
+	SPICE     = api.SPICE
+	WMKS      = api.WMKS
+	VMRC      = api.VMRC
+	ZSTACK    = api.ZSTACK
+	CTYUN     = api.CTYUN
 )
 
 type RemoteConsoleInfo struct {