Merge pull request #10280 from swordqiu/automated-cherry-pick-of-#10278-upstream-release-3.6

Automated cherry pick of #10278: fix(baremetal-agent): baremetal fail to stop due to power off soft failed

Makefile

@@ -6,10 +6,11 @@ ROOT_DIR := $(CURDIR)
 BUILD_DIR := $(ROOT_DIR)/_output
 BIN_DIR := $(BUILD_DIR)/bin
 BUILD_SCRIPT := $(ROOT_DIR)/build/build.sh
+DEB_BUILD_SCRIPT := $(ROOT_DIR)/build/build_deb.sh
 
 ifeq ($(ONECLOUD_CI_BUILD),)
 	GIT_COMMIT := $(shell git rev-parse --short HEAD)
-	GIT_BRANCH := $(shell git name-rev --name-only HEAD)
+	GIT_BRANCH := $(shell git branch -r --contains | head -1 | sed -E -e "s%(HEAD ->|origin|upstream)/?%%g" | xargs)
 	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')
@@ -64,6 +65,7 @@ endif
 
 cmdTargets:=$(filter-out cmd/host-image,$(wildcard cmd/*))
 rpmTargets:=$(foreach b,$(patsubst cmd/%,%,$(cmdTargets)),$(if $(shell [ -f "$(CURDIR)/build/$(b)/vars" ] && echo 1),rpm/$(b)))
+debTargets:=$(foreach b,$(patsubst cmd/%,%,$(cmdTargets)),$(if $(shell [ -f "$(CURDIR)/build/$(b)/vars" ] && echo 1),deb/$(b)))
 
 all: build
 
@@ -93,6 +95,9 @@ cmd/%: prepare_dir
 rpm/%: cmd/%
 	$(BUILD_SCRIPT) $*
 
+deb/%: cmd/%
+	$(DEB_BUILD_SCRIPT) $*
+
 pkg/%: prepare_dir
 	$(GO_INSTALL) $(REPO_PREFIX)/$@
 
@@ -102,6 +107,9 @@ build:
 rpm:
 	$(MAKE) $(rpmTargets)
 
+deb:
+	$(MAKE) $(debTargets)
+
 rpmclean:
 	rm -fr $(BUILD_DIR)/rpms
 
@@ -199,7 +207,7 @@ mod:
 	go mod vendor -v
 
 
-DOCKER_CENTOS_BUILD_IMAGE?=registry.cn-beijing.aliyuncs.com/yunionio/centos-build:1.1-1
+DOCKER_CENTOS_BUILD_IMAGE?=registry.cn-beijing.aliyuncs.com/yunionio/centos-build:1.1-3
 
 define dockerCentOSBuildCmd
 set -o xtrace

build/build_deb.sh

@@ -0,0 +1,76 @@
+#!/bin/bash
+
+set -e
+
+if [ -z "$ROOT_DIR" ]; then
+	pushd $(dirname $(readlink -f "$BASH_SOURCE")) > /dev/null
+	ROOT_DIR=$(cd .. && pwd)
+	popd > /dev/null
+fi
+
+SRC_BIN=$ROOT_DIR/_output/bin
+SRC_BUILD=$ROOT_DIR/build
+OUTPUT_DIR=$ROOT_DIR/_output/debs
+
+PKG=$1
+BIN_PATH=${2:-/opt/yunion/bin}
+
+if [ -z "$PKG" ]; then
+    echo "Usage: $0 <package>"
+    exit 1
+fi
+
+BIN="$SRC_BIN/$PKG"
+ROOT="$SRC_BUILD/$PKG"
+
+if [ ! -x "$BIN" ]; then
+    echo "$BIN not exists"
+    exit 1
+fi
+
+if [ ! -x "$ROOT" ]; then
+    echo "$ROOT not exists"
+    exit 1
+fi
+
+. $ROOT/vars
+
+if [ -z "$VERSION" ]; then
+    TAG=$(git describe --abbrev=0 --tags || echo 000000)
+    VERSION=${TAG/\//-}
+    VERSION=${VERSION/v/}
+fi
+RELEASE=`date +"%y%m%d%H"`
+FULL_VERSION=$VERSION-$RELEASE
+BUILDROOT=$OUTPUT_DIR/yunion-$1-$FULL_VERSION
+rm -rf $BUILDROOT
+mkdir -p $BUILDROOT/DEBIAN
+mkdir -p $BUILDROOT/$BIN_PATH
+
+cp -rf $BIN $BUILDROOT/$BIN_PATH
+cp -rf $ROOT/root/* $BUILDROOT/
+
+
+echo "Build root ${BUILDROOT}"
+
+case $(uname -m) in
+    x86_64)
+        CURRENT_ARCH=amd64
+        ;;
+    aarch64)
+        CURRENT_ARCH=arm64
+        ;;
+esac
+
+echo "Package: yunion-$1
+Version: $FULL_VERSION
+Section: base
+Priority: optional
+Architecture: $CURRENT_ARCH
+Maintainer: wanyaoqi@yunionyun.com
+Description: Yunion $1
+" > $BUILDROOT/DEBIAN/control
+chmod 0755 $BUILDROOT/DEBIAN/control
+
+
+dpkg-deb --build $BUILDROOT

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

@@ -0,0 +1,6 @@
+公有云子账号创建成功
+主账号：{{ .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

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

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

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

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

build/docker/Dockerfile.host-deployer

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

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

@@ -6,4 +6,4 @@
 资源数量：{{len .matches}}
 资源名称：{{.resource_name}}
 
-详情地址: {{.web_url}}/commonalerts
+详情地址: {{.web_url}}

build/monitor/root/opt/yunion/share/notify_templates/monitor/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}}/commonalerts
+      <td style="padding-left: 20px; font-size: 14px;">若要查看详情信息，<a class="link" target="_blank" href="{{.web_url}}
 ">请登录平台进行查看</a></td>
     </tr>
   </table>

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

@@ -6,4 +6,4 @@ TriggerCondition: {{.description | unescaped}}
 ResourceCount: {{len .matches}}
 ResourceName: {{.resource_name}}
 
-WebUrl: {{.web_url}}/commonalerts
+WebUrl: {{.web_url}}

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

@@ -33,7 +33,7 @@
     font-weight: bold;
   }
   .td {
-    width: 80px;
+    width: 120px;
     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}}/commonalerts
-">Please log in 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}}
+">Please login to the platform to view</a></td>
     </tr>
   </table>
   <table border="0" cellspacing="0" cellpadding="0" class="table pb-3">

build/notify/root/opt/yunion/share/template/content@cn/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

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

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

@@ -0,0 +1,66 @@
+<!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@en/IMAGE_ACTIVED

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

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

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

cmd/apsaracli/main.go

@@ -32,6 +32,7 @@ type BaseOptions struct {
 	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"`
 }
@@ -90,6 +91,7 @@ func newClient(options *BaseOptions) (*apsara.SRegion, error) {
 		apsara.NewApsaraClientConfig(
 			options.AccessKey,
 			options.Secret,
+			options.Endpoint,
 			options.SApsaraEndpoints,
 		).Debug(options.Debug),
 	)

cmd/climc/main.go

@@ -34,6 +34,7 @@ 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/compute/buckets.go

@@ -448,10 +448,6 @@ func init() {
 
 	type BucketSetRefererOption struct {
 		ID string `help:"ID or name of bucket" json:"-"`
-		// 是否开启防盗链
-		Enabled bool `help:"enable refer"`
-		// Black-List、White-List
-		Type string `help:"domain list type" choices:"Black-List|White-List"`
 		// 域名列表
 		DomainList []string
 		// 是否允许空referer 访问
@@ -459,9 +455,7 @@ func init() {
 	}
 	R(&BucketSetRefererOption{}, "bucket-set-referer", "Set bucket referer", func(s *mcclient.ClientSession, args *BucketSetRefererOption) error {
 		conf := api.BucketRefererConf{
-			Enabled:         args.Enabled,
-			Type:            args.Type,
-			DomainList:      args.DomainList,
+			WhiteList:       args.DomainList,
 			AllowEmptyRefer: args.AllowEmptyRefer,
 		}
 		result, err := modules.Buckets.PerformAction(s, args.ID, "set-referer", jsonutils.Marshal(conf))
@@ -496,4 +490,61 @@ func init() {
 		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/cloudaccounts.go

@@ -27,23 +27,23 @@ func init() {
 	cmd.Show(&options.SCloudAccountIdOptions{})
 	cmd.Delete(&options.SCloudAccountIdOptions{})
 	cmd.Update(&options.SCloudAccountUpdateBaseOptions{})
-	cmd.PerformClass("prepare-nets", &options.SVMwareCloudAccountPrepareNetsOptions{})
+	cmd.PerformClassWithKeyword("preparenets-vmware", "prepare-nets", &options.SVMwareCloudAccountPrepareNetsOptions{})
 
-	cmd.CreateWithKeyworkd("create-vmware", &options.SVMwareCloudAccountCreateOptions{})
-	cmd.CreateWithKeyworkd("create-aliyun", &options.SAliyunCloudAccountCreateOptions{})
-	cmd.CreateWithKeyworkd("create-azure", &options.SAzureCloudAccountCreateOptions{})
-	cmd.CreateWithKeyworkd("create-qcloud", &options.SQcloudCloudAccountCreateOptions{})
-	cmd.CreateWithKeyworkd("create-google", &options.SGoogleCloudAccountCreateOptions{})
-	cmd.CreateWithKeyworkd("create-aws", &options.SAWSCloudAccountCreateOptions{})
-	cmd.CreateWithKeyworkd("create-openstack", &options.SOpenStackCloudAccountCreateOptions{})
-	cmd.CreateWithKeyworkd("create-huawei", &options.SHuaweiCloudAccountCreateOptions{})
-	cmd.CreateWithKeyworkd("create-ucloud", &options.SHuaweiCloudAccountCreateOptions{})
-	cmd.CreateWithKeyworkd("create-zstack", &options.SZStackCloudAccountCreateOptions{})
-	cmd.CreateWithKeyworkd("create-s3", &options.SS3CloudAccountCreateOptions{})
-	cmd.CreateWithKeyworkd("create-ceph", &options.SCephCloudAccountCreateOptions{})
-	cmd.CreateWithKeyworkd("create-xsky", &options.SXskyCloudAccountCreateOptions{})
-	cmd.CreateWithKeyworkd("create-ctyun", &options.SCtyunCloudAccountCreateOptions{})
-	cmd.CreateWithKeyworkd("create-apsara", &options.SApsaraCloudAccountCreateOptions{})
+	cmd.CreateWithKeyword("create-vmware", &options.SVMwareCloudAccountCreateOptions{})
+	cmd.CreateWithKeyword("create-aliyun", &options.SAliyunCloudAccountCreateOptions{})
+	cmd.CreateWithKeyword("create-azure", &options.SAzureCloudAccountCreateOptions{})
+	cmd.CreateWithKeyword("create-qcloud", &options.SQcloudCloudAccountCreateOptions{})
+	cmd.CreateWithKeyword("create-google", &options.SGoogleCloudAccountCreateOptions{})
+	cmd.CreateWithKeyword("create-aws", &options.SAWSCloudAccountCreateOptions{})
+	cmd.CreateWithKeyword("create-openstack", &options.SOpenStackCloudAccountCreateOptions{})
+	cmd.CreateWithKeyword("create-huawei", &options.SHuaweiCloudAccountCreateOptions{})
+	cmd.CreateWithKeyword("create-ucloud", &options.SUcloudCloudAccountCreateOptions{})
+	cmd.CreateWithKeyword("create-zstack", &options.SZStackCloudAccountCreateOptions{})
+	cmd.CreateWithKeyword("create-s3", &options.SS3CloudAccountCreateOptions{})
+	cmd.CreateWithKeyword("create-ceph", &options.SCephCloudAccountCreateOptions{})
+	cmd.CreateWithKeyword("create-xsky", &options.SXskyCloudAccountCreateOptions{})
+	cmd.CreateWithKeyword("create-ctyun", &options.SCtyunCloudAccountCreateOptions{})
+	cmd.CreateWithKeyword("create-apsara", &options.SApsaraCloudAccountCreateOptions{})
 
 	cmd.UpdateWithKeyword("update-vmware", &options.SVMwareCloudAccountUpdateOptions{})
 	cmd.UpdateWithKeyword("update-aliyun", &options.SAliyunCloudAccountUpdateOptions{})

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,6 +19,7 @@ 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"
@@ -26,6 +27,23 @@ 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,50 +15,15 @@
 package compute
 
 import (
-	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/cmd/climc/shell"
 	"yunion.io/x/onecloud/pkg/mcclient/modules"
 	"yunion.io/x/onecloud/pkg/mcclient/options"
 )
 
 func init() {
-	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 := shell.NewResourceCmd(&modules.DBInstanceAccounts).WithKeyword("dbinstance-account")
+	cmd.List(&options.DBInstanceAccountListOptions{})
+	cmd.Update(&options.BaseUpdateOptions{})
+	cmd.Show(&options.DBInstanceAccountIdOptions{})
+	cmd.Delete(&options.DBInstanceAccountIdOptions{})
 }

cmd/climc/shell/compute/dbinstance_databases.go

@@ -15,60 +15,16 @@
 package compute
 
 import (
-	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/cmd/climc/shell"
 	"yunion.io/x/onecloud/pkg/mcclient/modules"
 	"yunion.io/x/onecloud/pkg/mcclient/options"
 )
 
 func init() {
-	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 := 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{})
 }

cmd/climc/shell/compute/dbinstance_skus.go

@@ -16,6 +16,7 @@ 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"
 )
@@ -24,4 +25,19 @@ 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()
+		if err != nil {
+			return err
+		}
+
+		result, err := modules.DBInstanceSkus.Get(s, "sync-tasks", params)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
 }

cmd/climc/shell/compute/dbinstances.go

@@ -15,262 +15,34 @@
 package compute
 
 import (
-	"fmt"
-	"strings"
-
-	"yunion.io/x/jsonutils"
-
-	computeapi "yunion.io/x/onecloud/pkg/apis/compute"
+	"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"
 	"yunion.io/x/onecloud/pkg/mcclient/options"
+	"yunion.io/x/onecloud/pkg/mcclient/options/compute"
 )
 
 func init() {
-	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
-	})
-
-	R(&options.DBInstanceCreateOptions{}, "dbinstance-create", "Create DB instance", func(s *mcclient.ClientSession, opts *options.DBInstanceCreateOptions) error {
-		params, err := opts.Params()
-		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
-	})
+	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 DBInstanceNetworkListOptions struct {
 		options.BaseListOptions
@@ -336,64 +108,4 @@ 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
-	})
-
-	R(&options.ResourceMetadataOptions{}, "dbinstance-add-tag", "Set tag of a dbinstance", func(s *mcclient.ClientSession, opts *options.ResourceMetadataOptions) error {
-		params, err := opts.Params()
-		if err != nil {
-			return err
-		}
-		result, err := modules.DBInstance.PerformAction(s, opts.ID, "user-metadata", params)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
-	R(&options.ResourceMetadataOptions{}, "dbinstance-set-tag", "Set tag of a dbinstance", func(s *mcclient.ClientSession, opts *options.ResourceMetadataOptions) error {
-		params, err := opts.Params()
-		if err != nil {
-			return err
-		}
-		result, err := modules.DBInstance.PerformAction(s, opts.ID, "set-user-metadata", params)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
-	type DBInstanceRemoteUpdateOptions struct {
-		ID string `json:"-"`
-		computeapi.DBInstanceRemoteUpdateInput
-	}
-
-	R(&DBInstanceRemoteUpdateOptions{}, "dbinstance-remote-update", "Change owner porject of a dbinstance", func(s *mcclient.ClientSession, opts *DBInstanceRemoteUpdateOptions) error {
-		params, err := options.StructToParams(opts)
-		if err != nil {
-			return err
-		}
-		result, err := modules.DBInstance.PerformAction(s, opts.ID, "remote-update", params)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
 }

cmd/climc/shell/compute/elasticcache.go

@@ -19,12 +19,16 @@ 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 {
@@ -398,6 +402,20 @@ func init() {
 		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 {

cmd/climc/shell/compute/elasticips.go

@@ -50,7 +50,7 @@ func init() {
 		Manager    string `help:"cloud provider"`
 		Region     string `help:"cloud region in which EIP is allocated"`
 		Bandwidth  int    `help:"Bandwidth in Mbps"`
-		Ip         string `help:"IP address of the EIP"`
+		IpAddr     string `help:"IP address of the EIP" json:"ip_addr"`
 		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"`
@@ -79,8 +79,8 @@ func init() {
 			params.Add(jsonutils.NewString(args.BgpType), "bgp_type")
 		}
 
-		if len(args.Ip) > 0 {
-			params.Add(jsonutils.NewString(args.Ip), "ip")
+		if len(args.IpAddr) > 0 {
+			params.Add(jsonutils.NewString(args.IpAddr), "ip_addr")
 		}
 
 		result, err := modules.Elasticips.Create(s, params)

cmd/climc/shell/compute/hosts.go

@@ -42,6 +42,7 @@ func init() {
 		Disabled  bool   `help:"Show disabled host only" json:"-"`
 		HostType  string `help:"Host type filter" choices:"baremetal|hypervisor|esxi|kubelet|hyperv|aliyun|azure|qcloud|aws|huawei|ucloud|google|ctyun"`
 		AnyMac    string `help:"Mac matches one of the host's interface"`
+		AnyIp     string `help:"IP matches one of the host's interface"`
 
 		IsBaremetal *bool `help:"filter host list by is_baremetal=true|false"`
 
@@ -407,12 +408,14 @@ 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"`
+		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"`
 	}
 	R(&HostAddNetIfOptions{}, "host-add-netif", "Host add a NIC", func(s *mcclient.ClientSession, args *HostAddNetIfOptions) error {
 		params := jsonutils.NewDict()
@@ -426,6 +429,12 @@ 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/loadbalanceracls.go

@@ -137,4 +137,21 @@ 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,6 +15,8 @@
 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"
@@ -81,4 +83,21 @@ 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/networkaddresses.go

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

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

cmd/climc/shell/compute/schedtags.go

@@ -15,155 +15,20 @@
 package compute
 
 import (
-	"fmt"
-
-	"yunion.io/x/jsonutils"
-
-	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/cmd/climc/shell"
 	"yunion.io/x/onecloud/pkg/mcclient/modules"
 	"yunion.io/x/onecloud/pkg/mcclient/options"
 )
 
 func init() {
-	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 := shell.NewResourceCmd(&modules.Schedtags)
 
-			}
-		}
-		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|cloudproviders|cloudregions|zones"`
-	}
-	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
-	})
-
-	R(&options.ResourceMetadataOptions{}, "schedtag-set-user-metadata", "Set metadata of a server", func(s *mcclient.ClientSession, opts *options.ResourceMetadataOptions) error {
-		params, err := opts.Params()
-		if err != nil {
-			return err
-		}
-		result, err := modules.Schedtags.PerformAction(s, opts.ID, "user-metadata", params)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
+	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))
 }

cmd/climc/shell/compute/schedulers.go

@@ -123,9 +123,10 @@ 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"`
+		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"`
 	}
 	R(&SchedulerHistoryListOptions{}, "scheduler-history-list", "Show scheduler history list",
 		func(s *mcclient.ClientSession, args *SchedulerHistoryListOptions) error {
@@ -138,17 +139,14 @@ func init() {
 			if args.Offset > 0 {
 				params.Add(jsonutils.NewInt(int64(args.Offset)), "offset")
 			}
-			if args.All {
-				params.Add(jsonutils.JSONTrue, "all")
-			} else {
-				params.Add(jsonutils.JSONFalse, "all")
-			}
+			params.Add(jsonutils.NewBool(args.All), "all")
+			params.Add(jsonutils.NewBool(args.IsSuggestion), "is_suggestion")
 			result, err := modules.SchedManager.HistoryList(s, params)
 			if err != nil {
 				return err
 			}
 			printList(modulebase.JSON2ListResult(result), []string{
-				"session_id", "time", "status", "consuming",
+				"session_id", "time", "status", "consuming", "is_suggestion",
 			})
 			return nil
 		})

cmd/climc/shell/compute/secgrouprules.go

@@ -15,142 +15,17 @@
 package compute
 
 import (
-	"yunion.io/x/jsonutils"
-
-	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/cmd/climc/shell"
 	"yunion.io/x/onecloud/pkg/mcclient/modules"
 	"yunion.io/x/onecloud/pkg/mcclient/options"
+	"yunion.io/x/onecloud/pkg/mcclient/options/compute"
 )
 
 func init() {
-	type SecGroupRulesListOptions struct {
-		options.BaseListOptions
-		Secgroup     string   `help:"Secgroup ID or Name"`
-		SecgroupName string   `help:"Search rules by fuzzy secgroup name"`
-		Projects     []string `help:"Filter rules by project"`
-		Direction    string   `help:"filter Direction of rule" choices:"in|out"`
-		Protocol     string   `help:"filter Protocol of rule" choices:"any|tcp|udp|icmp"`
-		Action       string   `help:"filter Actin of rule" choices:"allow|deny"`
-		Ports        string   `help:"filter Ports of rule"`
-		Ip           string   `help:"filter cidr of rule"`
-	}
-
-	R(&SecGroupRulesListOptions{}, "secgroup-rule-list", "List all security group", func(s *mcclient.ClientSession, args *SecGroupRulesListOptions) error {
-		params, err := options.ListStructToParams(args)
-		if err != nil {
-			return err
-		}
-		result, err := modules.SecGroupRules.List(s, params)
-		if err != nil {
-			return err
-		}
-		printList(result, modules.SecGroupRules.GetColumns(s))
-		return nil
-	})
-
-	type SecGroupRuleDetailOptions struct {
-		ID string `help:"ID or Name of security group rule"`
-	}
-	R(&SecGroupRuleDetailOptions{}, "secgroup-rule-show", "Show details of rule", func(s *mcclient.ClientSession, args *SecGroupRuleDetailOptions) error {
-		if rule, e := modules.SecGroupRules.Get(s, args.ID, nil); e != nil {
-			return e
-		} else {
-			printObject(rule)
-		}
-		return nil
-	})
-
-	R(&SecGroupRuleDetailOptions{}, "secgroup-rule-delete", "Delete a secgroup rule", func(s *mcclient.ClientSession, args *SecGroupRuleDetailOptions) error {
-		if rule, e := modules.SecGroupRules.Delete(s, args.ID, nil); e != nil {
-			return e
-		} else {
-			printObject(rule)
-		}
-		return nil
-	})
-
-	type SecGroupRulesCreateOptions struct {
-		SECGROUP  string `help:"Secgroup ID or Name" metavar:"Secgroup"`
-		Direction string `help:"Direction of rule" choices:"in|out"`
-		Action    string `help:"Action of rule" choices:"allow|deny"`
-		Protocol  string `help:"Protocol of rule" choices:"tcp|udp|icmp|any"`
-		Ports     string `help:"Ports of rule"`
-		Cidr      string `help:"Cidr of rule"`
-		Priority  int64  `help:"priority of Rule"`
-		Desc      string `help:"Description"`
-	}
-
-	R(&SecGroupRulesCreateOptions{}, "secgroup-rule-create", "Create all security group rule", func(s *mcclient.ClientSession, args *SecGroupRulesCreateOptions) error {
-		params := jsonutils.NewDict()
-		if len(args.Desc) > 0 {
-			params.Add(jsonutils.NewString(args.Desc), "description")
-		}
-		if args.Priority > 0 {
-			params.Add(jsonutils.NewInt(args.Priority), "priority")
-		}
-		if len(args.Direction) > 0 {
-			params.Add(jsonutils.NewString(args.Direction), "direction")
-		}
-		if len(args.Action) > 0 {
-			params.Add(jsonutils.NewString(args.Action), "action")
-		}
-		if len(args.Protocol) > 0 {
-			params.Add(jsonutils.NewString(args.Protocol), "protocol")
-		}
-		if len(args.Ports) > 0 {
-			params.Add(jsonutils.NewString(args.Ports), "ports")
-		}
-		if len(args.Cidr) > 0 {
-			params.Add(jsonutils.NewString(args.Cidr), "cidr")
-		}
-		params.Add(jsonutils.NewString(args.SECGROUP), "secgroup")
-		secgrouprules, err := modules.SecGroupRules.Create(s, params)
-		if err != nil {
-			return err
-		}
-		printObject(secgrouprules)
-		return nil
-	})
-
-	type SecGroupRulesUpdateOptions struct {
-		ID       string `help:"ID or name of rule"`
-		Name     string `help:"New name of rule"`
-		Priority int64  `help:"priority of Rule"`
-		Protocol string `help:"Protocol of rule" choices:"any|tcp|udp|icmp"`
-		Ports    string `help:"Ports of rule"`
-		Cidr     string `help:"Cidr of rule"`
-		Action   string `help:"filter Actin of rule" choices:"allow|deny"`
-		Desc     string `help:"Description" metavar:"Description"`
-	}
-
-	R(&SecGroupRulesUpdateOptions{}, "secgroup-rule-update", "Update property of a security group rule", func(s *mcclient.ClientSession, args *SecGroupRulesUpdateOptions) error {
-		params := jsonutils.NewDict()
-		if len(args.Name) > 0 {
-			params.Add(jsonutils.NewString(args.Name), "name")
-		}
-		if len(args.Desc) > 0 {
-			params.Add(jsonutils.NewString(args.Desc), "description")
-		}
-		if args.Priority > 0 {
-			params.Add(jsonutils.NewInt(args.Priority), "priority")
-		}
-		if len(args.Protocol) > 0 {
-			params.Add(jsonutils.NewString(args.Protocol), "protocol")
-		}
-		if len(args.Ports) > 0 {
-			params.Add(jsonutils.NewString(args.Ports), "ports")
-		}
-		if len(args.Cidr) > 0 {
-			params.Add(jsonutils.NewString(args.Cidr), "cidr")
-		}
-		if len(args.Action) > 0 {
-			params.Add(jsonutils.NewString(args.Action), "action")
-		}
-		if rule, e := modules.SecGroupRules.Update(s, args.ID, params); e != nil {
-			return e
-		} else {
-			printObject(rule)
-		}
-		return nil
-	})
+	cmd := shell.NewResourceCmd(&modules.SecGroupRules).WithKeyword("secgroup-rule")
+	cmd.List(&compute.SecGroupRulesListOptions{})
+	cmd.Show(&options.BaseShowOptions{})
+	cmd.Delete(&options.BaseIdOptions{})
+	cmd.Create(&compute.SecGroupRulesCreateOptions{})
+	cmd.Update(&compute.SecGroupRulesUpdateOptions{})
 }

cmd/climc/shell/compute/skus.go

@@ -15,194 +15,31 @@
 package compute
 
 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() {
-	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"`
-	}
+	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{})
 
-	R(&ServerSkusListOptions{}, "server-sku-list", "List all avaiable Server SKU", func(s *mcclient.ClientSession, args *ServerSkusListOptions) error {
-		params, err := options.ListStructToParams(args)
+	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()
 		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
-	})
 
-	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)
+		result, err := modules.ServerSkus.Get(s, "sync-tasks", params)
 		if err != nil {
 			return err
 		}

cmd/climc/shell/compute/storages.go

@@ -61,13 +61,14 @@ 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"`
+		CommitBound           float64 `help:"Upper bound of storage overcommit rate" json:"cmtbound"`
 		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/webconsole.go

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

cmd/climc/shell/compute/wires.go

@@ -27,6 +27,8 @@ func init() {
 	type WireListOptions struct {
 		options.BaseListOptions
 
+		Bandwidth *int `help:"List wires by bandwidth"`
+
 		Region string `help:"List wires in region"`
 		Zone   string `help:"list wires in zone" json:"-"`
 		Vpc    string `help:"List wires in vpc"`

cmd/climc/shell/events/splitable.go

@@ -0,0 +1,70 @@
+// 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,6 +78,11 @@ 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
@@ -134,24 +139,48 @@ func (cmd ResourceCmd) List(args IListOpt) {
 }
 
 func (cmd ResourceCmd) Create(args ICreateOpt) {
-	cmd.CreateWithKeyworkd("create", args)
+	cmd.CreateWithKeyword("create", args)
 }
 
-func (cmd ResourceCmd) CreateWithKeyworkd(keyword string, args ICreateOpt) {
+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
-	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
+	params, err := args.Params()
+	if err != nil {
+		return err
 	}
-	cmd.Run(keyword, args, callback)
+	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
 }
 
 type IIdOpt interface {
@@ -302,6 +331,23 @@ func (cmd ResourceCmd) PerformWithKeyword(keyword, action string, args IPerformO
 	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/climc/shell/identity/domains.go

@@ -156,4 +156,16 @@ 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

@@ -32,6 +32,7 @@ import (
 func init() {
 	type IdentityProviderListOptions struct {
 		options.BaseListOptions
+		SsoDomain string `help:"Filter SSO IDP by domain" json:"sso_domain"`
 	}
 	R(&IdentityProviderListOptions{}, "idp-list", "List all identity provider", func(s *mcclient.ClientSession, args *IdentityProviderListOptions) error {
 		params, err := options.ListStructToParams(args)

cmd/climc/shell/identity/keystone.go

@@ -12,26 +12,23 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package suggestsysdrivers
+package identity
 
 import (
-	"yunion.io/x/onecloud/pkg/apis/monitor"
-	"yunion.io/x/onecloud/pkg/monitor/dbinit"
-	"yunion.io/x/onecloud/pkg/monitor/models"
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
 )
 
-type ScaleDown struct {
-	*InfluxdbBaseDriver
-}
-
-func NewScaleDownDriver() models.ISuggestSysRuleDriver {
-	return &ScaleDown{
-		InfluxdbBaseDriver: NewInfluxdbBaseDriver(
-			monitor.SCALE_DOWN,
-			monitor.SCALE_MONTITOR_RES_TYPE,
-			monitor.SCALE_DOWN_DRIVER_ACTION,
-			monitor.SCALE_DOWN_MONITOR_SUGGEST,
-			*dbinit.ScaleDownCreateInput,
-		),
+func init() {
+	type ScopeResourceRefreshOptions struct {
 	}
+	R(&ScopeResourceRefreshOptions{}, "scope-resource-refresh", "Refresh scope resource count", func(s *mcclient.ClientSession, args *ScopeResourceRefreshOptions) error {
+		result, err := modules.ScopeResource.PerformClassAction(s, "refresh", nil)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
 }

cmd/climc/shell/identity/policies.go

@@ -31,6 +31,7 @@ import (
 	"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"
 )
@@ -63,6 +64,8 @@ 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)
@@ -84,6 +87,16 @@ 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 {
@@ -102,7 +115,9 @@ func init() {
 		Enabled  bool   `help:"update policy enabled"`
 		Disabled bool   `help:"update policy disabled"`
 		Desc     string `help:"Description"`
-		IsSystem *bool  `help:"is_system"`
+		IsSystem bool   `help:"is_system"`
+
+		IsNotSystem bool `help:"negative is_system"`
 	}
 	updateFunc := func(s *mcclient.ClientSession, args *PolicyPatchOptions) error {
 		policyId, err := modules.Policies.GetId(s, args.ID, nil)
@@ -128,14 +143,13 @@ 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")
-			}
+		if args.IsSystem {
+			params.Add(jsonutils.JSONTrue, "is_system")
 		}
-		result, err := modules.Policies.Patch(s, policyId, params)
+		if args.IsNotSystem {
+			params.Add(jsonutils.JSONFalse, "is_system")
+		}
+		result, err := modules.Policies.Update(s, policyId, params)
 		if err != nil {
 			return err
 		}
@@ -193,6 +207,7 @@ 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()
@@ -202,6 +217,15 @@ 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
 	})
 

cmd/climc/shell/identity/users.go

@@ -174,6 +174,8 @@ 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()
@@ -224,6 +226,10 @@ 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 {
@@ -265,6 +271,8 @@ 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()
@@ -321,6 +329,9 @@ 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/clusters.go

@@ -167,6 +167,32 @@ func initKubeCluster() {
 		return nil
 	})
 
+	R(&o.ClusterEnableComponentCephCSIOpt{}, cmdN("component-enable-ceph-csi"), "Enable cluster ceph csi component", func(s *mcclient.ClientSession, args *o.ClusterEnableComponentCephCSIOpt) error {
+		params, err := args.Params()
+		if err != nil {
+			return err
+		}
+		ret, err := k8s.KubeClusters.PerformAction(s, args.ID, "enable-component", params)
+		if err != nil {
+			return err
+		}
+		printObject(ret)
+		return nil
+	})
+
+	R(&o.ClusterEnableComponentMonitorOpt{}, cmdN("component-enable-monitor"), "Enable cluster monitor component", func(s *mcclient.ClientSession, args *o.ClusterEnableComponentMonitorOpt) error {
+		params, err := args.Params()
+		if err != nil {
+			return err
+		}
+		ret, err := k8s.KubeClusters.PerformAction(s, args.ID, "enable-component", params)
+		if err != nil {
+			return err
+		}
+		printObject(ret)
+		return nil
+	})
+
 	R(&o.ClusterEnableComponentFluentBitOpt{}, cmdN("component-enable-fluentbit"), "Enable cluster fluentbit component", func(s *mcclient.ClientSession, args *o.ClusterEnableComponentFluentBitOpt) error {
 		params, err := args.Params()
 		if err != nil {

cmd/climc/shell/monitor/alertrecord.go

@@ -10,4 +10,5 @@ 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

@@ -1,67 +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 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
-		})
-}

cmd/climc/shell/notifyv2/config.go

@@ -111,7 +111,7 @@ func init() {
 	}
 	R(&ConfigGetTypesOptions{}, "notify-config-get-types", "Get all Config types", func(s *mcclient.ClientSession, args *ConfigGetTypesOptions) error {
 		param := jsonutils.Marshal(args)
-		result, err := modules.NotifyConfig.PerformClassAction(s, "get-types", param)
+		result, err := modules.NotifyReceiver.PerformClassAction(s, "get-types", param)
 		if err != nil {
 			return err
 		}

cmd/climc/shell/notifyv2/receiver.go

@@ -15,151 +15,21 @@
 package notifyv2
 
 import (
-	"yunion.io/x/jsonutils"
-
-	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/cmd/climc/shell"
 	"yunion.io/x/onecloud/pkg/mcclient/modules"
-	"yunion.io/x/onecloud/pkg/mcclient/options"
+	options "yunion.io/x/onecloud/pkg/mcclient/options/notify"
 )
 
 func init() {
-	type ReceiverListOptions struct {
-		options.BaseListOptions
-		UId                 string `help:"user id in keystone"`
-		UName               string `help:"user name in keystone"`
-		EnabledContactType  string `help:"enabled contact type"`
-		VerifiedContactType string `help:"verified contact type"`
-	}
-	R(&ReceiverListOptions{}, "notify-receiver-list", "List notify receiver", func(s *mcclient.ClientSession, args *ReceiverListOptions) error {
-		params, err := options.ListStructToParams(args)
-		if err != nil {
-			return err
-		}
-		result, err := modules.NotifyReceiver.List(s, params)
-		if err != nil {
-			return err
-		}
-		printList(result, modules.NotifyReceiver.GetColumns(s))
-		return nil
-	})
-	type ReceiverCreateOptions struct {
-		UID                 string   `help:"user id in keystone"`
-		Email               string   `help:"email of receiver"`
-		Mobile              string   `help:"mobile of receiver"`
-		EnabledContactTypes []string `help:"enabled contact type"`
-	}
-	R(&ReceiverCreateOptions{}, "notify-receiver-create", "Create notify receiver", func(s *mcclient.ClientSession, args *ReceiverCreateOptions) error {
-		params := jsonutils.Marshal(args).(*jsonutils.JSONDict)
-		receiver, err := modules.NotifyReceiver.Create(s, params)
-		if err != nil {
-			return err
-		}
-		printObject(receiver)
-		return nil
-	})
-	type ReceiverUpdateInput struct {
-		ID                 string   `help:"Id or Name of receiver"`
-		Email              string   `help:"email of receiver"`
-		Mobile             string   `help:"mobile of receiver"`
-		EnabledContactType []string `help:"enabled contact type"`
-	}
-	R(&ReceiverUpdateInput{}, "notify-receiver-update", "Update notify receiver", func(s *mcclient.ClientSession, args *ReceiverUpdateInput) error {
-		params := jsonutils.NewDict()
-		if len(args.Email) > 0 {
-			params.Set("email", jsonutils.NewString(args.Email))
-		}
-		if len(args.Mobile) > 0 {
-			params.Set("mobile", jsonutils.NewString(args.Mobile))
-		}
-		if len(args.EnabledContactType) > 0 {
-			params.Set("enabled_contact_types", jsonutils.NewStringArray(args.EnabledContactType))
-		}
-		ret, err := modules.NotifyReceiver.Update(s, args.ID, params)
-		if err != nil {
-			return err
-		}
-		printObject(ret)
-		return nil
-	})
-	type ReceiverOptions struct {
-		ID string `help:"Id or Name of receiver"`
-	}
-	R(&ReceiverOptions{}, "notify-receiver-show", "Show notify receiver", func(s *mcclient.ClientSession, args *ReceiverOptions) error {
-		ret, err := modules.NotifyReceiver.Get(s, args.ID, nil)
-		if err != nil {
-			return err
-		}
-		printObject(ret)
-		return nil
-	})
-	R(&ReceiverOptions{}, "notify-receiver-delete", "Delete notify receiver", func(s *mcclient.ClientSession, args *ReceiverOptions) error {
-		receiver, err := modules.NotifyReceiver.Delete(s, args.ID, jsonutils.NewDict())
-		if err != nil {
-			return err
-		}
-		printObject(receiver)
-		return nil
-	})
-	R(&ReceiverOptions{}, "notify-receiver-enable", "Enable notify receiver", func(s *mcclient.ClientSession, args *ReceiverOptions) error {
-		ret, err := modules.NotifyReceiver.PerformAction(s, args.ID, "enable", jsonutils.NewDict())
-		if err != nil {
-			return err
-		}
-		printObject(ret)
-		return nil
-	})
-	R(&ReceiverOptions{}, "notify-receiver-disable", "Disable notify receiver", func(s *mcclient.ClientSession, args *ReceiverOptions) error {
-		ret, err := modules.NotifyReceiver.PerformAction(s, args.ID, "disable", jsonutils.NewDict())
-		if err != nil {
-			return err
-		}
-		printObject(ret)
-		return nil
-	})
-	type ReceiverTriggerVerifyInput struct {
-		ID          string `help:"Id or Name of receiver"`
-		ContactType string `help:"Contact type to trigger verify" choices:"email|mobile"`
-	}
-	R(&ReceiverTriggerVerifyInput{}, "notify-receiver-trigger-verify", "Trigger verification for receiver about some contact", func(s *mcclient.ClientSession, args *ReceiverTriggerVerifyInput) error {
-		params := jsonutils.NewDict()
-		params.Set("contact_type", jsonutils.NewString(args.ContactType))
-		ret, err := modules.NotifyReceiver.PerformAction(s, args.ID, "trigger-verify", params)
-		if err != nil {
-			return err
-		}
-		printObject(ret)
-		return nil
-	})
-	type ReceiverVerifyInput struct {
-		ID          string `help:"Id or Name of receiver"`
-		ContactType string `help:"Contact type to trigger verify" choices:"email|mobile"`
-		Token       string `help:"Token from verify message sent to you"`
-	}
-	R(&ReceiverVerifyInput{}, "notify-receiver-verify", "Verify receiver about some contact type", func(s *mcclient.ClientSession, args *ReceiverVerifyInput) error {
-		params := jsonutils.NewDict()
-		params.Set("contact_type", jsonutils.NewString(args.ContactType))
-		params.Set("token", jsonutils.NewString(args.Token))
-		ret, err := modules.NotifyReceiver.PerformAction(s, args.ID, "verify", params)
-		if err != nil {
-			return err
-		}
-		printObject(ret)
-		return nil
-	})
-	R(&ReceiverOptions{}, "notify-receiver-enable", "Enable receiver", func(s *mcclient.ClientSession, args *ReceiverOptions) error {
-		ret, err := modules.NotifyReceiver.PerformAction(s, args.ID, "enable", nil)
-		if err != nil {
-			return err
-		}
-		printObject(ret)
-		return nil
-	})
-	R(&ReceiverOptions{}, "notify-receiver-disable", "Disable receiver", func(s *mcclient.ClientSession, args *ReceiverOptions) error {
-		ret, err := modules.NotifyReceiver.PerformAction(s, args.ID, "disable", nil)
-		if err != nil {
-			return err
-		}
-		printObject(ret)
-		return nil
-	})
+	cmd := shell.NewResourceCmd(&modules.NotifyReceiver).WithKeyword("notify-receiver")
+	cmd.List(new(options.ReceiverListOptions))
+	cmd.Create(new(options.ReceiverCreateOptions))
+	cmd.Update(new(options.ReceiverUpdateOptions))
+	cmd.Show(new(options.ReceiverOptions))
+	cmd.Delete(new(options.ReceiverOptions))
+	cmd.Perform("enable", new(options.ReceiverOptions))
+	cmd.Perform("disable", new(options.ReceiverOptions))
+	cmd.Perform("trigger-verify", new(options.ReceiverTriggerVerifyOptions))
+	cmd.Perform("verify", new(options.ReceiverVerifyOptions))
+	cmd.PerformClass("intellij-get", new(options.ReceiverIntellijGetOptions))
 }

cmd/climc/shell/suggestion/analysispredict.go

@@ -0,0 +1,12 @@
+package suggestion
+
+import (
+	"yunion.io/x/onecloud/cmd/climc/shell"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
+	options "yunion.io/x/onecloud/pkg/mcclient/options/suggestion"
+)
+
+func init() {
+	cmd := shell.NewResourceCmd(modules.AnalysisPredictManager)
+	cmd.Get("", new(options.AnalysisPredictConfigOptions))
+}

cmd/climc/shell/suggestion/suggestsysalert.go

@@ -0,0 +1,30 @@
+// 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 suggestion
+
+import (
+	"yunion.io/x/onecloud/cmd/climc/shell"
+	"yunion.io/x/onecloud/pkg/mcclient/modules/monitor"
+	options "yunion.io/x/onecloud/pkg/mcclient/options/monitor"
+)
+
+func init() {
+	cmd := shell.NewResourceCmd(monitor.SuggestSysAlertManager)
+	cmd.List(new(options.SuggestSysAlertListOptions))
+	cmd.Show(new(options.SSuggestAlertShowOptions))
+	cmd.Perform("ignore", new(options.SuggestAlertIgnoreOptions))
+	cmd_ := shell.NewResourceCmd(monitor.SuggestSysAlertCostManager)
+	cmd_.Get("", new(options.SuggestAlertCostOptions))
+}

cmd/climc/shell/suggestion/suggestsysrule.go

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

cmd/telegraf-raid-plugin/main.go

@@ -45,7 +45,7 @@ func main() {
 		log.Fatalf("Missing env nodename")
 	}
 
-	node, err := clientset.CoreV1().Nodes().Get(nodeName, metav1.GetOptions{})
+	node, err := clientset.CoreV1().Nodes().Get(context.Background(), nodeName, metav1.GetOptions{})
 	if err != nil {
 		log.Fatalln(err)
 	}

go.mod

@@ -7,8 +7,9 @@ require (
 	cloud.google.com/go/storage v1.5.0
 	github.com/360EntSecGroup-Skylar/excelize v1.4.0
 	github.com/Azure/azure-sdk-for-go v36.1.0+incompatible
-	github.com/Azure/go-autorest/autorest v0.9.3
+	github.com/Azure/go-autorest/autorest v0.9.6
 	github.com/Azure/go-autorest/autorest/azure/auth v0.4.2
+	github.com/Azure/go-autorest/autorest/to v0.4.0 // indirect
 	github.com/DataDog/dd-trace-go v0.6.1 // indirect
 	github.com/DataDog/zstd v1.3.4 // indirect
 	github.com/Microsoft/azure-vhd-utils v0.0.0-20181115010904-44cbada2ece3
@@ -16,7 +17,7 @@ require (
 	github.com/Shopify/sarama v1.20.0 // indirect
 	github.com/Shopify/toxiproxy v2.1.4+incompatible // indirect
 	github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6 // indirect
-	github.com/aliyun/alibaba-cloud-sdk-go v0.0.0-20181031125837-1b0ec6f46eb1
+	github.com/aliyun/alibaba-cloud-sdk-go v1.61.684
 	github.com/aliyun/aliyun-oss-go-sdk v2.0.4+incompatible
 	github.com/anacrolix/dht v0.0.0-20181129074040-b09db78595aa // indirect
 	github.com/anacrolix/go-libutp v0.0.0-20180808010927-aebbeb60ea05 // indirect
@@ -36,6 +37,7 @@ require (
 	github.com/coredns/coredns v1.3.0
 	github.com/coreos/go-systemd v0.0.0-20190620071333-e64a0ec8b42a // indirect
 	github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f // indirect
+	github.com/dnaeon/go-vcr v1.1.0 // indirect
 	github.com/dnstap/golang-dnstap v0.0.0-20170829151710-2cf77a2b5e11 // indirect
 	github.com/eapache/go-resiliency v1.1.0 // indirect
 	github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21 // indirect
@@ -44,7 +46,8 @@ require (
 	github.com/farsightsec/golang-framestream v0.0.0-20181102145529-8a0cb8ba8710 // indirect
 	github.com/fatih/color v1.7.0
 	github.com/fernet/fernet-go v0.0.0-20180830025343-9eac43b88a5e
-	github.com/fsnotify/fsnotify v1.4.7
+	github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568 // indirect
+	github.com/fsnotify/fsnotify v1.4.9
 	github.com/ghodss/yaml v1.0.0
 	github.com/gin-gonic/gin v1.5.0
 	github.com/glycerine/go-unsnap-stream v0.0.0-20181221182339-f9677308dec2 // indirect
@@ -57,9 +60,8 @@ require (
 	github.com/golang-plus/testing v1.0.0 // indirect
 	github.com/golang-plus/uuid v1.0.0
 	github.com/golang/mock v1.3.1
-	github.com/golang/protobuf v1.3.2
+	github.com/golang/protobuf v1.4.2
 	github.com/google/gopacket v1.1.17
-	github.com/googleapis/gnostic v0.2.0 // indirect
 	github.com/googollee/go-engine.io v0.0.0-20180829091931-e2f255711dcb // indirect
 	github.com/googollee/go-socket.io v0.0.0-20181214084611-0ad7206c347a
 	github.com/gorilla/mux v1.7.0
@@ -97,6 +99,7 @@ require (
 	github.com/pkg/term v0.0.0-20181116001808-27bbf2edb814 // indirect
 	github.com/pquerna/otp v1.2.0
 	github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a // indirect
+	github.com/satori/go.uuid v1.2.0 // indirect
 	github.com/serialx/hashring v0.0.0-20180504054112-49a4782e9908
 	github.com/sevlyar/go-daemon v0.1.5
 	github.com/shirou/gopsutil v2.18.10+incompatible
@@ -114,67 +117,37 @@ require (
 	github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df // indirect
 	github.com/vmihailenco/msgpack v4.0.4+incompatible
 	github.com/vmware/govmomi v0.20.1
-	go.etcd.io/etcd v0.5.0-alpha.5.0.20191023171146-3cf2f69b5738
+	go.etcd.io/etcd v0.5.0-alpha.5.0.20200819165624-17cef6e3e9d5
 	go.uber.org/atomic v1.4.0 // indirect
-	golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413
-	golang.org/x/net v0.0.0-20200226121028-0de0cce0169b
+	golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9
+	golang.org/x/net v0.0.0-20200707034311-ab3426394381
 	golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6
 	golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e
-	golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8
+	golang.org/x/sys v0.0.0-20200622214017-ed371f2e16b4
 	golang.org/x/text v0.3.3
 	golang.org/x/tools v0.0.0-20200515220128-d3bf790afa53 // indirect
 	golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543
 	golang.zx2c4.com/wireguard/wgctrl v0.0.0-20191008142428-8d021180e987
-	google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb
-	google.golang.org/grpc v1.26.0
+	google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013
+	google.golang.org/grpc v1.27.0
 	gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d // indirect
-	gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect
 	gopkg.in/fatih/set.v0 v0.2.1
-	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/ini.v1 v1.44.0 // indirect
 	gopkg.in/ldap.v3 v3.0.3
 	gopkg.in/yaml.v2 v2.2.8
 	honnef.co/go/tools v0.0.1-2020.1.4 // indirect
-	k8s.io/api v0.17.3
-	k8s.io/apimachinery v0.17.3
-	k8s.io/client-go v9.0.0+incompatible
-	k8s.io/cluster-bootstrap v0.17.3
-	k8s.io/kubernetes v1.16.0
-	yunion.io/x/executor v0.0.0-20200227030256-a18417815e74
+	k8s.io/api v0.19.3
+	k8s.io/apimachinery v0.19.3
+	k8s.io/client-go v0.19.3
+	k8s.io/cluster-bootstrap v0.19.3
+	yunion.io/x/executor v0.0.0-20201201131200-44fa553abd9e
 	yunion.io/x/jsonutils v0.0.0-20201110084044-3e4e1cb49769
-	yunion.io/x/log v0.0.0-20200313080802-57a4ce5966b3
+	yunion.io/x/log v0.0.0-20201210064738-43181789dc74
 	yunion.io/x/ovsdb v0.0.0-20200526071744-27bf0940cbc7
-	yunion.io/x/pkg v0.0.0-20201028134817-3ed15ee169bc
+	yunion.io/x/pkg v0.0.0-20201123083159-ca3aea986ff2
 	yunion.io/x/s3cli v0.0.0-20190917004522-13ac36d8687e
-	yunion.io/x/sqlchemy v0.0.0-20201029091740-cd5e77b56d4b
+	yunion.io/x/sqlchemy v0.0.0-20210204013753-dbac29c9cedb
 	yunion.io/x/structarg v0.0.0-20200720093445-9f850fa222ce
 )
 
-replace (
-	github.com/ceph/go-ceph v0.0.0-20181217221554-e32f9f0f2e94 => github.com/yunionio/go-ceph v0.0.0-20190912101231-6f05a06b3859
-
-	k8s.io/api => k8s.io/api v0.0.0-20190918155943-95b840bb6a1f
-	k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.0.0-20190918161926-8f644eb6e783
-	k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190913080033-27d36303b655
-	k8s.io/apiserver => k8s.io/apiserver v0.0.0-20190918160949-bfa5e2e684ad
-	k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20190918162238-f783a3654da8
-	k8s.io/client-go => k8s.io/client-go v0.0.0-20190918160344-1fbdaa4c8d90
-	k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20190918163234-a9c1f33e9fb9
-	k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.0.0-20190918163108-da9fdfce26bb
-	k8s.io/code-generator => k8s.io/code-generator v0.0.0-20190912054826-cd179ad6a269
-	k8s.io/component-base => k8s.io/component-base v0.0.0-20190918160511-547f6c5d7090
-	k8s.io/cri-api => k8s.io/cri-api v0.0.0-20190828162817-608eb1dad4ac
-	k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.0.0-20190918163402-db86a8c7bb21
-	k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.0.0-20190918161219-8c8f079fddc3
-	k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.0.0-20190918162944-7a93a0ddadd8
-	k8s.io/kube-proxy => k8s.io/kube-proxy v0.0.0-20190918162534-de037b596c1e
-	k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.0.0-20190918162820-3b5c1246eb18
-	k8s.io/kubectl => k8s.io/kubectl v0.0.0-20190918164019-21692a0861df
-	k8s.io/kubelet => k8s.io/kubelet v0.0.0-20190918162654-250a1838aa2c
-	k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.0.0-20190918163543-cfa506e53441
-	k8s.io/metrics => k8s.io/metrics v0.0.0-20190918162108-227c654b2546
-	k8s.io/node-api => k8s.io/node-api v0.0.0-20190918163711-2299658ad911
-	k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.0.0-20190918161442-d4c9c65c82af
-	k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.0.0-20190918162410-e45c26d066f2
-	k8s.io/sample-controller => k8s.io/sample-controller v0.0.0-20190918161628-92eb3cb7496c
-)
+replace github.com/ceph/go-ceph v0.0.0-20181217221554-e32f9f0f2e94 => github.com/yunionio/go-ceph v0.0.0-20190912101231-6f05a06b3859

pkg/ansibleserver/models/ansibleplaybooks_v2.go

@@ -26,6 +26,7 @@ import (
 	"yunion.io/x/log"
 	"yunion.io/x/sqlchemy"
 
+	"yunion.io/x/onecloud/pkg/ansibleserver/options"
 	"yunion.io/x/onecloud/pkg/apis"
 	api "yunion.io/x/onecloud/pkg/apis/ansible"
 	"yunion.io/x/onecloud/pkg/cloudcommon/db"
@@ -199,7 +200,8 @@ func (apb *SAnsiblePlaybookV2) runPlaybook(ctx context.Context, userCred mcclien
 		PrivateKey(privateKey).
 		Requirements(apb.Requirements).
 		Files(files).
-		OutputWriter(&ansiblePlaybookOutputWriter{apb})
+		OutputWriter(&ansiblePlaybookOutputWriter{apb}).
+		KeepTmpdir(options.Options.KeepTmpdir)
 	man.sessions.Add(apb.Id, sess)
 
 	// NOTE host state check? run only on online hosts and running guests, skip others

pkg/ansibleserver/options/options.go

@@ -19,6 +19,7 @@ import common_options "yunion.io/x/onecloud/pkg/cloudcommon/options"
 type AnsibleServerOptions struct {
 	common_options.CommonOptions
 	common_options.DBOptions
+	KeepTmpdir bool `help:"Whether to save the tmp directory" json:"keep_tmpdir"`
 }
 
 var (

pkg/apigateway/handler/auth.go

@@ -67,6 +67,7 @@ func (h *AuthHandlers) AddMethods() {
 		NewHP(h.getIdpSsoRedirectUri, "sso", "redirect", "<idp_id>"),
 		NewHP(h.listTotpRecoveryQuestions, "recovery"),
 		NewHP(h.handleSsoLogin, "ssologin"),
+		NewHP(h.postLogoutHandler, "logout"),
 		// oidc auth
 		NewHP(handleOIDCAuth, "oidc", "auth"),
 		NewHP(handleOIDCConfiguration, "oidc", ".well-known", "openid-configuration"),
@@ -156,6 +157,9 @@ func (h *AuthHandlers) GetRegionsResponse(ctx context.Context, w http.ResponseWr
 			}
 		}
 		resp.Add(domains, "domains")
+		resp.Add(jsonutils.JSONTrue, "return_full_domains")
+	} else {
+		resp.Add(jsonutils.JSONFalse, "return_full_domains")
 	}
 
 	filters := jsonutils.NewDict()
@@ -308,9 +312,20 @@ func (h *AuthHandlers) doCredentialLogin(ctx context.Context, req *http.Request,
 	if err != nil {
 		switch httperr := err.(type) {
 		case *httputils.JSONClientError:
+			if httperr.Code >= 500 {
+				return nil, err
+			}
 			if httperr.Code == 409 || httperr.Code == 429 {
 				return nil, err
 			}
+			switch httperr.Class {
+			case "UserNotFound", "WrongPassword":
+				return nil, httperrors.NewJsonClientError(httperrors.ErrIncorrectUsernameOrPassword, "incorrect username or password")
+			case "UserLocked":
+				return nil, httperrors.NewJsonClientError(httperrors.ErrUserLocked, "The user has been locked, please contact the administrator")
+			case "UserDisabled":
+				return nil, httperrors.NewJsonClientError(httperrors.ErrUserDisabled, "The user has been disabled, please contact the administrator")
+			}
 		}
 		return nil, httperrors.NewInvalidCredentialError("invalid credential")
 	}
@@ -500,34 +515,34 @@ func (h *AuthHandlers) doLogin(ctx context.Context, w http.ResponseWriter, req *
 	if body.Contains("tenantId") { // switch project
 		token, authToken, err = doTenantLogin(ctx, req, body)
 		if err != nil {
-			return errors.Wrap(err, "doTenantLogin")
+			return err
 		}
 		userInfo, err = fetchUserInfoFromToken(ctx, req, token)
 		if err != nil {
-			return errors.Wrap(err, "fetchUserInfoFromToken")
+			return err
 		}
 	} else {
 		// user/password authenticate
 		// SSO authentication
 		token, err = h.doCredentialLogin(ctx, req, body)
 		if err != nil {
-			return errors.Wrap(err, "doCredentialLogin")
+			return err
 		}
 		userInfo, err = fetchUserInfoFromToken(ctx, req, token)
 		if err != nil {
-			return errors.Wrap(err, "fetchUserInfoFromToken")
+			return err
 		}
 		s := auth.GetAdminSession(ctx, FetchRegion(req), "")
 		isTotpInit, err := isUserTotpCredInitialed(s, token.GetUserId())
 		if err != nil {
-			return errors.Wrap(err, "isUserTotpCredInitialed")
+			return err
 		}
 		isIdpLogin := body.Contains("idp_driver")
 		authToken = clientman.NewAuthToken(token.GetTokenString(), isUserEnableTotp(userInfo), isTotpInit, isIdpLogin)
 	}
 
 	if !isUserAllowWebconsole(userInfo) {
-		return errors.Wrap(httperrors.ErrForbidden, "user forbidden login from web")
+		return httperrors.NewForbiddenError("user forbidden login from web")
 	}
 
 	saveAuthCookie(w, authToken, token)
@@ -559,6 +574,7 @@ func (h *AuthHandlers) doLogin(ctx context.Context, w http.ResponseWriter, req *
 
 func (h *AuthHandlers) postLogoutHandler(ctx context.Context, w http.ResponseWriter, req *http.Request) {
 	clearAuthCookie(w)
+	appsrv.DisableClientCache(w)
 	appsrv.Send(w, "")
 }
 
@@ -984,6 +1000,12 @@ func getUserInfo2(s *mcclient.ClientSession, uid string, pid string, loginIp str
 		data.Add(jsonutils.JSONFalse, "non_default_domain_projects")
 	}
 
+	if options.Options.EnableQuotaCheck {
+		data.Add(jsonutils.JSONTrue, "enable_quota_check")
+	} else {
+		data.Add(jsonutils.JSONFalse, "enable_quota_check")
+	}
+
 	data.Add(jsonutils.NewString(getSsoCallbackUrl()), "sso_callback_url")
 
 	return data, nil
@@ -994,7 +1016,7 @@ func (h *AuthHandlers) getPermissionDetails(ctx context.Context, w http.Response
 
 	_, query, body := appsrv.FetchEnv(ctx, w, req)
 	if body == nil {
-		httperrors.InvalidInputError(ctx, w, "body is empty")
+		httperrors.InvalidInputError(ctx, w, "request body is empty")
 		return
 	}
 	var name string
@@ -1028,7 +1050,7 @@ func (h *AuthHandlers) doCreatePolicies(ctx context.Context, w http.ResponseWrit
 	// }
 	_, _, body := appsrv.FetchEnv(ctx, w, req)
 	if body == nil {
-		httperrors.InvalidInputError(ctx, w, "body is empty")
+		httperrors.InvalidInputError(ctx, w, "request body is empty")
 		return
 	}
 	s := auth.GetSession(ctx, t, FetchRegion(req), "")
@@ -1112,7 +1134,7 @@ func (h *AuthHandlers) resetUserPassword(ctx context.Context, w http.ResponseWri
 
 	_, _, body := appsrv.FetchEnv(ctx, w, req)
 	if body == nil {
-		httperrors.InvalidInputError(ctx, w, "body is empty")
+		httperrors.InvalidInputError(ctx, w, "request body is empty")
 		return
 	}
 
@@ -1148,7 +1170,7 @@ func (h *AuthHandlers) resetUserPassword(ctx context.Context, w http.ResponseWri
 				return
 			}
 		}
-		httperrors.InputParameterError(ctx, w, "密码错误")
+		httperrors.InputParameterError(ctx, w, "wrong password")
 		return
 	}
 

pkg/apigateway/handler/auth_totp.go

@@ -205,7 +205,7 @@ func validateTotpRecoverySecrets(s *mcclient.ClientSession, uid string, question
 func initTotpSecrets(ctx context.Context, w http.ResponseWriter, req *http.Request) {
 	t, authToken, err := fetchAuthInfo(ctx, req)
 	if err != nil {
-		httperrors.InvalidCredentialError(ctx, w, "fetchAuthInfo fail %s", err)
+		httperrors.InvalidCredentialError(ctx, w, "fetchAuthInfo fail: %s", err)
 		return
 	}
 	if authToken.IsTotpInitialized() {
@@ -232,14 +232,14 @@ func initTotpSecrets(ctx context.Context, w http.ResponseWriter, req *http.Reque
 func validatePasscodeHandler(ctx context.Context, w http.ResponseWriter, req *http.Request) {
 	t, authToken, err := fetchAuthInfo(ctx, req)
 	if err != nil {
-		httperrors.InvalidCredentialError(ctx, w, "fetchAuthInfo fail %s", err)
+		httperrors.InvalidCredentialError(ctx, w, "fetchAuthInfo fail: %s", err)
 		return
 	}
 
 	s := auth.GetAdminSession(ctx, FetchRegion(req), "")
 	_, _, body := appsrv.FetchEnv(ctx, w, req)
 	if body == nil {
-		httperrors.InvalidInputError(ctx, w, "body is empty")
+		httperrors.InvalidInputError(ctx, w, "request body is empty")
 		return
 	}
 
@@ -271,14 +271,14 @@ func validatePasscodeHandler(ctx context.Context, w http.ResponseWriter, req *ht
 func resetTotpSecrets(ctx context.Context, w http.ResponseWriter, req *http.Request) {
 	t, _, err := fetchAuthInfo(ctx, req)
 	if err != nil {
-		httperrors.InvalidCredentialError(ctx, w, "fetchAuthInfo fail %s", err)
+		httperrors.InvalidCredentialError(ctx, w, "fetchAuthInfo fail: %s", err)
 		return
 	}
 
 	s := auth.GetAdminSession(ctx, FetchRegion(req), "")
 	_, _, body := appsrv.FetchEnv(ctx, w, req)
 	if body == nil {
-		httperrors.InvalidInputError(ctx, w, "body is empty")
+		httperrors.InvalidInputError(ctx, w, "request body is empty")
 		return
 	}
 
@@ -309,7 +309,7 @@ func resetTotpSecrets(ctx context.Context, w http.ResponseWriter, req *http.Requ
 func listTotpRecoveryQuestions(ctx context.Context, w http.ResponseWriter, req *http.Request) {
 	t, _, err := fetchAuthInfo(ctx, req)
 	if err != nil {
-		httperrors.InvalidCredentialError(ctx, w, "fetchAuthInfo fail %s", err)
+		httperrors.InvalidCredentialError(ctx, w, "fetchAuthInfo fail: %s", err)
 		return
 	}
 
@@ -335,14 +335,14 @@ func listTotpRecoveryQuestions(ctx context.Context, w http.ResponseWriter, req *
 func resetTotpRecoveryQuestions(ctx context.Context, w http.ResponseWriter, req *http.Request) {
 	t, _, err := fetchAuthInfo(ctx, req)
 	if err != nil {
-		httperrors.InvalidCredentialError(ctx, w, "fetchAuthInfo fail %s", err)
+		httperrors.InvalidCredentialError(ctx, w, "fetchAuthInfo fail: %s", err)
 		return
 	}
 
 	s := auth.GetAdminSession(ctx, FetchRegion(req), "")
 	_, _, body := appsrv.FetchEnv(ctx, w, req)
 	if body == nil {
-		httperrors.InvalidInputError(ctx, w, "body is empty")
+		httperrors.InvalidInputError(ctx, w, "request body is empty")
 		return
 	}
 

pkg/apigateway/handler/idp.go

@@ -170,7 +170,7 @@ func (h *AuthHandlers) handleSsoLogin(ctx context.Context, w http.ResponseWriter
 	case "POST":
 		formData, err := appsrv.Fetch(req)
 		if err != nil {
-			httperrors.InputParameterError(ctx, w, "fetch formdata error: %s", err)
+			httperrors.InputParameterError(ctx, w, "fetch form data error: %s", err)
 		}
 		body, err = jsonutils.ParseQueryString(string(formData))
 		if err != nil {

pkg/apigateway/handler/misc.go

@@ -42,6 +42,8 @@ import (
 	"yunion.io/x/onecloud/pkg/util/httputils"
 )
 
+const contentTypeSpreadsheet = "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
+
 const (
 	HOST_MAC                    = "*MAC地址"
 	HOST_NAME                   = "*名称"
@@ -154,8 +156,8 @@ func (mh *MiscHandler) DoBatchHostRegister(ctx context.Context, w http.ResponseW
 
 	fileHeader := hostfiles[0].Header
 	contentType := fileHeader.Get("Content-Type")
-	if contentType != "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet" {
-		e := httperrors.NewInputParameterError("Wrong content type %s, required application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", contentType)
+	if contentType != contentTypeSpreadsheet {
+		e := httperrors.NewInputParameterError("Wrong content type %s, want %s", contentType, contentTypeSpreadsheet)
 		httperrors.JsonClientError(ctx, w, e)
 		return
 	}
@@ -199,7 +201,7 @@ func (mh *MiscHandler) DoBatchHostRegister(ctx context.Context, w http.ResponseW
 	}
 
 	if !titlesOk {
-		httperrors.InputParameterError(ctx, w, "template file is invalid.please check.")
+		httperrors.InputParameterError(ctx, w, "template file is invalid. please check.")
 		return
 	}
 
@@ -302,8 +304,8 @@ func (mh *MiscHandler) DoBatchUserRegister(ctx context.Context, w http.ResponseW
 
 	fileHeader := userfiles[0].Header
 	contentType := fileHeader.Get("Content-Type")
-	if contentType != "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet" {
-		e := httperrors.NewInputParameterError("Wrong content type %s, required application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", contentType)
+	if contentType != contentTypeSpreadsheet {
+		e := httperrors.NewInputParameterError("Wrong content type %s, want %s", contentType, contentTypeSpreadsheet)
 		httperrors.JsonClientError(ctx, w, e)
 		return
 	}
@@ -328,7 +330,7 @@ func (mh *MiscHandler) DoBatchUserRegister(ctx context.Context, w http.ResponseW
 	// skipped header row
 	rows := xlsx.GetRows("users")
 	if len(rows) <= 1 {
-		e := httperrors.NewInputParameterError("empty file")
+		e := httperrors.NewInputParameterError("empty file content")
 		httperrors.JsonClientError(ctx, w, e)
 		return
 	} else if len(rows) > BATCH_USER_REGISTER_QUANTITY_LIMITATION {
@@ -431,7 +433,7 @@ func (mh *MiscHandler) getDownloadsHandler(ctx context.Context, w http.ResponseW
 	params := appctx.AppContextParams(ctx)
 	template, ok := params["<template_id>"]
 	if !ok || len(template) == 0 {
-		httperrors.InvalidInputError(ctx, w, "not found")
+		httperrors.InvalidInputError(ctx, w, "template_id")
 		return
 	}
 

pkg/apigateway/handler/resource.go

@@ -142,11 +142,11 @@ func fetchIdList(ctx context.Context, query jsonutils.JSONObject, w http.Respons
 	if e == nil && len(idlist) > 0 {
 		queryDict := query.(*jsonutils.JSONDict)
 		queryDict.Remove("id")
-		log.Debugf("Get idlist: %s", idlist)
+		log.Debugf("Get id list: %s", idlist)
 		return jsonutils.JSONArray2StringArray(idlist)
 	} else {
-		log.Debugf("Cannot find idlist in query: %s", query)
-		httperrors.InvalidInputError(ctx, w, "No idlist found")
+		log.Debugf("Cannot find id list in query: %s", query)
+		httperrors.InvalidInputError(ctx, w, "No id list found")
 		return nil
 	}
 }

pkg/apis/cloudevent/cloudevent.go

@@ -23,7 +23,7 @@ import (
 
 type CloudeventListInput struct {
 	apis.ModelBaseListInput
-	apis.ProjectizedResourceListInput
+	apis.DomainizedResourceListInput
 
 	compute.CloudenvResourceListInput
 
@@ -47,6 +47,6 @@ type CloudeventListInput struct {
 
 type CloudeventDetails struct {
 	apis.ModelBaseDetails
-	apis.ProjectizedResourceInfo
+	apis.DomainizedResourceInfo
 	SCloudevent
 }

pkg/apis/cloudid/cloudrole.go

@@ -27,6 +27,7 @@ type CloudroleListInput struct {
 	apis.StatusInfrasResourceBaseListInput
 
 	CloudaccountResourceListInput
+	CloudgroupResourceListInput
 }
 
 type CloudroleDetails struct {

pkg/apis/cloudid/clouduser.go

@@ -82,6 +82,10 @@ type ClouduserCreateInput struct {
 
 	// swagger:ignore
 	ExternalId string `json:"external_id"`
+
+	// 是否发送邮件通知(仅设置email不为空生效)
+	// default: false
+	Notify bool `json:"notify"`
 }
 
 type ClouduserListInput struct {

pkg/apis/cloudid/saml_provider.go

@@ -17,14 +17,17 @@ package cloudid
 import "yunion.io/x/onecloud/pkg/apis"
 
 const (
-	SAML_PROVIDER_STATUS_AVAILABLE     = "available"
-	SAML_PROVIDER_STATUS_NOT_MATCH     = "not_match"
-	SAML_PROVIDER_STATUS_DELETING      = "deleting"
-	SAML_PROVIDER_STATUS_DELETE_FAILED = "delete_failed"
-	SAML_PROVIDER_STATUS_UNKNOWN       = "unknown"
-	SAML_PROVIDER_STATUS_CREATING      = "creating"
-	SAML_PROVIDER_STATUS_CREATE_FAILED = "create_failed"
-	SAML_PROVIDER_STATUS_UNVALIABLE    = "unavailable"
+	SAML_PROVIDER_STATUS_AVAILABLE              = "available"
+	SAML_PROVIDER_STATUS_NOT_MATCH              = "not_match"
+	SAML_PROVIDER_STATUS_DELETING               = "deleting"
+	SAML_PROVIDER_STATUS_DELETE_FAILED          = "delete_failed"
+	SAML_PROVIDER_STATUS_UNKNOWN                = "unknown"
+	SAML_PROVIDER_STATUS_CREATING               = "creating"
+	SAML_PROVIDER_STATUS_CREATE_FAILED          = "create_failed"
+	SAML_PROVIDER_STATUS_UNVALIABLE             = "unavailable"
+	SAML_PROVIDER_STATUS_UPDATE_METADATA        = "update_metadata"
+	SAML_PROVIDER_STATUS_UPDATE_METADATA_FAILED = "update_metadata_failed"
+	SAML_PROVIDER_STATUS_SYNC                   = "sync"
 )
 
 type SAMLProviderListInput struct {

pkg/apis/compute/bucket.go

@@ -18,6 +18,8 @@ import (
 	"net/http"
 
 	"yunion.io/x/pkg/errors"
+	"yunion.io/x/pkg/util/regutils"
+	"yunion.io/x/pkg/utils"
 
 	"yunion.io/x/onecloud/pkg/apis"
 	"yunion.io/x/onecloud/pkg/cloudprovider"
@@ -237,6 +239,74 @@ type BucketCORSRuleDeleteInput struct {
 	Id []string
 }
 
+type BucketPolicy struct {
+	Data []BucketPolicyStatement
+}
+
+type BucketPolicyStatement struct {
+	// 授权的目标主体
+	Principal map[string][]string `json:"Principal,omitempty"`
+	// 授权的行为
+	Action []string `json:"Action,omitempty"`
+	// Allow|Deny
+	Effect string `json:"Effect,omitempty"`
+	// 被授权的资源地址
+	Resource []string `json:"Resource,omitempty"`
+	// 触发授权的条件
+	Condition map[string]map[string]interface{} `json:"Condition,omitempty"`
+
+	// 解析字段，主账号id:子账号id
+	PrincipalId []string
+	// map[主账号id:子账号id]子账号name
+	PrincipalNames map[string]string
+
+	// Read|ReadWrite|FullControl
+	CannedAction string
+	// 资源路径
+	ResourcePath []string
+	// 根据index 生成
+	Id string
+}
+
+type BucketPolicyStatementInput struct {
+	// 主账号id:子账号id
+	PrincipalId []string
+	// Read|ReadWrite|FullControl
+	CannedAction string
+	// Allow|Deny
+	Effect string
+	// 被授权的资源地址,/*
+	ResourcePath []string
+	// ip 条件
+	IpEquals    []string
+	IpNotEquals []string
+}
+
+func (input *BucketPolicyStatementInput) Validate() error {
+	cannedAction := []string{"Read", "ReadWrite", "FullControl"}
+	if !utils.IsInStringArray(input.CannedAction, cannedAction) {
+		return httperrors.NewInputParameterError("invalid CannedAction %s ", input.CannedAction)
+	}
+	if input.Effect != "Allow" && input.Effect != "Deny" {
+		return httperrors.NewInputParameterError("invalid Effect %s ", input.Effect)
+	}
+	for i := range input.IpEquals {
+		if !regutils.MatchIP4Addr(input.IpEquals[i]) && !regutils.MatchCIDR(input.IpEquals[i]) {
+			return httperrors.NewInputParameterError("invalid ipv4 %s ", input.IpEquals[i])
+		}
+	}
+	for i := range input.IpNotEquals {
+		if !regutils.MatchIP4Addr(input.IpNotEquals[i]) && !regutils.MatchCIDR(input.IpNotEquals[i]) {
+			return httperrors.NewInputParameterError("invalid ipv4 %s ", input.IpNotEquals[i])
+		}
+	}
+	return nil
+}
+
+type BucketPolicyDeleteInput struct {
+	Id []string
+}
+
 func (input *BucketCORSRules) Validate() error {
 	for i := range input.Data {
 		if len(input.Data[i].AllowedOrigins) == 0 {
@@ -250,19 +320,14 @@ func (input *BucketCORSRules) Validate() error {
 }
 
 type BucketRefererConf struct {
-	// 是否开启防盗链
-	Enabled bool
-	// Black-List、White-List
-	Type string
-	// 域名列表
-	DomainList []string
-	// 是否允许空refer 访问
+	// 白名单域名列表
+	WhiteList []string
+	// 黑名单域名列表
+	BlackList []string
+	// 是否允许空referer 访问
 	AllowEmptyRefer bool
 }
 
 func (input *BucketRefererConf) Validate() error {
-	if len(input.DomainList) == 0 {
-		return httperrors.NewMissingParameterError("domain_list")
-	}
 	return nil
 }

pkg/apis/compute/cachedloadbalanceracl.go

@@ -17,7 +17,7 @@ package compute
 import "yunion.io/x/onecloud/pkg/apis"
 
 type CachedLoadbalancerAclDetails struct {
-	apis.SharableVirtualResourceDetails
+	apis.VirtualResourceDetails
 	CloudregionResourceInfo
 	ManagedResourceInfo
 
@@ -25,7 +25,7 @@ type CachedLoadbalancerAclDetails struct {
 }
 
 type CachedLoadbalancerAclListInput struct {
-	apis.SharableVirtualResourceListInput
+	apis.VirtualResourceListInput
 	RegionalFilterListInput
 	ManagedResourceListInput
 	LoadbalancerAclFilterListInput

pkg/apis/compute/cloudaccount.go

@@ -319,6 +319,8 @@ type CloudaccountUpdateInput struct {
 	// 带删除的options key
 	RemoveOptions []string `json:"remove_options"`
 
+	SAMLAuth *bool `json:"saml_auth"`
+
 	proxyapi.ProxySettingResourceInput
 }
 
@@ -332,9 +334,16 @@ type CloudaccountPerformPublicInput struct {
 
 type CloudaccountPerformPrepareNetsInput struct {
 	CloudaccountCreateInput
+
+	// enum: vcenter,datacenter,cluster
+	WireLevelForVmware string `json:"wire_level_for_vmware"`
 }
 
 type CloudaccountPerformPrepareNetsOutput struct {
+	CAWireNets []CAWireNet `json:"wire_networks"`
+}
+
+type CAWireNet struct {
 	SuggestedWire CAWireConf  `json:"suggested_wire"`
 	SuitableWire  string      `json:"suitable_wire,allowempty"`
 	Hosts         []CAHostNet `json:"hosts"`

pkg/apis/compute/cloudaccount_const.go

@@ -61,6 +61,10 @@ const (
 
 	ZSTACK_BRAND_DSTACK     = "DStack"
 	ONECLOUD_BRAND_ONECLOUD = "OneCloud"
+
+	CLOUD_ACCOUNT_WIRE_LEVEL_VCENTER    = "vcenter"
+	CLOUD_ACCOUNT_WIRE_LEVEL_DATACENTER = "datacenter"
+	CLOUD_ACCOUNT_WIRE_LEVEL_CLUSTER    = "cluster"
 )
 
 const (
@@ -80,7 +84,7 @@ const (
 var (
 	CLOUD_PROVIDER_VALID_STATUS        = []string{CLOUD_PROVIDER_CONNECTED}
 	CLOUD_PROVIDER_VALID_HEALTH_STATUS = []string{CLOUD_PROVIDER_HEALTH_NORMAL, CLOUD_PROVIDER_HEALTH_NO_PERMISSION}
-	PRIVATE_CLOUD_PROVIDERS            = []string{CLOUD_PROVIDER_ZSTACK, CLOUD_PROVIDER_OPENSTACK}
+	PRIVATE_CLOUD_PROVIDERS            = []string{CLOUD_PROVIDER_ZSTACK, CLOUD_PROVIDER_OPENSTACK, CLOUD_PROVIDER_APSARA}
 
 	CLOUD_PROVIDERS = []string{
 		CLOUD_PROVIDER_ONECLOUD,
@@ -119,4 +123,37 @@ var (
 		CLOUD_ACCOUNT_SHARE_MODE_SYSTEM,
 		CLOUD_ACCOUNT_SHARE_MODE_PROVIDER_DOMAIN,
 	}
+
+	CLOUD_ENV_MAP = map[string]map[string]string{
+		CLOUD_PROVIDER_AZURE: map[string]string{
+			"AzureGermanCloud":       CLOUD_ACCESS_ENV_AZURE_GERMAN,
+			"AzureChinaCloud":        CLOUD_ACCESS_ENV_AZURE_CHINA,
+			"AzureUSGovernmentCloud": CLOUD_ACCESS_ENV_AZURE_US_GOVERNMENT,
+			"AzurePublicCloud":       CLOUD_ACCESS_ENV_AZURE_GLOBAL,
+		},
+		CLOUD_PROVIDER_AWS: map[string]string{
+			"InternationalCloud": CLOUD_ACCESS_ENV_AWS_GLOBAL,
+			"ChinaCloud":         CLOUD_ACCESS_ENV_AWS_CHINA,
+		},
+		CLOUD_PROVIDER_HUAWEI: map[string]string{
+			"InternationalCloud": CLOUD_ACCESS_ENV_HUAWEI_GLOBAL,
+			"ChinaCloud":         CLOUD_ACCESS_ENV_HUAWEI_CHINA,
+		},
+		CLOUD_PROVIDER_ALIYUN: map[string]string{
+			"InternationalCloud": CLOUD_PROVIDER_ALIYUN,
+			"FinanceCloud":       CLOUD_ACCESS_ENV_ALIYUN_FINANCE,
+		},
+	}
 )
+
+func GetCloudEnv(provider, accessUrl string) string {
+	envMap, ok := CLOUD_ENV_MAP[provider]
+	if !ok {
+		return provider
+	}
+	env, ok := envMap[accessUrl]
+	if !ok {
+		return provider
+	}
+	return env
+}

pkg/apis/compute/cloudregions_const.go

@@ -114,6 +114,7 @@ const (
 	CITY_SOUTH_CAROLINA = "South Carolina" //南卡罗来纳州
 	CITY_SALT_LAKE_CITY = "Salt Lake City" //盐湖城
 	CITY_LAS_VEGAS      = "Las Vegas"      //拉斯维加斯
+	CITY_PHOENIX        = "Phoenix"        //菲尼克斯
 
 	// 英国
 	CITY_LONDON      = "London"      //伦敦
@@ -150,7 +151,8 @@ const (
 	CITY_STOCKHOLM = "Stockholm" //斯德哥尔摩
 
 	// 巴西
-	CITY_SAO_PAULO = "Sao Paulo" //圣保罗
+	CITY_SAO_PAULO      = "Sao Paulo"      //圣保罗
+	CITY_RIO_DE_JANEIRO = "Rio de Janeiro" // 里约热内卢
 
 	// 智利
 	CITY_SANTIAGO = "Santiago" // 圣地亚哥

pkg/apis/compute/dbinstance.go

@@ -294,6 +294,8 @@ type DBInstanceDetails struct {
 
 	SDBInstance
 
+	Secgroups []apis.StandaloneShortDesc `json:"secgroups"`
+
 	// 安全组名称
 	// example: Default
 	Secgroup string `json:"secgroup"`
@@ -368,3 +370,7 @@ type DBInstanceAutoRenewInput struct {
 	// 是否自动续费
 	AutoRenew bool `json:"auto_renew"`
 }
+
+type DBInstanceSetSecgroupInput struct {
+	SecgroupIds []string `json:"secgroup_ids"`
+}

pkg/apis/compute/dbinstance_account.go

@@ -92,3 +92,7 @@ type DBInstanceAccountDetails struct {
 
 	ProjectId string `json:"tenant_id"`
 }
+
+type DBInstanceAccountUpdateInput struct {
+	apis.StatusStandaloneResourceBaseUpdateInput
+}

pkg/apis/compute/dbinstance_const.go

@@ -36,6 +36,7 @@ const (
 	DBINSTANCE_SET_AUTO_RENEW        = "set_auto_renew"        //设置自动续费中
 	DBINSTANCE_SET_AUTO_RENEW_FAILED = "set_auto_renew_failed" //设置自动续费失败
 	DBINSTANCE_UNKNOWN               = "unknown"
+	DBINSTANCE_SYNC_SECGROUP_FAILED  = "sync_secgroup_failed" // 同步安全组失败
 
 	DBINSTANCE_CHANGE_CONFIG        = "change_config"        //调整配置
 	DBINSTANCE_CHANGE_CONFIG_FAILED = "change_config_failed" //调整配置失败

pkg/apis/compute/dbinstance_database.go

@@ -80,3 +80,7 @@ type DBInstanceparameterDetails struct {
 
 	SDBInstanceParameter
 }
+
+type DBInstanceDatabaseUpdateInput struct {
+	apis.StatusStandaloneResourceBaseUpdateInput
+}

pkg/apis/compute/dbinstance_sku.go

@@ -21,6 +21,10 @@ type DBInstanceSkuDetails struct {
 	CloudregionResourceInfo
 
 	SDBInstanceSku
+
+	// 云环境
+	CloudEnv string `json:"cloud_env"`
+
 	Zone1Name string `json:"zone1_name"`
 	Zone2Name string `json:"zone2_name"`
 	Zone3Name string `json:"zone3_name"`

pkg/apis/compute/disk.go

@@ -105,6 +105,7 @@ type SnapshotPolicyFilterListInput struct {
 type DiskListInput struct {
 	apis.VirtualResourceListInput
 	apis.ExternalizedResourceBaseListInput
+	apis.MultiArchResourceBaseListInput
 	billing.BillingResourceListInput
 	StorageFilterListInput
 

pkg/apis/compute/elasticcachesku.go

@@ -23,4 +23,7 @@ type ElasticcacheSkuDetails struct {
 	SlaveZoneResourceInfoBase
 
 	SElasticcacheSku
+
+	// 云环境
+	CloudEnv string `json:"cloud_env"`
 }

pkg/apis/compute/elasticip.go

@@ -67,6 +67,8 @@ type SElasticipCreateInput struct {
 	// 子网Id
 	// 私有云创建此参数必传,例如Openstack, ZStack
 	NetworkId string `json:"network_id"`
+	// 指定新建EIP的地址
+	IpAddr string `json:"ip_addr"`
 
 	// description: BgpType for the new eip
 	BgpType string `json:"bgp_type"`

pkg/apis/compute/elasticips_const.go

@@ -42,7 +42,6 @@ const (
 
 	EIP_CHARGE_TYPE_BY_TRAFFIC   = "traffic"
 	EIP_CHARGE_TYPE_BY_BANDWIDTH = "bandwidth"
-	EIP_CHARGE_TYPE_DEFAULT      = EIP_CHARGE_TYPE_BY_TRAFFIC
 )
 
 var (

pkg/apis/compute/guests.go

@@ -25,6 +25,7 @@ type ServerListInput struct {
 	apis.VirtualResourceListInput
 	apis.ExternalizedResourceBaseListInput
 	apis.DeletePreventableResourceBaseListInput
+	apis.MultiArchResourceBaseListInput
 
 	HostFilterListInput
 
@@ -41,6 +42,11 @@ type ServerListInput struct {
 	Baremetal *bool `json:"baremetal"`
 	// 只列出GPU主机
 	Gpu *bool `json:"gpu"`
+	// 只列出还有备份机的主机
+	Backup *bool `json:"bakcup"`
+	// 列出指定类型的主机
+	// enum: normal,gpu,backup
+	ServerType string `json:"server_type"`
 	// 列出管理安全组为指定安全组的主机
 	AdminSecgroup string `json:"admin_security"`
 	// 列出Hypervisor为指定值的主机
@@ -48,8 +54,10 @@ type ServerListInput struct {
 	Hypervisor []string `json:"hypervisor"`
 	// 列出绑定了弹性IP（EIP）的主机
 	WithEip *bool `json:"with_eip"`
-	// 列出未绑定弹性IP（EIO）的主机
+	// 列出未绑定弹性IP（EIP）的主机
 	WithoutEip *bool `json:"without_eip"`
+	// 列出可绑定弹性IP的主机
+	EipAssociable *bool `json:"eip_associable"`
 	// 列出操作系统为指定值的主机
 	// enum: linux,windows,vmware
 	OsType []string `json:"os_type"`
@@ -211,6 +219,8 @@ type ServerDetails struct {
 	Vpc string `json:"vpc"`
 	// 归属VPC ID
 	VpcId string `json:"vpc_id"`
+	// Vpc外网访问模式
+	VpcExternalAccessMode string `json:"vpc_external_access_mode"`
 
 	// 关联安全组列表
 	Secgroups []apis.StandaloneShortDesc `json:"secgroups"`
@@ -362,7 +372,10 @@ type GuestMigrateInput struct {
 }
 
 type GuestLiveMigrateInput struct {
+	// 指定期望的迁移目标宿主机
 	PreferHost string `json:"prefer_host"`
+	// 是否跳过CPU检查，默认要做CPU检查
+	SkipCpuCheck *bool `json:"skip_cpu_check"`
 }
 
 type GuestSetSecgroupInput struct {

pkg/apis/compute/host.go

@@ -72,6 +72,8 @@ type HostListInput struct {
 	ResourceType string `json:"resource_type"`
 	// filter by mac of any network interface
 	AnyMac string `json:"any_mac"`
+	// filter by ip of any network interface
+	AnyIp string `json:"any_ip"`
 	// filter storages not attached to this host
 	StorageNotAttached *bool `json:"storage_not_attached"`
 	// filter by Hypervisor
@@ -120,6 +122,8 @@ type HostListInput struct {
 	BootMode []string `json:"boot_mode"`
 	// 虚拟机所在的二层网络
 	ServerIdForNetwork string `json:"server_id_for_network"`
+	// 宿主机 cpu 架构
+	CpuArchitecture string `json:"cpu_architecture"`
 }
 
 type HostDetails struct {

pkg/apis/compute/instance_snapshot.go

@@ -59,6 +59,8 @@ type InstanceSnapshotDetails struct {
 type InstanceSnapshotListInput struct {
 	apis.VirtualResourceListInput
 	apis.ExternalizedResourceBaseListInput
+	apis.MultiArchResourceBaseListInput
+
 	ManagedResourceListInput
 
 	ServerFilterListInput

pkg/apis/compute/loadbalancer.go

@@ -37,11 +37,11 @@ type LoadbalancerListenerListInput struct {
 	apis.VirtualResourceListInput
 	apis.ExternalizedResourceBaseListInput
 	LoadbalancerFilterListInput
+	// filter by acl
+	LoadbalancerAclResourceInput
 
 	// filter by backend_group
 	BackendGroup string `json:"backend_group"`
-	// filter by acl
-	Acl string `json:"acl"`
 
 	ListenerType []string `json:"listener_type"`
 	ListenerPort []int    `json:"listener_port"`
@@ -104,7 +104,7 @@ type LoadbalancerAgentListInput struct {
 }
 
 type LoadbalancerCertificateListInput struct {
-	apis.VirtualResourceListInput
+	apis.SharableVirtualResourceListInput
 	apis.ExternalizedResourceBaseListInput
 
 	UsableResourceListInput

pkg/apis/compute/loadbalanceracl.go

@@ -22,6 +22,8 @@ type LoadbalancerAclDetails struct {
 	CloudregionResourceInfo
 
 	SLoadbalancerAcl
+
+	LbListenerCount int `json:"lb_listener_count"`
 }
 
 type LoadbalancerAclResourceInfo struct {

pkg/apis/compute/loadbalancercertificate.go

@@ -17,8 +17,10 @@ package compute
 import "yunion.io/x/onecloud/pkg/apis"
 
 type LoadbalancerCertificateDetails struct {
-	apis.VirtualResourceDetails
+	apis.SharableVirtualResourceDetails
 	SLoadbalancerCertificate
+
+	LbListenerCount int `json:"lb_listener_count"`
 }
 
 type LoadbalancerCertificateResourceInfo struct {

pkg/apis/compute/network.go

@@ -334,7 +334,7 @@ type GetNetworkAddressesInput struct {
 
 type GetNetworkAddressesOutput struct {
 	// IP子网地址记录
-	Addresses []SNetworkAddress `json:"addresses"`
+	Addresses []SNetworkUsedAddress `json:"addresses"`
 }
 
 type NetworkSetBgpTypeInput struct {

pkg/apis/compute/network_const.go

@@ -62,6 +62,7 @@ var (
 		CLOUD_PROVIDER_CTYUN,
 		CLOUD_PROVIDER_UCLOUD,
 		CLOUD_PROVIDER_GOOGLE,
+		CLOUD_PROVIDER_OPENSTACK,
 	}
 )
 
@@ -75,7 +76,7 @@ const (
 	IPAllocationDefault                        = ""
 )
 
-type SNetworkAddress struct {
+type SNetworkUsedAddress struct {
 	IpAddr        string
 	MacAddr       string
 	Owner         string