Merge pull request #6741 from swordqiu/automated-cherry-pick-of-#6740-upstream-release-3.2

Automated cherry pick of #6740: fix: xsky recode using endpoint as accesskey key

.circleci/config.yml

@@ -13,7 +13,7 @@ jobs:
       - checkout
       - run:
           command: |
-            make -j3 check
+            make 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 -j3 $targets
+            make $targets
             ls -lh _output/bin/
       - save_cache:
           key: onecloud-build-cache-{{ checksum "go.mod" }}-{{ checksum "Makefile" }}
@@ -55,7 +55,6 @@ 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 cmd/cloudid
+        make cmd/cloudevent cmd/devtool
         make cmd/*cli
         make cmd/esxi-agent
         make docker-alpine-build F='-j4 cmd/host cmd/vpcagent cmd/region-dns'
@@ -211,16 +211,6 @@ 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,5 +35,3 @@ GPATH
 GRTAGS
 GTAGS
 pkg/generated
-
-*.orig

Makefile

@@ -163,15 +163,9 @@ 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
 
 

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.com/yunionio/onecloud/branches) 
+[![Build Status](https://travis-ci.com/yunionio/onecloud.svg?branch=master)](https://travis-ci.org/yunionio/onecloud) 
 [![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/apiv2/)
+- [Swagger API](https://docs.yunion.cn/api/)
 
 ## Architecture
 

build/cloudid/vars

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

build/docker/Dockerfile.ansibleserver

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

build/docker/Dockerfile.ansibleserver-base

@@ -1,12 +1,13 @@
-FROM alpine:3.11.6
+FROM frolvlad/alpine-glibc:glibc-2.28
 
-MAINTAINER "Yousong Zhou <zhouyousong@yunionyun.com>"
+MAINTAINER "Zexi Li <lizexi@yunionyun.com>"
 
-# 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/*
+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

build/docker/Dockerfile.apigateway

@@ -1,3 +1,3 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.1
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:latest
 
 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:v0.1
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:latest
 
 ADD ./_output/bin/cloudevent /opt/yunion/bin/cloudevent

build/docker/Dockerfile.cloudid

@@ -1,3 +0,0 @@
-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:v0.1
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:latest
 
 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:v0.1
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:latest
 
 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:v0.1
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:latest
 
 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.2.0
+FROM registry.cn-beijing.aliyuncs.com/yunionio/host-base:v0.1.0
 
 MAINTAINER "Yaoqi Wan wanyaoqi@yunionyun.com"
 

build/docker/Dockerfile.keystone

@@ -1,3 +1,3 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.1
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:latest
 
 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:v0.1
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:latest
 
 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:v0.1
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:latest
 
 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:v0.1
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:latest
 
 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 curl busybox-extras tcpdump strace ca-certificates && \
+    apk add --no-cache tzdata 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:v0.1
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:latest
 
 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:v0.1
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:latest
 
 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:v0.1
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:latest
 
 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.10.4-0
+FROM registry.cn-beijing.aliyuncs.com/yunionio/openvswitch:2.9.6-1
 
 MAINTAINER "Yousong Zhou <zhouyousong@yunion.cn>"
 

build/docker/Dockerfile.yunionconf

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

build/notify/root/opt/yunion/share/template/content/VERIFY.email

@@ -11,7 +11,7 @@
   			<table style="margin-left: 20px;">
   				<tr>
   					<td>
-  						<img src="data:{{.login_logo_format}};base64,{{.login_logo}}" alt="" style="color: #fff; height: 32px; vertical-align: middle;">
+  						<img src="data:{{.logo_format}};base64,{{.logo}}" alt="" style="color: #fff; width: 80px; vertical-align: middle;">
   					</td>
   				</tr>
   			</table>
@@ -43,23 +43,23 @@
   			<table style="padding: 20px 10px; width: 100%;">
 	  			<tr>
 	  				<td style="padding-bottom: 20px;">
-                        尊敬的{{.name}}，您好：
+	  					亲爱的{{.name}}，您好：
 	  				</td>
 	  			</tr>
 	  			<tr>
 	  				<td style="padding-bottom: 10px;">请点击下面的链接，完成用户邮箱的激活：</td>
 	  			</tr>
 	  			<tr>
-                    <td style="padding-bottom: 30px;"><a href="{{.link}}">{{.link}}</a></td>
+	  				<td style="padding-bottom: 30px;"><a href="{{.link}}">{{.link}}</a></td>
 	  			</tr>
 	  		</table>
   		</td>
   	</tr>
   	<tr style="width: 96%;">
-		<td colspan="2" style="border-top: 1px dashed #ccc; color: #333; font-size: 12px; padding-bottom: 10px; font-weight: 100;">*为了确保您的帐号安全，该链接仅48小时内访问有效，请勿直接回复此邮件。</td>
+		<td colspan="2" style="border-top: 1px dashed #ccc; color: #ccc; font-size: 12px; padding-bottom: 10px; font-weight: 100;">*为了确保您的帐号安全，该链接仅48小时内访问有效，请勿直接回复此邮件。</td>
 	</tr>
 	<tr>
-		<td colspan="2" style="background: #333; text-align: right; padding-right: 20px; font-size: 12px; color: #fff; height: 50px;">版权所有 © {{.copyright}} 保留一切权利</td>
+		<td colspan="2" style="background: #333; text-align: right; padding-right: 20px; font-size: 12px; color: #949494; height: 50px;">版权所有 © {{.copyright}} 保留一切权利</td>
 	</tr>
   </table>
 </body>

cmd/climc/climc.go

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

cmd/climc/entry/doc.go

@@ -1,15 +0,0 @@
-// 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 entry // import "yunion.io/x/onecloud/cmd/climc/entry"

cmd/climc/main.go

@@ -1,42 +0,0 @@
-// 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

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

cmd/climc/shell/account_balances.go

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

cmd/climc/shell/actions.go

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

cmd/climc/shell/alarmevents.go

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

cmd/climc/shell/alarmlogs.go

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

cmd/climc/shell/alarms.go

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

cmd/climc/shell/alarmtemplates.go

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

cmd/climc/shell/ansible.go

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

cmd/climc/shell/ansible/common.go

@@ -1,32 +0,0 @@
-// 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/ansibleplaybooks.go

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

cmd/climc/shell/ansibleplaybooks_v2.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package ansible
+package shell
 
 import (
 	"yunion.io/x/onecloud/pkg/mcclient"
@@ -49,34 +49,4 @@ 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/associated_bills.go

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

cmd/climc/shell/baremetalagents.go

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

cmd/climc/shell/baremetalevents.go

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

cmd/climc/shell/baremetalnetworks.go

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

cmd/climc/shell/baremetalstorages.go

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

cmd/climc/shell/bill_analysises.go

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

cmd/climc/shell/bill_balances.go

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

cmd/climc/shell/bill_cloudchecks.go

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

cmd/climc/shell/bill_conditions.go

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

cmd/climc/shell/bill_details.go

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

cmd/climc/shell/bill_resources.go

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

cmd/climc/shell/bill_tasks.go

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

cmd/climc/shell/bucket_options.go

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

cmd/climc/shell/buckets.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package compute
+package shell
 
 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"
-	"yunion.io/x/onecloud/pkg/multicloud/objectstore"
+	objectshell "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"`
 
-		objectstore.ObjectHeaderOptions
+		objectshell.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"`
 
-		objectstore.ObjectHeaderOptions
+		objectshell.ObjectHeaderOptions
 	}
 	R(&BucketSetMetadataOptions{}, "bucket-set-metadata", "Set metadata of object", func(s *mcclient.ClientSession, args *BucketSetMetadataOptions) error {
 		input := api.BucketMetadataInput{}

cmd/climc/shell/cachedimages.go

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

cmd/climc/shell/capabilities.go

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

cmd/climc/shell/cloud_sku_rates.go

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

cmd/climc/shell/cloudaccounts.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package compute
+package shell
 
 import (
 	"fmt"
@@ -125,22 +125,6 @@ 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)

cmd/climc/shell/cloudevent/common.go

@@ -1,25 +0,0 @@
-// 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/cloudevents.go

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

cmd/climc/shell/cloudid/cloudgroup.go

@@ -1,168 +0,0 @@
-// 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

@@ -1,73 +0,0 @@
-// 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

@@ -1,72 +0,0 @@
-// 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

@@ -1,72 +0,0 @@
-// 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

@@ -1,81 +0,0 @@
-// 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

@@ -1,72 +0,0 @@
-// 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

@@ -1,197 +0,0 @@
-// 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

@@ -1,26 +0,0 @@
-// 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/cloudmeta.go

@@ -15,19 +15,16 @@
 package shell
 
 import (
-	"yunion.io/x/onecloud/pkg/multicloud/aws"
-	"yunion.io/x/onecloud/pkg/util/shellutils"
+	"yunion.io/x/onecloud/pkg/mcclient"
 )
 
 func init() {
-	type CallerIdentityOptions struct {
+	type CloudmetaOptions struct {
+		PROVIDER_ID string `help:"provider_id"`
+		REGION_ID   string `help:"region_id"`
+		ZONE_ID     string `help:"zone_id"`
 	}
-	shellutils.R(&CallerIdentityOptions{}, "caller-identity-show", "Show caller identity", func(cli *aws.SRegion, args *CallerIdentityOptions) error {
-		identity, err := cli.GetClient().GetCallerIdentity()
-		if err != nil {
-			return err
-		}
-		printObject(identity)
+	R(&CloudmetaOptions{}, "instance-type-list", "query backend service for its version", func(s *mcclient.ClientSession, args *CloudmetaOptions) error {
 		return nil
 	})
 }

cmd/climc/shell/cloudprovider_quota.go

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

cmd/climc/shell/cloudproviderregions.go

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

cmd/climc/shell/cloudproviders.go

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

cmd/climc/shell/cloudregions.go

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

cmd/climc/shell/compute/common.go

@@ -1,34 +0,0 @@
-// 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/scheduled_task.go

@@ -1,211 +0,0 @@
-// 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"
-	"time"
-
-	"yunion.io/x/jsonutils"
-
-	apis "yunion.io/x/onecloud/pkg/apis/compute"
-	"yunion.io/x/onecloud/pkg/mcclient"
-	"yunion.io/x/onecloud/pkg/mcclient/modules"
-	"yunion.io/x/onecloud/pkg/mcclient/options"
-)
-
-func init() {
-	type ScheduledTaskListOptions struct {
-		options.BaseListOptions
-
-		ScheduledType string `help:"scheduled type" choices:"timing|cycle"`
-		ResourceType  string `help:"resource type"`
-		Operation     string `help:"operation"`
-	}
-	R(&ScheduledTaskListOptions{}, "scheduledtask-list", "list Scheduled Task", func(s *mcclient.ClientSession, args *ScheduledTaskListOptions) error {
-		params, err := options.ListStructToParams(args)
-		tasks, err := modules.ScheduledTask.List(s, params)
-		if err != nil {
-			return err
-		}
-		printList(tasks, modules.ScheduledTask.GetColumns(s))
-		return nil
-	})
-
-	type ScheduledTaskShowOptions struct {
-		ID string `help:"ScheduledTask ID or Name"`
-	}
-	R(&ScheduledTaskShowOptions{}, "scheudled-task-show", "Show Scheduled Task", func(s *mcclient.ClientSession,
-		args *ScheduledTaskShowOptions) error {
-		params := jsonutils.NewDict()
-		params.Set("details", jsonutils.JSONTrue)
-		task, err := modules.ScheduledTask.Get(s, args.ID, params)
-		if err != nil {
-			return err
-		}
-		printObject(task)
-		return nil
-	})
-
-	type ScheduledTaskCreateOptions struct {
-		NAME          string `help:"ScheduledTask Name" json:"name"`
-		ScheduledType string `help:"Scheudled Type" choices:"timing|cycle" json:"scheduled_type"`
-
-		Timer
-		CycleTimer
-
-		ResourceType string   `help:"resource type"`
-		Operation    string   `help:"operation"`
-		LabelType    string   `help:"label type"`
-		Labels       []string `help:"labels"`
-	}
-	R(&ScheduledTaskCreateOptions{}, "scheduledtask-create", "Create Scheduled Task", func(s *mcclient.ClientSession, args *ScheduledTaskCreateOptions) error {
-		formatStr := "2006-01-02 15:04:05"
-		var exectime, starttime, endtime time.Time
-		var err error
-		if len(args.TimingExecTime) > 0 {
-			exectime, err = time.Parse(formatStr, args.TimingExecTime)
-			if err != nil {
-				return fmt.Errorf("invalid time format for 'exec_time'")
-			}
-		}
-		if len(args.CycleStartTime) > 0 {
-			starttime, err = time.Parse(formatStr, args.CycleStartTime)
-			if err != nil {
-				return fmt.Errorf("invalid time format for 'start_time'")
-			}
-		}
-		if len(args.CycleEndTime) > 0 {
-			endtime, err = time.Parse(formatStr, args.CycleEndTime)
-			if err != nil {
-				return fmt.Errorf("invalid time format for 'end_time'")
-			}
-		}
-		stCreateInput := apis.ScheduledTaskCreateInput{
-			ScheduledType: args.ScheduledType,
-			Timer: apis.TimerCreateInput{
-				ExecTime: exectime,
-			},
-			CycleTimer: apis.CycleTimerCreateInput{
-				CycleType: args.CycleCycleType,
-				Minute:    args.CycleMinute,
-				Hour:      args.CycleHour,
-				WeekDays:  args.CycleWeekdays,
-				MonthDays: args.CycleMonthDays,
-				StartTime: starttime,
-				EndTime:   endtime,
-			},
-			ResourceType: args.ResourceType,
-			Operation:    args.Operation,
-			LabelType:    args.LabelType,
-			Labels:       args.Labels,
-		}
-		stCreateInput.Name = args.NAME
-		ret, err := modules.ScheduledTask.Create(s, jsonutils.Marshal(stCreateInput))
-		if err != nil {
-			return err
-		}
-		printObject(ret)
-		return nil
-	})
-
-	type ScheduledTaskEnableOptions struct {
-		ID string `help:"ScheduledTask ID or Name"`
-	}
-	R(&ScheduledTaskEnableOptions{}, "scheduledtask-enable", "Enable ScheduledTask", func(s *mcclient.ClientSession,
-		args *ScheduledTaskEnableOptions) error {
-		ret, err := modules.ScheduledTask.PerformAction(s, args.ID, "enable", jsonutils.NewDict())
-		if err != nil {
-			return err
-		}
-		printObject(ret)
-		return nil
-	})
-	R(&ScheduledTaskEnableOptions{}, "scheduledtask-disable", "Disable ScheduledTask",
-		func(s *mcclient.ClientSession, args *ScheduledTaskEnableOptions) error {
-			ret, err := modules.ScheduledTask.PerformAction(s, args.ID, "disable", jsonutils.NewDict())
-			if err != nil {
-				return err
-			}
-			printObject(ret)
-			return nil
-		},
-	)
-
-	type ScheduledTaskSetLabelsOptions struct {
-		ID     string   `help:"ScheduledTask ID or Name"`
-		Labels []string `help:"Label"`
-	}
-	R(&ScheduledTaskSetLabelsOptions{}, "scheduledtask-setlabels", "Trigger ScheduledTask's action",
-		func(s *mcclient.ClientSession, args *ScheduledTaskSetLabelsOptions) error {
-			params := jsonutils.NewDict()
-			params.Set("labels", jsonutils.Marshal(args.Labels))
-			ret, err := modules.ScheduledTask.PerformAction(s, args.ID, "set-labels", params)
-			if err != nil {
-				return err
-			}
-			printObject(ret)
-			return nil
-		},
-	)
-
-	type ScheduledTaskTriggerOptions struct {
-		ID string `help:"ScheduledTask ID or Name"`
-	}
-	R(&ScheduledTaskTriggerOptions{}, "scheduledtask-trigger", "Trigger ScheduledTask",
-		func(s *mcclient.ClientSession, args *ScheduledTaskTriggerOptions) error {
-			params := jsonutils.NewDict()
-			ret, err := modules.ScheduledTask.PerformAction(s, args.ID, "trigger", params)
-			if err != nil {
-				return err
-			}
-			printObject(ret)
-			return nil
-		},
-	)
-
-	type ScheduledTaskDeleteOptions struct {
-		ID string `help:"ScheduledTask ID or Name"`
-	}
-	R(&ScheduledTaskDeleteOptions{}, "scheduledtask-delete", "Delete ScheduledTask",
-		func(s *mcclient.ClientSession, args *ScheduledTaskDeleteOptions) error {
-			ret, err := modules.ScheduledTask.Delete(s, args.ID, jsonutils.NewDict())
-			if err != nil {
-				return err
-			}
-			printObject(ret)
-			return nil
-		},
-	)
-
-	type ScheduledTaskAvtivityListOptions struct {
-		options.BaseListOptions
-		ScheduledTask string `help:"Scheduled Task" json:"scheduled_task"`
-	}
-	R(&ScheduledTaskAvtivityListOptions{}, "scheduledtask-activity-list", "List Scheduled Task Activity",
-		func(s *mcclient.ClientSession, args *ScheduledTaskAvtivityListOptions) error {
-			params, err := options.ListStructToParams(args)
-			if err != nil {
-				return err
-			}
-			list, err := modules.ScheduledTaskActivity.List(s, params)
-			if err != nil {
-				return err
-			}
-			printList(list, modules.ScheduledTaskActivity.GetColumns(s))
-			return nil
-		},
-	)
-}

cmd/climc/shell/contactgroups.go

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

cmd/climc/shell/contacts.go

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

cmd/climc/shell/copyright.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package misc
+package shell
 
 import (
 	"bufio"
@@ -35,7 +35,6 @@ func init() {
 		Copyright string  `help:"The copyright"`
 		Email     string  `help:"The Email"`
 		Docs      *string `help:"the Docs website address"`
-		License   *string `help:"the license generator website address"`
 	}
 
 	R(&CopyrightUpdateOptions{}, "copyright-update", "update copyright", func(s *mcclient.ClientSession, args *CopyrightUpdateOptions) error {
@@ -48,10 +47,6 @@ func init() {
 			params.Add(jsonutils.NewString(*args.Docs), "docs")
 		}
 
-		if args.License != nil {
-			params.Add(jsonutils.NewString(*args.License), "license")
-		}
-
 		if len(args.Copyright) > 0 {
 			params.Add(jsonutils.NewString(args.Copyright), "copyright")
 		}

cmd/climc/shell/credentials.go

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

cmd/climc/shell/current.go

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

cmd/climc/shell/dbinstance_accounts.go

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

cmd/climc/shell/dbinstance_backups.go

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

cmd/climc/shell/dbinstance_databases.go

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

cmd/climc/shell/dbinstance_skus.go

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

cmd/climc/shell/dbinstances.go

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

cmd/climc/shell/devtoolcronjob.go

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

cmd/climc/shell/devtooltemplate.go

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

cmd/climc/shell/disks.go

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

cmd/climc/shell/distinctfield.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package misc
+package shell
 
 import (
 	"fmt"
@@ -27,7 +27,6 @@ func init() {
 	type DistinctFieldOption struct {
 		MODULE string `help:"module name"`
 		FIELD  string `help:"distinct field name to query"`
-		Extra  bool   `help:"query extra distinct field"`
 	}
 	R(&DistinctFieldOption{}, "distinct-field", "Query values of a distinct field for a module", func(s *mcclient.ClientSession, args *DistinctFieldOption) error {
 		mod, err := modulebase.GetModule(s, args.MODULE)
@@ -38,11 +37,7 @@ func init() {
 			return fmt.Errorf("No module %s found", args.MODULE)
 		}
 		params := jsonutils.NewDict()
-		if args.Extra {
-			params.Add(jsonutils.NewString(args.FIELD), "extra_field")
-		} else {
-			params.Add(jsonutils.NewString(args.FIELD), "field")
-		}
+		params.Add(jsonutils.NewString(args.FIELD), "extra_field")
 		result, err := mod.Get(s, "distinct-field", params)
 		if err != nil {
 			return err

cmd/climc/shell/dnsrecords.go

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

cmd/climc/shell/domains.go

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

cmd/climc/shell/dynamicschedtags.go

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

cmd/climc/shell/elasticcache.go

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

cmd/climc/shell/elasticips.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package compute
+package shell
 
 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,13 +56,9 @@ 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/email_config.go

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

cmd/climc/shell/endpoints.go

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

cmd/climc/shell/events.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package events
+package shell
 
 import (
 	"yunion.io/x/jsonutils"
@@ -35,10 +35,7 @@ type BaseEventListOptions struct {
 	Action     []string `help:"Log action"`
 
 	User    string `help:"filter by operator user"`
-	Project string `help:"filter by operator user's project"`
-
-	OwnerProjectIds []string `help:"filter by owner project ids"`
-	OwnerDomainIds  []string `help:"filter by owner domain ids"`
+	Project string `help:"filter by owner project"`
 
 	PagingMarker string `help:"marker for pagination"`
 }
@@ -110,12 +107,6 @@ func doEventList(man modulebase.ResourceManager, s *mcclient.ClientSession, args
 	if len(args.Scope) > 0 {
 		params.Add(jsonutils.NewString(args.Scope), "scope")
 	}
-	if len(args.OwnerProjectIds) > 0 {
-		params.Add(jsonutils.NewStringArray(args.OwnerProjectIds), "owner_project_ids")
-	}
-	if len(args.OwnerDomainIds) > 0 {
-		params.Add(jsonutils.NewStringArray(args.OwnerDomainIds), "owner_domain_ids")
-	}
 	if len(args.PagingMarker) > 0 {
 		params.Add(jsonutils.NewString(args.PagingMarker), "paging_marker")
 	}
@@ -190,6 +181,11 @@ func init() {
 		return doComputeEventList(s, &nargs)
 	})
 
+	R(&TypeEventListOptions{}, "kube-cluster-event", "Show operation event logs of kubernetes cluster", func(s *mcclient.ClientSession, args *TypeEventListOptions) error {
+		nargs := EventListOptions{BaseEventListOptions: args.BaseEventListOptions, Id: args.ID, Type: []string{"kube_cluster"}}
+		return doK8sEventList(s, &nargs)
+	})
+
 	R(&TypeEventListOptions{}, "kubecluster-event", "Show operation event logs of kubernetes cluster", func(s *mcclient.ClientSession, args *TypeEventListOptions) error {
 		nargs := EventListOptions{BaseEventListOptions: args.BaseEventListOptions, Id: args.ID, Type: []string{"kubecluster"}}
 		return doK8sEventList(s, &nargs)

cmd/climc/shell/events/common.go

@@ -1,30 +0,0 @@
-// 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 events
-
-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
-)