解决冲突

Gopkg.lock

@@ -552,67 +552,25 @@
 
 [[projects]]
   branch = "master"
-  name = "github.com/yunionio/jsonutils"
-  packages = ["."]
-  revision = "895610f4e0f2f4bf3aebf016604e6fec39992fd8"
-
-[[projects]]
-  branch = "master"
-  name = "github.com/yunionio/log"
+  name = "github.com/vmware/govmomi"
   packages = [
     ".",
-    "hooks"
+    "nfc",
+    "object",
+    "property",
+    "session",
+    "task",
+    "view",
+    "vim25",
+    "vim25/debug",
+    "vim25/methods",
+    "vim25/mo",
+    "vim25/progress",
+    "vim25/soap",
+    "vim25/types",
+    "vim25/xml"
   ]
-  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"
+  revision = "bbd99532a768d2fe369079ceda730e30726ae1a6"
 
 [[projects]]
   branch = "master"
@@ -888,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 = "ac275c3d7f14e4a959b3029058a3bb40bb016860ad0e9794e7a396ba33e62048"
+  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
@@ -69,10 +71,6 @@
     name = "github.com/ugorji/go"
     revision = "f3cacc17c85ecb7f1b6a9e373ee85d1480919868"
 
-[[constraint]]
-  name = "github.com/coreos/etcd"
-  version = "3.3.5"
-
 [[constraint]]
   name = "github.com/coredns/coredns"
   version = "v1.2.0"
@@ -80,3 +78,8 @@
 [prune]
   go-tests = true
   unused-packages = true
