Merge pull request #9113 from yousong/automated-cherry-pick-of-#9109-upstream-release-3.3

Automated cherry pick of #9109: fix(host): make sure it won't match vpc guests by accident

.circleci/config.yml

@@ -13,7 +13,7 @@ jobs:
       - checkout
       - run:
           command: |
-            make check
+            make -j3 check
   build:
     requires:
       - check
@@ -38,7 +38,7 @@ jobs:
           command: |
             targets="$(circleci tests glob "cmd/*" | grep -v cmd/host-image | circleci tests split)"
             echo $targets | tr ' ' '\n'
-            make $targets
+            make -j2 $targets
             ls -lh _output/bin/
       - save_cache:
           key: onecloud-build-cache-{{ checksum "go.mod" }}-{{ checksum "Makefile" }}
@@ -55,6 +55,7 @@ jobs:
         environment:
           GO111MODULE: "on"
     working_directory: /root/go/onecloud
+    parallelism: 4
     steps:
       - checkout
       - restore_cache:

.github/workflows/docker.yml

@@ -36,7 +36,7 @@ jobs:
         make cmd/ansibleserver cmd/cloudnet cmd/notify
         make cmd/host-deployer && ./scripts/bundle_libraries.sh _output/bin/bundles/host-deployer _output/bin/host-deployer
         make cmd/baremetal-agent && ./scripts/bundle_libraries.sh _output/bin/bundles/baremetal-agent _output/bin/baremetal-agent
-        make cmd/cloudevent cmd/devtool
+        make cmd/cloudevent cmd/devtool cmd/cloudid
         make cmd/*cli
         make cmd/esxi-agent
         make docker-alpine-build F='-j4 cmd/host cmd/vpcagent cmd/region-dns'
@@ -211,6 +211,16 @@ jobs:
         snapshot: true
         dockerfile: build/docker/Dockerfile.cloudevent
 
+    - name: Image cloudid
+      uses: elgohr/Publish-Docker-Github-Action@master
+      with:
+        name: registry.cn-beijing.aliyuncs.com/yunionio/cloudid
+        username: ${{ secrets.DOCKER_USERNAME }}
+        password: ${{ secrets.DOCKER_PASSWORD }}
+        registry: registry.cn-beijing.aliyuncs.com
+        snapshot: true
+        dockerfile: build/docker/Dockerfile.cloudid
+
     - name: Image devtool
       uses: elgohr/Publish-Docker-Github-Action@master
       with:

.gitignore

@@ -35,3 +35,5 @@ GPATH
 GRTAGS
 GTAGS
 pkg/generated
+
+*.orig

Makefile

@@ -163,9 +163,15 @@ goimports-check:
 	fi
 .PHONY: goimports-check
 
+vet-check:
+	./scripts/vet.sh gen
+	./scripts/vet.sh chk
+.PHONY: vet-check
+
 check: fmt-check
 check: gendocgo-check
 check: goimports-check
+check: vet-check
 .PHONY: check
 
 
@@ -291,9 +297,11 @@ gen-swagger: gen-swagger-check
 	$(ROOT_DIR)/scripts/codegen.py swagger-code
 	$(ROOT_DIR)/scripts/codegen.py swagger-yaml
 
-swagger-serve: gen-model-api gen-swagger
+swagger-serve-only:
 	$(ROOT_DIR)/scripts/codegen.py swagger-serve
 
+swagger-serve: gen-model-api gen-swagger swagger-serve-only
+
 swagger-site: gen-model-api gen-swagger
 	$(ROOT_DIR)/scripts/codegen.py swagger-site
 

README.md

@@ -1,7 +1,7 @@
 # Yunion OneCloud
 
 [![CircleCI](https://circleci.com/gh/yunionio/onecloud.svg?style=svg)](https://circleci.com/gh/yunionio/onecloud) 
-[![Build Status](https://travis-ci.com/yunionio/onecloud.svg?branch=master)](https://travis-ci.org/yunionio/onecloud) 
+[![Build Status](https://travis-ci.com/yunionio/onecloud.svg?branch=master)](https://travis-ci.com/yunionio/onecloud/branches) 
 [![Go Report Card](https://goreportcard.com/badge/github.com/yunionio/onecloud)](https://goreportcard.com/report/github.com/yunionio/onecloud) 
 
 ### [README in Chinese](./README-CN.md)
@@ -40,7 +40,7 @@ Please refers to [install & deployment](https://docs.yunion.io/docs/setup/) (cur
 
 - [Yunion OneCloud Documents](https://docs.yunion.io/)
 
-- [Swagger API](https://docs.yunion.cn/api/)
+- [Swagger API](https://docs.yunion.cn/apiv2/)
 
 ## Architecture
 

build/cloudid/vars

@@ -0,0 +1 @@
+DESCRIPTION="Yunion CloudId"

build/docker/Dockerfile.ansibleserver

@@ -1,3 +1,3 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/ansibleserver-base:latest
+FROM registry.cn-beijing.aliyuncs.com/yunionio/ansibleserver-base:1.0.0
 
-ADD ./_output/bin/ansibleserver /opt/yunion/bin/ansibleserver
+ADD ./_output/alpine-build/bin/ansibleserver /opt/yunion/bin/ansibleserver

build/docker/Dockerfile.ansibleserver-base

@@ -1,13 +1,12 @@
-FROM frolvlad/alpine-glibc:glibc-2.28
+FROM alpine:3.11.6
 
-MAINTAINER "Zexi Li <lizexi@yunionyun.com>"
+MAINTAINER "Yousong Zhou <zhouyousong@yunionyun.com>"
 
-ENV TZ Asia/Shanghai
-
-RUN mkdir -p /opt/yunion/bin
-
-RUN apk update && \
-    apk add --no-cache tzdata ansible ca-certificates && \
-    rm -rf /var/cache/apk/*
-
-RUN cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
+# openssh-client, for ansible ssh connection
+# git, ca-certificates, for fetching ansible roles
+RUN set -x \
+	&& apk update \
+	&& apk add openssh-client \
+	&& apk add ansible \
+	&& apk add tzdata git ca-certificates \
+	&& rm -rf /var/cache/apk/*

build/docker/Dockerfile.apigateway

@@ -1,3 +1,3 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:latest
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.1
 
 ADD ./_output/bin/apigateway /opt/yunion/bin/apigateway

build/docker/Dockerfile.cloudevent

@@ -1,3 +1,3 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:latest
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.1
 
 ADD ./_output/bin/cloudevent /opt/yunion/bin/cloudevent

build/docker/Dockerfile.cloudid

@@ -0,0 +1,3 @@
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.1
+
+ADD ./_output/bin/cloudid /opt/yunion/bin/cloudid

build/docker/Dockerfile.cloudnet

@@ -1,3 +1,3 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:latest
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.1
 
 ADD ./_output/bin/cloudnet /opt/yunion/bin/cloudnet

build/docker/Dockerfile.devtool

@@ -1,3 +1,3 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:latest
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.1
 
 ADD ./_output/bin/devtool /opt/yunion/bin/devtool

build/docker/Dockerfile.esxi-agent

@@ -1,4 +1,4 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:latest
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.1
 
 COPY ./build/esxi-agent/root/opt/ /opt/
 ADD ./_output/bin/esxi-agent /opt/yunion/bin/esxi-agent

build/docker/Dockerfile.host

@@ -1,4 +1,4 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/host-base:v0.1.0
+FROM registry.cn-beijing.aliyuncs.com/yunionio/host-base:v0.2.0
 
 MAINTAINER "Yaoqi Wan wanyaoqi@yunionyun.com"
 

build/docker/Dockerfile.keystone

@@ -1,3 +1,3 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:latest
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.1
 
 ADD ./_output/bin/keystone /opt/yunion/bin/keystone

build/docker/Dockerfile.logger

@@ -1,4 +1,4 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:latest
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.1
 
 ADD ./_output/bin/logger /opt/yunion/bin/logger
 

build/docker/Dockerfile.monitor

@@ -1,4 +1,4 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:latest
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.1
 
 ADD ./_output/bin/monitor /opt/yunion/bin/monitor
 

build/docker/Dockerfile.notify

@@ -1,4 +1,4 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:latest
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.1
 
 COPY ./build/notify/root/opt/ /opt/
 ADD ./_output/bin/notify /opt/yunion/bin/notify

build/docker/Dockerfile.onecloud-base

@@ -7,7 +7,7 @@ ENV TZ Asia/Shanghai
 RUN mkdir -p /opt/yunion/bin
 
 RUN apk update && \
-    apk add --no-cache tzdata ca-certificates && \
+    apk add --no-cache tzdata curl busybox-extras tcpdump strace ca-certificates && \
     rm -rf /var/cache/apk/*
 
 RUN cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime

build/docker/Dockerfile.region

@@ -1,4 +1,4 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:latest
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.1
 
 COPY ./build/region/root/opt/ /opt/
 ADD ./_output/bin/region /opt/yunion/bin/region

build/docker/Dockerfile.s3gateway

@@ -1,3 +1,3 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:latest
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.1
 
 ADD ./_output/bin/s3gateway /opt/yunion/bin/s3gateway

build/docker/Dockerfile.scheduler

@@ -1,3 +1,3 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:latest
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.1
 
 ADD ./_output/bin/scheduler /opt/yunion/bin/scheduler

build/docker/Dockerfile.vpcagent

@@ -1,4 +1,4 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/openvswitch:2.9.6-1
+FROM registry.cn-beijing.aliyuncs.com/yunionio/openvswitch:2.10.4-0
 
 MAINTAINER "Yousong Zhou <zhouyousong@yunion.cn>"
 

build/docker/Dockerfile.yunionconf

@@ -1,4 +1,4 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:latest
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.1
 
 ADD ./_output/bin/yunionconf /opt/yunion/bin/yunionconf
 

build/notify/root/opt/yunion/share/template/remote/VERIFY.mobile

@@ -1 +0,0 @@
-SMS_126915025

cmd/climc/entry/climc.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package main
+package entry
 
 import (
 	"context"
@@ -32,10 +32,6 @@ import (
 
 	"yunion.io/x/onecloud/cmd/climc/promputils"
 	"yunion.io/x/onecloud/cmd/climc/shell"
-	_ "yunion.io/x/onecloud/cmd/climc/shell/cloudnet"
-	_ "yunion.io/x/onecloud/cmd/climc/shell/etcd"
-	_ "yunion.io/x/onecloud/cmd/climc/shell/k8s"
-	_ "yunion.io/x/onecloud/cmd/climc/shell/monitor"
 	"yunion.io/x/onecloud/pkg/mcclient"
 )
 
@@ -49,7 +45,7 @@ type BaseOptions struct {
 	CertFile string `default:"$YUNION_CERT_FILE" help:"certificate file"`
 	KeyFile  string `default:"$YUNION_KEY_FILE" help:"private key file"`
 
-	Completion     string `default:"" help:"Generate climc auto complete script" choices:"bash"`
+	Completion     string `default:"" help:"Generate climc auto complete script" choices:"bash|zsh"`
 	UseCachedToken bool   `default:"$YUNION_USE_CACHED_TOKEN|false" help:"Use cached token"`
 
 	OsUsername string `default:"$OS_USERNAME" help:"Username, defaults to env[OS_USERNAME]"`
@@ -62,6 +58,8 @@ type BaseOptions struct {
 	OsAccessKey string `default:"$OS_ACCESS_KEY" help:"ak/sk access key, defaults to env[OS_ACCESS_KEY]"`
 	OsSecretKey string `default:"$OS_SECRET_KEY" help:"ak/s secret, defaults to env[OS_SECRET_KEY]"`
 
+	OsAuthToken string `default:"$OS_AUTH_TOKEN" help:"token authenticate, defaults to env[OS_AUTH_TOKEN]"`
+
 	OsAuthURL string `default:"$OS_AUTH_URL" help:"Defaults to env[OS_AUTH_URL]"`
 
 	OsRegionName   string `default:"$OS_REGION_NAME" help:"Defaults to env[OS_REGION_NAME]"`
@@ -73,9 +71,13 @@ type BaseOptions struct {
 }
 
 func getSubcommandsParser() (*structarg.ArgumentParser, error) {
+	var (
+		prog = "climc"
+		desc = `Command-line interface to the API server.`
+	)
 	parse, e := structarg.NewArgumentParser(&BaseOptions{},
-		"climc",
-		`Command-line interface to the API server.`,
+		prog,
+		desc,
 		`See "climc help COMMAND" for help on a specific command.`)
 	if e != nil {
 		return nil, e
@@ -96,26 +98,28 @@ func getSubcommandsParser() (*structarg.ArgumentParser, error) {
 			return nil
 		}
 	})
+
+	promptRootCmd := promputils.InitRootCmd(prog, desc, parse.GetOptArgs(), parse.GetPosArgs())
 	for _, v := range shell.CommandTable {
 		_par, e := subcmd.AddSubParser(v.Options, v.Command, v.Desc, v.Callback)
 
 		if e != nil {
 			return nil, e
 		}
-		promputils.AppendCommand(v.Command, v.Desc)
+		promputils.AppendCommand(promptRootCmd, v.Command, v.Desc)
 		cmd := v.Command
 
 		for _, v := range _par.GetOptArgs() {
 			text := v.String()
 			text = strings.TrimLeft(text, "[<")
 			text = strings.TrimRight(text, "]>")
-			promputils.AppendOpt(cmd, text, v.HelpString(""))
+			promputils.AppendOpt(cmd, text, v.HelpString(""), v)
 		}
 		for _, v := range _par.GetPosArgs() {
 			text := v.String()
 			text = strings.TrimLeft(text, "[<")
 			text = strings.TrimRight(text, "]>")
-			promputils.AppendPos(cmd, text, v.HelpString(""))
+			promputils.AppendPos(cmd, text, v.HelpString(""), v)
 		}
 	}
 	return parse, nil
@@ -131,8 +135,8 @@ func newClientSession(options *BaseOptions) (*mcclient.ClientSession, error) {
 	if len(options.OsAuthURL) == 0 {
 		return nil, fmt.Errorf("Missing OS_AUTH_URL")
 	}
-	if len(options.OsUsername) == 0 && len(options.OsAccessKey) == 0 {
-		return nil, fmt.Errorf("Missing OS_USERNAME or OS_ACCESS_KEY")
+	if len(options.OsUsername) == 0 && len(options.OsAccessKey) == 0 && len(options.OsAuthToken) == 0 {
+		return nil, fmt.Errorf("Missing OS_USERNAME or OS_ACCESS_KEY or OS_AUTH_TOKEN")
 	}
 	if len(options.OsUsername) > 0 && len(options.OsPassword) == 0 {
 		return nil, fmt.Errorf("Missing OS_PASSWORD")
@@ -140,9 +144,6 @@ func newClientSession(options *BaseOptions) (*mcclient.ClientSession, error) {
 	if len(options.OsAccessKey) > 0 && len(options.OsSecretKey) == 0 {
 		return nil, fmt.Errorf("Missing OS_SECRET_KEY")
 	}
-	if len(options.OsRegionName) == 0 {
-		return nil, fmt.Errorf("Missing OS_REGION_NAME")
-	}
 
 	logLevel := "info"
 	if options.Debug {
@@ -185,7 +186,11 @@ func newClientSession(options *BaseOptions) (*mcclient.ClientSession, error) {
 	if cacheToken == nil {
 		var token mcclient.TokenCredential
 		var err error
-		if len(options.OsAccessKey) > 0 {
+		if len(options.OsAuthToken) > 0 {
+			token, err = client.AuthenticateToken(options.OsAuthToken, options.OsProjectName,
+				options.OsProjectDomain,
+				mcclient.AuthSourceCli)
+		} else if len(options.OsAccessKey) > 0 {
 			token, err = client.AuthenticateByAccessKey(options.OsAccessKey,
 				options.OsSecretKey, mcclient.AuthSourceCli)
 		} else {
@@ -261,7 +266,7 @@ func executeSubcommand(
 	}
 }
 
-func main() {
+func ClimcMain() {
 	parser, e := getSubcommandsParser()
 	if e != nil {
 		showErrorAndExit(e)
@@ -270,7 +275,7 @@ func main() {
 	options := parser.Options().(*BaseOptions)
 
 	if len(options.Completion) > 0 {
-		completeScript := promputils.GenerateAutoCompleteCmds(options.Completion)
+		completeScript := promputils.GenerateAutoCompleteCmds(promputils.GetRootCmd(), options.Completion)
 		if len(completeScript) > 0 {
 			fmt.Printf("%s", completeScript)
 		}

cmd/climc/entry/doc.go

@@ -1,4 +1,4 @@
-// Copyright 2017, OpenCensus Authors
+// Copyright 2019 Yunion
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -12,8 +12,4 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// Package ocgrpc contains OpenCensus stats and trace
-// integrations for gRPC.
-//
-// Use ServerHandler for servers and ClientHandler for clients.
-package ocgrpc // import "go.opencensus.io/plugin/ocgrpc"
+package entry // import "yunion.io/x/onecloud/cmd/climc/entry"

cmd/climc/main.go

@@ -0,0 +1,42 @@
+// Copyright 2019 Yunion
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import (
+	"yunion.io/x/onecloud/cmd/climc/entry"
+	_ "yunion.io/x/onecloud/cmd/climc/shell"
+	_ "yunion.io/x/onecloud/cmd/climc/shell/ansible"
+	_ "yunion.io/x/onecloud/cmd/climc/shell/cloudevent"
+	_ "yunion.io/x/onecloud/cmd/climc/shell/cloudid"
+	_ "yunion.io/x/onecloud/cmd/climc/shell/cloudnet"
+	_ "yunion.io/x/onecloud/cmd/climc/shell/compute"
+	_ "yunion.io/x/onecloud/cmd/climc/shell/etcd"
+	_ "yunion.io/x/onecloud/cmd/climc/shell/events"
+	_ "yunion.io/x/onecloud/cmd/climc/shell/identity"
+	_ "yunion.io/x/onecloud/cmd/climc/shell/image"
+	_ "yunion.io/x/onecloud/cmd/climc/shell/itsm"
+	_ "yunion.io/x/onecloud/cmd/climc/shell/k8s"
+	_ "yunion.io/x/onecloud/cmd/climc/shell/logger"
+	_ "yunion.io/x/onecloud/cmd/climc/shell/meter"
+	_ "yunion.io/x/onecloud/cmd/climc/shell/misc"
+	_ "yunion.io/x/onecloud/cmd/climc/shell/monitor"
+	_ "yunion.io/x/onecloud/cmd/climc/shell/notify"
+	_ "yunion.io/x/onecloud/cmd/climc/shell/servicetree"
+	_ "yunion.io/x/onecloud/cmd/climc/shell/yunionconf"
+)
+
+func main() {
+	entry.ClimcMain()
+}

cmd/climc/promputils/complete_zsh.go

@@ -0,0 +1,178 @@
+// Copyright 2019 Yunion
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package promputils
+
+import (
+	"fmt"
+	"io"
+	"strings"
+	"text/template"
+
+	"yunion.io/x/structarg"
+)
+
+// ref: https://github.com/spf13/cobra/blob/master/zsh_completions.go
+
+var (
+	zshCompFuncMap = template.FuncMap{
+		"genZshFuncName":              zshCompGenFuncName,
+		"extractFlags":                zshCompExtractFlag,
+		"genFlagEntryForZshArguments": zshCompGenFlagEntryForArguments,
+		"extractArgsCompletions":      zshCompExtractArgumentCompletionHintsForRendering,
+	}
+	zshCompletionText = `
+{{/* should accept Command (that contains subcommands) as parameter */}}
+{{define "argumentsC" -}}
+{{ $cmdPath := genZshFuncName .}}
+function {{$cmdPath}} {
+	local -a commands
+	_arguments -C \{{- range extractFlags .}}
+	  {{genFlagEntryForZshArguments .}} \{{- end}}
+	  "1: :->cmnds" \
+	  "*::arg:->args"
+
+	case $state in
+	cmnds)
+	  commands=({{range .SubCmds}}
+		"{{.Name}}:{{.Desc}}"{{end}}
+	  )
+	  _describe "command" commands
+	  ;;
+	esac
+
+	case "$words[1]" in {{- range .SubCmds}}
+	{{.Name}})
+	  {{$cmdPath}}_{{.Name}}
+	  ;;{{end}}
+	esac
+}
+{{range .SubCmds}}
+{{template "selectCmdTemplate" .}}
+{{- end}}
+{{- end}}
+
+{{/* should accept Command without subcommands as parameter */}}
+{{define "arguments" -}}
+function {{genZshFuncName .}} {
+{{"  _arguments"}}{{range extractFlags .}} \
+     {{genFlagEntryForZshArguments . -}}
+{{end}}{{range extractArgsCompletions .}} \
+     {{.}}{{end}}
+}
+{{end}}
+
+{{/* dispatcher for commands with or without subcommands */}}
+{{define "selectCmdTemplate" -}}
+{{if .SubCmds}}{{template "argumentsC" .}}{{else}}{{template "arguments" .}}{{end}}
+{{- end}}
+
+{{/* template entry point */}}
+{{define "Main" -}}
+#compdef _{{.Name}} {{.Name}}
+
+{{template "selectCmdTemplate" .}}
+compdef _{{.Name}} {{.Name}}
+{{end}}
+`
+)
+
+func zshCompGenFuncName(c *Cmd) string {
+	if c.ParentCmd != nil {
+		return zshCompGenFuncName(c.ParentCmd) + "_" + c.Name
+	}
+	return "_" + c.Name
+}
+
+func zshCompExtractFlag(c *Cmd) []structarg.Argument {
+	return c.GetArguments()
+}
+
+func zshCompGenFlagEntryForArguments(f structarg.Argument) string {
+	// not process positional argument and single command
+	if f.IsPositional() {
+		return ""
+	}
+	if f.ShortToken() == "" {
+		return zshCompGenFlagEntryForSingleOptionFlag(f)
+	}
+	return zshCompGenFlagEntryForMultiOptionFlag(f)
+}
+
+func zshCompGenFlagEntryForSingleOptionFlag(f structarg.Argument) string {
+	var option, multiMark, extras string
+	if f.IsMulti() {
+		multiMark = "*"
+	}
+
+	option = "--" + f.Token()
+	extras = zshCompGenFlagEntryExtras(f)
+	return fmt.Sprintf(`'%s%s[%s]%s'`, multiMark, option, zshCompQuoteFlagDescription(f.HelpString("")), extras)
+}
+
+func zshCompGenFlagEntryForMultiOptionFlag(f structarg.Argument) string {
+	var options, parenMultiMark, curlyMultiMark, extras string
+	if f.IsMulti() {
+		parenMultiMark = "*"
+		curlyMultiMark = "\\*"
+	}
+
+	options = fmt.Sprintf(`'(%s-%s %s--%s)'{%s-%s,%s--%s}`,
+		parenMultiMark, f.ShortToken(), parenMultiMark, f.Token(), curlyMultiMark, f.ShortToken(), curlyMultiMark, f.Token())
+	extras = zshCompGenFlagEntryExtras(f)
+
+	return fmt.Sprintf(`%s'[%s]%s'`, options, zshCompQuoteFlagDescription(f.HelpString("")), extras)
+}
+
+func zshCompGenFlagEntryExtras(f structarg.Argument) string {
+	if !f.NeedData() {
+		return ""
+	}
+	// allow options for flag
+	extras := ":"
+
+	type iChoices interface {
+		Choices() []string
+	}
+	if hasChoices, ok := f.(iChoices); ok {
+		// process choices
+		var words []string
+		for _, w := range hasChoices.Choices() {
+			words = append(words, fmt.Sprintf("%q", w))
+		}
+		if len(words) != 0 {
+			extras = fmt.Sprintf("%s :(%s)", extras, strings.Join(words, " "))
+		}
+	}
+	return extras
+}
+
+func zshCompQuoteFlagDescription(s string) string {
+	s = strings.Replace(s, "'", `'\''`, -1)
+	s = strings.Replace(s, "[", `\[`, -1)
+	s = strings.Replace(s, "]", `\]`, -1)
+	return s
+}
+
+func zshCompExtractArgumentCompletionHintsForRendering(c *Cmd) []string {
+	return nil
+}
+
+func (c *Cmd) GenZshCompletion(w io.Writer) error {
+	tmpl, err := template.New("Main").Funcs(zshCompFuncMap).Parse(zshCompletionText)
+	if err != nil {
+		return fmt.Errorf("error creating zsh completion template: %v", err)
+	}
+	return tmpl.Execute(w, c.Root())
+}

cmd/climc/promputils/completescript.go

@@ -75,33 +75,3 @@ _climc(){
     do
         line="${arr[$i]}"
         allopts[count]=${line%s`
