Merge pull request #8537 from rainzm/automated-cherry-pick-of-#8535-upstream-release-3.4

Automated cherry pick of #8535: refactor(region): faster list for cachedimage

.dockerignore

@@ -1,7 +0,0 @@
- _output/alpine-build/_cache
-pkg
-vendor
-cmd
-locales
-docs
-scripts

.gitignore

@@ -31,7 +31,6 @@ _output
 /structargtest
 .idea
 .vscode
-intellij.yaml
 GPATH
 GRTAGS
 GTAGS

Makefile

@@ -9,7 +9,7 @@ BUILD_SCRIPT := $(ROOT_DIR)/build/build.sh
 
 ifeq ($(ONECLOUD_CI_BUILD),)
 	GIT_COMMIT := $(shell git rev-parse --short HEAD)
-	GIT_BRANCH := $(shell git branch -r --contains | head -1 | sed -E -e "s%(HEAD ->|origin|upstream)/?%%g" | xargs)
+	GIT_BRANCH := $(shell git name-rev --name-only HEAD)
 	GIT_VERSION := $(shell git describe --always --tags --abbrev=14 $(GIT_COMMIT)^{commit})
 	GIT_TREE_STATE := $(shell s=`git status --porcelain 2>/dev/null`; if [ -z "$$s" ]; then echo "clean"; else echo "dirty"; fi)
 	BUILD_DATE := $(shell date -u +'%Y-%m-%dT%H:%M:%SZ')
@@ -199,7 +199,7 @@ mod:
 	go mod vendor -v
 
 
-DOCKER_CENTOS_BUILD_IMAGE?=registry.cn-beijing.aliyuncs.com/yunionio/centos-build:1.1-3
+DOCKER_CENTOS_BUILD_IMAGE?=registry.cn-beijing.aliyuncs.com/yunionio/centos-build:1.1-1
 
 define dockerCentOSBuildCmd
 set -o xtrace
@@ -232,7 +232,7 @@ docker-centos-build-stop:
 .PHONY: docker-centos-build
 .PHONY: docker-centos-build-stop
 
-DOCKER_ALPINE_BUILD_IMAGE?=registry.cn-beijing.aliyuncs.com/yunionio/alpine-build:1.0-5
+DOCKER_ALPINE_BUILD_IMAGE?=registry.cn-beijing.aliyuncs.com/yunionio/alpine-build:1.0-3
 
 define dockerAlpineBuildCmd
 set -o xtrace

README-CN.md

@@ -41,7 +41,7 @@
 
 ## 架构
 
