Merge pull request #35 in YUNIONIO/onecloud from ~LIZEXI/onecloud:release/2.1.0 to release/2.1.0

* commit '090a9c5e869c6770a43f12ab3dc0af1d180b5172':
  add doc.go for each package
  path move: github.com/yunionio -> yunion.io/x

Gopkg.lock

@@ -572,70 +572,6 @@
   ]
   revision = "bbd99532a768d2fe369079ceda730e30726ae1a6"
 
-[[projects]]
-  branch = "master"
-  name = "github.com/yunionio/jsonutils"
-  packages = ["."]
-  revision = "a19572265f525c898629becef50b405afd5e3ec6"
-
-[[projects]]
-  branch = "master"
-  name = "github.com/yunionio/log"
-  packages = [
-    ".",
-    "hooks"
-  ]
-  revision = "d2fe137411c230927e28dd82b1a3bcb618dbb28d"
-
-[[projects]]
-  branch = "master"
-  name = "github.com/yunionio/pkg"
-  packages = [
-    "gotypes",
-    "prettytable",
-    "trace",
-    "tristate",
-    "util/cache",
-    "util/clock",
-    "util/compare",
-    "util/errors",
-    "util/fifoutils",
-    "util/fileutils",
-    "util/filterclause",
-    "util/goroutine_pool",
-    "util/netutils",
-    "util/osprofile",
-    "util/prometheus",
-    "util/reflectutils",
-    "util/regutils",
-    "util/runtime",
-    "util/seclib",
-    "util/secrules",
-    "util/sets",
-    "util/stringutils",
-    "util/sysutils",
-    "util/timeutils",
-    "util/trace",
-    "util/ttlpool",
-    "util/version",
-    "util/wait",
-    "util/workqueue",
-    "utils"
-  ]
-  revision = "607ffde100f37b77f1a90289c06ed6b103325ee8"
-
-[[projects]]
-  branch = "master"
-  name = "github.com/yunionio/sqlchemy"
-  packages = ["."]
-  revision = "b84d8e2b4313670f24cd50caa5bcc0c5288c16b5"
-
-[[projects]]
-  branch = "master"
-  name = "github.com/yunionio/structarg"
-  packages = ["."]
-  revision = "7c3bbf8a77dc7b33ccad90087a296f3e34399d09"
-
 [[projects]]
   branch = "master"
   name = "golang.org/x/crypto"
@@ -910,9 +846,72 @@
   revision = "7d04d0e2a0a1a4d4a1cd6baa432a2301492e4e65"
   version = "v8.0.0"
 
+[[projects]]
+  branch = "master"
+  name = "yunion.io/x/jsonutils"
+  packages = ["."]
+  revision = "a86e16793be4a6f4c5ea9203e40c2a0a9361efb8"
+
+[[projects]]
+  branch = "master"
+  name = "yunion.io/x/log"
+  packages = [
+    ".",
+    "hooks"
+  ]
+  revision = "a10b94c5038480920262e0f344656328434955a2"
+
+[[projects]]
+  name = "yunion.io/x/pkg"
+  packages = [
+    "gotypes",
+    "prettytable",
+    "trace",
+    "tristate",
+    "util/cache",
+    "util/clock",
+    "util/compare",
+    "util/errors",
+    "util/fifoutils",
+    "util/fileutils",
+    "util/filterclause",
+    "util/goroutine_pool",
+    "util/netutils",
+    "util/osprofile",
+    "util/prometheus",
+    "util/reflectutils",
+    "util/regutils",
+    "util/runtime",
+    "util/seclib",
+    "util/secrules",
+    "util/sets",
+    "util/stringutils",
+    "util/sysutils",
+    "util/timeutils",
+    "util/trace",
+    "util/ttlpool",
+    "util/version",
+    "util/wait",
+    "util/workqueue",
+    "utils"
+  ]
+  revision = "07cad0cb1df5155b3bfa15079594d01050931554"
+
+[[projects]]
+  branch = "master"
+  name = "yunion.io/x/sqlchemy"
+  packages = ["."]
+  revision = "f6a47145f9b94ebff1517017e790f068698b5b5a"
+
+[[projects]]
+  branch = "master"
+  name = "yunion.io/x/structarg"
+  packages = ["."]
+  revision = "5f84a68c40a2d8eb923f0607f809cbda8d5b944a"
+
 [solve-meta]
   analyzer-name = "dep"
   analyzer-version = 1
-  inputs-digest = "c7bfe16614b0c3ebccbf920779ecaf929daaef2dc863be449279c3bafa45839b"
+  inputs-digest = "63315737a1e02fba65e6ba256ff2571dfb9351af5fe446152e89adaf1c7129fb"
   solver-name = "gps-cdcl"
   solver-version = 1

Gopkg.toml

