Merge pull request #10034 from yousong/automated-cherry-pick-of-#10032-upstream-release-3.6

Automated cherry pick of #10032: Feature/yousong wire bw filter

.circleci/config.yml

@@ -38,7 +38,7 @@ jobs:
           command: |
             targets="$(circleci tests glob "cmd/*" | grep -v cmd/host-image | circleci tests split)"
             echo $targets | tr ' ' '\n'
-            make -j3 $targets
+            make -j2 $targets
             ls -lh _output/bin/
       - save_cache:
           key: onecloud-build-cache-{{ checksum "go.mod" }}-{{ checksum "Makefile" }}

.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')
@@ -199,7 +199,7 @@ mod:
 	go mod vendor -v
 
 
-DOCKER_CENTOS_BUILD_IMAGE?=registry.cn-beijing.aliyuncs.com/yunionio/centos-build:1.1-1
+DOCKER_CENTOS_BUILD_IMAGE?=registry.cn-beijing.aliyuncs.com/yunionio/centos-build:1.1-3
 
 define dockerCentOSBuildCmd
 set -o xtrace
@@ -232,7 +232,7 @@ docker-centos-build-stop:
 .PHONY: docker-centos-build
 .PHONY: docker-centos-build-stop
 
-DOCKER_ALPINE_BUILD_IMAGE?=registry.cn-beijing.aliyuncs.com/yunionio/alpine-build:1.0-3
+DOCKER_ALPINE_BUILD_IMAGE?=registry.cn-beijing.aliyuncs.com/yunionio/alpine-build:1.0-5
 
 define dockerAlpineBuildCmd
 set -o xtrace
@@ -314,7 +314,8 @@ VERSION ?= $(shell git describe --exact-match 2> /dev/null || \
                 git describe --match=$(git rev-parse --short=8 HEAD) --always --dirty --abbrev=8)
 
 image:
-	TAG=$(VERSION) REGISTRY=$(REGISTRY) $(ROOT_DIR)/scripts/docker_push.sh $(filter-out $@,$(MAKECMDGOALS))
+	mkdir -p $(ROOT_DIR)/_output
+	DEBUG=$(DEBUG) ARCH=$(ARCH) TAG=$(VERSION) REGISTRY=$(REGISTRY) $(ROOT_DIR)/scripts/docker_push.sh $(filter-out $@,$(MAKECMDGOALS))
 
 .PHONY: image
 

README-CN.md

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

README.md

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

build/docker/Dockerfile.baremetal-agent

@@ -1,4 +1,4 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/baremetal-base:v0.0.1
+FROM registry.cn-beijing.aliyuncs.com/yunionio/baremetal-base:v0.2
 
 MAINTAINER "Zexi Li <lizexi@yunionyun.com>"
 

build/docker/Dockerfile.baremetal-base

@@ -5,13 +5,16 @@ MAINTAINER "Yaoqi Wan <wanyaoqi@yunionyun.com>"
 RUN mkdir -p /opt/yunion/bin
 
 RUN apk update && \
-    apk add --no-cache ipmitool ethtool tzdata ca-certificates && \
+    apk add --no-cache ipmitool ethtool tzdata ca-certificates cdrkit coreutils && \
     rm -rf /var/cache/apk/*
 
 RUN cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
 
 RUN mkdir -p /opt/cloud/yunion/baremetal
 
+# udpate latest pci.ids
+RUN wget -O /opt/cloud/yunion/baremetal/pci.ids http://pci-ids.ucw.cz/v2.2/pci.ids
+
 # download baremetal-pxerom-*.x86_64.rpm and unpack rpm in current directory
 COPY ./opt/cloud/yunion/baremetal/bootia32.efi /opt/cloud/yunion/baremetal
 COPY ./opt/cloud/yunion/baremetal/bootx64.efi /opt/cloud/yunion/baremetal
@@ -27,13 +30,3 @@ COPY ./opt/cloud/yunion/baremetal/libutil.c32 /opt/cloud/yunion/baremetal
 COPY ./opt/cloud/yunion/baremetal/lpxelinux.0 /opt/cloud/yunion/baremetal
 COPY ./opt/cloud/yunion/baremetal/menu.c32 /opt/cloud/yunion/baremetal
 COPY ./opt/cloud/yunion/baremetal/pxelinux.0 /opt/cloud/yunion/baremetal
-
-# add mkisofs with bundles libraries
-ADD ./mkisofs /bin/mkisofs
-ADD ./.mkisofs.bin /bin/.mkisofs.bin
-ADD ./bundles/mkisofs /bin/bundles/mkisofs
-# use GNU timeout command replace busybox timeout command
-RUN rm /usr/bin/timeout
-ADD ./timeout /bin/timeout
-ADD ./.timeout.bin /bin/.timeout.bin
-ADD ./bundles/timeout /bin/bundles/timeout

build/docker/Dockerfile.host-deployer

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

build/docker/Dockerfile.monitor

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

build/docker/Dockerfile.telegraf-raid

@@ -0,0 +1,3 @@
+FROM registry.cn-beijing.aliyuncs.com/yunionio/yunion-rootfs:v1.0
+
+ADD ./_output/bin/telegraf-raid-plugin /opt/yunion/bin/telegraf-raid-plugin

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

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

build/docker/multi-arch/Dockerfile.host

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

build/docker/multi-arch/Dockerfile.torrent

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

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}}

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

@@ -0,0 +1,138 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <meta http-equiv="X-UA-Compatible" content="ie=edge">
+  <title>{{.Title}}</title>
+</head>
+<style>
+  .title {
+    height: 40px;
+    line-height: 40px;
+    width: 960px;
+    background-color: #4da1ff;
+    color: #fff;
+    font-size: 16px;
+    text-align: center;
+    margin: 0 auto;
+  }
+  .table {
+    width: 960px;
+    margin: 0 auto;
+    padding: 10px 30px 0px 30px;
+    font-family:'微软雅黑',Helvetica,Arial,sans-serif;
+    font-size:14px;
+    background-color: #fbfbfb;
+  }
+  .tr-title {
+    height: 10px;
+    border-left: 5px solid #4da1ff;
+    margin-left: 10px;
+    padding: 3px 8px;
+    font-weight: bold;
+  }
+  .td {
+    width: 80px;
+    padding-left: 20px;
+    height: 35px;
+    font-weight: 400;
+  }
+  .link {
+    text-decoration: none;
+    color: #3591FF;
+  }
+  .thead-tr td {
+    border-left: 1px solid #d7d7d7;
+    border-top: 1px solid #d7d7d7;
+    height: 32px;
+    font-size: 14px;
+    background-color: #d7d7d7;
+    text-align: center;
+  }
+  .tbody-tr td {
+    border-left: 1px solid #d7d7d7;
+    border-top: 1px solid #d7d7d7;
+    height: 32px;
+    font-size: 14px;
+    font-weight: 400;
+    text-align: center;
+  }
+  .pb-3 {
+    padding-bottom: 30px;
+  }
+  .resouce-table {
+    width: 98%;
+    color: #717171;
+    border-right: 1px solid #d7d7d7;
+    border-bottom: 1px solid #d7d7d7;
+  }
+</style>
+<body>
+  <h3 class="title">报警提醒</h3>
+  <table border="0" cellspacing="0" cellpadding="0" class="table">
+    <tr><td colspan="4" class="tr-title">报警信息</td></tr>
+    <tr><td style="height: 10px;"></td></tr>
+    <tr>
+      <td class="td">报警策略：</td>
+      <td>{{.name}}</td>
+    </tr>
+    <tr>
+      <td class="td">报警级别：</td>
+      <td>{{.level}}</td>
+    </tr>
+    <tr>
+      <td class="td">报警时间：</td>
+      <td>{{.start_time}}</td>
+    </tr>
+    <tr>
+      <td class="td">策略详情：</td>
+      <td>{{.description}}</td>
+    </tr>
+  </table>
+  <table class="table" style="padding-top: 6px; padding-bottom: 10px;">
+    <tr>
+      <td style="padding-left: 20px; font-size: 14px;">若要查看详情信息，<a class="link" target="_blank" href="{{.web_url}}
+">请登录平台进行查看</a></td>
+    </tr>
+  </table>
+  <table border="0" cellspacing="0" cellpadding="0" class="table pb-3">
+    <tr><td colspan="4" class="tr-title">报警资源</td></tr>
+    <tr><td style="height: 10px;"></td></tr>
+    <tr>
+      <td colspan="4" style="padding: 10px 0 0 20px;">
+        <table cellspacing="0" cellpadding="0" class="resouce-table">
+          <thead>
+            <tr class="thead-tr">
+
+	          <td>名称</td>
+              <td>IP</td>
+              <td>平台</td>
+              <td>触发值</td>
+            </tr>
+          </thead>
+          <tbody>
+			{{- range $i, $Matche := .matches}}
+				<tr class="tbody-tr">
+
+				  <td>
+					{{- index .tags "name"}}
+                  </td>
+				  <td>
+					{{ index .tags "ip" }}
+                  </td>
+				  <td>
+				   	{{ index .tags "brand" }}
+				  </td>
+				  <td>{{$Matche.value_str}}</td>
+				</tr>
+			{{end}}
+          </tbody>
+        </table>
+      </td>
+    </tr>
+    <tr><td style="height: 10px;"></td></tr>
+  </table>
+  <p style="width: 960px; height: 40px; line-height: 40px; margin: 0 auto; background-color: #4da1ff; color: #fff; font-size: 12px; text-align: center; ">本邮件由系统自动发送，请勿直接回复！</p>
+</body>
+</html>

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}}

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

@@ -0,0 +1,145 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <meta http-equiv="X-UA-Compatible" content="ie=edge">
+  <title>{{.Title}}</title>
+</head>
+<style>
+  .title {
+    height: 40px;
+    line-height: 40px;
+    width: 960px;
+    background-color: #4da1ff;
+    color: #fff;
+    font-size: 16px;
+    text-align: center;
+    margin: 0 auto;
+  }
+  .table {
+    width: 960px;
+    margin: 0 auto;
+    padding: 10px 30px 0px 30px;
+    font-family:'微软雅黑',Helvetica,Arial,sans-serif;
+    font-size:14px;
+    background-color: #fbfbfb;
+  }
+  .tr-title {
+    height: 10px;
+    border-left: 5px solid #4da1ff;
+    margin-left: 10px;
+    padding: 3px 8px;
+    font-weight: bold;
+  }
+  .td {
+    width: 120px;
+    padding-left: 20px;
+    height: 35px;
+    font-weight: 400;
+  }
+  .link {
+    text-decoration: none;
+    color: #3591FF;
+  }
+  .thead-tr td {
+    border-left: 1px solid #d7d7d7;
+    border-top: 1px solid #d7d7d7;
+    height: 32px;
+    font-size: 14px;
+    background-color: #d7d7d7;
+    text-align: center;
+  }
+  .tbody-tr td {
+    border-left: 1px solid #d7d7d7;
+    border-top: 1px solid #d7d7d7;
+    height: 32px;
+    font-size: 14px;
+    font-weight: 400;
+    text-align: center;
+  }
+  .pb-3 {
+    padding-bottom: 30px;
+  }
+  .resouce-table {
+    width: 98%;
+    color: #717171;
+    border-right: 1px solid #d7d7d7;
+    border-bottom: 1px solid #d7d7d7;
+  }
+</style>
+<body>
+  <h3 class="title">Alert</h3>
+  <table border="0" cellspacing="0" cellpadding="0" class="table">
+    <tr><td colspan="4" class="tr-title">Alert info</td></tr>
+    <tr><td style="height: 10px;"></td></tr>
+    <tr>
+      <td class="td">Alarm strategy：</td>
+      <td>{{.name}}</td>
+    </tr>
+    <tr>
+      <td class="td">Alarm level：</td>
+      <td>{{.level}}</td>
+    </tr>
+    <tr>
+      <td class="td">Alarm time：</td>
+      <td>{{.start_time}}</td>
+    </tr>
+    <tr>
+      <td class="td">Strategy details：</td>
+      <td>{{.description}}</td>
+    </tr>
+  </table>
+  <table class="table" style="padding-top: 6px; padding-bottom: 10px;">
+    <tr>
+      <td style="padding-left: 20px; font-size: 14px;">To view details，<a class="link" target="_blank" href="{{.web_url}}
+">Please login to the platform to view</a></td>
+    </tr>
+  </table>
+  <table border="0" cellspacing="0" cellpadding="0" class="table pb-3">
+    <tr><td colspan="4" class="tr-title">Alarm resources</td></tr>
+    <tr><td style="height: 10px;"></td></tr>
+    <tr>
+      <td colspan="4" style="padding: 10px 0 0 20px;">
+        <table cellspacing="0" cellpadding="0" class="resouce-table">
+          <thead>
+            <tr class="thead-tr">
+
+	          <td>Name</td>
+              <td>IP</td>
+              <td>Brand</td>
+              <td>Trigger value</td>
+            </tr>
+          </thead>
+          <tbody>
+			{{- range $i, $Matche := .matches}}
+				<tr class="tbody-tr">
+
+				  <td>
+					{{- index .tags "name"}}
+                  </td>
+				  <td>
+					{{ index .tags "ip" }}
+                  </td>
+				  <td>
+				   	{{ index .tags "brand" }}
+				  </td>
+				  <td>{{$Matche.value_str}}</td>
+				</tr>
+			{{end}}
+          </tbody>
+        </table>
+      </td>
+    </tr>
+    <tr><td style="height: 10px;"></td></tr>
+  </table>
+  <p style="width: 960px; height: 40px; line-height: 40px; margin: 0 auto; background-color: #4da1ff; color: #fff; font-size: 12px; text-align: center; ">This email is sent automatically by the system. Please do not reply directly！</p>
+</body>
+</html>
+
+
+
+
+
+
+

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

@@ -0,0 +1 @@
+{{.title}}

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

@@ -0,0 +1 @@
+{{.title}}

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

@@ -0,0 +1 @@
+{{.title}}

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

@@ -0,0 +1 @@
+{{.title}}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

build/region/root/opt/yunion/share/notify_templates/compute/content/SERVER_CHANGE_FLAVOR

@@ -1 +0,0 @@
-您的{{ .brand }}主机{{ .name }}的套餐类型已经更改为 CPU:{{ index .flavor_info "cpu" }}核，内存:{{ index .flavor_info "memory" }}M，数据盘:{{ index .flavor_info "datadisk" }}G，带宽: {{ index .flavor_info "ebw" }}M。

build/region/root/opt/yunion/share/notify_templates/compute/content/SERVER_CREATED

@@ -1 +0,0 @@
-您的{{ .brand }}主机{{ .name }}已经创建成功，服务器IP地址为{{ .ips }}，{{ if .account }}初始帐号为{{ .account }}，{{ end }}{{ if .keypair }}访问ssh密钥为{{ .keypair }}，{{ end }}{{ if .password }}初始密码为{{ .password }}，{{ end }}请使用{{ if .windows }}远程桌面连接器(RDC){{ else }}SSH{{ end }}或控制面板控制台访问云主机。

build/region/root/opt/yunion/share/notify_templates/compute/content/SERVER_CREATED_ADMIN

@@ -1 +0,0 @@
-项目{{ .tenant }}的{{ .brand }}主机{{ .name }}已经创建成功。

build/region/root/opt/yunion/share/notify_templates/compute/content/SERVER_DELETED

@@ -1 +0,0 @@
-您的{{ .brand }}主机{{ .name }}已经删除。

build/region/root/opt/yunion/share/notify_templates/compute/content/SERVER_DELETED_ADMIN

@@ -1 +0,0 @@
-项目{{ .tenant }}的{{ .brand }}主机{{ .name }}已经删除。

build/region/root/opt/yunion/share/notify_templates/compute/content/SERVER_PANICKED

@@ -1 +0,0 @@
-您的{{ .brand }}主机{{ .name }}系统崩溃了: {{ .reason }}

build/region/root/opt/yunion/share/notify_templates/compute/content/SERVER_REBUILD_ROOT

@@ -1 +0,0 @@
-您的{{ .brand }}主机{{ .name }}重装系统成功，{{ if .account }}初始帐号为{{ .account }}，{{ end }}{{ if .keypair }}访问密钥为{{ .keypair }}，{{ end }}{{ if .password }}初始密码为{{ .password }}，{{ end }}请使用{{ if .windows }}远程桌面连接器(RDC){{ else }}SSH{{ end }}或控制面板控制台访问云主机。

build/region/root/opt/yunion/share/notify_templates/compute/content@cn/SERVER_CHANGE_FLAVOR

@@ -0,0 +1 @@
+您的{{ .brand }}虚拟机{{ .name }}的套餐类型已经更改为 CPU:{{ index .flavor_info "cpu" }}核，内存:{{ index .flavor_info "memory" }}M，数据盘:{{ index .flavor_info "datadisk" }}G，带宽: {{ index .flavor_info "ebw" }}M。

build/region/root/opt/yunion/share/notify_templates/compute/content@cn/SERVER_CREATED

@@ -0,0 +1 @@
+您的{{ .brand }}虚拟机{{ .name }}已经创建成功，虚拟机IP地址为{{ .ips }}，{{ if .account }}初始帐号为{{ .account }}，{{ end }}{{ if .keypair }}访问ssh密钥为{{ .keypair }}，{{ end }}{{ if .password }}初始密码为{{ .password }}，{{ end }}请使用{{ if .windows }}远程桌面连接器(RDC){{ else }}SSH{{ end }}或控制面板控制台访问虚拟机。

build/region/root/opt/yunion/share/notify_templates/compute/content@cn/SERVER_CREATED_ADMIN

@@ -0,0 +1 @@
+项目{{ .tenant }}的{{ .brand }}虚拟机{{ .name }}已经创建成功。

build/region/root/opt/yunion/share/notify_templates/compute/content@cn/SERVER_DELETED

@@ -0,0 +1 @@
+您的{{ .brand }}虚拟机{{ .name }}已经删除。

build/region/root/opt/yunion/share/notify_templates/compute/content@cn/SERVER_DELETED_ADMIN

@@ -0,0 +1 @@
+项目{{ .tenant }}的{{ .brand }}虚拟机{{ .name }}已经删除。

build/region/root/opt/yunion/share/notify_templates/compute/content@cn/SERVER_PANICKED

@@ -0,0 +1 @@
+您的{{ .brand }}虚拟机{{ .name }}系统崩溃了: {{ .reason }}

build/region/root/opt/yunion/share/notify_templates/compute/content@cn/SERVER_REBUILD_ROOT

@@ -0,0 +1 @@
+您的{{ .brand }}虚拟机{{ .name }}重装系统成功，{{ if .account }}初始帐号为{{ .account }}，{{ end }}{{ if .keypair }}访问密钥为{{ .keypair }}，{{ end }}{{ if .password }}初始密码为{{ .password }}，{{ end }}请使用{{ if .windows }}远程桌面连接器(RDC){{ else }}SSH{{ end }}或控制面板控制台访问虚拟机。

build/region/root/opt/yunion/share/notify_templates/compute/content@en/SERVER_CHANGE_FLAVOR

@@ -0,0 +1 @@
+The instance type of your {{ .brand }} virtual machine {{ .name }} has been changed to: {{ index .flavor_info "cpu" }}-core CPU, {{ index .flavor_info "memory" }}M memory, {{ index .flavor_info "datadisk" }}G data disk, {{ index .flavor_info "ebw" }}M bandwidth.

build/region/root/opt/yunion/share/notify_templates/compute/content@en/SERVER_CREATED

@@ -0,0 +1 @@
+Your {{ .brand }} virtual machine {{ .name }} has been created successfully. The VM's IP address is {{ .ips }}, {{ if .account }}initial account is {{ .account }}, {{ end }}{{ if .keypair }}the access ssh key is {{ .keypair }}, {{ end }}{{ if .password }}the initial password is {{ .password }}, {{ end }}and please use {{ if .windows }}Remote Desktop Connector (RDC){{ else }}SSH{{ end }} or the control panel console to access the VM.

build/region/root/opt/yunion/share/notify_templates/compute/content@en/SERVER_CREATED_ADMIN

@@ -0,0 +1 @@
+The {{ .brand }} virtual machine {{ .name }} of the project {{ .tenant }} has been created successfully.

build/region/root/opt/yunion/share/notify_templates/compute/content@en/SERVER_DELETED

@@ -0,0 +1 @@
+Your {{ .brand }} virtual machine {{ .name }} has been deleted.

build/region/root/opt/yunion/share/notify_templates/compute/content@en/SERVER_DELETED_ADMIN

@@ -0,0 +1 @@
+The {{ .brand }} virtual machine {{ .name }} of the project {{ .tenant }} has been deleted.

build/region/root/opt/yunion/share/notify_templates/compute/content@en/SERVER_PANICKED

@@ -0,0 +1 @@
+Your {{ .brand }} virtual machine {{ .name }} system crashed: {{ .reason }}

build/region/root/opt/yunion/share/notify_templates/compute/content@en/SERVER_REBUILD_ROOT

@@ -0,0 +1 @@
+Your {{ .brand }} virtual machine {{ .name }} is successfully reinstalled. The VM's {{ if .account }}initial account is {{ .account }}, {{ end }}{{ if .keypair }}the access key is {{ .keypair }}, {{ end }}{{ if .password }}the initial password is {{ .password }}, {{ end }}and please use {{ if .windows }}remote desktop connection (RDC){{ else }}SSH{{ end }} or the control panel console to access the virtual machine.

build/region/root/opt/yunion/share/notify_templates/compute/content@en/SYSTEM_ERROR

@@ -0,0 +1,6 @@
+System error message
+Resource: {{ .name}}
+Resource ID: {{ .id }}
+Event: {{ .event }}
+Reason: {{ .reason }}
+Time: {{ .created }}

build/region/root/opt/yunion/share/notify_templates/compute/content@en/SYSTEM_WARNING

@@ -0,0 +1,6 @@
+System warning message
+Resource: {{ .name}}
+Resource ID: {{ .id }}
+Event: {{ .event }}
+Reason: {{ .reason }}
+Time: {{ .created }}

build/region/root/opt/yunion/share/notify_templates/compute/title/SERVER_CHANGE_FLAVOR

@@ -1 +0,0 @@
-您的{{ .brand }}主机{{ .name }}的套餐类型已经更改为 CPU:{{ index .flavor_info "cpu" }}核，内存:{{ index .flavor_info "memory" }}M，数据盘:{{ index .flavor_info "datadisk" }}G，带宽: {{ index .flavor_info "ebw" }}M。

build/region/root/opt/yunion/share/notify_templates/compute/title/SERVER_CREATED

@@ -1 +0,0 @@
-{{ .brand }}主机{{ .Name }}创建成功

build/region/root/opt/yunion/share/notify_templates/compute/title/SERVER_CREATED_ADMIN

@@ -1 +0,0 @@
-项目{{ .tenant }}的{{ .brand }}主机{{ .name }}已经创建成功

build/region/root/opt/yunion/share/notify_templates/compute/title/SERVER_DELETED

@@ -1 +0,0 @@
-{{ .brand }}主机{{ .name }}删除通知

build/region/root/opt/yunion/share/notify_templates/compute/title/SERVER_DELETED_ADMIN

@@ -1 +0,0 @@
-项目{{ .tenant }}的{{ .brand }}主机{{ .name }}已经删除

build/region/root/opt/yunion/share/notify_templates/compute/title/SERVER_PANICKED

@@ -1 +0,0 @@
-您的{{ .brand }}主机{{ .name }}系统崩溃了

build/region/root/opt/yunion/share/notify_templates/compute/title/SERVER_REBUILD_ROOT

@@ -1 +0,0 @@
-{{ .brand }}主机{{ .name }}重装系统成功

build/region/root/opt/yunion/share/notify_templates/compute/title@cn/SERVER_CHANGE_FLAVOR

@@ -0,0 +1 @@
+您的{{ .brand }}虚拟机{{ .name }}的套餐类型已经更改为 CPU:{{ index .flavor_info "cpu" }}核，内存:{{ index .flavor_info "memory" }}M，数据盘:{{ index .flavor_info "datadisk" }}G，带宽: {{ index .flavor_info "ebw" }}M。

build/region/root/opt/yunion/share/notify_templates/compute/title@cn/SERVER_CREATED

@@ -0,0 +1 @@
+{{ .brand }}虚拟机{{ .Name }}创建成功

build/region/root/opt/yunion/share/notify_templates/compute/title@cn/SERVER_CREATED_ADMIN

@@ -0,0 +1 @@
+项目{{ .tenant }}的{{ .brand }}虚拟机{{ .name }}已经创建成功

build/region/root/opt/yunion/share/notify_templates/compute/title@cn/SERVER_DELETED

@@ -0,0 +1 @@
+{{ .brand }}虚拟机{{ .name }}删除通知

build/region/root/opt/yunion/share/notify_templates/compute/title@cn/SERVER_DELETED_ADMIN

@@ -0,0 +1 @@
+项目{{ .tenant }}的{{ .brand }}虚拟机{{ .name }}已经删除

build/region/root/opt/yunion/share/notify_templates/compute/title@cn/SERVER_PANICKED

@@ -0,0 +1 @@
+您的{{ .brand }}虚拟机{{ .name }}系统崩溃了

build/region/root/opt/yunion/share/notify_templates/compute/title@cn/SERVER_REBUILD_ROOT

@@ -0,0 +1 @@
+{{ .brand }}虚拟机{{ .name }}重装系统成功

build/region/root/opt/yunion/share/notify_templates/compute/title@en/SERVER_CHANGE_FLAVOR

@@ -0,0 +1 @@
+The instance type of your {{ .brand }} virtual machine {{ .name }} has been changed to: {{ index .flavor_info "cpu" }}-core CPU, {{ index .flavor_info "memory" }}M memory, {{ index .flavor_info "datadisk" }}G data disk, {{ index .flavor_info "ebw" }}M bandwidth

build/region/root/opt/yunion/share/notify_templates/compute/title@en/SERVER_CREATED

@@ -0,0 +1 @@
+The {{ .brand }} virtual machine {{ .Name }} created successfully

build/region/root/opt/yunion/share/notify_templates/compute/title@en/SERVER_CREATED_ADMIN

@@ -0,0 +1 @@
+The {{ .brand }} virtual machine {{ .name }} of the project {{ .tenant }} has been created successfully

build/region/root/opt/yunion/share/notify_templates/compute/title@en/SERVER_DELETED

@@ -0,0 +1 @@
+The {{ .brand }} virtual machine {{ .name }} has been deleted

build/region/root/opt/yunion/share/notify_templates/compute/title@en/SERVER_DELETED_ADMIN

@@ -0,0 +1 @@
+The {{ .brand }} virtual machine {{ .name }} of the project {{ .tenant }} has been deleted

build/region/root/opt/yunion/share/notify_templates/compute/title@en/SERVER_PANICKED

@@ -0,0 +1 @@
+Your {{ .brand }} virtual machine {{ .name }} system crashed

build/region/root/opt/yunion/share/notify_templates/compute/title@en/SERVER_REBUILD_ROOT

@@ -0,0 +1 @@
+The {{ .brand }} virtual machine {{ .name }} successfully reinstalled the system

build/region/root/opt/yunion/share/notify_templates/compute/title@en/SYSTEM_ERROR

@@ -0,0 +1 @@
+System error message {{ .name }} {{ .event }}

build/region/root/opt/yunion/share/notify_templates/compute/title@en/SYSTEM_WARNING

@@ -0,0 +1 @@
+System warning message {{ .name }} {{ .event }}

cmd/aliyuncli/main.go

@@ -28,6 +28,7 @@ import (
 type BaseOptions struct {
 	Debug      bool   `help:"debug mode"`
 	Help       bool   `help:"Show help"`
+	CloudEnv   string `help:"Cloud environment" default:"$ALIYUN_CLOUD_ENV" choices:"InternationalCloud|FinanceCloud" metavar:"ALIYUN_CLOUD_ENV"`
 	AccessKey  string `help:"Access key" default:"$ALIYUN_ACCESS_KEY" metavar:"ALIYUN_ACCESS_KEY"`
 	Secret     string `help:"Secret" default:"$ALIYUN_SECRET" metavar:"ALIYUN_SECRET"`
 	RegionId   string `help:"RegionId" default:"$ALIYUN_REGION" metavar:"ALIYUN_REGION"`
@@ -86,7 +87,9 @@ func newClient(options *BaseOptions) (*aliyun.SRegion, error) {
 
 	cli, err := aliyun.NewAliyunClient(
 		aliyun.NewAliyunClientConfig(
-			options.AccessKey, options.Secret,
+			options.CloudEnv,
+			options.AccessKey,
+			options.Secret,
 		).Debug(options.Debug),
 	)
 	if err != nil {

cmd/apsaracli/main.go

@@ -0,0 +1,146 @@
+// Copyright 2019 Yunion
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import (
+	"fmt"
+	"os"
+
+	"yunion.io/x/structarg"
+
+	"yunion.io/x/onecloud/pkg/cloudprovider"
+	"yunion.io/x/onecloud/pkg/multicloud/apsara"
+	_ "yunion.io/x/onecloud/pkg/multicloud/apsara/shell"
+	"yunion.io/x/onecloud/pkg/util/shellutils"
+)
+
+type BaseOptions struct {
+	Debug                          bool   `help:"debug mode"`
+	Help                           bool   `help:"Show help"`
+	AccessKey                      string `help:"Access key" default:"$APSARA_ACCESS_KEY" metavar:"APSARA_ACCESS_KEY"`
+	Secret                         string `help:"Secret" default:"$APSARA_SECRET" metavar:"APSARA_SECRET"`
+	cloudprovider.SApsaraEndpoints `help:"Endpoints for Apsara"`
+	Endpoint                       string `help:"Apsara endpoint" default:"$APSARA_ENDPOINT" metavar:"APSARA_ENDPOINT"`
+	RegionId                       string `help:"RegionId" default:"$APSARA_REGION" metavar:"APSARA_REGION"`
+	SUBCOMMAND                     string `help:"apsaracli subcommand" subcommand:"true"`
+}
+
+func getSubcommandParser() (*structarg.ArgumentParser, error) {
+	parse, e := structarg.NewArgumentParser(&BaseOptions{},
+		"apsaracli",
+		"Command-line interface to apsara API.",
+		`See "apsaracli help COMMAND" for help on a specific command.`)
+
+	if e != nil {
+		return nil, e
+	}
+
+	subcmd := parse.GetSubcommand()
+	if subcmd == nil {
+		return nil, fmt.Errorf("No subcommand argument.")
+	}
+	type HelpOptions struct {
+		SUBCOMMAND string `help:"sub-command name"`
+	}
+	shellutils.R(&HelpOptions{}, "help", "Show help of a subcommand", func(args *HelpOptions) error {
+		helpstr, e := subcmd.SubHelpString(args.SUBCOMMAND)
+		if e != nil {
+			return e
+		} else {
+			fmt.Print(helpstr)
+			return nil
+		}
+	})
+	for _, v := range shellutils.CommandTable {
+		_, e := subcmd.AddSubParser(v.Options, v.Command, v.Desc, v.Callback)
+		if e != nil {
+			return nil, e
+		}
+	}
+	return parse, nil
+}
+
+func showErrorAndExit(e error) {
+	fmt.Fprintf(os.Stderr, "%s", e)
+	fmt.Fprintln(os.Stderr)
+	os.Exit(1)
+}
+
+func newClient(options *BaseOptions) (*apsara.SRegion, error) {
+	if len(options.AccessKey) == 0 {
+		return nil, fmt.Errorf("Missing accessKey")
+	}
+
+	if len(options.Secret) == 0 {
+		return nil, fmt.Errorf("Missing secret")
+	}
+
+	cli, err := apsara.NewApsaraClient(
+		apsara.NewApsaraClientConfig(
+			options.AccessKey,
+			options.Secret,
+			options.Endpoint,
+			options.SApsaraEndpoints,
+		).Debug(options.Debug),
+	)
+	if err != nil {
+		return nil, err
+	}
+
+	region := cli.GetRegion(options.RegionId)
+	if region == nil {
+		return nil, fmt.Errorf("No such region %s", options.RegionId)
+	}
+
+	return region, nil
+}
+
+func main() {
+	parser, e := getSubcommandParser()
+	if e != nil {
+		showErrorAndExit(e)
+	}
+	e = parser.ParseArgs(os.Args[1:], false)
+	options := parser.Options().(*BaseOptions)
+
+	if options.Help {
+		fmt.Print(parser.HelpString())
+		return
+	}
+	subcmd := parser.GetSubcommand()
+	subparser := subcmd.GetSubParser()
+	if e != nil {
+		if subparser != nil {
+			fmt.Print(subparser.Usage())
+		} else {
+			fmt.Print(parser.Usage())
+		}
+		showErrorAndExit(e)
+	}
+	suboptions := subparser.Options()
+	if options.SUBCOMMAND == "help" {
+		e = subcmd.Invoke(suboptions)
+	} else {
+		var region *apsara.SRegion
+		region, e = newClient(options)
+		if e != nil {
+			showErrorAndExit(e)
+		}
+		e = subcmd.Invoke(region, suboptions)
+	}
+	if e != nil {
+		showErrorAndExit(e)
+	}
+}

cmd/climc/main.go

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

cmd/climc/shell/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{})
 }