-![architecture](https://www.yunion.cn/static/frame.png)
+![architecture](./docs/architecture.svg)
 
 
 ## 贡献

README.md

@@ -44,7 +44,7 @@ Please refers to [install & deployment](https://docs.yunion.io/docs/setup/) (cur
 
 ## Architecture
 
-![architecture](https://www.yunion.cn/static/frame.png)
+![architecture](./docs/architecture.svg)
 
 ## Contribution
 

build/climc/root/opt/yunion/scripts/rbac/domainadmin.yaml

@@ -0,0 +1,6 @@
+# rbac for project owner, not allow for delete
+roles:
+  - domain_admin
+scope: domain
+policy:
+  '*': allow

build/climc/root/opt/yunion/scripts/rbac/member.yaml

@@ -1,10 +1,9 @@
+# rbac for normal user, not allow for delete
+scope: project
 policy:
   '*':
     '*':
       '*': allow
       create: deny
+      update: deny
       delete: deny
-      perform:
-        purge: deny
-        clone: deny
-        '*': allow

build/climc/root/opt/yunion/scripts/rbac/owner.yaml

@@ -1,2 +0,0 @@
-policy:
-  '*': allow

build/climc/root/opt/yunion/scripts/rbac/projectowner.yaml

@@ -0,0 +1,6 @@
+# rbac for project owner, not allow for delete
+roles:
+  - project_owner
+scope: project
+policy:
+  '*': allow

build/climc/root/opt/yunion/scripts/rbac/sysadmin.yaml

@@ -0,0 +1,8 @@
+# rbac for sysadmin
+projects:
+  - system
+roles:
+  - admin
+scope: system
+policy:
+  '*': allow

build/climc/root/opt/yunion/scripts/rbac/viewer.yaml

@@ -1,6 +0,0 @@
-policy:
-  '*':
-    '*':
-      get: allow
-      list: allow
-      '*': deny

build/cloudid/root/opt/yunion/share/notify_templates/cloudid/content@cn/CLOUD_USER_CREATED

@@ -1,6 +0,0 @@
-公有云子账号创建成功
-主账号：{{ .account }}<br>
-名称：{{ .name }}<br>
-密码：{{ .password }}<br>
-登录地址: {{ .iam_login_url }}<br>
-资源ID: {{ .id }}<br>

build/cloudid/root/opt/yunion/share/notify_templates/cloudid/content@en/CLOUD_USER_CREATED

@@ -1,6 +0,0 @@
-Clouduser has been created successfully
-Root Account: {{ .account }}<br>
-Name：{{ .name }}<br>
-Password：{{ .password }}<br>
-IAM Login URL: {{ .iam_login_url }}<br>
-Resource ID: {{ .id }}<br>

build/cloudid/root/opt/yunion/share/notify_templates/cloudid/title@cn/CLOUD_USER_CREATED

@@ -1 +0,0 @@
-公有云子账号 {{ .name }} 创建成功

build/cloudid/root/opt/yunion/share/notify_templates/cloudid/title@en/CLOUD_USER_CREATED

@@ -1 +0,0 @@
-The clouduser {{ .name }} created successfully

build/docker/Dockerfile.host-deployer

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

build/docker/multi-arch/Dockerfile.esxi-agent

@@ -0,0 +1,16 @@
+FROM registry.cn-beijing.aliyuncs.com/yunionio/alpine-build:1.0-3 as build
+ARG TARGETPLATFORM
+ARG BUILDPLATFORM
+RUN mkdir -p /root/go/src/yunion.io/x/onecloud
+COPY . /root/go/src/yunion.io/x/onecloud
+
+WORKDIR /root/go/src/yunion.io/x/onecloud
+RUN make cmd/esxi-agent
+
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.2
+
+MAINTAINER "Yaoqi Wan wanyaoqi@yunionyun.com"
+
+RUN mkdir -p /opt/yunion/bin
+COPY --from=build /root/go/src/yunion.io/x/onecloud/build/esxi-agent/root/opt/ /opt/
+COPY --from=build /root/go/src/yunion.io/x/onecloud/_output/bin/esxi-agent /opt/yunion/bin/esxi-agent

build/docker/multi-arch/Dockerfile.host

@@ -1,4 +1,4 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/alpine-build:1.0-5 as build
+FROM registry.cn-beijing.aliyuncs.com/yunionio/alpine-build:1.0-3 as build
 ARG TARGETPLATFORM
 ARG BUILDPLATFORM
 RUN mkdir -p /root/go/src/yunion.io/x/onecloud

build/docker/multi-arch/Dockerfile.torrent

@@ -1,4 +1,4 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/alpine-build:1.0-5 as build
+FROM registry.cn-beijing.aliyuncs.com/yunionio/alpine-build:1.0-3 as build
 ARG TARGETPLATFORM
 ARG BUILDPLATFORM
 RUN mkdir -p /root/go/src/yunion.io/x/onecloud

build/monitor/root/opt/yunion/share/notify_templates/alerter/content@cn/DEFAULT

@@ -0,0 +1,18 @@
+## {{.title}}
+- 时间: {{.start_time}}
+- 级别: {{.level}}
+- 详情地址: {{.web_url}}/commonalerts
+
+{{ range .matches}}
+- 指标: {{.metric}}
+- 触发值: {{html .value_str}}
+
+### 触发条件:
+- {{html $.description}}
+
+### 标签
+ > 名称: {{ index .tags "name" }}
+ > ip: {{ index .tags "ip" }}
+ > 平台: {{ index .tags "brand" }}
+------
+{{- end}}

build/monitor/root/opt/yunion/share/notify_templates/alerter/content@cn/DEFAULT.email

@@ -92,7 +92,7 @@
   </table>
   <table class="table" style="padding-top: 6px; padding-bottom: 10px;">
     <tr>
-      <td style="padding-left: 20px; font-size: 14px;">若要查看详情信息，<a class="link" target="_blank" href="{{.web_url}}
+      <td style="padding-left: 20px; font-size: 14px;">若要查看详情信息，<a class="link" target="_blank" href="{{.web_url}}/commonalerts
 ">请登录平台进行查看</a></td>
     </tr>
   </table>

build/monitor/root/opt/yunion/share/notify_templates/alerter/content@en/DEFAULT

@@ -0,0 +1,18 @@
+## {{.title}}
+- Time: {{.start_time}}
+- Level: {{.level}}
+- WebUrl: {{.web_url}}/commonalerts
+
+{{ range .matches}}
+- Metric: {{.metric}}
+- Trigger value: {{html .value_str}}
+
+### Trigger condition:
+- {{html $.description }}
+
+### Label
+ > Name: {{ index .tags "name" }}
+ > IP: {{ index .tags "ip" }}
+ > Brand: {{ index .tags "brand" }}
+------
+{{- end}}

build/monitor/root/opt/yunion/share/notify_templates/alerter/content@en/DEFAULT.email

@@ -33,7 +33,7 @@
     font-weight: bold;
   }
   .td {
-    width: 120px;
+    width: 80px;
     padding-left: 20px;
     height: 35px;
     font-weight: 400;
@@ -92,8 +92,8 @@
   </table>
   <table class="table" style="padding-top: 6px; padding-bottom: 10px;">
     <tr>
-      <td style="padding-left: 20px; font-size: 14px;">To view details，<a class="link" target="_blank" href="{{.web_url}}
-">Please login to the platform to view</a></td>
+      <td style="padding-left: 20px; font-size: 14px;">To view details，<a class="link" target="_blank" href="{{.web_url}}/commonalerts
+">Please log in to the platform to view</a></td>
     </tr>
   </table>
   <table border="0" cellspacing="0" cellpadding="0" class="table pb-3">

build/monitor/root/opt/yunion/share/notify_templates/monitor/content@cn/DEFAULT

@@ -1,9 +0,0 @@
-{{.title}}
-策略名称: {{.name}}
-触发时间: {{.start_time}}
-报警级别: {{.level}}
-触发条件: {{.description | unescaped}}
-资源数量：{{len .matches}}
-资源名称：{{.resource_name}}
-
-详情地址: {{.web_url}}

build/monitor/root/opt/yunion/share/notify_templates/monitor/content@en/DEFAULT

@@ -1,9 +0,0 @@
-{{.title}}
-AlertName: {{.name}}
-Time: {{.start_time}}
-Level: {{.level}}
-TriggerCondition: {{.description | unescaped}}
-ResourceCount: {{len .matches}}
-ResourceName: {{.resource_name}}
-
-WebUrl: {{.web_url}}

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

@@ -47,7 +47,7 @@
 	  				</td>
 	  			</tr>
 	  			<tr>
-                    <td style="padding-bottom: 10px;">您正在验证邮箱，请在验证码输入框中输入：{{.code}}，以完成验证。</td>
+                    <td style="padding-bottom: 10px;">您正在验证邮箱，请在验证码输入框中输入：{{.code}}，已完成验证。</td>
 	  			</tr>
 	  		</table>
   		</td>

build/notify/root/opt/yunion/share/template/content@en/IMAGE_ACTIVED

@@ -1 +0,0 @@
-{{.os_type}} image {{.name}} upload completed

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

@@ -1,66 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="UTF-8">
-  <title>Document</title>
-</head>
-<body>
-  <table style="width: 650px; margin-bottom: 20px;" border="0" cellpadding="0" cellspacing="0" align="center">
-  	<tr style="height: 50px; background: #333; overflow: hidden;">
-  		<td>
-  			<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;">
-  					</td>
-  				</tr>
-  			</table>
-  		</td>
-  		<td>
-  			<table style="float: right;">
-  				<tr>
-  					<td style="padding-left: 20px; padding-right: 20px;">
-                        <a href="" style="text-decoration: none; color: #20A0FF; font-size: 12px; display: none;">Product</a>
-  					</td>
-  					<td style="padding-left: 20px; padding-right: 20px;">
-  						<a href="" style="text-decoration: none; color: #20A0FF; font-size: 12px; display: none;">Solution</a>
-  					</td>
-  					<td style="padding-left: 20px; padding-right: 20px;">
-  						<a href="" style="text-decoration: none; color: #20A0FF; font-size: 12px; display: none;">Service</a>
-  					</td>
-  					<td style="padding-left: 20px; padding-right: 20px;">
-  						<a href="" style="text-decoration: none; color: #20A0FF; font-size: 12px; display: none;">Help and Documentation</a>
-  					</td>
-  					<td style="padding-left: 20px; padding-right: 20px;">
-  						<a href="" style="text-decoration: none; color: #20A0FF; font-size: 12px; display: none;">About</a>
-  					</td>
-  				</tr>
-  			</table>
-  		</td>
-  	</tr>
-  	<tr>
-  		<td style="width: 100%;" colspan="2">
-  			<table style="padding: 20px 10px; width: 100%;">
-	  			<tr>
-	  				<td style="padding-bottom: 13px;">
-                        Dear {{.name}}：
-	  				</td>
-	  			</tr>
-	  			<tr>
-                    <td style="padding-bottom: 13px;">You are verifying your email, please enter the following code on the email verification page:</td>
-	  			</tr>
-	  			<tr>
-                    <td style="padding-bottom: 10px; font-size: large">{{.code}}</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;">If you are not operating by yourself, please log in to the platform in time and change your password to ensure the security of your account.</td>
-	</tr>
-	<tr>
-		<td colspan="2" style="background: #333; text-align: right; padding-right: 20px; font-size: 12px; color: #fff; height: 50px;">Copyrights © {{.copyright}}. All rights reserved.</td>
-	</tr>
-  </table>
-</body>
-</html>

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

@@ -0,0 +1 @@
+Yunion Verify

build/notify/root/opt/yunion/share/template/title@cn/VERIFY.email

@@ -1 +0,0 @@
-{{.copyright}} Verify

build/notify/root/opt/yunion/share/template/title@en/IMAGE_ACTIVED

@@ -1 +0,0 @@
-Image {{.name}} upload completed

build/notify/root/opt/yunion/share/template/title@en/VERIFY.email

@@ -1 +0,0 @@
-{{.copyright}} Verify

cmd/apsaracli/main.go

@@ -1,146 +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 (
-	"fmt"
-	"os"
-
-	"yunion.io/x/structarg"
-
-	"yunion.io/x/onecloud/pkg/cloudprovider"
-	"yunion.io/x/onecloud/pkg/multicloud/apsara"
-	_ "yunion.io/x/onecloud/pkg/multicloud/apsara/shell"
-	"yunion.io/x/onecloud/pkg/util/shellutils"
-)
-
-type BaseOptions struct {
-	Debug                          bool   `help:"debug mode"`
-	Help                           bool   `help:"Show help"`
-	AccessKey                      string `help:"Access key" default:"$APSARA_ACCESS_KEY" metavar:"APSARA_ACCESS_KEY"`
-	Secret                         string `help:"Secret" default:"$APSARA_SECRET" metavar:"APSARA_SECRET"`
-	cloudprovider.SApsaraEndpoints `help:"Endpoints for Apsara"`
-	Endpoint                       string `help:"Apsara endpoint" default:"$APSARA_ENDPOINT" metavar:"APSARA_ENDPOINT"`
-	RegionId                       string `help:"RegionId" default:"$APSARA_REGION" metavar:"APSARA_REGION"`
-	SUBCOMMAND                     string `help:"apsaracli subcommand" subcommand:"true"`
-}
-
-func getSubcommandParser() (*structarg.ArgumentParser, error) {
-	parse, e := structarg.NewArgumentParser(&BaseOptions{},
-		"apsaracli",
-		"Command-line interface to apsara API.",
-		`See "apsaracli help COMMAND" for help on a specific command.`)
-
-	if e != nil {
-		return nil, e
-	}
-
-	subcmd := parse.GetSubcommand()
-	if subcmd == nil {
-		return nil, fmt.Errorf("No subcommand argument.")
-	}
-	type HelpOptions struct {
-		SUBCOMMAND string `help:"sub-command name"`
-	}
-	shellutils.R(&HelpOptions{}, "help", "Show help of a subcommand", func(args *HelpOptions) error {
-		helpstr, e := subcmd.SubHelpString(args.SUBCOMMAND)
-		if e != nil {
-			return e
-		} else {
-			fmt.Print(helpstr)
-			return nil
-		}
-	})
-	for _, v := range shellutils.CommandTable {
-		_, e := subcmd.AddSubParser(v.Options, v.Command, v.Desc, v.Callback)
-		if e != nil {
-			return nil, e
-		}
-	}
-	return parse, nil
-}
-
-func showErrorAndExit(e error) {
-	fmt.Fprintf(os.Stderr, "%s", e)
-	fmt.Fprintln(os.Stderr)
-	os.Exit(1)
-}
-
-func newClient(options *BaseOptions) (*apsara.SRegion, error) {
-	if len(options.AccessKey) == 0 {
-		return nil, fmt.Errorf("Missing accessKey")
-	}
-
-	if len(options.Secret) == 0 {
-		return nil, fmt.Errorf("Missing secret")
-	}
-
-	cli, err := apsara.NewApsaraClient(
-		apsara.NewApsaraClientConfig(
-			options.AccessKey,
-			options.Secret,
-			options.Endpoint,
-			options.SApsaraEndpoints,
-		).Debug(options.Debug),
-	)
-	if err != nil {
-		return nil, err
-	}
-
-	region := cli.GetRegion(options.RegionId)
-	if region == nil {
-		return nil, fmt.Errorf("No such region %s", options.RegionId)
-	}
-
-	return region, nil
-}
-
-func main() {
-	parser, e := getSubcommandParser()
-	if e != nil {
-		showErrorAndExit(e)
-	}
-	e = parser.ParseArgs(os.Args[1:], false)
-	options := parser.Options().(*BaseOptions)
-
-	if options.Help {
-		fmt.Print(parser.HelpString())
-		return
-	}
-	subcmd := parser.GetSubcommand()
-	subparser := subcmd.GetSubParser()
-	if e != nil {
-		if subparser != nil {
-			fmt.Print(subparser.Usage())
-		} else {
-			fmt.Print(parser.Usage())
-		}
-		showErrorAndExit(e)
-	}
-	suboptions := subparser.Options()
-	if options.SUBCOMMAND == "help" {
-		e = subcmd.Invoke(suboptions)
-	} else {
-		var region *apsara.SRegion
-		region, e = newClient(options)
-		if e != nil {
-			showErrorAndExit(e)
-		}
-		e = subcmd.Invoke(region, suboptions)
-	}
-	if e != nil {
-		showErrorAndExit(e)
-	}
-}

cmd/climc/main.go

@@ -34,7 +34,6 @@ import (
 	_ "yunion.io/x/onecloud/cmd/climc/shell/monitor"
 	_ "yunion.io/x/onecloud/cmd/climc/shell/notifyv2"
 	_ "yunion.io/x/onecloud/cmd/climc/shell/servicetree"
-	_ "yunion.io/x/onecloud/cmd/climc/shell/suggestion"
 	_ "yunion.io/x/onecloud/cmd/climc/shell/yunionconf"
 )
 

cmd/climc/shell/cloudid/cloudgroup.go

@@ -17,22 +17,22 @@ package cloudid
 import (
 	"yunion.io/x/onecloud/cmd/climc/shell"
 	"yunion.io/x/onecloud/pkg/mcclient/modules"
-	"yunion.io/x/onecloud/pkg/mcclient/options/cloudid"
+	"yunion.io/x/onecloud/pkg/mcclient/options"
 )
 
 func init() {
 	cmd := shell.NewResourceCmd(&modules.Cloudgroups).WithKeyword("cloud-group")
-	cmd.List(&cloudid.CloudgroupListOptions{})
-	cmd.Create(&cloudid.CloudgroupCreateOptions{})
-	cmd.Show(&cloudid.CloudgroupIdOptions{})
-	cmd.Delete(&cloudid.CloudgroupIdOptions{})
-	cmd.Perform("syncstatus", &cloudid.CloudgroupIdOptions{})
-	cmd.Perform("attach-policy", &cloudid.CloudgroupPolicyOptions{})
-	cmd.Perform("detach-policy", &cloudid.CloudgroupPolicyOptions{})
-	cmd.Perform("add-user", &cloudid.CloudgroupUserOptions{})
-	cmd.Perform("remove-user", &cloudid.CloudgroupUserOptions{})
-	cmd.Perform("set-policies", &cloudid.CloudgroupPolicyOptions{})
-	cmd.Perform("set-users", &cloudid.CloudgroupUserOptions{})
-	cmd.Perform("public", &cloudid.CloudgroupPublicOptions{})
-	cmd.Perform("private", &cloudid.CloudgroupIdOptions{})
+	cmd.List(&options.CloudgroupListOptions{})
+	cmd.Create(&options.CloudgroupCreateOptions{})
+	cmd.Show(&options.CloudgroupIdOptions{})
+	cmd.Delete(&options.CloudgroupIdOptions{})
+	cmd.Perform("syncstatus", &options.CloudgroupIdOptions{})
+	cmd.Perform("attach-policy", &options.CloudgroupPolicyOptions{})
+	cmd.Perform("detach-policy", &options.CloudgroupPolicyOptions{})
+	cmd.Perform("add-user", &options.CloudgroupUserOptions{})
+	cmd.Perform("remove-user", &options.CloudgroupUserOptions{})
+	cmd.Perform("set-policies", &options.CloudgroupPolicyOptions{})
+	cmd.Perform("set-users", &options.CloudgroupUserOptions{})
+	cmd.Perform("public", &options.CloudgroupPublicOptions{})
+	cmd.Perform("private", &options.CloudgroupIdOptions{})
 }

cmd/climc/shell/cloudid/cloudgroupcache.go

@@ -15,15 +15,59 @@
 package cloudid
 
 import (
-	"yunion.io/x/onecloud/cmd/climc/shell"
+	"yunion.io/x/onecloud/pkg/mcclient"
 	"yunion.io/x/onecloud/pkg/mcclient/modules"
-	"yunion.io/x/onecloud/pkg/mcclient/options/cloudid"
+	"yunion.io/x/onecloud/pkg/mcclient/options"
 )
 
 func init() {
-	cmd := shell.NewResourceCmd(&modules.Cloudgroupcaches).WithKeyword("cloud-group-cache")
-	cmd.List(&cloudid.CloudgroupcacheListOptions{})
-	cmd.Show(&cloudid.CloudgroupcacheIdOption{})
-	cmd.Delete(&cloudid.CloudgroupcacheIdOption{})
-	cmd.Perform("syncstatus", &cloudid.CloudgroupcacheIdOption{})
+	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

@@ -15,12 +15,58 @@
 package cloudid
 
 import (
-	"yunion.io/x/onecloud/cmd/climc/shell"
+	"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/cloudid"
+	"yunion.io/x/onecloud/pkg/mcclient/options"
 )
 
 func init() {
-	cmd := shell.NewResourceCmd(&modules.Cloudgrouppolicies).WithKeyword("cloud-group-policy").WithContextManager(&modules.Cloudgroups)
-	cmd.List(&cloudid.CloudgroupPolicyListOptions{})
+	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

@@ -15,12 +15,58 @@
 package cloudid
 
 import (
-	"yunion.io/x/onecloud/cmd/climc/shell"
+	"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/cloudid"
+	"yunion.io/x/onecloud/pkg/mcclient/options"
 )
 
 func init() {
-	cmd := shell.NewResourceCmd(&modules.Cloudgroupusers).WithKeyword("cloud-group-user").WithContextManager(&modules.Cloudusers)
-	cmd.List(&cloudid.CloudgroupUserListOptions{})
+	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

@@ -17,18 +17,18 @@ package cloudid
 import (
 	"yunion.io/x/onecloud/cmd/climc/shell"
 	"yunion.io/x/onecloud/pkg/mcclient/modules"
-	"yunion.io/x/onecloud/pkg/mcclient/options/cloudid"
+	"yunion.io/x/onecloud/pkg/mcclient/options"
 )
 
 func init() {
 	cmd := shell.NewResourceCmd(&modules.Cloudpolicies).WithKeyword("cloud-policy")
-	cmd.Create(&cloudid.CloudpolicyListOptions{})
-	cmd.List(&cloudid.CloudpolicyListOptions{})
-	cmd.Show(&cloudid.CloudpolicyIdOptions{})
-	cmd.Update(&cloudid.CloudpolicyUpdateOption{})
-	cmd.Perform("syncstauts", &cloudid.CloudpolicyIdOptions{})
-	cmd.Perform("lock", &cloudid.CloudpolicyIdOptions{})
-	cmd.Perform("unlock", &cloudid.CloudpolicyIdOptions{})
-	cmd.Perform("assign-group", &cloudid.CloudpolicyGroupOptions{})
-	cmd.Perform("revoke-group", &cloudid.CloudpolicyGroupOptions{})
+	cmd.Create(&options.CloudpolicyListOptions{})
+	cmd.List(&options.CloudpolicyListOptions{})
+	cmd.Show(&options.CloudpolicyIdOptions{})
+	cmd.Update(&options.CloudpolicyUpdateOption{})
+	cmd.Perform("syncstauts", &options.CloudpolicyIdOptions{})
+	cmd.Perform("lock", &options.CloudpolicyIdOptions{})
+	cmd.Perform("unlock", &options.CloudpolicyIdOptions{})
+	cmd.Perform("assign-group", &options.CloudpolicyGroupOptions{})
+	cmd.Perform("revoke-group", &options.CloudpolicyGroupOptions{})
 }

cmd/climc/shell/cloudid/cloudpolicycache.go

@@ -15,12 +15,28 @@
 package cloudid
 
 import (
-	"yunion.io/x/onecloud/cmd/climc/shell"
+	"yunion.io/x/onecloud/pkg/mcclient"
 	"yunion.io/x/onecloud/pkg/mcclient/modules"
-	"yunion.io/x/onecloud/pkg/mcclient/options/cloudid"
+	"yunion.io/x/onecloud/pkg/mcclient/options"
 )
 
 func init() {
-	cmd := shell.NewResourceCmd(&modules.Cloudpolicycaches).WithKeyword("cloud-policy-cache")
-	cmd.List(&cloudid.CloudpolicycacheListOptions{})
+	type CloudpolicycacheListOptions struct {
+		options.BaseListOptions
+
+		CloudpolyId    string
+		CloudaccountId string
+	}
+	R(&CloudpolicycacheListOptions{}, "cloud-policy-cache-list", "List cloud policy caches", func(s *mcclient.ClientSession, opts *CloudpolicycacheListOptions) error {
+		params, err := options.ListStructToParams(opts)
+		if err != nil {
+			return err
+		}
+		result, err := modules.Cloudpolicycaches.List(s, params)
+		if err != nil {
+			return err
+		}
+		printList(result, modules.Cloudpolicycaches.GetColumns(s))
+		return nil
+	})
 }

cmd/climc/shell/cloudid/cloudrole.go

@@ -1,29 +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/mcclient/modules"
-	"yunion.io/x/onecloud/pkg/mcclient/options/cloudid"
-)
-
-func init() {
-	cmd := shell.NewResourceCmd(&modules.Cloudroles).WithKeyword("cloud-role")
-	cmd.List(&cloudid.CloudroleListOptions{})
-	cmd.Delete(&cloudid.CloudroleIdOptions{})
-	cmd.Show(&cloudid.CloudroleIdOptions{})
-	cmd.Perform("purge", &cloudid.CloudroleIdOptions{})
-}

cmd/climc/shell/cloudid/clouduserpolicies.go

@@ -15,12 +15,58 @@
 package cloudid
 
 import (
-	"yunion.io/x/onecloud/cmd/climc/shell"
+	"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/cloudid"
+	"yunion.io/x/onecloud/pkg/mcclient/options"
 )
 
 func init() {
-	cmd := shell.NewResourceCmd(&modules.Clouduserpolicies).WithKeyword("cloud-user-policy").WithContextManager(&modules.Cloudpolicies)
-	cmd.List(&cloudid.ClouduserPolicyListOptions{})
+	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

@@ -17,22 +17,22 @@ package cloudid
 import (
 	"yunion.io/x/onecloud/cmd/climc/shell"
 	"yunion.io/x/onecloud/pkg/mcclient/modules"
-	"yunion.io/x/onecloud/pkg/mcclient/options/cloudid"
+	"yunion.io/x/onecloud/pkg/mcclient/options"
 )
 
 func init() {
 	cmd := shell.NewResourceCmd(&modules.Cloudusers).WithKeyword("cloud-user")
-	cmd.List(&cloudid.ClouduserListOptions{})
-	cmd.Create(&cloudid.ClouduserCreateOptions{})
-	cmd.Show(&cloudid.ClouduserIdOption{})
-	cmd.Custom(shell.CustomActionGet, "login-info", &cloudid.ClouduserIdOption{})
-	cmd.Delete(&cloudid.ClouduserIdOption{})
-	cmd.Perform("sync", &cloudid.ClouduserSyncOptions{})
-	cmd.Perform("syncstatus", &cloudid.ClouduserIdOption{})
-	cmd.Perform("attach-policy", &cloudid.ClouduserPolicyOptions{})
-	cmd.Perform("detach-policy", &cloudid.ClouduserPolicyOptions{})
-	cmd.Perform("change-owner", &cloudid.ClouduserChangeOwnerOptions{})
-	cmd.Perform("reset-password", &cloudid.ClouduserResetPasswordOptions{})
-	cmd.Perform("cloud-user-join-group", &cloudid.ClouduserGroupOptions{})
-	cmd.Perform("cloud-user-leave-group", &cloudid.ClouduserGroupOptions{})
+	cmd.List(&options.ClouduserListOptions{})
+	cmd.Create(&options.ClouduserCreateOptions{})
+	cmd.Show(&options.ClouduserIdOption{})
+	cmd.Custom(shell.CustomActionGet, "login-info", &options.ClouduserIdOption{})
+	cmd.Delete(&options.ClouduserIdOption{})
+	cmd.Perform("sync", &options.ClouduserSyncOptions{})
+	cmd.Perform("syncstatus", &options.ClouduserIdOption{})
+	cmd.Perform("attach-policy", &options.ClouduserPolicyOptions{})
+	cmd.Perform("detach-policy", &options.ClouduserPolicyOptions{})
+	cmd.Perform("change-owner", &options.ClouduserChangeOwnerOptions{})
+	cmd.Perform("reset-password", &options.ClouduserResetPasswordOptions{})
+	cmd.Perform("cloud-user-join-group", &options.ClouduserGroupOptions{})
+	cmd.Perform("cloud-user-leave-group", &options.ClouduserGroupOptions{})
 }

cmd/climc/shell/cloudid/samlprovider.go

@@ -1,29 +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/mcclient/modules"
-	"yunion.io/x/onecloud/pkg/mcclient/options/cloudid"
-)
-
-func init() {
-	cmd := shell.NewResourceCmd(&modules.SAMLProviders).WithKeyword("saml-provider")
-	cmd.List(&cloudid.SAMLProviderListOptions{})
-	cmd.Create(&cloudid.SAMLProviderCreateOptions{})
-	cmd.Show(&cloudid.SAMLProviderIdOptions{})
-	cmd.Delete(&cloudid.SAMLProviderIdOptions{})
-}

cmd/climc/shell/cloudid/samluser.go

@@ -1,29 +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/mcclient/modules"
-	"yunion.io/x/onecloud/pkg/mcclient/options/cloudid"
-)
-
-func init() {
-	cmd := shell.NewResourceCmd(&modules.Samlusers).WithKeyword("saml-user")
-	cmd.List(&cloudid.SamluserListOptions{})
-	cmd.Create(&cloudid.SamluserCreateOptions{})
-	cmd.Show(&cloudid.SamluserIdOptions{})
-	cmd.Delete(&cloudid.SamluserIdOptions{})
-}

cmd/climc/shell/compute/buckets.go

@@ -342,209 +342,4 @@ func init() {
 		printObject(result)
 		return nil
 	})
-
-	type BucketSetWebsiteOption struct {
-		ID string `help:"ID or name of bucket" json:"-"`
-		// 主页
-		Index string `help:"main page"`
-		// 错误时返回的文档
-		ErrorDocument string `help:"error return"`
-		// http或https
-		Protocol string `help:"force https" choices:"http|https"`
-	}
-	R(&BucketSetWebsiteOption{}, "bucket-set-website", "Set bucket website", func(s *mcclient.ClientSession, args *BucketSetWebsiteOption) error {
-		conf := api.BucketWebsiteConf{
-			Index:         args.Index,
-			ErrorDocument: args.ErrorDocument,
-			Protocol:      args.Protocol,
-		}
-		result, err := modules.Buckets.PerformAction(s, args.ID, "set-website", jsonutils.Marshal(conf))
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
-	type BucketGetWebsiteConfOption struct {
-		ID string `help:"ID or name of bucket" json:"-"`
-	}
-	R(&BucketGetWebsiteConfOption{}, "bucket-get-website", "Get bucket website", func(s *mcclient.ClientSession, args *BucketGetWebsiteConfOption) error {
-		result, err := modules.Buckets.GetSpecific(s, args.ID, "website", nil)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
-	type BucketDeleteWebsiteConfOption struct {
-		ID string `help:"ID or name of bucket" json:"-"`
-	}
-	R(&BucketDeleteWebsiteConfOption{}, "bucket-delete-website", "Delete bucket website", func(s *mcclient.ClientSession, args *BucketDeleteWebsiteConfOption) error {
-		result, err := modules.Buckets.PerformAction(s, args.ID, "delete-website", nil)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
-	type BucketSetCorsOption struct {
-		ID             string   `help:"ID or name of bucket" json:"-"`
-		AllowedMethods []string `help:"allowed http method" choices:"PUT|GET|POST|DELETE|HEAD"`
-		// 允许的源站，可以设为*
-		AllowedOrigins []string
-		AllowedHeaders []string
-		MaxAgeSeconds  int
-		ExposeHeaders  []string
-		RuleId         string
-	}
-	R(&BucketSetCorsOption{}, "bucket-set-cors", "Set bucket cors", func(s *mcclient.ClientSession, args *BucketSetCorsOption) error {
-
-		rule := api.BucketCORSRule{
-			AllowedOrigins: args.AllowedOrigins,
-			AllowedMethods: args.AllowedMethods,
-			AllowedHeaders: args.AllowedHeaders,
-			MaxAgeSeconds:  args.MaxAgeSeconds,
-			ExposeHeaders:  args.ExposeHeaders,
-			Id:             args.RuleId,
-		}
-		rules := api.BucketCORSRules{Data: []api.BucketCORSRule{rule}}
-		result, err := modules.Buckets.PerformAction(s, args.ID, "set-cors", jsonutils.Marshal(rules))
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
-	type BucketGetCorsOption struct {
-		ID string `help:"ID or name of bucket" json:"-"`
-	}
-	R(&BucketGetCorsOption{}, "bucket-get-cors", "Get bucket cors", func(s *mcclient.ClientSession, args *BucketGetCorsOption) error {
-		result, err := modules.Buckets.GetSpecific(s, args.ID, "cors", nil)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
-	type BucketDeleteCorsOption struct {
-		ID string   `help:"ID or name of bucket" json:"-"`
-		Id []string `"help:Id of rules to delete"`
-	}
-	R(&BucketDeleteCorsOption{}, "bucket-delete-cors", "Delete bucket cors", func(s *mcclient.ClientSession, args *BucketDeleteCorsOption) error {
-		input := api.BucketCORSRuleDeleteInput{}
-		input.Id = args.Id
-		result, err := modules.Buckets.PerformAction(s, args.ID, "delete-cors", jsonutils.Marshal(input))
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
-	type BucketSetRefererOption struct {
-		ID string `help:"ID or name of bucket" json:"-"`
-		// 域名列表
-		DomainList []string
-		// 是否允许空referer 访问
-		AllowEmptyRefer bool `help:"all empty refer access"`
-	}
-	R(&BucketSetRefererOption{}, "bucket-set-referer", "Set bucket referer", func(s *mcclient.ClientSession, args *BucketSetRefererOption) error {
-		conf := api.BucketRefererConf{
-			WhiteList:       args.DomainList,
-			AllowEmptyRefer: args.AllowEmptyRefer,
-		}
-		result, err := modules.Buckets.PerformAction(s, args.ID, "set-referer", jsonutils.Marshal(conf))
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
-	type BucketGetRefererOption struct {
-		ID string `help:"ID or name of bucket" json:"-"`
-	}
-	R(&BucketGetRefererOption{}, "bucket-get-referer", "get bucket referer", func(s *mcclient.ClientSession, args *BucketGetRefererOption) error {
-		result, err := modules.Buckets.GetSpecific(s, args.ID, "referer", nil)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
-	type BucketGetCdnDomainOption struct {
-		ID string `help:"ID or name of bucket" json:"-"`
-	}
-	R(&BucketGetRefererOption{}, "bucket-get-cdn-domain", "get bucket cdn domain", func(s *mcclient.ClientSession, args *BucketGetRefererOption) error {
-		result, err := modules.Buckets.GetSpecific(s, args.ID, "cdn-domain", nil)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
-	type BucketGetPolicyOption struct {
-		ID string `help:"ID or name of bucket" json:"-"`
-	}
-	R(&BucketGetPolicyOption{}, "bucket-get-policy", "get bucket policy", func(s *mcclient.ClientSession, args *BucketGetPolicyOption) error {
-		result, err := modules.Buckets.GetSpecific(s, args.ID, "policy", nil)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
-	type BucketSetPolicyOption struct {
-		ID string `help:"ID or name of bucket" json:"-"`
-		// 格式主账号id:子账号id
-		PrincipalId []string `help:"ext account id, accountId:subaccountId"`
-		// Read|ReadWrite|FullControl
-		CannedAction string `help:"authority action" choice:"Read|FullControl"`
-		// Allow|Deny
-		Effect string `help:"allow or deny" choice:"Allow|Deny"`
-		// 被授权的资源地址
-		ResourcePath []string
-		// ip 条件
-		IpEquals    []string
-		IpNotEquals []string
-	}
-	R(&BucketSetPolicyOption{}, "bucket-set-policy", "set bucket policy", func(s *mcclient.ClientSession, args *BucketSetPolicyOption) error {
-		opts := api.BucketPolicyStatementInput{}
-		opts.CannedAction = args.CannedAction
-		opts.Effect = args.Effect
-		opts.IpEquals = args.IpEquals
-		opts.IpNotEquals = args.IpNotEquals
-		opts.ResourcePath = args.ResourcePath
-		opts.PrincipalId = args.PrincipalId
-
-		result, err := modules.Buckets.PerformAction(s, args.ID, "set-policy", jsonutils.Marshal(opts))
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
-	type BucketDeletePolicyOption struct {
-		ID string `help:"ID or name of bucket" json:"-"`
-		Id []string
-	}
-	R(&BucketDeletePolicyOption{}, "bucket-delete-policy", "delete bucket policy", func(s *mcclient.ClientSession, args *BucketDeletePolicyOption) error {
-		input := api.BucketPolicyDeleteInput{}
-		input.Id = args.Id
-		result, err := modules.Buckets.PerformAction(s, args.ID, "delete-policy", jsonutils.Marshal(input))
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
 }

cmd/climc/shell/compute/cloudproviders.go

@@ -235,7 +235,7 @@ func init() {
 			return err
 		}
 		for k, v := range rc {
-			fmt.Printf(`export %s="%s"`+"\n", k, v)
+			fmt.Printf("export %s='%s'\n", k, v)
 		}
 		return nil
 	})

cmd/climc/shell/compute/cloudregions.go

@@ -19,7 +19,6 @@ import (
 
 	"yunion.io/x/jsonutils"
 
-	"yunion.io/x/onecloud/cmd/climc/shell"
 	"yunion.io/x/onecloud/pkg/mcclient"
 	"yunion.io/x/onecloud/pkg/mcclient/modulebase"
 	"yunion.io/x/onecloud/pkg/mcclient/modules"
@@ -27,23 +26,6 @@ import (
 )
 
 func init() {
-	cmd := shell.NewResourceCmd(&modules.Cloudregions).WithKeyword("cloud-region")
-	cmd.PerformClass("sync-skus", &options.CloudregionSkuSyncOptions{})
-
-	R(&options.SkuTaskQueryOptions{}, "cloud-region-sync-task-show", "Show details of skus sync tasks", func(s *mcclient.ClientSession, args *options.SkuTaskQueryOptions) error {
-		params, err := args.Params()
-		if err != nil {
-			return err
-		}
-
-		result, err := modules.Cloudregions.Get(s, "sync-tasks", params)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
 	type CloudregionListOptions struct {
 		options.BaseListOptions
 

cmd/climc/shell/compute/dbinstance_accounts.go

@@ -15,15 +15,50 @@
 package compute
 
 import (
-	"yunion.io/x/onecloud/cmd/climc/shell"
+	"yunion.io/x/onecloud/pkg/mcclient"
 	"yunion.io/x/onecloud/pkg/mcclient/modules"
 	"yunion.io/x/onecloud/pkg/mcclient/options"
 )
 
 func init() {
-	cmd := shell.NewResourceCmd(&modules.DBInstanceAccounts).WithKeyword("dbinstance-account")
-	cmd.List(&options.DBInstanceAccountListOptions{})
-	cmd.Update(&options.BaseUpdateOptions{})
-	cmd.Show(&options.DBInstanceAccountIdOptions{})
-	cmd.Delete(&options.DBInstanceAccountIdOptions{})
+	type DBInstanceAccountListOptions struct {
+		options.BaseListOptions
+		DBInstance string `help:"ID or Name of DBInstance" json:"dbinstance"`
+	}
+	R(&DBInstanceAccountListOptions{}, "dbinstance-account-list", "List DB instance accounts", func(s *mcclient.ClientSession, opts *DBInstanceAccountListOptions) error {
+		params, err := options.ListStructToParams(opts)
+		if err != nil {
+			return err
+		}
+
+		result, err := modules.DBInstanceAccounts.List(s, params)
+		if err != nil {
+			return err
+		}
+		printList(result, modules.DBInstanceAccounts.GetColumns(s))
+		return nil
+	})
+
+	type DBInstanceAccountIdOptions struct {
+		ID string `help:"ID or Name of DBInstanceaccount"`
+	}
+
+	R(&DBInstanceAccountIdOptions{}, "dbinstance-account-show", "Show DB instance account", func(s *mcclient.ClientSession, opts *DBInstanceAccountIdOptions) error {
+		account, err := modules.DBInstanceAccounts.Get(s, opts.ID, nil)
+		if err != nil {
+			return err
+		}
+		printObject(account)
+		return nil
+	})
+
+	R(&DBInstanceAccountIdOptions{}, "dbinstance-account-delete", "Delete DB instance account", func(s *mcclient.ClientSession, opts *DBInstanceAccountIdOptions) error {
+		account, err := modules.DBInstanceAccounts.Delete(s, opts.ID, nil)
+		if err != nil {
+			return err
+		}
+		printObject(account)
+		return nil
+	})
+
 }

cmd/climc/shell/compute/dbinstance_databases.go

@@ -15,16 +15,60 @@
 package compute
 
 import (
-	"yunion.io/x/onecloud/cmd/climc/shell"
+	"yunion.io/x/onecloud/pkg/mcclient"
 	"yunion.io/x/onecloud/pkg/mcclient/modules"
 	"yunion.io/x/onecloud/pkg/mcclient/options"
 )
 
 func init() {
-	cmd := shell.NewResourceCmd(&modules.DBInstanceDatabases).WithKeyword("dbinstance-database")
-	cmd.List(&options.DBInstanceDatabaseListOptions{})
-	cmd.Update(&options.BaseUpdateOptions{})
-	cmd.Delete(&options.DBInstanceDatabaseIdOptions{})
-	cmd.Show(&options.DBInstanceDatabaseIdOptions{})
-	cmd.Create(&options.DBInstanceDatabaseCreateOptions{})
+	type DBInstanceDatabaseListOptions struct {
+		options.BaseListOptions
+		DBInstance string `help:"ID or Name of DBInstance" json:"dbinstance"`
+	}
+	R(&DBInstanceDatabaseListOptions{}, "dbinstance-database-list", "List DB instance databases", func(s *mcclient.ClientSession, opts *DBInstanceDatabaseListOptions) error {
+		params, err := options.ListStructToParams(opts)
+		if err != nil {
+			return err
+		}
+
+		result, err := modules.DBInstanceDatabases.List(s, params)
+		if err != nil {
+			return err
+		}
+		printList(result, modules.DBInstanceDatabases.GetColumns(s))
+		return nil
+	})
+
+	type DBInstanceDatabaseCreateOptions struct {
+		NAME         string
+		DBINSTANCE   string `help:"ID or Name of DBInstance" json:"dbinstance"`
+		CharacterSet string `help:"CharacterSet for database"`
+	}
+
+	R(&DBInstanceDatabaseCreateOptions{}, "dbinstance-database-create", "Create DB instance databases", func(s *mcclient.ClientSession, opts *DBInstanceDatabaseCreateOptions) error {
+		params, err := options.ListStructToParams(opts)
+		if err != nil {
+			return err
+		}
+		result, err := modules.DBInstanceDatabases.Create(s, params)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	type DBInstanceDatabaseIdOptions struct {
+		ID string
+	}
+
+	R(&DBInstanceDatabaseIdOptions{}, "dbinstance-database-delete", "Delete DB instance databases", func(s *mcclient.ClientSession, opts *DBInstanceDatabaseIdOptions) error {
+		result, err := modules.DBInstanceDatabases.Delete(s, opts.ID, nil)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
 }

cmd/climc/shell/compute/dbinstance_skus.go

@@ -15,29 +15,44 @@
 package compute
 
 import (
-	"yunion.io/x/onecloud/cmd/climc/shell"
 	"yunion.io/x/onecloud/pkg/mcclient"
 	"yunion.io/x/onecloud/pkg/mcclient/modules"
 	"yunion.io/x/onecloud/pkg/mcclient/options"
 )
 
 func init() {
-	cmd := shell.NewResourceCmd(&modules.DBInstanceSkus).WithKeyword("dbinstance-sku")
-	cmd.List(&options.DBInstanceSkuListOption{})
-	cmd.Show(&options.DBInstanceSkuIdOption{})
-	cmd.PerformClass("sync-skus", &options.SkuSyncOptions{})
-
-	R(&options.SkuTaskQueryOptions{}, "dbinstance-sku-sync-task-show", "Show details of skus sync tasks", func(s *mcclient.ClientSession, args *options.SkuTaskQueryOptions) error {
-		params, err := args.Params()
+	type DBInstanceSkuListOption struct {
+		options.BaseListOptions
+		Engine        string
+		EngineVersion string
+		Category      string
+		StorageType   string
+		Cloudregion   string
+	}
+	R(&DBInstanceSkuListOption{}, "dbinstance-sku-list", "List dbinstance skus", func(s *mcclient.ClientSession, args *DBInstanceSkuListOption) error {
+		params, err := options.ListStructToParams(args)
 		if err != nil {
 			return err
 		}
+		result, err := modules.DBInstanceSkus.List(s, params)
+		if err != nil {
+			return err
+		}
+		printList(result, modules.DBInstanceSkus.GetColumns(s))
+		return nil
+	})
 
-		result, err := modules.DBInstanceSkus.Get(s, "sync-tasks", params)
+	type DBInstanceSkuIdOption struct {
+		ID string `help:"DBInstance Id or name"`
+	}
+
+	R(&DBInstanceSkuIdOption{}, "dbinstance-sku-show", "Show dbinstance sku details", func(s *mcclient.ClientSession, args *DBInstanceSkuIdOption) error {
+		result, err := modules.DBInstanceSkus.Get(s, args.ID, nil)
 		if err != nil {
 			return err
 		}
 		printObject(result)
 		return nil
 	})
+
 }

cmd/climc/shell/compute/dbinstances.go

@@ -15,34 +15,280 @@
 package compute
 
 import (
-	"yunion.io/x/onecloud/cmd/climc/shell"
+	"fmt"
+	"strings"
+
+	"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"
-	"yunion.io/x/onecloud/pkg/mcclient/options/compute"
 )
 
 func init() {
-	cmd := shell.NewResourceCmd(&modules.DBInstance) //.WithContextManager(&modules.Networks)
-	cmd.List(&compute.DBInstanceListOptions{})
-	cmd.Create(&compute.DBInstanceCreateOptions{})
-	cmd.Update(&compute.DBInstanceUpdateOptions{})
-	cmd.Show(&compute.DBInstanceIdOptions{})
-	cmd.Delete(&compute.DBInstanceDeleteOptions{})
-	cmd.Perform("renew", &compute.DBInstanceRenewOptions{})
-	cmd.Perform("change-config", &compute.DBInstanceChangeConfigOptions{})
-	cmd.Perform("public-connection", &compute.DBInstancePublicConnectionOptions{})
-	cmd.Perform("recovery", &compute.DBInstanceRecoveryOptions{})
-	cmd.Perform("reboot", &compute.DBInstanceIdOptions{})
-	cmd.Perform("purge", &compute.DBInstanceIdOptions{})
-	cmd.Perform("syncstatus", &compute.DBInstanceIdOptions{})
-	cmd.Perform("sync", &compute.DBInstanceIdOptions{})
-	cmd.Perform("change-owner", &compute.DBInstanceChangeOwnerOptions{})
-	cmd.PerformWithKeyword("add-tag", "user-metadata", &options.ResourceMetadataOptions{})
-	cmd.PerformWithKeyword("set-tag", "set-user-metadata", &options.ResourceMetadataOptions{})
-	cmd.Perform("remote-update", &compute.DBInstanceRemoteUpdateOptions{})
-	cmd.Perform("set-secgroup", &compute.DBInstanceSetSecgroupOptions{})
+	type DBInstanceListOptions struct {
+		options.BaseListOptions
+		BillingType string `help:"billing type" choices:"postpaid|prepaid"`
+	}
+	R(&DBInstanceListOptions{}, "dbinstance-list", "List DB instance", func(s *mcclient.ClientSession, opts *DBInstanceListOptions) error {
+		params, err := options.ListStructToParams(opts)
+		if err != nil {
+			return err
+		}
+
+		result, err := modules.DBInstance.List(s, params)
+		if err != nil {
+			return err
+		}
+
+		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
+	})
+
+	type DBInstanceCreateOptions struct {
+		NAME          string `help:"DBInstance Name"`
+		InstanceType  string `help:"InstanceType for DBInstance"`
+		VcpuCount     int    `help:"Core of cpu for DBInstance"`
+		VmemSizeMb    int    `help:"Memory size of DBInstance"`
+		Port          int    `help:"Port of DBInstance"`
+		Category      string `help:"Category of DBInstance"`
+		Network       string `help:"Network of DBInstance"`
+		Address       string `help:"Address of DBInstance"`
+		Engine        string `help:"Engine of DBInstance"`
+		EngineVersion string `help:"EngineVersion of DBInstance Engine"`
+		StorageType   string `help:"StorageTyep of DBInstance"`
+		Secgroup      string `help:"Secgroup name or Id for DBInstance"`
+		Zone          string `help:"ZoneId or name for DBInstance"`
+		DiskSizeGB    int    `help:"Storage size for DBInstance"`
+		Duration      string `help:"Duration for DBInstance"`
+		AllowDelete   *bool  `help:"not lock dbinstance" `
+	}
+
+	R(&DBInstanceCreateOptions{}, "dbinstance-create", "Create DB instance", func(s *mcclient.ClientSession, opts *DBInstanceCreateOptions) error {
+		params, err := options.StructToParams(opts)
+		if err != nil {
+			return err
+		}
+		if opts.AllowDelete != nil && *opts.AllowDelete {
+			params.Add(jsonutils.JSONFalse, "disable_delete")
+		}
+		result, err := modules.DBInstance.Create(s, params)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	type DBInstanceRenewOptions struct {
+		ID       string `help:"ID or name of server to renew"`
+		DURATION string `help:"Duration of renew, ADMIN only command"`
+	}
+	R(&DBInstanceRenewOptions{}, "dbinstance-renew", "Renew a dbinstance", func(s *mcclient.ClientSession, args *DBInstanceRenewOptions) error {
+		params := jsonutils.NewDict()
+		params.Add(jsonutils.NewString(args.DURATION), "duration")
+		result, err := modules.DBInstance.PerformAction(s, args.ID, "renew", params)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	type DBInstanceUpdateOptions struct {
+		ID          string `help:"ID or name of server to renew"`
+		Name        string
+		Description string
+		Delete      string `help:"Lock or not lock dbinstance" choices:"enable|disable"`
+	}
+	R(&DBInstanceUpdateOptions{}, "dbinstance-update", "Update a dbinstance", func(s *mcclient.ClientSession, args *DBInstanceUpdateOptions) error {
+		params, err := options.StructToParams(args)
+		if err != nil {
+			return err
+		}
+		if len(args.Delete) > 0 {
+			if args.Delete == "disable" {
+				params.Add(jsonutils.JSONTrue, "disable_delete")
+			} else {
+				params.Add(jsonutils.JSONFalse, "disable_delete")
+			}
+		}
+		result, err := modules.DBInstance.Update(s, args.ID, params)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	type DBInstanceChangeConfigOptions struct {
+		ID           string `help:"ID or name of server to renew"`
+		DiskSizeGb   int64  `help:"Change DBInstance storage size"`
+		VcpuCount    int64  `help:"Change DBInstance vcpu count"`
+		VmemSizeMb   int64  `help:"Change DBInstance vmem size mb"`
+		InstanceType string `help:"Change DBInstance instanceType"`
+		Category     string `help:"Change DBInstance category"`
+	}
+	R(&DBInstanceChangeConfigOptions{}, "dbinstance-change-config", "ChangeConfig a dbinstance", func(s *mcclient.ClientSession, args *DBInstanceChangeConfigOptions) error {
+		params := jsonutils.NewDict()
+		if len(args.Category) > 0 {
+			params.Add(jsonutils.NewString(args.Category), "category")
+		}
+		if len(args.InstanceType) > 0 {
+			params.Add(jsonutils.NewString(args.InstanceType), "instance_type")
+		}
+		if args.DiskSizeGb > 0 {
+			params.Add(jsonutils.NewInt(args.DiskSizeGb), "disk_size_gb")
+		}
+		if args.VcpuCount > 0 {
+			params.Add(jsonutils.NewInt(args.VcpuCount), "vcpu_count")
+		}
+		if args.VmemSizeMb > 0 {
+			params.Add(jsonutils.NewInt(args.VmemSizeMb), "vmeme_size_mb")
+		}
+		result, err := modules.DBInstance.PerformAction(s, args.ID, "change-config", params)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	type DBInstanceIdOptions struct {
+		ID string `help:"ID of dbinstance"`
+	}
+
+	R(&DBInstanceIdOptions{}, "dbinstance-open-public-connection", "Open DB instance public connection", func(s *mcclient.ClientSession, opts *DBInstanceIdOptions) error {
+		params := jsonutils.NewDict()
+		params.Add(jsonutils.JSONTrue, "open")
+		result, err := modules.DBInstance.PerformAction(s, opts.ID, "public-connection", params)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	R(&DBInstanceIdOptions{}, "dbinstance-close-public-connection", "Close DB instance public connection", func(s *mcclient.ClientSession, opts *DBInstanceIdOptions) error {
+		params := jsonutils.NewDict()
+		params.Add(jsonutils.JSONFalse, "open")
+		result, err := modules.DBInstance.PerformAction(s, opts.ID, "public-connection", params)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	type DBInstanceRecoveryOptions struct {
+		ID        string
+		BACKUP    string
+		Databases []string
+	}
+
+	R(&DBInstanceRecoveryOptions{}, "dbinstance-recovery", "Recovery DB instance database from backup", func(s *mcclient.ClientSession, opts *DBInstanceRecoveryOptions) error {
+		params := jsonutils.NewDict()
+		params.Set("dbinstancebackup", jsonutils.NewString(opts.BACKUP))
+		dbs := jsonutils.NewDict()
+		for _, database := range opts.Databases {
+			if len(database) > 0 {
+				dbInfo := strings.Split(database, ":")
+				if len(dbInfo) == 1 {
+					dbs.Add(jsonutils.NewString(dbInfo[0]), dbInfo[0])
+				} else if len(dbInfo) == 2 {
+					dbs.Add(jsonutils.NewString(dbInfo[1]), dbInfo[0])
+				} else {
+					return fmt.Errorf("Invalid dbinfo: %s", database)
+				}
+			}
+		}
+		if dbs.Length() > 0 {
+			params.Add(dbs, "databases")
+		}
+		result, err := modules.DBInstance.PerformAction(s, opts.ID, "recovery", params)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	R(&DBInstanceIdOptions{}, "dbinstance-show", "Show DB instance", func(s *mcclient.ClientSession, opts *DBInstanceIdOptions) error {
+		result, err := modules.DBInstance.Get(s, opts.ID, nil)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	R(&DBInstanceIdOptions{}, "dbinstance-reboot", "Reboot DB instance", func(s *mcclient.ClientSession, opts *DBInstanceIdOptions) error {
+		result, err := modules.DBInstance.PerformAction(s, opts.ID, "reboot", nil)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	type DBInstanceDeleteOptions struct {
+		ID         string `help:"DBInstance Id or name"`
+		KeepBackup bool   `help:"Keep dbinstance manual backup after delete dbinstance"`
+	}
+
+	R(&DBInstanceDeleteOptions{}, "dbinstance-delete", "Delete DB instance", func(s *mcclient.ClientSession, opts *DBInstanceDeleteOptions) error {
+		params := jsonutils.NewDict()
+		if opts.KeepBackup {
+			params.Add(jsonutils.JSONTrue, "keep_backup")
+		}
+		result, err := modules.DBInstance.Delete(s, opts.ID, params)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	R(&DBInstanceIdOptions{}, "dbinstance-purge", "Purge DB instance", func(s *mcclient.ClientSession, opts *DBInstanceIdOptions) error {
+		result, err := modules.DBInstance.PerformAction(s, opts.ID, "purge", nil)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	R(&DBInstanceIdOptions{}, "dbinstance-syncstatus", "Sync status for DB instance", func(s *mcclient.ClientSession, opts *DBInstanceIdOptions) error {
+		result, err := modules.DBInstance.PerformAction(s, opts.ID, "syncstatus", nil)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	R(&DBInstanceIdOptions{}, "dbinstance-sync", "Sync conf from cloud dbinstance", func(s *mcclient.ClientSession, opts *DBInstanceIdOptions) error {
+		result, err := modules.DBInstance.PerformAction(s, opts.ID, "sync", nil)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	R(&DBInstanceIdOptions{}, "dbinstance-sync-status", "Sync status for DB instance", func(s *mcclient.ClientSession, opts *DBInstanceIdOptions) error {
+		result, err := modules.DBInstance.PerformAction(s, opts.ID, "sync-status", nil)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
 
 	type DBInstanceNetworkListOptions struct {
 		options.BaseListOptions
@@ -108,4 +354,21 @@ func init() {
 		return nil
 	})
 
+	type DBInstanceChangeOwnerOptions struct {
+		ID      string `help:"DBInstance to change owner" json:"-"`
+		PROJECT string `help:"Project ID or change" json:"tenant"`
+	}
+	R(&DBInstanceChangeOwnerOptions{}, "dbinstance-change-owner", "Change owner porject of a dbinstance", func(s *mcclient.ClientSession, opts *DBInstanceChangeOwnerOptions) error {
+		params, err := options.StructToParams(opts)
+		if err != nil {
+			return err
+		}
+		result, err := modules.DBInstance.PerformAction(s, opts.ID, "change-owner", params)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
 }

cmd/climc/shell/compute/disks.go

@@ -149,7 +149,6 @@ func init() {
 		AutoDelete   string `help:"enable/disable auto delete of disk" choices:"enable|disable"`
 		AutoSnapshot string `help:"enable/disable auto snapshot of disk" choices:"enable|disable"`
 		DiskType     string `help:"Disk type" choices:"data|volume"`
-		IsSsd        *bool  `help:"mark disk as ssd" negative:"no-is-ssd"`
 	}
 	R(&DiskUpdateOptions{}, "disk-update", "Update property of a virtual disk", func(s *mcclient.ClientSession, args *DiskUpdateOptions) error {
 		params := jsonutils.NewDict()
@@ -176,13 +175,6 @@ func init() {
 		if len(args.DiskType) > 0 {
 			params.Add(jsonutils.NewString(args.DiskType), "disk_type")
 		}
-		if args.IsSsd != nil {
-			if *args.IsSsd {
-				params.Add(jsonutils.JSONTrue, "is_ssd")
-			} else {
-				params.Add(jsonutils.JSONFalse, "is_ssd")
-			}
-		}
 		if params.Size() == 0 {
 			return InvalidUpdateError()
 		}

cmd/climc/shell/compute/elasticcache.go

@@ -19,16 +19,12 @@ import (
 
 	"yunion.io/x/jsonutils"
 
-	"yunion.io/x/onecloud/cmd/climc/shell"
 	"yunion.io/x/onecloud/pkg/mcclient"
 	"yunion.io/x/onecloud/pkg/mcclient/modules"
 	"yunion.io/x/onecloud/pkg/mcclient/options"
 )
 
 func init() {
-	cmd := shell.NewResourceCmd(&modules.ElasticcacheSkus).WithKeyword("elastic-cache-sku")
-	cmd.PerformClass("sync-skus", &options.SkuSyncOptions{})
-
 	R(&options.BaseListOptions{}, "elastic-cache-list", "List elastisc cache instance", func(s *mcclient.ClientSession, opts *options.BaseListOptions) error {
 		params, err := options.ListStructToParams(opts)
 		if err != nil {
@@ -45,15 +41,11 @@ func init() {
 	})
 
 	R(&options.ElasticCacheCreateOptions{}, "elastic-cache-create", "Create elastisc cache instance", func(s *mcclient.ClientSession, opts *options.ElasticCacheCreateOptions) error {
-		params, err := opts.Params()
+		params, err := options.StructToParams(opts)
 		if err != nil {
 			return err
 		}
 
-		if len(opts.SecgroupIds) > 0 {
-			params.Set("secgroup_ids", jsonutils.NewStringArray(opts.SecgroupIds))
-		}
-
 		result, err := modules.ElasticCache.Create(s, params)
 		if err != nil {
 			return err
@@ -401,107 +393,4 @@ func init() {
 		printList(result, nil)
 		return nil
 	})
-
-	R(&options.SkuTaskQueryOptions{}, "elastic-cache-sku-sync-task-show", "Show details of skus sync tasks", func(s *mcclient.ClientSession, args *options.SkuTaskQueryOptions) error {
-		params, err := args.Params()
-		if err != nil {
-			return err
-		}
-
-		result, err := modules.ElasticcacheSkus.Get(s, "sync-tasks", params)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
-	R(&options.ResourceMetadataOptions{}, "elastic-cache-add-tag", "Set tag of a server", func(s *mcclient.ClientSession, opts *options.ResourceMetadataOptions) error {
-		params, err := opts.Params()
-		if err != nil {
-			return err
-		}
-		result, err := modules.ElasticCache.PerformAction(s, opts.ID, "user-metadata", params)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
-	R(&options.ResourceMetadataOptions{}, "elastic-cache-set-tag", "Set tag of a server", func(s *mcclient.ClientSession, opts *options.ResourceMetadataOptions) error {
-		params, err := opts.Params()
-		if err != nil {
-			return err
-		}
-		result, err := modules.ElasticCache.PerformAction(s, opts.ID, "set-user-metadata", params)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
-	R(&options.ElasticCacheRemoteUpdateOptions{}, "elastic-cache-remote-update", "Restore elastisc cache backup", func(s *mcclient.ClientSession, opts *options.ElasticCacheRemoteUpdateOptions) error {
-		params, err := options.StructToParams(opts)
-		if err != nil {
-			return err
-		}
-		result, err := modules.ElasticCache.PerformAction(s, opts.ID, "remote-update", params)
-		if err != nil {
-			return err
-		}
-
-		printObject(result)
-		return nil
-	})
-
-	R(&options.ElasticCacheAutoRenewOptions{}, "elastic-cache-auto-renew", "Set elastisc cache auto renew", func(s *mcclient.ClientSession, opts *options.ElasticCacheAutoRenewOptions) error {
-		params, err := options.StructToParams(opts)
-		if err != nil {
-			return err
-		}
-		result, err := modules.ElasticCache.PerformAction(s, opts.ID, "set-auto-renew", params)
-		if err != nil {
-			return err
-		}
-
-		printObject(result)
-		return nil
-	})
-
-	R(&options.ElasticCacheRenewOptions{}, "elastic-cache-renew", "Renew elastisc cache", func(s *mcclient.ClientSession, opts *options.ElasticCacheRenewOptions) error {
-		params, err := options.StructToParams(opts)
-		if err != nil {
-			return err
-		}
-		result, err := modules.ElasticCache.PerformAction(s, opts.ID, "renew", params)
-		if err != nil {
-			return err
-		}
-
-		printObject(result)
-		return nil
-	})
-
-	type ElasticcacheSecgroupListOptions struct {
-		options.BaseListOptions
-		Elasticcache string `help:"ID or Name of elastic cache" json:"elasticcache"`
-		Secgroup     string `help:"Secgroup ID or name"`
-	}
-
-	R(&ElasticcacheSecgroupListOptions{}, "elastic-cache-secgroup-list", "List elastisc cache secgroups", func(s *mcclient.ClientSession, opts *ElasticcacheSecgroupListOptions) error {
-		params, err := options.ListStructToParams(opts)
-		if err != nil {
-			return err
-		}
-
-		result, err := modules.ElasticCacheSecgroup.List(s, params)
-		if err != nil {
-			return err
-		}
-
-		printList(result, nil)
-		return nil
-	})
 }

cmd/climc/shell/compute/elasticips.go

@@ -50,9 +50,8 @@ func init() {
 		Manager    string `help:"cloud provider"`
 		Region     string `help:"cloud region in which EIP is allocated"`
 		Bandwidth  int    `help:"Bandwidth in Mbps"`
-		IpAddr     string `help:"IP address of the EIP" json:"ip_addr"`
+		Ip         string `help:"IP address of the EIP"`
 		Network    string `help:"Network of the EIP"`
-		BgpType    string `help:"BgpType of the EIP" positional:"false"`
 		ChargeType string `help:"bandwidth charge type" choices:"traffic|bandwidth"`
 	}
 	R(&EipCreateOptions{}, "eip-create", "Create an EIP", func(s *mcclient.ClientSession, args *EipCreateOptions) error {
@@ -75,12 +74,9 @@ func init() {
 		if len(args.Network) > 0 {
 			params.Add(jsonutils.NewString(args.Network), "network")
 		}
-		if len(args.BgpType) > 0 {
-			params.Add(jsonutils.NewString(args.BgpType), "bgp_type")
-		}
 
-		if len(args.IpAddr) > 0 {
-			params.Add(jsonutils.NewString(args.IpAddr), "ip_addr")
+		if len(args.Ip) > 0 {
+			params.Add(jsonutils.NewString(args.Ip), "ip")
 		}
 
 		result, err := modules.Elasticips.Create(s, params)
@@ -190,16 +186,12 @@ func init() {
 	type ServerCreateEipOptions struct {
 		ID         string `help:"server ID or name"`
 		BW         int    `help:"EIP bandwidth in Mbps"`
-		BgpType    string `help:"desired BGP type"`
 		ChargeType string `help:"bandwidth charge type" choices:"traffic|bandwidth"`
 	}
 	R(&ServerCreateEipOptions{}, "server-create-eip", "allocate an EIP and associate EIP to server", func(s *mcclient.ClientSession, args *ServerCreateEipOptions) error {
 		params := jsonutils.NewDict()
 		params.Add(jsonutils.NewInt(int64(args.BW)), "bandwidth")
 
-		if args.BgpType != "" {
-			params.Add(jsonutils.NewString(args.BgpType), "bgp_type")
-		}
 		if len(args.ChargeType) > 0 {
 			params.Add(jsonutils.NewString(args.ChargeType), "charge_type")
 		}

cmd/climc/shell/compute/hosts.go

@@ -407,14 +407,12 @@ func init() {
 	})
 
 	type HostAddNetIfOptions struct {
-		ID        string `help:"ID or Name of host"`
-		WIRE      string `help:"ID or Name of wire to attach"`
-		MAC       string `help:"Mac address of NIC"`
-		INDEX     int64  `help:"nic index"`
-		Type      string `help:"Nic type" choices:"admin|ipmi"`
-		IpAddr    string `help:"IP address"`
-		Bridge    string `help:"Bridge of hostwire"`
-		Interface string `help:"Interface name, eg:eth0, en0"`
+		ID     string `help:"ID or Name of host"`
+		WIRE   string `help:"ID or Name of wire to attach"`
+		MAC    string `help:"Mac address of NIC"`
+		INDEX  int64  `help:"nic index"`
+		Type   string `help:"Nic type" choices:"admin|ipmi"`
+		IpAddr string `help:"IP address"`
 	}
 	R(&HostAddNetIfOptions{}, "host-add-netif", "Host add a NIC", func(s *mcclient.ClientSession, args *HostAddNetIfOptions) error {
 		params := jsonutils.NewDict()
@@ -428,12 +426,6 @@ func init() {
 		if len(args.IpAddr) > 0 {
 			params.Add(jsonutils.NewString(args.IpAddr), "ip_addr")
 		}
-		if len(args.Bridge) > 0 {
-			params.Add(jsonutils.NewString(args.Bridge), "bridge")
-		}
-		if len(args.Interface) > 0 {
-			params.Add(jsonutils.NewString(args.Interface), "interface")
-		}
 		result, err := modules.Hosts.PerformAction(s, args.ID, "add-netif", params)
 		if err != nil {
 			return err

cmd/climc/shell/compute/inter_vpc_network.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 compute
-
-import (
-	"yunion.io/x/onecloud/cmd/climc/shell"
-	"yunion.io/x/onecloud/pkg/mcclient/modules"
-	"yunion.io/x/onecloud/pkg/mcclient/options"
-)
-
-func init() {
-	cmd := shell.NewResourceCmd(&modules.InterVpcNetworks).WithKeyword("inter-vpc-network")
-	cmd.List(&options.InterVpcNetworkListOPtions{})
-	cmd.Show(&options.InterVpcNetworkIdOPtions{})
-	cmd.Create(&options.InterVpcNetworkCreateOPtions{})
-	cmd.Delete(&options.InterVpcNetworkIdOPtions{})
-	cmd.Perform("syncstatus", &options.InterVpcNetworkIdOPtions{})
-	cmd.Perform("addvpc", &options.InterVpcNetworkAddVpcOPtions{})
-	cmd.Perform("removevpc", &options.InterVpcNetworkRemoveVpcOPtions{})
-}

cmd/climc/shell/compute/inter_vpc_network_routeset.go

@@ -1,29 +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/mcclient/modules"
-	"yunion.io/x/onecloud/pkg/mcclient/options"
-)
-
-func init() {
-	cmd := shell.NewResourceCmd(&modules.InterVpcNetworkRouteSets).WithKeyword("inter-vpc-network-routeset")
-	cmd.List(&options.InterVpcNetworkRouteListOptions{})
-	cmd.Show(&options.InterVpcNetworkRouteIdptions{})
-	cmd.Perform("enable", &options.InterVpcNetworkRouteIdptions{})
-	cmd.Perform("disable", &options.InterVpcNetworkRouteIdptions{})
-}

cmd/climc/shell/compute/loadbalanceracls.go

@@ -137,21 +137,4 @@ func init() {
 		printLbAcl(lbacl)
 		return nil
 	})
-	R(&options.LoadbalancerAclPublicOptions{}, "lbacl-public", "Public lbacl", func(s *mcclient.ClientSession, opts *options.LoadbalancerAclPublicOptions) error {
-		params := jsonutils.Marshal(opts)
-		lbacl, err := modules.LoadbalancerAcls.PerformAction(s, opts.ID, "public", params)
-		if err != nil {
-			return err
-		}
-		printLbAcl(lbacl)
-		return nil
-	})
-	R(&options.LoadbalancerAclPrivateOptions{}, "lbacl-private", "Private lbacl", func(s *mcclient.ClientSession, opts *options.LoadbalancerAclPrivateOptions) error {
-		lbacl, err := modules.LoadbalancerAcls.PerformAction(s, opts.ID, "private", nil)
-		if err != nil {
-			return err
-		}
-		printLbAcl(lbacl)
-		return nil
-	})
 }

cmd/climc/shell/compute/loadbalancercertificates.go

@@ -15,8 +15,6 @@
 package compute
 
 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"
@@ -83,21 +81,4 @@ func init() {
 		printObject(lbcert)
 		return nil
 	})
-	R(&options.LoadbalancerCertificatePublicOptions{}, "lbcert-public", "Public lbcert", func(s *mcclient.ClientSession, opts *options.LoadbalancerCertificatePublicOptions) error {
-		params := jsonutils.Marshal(opts)
-		lbcert, err := modules.LoadbalancerCertificates.PerformAction(s, opts.ID, "public", params)
-		if err != nil {
-			return err
-		}
-		printObject(lbcert)
-		return nil
-	})
-	R(&options.LoadbalancerCertificatePrivateOptions{}, "lbcert-private", "Private lbcert", func(s *mcclient.ClientSession, opts *options.LoadbalancerCertificatePrivateOptions) error {
-		lbcert, err := modules.LoadbalancerCertificates.PerformAction(s, opts.ID, "private", nil)
-		if err != nil {
-			return err
-		}
-		printObject(lbcert)
-		return nil
-	})
 }

cmd/climc/shell/compute/loadbalancers.go

@@ -15,44 +15,92 @@
 package compute
 
 import (
-	"yunion.io/x/onecloud/cmd/climc/shell"
 	"yunion.io/x/onecloud/pkg/mcclient"
 	"yunion.io/x/onecloud/pkg/mcclient/modules"
 	"yunion.io/x/onecloud/pkg/mcclient/options"
 )
 
 func init() {
-	cmd := shell.NewResourceCmd(&modules.Loadbalancers).WithKeyword("lb")
-	cmd.Create(&options.LoadbalancerCreateOptions{})
-	cmd.Show(&options.LoadbalancerIdOptions{})
-	cmd.List(&options.LoadbalancerListOptions{})
-	cmd.Update(&options.LoadbalancerUpdateOptions{})
-	cmd.Delete(&options.LoadbalancerIdOptions{})
-	cmd.Perform("purge", &options.LoadbalancerIdOptions{})
-	cmd.Perform("status", &options.LoadbalancerActionStatusOptions{})
-	cmd.Perform("syncstatus", &options.LoadbalancerIdOptions{})
-	cmd.Perform("remote-update", &options.LoadbalancerRemoteUpdateOptions{})
-	cmd.Get("change-owner-candidate-domains", &options.LoadbalancerIdOptions{})
-
-	R(&options.ResourceMetadataOptions{}, "lb-add-tag", "Set tag of a lb", func(s *mcclient.ClientSession, opts *options.ResourceMetadataOptions) error {
-		params, err := opts.Params()
+	R(&options.LoadbalancerCreateOptions{}, "lb-create", "Create lb", func(s *mcclient.ClientSession, opts *options.LoadbalancerCreateOptions) error {
+		params, err := options.StructToParams(opts)
 		if err != nil {
 			return err
 		}
-		result, err := modules.Loadbalancers.PerformAction(s, opts.ID, "user-metadata", params)
+		lb, err := modules.Loadbalancers.Create(s, params)
 		if err != nil {
 			return err
 		}
-		printObject(result)
+		printObject(lb)
+		return nil
+	})
+	R(&options.LoadbalancerGetOptions{}, "lb-show", "Show lb", func(s *mcclient.ClientSession, opts *options.LoadbalancerGetOptions) error {
+		lb, err := modules.Loadbalancers.Get(s, opts.ID, nil)
+		if err != nil {
+			return err
+		}
+		printObject(lb)
+		return nil
+	})
+	R(&options.LoadbalancerListOptions{}, "lb-list", "List lbs", func(s *mcclient.ClientSession, opts *options.LoadbalancerListOptions) error {
+		params, err := options.ListStructToParams(opts)
+		if err != nil {
+			return err
+		}
+		result, err := modules.Loadbalancers.List(s, params)
+		if err != nil {
+			return err
+		}
+		printList(result, modules.Loadbalancers.GetColumns(s))
+		return nil
+	})
+	R(&options.LoadbalancerUpdateOptions{}, "lb-update", "Update lb", func(s *mcclient.ClientSession, opts *options.LoadbalancerUpdateOptions) error {
+		params, err := options.StructToParams(opts)
+		lb, err := modules.Loadbalancers.Update(s, opts.ID, params)
+		if err != nil {
+			return err
+		}
+		printObject(lb)
+		return nil
+	})
+	R(&options.LoadbalancerDeleteOptions{}, "lb-delete", "Delete lb", func(s *mcclient.ClientSession, opts *options.LoadbalancerDeleteOptions) error {
+		lb, err := modules.Loadbalancers.Delete(s, opts.ID, nil)
+		if err != nil {
+			return err
+		}
+		printObject(lb)
+		return nil
+	})
+	R(&options.LoadbalancerPurgeOptions{}, "lb-purge", "Purge lb", func(s *mcclient.ClientSession, opts *options.LoadbalancerPurgeOptions) error {
+		lb, err := modules.Loadbalancers.PerformAction(s, opts.ID, "purge", nil)
+		if err != nil {
+			return err
+		}
+		printObject(lb)
+		return nil
+	})
+	R(&options.LoadbalancerActionStatusOptions{}, "lb-status", "Change lb status", func(s *mcclient.ClientSession, opts *options.LoadbalancerActionStatusOptions) error {
+		params, err := options.StructToParams(opts)
+		if err != nil {
+			return err
+		}
+		lb, err := modules.Loadbalancers.PerformAction(s, opts.ID, "status", params)
+		if err != nil {
+			return err
+		}
+		printObject(lb)
+		return nil
+	})
+	R(&options.LoadbalancerActionSyncStatusOptions{}, "lb-syncstatus", "Sync lb status", func(s *mcclient.ClientSession, opts *options.LoadbalancerActionSyncStatusOptions) error {
+		lb, err := modules.Loadbalancers.PerformAction(s, opts.ID, "syncstatus", nil)
+		if err != nil {
+			return err
+		}
+		printObject(lb)
 		return nil
 	})
 
-	R(&options.ResourceMetadataOptions{}, "lb-set-tag", "Set tag of a lb", func(s *mcclient.ClientSession, opts *options.ResourceMetadataOptions) error {
-		params, err := opts.Params()
-		if err != nil {
-			return err
-		}
-		result, err := modules.Loadbalancers.PerformAction(s, opts.ID, "set-user-metadata", params)
+	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
 		}

cmd/climc/shell/compute/networkaddresses.go

@@ -1,29 +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/mcclient/modules"
-	"yunion.io/x/onecloud/pkg/mcclient/options"
-)
-
-func init() {
-	cmd := shell.NewResourceCmd(&modules.NetworkAddresses).WithContextManager(&modules.Wires)
-	cmd.BatchCreate(&options.NetworkAddressCreateOptions{})
-	cmd.List(&options.NetworkAddressListOptions{})
-	cmd.Show(&options.NetworkAddressIdOptions{})
-	cmd.Delete(&options.NetworkAddressIdOptions{})
-}

cmd/climc/shell/compute/networks.go

@@ -69,7 +69,6 @@ func init() {
 		AllocPolicy string `help:"Address allocation policy" choices:"none|stepdown|stepup|random"`
 		ServerType  string `help:"Server type" choices:"baremetal|container|eip|guest|ipmi|pxe"`
 		IsAutoAlloc *bool  `help:"Auto allocation IP pool"`
-		BgpType     string `help:"Internet service provider name" positional:"false"`
 		Desc        string `help:"Description" metavar:"DESCRIPTION"`
 	}
 	R(&NetworkCreateOptions{}, "network-create", "Create a virtual network", func(s *mcclient.ClientSession, args *NetworkCreateOptions) error {
@@ -96,9 +95,6 @@ func init() {
 		if len(args.Desc) > 0 {
 			params.Add(jsonutils.NewString(args.Desc), "description")
 		}
-		if len(args.BgpType) > 0 {
-			params.Add(jsonutils.NewString(args.BgpType), "bgp_type")
-		}
 		if args.IsAutoAlloc != nil {
 			params.Add(jsonutils.NewBool(*args.IsAutoAlloc), "is_auto_alloc")
 		}
@@ -111,21 +107,17 @@ func init() {
 	})
 
 	type NetworkCreateOptions2 struct {
-		Wire    string `help:"ID or Name of wire in which the network is created"`
-		Vpc     string `help:"ID or Name of vpc in which the network is created"`
-		Zone    string `help:"ID or Name of zone in which the network is created"`
-		NAME    string `help:"Name of new network"`
-		PREFIX  string `help:"Start of IPv4 address range"`
-		BgpType string `help:"Internet service provider name" positional:"false"`
-		Desc    string `help:"Description" metavar:"DESCRIPTION"`
+		Wire   string `help:"ID or Name of wire in which the network is created"`
+		Vpc    string `help:"ID or Name of vpc in which the network is created"`
+		Zone   string `help:"ID or Name of zone in which the network is created"`
+		NAME   string `help:"Name of new network"`
+		PREFIX string `help:"Start of IPv4 address range"`
+		Desc   string `help:"Description" metavar:"DESCRIPTION"`
 	}
 	R(&NetworkCreateOptions2{}, "network-create2", "Create a virtual network", func(s *mcclient.ClientSession, args *NetworkCreateOptions2) error {
 		params := jsonutils.NewDict()
 		params.Add(jsonutils.NewString(args.NAME), "name")
 		params.Add(jsonutils.NewString(args.PREFIX), "guest_ip_prefix")
-		if len(args.BgpType) > 0 {
-			params.Add(jsonutils.NewString(args.BgpType), "bgp_type")
-		}
 		if len(args.Desc) > 0 {
 			params.Add(jsonutils.NewString(args.Desc), "description")
 		}
@@ -261,20 +253,4 @@ func init() {
 		printObject(net)
 		return nil
 	})
-	type NetworkSetBgpTypeOptions struct {
-		ID      string  `help:"Network to set BgpType" json:"-"`
-		BgpType *string `help:"new BgpType name"`
-	}
-	R(&NetworkSetBgpTypeOptions{}, "network-set-bgp-type", "Set BgpType of a network", func(s *mcclient.ClientSession, args *NetworkSetBgpTypeOptions) error {
-		params, err := options.StructToParams(args)
-		if err != nil {
-			return err
-		}
-		net, err := modules.Networks.PerformAction(s, args.ID, "set-bgp-type", params)
-		if err != nil {
-			return err
-		}
-		printObject(net)
-		return nil
-	})
 }

cmd/climc/shell/compute/quotas.go

@@ -58,8 +58,7 @@ type RegionQuotaOptions struct {
 
 	Eip int64 `help:"Elastic IP count" json:"eip,omitzero"`
 
-	Snapshot         int64 `help:"Snapshot count" json:"snapshot,omitzero"`
-	InstanceSnapshot int64 `help:"Instance snapshot count" json:"instance_snapshot,omitzero"`
+	Snapshot int64 `help:"Snapshot count" json:"snapshot,omitzero"`
 
 	Bucket    int64 `help:"bucket count" json:"bucket,omitzero"`
 	ObjectGB  int64 `help:"object size in GB" json:"object_gb,omitzero"`
@@ -317,7 +316,7 @@ func init() {
 		QuotaSetBaseOptions
 		IdentityQuotaOptions
 	}
-	R(&IdentityQuotaSetOptions{}, "identity-quota-set", "Set identity quota for domain", func(s *mcclient.ClientSession, args *IdentityQuotaSetOptions) error {
+	R(&IdentityQuotaSetOptions{}, "identity-quota-set", "Set identity quota for domain", func(s *mcclient.ClientSession, args *InfrasQuotaSetOptions) error {
 		params := jsonutils.Marshal(args)
 		quotas, e := modules.IdentityQuotas.DoQuotaSet(s, params)
 		if e != nil {

cmd/climc/shell/compute/routetable_association.go

@@ -1,27 +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/mcclient/modules"
-	"yunion.io/x/onecloud/pkg/mcclient/options"
-)
-
-func init() {
-	cmd := shell.NewResourceCmd(&modules.RouteTableRouteAssociations).WithKeyword("routetable-association")
-	cmd.List(&options.RouteTableAssociationListOptions{})
-	cmd.Show(&options.RouteTableAssociationIdOptions{})
-}

cmd/climc/shell/compute/routetable_routeset.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 compute
-
-import (
-	"yunion.io/x/onecloud/cmd/climc/shell"
-	"yunion.io/x/onecloud/pkg/mcclient/modules"
-	"yunion.io/x/onecloud/pkg/mcclient/options"
-)
-
-func init() {
-	cmd := shell.NewResourceCmd(&modules.RouteTableRouteSets).WithKeyword("routetable-routeset")
-	cmd.List(&options.RouteTableRouteSetListOptions{})
-	cmd.Show(&options.RouteTableRouteSetIdOptions{})
-	cmd.Create(&options.RouteTableRouteSetCreateOptions{})
-	cmd.Update(&options.RouteTableRouteSetUpdateOptions{})
-	cmd.Delete(&options.RouteTableRouteSetIdOptions{})
-}

cmd/climc/shell/compute/routetables.go

@@ -15,20 +15,126 @@
 package compute
 
 import (
-	"yunion.io/x/onecloud/cmd/climc/shell"
+	"fmt"
+	"strings"
+
+	"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() {
-	cmd := shell.NewResourceCmd(&modules.RouteTables).WithKeyword("routetable")
-	cmd.List(&options.RouteTableListOptions{})
-	cmd.Show(&options.RouteTableIdOptions{})
-	cmd.Create(&options.RouteTableCreateOptions{})
-	cmd.Update(&options.RouteTableUpdateOptions{})
-	cmd.Delete(&options.RouteTableIdOptions{})
-	cmd.Perform("syncstatus", &options.RouteTableIdOptions{})
-	cmd.Perform("add-routes", &options.RouteTableAddRoutesOptions{})
-	cmd.Perform("del-routes", &options.RouteTableDelRoutesOptions{})
-	cmd.Perform("purge", &options.RouteTableIdOptions{})
+	printRouteTableList := func(list *modulebase.ListResult, columns []string) {
+		data := list.Data
+		for _, jsonObj := range data {
+			jd := jsonObj.(*jsonutils.JSONDict)
+			routesObj, err := jd.GetArray("routes")
+			if err != nil {
+				continue
+			}
+			routes := []string{}
+			for _, routeObj := range routesObj {
+				typ, _ := routeObj.GetString("type")
+				cidr, _ := routeObj.GetString("cidr")
+				next_hop_type, _ := routeObj.GetString("next_hop_type")
+				next_hop_id, _ := routeObj.GetString("next_hop_id")
+				route := fmt.Sprintf("%8s: %18s %s", typ, cidr, next_hop_type)
+				if next_hop_id != "" {
+					route += fmt.Sprintf(":%s", next_hop_id)
+				}
+				routes = append(routes, route)
+			}
+			s := strings.Join(routes, "\n")
+			jd.Set("routes", jsonutils.NewString(s))
+		}
+		printList(list, columns)
+	}
+
+	R(&options.RouteTableCreateOptions{}, "routetable-create", "Create routetable", func(s *mcclient.ClientSession, opts *options.RouteTableCreateOptions) error {
+		params, err := opts.Params()
+		if err != nil {
+			return err
+		}
+		routetable, err := modules.RouteTables.Create(s, params)
+		if err != nil {
+			return err
+		}
+		printObjectRecursive(routetable)
+		return nil
+	})
+	R(&options.RouteTableGetOptions{}, "routetable-show", "Show routetable", func(s *mcclient.ClientSession, opts *options.RouteTableGetOptions) error {
+		routetable, err := modules.RouteTables.Get(s, opts.ID, nil)
+		if err != nil {
+			return err
+		}
+		printObjectRecursive(routetable)
+		return nil
+	})
+	R(&options.RouteTableListOptions{}, "routetable-list", "List routetables", func(s *mcclient.ClientSession, opts *options.RouteTableListOptions) error {
+		params, err := options.ListStructToParams(opts)
+		if err != nil {
+			return err
+		}
+		result, err := modules.RouteTables.List(s, params)
+		if err != nil {
+			return err
+		}
+		printRouteTableList(result, modules.RouteTables.GetColumns(s))
+		return nil
+	})
+	R(&options.RouteTableUpdateOptions{}, "routetable-update", "Update routetable", func(s *mcclient.ClientSession, opts *options.RouteTableUpdateOptions) error {
+		params, err := opts.Params()
+		if err != nil {
+			return err
+		}
+		routetable, err := modules.RouteTables.Update(s, opts.ID, params)
+		if err != nil {
+			return err
+		}
+		printObjectRecursive(routetable)
+		return nil
+	})
+	R(&options.RouteTableAddRoutesOptions{}, "routetable-add-routes", "Add routes to routetable", func(s *mcclient.ClientSession, opts *options.RouteTableAddRoutesOptions) error {
+		params, err := opts.Params()
+		if err != nil {
+			return err
+		}
+		routetable, err := modules.RouteTables.PerformAction(s, opts.ID, "add-routes", params)
+		if err != nil {
+			return err
+		}
+		printObjectRecursive(routetable)
+		return nil
+	})
+	R(&options.RouteTableDelRoutesOptions{}, "routetable-del-routes", "Del routes to routetable", func(s *mcclient.ClientSession, opts *options.RouteTableDelRoutesOptions) error {
+		params, err := opts.Params()
+		if err != nil {
+			return err
+		}
+		routetable, err := modules.RouteTables.PerformAction(s, opts.ID, "del-routes", params)
+		if err != nil {
+			return err
+		}
+		printObjectRecursive(routetable)
+		return nil
+	})
+	R(&options.RouteTableDeleteOptions{}, "routetable-delete", "Delete routetable", func(s *mcclient.ClientSession, opts *options.RouteTableDeleteOptions) error {
+		routetable, err := modules.RouteTables.Delete(s, opts.ID, nil)
+		if err != nil {
+			return err
+		}
+		printObjectRecursive(routetable)
+		return nil
+	})
+	R(&options.RouteTablePurgeOptions{}, "routetable-purge", "Purge routetable", func(s *mcclient.ClientSession, opts *options.RouteTablePurgeOptions) error {
+		routetable, err := modules.RouteTables.PerformAction(s, opts.ID, "purge", nil)
+		if err != nil {
+			return err
+		}
+		printObjectRecursive(routetable)
+		return nil
+	})
 }

cmd/climc/shell/compute/schedtagresources.go

@@ -123,8 +123,5 @@ func init() {
 		modules.Schedtaghosts,
 		modules.Schedtagstorages,
 		modules.Schedtagnetworks,
-		modules.Schedtagcloudproviders,
-		modules.Schedtagcloudregions,
-		modules.Schedtagzones,
 	).register()
 }

cmd/climc/shell/compute/schedtags.go

@@ -15,20 +15,142 @@
 package compute
 
 import (
-	"yunion.io/x/onecloud/cmd/climc/shell"
+	"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() {
-	cmd := shell.NewResourceCmd(&modules.Schedtags)
+	type SchedtagListOptions struct {
+		options.BaseListOptions
+		Type string `help:"Filter by resource type"`
+	}
+	R(&SchedtagListOptions{}, "schedtag-list", "List schedule tags", func(s *mcclient.ClientSession, args *SchedtagListOptions) error {
+		var params *jsonutils.JSONDict
+		{
+			var err error
+			params, err = args.BaseListOptions.Params()
+			if err != nil {
+				return err
 
-	cmd.List(new(options.SchedtagListOptions))
-	cmd.Show(new(options.SchedtagShowOptions))
-	cmd.Delete(new(options.SchedtagShowOptions))
-	cmd.Create(new(options.SchedtagCreateOptions))
-	cmd.Update(new(options.SchedtagUpdateOptions))
-	cmd.BatchPerform("set-scope", new(options.SchedtagSetScopeOptions))
-	cmd.PerformWithKeyword("set-user-metadata", "user-metadata", new(options.ResourceMetadataOptions))
-	cmd.Perform("set-resource", new(options.SchedtagSetResource))
+			}
+		}
+		if len(args.Type) > 0 {
+			params.Add(jsonutils.NewString(args.Type), "resource_type")
+		}
+		result, err := modules.Schedtags.List(s, params)
+		if err != nil {
+			return err
+		}
+		printList(result, modules.Schedtags.GetColumns(s))
+		return nil
+	})
+
+	type SchedtagShowOptions struct {
+		ID string `help:"ID or Name of the scheduler tag to show"`
+	}
+	R(&SchedtagShowOptions{}, "schedtag-show", "Show scheduler tag details", func(s *mcclient.ClientSession, args *SchedtagShowOptions) error {
+		result, err := modules.Schedtags.Get(s, args.ID, nil)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	R(&SchedtagShowOptions{}, "schedtag-delete", "Delete a scheduler tag", func(s *mcclient.ClientSession, args *SchedtagShowOptions) error {
+		result, err := modules.Schedtags.Delete(s, args.ID, nil)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	type SchedtagCreateOptions struct {
+		NAME     string `help:"Name of new schedtag"`
+		Strategy string `help:"Policy" choices:"require|exclude|prefer|avoid"`
+		Desc     string `help:"Description"`
+		Scope    string `help:"Resource scope" choices:"system|domain|project"`
+		Type     string `help:"Resource type" choices:"hosts|storages|networks"`
+	}
+	R(&SchedtagCreateOptions{}, "schedtag-create", "Create a schedule tag", func(s *mcclient.ClientSession, args *SchedtagCreateOptions) error {
+		params := jsonutils.NewDict()
+		params.Add(jsonutils.NewString(args.NAME), "name")
+		if len(args.Strategy) > 0 {
+			params.Add(jsonutils.NewString(args.Strategy), "default_strategy")
+		}
+		if len(args.Desc) > 0 {
+			params.Add(jsonutils.NewString(args.Desc), "description")
+		}
+		if len(args.Type) > 0 {
+			params.Add(jsonutils.NewString(args.Type), "resource_type")
+		}
+		if len(args.Scope) > 0 {
+			params.Add(jsonutils.NewString(args.Scope), "scope")
+		}
+		schedtag, err := modules.Schedtags.Create(s, params)
+		if err != nil {
+			return err
+		}
+		printObject(schedtag)
+		return nil
+	})
+
+	type SchedtagUpdateOptions struct {
+		ID            string `help:"ID or Name of schetag"`
+		Name          string `help:"New name of schedtag"`
+		Strategy      string `help:"Policy" choices:"require|exclude|prefer|avoid"`
+		Desc          string `help:"Description"`
+		ClearStrategy bool   `help:"Clear default schedule policy"`
+	}
+	R(&SchedtagUpdateOptions{}, "schedtag-update", "Update a schedule tag", func(s *mcclient.ClientSession, args *SchedtagUpdateOptions) error {
+		params := jsonutils.NewDict()
+		if len(args.Name) > 0 {
+			params.Add(jsonutils.NewString(args.Name), "name")
+		}
+		if len(args.Strategy) > 0 {
+			params.Add(jsonutils.NewString(args.Strategy), "default_strategy")
+		}
+		if len(args.Desc) > 0 {
+			params.Add(jsonutils.NewString(args.Desc), "description")
+		}
+		if args.ClearStrategy {
+			params.Add(jsonutils.NewString(""), "default_strategy")
+		}
+		if params.Size() == 0 {
+			return fmt.Errorf("No valid data to update")
+		}
+		schedtag, err := modules.Schedtags.Update(s, args.ID, params)
+		if err != nil {
+			return err
+		}
+		printObject(schedtag)
+		return nil
+	})
+
+	type SetScopeOptions struct {
+		ID      []string `help:"ID or Name of schetag"`
+		Project string   `help:"ID or Name of project"`
+		Domain  string   `help:"ID or Name of domain"`
+		System  bool     `help:"Set to system scope"`
+	}
+	R(&SetScopeOptions{}, "schedtag-set-scope", "Set schedtag scope", func(s *mcclient.ClientSession, args *SetScopeOptions) error {
+		params := jsonutils.NewDict()
+		domainId := args.Domain
+		projectId := args.Project
+		if args.System {
+			domainId = ""
+			projectId = ""
+		}
+		params.Add(jsonutils.NewString(domainId), "domain")
+		params.Add(jsonutils.NewString(projectId), "project")
+		ret := modules.Schedtags.BatchPerformAction(s, args.ID, "set-scope", params)
+		printBatchResults(ret, modules.Schedtags.GetColumns(s))
+		return nil
+	})
 }

cmd/climc/shell/compute/schedulers.go

@@ -123,10 +123,9 @@ func init() {
 		})
 
 	type SchedulerHistoryListOptions struct {
-		Limit        int  `default:"50" help:"Page limit"`
-		Offset       int  `default:"0" help:"Page offset"`
-		All          bool `help:"Show all histories, including scheduler-test"`
-		IsSuggestion bool `help:"Only show forcast suggestion history"`
+		Limit  int  `default:"50" help:"Page limit"`
+		Offset int  `default:"0" help:"Page offset"`
+		All    bool `help:"Show all histories, including scheduler-test"`
 	}
 	R(&SchedulerHistoryListOptions{}, "scheduler-history-list", "Show scheduler history list",
 		func(s *mcclient.ClientSession, args *SchedulerHistoryListOptions) error {
@@ -139,14 +138,17 @@ func init() {
 			if args.Offset > 0 {
 				params.Add(jsonutils.NewInt(int64(args.Offset)), "offset")
 			}
-			params.Add(jsonutils.NewBool(args.All), "all")
-			params.Add(jsonutils.NewBool(args.IsSuggestion), "is_suggestion")
+			if args.All {
+				params.Add(jsonutils.JSONTrue, "all")
+			} else {
+				params.Add(jsonutils.JSONFalse, "all")
+			}
 			result, err := modules.SchedManager.HistoryList(s, params)
 			if err != nil {
 				return err
 			}
 			printList(modulebase.JSON2ListResult(result), []string{
-				"session_id", "time", "status", "consuming", "is_suggestion",
+				"session_id", "time", "status", "consuming",
 			})
 			return nil
 		})

cmd/climc/shell/compute/secgroups.go

@@ -34,6 +34,4 @@ func init() {
 	cmd.Perform("cache-secgroup", &options.SecurityGroupCacheOptions{})
 	cmd.Perform("uncache-secgroup", &options.SecurityGroupUncacheSecurityGroup{})
 	cmd.Perform("purge", &options.SecgroupIdOptions{})
-	cmd.Perform("change-owner", &options.SecgroupChangeOwnerOptions{})
-	cmd.Perform("import-rules", &options.SecgroupImportRulesOptions{})
 }

cmd/climc/shell/compute/servers.go

@@ -728,7 +728,6 @@ func init() {
 	type ServerRollBackSnapshot struct {
 		ID               string `help:"ID or name of VM" json:"-"`
 		InstanceSnapshot string `help:"Instance snapshot id or name" json:"instance_snapshot"`
-		AutoStart        bool   `help:"Auto start VM"`
 	}
 	R(&ServerRollBackSnapshot{}, "instance-snapshot-reset", "reset instance snapshot", func(s *mcclient.ClientSession, opts *ServerRollBackSnapshot) error {
 		params := jsonutils.Marshal(opts)

cmd/climc/shell/compute/skus.go

@@ -15,31 +15,194 @@
 package compute
 
 import (
-	"yunion.io/x/onecloud/cmd/climc/shell"
+	"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() {
-	cmd := shell.NewResourceCmd(&modules.ServerSkus).WithKeyword("server-sku")
-	cmd.List(&options.ServerSkusListOptions{})
-	cmd.Show(&options.ServerSkusIdOptions{})
-	cmd.Delete(&options.ServerSkusIdOptions{})
-	cmd.Perform("enable", &options.ServerSkusIdOptions{})
-	cmd.Perform("disable", &options.ServerSkusIdOptions{})
-	cmd.Create(&options.ServerSkusCreateOptions{})
-	cmd.Update(&options.ServerSkusUpdateOptions{})
-	cmd.ClassShow(&options.ServerSkusListOptions{})
-	cmd.PerformClass("sync-skus", &options.SkuSyncOptions{})
+	type ServerSkusListOptions struct {
+		options.BaseListOptions
+		Cloudregion    string  `help:"region Id or name"`
+		Usable         bool    `help:"Filter usable sku"`
+		Zone           string  `help:"zone Id or name"`
+		City           *string `help:"city name,eg. BeiJing"`
+		Cpu            *int    `help:"Cpu core count" json:"cpu_core_count"`
+		Mem            *int    `help:"Memory size in MB" json:"memory_size_mb"`
+		Name           string  `help:"Name of Sku"`
+		PostpaidStatus string  `help:"Postpaid status" choices:"soldout|available"`
+		PrepaidStatus  string  `help:"Prepaid status" choices:"soldout|available"`
+	}
 
-	R(&options.SkuTaskQueryOptions{}, "server-sku-sync-task-show", "Show details of skus sync tasks", func(s *mcclient.ClientSession, args *options.SkuTaskQueryOptions) error {
-		params, err := args.Params()
+	R(&ServerSkusListOptions{}, "server-sku-list", "List all avaiable Server SKU", func(s *mcclient.ClientSession, args *ServerSkusListOptions) error {
+		params, err := options.ListStructToParams(args)
 		if err != nil {
 			return err
 		}
+		results, err := modules.ServerSkus.List(s, params)
+		if err != nil {
+			return err
+		}
+		printList(results, modules.ServerSkus.GetColumns(s))
+		return nil
+	})
 
-		result, err := modules.ServerSkus.Get(s, "sync-tasks", params)
+	type ServerSkusIdOptions struct {
+		ID string `help:"ID or Name of SKU to show"`
+	}
+	R(&ServerSkusIdOptions{}, "server-sku-show", "show details of a avaiable Server SKU", func(s *mcclient.ClientSession, args *ServerSkusIdOptions) error {
+		result, err := modules.ServerSkus.Get(s, args.ID, nil)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	R(&ServerSkusIdOptions{}, "server-sku-enable", "Enable Server SKU", func(s *mcclient.ClientSession, args *ServerSkusIdOptions) error {
+		result, err := modules.ServerSkus.PerformAction(s, args.ID, "enable", nil)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	R(&ServerSkusIdOptions{}, "server-sku-disable", "Disable Server SKU", func(s *mcclient.ClientSession, args *ServerSkusIdOptions) error {
+		result, err := modules.ServerSkus.PerformAction(s, args.ID, "disable", nil)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	type ServerSkusCacheOptions struct {
+		REGION string `help:"Private cloud region"`
+		ID     string `help:"ServerSku Id"`
+	}
+
+	R(&ServerSkusCacheOptions{}, "server-sku-cache", "Cache Server SKU for private cloud", func(s *mcclient.ClientSession, args *ServerSkusCacheOptions) error {
+		params := jsonutils.NewDict()
+		params.Add(jsonutils.NewString(args.REGION), "cloudregion")
+		result, err := modules.ServerSkus.PerformAction(s, args.ID, "cache-sku", params)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	type ServerSkusCreateOptions struct {
+		Name         string `help:"ServerSku name"`
+		CpuCoreCount int    `help:"Cpu Count" required:"true" positional:"true"`
+		MemorySizeMB int    `help:"Memory MB" required:"true" positional:"true"`
+
+		OsName               *string `help:"OS name/type" choices:"Linux|Windows|Any" default:"Any"`
+		InstanceTypeCategory *string `help:"instance type category" choices:"general_purpose|compute_optimized|memory_optimized|storage_optimized|hardware_accelerated|high_memory|high_storage"`
+
+		SysDiskResizable *bool   `help:"system disk is resizable"`
+		SysDiskType      *string `help:"system disk type" default:"local" choices:"local"`
+		SysDiskMaxSizeGB *int    `help:"system disk maximal size in gb"`
+
+		AttachedDiskType   *string `help:"attached data disk type"`
+		AttachedDiskSizeGB *int    `help:"attached data disk size in GB"`
+		AttachedDiskCount  *int    `help:"attached data disk count"`
+
+		MaxDataDiskCount *int `help:"maximal allowed data disk count"`
+
+		NicType     *string `help:"nic type"`
+		MaxNicCount *int    `help:"maximal nic count"`
+
+		GPUSpec       *string `help:"GPU spec"`
+		GPUCount      *int    `help:"GPU count"`
+		GPUAttachable *bool   `help:"Allow attach GPU"`
+
+		Zone        *string `help:"Zone ID or name"`
+		Cloudregion *string `help:"Cloudregion ID or name"`
+		Provider    string  `help:"provider"`
+		Brand       string  `help:"brand"`
+	}
+	R(&ServerSkusCreateOptions{}, "server-sku-create", "Create a server sku record", func(s *mcclient.ClientSession, args *ServerSkusCreateOptions) error {
+		params, err := options.StructToParams(args)
+		if err != nil {
+			return err
+		}
+		result, err := modules.ServerSkus.Create(s, params)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	type ServerSkusUpdateOptions struct {
+		ID string `help:"Name or ID of SKU" json:"-"`
+
+		PostpaidStatus *string `help:"skus available status for postpaid instance" choices:"available|soldout"`
+		PrepaidStatus  *string `help:"skus available status for prepaid instance"  choices:"available|soldout"`
+		CpuCoreCount   *int    `help:"Cpu Count"`
+		MemorySizeMB   *int    `help:"Memory MB"`
+
+		InstanceTypeCategory *string `help:"instance type category" choices:"general_purpose|compute_optimized|memory_optimized|storage_optimized|hardware_accelerated|high_memory|high_storage"`
+
+		SysDiskResizable *bool `help:"system disk is resizable"`
+		SysDiskMaxSizeGB *int  `help:"system disk maximal size in gb"`
+
+		AttachedDiskType   *string `help:"attached data disk type"`
+		AttachedDiskSizeGB *int    `help:"attached data disk size in GB"`
+		AttachedDiskCount  *int    `help:"attached data disk count"`
+
+		MaxDataDiskCount *int `help:"maximal allowed data disk count"`
+
+		NicType     *string `help:"nic type"`
+		MaxNicCount *int    `help:"maximal nic count"`
+
+		GPUSpec       *string `help:"GPU spec"`
+		GPUCount      *int    `help:"GPU count"`
+		GPUAttachable *bool   `help:"Allow attach GPU"`
+
+		Zone   *string `help:"Zone ID or name"`
+		Region *string `help:"Region ID or name"`
+	}
+	R(&ServerSkusUpdateOptions{}, "server-sku-update", "Update server sku attributes", func(s *mcclient.ClientSession, args *ServerSkusUpdateOptions) error {
+		params, err := options.StructToParams(args)
+		if err != nil {
+			return err
+		}
+		result, err := modules.ServerSkus.Update(s, args.ID, params)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	type ServerSkusDeleteOptions struct {
+		ID    string `help:"Id or name of server sku"`
+		Purge bool   `help:"purge sku"`
+	}
+	R(&ServerSkusDeleteOptions{}, "server-sku-delete", "Delete a server sku", func(s *mcclient.ClientSession, args *ServerSkusDeleteOptions) error {
+		params := jsonutils.NewDict()
+		if args.Purge {
+			params.Add(jsonutils.JSONTrue, "purge")
+		}
+		result, err := modules.ServerSkus.Delete(s, args.ID, params)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	R(&ServerSkusListOptions{}, "server-sku-specs-list", "List all avaiable Server SKU specifications", func(s *mcclient.ClientSession, args *ServerSkusListOptions) error {
+		params, err := options.ListStructToParams(args)
+		if err != nil {
+			return err
+		}
+		result, err := modules.ServerSkus.Get(s, "instance-specs", params)
 		if err != nil {
 			return err
 		}

cmd/climc/shell/compute/storages.go

@@ -61,14 +61,13 @@ func init() {
 		ID                    string  `help:"ID or Name of storage to update"`
 		Name                  string  `help:"New Name of storage"`
 		Desc                  string  `help:"Description"`
-		CommitBound           float64 `help:"Upper bound of storage overcommit rate" json:"cmtbound"`
+		CommitBound           float64 `help:"Upper bound of storage overcommit rate"`
 		MediumType            string  `help:"Medium type" choices:"ssd|rotate"`
 		RbdRadosMonOpTimeout  int64   `help:"ceph rados_mon_op_timeout"`
 		RbdRadosOsdOpTimeout  int64   `help:"ceph rados_osd_op_timeout"`
 		RbdClientMountTimeout int64   `help:"ceph client_mount_timeout"`
 		RbdKey                string  `help:"ceph rbd key"`
 		Reserved              string  `help:"Reserved storage space"`
-		Capacity              int     `help:"Capacity for storage"`
 	}
 	R(&StorageUpdateOptions{}, "storage-update", "Update a storage", func(s *mcclient.ClientSession, args *StorageUpdateOptions) error {
 		params, err := options.StructToParams(args)

cmd/climc/shell/compute/vpc_peering_connection.go

@@ -1,31 +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/mcclient/modules"
-	"yunion.io/x/onecloud/pkg/mcclient/options"
-)
-
-func init() {
-	cmd := shell.NewResourceCmd(&modules.VpcPeeringConnections).WithKeyword("vpc-peering-connection")
-	cmd.List(&options.VpcPeeringConnectionListOptions{})
-	cmd.Show(&options.VpcPeeringConnectionIdOptions{})
-	cmd.Create(&options.VpcPeeringConnectionCreateOptions{})
-	cmd.Delete(&options.VpcPeeringConnectionIdOptions{})
-	cmd.Perform("sync", &options.VpcPeeringConnectionIdOptions{})
-	cmd.Perform("syncstatus", &options.VpcPeeringConnectionIdOptions{})
-}

cmd/climc/shell/compute/vpcs.go

@@ -16,7 +16,6 @@ package compute
 
 import (
 	"yunion.io/x/onecloud/cmd/climc/shell"
-	"yunion.io/x/onecloud/pkg/mcclient"
 	"yunion.io/x/onecloud/pkg/mcclient/modules"
 	"yunion.io/x/onecloud/pkg/mcclient/options"
 )
@@ -36,17 +35,4 @@ func init() {
 	cmd.Perform("public", &options.BasePublicOptions{})
 	cmd.Perform("change-owner", &options.VpcChangeOwnerOptions{})
 	cmd.Get("vpc-change-owner-candidate-domains", &options.VpcIdOptions{})
-
-	R(&options.ResourceMetadataOptions{}, "vpc-set-user-metadata", "Set metadata of a vpc", func(s *mcclient.ClientSession, opts *options.ResourceMetadataOptions) error {
-		params, err := opts.Params()
-		if err != nil {
-			return err
-		}
-		result, err := modules.Vpcs.PerformAction(s, opts.ID, "user-metadata", params)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
 }

cmd/climc/shell/compute/webconsole.go

@@ -42,24 +42,34 @@ func init() {
 		if err != nil {
 			return err
 		}
-
-		resp := &webconsole_api.ServerRemoteConsoleResponse{}
-		if err := obj.Unmarshal(resp); err != nil {
+		connParams, err := obj.GetString("connect_params")
+		if err != nil {
 			return err
 		}
-		connectParams := resp.GetConnectParams()
-		if protocol, err := resp.GetConnectProtocol(); err != nil {
-			return err
-		} else if !utils.IsInStringArray(protocol, []string{
+		if decodeStr, err := base64.StdEncoding.DecodeString(connParams); err == nil {
+			connParams = string(decodeStr)
+		}
+		var query url.Values
+		connUrl, err := url.ParseRequestURI(connParams)
+		if err == nil {
+			query = connUrl.Query()
+		} else {
+			query, err = url.ParseQuery(connParams)
+			if err != nil {
+				return err
+			}
+		}
+		protocol := query.Get("protocol")
+		if !utils.IsInStringArray(protocol, []string{
 			command.PROTOCOL_TTY, webconsole_api.VNC,
 			webconsole_api.SPICE, webconsole_api.WMKS,
 		}) {
-			fmt.Println(connectParams)
+			fmt.Println(connParams)
 			return nil
 		}
 
-		newQuery := url.Values{}
-		newQuery.Set("data", base64.StdEncoding.EncodeToString([]byte(connectParams)))
+		newQuery := url.Values(make(map[string][]string))
+		newQuery.Set("data", base64.StdEncoding.EncodeToString([]byte(connParams)))
 		u.RawQuery = newQuery.Encode()
 		fmt.Println(u.String())
 		return nil

cmd/climc/shell/events/splitable.go

@@ -1,70 +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/jsonutils"
-
-	"yunion.io/x/onecloud/pkg/mcclient"
-	"yunion.io/x/onecloud/pkg/mcclient/modulebase"
-	"yunion.io/x/onecloud/pkg/mcclient/modules"
-)
-
-func init() {
-	type EventSplitableOptions struct {
-		Service string `help:"service" choices:"compute|identity|image" default:"compute"`
-	}
-	R(&EventSplitableOptions{}, "logs-splitable", "Show splitable info of event table", func(s *mcclient.ClientSession, args *EventSplitableOptions) error {
-		var results jsonutils.JSONObject
-		var err error
-		switch args.Service {
-		case "identity":
-			results, err = modules.IdentityLogs.Get(s, "splitable", nil)
-		case "image":
-			results, err = modules.ImageLogs.Get(s, "splitable", nil)
-		default:
-			results, err = modules.Logs.Get(s, "splitable", nil)
-		}
-		if err != nil {
-			return err
-		}
-		tables, err := results.GetArray()
-		if err != nil {
-			return err
-		}
-		listResult := &modulebase.ListResult{
-			Data: tables,
-		}
-		printList(listResult, nil)
-		return nil
-	})
-	R(&EventSplitableOptions{}, "logs-purge", "Purge obsolete splitable of event table", func(s *mcclient.ClientSession, args *EventSplitableOptions) error {
-		var results jsonutils.JSONObject
-		var err error
-		switch args.Service {
-		case "identity":
-			results, err = modules.IdentityLogs.PerformClassAction(s, "purge-splitable", nil)
-		case "image":
-			results, err = modules.ImageLogs.PerformClassAction(s, "purge-splitable", nil)
-		default:
-			results, err = modules.Logs.PerformClassAction(s, "purge-splitable", nil)
-		}
-		if err != nil {
-			return err
-		}
-		printObject(results)
-		return nil
-	})
-}

cmd/climc/shell/helper.go

@@ -78,11 +78,6 @@ type ICreateOpt interface {
 	IOpt
 }
 
-type IBatchCreateOpt interface {
-	IOpt
-	GetCountParam() int
-}
-
 func (cmd ResourceCmd) RunWithDesc(action, desc string, args interface{}, callback interface{}) {
 	man := cmd.manager
 	prefix := cmd.prefix
@@ -139,48 +134,20 @@ func (cmd ResourceCmd) List(args IListOpt) {
 }
 
 func (cmd ResourceCmd) Create(args ICreateOpt) {
-	cmd.CreateWithKeyword("create", args)
-}
-
-func (cmd ResourceCmd) CreateWithKeyword(keyword string, args ICreateOpt) {
-	cmd.Run(keyword, args, cmd.create)
-}
-
-func (cmd ResourceCmd) create(s *mcclient.ClientSession, args ICreateOpt) error {
 	man := cmd.manager
-	params, err := args.Params()
-	if err != nil {
-		return err
+	callback := func(s *mcclient.ClientSession, args ICreateOpt) error {
+		params, err := args.Params()
+		if err != nil {
+			return err
+		}
+		ret, err := man.(modulebase.Manager).Create(s, params)
+		if err != nil {
+			return err
+		}
+		printObject(ret)
+		return nil
 	}
-	ret, err := man.(modulebase.Manager).Create(s, params)
-	if err != nil {
-		return err
-	}
-	printObject(ret)
-	return nil
-}
-
-func (cmd ResourceCmd) BatchCreate(args IBatchCreateOpt) {
-	cmd.BatchCreateWithKeyword("create", args)
-}
-
-func (cmd ResourceCmd) BatchCreateWithKeyword(keyword string, args IBatchCreateOpt) {
-	cmd.Run(keyword, args, cmd.batchCreate)
-}
-
-func (cmd ResourceCmd) batchCreate(s *mcclient.ClientSession, args IBatchCreateOpt) error {
-	man := cmd.manager.(modulebase.Manager)
-	count := args.GetCountParam()
-	if count <= 1 {
-		return cmd.create(s, args)
-	}
-	params, err := args.Params()
-	if err != nil {
-		return err
-	}
-	rets := man.BatchCreate(s, params, count)
-	printBatchResults(rets, man.GetColumns(s))
-	return nil
+	cmd.Run("create", args, callback)
 }
 
 type IIdOpt interface {
@@ -314,13 +281,10 @@ type IPerformOpt interface {
 	IIdOpt
 }
 
-func (cmd ResourceCmd) PerformWithKeyword(keyword, action string, args IPerformOpt) {
+func (cmd ResourceCmd) Perform(action string, args IPerformOpt) {
 	man := cmd.manager
 	callback := func(s *mcclient.ClientSession, args IPerformOpt) error {
-		params, err := args.Params()
-		if err != nil {
-			return err
-		}
+		params := jsonutils.Marshal(args) // .Params()
 		ret, err := man.(modulebase.Manager).PerformAction(s, args.GetId(), action, params)
 		if err != nil {
 			return err
@@ -328,28 +292,7 @@ func (cmd ResourceCmd) PerformWithKeyword(keyword, action string, args IPerformO
 		printObject(ret)
 		return nil
 	}
-	cmd.Run(keyword, args, callback)
-}
-
-func (cmd ResourceCmd) PerformClassWithKeyword(keyword, action string, args IOpt) {
-	man := cmd.manager
-	callback := func(s *mcclient.ClientSession, args IOpt) error {
-		params, err := args.Params()
-		if err != nil {
-			return err
-		}
-		ret, err := man.(modulebase.Manager).PerformClassAction(s, action, params)
-		if err != nil {
-			return err
-		}
-		printObject(ret)
-		return nil
-	}
-	cmd.Run(keyword, args, callback)
-}
-
-func (cmd ResourceCmd) Perform(action string, args IPerformOpt) {
-	cmd.PerformWithKeyword(action, action, args)
+	cmd.Run(action, args, callback)
 }
 
 func (cmd ResourceCmd) PerformClass(action string, args IOpt) {
@@ -415,18 +358,13 @@ type IUpdateOpt interface {
 	IIdOpt
 }
 
-func (cmd ResourceCmd) UpdateWithKeyword(keyword string, args IUpdateOpt) {
+func (cmd ResourceCmd) Update(args IUpdateOpt) {
 	man := cmd.manager
 	callback := func(s *mcclient.ClientSession, args IUpdateOpt) error {
-		_params, err := args.Params()
+		params, err := args.Params()
 		if err != nil {
 			return err
 		}
-		params := _params.(*jsonutils.JSONDict)
-		params.Remove("id")
-		if params.Length() == 0 {
-			return InvalidUpdateError()
-		}
 		ret, err := man.(modulebase.Manager).Update(s, args.GetId(), params)
 		if err != nil {
 			return err
@@ -434,11 +372,7 @@ func (cmd ResourceCmd) UpdateWithKeyword(keyword string, args IUpdateOpt) {
 		printObject(ret)
 		return nil
 	}
-	cmd.Run(keyword, args, callback)
-}
-
-func (cmd ResourceCmd) Update(args IUpdateOpt) {
-	cmd.UpdateWithKeyword("update", args)
+	cmd.Run("update", args, callback)
 }
 
 type IMetadataOpt interface {

cmd/climc/shell/identity/domains.go

@@ -25,8 +25,7 @@ import (
 func init() {
 	type DomainListOptions struct {
 		options.BaseListOptions
-		IdpId       string `help:"filter by idp_id"`
-		IdpEntityId string `help:"filter by idp_entity_id"`
+		IdpId string `help:"filter by idp_id"`
 	}
 	R(&DomainListOptions{}, "domain-list", "List domains", func(s *mcclient.ClientSession, args *DomainListOptions) error {
 		params, err := options.ListStructToParams(args)
@@ -156,16 +155,4 @@ func init() {
 		return nil
 	})
 
-	type DomainUnlinkIdpOptions struct {
-		DOMAIN string `help:"ID or name of domain to operate" json:"-"`
-	}
-	R(&DomainUnlinkIdpOptions{}, "domain-unlink-idp", "Unlink domain from an entity in the speicified identity provider", func(s *mcclient.ClientSession, args *DomainUnlinkIdpOptions) error {
-		result, err := modules.Domains.PerformAction(s, args.DOMAIN, "unlink-idp", nil)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
 }

cmd/climc/shell/identity/identityproviders.go

@@ -265,12 +265,9 @@ func init() {
 	type IdentityProviderCreateCASOptions struct {
 		NAME string `help:"name of identity provider" json:"-"`
 
-		AutoCreateProject   bool `help:"automatically create a project if the default_project not exists" json:"-"`
+		AutoCreateProject   bool `help:"automatically create a default project when importing domain" json:"-"`
 		NoAutoCreateProject bool `help:"do not create default project when importing domain" json:"-"`
 
-		AutoCreateUser   bool `help:"automatically create a user" json:"-"`
-		NoAutoCreateUser bool `help:"do not automatically create a user" json:"-"`
-
 		TargetDomain string `help:"target domain without creating new domain" json:"-"`
 
 		api.SCASIdpConfigOptions
@@ -287,11 +284,6 @@ func init() {
 		} else if args.NoAutoCreateProject {
 			params.Add(jsonutils.JSONFalse, "auto_create_project")
 		}
-		if args.AutoCreateUser {
-			params.Add(jsonutils.JSONTrue, "auto_create_user")
-		} else if args.NoAutoCreateUser {
-			params.Add(jsonutils.JSONFalse, "auto_create_user")
-		}
 
 		params.Add(jsonutils.NewString("cas"), "driver")
 		params.Add(jsonutils.Marshal(args), "config", "cas")
@@ -472,9 +464,6 @@ func init() {
 		AutoCreateProject   bool `help:"automatically create a default project when importing domain" json:"-"`
 		NoAutoCreateProject bool `help:"do not create default project when importing domain" json:"-"`
 
-		AutoCreateUser   bool `help:"automatically create a user" json:"-"`
-		NoAutoCreateUser bool `help:"do not automatically create a user" json:"-"`
-
 		TargetDomain string `help:"target domain without creating new domain" json:"-"`
 
 		api.SOIDCIdpConfigOptions
@@ -491,11 +480,6 @@ func init() {
 		} else if args.NoAutoCreateProject {
 			params.Add(jsonutils.JSONFalse, "auto_create_project")
 		}
-		if args.AutoCreateUser {
-			params.Add(jsonutils.JSONTrue, "auto_create_user")
-		} else if args.NoAutoCreateUser {
-			params.Add(jsonutils.JSONFalse, "auto_create_user")
-		}
 
 		params.Add(jsonutils.NewString("oidc"), "driver")
 		params.Add(jsonutils.Marshal(args), "config", "oidc")
@@ -722,18 +706,4 @@ func init() {
 		printObject(result)
 		return nil
 	})
-
-	type IdpSetDefaultSsoOptions struct {
-		ID string `help:"id or name of idp to set default Sso" json:"-"`
-
-		api.PerformDefaultSsoInput
-	}
-	R(&IdpSetDefaultSsoOptions{}, "idp-default-sso", "Enable/disable default SSO", func(s *mcclient.ClientSession, args *IdpSetDefaultSsoOptions) error {
-		result, err := modules.IdentityProviders.PerformAction(s, args.ID, "default-sso", jsonutils.Marshal(args))
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
 }

cmd/climc/shell/identity/policies.go

@@ -24,14 +24,12 @@ import (
 	"yunion.io/x/jsonutils"
 	"yunion.io/x/log"
 
-	api "yunion.io/x/onecloud/pkg/apis/identity"
 	"yunion.io/x/onecloud/pkg/cloudcommon/consts"
 	"yunion.io/x/onecloud/pkg/cloudcommon/policy"
 	"yunion.io/x/onecloud/pkg/mcclient"
 	"yunion.io/x/onecloud/pkg/mcclient/auth"
 	"yunion.io/x/onecloud/pkg/mcclient/modules"
 	"yunion.io/x/onecloud/pkg/mcclient/options"
-	"yunion.io/x/onecloud/pkg/util/fileutils2"
 	"yunion.io/x/onecloud/pkg/util/rbacutils"
 	"yunion.io/x/onecloud/pkg/util/shellutils"
 )
@@ -40,7 +38,6 @@ func init() {
 	type PolicyListOptions struct {
 		options.BaseListOptions
 		Type          string `help:"filter by type"`
-		IsSystem      *bool  `help:"filter by is_system" negative:"is_no_system"`
 		Format        string `help:"policy format, default to yaml" default:"yaml" choices:"yaml|json"`
 		OrderByDomain string `help:"order by domain name" choices:"asc|desc"`
 	}
@@ -64,8 +61,6 @@ func init() {
 		Enabled  bool   `help:"create policy enabled"`
 		Disabled bool   `help:"create policy disabled"`
 		Desc     string `help:"policy description"`
-		Scope    string `help:"scope of policy"`
-		IsSystem *bool  `help:"create system policy" negative:"no-system"`
 	}
 	R(&PolicyCreateOptions{}, "policy-create", "Create a new policy", func(s *mcclient.ClientSession, args *PolicyCreateOptions) error {
 		policyBytes, err := ioutil.ReadFile(args.FILE)
@@ -87,16 +82,6 @@ func init() {
 		if len(args.Desc) > 0 {
 			params.Add(jsonutils.NewString(args.Desc), "description")
 		}
-		if len(args.Scope) > 0 {
-			params.Add(jsonutils.NewString(args.Scope), "scope")
-		}
-		if args.IsSystem != nil {
-			if *args.IsSystem {
-				params.Add(jsonutils.JSONTrue, "is_system")
-			} else {
-				params.Add(jsonutils.JSONFalse, "is_system")
-			}
-		}
 
 		result, err := modules.Policies.Create(s, params)
 		if err != nil {
@@ -115,7 +100,6 @@ func init() {
 		Enabled  bool   `help:"update policy enabled"`
 		Disabled bool   `help:"update policy disabled"`
 		Desc     string `help:"Description"`
-		IsSystem *bool  `help:"is_system"`
 	}
 	updateFunc := func(s *mcclient.ClientSession, args *PolicyPatchOptions) error {
 		policyId, err := modules.Policies.GetId(s, args.ID, nil)
@@ -141,13 +125,6 @@ func init() {
 		if len(args.Desc) > 0 {
 			params.Add(jsonutils.NewString(args.Desc), "description")
 		}
-		if args.IsSystem != nil {
-			if *args.IsSystem {
-				params.Add(jsonutils.JSONTrue, "is_system")
-			} else {
-				params.Add(jsonutils.JSONFalse, "is_system")
-			}
-		}
 		result, err := modules.Policies.Patch(s, policyId, params)
 		if err != nil {
 			return err
@@ -206,7 +183,6 @@ func init() {
 	type PolicyShowOptions struct {
 		ID     string `help:"ID of policy"`
 		Format string `help:"policy format, default yaml" default:"yaml" choices:"yaml|json"`
-		Save   string `help:"save policy data into a file"`
 	}
 	R(&PolicyShowOptions{}, "policy-show", "Show policy", func(s *mcclient.ClientSession, args *PolicyShowOptions) error {
 		query := jsonutils.NewDict()
@@ -216,15 +192,6 @@ func init() {
 			return err
 		}
 		printObject(result)
-		if len(args.Save) > 0 {
-			if args.Format == "yaml" {
-				yaml, _ := result.GetString("policy")
-				fileutils2.FilePutContents(args.Save, yaml, false)
-			} else {
-				p, _ := result.Get("policy")
-				fileutils2.FilePutContents(args.Save, p.PrettyString(), false)
-			}
-		}
 		return nil
 	})
 
@@ -264,32 +231,16 @@ func init() {
 		return nil
 	})
 
-	type PolicyBindRoleOptions struct {
-		POLICY string `json:"-" help:"policy Id or name"`
-		api.PolicyBindRoleInput
-	}
-	R(&PolicyBindRoleOptions{}, "policy-bind-role", "Policy bind role", func(s *mcclient.ClientSession, args *PolicyBindRoleOptions) error {
-		params := jsonutils.Marshal(args)
-		log.Debugf("params: %s", params)
-		result, err := modules.Policies.PerformAction(s, args.POLICY, "bind-role", params)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
 	type PolicyAdminCapableOptions struct {
 		User          string   `help:"For user"`
 		UserDomain    string   `help:"Domain for user"`
 		Project       string   `help:"Role assignments for project"`
 		ProjectDomain string   `help:"Domain for project"`
-		Role          []string `help:"Role name list"`
-		RoleId        []string `help:"Role Id list"`
+		Role          []string `help:"Roles"`
 	}
 	R(&PolicyAdminCapableOptions{}, "policy-admin-capable", "Check admin capable", func(s *mcclient.ClientSession, args *PolicyAdminCapableOptions) error {
 		auth.InitFromClientSession(s)
-		policy.EnableGlobalRbac(15*time.Second, false)
+		policy.EnableGlobalRbac(15*time.Second, 15*time.Second, false)
 
 		var token mcclient.TokenCredential
 		if len(args.User) > 0 {
@@ -299,7 +250,6 @@ func init() {
 				Project:       args.Project,
 				ProjectDomain: args.ProjectDomain,
 				Roles:         strings.Join(args.Role, ","),
-				RoleIds:       strings.Join(args.RoleId, ","),
 			}
 		} else {
 			token = s.GetToken()
@@ -327,7 +277,6 @@ func init() {
 		UserDomain    string   `help:"Domain for user"`
 		Project       string   `help:"Role assignments for project"`
 		Role          []string `help:"Roles"`
-		RoleId        []string `help:"Role Id list"`
 		Request       []string `help:"explain request, in format of key:scope:service:resource:action:extra"`
 		Name          string   `help:"policy name"`
 		Debug         bool     `help:"enable RBAC debug"`
@@ -343,11 +292,26 @@ func init() {
 			rbacutils.ShowMatchRuleDebug = true
 		}
 		auth.InitFromClientSession(s)
-		policy.EnableGlobalRbac(15*time.Second, false)
+		policy.EnableGlobalRbac(15*time.Second, 15*time.Second, false)
 		if args.Debug {
 			consts.EnableRbacDebug()
 		}
 
+		findPolicy := false
+		for !findPolicy {
+			all := policy.PolicyManager.AllPolicies()
+			for _, allP := range all {
+				if len(allP) > 0 {
+					findPolicy = true
+					break
+				}
+			}
+			if findPolicy {
+				break
+			}
+			time.Sleep(time.Second)
+		}
+
 		req := jsonutils.NewDict()
 		for i := 0; i < len(args.Request); i += 1 {
 			parts := strings.Split(args.Request[i], ":")
@@ -410,7 +374,6 @@ func init() {
 				ProjectDomain:   projDom,
 				ProjectDomainId: projDomId,
 				Roles:           strings.Join(args.Role, ","),
-				RoleIds:         strings.Join(args.RoleId, ","),
 				Context: mcclient.SAuthContext{
 					Ip: args.Ip,
 				},
@@ -426,7 +389,7 @@ func init() {
 		}
 		printObject(result)
 
-		/*for _, r := range args.Role {
+		for _, r := range args.Role {
 			fmt.Println("role", r, "matched policies:", policy.PolicyManager.RoleMatchPolicies(r))
 		}
 
@@ -442,7 +405,7 @@ func init() {
 			fmt.Println("matched", scope, "policies:", m)
 		}
 
-		fmt.Println("all_policies", policy.PolicyManager.AllPolicies())*/
+		fmt.Println("all_policies", policy.PolicyManager.AllPolicies())
 		return nil
 	})
 }

cmd/climc/shell/identity/rolepolicies.go

@@ -1,88 +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 identity
-
-import (
-	"yunion.io/x/jsonutils"
-
-	api "yunion.io/x/onecloud/pkg/apis/identity"
-	"yunion.io/x/onecloud/pkg/mcclient"
-	"yunion.io/x/onecloud/pkg/mcclient/modules"
-)
-
-func init() {
-	type RolePolicyListOptions struct {
-		api.RolePolicyListInput
-	}
-	R(&RolePolicyListOptions{}, "role-policy-list", "List associated policies of a role", func(s *mcclient.ClientSession, args *RolePolicyListOptions) error {
-		results, err := modules.RolePolicies.List(s, jsonutils.Marshal(args))
-		if err != nil {
-			return err
-		}
-		printList(results, modules.RolePolicies.GetColumns(s))
-		return nil
-	})
-
-	type RoleAddPolicyOptions struct {
-		ID string `json:"-" help:"role id or name to add policy"`
-		api.RolePerformAddPolicyInput
-	}
-	R(&RoleAddPolicyOptions{}, "role-add-policy", "Add policy to a role", func(s *mcclient.ClientSession, args *RoleAddPolicyOptions) error {
-		result, err := modules.RolesV3.PerformAction(s, args.ID, "add-policy", jsonutils.Marshal(args))
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
-	type RoleRemovePolicyOptions struct {
-		ID string `json:"-" help:"role id or name to remove policy"`
-		api.RolePerformRemovePolicyInput
-	}
-	R(&RoleRemovePolicyOptions{}, "role-remove-policy", "Remove policy from a role", func(s *mcclient.ClientSession, args *RoleRemovePolicyOptions) error {
-		result, err := modules.RolesV3.PerformAction(s, args.ID, "remove-policy", jsonutils.Marshal(args))
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
-	type RoleSetPolicyOptions struct {
-		ID string `json:"-" help:"role id or name to set policies"`
-		api.RolePerformSetPoliciesInput
-	}
-	R(&RoleSetPolicyOptions{}, "role-set-policies", "Set policies for a role", func(s *mcclient.ClientSession, args *RoleSetPolicyOptions) error {
-		result, err := modules.RolesV3.PerformAction(s, args.ID, "set-policies", jsonutils.Marshal(args))
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
-	type RolePolicyDeleteOptions struct {
-		ID string `json:"-" help:"id or role policy binding"`
-	}
-	R(&RolePolicyDeleteOptions{}, "role-policy-delete", "Delete role policy binding", func(s *mcclient.ClientSession, args *RolePolicyDeleteOptions) error {
-		result, err := modules.RolePolicies.Delete(s, args.ID, nil)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-}

cmd/climc/shell/identity/users.go

@@ -31,7 +31,6 @@ func init() {
 		OrderByDomain string `help:"order by domain name" choices:"asc|desc"`
 		Role          string `help:"Filter by role"`
 		IdpId         string `help:"filter by idp_id"`
-		IdpEntityId   string `help:"filter by idp_entity_id"`
 	}
 	R(&UserListOptions{}, "user-list", "List users", func(s *mcclient.ClientSession, args *UserListOptions) error {
 		params, err := options.ListStructToParams(args)
@@ -174,8 +173,6 @@ func init() {
 
 		IdpId       string `help:"Id of identity provider to link with"`
 		IdpEntityId string `help:"Entity id of identity provider to link with"`
-
-		Lang string `help:"user default language"`
 	}
 	R(&UserCreateOptions{}, "user-create", "Create a user", func(s *mcclient.ClientSession, args *UserCreateOptions) error {
 		params := jsonutils.NewDict()
@@ -226,10 +223,6 @@ func init() {
 			params.Add(jsonutils.NewString(args.IdpEntityId), "idp_entity_id")
 		}
 
-		if len(args.Lang) > 0 {
-			params.Add(jsonutils.NewString(args.Lang), "lang")
-		}
-
 		/*if len(args.DefaultProject) > 0 {
 			projId, err := modules.Projects.GetId(s, args.DefaultProject, nil)
 			if err != nil {
@@ -271,8 +264,6 @@ func init() {
 		// Option []string `help:"User options"`
 
 		SkipPasswordComplexityCheck bool `help:"skip_password_complexity_check"`
-
-		Lang string `help:"update user language"`
 	}
 	R(&UserUpdateOptions{}, "user-update", "Update a user", func(s *mcclient.ClientSession, args *UserUpdateOptions) error {
 		query := jsonutils.NewDict()
@@ -329,9 +320,6 @@ func init() {
 		} else if args.DisableMfa {
 			params.Add(jsonutils.JSONFalse, "enable_mfa")
 		}
-		if len(args.Lang) > 0 {
-			params.Add(jsonutils.NewString(args.Lang), "lang")
-		}
 		// if len(args.DefaultProject) > 0 {
 		// 	projId, err := modules.Projects.GetId(s, args.DefaultProject, nil)
 		// 	if err != nil {

cmd/climc/shell/k8s/fed_clusterrole.go

@@ -29,7 +29,6 @@ func init() {
 		DetachCluster(new(options.FedResourceJointClusterDetachOptions)).
 		SyncCluster(new(options.FedResourceJointClusterDetachOptions)).
 		Sync(new(options.FedResourceIdOptions)).
-		Update(new(options.FedResourceUpdateOptions)).
 		ShowEvent()
 
 	cmd.ClassShow(new(options.FedApiResourecesOptions))

cmd/climc/shell/k8s/fed_clusterrolebinding.go

@@ -29,6 +29,5 @@ func init() {
 		DetachCluster(new(options.FedResourceJointClusterDetachOptions)).
 		SyncCluster(new(options.FedResourceJointClusterDetachOptions)).
 		Sync(new(options.FedResourceIdOptions)).
-		Update(new(options.FedResourceUpdateOptions)).
 		ShowEvent()
 }

cmd/climc/shell/k8s/fed_helper.go

@@ -15,15 +15,7 @@
 package k8s
 
 import (
-	"fmt"
-
-	"github.com/ghodss/yaml"
-
-	"yunion.io/x/jsonutils"
-	"yunion.io/x/pkg/errors"
-
 	"yunion.io/x/onecloud/cmd/climc/shell"
-	"yunion.io/x/onecloud/pkg/mcclient"
 	"yunion.io/x/onecloud/pkg/mcclient/modulebase"
 )
 
@@ -77,51 +69,3 @@ func (c *fedResourceCmd) Sync(args shell.IPerformOpt) *fedResourceCmd {
 	c.K8sResourceCmd.Perform("sync", args)
 	return c
 }
-
-type iFedResUpdateOpt interface {
-	shell.IShowOpt
-	GetUpdateFields() []string
-}
-
-func (c *fedResourceCmd) Update(args iFedResUpdateOpt) *fedResourceCmd {
-	man := c.manager
-	fields := args.GetUpdateFields()
-	callback := func(s *mcclient.ClientSession, args iFedResUpdateOpt) error {
-		params, err := args.Params()
-		if err != nil {
-			return err
-		}
-		ret, err := man.(modulebase.Manager).Get(s, args.GetId(), params)
-		if err != nil {
-			return err
-		}
-		updateData := jsonutils.NewDict()
-		for _, field := range fields {
-			up, err := ret.Get(field)
-			if err != nil {
-				return errors.Wrapf(err, "get update field %s", field)
-			}
-			updateData.Add(up, field)
-		}
-		content, err := FileTempEdit(args.GetId(), "yaml", updateData.YAMLString())
-		if err != nil {
-			return errors.Wrap(err, "edit tempfile")
-		}
-		jsonBytes, err := yaml.YAMLToJSON([]byte(content))
-		if err != nil {
-			return errors.Wrap(err, "yaml to json")
-		}
-		updateBody, err := jsonutils.Parse(jsonBytes)
-		if err != nil {
-			return errors.Wrap(err, "parse json bytes")
-		}
-		ret, err = man.(modulebase.Manager).Update(s, args.GetId(), updateBody)
-		if err != nil {
-			return err
-		}
-		printObject(ret)
-		return nil
-	}
-	c.RunWithDesc("update", fmt.Sprintf("Update %s of a %s", fields, man.GetKeyword()), args, callback)
-	return c
-}

cmd/climc/shell/k8s/fed_namespace.go

@@ -30,6 +30,5 @@ func init() {
 		DetachCluster(new(options.FedResourceJointClusterDetachOptions)).
 		SyncCluster(new(options.FedResourceJointClusterDetachOptions)).
 		Sync(new(options.IdentOptions)).
-		Update(new(options.FedResourceUpdateOptions)).
 		ShowEvent()
 }

cmd/climc/shell/k8s/fed_role.go

@@ -29,7 +29,6 @@ func init() {
 		DetachCluster(new(options.FedResourceJointClusterDetachOptions)).
 		SyncCluster(new(options.FedResourceJointClusterDetachOptions)).
 		Sync(new(options.IdentOptions)).
-		Update(new(options.FedResourceUpdateOptions)).
 		ShowEvent()
 
 	cmd.ClassShow(new(options.FedApiResourecesOptions))

cmd/climc/shell/k8s/helper.go

@@ -23,7 +23,6 @@ import (
 	"github.com/ghodss/yaml"
 
 	"yunion.io/x/jsonutils"
-	"yunion.io/x/pkg/errors"
 
 	"yunion.io/x/onecloud/cmd/climc/shell"
 	"yunion.io/x/onecloud/cmd/climc/shell/events"
@@ -57,31 +56,6 @@ func (cmd *K8sResourceCmd) ShowEvent() *K8sResourceCmd {
 	return cmd
 }
 
-func FileTempEdit(prefix, suffix string, input string) (string, error) {
-	tempfile, err := ioutil.TempFile("", fmt.Sprintf("k8s-%s*.%s", prefix, suffix))
-	if err != nil {
-		return "", errors.Wrap(err, "New tempfile")
-	}
-	defer os.Remove(tempfile.Name())
-	if _, err := tempfile.Write([]byte(input)); err != nil {
-		return "", errors.Wrap(err, "write tempfile")
-	}
-	if err := tempfile.Close(); err != nil {
-		return "", err
-	}
-	cmd := exec.Command("vim", tempfile.Name())
-	cmd.Stdin = os.Stdin
-	cmd.Stdout = os.Stdout
-	if err := cmd.Run(); err != nil {
-		return "", err
-	}
-	content, err := ioutil.ReadFile(tempfile.Name())
-	if err != nil {
-		return "", errors.Wrapf(err, "read file %s", tempfile.Name())
-	}
-	return string(content), nil
-}
-
 func (cmd *K8sResourceCmd) EditRaw(opt shell.IGetOpt) *K8sResourceCmd {
 	man := cmd.GetClusterResManager()
 	callback := func(s *mcclient.ClientSession, args shell.IGetOpt) error {

cmd/climc/shell/monitor/alertpanel.go

@@ -1,15 +0,0 @@
-package monitor
-
-import (
-	"yunion.io/x/onecloud/cmd/climc/shell"
-	"yunion.io/x/onecloud/pkg/mcclient/modules"
-	options "yunion.io/x/onecloud/pkg/mcclient/options/monitor"
-)
-
-func init() {
-	cmd := shell.NewResourceCmd(modules.AlertPanelManager)
-	cmd.Create(new(options.AlertPanelCreateOptions))
-	cmd.List(new(options.AlertPanelListOptions))
-	cmd.Show(new(options.AlertPanelShowOptions))
-	cmd.Delete(new(options.AlertPanelDeleteOptions))
-}

cmd/climc/shell/monitor/alertrecord.go

@@ -10,5 +10,4 @@ func init() {
 	cmd := shell.NewResourceCmd(modules.AlertRecordManager)
 	cmd.List(new(options.AlertRecordListOptions))
 	cmd.Show(new(options.AlertRecordShowOptions))
-	cmd.Get("", new(options.AlertRecordTotalOptions))
 }

cmd/climc/shell/monitor/suggestsysalert.go

@@ -0,0 +1,67 @@
+// 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 monitor
+
+import (
+	"yunion.io/x/jsonutils"
+
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modules/monitor"
+	options "yunion.io/x/onecloud/pkg/mcclient/options/monitor"
+)
+
+func init() {
+	aN := cmdN("suggestsysalert")
+	R(&options.SuggestSysAlertListOptions{}, aN("list"), "List all suggestsysrules",
+		func(s *mcclient.ClientSession, args *options.SuggestSysAlertListOptions) error {
+			params, err := args.Params()
+			if err != nil {
+				return err
+			}
+			if len(args.Type) > 0 {
+				params.Add(jsonutils.NewString(args.Type), "type")
+			}
+			ret, err := monitor.SuggestSysAlertManager.List(s, params)
+			if err != nil {
+				return err
+			}
+			printList(ret, monitor.SuggestSysAlertManager.GetColumns(s))
+			return nil
+		})
+
+	R(&options.SSuggestAlertShowOptions{}, aN("show"), "Show details of a alert rule",
+		func(s *mcclient.ClientSession, args *options.SSuggestAlertShowOptions) error {
+			ret, err := monitor.SuggestSysAlertManager.Get(s, args.ID, nil)
+			if err != nil {
+				return err
+			}
+			printObject(ret)
+			return nil
+		})
+
+	R(&options.SuggestAlertIgnoreOptions{}, aN("ignore"), "Ignore alert result",
+		func(s *mcclient.ClientSession, args *options.SuggestAlertIgnoreOptions) error {
+			params, err := args.Params()
+			if err != nil {
+				return err
+			}
+			ret, err := monitor.SuggestSysAlertManager.PerformAction(s, args.ID, "ignore", params)
+			if err != nil {
+				return err
+			}
+			printObject(ret)
+			return nil
+		})
+}