@@ -31,23 +31,25 @@
 
 [[constraint]]
   branch = "master"
-  name = "github.com/yunionio/jsonutils"
+  name = "yunion.io/x/jsonutils"
+
+[[constraint]]
+  #revision = "a14641a90b9e5c72868b7a8358d62ea1d83eab53"
+  branch = "master"
+  name = "yunion.io/x/sqlchemy"
 
 [[constraint]]
   branch = "master"
-  name = "github.com/yunionio/sqlchemy"
+  name = "yunion.io/x/log"
+
+[[constraint]]
+  revision = "07cad0cb1df5155b3bfa15079594d01050931554"
+  #branch = "master"
+  name = "yunion.io/x/pkg"
 
 [[constraint]]
   branch = "master"
-  name = "github.com/yunionio/log"
-
-[[constraint]]
-  branch = "master"
-  name = "github.com/yunionio/pkg"
-
-[[constraint]]
-  branch = "master"
-  name = "github.com/yunionio/structarg"
+  name = "yunion.io/x/structarg"
 
 # client-go v8.0.0 uses apimachinery 103fd098999dc9c0c88536f5c9ad2e5da39373ae
 # and api 072894a440bdee3a891dea811fe42902311cd2a3 (see Godep.json). go dep

Makefile

@@ -1,8 +1,8 @@
 #####################################################
 
-REPO_PREFIX := github.com/yunionio/onecloud
+REPO_PREFIX := yunion.io/x/onecloud
 VENDOR_PATH := $(REPO_PREFIX)/vendor
-VERSION_PKG := $(VENDOR_PATH)/github.com/yunionio/pkg/util/version
+VERSION_PKG := $(VENDOR_PATH)/yunion.io/x/pkg/util/version
 ROOT_DIR := $(shell readlink -f `pwd`)
 BUILD_DIR := $(ROOT_DIR)/_output
 BIN_DIR := $(BUILD_DIR)/bin

cmd/aliyuncli/main.go

@@ -4,12 +4,12 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/yunionio/log"
-	"github.com/yunionio/onecloud/pkg/util/aliyun"
-	"github.com/yunionio/onecloud/pkg/util/shellutils"
-	"github.com/yunionio/structarg"
+	"yunion.io/x/log"
+	"yunion.io/x/onecloud/pkg/util/aliyun"
+	"yunion.io/x/onecloud/pkg/util/shellutils"
+	"yunion.io/x/structarg"
 
