Merge pull request #12897 from ioito/automated-cherry-pick-of-#12893-upstream-release-3.5

Automated cherry pick of #12893: fix(region): openstack use proxy

.dockerignore

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

.gitignore

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

Makefile

@@ -9,7 +9,7 @@ BUILD_SCRIPT := $(ROOT_DIR)/build/build.sh
 
 ifeq ($(ONECLOUD_CI_BUILD),)
 	GIT_COMMIT := $(shell git rev-parse --short HEAD)
-	GIT_BRANCH := $(shell git 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')

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/monitor/root/opt/yunion/share/notify_templates/alerter/content@cn/DEFAULT

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

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

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

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

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

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

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

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

@@ -1 +1 @@
-Yunion Verify
+{{.copyright}} Verify

cmd/ansibleserver/main.go

@@ -15,9 +15,14 @@
 package main
 
 import (
+	"context"
+
 	"yunion.io/x/onecloud/pkg/ansibleserver/service"
+	"yunion.io/x/onecloud/pkg/util/procutils"
 )
 
 func main() {
+	go procutils.WaitZombieLoop(context.TODO())
+
 	service.StartService()
 }

cmd/baremetal-agent/main.go

@@ -15,12 +15,17 @@
 package main
 
 import (
+	"context"
+
 	"yunion.io/x/onecloud/pkg/baremetal/service"
 	"yunion.io/x/onecloud/pkg/util/atexit"
+	"yunion.io/x/onecloud/pkg/util/procutils"
 )
 
 func main() {
 	defer atexit.Handle()
 
+	go procutils.WaitZombieLoop(context.TODO())
+
 	service.New().StartService()
 }

cmd/climc/shell/cloudid/cloudgroup.go

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

cmd/climc/shell/cloudid/cloudgroupcache.go

@@ -15,59 +15,15 @@
 package cloudid
 
 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"
+	"yunion.io/x/onecloud/pkg/mcclient/options/cloudid"
 )
 
 func init() {
-	type CloudgroupcacheListOptions struct {
-		options.BaseListOptions
-
-		CloudgroupId string `json:"cloudgroup_id"`
-	}
-	R(&CloudgroupcacheListOptions{}, "cloud-group-cache-list", "List cloud group caches", func(s *mcclient.ClientSession, opts *CloudgroupcacheListOptions) error {
-		params, err := options.ListStructToParams(opts)
-		if err != nil {
-			return err
-		}
-		result, err := modules.Cloudgroupcaches.List(s, params)
-		if err != nil {
-			return err
-		}
-		printList(result, modules.Cloudgroupcaches.GetColumns(s))
-		return nil
-	})
-
-	type CloudgroupcacheIdOption struct {
-		ID string `help:"Cloudgroup Id"`
-	}
-
-	R(&CloudgroupcacheIdOption{}, "cloud-group-cache-show", "Show cloud groupcache details", func(s *mcclient.ClientSession, opts *CloudgroupcacheIdOption) error {
-		result, err := modules.Cloudgroupcaches.Get(s, opts.ID, nil)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
-	R(&CloudgroupcacheIdOption{}, "cloud-group-cache-syncstatus", "Sync cloudgroupcache", func(s *mcclient.ClientSession, opts *CloudgroupcacheIdOption) error {
-		result, err := modules.Cloudgroupcaches.PerformAction(s, opts.ID, "syncstatus", nil)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
-	R(&CloudgroupcacheIdOption{}, "cloud-group-cache-delete", "Delete cloudgroupcache", func(s *mcclient.ClientSession, opts *CloudgroupcacheIdOption) error {
-		result, err := modules.Cloudgroupcaches.Delete(s, opts.ID, nil)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
+	cmd := shell.NewResourceCmd(&modules.Cloudgroupcaches).WithKeyword("cloud-group-cache")
+	cmd.List(&cloudid.CloudgroupcacheListOptions{})
+	cmd.Show(&cloudid.CloudgroupcacheIdOption{})
+	cmd.Delete(&cloudid.CloudgroupcacheIdOption{})
+	cmd.Perform("syncstatus", &cloudid.CloudgroupcacheIdOption{})
 }

cmd/climc/shell/cloudid/cloudgrouppolicies.go

@@ -15,58 +15,12 @@
 package cloudid
 
 import (
-	"yunion.io/x/jsonutils"
-
-	"yunion.io/x/onecloud/pkg/mcclient"
-	"yunion.io/x/onecloud/pkg/mcclient/modulebase"
+	"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/cloudid"
 )
 
 func init() {
-	type CloudgroupPolicyListOptions struct {
-		options.BaseListOptions
-		Cloudgroup  string `help:"ID or Name of Cloudgroup"`
-		Cloudpolicy string `help:"Policy ID or name"`
-	}
-	R(&CloudgroupPolicyListOptions{}, "cloud-group-policy-list", "List cloudgroup cloudpolicy pairs", func(s *mcclient.ClientSession, args *CloudgroupPolicyListOptions) error {
-		var params *jsonutils.JSONDict
-		{
-			var err error
-			params, err = args.BaseListOptions.Params()
-			if err != nil {
-				return err
-
-			}
-		}
-		var result *modulebase.ListResult
-		var err error
-		if len(args.Cloudgroup) > 0 {
-			result, err = modules.Cloudgrouppolicies.ListDescendent(s, args.Cloudgroup, params)
-		} else if len(args.Cloudpolicy) > 0 {
-			result, err = modules.Cloudgrouppolicies.ListDescendent2(s, args.Cloudpolicy, params)
-		} else {
-			result, err = modules.Cloudgrouppolicies.List(s, params)
-		}
-		if err != nil {
-			return err
-		}
-		printList(result, modules.Cloudgrouppolicies.GetColumns(s))
-		return nil
-	})
-
-	type CloudgroupPolicyDetailOptions struct {
-		CLOUDUSER   string `help:"ID or Name of Cloudgroup"`
-		CLOUDPOLICY string `help:"ID or Name of Cloudpolicy"`
-	}
-	R(&CloudgroupPolicyDetailOptions{}, "cloud-group-policy-show", "Show cloudgrouppolicy details", func(s *mcclient.ClientSession, args *CloudgroupPolicyDetailOptions) error {
-		query := jsonutils.NewDict()
-		result, err := modules.Cloudgrouppolicies.Get(s, args.CLOUDUSER, args.CLOUDPOLICY, query)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
+	cmd := shell.NewResourceCmd(&modules.Cloudgrouppolicies).WithKeyword("cloud-group-policy").WithContextManager(&modules.Cloudgroups)
+	cmd.List(&cloudid.CloudgroupPolicyListOptions{})
 }

cmd/climc/shell/cloudid/cloudgroupusers.go

@@ -15,58 +15,12 @@
 package cloudid
 
 import (
-	"yunion.io/x/jsonutils"
-
-	"yunion.io/x/onecloud/pkg/mcclient"
-	"yunion.io/x/onecloud/pkg/mcclient/modulebase"
+	"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/cloudid"
 )
 
 func init() {
-	type CloudgroupUserListOptions struct {
-		options.BaseListOptions
-		Cloudgroup string `help:"ID or Name of Cloudgroup"`
-		Clouduser  string `help:"User ID or name"`
-	}
-	R(&CloudgroupUserListOptions{}, "cloud-group-user-list", "List cloudgroup clouduser pairs", func(s *mcclient.ClientSession, args *CloudgroupUserListOptions) error {
-		var params *jsonutils.JSONDict
-		{
-			var err error
-			params, err = args.BaseListOptions.Params()
-			if err != nil {
-				return err
-
-			}
-		}
-		var result *modulebase.ListResult
-		var err error
-		if len(args.Cloudgroup) > 0 {
-			result, err = modules.Cloudgroupusers.ListDescendent(s, args.Cloudgroup, params)
-		} else if len(args.Clouduser) > 0 {
-			result, err = modules.Cloudgroupusers.ListDescendent2(s, args.Clouduser, params)
-		} else {
-			result, err = modules.Cloudgroupusers.List(s, params)
-		}
-		if err != nil {
-			return err
-		}
-		printList(result, modules.Cloudgroupusers.GetColumns(s))
-		return nil
-	})
-
-	type CloudgroupUserDetailOptions struct {
-		CLOUDUSER   string `help:"ID or Name of Cloudgroup"`
-		CLOUDPOLICY string `help:"ID or Name of Clouduser"`
-	}
-	R(&CloudgroupUserDetailOptions{}, "cloud-group-user-show", "Show cloudgroupuser details", func(s *mcclient.ClientSession, args *CloudgroupUserDetailOptions) error {
-		query := jsonutils.NewDict()
-		result, err := modules.Cloudgroupusers.Get(s, args.CLOUDUSER, args.CLOUDPOLICY, query)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
+	cmd := shell.NewResourceCmd(&modules.Cloudgroupusers).WithKeyword("cloud-group-user").WithContextManager(&modules.Cloudusers)
+	cmd.List(&cloudid.CloudgroupUserListOptions{})
 }

cmd/climc/shell/cloudid/cloudpolicy.go

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

cmd/climc/shell/cloudid/cloudpolicycache.go

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

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

cmd/climc/shell/cloudid/clouduserpolicies.go

@@ -15,58 +15,12 @@
 package cloudid
 
 import (
-	"yunion.io/x/jsonutils"
-
-	"yunion.io/x/onecloud/pkg/mcclient"
-	"yunion.io/x/onecloud/pkg/mcclient/modulebase"
+	"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/cloudid"
 )
 
 func init() {
-	type ClouduserPolicyListOptions struct {
-		options.BaseListOptions
-		Clouduser   string `help:"ID or Name of Clouduser"`
-		Cloudpolicy string `help:"Policy ID or name"`
-	}
-	R(&ClouduserPolicyListOptions{}, "cloud-user-policy-list", "List clouduser cloudpolicy pairs", func(s *mcclient.ClientSession, args *ClouduserPolicyListOptions) error {
-		var params *jsonutils.JSONDict
-		{
-			var err error
-			params, err = args.BaseListOptions.Params()
-			if err != nil {
-				return err
-
-			}
-		}
-		var result *modulebase.ListResult
-		var err error
-		if len(args.Clouduser) > 0 {
-			result, err = modules.Clouduserpolicies.ListDescendent(s, args.Clouduser, params)
-		} else if len(args.Cloudpolicy) > 0 {
-			result, err = modules.Clouduserpolicies.ListDescendent2(s, args.Cloudpolicy, params)
-		} else {
-			result, err = modules.Clouduserpolicies.List(s, params)
-		}
-		if err != nil {
-			return err
-		}
-		printList(result, modules.Clouduserpolicies.GetColumns(s))
-		return nil
-	})
-
-	type ClouduserPolicyDetailOptions struct {
-		CLOUDUSER   string `help:"ID or Name of Clouduser"`
-		CLOUDPOLICY string `help:"ID or Name of Cloudpolicy"`
-	}
-	R(&ClouduserPolicyDetailOptions{}, "cloud-user-policy-show", "Show clouduserpolicy details", func(s *mcclient.ClientSession, args *ClouduserPolicyDetailOptions) error {
-		query := jsonutils.NewDict()
-		result, err := modules.Clouduserpolicies.Get(s, args.CLOUDUSER, args.CLOUDPOLICY, query)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
+	cmd := shell.NewResourceCmd(&modules.Clouduserpolicies).WithKeyword("cloud-user-policy").WithContextManager(&modules.Cloudpolicies)
+	cmd.List(&cloudid.ClouduserPolicyListOptions{})
 }

cmd/climc/shell/cloudid/cloudusers.go

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

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

cmd/climc/shell/cloudid/samluser.go

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

cmd/climc/shell/compute/buckets.go

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

cmd/climc/shell/compute/cloudproviders.go

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

cmd/climc/shell/compute/cloudregions.go

@@ -19,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

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

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

cmd/climc/shell/compute/elasticips.go

@@ -50,8 +50,9 @@ 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"`
 	}
 	R(&EipCreateOptions{}, "eip-create", "Create an EIP", func(s *mcclient.ClientSession, args *EipCreateOptions) error {
@@ -74,9 +75,12 @@ func init() {
 		if len(args.Network) > 0 {
 			params.Add(jsonutils.NewString(args.Network), "network")
 		}
+		if len(args.BgpType) > 0 {
+			params.Add(jsonutils.NewString(args.BgpType), "bgp_type")
+		}
 
-		if len(args.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)
@@ -186,12 +190,16 @@ func init() {
 	type ServerCreateEipOptions struct {
 		ID         string `help:"server ID or name"`
 		BW         int    `help:"EIP bandwidth in Mbps"`
+		BgpType    string `help:"desired BGP type"`
 		ChargeType string `help:"bandwidth charge type" choices:"traffic|bandwidth"`
 	}
 	R(&ServerCreateEipOptions{}, "server-create-eip", "allocate an EIP and associate EIP to server", func(s *mcclient.ClientSession, args *ServerCreateEipOptions) error {
 		params := jsonutils.NewDict()
 		params.Add(jsonutils.NewInt(int64(args.BW)), "bandwidth")
 
+		if args.BgpType != "" {
+			params.Add(jsonutils.NewString(args.BgpType), "bgp_type")
+		}
 		if len(args.ChargeType) > 0 {
 			params.Add(jsonutils.NewString(args.ChargeType), "charge_type")
 		}

cmd/climc/shell/compute/hosts.go

@@ -407,12 +407,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 +428,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/loadbalancers.go

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

cmd/climc/shell/compute/networks.go

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

cmd/climc/shell/compute/quotas.go

@@ -58,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,142 +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"`
-	}
-	R(&SchedtagCreateOptions{}, "schedtag-create", "Create a schedule tag", func(s *mcclient.ClientSession, args *SchedtagCreateOptions) error {
-		params := jsonutils.NewDict()
-		params.Add(jsonutils.NewString(args.NAME), "name")
-		if len(args.Strategy) > 0 {
-			params.Add(jsonutils.NewString(args.Strategy), "default_strategy")
-		}
-		if len(args.Desc) > 0 {
-			params.Add(jsonutils.NewString(args.Desc), "description")
-		}
-		if len(args.Type) > 0 {
-			params.Add(jsonutils.NewString(args.Type), "resource_type")
-		}
-		if len(args.Scope) > 0 {
-			params.Add(jsonutils.NewString(args.Scope), "scope")
-		}
-		schedtag, err := modules.Schedtags.Create(s, params)
-		if err != nil {
-			return err
-		}
-		printObject(schedtag)
-		return nil
-	})
-
-	type SchedtagUpdateOptions struct {
-		ID            string `help:"ID or Name of schetag"`
-		Name          string `help:"New name of schedtag"`
-		Strategy      string `help:"Policy" choices:"require|exclude|prefer|avoid"`
-		Desc          string `help:"Description"`
-		ClearStrategy bool   `help:"Clear default schedule policy"`
-	}
-	R(&SchedtagUpdateOptions{}, "schedtag-update", "Update a schedule tag", func(s *mcclient.ClientSession, args *SchedtagUpdateOptions) error {
-		params := jsonutils.NewDict()
-		if len(args.Name) > 0 {
-			params.Add(jsonutils.NewString(args.Name), "name")
-		}
-		if len(args.Strategy) > 0 {
-			params.Add(jsonutils.NewString(args.Strategy), "default_strategy")
-		}
-		if len(args.Desc) > 0 {
-			params.Add(jsonutils.NewString(args.Desc), "description")
-		}
-		if args.ClearStrategy {
-			params.Add(jsonutils.NewString(""), "default_strategy")
-		}
-		if params.Size() == 0 {
-			return fmt.Errorf("No valid data to update")
-		}
-		schedtag, err := modules.Schedtags.Update(s, args.ID, params)
-		if err != nil {
-			return err
-		}
-		printObject(schedtag)
-		return nil
-	})
-
-	type SetScopeOptions struct {
-		ID      []string `help:"ID or Name of schetag"`
-		Project string   `help:"ID or Name of project"`
-		Domain  string   `help:"ID or Name of domain"`
-		System  bool     `help:"Set to system scope"`
-	}
-	R(&SetScopeOptions{}, "schedtag-set-scope", "Set schedtag scope", func(s *mcclient.ClientSession, args *SetScopeOptions) error {
-		params := jsonutils.NewDict()
-		domainId := args.Domain
-		projectId := args.Project
-		if args.System {
-			domainId = ""
-			projectId = ""
-		}
-		params.Add(jsonutils.NewString(domainId), "domain")
-		params.Add(jsonutils.NewString(projectId), "project")
-		ret := modules.Schedtags.BatchPerformAction(s, args.ID, "set-scope", params)
-		printBatchResults(ret, modules.Schedtags.GetColumns(s))
-		return nil
-	})
+	cmd.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/secgroups.go

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

cmd/climc/shell/compute/servers.go

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

cmd/climc/shell/compute/skus.go

@@ -15,194 +15,32 @@
 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.PerformWithKeyword("cache", "cache-sku", &options.ServerSkusCacheOptions{})
+	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/usages.go

@@ -32,6 +32,8 @@ type GeneralUsageOptions struct {
 
 	CloudEnv string `help:"show usage of specified cloudenv" choices:"public|private|onpremise"`
 	Scope    string `help:"show usage of specified privilege scope" choices:"system|domain|project"`
+
+	Refresh bool `help:"force refresh usage statistics"`
 }
 
 func fetchHostTypeOptions(args *GeneralUsageOptions) *jsonutils.JSONDict {
@@ -48,6 +50,9 @@ func fetchHostTypeOptions(args *GeneralUsageOptions) *jsonutils.JSONDict {
 	if len(args.CloudEnv) > 0 {
 		params.Add(jsonutils.NewString(args.CloudEnv), "cloud_env")
 	}
+	if args.Refresh {
+		params.Add(jsonutils.JSONTrue, "refresh")
+	}
 	return params
 }
 

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/helper.go

@@ -134,6 +134,10 @@ func (cmd ResourceCmd) List(args IListOpt) {
 }
 
 func (cmd ResourceCmd) Create(args ICreateOpt) {
+	cmd.CreateWithKeyworkd("create", args)
+}
+
+func (cmd ResourceCmd) CreateWithKeyworkd(keyword string, args ICreateOpt) {
 	man := cmd.manager
 	callback := func(s *mcclient.ClientSession, args ICreateOpt) error {
 		params, err := args.Params()
@@ -147,7 +151,7 @@ func (cmd ResourceCmd) Create(args ICreateOpt) {
 		printObject(ret)
 		return nil
 	}
-	cmd.Run("create", args, callback)
+	cmd.Run(keyword, args, callback)
 }
 
 type IIdOpt interface {
@@ -281,10 +285,13 @@ type IPerformOpt interface {
 	IIdOpt
 }
 
-func (cmd ResourceCmd) Perform(action string, args IPerformOpt) {
+func (cmd ResourceCmd) PerformWithKeyword(keyword, action string, args IPerformOpt) {
 	man := cmd.manager
 	callback := func(s *mcclient.ClientSession, args IPerformOpt) error {
-		params := jsonutils.Marshal(args) // .Params()
+		params, err := args.Params()
+		if err != nil {
+			return err
+		}
 		ret, err := man.(modulebase.Manager).PerformAction(s, args.GetId(), action, params)
 		if err != nil {
 			return err
@@ -292,7 +299,28 @@ func (cmd ResourceCmd) Perform(action string, args IPerformOpt) {
 		printObject(ret)
 		return nil
 	}
-	cmd.Run(action, args, callback)
+	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)
 }
 
 func (cmd ResourceCmd) PerformClass(action string, args IOpt) {
@@ -358,13 +386,18 @@ type IUpdateOpt interface {
 	IIdOpt
 }
 
-func (cmd ResourceCmd) Update(args IUpdateOpt) {
+func (cmd ResourceCmd) UpdateWithKeyword(keyword string, args IUpdateOpt) {
 	man := cmd.manager
 	callback := func(s *mcclient.ClientSession, args IUpdateOpt) error {
-		params, err := args.Params()
+		_params, err := args.Params()
 		if err != nil {
 			return err
 		}
+		params := _params.(*jsonutils.JSONDict)
+		params.Remove("id")
+		if params.Length() == 0 {
+			return InvalidUpdateError()
+		}
 		ret, err := man.(modulebase.Manager).Update(s, args.GetId(), params)
 		if err != nil {
 			return err
@@ -372,7 +405,11 @@ func (cmd ResourceCmd) Update(args IUpdateOpt) {
 		printObject(ret)
 		return nil
 	}
-	cmd.Run("update", args, callback)
+	cmd.Run(keyword, args, callback)
+}
+
+func (cmd ResourceCmd) Update(args IUpdateOpt) {
+	cmd.UpdateWithKeyword("update", args)
 }
 
 type IMetadataOpt interface {

cmd/climc/shell/identity/domains.go

@@ -25,7 +25,8 @@ import (
 func init() {
 	type DomainListOptions struct {
 		options.BaseListOptions
-		IdpId string `help:"filter by idp_id"`
+		IdpId       string `help:"filter by idp_id"`
+		IdpEntityId string `help:"filter by idp_entity_id"`
 	}
 	R(&DomainListOptions{}, "domain-list", "List domains", func(s *mcclient.ClientSession, args *DomainListOptions) error {
 		params, err := options.ListStructToParams(args)
@@ -155,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

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

cmd/climc/shell/identity/keystone.go

@@ -0,0 +1,34 @@
+// Copyright 2019 Yunion
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package identity
+
+import (
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
+)
+
+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

@@ -30,6 +30,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"
 )
@@ -183,6 +184,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()
@@ -192,6 +194,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

@@ -31,6 +31,7 @@ func init() {
 		OrderByDomain string `help:"order by domain name" choices:"asc|desc"`
 		Role          string `help:"Filter by role"`
 		IdpId         string `help:"filter by idp_id"`
+		IdpEntityId   string `help:"filter by idp_entity_id"`
 	}
 	R(&UserListOptions{}, "user-list", "List users", func(s *mcclient.ClientSession, args *UserListOptions) error {
 		params, err := options.ListStructToParams(args)

cmd/climc/shell/misc/copyright.go

@@ -36,6 +36,8 @@ func init() {
 		Email     string  `help:"The Email"`
 		Docs      *string `help:"the Docs website address"`
 		License   *string `help:"the license generator website address"`
+		BrandCn   *string `help:"the brand name in Chinese"`
+		BrandEn   *string `help:"the brand name in English"`
 	}
 
 	R(&CopyrightUpdateOptions{}, "copyright-update", "update copyright", func(s *mcclient.ClientSession, args *CopyrightUpdateOptions) error {
@@ -52,6 +54,14 @@ func init() {
 			params.Add(jsonutils.NewString(*args.License), "license")
 		}
 
+		if args.BrandCn != nil {
+			params.Add(jsonutils.NewString(*args.BrandCn), "brand_cn")
+		}
+
+		if args.BrandEn != nil {
+			params.Add(jsonutils.NewString(*args.BrandEn), "brand_en")
+		}
+
 		if len(args.Copyright) > 0 {
 			params.Add(jsonutils.NewString(args.Copyright), "copyright")
 		}

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/yunionconf/parameters.go

@@ -20,6 +20,7 @@ import (
 	"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/modules/yunionconf"
 	"yunion.io/x/onecloud/pkg/mcclient/options"
 )
 
@@ -46,21 +47,21 @@ func init() {
 		if len(args.NamespaceId) > 0 {
 			params.Add(jsonutils.NewString(args.NamespaceId), "namespace_id")
 			params.Add(jsonutils.NewString("system"), "scope")
-			result, err = modules.Parameters.List(s, params)
+			result, err = yunionconf.Parameters.List(s, params)
 		} else if len(args.User) > 0 {
 			params.Add(jsonutils.NewString("system"), "scope")
-			result, err = modules.Parameters.ListInContext(s, params, &modules.UsersV3, args.User)
+			result, err = yunionconf.Parameters.ListInContext(s, params, &modules.UsersV3, args.User)
 		} else if len(args.Service) > 0 {
 			params.Add(jsonutils.NewString("system"), "scope")
-			result, err = modules.Parameters.ListInContext(s, params, &modules.ServicesV3, args.Service)
+			result, err = yunionconf.Parameters.ListInContext(s, params, &modules.ServicesV3, args.Service)
 		} else {
-			result, err = modules.Parameters.List(s, params)
+			result, err = yunionconf.Parameters.List(s, params)
 		}
 
 		if err != nil {
 			return err
 		}
-		printList(result, modules.Parameters.GetColumns(s))
+		printList(result, yunionconf.Parameters.GetColumns(s))
 		return nil
 	})
 
@@ -83,15 +84,15 @@ func init() {
 		if len(args.NamespaceId) > 0 {
 			params.Add(jsonutils.NewString("system"), "scope")
 			params.Add(jsonutils.NewString(args.NamespaceId), "namespace_id")
-			parameter, err = modules.Parameters.Get(s, args.NAME, params)
+			parameter, err = yunionconf.Parameters.Get(s, args.NAME, params)
 		} else if len(args.User) > 0 {
 			params.Add(jsonutils.NewString("system"), "scope")
-			parameter, err = modules.Parameters.GetInContext(s, args.NAME, params, &modules.UsersV3, args.User)
+			parameter, err = yunionconf.Parameters.GetInContext(s, args.NAME, params, &modules.UsersV3, args.User)
 		} else if len(args.Service) > 0 {
 			params.Add(jsonutils.NewString("system"), "scope")
-			parameter, err = modules.Parameters.GetInContext(s, args.NAME, params, &modules.ServicesV3, args.Service)
+			parameter, err = yunionconf.Parameters.GetInContext(s, args.NAME, params, &modules.ServicesV3, args.Service)
 		} else {
-			parameter, err = modules.Parameters.Get(s, args.NAME, params)
+			parameter, err = yunionconf.Parameters.Get(s, args.NAME, params)
 		}
 
 		if err != nil {
@@ -124,7 +125,7 @@ func init() {
 			params.Add(jsonutils.NewString(args.Service), "service_id")
 		}
 
-		parameter, err := modules.Parameters.Create(s, params)
+		parameter, err := yunionconf.Parameters.Create(s, params)
 		if err != nil {
 			return err
 		}
@@ -153,11 +154,11 @@ func init() {
 		}
 
 		if len(args.User) > 0 {
-			parameter, err = modules.Parameters.PutInContext(s, args.NAME, params, &modules.UsersV3, args.User)
+			parameter, err = yunionconf.Parameters.PutInContext(s, args.NAME, params, &modules.UsersV3, args.User)
 		} else if len(args.Service) > 0 {
-			parameter, err = modules.Parameters.PutInContext(s, args.NAME, params, &modules.ServicesV3, args.Service)
+			parameter, err = yunionconf.Parameters.PutInContext(s, args.NAME, params, &modules.ServicesV3, args.Service)
 		} else {
-			parameter, err = modules.Parameters.Put(s, args.NAME, params)
+			parameter, err = yunionconf.Parameters.Put(s, args.NAME, params)
 		}
 
 		if err != nil {
@@ -179,11 +180,11 @@ func init() {
 		var parameter jsonutils.JSONObject
 		var err error
 		if len(args.User) > 0 {
-			parameter, err = modules.Parameters.DeleteInContext(s, args.NAME, params, &modules.UsersV3, args.User)
+			parameter, err = yunionconf.Parameters.DeleteInContext(s, args.NAME, params, &modules.UsersV3, args.User)
 		} else if len(args.Service) > 0 {
-			parameter, err = modules.Parameters.DeleteInContext(s, args.NAME, params, &modules.ServicesV3, args.Service)
+			parameter, err = yunionconf.Parameters.DeleteInContext(s, args.NAME, params, &modules.ServicesV3, args.Service)
 		} else {
-			parameter, err = modules.Parameters.Delete(s, args.NAME, nil)
+			parameter, err = yunionconf.Parameters.Delete(s, args.NAME, nil)
 		}
 
 		if err != nil {

cmd/climc/shell/yunionconf/scopedpolicies.go

@@ -0,0 +1,31 @@
+// 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 yunionconf
+
+import (
+	"yunion.io/x/onecloud/cmd/climc/shell"
+	modules "yunion.io/x/onecloud/pkg/mcclient/modules/yunionconf"
+	options "yunion.io/x/onecloud/pkg/mcclient/options/yunionconf"
+)
+
+func init() {
+	cmd := shell.NewResourceCmd(&modules.ScopedPolicies)
+	cmd.List(new(options.ScopedPolicyListOptions))
+	cmd.Show(new(options.ScopedPolicyShowOptions))
+	cmd.Create(new(options.ScopedPolicyCreateOptions))
+	cmd.Update(new(options.ScopedPolicyUpdateOptions))
+	cmd.Delete(new(options.ScopedPolicyIDOptions))
+	cmd.Perform("bind", new(options.ScopedPolicyBindOptions))
+}

cmd/climc/shell/yunionconf/scopedpolicybindings.go

@@ -0,0 +1,28 @@
+// 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 yunionconf
+
+import (
+	"yunion.io/x/onecloud/cmd/climc/shell"
+	modules "yunion.io/x/onecloud/pkg/mcclient/modules/yunionconf"
+	options "yunion.io/x/onecloud/pkg/mcclient/options/yunionconf"
+)
+
+func init() {
+	cmd := shell.NewResourceCmd(&modules.ScopedPolicyBindings)
+	cmd.List(new(options.ScopedPolicyBindingListOptions))
+	cmd.Show(new(options.ScopedPolicyBindingShowOptions))
+	cmd.Delete(new(options.ScopedPolicyBindingIDOptions))
+}

cmd/esxi-agent/main.go

@@ -15,12 +15,17 @@
 package main
 
 import (
+	"context"
+
 	"yunion.io/x/onecloud/pkg/esxi/service"
 	"yunion.io/x/onecloud/pkg/util/atexit"
+	"yunion.io/x/onecloud/pkg/util/procutils"
 )
 
 func main() {
 	defer atexit.Handle()
 
+	go procutils.WaitZombieLoop(context.TODO())
+
 	service.New().StartService()
 }

cmd/glance/main.go

@@ -15,12 +15,17 @@
 package main
 
 import (
+	"context"
+
 	"yunion.io/x/onecloud/pkg/image/service"
 	"yunion.io/x/onecloud/pkg/util/atexit"
+	"yunion.io/x/onecloud/pkg/util/procutils"
 )
 
 func main() {
 	defer atexit.Handle()
 
+	go procutils.WaitZombieLoop(context.TODO())
+
 	service.StartService()
 }

cmd/host-deployer/main.go

@@ -14,9 +14,16 @@
 
 package main
 
-import "yunion.io/x/onecloud/pkg/hostman/hostdeployer/deployserver"
+import (
+	"context"
+
+	"yunion.io/x/onecloud/pkg/hostman/hostdeployer/deployserver"
+	"yunion.io/x/onecloud/pkg/util/procutils"
+)
 
 func main() {
+	go procutils.WaitZombieLoop(context.TODO())
+
 	deployer := deployserver.NewDeployService()
 	deployer.StartService()
 }

cmd/host/main.go

@@ -15,14 +15,19 @@
 package main
 
 import (
+	"context"
+
 	"yunion.io/x/onecloud/pkg/cloudcommon/service"
 	"yunion.io/x/onecloud/pkg/hostman"
 	"yunion.io/x/onecloud/pkg/util/atexit"
+	"yunion.io/x/onecloud/pkg/util/procutils"
 )
 
 func main() {
 	defer atexit.Handle()
 
+	go procutils.WaitZombieLoop(context.TODO())
+
 	var srv = &hostman.SHostService{}
 	srv.SServiceBase = &service.SServiceBase{
 		Service: srv,

cmd/vpcagent/main.go

@@ -26,6 +26,7 @@ import (
 	app_common "yunion.io/x/onecloud/pkg/cloudcommon/app"
 	common_options "yunion.io/x/onecloud/pkg/cloudcommon/options"
 	"yunion.io/x/onecloud/pkg/util/atexit"
+	"yunion.io/x/onecloud/pkg/util/procutils"
 	"yunion.io/x/onecloud/pkg/vpcagent/options"
 	_ "yunion.io/x/onecloud/pkg/vpcagent/ovn"
 	"yunion.io/x/onecloud/pkg/vpcagent/worker"
@@ -52,8 +53,12 @@ func main() {
 	}
 
 	{
+
+		ctx := context.Background()
+		ctx, cancelFunc := context.WithCancel(ctx)
+		go procutils.WaitZombieLoop(ctx)
+
 		wg := &sync.WaitGroup{}
-		ctx, cancelFunc := context.WithCancel(context.Background())
 		ctx = context.WithValue(ctx, "wg", wg)
 		wg.Add(1)
 		go w.Start(ctx)

cmd/webconsole/main.go

@@ -15,12 +15,17 @@
 package main
 
 import (
+	"context"
+
 	"yunion.io/x/onecloud/pkg/util/atexit"
+	"yunion.io/x/onecloud/pkg/util/procutils"
 	"yunion.io/x/onecloud/pkg/webconsole/service"
 )
 
 func main() {
 	defer atexit.Handle()
 
+	go procutils.WaitZombieLoop(context.TODO())
+
 	service.StartService()
 }

go.mod

@@ -106,7 +106,7 @@ require (
 	github.com/spaolacci/murmur3 v1.1.0 // indirect
 	github.com/stretchr/testify v1.5.1
 	github.com/tencentcloud/tencentcloud-sdk-go v3.0.135+incompatible
-	github.com/tencentyun/cos-go-sdk-v5 v0.0.0-20191108095731-8ca4b370cde4
+	github.com/tencentyun/cos-go-sdk-v5 v0.7.24
 	github.com/tinylib/msgp v1.1.0 // indirect
 	github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5 // indirect
 	github.com/tredoe/osutil v0.0.0-20161130133508-7d3ee1afa71c
@@ -140,13 +140,13 @@ require (
 	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
-	yunion.io/x/jsonutils v0.0.0-20201014025429-7ce189228db6
-	yunion.io/x/log v0.0.0-20200313080802-57a4ce5966b3
+	yunion.io/x/executor v0.0.0-20210310041834-3fcd1574f68e
+	yunion.io/x/jsonutils v0.0.0-20201110084044-3e4e1cb49769
+	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-20200814072949-4f1b541857d6
+	yunion.io/x/pkg v0.0.0-20210218105412-13a69f60034c
 	yunion.io/x/s3cli v0.0.0-20190917004522-13ac36d8687e
-	yunion.io/x/sqlchemy v0.0.0-20201014101037-8fe75542e6d8
+	yunion.io/x/sqlchemy v0.0.0-20210329171939-2c520f93aee3
 	yunion.io/x/structarg v0.0.0-20200720093445-9f850fa222ce
 )
 

go.sum

@@ -732,8 +732,8 @@ github.com/syncthing/syncthing v0.14.48-rc.4/go.mod h1:nw3siZwHPA6M8iSfjDCWQ402e
 github.com/syndtr/gocapability v0.0.0-20160928074757-e7cb7fa329f4/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww=
 github.com/tencentcloud/tencentcloud-sdk-go v3.0.135+incompatible h1:QIMoFqKCmNp4HPLiTR+couZbHsIZfoOllncHYvtqse8=
 github.com/tencentcloud/tencentcloud-sdk-go v3.0.135+incompatible/go.mod h1:0PfYow01SHPMhKY31xa+EFz2RStxIqj6JFAJS+IkCi4=
-github.com/tencentyun/cos-go-sdk-v5 v0.0.0-20191108095731-8ca4b370cde4 h1:wVKDVTKxaf0ll8ONv22Q+cazYSSmcWt7JJOeQD0LoKQ=
-github.com/tencentyun/cos-go-sdk-v5 v0.0.0-20191108095731-8ca4b370cde4/go.mod h1:wk2XFUg6egk4tSDNZtXeKfe2G6690UVyt163PuUxBZk=
+github.com/tencentyun/cos-go-sdk-v5 v0.7.24 h1:ZsZij764lOaPsj7mEAlyxXvslGt6/m312Tzqj/zeRpo=
+github.com/tencentyun/cos-go-sdk-v5 v0.7.24/go.mod h1:wQBO5HdAkLjj2q6XQiIfDSP8DXDNrppDRw2Kp/1BODA=
 github.com/texttheater/golang-levenshtein v0.0.0-20180516184445-d188e65d659e h1:T5PdfK/M1xyrHwynxMIVMWLS7f/qHwfslZphxtGnw7s=
 github.com/texttheater/golang-levenshtein v0.0.0-20180516184445-d188e65d659e/go.mod h1:XDKHRm5ThF8YJjx001LtgelzsoaEcvnA7lVWz9EeX3g=
 github.com/thecodeteam/goscaleio v0.1.0/go.mod h1:68sdkZAsK8bvEwBlbQnlLS+xU+hvLYM/iQ8KXej1AwM=
@@ -1121,25 +1121,25 @@ sigs.k8s.io/structured-merge-diff v0.0.0-20190817042607-6149e4549fca/go.mod h1:I
 sigs.k8s.io/yaml v1.1.0 h1:4A07+ZFc2wgJwo8YNlQpr1rVlgUDlxXHhPJciaPY5gs=
 sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=
 vbom.ml/util v0.0.0-20160121211510-db5cfe13f5cc/go.mod h1:so/NYdZXCz+E3ZpW0uAoCj6uzU2+8OWDFv/HxUSs7kI=
-yunion.io/x/executor v0.0.0-20200227030256-a18417815e74 h1:A15C6VdVRWvmQ9pAJHrUs9yan5qKlYH7uaRxHg1kRbk=
-yunion.io/x/executor v0.0.0-20200227030256-a18417815e74/go.mod h1:Uxuou9WQIeJXNpy7t2fPLL0BYLvLiMvGQwY7Qc6aSws=
+yunion.io/x/executor v0.0.0-20210310041834-3fcd1574f68e h1:uGmKmmHm4zeLXhc/MEbAFtEDtGtyEYhC0OaBRGFi+fQ=
+yunion.io/x/executor v0.0.0-20210310041834-3fcd1574f68e/go.mod h1:Uxuou9WQIeJXNpy7t2fPLL0BYLvLiMvGQwY7Qc6aSws=
 yunion.io/x/jsonutils v0.0.0-20190625054549-a964e1e8a051/go.mod h1:4N0/RVzsYL3kH3WE/H1BjUQdFiWu50JGCFQuuy+Z634=
-yunion.io/x/jsonutils v0.0.0-20201014025429-7ce189228db6 h1:RPpnTSCZwa9VQuWAf7S2dRjnZlYTIM0NH/j5vvUpk9g=
-yunion.io/x/jsonutils v0.0.0-20201014025429-7ce189228db6/go.mod h1:p0nyMqGA/apTxxyLIU/o1k4V7Vujl2O6ey30L594sYE=
+yunion.io/x/jsonutils v0.0.0-20201110084044-3e4e1cb49769 h1:LIQ4hhLGQuQK+XxlV+8JrKBuL37WUT+5ZTVxBwHOTD4=
+yunion.io/x/jsonutils v0.0.0-20201110084044-3e4e1cb49769/go.mod h1:p0nyMqGA/apTxxyLIU/o1k4V7Vujl2O6ey30L594sYE=
 yunion.io/x/log v0.0.0-20190514041436-04ce53b17c6b/go.mod h1:+gauLs73omeJAPlsXcevLsJLKixV+sR/E7WSYTSx1fE=
-yunion.io/x/log v0.0.0-20190629062853-9f6483a7103d h1:59zrDL7Ft+hDukguJRmLr/Gdu/9V75x+yX99ovZwfaA=
 yunion.io/x/log v0.0.0-20190629062853-9f6483a7103d/go.mod h1:LC6f/4FozL0iaAbnFt2eDX9jlsyo3WiOUPm03d7+U4U=
-yunion.io/x/log v0.0.0-20200313080802-57a4ce5966b3 h1:5Wc5hkB8PtMudmHuzCyok960RuOa9I55imIGrigSdjs=
-yunion.io/x/log v0.0.0-20200313080802-57a4ce5966b3/go.mod h1:LC6f/4FozL0iaAbnFt2eDX9jlsyo3WiOUPm03d7+U4U=
+yunion.io/x/log v0.0.0-20201210064738-43181789dc74 h1:7D+sQ/XaUTUEm+NCrKXOhXBKlzEd0RyS2qZ4vBGjx2o=
+yunion.io/x/log v0.0.0-20201210064738-43181789dc74/go.mod h1:LC6f/4FozL0iaAbnFt2eDX9jlsyo3WiOUPm03d7+U4U=
 yunion.io/x/ovsdb v0.0.0-20200526071744-27bf0940cbc7 h1:gjqNa2uQzIEXyySsbvVz0UltTEbGsnFFlvnzOpCfHdo=
 yunion.io/x/ovsdb v0.0.0-20200526071744-27bf0940cbc7/go.mod h1:0vLkNEhlmA64HViPBAnSTUMrx5QP1CLsxXmxDKQ80tc=
 yunion.io/x/pkg v0.0.0-20190620104149-945c25821dbf/go.mod h1:t6rEGG2sQ4J7DhFxSZVOTjNd0YO/KlfWQyK1W4tog+E=
 yunion.io/x/pkg v0.0.0-20190628082551-f4033ba2ea30/go.mod h1:t6rEGG2sQ4J7DhFxSZVOTjNd0YO/KlfWQyK1W4tog+E=
-yunion.io/x/pkg v0.0.0-20200814072949-4f1b541857d6 h1:UarEDTBGkgcgc+nc+PZ75uo9M9+jiOGd5P2B90TxDNw=
 yunion.io/x/pkg v0.0.0-20200814072949-4f1b541857d6/go.mod h1:t6rEGG2sQ4J7DhFxSZVOTjNd0YO/KlfWQyK1W4tog+E=
+yunion.io/x/pkg v0.0.0-20210218105412-13a69f60034c h1:J/joqbA1N2mAlOl0Uqd4LpAq3+DK5aoFMdz+p9Ld7pQ=
+yunion.io/x/pkg v0.0.0-20210218105412-13a69f60034c/go.mod h1:t6rEGG2sQ4J7DhFxSZVOTjNd0YO/KlfWQyK1W4tog+E=
 yunion.io/x/s3cli v0.0.0-20190917004522-13ac36d8687e h1:v+EzIadodSwkdZ/7bremd7J8J50Cise/HCylsOJngmo=
 yunion.io/x/s3cli v0.0.0-20190917004522-13ac36d8687e/go.mod h1:0iFKpOs1y4lbCxeOmq3Xx/0AcQoewVPwj62eRluioEo=
-yunion.io/x/sqlchemy v0.0.0-20201014101037-8fe75542e6d8 h1:AkPrqO37Yi3aICys9qDjTlSdVVGh2pWQ8ET+dSJmhoI=
-yunion.io/x/sqlchemy v0.0.0-20201014101037-8fe75542e6d8/go.mod h1:FTdwPdGhMgh4E+UFXc9klI1Ok34fMuybTT+jLhOaIjI=
+yunion.io/x/sqlchemy v0.0.0-20210329171939-2c520f93aee3 h1:C4yasW3gXronDIlIVUqHSbkA38PM1X9gxUWTYGsuIuI=
+yunion.io/x/sqlchemy v0.0.0-20210329171939-2c520f93aee3/go.mod h1:FTdwPdGhMgh4E+UFXc9klI1Ok34fMuybTT+jLhOaIjI=
 yunion.io/x/structarg v0.0.0-20200720093445-9f850fa222ce h1:kU8xE7O5uZ1GSJVMZHoJ+jrNL7csUQHYGyAPW9QfNpE=
 yunion.io/x/structarg v0.0.0-20200720093445-9f850fa222ce/go.mod h1:EP6NSv2C0zzqBDTKumv8hPWLb3XvgMZDHQRfyuOrQng=

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,10 @@ 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).
+		RolePublic(options.Options.RolePublic).
+		Timeout(options.Options.Timeout)
 	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,9 @@ 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"`
+	RolePublic bool `help:"Download and use the role of the public directory"`
+	Timeout    int  `help:"Ansible Override the connection timeout in seconds" default:"10"`
 }
 
 var (

pkg/apigateway/app/app.go

@@ -23,14 +23,14 @@ import (
 type Application struct {
 	*appsrv.Application
 
-	AuthHandler          handler.IHandler
-	MiscHandler          handler.IHandler
-	K8sHandler           handler.IHandler
-	ResourceHandler      handler.IHandler
-	CSRFResourceHandler  handler.IHandler
-	RPCHandler           handler.IHandler
-	InfluxdbProxyHandler handler.IHandler
-	CloudIdSAMLHandler   handler.IHandler
+	AuthHandler         handler.IHandler
+	MiscHandler         handler.IHandler
+	K8sHandler          handler.IHandler
+	ResourceHandler     handler.IHandler
+	CSRFResourceHandler handler.IHandler
+	RPCHandler          handler.IHandler
+	// InfluxdbProxyHandler handler.IHandler
+	CloudIdSAMLHandler handler.IHandler
 }
 
 func NewApp(app *appsrv.Application) *Application {
@@ -66,7 +66,7 @@ func (app *Application) InitHandlers() *Application {
 		AddGet(handler.FetchAuthToken).
 		AddPost(handler.FetchAuthToken)
 
-	app.InfluxdbProxyHandler = handler.NewInfluxdbProxyHandler("/query")
+	// app.InfluxdbProxyHandler = handler.NewInfluxdbProxyHandler("/query")
 
 	app.CloudIdSAMLHandler = handler.NewProxyHandlerWithService(cloudid.SAML_IDP_PREFIX, cloudid.SERVICE_TYPE)
 
@@ -76,7 +76,7 @@ func (app *Application) InitHandlers() *Application {
 func (app *Application) Bind() {
 	for _, h := range []handler.IHandler{
 		app.CloudIdSAMLHandler,
-		app.InfluxdbProxyHandler,
+		// app.InfluxdbProxyHandler,
 		app.MiscHandler,
 		app.AuthHandler,
 		app.K8sHandler,

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"),
@@ -139,7 +140,7 @@ func (h *AuthHandlers) GetRegionsResponse(ctx context.Context, w http.ResponseWr
 	if options.Options.ReturnFullDomainList {
 		filters := jsonutils.NewDict()
 		if len(currentDomain) > 0 {
-			filters.Add(jsonutils.NewString(currentDomain), "id")
+			filters.Add(jsonutils.NewString(currentDomain), "name")
 		}
 		filters.Add(jsonutils.NewInt(1000), "limit")
 		result, e := modules.Domains.List(s, filters)
@@ -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()
@@ -175,7 +179,7 @@ func (h *AuthHandlers) GetRegionsResponse(ctx context.Context, w http.ResponseWr
 	}
 	retIdps := make([]jsonutils.JSONObject, 0)
 	for i := range idps.Data {
-		retIdp := idps.Data[i].(*jsonutils.JSONDict).CopyIncludes("id", "name", "driver", "template", "icon_uri")
+		retIdp := idps.Data[i].(*jsonutils.JSONDict).CopyIncludes("id", "name", "driver", "template", "icon_uri", "is_default")
 		retIdps = append(retIdps, retIdp)
 	}
 
@@ -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")
 	}
@@ -551,6 +566,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, "")
 }
 
@@ -962,6 +978,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

pkg/apigateway/handler/init.go

@@ -21,6 +21,7 @@ import (
 	"yunion.io/x/onecloud/pkg/mcclient/modules/k8s"
 	_ "yunion.io/x/onecloud/pkg/mcclient/modules/monitor"
 	_ "yunion.io/x/onecloud/pkg/mcclient/modules/notify"
+	_ "yunion.io/x/onecloud/pkg/mcclient/modules/yunionconf"
 )
 
 func init() {

pkg/apigateway/handler/misc.go

@@ -383,7 +383,9 @@ func (mh *MiscHandler) DoBatchUserRegister(ctx context.Context, w http.ResponseW
 			return
 		} else {
 			names[name+"/"+domainId] = true
-			_, err := modules.UsersV3.Get(s, name, nil)
+			params := jsonutils.NewDict()
+			params.Set("domain_id", jsonutils.NewString(domainId))
+			_, err := modules.UsersV3.Get(s, name, params)
 			if err == nil {
 				continue
 			}

pkg/apigateway/handler/proxy.go

@@ -42,8 +42,7 @@ func NewProxyHandlerWithService(prefix string, serviceName string) *InfluxdbProx
 }
 
 func requestManipulator(ctx context.Context, r *http.Request) (*http.Request, error) {
-	r.Header.Del("Cookie")
-	token := AppContextToken(ctx)
+	token, _, _ := fetchAuthInfo(ctx, r)
 	if token != nil {
 		r.Header.Set("X-Auth-Token", token.GetTokenString())
 	}

pkg/apis/cloudid/cloudgroup.go

@@ -162,3 +162,13 @@ type CloudgroupSyncInput struct {
 
 type CloudgroupUpdateInput struct {
 }
+
+type CloudgroupResourceListInput struct {
+	// 根据权限组Id过滤资源
+	CloudgroupId string `json:"cloudgroup_id"`
+}
+
+type CloudgroupResourceDetails struct {
+	// 公有云用户名称
+	Cloudgroup string `json:"cloudgroup"`
+}

pkg/apis/cloudid/cloudid.go

@@ -18,6 +18,6 @@ import "yunion.io/x/onecloud/pkg/apis"
 
 const (
 	SERVICE_TYPE    = apis.SERVICE_TYPE_CLOUDID
-	SAML_IDP_PREFIX = "/saml/idp"
+	SAML_IDP_PREFIX = "/api/saml/idp"
 	SERVICE_VERSION = ""
 )

pkg/apis/cloudid/cloudrole.go

@@ -0,0 +1,40 @@
+// Copyright 2019 Yunion
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package cloudid
+
+import "yunion.io/x/onecloud/pkg/apis"
+
+const (
+	CLOUD_ROLE_STATUS_CREATING      = "creating"      // 创建中
+	CLOUD_ROLE_STATUS_AVAILABLE     = "available"     // 正常
+	CLOUD_ROLE_STATUS_DELETING      = "deleting"      // 删除中
+	CLOUD_ROLE_STATUS_DELETE_FAILED = "delete_failed" // 删除失败
+)
+
+type CloudroleListInput struct {
+	apis.StatusInfrasResourceBaseListInput
+
+	CloudaccountResourceListInput
+}
+
+type CloudroleDetails struct {
+	apis.StatusInfrasResourceBaseDetails
+	CloudaccountResourceDetails
+
+	SCloudrole
+}
+
+type CloudrolePurgeInput 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

@@ -0,0 +1,55 @@
+// Copyright 2019 Yunion
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package cloudid
+
+import "yunion.io/x/onecloud/pkg/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_UPDATE_METADATA        = "update_metadata"
+	SAML_PROVIDER_STATUS_UPDATE_METADATA_FAILED = "update_metadata_failed"
+	SAML_PROVIDER_STATUS_SYNC                   = "sync"
+)
+
+type SAMLProviderListInput struct {
+	apis.StatusInfrasResourceBaseListInput
+	CloudaccountResourceListInput
+}
+
+type SAMLProviderDetails struct {
+	apis.StatusInfrasResourceBaseDetails
+	CloudaccountResourceDetails
+
+	SSAMLProvider
+}
+
+type SAMLProviderCreateInput struct {
+	apis.StatusInfrasResourceBaseCreateInput
+
+	CloudaccountId string `json:"cloudaccount_id"`
+
+	// swagger:ignore
+	EntityId string `json:"entity_id"`
+
+	// swagger:ignore
+	MetadataDocument string `json:"metadata_document"`
+}

pkg/apis/cloudid/samluser.go

@@ -0,0 +1,45 @@
+// Copyright 2019 Yunion
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package cloudid
+
+import "yunion.io/x/onecloud/pkg/apis"
+
+const (
+	SAML_USER_STATUS_AVAILABLE = "available"
+)
+
+type SamluserCreateInput struct {
+	apis.StatusDomainLevelUserResourceCreateInput
+
+	// 权限组和账号必须是同一平台
+	CloudgroupId string `json:"cloudgroup_id"`
+
+	// 权限组和账号必须是同一平台
+	CloudaccountId string `json:"cloudaccount_id"`
+}
+
+type SamluserListInput struct {
+	apis.StatusDomainLevelUserResourceListInput
+	CloudgroupResourceListInput
+	CloudaccountResourceListInput
+}
+
+type SamluserDetails struct {
+	apis.StatusDomainLevelUserResourceDetails
+	CloudgroupResourceDetails
+	CloudaccountResourceDetails
+
+	SSamluser
+}

pkg/apis/cloudid/zz_generated.model.go

@@ -18,13 +18,20 @@ import (
 	"yunion.io/x/onecloud/pkg/apis"
 )
 
+// SAMLProviderResourceBase is an autogenerated struct via yunion.io/x/onecloud/pkg/cloudid/models.SAMLProviderResourceBase.
+type SAMLProviderResourceBase struct {
+	SAMLProviderId string `json:"saml_provider_id"`
+}
+
 // SCloudaccount is an autogenerated struct via yunion.io/x/onecloud/pkg/cloudid/models.SCloudaccount.
 type SCloudaccount struct {
 	apis.SStandaloneResourceBase
 	apis.SDomainizedResourceBase
+	AccountId   string `json:"account_id"`
 	Provider    string `json:"provider"`
 	Brand       string `json:"brand"`
 	IamLoginUrl string `json:"iam_login_url"`
+	SAMLAuth    *bool  `json:"saml_auth,omitempty"`
 }
 
 // SCloudaccountResourceBase is an autogenerated struct via yunion.io/x/onecloud/pkg/cloudid/models.SCloudaccountResourceBase.
@@ -52,6 +59,11 @@ type SCloudgroupPolicy struct {
 	SCloudpolicyResourceBase
 }
 
+// SCloudgroupResourceBase is an autogenerated struct via yunion.io/x/onecloud/pkg/cloudid/models.SCloudgroupResourceBase.
+type SCloudgroupResourceBase struct {
+	CloudgroupId string `json:"cloudgroup_id"`
+}
+
 // SCloudgroupUser is an autogenerated struct via yunion.io/x/onecloud/pkg/cloudid/models.SCloudgroupUser.
 type SCloudgroupUser struct {
 	SCloudgroupJointsBase
@@ -121,6 +133,16 @@ type SCloudproviderResourceBase struct {
 	CloudproviderId string `json:"cloudprovider_id"`
 }
 
+// SCloudrole is an autogenerated struct via yunion.io/x/onecloud/pkg/cloudid/models.SCloudrole.
+type SCloudrole struct {
+	apis.SEnabledStatusInfrasResourceBase
+	apis.SExternalizedResourceBase
+	SCloudaccountResourceBase
+	SAMLProviderResourceBase
+	Document interface{} `json:"document"`
+	OwnerId  string      `json:"owner_id"`
+}
+
 // SClouduser is an autogenerated struct via yunion.io/x/onecloud/pkg/cloudid/models.SClouduser.
 type SClouduser struct {
 	apis.SStatusDomainLevelUserResourceBase
@@ -152,3 +174,20 @@ type SClouduserPolicy struct {
 type SClouduserResourceBase struct {
 	ClouduserId string `json:"clouduser_id"`
 }
+
+// SSAMLProvider is an autogenerated struct via yunion.io/x/onecloud/pkg/cloudid/models.SSAMLProvider.
+type SSAMLProvider struct {
+	apis.SStatusInfrasResourceBase
+	apis.SExternalizedResourceBase
+	SCloudaccountResourceBase
+	EntityId         string `json:"entity_id"`
+	MetadataDocument string `json:"metadata_document"`
+	AuthUrl          string `json:"auth_url"`
+}
+
+// SSamluser is an autogenerated struct via yunion.io/x/onecloud/pkg/cloudid/models.SSamluser.
+type SSamluser struct {
+	apis.SStatusDomainLevelUserResourceBase
+	SCloudgroupResourceBase
+	SCloudaccountResourceBase
+}

pkg/apis/compute/api.go

@@ -448,8 +448,9 @@ type ServerCreateInput struct {
 	// 弹性公网IP带宽
 	// 指定此参数后会创建新的弹性公网IP并绑定到新建的虚拟机
 	// 此参数优先级低于public_ip
-	// 私有云不支持此参数
 	EipBw int `json:"eip_bw,omitzero"`
+	// 弹性公网IP线路类型
+	EipBgpType string `json:"eip_bgp_type,omitzero"`
 	// 弹性公网IP计费类型
 	EipChargeType string `json:"eip_charge_type,omitempty"`
 	// 是否跟随主机删除而自动释放

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"
@@ -182,3 +184,154 @@ type BucketGetObjectsOutput struct {
 	// 下一页请求的paging_marker标识
 	NextMarker string `json:"next_marker"`
 }
+
+type BucketWebsiteRoutingRule struct {
+	ConditionErrorCode string
+	ConditionPrefix    string
+
+	RedirectProtocol         string
+	RedirectReplaceKey       string
+	RedirectReplaceKeyPrefix string
+}
+
+type BucketWebsiteConf struct {
+	// 主页
+	Index string
+	// 错误时返回的文档
+	ErrorDocument string
+	// http或https
+	Protocol string
+
+	Rules []BucketWebsiteRoutingRule
+	// 访问网站url
+	Url string
+}
+
+func (input *BucketWebsiteConf) Validate() error {
+	if len(input.Index) == 0 {
+		return httperrors.NewMissingParameterError("index")
+	}
+	if len(input.ErrorDocument) == 0 {
+		return httperrors.NewMissingParameterError("error_document")
+	}
+	if len(input.Protocol) == 0 {
+		return httperrors.NewMissingParameterError("protocol")
+	}
+	return nil
+}
+
+type BucketCORSRule struct {
+	AllowedMethods []string
+	// 允许的源站，可以是*
+	AllowedOrigins []string
+	AllowedHeaders []string
+	MaxAgeSeconds  int
+	ExposeHeaders  []string
+	// 规则区别标识
+	Id string
+}
+
+type BucketCORSRules struct {
+	Data []BucketCORSRule `json:"data"`
+}
+
+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 {
+			return httperrors.NewMissingParameterError("allowed_origins")
+		}
+		if len(input.Data[i].AllowedMethods) == 0 {
+			return httperrors.NewMissingParameterError("allowed_methods")
+		}
+	}
+	return nil
+}
+
+type BucketRefererConf struct {
+	// Referer Type
+	// enmu: Black-List, White-List
+	RefererType string
+	// 域名列表
+	DomainList []string
+	// 是否允许空referer 访问
+	AllowEmptyRefer bool
+
+	// 是否开启
+	Enabled bool `json:"enabled"`
+}
+
+func (input *BucketRefererConf) Validate() error {
+	return nil
+}

pkg/apis/compute/cdn.go

@@ -0,0 +1,47 @@
+// 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
+
+const (
+	CDN_DOMAIN_STATUS_ONLINE      = "online"
+	CDN_DOMAIN_STATUS_OFFLINE     = "offline"
+	CDN_DOMAIN_STATUS_PROCESSING  = "processing"
+	CDN_DOMAIN_STATUS_REJECTED    = "rejected"
+	CDN_DOMAIN_AREA_MAINLAND      = "mainland"
+	CDN_DOMAIN_AREA_OVERSEAS      = "overseas"
+	CDN_DOMAIN_AREA_GLOBAL        = "global"
+	CDN_DOMAIN_ORIGIN_TYPE_DOMAIN = "domain"
+	CDN_DOMAIN_ORIGIN_TYPE_IP     = "ip"
+	CDN_DOMAIN_ORIGIN_TYPE_BUCKET = "bucket"
+)
+
+type CdnDomain struct {
+	// cdn加速域名
+	Domain string
+	// 状态 rejected(域名未审核)|processing(部署中)|online|offline
+	Status string
+	// 区域 mainland|overseas|global
+	Area string
+	// cdn Cname
+	Cname string
+	// 源站
+	Origin string
+	// 源站类型 domain|ip|bucket
+	OriginType string
+}
+
+type CdnDomains struct {
+	Data []CdnDomain `json:"data"`
+}

pkg/apis/compute/cloudaccount.go

@@ -191,6 +191,10 @@ type CloudaccountCreateInput struct {
 
 	cloudprovider.SCloudaccount
 	cloudprovider.SCloudaccountCredential
+
+	// 是否启用SAML认证
+	// default: false
+	SAMLAuth *bool `json:"saml_auth"`
 }
 
 type CloudaccountShareModeInput struct {
@@ -315,6 +319,8 @@ type CloudaccountUpdateInput struct {
 	// 带删除的options key
 	RemoveOptions []string `json:"remove_options"`
 
+	SAMLAuth *bool `json:"saml_auth"`
+
 	proxyapi.ProxySettingResourceInput
 }
 
@@ -328,9 +334,33 @@ type CloudaccountPerformPublicInput struct {
 
 type CloudaccountPerformPrepareNetsInput struct {
 	CloudaccountCreateInput
+
+	// description: Recommended network subnet mask
+	// example: 24
+	NetworkBits *int8 `json:"network_bits"`
+	// description: The upper limit of host number
+	// example: 254
+	HostNumberUpperLimit *int `json:"host_number_upper_limit"`
+	// description: The lower limit of host number
+	// example: 2
+	HostNumberLowerLimit *int `json:"host_number_lower_limit"`
+	// enum: vcenter,datacenter,cluster
+	WireLevelForVmware string `json:"wire_level_for_vmware"`
+	// description: Whether to directly create the recommended network
+	Create *bool `json:"create"`
+	// description: It is recommended that the name of the network be the same as the native name of vmware
+	OriginNetworkName *bool `json:"origin_network_name"`
+	// description: Created network ip distribution strategy
+	NetworkIpAllocationPolicy string `json:"network_ip_allocation_policy"`
+	// description: zone of wire created
+	WireZone string `json:"wire_zone"`
 }
 
 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"`
@@ -404,13 +434,19 @@ type EnrollmentAccountQuery struct {
 
 type GetCloudaccountSamlOutput struct {
 	// cloudaccount SAML ServiceProvider entity ID
-	EntityId string `json:"entity_id"`
+	EntityId string `json:"entity_id,allowempty"`
 	// redirect login URL for this cloudaccount
-	RedirectLoginUrl string `json:"redirect_login_url"`
+	RedirectLoginUrl string `json:"redirect_login_url,allowempty"`
 	// redirect logout URL for this cloudaccount
-	RedirectLogoutUrl string `json:"redirect_logout_url"`
+	RedirectLogoutUrl string `json:"redirect_logout_url,allowempty"`
 	// metadata URL for this cloudaccount
-	MetadataUrl string `json:"metadata_url"`
+	MetadataUrl string `json:"metadata_url,allowempty"`
 	// initial SAML SSO login URL for this cloudaccount
-	InitLoginUrl string `json:"init_login_url"`
+	InitLoginUrl string `json:"init_login_url,allowempty"`
+}
+
+type CloudaccountEnableAutoSyncInput struct {
+	// 云账号状态必须是connected
+	// 最小值为region服务的minimal_sync_interval_seconds
+	SyncIntervalSeconds int `json:"sync_interval_seconds"`
 }

pkg/apis/compute/cloudaccount_const.go

@@ -60,6 +60,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 (
@@ -95,6 +99,47 @@ var (
 		CLOUD_PROVIDER_GOOGLE,
 		CLOUD_PROVIDER_CTYUN,
 	}
+
+	CLOUD_PROVIDER_HOST_TYPE_MAP = map[string][]string{
+		CLOUD_PROVIDER_ONECLOUD: []string{
+			HOST_TYPE_KVM,
+			HOST_TYPE_BAREMETAL,
+			HOST_TYPE_HYPERVISOR,
+		},
+		CLOUD_PROVIDER_VMWARE: []string{
+			HOST_TYPE_ESXI,
+		},
+		CLOUD_PROVIDER_ALIYUN: []string{
+			HOST_TYPE_ALIYUN,
+		},
+		CLOUD_PROVIDER_QCLOUD: []string{
+			HOST_TYPE_QCLOUD,
+		},
+		CLOUD_PROVIDER_AZURE: []string{
+			HOST_TYPE_AZURE,
+		},
+		CLOUD_PROVIDER_AWS: []string{
+			HOST_TYPE_AWS,
+		},
+		CLOUD_PROVIDER_HUAWEI: []string{
+			HOST_TYPE_HUAWEI,
+		},
+		CLOUD_PROVIDER_OPENSTACK: []string{
+			HOST_TYPE_OPENSTACK,
+		},
+		CLOUD_PROVIDER_UCLOUD: []string{
+			HOST_TYPE_UCLOUD,
+		},
+		CLOUD_PROVIDER_ZSTACK: []string{
+			HOST_TYPE_ZSTACK,
+		},
+		CLOUD_PROVIDER_GOOGLE: []string{
+			HOST_TYPE_GOOGLE,
+		},
+		CLOUD_PROVIDER_CTYUN: []string{
+			HOST_TYPE_CTYUN,
+		},
+	}
 )
 
 const (
@@ -117,4 +162,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

@@ -27,9 +27,9 @@ type DBInstanceCreateInput struct {
 	// Ip子网名称或Id,建议使用Id
 	// 谷歌云并不实际使用Ip子网,仅仅通过Ip子网确定Vpc
 	// required: true
-	Network string `json:"network"`
+	NetworkId string `json:"network_id"`
 	// swagger:ignore
-	NetworkId string
+	Network string `json:"network" yunion-deprecated-by:"network_id"`
 
 	// Ip子网内的地址,不填则按照ip子网的地址分配策略分配一个ip
 	// required: false
@@ -41,11 +41,17 @@ type DBInstanceCreateInput struct {
 	// swagger:ignore
 	MasterInstanceId string
 
-	// 安全组名称或Id
-	// default: default
-	Secgroup string `json:"secgroup"`
+	// 安全组Id列表
+	//
+	//
+	// | 云平台      | 最大支出安全组数量 |
+	// |-------------|----------|
+	// | 腾讯云      | 5    |
+	// | 华为云      | 1   |
+	// | 阿里云      | 不支持|
+	SecgroupIds []string `json:"secgroup_ids"`
 	// swagger:ignore
-	SecgroupId string
+	Secgroup string `json:"secgroup" yunion-deprecated-by:"secgroup_ids"`
 
 	// 主可用区名称或Id, 此参数从指定的套餐所在的可用区获取
 	Zone1 string `json:"zone1"`
@@ -59,10 +65,6 @@ type DBInstanceCreateInput struct {
 	// swagger:ignore
 	ZoneId string
 
-	// 区域名称或Id，建议使用Id
-	// swagger:ignore
-	Cloudregion string `json:"cloudregion"`
-
 	// swagger:ignore
 	CloudregionId string
 
@@ -72,12 +74,13 @@ type DBInstanceCreateInput struct {
 	// swagger:ignore
 	ManagerId string
 
-	// swagger:ignore
-	NetworkExternalId string
-
 	// 包年包月时间周期
 	Duration string `json:"duration"`
 
+	// 是否自动续费(仅包年包月时生效)
+	// default: false
+	AutoRenew bool `json:"auto_renew"`
+
 	// swagger:ignore
 	ExpiredAt time.Time `json:"expired_at"`
 
@@ -107,19 +110,10 @@ type DBInstanceCreateInput struct {
 	//
 	// | 平台		| 支持类型	| 说明 |
 	// | -----		| ------	| --- |
-	// | 华为云		|ha, single, replica| |
-	// | 阿里云		|basic, high_availability, always_on, finance||
-	// | Google		|Zonal, Regional | |
-	// 翻译:
-	// basic: 基础版
-	// high_availability: 高可用
-	// always_on: 集群版
-	// finance: 金融版, 三节点
-	// ha: 高可用
-	// single: 单机
-	// replica: 只读
-	// Zonal: 单区域
-	// Regional: 区域级
+	// | 华为云		|ha, single, replica| ha: 高可用, single: 单机, replica: 只读|
+	// | 阿里云		|basic, high_availability, always_on, finance|basic: 基础版, high_availability: 高可用, always_on: 集群版, finance: 金融版, 三节点|
+	// | Google		|Zonal, Regional | Zonal: 单区域, Regional: 区域级|
+	// | 腾讯云		|fe, ha, basic | ha: 高可用, basic: 基础版, fe: 金融版|
 	// required: true
 	Category string `json:"category"`
 
@@ -127,13 +121,12 @@ type DBInstanceCreateInput struct {
 	//
 	//
 	//
-	// | 平台	| 支持类型	|
-	// | 华为云	|SSD, SAS, SATA|
-	// | 阿里云	|local_ssd, cloud_essd, cloud_ssd|
-	// | Google	|PD_SSD, PD_HDD|
-	// 翻译:
-	// PD_SSD: SSD
-	// PD_HDD: HDD
+	// | 平台	| 支持类型	| 说明 |
+	// | -----		| ------	| --- |
+	// | 华为云	|SSD, SAS, SATA| |
+	// | 阿里云	|local_ssd, cloud_essd, cloud_ssd| |
+	// | Google	|PD_SSD, PD_HDD| PD_SSD: SSD, PD_HDD: HDD|
+	// | 腾讯云	|cloud_ssd, local_ssd| |
 	// required: true
 	StorageType string `json:"storage_type"`
 
@@ -142,10 +135,14 @@ type DBInstanceCreateInput struct {
 	// required: true
 	DiskSizeGB int `json:"disk_size_gb"`
 
+	// 指定连接端口
+	Port int `json:"port"`
+
 	// rds初始化密码
 	// 阿里云不需要此参数
 	// 华为云会默认创建一个用户,若不传此参数, 则为随机密码
 	// 谷歌云会默认创建一个用户,若不传此参数, 则为随机密码
+	// 腾讯云会默认创建一个用户,若不传此参数, 则为随机密码
 	Password string `json:"password"`
 
 	// 是否不设置初始密码
@@ -161,19 +158,15 @@ type DBInstanceCreateInput struct {
 	// 若指定实例套餐，此参数将根据套餐设置
 	VmemSizeMb int `json:"vmem_size_mb"`
 
-	// swagger:ignore
-	Provider string
+	// 从备份中创建新实例
+	DBInstancebackupId string `json:"dbinstancebackup_id"`
 }
 
 type SDBInstanceChangeConfigInput struct {
 	apis.Meta
 
 	InstanceType string
-	VCpuCount    int
-	VmemSizeMb   int
-	StorageType  string
 	DiskSizeGB   int
-	Category     string
 }
 
 type SDBInstanceRecoveryConfigInput struct {
@@ -297,6 +290,8 @@ type DBInstanceDetails struct {
 
 	SDBInstance
 
+	Secgroups []apis.StandaloneShortDesc `json:"secgroups"`
+
 	// 安全组名称
 	// example: Default
 	Secgroup string `json:"secgroup"`
@@ -351,7 +346,27 @@ type DBInstanceFilterListInput struct {
 	VpcFilterListInput
 }
 
-type DBInstanceNetworkListInput struct {
+type DBInstanceJoinListInput struct {
 	apis.VirtualJointResourceBaseListInput
 	DBInstanceFilterListInput
 }
+
+type DBInstanceRemoteUpdateInput struct {
+	// 是否覆盖替换所有标签
+	ReplaceTags *bool `json:"replace_tags" help:"replace all remote tags"`
+}
+
+type DBInstanceNetworkListInput struct {
+	DBInstanceJoinListInput
+
+	NetworkFilterListInput
+}
+
+type DBInstanceAutoRenewInput struct {
+	// 是否自动续费
+	AutoRenew bool `json:"auto_renew"`
+}
+
+type DBInstanceSetSecgroupInput struct {
+	SecgroupIds []string `json:"secgroup_ids"`
+}

pkg/apis/compute/dbinstance_account.go

@@ -48,6 +48,7 @@ type DBInstanceAccountCreateInput struct {
 	// | ----		|-------					|
 	// | Aliyun		|MySQL, MariaBD, SQLServer	|
 	// | 华为云		|MySQL, MariaBD				|
+	// | 腾讯云		|MySQL      				|
 	// required: true
 	// 阿里云SQL Server 2017集群版不支持创建账号
 	// 实例状态必须是运行中
@@ -91,3 +92,7 @@ type DBInstanceAccountDetails struct {
 
 	ProjectId string `json:"tenant_id"`
 }
+
+type DBInstanceAccountUpdateInput struct {
+	apis.StatusStandaloneResourceBaseUpdateInput
+}

pkg/apis/compute/dbinstance_const.go

@@ -16,20 +16,27 @@ package compute
 
 const (
 	//实例状态
-	DBINSTANCE_DEPLOYING         = "deploying"         //部署中
-	DBINSTANCE_RUNNING           = "running"           //运行中
-	DBINSTANCE_REBOOTING         = "rebooting"         //重启中
-	DBINSTANCE_MIGRATING         = "migrating"         //迁移中
-	DBINSTANCE_BACKING_UP        = "backing_up"        //备份中
-	DBINSTANCE_BACKING_UP_FAILED = "backing_up_failed" //备份失败
-	DBINSTANCE_RESTORING         = "restoring"         //备份恢复中
-	DBINSTANCE_RESTORE_FAILED    = "restore_failed"
-	DBINSTANCE_IMPORTING         = "importing"     //数据导入中
-	DBINSTANCE_CLONING           = "cloning"       //克隆中
-	DBINSTANCE_DELETING          = "deleting"      //删除中
-	DBINSTANCE_DELETE_FAILED     = "delete_failed" //删除失败
-	DBINSTANCE_MAINTENANCE       = "maintenance"   //维护中
-	DBINSTANCE_UNKNOWN           = "unknown"
+	DBINSTANCE_INIT                  = "init"              //初始化
+	DBINSTANCE_DEPLOYING             = "deploying"         //部署中
+	DBINSTANCE_RUNNING               = "running"           //运行中
+	DBINSTANCE_REBOOTING             = "rebooting"         //重启中
+	DBINSTANCE_MIGRATING             = "migrating"         //迁移中
+	DBINSTANCE_BACKING_UP            = "backing_up"        //备份中
+	DBINSTANCE_BACKING_UP_FAILED     = "backing_up_failed" //备份失败
+	DBINSTANCE_RESTORING             = "restoring"         //备份恢复中
+	DBINSTANCE_RESTORE_FAILED        = "restore_failed"
+	DBINSTANCE_IMPORTING             = "importing"             //数据导入中
+	DBINSTANCE_CLONING               = "cloning"               //克隆中
+	DBINSTANCE_DELETING              = "deleting"              //删除中
+	DBINSTANCE_DELETE_FAILED         = "delete_failed"         //删除失败
+	DBINSTANCE_MAINTENANCE           = "maintenance"           //维护中
+	DBINSTANCE_ISOLATING             = "isolating"             //隔离中
+	DBINSTANCE_ISOLATE               = "isolate"               //已隔离
+	DBINSTANCE_UPGRADING             = "upgrading"             //升级中
+	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" //调整配置失败
@@ -99,6 +106,11 @@ const (
 	ALIYUN_DBINSTANCE_CATEGORY_ALWAYSON = "always_on"         //集群版
 	ALIYUN_DBINSTANCE_CATEGORY_FINANCE  = "finance"           //金融版
 
+	//腾讯云实例类型
+	QCLOUD_DBINSTANCE_CATEGORY_BASIC   = "basic" //基础版
+	QCLOUD_DBINSTANCE_CATEGORY_HA      = "ha"    //高可用
+	QCLOUD_DBINSTANCE_CATEGORY_FINANCE = "fe"    //金融版
+
 	//华为云实例类型
 	HUAWEI_DBINSTANCE_CATEGORY_HA      = "ha"      //主备
 	HUAWEI_DBINSTANCE_CATEGORY_SINGLE  = "single"  //单机
@@ -118,6 +130,11 @@ const (
 	HUAWEI_DBINSTANCE_STORAGE_TYPE_ULTRAHIGHPRO = "ULTRAHIGHPRO"
 	HUAWEI_DBINSTANCE_STORAGE_TYPE_COMMON       = "COMMON"
 	HUAWEI_DBINSTANCE_STORAGE_TYPE_HIGH         = "HIGH"
+
+	//腾讯云
+	QCLOUD_DBINSTANCE_STORAGE_TYPE_LOCAL_SSD = "local_ssd" //本地盘SSD盘
+	QCLOUD_DBINSTANCE_STORAGE_TYPE_CLOUD_SSD = "cloud_ssd" //SSD云盘
+
 )
 
 var (
@@ -128,4 +145,20 @@ var (
 	ALIYUN_SQL_SERVER_DENY_KEYWORD []string = []string{
 		"root", " admin", " eagleye", " master", " aurora", " sa", " sysadmin", " administrator", " mssqld", " public", " securityadmin", " serveradmin", " setupadmin", " processadmin", " diskadmin", " dbcreator", " bulkadmin", " tempdb", " msdb", " model", " distribution", " mssqlsystemresource", " guest", " add", " except", " percent", " all", " exec", " plan", " alter", " execute", " precision", " and", " exists", " primary", " any", " exit", " print", " as", " fetch", " proc", " asc", " file", " procedure", " authorization", " fillfactor", " public", " backup", " for", " raiserror", " begin", " foreign", " read", " between", " freetext", " readtext", " break", " freetexttable", " reconfigure", " browse", " from", " references", " bulk", " full", " replication", " by", " function", " restore", " cascade", " goto", " restrict", " case", " grant", " return", " check", " group", " revoke", " checkpoint", " having", " right", " close", " holdlock", " rollback", " clustered", " identity", " rowcount", " coalesce", " identity_insert", " rowguidcol", " collate", " identitycol", " rule", " column", " if", " save", " commit", " in", " schema", " compute", " index", " select", " constraint", " inner", " session_user", " contains", " insert", " set", " containstable", " intersect", " setuser", " continue", " into", " shutdown", " convert", " is", " some", " create", " join", " statistics", " cross", " key", " system_user", " current", " kill", " table", " current_date", " left", " textsize", " current_time", " like", " then", " current_timestamp", " lineno", " to", " current_user", " load", " top", " cursor", " national", " tran", " database", " nocheck", " transaction", " dbcc", " nonclustered", " trigger", " deallocate", " not", " truncate", " declare", " null", " tsequal", " default", " nullif", " union", " delete", " of", " unique", " deny", " off", " update", " desc", " offsets", " updatetext", " disk", " on", " use", " distinct", " open", " user", " distributed", " opendatasource", " values", " double", " openquery", " varying", " drop", " openrowset", " view", " dummy", " openxml", " waitfor", " dump", " option", " when", " else", " or", " where", " end", " order", " while", " errlvl", " outer", " with", " escape", " over", " writetext", " galaxy",
 	}
+
+	RW_PRIVILEGE_SET = []string{
+		"SELECT", "INSERT", "UPDATE", "DELETE", "CREATE",
+		"DROP", "REFERENCES", "INDEX", "ALTER", "CREATE TEMPORARY TABLES",
+		"LOCK TABLES", "EXECUTE", "CREATE VIEW", "SHOW VIEW", "CREATE ROUTINE",
+		"ALTER ROUTINE", "EVENT", "TRIGGER", "PROCESS", "REPLICATION SLAVE",
+		"REPLICATION CLIENT",
+	}
+	R_PRIVILEGE_SET         = []string{"SELECT", "LOCK TABLES", "SHOW VIEW", "PROCESS", "REPLICATION SLAVE", "REPLICATION CLIENT"}
+	QCLOUD_RW_PRIVILEGE_SET = []string{
+		"SELECT", "INSERT", "UPDATE", "DELETE", "CREATE",
+		"DROP", "REFERENCES", "INDEX", "ALTER", "CREATE TEMPORARY TABLES",
+		"LOCK TABLES", "EXECUTE", "CREATE VIEW", "SHOW VIEW", "CREATE ROUTINE",
+		"ALTER ROUTINE", "EVENT", "TRIGGER",
+	}
+	QCLOUD_R_PRIVILEGE_SET = []string{"SELECT", "LOCK TABLES", "SHOW VIEW"}
 )

pkg/apis/compute/dbinstance_database.go

@@ -44,6 +44,7 @@ type DBInstanceDatabaseCreateInput struct {
 	// | ----		|-------					|
 	// | Aliyun		|MySQL, MariaBD, SQLServer  |
 	// | 华为云		|MySQL, MariaBD				|
+	// | 腾讯云		|           				|
 	// required: true
 	// 阿里云SQL Server 2017集群版不支持创建数据库
 	// 阿里云只读实例不支持创建数据库
@@ -79,3 +80,7 @@ type DBInstanceparameterDetails struct {
 
 	SDBInstanceParameter
 }
+
+type DBInstanceDatabaseUpdateInput struct {
+	apis.StatusStandaloneResourceBaseUpdateInput
+}

pkg/apis/compute/dbinstance_secgroup.go

@@ -0,0 +1,32 @@
+// Copyright 2019 Yunion
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package compute
+
+import "yunion.io/x/onecloud/pkg/apis"
+
+type DBInstanceSecgroupListInput struct {
+	DBInstanceJoinListInput
+
+	SecgroupFilterListInput
+}
+
+type DBInstanceSecgroupDetails struct {
+	apis.VirtualJointResourceBaseDetails
+
+	// RDS名称
+	DBInstance string `json:"dbinstance"`
+	// 安全组名称
+	Secgroup string `json:"secgroup"`
+}

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"`