Merge pull request #11410 from yousong/automated-cherry-pick-of-#11406-upstream-release-3.4

Automated cherry pick of #11406: webconsole: wait zombies

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

.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')
@@ -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
 

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:v0.5
 
 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

@@ -7,7 +7,7 @@ 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
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.2
 
 MAINTAINER "Yaoqi Wan wanyaoqi@yunionyun.com"
 

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@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}}/commonalerts
+">请登录平台进行查看</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}}/commonalerts

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: 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">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}}/commonalerts
+">Please log in 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/title/VERIFY.email

@@ -1 +1 @@
-Yunion Verify
+{{.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/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/cloudusers.go

@@ -32,6 +32,7 @@ func init() {
 	cmd.Perform("attach-policy", &options.ClouduserPolicyOptions{})
 	cmd.Perform("detach-policy", &options.ClouduserPolicyOptions{})
 	cmd.Perform("change-owner", &options.ClouduserChangeOwnerOptions{})
+	cmd.Perform("reset-password", &options.ClouduserResetPasswordOptions{})
 	cmd.Perform("cloud-user-join-group", &options.ClouduserGroupOptions{})
 	cmd.Perform("cloud-user-leave-group", &options.ClouduserGroupOptions{})
 }

cmd/climc/shell/compute/cachedimages.go

@@ -27,6 +27,9 @@ func init() {
 
 		Region string `help:"show images cached at cloud region"`
 		Zone   string `help:"show images cached at zone"`
+
+		HostSchedtagId string `help:"filter cached image with host schedtag"`
+		Valid          *bool  `help:"valid cachedimage"`
 	}
 	R(&CachedImageListOptions{}, "cached-image-list", "List cached images", func(s *mcclient.ClientSession, args *CachedImageListOptions) error {
 		params, err := options.ListStructToParams(args)

cmd/climc/shell/compute/cloudproviders.go

@@ -35,6 +35,8 @@ func init() {
 		NoObjectStorage  bool     `help:"filter cloudproviders that has no object storage"`
 		Capability       []string `help:"capability filter" choices:"project|compute|network|loadbalancer|objectstore|rds|cache|event"`
 		Cloudregion      string   `help:"filter cloudproviders by cloudregion"`
+
+		HostSchedtagId string `help:"filter by host schedtag"`
 	}
 	R(&CloudproviderListOptions{}, "cloud-provider-list", "List cloud providers", func(s *mcclient.ClientSession, args *CloudproviderListOptions) error {
 		var params *jsonutils.JSONDict
@@ -62,6 +64,10 @@ func init() {
 			if len(args.Cloudregion) > 0 {
 				params.Add(jsonutils.NewString(args.Cloudregion), "cloudregion")
 			}
+
+			if len(args.HostSchedtagId) > 0 {
+				params.Add(jsonutils.NewString(args.HostSchedtagId), "host_schedtag_id")
+			}
 		}
 		result, err := modules.Cloudproviders.List(s, params)
 		if err != 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_skus.go

@@ -15,12 +15,30 @@
 package compute
 
 import (
+	"yunion.io/x/onecloud/cmd/climc/shell"
 	"yunion.io/x/onecloud/pkg/mcclient"
 	"yunion.io/x/onecloud/pkg/mcclient/modules"
 	"yunion.io/x/onecloud/pkg/mcclient/options"
 )
 
 func init() {
+	cmd := shell.NewResourceCmd(&modules.DBInstanceSkus).WithKeyword("dbinstance-sku")
+	cmd.PerformClass("sync-skus", &options.SkuSyncOptions{})
+
+	R(&options.SkuTaskQueryOptions{}, "dbinstance-sku-sync-task-show", "Show details of skus sync tasks", func(s *mcclient.ClientSession, args *options.SkuTaskQueryOptions) error {
+		params, err := args.Params()
+		if err != nil {
+			return err
+		}
+
+		result, err := modules.DBInstanceSkus.Get(s, "sync-tasks", params)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
 	type DBInstanceSkuListOption struct {
 		options.BaseListOptions
 		Engine        string
@@ -54,5 +72,4 @@ func init() {
 		printObject(result)
 		return nil
 	})
-
 }

cmd/climc/shell/compute/dnsrecordsets.go

@@ -0,0 +1,33 @@
+// Copyright 2019 Yunion
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package compute
+
+import (
+	"yunion.io/x/onecloud/cmd/climc/shell"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/onecloud/pkg/mcclient/options"
+)
+
+func init() {
+	cmd := shell.NewResourceCmd(&modules.DnsRecordSets).WithKeyword("dns-recordset")
+	cmd.List(&options.DnsRecordSetListOptions{})
+	cmd.Create(&options.DnsRecordSetCreateOptions{})
+	cmd.Update(&options.DnsRecordSetUpdateOptions{})
+	cmd.Show(&options.DnsRecordSetIdOptions{})
+	cmd.Delete(&options.DnsRecordSetIdOptions{})
+	cmd.Perform("enable", &options.DnsRecordSetIdOptions{})
+	cmd.Perform("disable", &options.DnsRecordSetIdOptions{})
+	cmd.Perform("set-traffic-policies", &options.DnsRecordSetTrafficPolicyOptions{})
+}

cmd/climc/shell/compute/dnstrafficpolicy.go

@@ -0,0 +1,27 @@
+// Copyright 2019 Yunion
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package compute
+
+import (
+	"yunion.io/x/onecloud/cmd/climc/shell"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/onecloud/pkg/mcclient/options"
+)
+
+func init() {
+	cmd := shell.NewResourceCmd(&modules.DnsTrafficPolicies).WithKeyword("dns-trafficpolicy")
+	cmd.List(&options.DnsTrafficPolicyListOptions{})
+	cmd.Create(&options.DnsTrafficPolicyCreateOptions{})
+}

cmd/climc/shell/compute/dnszone.go

@@ -0,0 +1,37 @@
+// Copyright 2019 Yunion
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package compute
+
+import (
+	"yunion.io/x/onecloud/cmd/climc/shell"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/onecloud/pkg/mcclient/options"
+)
+
+func init() {
+	cmd := shell.NewResourceCmd(&modules.DnsZones).WithKeyword("dns-zone")
+	cmd.List(&options.SDnsZoneListOptions{})
+	cmd.Show(&options.SDnsZoneIdOptions{})
+	cmd.ClassShow(&options.DnsZoneCapabilitiesOptions{})
+	cmd.Delete(&options.SDnsZoneIdOptions{})
+	cmd.Create(&options.DnsZoneCreateOptions{})
+	cmd.Perform("syncstatus", &options.SDnsZoneIdOptions{})
+	cmd.Perform("sync-recordsets", &options.SDnsZoneIdOptions{})
+	cmd.Perform("cache", &options.DnsZoneCacheOptions{})
+	cmd.Perform("uncache", &options.DnsZoneUncacheOptions{})
+	cmd.Perform("purge", &options.SDnsZoneIdOptions{})
+	cmd.Perform("add-vpcs", &options.DnsZoneAddVpcsOptions{})
+	cmd.Perform("remove-vpcs", &options.DnsZoneRemoveVpcsOptions{})
+}

cmd/climc/shell/compute/dnszonecache.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 compute
+
+import (
+	"yunion.io/x/onecloud/cmd/climc/shell"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/onecloud/pkg/mcclient/options"
+)
+
+func init() {
+	cmd := shell.NewResourceCmd(&modules.DnsZoneCaches).WithKeyword("dns-zone-cache")
+	cmd.List(&options.DnsZoneCacheListOptions{})
+	cmd.Show(&options.DnsZoneCacheIdOptions{})
+	cmd.Delete(&options.DnsZoneCacheIdOptions{})
+}

cmd/climc/shell/compute/elasticcache.go

@@ -19,12 +19,30 @@ 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.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.BaseListOptions{}, "elastic-cache-list", "List elastisc cache instance", func(s *mcclient.ClientSession, opts *options.BaseListOptions) error {
 		params, err := options.ListStructToParams(opts)
 		if err != nil {

cmd/climc/shell/compute/elasticips.go

@@ -50,7 +50,7 @@ func init() {
 		Manager    string `help:"cloud provider"`
 		Region     string `help:"cloud region in which EIP is allocated"`
 		Bandwidth  int    `help:"Bandwidth in Mbps"`
-		Ip         string `help:"IP address of the EIP"`
+		IpAddr     string `help:"IP address of the EIP" json:"ip_addr"`
 		Network    string `help:"Network of the EIP"`
 		ChargeType string `help:"bandwidth charge type" choices:"traffic|bandwidth"`
 	}
@@ -75,8 +75,8 @@ func init() {
 			params.Add(jsonutils.NewString(args.Network), "network")
 		}
 
-		if len(args.Ip) > 0 {
-			params.Add(jsonutils.NewString(args.Ip), "ip")
+		if len(args.IpAddr) > 0 {
+			params.Add(jsonutils.NewString(args.IpAddr), "ip_addr")
 		}
 
 		result, err := modules.Elasticips.Create(s, params)

cmd/climc/shell/compute/hosts.go

@@ -259,10 +259,10 @@ func init() {
 			params.Add(jsonutils.NewString(args.Desc), "description")
 		}
 		if args.CpuCommitBound > 0.0 {
-			params.Add(jsonutils.NewFloat(args.CpuCommitBound), "cpu_cmtbound")
+			params.Add(jsonutils.NewFloat64(args.CpuCommitBound), "cpu_cmtbound")
 		}
 		if args.MemoryCommitBound > 0.0 {
-			params.Add(jsonutils.NewFloat(args.MemoryCommitBound), "mem_cmtbound")
+			params.Add(jsonutils.NewFloat64(args.MemoryCommitBound), "mem_cmtbound")
 		}
 		if len(args.MemoryReserved) > 0 {
 			params.Add(jsonutils.NewString(args.MemoryReserved), "mem_reserved")
@@ -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/networks.go

@@ -20,6 +20,7 @@ import (
 	"yunion.io/x/jsonutils"
 
 	"yunion.io/x/onecloud/cmd/climc/shell"
+	api "yunion.io/x/onecloud/pkg/apis/compute"
 	"yunion.io/x/onecloud/pkg/mcclient"
 	"yunion.io/x/onecloud/pkg/mcclient/modulebase"
 	"yunion.io/x/onecloud/pkg/mcclient/modules"
@@ -203,15 +204,18 @@ func init() {
 
 	type NetworkAddressOptions struct {
 		NETWORK string `help:"id or name of network to query"`
+
+		api.GetNetworkAddressesInput
 	}
 	R(&NetworkAddressOptions{}, "network-addresses", "Query used addresses of network", func(s *mcclient.ClientSession, args *NetworkAddressOptions) error {
-		result, err := modules.Networks.GetSpecific(s, args.NETWORK, "addresses", nil)
+		result, err := modules.Networks.GetSpecific(s, args.NETWORK, "addresses", jsonutils.Marshal(args.GetNetworkAddressesInput))
 		if err != nil {
 			return err
 		}
-		addrList, err := result.GetArray("addresses")
-		if err != nil {
-			return err
+		addrList, _ := result.GetArray("addresses")
+		if addrList == nil {
+			fmt.Println("no result")
+			return nil
 		}
 		listResult := modulebase.ListResult{Data: addrList}
 		printList(&listResult, nil)

cmd/climc/shell/compute/quotas.go

@@ -316,7 +316,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/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

@@ -15,194 +15,24 @@
 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 SecGroupsListOptions struct {
-		Equals string `help:"Secgroup ID or Name, filter secgroups whose rules equals the specified one"`
-		Server string `help:"Filter secgroups bound to specified server"`
-		options.BaseListOptions
-		Ip        string `help:"Filter secgroup by ip"`
-		Ports     string `help:"Filter secgroup by ports"`
-		Direction string `help:"Filter secgroup by ports" choices:"all|in|out"`
-	}
-
-	R(&SecGroupsListOptions{}, "secgroup-list", "List all security group", func(s *mcclient.ClientSession, args *SecGroupsListOptions) error {
-		params, err := options.ListStructToParams(args)
-		if err != nil {
-			return err
-		}
-		result, err := modules.SecGroups.List(s, params)
-		if err != nil {
-			return err
-		}
-		printList(result, modules.SecGroups.GetColumns(s))
-		return nil
-	})
-
-	type SecGroupsCreateOptions struct {
-		NAME  string   `help:"Name of security group to create"`
-		RULES []string `help:"security rule to create"`
-		Desc  string   `help:"Description"`
-	}
-
-	R(&SecGroupsCreateOptions{}, "secgroup-create", "Create a security group", func(s *mcclient.ClientSession, args *SecGroupsCreateOptions) error {
-		params := jsonutils.NewDict()
-		params.Add(jsonutils.NewString(args.NAME), "name")
-		if len(args.Desc) > 0 {
-			params.Add(jsonutils.NewString(args.Desc), "description")
-		}
-		for i, a := range args.RULES {
-			params.Add(jsonutils.NewString(a), fmt.Sprintf("rule.%d", i))
-		}
-		secgroups, err := modules.SecGroups.Create(s, params)
-		if err != nil {
-			return err
-		}
-		printObject(secgroups)
-		return nil
-
-	})
-
-	type SecGroupsUnionOptions struct {
-		ID        string   `help:"ID or Name of security group destination"`
-		SECGROUPS []string `help:"source IDs or Names of secgroup"`
-	}
-
-	R(&SecGroupsUnionOptions{}, "secgroup-union", "Union secgroups to one secgroup", func(s *mcclient.ClientSession, args *SecGroupsUnionOptions) error {
-		params := jsonutils.NewDict()
-		secgroups := jsonutils.NewArray()
-		for i := 0; i < len(args.SECGROUPS); i++ {
-			secgroups.Add(jsonutils.NewString(args.SECGROUPS[i]))
-		}
-		params.Add(secgroups, "secgroups")
-		secgroup, err := modules.SecGroups.PerformAction(s, args.ID, "union", params)
-		if err != nil {
-			return err
-		}
-		printObject(secgroup)
-		return nil
-
-	})
-
-	type SecGroupsDetailOptions struct {
-		ID string `help:"ID or Name of security group"`
-	}
-	R(&SecGroupsDetailOptions{}, "secgroup-show", "Show details of a security group", func(s *mcclient.ClientSession, args *SecGroupsDetailOptions) error {
-		result, err := modules.SecGroups.Get(s, args.ID, nil)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-	R(&SecGroupsDetailOptions{}, "secgroup-delete", "Delete a security group", func(s *mcclient.ClientSession, args *SecGroupsDetailOptions) error {
-		secgroups, err := modules.SecGroups.Delete(s, args.ID, nil)
-		if err != nil {
-			return err
-		}
-		printObject(secgroups)
-		return nil
-	})
-
-	R(&SecGroupsDetailOptions{}, "secgroup-public", "Make a security group publicly available", func(s *mcclient.ClientSession, args *SecGroupsDetailOptions) error {
-		result, err := modules.SecGroups.PerformAction(s, args.ID, "public", nil)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
-	R(&SecGroupsDetailOptions{}, "secgroup-private", "Make a security group private", func(s *mcclient.ClientSession, args *SecGroupsDetailOptions) error {
-		result, err := modules.SecGroups.PerformAction(s, args.ID, "private", nil)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
-	type SecGroupsUpdateOptions struct {
-		ID   string `help:"ID of security group"`
-		Name string `help:"Name of security group to update"`
-		Desc string `help:"Description of security groups"`
-	}
-
-	R(&SecGroupsUpdateOptions{}, "secgroup-update", "Update details of a security group", func(s *mcclient.ClientSession, args *SecGroupsUpdateOptions) error {
-		params := jsonutils.NewDict()
-		if len(args.Name) > 0 {
-			params.Add(jsonutils.NewString(args.Name), "name")
-		}
-		if len(args.Desc) > 0 {
-			params.Add(jsonutils.NewString(args.Desc), "description")
-		}
-		secgroups, err := modules.SecGroups.Update(s, args.ID, params)
-		if err != nil {
-			return err
-		}
-		printObject(secgroups)
-		return nil
-	})
-
-	type SecGroupsAddRuleOptions struct {
-		ID          string `help:"ID or Name of security group"`
-		DIRECTION   string `help:"Direction of rule" choices:"in|out"`
-		PROTOCOL    string `help:"Protocol of rule" choices:"any|tcp|udp|icmp"`
-		ACTION      string `help:"Actin of rule" choices:"allow|deny"`
-		PRIORITY    int    `help:"Priority for rule, range 1 ~ 100"`
-		Cidr        string `help:"IP or CIRD for rule"`
-		Description string `help:"Desciption for rule"`
-		Ports       string `help:"Port for rule"`
-	}
-
-	R(&SecGroupsAddRuleOptions{}, "secgroup-add-rule", "Add rule for a security group", func(s *mcclient.ClientSession, args *SecGroupsAddRuleOptions) error {
-		params, err := options.StructToParams(args)
-		secgroups, err := modules.SecGroups.PerformAction(s, args.ID, "add-rule", params)
-		if err != nil {
-			return err
-		}
-		printObject(secgroups)
-		return nil
-	})
-
-	type SecurityGroupCacheSecurityGroup struct {
-		ID      string `help:"ID or Name of security group"`
-		VPC     string `help:"ID or Name of vpc"`
-		Classic *bool  `help:"Is classic vpc"`
-	}
-
-	R(&SecurityGroupCacheSecurityGroup{}, "secgroup-cache-secgroup", "Cache security group for special vpc", func(s *mcclient.ClientSession, args *SecurityGroupCacheSecurityGroup) error {
-		params, err := options.StructToParams(args)
-		secgroups, err := modules.SecGroups.PerformAction(s, args.ID, "cache-secgroup", params)
-		if err != nil {
-			return err
-		}
-		printObject(secgroups)
-		return nil
-	})
-
-	type SecurityGroupUncacheSecurityGroup struct {
-		ID    string `help:"ID or Name of security group"`
-		CACHE string `help:"ID of secgroup cache"`
-	}
-
-	R(&SecurityGroupUncacheSecurityGroup{}, "secgroup-uncache-secgroup", "Unache special secgroup cache", func(s *mcclient.ClientSession, args *SecurityGroupUncacheSecurityGroup) error {
-		params := jsonutils.NewDict()
-		params.Add(jsonutils.NewString(args.CACHE), "secgroupcache")
-		secgroups, err := modules.SecGroups.PerformAction(s, args.ID, "uncache-secgroup", params)
-		if err != nil {
-			return err
-		}
-		printObject(secgroups)
-		return nil
-	})
-
+	cmd := shell.NewResourceCmd(&modules.SecGroups)
+	cmd.List(&options.SecgroupListOptions{})
+	cmd.Create(&options.SecgroupCreateOptions{})
+	cmd.Show(&options.SecgroupIdOptions{})
+	cmd.Update(&options.BaseUpdateOptions{})
+	cmd.Delete(&options.SecgroupIdOptions{})
+	cmd.Perform("merge", &options.SecgroupMergeOptions{})
+	cmd.Perform("public", &options.SecgroupIdOptions{})
+	cmd.Perform("private", &options.SecgroupIdOptions{})
+	cmd.Perform("add-rule", &options.SecgroupsAddRuleOptions{})
+	cmd.Perform("cache-secgroup", &options.SecurityGroupCacheOptions{})
+	cmd.Perform("uncache-secgroup", &options.SecurityGroupUncacheSecurityGroup{})
+	cmd.Perform("purge", &options.SecgroupIdOptions{})
+	cmd.Perform("change-owner", &options.SecgroupChangeOwnerOptions{})
 }

cmd/climc/shell/compute/servers.go

@@ -83,6 +83,7 @@ func init() {
 	cmd.Perform("publicip-to-eip", new(options.ServerPublicipToEip))
 	cmd.Perform("set-auto-renew", new(options.ServerSetAutoRenew))
 	cmd.Perform("save-template", new(options.ServerSaveImageOptions))
+	cmd.Perform("remote-update", new(options.ServerRemoteUpdateOptions))
 
 	cmd.Get("vnc", new(options.ServerIdOptions))
 	cmd.Get("desc", new(options.ServerIdOptions))

cmd/climc/shell/compute/skus.go

@@ -17,12 +17,30 @@ 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() {
+	cmd := shell.NewResourceCmd(&modules.ServerSkus).WithKeyword("server-sku")
+	cmd.PerformClass("sync-skus", &options.SkuSyncOptions{})
+
+	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
+		}
+
+		result, err := modules.ServerSkus.Get(s, "sync-tasks", params)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
 	type ServerSkusListOptions struct {
 		options.BaseListOptions
 		Cloudregion    string  `help:"region Id or name"`

cmd/climc/shell/compute/snapshots.go

@@ -31,6 +31,7 @@ func init() {
 		Local       *bool  `help:"Show local snapshots"`
 		Share       *bool  `help:"Show shared snapshots"`
 		DiskType    string `help:"Filter by disk type" choices:"sys|data"`
+		Server      string `help:"Filter by server" json:"server_id"`
 	}
 	R(&SnapshotsListOptions{}, "snapshot-list", "Show snapshots", func(s *mcclient.ClientSession, args *SnapshotsListOptions) error {
 		params, err := options.ListStructToParams(args)

cmd/climc/shell/compute/specs.go

@@ -70,13 +70,15 @@ func init() {
 
 	type HostsQueryOptions struct {
 		options.BaseListOptions
-		HostType string   `help:"Host type filter" choices:"baremetal|hypervisor|esxi|kubelet|hyperv"`
-		Ncpu     int64    `help:"#CPU count of host" metavar:"<CPU_COUNT>"`
-		MemSize  int64    `help:"Memory MB size"`
-		DiskSpec []string `help:"Disk spec string, like 'Linux_adapter0_HDD_111Gx4'"`
-		Nic      int64    `help:"#Nics count of host" metavar:"<NIC_COUNT>"`
-		GpuModel []string `help:"GPU model, like 'GeForce GTX 1050 Ti'"`
-		Occupied bool     `help:"show occupid host" json:"-"`
+		HostType    string   `help:"Host type filter" choices:"baremetal|hypervisor|esxi|kubelet|hyperv"`
+		Ncpu        int64    `help:"#CPU count of host" metavar:"<CPU_COUNT>"`
+		MemSize     int64    `help:"Memory MB size"`
+		DiskSpec    []string `help:"Disk spec string, like 'Linux_adapter0_HDD_111Gx4'"`
+		Nic         int64    `help:"#Nics count of host" metavar:"<NIC_COUNT>"`
+		GpuModel    []string `help:"GPU model, like 'GeForce GTX 1050 Ti'"`
+		Occupied    bool     `help:"Show occupid host" json:"-"`
+		Manufacture string   `help:"Manufacture of host"`
+		Model       string   `help:"Model of host"`
 	}
 	R(&HostsQueryOptions{}, "spec-hosts-list", "List hosts according by specs", func(s *mcclient.ClientSession, args *HostsQueryOptions) error {
 		newHostSpecKeys := func() []string {
@@ -90,6 +92,12 @@ func init() {
 			if args.Nic > 0 {
 				keys = append(keys, fmt.Sprintf("nic:%d", args.Nic))
 			}
+			if args.Manufacture != "" {
+				keys = append(keys, fmt.Sprintf("manufacture:%s", args.Manufacture))
+			}
+			if args.Model != "" {
+				keys = append(keys, fmt.Sprintf("model:%s", args.Model))
+			}
 			for _, gm := range args.GpuModel {
 				keys = append(keys, fmt.Sprintf("gpu_model:%s", gm))
 			}

cmd/climc/shell/compute/storages.go

@@ -35,6 +35,9 @@ func init() {
 		Zone     string `help:"List storages in zone" json:"-"`
 		Region   string `help:"List storages in region"`
 		Schedtag string `help:"filter storage by schedtag"`
+
+		HostSchedtagId string `help:"filter storage by host schedtag"`
+		ImageId        string `help:"filter storage by image"`
 	}
 	R(&StorageListOptions{}, "storage-list", "List storages", func(s *mcclient.ClientSession, opts *StorageListOptions) error {
 		params, err := options.ListStructToParams(opts)
@@ -58,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/vpcs.go

@@ -15,235 +15,24 @@
 package compute
 
 import (
-	"fmt"
-
-	"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"
 )
 
 func init() {
-	type VpcListOptions struct {
-		options.BaseListOptions
-
-		Usable             *bool  `help:"Filter usable vpcs"`
-		Region             string `help:"ID or Name of region" json:"-"`
-		Globalvpc          string `help:"Filter by globalvpc"`
-		ExternalAccessMode string `help:"Filter by external access mode" choices:"distgw|eip|eip-distgw"`
-	}
-	R(&VpcListOptions{}, "vpc-list", "List VPCs", func(s *mcclient.ClientSession, opts *VpcListOptions) error {
-		params, err := options.ListStructToParams(opts)
-		if err != nil {
-			return err
-		}
-
-		var result *modulebase.ListResult
-		if len(opts.Region) > 0 {
-			result, err = modules.Vpcs.ListInContext(s, params, &modules.Cloudregions, opts.Region)
-		} else {
-			result, err = modules.Vpcs.List(s, params)
-		}
-		if err != nil {
-			return err
-		}
-
-		if len(opts.ExportFile) > 0 {
-			exportList(result, opts.ExportFile, opts.ExportKeys, opts.ExportTexts, modules.Vpcs.GetColumns(s))
-		} else {
-			printList(result, modules.Vpcs.GetColumns(s))
-		}
-		return nil
-	})
-
-	type VpcCreateOptions struct {
-		REGION             string `help:"ID or name of the region where the VPC is created"`
-		Id                 string `help:"ID of the new VPC"`
-		NAME               string `help:"Name of the VPC"`
-		CIDR               string `help:"CIDR block"`
-		Default            bool   `help:"default VPC for the region" default:"false"`
-		Desc               string `help:"Description of the VPC"`
-		Manager            string `help:"ID or Name of Cloud provider"`
-		ExternalAccessMode string `help:"Filter by external access mode" choices:"distgw|eip|eip-distgw" default:"eip-distgw"`
-	}
-	R(&VpcCreateOptions{}, "vpc-create", "Create a VPC", func(s *mcclient.ClientSession, args *VpcCreateOptions) error {
-		params := jsonutils.NewDict()
-		params.Add(jsonutils.NewString(args.NAME), "name")
-		params.Add(jsonutils.NewString(args.CIDR), "cidr_block")
-		if len(args.Id) > 0 {
-			params.Add(jsonutils.NewString(args.Id), "id")
-		}
-		if len(args.ExternalAccessMode) > 0 {
-			params.Add(jsonutils.NewString(args.ExternalAccessMode), "external_access_mode")
-		}
-		if len(args.Desc) > 0 {
-			params.Add(jsonutils.NewString(args.Desc), "description")
-		}
-		if args.Default {
-			params.Add(jsonutils.JSONTrue, "is_default")
-		}
-		if len(args.Manager) > 0 {
-			params.Add(jsonutils.NewString(args.Manager), "manager")
-		}
-		results, err := modules.Vpcs.CreateInContext(s, params, &modules.Cloudregions, args.REGION)
-		if err != nil {
-			return err
-		}
-		printObject(results)
-		return nil
-	})
-
-	type VpcShowOptions struct {
-		ID string `help:"ID or name of the region"`
-	}
-	R(&VpcShowOptions{}, "vpc-show", "Show a VPC", func(s *mcclient.ClientSession, args *VpcShowOptions) error {
-		results, err := modules.Vpcs.Get(s, args.ID, nil)
-		if err != nil {
-			return err
-		}
-		printObject(results)
-		return nil
-	})
-
-	R(&VpcShowOptions{}, "vpc-delete", "Delete a VPC", func(s *mcclient.ClientSession, args *VpcShowOptions) error {
-		results, err := modules.Vpcs.Delete(s, args.ID, nil)
-		if err != nil {
-			return err
-		}
-		printObject(results)
-		return nil
-	})
-
-	type VpcUpdateOptions struct {
-		ID                 string `help:"ID or name of the VPC"`
-		Name               string `help:"New name of the VPC"`
-		Desc               string `help:"Description of the VPC"`
-		ExternalAccessMode string `help:"Filter by external access mode" choices:"distgw|eip|eip-distgw"`
-	}
-	R(&VpcUpdateOptions{}, "vpc-update", "Update a VPC", func(s *mcclient.ClientSession, args *VpcUpdateOptions) error {
-		params := jsonutils.NewDict()
-		if len(args.Name) > 0 {
-			params.Add(jsonutils.NewString(args.Name), "name")
-		}
-		if len(args.ExternalAccessMode) > 0 {
-			params.Add(jsonutils.NewString(args.ExternalAccessMode), "external_access_mode")
-		}
-		if len(args.Desc) > 0 {
-			params.Add(jsonutils.NewString(args.Desc), "description")
-		}
-		results, err := modules.Vpcs.Update(s, args.ID, params)
-		if err != nil {
-			return err
-		}
-		printObject(results)
-		return nil
-	})
-
-	type VpcUpdateStatusOptions struct {
-		ID string `help:"ID or name of the VPC"`
-	}
-	R(&VpcUpdateStatusOptions{}, "vpc-available", "Make vpc status available", func(s *mcclient.ClientSession, args *VpcUpdateStatusOptions) error {
-		params := jsonutils.NewDict()
-		params.Add(jsonutils.NewString("available"), "status")
-		result, err := modules.Vpcs.PerformAction(s, args.ID, "status", params)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
-	R(&VpcUpdateStatusOptions{}, "vpc-pending", "Make vpc status pending", func(s *mcclient.ClientSession, args *VpcUpdateStatusOptions) error {
-		params := jsonutils.NewDict()
-		params.Add(jsonutils.NewString("pending"), "status")
-		result, err := modules.Vpcs.PerformAction(s, args.ID, "status", params)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
-	R(&VpcUpdateStatusOptions{}, "vpc-purge", "Purge a managed VPC, not delete the remote entity", func(s *mcclient.ClientSession, args *VpcUpdateStatusOptions) error {
-		result, err := modules.Vpcs.PerformAction(s, args.ID, "purge", nil)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
-	R(&VpcUpdateStatusOptions{}, "vpc-sync", "Synchronize the status of a vpc", func(s *mcclient.ClientSession, args *VpcUpdateStatusOptions) error {
-		result, err := modules.Vpcs.PerformAction(s, args.ID, "sync", nil)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
-	R(&VpcUpdateStatusOptions{}, "vpc-syncstatus", "Sync the status of a vpc", func(s *mcclient.ClientSession, args *VpcUpdateStatusOptions) error {
-		result, err := modules.Vpcs.PerformAction(s, args.ID, "syncstatus", nil)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
-	type VpcPublicOptions struct {
-		ID            string   `help:"ID or name of vpc" json:"-"`
-		Scope         string   `help:"sharing scope" choices:"system|domain"`
-		SharedDomains []string `help:"share to domains"`
-	}
-	R(&VpcPublicOptions{}, "vpc-public", "Make vpc public", func(s *mcclient.ClientSession, args *VpcPublicOptions) error {
-		params := jsonutils.Marshal(args)
-		result, err := modules.Vpcs.PerformAction(s, args.ID, "public", params)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
-	type VpcPrivateOptions struct {
-		ID string `help:"ID or name of vpc" json:"-"`
-	}
-	R(&VpcPrivateOptions{}, "vpc-private", "Make vpc private", func(s *mcclient.ClientSession, args *VpcPrivateOptions) error {
-		params := jsonutils.Marshal(args)
-		result, err := modules.Vpcs.PerformAction(s, args.ID, "private", params)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
-	R(&VpcShowOptions{}, "vpc-change-owner-candidate-domains", "Show candiate domains of a vpc for changing owner", func(s *mcclient.ClientSession, args *VpcShowOptions) error {
-		result, err := modules.Vpcs.GetSpecific(s, args.ID, "change-owner-candidate-domains", nil)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
-	type VpcChangeOwnerOptions struct {
-		ID            string `help:"ID or name of vpc" json:"-"`
-		ProjectDomain string `json:"project_domain" help:"target domain"`
-	}
-	R(&VpcChangeOwnerOptions{}, "vpc-change-owner", "Change owner domain of vpc", func(s *mcclient.ClientSession, args *VpcChangeOwnerOptions) error {
-		if len(args.ProjectDomain) == 0 {
-			return fmt.Errorf("empty project_domain")
-		}
-		params := jsonutils.Marshal(args)
-		ret, err := modules.Vpcs.PerformAction(s, args.ID, "change-owner", params)
-		if err != nil {
-			return err
-		}
-		printObject(ret)
-		return nil
-	})
+	cmd := shell.NewResourceCmd(&modules.Vpcs).WithContextManager(&modules.Cloudregions)
+	cmd.List(&options.VpcListOptions{})
+	cmd.Create(&options.VpcCreateOptions{})
+	cmd.Show(&options.VpcIdOptions{})
+	cmd.Delete(&options.VpcIdOptions{})
+	cmd.Update(&options.VpcUpdateOptions{})
+	cmd.Perform("status", &options.VpcStatusOptions{})
+	cmd.Perform("purge", &options.VpcIdOptions{})
+	cmd.Perform("sync", &options.VpcIdOptions{})
+	cmd.Perform("syncstatus", &options.VpcIdOptions{})
+	cmd.Perform("private", &options.VpcIdOptions{})
+	cmd.Perform("public", &options.BasePublicOptions{})
+	cmd.Perform("change-owner", &options.VpcChangeOwnerOptions{})
+	cmd.Get("vpc-change-owner-candidate-domains", &options.VpcIdOptions{})
 }

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

@@ -20,7 +20,6 @@ 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/k8s"
 )
 
 type BaseEventListOptions struct {
@@ -54,23 +53,19 @@ type TypeEventListOptions struct {
 	ID string `help:"" metavar:"OBJ_ID"`
 }
 
-func doK8sEventList(s *mcclient.ClientSession, args *EventListOptions) error {
-	return doEventList(*k8s.Logs.ResourceManager, s, args)
-}
-
 func doComputeEventList(s *mcclient.ClientSession, args *EventListOptions) error {
-	return doEventList(modules.Logs, s, args)
+	return DoEventList(modules.Logs, s, args)
 }
 
 func doImageEventList(s *mcclient.ClientSession, args *EventListOptions) error {
-	return doEventList(modules.ImageLogs, s, args)
+	return DoEventList(modules.ImageLogs, s, args)
 }
 
 func doIdentityEventList(s *mcclient.ClientSession, args *EventListOptions) error {
-	return doEventList(modules.IdentityLogs, s, args)
+	return DoEventList(modules.IdentityLogs, s, args)
 }
 
-func doEventList(man modulebase.ResourceManager, s *mcclient.ClientSession, args *EventListOptions) error {
+func DoEventList(man modulebase.ResourceManager, s *mcclient.ClientSession, args *EventListOptions) error {
 	params := jsonutils.NewDict()
 	if len(args.Type) > 0 {
 		params.Add(jsonutils.NewStringArray(args.Type), "obj_type")
@@ -190,16 +185,6 @@ func init() {
 		return doComputeEventList(s, &nargs)
 	})
 
-	R(&TypeEventListOptions{}, "kubecluster-event", "Show operation event logs of kubernetes cluster", func(s *mcclient.ClientSession, args *TypeEventListOptions) error {
-		nargs := EventListOptions{BaseEventListOptions: args.BaseEventListOptions, Id: args.ID, Type: []string{"kubecluster"}}
-		return doK8sEventList(s, &nargs)
-	})
-
-	R(&TypeEventListOptions{}, "kubemachine-event", "Show operation event logs of kubernetes machine", func(s *mcclient.ClientSession, args *TypeEventListOptions) error {
-		nargs := EventListOptions{BaseEventListOptions: args.BaseEventListOptions, Id: args.ID, Type: []string{"kubemachine"}}
-		return doK8sEventList(s, &nargs)
-	})
-
 	R(&TypeEventListOptions{}, "image-event", "Show operation event logs of glance images", func(s *mcclient.ClientSession, args *TypeEventListOptions) error {
 		nargs := EventListOptions{BaseEventListOptions: args.BaseEventListOptions, Id: args.ID, Type: []string{"image"}}
 		return doImageEventList(s, &nargs)

cmd/climc/shell/helper.go

@@ -78,7 +78,7 @@ type ICreateOpt interface {
 	IOpt
 }
 
-func (cmd ResourceCmd) runWithDesc(action, desc string, args interface{}, callback interface{}) {
+func (cmd ResourceCmd) RunWithDesc(action, desc string, args interface{}, callback interface{}) {
 	man := cmd.manager
 	prefix := cmd.prefix
 	if prefix != "" {
@@ -98,8 +98,8 @@ func (cmd ResourceCmd) runWithDesc(action, desc string, args interface{}, callba
 	R(args, fmt.Sprintf("%s%s-%s", prefix, cmd.keyword, action), desc, callback)
 }
 
-func (cmd ResourceCmd) run(action string, args interface{}, callback interface{}) {
-	cmd.runWithDesc(action, "", args, callback)
+func (cmd ResourceCmd) Run(action string, args interface{}, callback interface{}) {
+	cmd.RunWithDesc(action, "", args, callback)
 }
 
 func (cmd ResourceCmd) List(args IListOpt) {
@@ -130,7 +130,7 @@ func (cmd ResourceCmd) List(args IListOpt) {
 		printList(result, man.GetColumns(s))
 		return nil
 	}
-	cmd.run("list", args, callback)
+	cmd.Run("list", args, callback)
 }
 
 func (cmd ResourceCmd) Create(args ICreateOpt) {
@@ -147,7 +147,7 @@ func (cmd ResourceCmd) Create(args ICreateOpt) {
 		printObject(ret)
 		return nil
 	}
-	cmd.run("create", args, callback)
+	cmd.Run("create", args, callback)
 }
 
 type IIdOpt interface {
@@ -177,7 +177,24 @@ func (cmd ResourceCmd) Show(args IShowOpt) {
 		printObject(ret)
 		return nil
 	}
-	cmd.runWithDesc("show", fmt.Sprintf("Show details of a %s", man.GetKeyword()), args, callback)
+	cmd.RunWithDesc("show", fmt.Sprintf("Show details of a %s", man.GetKeyword()), args, callback)
+}
+
+func (cmd ResourceCmd) ClassShow(args IShowOpt) {
+	man := cmd.manager
+	callback := func(s *mcclient.ClientSession, args IShowOpt) error {
+		params, err := args.Params()
+		if err != nil {
+			return err
+		}
+		ret, err := man.(modulebase.Manager).Get(s, args.GetId(), params)
+		if err != nil {
+			return err
+		}
+		printObject(ret)
+		return nil
+	}
+	cmd.RunWithDesc(args.GetId(), fmt.Sprintf("Show %s of a %s", args.GetId(), man.GetKeyword()), args, callback)
 }
 
 type IGetActionOpt interface {
@@ -230,7 +247,7 @@ func (cmd ResourceCmd) Custom(action TCustomAction, funcname string, args IGetAc
 		}
 		return nil
 	}
-	cmd.runWithDesc(funcname, fmt.Sprintf("Get %s of a %s", funcname, man.GetKeyword()), args, callback)
+	cmd.RunWithDesc(funcname, fmt.Sprintf("Get %s of a %s", funcname, man.GetKeyword()), args, callback)
 }
 
 type IDeleteOpt interface {
@@ -252,7 +269,7 @@ func (cmd ResourceCmd) Delete(args IDeleteOpt) {
 		printObject(ret)
 		return nil
 	}
-	cmd.runWithDesc("delete", fmt.Sprintf("Delete %s", man.GetKeyword()), args, callback)
+	cmd.RunWithDesc("delete", fmt.Sprintf("Delete %s", man.GetKeyword()), args, callback)
 }
 
 type IWithDescOpt interface {
@@ -278,7 +295,7 @@ func (cmd ResourceCmd) Perform(action string, args IPerformOpt) {
 		printObject(ret)
 		return nil
 	}
-	cmd.run(action, args, callback)
+	cmd.Run(action, args, callback)
 }
 
 func (cmd ResourceCmd) PerformClass(action string, args IOpt) {
@@ -295,7 +312,7 @@ func (cmd ResourceCmd) PerformClass(action string, args IOpt) {
 		printObject(ret)
 		return nil
 	}
-	cmd.run(action, args, callback)
+	cmd.Run(action, args, callback)
 }
 
 type IBatchPerformOpt interface {
@@ -314,7 +331,7 @@ func (cmd ResourceCmd) BatchPerform(action string, args IBatchPerformOpt) {
 		printBatchResults(ret, man.GetColumns(s))
 		return nil
 	}
-	cmd.run(action, args, callback)
+	cmd.Run(action, args, callback)
 }
 
 type IGetOpt interface {
@@ -336,7 +353,7 @@ func (cmd ResourceCmd) Get(specific string, args IGetOpt) {
 		printObject(ret)
 		return nil
 	}
-	cmd.runWithDesc(specific, fmt.Sprintf("Get %s of a %s", specific, man.GetKeyword()), args, callback)
+	cmd.RunWithDesc(specific, fmt.Sprintf("Get %s of a %s", specific, man.GetKeyword()), args, callback)
 }
 
 type IUpdateOpt interface {
@@ -358,7 +375,7 @@ func (cmd ResourceCmd) Update(args IUpdateOpt) {
 		printObject(ret)
 		return nil
 	}
-	cmd.run("update", args, callback)
+	cmd.Run("update", args, callback)
 }
 
 type IMetadataOpt interface {
@@ -380,7 +397,7 @@ func (cmd ResourceCmd) GetMetadata(args IMetadataOpt) {
 		printObject(ret)
 		return nil
 	}
-	cmd.runWithDesc("metadata", fmt.Sprintf("Show metadata of a %s", man.GetKeyword()), args, callback)
+	cmd.RunWithDesc("metadata", fmt.Sprintf("Show metadata of a %s", man.GetKeyword()), args, callback)
 }
 
 type IBatchDeleteOpt interface {
@@ -399,7 +416,7 @@ func (cmd ResourceCmd) BatchDelete(args IBatchDeleteOpt) {
 		printBatchResults(ret, man.GetColumns(s))
 		return nil
 	}
-	cmd.run("delete", args, callback)
+	cmd.Run("delete", args, callback)
 }
 
 type IBatchDeleteWithParamOpt interface {
@@ -422,7 +439,7 @@ func (cmd ResourceCmd) BatchDeleteWithParam(args IBatchDeleteWithParamOpt) {
 		printBatchResults(ret, man.GetColumns(s))
 		return nil
 	}
-	cmd.run("delete", args, callback)
+	cmd.Run("delete", args, callback)
 }
 
 type IBatchPutOpt interface {
@@ -441,7 +458,7 @@ func (cmd ResourceCmd) BatchPut(args IBatchPutOpt) {
 		printBatchResults(ret, man.GetColumns(s))
 		return nil
 	}
-	cmd.run("update", args, callback)
+	cmd.Run("update", args, callback)
 }
 
 type JointCmd struct {
@@ -471,7 +488,7 @@ func (cmd JointCmd) List(args IJointListOpt) {
 		if len(args.GetMasterOpt()) > 0 {
 			result, err = man.ListDescendent(s, args.GetMasterOpt(), params)
 		} else if len(args.GetSlaveOpt()) > 0 {
-			result, err = man.ListDescendent2(s, args.GetMasterOpt(), params)
+			result, err = man.ListDescendent2(s, args.GetSlaveOpt(), params)
 		} else {
 			result, err = man.List(s, params)
 		}
@@ -481,7 +498,7 @@ func (cmd JointCmd) List(args IJointListOpt) {
 		printList(result, man.GetColumns(s))
 		return nil
 	}
-	cmd.runWithDesc("list", fmt.Sprintf("list %s %s pairs", man.MasterManager().KeyString(), man.SlaveManager().KeyString()), args, callback)
+	cmd.RunWithDesc("list", fmt.Sprintf("list %s %s pairs", man.MasterManager().KeyString(), man.SlaveManager().KeyString()), args, callback)
 }
 
 type IJointShowOpt interface {
@@ -504,5 +521,5 @@ func (cmd JointCmd) Show(args IJointShowOpt) {
 		printObject(result)
 		return nil
 	}
-	cmd.run("show", args, callback)
+	cmd.Run("show", args, callback)
 }

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

@@ -23,20 +23,27 @@ import (
 
 func init() {
 	type RoleAssignmentsOptions struct {
-		Effective     bool   `help:"Include role assignment of group members"`
-		System        bool   `help:"Include system user account"`
-		Policy        bool   `help:"Show matched policies"`
-		Domain        string `help:"Role assignments for domain"`
-		User          string `help:"For user"`
-		UserDomain    string `help:"Domain for user"`
-		Group         string `help:"For group"`
-		GroupDomain   string `help:"Domain for group"`
-		Project       string `help:"Role assignments for project"`
-		ProjectDomain string `help:"Domain for project"`
-		Role          string `help:"Role assignments for role"`
-		RoleDomain    string `help:"Domain for role"`
-		Limit         int64  `help:"maximal returned number of rows"`
-		Offset        int64  `help:"offset index of returned results"`
+		Effective     bool     `help:"Include role assignment of group members"`
+		System        bool     `help:"Include system user account"`
+		Policy        bool     `help:"Show matched policies"`
+		Domain        string   `help:"Role assignments for domain"`
+		User          string   `help:"For user"`
+		UserDomain    string   `help:"Domain for user"`
+		Group         string   `help:"For group"`
+		GroupDomain   string   `help:"Domain for group"`
+		Project       string   `help:"Role assignments for project"`
+		ProjectDomain string   `help:"Domain for project"`
+		Role          string   `help:"Role assignments for role"`
+		RoleDomain    string   `help:"Domain for role"`
+		Limit         int64    `help:"maximal returned number of rows"`
+		Offset        int64    `help:"offset index of returned results"`
+		Users         []string `help:"fitler by user id or name"`
+		Groups        []string `help:"fitler by group id or name"`
+		Roles         []string `help:"fitler by role id or name"`
+		Projects      []string `help:"fitler by project id or name"`
+		Domains       []string `help:"fitler by domain id or name"`
+
+		ProjectDomains []string `help:"filter by project's domain id or name"`
 	}
 	R(&RoleAssignmentsOptions{}, "role-assignments", "List all role assignments", func(s *mcclient.ClientSession, args *RoleAssignmentsOptions) error {
 		query := jsonutils.NewDict()
@@ -85,6 +92,24 @@ func init() {
 			}
 			query.Add(jsonutils.NewString(rid), "role", "id")
 		}
+		if len(args.Users) > 0 {
+			query.Add(jsonutils.NewStringArray(args.Users), "users")
+		}
+		if len(args.Groups) > 0 {
+			query.Add(jsonutils.NewStringArray(args.Groups), "groups")
+		}
+		if len(args.Roles) > 0 {
+			query.Add(jsonutils.NewStringArray(args.Roles), "roles")
+		}
+		if len(args.Projects) > 0 {
+			query.Add(jsonutils.NewStringArray(args.Projects), "projects")
+		}
+		if len(args.Domains) > 0 {
+			query.Add(jsonutils.NewStringArray(args.Domains), "domains")
+		}
+		if len(args.ProjectDomains) > 0 {
+			query.Add(jsonutils.NewStringArray(args.ProjectDomains), "project_domains")
+		}
 		if args.Limit > 0 {
 			query.Add(jsonutils.NewInt(args.Limit), "limit")
 		}

cmd/climc/shell/identity/users.go

@@ -262,6 +262,8 @@ func init() {
 
 		// DefaultProject string `help:"Default project"`
 		// Option []string `help:"User options"`
+
+		SkipPasswordComplexityCheck bool `help:"skip_password_complexity_check"`
 	}
 	R(&UserUpdateOptions{}, "user-update", "Update a user", func(s *mcclient.ClientSession, args *UserUpdateOptions) error {
 		query := jsonutils.NewDict()
@@ -282,6 +284,9 @@ func init() {
 		}
 		if args.Password != nil {
 			params.Add(jsonutils.NewString(*args.Password), "password")
+			if args.SkipPasswordComplexityCheck {
+				params.Add(jsonutils.JSONTrue, "skip_password_complexity_check")
+			}
 		}
 		if len(args.Displayname) > 0 {
 			params.Add(jsonutils.NewString(args.Displayname), "displayname")

cmd/climc/shell/k8s/certs.go

@@ -15,27 +15,11 @@
 package k8s
 
 import (
-	"fmt"
-
-	"yunion.io/x/onecloud/pkg/mcclient"
 	"yunion.io/x/onecloud/pkg/mcclient/modules/k8s"
 	o "yunion.io/x/onecloud/pkg/mcclient/options/k8s"
 )
 
 func initKubeCerts() {
-	cmdN := func(action string) string {
-		return fmt.Sprintf("kubecert-%s", action)
-	}
-	R(&o.CertListOptions{}, cmdN("list"), "List k8s cluster certificates key pairs", func(s *mcclient.ClientSession, args *o.CertListOptions) error {
-		params, err := args.Params()
-		if err != nil {
-			return err
-		}
-		ret, err := k8s.KubeCerts.List(s, params)
-		if err != nil {
-			return err
-		}
-		printList(ret, k8s.KubeCerts.GetColumns(s))
-		return nil
-	})
+	cmd := NewK8sResourceCmd(k8s.KubeCerts)
+	cmd.List(new(o.CertListOptions))
 }