-
-const ZSH_COMPLETE_SCRIPT_2 = `%"#"*}
-        subopts[count]=${line#*"#"}
-        ((count++))
-    done
-    _arguments \
-            '1: :->commands'\
-            '*: :->options'
-
-    case $state in 
-        commands)
-        _arguments '1:Comm:(${allopts[*]})'
-        ;;
-        *)
-            item=1
-            for key in ${allopts[*]}
-            do
-                case $words[2] in
-                    $key)
-                    compadd "$@"` + "`echo $subopts[item]`" + `
-                    ;;
-                    *)
-                    ;;
-                esac
-                ((item++))
-            done
-    esac    
-}
-_climc "$@"
-`

cmd/climc/promputils/completor.go

@@ -15,26 +15,118 @@
 package promputils
 
 import (
+	"bytes"
 	"fmt"
 	"regexp"
 	"strings"
 
 	prompt "github.com/c-bata/go-prompt"
+
+	"yunion.io/x/structarg"
 )
 
-type Cmd struct {
-	desc    string
-	optArgs []prompt.Suggest
-	posArgs []prompt.Suggest
-}
-
-var cmds = make(map[string]*Cmd)
+var (
+	subcmds = make(map[string]*Cmd)
+	rootCmd *Cmd
+)
 
 var optionHelp = []prompt.Suggest{
 	{Text: "-h"},
 	{Text: "--help"},
 }
 