-	_ "github.com/yunionio/onecloud/pkg/util/aliyun/shell"
+	_ "yunion.io/x/onecloud/pkg/util/aliyun/shell"
 )
 
 type BaseOptions struct {

cmd/climc/climc.go

@@ -7,14 +7,14 @@ import (
 	"time"
 
 	prompt "github.com/c-bata/go-prompt"
-	"github.com/yunionio/log"
-	"github.com/yunionio/pkg/util/version"
-	"github.com/yunionio/structarg"
+	"yunion.io/x/log"
+	"yunion.io/x/pkg/util/version"
+	"yunion.io/x/structarg"
 
-	"github.com/yunionio/onecloud/cmd/climc/promputils"
-	"github.com/yunionio/onecloud/cmd/climc/shell"
-	_ "github.com/yunionio/onecloud/cmd/climc/shell/k8s"
-	"github.com/yunionio/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/cmd/climc/promputils"
+	"yunion.io/x/onecloud/cmd/climc/shell"
+	_ "yunion.io/x/onecloud/cmd/climc/shell/k8s"
+	"yunion.io/x/onecloud/pkg/mcclient"
 )
 
 type BaseOptions struct {
@@ -122,7 +122,7 @@ func newClientSession(options *BaseOptions) (*mcclient.ClientSession, error) {
 		options.Debug,
 		options.Secure)
 
-	if CacheToken == nil || {
+	if CacheToken == nil {
 		token, err := client.Authenticate(options.OsUsername,
 			options.OsPassword,
 			options.OsDomainName,

cmd/climc/promputils/doc.go

@@ -0,0 +1 @@
+package promputils // import "yunion.io/x/onecloud/cmd/climc/promputils"

cmd/climc/promputils/executor.go

@@ -9,9 +9,9 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/yunionio/structarg"
+	"yunion.io/x/structarg"
 
-	"github.com/yunionio/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient"
 )
 
 var (

cmd/climc/shell/actions.go

@@ -1,10 +1,10 @@
 package shell
 
 import (
-	"github.com/yunionio/jsonutils"
+	"yunion.io/x/jsonutils"
 
-	"github.com/yunionio/onecloud/pkg/mcclient"
-	"github.com/yunionio/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
 )
 
 type BaseActionListOptions struct {

cmd/climc/shell/alarmevents.go

@@ -1,10 +1,10 @@
 package shell
 
 import (
-	"github.com/yunionio/jsonutils"
+	"yunion.io/x/jsonutils"
 
-	"github.com/yunionio/onecloud/pkg/mcclient"
-	"github.com/yunionio/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
 )
 
 func init() {

cmd/climc/shell/alarmlogs.go

@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/yunionio/jsonutils"
-	"github.com/yunionio/onecloud/pkg/mcclient"
-	"github.com/yunionio/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/jsonutils"
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
 )
 
 func init() {

cmd/climc/shell/alarms.go

@@ -1,10 +1,10 @@
 package shell
 
 import (
-	"github.com/yunionio/jsonutils"
+	"yunion.io/x/jsonutils"
 
-	"github.com/yunionio/onecloud/pkg/mcclient"
-	"github.com/yunionio/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
 )
 
 func init() {

cmd/climc/shell/alarmtemplates.go

@@ -3,10 +3,10 @@ package shell
 import (
 	"strings"
 
-	"github.com/yunionio/jsonutils"
+	"yunion.io/x/jsonutils"
 
-	"github.com/yunionio/onecloud/pkg/mcclient"
-	"github.com/yunionio/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
 )
 
 func init() {

cmd/climc/shell/baremetalnetworks.go

@@ -1,10 +1,10 @@
 package shell
 
 import (
-	"github.com/yunionio/jsonutils"
+	"yunion.io/x/jsonutils"
 
-	"github.com/yunionio/onecloud/pkg/mcclient"
-	"github.com/yunionio/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
 )
 
 func init() {

cmd/climc/shell/baremetalstorages.go

@@ -1,8 +1,8 @@
 package shell
 
 import (
-	"github.com/yunionio/onecloud/pkg/mcclient"
-	"github.com/yunionio/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
 )
 
 func init() {

cmd/climc/shell/cachedimages.go

@@ -1,8 +1,8 @@
 package shell
 
 import (
-	"github.com/yunionio/onecloud/pkg/mcclient"
-	"github.com/yunionio/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
 )
 
 func init() {

cmd/climc/shell/cloudproviders.go

@@ -1,10 +1,10 @@
 package shell
 
 import (
-	"github.com/yunionio/jsonutils"
+	"yunion.io/x/jsonutils"
 
-	"github.com/yunionio/onecloud/pkg/mcclient"
-	"github.com/yunionio/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
 )
 
 func init() {

cmd/climc/shell/cloudregions.go

@@ -1,10 +1,10 @@
 package shell
 
 import (
-	"github.com/yunionio/jsonutils"
+	"yunion.io/x/jsonutils"
 
-	"github.com/yunionio/onecloud/pkg/mcclient"
-	"github.com/yunionio/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
 )
 
 func init() {

cmd/climc/shell/contactgroups.go

@@ -1,8 +1,8 @@
 package shell
 
 import (
-	"github.com/yunionio/onecloud/pkg/mcclient"
-	"github.com/yunionio/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
 )
 
 func init() {

cmd/climc/shell/contacts.go

@@ -1,10 +1,10 @@
 package shell
 
 import (
-	"github.com/yunionio/jsonutils"
+	"yunion.io/x/jsonutils"
 
-	"github.com/yunionio/onecloud/pkg/mcclient"
-	"github.com/yunionio/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
 )
 
 func init() {

cmd/climc/shell/current.go

@@ -1,7 +1,7 @@
 package shell
 
 import (
-	"github.com/yunionio/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient"
 )
 
 func init() {

cmd/climc/shell/disks.go

@@ -1,10 +1,10 @@
 package shell
 
 import (
-	"github.com/yunionio/jsonutils"
+	"yunion.io/x/jsonutils"
 
-	"github.com/yunionio/onecloud/pkg/mcclient"
-	"github.com/yunionio/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
 )
 
 func init() {

cmd/climc/shell/dnsrecords.go

@@ -3,10 +3,10 @@ package shell
 import (
 	"fmt"
 
-	"github.com/yunionio/jsonutils"
+	"yunion.io/x/jsonutils"
 
-	"github.com/yunionio/onecloud/pkg/mcclient"
-	"github.com/yunionio/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
 )
 
 type DNSRecordOptions struct {

cmd/climc/shell/doc.go

@@ -0,0 +1 @@
+package shell // import "yunion.io/x/onecloud/cmd/climc/shell"

cmd/climc/shell/domains.go

@@ -3,10 +3,10 @@ package shell
 import (
 	"fmt"
 
-	"github.com/yunionio/jsonutils"
+	"yunion.io/x/jsonutils"
 
-	"github.com/yunionio/onecloud/pkg/mcclient"
-	"github.com/yunionio/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
 )
 
 func init() {

cmd/climc/shell/email_config.go

@@ -1,9 +1,9 @@
 package shell
 
 import (
-	"github.com/yunionio/jsonutils"
-	"github.com/yunionio/onecloud/pkg/mcclient"
-	"github.com/yunionio/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/jsonutils"
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
 )
 
 func init() {

cmd/climc/shell/endpoints.go

@@ -1,9 +1,9 @@
 package shell
 
 import (
-	"github.com/yunionio/jsonutils"
-	"github.com/yunionio/onecloud/pkg/mcclient"
-	"github.com/yunionio/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/jsonutils"
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
 )
 
 func init() {

cmd/climc/shell/events.go

@@ -1,11 +1,11 @@
 package shell
 
 import (
-	"github.com/yunionio/jsonutils"
+	"yunion.io/x/jsonutils"
 
-	"github.com/yunionio/onecloud/pkg/mcclient"
-	"github.com/yunionio/onecloud/pkg/mcclient/modules"
-	"github.com/yunionio/onecloud/pkg/mcclient/modules/k8s"
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/onecloud/pkg/mcclient/modules/k8s"
 )
 
 type BaseEventListOptions struct {

cmd/climc/shell/groups.go

@@ -1,9 +1,9 @@
 package shell
 
 import (
-	"github.com/yunionio/jsonutils"
-	"github.com/yunionio/onecloud/pkg/mcclient"
-	"github.com/yunionio/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/jsonutils"
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
 )
 
 func init() {

cmd/climc/shell/hostcachedimages.go

@@ -1,9 +1,9 @@
 package shell
 
 import (
-	"github.com/yunionio/jsonutils"
-	"github.com/yunionio/onecloud/pkg/mcclient"
-	"github.com/yunionio/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/jsonutils"
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
 )
 
 func init() {

cmd/climc/shell/hosts.go

@@ -3,9 +3,9 @@ package shell
 import (
 	"fmt"
 
-	"github.com/yunionio/jsonutils"
-	"github.com/yunionio/onecloud/pkg/mcclient"
-	"github.com/yunionio/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/jsonutils"
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
 )
 
 func init() {

cmd/climc/shell/hoststorages.go

@@ -1,9 +1,9 @@
 package shell
 
 import (
-	"github.com/yunionio/jsonutils"
-	"github.com/yunionio/onecloud/pkg/mcclient"
-	"github.com/yunionio/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/jsonutils"
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
 )
 
 func init() {

cmd/climc/shell/hostwires.go

@@ -1,9 +1,9 @@
 package shell
 
 import (
-	"github.com/yunionio/jsonutils"
-	"github.com/yunionio/onecloud/pkg/mcclient"
-	"github.com/yunionio/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/jsonutils"
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
 )
 
 func init() {

cmd/climc/shell/images.go

@@ -6,9 +6,9 @@ import (
 	"os"
 	"strings"
 
-	"github.com/yunionio/jsonutils"
-	"github.com/yunionio/onecloud/pkg/mcclient"
-	"github.com/yunionio/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/jsonutils"
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
 )
 
 type ImageOptionalOptions struct {

cmd/climc/shell/instances.go

@@ -1,8 +1,8 @@
 package shell
 
 import (
-	"github.com/yunionio/onecloud/pkg/mcclient"
-	"github.com/yunionio/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
 )
 
 func init() {

cmd/climc/shell/isolatedevices.go

@@ -1,9 +1,9 @@
 package shell
 
 import (
-	"github.com/yunionio/jsonutils"
-	"github.com/yunionio/onecloud/pkg/mcclient"
-	"github.com/yunionio/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/jsonutils"
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
 )
 
 func init() {

cmd/climc/shell/k8s/clusters.go

@@ -3,10 +3,10 @@ package k8s
 import (
 	"fmt"
 
-	"github.com/yunionio/jsonutils"
+	"yunion.io/x/jsonutils"
 
-	"github.com/yunionio/onecloud/pkg/mcclient"
-	"github.com/yunionio/onecloud/pkg/mcclient/modules/k8s"
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modules/k8s"
 )
 
 func initCluster() {

cmd/climc/shell/k8s/doc.go

@@ -0,0 +1 @@
+package k8s // import "yunion.io/x/onecloud/cmd/climc/shell/k8s"

cmd/climc/shell/k8s/k8s.go

@@ -3,12 +3,12 @@ package k8s
 import (
 	"fmt"
 
-	"github.com/yunionio/jsonutils"
+	"yunion.io/x/jsonutils"
 
-	"github.com/yunionio/onecloud/cmd/climc/shell"
-	"github.com/yunionio/onecloud/pkg/mcclient/modules"
-	"github.com/yunionio/onecloud/pkg/mcclient/modules/k8s"
-	"github.com/yunionio/onecloud/pkg/util/printutils"
+	"yunion.io/x/onecloud/cmd/climc/shell"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/onecloud/pkg/mcclient/modules/k8s"
+	"yunion.io/x/onecloud/pkg/util/printutils"
 )
 
 func init() {

cmd/climc/shell/k8s/nodes.go

@@ -3,10 +3,10 @@ package k8s
 import (
 	"fmt"
 
-	"github.com/yunionio/jsonutils"
+	"yunion.io/x/jsonutils"
 
-	"github.com/yunionio/onecloud/pkg/mcclient"
-	"github.com/yunionio/onecloud/pkg/mcclient/modules/k8s"
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modules/k8s"
 )
 
 func initNode() {

cmd/climc/shell/k8s/pods.go

@@ -3,8 +3,8 @@ package k8s
 import (
 	"fmt"
 
-	"github.com/yunionio/onecloud/pkg/mcclient"
-	"github.com/yunionio/onecloud/pkg/mcclient/modules/k8s"
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modules/k8s"
 )
 
 func initPod() {

cmd/climc/shell/keypairs.go

@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"io/ioutil"
 
-	"github.com/yunionio/jsonutils"
-	"github.com/yunionio/onecloud/pkg/mcclient"
-	"github.com/yunionio/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/jsonutils"
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
 )
 
 func init() {

cmd/climc/shell/keystoneutils.go

@@ -1,9 +1,9 @@
 package shell
 
 import (
-	"github.com/yunionio/jsonutils"
-	"github.com/yunionio/onecloud/pkg/mcclient"
-	"github.com/yunionio/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/jsonutils"
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
 )
 
 func getUserId(s *mcclient.ClientSession, user string, domain string) (string, error) {

cmd/climc/shell/labels.go

@@ -1,9 +1,9 @@
 package shell
 
 import (
-	"github.com/yunionio/jsonutils"
-	"github.com/yunionio/onecloud/pkg/mcclient"
-	"github.com/yunionio/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/jsonutils"
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
 )
 
 func init() {

cmd/climc/shell/metric_types.go

@@ -1,8 +1,8 @@
 package shell
 
 import (
-	"github.com/yunionio/onecloud/pkg/mcclient"
-	"github.com/yunionio/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
 )
 
 func init() {

cmd/climc/shell/metrics.go

@@ -1,8 +1,8 @@
 package shell
 
 import (
-	"github.com/yunionio/onecloud/pkg/mcclient"
-	"github.com/yunionio/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
 )
 
 func init() {

cmd/climc/shell/monitor_metrics.go

@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/yunionio/jsonutils"
-	"github.com/yunionio/onecloud/pkg/mcclient"
-	"github.com/yunionio/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/jsonutils"
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
 )
 
 func init() {

cmd/climc/shell/monitor_types.go

@@ -1,8 +1,8 @@
 package shell
 
 import (
-	"github.com/yunionio/onecloud/pkg/mcclient"
-	"github.com/yunionio/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
 )
 
 func init() {

cmd/climc/shell/monitorinputs.go

@@ -1,8 +1,8 @@
 package shell
 
 import (
-	"github.com/yunionio/onecloud/pkg/mcclient"
-	"github.com/yunionio/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
 )
 
 func init() {

cmd/climc/shell/monitortemplates.go

@@ -3,9 +3,9 @@ package shell
 import (
 	"strings"
 
-	"github.com/yunionio/jsonutils"
-	"github.com/yunionio/onecloud/pkg/mcclient"
-	"github.com/yunionio/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/jsonutils"
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
 )
 
 func init() {

cmd/climc/shell/networks.go

@@ -3,9 +3,9 @@ package shell
 import (
 	"fmt"
 
-	"github.com/yunionio/jsonutils"
-	"github.com/yunionio/onecloud/pkg/mcclient"
-	"github.com/yunionio/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/jsonutils"
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
 )
 
 func init() {

cmd/climc/shell/nodes.go

@@ -3,9 +3,9 @@ package shell
 import (
 	"strings"
 
-	"github.com/yunionio/jsonutils"
-	"github.com/yunionio/onecloud/pkg/mcclient"
-	"github.com/yunionio/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/jsonutils"
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
 )
 
 func init() {

cmd/climc/shell/notification.go

@@ -2,9 +2,9 @@ package shell
 
 import (
 	//"strings"
-	"github.com/yunionio/jsonutils"
-	"github.com/yunionio/onecloud/pkg/mcclient"
-	"github.com/yunionio/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/jsonutils"
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
 )
 
 func init() {

cmd/climc/shell/operations.go

@@ -1,9 +1,9 @@
 package shell
 
 import (
-	"github.com/yunionio/jsonutils"
-	"github.com/yunionio/onecloud/pkg/mcclient"
-	"github.com/yunionio/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/jsonutils"
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
 )
 
 func init() {

cmd/climc/shell/performances.go

@@ -1,9 +1,9 @@
 package shell
 
 import (
-	"github.com/yunionio/jsonutils"
-	"github.com/yunionio/onecloud/pkg/mcclient"
-	"github.com/yunionio/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/jsonutils"
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
 )
 
 func init() {

cmd/climc/shell/processes.go

@@ -1,8 +1,8 @@
 package shell
 
 import (
-	"github.com/yunionio/onecloud/pkg/mcclient"
-	"github.com/yunionio/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
 )
 
 func init() {

cmd/climc/shell/processlogs.go

@@ -1,8 +1,8 @@
 package shell
 
 import (
-	"github.com/yunionio/onecloud/pkg/mcclient"
-	"github.com/yunionio/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
 )
 
 func init() {

cmd/climc/shell/project_admin.go

@@ -1,8 +1,8 @@
 package shell
 
 import (
-	"github.com/yunionio/onecloud/pkg/mcclient"
-	"github.com/yunionio/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
 )
 
 func init() {

cmd/climc/shell/project_admin_candidates.go

@@ -1,8 +1,8 @@
 package shell
 
 import (
-	"github.com/yunionio/onecloud/pkg/mcclient"
-	"github.com/yunionio/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
 )
 
 func init() {

cmd/climc/shell/projects.go

@@ -1,9 +1,9 @@
 package shell
 
 import (
-	"github.com/yunionio/jsonutils"
-	"github.com/yunionio/onecloud/pkg/mcclient"
-	"github.com/yunionio/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/jsonutils"
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
 )
 
 func init() {

cmd/climc/shell/quotas.go

@@ -1,9 +1,9 @@
 package shell
 
 import (
-	"github.com/yunionio/jsonutils"
-	"github.com/yunionio/onecloud/pkg/mcclient"
-	"github.com/yunionio/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/jsonutils"
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
 )
 
 type QuotaBaseOptions struct {

cmd/climc/shell/rates.go

@@ -1,9 +1,9 @@
 package shell
 
 import (
-	"github.com/yunionio/jsonutils"
-	"github.com/yunionio/onecloud/pkg/mcclient"
-	"github.com/yunionio/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/jsonutils"
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
 )
 
 func init() {

cmd/climc/shell/recipient.go

@@ -1,9 +1,9 @@
 package shell
 
 import (
-	"github.com/yunionio/jsonutils"
-	"github.com/yunionio/onecloud/pkg/mcclient"
-	"github.com/yunionio/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/jsonutils"
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
 )
 
 func init() {

cmd/climc/shell/regions.go

@@ -2,9 +2,9 @@ package shell
 
 import (
 	"fmt"
-	"github.com/yunionio/jsonutils"
-	"github.com/yunionio/onecloud/pkg/mcclient"
-	"github.com/yunionio/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/jsonutils"
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
 )
 
 func init() {

cmd/climc/shell/reservedips.go

@@ -1,9 +1,9 @@
 package shell
 
 import (
-	"github.com/yunionio/jsonutils"
-	"github.com/yunionio/onecloud/pkg/mcclient"
-	"github.com/yunionio/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/jsonutils"
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
 )
 
 func init() {

cmd/climc/shell/resource_details.go

@@ -1,9 +1,9 @@
 package shell
 
 import (
-	"github.com/yunionio/jsonutils"
-	"github.com/yunionio/onecloud/pkg/mcclient"
-	"github.com/yunionio/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/jsonutils"
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
 )
 
 func init() {

cmd/climc/shell/resource_fees.go

@@ -1,9 +1,9 @@
 package shell
 
 import (
-	"github.com/yunionio/jsonutils"
-	"github.com/yunionio/onecloud/pkg/mcclient"
-	"github.com/yunionio/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/jsonutils"
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
 )
 
 func init() {

cmd/climc/shell/role_assignments.go

@@ -1,9 +1,9 @@
 package shell
 
 import (
-	"github.com/yunionio/jsonutils"
-	"github.com/yunionio/onecloud/pkg/mcclient"
-	"github.com/yunionio/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/jsonutils"
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
 )
 
 func init() {

cmd/climc/shell/roles.go

@@ -1,9 +1,9 @@
 package shell
 
 import (
-	"github.com/yunionio/jsonutils"
-	"github.com/yunionio/onecloud/pkg/mcclient"
-	"github.com/yunionio/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/jsonutils"
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
 )
 
 func init() {

cmd/climc/shell/schedtaghosts.go

@@ -1,8 +1,8 @@
 package shell
 
 import (
-	"github.com/yunionio/onecloud/pkg/mcclient"
-	"github.com/yunionio/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
 )
 
 func init() {

cmd/climc/shell/schedtags.go

@@ -2,9 +2,9 @@ package shell
 
 import (
 	"fmt"
-	"github.com/yunionio/jsonutils"
-	"github.com/yunionio/onecloud/pkg/mcclient"
-	"github.com/yunionio/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/jsonutils"
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
 )
 
 func init() {

cmd/climc/shell/schedulers.go

@@ -3,9 +3,9 @@ package shell
 import (
 	"fmt"
 
-	"github.com/yunionio/jsonutils"
-	"github.com/yunionio/onecloud/pkg/mcclient"
-	"github.com/yunionio/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/jsonutils"
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
 )
 
 func init() {

cmd/climc/shell/secgrouprules.go

@@ -1,9 +1,9 @@
 package shell
 
 import (
-	"github.com/yunionio/jsonutils"
-	"github.com/yunionio/onecloud/pkg/mcclient"
-	"github.com/yunionio/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/jsonutils"
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
 )
 
 func init() {

cmd/climc/shell/secgroups.go

@@ -3,9 +3,9 @@ package shell
 import (
 	"fmt"
 
-	"github.com/yunionio/jsonutils"
-	"github.com/yunionio/onecloud/pkg/mcclient"
-	"github.com/yunionio/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/jsonutils"
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
 )
 
 func init() {

cmd/climc/shell/serverdisks.go

@@ -2,9 +2,9 @@ package shell
 
 import (
 	"fmt"
-	"github.com/yunionio/jsonutils"
-	"github.com/yunionio/onecloud/pkg/mcclient"
-	"github.com/yunionio/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/jsonutils"
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
 )
 
 func init() {

cmd/climc/shell/serverisolatedevices.go

@@ -1,9 +1,9 @@
 package shell
 
 import (
-	"github.com/yunionio/jsonutils"
-	"github.com/yunionio/onecloud/pkg/mcclient"
-	"github.com/yunionio/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/jsonutils"
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
 )
 
 func init() {

cmd/climc/shell/servernetworks.go

@@ -1,9 +1,9 @@
 package shell
 
 import (
-	"github.com/yunionio/jsonutils"
-	"github.com/yunionio/onecloud/pkg/mcclient"
-	"github.com/yunionio/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/jsonutils"
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
 )
 
 func init() {

cmd/climc/shell/servers.go

@@ -5,9 +5,9 @@ import (
 	"io/ioutil"
 	"strings"
 
-	"github.com/yunionio/jsonutils"
-	"github.com/yunionio/onecloud/pkg/mcclient"
-	"github.com/yunionio/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/jsonutils"
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
 )
 
 type ServerDeployInfo struct {

cmd/climc/shell/service_hosts.go

@@ -1,9 +1,9 @@
 package shell
 
 import (
-	"github.com/yunionio/jsonutils"
-	"github.com/yunionio/onecloud/pkg/mcclient"
-	"github.com/yunionio/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/jsonutils"
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
 )
 
 func init() {

cmd/climc/shell/service_name_suggestions.go

@@ -1,8 +1,8 @@
 package shell
 
 import (
-	"github.com/yunionio/onecloud/pkg/mcclient"
-	"github.com/yunionio/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
 )
 
 func init() {

cmd/climc/shell/services.go

@@ -1,9 +1,9 @@
 package shell
 
 import (
-	"github.com/yunionio/jsonutils"
-	"github.com/yunionio/onecloud/pkg/mcclient"
-	"github.com/yunionio/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/jsonutils"
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
 )
 
 func init() {

cmd/climc/shell/servicetrees.go

@@ -1,9 +1,9 @@
 package shell
 
 import (
-	"github.com/yunionio/jsonutils"
-	"github.com/yunionio/onecloud/pkg/mcclient"
-	"github.com/yunionio/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/jsonutils"
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
 )
 
 func init() {

cmd/climc/shell/shell.go

@@ -2,7 +2,7 @@ package shell
 
 import (
 	"fmt"
-	"github.com/yunionio/jsonutils"
+	"yunion.io/x/jsonutils"
 )
 
 type CMD struct {

cmd/climc/shell/sms_configs.go

@@ -1,9 +1,9 @@
 package shell
 
 import (
-	"github.com/yunionio/jsonutils"
-	"github.com/yunionio/onecloud/pkg/mcclient"
-	"github.com/yunionio/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/jsonutils"
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
 )
 
 func init() {

cmd/climc/shell/specs.go

@@ -3,9 +3,9 @@ package shell
 import (
 	"fmt"
 
-	"github.com/yunionio/jsonutils"
-	"github.com/yunionio/onecloud/pkg/mcclient"
-	"github.com/yunionio/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/jsonutils"
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
 )
 
 func init() {

cmd/climc/shell/storagecachedimages.go

@@ -1,9 +1,9 @@
 package shell
 
 import (
-	"github.com/yunionio/jsonutils"
-	"github.com/yunionio/onecloud/pkg/mcclient"
-	"github.com/yunionio/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/jsonutils"
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
 )
 
 func init() {

cmd/climc/shell/storagecaches.go

@@ -1,9 +1,9 @@
 package shell
 
 import (
-	"github.com/yunionio/jsonutils"
-	"github.com/yunionio/onecloud/pkg/mcclient"
-	"github.com/yunionio/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/jsonutils"
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
 )
 
 func init() {

cmd/climc/shell/storages.go

@@ -3,9 +3,9 @@ package shell
 import (
 	"fmt"
 
-	"github.com/yunionio/jsonutils"
-	"github.com/yunionio/onecloud/pkg/mcclient"
-	"github.com/yunionio/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/jsonutils"
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
 )
 
 func init() {

cmd/climc/shell/tasks.go

@@ -1,8 +1,8 @@
 package shell
 
 import (
-	"github.com/yunionio/onecloud/pkg/mcclient"
-	"github.com/yunionio/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
 )
 
 func init() {

cmd/climc/shell/tenants.go

@@ -1,8 +1,8 @@
 package shell
 
 import (
-	"github.com/yunionio/onecloud/pkg/mcclient"
-	"github.com/yunionio/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
 )
 
 func init() {

cmd/climc/shell/treenodes.go

@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"strconv"
 
-	"github.com/yunionio/jsonutils"
-	"github.com/yunionio/onecloud/pkg/mcclient"
-	"github.com/yunionio/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/jsonutils"
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
 )
 
 func init() {

cmd/climc/shell/usages.go

@@ -1,9 +1,9 @@
 package shell
 
 import (
-	"github.com/yunionio/jsonutils"
-	"github.com/yunionio/onecloud/pkg/mcclient"
-	"github.com/yunionio/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/jsonutils"
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
 )
 
 type GeneralUsageOptions struct {

cmd/climc/shell/users.go

@@ -1,9 +1,9 @@
 package shell
 
 import (
-	"github.com/yunionio/jsonutils"
-	"github.com/yunionio/onecloud/pkg/mcclient"
-	"github.com/yunionio/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/jsonutils"
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
 )
 
 func init() {

cmd/climc/shell/utils.go

@@ -1,10 +1,10 @@
 package shell
 
 import (
-	"github.com/yunionio/jsonutils"
+	"yunion.io/x/jsonutils"
 
-	"github.com/yunionio/onecloud/pkg/mcclient/modules"
-	"github.com/yunionio/onecloud/pkg/util/printutils"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/onecloud/pkg/util/printutils"
 )
 
 func printList(list *modules.ListResult, columns []string) {

cmd/climc/shell/vcenters.go

@@ -1,9 +1,9 @@
 package shell
 
 import (
-	"github.com/yunionio/jsonutils"
-	"github.com/yunionio/onecloud/pkg/mcclient"
-	"github.com/yunionio/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/jsonutils"
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
 )
 
 func init() {

cmd/climc/shell/verification.go

@@ -1,9 +1,9 @@
 package shell
 
 import (
-	"github.com/yunionio/jsonutils"
-	"github.com/yunionio/onecloud/pkg/mcclient"
-	"github.com/yunionio/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/jsonutils"
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
 )
 
 func init() {

cmd/climc/shell/version.go

@@ -2,8 +2,8 @@ package shell
 
 import (
 	"fmt"
-	"github.com/yunionio/onecloud/pkg/mcclient"
-	"github.com/yunionio/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
 )
 
 func init() {

cmd/climc/shell/vncproxy.go

@@ -1,9 +1,9 @@
 package shell
 
 import (
-	"github.com/yunionio/jsonutils"
-	"github.com/yunionio/onecloud/pkg/mcclient"
-	"github.com/yunionio/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/jsonutils"
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
 )
 
 func init() {

cmd/climc/shell/vpcs.go

@@ -1,9 +1,9 @@
 package shell
 
 import (
-	"github.com/yunionio/jsonutils"
-	"github.com/yunionio/onecloud/pkg/mcclient"
-	"github.com/yunionio/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/jsonutils"
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
 )
 
 func init() {

cmd/climc/shell/wires.go

@@ -1,9 +1,9 @@
 package shell
 
 import (
-	"github.com/yunionio/jsonutils"
-	"github.com/yunionio/onecloud/pkg/mcclient"
-	"github.com/yunionio/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/jsonutils"
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
 )
 
 func init() {

cmd/climc/shell/zones.go

@@ -1,9 +1,9 @@
 package shell
 
 import (
-	"github.com/yunionio/jsonutils"
-	"github.com/yunionio/onecloud/pkg/mcclient"
-	"github.com/yunionio/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/jsonutils"
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
 )
 
 func init() {