+
+[[constraint]]
+  branch = "master"
+  name = "github.com/vmware/govmomi"
+

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,10 +4,12 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/yunionio/log"
-	"github.com/yunionio/structarg"
-	"github.com/yunionio/onecloud/pkg/util/aliyun"
-	"github.com/yunionio/onecloud/pkg/util/aliyun/shell"
+	"yunion.io/x/log"
+	"yunion.io/x/onecloud/pkg/util/aliyun"
+	"yunion.io/x/onecloud/pkg/util/shellutils"
+	"yunion.io/x/structarg"
+
+	_ "yunion.io/x/onecloud/pkg/util/aliyun/shell"
 )
 
 type BaseOptions struct {
@@ -35,7 +37,7 @@ func getSubcommandParser() (*structarg.ArgumentParser, error) {
 	type HelpOptions struct {
 		SUBCOMMAND string `help:"sub-command name"`
 	}
-	shell.R(&HelpOptions{}, "help", "Show help of a subcommand", func(args *HelpOptions) error {
+	shellutils.R(&HelpOptions{}, "help", "Show help of a subcommand", func(args *HelpOptions) error {
 		helpstr, e := subcmd.SubHelpString(args.SUBCOMMAND)
 		if e != nil {
 			return e
@@ -44,7 +46,7 @@ func getSubcommandParser() (*structarg.ArgumentParser, error) {
 			return nil
 		}
 	})
-	for _, v := range shell.CommandTable {
+	for _, v := range shellutils.CommandTable {
 		_, e := subcmd.AddSubParser(v.Options, v.Command, v.Desc, v.Callback)
 		if e != nil {
 			return nil, e

cmd/climc/climc.go

@@ -1,18 +1,22 @@
 package main
 
 import (
+	"encoding/json"
 	"fmt"
+	"io/ioutil"
 	"os"
 	"strings"
+	"time"
 
-	"github.com/c-bata/go-prompt"
-	"github.com/yunionio/log"
-	"github.com/yunionio/pkg/util/version"
-	"github.com/yunionio/structarg"
+	prompt "github.com/c-bata/go-prompt"
+	"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/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 {
@@ -116,18 +120,51 @@ func newClientSession(options *BaseOptions) (*mcclient.ClientSession, error) {
 		options.Timeout,
 		options.Debug,
 		options.Secure)
-	token, err := client.Authenticate(options.OsUsername,
-		options.OsPassword,
-		options.OsDomainName,
-		options.OsProjectName)
-	if err != nil {
-		return nil, err
+
+	var cacheToken mcclient.TokenCredential
+	cacheFile, err := os.Open("/tmp/OS_AUTH_CACHE_TOKEN")
+	if err == nil && cacheFile != nil {
+		fileInfo, _ := cacheFile.Stat()
+		dur, err := time.ParseDuration("-24h")
+		if fileInfo != nil && err == nil && fileInfo.ModTime().After(time.Now().Add(dur)) {
+			bytesToken, err := ioutil.ReadAll(cacheFile)
+			if err == nil {
+				token := client.NewAuthTokenCredential()
+				err := json.Unmarshal(bytesToken, token)
+				if err != nil {
+					fmt.Printf("Unmarshal token error:%s", err)
+				} else {
+					cacheToken = token
+				}
+			}
+			cacheFile.Close()
+		}
+	}
+	if cacheToken == nil {
+		token, err := client.Authenticate(options.OsUsername,
+			options.OsPassword,
+			options.OsDomainName,
+			options.OsProjectName)
+		if err != nil {
+			return nil, err
+		}
+		cacheToken = token
+		bytesCacheToken, err := json.Marshal(cacheToken)
+		if err != nil {
+			fmt.Printf("Marshal token error:%s", err)
+		} else {
+			fo, _ := os.Create("/tmp/OS_AUTH_CACHE_TOKEN")
+			fo.Write(bytesCacheToken)
+			fo.Close()
+		}
+	} else {
+		fmt.Println("******** Use Token Cache At /tmp/OS_AUTH_CACHE_TOKEN ********")
 	}
 
 	session := client.NewSession(options.OsRegionName,
 		options.OsZoneName,
 		options.OsEndpointType,
-		token,
+		cacheToken,
 		options.ApiVersion)
 	return session, nil
 }
@@ -144,7 +181,7 @@ func main() {
 		fmt.Print(parser.HelpString())
 	} else if options.Version {
 		fmt.Printf("Yunion API client version:\n %s\n", version.GetJsonString())
-	} else if len(os.Args) <= 1 {
+	} else if len(options.SUBCOMMAND) == 0 {
 		session, e := newClientSession(options)
 		if e != nil {
 			showErrorAndExit(e)

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 (
@@ -55,6 +55,11 @@ func Executor(s string) {
 	e := parser.ParseArgs(strings.Split(s, " "), false)
 	subcmd := parser.GetSubcommand()
 	subparser := subcmd.GetSubParser()
+	if args[0] == "--debug" {
+		session.GetClient().SetDebug(true)
+	} else {
+		session.GetClient().SetDebug(false)
+	}
 	if e != nil {
 		if subparser != nil {
 			fmt.Print(subparser.Usage())

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() {
@@ -142,6 +142,7 @@ func init() {
 	type CloudproviderSyncOptions struct {
 		ID     string   `help:"ID or Name of cloud provider"`
 		Force  bool     `help:"Force sync no matter what"`
+		FullSync bool   `help:"Synchronize everything"`
 		Region []string `help:"region to sync"`
 		Zone   []string `help:"region to sync"`
 		Host   []string `help:"region to sync"`
@@ -151,6 +152,9 @@ func init() {
 		if args.Force {
 			params.Add(jsonutils.JSONTrue, "force")
 		}
+		if args.FullSync {
+			params.Add(jsonutils.JSONTrue, "full_sync")
+		}
 		if len(args.Region) > 0 {
 			params.Add(jsonutils.NewStringArray(args.Region), "region")
 		}

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 {
@@ -30,7 +30,7 @@ type TypeEventListOptions struct {
 }
 
 func doK8sEventList(s *mcclient.ClientSession, args *EventListOptions) error {
-	return doEventList(k8s.Logs, s, args)
+	return doEventList(*k8s.Logs, s, args)
 }
 
 func doComputeEventList(s *mcclient.ClientSession, args *EventListOptions) error {

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

@@ -1,22 +1,17 @@
-package shell
+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 init() {
-	initCluster()
-	initNode()
-}
-
 func initCluster() {
 	cmdN := func(suffix string) string {
-		return fmt.Sprintf("k8s-cluster-%s", suffix)
+		return resourceCmdN("cluster", suffix)
 	}
 	type listOpt struct {
 		BaseListOptions
@@ -175,119 +170,3 @@ func initCluster() {
 		return nil
 	})
 }
-
-func initNode() {
-	cmdN := func(suffix string) string {
-		return fmt.Sprintf("k8s-node-%s", suffix)
-	}
-	type listOpt struct {
-		BaseListOptions
-	}
-	R(&listOpt{}, cmdN("list"), "List k8s node", func(s *mcclient.ClientSession, args *listOpt) error {
-		args.Details = true
-		params := FetchPagingParams(args.BaseListOptions)
-		result, err := k8s.Nodes.List(s, params)
-		if err != nil {
-			return err
-		}
-		printList(result, k8s.Nodes.GetColumns(s))
-		return nil
-	})
-
-	type dockerConfig struct {
-		RegistryMirrors    []string `json:"registry-mirrors"`
-		InsecureRegistries []string `json:"insecure-registries"`
-	}
-
-	type createOpt struct {
-		CLUSTER          string   `help:"Cluster id"`
-		Etcd             bool     `help:"Etcd role"`
-		Controlplane     bool     `help:"Controlplane role"`
-		Worker           bool     `help:"Worker role"`
-		AllRole          bool     `help:"All roles"`
-		HostnameOverride string   `help:"Worker node overrided hostname"`
-		Host             string   `help:"Yunion host server name or id"`
-		Name             string   `help:"Name of node"`
-		RegistryMirror   []string `help:"Docker registry mirrors, e.g. 'https://registry.docker-cn.com'"`
-		InsecureRegistry []string `help:"Docker insecure registry"`
-	}
-	R(&createOpt{}, cmdN("create"), "Create k8s cluster node", func(s *mcclient.ClientSession, args *createOpt) error {
-		params := jsonutils.NewDict()
-		if args.Name != "" {
-			params.Add(jsonutils.NewString(args.Name), "name")
-		}
-		params.Add(jsonutils.NewString(args.CLUSTER), "cluster")
-
-		dockerConf := dockerConfig{}
-		for _, rm := range args.RegistryMirror {
-			dockerConf.RegistryMirrors = append(dockerConf.RegistryMirrors, rm)
-		}
-		for _, im := range args.InsecureRegistry {
-			dockerConf.InsecureRegistries = append(dockerConf.InsecureRegistries, im)
-		}
-		confObj := jsonutils.Marshal(dockerConf)
-		params.Add(confObj, "dockerd_config")
-
-		roles := jsonutils.NewArray()
-		if args.AllRole {
-			roles.Add(jsonutils.NewString("etcd"), jsonutils.NewString("controlplane"), jsonutils.NewString("worker"))
-		} else {
-			if args.Etcd {
-				roles.Add(jsonutils.NewString("etcd"))
-			}
-			if args.Controlplane {
-				roles.Add(jsonutils.NewString("controlplane"))
-			}
-			if args.Worker {
-				roles.Add(jsonutils.NewString("worker"))
-			}
-		}
-		params.Add(roles, "roles")
-		if args.HostnameOverride != "" {
-			params.Add(jsonutils.NewString(args.HostnameOverride), "hostname_override")
-		}
-		if args.Host != "" {
-			params.Add(jsonutils.NewString(args.Host), "host")
-		}
-		node, err := k8s.Nodes.Create(s, params)
-		if err != nil {
-			return err
-		}
-		printObject(node)
-		return nil
-	})
-
-	type identOpt struct {
-		ID string `help:"ID or name of the node"`
-	}
-
-	type identsOpt struct {
-		ID []string `help:"ID or name of the nodes"`
-	}
-	type deleteOpt struct {
-		identsOpt
-	}
-	R(&deleteOpt{}, cmdN("delete"), "Delete node", func(s *mcclient.ClientSession, args *deleteOpt) error {
-		ret := k8s.Nodes.BatchDeleteWithParam(s, args.ID, nil, nil)
-		printBatchResults(ret, k8s.Nodes.GetColumns(s))
-		return nil
-	})
-
-	R(&identOpt{}, cmdN("show"), "Show node details", func(s *mcclient.ClientSession, args *identOpt) error {
-		obj, err := k8s.Nodes.Get(s, args.ID, nil)
-		if err != nil {
-			return err
-		}
-		printObject(obj)
-		return nil
-	})
-
-	R(&identOpt{}, cmdN("dockerconfig"), "Get docker daemon config", func(s *mcclient.ClientSession, args *identOpt) error {
-		ret, err := k8s.Nodes.GetSpecific(s, args.ID, "docker-config", nil)
-		if err != nil {
-			return err
-		}
-		fmt.Println(ret)
-		return nil
-	})
-}

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

@@ -0,0 +1,55 @@
+package k8s
+
+import (
+	"fmt"
+
+	"yunion.io/x/jsonutils"
+
+	"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() {
+	initCluster()
+	initNode()
+	initPod()
+}
+
+type BaseListOptions shell.BaseListOptions
+
+type clusterBaseOptions struct {
+	Cluster string `default:"$K8S_CLUSTER" help:"Kubernetes cluster name"`
+}
+
+func (o clusterBaseOptions) ClusterContext() []modules.ManagerContext {
+	return []modules.ManagerContext{clusterContext(o.Cluster)}
+}
+
+type k8sBaseListOptions struct {
+	clusterBaseOptions
+	Limit int `default:"20" help:"Page limit"`
+}
+
+var (
+	R                 = shell.R
+	printList         = printutils.PrintJSONList
+	printObject       = printutils.PrintJSONObject
+	printBatchResults = printutils.PrintJSONBatchResults
+)
+
+func FetchPagingParams(o BaseListOptions) jsonutils.JSONObject {
+	return shell.FetchPagingParams(shell.BaseListOptions(o))
+}
+
+func resourceCmdN(prefix, suffix string) string {
+	return fmt.Sprintf("k8s-%s-%s", prefix, suffix)
+}
+
+func clusterContext(clusterId string) modules.ManagerContext {
+	return modules.ManagerContext{
+		InstanceManager: k8s.Clusters,
+		InstanceId:      clusterId,
+	}
+}

cmd/climc/shell/k8s/nodes.go

@@ -0,0 +1,126 @@
+package k8s
+
+import (
+	"fmt"
+
+	"yunion.io/x/jsonutils"
+
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modules/k8s"
+)
+
+func initNode() {
+	cmdN := func(suffix string) string {
+		return resourceCmdN("node", suffix)
+	}
+	type listOpt struct {
+		BaseListOptions
+	}
+	R(&listOpt{}, cmdN("list"), "List k8s node", func(s *mcclient.ClientSession, args *listOpt) error {
+		args.Details = true
+		params := FetchPagingParams(args.BaseListOptions)
+		result, err := k8s.Nodes.List(s, params)
+		if err != nil {
+			return err
+		}
+		printList(result, k8s.Nodes.GetColumns(s))
+		return nil
+	})
+
+	type dockerConfig struct {
+		RegistryMirrors    []string `json:"registry-mirrors"`
+		InsecureRegistries []string `json:"insecure-registries"`
+	}
+
+	type createOpt struct {
+		CLUSTER          string   `help:"Cluster id"`
+		Etcd             bool     `help:"Etcd role"`
+		Controlplane     bool     `help:"Controlplane role"`
+		Worker           bool     `help:"Worker role"`
+		AllRole          bool     `help:"All roles"`
+		HostnameOverride string   `help:"Worker node overrided hostname"`
+		Host             string   `help:"Yunion host server name or id"`
+		Name             string   `help:"Name of node"`
+		RegistryMirror   []string `help:"Docker registry mirrors, e.g. 'https://registry.docker-cn.com'"`
+		InsecureRegistry []string `help:"Docker insecure registry"`
+	}
+	R(&createOpt{}, cmdN("create"), "Create k8s cluster node", func(s *mcclient.ClientSession, args *createOpt) error {
+		params := jsonutils.NewDict()
+		if args.Name != "" {
+			params.Add(jsonutils.NewString(args.Name), "name")
+		}
+		params.Add(jsonutils.NewString(args.CLUSTER), "cluster")
+
+		dockerConf := dockerConfig{}
+		for _, rm := range args.RegistryMirror {
+			dockerConf.RegistryMirrors = append(dockerConf.RegistryMirrors, rm)
+		}
+		for _, im := range args.InsecureRegistry {
+			dockerConf.InsecureRegistries = append(dockerConf.InsecureRegistries, im)
+		}
+		confObj := jsonutils.Marshal(dockerConf)
+		params.Add(confObj, "dockerd_config")
+
+		roles := jsonutils.NewArray()
+		if args.AllRole {
+			roles.Add(jsonutils.NewString("etcd"), jsonutils.NewString("controlplane"), jsonutils.NewString("worker"))
+		} else {
+			if args.Etcd {
+				roles.Add(jsonutils.NewString("etcd"))
+			}
+			if args.Controlplane {
+				roles.Add(jsonutils.NewString("controlplane"))
+			}
+			if args.Worker {
+				roles.Add(jsonutils.NewString("worker"))
+			}
+		}
+		params.Add(roles, "roles")
+		if args.HostnameOverride != "" {
+			params.Add(jsonutils.NewString(args.HostnameOverride), "hostname_override")
+		}
+		if args.Host != "" {
+			params.Add(jsonutils.NewString(args.Host), "host")
+		}
+		node, err := k8s.Nodes.Create(s, params)
+		if err != nil {
+			return err
+		}
+		printObject(node)
+		return nil
+	})
+
+	type identOpt struct {
+		ID string `help:"ID or name of the node"`
+	}
+
+	type identsOpt struct {
+		ID []string `help:"ID or name of the nodes"`
+	}
+	type deleteOpt struct {
+		identsOpt
+	}
+	R(&deleteOpt{}, cmdN("delete"), "Delete node", func(s *mcclient.ClientSession, args *deleteOpt) error {
+		ret := k8s.Nodes.BatchDeleteWithParam(s, args.ID, nil, nil)
+		printBatchResults(ret, k8s.Nodes.GetColumns(s))
+		return nil
+	})
+
+	R(&identOpt{}, cmdN("show"), "Show node details", func(s *mcclient.ClientSession, args *identOpt) error {
+		obj, err := k8s.Nodes.Get(s, args.ID, nil)
+		if err != nil {
+			return err
+		}
+		printObject(obj)
+		return nil
+	})
+
+	R(&identOpt{}, cmdN("dockerconfig"), "Get docker daemon config", func(s *mcclient.ClientSession, args *identOpt) error {
+		ret, err := k8s.Nodes.GetSpecific(s, args.ID, "docker-config", nil)
+		if err != nil {
+			return err
+		}
+		fmt.Println(ret)
+		return nil
+	})
+}

cmd/climc/shell/k8s/pods.go

@@ -0,0 +1,26 @@
+package k8s
+
+import (
+	"fmt"
+
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modules/k8s"
+)
+
+func initPod() {
+	cmdN := func(suffix string) string {
+		return resourceCmdN("pod", suffix)
+	}
+
+	type listOpt struct {
+		k8sBaseListOptions
+	}
+	R(&listOpt{}, cmdN("list"), "List k8s pod", func(s *mcclient.ClientSession, args *listOpt) error {
+		ret, err := k8s.Pods.ListInContexts(s, nil, args.ClusterContext())
+		if err != nil {
+			return err
+		}
+		fmt.Println(ret)
+		return nil
+	})
+}

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 {
@@ -311,7 +311,7 @@ func init() {
 		return nil
 	})
 
-	R(&ServerOpsOptions{}, "server-sync", "Sync servers status", func(s *mcclient.ClientSession, args *ServerOpsOptions) error {
+	R(&ServerOpsOptions{}, "server-sync", "Sync servers configures", func(s *mcclient.ClientSession, args *ServerOpsOptions) error {
 		ret := modules.Servers.BatchPerformAction(s, args.ID, "sync", nil)
 		printBatchResults(ret, modules.Servers.GetColumns(s))
 		return nil

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,20 +1,20 @@
 package shell
 
 import (
-	"github.com/yunionio/jsonutils"
+	"yunion.io/x/jsonutils"
 
-	"github.com/yunionio/onecloud/pkg/mcclient/modules"
-	"github.com/yunionio/onecloud/pkg/util/printjson"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/onecloud/pkg/util/printutils"
 )
 
 func printList(list *modules.ListResult, columns []string) {
-	printjson.PrintList(list, columns)
+	printutils.PrintJSONList(list, columns)
 }
 
 func printObject(obj jsonutils.JSONObject) {
-	printjson.PrintObject(obj)
+	printutils.PrintJSONObject(obj)
 }
 
 func printBatchResults(results []modules.SubmitResult, columns []string) {
-	printjson.PrintBatchResults(results, columns)
+	printutils.PrintJSONBatchResults(results, columns)
 }

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() {