+type Cmd struct {
+	Name      string
+	Desc      string
+	optArgs   []CmdArgument
+	posArgs   []CmdArgument
+	ParentCmd *Cmd
+	SubCmds   []*Cmd
+}
+
+func InitRootCmd(name, desc string, optArgs, posArgs []structarg.Argument) *Cmd {
+	rootCmd = NewCmd(name, desc)
+	for _, optA := range optArgs {
+		rootCmd.AddOptArgument(optA, optA.Token(), optA.HelpString(""))
+	}
+	for _, posA := range posArgs {
+		rootCmd.AddPosArgument(posA, posA.Token(), posA.HelpString(""))
+	}
+	return rootCmd
+}
+
+func GetRootCmd() *Cmd {
+	return rootCmd
+}
+
+func NewCmd(name, desc string) *Cmd {
+	return &Cmd{
+		Name:    name,
+		Desc:    desc,
+		optArgs: make([]CmdArgument, 0),
+		posArgs: make([]CmdArgument, 0),
+		SubCmds: make([]*Cmd, 0),
+	}
+}
+
+func (c Cmd) getPromptSuggests(args []CmdArgument) []prompt.Suggest {
+	ret := make([]prompt.Suggest, 0)
+	for _, arg := range args {
+		ret = append(ret, arg.Suggest)
+	}
+	return ret
+}
+
+func (c *Cmd) Root() *Cmd {
+	if c.ParentCmd == nil {
+		return c
+	}
+	return c.ParentCmd.Root()
+}
+
+func (c Cmd) GetName() string {
+	return c.Name
+}
+
+func (c *Cmd) AddCmd(cmd *Cmd) {
+	c.SubCmds = append(c.SubCmds, cmd)
+}
+
+func (c Cmd) GetPromptOptSuggests() []prompt.Suggest {
+	return c.getPromptSuggests(c.optArgs)
+}
+
+func (c Cmd) GetPromptPosSuggests() []prompt.Suggest {
+	return c.getPromptSuggests(c.posArgs)
+}
+
+func (c Cmd) GetOptArguments() []structarg.Argument {
+	return c.getArguments(c.optArgs)
+}
+
+func (c Cmd) GetArguments() []structarg.Argument {
+	ret := c.GetOptArguments()
+	ret = append(ret, c.GetPosArguments()...)
+	return ret
+}
+
+func (c Cmd) GetPosArguments() []structarg.Argument {
+	return c.getArguments(c.posArgs)
+}
+
+func (c Cmd) getArguments(args []CmdArgument) []structarg.Argument {
+	ret := make([]structarg.Argument, 0)
+	for _, a := range args {
+		ret = append(ret, a.Argument)
+	}
+	return ret
+}
+
+type CmdArgument struct {
+	Suggest  prompt.Suggest
+	Argument structarg.Argument
+}
+
 func optionCompleter(args []string, long bool) []prompt.Suggest {
 	l := len(args)
 	if l == 0 {
@@ -47,11 +139,11 @@ func optionCompleter(args []string, long bool) []prompt.Suggest {
 		return optionHelp
 	}
 
-	if cmds[args[0]] == nil {
+	if subcmds[args[0]] == nil {
 		return []prompt.Suggest{}
 	}
 
-	_cmd := cmds[args[0]].optArgs
+	_cmd := subcmds[args[0]].GetPromptOptSuggests()
 	return prompt.FilterContains(_cmd, strings.TrimLeft(args[l-1], "-"), true)
 }
 
@@ -100,7 +192,7 @@ func argumentsCompleter(args []string) []prompt.Suggest {
 	if len(args) == 1 {
 		return prompt.FilterHasPrefix(commands, args[0], true)
 	}
-	_cmd, ok := cmds[args[0]]
+	_cmd, ok := subcmds[args[0]]
 	if !ok {
 		return []prompt.Suggest{}
 	}
@@ -111,48 +203,75 @@ func argumentsCompleter(args []string) []prompt.Suggest {
 
 	prm := _cmd.posArgs[len(args)-2]
 	subcommands := []prompt.Suggest{
-		prm,
+		prm.Suggest,
 	}
 
 	return prompt.FilterHasPrefix(subcommands, args[len(args)-1], true)
 }
 
-func AppendCommand(text, desc string) {
+func AppendCommand(parentCmd *Cmd, text, desc string) {
 	commands = append(commands, prompt.Suggest{Text: text, Description: desc})
-	cmds[text] = &Cmd{}
-	cmds[text].desc = desc
-	cmds[text].posArgs = []prompt.Suggest{}
-	cmds[text].optArgs = []prompt.Suggest{}
+	cmd := &Cmd{
+		Name:      text,
+		Desc:      desc,
+		posArgs:   make([]CmdArgument, 0),
+		optArgs:   make([]CmdArgument, 0),
+		ParentCmd: parentCmd,
+	}
+	subcmds[text] = cmd
+	parentCmd.AddCmd(cmd)
 }
 
-func AppendPos(text, cmd, desc string) {
-	var v = []prompt.Suggest{{Text: cmd, Description: desc}}
-	cmds[text].posArgs = append(cmds[text].posArgs, v...)
+func (c *Cmd) addArgument(target *[]CmdArgument, arg structarg.Argument, argStr string, desc string) {
+	*target = append(*target, CmdArgument{
+		Suggest: prompt.Suggest{
+			Text:        argStr,
+			Description: desc,
+		},
+		Argument: arg,
+	})
 }
 
-func AppendOpt(text, cmd, desc string) {
-	var v = []prompt.Suggest{{Text: cmd, Description: desc}}
-	cmds[text].optArgs = append(cmds[text].optArgs, v...)
+func (c *Cmd) AddPosArgument(arg structarg.Argument, argStr string, desc string) {
+	c.addArgument(&c.posArgs, arg, argStr, desc)
 }
 
-func GenerateAutoCompleteCmds(shell string) string {
+func (c *Cmd) AddOptArgument(arg structarg.Argument, argStr string, desc string) {
+	c.addArgument(&c.optArgs, arg, argStr, desc)
+}
+
+func AppendPos(text, cmd, desc string, arg structarg.Argument) {
+	cmdObj := subcmds[text]
+	cmdObj.AddPosArgument(arg, cmd, desc)
+}
+
+func AppendOpt(text, cmd, desc string, arg structarg.Argument) {
+	cmdObj := subcmds[text]
+	cmdObj.AddOptArgument(arg, cmd, desc)
+}
+
+func GenerateAutoCompleteCmds(rootCmd *Cmd, shell string) string {
 	var ret = []string{}
 	var i = 0
 	if strings.ToLower(shell) == "zsh" {
-		i = 1
+		out := bytes.NewBufferString("")
+		if err := rootCmd.GenZshCompletion(out); err != nil {
+			panic(err)
+		}
+		return out.String()
 	}
-	for cmd, options := range cmds {
+	for _, cmd := range subcmds {
 		var (
 			strPosArgs = []string{}
 			strOptArgs = []string{}
 		)
-		for _, posArg := range options.posArgs {
+		for _, posArg := range cmd.GetPromptPosSuggests() {
 			strPosArgs = append(strPosArgs, posArg.Text)
 		}
-		for _, optArg := range options.optArgs {
+		for _, optArg := range cmd.GetPromptOptSuggests() {
 			strOptArgs = append(strOptArgs, strings.Split(optArg.Text, " ")[0])
 		}
-		ret = append(ret, fmt.Sprintf(`arr[%d]="%s# %s %s"`, i, cmd,
+		ret = append(ret, fmt.Sprintf(`arr[%d]="%s# %s %s"`, i, cmd.Name,
 			strings.Join(strPosArgs, " "), strings.Join(strOptArgs, " ")))
 		i += 1
 	}

cmd/climc/shell/ansible/ansible.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package shell
+package ansible
 
 import (
 	"fmt"

cmd/climc/shell/ansible/ansibleplaybooks.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package shell
+package ansible
 
 import (
 	"yunion.io/x/jsonutils"

cmd/climc/shell/ansible/ansibleplaybooks_v2.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package shell
+package ansible
 
 import (
 	"yunion.io/x/onecloud/pkg/mcclient"
@@ -49,4 +49,34 @@ func init() {
 		printList(apbs, modules.AnsiblePlaybooksV2.GetColumns(s))
 		return nil
 	})
+	R(&AnsiblePlaybookV2IdOptions{}, "ansibleplaybookv2-run", "Run ansible playbook",
+		func(s *mcclient.ClientSession, opts *AnsiblePlaybookV2IdOptions) error {
+			apb, err := modules.AnsiblePlaybooksV2.PerformAction(s, opts.ID, "run", nil)
+			if err != nil {
+				return err
+			}
+			printObject(apb)
+			return nil
+		},
+	)
+	R(&AnsiblePlaybookV2IdOptions{}, "ansibleplaybookv2-stop", "Stop ansible playbook",
+		func(s *mcclient.ClientSession, opts *AnsiblePlaybookV2IdOptions) error {
+			apb, err := modules.AnsiblePlaybooksV2.PerformAction(s, opts.ID, "stop", nil)
+			if err != nil {
+				return err
+			}
+			printObject(apb)
+			return nil
+		},
+	)
+	R(&AnsiblePlaybookV2IdOptions{}, "ansibleplaybookv2-delete", "Delete ansible playbook",
+		func(s *mcclient.ClientSession, opts *AnsiblePlaybookV2IdOptions) error {
+			apb, err := modules.AnsiblePlaybooksV2.Delete(s, opts.ID, nil)
+			if err != nil {
+				return err
+			}
+			printObject(apb)
+			return nil
+		},
+	)
 }

cmd/climc/shell/ansible/common.go

@@ -0,0 +1,32 @@
+// Copyright 2019 Yunion
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package ansible
+
+import (
+	"yunion.io/x/onecloud/cmd/climc/shell"
+	"yunion.io/x/onecloud/pkg/util/printutils"
+)
+
+var (
+	R                 = shell.R
+	printList         = printutils.PrintJSONList
+	printObject       = printutils.PrintJSONObject
+	printBatchResults = printutils.PrintJSONBatchResults
+
+	InvalidUpdateError   = shell.InvalidUpdateError
+	printObjectRecursive = printutils.PrintJSONObjectRecursive
+
+	exportList = shell.ExportList
+)

cmd/climc/shell/ansible/devtoolcronjob.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package shell
+package ansible
 
 import (
 	"fmt"

cmd/climc/shell/ansible/devtooltemplate.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package shell
+package ansible
 
 import (
 	"yunion.io/x/jsonutils"

cmd/climc/shell/cloudevent/cloudevents.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package shell
+package cloudevent
 
 import (
 	"yunion.io/x/onecloud/pkg/mcclient"

cmd/climc/shell/cloudevent/common.go

@@ -0,0 +1,25 @@
+// Copyright 2019 Yunion
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package cloudevent
+
+import (
+	"yunion.io/x/onecloud/cmd/climc/shell"
+	"yunion.io/x/onecloud/pkg/util/printutils"
+)
+
+var (
+	R         = shell.R
+	printList = printutils.PrintJSONList
+)

cmd/climc/shell/cloudid/cloudgroup.go

@@ -0,0 +1,168 @@
+// Copyright 2019 Yunion
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package cloudid
+
+import (
+	"yunion.io/x/jsonutils"
+
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/onecloud/pkg/mcclient/options"
+)
+
+func init() {
+	type CloudgroupListOptions struct {
+		options.BaseListOptions
+
+		ClouduserId   string `json:"clouduser_id"`
+		CloudpolicyId string `json:"cloudpolicy_id"`
+		Usable        bool   `json:"usable"`
+	}
+	R(&CloudgroupListOptions{}, "cloud-group-list", "List cloud groups", func(s *mcclient.ClientSession, opts *CloudgroupListOptions) error {
+		params, err := options.ListStructToParams(opts)
+		if err != nil {
+			return err
+		}
+		result, err := modules.Cloudgroups.List(s, params)
+		if err != nil {
+			return err
+		}
+		printList(result, modules.Cloudgroups.GetColumns(s))
+		return nil
+	})
+
+	type CloudgroupCreateOptions struct {
+		NAME           string   `json:"name"`
+		PROVIDER       string   `json:"provider" choices:"Google|Aliyun|Aws|Huawei|Qcloud"`
+		CloudpolicyIds []string `json:"cloudpolicy_ids"`
+		Desc           string   `json:"description"`
+	}
+
+	R(&CloudgroupCreateOptions{}, "cloud-group-create", "Create cloud group", func(s *mcclient.ClientSession, opts *CloudgroupCreateOptions) error {
+		params := jsonutils.Marshal(opts)
+		result, err := modules.Cloudgroups.Create(s, params)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	type CloudgroupIdOptions struct {
+		ID string `help:"Cloudgroup Id"`
+	}
+
+	R(&CloudgroupIdOptions{}, "cloud-group-delete", "Delete cloud group", func(s *mcclient.ClientSession, opts *CloudgroupIdOptions) error {
+		result, err := modules.Cloudgroups.Delete(s, opts.ID, nil)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	R(&CloudgroupIdOptions{}, "cloud-group-show", "Show cloud group", func(s *mcclient.ClientSession, opts *CloudgroupIdOptions) error {
+		result, err := modules.Cloudgroups.Get(s, opts.ID, nil)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	R(&CloudgroupIdOptions{}, "cloud-group-syncstatus", "Sync cloud group status", func(s *mcclient.ClientSession, opts *CloudgroupIdOptions) error {
+		result, err := modules.Cloudgroups.PerformAction(s, opts.ID, "syncstatus", nil)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	type CloudgroupPolicyOptions struct {
+		ID             string `help:"Cloudgroup Id"`
+		CLOUDPOLICY_ID string `help:"Cloudpolicy Id"`
+	}
+
+	R(&CloudgroupPolicyOptions{}, "cloud-group-attach-policy", "Attach policy for cloud group", func(s *mcclient.ClientSession, opts *CloudgroupPolicyOptions) error {
+		result, err := modules.Cloudgroups.PerformAction(s, opts.ID, "attach-policy", jsonutils.Marshal(opts))
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	R(&CloudgroupPolicyOptions{}, "cloud-group-detach-policy", "Detach policy from cloud group", func(s *mcclient.ClientSession, opts *CloudgroupPolicyOptions) error {
+		result, err := modules.Cloudgroups.PerformAction(s, opts.ID, "detach-policy", jsonutils.Marshal(opts))
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	type CloudgroupUserOptions struct {
+		ID           string `help:"Cloudgroup Id"`
+		CLOUDUSER_ID string `help:"Clouduser Id"`
+	}
+
+	R(&CloudgroupUserOptions{}, "cloud-group-add-user", "Add user to cloud group", func(s *mcclient.ClientSession, opts *CloudgroupUserOptions) error {
+		result, err := modules.Cloudgroups.PerformAction(s, opts.ID, "add-user", jsonutils.Marshal(opts))
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	R(&CloudgroupUserOptions{}, "cloud-group-remove-user", "Remove user from cloud group", func(s *mcclient.ClientSession, opts *CloudgroupUserOptions) error {
+		result, err := modules.Cloudgroups.PerformAction(s, opts.ID, "remove-user", jsonutils.Marshal(opts))
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	type CloudgroupPoliciesOptions struct {
+		ID             string   `help:"Cloudgroup Id"`
+		CloudpolicyIds []string `json:"cloudpolicy_ids"`
+	}
+
+	R(&CloudgroupPoliciesOptions{}, "cloud-group-set-policies", "Set cloudpolicies for cloud group", func(s *mcclient.ClientSession, opts *CloudgroupPoliciesOptions) error {
+		result, err := modules.Cloudgroups.PerformAction(s, opts.ID, "set-policies", jsonutils.Marshal(opts))
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	type CloudgroupUsersOptions struct {
+		ID           string   `help:"Cloudgroup Id"`
+		ClouduserIds []string `json:"clouduser_ids"`
+	}
+
+	R(&CloudgroupUsersOptions{}, "cloud-group-set-users", "Set users for cloud group", func(s *mcclient.ClientSession, opts *CloudgroupUsersOptions) error {
+		result, err := modules.Cloudgroups.PerformAction(s, opts.ID, "set-users", jsonutils.Marshal(opts))
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+}

cmd/climc/shell/cloudid/cloudgroupcache.go

@@ -0,0 +1,73 @@
+// Copyright 2019 Yunion
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package cloudid
+
+import (
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/onecloud/pkg/mcclient/options"
+)
+
+func init() {
+	type CloudgroupcacheListOptions struct {
+		options.BaseListOptions
+
+		CloudgroupId string `json:"cloudgroup_id"`
+	}
+	R(&CloudgroupcacheListOptions{}, "cloud-group-cache-list", "List cloud group caches", func(s *mcclient.ClientSession, opts *CloudgroupcacheListOptions) error {
+		params, err := options.ListStructToParams(opts)
+		if err != nil {
+			return err
+		}
+		result, err := modules.Cloudgroupcaches.List(s, params)
+		if err != nil {
+			return err
+		}
+		printList(result, modules.Cloudgroupcaches.GetColumns(s))
+		return nil
+	})
+
+	type CloudgroupcacheIdOption struct {
+		ID string `help:"Cloudgroup Id"`
+	}
+
+	R(&CloudgroupcacheIdOption{}, "cloud-group-cache-show", "Show cloud groupcache details", func(s *mcclient.ClientSession, opts *CloudgroupcacheIdOption) error {
+		result, err := modules.Cloudgroupcaches.Get(s, opts.ID, nil)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	R(&CloudgroupcacheIdOption{}, "cloud-group-cache-syncstatus", "Sync cloudgroupcache", func(s *mcclient.ClientSession, opts *CloudgroupcacheIdOption) error {
+		result, err := modules.Cloudgroupcaches.PerformAction(s, opts.ID, "syncstatus", nil)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	R(&CloudgroupcacheIdOption{}, "cloud-group-cache-delete", "Delete cloudgroupcache", func(s *mcclient.ClientSession, opts *CloudgroupcacheIdOption) error {
+		result, err := modules.Cloudgroupcaches.Delete(s, opts.ID, nil)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+}

cmd/climc/shell/cloudid/cloudgrouppolicies.go

@@ -0,0 +1,72 @@
+// Copyright 2019 Yunion
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package cloudid
+
+import (
+	"yunion.io/x/jsonutils"
+
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modulebase"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/onecloud/pkg/mcclient/options"
+)
+
+func init() {
+	type CloudgroupPolicyListOptions struct {
+		options.BaseListOptions
+		Cloudgroup  string `help:"ID or Name of Cloudgroup"`
+		Cloudpolicy string `help:"Policy ID or name"`
+	}
+	R(&CloudgroupPolicyListOptions{}, "cloud-group-policy-list", "List cloudgroup cloudpolicy pairs", func(s *mcclient.ClientSession, args *CloudgroupPolicyListOptions) error {
+		var params *jsonutils.JSONDict
+		{
+			var err error
+			params, err = args.BaseListOptions.Params()
+			if err != nil {
+				return err
+
+			}
+		}
+		var result *modulebase.ListResult
+		var err error
+		if len(args.Cloudgroup) > 0 {
+			result, err = modules.Cloudgrouppolicies.ListDescendent(s, args.Cloudgroup, params)
+		} else if len(args.Cloudpolicy) > 0 {
+			result, err = modules.Cloudgrouppolicies.ListDescendent2(s, args.Cloudpolicy, params)
+		} else {
+			result, err = modules.Cloudgrouppolicies.List(s, params)
+		}
+		if err != nil {
+			return err
+		}
+		printList(result, modules.Cloudgrouppolicies.GetColumns(s))
+		return nil
+	})
+
+	type CloudgroupPolicyDetailOptions struct {
+		CLOUDUSER   string `help:"ID or Name of Cloudgroup"`
+		CLOUDPOLICY string `help:"ID or Name of Cloudpolicy"`
+	}
+	R(&CloudgroupPolicyDetailOptions{}, "cloud-group-policy-show", "Show cloudgrouppolicy details", func(s *mcclient.ClientSession, args *CloudgroupPolicyDetailOptions) error {
+		query := jsonutils.NewDict()
+		result, err := modules.Cloudgrouppolicies.Get(s, args.CLOUDUSER, args.CLOUDPOLICY, query)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+}

cmd/climc/shell/cloudid/cloudgroupusers.go

@@ -0,0 +1,72 @@
+// Copyright 2019 Yunion
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package cloudid
+
+import (
+	"yunion.io/x/jsonutils"
+
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modulebase"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/onecloud/pkg/mcclient/options"
+)
+
+func init() {
+	type CloudgroupUserListOptions struct {
+		options.BaseListOptions
+		Cloudgroup string `help:"ID or Name of Cloudgroup"`
+		Clouduser  string `help:"User ID or name"`
+	}
+	R(&CloudgroupUserListOptions{}, "cloud-group-user-list", "List cloudgroup clouduser pairs", func(s *mcclient.ClientSession, args *CloudgroupUserListOptions) error {
+		var params *jsonutils.JSONDict
+		{
+			var err error
+			params, err = args.BaseListOptions.Params()
+			if err != nil {
+				return err
+
+			}
+		}
+		var result *modulebase.ListResult
+		var err error
+		if len(args.Cloudgroup) > 0 {
+			result, err = modules.Cloudgroupusers.ListDescendent(s, args.Cloudgroup, params)
+		} else if len(args.Clouduser) > 0 {
+			result, err = modules.Cloudgroupusers.ListDescendent2(s, args.Clouduser, params)
+		} else {
+			result, err = modules.Cloudgroupusers.List(s, params)
+		}
+		if err != nil {
+			return err
+		}
+		printList(result, modules.Cloudgroupusers.GetColumns(s))
+		return nil
+	})
+
+	type CloudgroupUserDetailOptions struct {
+		CLOUDUSER   string `help:"ID or Name of Cloudgroup"`
+		CLOUDPOLICY string `help:"ID or Name of Clouduser"`
+	}
+	R(&CloudgroupUserDetailOptions{}, "cloud-group-user-show", "Show cloudgroupuser details", func(s *mcclient.ClientSession, args *CloudgroupUserDetailOptions) error {
+		query := jsonutils.NewDict()
+		result, err := modules.Cloudgroupusers.Get(s, args.CLOUDUSER, args.CLOUDPOLICY, query)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+}

cmd/climc/shell/cloudid/cloudpolicy.go

@@ -0,0 +1,81 @@
+// Copyright 2019 Yunion
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package cloudid
+
+import (
+	"yunion.io/x/jsonutils"
+
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/onecloud/pkg/mcclient/options"
+)
+
+func init() {
+	type CloudpolicyListOptions struct {
+		options.BaseListOptions
+
+		ClouduserId  string `json:"clouduser_id"`
+		CloudgroupId string `json:"cloudgroup_id"`
+	}
+	R(&CloudpolicyListOptions{}, "cloud-policy-list", "List cloud policies", func(s *mcclient.ClientSession, opts *CloudpolicyListOptions) error {
+		params, err := options.ListStructToParams(opts)
+		if err != nil {
+			return err
+		}
+		result, err := modules.Cloudpolicies.List(s, params)
+		if err != nil {
+			return err
+		}
+		printList(result, modules.Cloudpolicies.GetColumns(s))
+		return nil
+	})
+
+	type CloudpolicyIdOptions struct {
+		ID string `help:"Cloudpolicy Id"`
+	}
+
+	R(&CloudpolicyIdOptions{}, "cloud-policy-show", "Sow cloud policiy details", func(s *mcclient.ClientSession, opts *CloudpolicyIdOptions) error {
+		result, err := modules.Cloudpolicies.Get(s, opts.ID, nil)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	type CloudpolicyGroupOptions struct {
+		ID            string `help:"Cloudpolicy Id"`
+		CLOUDGROUP_ID string `help:"Cloudgroup Id" json:"cloudgroup_id"`
+	}
+
+	R(&CloudpolicyGroupOptions{}, "cloud-policy-assign-group", "Assign cloud policiy to group", func(s *mcclient.ClientSession, opts *CloudpolicyGroupOptions) error {
+		result, err := modules.Cloudpolicies.PerformAction(s, opts.ID, "assign-group", jsonutils.Marshal(opts))
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	R(&CloudpolicyGroupOptions{}, "cloud-policy-revoke-group", "Revoke cloud policiy from group", func(s *mcclient.ClientSession, opts *CloudpolicyGroupOptions) error {
+		result, err := modules.Cloudpolicies.PerformAction(s, opts.ID, "revoke-group", jsonutils.Marshal(opts))
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+}

cmd/climc/shell/cloudid/clouduserpolicies.go

@@ -0,0 +1,72 @@
+// Copyright 2019 Yunion
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package cloudid
+
+import (
+	"yunion.io/x/jsonutils"
+
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modulebase"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/onecloud/pkg/mcclient/options"
+)
+
+func init() {
+	type ClouduserPolicyListOptions struct {
+		options.BaseListOptions
+		Clouduser   string `help:"ID or Name of Clouduser"`
+		Cloudpolicy string `help:"Policy ID or name"`
+	}
+	R(&ClouduserPolicyListOptions{}, "cloud-user-policy-list", "List clouduser cloudpolicy pairs", func(s *mcclient.ClientSession, args *ClouduserPolicyListOptions) error {
+		var params *jsonutils.JSONDict
+		{
+			var err error
+			params, err = args.BaseListOptions.Params()
+			if err != nil {
+				return err
+
+			}
+		}
+		var result *modulebase.ListResult
+		var err error
+		if len(args.Clouduser) > 0 {
+			result, err = modules.Clouduserpolicies.ListDescendent(s, args.Clouduser, params)
+		} else if len(args.Cloudpolicy) > 0 {
+			result, err = modules.Clouduserpolicies.ListDescendent2(s, args.Cloudpolicy, params)
+		} else {
+			result, err = modules.Clouduserpolicies.List(s, params)
+		}
+		if err != nil {
+			return err
+		}
+		printList(result, modules.Clouduserpolicies.GetColumns(s))
+		return nil
+	})
+
+	type ClouduserPolicyDetailOptions struct {
+		CLOUDUSER   string `help:"ID or Name of Clouduser"`
+		CLOUDPOLICY string `help:"ID or Name of Cloudpolicy"`
+	}
+	R(&ClouduserPolicyDetailOptions{}, "cloud-user-policy-show", "Show clouduserpolicy details", func(s *mcclient.ClientSession, args *ClouduserPolicyDetailOptions) error {
+		query := jsonutils.NewDict()
+		result, err := modules.Clouduserpolicies.Get(s, args.CLOUDUSER, args.CLOUDPOLICY, query)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+}

cmd/climc/shell/cloudid/cloudusers.go

@@ -0,0 +1,197 @@
+// Copyright 2019 Yunion
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package cloudid
+
+import (
+	"yunion.io/x/jsonutils"
+
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/onecloud/pkg/mcclient/options"
+)
+
+func init() {
+	type ClouduserListOptions struct {
+		options.BaseListOptions
+		CloudaccountId  string `help:"Cloudaccount Id"`
+		CloudproviderId string `help:"Cloudprovider Id"`
+		CloudpolicyId   string `help:"filter cloudusers by cloudpolicy"`
+		CloudgroupId    string `help:"filter cloudusers by cloudgroup"`
+	}
+	R(&ClouduserListOptions{}, "cloud-user-list", "List cloud users", func(s *mcclient.ClientSession, opts *ClouduserListOptions) error {
+		params, err := options.ListStructToParams(opts)
+		if err != nil {
+			return err
+		}
+		result, err := modules.Cloudusers.List(s, params)
+		if err != nil {
+			return err
+		}
+		printList(result, modules.Cloudusers.GetColumns(s))
+		return nil
+	})
+
+	type ClouduserCreateOptions struct {
+		Name            string
+		CloudaccountId  string   `help:"Cloudaccount Id"`
+		CloudproviderId string   `help:"Cloudprovider Id"`
+		OwnerId         string   `help:"Owner Id"`
+		CloudpolicyIds  []string `help:"cloudpolicy ids"`
+		CloudgroupIds   []string `help:"cloudgroup ids"`
+		Email           string   `help:"email address"`
+		MobilePhone     string   `help:"phone number"`
+		IsConsoleLogin  *bool    `help:"is console login"`
+		Password        string   `help:"clouduser password"`
+	}
+
+	R(&ClouduserCreateOptions{}, "cloud-user-create", "Create cloud user", func(s *mcclient.ClientSession, opts *ClouduserCreateOptions) error {
+		params := jsonutils.Marshal(opts)
+		result, err := modules.Cloudusers.Create(s, params)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	type ClouduserIdOptions struct {
+		ID string `help:"Clouduser Id"`
+	}
+
+	R(&ClouduserIdOptions{}, "cloud-user-delete", "Delete cloud user", func(s *mcclient.ClientSession, opts *ClouduserIdOptions) error {
+		result, err := modules.Cloudusers.Delete(s, opts.ID, nil)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	R(&ClouduserIdOptions{}, "cloud-user-logininfo", "Show cloud user login info", func(s *mcclient.ClientSession, opts *ClouduserIdOptions) error {
+		result, err := modules.Cloudusers.GetLoginInfo(s, opts.ID, nil)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	R(&ClouduserIdOptions{}, "cloud-user-show", "Show cloud user", func(s *mcclient.ClientSession, opts *ClouduserIdOptions) error {
+		result, err := modules.Cloudusers.Get(s, opts.ID, nil)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	type ClouduserSyncOptions struct {
+		ID         string `help:"Clouduser Id"`
+		PolicyOnly bool   `help:"Ony sync clouduser policies for cloud"`
+	}
+
+	R(&ClouduserSyncOptions{}, "cloud-user-sync", "Sync cloud user policies", func(s *mcclient.ClientSession, opts *ClouduserSyncOptions) error {
+		result, err := modules.Cloudusers.PerformAction(s, opts.ID, "sync", jsonutils.Marshal(opts))
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	R(&ClouduserIdOptions{}, "cloud-user-syncstatus", "Sync cloud user status", func(s *mcclient.ClientSession, opts *ClouduserIdOptions) error {
+		result, err := modules.Cloudusers.PerformAction(s, opts.ID, "syncstatus", nil)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	type ClouduserPolicyOptions struct {
+		ID             string `help:"Clouduser Id"`
+		CLOUDPOLICY_ID string `help:"cloudpolicy Id"`
+	}
+
+	R(&ClouduserPolicyOptions{}, "cloud-user-attach-policy", "Attach policy for cloud user", func(s *mcclient.ClientSession, opts *ClouduserPolicyOptions) error {
+		result, err := modules.Cloudusers.PerformAction(s, opts.ID, "attach-policy", jsonutils.Marshal(opts))
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	R(&ClouduserPolicyOptions{}, "cloud-user-detach-policy", "Detach policy from cloud user", func(s *mcclient.ClientSession, opts *ClouduserPolicyOptions) error {
+		result, err := modules.Cloudusers.PerformAction(s, opts.ID, "detach-policy", jsonutils.Marshal(opts))
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	type ClouduserPasswordOptions struct {
+		ID       string `help:"Clouduser Id"`
+		Password string `help:"clouduser password"`
+	}
+
+	R(&ClouduserPasswordOptions{}, "cloud-user-reset-password", "Reset clouduser password", func(s *mcclient.ClientSession, opts *ClouduserPasswordOptions) error {
+		result, err := modules.Cloudusers.PerformAction(s, opts.ID, "reset-password", jsonutils.Marshal(opts))
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	type ClouduserChangeOwnerOptions struct {
+		ID      string `help:"clouduser id"`
+		USER_ID string `help:"local user id"`
+	}
+
+	R(&ClouduserChangeOwnerOptions{}, "cloud-user-change-owner", "Change clouduser owner", func(s *mcclient.ClientSession, opts *ClouduserChangeOwnerOptions) error {
+		result, err := modules.Cloudusers.PerformAction(s, opts.ID, "change-owner", jsonutils.Marshal(opts))
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	type ClouduserGroupOptions struct {
+		ID            string `help:"clouduser id"`
+		CLOUDGROUP_ID string `help:"cloudgroup id" json:"cloudgroup_id"`
+	}
+
+	R(&ClouduserGroupOptions{}, "cloud-user-join-group", "Join user to cloudgroup", func(s *mcclient.ClientSession, opts *ClouduserGroupOptions) error {
+		result, err := modules.Cloudusers.PerformAction(s, opts.ID, "join-group", jsonutils.Marshal(opts))
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	R(&ClouduserGroupOptions{}, "cloud-user-leave-group", "Leave from cloudgroup", func(s *mcclient.ClientSession, opts *ClouduserGroupOptions) error {
+		result, err := modules.Cloudusers.PerformAction(s, opts.ID, "leave-group", jsonutils.Marshal(opts))
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+}

cmd/climc/shell/cloudid/common.go

@@ -0,0 +1,26 @@
+// Copyright 2019 Yunion
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package cloudid
+
+import (
+	"yunion.io/x/onecloud/cmd/climc/shell"
+	"yunion.io/x/onecloud/pkg/util/printutils"
+)
+
+var (
+	R           = shell.R
+	printList   = printutils.PrintJSONList
+	printObject = printutils.PrintJSONObject
+)

cmd/climc/shell/compute/baremetalagents.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package shell
+package compute
 
 import (
 	"yunion.io/x/jsonutils"

cmd/climc/shell/compute/baremetalnetworks.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package shell
+package compute
 
 import (
 	"yunion.io/x/jsonutils"

cmd/climc/shell/compute/baremetalstorages.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package shell
+package compute
 
 import (
 	"yunion.io/x/jsonutils"

cmd/climc/shell/compute/buckets.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package shell
+package compute
 
 import (
 	"fmt"
@@ -26,7 +26,7 @@ import (
 	"yunion.io/x/onecloud/pkg/mcclient/modulebase"
 	"yunion.io/x/onecloud/pkg/mcclient/modules"
 	"yunion.io/x/onecloud/pkg/mcclient/options"
-	objectshell "yunion.io/x/onecloud/pkg/multicloud/objectstore"
+	"yunion.io/x/onecloud/pkg/multicloud/objectstore"
 )
 
 func init() {
@@ -188,7 +188,7 @@ func init() {
 		StorageClass  string `help:"storage CLass"`
 		Acl           string `help:"object acl." choices:"private|public-read|public-read-write"`
 
-		objectshell.ObjectHeaderOptions
+		objectstore.ObjectHeaderOptions
 	}
 	R(&BucketUploadObjectsOptions{}, "bucket-object-upload", "Upload an object into a bucket", func(s *mcclient.ClientSession, args *BucketUploadObjectsOptions) error {
 		var body io.Reader
@@ -325,7 +325,7 @@ func init() {
 
 		Key []string `help:"Optional object key" json:"key"`
 
-		objectshell.ObjectHeaderOptions
+		objectstore.ObjectHeaderOptions
 	}
 	R(&BucketSetMetadataOptions{}, "bucket-set-metadata", "Set metadata of object", func(s *mcclient.ClientSession, args *BucketSetMetadataOptions) error {
 		input := api.BucketMetadataInput{}

cmd/climc/shell/compute/cachedimages.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package shell
+package compute
 
 import (
 	"yunion.io/x/onecloud/pkg/mcclient"

cmd/climc/shell/compute/capabilities.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package shell
+package compute
 
 import (
 	"yunion.io/x/onecloud/pkg/mcclient"

cmd/climc/shell/compute/cloudaccounts.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package shell
+package compute
 
 import (
 	"fmt"
@@ -26,6 +26,28 @@ import (
 	"yunion.io/x/onecloud/pkg/mcclient/options"
 )
 
+func parseGcpCredential(filename string) (jsonutils.JSONObject, error) {
+	data, err := ioutil.ReadFile(filename)
+	if err != nil {
+		return nil, err
+	}
+	authParams, err := jsonutils.Parse(data)
+	if err != nil {
+		return nil, err
+	}
+	ret := jsonutils.NewDict()
+	for _, k := range []string{
+		"client_email",
+		"project_id",
+		"private_key_id",
+		"private_key",
+	} {
+		v, _ := authParams.Get(k)
+		ret.Add(v, fmt.Sprintf("gcp_%s", k))
+	}
+	return ret, nil
+}
+
 func init() {
 
 	type CloudaccountListOptions struct {
@@ -33,6 +55,7 @@ func init() {
 		Capability []string `help:"capability filter" choices:"project|compute|network|loadbalancer|objectstore|rds|cache|event"`
 
 		DistinctField string `help:"distinct field"`
+		ProxySetting  string `help:"Proxy setting id or name"`
 	}
 	R(&CloudaccountListOptions{}, "cloud-account-list", "List cloud accounts", func(s *mcclient.ClientSession, args *CloudaccountListOptions) error {
 		var params *jsonutils.JSONDict
@@ -45,6 +68,9 @@ func init() {
 			if len(args.Capability) > 0 {
 				params.Add(jsonutils.NewStringArray(args.Capability), "capability")
 			}
+			if len(args.ProxySetting) > 0 {
+				params.Add(jsonutils.NewString(args.ProxySetting), "proxy_setting")
+			}
 		}
 		if len(args.DistinctField) > 0 {
 			params.Add(jsonutils.NewString(args.DistinctField), "extra_field")
@@ -99,6 +125,22 @@ func init() {
 		printObject(result)
 		return nil
 	})
+	type SVMwareCloudAccountPrepareNetsOptions struct {
+		Project       string `help:"project for this account"`
+		ProjectDomain string `help:"domain for this account"`
+		NAME          string `help:"name for this account"`
+		options.SVMwareCredentialWithEnvironment
+	}
+	R(&SVMwareCloudAccountPrepareNetsOptions{}, "cloud-account-preparenets-vmware", "Prepare networks for a VMware cloud account before create this accout", func(s *mcclient.ClientSession, args *SVMwareCloudAccountPrepareNetsOptions) error {
+		params := jsonutils.Marshal(args)
+		params.(*jsonutils.JSONDict).Add(jsonutils.NewString("VMware"), "provider")
+		result, err := modules.Cloudaccounts.PerformClassAction(s, "prepare-nets", params)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
 
 	R(&options.SAliyunCloudAccountCreateOptions{}, "cloud-account-create-aliyun", "Create an Aliyun cloud account", func(s *mcclient.ClientSession, args *options.SAliyunCloudAccountCreateOptions) error {
 		params := jsonutils.Marshal(args)
@@ -149,11 +191,7 @@ func init() {
 	R(&options.SGoogleCloudAccountCreateOptions{}, "cloud-account-create-google", "Create a Google cloud account", func(s *mcclient.ClientSession, args *options.SGoogleCloudAccountCreateOptions) error {
 		params := jsonutils.Marshal(args)
 		params.(*jsonutils.JSONDict).Add(jsonutils.NewString("Google"), "provider")
-		data, err := ioutil.ReadFile(args.GoogleJsonFile)
-		if err != nil {
-			return err
-		}
-		authParams, err := jsonutils.Parse(data)
+		authParams, err := parseGcpCredential(args.GoogleJsonFile)
 		if err != nil {
 			return err
 		}
@@ -699,11 +737,7 @@ func init() {
 	})
 
 	R(&options.SGoogleCloudAccountUpdateCredentialOptions{}, "cloud-account-update-credential-google", "Update credential of a Google cloud account", func(s *mcclient.ClientSession, args *options.SGoogleCloudAccountUpdateCredentialOptions) error {
-		data, err := ioutil.ReadFile(args.GoogleJsonFile)
-		if err != nil {
-			return err
-		}
-		params, err := jsonutils.Parse(data)
+		params, err := parseGcpCredential(args.GoogleJsonFile)
 		if err != nil {
 			return err
 		}
@@ -826,11 +860,7 @@ func init() {
 	})
 
 	R(&options.SGoogleCloudAccountUpdateCredentialOptions{}, "cloud-account-test-connectivity-google", "Update credential of a Google cloud account", func(s *mcclient.ClientSession, args *options.SGoogleCloudAccountUpdateCredentialOptions) error {
-		data, err := ioutil.ReadFile(args.GoogleJsonFile)
-		if err != nil {
-			return err
-		}
-		params, err := jsonutils.Parse(data)
+		params, err := parseGcpCredential(args.GoogleJsonFile)
 		if err != nil {
 			return err
 		}
@@ -1027,4 +1057,12 @@ func init() {
 		return nil
 	})
 
+	R(&CloudaccountShowOptions{}, "cloud-account-change-owner-candidate-domains", "Show candiate domains of a cloud account changing project", func(s *mcclient.ClientSession, args *CloudaccountShowOptions) error {
+		result, err := modules.Cloudaccounts.GetSpecific(s, args.ID, "change-owner-candidate-domains", nil)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
 }

cmd/climc/shell/compute/cloudprovider_quota.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package shell
+package compute
 
 import (
 	"yunion.io/x/jsonutils"

cmd/climc/shell/compute/cloudproviderregions.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package shell
+package compute
 
 import (
 	"yunion.io/x/jsonutils"

cmd/climc/shell/compute/cloudproviders.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package shell
+package compute
 
 import (
 	"fmt"
@@ -34,6 +34,7 @@ func init() {
 		HasObjectStorage bool     `help:"filter cloudproviders that has object storage"`
 		NoObjectStorage  bool     `help:"filter cloudproviders that has no object storage"`
 		Capability       []string `help:"capability filter" choices:"project|compute|network|loadbalancer|objectstore|rds|cache|event"`
+		Cloudregion      string   `help:"filter cloudproviders by cloudregion"`
 	}
 	R(&CloudproviderListOptions{}, "cloud-provider-list", "List cloud providers", func(s *mcclient.ClientSession, args *CloudproviderListOptions) error {
 		var params *jsonutils.JSONDict
@@ -57,6 +58,10 @@ func init() {
 			if len(args.Capability) > 0 {
 				params.Add(jsonutils.NewStringArray(args.Capability), "capability")
 			}
+
+			if len(args.Cloudregion) > 0 {
+				params.Add(jsonutils.NewString(args.Cloudregion), "cloudregion")
+			}
 		}
 		result, err := modules.Cloudproviders.List(s, params)
 		if err != nil {
@@ -245,4 +250,13 @@ func init() {
 		printObject(result)
 		return nil
 	})
+
+	R(&CloudproviderShowOptions{}, "cloud-provider-change-owner-candidate-domains", "Show candiate domains of a cloud provider  changing owner", func(s *mcclient.ClientSession, args *CloudproviderShowOptions) error {
+		result, err := modules.Cloudproviders.GetSpecific(s, args.ID, "change-owner-candidate-domains", nil)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
 }

cmd/climc/shell/compute/cloudregions.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package shell
+package compute
 
 import (
 	"fmt"

cmd/climc/shell/compute/common.go

@@ -0,0 +1,34 @@
+// Copyright 2019 Yunion
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package compute
+
+import (
+	"yunion.io/x/onecloud/cmd/climc/shell"
+	"yunion.io/x/onecloud/pkg/util/printutils"
+)
+
+var (
+	R                 = shell.R
+	printList         = printutils.PrintJSONList
+	printObject       = printutils.PrintJSONObject
+	printBatchResults = printutils.PrintJSONBatchResults
+
+	InvalidUpdateError   = shell.InvalidUpdateError
+	printObjectRecursive = printutils.PrintJSONObjectRecursive
+
+	exportList = shell.ExportList
+
+	printObjectRecursiveEx = printutils.PrintJSONObjectRecursiveEx
+)

cmd/climc/shell/compute/dbinstance_accounts.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package shell
+package compute
 
 import (
 	"yunion.io/x/onecloud/pkg/mcclient"

cmd/climc/shell/compute/dbinstance_backups.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package shell
+package compute
 
 import (
 	"yunion.io/x/jsonutils"
@@ -38,7 +38,11 @@ func init() {
 		if err != nil {
 			return err
 		}
-		printList(result, modules.DBInstanceBackups.GetColumns(s))
+		if len(opts.ExportFile) > 0 {
+			exportList(result, opts.ExportFile, opts.ExportKeys, opts.ExportTexts, modules.DBInstanceBackups.GetColumns(s))
+		} else {
+			printList(result, modules.DBInstanceBackups.GetColumns(s))
+		}
 		return nil
 	})
 

cmd/climc/shell/compute/dbinstance_databases.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package shell
+package compute
 
 import (
 	"yunion.io/x/onecloud/pkg/mcclient"

cmd/climc/shell/compute/dbinstance_skus.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package shell
+package compute
 
 import (
 	"yunion.io/x/onecloud/pkg/mcclient"

cmd/climc/shell/compute/dbinstances.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package shell
+package compute
 
 import (
 	"fmt"
@@ -41,7 +41,12 @@ func init() {
 		if err != nil {
 			return err
 		}
-		printList(result, modules.DBInstance.GetColumns(s))
+
+		if len(opts.ExportFile) > 0 {
+			exportList(result, opts.ExportFile, opts.ExportKeys, opts.ExportTexts, modules.DBInstance.GetColumns(s))
+		} else {
+			printList(result, modules.DBInstance.GetColumns(s))
+		}
 		return nil
 	})
 

cmd/climc/shell/compute/disks.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package shell
+package compute
 
 import (
 	"yunion.io/x/jsonutils"
@@ -291,4 +291,14 @@ func init() {
 		printObject(srv)
 		return nil
 	})
+
+	R(&DiskDetailOptions{}, "disk-change-owner-candidate-domains", "Get change owner candidate domain list", func(s *mcclient.ClientSession, args *DiskDetailOptions) error {
+		result, err := modules.Disks.GetSpecific(s, args.ID, "change-owner-candidate-domains", nil)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
 }

cmd/climc/shell/compute/dnsrecords.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package shell
+package compute
 
 import (
 	"yunion.io/x/onecloud/pkg/mcclient"

cmd/climc/shell/compute/dynamicschedtags.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package shell
+package compute
 
 import (
 	"yunion.io/x/jsonutils"

cmd/climc/shell/compute/elasticcache.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package shell
+package compute
 
 import (
 	"fmt"

cmd/climc/shell/compute/elasticips.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package shell
+package compute
 
 import (
 	"yunion.io/x/jsonutils"
@@ -46,9 +46,9 @@ func init() {
 	})
 
 	type EipCreateOptions struct {
-		MANAGER    string `help:"cloud provider"`
-		REGION     string `help:"cloud region in which EIP is allocated"`
 		NAME       string `help:"name of the EIP"`
+		Manager    string `help:"cloud provider"`
+		Region     string `help:"cloud region in which EIP is allocated"`
 		Bandwidth  int    `help:"Bandwidth in Mbps"`
 		Ip         string `help:"IP address of the EIP"`
 		Network    string `help:"Network of the EIP"`
@@ -56,9 +56,13 @@ func init() {
 	}
 	R(&EipCreateOptions{}, "eip-create", "Create an EIP", func(s *mcclient.ClientSession, args *EipCreateOptions) error {
 		params := jsonutils.NewDict()
-		params.Add(jsonutils.NewString(args.MANAGER), "manager")
-		params.Add(jsonutils.NewString(args.REGION), "region")
 		params.Add(jsonutils.NewString(args.NAME), "name")
+		if args.Region != "" {
+			params.Add(jsonutils.NewString(args.Region), "region")
+		}
+		if args.Manager != "" {
+			params.Add(jsonutils.NewString(args.Manager), "manager")
+		}
 		if args.Bandwidth != 0 {
 			params.Add(jsonutils.NewInt(int64(args.Bandwidth)), "bandwidth")
 		}

cmd/climc/shell/compute/external_projects.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package shell
+package compute
 
 import (
 	"yunion.io/x/jsonutils"

cmd/climc/shell/compute/globalvpcs.go

@@ -0,0 +1,109 @@
+// Copyright 2019 Yunion
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package compute
+
+import (
+	"fmt"
+
+	"yunion.io/x/jsonutils"
+
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/onecloud/pkg/mcclient/options"
+)
+
+func init() {
+	type GlobalVpcListOptions struct {
+		options.BaseListOptions
+	}
+	R(&GlobalVpcListOptions{}, "global-vpc-list", "List global vpcs", func(s *mcclient.ClientSession, args *GlobalVpcListOptions) error {
+		params, err := options.ListStructToParams(args)
+		if err != nil {
+			return err
+		}
+		result, err := modules.GlobalVpcs.List(s, params)
+		if err != nil {
+			return err
+		}
+		printList(result, modules.GlobalVpcs.GetColumns(s))
+		return nil
+	})
+
+	type GlobalVpcShowOptions struct {
+		ID string `help:"ID or Name of globalvpc"`
+	}
+	R(&GlobalVpcShowOptions{}, "global-vpc-show", "Show details of a global vpc", func(s *mcclient.ClientSession, args *GlobalVpcShowOptions) error {
+		result, err := modules.GlobalVpcs.GetById(s, args.ID, nil)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	type GlobalVpcPublicOptions struct {
+		ID            string   `help:"ID or name of global vpc" json:"-"`
+		Scope         string   `help:"sharing scope" choices:"system|domain"`
+		SharedDomains []string `help:"share to domains"`
+	}
+	R(&GlobalVpcPublicOptions{}, "global-vpc-public", "Make global vpc public", func(s *mcclient.ClientSession, args *GlobalVpcPublicOptions) error {
+		params := jsonutils.Marshal(args)
+		result, err := modules.GlobalVpcs.PerformAction(s, args.ID, "public", params)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	type GlobalVpcPrivateOptions struct {
+		ID string `help:"ID or name of global vpc" json:"-"`
+	}
+	R(&GlobalVpcPrivateOptions{}, "global-vpc-private", "Make global vpc private", func(s *mcclient.ClientSession, args *GlobalVpcPrivateOptions) error {
+		params := jsonutils.Marshal(args)
+		result, err := modules.GlobalVpcs.PerformAction(s, args.ID, "private", params)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	R(&GlobalVpcShowOptions{}, "global-vpc-change-owner-candidate-domains", "Show candiate domains of a global vpc for changing owner", func(s *mcclient.ClientSession, args *GlobalVpcShowOptions) error {
+		result, err := modules.GlobalVpcs.GetSpecific(s, args.ID, "change-owner-candidate-domains", nil)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	type GlobalVpcChangeOwnerOptions struct {
+		ID            string `help:"ID or name of vpc" json:"-"`
+		ProjectDomain string `json:"project_domain" help:"target domain"`
+	}
+	R(&GlobalVpcChangeOwnerOptions{}, "global-vpc-change-owner", "Change owner domain of a global vpc", func(s *mcclient.ClientSession, args *GlobalVpcChangeOwnerOptions) error {
+		if len(args.ProjectDomain) == 0 {
+			return fmt.Errorf("empty project_domain")
+		}
+		params := jsonutils.Marshal(args)
+		ret, err := modules.GlobalVpcs.PerformAction(s, args.ID, "change-owner", params)
+		if err != nil {
+			return err
+		}
+		printObject(ret)
+		return nil
+	})
+}

cmd/climc/shell/compute/guest_template.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package shell
+package compute
 
 import (
 	"fmt"
@@ -145,6 +145,15 @@ func init() {
 		},
 	)
 
+	R(&GuestTemplateOptions{}, "server-template-inspect", "Inspect server template", func(s *mcclient.ClientSession, opts *GuestTemplateOptions) error {
+		tem, err := modules.GuestTemplate.PerformAction(s, opts.ID, "inspect", jsonutils.JSONNull)
+		if err != nil {
+			return err
+		}
+		printObject(tem)
+		return nil
+	})
+
 	type GuestTemplatePublicOptions struct {
 		ID          string `help:"ID or Name of server template"`
 		PublicScope string `help:"public scope"`

cmd/climc/shell/compute/hostcachedimages.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package shell
+package compute
 
 import (
 	"yunion.io/x/jsonutils"

cmd/climc/shell/compute/hosts.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package shell
+package compute
 
 import (
 	"fmt"
@@ -793,4 +793,42 @@ func init() {
 		printObject(result)
 		return nil
 	})
+
+	type HostAutoMigrateOnHostDownOptions struct {
+		ID      string `help:"ID or name of host"`
+		Enable  bool   `help:"enable auto migrate"`
+		Disable bool   `help:"disable auto migrate"`
+	}
+	R(&HostAutoMigrateOnHostDownOptions{}, "host-auto-migrate-on-host-down", "Get change owner candidate domain list", func(s *mcclient.ClientSession, args *HostAutoMigrateOnHostDownOptions) error {
+		params := jsonutils.NewDict()
+		if args.Disable {
+			params.Set("auto_migrate_on_host_down", jsonutils.NewString("disable"))
+		} else if args.Enable {
+			params.Set("auto_migrate_on_host_down", jsonutils.NewString("enable"))
+		} else {
+			return fmt.Errorf("missing input enable or disable")
+		}
+		result, err := modules.Hosts.PerformAction(s, args.ID, "auto-migrate-on-host-down", params)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	type HostSetReservedResourceForIsolatedDevice struct {
+		ID              []string `help:"ID or name of host" json:"-"`
+		ReservedCpu     *int     `help:"reserved cpu count"`
+		ReservedMem     *int     `help:"reserved mem count"`
+		ReservedStorage *int     `help:"reserved storage count"`
+	}
+	R(&HostSetReservedResourceForIsolatedDevice{},
+		"host-set-reserved-resource-for-isolated-device",
+		"Set reserved resource for isolated device",
+		func(s *mcclient.ClientSession, args *HostSetReservedResourceForIsolatedDevice) error {
+			res := modules.Hosts.BatchPerformAction(s, args.ID, "set-reserved-resource-for-isolated-device", jsonutils.Marshal(args))
+			printBatchResults(res, modules.Hosts.GetColumns(s))
+			return nil
+		},
+	)
 }

cmd/climc/shell/compute/hoststorages.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package shell
+package compute
 
 import (
 	"yunion.io/x/jsonutils"

cmd/climc/shell/compute/hostwires.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package shell
+package compute
 
 import (
 	"yunion.io/x/jsonutils"

cmd/climc/shell/compute/instance_group.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package shell
+package compute
 
 import (
 	"yunion.io/x/jsonutils"

cmd/climc/shell/compute/instance_snapshots.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package shell
+package compute
 
 import (
 	"yunion.io/x/onecloud/pkg/mcclient"

cmd/climc/shell/compute/isolatedevices.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package shell
+package compute
 
 import (
 	"yunion.io/x/jsonutils"
@@ -84,4 +84,16 @@ func init() {
 		printObject(result)
 		return nil
 	})
+
+	type DeviceUpdateOptions struct {
+		ID              []string `help:"ID of the isolated device" json:"-"`
+		ReservedCpu     *int     `help:"reserved cpu for isolated device"`
+		ReservedMem     *int     `help:"reserved mem for isolated device"`
+		ReservedStorage *int     `help:"reserved storage for isolated device"`
+	}
+	R(&DeviceUpdateOptions{}, "isolated-device-update", "Update a isolated device", func(s *mcclient.ClientSession, args *DeviceUpdateOptions) error {
+		res := modules.IsolatedDevices.BatchUpdate(s, args.ID, jsonutils.Marshal(args))
+		printBatchResults(res, modules.IsolatedDevices.GetColumns(s))
+		return nil
+	})
 }

cmd/climc/shell/compute/keypairs.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package shell
+package compute
 
 import (
 	"fmt"

cmd/climc/shell/compute/loadbalanceracls.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package shell
+package compute
 
 import (
 	"yunion.io/x/jsonutils"

cmd/climc/shell/compute/loadbalanceragents.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package shell
+package compute
 
 import (
 	"encoding/base64"
@@ -70,6 +70,18 @@ func init() {
 		printLbagent(lbagent)
 		return nil
 	})
+	R(&options.LoadbalancerAgentDefaultParamsOptions{}, "lbagent-show-default-params", "Show lbagent default params", func(s *mcclient.ClientSession, opts *options.LoadbalancerAgentDefaultParamsOptions) error {
+		params, err := options.StructToParams(opts)
+		if err != nil {
+			return err
+		}
+		lbagent, err := modules.LoadbalancerAgents.Get(s, "default-params", params)
+		if err != nil {
+			return err
+		}
+		printLbagent(lbagent)
+		return nil
+	})
 	R(&options.LoadbalancerAgentListOptions{}, "lbagent-list", "List lbagents", func(s *mcclient.ClientSession, opts *options.LoadbalancerAgentListOptions) error {
 		params, err := options.ListStructToParams(opts)
 		if err != nil {

cmd/climc/shell/compute/loadbalancerbackendgroups.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package shell
+package compute
 
 import (
 	"yunion.io/x/onecloud/pkg/mcclient"

cmd/climc/shell/compute/loadbalancerbackends.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package shell
+package compute
 
 import (
 	"yunion.io/x/onecloud/pkg/mcclient"

cmd/climc/shell/compute/loadbalancercachedacls.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package shell
+package compute
 
 import (
 	"yunion.io/x/jsonutils"

cmd/climc/shell/compute/loadbalancercachedcertificates.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package shell
+package compute
 
 import (
 	"yunion.io/x/onecloud/pkg/mcclient"

cmd/climc/shell/compute/loadbalancercertificates.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package shell
+package compute
 
 import (
 	"yunion.io/x/onecloud/pkg/mcclient"

cmd/climc/shell/compute/loadbalancerclusters.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package shell
+package compute
 
 import (
 	"yunion.io/x/onecloud/pkg/mcclient"

cmd/climc/shell/compute/loadbalancerlistenerrules.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package shell
+package compute
 
 import (
 	"yunion.io/x/jsonutils"

cmd/climc/shell/compute/loadbalancerlisteners.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package shell
+package compute
 
 import (
 	"fmt"

cmd/climc/shell/compute/loadbalancernetworks.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package shell
+package compute
 
 import (
 	"yunion.io/x/jsonutils"

cmd/climc/shell/compute/loadbalancers.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package shell
+package compute
 
 import (
 	"yunion.io/x/onecloud/pkg/mcclient"
@@ -99,4 +99,13 @@ func init() {
 		return nil
 	})
 
+	R(&options.LoadbalancerGetOptions{}, "lb-change-owner-candidate-domains", "Get change owner candidate domain list", func(s *mcclient.ClientSession, args *options.LoadbalancerGetOptions) error {
+		result, err := modules.Loadbalancers.GetSpecific(s, args.ID, "change-owner-candidate-domains", nil)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
 }

cmd/climc/shell/compute/metadata.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package shell
+package compute
 
 import (
 	"yunion.io/x/onecloud/pkg/mcclient"

cmd/climc/shell/compute/natdtable.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package shell
+package compute
 
 import (
 	"yunion.io/x/jsonutils"

cmd/climc/shell/compute/natgateways.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package shell
+package compute
 
 import (
 	"yunion.io/x/onecloud/pkg/mcclient"

cmd/climc/shell/compute/natstable.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package shell
+package compute
 
 import (
 	"yunion.io/x/jsonutils"

cmd/climc/shell/compute/networkinterfacenetworks.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package shell
+package compute
 
 import (
 	"yunion.io/x/jsonutils"

cmd/climc/shell/compute/networkinterfaces.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package shell
+package compute
 
 import (
 	"yunion.io/x/onecloud/pkg/mcclient"