feat(region,host): hostpinger add cpu usage percent report (#22006)

Co-authored-by: Qiu Jian <qiujian@yunionyun.com>

.circleci/config.yml

@@ -7,7 +7,7 @@ jobs:
     requires:
       - check
     docker:
-      - image: yunion/centos-build:go-1.18.3-0
+      - image: yunion/centos-build:go-1.21.10-0
         environment:
           ONECLOUD_CI_BUILD: "1"
 

.github/workflows/ci-pr-build-test.yml

@@ -0,0 +1,38 @@
+name: Building and test for PR
+
+on:
+  pull_request:
+    types: [opened, synchronize, reopened]
+
+jobs:
+  build_and_test:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+
+    - name: Setup Go
+      uses: actions/setup-go@v4
+      with:
+        go-version: '1.21'
+
+    - name: Install check tools
+      shell: bash
+      run: |
+        set -o xtrace
+        git clone --branch yun --depth 4 https://github.com/yousong/tools && cd tools
+        go build ./cmd/goimports && sudo cp goimports /usr/bin/ && cd .. && rm -rf tools
+        git clone --depth 4 https://github.com/yousong/y18n && cd y18n
+        go build . && sudo cp y18n /usr/bin && cd .. && rm -rf y18n
+
+    
+    - name: Test and build
+      shell: bash
+      run: |
+        set -o xtrace
+        export GO111MODULE=on
+        make -j3 check
+        make test
+        targets="$(find cmd -mindepth 1 -maxdepth 1 -type d | grep -v cmd/host-image | grep -v torrent)"
+        echo $targets | tr ' ' '\n'
+        make $targets
+        ls -lh _output/bin

.github/workflows/docker_apigateway.yml

@@ -22,7 +22,7 @@ jobs:
         
     - uses: actions/setup-go@v4
       with:
-        go-version: '1.18'
+        go-version: '1.21'
         
     - name: Set up QEMU
       uses: docker/setup-qemu-action@v2

.github/workflows/docker_climc.yml

@@ -20,7 +20,7 @@ jobs:
         
     - uses: actions/setup-go@v4
       with:
-        go-version: '1.18'
+        go-version: '1.21'
         
     - name: Set up QEMU
       uses: docker/setup-qemu-action@v2

.github/workflows/docker_cloudmon.yml

@@ -21,7 +21,7 @@ jobs:
         
     - uses: actions/setup-go@v4
       with:
-        go-version: '1.18'
+        go-version: '1.21'
         
     - name: Set up QEMU
       uses: docker/setup-qemu-action@v2

.github/workflows/docker_esxi_agent.yml

@@ -19,7 +19,7 @@ jobs:
         
     - uses: actions/setup-go@v4
       with:
-        go-version: '1.18'
+        go-version: '1.21'
         
     - name: Set up QEMU
       uses: docker/setup-qemu-action@v2

.github/workflows/docker_glance.yml

@@ -23,7 +23,7 @@ jobs:
         
     - uses: actions/setup-go@v4
       with:
-        go-version: '1.18'
+        go-version: '1.21'
         
     - name: Set up QEMU
       uses: docker/setup-qemu-action@v2

.github/workflows/docker_host.yml

@@ -19,7 +19,7 @@ jobs:
         
     - uses: actions/setup-go@v4
       with:
-        go-version: '1.18'
+        go-version: '1.21'
         
     - name: Set up QEMU
       uses: docker/setup-qemu-action@v2

.github/workflows/docker_keystone.yml

@@ -23,7 +23,7 @@ jobs:
         
     - uses: actions/setup-go@v4
       with:
-        go-version: '1.18'
+        go-version: '1.21'
         
     - name: Set up QEMU
       uses: docker/setup-qemu-action@v2

.github/workflows/docker_logger.yml

@@ -23,7 +23,7 @@ jobs:
         
     - uses: actions/setup-go@v4
       with:
-        go-version: '1.18'
+        go-version: '1.21'
         
     - name: Set up QEMU
       uses: docker/setup-qemu-action@v2

.github/workflows/docker_notify.yml

@@ -23,7 +23,7 @@ jobs:
         
     - uses: actions/setup-go@v4
       with:
-        go-version: '1.18'
+        go-version: '1.21'
         
     - name: Set up QEMU
       uses: docker/setup-qemu-action@v2

.github/workflows/docker_region.yml

@@ -24,7 +24,7 @@ jobs:
         
     - uses: actions/setup-go@v4
       with:
-        go-version: '1.18'
+        go-version: '1.21'
         
     - name: Set up QEMU
       uses: docker/setup-qemu-action@v2

.github/workflows/docker_scheduler.yml

@@ -20,7 +20,7 @@ jobs:
         
     - uses: actions/setup-go@v4
       with:
-        go-version: '1.18'
+        go-version: '1.21'
         
     - name: Set up QEMU
       uses: docker/setup-qemu-action@v2

.github/workflows/docker_webconsole.yml

@@ -23,7 +23,7 @@ jobs:
         
     - uses: actions/setup-go@v4
       with:
-        go-version: '1.18'
+        go-version: '1.21'
         
     - name: Set up QEMU
       uses: docker/setup-qemu-action@v2

.github/workflows/issue-check-inactive.yml

@@ -0,0 +1,17 @@
+name: Issue Check Inactive
+
+on:
+  schedule:
+    - cron: "0 0 * * *"
+
+jobs:
+  issue-check-inactive:
+    runs-on: ubuntu-latest
+    steps:
+      - name: check-inactive
+        uses: actions-cool/issues-helper@v2
+        with:
+          actions: 'check-inactive'
+          inactive-label: 'stale'
+          inactive-day: 30
+          exclude-labels: 'announcement'

.github/workflows/issue-close-require.yml

@@ -0,0 +1,20 @@
+name: Issue Close Require
+
+on:
+  schedule:
+    - cron: "0 1 * * *"
+
+jobs:
+  issue-close-require:
+    runs-on: ubuntu-latest
+    steps:
+      - name: need reproduce
+        uses: actions-cool/issues-helper@v2
+        with:
+          actions: 'close-issues'
+          labels: 'stale,state/awaiting user feedback'
+          inactive-day: 7
+          body: |
+            If you do not provide feedback for more than 37 days, we will close the issue and you can either reopen it or submit a new issue.
+
+            您超过 37 天未反馈信息，我们将关闭该 issue，如有需求您可以重新打开或者提交新的 issue。

.github/workflows/issue-close.yml

@@ -0,0 +1,16 @@
+name: Issue Close Check
+
+on:
+  issues:
+    types: [closed]
+
+jobs:
+  issue-closed-remove-labels:
+    runs-on: ubuntu-latest
+    if: "!contains(github.event.issue.labels.*.name, 'stale')"
+    steps:
+      - name: Remove statle labels when issue that hasn't stale label is closed
+        uses: actions-cool/issues-helper@v2
+        with:
+          actions: 'remove-labels'
+          labels: 'state/awaiting processing,state/awaiting user feedback'

.github/workflows/issue-comment.yml

@@ -0,0 +1,38 @@
+on:
+  issue_comment:
+    types: [created]
+
+name: Add issues workflow labels
+
+jobs:
+  add-label-if-is-author:
+    runs-on: ubuntu-latest
+    if: (github.event.issue.user.id == github.event.comment.user.id) && !github.event.issue.pull_request && (github.event.issue.state == 'open')
+    steps:
+      - name: Add require handle label
+        uses: actions-cool/issues-helper@v2
+        with:
+          actions: 'add-labels'
+          labels: 'state/awaiting processing'
+
+      - name: Remove require reply label
+        uses: actions-cool/issues-helper@v2
+        with:
+          actions: 'remove-labels'
+          labels: 'state/awaiting user feedback,stale'
+
+  add-label-if-not-author:
+    runs-on: ubuntu-latest
+    if: (github.event.issue.user.id != github.event.comment.user.id) && !github.event.issue.pull_request && (github.event.issue.state == 'open') && (!contains(github.event.comment.body, '/keep-state'))
+    steps:
+      - name: Add require replay label
+        uses: actions-cool/issues-helper@v2
+        with:
+          actions: 'add-labels'
+          labels: 'state/awaiting user feedback'
+
+      - name: Remove require handle label
+        uses: actions-cool/issues-helper@v2
+        with:
+          actions: 'remove-labels'
+          labels: 'state/awaiting processing,stale'

.github/workflows/issue-notify.yml

@@ -0,0 +1,17 @@
+on:
+  issue_comment:
+    types: [created]
+
+jobs:
+  notify-author-comment:
+    runs-on: ubuntu-latest
+    if: (github.event.issue.user.id == github.event.comment.user.id) && !github.event.issue.pull_request
+    # find context from: https://docs.github.com/en/webhooks/webhook-events-and-payloads#issue_comment
+    steps:
+      - name: feishu notify
+        uses: zexi/action-issues-notify@v1
+        with:
+          url: ${{ secrets.FEISHU_BOT_WEBHOOK_URL }}
+          issue_title: "${{ github.event.comment.user.login }} 回复了 issue: ${{ github.event.issue.title }}"
+          issue_body: "${{ tojson(github.event.comment.body) }}"
+          issue_link_url: "${{github.event.comment.html_url}}"

.github/workflows/issue-open.yml

@@ -0,0 +1,33 @@
+name: Issue Open Check
+
+on:
+  issues:
+    types: [opened, reopened]
+
+jobs:
+  issue-open-add-labels:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Add labels
+        uses: actions-cool/issues-helper@v2
+        if: ${{ !github.event.comment.pull_request.pull_request }}
+        with:
+          actions: 'add-labels'
+          labels: 'state/awaiting processing'
+
+      - name: Remove require reply label
+        uses: actions-cool/issues-helper@v2
+        with:
+          actions: 'remove-labels'
+          labels: 'state/awaiting user feedback,stale'
+
+  notify-author-comment:
+    runs-on: ubuntu-latest
+    steps:
+      - name: feishu notify
+        uses: zexi/action-issues-notify@v1
+        with:
+          url: ${{ secrets.FEISHU_BOT_WEBHOOK_URL }}
+          issue_title: "${{ github.event.issue.user.login }} 提交了 issue: ${{ github.event.issue.title }}"
+          issue_body: "${{ tojson(github.event.issue.body) }}"
+          issue_link_url: "${{github.event.issue.html_url}}"

CONTRIBUTING.md

@@ -18,7 +18,7 @@ You may answer issues at Github and help those who encounter issues when using C
 
 ## Contribute codes
 
-You are welcome to contribute codes to Cloudpods. Please refers to [CONTRIBUTING](https://www.cloudpods.org/en/docs/contribute/contrib/) for more details on how to contribute codes to Cloudpods.
+You are welcome to contribute codes to Cloudpods. Please refers to [CONTRIBUTING](https://www.cloudpods.org/en/docs/development/contrib/) for more details on how to contribute codes to Cloudpods.
 
 ### Fix Issues
 
@@ -29,8 +29,8 @@ You may help solve bugs by submiting patches.
 
 You may help improve the codes of Cloudpods, including:
 
-* Develop new features for Cloudpods
-* Recode some part of Cloudpods so as to make the code easier to be understood, or less error-prone, or more efficient
+* Develop new [features for Cloudpods](https://github.com/yunionio/cloudpods/issues?q=is%3Aopen+is%3Aissue+label%3Afeature).
+* Recode some part of Cloudpods so as to make the code easier to be understood, or less error-prone, or more efficient.
 
 ## Documentation
 

CONTRIBUTING_zh.md

@@ -18,7 +18,7 @@ Cloudpods是一款开源的基础设施管理工具软件，运行场景复杂
 
 ## 贡献代码
 
-我们非常欢迎和感谢开发者向项目提交代码PR，流程细节请查看 [CONTRIBUTING](https://www.cloudpods.org/zh/docs/contribute/contrib/).
+我们非常欢迎和感谢开发者向项目提交代码PR，流程细节请查看 [CONTRIBUTING](https://www.cloudpods.org/docs/development/contrib/).
 
 ### 修复BUG
 
@@ -27,8 +27,8 @@ Cloudpods是一款开源的基础设施管理工具软件，运行场景复杂
 ### 开发新的功能特性
 
 不仅仅是修复BUG，您也可以通过提交代码以改进Cloudpods，包括但不限于：
-* 开发新的功能特性，您可以在[Cloudpods Roadmap](https://www.cloudpods.org/zh/docs/roadmap/)找到Cloudpods的功能规划
-* 重构代码，使得代码更加简洁易读，更加低健壮，或者执行起来更加高效
+* 开发新的功能特性，您可以在[feature issues](https://github.com/yunionio/cloudpods/issues?q=is%3Aopen+is%3Aissue+label%3Afeature)查找需要的功能。
+* 重构代码，使得代码更加简洁易读，更加低健壮，或者执行起来更加高效。
 
 ## 文档
 

Makefile

@@ -81,7 +81,7 @@ gencopyright:
 	@bash scripts/gencopyright.sh pkg cmd
 
 test:
-	@go test $(GO_BUILD_FLAGS) $(shell go list ./... | egrep -v 'host-image|hostimage')
+	@go test $(GO_BUILD_FLAGS) $(shell go list ./... | egrep -v 'host-image|hostimage|torrent')
 
 vet:
 	go vet ./...
@@ -89,11 +89,14 @@ vet:
 # cmd/esxi-agent: prepare_dir
 # 	CGO_ENABLED=0 $(GO_BUILD) -o $(BIN_DIR)/$(shell basename $@) $(REPO_PREFIX)/$@
 
-cmd/fetcherfs: prepare_dir
-	CGO_ENABLED=0 $(GO_BUILD) -o $(BIN_DIR)/$(shell basename $@) $(REPO_PREFIX)/$@
+cmd/host: prepare_dir
+	CGO_ENABLED=1 $(GO_BUILD) -o $(BIN_DIR)/$(shell basename $@) $(REPO_PREFIX)/$@
+
+cmd/host-image: prepare_dir
+	CGO_ENABLED=1 $(GO_BUILD) -o $(BIN_DIR)/$(shell basename $@) $(REPO_PREFIX)/$@
 
 cmd/%: prepare_dir
-	$(GO_BUILD) -o $(BIN_DIR)/$(shell basename $@) $(REPO_PREFIX)/$@
+	CGO_ENABLED=0 $(GO_BUILD) -o $(BIN_DIR)/$(shell basename $@) $(REPO_PREFIX)/$@
 
 rpm/%: cmd/%
 	$(BUILD_SCRIPT) $*
@@ -282,7 +285,7 @@ dep:
 	@echo "$$depDeprecated"
 	@$(MAKE) mod
 
-RELEASE_BRANCH:=master
+RELEASE_BRANCH:=release/3.12
 GOPROXY ?= direct
 
 mod:
@@ -349,7 +352,7 @@ image:
 .PHONY: image
 
 image-telegraf-raid-plugin:
-	VERSION=release-1.6.4 ARCH=all make image telegraf-raid-plugin
+	VERSION=release-1.6.5 ARCH=all make image telegraf-raid-plugin
 
 %:
 	@:

Makefile.common.mk

@@ -8,8 +8,8 @@ endif
 ModBaseName:=$(notdir $(ModName))
 
 DockerImageRegistry?=registry.cn-beijing.aliyuncs.com
-DockerImageAlpineBuild?=$(DockerImageRegistry)/yunionio/alpine-build:3.16.0-go-1.18.2-0
-DockerImageCentOSBuild?=$(DockerImageRegistry)/yunionio/centos-build:go-1.18.3-0
+DockerImageAlpineBuild?=$(DockerImageRegistry)/yunionio/alpine-build:3.19.0-go-1.21.10-0
+DockerImageCentOSBuild?=$(DockerImageRegistry)/yunionio/centos-build:go-1.21.10-0
 
 EnvIf=$(if $($(1)),$(1)=$($(1)))
 

README-CN.md

@@ -6,7 +6,7 @@
 
 ## Cloudpods是什么?
 
-<img src="https://www.cloudpods.org/images/cloudpods_logo_green.png" alt="Cloudpods" height="100">
+<img src="https://v1.cloudpods.org/images/cloudpods_logo_green.png" alt="Cloudpods" height="100">
 
 Cloudpods是一个开源的Golang实现的云原生的融合多云/混合云的云平台，也就是一个“云上之云”。Cloudpods不仅可以管理本地的虚拟机和物理机资源，还可以管理多个云平台和云账号。Cloudpods隐藏了这些异构基础设施资源的数据模型和API的差异，对外暴露了一套统一的API，允许用户就像用一个云一样地访问多云。从而大大降低了访问多云的复杂度，提升了管理多云的效率。
 
@@ -21,184 +21,7 @@ Cloudpods是一个开源的Golang实现的云原生的融合多云/混合云的
 
 ## 功能
 
-### 概览 & UI 展示
-
-<details>
-  <summary>管理多云资源的功能，可以管理大多数的主流云，包括私有云，例如OpenStack，以及公有云，例如AWS，Azure，GCP，阿里云，华为云和腾讯云等</summary>
-  <ul>
-    <li>
-      <p>云帐号纳管</p>
-      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/cloudselect.png" alt="multi cloud management">
-    </li>
-    <li>
-      <p>云帐号列表</p>
-      <img src="https://i.imgur.com/Q0LipfI.png" alt="cloud account list">
-    </li>
-    <li>
-      <p>公有云虚拟机列表</p>
-      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/publicvmlist.png">
-    </li>
-  </ul>
-</details>
-
-<details>
-  <summary>
-  一个可以管理海量KVM虚拟机的轻量级私有云
-  </summary>
-  <ul>
-    <li>
-      <p>虚拟机列表</p>
-      <img src="https://i.imgur.com/DbkRUoo.png">
-    </li>
-    <li>
-      <p>虚拟机创建页面</p>
-      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/createkvmvm1.png">
-      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/createkvmvm2.png">
-    </li>
-    <li>
-      <p>虚拟机可通过 VNC 或者 SSH 登录</p>
-      <img src="https://i.imgur.com/m0rkeQ3.png">
-    </li>
-    <li>
-      <p>宿主机列表</p>
-      <img src="https://imgur.com/i509t5a.png">
-    </li>
-    <li>
-      <p>镜像模板列表</p>
-      <img src="https://imgur.com/UVFLGi2.png">
-    </li>
-    <li>
-      <p>VPC列表</p>
-      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/vpclist.png">
-    </li>
-    <li>
-      <p>二层网络列表（经典网络）</p>
-      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/wirelist.png">
-    </li>
-    <li>
-      <p>IP子网列表</p>
-      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/ipsubnetlist.png">
-    </li> 
-    <li>
-      <p>弹性公网IP列表（VPC网络）</p>
-      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/vpclist.png">
-    </li>
-    <li>
-      <p>LB列表</p>
-      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/lblist.png">
-    </li>
-  </ul>
-</details>
-
-<details>
-  <summary>
-  一个能进行物理机全生命周期管理的裸机云
-  </summary>
-  <ul>
-    <li>
-      <p>物理机列表</p>
-      <img src="https://i.imgur.com/Jz8b5nC.png">
-    </li>
-    <li>
-      <p>物理机纳管</p>
-      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/addphysicalmachine.png">
-    </li>
-    <li>
-      <p>安装操作系统</p>
-      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/createbaremetal.png">
-    </li>
-    <li>支持 ARM64 的物理机服务器</li>
-  </ul>
-</details>
-
-<details>
-  <summary>一套完整的多租户认证和访问控制体系</summary>
-  <ul>
-    <li>
-      <p>支持本地sql、LDAP 等认证源</p>
-      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/idplist.png">
-    </li>
-    <li>
-      <p>多租户系统，包括域，项目，组，用户，角色和权限等</p>
-      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/domainlist.png">
-      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/projectlist.png">
-      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/grouplist.png">
-      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/userlist.png">
-      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/rolelist.png">
-      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/policylist.png">
-    </li>
-  </ul>
-</details>
-
-<details>
-  <summary>
-  实现了VMware vSphere虚拟化集群的自助服务和自动化
-  </summary>
-  <ul>
-    <li>
-      <p>添加VMware云账号</p>
-      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/createvmware.png">
-    </li>
-    <li>
-      <p>VMware云账号列表</p>
-      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/vmwarelist.png">
-    </li>
-    <li>
-      <p>自动创建二层网络</p>
-      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/vmwarewirelist.png">
-    </li>
-    <li>
-      <p>自动创建IP子网</p>
-      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/vmwareipsubnetlist.png">
-    </li>
-    <li>
-      <p>新建VMware虚拟机</p>
-      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/createvmwarevm1.png">
-      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/createvmwarevm2.png">
-    </li>
-  </ul>
-</details>
-
-
-<details>
-  <summary>
-  允许以统一的联邦身份访问各个云平台的原生控制台的SSO
-  </summary>
-  <ul>
-    <li>
-      <p>为云账号开启免密登录（以阿里云为例）</p>
-      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/enablecloudsso.png">
-    </li>
-    <li>
-      <p>将Cloudpods平台用户添加为免密登录用户</p>
-      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/addsamluser.png">
-    </li>
-    <li>
-      <p>多云统一登录入口</p>
-      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/cloudssoentry.png">
-    </li>
-    <li>
-      <p>多云统一登录-免密登录用户列表</p>
-      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/cloudsamluser.png">
-    </li>
-    <li>
-      <p>Cloudpods平台用户免密登录阿里云</p>
-    </li>
-  </ul>
-</details>
-
-<details>
-  <summary>
-  一套功能丰富、统一一致的RESTAPI和模型访问以上的云资源和功能
-  </summary>
-</details>
-
-<details>
-  <summary>
-  自动将镜像转换为不同云平台需要的格式的多云镜像服务
-  </summary>
-</details>
-
+请访问[产品介绍](https://www.cloudpods.org/docs/introduction/)页面了解详细信息。
 
 ### 支持的云平台
 
@@ -239,7 +62,7 @@ Cloudpods是一个开源的Golang实现的云原生的融合多云/混合云的
 
 ## 安装部署
 
-- [All in One 安装](https://www.cloudpods.org/zh/docs/quickstart/allinone/)：在 CentOS 7 或 Debian 10 等发行版里搭建全功能 Cloudpods 服务，可以快速体验**内置私有云**和**多云管理**的功能。
+- [All in One 安装](https://www.cloudpods.org/zh/docs/quickstart/allinone-converge/)：在 CentOS 7 或 Debian 10 等发行版里搭建全功能 Cloudpods 服务，可以快速体验**内置私有云**和**多云管理**的功能。
 - [Kubernetes Helm 安装](https://www.cloudpods.org/zh/docs/quickstart/k8s/)：在已有 Kubernetes 集群上通过 Helm 部署一套 Cloudpods CMP 服务，可以体验**多云管理**的功能。
 - [Docker Compose 安装](https://www.cloudpods.org/zh/docs/quickstart/docker-compose/)：通过 Docker Compose 部署 Cloudpods CMP 服务，可以迅速体验**多云管理**的功能。
 - [高可用安装](https://www.cloudpods.org/zh/docs/setup/ha-ce/)：在生产环境中使用高可用的方式部署 Cloudpods 服务，包括**内置私有云**和**多云管理**的功能。
@@ -256,23 +79,11 @@ Cloudpods是一个开源的Golang实现的云原生的融合多云/混合云的
 
 ## 联系我们
 
-您可以通过如下方式联系我们：
-
-* [服务订阅](https://www.yunion.cn/subscription/index.html)
-
-* 哔哩哔哩: [Cloudpods](https://space.bilibili.com/3493131737631540/)
-
-* 微信: 请扫描如下二维码联系我们
-
-<img src="https://www.cloudpods.org/images/contact_me_qr_20230321.png" alt="WeChat QRCode">
+请查看[联系我们](https://www.cloudpods.org/docs/contact/)。
 
 ## 版本历史
 
-请访问[Cloudpods Changelog](https://www.cloudpods.org/zh/docs/changelog/).
-
-## 开发规划
-
-请访问[Cloudpods Roadmap](https://www.cloudpods.org/zh/docs/roadmap/).
+请查看[发布日志](https://www.cloudpods.org/docs/release-notes/)和[Changelog](https://www.cloudpods.org/docs/development/changelog/)。
 
 ## 贡献
 

README.md

@@ -8,7 +8,7 @@
 
 ## What is Cloudpods?
 
-<img src="https://www.cloudpods.org/images/cloudpods_logo_green.png" alt="Cloudpods" height="100">
+<img src="https://v1.cloudpods.org/images/cloudpods_logo_green.png" alt="Cloudpods" height="100">
 
 Cloudpods is a cloud-native open source unified multi/hybrid-cloud platform developed with Golang, i.e. Cloudpods is *a cloud on clouds*. Cloudpods is able to manage not only on-premise KVM/baremetals, but also resources from many cloud accounts across many cloud providers. It hides the differences of underlying cloud providers and exposes one set of APIs that allow programatically interacting with these many clouds.
 
@@ -23,186 +23,7 @@ Cloudpods is a cloud-native open source unified multi/hybrid-cloud platform deve
 
 ## Features
 
-### Summary & UI
-
-<details>
-  <summary>
-  Multi-cloud management that is able to manage a wide range of cloud providers, including private cloud, such as OpenStack, and public clouds, such as AWS, Azure, Google Cloud, Alibaba Cloud, Tencent Cloud, Huawei Cloud, etc.
-  </summary>
-  <ul>
-    <li>
-      <p>Cloud account create form</p>
-      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/cloudselect.png" alt="multi cloud management">
-    </li>
-    <li>
-      <p>Cloud accounts list</p>
-      <img src="https://i.imgur.com/Q0LipfI.png" alt="cloud account list">
-    </li>
-    <li>
-      <p>Multi public cloud VM list</p>
-      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/publicvmlist.png">
-    </li>
-  </ul>
-</details>
-
-<details>
-  <summary>
-  A light-weight private cloud that manages KVM hypervisor in scale
-  </summary>
-  <ul>
-    <li>
-      <p>VM instances list</p>
-      <img src="https://i.imgur.com/DbkRUoo.png">
-    </li>
-    <li>
-      <p>Create VM instance form</p>
-      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/createkvmvm1.png">
-      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/createkvmvm2.png">
-    </li>
-    <li>
-      <p>VNC and SSH login page</p>
-      <img src="https://i.imgur.com/m0rkeQ3.png">
-    </li>
-    <li>
-      <p>Host list</p>
-      <img src="https://imgur.com/i509t5a.png">
-    </li>
-    <li>
-      <p>Image template list</p>
-      <img src="https://imgur.com/UVFLGi2.png">
-    </li>
-    <li>
-      <p>VPC list</p>
-      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/vpclist.png">
-    </li>
-    <li>
-      <p>Wire list (Classic Network)</p>
-      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/wirelist.png">
-    </li>
-    <li>
-      <p>IPsubnet list</p>
-      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/ipsubnetlist.png">
-    </li> 
-    <li>
-      <p>Eip list (VPC Network)</p>
-      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/vpclist.png">
-    </li>
-    <li>
-      <p>LB list</p>
-      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/lblist.png">
-    </li>   
-  </ul>
-</details>
-
-<details>
-  <summary>
-  A BareMetal cloud that automates the full life-cycle management of baremetal physical machines
-  </summary>
-  <ul>
-    <li>
-      <p>BareMetal list</p>
-      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/physicalmachinelist.png">
-    </li>
-    <li>
-      <p>Baremetal Management</p>
-      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/addphysicalmachine.png">
-    </li>
-    <li>
-      <p>Create OS on BareMetal</p>
-      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/createbaremetal.png">
-    </li>
-    <li>ARM64 baremetal supported</li>
-  </ul>
-</details>
-
-<details>
-  <summary>
-  A complete multi-tenancy RBAC-enabled IAM (identity and access management) system
-  </summary>
-  <ul>
-    <li>
-      <p>sql, LDAP supported</p>
-      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/idplist.png">
-    </li>
-    <li>
-      <p>Multi-tenancy system, include domain, project, group, user, role, policy</p>
-      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/domainlist.png">
-      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/projectlist.png">
-      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/grouplist.png">
-      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/userlist.png">
-      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/rolelist.png">
-      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/policylist.png">
-  </ul>
-</details>
-
-<details>
-  <summary>
-  VMware vSphere management that enables self-service and automation
-  </summary>
-  <ul>
-    <li>
-      <p>Add VMware account</p>
-      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/createvmware.png">
-    </li>
-    <li>
-      <p>VMware account list</p>
-      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/vmwarelist.png">
-    </li>
-    <li>
-      <p>Automatic creation of wire</p>
-      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/vmwarewirelist.png">
-    </li>
-    <li>
-      <p>Automatic creation of ipsubnet</p>
-      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/vmwareipsubnetlist.png">
-    </li>
-    <li>
-      <p>Create a VMware VM instance</p>
-      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/createvmwarevm1.png">
-      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/createvmwarevm2.png">
-    </li>
-  </ul>
-</details>
-
-
-<details>
-  <summary>
-  Cloud SSO that allows accessing native webconsole of cloud providers with unified federated identities
-  </summary>
-  <ul>
-    <li>
-      <p>Enable the SSO login function of the cloud account (aliyun as an example)</p>
-      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/enablecloudsso.png">
-    </li>
-    <li>
-      <p>create saml users</p>
-      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/addsamluser.png">
-    </li>
-    <li>
-      <p>Cloud SSO entry</p>
-      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/cloudssoentry.png">
-    </li>
-    <li>
-      <p>Cloud SSO - SSO login user</p>
-      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/cloudsamluser.png">
-    </li>
-    <li>
-      <p>Sign in to the public cloud platform with SSO</p>
-    </li>
-  </ul>
-</details>
-
-<details>
-  <summary>
-  One set of feature-rich APIs to access a wide range of resources from cloud providers above with consistent models and APIs
-  </summary>
-</details>
-
-<details>
-  <summary>
-  Multi-cloud image management system that automates image conversion between different cloud providers
-  </summary>
-</details>
+See [Introduction](https://www.cloudpods.org/docs/introduction/) for details.
 
 ### Supported cloud providers
 
@@ -243,7 +64,7 @@ Cloudpods is a cloud-native open source unified multi/hybrid-cloud platform deve
 
 ## Getting started
 
-- [All in One Installation](https://www.cloudpods.org/zh/docs/quickstart/allinone/)：Building a full-featured Cloudpods service on linux distributions such as CentOS 7 or Debian 10 allows for a quick experience of the **built-in private cloud** and **multi-cloud management** features.
+- [All in One Installation](https://www.cloudpods.org/zh/docs/quickstart/allinone-converge/)：Building a full-featured Cloudpods service on linux distributions such as CentOS 7 or Debian 10 allows for a quick experience of the **built-in private cloud** and **multi-cloud management** features.
 - [Kubernetes Helm Installation](https://www.cloudpods.org/zh/docs/quickstart/k8s/)：Deploying the Cloudpods CMP service on an existing Kubernetes cluster using Helm and experience the **multi-cloud management** feature.
 - [Docker Compose Installation](https://www.cloudpods.org/zh/docs/quickstart/docker-compose/)：Deploying the Cloudpods CMP service using Docker Compose and quickly experience the **multi-cloud management** feature.
 - [High availability installation](https://www.cloudpods.org/zh/docs/setup/ha-ce/)：Deploying Cloudpods services in a highly available manner for production environments, including **built-in private cloud** and **multi-cloud management** features.
@@ -261,23 +82,11 @@ Please check this [issue](https://github.com/yunionio/cloudpods/issues/11427) fo
 
 ## Contact
 
-You may contact us by:
-
-* [Subscription](https://www.yunion.cn/subscription/index.html)
-
-* Bilibili: [Cloudpods](https://space.bilibili.com/3493131737631540/)
-
-* WeChat: please scan the following QRCode to contact us
-
-<img src="https://www.cloudpods.org/images/contact_me_qr_20230321.png" alt="WeChat QRCode">
+See [Contact Us](https://www.cloudpods.org/en/docs/contact/) for details.
 
 ## Changelog
 
-See [Cloudpods Changelog](https://www.cloudpods.org/en/docs/changelog/) for details.
-
-## Roadmap
-
-See [Cloudpods Roadmap](https://www.cloudpods.org/en/docs/roadmap/) for details.
+See [Relase Notes](https://www.cloudpods.org/en/docs/release-notes/) and [Changelog](https://www.cloudpods.org/en/docs/development/changelog/) for details.
 
 ## Contribution
 

build/climc/root/opt/yunion/scripts/motd/climc.sh

@@ -1,8 +1,21 @@
 export PATH=/opt/yunion/bin:$PATH
 
+if [ -f /etc/profile.d/bash_completion.sh ]; then
+    source /etc/profile.d/bash_completion.sh
+fi
+
 test -f /etc/yunion/rcadmin && source /etc/yunion/rcadmin
 
+if [ -n "$OS_AUTH_TOKEN" ]; then
+    test -n "$OS_USERNAME" && unset OS_USERNAME
+    test -n "$OS_PASSWORD" && unset OS_PASSWORD
+    test -n "$OS_DOMAIN_NAME" && unset OS_DOMAIN_NAME
+    test -n "$OS_ACCESS_KEY" && unset OS_ACCESS_KEY
+    test -n "$OS_SECRET_KEY" && unset OS_SECRET_KEY
+fi
+
 source <(climc --completion bash)
+source <(kubectl completion bash)
 
 echo "Welcome to Cloud Shell :-) You may execute climc and other command tools in this shell."
 echo "Please exec 'climc' to get started"

build/climc/root/opt/yunion/scripts/tools/clean_host.sh

@@ -47,6 +47,11 @@ do
     climc server-purge $i > /dev/null
 done
 
+for i in $(climc server-list --admin --limit 2048 --system  --filter "backup_host_id.equals($HOSTID)" | egrep '[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}' | awk '{print $2}')
+do
+    climc server-delete-backup $i > /dev/null
+done
+
 echo "3. Clean disks on $HOSTNAME($HOSTID)"
 
 for storageid in $(climc host-storage-list --host $HOSTID --show-emulated | egrep '[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}' | awk '{print $4}')

build/cloudid/root/opt/yunion/share/saml/sp-metadata/volcengine.xml

@@ -0,0 +1,35 @@
+<?xml version="1.0"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata"
+    xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion"
+    xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://www.volcengine.com/">
+    <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" WantAssertionsSigned="true">
+        <KeyDescriptor use="signing">
+            <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+                <ds:X509Data>
+                    <ds:X509Certificate>MIIDJjCCAg6gAwIBAgIUF3lH8/cdlQeyPBqt066RFnt3cI4wDQYJKoZIhvcNAQELBQAwJTEjMCEGA1UEAxMadXJuOnZvbGNlbmdpbmU6d2Vic2VydmljZXMwHhcNMjMwODA4MDIzNzI4WhcNMzMwODIxMTYwMDAwWjAlMSMwIQYDVQQDExp1cm46dm9sY2VuZ2luZTp3ZWJzZXJ2aWNlczCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPZ+nhODpFTe+A8PbuZYA5XDQ04WckV1A5U90tKaaUX5uKLUYfDtFA1TwMO/qG87LU/0Pxs4FhgZJkUOeBHkyYzzXZQvtfsJ9frcKkcTjX/WF4XJyitXCULSjhcclMS3gOqeI/Mo3P90KutfhNli/mAHQJaRsuPFG4ZwBusbUo8i5sqBqt/Sg8JapH7DjEU2mN1165o59gavPGSByPeEuu28EkivVFcI7Jox5ztwgMrOYY+pYP9GeSurzpyLq3CfvvahTsAJjuHDHTTnYNcq/I3VOap/y4cOU6vgxcQvBmgb+CBvGldjn0em3BIn5meQwuB6jfQ7kqBaO1PRD1nhDTMCAwEAAaNOMEwwSgYIKwYBBQUHAQEEPjA8MDoGCCsGAQUFBzABhi5odHRwOi8vbmV4dXMtcHJvZHVjdGlvbi5ieXRlZGFuY2UubmV0L3BjYS9vY3NwMA0GCSqGSIb3DQEBCwUAA4IBAQBxySDr9TPJxRN+otrFDaV8HSeFKUUSO3+r8bEVAXmS+xUsdUOZbaf2r/g+eKrW58dpn+iBWTAAKug9Jwe5KVGqB7G5r2r6k/eI5dvv5r/Fr5T7NppRCXKQTQiAhrrVlqttsagPztJ6LmVAcm4sh4Ckx99FgibQCbT/zui+c6IUyEQcVIwtmoPANl3K2Yn85t+G+Cu9xxXY0JPlZcUHntHg0R0PUWc3LuzLXnff7JWEzPyhMUBLpQk5BltxuD5cTGCA6WafJuBTAqkt48VN0MFTP5c5m3PJFz8Ro1GLY8hw1uhUEx28DKBkQSGpkZNx0oJXETIDpSBfD0dHWBvZQPd0</ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </KeyDescriptor>
+        <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+        <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+        <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</NameIDFormat>
+        <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</NameIDFormat>
+        <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:X509SubjectName</NameIDFormat>
+        <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:WindowsDomainQualifiedName</NameIDFormat>
+        <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:kerberos</NameIDFormat>
+        <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:entity</NameIDFormat>
+        <AssertionConsumerService index="1" isDefault="true" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://signin.volcengine.com/saml/sso"/>
+        <AttributeConsumingService index="1">
+            <ServiceName xml:lang="en">Volcengine Single Sign-On</ServiceName>
+            <RequestedAttribute isRequired="true" Name="https://www.volcengine.com/SAML/Attributes/Identity" FriendlyName="Identity"/>
+            <RequestedAttribute isRequired="true" Name="https://www.volcengine.com/SAML/Attributes/SessionName" FriendlyName="SessionName"/>
+            <RequestedAttribute isRequired="false" Name="https://www.volcengine.com/SAML/Attributes/SessionDuration" FriendlyName="SessionDuration"/>
+
+        </AttributeConsumingService>
+    </SPSSODescriptor>
+    <Organization>
+        <OrganizationName xml:lang="en">Volcengine, Inc.</OrganizationName>
+        <OrganizationDisplayName xml:lang="en">Volcengine</OrganizationDisplayName>
+        <OrganizationURL xml:lang="en">https://www.volcengine.com</OrganizationURL>
+    </Organization>
+</EntityDescriptor>

build/docker/Dockerfile.ansibleserver

@@ -1,7 +1,7 @@
 FROM registry.cn-beijing.aliyuncs.com/yunionio/ansibleserver-base:v1.1.1
 
 # install playbook and telegraf install pkg
-COPY --from=registry.cn-beijing.aliyuncs.com/yunionio/file-repo:v0.4.0 /opt/yunion/playbook /opt/yunion/playbook
-COPY --from=registry.cn-beijing.aliyuncs.com/yunionio/file-repo:v0.4.0 /opt/yunion/ansible-install-pkg /opt/yunion/ansible-install-pkg
+COPY --from=registry.cn-beijing.aliyuncs.com/yunionio/file-repo:v0.5.2 /opt/yunion/playbook /opt/yunion/playbook
+COPY --from=registry.cn-beijing.aliyuncs.com/yunionio/file-repo:v0.5.2 /opt/yunion/ansible-install-pkg /opt/yunion/ansible-install-pkg
 
 ADD ./_output/alpine-build/bin/ansibleserver /opt/yunion/bin/ansibleserver

build/docker/Dockerfile.ansibleserver-base

@@ -9,12 +9,20 @@ RUN sed -i 's!https://dl-cdn.alpinelinux.org/!https://mirrors.ustc.edu.cn/!g' /e
 # openssh-client, for ansible ssh connection
 # git, ca-certificates, for fetching ansible roles
 RUN set -x \
-	&& apk update \
-	&& apk add openssh-client \
-	&& apk add sshpass \
-	&& apk add ansible \
-    && apk add py3-pip \
-	&& apk add tzdata git ca-certificates \
-	&& rm -rf /var/cache/apk/*
+  && apk update \
+  && apk add openssh-client \
+  && apk add sshpass \
+  && apk add py3-pip \
+  && apk add tzdata git ca-certificates
 
-RUN pip3 install pywinrm
+RUN apk add --no-cache openssh openssl curl rsync pv mariadb-client
+RUN apk add --no-cache --virtual .build-dependencies \
+  libffi-dev openssl-dev python3-dev build-base py-setuptools rust cargo mariadb-dev
+
+# ansible should be installed
+# after setuptools and wheel
+RUN pip3 install -U pip setuptools wheel \
+  && pip3 install paramiko mysqlclient pywinrm \
+  && pip3 install 'ansible<=9.0.0' \
+  && apk del --no-network .build-dependencies \
+  && rm -rf /root/.cache /root/.cargo /var/cache/apk/*

build/docker/Dockerfile.baremetal-agent

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

build/docker/Dockerfile.baremetal-base

@@ -1,7 +1,7 @@
 #FROM --platform=linux/amd64 registry.cn-beijing.aliyuncs.com/yunionio/centos-build:1.1-4 as build
 #RUN yum install -y https://iso.yunion.cn/vm-images/baremetal-pxerom-1.1.0-21092209.x86_64.rpm
 #RUN yum install -y http://192.168.23.50:8083/baremetal-pxerom-1.1.0-21092209.x86_64.rpm
-FROM registry.cn-beijing.aliyuncs.com/yunionio/yunionos:v0.1.8-20230812.0 as yunionos
+FROM registry.cn-beijing.aliyuncs.com/yunionio/yunionos:v3.10.8-20231215.0 as yunionos
 
 FROM centos:8 as grub-stage
 

build/docker/Dockerfile.dhcprelay

@@ -0,0 +1,6 @@
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5-1
+
+ADD ./_output/alpine-build/bin/dhcprelay /opt/yunion/bin/dhcprelay
+
+ENV PATH $PATH:/opt/yunion/bin
+WORKDIR /opt/yunion/bin

build/docker/Dockerfile.file-repo

@@ -1,3 +1,5 @@
+FROM registry.cn-beijing.aliyuncs.com/yunionio/file-repo:v0.4.0 as file-repo
+
 FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.2
 
 MAINTAINER "Rain Zheng <zhengyu@yunion.com>"
@@ -11,12 +13,13 @@ RUN set -x \
 
 # install default playbook and install pkg
 Run mkdir -p /opt/yunion/ansible-install-pkg
-Run wget https://yunioniso.oss-cn-beijing.aliyuncs.com/rpms/telegraf/telegraf-1.19.2-yn~be742cbf-0.x86_64.rpm -P /opt/yunion/ansible-install-pkg
-Run wget https://yunioniso.oss-cn-beijing.aliyuncs.com/rpms/telegraf/telegraf-1.19.2-yn~be742cbf-0.aarch64.rpm -P /opt/yunion/ansible-install-pkg
-Run wget https://yunioniso.oss-cn-beijing.aliyuncs.com/rpms/telegraf/telegraf_1.19.2-yn~be742cbf-0_arm64.deb -P /opt/yunion/ansible-install-pkg
-Run wget https://yunioniso.oss-cn-beijing.aliyuncs.com/rpms/telegraf/telegraf_1.19.2-yn~be742cbf-0_amd64.deb -P /opt/yunion/ansible-install-pkg
-Run wget https://yunioniso.oss-cn-beijing.aliyuncs.com/rpms/telegraf/telegraf-1.19.2-yn~be742cbf_windows_amd64.zip -P /opt/yunion/ansible-install-pkg
-Run wget https://yunioniso.oss-cn-beijing.aliyuncs.com/rpms/telegraf/telegraf-1.19.2-yn~be742cbf_windows_i386.zip -P /opt/yunion/ansible-install-pkg
+
+COPY --from=file-repo /opt/yunion/ansible-install-pkg/telegraf-1.19.2-yn~be742cbf-0.x86_64.rpm /opt/yunion/ansible-install-pkg
+COPY --from=file-repo /opt/yunion/ansible-install-pkg/telegraf-1.19.2-yn~be742cbf-0.aarch64.rpm /opt/yunion/ansible-install-pkg
+COPY --from=file-repo /opt/yunion/ansible-install-pkg/telegraf_1.19.2-yn~be742cbf-0_arm64.deb /opt/yunion/ansible-install-pkg
+COPY --from=file-repo /opt/yunion/ansible-install-pkg/telegraf_1.19.2-yn~be742cbf-0_amd64.deb /opt/yunion/ansible-install-pkg
+COPY --from=file-repo /opt/yunion/ansible-install-pkg/telegraf-1.19.2-yn~be742cbf_windows_amd64.zip /opt/yunion/ansible-install-pkg
+COPY --from=file-repo /opt/yunion/ansible-install-pkg/telegraf-1.19.2-yn~be742cbf_windows_i386.zip /opt/yunion/ansible-install-pkg
 
 Run mkdir -p /opt/yunion/playbook
 Run mkdir /opt/yunion/playbook/monitor-agent

build/docker/Dockerfile.guacd

@@ -0,0 +1,214 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you 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.
+#
+
+#
+# Dockerfile for guacamole-server
+#
+
+# The Alpine Linux image that should be used as the basis for the guacd image
+ARG ALPINE_BASE_IMAGE=latest
+FROM alpine:${ALPINE_BASE_IMAGE} AS builder
+
+ARG TARGETPLATFORM
+
+RUN sed -i 's!https://dl-cdn.alpinelinux.org/!https://mirrors.ustc.edu.cn/!g' /etc/apk/repositories
+
+# Install build dependencies
+RUN apk add --no-cache                \
+        autoconf                      \
+        automake                      \
+        build-base                    \
+        cairo-dev                     \
+        cmake                         \
+        cunit-dev                     \
+        git                           \
+        grep                          \
+        libjpeg-turbo-dev             \
+        libpng-dev                    \
+        libtool                       \
+        libwebp-dev                   \
+        make                          \
+        openssl1.1-compat-dev         \
+        pango-dev                     \
+        pulseaudio-dev                \
+        util-linux-dev
+
+# Copy source to container for sake of build
+ARG BUILD_DIR=/tmp/guacamole-server
+ARG GUAC_VER=1.5.3
+RUN git clone --branch=${GUAC_VER} https://github.com/apache/guacamole-server.git /tmp/guacamole-server
+
+#
+# Base directory for installed build artifacts.
+#
+# NOTE: Due to limitations of the Docker image build process, this value is
+# duplicated in an ARG in the second stage of the build.
+#
+ARG PREFIX_DIR=/opt/guacamole
+
+#
+# Automatically select the latest versions of each core protocol support
+# library (these can be overridden at build time if a specific version is
+# needed)
+#
+ARG WITH_FREERDP='2(\.\d+)+'
+ARG WITH_LIBSSH2='libssh2-\d+(\.\d+)+'
+ARG WITH_LIBTELNET='\d+(\.\d+)+'
+ARG WITH_LIBVNCCLIENT='LibVNCServer-\d+(\.\d+)+'
+ARG WITH_LIBWEBSOCKETS='v\d+(\.\d+)+'
+
+#
+# Default build options for each core protocol support library, as well as
+# guacamole-server itself (these can be overridden at build time if different
+# options are needed)
+#
+
+ARG FREERDP_OPTS="\
+    -DBUILTIN_CHANNELS=OFF \
+    -DCHANNEL_URBDRC=OFF \
+    -DWITH_ALSA=OFF \
+    -DWITH_CAIRO=ON \
+    -DWITH_CHANNELS=ON \
+    -DWITH_CLIENT=ON \
+    -DWITH_CUPS=OFF \
+    -DWITH_DIRECTFB=OFF \
+    -DWITH_FFMPEG=OFF \
+    -DWITH_GSM=OFF \
+    -DWITH_GSSAPI=OFF \
+    -DWITH_IPP=OFF \
+    -DWITH_JPEG=ON \
+    -DWITH_LIBSYSTEMD=OFF \
+    -DWITH_MANPAGES=OFF \
+    -DWITH_OPENH264=OFF \
+    -DWITH_OPENSSL=ON \
+    -DWITH_OSS=OFF \
+    -DWITH_PCSC=OFF \
+    -DWITH_PULSE=OFF \
+    -DWITH_SERVER=OFF \
+    -DWITH_SERVER_INTERFACE=OFF \
+    -DWITH_SHADOW_MAC=OFF \
+    -DWITH_SHADOW_X11=OFF \
+    -DWITH_SSE2=ON \
+    -DWITH_WAYLAND=OFF \
+    -DWITH_X11=OFF \
+    -DWITH_X264=OFF \
+    -DWITH_XCURSOR=ON \
+    -DWITH_XEXT=ON \
+    -DWITH_XI=OFF \
+    -DWITH_XINERAMA=OFF \
+    -DWITH_XKBFILE=ON \
+    -DWITH_XRENDER=OFF \
+    -DWITH_XTEST=OFF \
+    -DWITH_XV=OFF \
+    -DWITH_ZLIB=ON"
+
+ARG GUACAMOLE_SERVER_OPTS="\
+    --disable-guaclog"
+
+ARG LIBSSH2_OPTS="\
+    -DBUILD_EXAMPLES=OFF \
+    -DBUILD_SHARED_LIBS=ON"
+
+ARG LIBTELNET_OPTS="\
+    --disable-static \
+    --disable-util"
+
+ARG LIBVNCCLIENT_OPTS=""
+
+ARG LIBWEBSOCKETS_OPTS="\
+    -DDISABLE_WERROR=ON \
+    -DLWS_WITHOUT_SERVER=ON \
+    -DLWS_WITHOUT_TESTAPPS=ON \
+    -DLWS_WITHOUT_TEST_CLIENT=ON \
+    -DLWS_WITHOUT_TEST_PING=ON \
+    -DLWS_WITHOUT_TEST_SERVER=ON \
+    -DLWS_WITHOUT_TEST_SERVER_EXTPOLL=ON \
+    -DLWS_WITH_STATIC=OFF"
+
+# Build guacamole-server and its core protocol library dependencies
+RUN echo "$TARGETPLATFORM"
+RUN if [ "$TARGETPLATFORM" = "linux/amd64" ]; \
+    then FREERDP_OPTS="${FREERDP_OPTS}    -DWITH_SSE2=ON" && echo "SSE2 active"; \
+    else FREERDP_OPTS="${FREERDP_OPTS}    -DWITH_SSE2=OFF" && echo "SSE2 disabled"; \
+    fi && ${BUILD_DIR}/src/guacd-docker/bin/build-all.sh
+
+
+# Record the packages of all runtime library dependencies
+RUN ${BUILD_DIR}/src/guacd-docker/bin/list-dependencies.sh \
+        ${PREFIX_DIR}/sbin/guacd               \
+        ${PREFIX_DIR}/lib/libguac-client-*.so  \
+        ${PREFIX_DIR}/lib/freerdp2/*guac*.so   \
+        > ${PREFIX_DIR}/DEPENDENCIES
+
+# Use same Alpine version as the base for the runtime image
+FROM alpine:${ALPINE_BASE_IMAGE}
+
+RUN sed -i 's!https://dl-cdn.alpinelinux.org/!https://mirrors.ustc.edu.cn/!g' /etc/apk/repositories
+#
+# Base directory for installed build artifacts. See also the
+# CMD directive at the end of this build stage.
+#
+# NOTE: Due to limitations of the Docker image build process, this value is
+# duplicated in an ARG in the first stage of the build.
+#
+ARG PREFIX_DIR=/opt/guacamole
+
+# Runtime environment
+ENV LC_ALL=C.UTF-8
+ENV LD_LIBRARY_PATH=${PREFIX_DIR}/lib
+ENV GUACD_LOG_LEVEL=info
+
+# Copy build artifacts into this stage
+COPY --from=builder ${PREFIX_DIR} ${PREFIX_DIR}
+
+# Bring runtime environment up to date and install runtime dependencies
+RUN apk add --no-cache                \
+        ca-certificates               \
+        ghostscript                   \
+        netcat-openbsd                \
+        shadow                        \
+        terminus-font                 \
+        ttf-dejavu                    \
+        ttf-liberation                \
+        util-linux-login && \
+    xargs apk add --no-cache < ${PREFIX_DIR}/DEPENDENCIES
+
+# Checks the operating status every 5 minutes with a timeout of 5 seconds
+HEALTHCHECK --interval=5m --timeout=5s CMD nc -z 127.0.0.1 4822 || exit 1
+
+# Create a new user guacd
+ARG UID=1000
+ARG GID=1000
+RUN groupadd --gid $GID guacd
+RUN useradd --system --create-home --shell /sbin/nologin --uid $UID --gid $GID guacd
+RUN mkdir -p /opt/cloudpods
+RUN chown -R guacd:guacd /opt/cloudpods
+
+# Run with user guacd
+USER guacd
+
+# Expose the default listener port
+EXPOSE 4822
+
+# Start guacd, listening on port 0.0.0.0:4822
+#
+# Note the path here MUST correspond to the value specified in the 
+# PREFIX_DIR build argument.
+#
+CMD /opt/guacamole/sbin/guacd -b 0.0.0.0 -L $GUACD_LOG_LEVEL -f

build/docker/Dockerfile.host-deployer

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

build/docker/Makefile

@@ -15,7 +15,7 @@ onecloud-base:
 onecloud-base-3-15-4:
 	$(DOCKER_BUILDX)/onecloud-base:$(ONECLOUD_BASE_VERSION_3-15-4) -f ./Dockerfile.onecloud-base-3-15-4 .
 
-ANSIBLESERVER_BASE = v1.1.1
+ANSIBLESERVER_BASE = v1.1.2
 
 ansibleserver-base:
 	$(DOCKER_BUILDX)/ansibleserver-base:$(ANSIBLESERVER_BASE) -f ./Dockerfile.ansibleserver-base .
@@ -30,7 +30,7 @@ WEBCONSOLE_BASE_VERSION = 20230731.2
 webconsole-base:
 	$(DOCKER_BUILDX)/webconsole-base:$(WEBCONSOLE_BASE_VERSION) -f ./Dockerfile.webconsole-base .
 
-BAREMETAL_BASE_VERSION = v0.3.9-20230812.0
+BAREMETAL_BASE_VERSION = v0.3.9-20231219.1
 
 baremetal-base:
 	$(DOCKER_BUILDX)/baremetal-base:$(BAREMETAL_BASE_VERSION) -f ./Dockerfile.baremetal-base .
@@ -44,7 +44,7 @@ GLANCE_BASE_VERSION = v0.0.1
 glance-base:
 	$(DOCKER_BUILDX)/glance-base:$(GLANCE_BASE_VERSION) -f ./Dockerfile.glance-base .
 
-FILE_REPO_VERSION = v0.3.3
+FILE_REPO_VERSION = v0.5.2
 
 file-repo:
 	$(DOCKER_BUILDX)/file-repo:$(FILE_REPO_VERSION) -f ./Dockerfile.file-repo .
@@ -64,3 +64,13 @@ host-image:
 LBAGENT_BASE_VERSION = v0.0.3
 lbagent-base:
 	$(DOCKER_BUILDX)/lbagent-base:$(LBAGENT_BASE_VERSION) -f ./Dockerfile.lbagent-base .
+
+GUACD_VERSION=1.5.3
+guacd:
+	docker buildx build --platform linux/arm64 --push \
+		-t registry.cn-beijing.aliyuncs.com/yunionio/guacd:$(GUACD_VERSION)-arm64 -f ./Dockerfile.guacd .
+	docker buildx build --platform linux/amd64 --push \
+		-t registry.cn-beijing.aliyuncs.com/yunionio/guacd:$(GUACD_VERSION)-amd64 -f ./Dockerfile.guacd .
+	docker buildx imagetools create -t registry.cn-beijing.aliyuncs.com/yunionio/guacd:$(GUACD_VERSION) \
+		registry.cn-beijing.aliyuncs.com/yunionio/guacd:$(GUACD_VERSION)-amd64 \
+		registry.cn-beijing.aliyuncs.com/yunionio/guacd:$(GUACD_VERSION)-arm64

build/docker/multi-arch/Dockerfile.host

@@ -1,4 +1,4 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/alpine-build:3.16.0-go-1.18.2-0 as build
+FROM registry.cn-beijing.aliyuncs.com/yunionio/alpine-build:3.19.0-go-1.21.10-0 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

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

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

@@ -108,6 +108,7 @@
 	          <td>名称</td>
               <td>IP</td>
               <td>平台</td>
+              <td>指标</td>
               <td>触发值</td>
             </tr>
           </thead>
@@ -124,7 +125,8 @@
 				  <td>
 				   	{{ index .tags "brand" }}
 				  </td>
-				  <td>{{$Matche.value_str}}</td>
+				  <td>{{ $Matche.metric }}</td>
+				  <td>{{ $Matche.value_str }}</td>
 				</tr>
 			{{end}}
           </tbody>

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

@@ -3,7 +3,7 @@ AlertName: {{.name}}
 Time: {{.start_time}}
 Level: {{.level}}
 TriggerCondition: {{.description | unescaped}}
-ResourceCount: {{len .matches}}
+AlertCount: {{len .matches}}
 ResourceName: {{.resource_name}}
 
 WebUrl: {{.web_url}}

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

@@ -108,6 +108,7 @@
 	          <td>Name</td>
               <td>IP</td>
               <td>Brand</td>
+              <td>Metric</td>
               <td>Trigger value</td>
             </tr>
           </thead>
@@ -124,7 +125,8 @@
 				  <td>
 				   	{{ index .tags "brand" }}
 				  </td>
-				  <td>{{$Matche.value_str}}</td>
+				  <td>{{ $Matche.metric }}</td>
+				  <td>{{ $Matche.value_str }}</td>
 				</tr>
 			{{end}}
           </tbody>

cmd/climc/shell/cloudid/cloudgroup.go

@@ -35,4 +35,5 @@ func init() {
 	cmd.Perform("set-users", &cloudid.CloudgroupUserOptions{})
 	cmd.Perform("public", &cloudid.CloudgroupPublicOptions{})
 	cmd.Perform("private", &cloudid.CloudgroupIdOptions{})
+	cmd.Get("saml", &cloudid.CloudgroupIdOptions{})
 }

cmd/climc/shell/cloudid/cloudgroupcache.go

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

cmd/climc/shell/cloudid/cloudrole.go

@@ -25,5 +25,4 @@ func init() {
 	cmd.List(&cloudid.CloudroleListOptions{})
 	cmd.Delete(&cloudid.CloudroleIdOptions{})
 	cmd.Show(&cloudid.CloudroleIdOptions{})
-	cmd.Perform("purge", &cloudid.CloudroleIdOptions{})
 }

cmd/climc/shell/cloudid/cloudusers.go

@@ -30,14 +30,13 @@ func init() {
 	cmd.Show(&cloudid.ClouduserIdOption{})
 	cmd.Custom(shell.CustomActionGet, "login-info", &cloudid.ClouduserIdOption{})
 	cmd.Delete(&cloudid.ClouduserIdOption{})
-	cmd.Perform("sync", &cloudid.ClouduserSyncOptions{})
 	cmd.Perform("syncstatus", &cloudid.ClouduserIdOption{})
 	cmd.Perform("attach-policy", &cloudid.ClouduserPolicyOptions{})
 	cmd.Perform("detach-policy", &cloudid.ClouduserPolicyOptions{})
 	cmd.Perform("change-owner", &cloudid.ClouduserChangeOwnerOptions{})
 	cmd.Perform("reset-password", &cloudid.ClouduserResetPasswordOptions{})
-	cmd.Perform("cloud-user-join-group", &cloudid.ClouduserGroupOptions{})
-	cmd.Perform("cloud-user-leave-group", &cloudid.ClouduserGroupOptions{})
+	cmd.Perform("join-group", &cloudid.ClouduserGroupOptions{})
+	cmd.Perform("leave-group", &cloudid.ClouduserGroupOptions{})
 	cmd.GetWithCustomShow("access-keys", func(result jsonutils.JSONObject) {
 		ret := modulebase.JSON2ListResult(result)
 		shell.PrintList(ret, nil)

cmd/climc/shell/compute/access_groups.go

@@ -25,6 +25,6 @@ func init() {
 	cmd := shell.NewResourceCmd(&modules.AccessGroups).WithKeyword("access-group")
 	cmd.List(&compute.AccessGroupListOptions{})
 	cmd.Delete(&options.BaseIdOptions{})
-	cmd.Create(&options.BaseCreateOptions{})
+	cmd.Create(&compute.AccessGroupCreateOptions{})
 	cmd.Perform("syncstatus", &options.BaseIdOptions{})
 }

cmd/climc/shell/compute/app.go

@@ -25,6 +25,10 @@ func init() {
 	cmd.List(&compute.AppListOptions{})
 	cmd.Show(&compute.AppIdOptions{})
 	cmd.Perform("syncstatus", &compute.AppIdOptions{})
+	cmd.Get("hybird-connections", &compute.AppIdOptions{})
+	cmd.Get("certificates", &compute.AppIdOptions{})
+	cmd.Get("backups", &compute.AppIdOptions{})
+	cmd.Get("custom-domains", &compute.AppIdOptions{})
 
 	cmd1 := shell.NewResourceCmd(&modules.AppEnvironments)
 	cmd1.List(&compute.AppEnvironmentListOptions{})

cmd/climc/shell/compute/backup.go

@@ -26,6 +26,7 @@ func init() {
 	bsCmd.List(&compute.BackupStorageListOptions{})
 	bsCmd.Show(&compute.BackupStorageIdOptions{})
 	bsCmd.Create(&compute.BackupStorageCreateOptions{})
+	bsCmd.Update(&compute.BackupStorageUpdateOptions{})
 	bsCmd.Delete(&compute.BackupStorageIdOptions{})
 	bsCmd.Perform("public", &options.BasePublicOptions{})
 	bsCmd.Perform("private", &options.BaseIdOptions{})
@@ -49,4 +50,10 @@ func init() {
 	ibCmd.Create(&compute.InstanceBackupManagerCreateFromPackageOptions{})
 	ibCmd.Perform("syncstatus", &compute.DiskBackupSyncstatusOptions{})
 	ibCmd.Perform("set-class-metadata", &options.ResourceMetadataOptions{})
+
+	hbsCmd := shell.NewJointCmd(&modules.HostBackupstorages)
+	hbsCmd.List(&compute.HostBackupStorageListOptions{})
+	hbsCmd.Show(&compute.HostBackupStorageJoinOptions{})
+	hbsCmd.Attach(&compute.HostBackupStorageJoinOptions{})
+	hbsCmd.Detach(&compute.HostBackupStorageJoinOptions{})
 }

cmd/climc/shell/compute/baremetal_profiles.go

@@ -0,0 +1,50 @@
+// 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/jsonutils"
+	"yunion.io/x/pkg/errors"
+	"yunion.io/x/pkg/util/printutils"
+
+	"yunion.io/x/onecloud/cmd/climc/shell"
+	"yunion.io/x/onecloud/pkg/mcclient"
+	baremetalmodules "yunion.io/x/onecloud/pkg/mcclient/modules/compute/baremetal"
+	baremetaloptions "yunion.io/x/onecloud/pkg/mcclient/options/compute/baremetal"
+)
+
+func init() {
+	cmd := shell.NewResourceCmd(&baremetalmodules.BaremetalProfiles)
+	cmd.List(new(baremetaloptions.BaremetalProfileListOptions))
+	cmd.Show(new(baremetaloptions.BaremetalProfileIdOptions))
+	cmd.Delete(new(baremetaloptions.BaremetalProfileIdOptions))
+
+	type BaremetalProfileMatchOpts struct {
+		OEMNAME string
+		MODEL   string
+	}
+	R(&BaremetalProfileMatchOpts{}, "baremetal-profile-match", "find match baremetal profile by oemname and model", func(s *mcclient.ClientSession, args *BaremetalProfileMatchOpts) error {
+		specs, err := baremetalmodules.BaremetalProfiles.GetMatchProfiles(s, args.OEMNAME, args.MODEL)
+		if err != nil {
+			return errors.Wrap(err, "GetMatchProfiles")
+		}
+		listResults := printutils.ListResult{}
+		for _, spec := range specs {
+			listResults.Data = append(listResults.Data, jsonutils.Marshal(spec))
+		}
+		printList(&listResults, nil)
+		return nil
+	})
+}

cmd/climc/shell/compute/cachedimages.go

@@ -15,62 +15,17 @@
 package compute
 
 import (
-	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/cmd/climc/shell"
 	modules "yunion.io/x/onecloud/pkg/mcclient/modules/compute"
-	"yunion.io/x/onecloud/pkg/mcclient/options"
+	opts "yunion.io/x/onecloud/pkg/mcclient/options"
+	options "yunion.io/x/onecloud/pkg/mcclient/options/compute"
 )
 
 func init() {
-	type CachedImageListOptions struct {
-		options.BaseListOptions
-		ImageType string `help:"image type" choices:"system|customized|shared|market"`
-
-		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)
-		if err != nil {
-			return err
-		}
-		result, err := modules.Cachedimages.List(s, params)
-		if err != nil {
-			return err
-		}
-		printList(result, modules.Cachedimages.GetColumns(s))
-		return nil
-	})
-
-	type CachedImageShowOptions struct {
-		ID string `help:"ID or Name of the cached image to show"`
-	}
-	R(&CachedImageShowOptions{}, "cached-image-show", "Show cached image details", func(s *mcclient.ClientSession, args *CachedImageShowOptions) error {
-		result, err := modules.Cachedimages.Get(s, args.ID, nil)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
-	R(&CachedImageShowOptions{}, "cached-image-refresh", "Refresh cached image details", func(s *mcclient.ClientSession, args *CachedImageShowOptions) error {
-		result, err := modules.Cachedimages.PerformAction(s, args.ID, "refresh", nil)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
-	type CachedImageDeleteOptions struct {
-		ID []string `help:"ID or Name of the cached image to show"`
-	}
-	R(&CachedImageDeleteOptions{}, "cached-image-delete", "Remove cached image information", func(s *mcclient.ClientSession, args *CachedImageDeleteOptions) error {
-		results := modules.Cachedimages.BatchDelete(s, args.ID, nil)
-		printBatchResults(results, modules.Cachedimages.GetColumns(s))
-		return nil
-	})
+	cmd := shell.NewResourceCmd(&modules.Cachedimages).WithKeyword("cached-image")
+	cmd.List(&options.CachedImageListOptions{})
+	cmd.Show(&opts.BaseIdOptions{})
+	cmd.PerformClass("cache-image", &options.CachedImageCacheImageOptions{})
+	cmd.Perform("refresh", &opts.BaseIdOptions{})
+	cmd.BatchDelete(&opts.BaseIdsOptions{})
 }

cmd/climc/shell/compute/cloudaccounts.go

@@ -17,7 +17,7 @@ package compute
 import (
 	"yunion.io/x/onecloud/cmd/climc/shell"
 	modules "yunion.io/x/onecloud/pkg/mcclient/modules/compute"
-	"yunion.io/x/onecloud/pkg/mcclient/options"
+	options "yunion.io/x/onecloud/pkg/mcclient/options/compute"
 )
 
 func init() {
@@ -41,6 +41,7 @@ func init() {
 	cmd.CreateWithKeyword("create-hcs", &options.SHCSAccountCreateOptions{})
 	cmd.CreateWithKeyword("create-hcsop", &options.SHcsOpCloudAccountCreateOptions{})
 	cmd.CreateWithKeyword("create-ucloud", &options.SUcloudCloudAccountCreateOptions{})
+	cmd.CreateWithKeyword("create-volcengine", &options.SVolcengineCloudAccountCreateOptions{})
 	cmd.CreateWithKeyword("create-zstack", &options.SZStackCloudAccountCreateOptions{})
 	cmd.CreateWithKeyword("create-s3", &options.SS3CloudAccountCreateOptions{})
 	cmd.CreateWithKeyword("create-ceph", &options.SCephCloudAccountCreateOptions{})
@@ -59,6 +60,8 @@ func init() {
 	cmd.CreateWithKeyword("create-baidu", &options.SBaiduCloudAccountCreateOptions{})
 	cmd.CreateWithKeyword("create-cucloud", &options.SCucloudCloudAccountCreateOptions{})
 	cmd.CreateWithKeyword("create-qingcloud", &options.SQingCloudCloudAccountCreateOptions{})
+	cmd.CreateWithKeyword("create-oracle", &options.SOracleCloudAccountCreateOptions{})
+	cmd.CreateWithKeyword("create-cephfs", &options.SCephFSCloudAccountCreateOptions{})
 
 	cmd.UpdateWithKeyword("update-vmware", &options.SVMwareCloudAccountUpdateOptions{})
 	cmd.UpdateWithKeyword("update-aliyun", &options.SAliyunCloudAccountUpdateOptions{})
@@ -71,6 +74,7 @@ func init() {
 	cmd.UpdateWithKeyword("update-hcso", &options.SHCSOAccountUpdateOptions{})
 	cmd.UpdateWithKeyword("update-hcs", &options.SHCSAccountUpdateOptions{})
 	cmd.UpdateWithKeyword("update-ucloud", &options.SUcloudCloudAccountUpdateOptions{})
+	cmd.UpdateWithKeyword("update-volcengine", &options.SVolcengineCloudAccountUpdateOptions{})
 	cmd.UpdateWithKeyword("update-zstack", &options.SZStackCloudAccountUpdateOptions{})
 	cmd.UpdateWithKeyword("update-s3", &options.SS3CloudAccountUpdateOptions{})
 	cmd.UpdateWithKeyword("update-ctyun", &options.SCtyunCloudAccountUpdateOptions{})
@@ -99,6 +103,7 @@ func init() {
 	cmd.PerformWithKeyword("update-credential-hcso", "update-credential", &options.SHCSOAccountUpdateCredentialOptions{})
 	cmd.PerformWithKeyword("update-credential-hcs", "update-credential", &options.SHCSOAccountUpdateCredentialOptions{})
 	cmd.PerformWithKeyword("update-credential-ucloud", "update-credential", &options.SUcloudCloudAccountUpdateCredentialOptions{})
+	cmd.PerformWithKeyword("update-credential-volcengine", "update-credential", &options.SVolcengineCloudAccountUpdateCredentialOptions{})
 	cmd.PerformWithKeyword("update-credential-zstack", "update-credential", &options.SZStackCloudAccountUpdateCredentialOptions{})
 	cmd.PerformWithKeyword("update-credential-s3", "update-credential", &options.SS3CloudAccountUpdateCredentialOptions{})
 	cmd.PerformWithKeyword("update-credential-ctyun", "update-credential", &options.SCtyunCloudAccountUpdateCredentialOptions{})
@@ -122,6 +127,7 @@ func init() {
 	cmd.PerformWithKeyword("test-connectivity-openstack", "test-connectivity", &options.SOpenStackCloudAccountUpdateCredentialOptions{})
 	cmd.PerformWithKeyword("test-connectivity-huawei", "test-connectivity", &options.SHuaweiCloudAccountUpdateCredentialOptions{})
 	cmd.PerformWithKeyword("test-connectivity-ucloud", "test-connectivity", &options.SUcloudCloudAccountUpdateCredentialOptions{})
+	cmd.PerformWithKeyword("test-connectivity-volcengine", "test-connectivity", &options.SVolcengineCloudAccountUpdateCredentialOptions{})
 	cmd.PerformWithKeyword("test-connectivity-zstack", "test-connectivity", &options.SZStackCloudAccountUpdateCredentialOptions{})
 	cmd.PerformWithKeyword("test-connectivity-s3", "test-connectivity", &options.SS3CloudAccountUpdateCredentialOptions{})
 	cmd.PerformWithKeyword("test-connectivity-ctyun", "test-connectivity", &options.SCtyunCloudAccountUpdateCredentialOptions{})
@@ -145,5 +151,4 @@ func init() {
 	cmd.Get("change-owner-candidate-domains", &options.SCloudAccountIdOptions{})
 	cmd.Get("enrollment-accounts", &options.SCloudAccountIdOptions{})
 	cmd.Get("balance", &options.SCloudAccountIdOptions{})
-	cmd.Get("saml", &options.SCloudAccountIdOptions{})
 }

cmd/climc/shell/compute/cloudregions.go

@@ -38,7 +38,7 @@ func init() {
 
 		Usable    *bool  `help:"List regions where networks are usable"`
 		UsableVpc *bool  `help:"List regions where VPC are usable"`
-		Service   string `help:"List regions which service has available skus" choices:"dbinstances|servers"`
+		Service   string `help:"List regions which service has available skus" choices:"dbinstances|servers|elasticcaches"`
 
 		City string `help:"List regions in the specified city"`
 

cmd/climc/shell/compute/containers.go

@@ -0,0 +1,112 @@
+// 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 (
+	"fmt"
+	"io/ioutil"
+	"os"
+	"os/exec"
+
+	"github.com/ghodss/yaml"
+
+	"yunion.io/x/jsonutils"
+	"yunion.io/x/pkg/errors"
+
+	"yunion.io/x/onecloud/cmd/climc/shell"
+	computeapi "yunion.io/x/onecloud/pkg/apis/compute"
+	"yunion.io/x/onecloud/pkg/mcclient"
+	modules "yunion.io/x/onecloud/pkg/mcclient/modules/compute"
+	options "yunion.io/x/onecloud/pkg/mcclient/options/compute"
+)
+
+func init() {
+	cmd := shell.NewResourceCmd(&modules.Containers)
+	cmd.Create(new(options.ContainerCreateOptions))
+	cmd.List(new(options.ContainerListOptions))
+	cmd.Show(new(options.ContainerShowOptions))
+	cmd.BatchDelete(new(options.ContainerDeleteOptions))
+	cmd.BatchPerform("stop", new(options.ContainerStopOptions))
+	cmd.BatchPerform("start", new(options.ContainerStartOptions))
+	cmd.BatchPerform("syncstatus", new(options.ContainerIdsOptions))
+
+	type UpdateSpecOptions struct {
+		ID string `help:"ID or name of server" json:"-"`
+	}
+	R(&UpdateSpecOptions{}, "container-update-spec", "Update spec of a container", func(s *mcclient.ClientSession, opts *UpdateSpecOptions) error {
+		result, err := modules.Containers.Get(s, opts.ID, nil)
+		if err != nil {
+			return errors.Wrap(err, "get container id")
+		}
+		yamlBytes := result.YAMLString()
+		tempfile, err := ioutil.TempFile("", fmt.Sprintf("container-%s*.yaml", opts.ID))
+		if err != nil {
+			return err
+		}
+		defer os.Remove(tempfile.Name())
+		if _, err := tempfile.Write([]byte(yamlBytes)); err != nil {
+			return err
+		}
+		if err := tempfile.Close(); err != nil {
+			return err
+		}
+
+		cmd := exec.Command("vim", tempfile.Name())
+		cmd.Stdin = os.Stdin
+		cmd.Stdout = os.Stdout
+		if err := cmd.Run(); err != nil {
+			return err
+		}
+		content, err := ioutil.ReadFile(tempfile.Name())
+		if err != nil {
+			return err
+		}
+		jsonBytes, err := yaml.YAMLToJSON(content)
+		if err != nil {
+			return err
+		}
+		body, err := jsonutils.Parse(jsonBytes)
+		if err != nil {
+			return err
+		}
+		if _, err := modules.Containers.Update(s, opts.ID, body); err != nil {
+			return errors.Wrap(err, "update spec")
+		}
+
+		return nil
+	})
+
+	type SetSpecOptions struct {
+		ID                string `help:"ID or name of server" json:"-"`
+		EnableSimulateCpu bool   `help:"Enable simulating /sys/devices/system/cpu directory"`
+	}
+	R(&SetSpecOptions{}, "container-set-spec", "Set spec of a container", func(s *mcclient.ClientSession, opts *SetSpecOptions) error {
+		result, err := modules.Containers.Get(s, opts.ID, nil)
+		if err != nil {
+			return errors.Wrap(err, "get container id")
+		}
+		spec := new(computeapi.ContainerSpec)
+		if err := result.Unmarshal(spec, "spec"); err != nil {
+			return errors.Wrap(err, "unmarshal to spec")
+		}
+		spec.SimulateCpu = opts.EnableSimulateCpu
+		result.(*jsonutils.JSONDict).Set("spec", jsonutils.Marshal(spec))
+
+		if _, err := modules.Containers.Update(s, opts.ID, result); err != nil {
+			return errors.Wrap(err, "update spec")
+		}
+		return nil
+	})
+}

cmd/climc/shell/compute/dbinstance_accounts.go

@@ -17,13 +17,14 @@ package compute
 import (
 	"yunion.io/x/onecloud/cmd/climc/shell"
 	modules "yunion.io/x/onecloud/pkg/mcclient/modules/compute"
-	"yunion.io/x/onecloud/pkg/mcclient/options"
+	baseoptions "yunion.io/x/onecloud/pkg/mcclient/options"
+	options "yunion.io/x/onecloud/pkg/mcclient/options/compute"
 )
 
 func init() {
 	cmd := shell.NewResourceCmd(&modules.DBInstanceAccounts).WithKeyword("dbinstance-account")
 	cmd.List(&options.DBInstanceAccountListOptions{})
-	cmd.Update(&options.BaseUpdateOptions{})
+	cmd.Update(&baseoptions.BaseUpdateOptions{})
 	cmd.Show(&options.DBInstanceAccountIdOptions{})
 	cmd.Delete(&options.DBInstanceAccountIdOptions{})
 }

cmd/climc/shell/compute/dbinstance_databases.go

@@ -17,13 +17,14 @@ package compute
 import (
 	"yunion.io/x/onecloud/cmd/climc/shell"
 	modules "yunion.io/x/onecloud/pkg/mcclient/modules/compute"
-	"yunion.io/x/onecloud/pkg/mcclient/options"
+	baseoptions "yunion.io/x/onecloud/pkg/mcclient/options"
+	options "yunion.io/x/onecloud/pkg/mcclient/options/compute"
 )
 
 func init() {
 	cmd := shell.NewResourceCmd(&modules.DBInstanceDatabases).WithKeyword("dbinstance-database")
 	cmd.List(&options.DBInstanceDatabaseListOptions{})
-	cmd.Update(&options.BaseUpdateOptions{})
+	cmd.Update(&baseoptions.BaseUpdateOptions{})
 	cmd.Delete(&options.DBInstanceDatabaseIdOptions{})
 	cmd.Show(&options.DBInstanceDatabaseIdOptions{})
 	cmd.Create(&options.DBInstanceDatabaseCreateOptions{})

cmd/climc/shell/compute/dbinstance_skus.go

@@ -17,7 +17,7 @@ package compute
 import (
 	"yunion.io/x/onecloud/cmd/climc/shell"
 	modules "yunion.io/x/onecloud/pkg/mcclient/modules/compute"
-	"yunion.io/x/onecloud/pkg/mcclient/options"
+	options "yunion.io/x/onecloud/pkg/mcclient/options/compute"
 )
 
 func init() {

cmd/climc/shell/compute/disks.go

@@ -41,46 +41,10 @@ import (
 
 func init() {
 	cmd := shell.NewResourceCmd(&modules.Disks)
+	cmd.List(&compute_options.DiskListOptions{})
 	cmd.Perform("set-class-metadata", &options.ResourceMetadataOptions{})
-
-	type DiskListOptions struct {
-		options.BaseListOptions
-		Unused        *bool  `help:"Show unused disks"`
-		Share         *bool  `help:"Show Share storage disks"`
-		Local         *bool  `help:"Show Local storage disks"`
-		Guest         string `help:"Guest ID or name"`
-		GuestStatus   string `help:"Guest Status"`
-		OrderByServer string `help:"Order By Server"`
-		Storage       string `help:"Storage ID or name"`
-		Type          string `help:"Disk type" choices:"sys|data|swap|volume"`
-		CloudType     string `help:"Public cloud or private cloud" choices:"Public|Private"`
-
-		OrderByGuestCount string `help:"Order By Guest Count"`
-
-		BillingType string `help:"billing type" choices:"postpaid|prepaid"`
-
-		SnapshotpolicyId string `help:"snapshotpolicy id"`
-	}
-	R(&DiskListOptions{}, "disk-list", "List virtual disks", func(s *mcclient.ClientSession, opts *DiskListOptions) error {
-		params, err := options.ListStructToParams(opts)
-		if err != nil {
-			return err
-		}
-		if len(opts.CloudType) > 0 {
-			if opts.CloudType == "Public" {
-				params.Add(jsonutils.JSONTrue, "public_cloud")
-			} else if opts.CloudType == "Private" {
-				params.Add(jsonutils.JSONTrue, "private_cloud")
-			}
-		}
-
-		result, err := modules.Disks.List(s, params)
-		if err != nil {
-			return err
-		}
-		printList(result, modules.Disks.GetColumns(s))
-		return nil
-	})
+	cmd.Perform("rebuild", &options.ResourceIdOptions{})
+	cmd.Perform("migrate", &compute_options.DiskMigrateOptions{})
 
 	type DiskDetailOptions struct {
 		ID string `help:"ID or Name of disk"`
@@ -172,7 +136,7 @@ func init() {
 		Desc         string `help:"Description" metavar:"DESCRIPTION"`
 		AutoDelete   string `help:"enable/disable auto delete of disk" choices:"enable|disable"`
 		AutoSnapshot string `help:"enable/disable auto snapshot of disk" choices:"enable|disable"`
-		DiskType     string `help:"Disk type" choices:"data|volume"`
+		DiskType     string `help:"Disk type" choices:"data|volume|sys"`
 		IsSsd        *bool  `help:"mark disk as ssd" negative:"no-is-ssd"`
 	}
 	R(&DiskUpdateOptions{}, "disk-update", "Update property of a virtual disk", func(s *mcclient.ClientSession, args *DiskUpdateOptions) error {

cmd/climc/shell/compute/dnszone.go

@@ -22,6 +22,7 @@ import (
 
 	"yunion.io/x/onecloud/cmd/climc/shell"
 	modules "yunion.io/x/onecloud/pkg/mcclient/modules/compute"
+	"yunion.io/x/onecloud/pkg/mcclient/options"
 	"yunion.io/x/onecloud/pkg/mcclient/options/compute"
 )
 
@@ -32,6 +33,8 @@ func init() {
 	cmd.ClassShow(&compute.DnsZoneCapabilitiesOptions{})
 	cmd.Delete(&compute.SDnsZoneIdOptions{})
 	cmd.Create(&compute.DnsZoneCreateOptions{})
+	cmd.Perform("public", &options.BasePublicOptions{})
+	cmd.Perform("private", &options.BaseIdOptions{})
 	cmd.Perform("syncstatus", &compute.SDnsZoneIdOptions{})
 	cmd.Perform("purge", &compute.SDnsZoneIdOptions{})
 	cmd.Perform("add-vpcs", &compute.DnsZoneAddVpcsOptions{})

cmd/climc/shell/compute/elasticcache.go

@@ -41,7 +41,7 @@ func init() {
 	cmd.PerformWithKeyword("disable-auth", "update-auth-mode", &compute.ElasticCacheDisableAuthOptions{})
 
 	type ElasticCacheAccountResetPasswordOptions struct {
-		options.ElasticCacheIdOptions
+		compute.ElasticCacheIdOptions
 		PASSWORD string `help:"elastic cache account password."`
 	}
 
@@ -77,7 +77,7 @@ func init() {
 		return nil
 	})
 
-	R(&options.ElasticCacheAccountCreateOptions{}, "elastic-cache-account-create", "Create elastisc cache account", func(s *mcclient.ClientSession, opts *options.ElasticCacheAccountCreateOptions) error {
+	R(&compute.ElasticCacheAccountCreateOptions{}, "elastic-cache-account-create", "Create elastisc cache account", func(s *mcclient.ClientSession, opts *compute.ElasticCacheAccountCreateOptions) error {
 		params, err := options.ListStructToParams(opts)
 		if err != nil {
 			return err
@@ -92,7 +92,7 @@ func init() {
 		return nil
 	})
 
-	R(&options.ElasticCacheIdOptions{}, "elastic-cache-account-delete", "Delete elastisc cache account", func(s *mcclient.ClientSession, opts *options.ElasticCacheIdOptions) error {
+	R(&compute.ElasticCacheIdOptions{}, "elastic-cache-account-delete", "Delete elastisc cache account", func(s *mcclient.ClientSession, opts *compute.ElasticCacheIdOptions) error {
 		result, err := modules.ElasticCacheAccount.Delete(s, opts.ID, nil)
 		if err != nil {
 			return err
@@ -102,7 +102,7 @@ func init() {
 		return nil
 	})
 
-	R(&options.ElasticCacheBackupCreateOptions{}, "elastic-cache-backup-create", "Create elastisc cache backup", func(s *mcclient.ClientSession, opts *options.ElasticCacheBackupCreateOptions) error {
+	R(&compute.ElasticCacheBackupCreateOptions{}, "elastic-cache-backup-create", "Create elastisc cache backup", func(s *mcclient.ClientSession, opts *compute.ElasticCacheBackupCreateOptions) error {
 		params, err := options.ListStructToParams(opts)
 		if err != nil {
 			return err
@@ -132,7 +132,7 @@ func init() {
 		return nil
 	})
 
-	R(&options.ElasticCacheIdOptions{}, "elastic-cache-backup-delete", "Delete elastisc cache backup", func(s *mcclient.ClientSession, opts *options.ElasticCacheIdOptions) error {
+	R(&compute.ElasticCacheIdOptions{}, "elastic-cache-backup-delete", "Delete elastisc cache backup", func(s *mcclient.ClientSession, opts *compute.ElasticCacheIdOptions) error {
 		result, err := modules.ElasticCacheBackup.Delete(s, opts.ID, nil)
 		if err != nil {
 			return err
@@ -142,7 +142,7 @@ func init() {
 		return nil
 	})
 
-	R(&options.ElasticCacheIdOptions{}, "elastic-cache-backup-restore", "Restore elastisc cache backup", func(s *mcclient.ClientSession, opts *options.ElasticCacheIdOptions) error {
+	R(&compute.ElasticCacheIdOptions{}, "elastic-cache-backup-restore", "Restore elastisc cache backup", func(s *mcclient.ClientSession, opts *compute.ElasticCacheIdOptions) error {
 		result, err := modules.ElasticCacheBackup.PerformAction(s, opts.ID, "restore-instance", nil)
 		if err != nil {
 			return err
@@ -152,7 +152,7 @@ func init() {
 		return nil
 	})
 
-	R(&options.ElasticCacheAclCreateOptions{}, "elastic-cache-acl-create", "Create elastisc cache acl", func(s *mcclient.ClientSession, opts *options.ElasticCacheAclCreateOptions) error {
+	R(&compute.ElasticCacheAclCreateOptions{}, "elastic-cache-acl-create", "Create elastisc cache acl", func(s *mcclient.ClientSession, opts *compute.ElasticCacheAclCreateOptions) error {
 		params, err := options.ListStructToParams(opts)
 		if err != nil {
 			return err
@@ -167,7 +167,7 @@ func init() {
 		return nil
 	})
 
-	R(&options.ElasticCacheIdOptions{}, "elastic-cache-acl-delete", "Delete elastisc cache acl", func(s *mcclient.ClientSession, opts *options.ElasticCacheIdOptions) error {
+	R(&compute.ElasticCacheIdOptions{}, "elastic-cache-acl-delete", "Delete elastisc cache acl", func(s *mcclient.ClientSession, opts *compute.ElasticCacheIdOptions) error {
 		result, err := modules.ElasticCacheAcl.Delete(s, opts.ID, nil)
 		if err != nil {
 			return err
@@ -192,7 +192,7 @@ func init() {
 		return nil
 	})
 
-	R(&options.ElasticCacheAclUpdateOptions{}, "elastic-cache-acl-update", "Update elastisc cache acl", func(s *mcclient.ClientSession, opts *options.ElasticCacheAclUpdateOptions) error {
+	R(&compute.ElasticCacheAclUpdateOptions{}, "elastic-cache-acl-update", "Update elastisc cache acl", func(s *mcclient.ClientSession, opts *compute.ElasticCacheAclUpdateOptions) error {
 		params, err := options.ListStructToParams(opts)
 		if err != nil {
 			return err
@@ -223,7 +223,7 @@ func init() {
 		return nil
 	})
 
-	R(&options.ElasticCacheParameterUpdateOptions{}, "elastic-cache-parameter-update", "Update elastisc cache parameter", func(s *mcclient.ClientSession, opts *options.ElasticCacheParameterUpdateOptions) error {
+	R(&compute.ElasticCacheParameterUpdateOptions{}, "elastic-cache-parameter-update", "Update elastisc cache parameter", func(s *mcclient.ClientSession, opts *compute.ElasticCacheParameterUpdateOptions) error {
 		params, err := options.ListStructToParams(opts)
 		if err != nil {
 			return err
@@ -293,7 +293,7 @@ func init() {
 		return nil
 	})
 
-	R(&options.ElasticCacheRemoteUpdateOptions{}, "elastic-cache-remote-update", "Restore elastisc cache backup", func(s *mcclient.ClientSession, opts *options.ElasticCacheRemoteUpdateOptions) error {
+	R(&compute.ElasticCacheRemoteUpdateOptions{}, "elastic-cache-remote-update", "Restore elastisc cache backup", func(s *mcclient.ClientSession, opts *compute.ElasticCacheRemoteUpdateOptions) error {
 		params, err := options.StructToParams(opts)
 		if err != nil {
 			return err
@@ -307,7 +307,7 @@ func init() {
 		return nil
 	})
 
-	R(&options.ElasticCacheAutoRenewOptions{}, "elastic-cache-auto-renew", "Set elastisc cache auto renew", func(s *mcclient.ClientSession, opts *options.ElasticCacheAutoRenewOptions) error {
+	R(&compute.ElasticCacheAutoRenewOptions{}, "elastic-cache-auto-renew", "Set elastisc cache auto renew", func(s *mcclient.ClientSession, opts *compute.ElasticCacheAutoRenewOptions) error {
 		params, err := options.StructToParams(opts)
 		if err != nil {
 			return err
@@ -321,7 +321,7 @@ func init() {
 		return nil
 	})
 
-	R(&options.ElasticCacheRenewOptions{}, "elastic-cache-renew", "Renew elastisc cache", func(s *mcclient.ClientSession, opts *options.ElasticCacheRenewOptions) error {
+	R(&compute.ElasticCacheRenewOptions{}, "elastic-cache-renew", "Renew elastisc cache", func(s *mcclient.ClientSession, opts *compute.ElasticCacheRenewOptions) error {
 		params, err := options.StructToParams(opts)
 		if err != nil {
 			return err

cmd/climc/shell/compute/hosts.go

@@ -23,6 +23,7 @@ import (
 	"yunion.io/x/log"
 	"yunion.io/x/pkg/errors"
 	"yunion.io/x/pkg/util/httputils"
+	"yunion.io/x/pkg/util/printutils"
 
 	"yunion.io/x/onecloud/cmd/climc/shell"
 	"yunion.io/x/onecloud/pkg/mcclient"
@@ -36,7 +37,6 @@ import (
 func init() {
 	cmd := shell.NewResourceCmd(&modules.Hosts)
 	cmd.List(&compute.HostListOptions{})
-	cmd.Show(&options.BaseShowOptions{})
 	cmd.GetMetadata(&options.BaseIdOptions{})
 	cmd.GetProperty(&compute.HostStatusStatisticsOptions{})
 
@@ -53,6 +53,8 @@ func init() {
 	cmd.Perform("probe-isolated-devices", &options.BaseIdOptions{})
 	cmd.Perform("class-metadata", &options.ResourceMetadataOptions{})
 	cmd.Perform("set-class-metadata", &options.ResourceMetadataOptions{})
+	cmd.PerformClass("validate-ipmi", &compute.HostValidateIPMI{})
+	cmd.Perform("set-commit-bound", &compute.HostSetCommitBoundOptions{})
 
 	cmd.BatchPerform("enable", &options.BaseIdsOptions{})
 	cmd.BatchPerform("disable", &options.BaseIdsOptions{})
@@ -69,13 +71,54 @@ func init() {
 	cmd.Get("vnc", &options.BaseIdOptions{})
 	cmd.Get("app-options", &options.BaseIdOptions{})
 	cmd.Get("tap-config", &options.BaseIdOptions{})
+	cmd.GetWithCustomShow("nics", func(data jsonutils.JSONObject) {
+		results := printutils.ListResult{}
+		err := data.Unmarshal(&results)
+		if err == nil {
+			printutils.PrintJSONList(&results, []string{
+				"mac",
+				"vlan_id",
+				"interface",
+				"bridge",
+				"ip_addr",
+				"net",
+				"wire",
+			})
+		} else {
+			fmt.Println("error", err)
+		}
+	}, &options.BaseIdOptions{})
+
+	R(&compute.HostShowOptions{}, "host-show", "Show details of a host", func(s *mcclient.ClientSession, args *compute.HostShowOptions) error {
+		params, err := args.Params()
+		if err != nil {
+			return err
+		}
+		result, err := modules.Hosts.Get(s, args.ID, params)
+		if err != nil {
+			return err
+		}
+		resultDict := result.(*jsonutils.JSONDict)
+		if !args.ShowAll {
+			if !args.ShowMetadata {
+				print("ShowMetadata\n")
+				resultDict.Remove("metadata")
+			}
+			if !args.ShowNicInfo {
+				print("ShowMetadata\n")
+				resultDict.Remove("nic_info")
+			}
+			if !args.ShowSysInfo {
+				print("ShowSysInfo\n")
+				resultDict.Remove("sys_info")
+			}
+		}
+		printObject(resultDict)
+		return nil
+	})
 
 	R(&options.BaseIdOptions{}, "host-logininfo", "Get SSH login information of a host", func(s *mcclient.ClientSession, args *options.BaseIdOptions) error {
-		srvid, e := modules.Hosts.GetId(s, args.ID, nil)
-		if e != nil {
-			return e
-		}
-		i, e := modules.Hosts.GetLoginInfo(s, srvid, nil)
+		i, e := modules.Hosts.PerformAction(s, args.ID, "login-info", nil)
 		if e != nil {
 			return e
 		}
@@ -159,17 +202,16 @@ func init() {
 	})
 
 	type HostUpdateOptions struct {
-		ID                string  `help:"ID or Name of Host"`
-		Name              string  `help:"New name of the host"`
-		Desc              string  `help:"New Description of the host"`
-		CpuCommitBound    float64 `help:"CPU overcommit upper bound at this host"`
-		MemoryCommitBound float64 `help:"Memory overcommit upper bound at this host"`
-		MemoryReserved    string  `help:"Memory reserved"`
-		CpuReserved       int64   `help:"CPU reserved"`
-		HostType          string  `help:"Change host type, CAUTION!!!!" choices:"hypervisor|kubelet|esxi|baremetal"`
+		ID             string `help:"ID or Name of Host"`
+		Name           string `help:"New name of the host"`
+		Desc           string `help:"New Description of the host"`
+		MemoryReserved string `help:"Memory reserved"`
+		CpuReserved    int64  `help:"CPU reserved"`
+		HostType       string `help:"Change host type, CAUTION!!!!" choices:"hypervisor|kubelet|esxi|baremetal"`
 		// AccessIp          string  `help:"Change access ip, CAUTION!!!!"`
-		AccessMac string `help:"Change baremetal access MAC, CAUTION!!!!"`
-		Uuid      string `help:"Change baremetal UUID,  CAUTION!!!!"`
+		AccessMac          string `help:"Change baremetal access MAC, CAUTION!!!!"`
+		Uuid               string `help:"Change baremetal UUID,  CAUTION!!!!"`
+		EnableNumaAllocate string `help:"Host enable numa allocate" choices:"True|False"`
 
 		IpmiUsername string `help:"IPMI user"`
 		IpmiPassword string `help:"IPMI password"`
@@ -187,12 +229,6 @@ func init() {
 		if len(args.Desc) > 0 {
 			params.Add(jsonutils.NewString(args.Desc), "description")
 		}
-		if args.CpuCommitBound > 0.0 {
-			params.Add(jsonutils.NewFloat64(args.CpuCommitBound), "cpu_cmtbound")
-		}
-		if args.MemoryCommitBound > 0.0 {
-			params.Add(jsonutils.NewFloat64(args.MemoryCommitBound), "mem_cmtbound")
-		}
 		if len(args.MemoryReserved) > 0 {
 			params.Add(jsonutils.NewString(args.MemoryReserved), "mem_reserved")
 		}
@@ -220,6 +256,13 @@ func init() {
 		if len(args.Sn) > 0 {
 			params.Add(jsonutils.NewString(args.Sn), "sn")
 		}
+		if len(args.EnableNumaAllocate) > 0 {
+			enableNumaAllocate := false
+			if args.EnableNumaAllocate == "True" {
+				enableNumaAllocate = true
+			}
+			params.Add(jsonutils.NewBool(enableNumaAllocate), "enable_numa_allocate")
+		}
 		if params.Size() == 0 {
 			return fmt.Errorf("Not data to update")
 		}
@@ -576,14 +619,10 @@ func init() {
 		Port int    `help:"SSH service port" default:"22"`
 	}
 	R(&HostSSHLoginOptions{}, "host-ssh", "SSH login of a host", func(s *mcclient.ClientSession, args *HostSSHLoginOptions) error {
-		srvid, e := modules.Hosts.GetId(s, args.ID, nil)
-		if e != nil {
-			return e
-		}
-		i, e := modules.Hosts.GetLoginInfo(s, srvid, nil)
+		i, e := modules.Hosts.PerformAction(s, args.ID, "login-info", nil)
 		privateKey := ""
 		if e != nil {
-			if httputils.ErrorCode(e) == 404 || e.Error() == "ciphertext too short" {
+			if httputils.ErrorCode(e) == 404 || strings.Contains(e.Error(), "ciphertext too short") {
 				var err error
 				privateKey, err = modules.Sshkeypairs.FetchPrivateKeyBySession(context.Background(), s)
 				if err != nil {

cmd/climc/shell/compute/isolated_device_models.go

@@ -15,8 +15,13 @@
 package compute
 
 import (
+	"yunion.io/x/jsonutils"
+	"yunion.io/x/pkg/util/printutils"
+
 	"yunion.io/x/onecloud/cmd/climc/shell"
+	"yunion.io/x/onecloud/pkg/mcclient"
 	modules "yunion.io/x/onecloud/pkg/mcclient/modules/compute"
+	baseoptions "yunion.io/x/onecloud/pkg/mcclient/options"
 	options "yunion.io/x/onecloud/pkg/mcclient/options/compute"
 )
 
@@ -26,4 +31,71 @@ func init() {
 	cmd.Create(new(options.IsolatedDeviceModelCreateOptions))
 	cmd.Update(new(options.IsolatedDeviceModelUpdateOptions))
 	cmd.Delete(new(options.IsolatedDeviceIdsOptions))
+	cmd.Perform("set-hardware-info", new(options.IsolatedDeviceModelSetHardwareInfoOptions))
+	cmd.Get("hardware-info", new(options.IsolatedDeviceIdsOptions))
+
+	type HostIsolatedDeviceModelListOptions struct {
+		baseoptions.BaseListOptions
+		Host                string `help:"ID or Name of Host"`
+		IsolatedDeviceModel string `help:"ID or Name of Isolated device model"`
+	}
+	R(&HostIsolatedDeviceModelListOptions{}, "host-isolated-device-model-list",
+		"List host Isolated device model pairs", func(s *mcclient.ClientSession, args *HostIsolatedDeviceModelListOptions) error {
+			var params *jsonutils.JSONDict
+			{
+				var err error
+				params, err = args.BaseListOptions.Params()
+				if err != nil {
+					return err
+
+				}
+			}
+			var result *printutils.ListResult
+			var err error
+			if len(args.Host) > 0 {
+				result, err = modules.HostIsolatedDeviceModels.ListDescendent(s, args.Host, params)
+			} else if len(args.IsolatedDeviceModel) > 0 {
+				result, err = modules.HostIsolatedDeviceModels.ListDescendent2(s, args.IsolatedDeviceModel, params)
+			} else {
+				result, err = modules.HostIsolatedDeviceModels.List(s, params)
+			}
+			if err != nil {
+				return err
+			}
+			printList(result, modules.HostIsolatedDeviceModels.GetColumns(s))
+			return nil
+		})
+
+	type HostIsolatedDeviceModelDetailOptions struct {
+		HOST                string `help:"ID or Name of Host"`
+		IsolatedDeviceModel string `help:"ID or Name of Isolated device model"`
+	}
+	R(&HostIsolatedDeviceModelDetailOptions{}, "host-isolated-device-model-show", "Show host isolated-device-model details", func(s *mcclient.ClientSession, args *HostIsolatedDeviceModelDetailOptions) error {
+		result, err := modules.HostIsolatedDeviceModels.Get(s, args.HOST, args.IsolatedDeviceModel, nil)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	R(&HostIsolatedDeviceModelDetailOptions{}, "host-isolated-device-model-detach", "Detach a isolated-device-model from a host", func(s *mcclient.ClientSession, args *HostIsolatedDeviceModelDetailOptions) error {
+		result, err := modules.HostIsolatedDeviceModels.Detach(s, args.HOST, args.IsolatedDeviceModel, nil)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	R(&HostIsolatedDeviceModelDetailOptions{}, "host-isolated-device-model-attach", "Attach a isolated-device-model to a host", func(s *mcclient.ClientSession, args *HostIsolatedDeviceModelDetailOptions) error {
+		params := jsonutils.NewDict()
+		result, err := modules.HostIsolatedDeviceModels.Attach(s, args.HOST, args.IsolatedDeviceModel, params)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
 }

cmd/climc/shell/compute/isolatedevices.go

@@ -15,90 +15,15 @@
 package compute
 
 import (
-	"yunion.io/x/jsonutils"
-
-	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/cmd/climc/shell"
 	modules "yunion.io/x/onecloud/pkg/mcclient/modules/compute"
-	"yunion.io/x/onecloud/pkg/mcclient/options"
+	"yunion.io/x/onecloud/pkg/mcclient/options/compute"
 )
 
 func init() {
-	type DeviceListOptions struct {
-		options.BaseListOptions
-		Unused bool   `help:"Only show unused devices"`
-		Gpu    bool   `help:"Only show gpu devices"`
-		Host   string `help:"Host ID or Name"`
-		Region string `help:"Cloudregion ID or Name"`
-		Zone   string `help:"Zone ID or Name"`
-		Server string `help:"Server ID or Name"`
-	}
-	R(&DeviceListOptions{}, "isolated-device-list", "List isolated devices like GPU", func(s *mcclient.ClientSession, args *DeviceListOptions) error {
-		var params *jsonutils.JSONDict
-		{
-			var err error
-			params, err = args.BaseListOptions.Params()
-			if err != nil {
-				return err
-
-			}
-		}
-		if len(args.Host) > 0 {
-			params.Add(jsonutils.NewString(args.Host), "host")
-		}
-		if args.Unused {
-			params.Add(jsonutils.JSONTrue, "unused")
-		}
-		if args.Gpu {
-			params.Add(jsonutils.JSONTrue, "gpu")
-		}
-		if len(args.Region) > 0 {
-			params.Add(jsonutils.NewString(args.Region), "region")
-		}
-		if args.Zone != "" {
-			params.Add(jsonutils.NewString(args.Zone), "zone")
-		}
-		if args.Server != "" {
-			params.Add(jsonutils.NewString(args.Server), "guest_id")
-		}
-		result, err := modules.IsolatedDevices.List(s, params)
-		if err != nil {
-			return err
-		}
-		printList(result, modules.IsolatedDevices.GetColumns(s))
-		return nil
-	})
-
-	type DeviceShowOptions struct {
-		ID string `help:"ID of the isolated device"`
-	}
-	R(&DeviceShowOptions{}, "isolated-device-show", "Show isolated device details", func(s *mcclient.ClientSession, args *DeviceShowOptions) error {
-		result, err := modules.IsolatedDevices.Get(s, args.ID, nil)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
-	type DeviceDeleteOptions struct {
-		IDS []string `help:"IDs of the isolated device"`
-	}
-	R(&DeviceDeleteOptions{}, "isolated-device-delete", "Delete a isolated device", func(s *mcclient.ClientSession, args *DeviceDeleteOptions) error {
-		result := modules.IsolatedDevices.BatchDelete(s, args.IDS, nil)
-		printBatchResults(result, modules.IsolatedDevices.GetColumns(s))
-		return nil
-	})
-
-	type DeviceUpdateOptions struct {
-		ID              []string `help:"ID of the isolated device" json:"-"`
-		ReservedCpu     *int     `help:"reserved cpu for isolated device"`
-		ReservedMem     *int     `help:"reserved mem for isolated device"`
-		ReservedStorage *int     `help:"reserved storage for isolated device"`
-		DevType         string   `help:"Device type" choices:"GPU-HPC|GPU-VGA"`
-	}
-	R(&DeviceUpdateOptions{}, "isolated-device-update", "Update a isolated device", func(s *mcclient.ClientSession, args *DeviceUpdateOptions) error {
-		res := modules.IsolatedDevices.BatchUpdate(s, args.ID, jsonutils.Marshal(args))
-		printBatchResults(res, modules.IsolatedDevices.GetColumns(s))
-		return nil
-	})
+	cmd := shell.NewResourceCmd(&modules.IsolatedDevices)
+	cmd.List(&compute.DeviceListOptions{})
+	cmd.Update(&compute.DeviceUpdateOptions{})
+	cmd.Show(&compute.DeviceShowOptions{})
+	cmd.BatchDelete(&compute.DeviceDeleteOptions{})
 }

cmd/climc/shell/compute/loadbalanceracls.go

@@ -15,144 +15,21 @@
 package compute
 
 import (
-	"yunion.io/x/jsonutils"
-	"yunion.io/x/pkg/util/printutils"
-
-	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/cmd/climc/shell"
 	modules "yunion.io/x/onecloud/pkg/mcclient/modules/compute"
-	baseoptions "yunion.io/x/onecloud/pkg/mcclient/options"
 	options "yunion.io/x/onecloud/pkg/mcclient/options/compute"
 )
 
 func init() {
-	lbAclConvert := func(jd *jsonutils.JSONDict) error {
-		jaeso, err := jd.Get("acl_entries")
-		if err != nil {
-			return err
-		}
-		aclEntries := options.AclEntries{}
-		err = jaeso.Unmarshal(&aclEntries)
-		if err != nil {
-			return err
-		}
-		aclTextLines := aclEntries.String()
-		jd.Set("acl_entries", jsonutils.NewString(aclTextLines))
-		return nil
-	}
-
-	printLbAcl := func(jsonObj jsonutils.JSONObject) {
-		jd, ok := jsonObj.(*jsonutils.JSONDict)
-		if !ok {
-			printObject(jsonObj)
-			return
-		}
-		err := lbAclConvert(jd)
-		if err != nil {
-			printObject(jsonObj)
-			return
-		}
-		printObject(jd)
-	}
-	printLbAclList := func(list *printutils.ListResult, columns []string) {
-		data := list.Data
-		for _, jsonObj := range data {
-			jd := jsonObj.(*jsonutils.JSONDict)
-			err := lbAclConvert(jd)
-			if err != nil {
-				printList(list, columns)
-				return
-			}
-		}
-		printList(list, columns)
-	}
-
-	R(&options.LoadbalancerAclCreateOptions{}, "lbacl-create", "Create lbacl", func(s *mcclient.ClientSession, opts *options.LoadbalancerAclCreateOptions) error {
-		params, err := opts.Params()
-		if err != nil {
-			return err
-		}
-		lbacl, err := modules.LoadbalancerAcls.Create(s, params)
-		if err != nil {
-			return err
-		}
-		printLbAcl(lbacl)
-		return nil
-	})
-	R(&options.LoadbalancerAclGetOptions{}, "lbacl-show", "Show lbacl", func(s *mcclient.ClientSession, opts *options.LoadbalancerAclGetOptions) error {
-		lbacl, err := modules.LoadbalancerAcls.Get(s, opts.ID, nil)
-		if err != nil {
-			return err
-		}
-		printLbAcl(lbacl)
-		return nil
-	})
-	R(&options.LoadbalancerAclListOptions{}, "lbacl-list", "List lbacls", func(s *mcclient.ClientSession, opts *options.LoadbalancerAclListOptions) error {
-		params, err := baseoptions.ListStructToParams(opts)
-		if err != nil {
-			return err
-		}
-		result, err := modules.LoadbalancerAcls.List(s, params)
-		if err != nil {
-			return err
-		}
-		printLbAclList(result, modules.LoadbalancerAcls.GetColumns(s))
-		return nil
-	})
-	R(&options.LoadbalancerAclUpdateOptions{}, "lbacl-update", "Update lbacls", func(s *mcclient.ClientSession, opts *options.LoadbalancerAclUpdateOptions) error {
-		params, err := opts.Params()
-		if err != nil {
-			return err
-		}
-		lbacl, err := modules.LoadbalancerAcls.Update(s, opts.ID, params)
-		if err != nil {
-			return err
-		}
-		printLbAcl(lbacl)
-		return nil
-	})
-	R(&options.LoadbalancerAclDeleteOptions{}, "lbacl-purge", "Purge lbacl", func(s *mcclient.ClientSession, opts *options.LoadbalancerAclDeleteOptions) error {
-		lbacl, err := modules.LoadbalancerAcls.PerformAction(s, opts.ID, "purge", nil)
-		if err != nil {
-			return err
-		}
-		printLbAcl(lbacl)
-		return nil
-	})
-	R(&options.LoadbalancerAclDeleteOptions{}, "lbacl-delete", "Show lbacl", func(s *mcclient.ClientSession, opts *options.LoadbalancerAclDeleteOptions) error {
-		lbacl, err := modules.LoadbalancerAcls.Delete(s, opts.ID, nil)
-		if err != nil {
-			return err
-		}
-		printLbAcl(lbacl)
-		return nil
-	})
-	R(&options.LoadbalancerAclActionPatchOptions{}, "lbacl-patch", "Patch lbacls", func(s *mcclient.ClientSession, opts *options.LoadbalancerAclActionPatchOptions) error {
-		params, err := opts.Params()
-		if err != nil {
-			return err
-		}
-		lbacl, err := modules.LoadbalancerAcls.PerformAction(s, opts.ID, "patch", params)
-		if err != nil {
-			return err
-		}
-		printLbAcl(lbacl)
-		return nil
-	})
-	R(&options.LoadbalancerAclPublicOptions{}, "lbacl-public", "Public lbacl", func(s *mcclient.ClientSession, opts *options.LoadbalancerAclPublicOptions) error {
-		params := jsonutils.Marshal(opts)
-		lbacl, err := modules.LoadbalancerAcls.PerformAction(s, opts.ID, "public", params)
-		if err != nil {
-			return err
-		}
-		printLbAcl(lbacl)
-		return nil
-	})
-	R(&options.LoadbalancerAclPrivateOptions{}, "lbacl-private", "Private lbacl", func(s *mcclient.ClientSession, opts *options.LoadbalancerAclPrivateOptions) error {
-		lbacl, err := modules.LoadbalancerAcls.PerformAction(s, opts.ID, "private", nil)
-		if err != nil {
-			return err
-		}
-		printLbAcl(lbacl)
-		return nil
-	})
+	cmd := shell.NewResourceCmd(&modules.LoadbalancerAcls).WithKeyword("lbacl")
+	cmd.List(&options.LoadbalancerAclListOptions{})
+	cmd.Show(&options.LoadbalancerAclIdOptions{})
+	cmd.Create(&options.LoadbalancerAclCreateOptions{})
+	cmd.Delete(&options.LoadbalancerAclIdOptions{})
+	cmd.Update(&options.LoadbalancerAclUpdateOptions{})
+	cmd.Perform("purge", &options.LoadbalancerAclIdOptions{})
+	cmd.Perform("syncstatus", &options.LoadbalancerAclIdOptions{})
+	cmd.Perform("private", &options.LoadbalancerAclIdOptions{})
+	cmd.Perform("public", &options.LoadbalancerAclPublicOptions{})
+	cmd.Perform("patch", &options.LoadbalancerAclActionPatchOptions{})
 }

cmd/climc/shell/compute/loadbalancercachedacls.go

@@ -1,121 +0,0 @@
-// Copyright 2019 Yunion
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package compute
-
-import (
-	"yunion.io/x/jsonutils"
-	"yunion.io/x/pkg/util/printutils"
-
-	"yunion.io/x/onecloud/pkg/mcclient"
-	modules "yunion.io/x/onecloud/pkg/mcclient/modules/compute"
-	options "yunion.io/x/onecloud/pkg/mcclient/options/compute"
-)
-
-func init() {
-	lbAclConvert := func(jd *jsonutils.JSONDict) error {
-		jaeso, err := jd.Get("acl_entries")
-		if err != nil {
-			return err
-		}
-		aclEntries := options.AclEntries{}
-		err = jaeso.Unmarshal(&aclEntries)
-		if err != nil {
-			return err
-		}
-		aclTextLines := aclEntries.String()
-		jd.Set("acl_entries", jsonutils.NewString(aclTextLines))
-		return nil
-	}
-
-	printLbAcl := func(jsonObj jsonutils.JSONObject) {
-		jd, ok := jsonObj.(*jsonutils.JSONDict)
-		if !ok {
-			printObject(jsonObj)
-			return
-		}
-		err := lbAclConvert(jd)
-		if err != nil {
-			printObject(jsonObj)
-			return
-		}
-		printObject(jd)
-	}
-	printLbAclList := func(list *printutils.ListResult, columns []string) {
-		data := list.Data
-		for _, jsonObj := range data {
-			jd := jsonObj.(*jsonutils.JSONDict)
-			err := lbAclConvert(jd)
-			if err != nil {
-				printList(list, columns)
-				return
-			}
-		}
-		printList(list, columns)
-	}
-
-	R(&options.LoadbalancerAclGetOptions{}, "lbacl-cache-show", "Show cached lbacl", func(s *mcclient.ClientSession, opts *options.LoadbalancerAclGetOptions) error {
-		lbacl, err := modules.LoadbalancerCachedAcls.Get(s, opts.ID, nil)
-		if err != nil {
-			return err
-		}
-		printLbAcl(lbacl)
-		return nil
-	})
-
-	R(&options.CachedLoadbalancerAclListOptions{}, "lbacl-cache-list", "List cached lbacls", func(s *mcclient.ClientSession, opts *options.CachedLoadbalancerAclListOptions) error {
-		params, err := opts.Params()
-		if err != nil {
-			return err
-		}
-		result, err := modules.LoadbalancerCachedAcls.List(s, params)
-		if err != nil {
-			return err
-		}
-		printLbAclList(result, modules.LoadbalancerCachedAcls.GetColumns(s))
-		return nil
-	})
-
-	R(&options.LoadbalancerCachedAclCreateOptions{}, "lbacl-cache-create", "Create cached lbacl", func(s *mcclient.ClientSession, opts *options.LoadbalancerCachedAclCreateOptions) error {
-		params, err := opts.Params()
-		if err != nil {
-			return err
-		}
-
-		lbacl, err := modules.LoadbalancerCachedAcls.Create(s, params)
-		if err != nil {
-			return err
-		}
-
-		printObject(lbacl)
-		return nil
-	})
-
-	R(&options.LoadbalancerAclDeleteOptions{}, "lbacl-cache-purge", "Purge cached lbacl", func(s *mcclient.ClientSession, opts *options.LoadbalancerAclDeleteOptions) error {
-		lbacl, err := modules.LoadbalancerCachedAcls.PerformAction(s, opts.ID, "purge", nil)
-		if err != nil {
-			return err
-		}
-		printLbAcl(lbacl)
-		return nil
-	})
-	R(&options.LoadbalancerAclDeleteOptions{}, "lbacl-cache-delete", "Delete cached lbacl", func(s *mcclient.ClientSession, opts *options.LoadbalancerAclDeleteOptions) error {
-		lbacl, err := modules.LoadbalancerCachedAcls.Delete(s, opts.ID, nil)
-		if err != nil {
-			return err
-		}
-		printLbAcl(lbacl)
-		return nil
-	})
-}

cmd/climc/shell/compute/loadbalancercachedcertificates.go

@@ -1,77 +0,0 @@
-// Copyright 2019 Yunion
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package compute
-
-import (
-	"yunion.io/x/onecloud/pkg/mcclient"
-	modules "yunion.io/x/onecloud/pkg/mcclient/modules/compute"
-	options "yunion.io/x/onecloud/pkg/mcclient/options/compute"
-)
-
-func init() {
-	R(&options.LoadbalancerCertificateGetOptions{}, "lbcert-cache-show", "Show cached lbcert", func(s *mcclient.ClientSession, opts *options.LoadbalancerCertificateGetOptions) error {
-		lbcert, err := modules.LoadbalancerCachedCertificates.Get(s, opts.ID, nil)
-		if err != nil {
-			return err
-		}
-		printObject(lbcert)
-		return nil
-	})
-
-	R(&options.LoadbalancerCachedCertificateListOptions{}, "lbcert-cache-list", "List cached lbcerts", func(s *mcclient.ClientSession, opts *options.LoadbalancerCachedCertificateListOptions) error {
-		params, err := opts.Params()
-		if err != nil {
-			return err
-		}
-		result, err := modules.LoadbalancerCachedCertificates.List(s, params)
-		if err != nil {
-			return err
-		}
-		printList(result, modules.LoadbalancerCachedCertificates.GetColumns(s))
-		return nil
-	})
-
-	R(&options.LoadbalancerCachedCertificateCreateOptions{}, "lbcert-cache-create", "Create cached lbcert", func(s *mcclient.ClientSession, opts *options.LoadbalancerCachedCertificateCreateOptions) error {
-		params, err := opts.Params()
-		if err != nil {
-			return err
-		}
-
-		lbcert, err := modules.LoadbalancerCachedCertificates.Create(s, params)
-		if err != nil {
-			return err
-		}
-
-		printObject(lbcert)
-		return nil
-	})
-
-	R(&options.LoadbalancerCertificateDeleteOptions{}, "lbcert-cache-delete", "Delete cached lbcert", func(s *mcclient.ClientSession, opts *options.LoadbalancerCertificateDeleteOptions) error {
-		lbcert, err := modules.LoadbalancerCachedCertificates.Delete(s, opts.ID, nil)
-		if err != nil {
-			return err
-		}
-		printObject(lbcert)
-		return nil
-	})
-	R(&options.LoadbalancerCertificateDeleteOptions{}, "lbcert-cache-purge", "Purge cached lbcert", func(s *mcclient.ClientSession, opts *options.LoadbalancerCertificateDeleteOptions) error {
-		lbcert, err := modules.LoadbalancerCachedCertificates.PerformAction(s, opts.ID, "purge", nil)
-		if err != nil {
-			return err
-		}
-		printObject(lbcert)
-		return nil
-	})
-}

cmd/climc/shell/compute/loadbalancercertificates.go

@@ -15,81 +15,19 @@
 package compute
 
 import (
-	"yunion.io/x/jsonutils"
-
-	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/cmd/climc/shell"
 	modules "yunion.io/x/onecloud/pkg/mcclient/modules/compute"
 	options "yunion.io/x/onecloud/pkg/mcclient/options/compute"
 )
 
 func init() {
-	R(&options.LoadbalancerCertificateCreateOptions{}, "lbcert-create", "Create lbcert", func(s *mcclient.ClientSession, opts *options.LoadbalancerCertificateCreateOptions) error {
-		params, err := opts.Params()
-		if err != nil {
-			return err
-		}
-		lbcert, err := modules.LoadbalancerCertificates.Create(s, params)
-		if err != nil {
-			return err
-		}
-		printObject(lbcert)
-		return nil
-	})
-	R(&options.LoadbalancerCertificateGetOptions{}, "lbcert-show", "Show lbcert", func(s *mcclient.ClientSession, opts *options.LoadbalancerCertificateGetOptions) error {
-		lbcert, err := modules.LoadbalancerCertificates.Get(s, opts.ID, nil)
-		if err != nil {
-			return err
-		}
-		printObject(lbcert)
-		return nil
-	})
-	R(&options.LoadbalancerCertificateListOptions{}, "lbcert-list", "List lbcerts", func(s *mcclient.ClientSession, opts *options.LoadbalancerCertificateListOptions) error {
-		params, err := opts.Params()
-		if err != nil {
-			return err
-		}
-		result, err := modules.LoadbalancerCertificates.List(s, params)
-		if err != nil {
-			return err
-		}
-		printList(result, modules.LoadbalancerCertificates.GetColumns(s))
-		return nil
-	})
-	R(&options.LoadbalancerCertificateUpdateOptions{}, "lbcert-update", "Update lbcert", func(s *mcclient.ClientSession, opts *options.LoadbalancerCertificateUpdateOptions) error {
-		params, err := opts.Params()
-		if err != nil {
-			return err
-		}
-		lbcert, err := modules.LoadbalancerCertificates.Update(s, opts.ID, params)
-		if err != nil {
-			return err
-		}
-		printObject(lbcert)
-		return nil
-	})
-	R(&options.LoadbalancerCertificateDeleteOptions{}, "lbcert-delete", "Delete lbcert", func(s *mcclient.ClientSession, opts *options.LoadbalancerCertificateDeleteOptions) error {
-		lbcert, err := modules.LoadbalancerCertificates.Delete(s, opts.ID, nil)
-		if err != nil {
-			return err
-		}
-		printObject(lbcert)
-		return nil
-	})
-	R(&options.LoadbalancerCertificatePublicOptions{}, "lbcert-public", "Public lbcert", func(s *mcclient.ClientSession, opts *options.LoadbalancerCertificatePublicOptions) error {
-		params := jsonutils.Marshal(opts)
-		lbcert, err := modules.LoadbalancerCertificates.PerformAction(s, opts.ID, "public", params)
-		if err != nil {
-			return err
-		}
-		printObject(lbcert)
-		return nil
-	})
-	R(&options.LoadbalancerCertificatePrivateOptions{}, "lbcert-private", "Private lbcert", func(s *mcclient.ClientSession, opts *options.LoadbalancerCertificatePrivateOptions) error {
-		lbcert, err := modules.LoadbalancerCertificates.PerformAction(s, opts.ID, "private", nil)
-		if err != nil {
-			return err
-		}
-		printObject(lbcert)
-		return nil
-	})
+	cmd := shell.NewResourceCmd(&modules.LoadbalancerCertificates).WithKeyword("lbcert")
+	cmd.Create(&options.LoadbalancerCertificateCreateOptions{})
+	cmd.Show(&options.LoadbalancerCertificateIdOptions{})
+	cmd.Delete(&options.LoadbalancerCertificateIdOptions{})
+	cmd.List(&options.LoadbalancerCertificateListOptions{})
+	cmd.Update(&options.LoadbalancerCertificateUpdateOptions{})
+	cmd.Perform("public", &options.LoadbalancerCertificatePublicOptions{})
+	cmd.Perform("private", &options.LoadbalancerCertificateIdOptions{})
+	cmd.Perform("syncstatus", &options.LoadbalancerCertificateIdOptions{})
 }

cmd/climc/shell/compute/network_ip_mac.go

@@ -1,3 +1,17 @@
+// 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 (

cmd/climc/shell/compute/networkaddresses.go

@@ -17,7 +17,7 @@ package compute
 import (
 	"yunion.io/x/onecloud/cmd/climc/shell"
 	modules "yunion.io/x/onecloud/pkg/mcclient/modules/compute"
-	"yunion.io/x/onecloud/pkg/mcclient/options"
+	options "yunion.io/x/onecloud/pkg/mcclient/options/compute"
 )
 
 func init() {

cmd/climc/shell/compute/networks.go

@@ -26,12 +26,14 @@ import (
 	modules "yunion.io/x/onecloud/pkg/mcclient/modules/compute"
 	"yunion.io/x/onecloud/pkg/mcclient/options"
 	compute_options "yunion.io/x/onecloud/pkg/mcclient/options/compute"
+	"yunion.io/x/onecloud/pkg/util/netutils2"
 )
 
 func init() {
 
 	cmd := shell.NewResourceCmd(&modules.Networks).WithContextManager(&modules.Wires)
 	cmd.List(&compute_options.NetworkListOptions{})
+	cmd.Create(&compute_options.NetworkCreateOptions{})
 	cmd.Update(&compute_options.NetworkUpdateOptions{})
 	cmd.Show(&compute_options.NetworkIdOptions{})
 	cmd.Delete(&compute_options.NetworkIdOptions{})
@@ -43,6 +45,8 @@ func init() {
 	cmd.Get("change-owner-candidate-domains", &compute_options.NetworkIdOptions{})
 	cmd.Perform("set-class-metadata", &options.ResourceMetadataOptions{})
 	cmd.Perform("switch-wire", &compute_options.NetworkSwitchWireOptions{})
+	cmd.Perform("sync-additional-wires", &compute_options.NetworkSyncAdditionalWiresOptions{})
+	cmd.Get("available-addresses", &compute_options.NetworkIdOptions{})
 
 	type NetworkShareOptions struct {
 		ID             string   `help:"ID or Name of the zone to show"`
@@ -60,65 +64,15 @@ func init() {
 		return nil
 	})
 
-	type NetworkCreateOptions struct {
-		WIRE        string `help:"ID or Name of wire in which the network is created"`
-		NETWORK     string `help:"Name of new network"`
-		STARTIP     string `help:"Start of IPv4 address range"`
-		ENDIP       string `help:"End of IPv4 address rnage"`
-		NETMASK     int64  `help:"Length of network mask"`
-		Gateway     string `help:"Default gateway"`
-		VlanId      int64  `help:"Vlan ID" default:"1"`
-		IfnameHint  string `help:"Hint for ifname generation"`
-		AllocPolicy string `help:"Address allocation policy" choices:"none|stepdown|stepup|random"`
-		ServerType  string `help:"Server type" choices:"baremetal|container|eip|guest|ipmi|pxe"`
-		IsAutoAlloc *bool  `help:"Auto allocation IP pool"`
-		BgpType     string `help:"Internet service provider name" positional:"false"`
-		Desc        string `help:"Description" metavar:"DESCRIPTION"`
-	}
-	R(&NetworkCreateOptions{}, "network-create", "Create a virtual network", func(s *mcclient.ClientSession, args *NetworkCreateOptions) error {
-		params := jsonutils.NewDict()
-		params.Add(jsonutils.NewString(args.NETWORK), "name")
-		params.Add(jsonutils.NewString(args.STARTIP), "guest_ip_start")
-		params.Add(jsonutils.NewString(args.ENDIP), "guest_ip_end")
-		params.Add(jsonutils.NewInt(args.NETMASK), "guest_ip_mask")
-		if len(args.Gateway) > 0 {
-			params.Add(jsonutils.NewString(args.Gateway), "guest_gateway")
-		}
-		if args.VlanId > 0 {
-			params.Add(jsonutils.NewInt(args.VlanId), "vlan_id")
-		}
-		if len(args.ServerType) > 0 {
-			params.Add(jsonutils.NewString(args.ServerType), "server_type")
-		}
-		if len(args.IfnameHint) > 0 {
-			params.Add(jsonutils.NewString(args.IfnameHint), "ifname_hint")
-		}
-		if len(args.AllocPolicy) > 0 {
-			params.Add(jsonutils.NewString(args.AllocPolicy), "alloc_policy")
-		}
-		if len(args.Desc) > 0 {
-			params.Add(jsonutils.NewString(args.Desc), "description")
-		}
-		if len(args.BgpType) > 0 {
-			params.Add(jsonutils.NewString(args.BgpType), "bgp_type")
-		}
-		if args.IsAutoAlloc != nil {
-			params.Add(jsonutils.NewBool(*args.IsAutoAlloc), "is_auto_alloc")
-		}
-		net, e := modules.Networks.CreateInContext(s, params, &modules.Wires, args.WIRE)
-		if e != nil {
-			return e
-		}
-		printObject(net)
-		return nil
-	})
-
 	type NetworkCreateOptions2 struct {
-		Wire           string `help:"ID or Name of wire in which the network is created"`
-		Vpc            string `help:"ID or Name of vpc in which the network is created"`
-		Zone           string `help:"ID or Name of zone in which the network is created"`
-		NAME           string `help:"Name of new network"`
-		PREFIX         string `help:"Start of IPv4 address range"`
+		Wire   string `help:"ID or Name of wire in which the network is created"`
+		Vpc    string `help:"ID or Name of vpc in which the network is created"`
+		Zone   string `help:"ID or Name of zone in which the network is created"`
+		NAME   string `help:"Name of new network"`
+		PREFIX string `help:"IPv4 prefix"`
+
+		Prefix6 string `help:"IPv6 prefix"`
+
 		BgpType        string `help:"Internet service provider name" positional:"false"`
 		AssignPublicIp bool
 		Desc           string `help:"Description" metavar:"DESCRIPTION"`
@@ -127,6 +81,11 @@ func init() {
 		params := jsonutils.NewDict()
 		params.Add(jsonutils.NewString(args.NAME), "name")
 		params.Add(jsonutils.NewString(args.PREFIX), "guest_ip_prefix")
+
+		if len(args.Prefix6) > 0 {
+			params.Add(jsonutils.NewString(args.Prefix6), "guest_ip6_prefix")
+		}
+
 		params.Set("assign_public_ip", jsonutils.NewBool(args.AssignPublicIp))
 		if len(args.BgpType) > 0 {
 			params.Add(jsonutils.NewString(args.BgpType), "bgp_type")
@@ -282,4 +241,21 @@ func init() {
 		printObject(net)
 		return nil
 	})
+	type NetworkInterfaceInfoOptions struct {
+		DEV string `help:"name of device, e.g. eth0"`
+	}
+	R(&NetworkInterfaceInfoOptions{}, "network-interface-info", "Show addr and routes of interface", func(s *mcclient.ClientSession, args *NetworkInterfaceInfoOptions) error {
+		netIf := netutils2.NewNetInterface(args.DEV)
+
+		fmt.Println("[Slave Addresses]")
+		for _, addr := range netIf.GetSlaveAddresses() {
+			fmt.Printf("%s/%s\n", addr[0], addr[1])
+		}
+		fmt.Println("[Routes]")
+		for _, r := range netIf.GetRouteSpecs() {
+			fmt.Printf("%s via %s dev %d\n", r.Dst.String(), r.Gw.String(), r.LinkIndex)
+		}
+
+		return nil
+	})
 }

cmd/climc/shell/compute/routetable_association.go

@@ -17,7 +17,7 @@ package compute
 import (
 	"yunion.io/x/onecloud/cmd/climc/shell"
 	modules "yunion.io/x/onecloud/pkg/mcclient/modules/compute"
-	"yunion.io/x/onecloud/pkg/mcclient/options"
+	options "yunion.io/x/onecloud/pkg/mcclient/options/compute"
 )
 
 func init() {

cmd/climc/shell/compute/routetable_routeset.go

@@ -17,7 +17,7 @@ package compute
 import (
 	"yunion.io/x/onecloud/cmd/climc/shell"
 	modules "yunion.io/x/onecloud/pkg/mcclient/modules/compute"
-	"yunion.io/x/onecloud/pkg/mcclient/options"
+	options "yunion.io/x/onecloud/pkg/mcclient/options/compute"
 )
 
 func init() {

cmd/climc/shell/compute/routetables.go

@@ -17,7 +17,7 @@ package compute
 import (
 	"yunion.io/x/onecloud/cmd/climc/shell"
 	modules "yunion.io/x/onecloud/pkg/mcclient/modules/compute"
-	"yunion.io/x/onecloud/pkg/mcclient/options"
+	options "yunion.io/x/onecloud/pkg/mcclient/options/compute"
 )
 
 func init() {

cmd/climc/shell/compute/schedtagresources.go

@@ -22,7 +22,7 @@ import (
 	"yunion.io/x/onecloud/pkg/mcclient"
 	"yunion.io/x/onecloud/pkg/mcclient/modulebase"
 	modules "yunion.io/x/onecloud/pkg/mcclient/modules/compute"
-	"yunion.io/x/onecloud/pkg/mcclient/options"
+	options "yunion.io/x/onecloud/pkg/mcclient/options/compute"
 )
 
 type schedtagModelHelper struct {

cmd/climc/shell/compute/schedtags.go

@@ -17,7 +17,8 @@ package compute
 import (
 	"yunion.io/x/onecloud/cmd/climc/shell"
 	modules "yunion.io/x/onecloud/pkg/mcclient/modules/compute"
-	"yunion.io/x/onecloud/pkg/mcclient/options"
+	baseoptions "yunion.io/x/onecloud/pkg/mcclient/options"
+	options "yunion.io/x/onecloud/pkg/mcclient/options/compute"
 )
 
 func init() {
@@ -29,6 +30,6 @@ func init() {
 	cmd.Create(new(options.SchedtagCreateOptions))
 	cmd.Update(new(options.SchedtagUpdateOptions))
 	cmd.BatchPerform("set-scope", new(options.SchedtagSetScopeOptions))
-	cmd.PerformWithKeyword("set-user-metadata", "user-metadata", new(options.ResourceMetadataOptions))
+	cmd.PerformWithKeyword("set-user-metadata", "user-metadata", new(baseoptions.ResourceMetadataOptions))
 	cmd.Perform("set-resource", new(options.SchedtagSetResource))
 }

cmd/climc/shell/compute/secgroups.go

@@ -17,7 +17,8 @@ package compute
 import (
 	"yunion.io/x/onecloud/cmd/climc/shell"
 	modules "yunion.io/x/onecloud/pkg/mcclient/modules/compute"
-	"yunion.io/x/onecloud/pkg/mcclient/options"
+	baseoptions "yunion.io/x/onecloud/pkg/mcclient/options"
+	options "yunion.io/x/onecloud/pkg/mcclient/options/compute"
 )
 
 func init() {
@@ -25,15 +26,13 @@ func init() {
 	cmd.List(&options.SecgroupListOptions{})
 	cmd.Create(&options.SecgroupCreateOptions{})
 	cmd.Show(&options.SecgroupIdOptions{})
-	cmd.Update(&options.BaseUpdateOptions{})
+	cmd.Update(&baseoptions.BaseUpdateOptions{})
 	cmd.Delete(&options.SecgroupIdOptions{})
-	cmd.Perform("merge", &options.SecgroupMergeOptions{})
 	cmd.Perform("public", &options.SecgroupIdOptions{})
+	cmd.Perform("syncstatus", &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.Perform("import-rules", &options.SecgroupImportRulesOptions{})
+	cmd.PerformClass("clean", &options.SecgroupCleanOptions{})
 }

cmd/climc/shell/compute/server_pod.go

@@ -15,16 +15,27 @@
 package compute
 
 import (
-	"yunion.io/x/onecloud/cmd/climc/shell"
+	"yunion.io/x/onecloud/pkg/mcclient"
 	modules "yunion.io/x/onecloud/pkg/mcclient/modules/compute"
-	"yunion.io/x/onecloud/pkg/mcclient/options/compute"
+	options "yunion.io/x/onecloud/pkg/mcclient/options/compute"
 )
 
 func init() {
-	cmd := shell.NewResourceCmd(&modules.SecGroupCaches).WithKeyword("secgroup-cache")
-	cmd.List(&compute.SecGroupCacheListOptions{})
-	cmd.Show(&compute.SecGroupCacheIdOptions{})
-	cmd.Delete(&compute.SecGroupCacheIdOptions{})
-	cmd.Perform("syncstatus", &compute.SecGroupCacheIdOptions{})
-	cmd.Get("references", &compute.SecGroupCacheIdOptions{})
+	R(&options.PodCreateOptions{}, "pod-create", "Create a container pod", func(s *mcclient.ClientSession, opts *options.PodCreateOptions) error {
+		params, err := opts.Params()
+		if err != nil {
+			return err
+		}
+		if opts.Count > 1 {
+			results := modules.Servers.BatchCreate(s, params.JSON(params), opts.Count)
+			printBatchResults(results, modules.Servers.GetColumns(s))
+		} else {
+			server, err := modules.Servers.Create(s, params.JSON(params))
+			if err != nil {
+				return err
+			}
+			printObject(server)
+		}
+		return nil
+	})
 }

cmd/climc/shell/compute/servernetworks.go

@@ -94,6 +94,7 @@ func init() {
 		Driver  string `help:"Driver model of vNIC" choices:"virtio|e1000|vmxnet3|rtl8139"`
 		Index   int64  `help:"Index of NIC" default:"-1"`
 		Ifname  string `help:"Interface name of vNIC on host"`
+		Default bool   `help:"is default nic?"`
 	}
 	R(&ServerNetworkUpdateOptions{}, "server-network-update", "Update server network settings", func(s *mcclient.ClientSession, args *ServerNetworkUpdateOptions) error {
 		params := jsonutils.NewDict()
@@ -106,6 +107,9 @@ func init() {
 		if len(args.Ifname) > 0 {
 			params.Add(jsonutils.NewString(args.Ifname), "ifname")
 		}
+		if args.Default {
+			params.Add(jsonutils.JSONTrue, "is_default")
+		}
 		if params.Size() == 0 {
 			return InvalidUpdateError()
 		}
@@ -176,6 +180,7 @@ func init() {
 		SERVER  string `help:"ID or Name of server"`
 		MACORIP string `help:"Mac Or IP of NIC"`
 		Reserve bool   `help:"Put the release IP address into reserved address pool"`
+		Force   bool   `help:"detach server network by force"`
 	}
 	R(&ServerDetachNetworkOptions{}, "server-detach-network", "Detach the virtual network fron a virtual server", func(s *mcclient.ClientSession, args *ServerDetachNetworkOptions) error {
 		params := jsonutils.NewDict()
@@ -183,6 +188,9 @@ func init() {
 		if args.Reserve {
 			params.Add(jsonutils.JSONTrue, "reserve")
 		}
+		if args.Force {
+			params.Add(jsonutils.JSONTrue, "force")
+		}
 		if regutils.MatchMacAddr(args.MACORIP) {
 			params.Add(jsonutils.NewString(args.MACORIP), "mac")
 		} else if regutils.MatchIP4Addr(args.MACORIP) {

cmd/climc/shell/compute/servers.go

@@ -115,11 +115,19 @@ func init() {
 	cmd.Perform("qga-set-password", &options.ServerQgaSetPassword{})
 	cmd.Perform("qga-command", &options.ServerQgaCommand{})
 	cmd.Perform("qga-ping", &options.ServerQgaPing{})
+	cmd.Perform("qga-guest-info-task", &options.ServerQgaGuestInfoTask{})
+	cmd.Perform("qga-get-network", &options.ServerQgaGetNetwork{})
 	cmd.Perform("set-password", &options.ServerSetPasswordOptions{})
 	cmd.Perform("set-boot-index", &options.ServerSetBootIndexOptions{})
 	cmd.Perform("reset-nic-traffic-limit", &options.ServerNicTrafficLimitOptions{})
 	cmd.Perform("set-nic-traffic-limit", &options.ServerNicTrafficLimitOptions{})
 	cmd.Perform("add-sub-ips", &options.ServerAddSubIpsOptions{})
+	cmd.Perform("update-sub-ips", &options.ServerUpdateSubIpsOptions{})
+	cmd.BatchPerform("set-os-info", &options.ServerSetOSInfoOptions{})
+	cmd.BatchPerform("start-rescue", &options.ServerStartOptions{})
+	cmd.BatchPerform("stop-rescue", &options.ServerStartOptions{})
+	cmd.BatchPerform("sync-os-info", &options.ServerIdsOptions{})
+	cmd.BatchPerform("set-root-disk-matcher", &options.ServerSetRootDiskMatcher{})
 
 	cmd.Get("vnc", new(options.ServerVncOptions))
 	cmd.Get("desc", new(options.ServerIdOptions))
@@ -133,6 +141,7 @@ func init() {
 	cmd.Get("cpuset-cores", new(options.ServerIdOptions))
 	cmd.Get("sshport", new(options.ServerIdOptions))
 	cmd.Get("qemu-info", new(options.ServerIdOptions))
+	cmd.Get("hardware-info", new(options.ServerIdOptions))
 
 	cmd.GetProperty(&options.ServerStatusStatisticsOptions{})
 	cmd.GetProperty(&options.ServerProjectStatisticsOptions{})
@@ -299,11 +308,6 @@ func init() {
 	})
 
 	R(&options.ServerLoginInfoOptions{}, "server-logininfo", "Get login info of a server", func(s *mcclient.ClientSession, opts *options.ServerLoginInfoOptions) error {
-		srvid, e := modules.Servers.GetId(s, opts.ID, nil)
-		if e != nil {
-			return e
-		}
-
 		params := jsonutils.NewDict()
 		if len(opts.Key) > 0 {
 			privateKey, e := ioutil.ReadFile(opts.Key)
@@ -313,7 +317,7 @@ func init() {
 			params.Add(jsonutils.NewString(string(privateKey)), "private_key")
 		}
 
-		i, e := modules.Servers.GetLoginInfo(s, srvid, params)
+		i, e := modules.Servers.PerformAction(s, opts.ID, "login-info", params)
 		if e != nil {
 			return e
 		}
@@ -865,7 +869,7 @@ func init() {
 			privateKey = string(key)
 		}
 
-		i, e := modules.Servers.GetLoginInfo(s, srvid, params)
+		i, e := modules.Servers.PerformAction(s, srvid, "login-info", params)
 		if e != nil {
 			return e
 		}

cmd/climc/shell/compute/skus.go

@@ -17,7 +17,7 @@ package compute
 import (
 	"yunion.io/x/onecloud/cmd/climc/shell"
 	modules "yunion.io/x/onecloud/pkg/mcclient/modules/compute"
-	"yunion.io/x/onecloud/pkg/mcclient/options"
+	options "yunion.io/x/onecloud/pkg/mcclient/options/compute"
 )
 
 func init() {

cmd/climc/shell/compute/snapshot_policy.go

@@ -15,112 +15,18 @@
 package compute
 
 import (
-	"yunion.io/x/jsonutils"
-
-	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/cmd/climc/shell"
 	modules "yunion.io/x/onecloud/pkg/mcclient/modules/compute"
 	"yunion.io/x/onecloud/pkg/mcclient/options"
+	"yunion.io/x/onecloud/pkg/mcclient/options/compute"
 )
 
 func init() {
-	type SnapshotPolicyListOptions struct {
-		options.BaseListOptions
-
-		OrderByBindDiskCount string
-	}
-	R(&SnapshotPolicyListOptions{}, "snapshot-policy-list", "List snapshot policy", func(s *mcclient.ClientSession, args *SnapshotPolicyListOptions) error {
-		params, err := options.ListStructToParams(args)
-		if err != nil {
-			return err
-		}
-		result, err := modules.SnapshotPoliciy.List(s, params)
-		if err != nil {
-			return err
-		}
-		printList(result, modules.SnapshotPoliciy.GetColumns(s))
-		return nil
-	})
-
-	type SnapshotPolicyDeleteOptions struct {
-		ID string `help:"Delete snapshot id"`
-	}
-	R(&SnapshotPolicyDeleteOptions{}, "snapshot-policy-delete", "Delete snapshot policy", func(s *mcclient.ClientSession, args *SnapshotPolicyDeleteOptions) error {
-		result, err := modules.SnapshotPoliciy.Delete(s, args.ID, nil)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
-	type SnapshotPolicyCreateOptions struct {
-		NAME string
-
-		RetentionDays  int   `help:"snapshot retention days"`
-		RepeatWeekdays []int `help:"snapshot create days on week"`
-		TimePoints     []int `help:"snapshot create time points on one day"`
-	}
-
-	R(&SnapshotPolicyCreateOptions{}, "snapshot-policy-create", "Create snapshot policy", func(s *mcclient.ClientSession, args *SnapshotPolicyCreateOptions) error {
-		params := jsonutils.Marshal(args).(*jsonutils.JSONDict)
-		snapshot, err := modules.SnapshotPoliciy.Create(s, params)
-		if err != nil {
-			return err
-		}
-		printObject(snapshot)
-		return nil
-	})
-
-	type SnapshotPolicyBindDisksOptions struct {
-		ID   string   `help:"ID"`
-		Disk []string `help:"ids of disk"`
-	}
-
-	R(&SnapshotPolicyBindDisksOptions{}, "snapshot-policy-bind-disk", "bind snapshotpolicy to disks",
-		func(s *mcclient.ClientSession, opts *SnapshotPolicyBindDisksOptions) error {
-			params, err := options.StructToParams(opts)
-			if err != nil {
-				return err
-			}
-			sp, err := modules.SnapshotPoliciy.PerformAction(s, opts.ID, "bind-disks", params)
-			if err != nil {
-				return err
-			}
-			printObject(sp)
-			return nil
-		})
-
-	R(&SnapshotPolicyBindDisksOptions{}, "snapshot-policy-unbind-disk", "bind snapshotpolicy to disks",
-		func(s *mcclient.ClientSession, opts *SnapshotPolicyBindDisksOptions) error {
-			params, err := options.StructToParams(opts)
-			if err != nil {
-				return err
-			}
-			sp, err := modules.SnapshotPoliciy.PerformAction(s, opts.ID, "unbind-disks", params)
-			if err != nil {
-				return err
-			}
-			printObject(sp)
-			return nil
-		})
-
-	type SnapshotPolicyCacheOptions struct {
-		ID       string `help:"SnasphotPolicy ID"`
-		REGIONID string `help:"Region ID"`
-		PROVIDER string `help:"Provider ID"`
-	}
-	R(&SnapshotPolicyCacheOptions{}, "snapshot-policy-cache", "upload local snapshotpolicy to cloud",
-		func(s *mcclient.ClientSession, opts *SnapshotPolicyCacheOptions) error {
-			params, err := options.StructToParams(opts)
-			if err != nil {
-				return err
-			}
-			sp, err := modules.SnapshotPoliciy.PerformAction(s, opts.ID, "cache", params)
-			if err != nil {
-				return err
-			}
-			printObject(sp)
-			return nil
-		},
-	)
+	cmd := shell.NewResourceCmd(&modules.SnapshotPoliciy).WithKeyword("snapshot-policy")
+	cmd.List(&compute.SnapshotPolicyListOptions{})
+	cmd.Delete(&options.BaseIdOptions{})
+	cmd.Create(&compute.SnapshotPolicyCreateOptions{})
+	cmd.Perform("bind-disks", &compute.SnapshotPolicyDisksOptions{})
+	cmd.Perform("unbind-disks", &compute.SnapshotPolicyDisksOptions{})
+	cmd.Perform("syncstatus", &options.BaseIdOptions{})
 }

cmd/climc/shell/compute/snapshotpolicy_disk.go

@@ -1,80 +0,0 @@
-// Copyright 2019 Yunion
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package compute
-
-import (
-	"yunion.io/x/jsonutils"
-
-	"yunion.io/x/onecloud/pkg/mcclient"
-	modules "yunion.io/x/onecloud/pkg/mcclient/modules/compute"
-)
-
-func init() {
-	type SSnapshotpolicyDiskListOfDiskOption struct {
-		DISKID string `help:"disk id"`
-	}
-	R(&SSnapshotpolicyDiskListOfDiskOption{}, "disk-snapshot-policy-list", "List snapshot policy attached",
-		func(s *mcclient.ClientSession, opts *SSnapshotpolicyDiskListOfDiskOption) error {
-			result, err := modules.SnapshotPolicyDisk.ListDescendent(s, opts.DISKID, jsonutils.NewDict())
-			if err != nil {
-				return err
-			}
-			printList(result, modules.SnapshotPolicyDisk.GetColumns(s))
-			return nil
-		},
-	)
-
-	type SSnapshotpolicyDiskListOfSnapshotpolicyOption struct {
-		SNAPSHOTPOLICYID string `help:"snapshot policy id"`
-	}
-	R(&SSnapshotpolicyDiskListOfSnapshotpolicyOption{}, "snapshot-policy-disk-list", "List disk attached",
-		func(s *mcclient.ClientSession, opts *SSnapshotpolicyDiskListOfSnapshotpolicyOption) error {
-			result, err := modules.SnapshotPolicyDisk.ListDescendent2(s, opts.SNAPSHOTPOLICYID, jsonutils.NewDict())
-			if err != nil {
-				return err
-			}
-			printList(result, modules.SnapshotPolicyDisk.GetColumns(s))
-			return nil
-		},
-	)
-
-	type SSnapshotpolicyDiskAttachOption struct {
-		DISKID           string `help:"disk id"`
-		SNAPSHOTPOLICYID string `help:"snapshot policy id"`
-	}
-	R(&SSnapshotpolicyDiskAttachOption{}, "disk-snapshot-policy-attach", "attach snapshot policy to disk",
-		func(s *mcclient.ClientSession, opts *SSnapshotpolicyDiskAttachOption) error {
-			_, err := modules.SnapshotPolicyDisk.Attach(s, opts.DISKID, opts.SNAPSHOTPOLICYID, jsonutils.NewDict())
-			if err != nil {
-				return err
-			}
-			return nil
-		},
-	)
-
-	type SSnapshotpolicyDiskDetachOption struct {
-		DISKID           string `help:"disk id"`
-		SNAPSHOTPOLICYID string `help:"snapshot policy id"`
-	}
-	R(&SSnapshotpolicyDiskDetachOption{}, "disk-snapshot-policy-detach", "detach snapshot policy to disk",
-		func(s *mcclient.ClientSession, opts *SSnapshotpolicyDiskDetachOption) error {
-			_, err := modules.SnapshotPolicyDisk.Detach(s, opts.DISKID, opts.SNAPSHOTPOLICYID, jsonutils.NewDict())
-			if err != nil {
-				return err
-			}
-			return nil
-		},
-	)
-}

cmd/climc/shell/compute/snapshots.go

@@ -32,6 +32,7 @@ func init() {
 		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"`
+		Unused      bool
 
 		OrderByGuest    string
 		OrderByDiskName string

cmd/climc/shell/compute/specs.go

@@ -131,7 +131,7 @@ func init() {
 			return err
 		}
 		data := &printutils.ListResult{Data: hosts, Total: len(hosts)}
-		printList(data, []string{"ID", "Name", "Mem", "CPU", "Storage_Info"})
+		printList(data, []string{"ID", "Name", "MEM", "CPU", "Storage_Info"})
 		return nil
 	})
 

cmd/climc/shell/compute/sshkeypairs.go

@@ -18,12 +18,11 @@ import (
 	"fmt"
 	"os"
 	"path"
+	"strings"
 
 	"yunion.io/x/jsonutils"
 	"yunion.io/x/pkg/errors"
 
-	"yunion.io/x/onecloud/pkg/hostman/guestfs/fsdriver"
-	deployapi "yunion.io/x/onecloud/pkg/hostman/hostdeployer/apis"
 	"yunion.io/x/onecloud/pkg/mcclient"
 	modules "yunion.io/x/onecloud/pkg/mcclient/modules/compute"
 	"yunion.io/x/onecloud/pkg/util/procutils"
@@ -101,8 +100,44 @@ func init() {
 			}
 			oldKeys = string(output)
 		}
-		pubKeys := &deployapi.SSHKeys{AdminPublicKey: pubKey}
-		newKeys := fsdriver.MergeAuthorizedKeys(oldKeys, pubKeys)
+		var MergeAuthorizedKeys = func(oldKeys string, pubKey string) string {
+			const sshKeySignature = "@yunioncloudpods"
+			var allkeys = make(map[string]string)
+			if len(oldKeys) > 0 {
+				for _, line := range strings.Split(oldKeys, "\n") {
+					line = strings.TrimSpace(line)
+					dat := strings.Split(line, " ")
+					if len(dat) > 1 {
+						if len(dat) > 2 && dat[2] == sshKeySignature {
+							// skip ssh keys with signature
+							continue
+						}
+						if _, ok := allkeys[dat[1]]; !ok {
+							allkeys[dat[1]] = line
+						}
+					}
+				}
+			}
+			candiateKeys := []string{pubKey}
+			for _, k := range candiateKeys {
+				if len(k) > 0 {
+					k = strings.TrimSpace(k)
+					dat := strings.Split(k, " ")
+					if len(dat) > 1 {
+						if _, ok := allkeys[dat[1]]; !ok {
+							allkeys[dat[1]] = strings.Join([]string{dat[0], dat[1], sshKeySignature}, " ")
+						}
+					}
+				}
+			}
+			var keys = make([]string, 0)
+			for _, val := range allkeys {
+				keys = append(keys, val)
+			}
+			return strings.Join(keys, "\n") + "\n"
+		}
+
+		newKeys := MergeAuthorizedKeys(oldKeys, pubKey)
 		if output, err := procutils.NewCommand(
 			"sh", "-c", fmt.Sprintf("echo '%s' > %s", newKeys, authFile)).Output(); err != nil {
 			return errors.Wrapf(err, "write public keys: %s", output)

cmd/climc/shell/compute/sslcertificate.go

@@ -18,12 +18,12 @@ import (
 	"yunion.io/x/onecloud/cmd/climc/shell"
 	modules "yunion.io/x/onecloud/pkg/mcclient/modules/compute"
 	"yunion.io/x/onecloud/pkg/mcclient/options"
-	"yunion.io/x/onecloud/pkg/mcclient/options/compute"
+	compute "yunion.io/x/onecloud/pkg/mcclient/options/compute"
 )
 
 func init() {
-	cmd := shell.NewResourceCmd(&modules.WafIPSetCaches)
-	cmd.List(&compute.WafIPSetCacheListOptions{})
-	cmd.Show(&options.BaseIdOptions{})
+	cmd := shell.NewResourceCmd(&modules.SslCerticicate).WithKeyword("ssl-certificate")
+	cmd.List(&compute.SslCertificateListOptions{})
+	cmd.Show(&options.BaseShowOptions{})
 	cmd.Delete(&options.BaseIdOptions{})
 }

cmd/climc/shell/compute/storagecaches.go

@@ -15,92 +15,18 @@
 package compute
 
 import (
-	"yunion.io/x/jsonutils"
-
-	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/cmd/climc/shell"
 	modules "yunion.io/x/onecloud/pkg/mcclient/modules/compute"
 	"yunion.io/x/onecloud/pkg/mcclient/options"
+	"yunion.io/x/onecloud/pkg/mcclient/options/compute"
 )
 
 func init() {
-	type StoragecacheListOptions struct {
-		options.BaseListOptions
-
-		CloudregionId string `help:"cloudregion id"`
-	}
-	R(&StoragecacheListOptions{}, "storage-cache-list", "List storage caches", func(s *mcclient.ClientSession, opts *StoragecacheListOptions) error {
-		params, err := options.ListStructToParams(opts)
-		if err != nil {
-			return err
-		}
-		result, err := modules.Storagecaches.List(s, params)
-		if err != nil {
-			return err
-		}
-		printList(result, modules.Storagecaches.GetColumns(s))
-		return nil
-	})
-
-	type StoragecacheShowptions struct {
-		ID string `help:"ID or Name of storagecache"`
-	}
-	R(&StoragecacheShowptions{}, "storage-cache-show", "Show details of storage caches", func(s *mcclient.ClientSession, args *StoragecacheShowptions) error {
-		result, err := modules.Storagecaches.Get(s, args.ID, nil)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
-	R(&StoragecacheShowptions{}, "storage-cache-delete", "Delete storage cache", func(s *mcclient.ClientSession, args *StoragecacheShowptions) error {
-		result, err := modules.Storagecaches.Delete(s, args.ID, nil)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
-	type StorageCacheImageActionOptions struct {
-		ID     string `help:"ID or name of storage"`
-		IMAGE  string `help:"ID or name of image"`
-		Force  bool   `help:"Force refresh cache, even if the image exists in cache"`
-		Format string `help:"image format" choices:"iso|qcow2|vmdk|vhd"`
-	}
-	R(&StorageCacheImageActionOptions{}, "storagecache-cache-image", "Ask a storage cache to cache a image", func(s *mcclient.ClientSession, args *StorageCacheImageActionOptions) error {
-		params := jsonutils.NewDict()
-		params.Add(jsonutils.NewString(args.IMAGE), "image")
-		if args.Force {
-			params.Add(jsonutils.JSONTrue, "is_force")
-		}
-		if len(args.Format) > 0 {
-			params.Add(jsonutils.NewString(args.Format), "format")
-		}
-		storage, err := modules.Storagecaches.PerformAction(s, args.ID, "cache-image", params)
-		if err != nil {
-			return err
-		}
-		printObject(storage)
-		return nil
-	})
-
-	type StorageUncacheImageActionOptions struct {
-		ID    string `help:"ID or name of storage"`
-		IMAGE string `help:"ID or name of image"`
-		Force bool   `help:"Force uncache, even if the image exists in cache is invalid"`
-	}
-	R(&StorageUncacheImageActionOptions{}, "storagecache-uncache-image", "Ask a storage cache to remove image from its cache", func(s *mcclient.ClientSession, args *StorageUncacheImageActionOptions) error {
-		params := jsonutils.NewDict()
-		params.Add(jsonutils.NewString(args.IMAGE), "image")
-		if args.Force {
-			params.Add(jsonutils.JSONTrue, "is_force")
-		}
-		storage, err := modules.Storagecaches.PerformAction(s, args.ID, "uncache-image", params)
-		if err != nil {
-			return err
-		}
-		printObject(storage)
-		return nil
-	})
+	cmd := shell.NewResourceCmd(&modules.Storagecaches).WithKeyword("storage-cache")
+	cmd.List(&compute.StoragecacheListOptions{})
+	cmd.Show(&options.BaseIdOptions{})
+	cmd.Delete(&options.BaseIdOptions{})
+	cmd.Update(&options.BaseUpdateOptions{})
+	cmd.Perform("cache-image", &compute.StorageCacheImageActionOptions{})
+	cmd.Perform("uncache-image", &compute.StorageUncacheImageActionOptions{})
 }

cmd/climc/shell/compute/storages.go

@@ -45,6 +45,9 @@ func init() {
 	cmd.Perform("force-detach-host", &compute.StorageForceDetachHost{})
 	cmd.Perform("public", &options.BasePublicOptions{})
 	cmd.Perform("private", &options.BaseIdOptions{})
+	cmd.Get("hardware-info", &options.BaseIdOptions{})
+	cmd.Perform("set-hardware-info", &compute.StorageSetHardwareInfoOptions{})
+	cmd.Perform("set-commit-bound", &compute.StorageSetCommitBoundOptions{})
 
 	type StorageCephRunOptions struct {
 		ID     string `help:"ID or name of ceph storage"`
@@ -58,9 +61,10 @@ func init() {
 		info := struct {
 			StorageType string `json:"storage_type"`
 			StorageConf struct {
-				Key     string `json:"key"`
-				MonHost string `json:"mon_host"`
-				Pool    string `json:"pool"`
+				Key               string `json:"key"`
+				MonHost           string `json:"mon_host"`
+				Pool              string `json:"pool"`
+				EnableMessengerV2 bool   `json:"enable_messenger_v2"`
 			}
 		}{}
 		err = result.Unmarshal(&info)
@@ -74,6 +78,7 @@ func init() {
 			info.StorageConf.MonHost,
 			info.StorageConf.Key,
 			info.StorageConf.Pool,
+			info.StorageConf.EnableMessengerV2,
 		)
 		if err != nil {
 			return errors.Wrap(err, "cephutils.NewClient")

cmd/climc/shell/compute/usages.go

@@ -15,19 +15,25 @@
 package compute
 
 import (
-	"yunion.io/x/jsonutils"
+	"fmt"
+	"time"
 
+	"yunion.io/x/jsonutils"
+	"yunion.io/x/pkg/util/printutils"
+
+	"yunion.io/x/onecloud/cmd/climc/shell"
 	"yunion.io/x/onecloud/pkg/mcclient"
 	modules "yunion.io/x/onecloud/pkg/mcclient/modules/compute"
 	"yunion.io/x/onecloud/pkg/mcclient/modules/identity"
 	"yunion.io/x/onecloud/pkg/mcclient/modules/image"
 	"yunion.io/x/onecloud/pkg/mcclient/modules/k8s"
+	"yunion.io/x/onecloud/pkg/mcclient/options"
 )
 
 type GeneralUsageOptions struct {
 	HostType []string `help:"Host types" choices:"hypervisor|baremetal|esxi|xen|kubelet|hyperv|aliyun|azure|aws|huawei|qcloud|openstack|ucloud|zstack|google|ctyun"`
-	Provider []string `help:"Provider" choices:"OneCloud|VMware|Aliyun|Azure|Aws|Qcloud|Huawei|OpenStack|Ucloud|ZStack|Google|Ctyun"`
-	Brand    []string `help:"Brands" choices:"OneCloud|VMware|Aliyun|Azure|Aws|Qcloud|Huawei|OpenStack|Ucloud|ZStack|DStack|Google|Ctyun"`
+	Provider []string `help:"Provider" choices:"OneCloud|VMware|Aliyun|Azure|Aws|Qcloud|Huawei|OpenStack|Ucloud|VolcEngine|ZStack|Google|Ctyun"`
+	Brand    []string `help:"Brands" choices:"OneCloud|VMware|Aliyun|Azure|Aws|Qcloud|Huawei|OpenStack|Ucloud|VolcEngine|ZStack|Google|Ctyun"`
 	Project  string   `help:"show usage of specified project"`
 
 	ProjectDomain string `help:"show usage of specified domain"`
@@ -58,7 +64,50 @@ func fetchHostTypeOptions(args *GeneralUsageOptions) *jsonutils.JSONDict {
 	return params
 }
 
+type HistoryUsageListOptions struct {
+	options.ExtraListOptions
+	StartDate time.Time
+	EndDate   time.Time
+	Interval  string `choices:"hour|day|month|year" default:"day"`
+}
+
+func (opts *HistoryUsageListOptions) Params() (jsonutils.JSONObject, error) {
+	if opts.StartDate.IsZero() || opts.EndDate.IsZero() {
+		opts.EndDate = time.Now()
+		switch opts.Interval {
+		case "hour":
+			opts.StartDate = time.Now().Add(time.Hour * -24)
+		case "day":
+			opts.StartDate = time.Now().AddDate(0, 0, -30)
+		case "month":
+			opts.StartDate = time.Now().AddDate(0, -12, 0)
+		case "year":
+			opts.StartDate = time.Now().AddDate(-3, 0, 0)
+		}
+	}
+	return jsonutils.Marshal(opts), nil
+}
+
+func (o *HistoryUsageListOptions) GetExportKeys() string {
+	return ""
+}
+
+func (o *HistoryUsageListOptions) GetId() string {
+	return ""
+}
+
 func init() {
+
+	cmd := shell.NewResourceCmd(modules.HistoryUsages)
+	cmd.GetWithCustomShow("list", func(data jsonutils.JSONObject) {
+		ret := map[string][]jsonutils.JSONObject{}
+		data.Unmarshal(&ret)
+		for k, d := range ret {
+			fmt.Println(k)
+			printutils.PrintJSONList(&printutils.ListResult{Data: d}, nil)
+		}
+	}, &HistoryUsageListOptions{})
+
 	R(&GeneralUsageOptions{}, "usage", "Show general usage", func(s *mcclient.ClientSession, args *GeneralUsageOptions) error {
 		params := fetchHostTypeOptions(args)
 		if args.Project != "" {

cmd/climc/shell/compute/vpc_peering_connection.go

@@ -17,7 +17,7 @@ package compute
 import (
 	"yunion.io/x/onecloud/cmd/climc/shell"
 	modules "yunion.io/x/onecloud/pkg/mcclient/modules/compute"
-	"yunion.io/x/onecloud/pkg/mcclient/options"
+	options "yunion.io/x/onecloud/pkg/mcclient/options/compute"
 )
 
 func init() {

cmd/climc/shell/compute/vpcs.go

@@ -18,7 +18,8 @@ import (
 	"yunion.io/x/onecloud/cmd/climc/shell"
 	"yunion.io/x/onecloud/pkg/mcclient"
 	modules "yunion.io/x/onecloud/pkg/mcclient/modules/compute"
-	"yunion.io/x/onecloud/pkg/mcclient/options"
+	baseoptions "yunion.io/x/onecloud/pkg/mcclient/options"
+	options "yunion.io/x/onecloud/pkg/mcclient/options/compute"
 )
 
 func init() {
@@ -33,12 +34,12 @@ func init() {
 	cmd.Perform("sync", &options.VpcIdOptions{})
 	cmd.Perform("syncstatus", &options.VpcIdOptions{})
 	cmd.Perform("private", &options.VpcIdOptions{})
-	cmd.Perform("public", &options.BasePublicOptions{})
+	cmd.Perform("public", &baseoptions.BasePublicOptions{})
 	cmd.Perform("change-owner", &options.VpcChangeOwnerOptions{})
 	cmd.Get("vpc-change-owner-candidate-domains", &options.VpcIdOptions{})
 	cmd.Get("topology", &options.VpcIdOptions{})
 
-	R(&options.ResourceMetadataOptions{}, "vpc-set-user-metadata", "Set metadata of a vpc", func(s *mcclient.ClientSession, opts *options.ResourceMetadataOptions) error {
+	R(&baseoptions.ResourceMetadataOptions{}, "vpc-set-user-metadata", "Set metadata of a vpc", func(s *mcclient.ClientSession, opts *baseoptions.ResourceMetadataOptions) error {
 		params, err := opts.Params()
 		if err != nil {
 			return err

cmd/climc/shell/compute/webconsole.go

@@ -32,6 +32,11 @@ import (
 
 func init() {
 	handleResult := func(s *mcclient.ClientSession, opt o.WebConsoleOptions, obj jsonutils.JSONObject) error {
+		if obj.Contains("access_url") {
+			accessUrl, _ := obj.GetString("access_url")
+			fmt.Println("AccessURL:", accessUrl)
+			return nil
+		}
 		if opt.WebconsoleUrl == "" {
 			resp, err := identity.ServicesV3.GetSpecific(s, "common", "config", nil)
 			if err != nil {
@@ -117,7 +122,7 @@ func init() {
 		if err != nil {
 			return err
 		}
-		ret, err := webconsole.WebConsole.DoSshConnect(s, args.IP, params)
+		ret, err := webconsole.WebConsole.DoSshConnect(s, args.ID, params)
 		if err != nil {
 			return err
 		}
@@ -133,4 +138,14 @@ func init() {
 		handleResult(s, args.WebConsoleOptions, ret)
 		return nil
 	})
+
+	R(&o.WebConsoleServerRdpOptions{}, "webconsole-server-rdp", "Connect server remote graphic console by rdp", func(s *mcclient.ClientSession, args *o.WebConsoleServerRdpOptions) error {
+		ret, err := webconsole.WebConsole.DoServerRDPConnect(s, args.ID, jsonutils.Marshal(map[string]interface{}{"webconsole": args}))
+		if err != nil {
+			return err
+		}
+		handleResult(s, args.WebConsoleOptions, ret)
+		return nil
+	})
+
 }

cmd/climc/shell/compute/workers.go

@@ -23,7 +23,7 @@ import (
 
 func init() {
 	type WorkerListOptions struct {
-		ServiceType string `choices:"image|cloudid|cloudevent|devtool|ansible|identity|notify|log|compute|compute_v2"`
+		ServiceType string `choices:"image|cloudid|cloudevent|devtool|ansible|identity|notify|log|compute|compute_v2|meter|suggestion|cloudmon|cloudproxy|dns|monitor|scheduler|vpcagent|webconsole|yunionconf|bastionhost|extdb|yunionapi"`
 	}
 	R(&WorkerListOptions{}, "worker-list", "List workers", func(s *mcclient.ClientSession, args *WorkerListOptions) error {
 		result, err := modules.Workers.List(s, jsonutils.Marshal(args))

cmd/climc/shell/events/events.go

@@ -168,6 +168,16 @@ func init() {
 		return doComputeEventList(s, &nargs)
 	})
 
+	R(&TypeEventListOptions{}, "dbinstance-event", "Show operation event logs of disk", func(s *mcclient.ClientSession, args *TypeEventListOptions) error {
+		nargs := EventListOptions{BaseEventListOptions: args.BaseEventListOptions, Id: args.ID, Type: []string{"dbinstance"}}
+		return doComputeEventList(s, &nargs)
+	})
+
+	R(&TypeEventListOptions{}, "lb-event", "Show operation event logs of disk", func(s *mcclient.ClientSession, args *TypeEventListOptions) error {
+		nargs := EventListOptions{BaseEventListOptions: args.BaseEventListOptions, Id: args.ID, Type: []string{"loadbalancer"}}
+		return doComputeEventList(s, &nargs)
+	})
+
 	R(&TypeEventListOptions{}, "eip-event", "Show operation event logs of elastic IP", func(s *mcclient.ClientSession, args *TypeEventListOptions) error {
 		nargs := EventListOptions{BaseEventListOptions: args.BaseEventListOptions, Id: args.ID, Type: []string{"eip"}}
 		return doComputeEventList(s, &nargs)

cmd/climc/shell/helper.go

@@ -229,7 +229,7 @@ type IPropertyOpt interface {
 	Property() string
 }
 
-func (cmd ResourceCmd) GetProperty(args IPropertyOpt) {
+func (cmd ResourceCmd) GetPropertyWithShowFunc(args IPropertyOpt, showFunc func(jsonutils.JSONObject) error) {
 	man := cmd.manager
 	callback := func(s *mcclient.ClientSession, args IPropertyOpt) error {
 		params, err := args.Params()
@@ -240,6 +240,17 @@ func (cmd ResourceCmd) GetProperty(args IPropertyOpt) {
 		if err != nil {
 			return err
 		}
+		err = showFunc(ret)
+		if err != nil {
+			return err
+		}
+		return nil
+	}
+	cmd.RunWithDesc(args.Property(), fmt.Sprintf("Get property of a %s", man.GetKeyword()), args, callback)
+}
+
+func (cmd ResourceCmd) GetProperty(args IPropertyOpt) {
+	cmd.GetPropertyWithShowFunc(args, func(ret jsonutils.JSONObject) error {
 		if _, ok := ret.(*jsonutils.JSONArray); ok {
 			data, _ := ret.GetArray()
 			PrintList(&printutils.ListResult{
@@ -249,8 +260,7 @@ func (cmd ResourceCmd) GetProperty(args IPropertyOpt) {
 			PrintObject(ret)
 		}
 		return nil
-	}
-	cmd.RunWithDesc(args.Property(), fmt.Sprintf("Get property of a %s", man.GetKeyword()), args, callback)
+	})
 }
 
 func (cmd ResourceCmd) Show(args IShowOpt) {
@@ -657,15 +667,15 @@ func (cmd JointCmd) List(args IJointListOpt) {
 	cmd.RunWithDesc("list", fmt.Sprintf("list %s %s pairs", man.MasterManager().KeyString(), man.SlaveManager().KeyString()), args, callback)
 }
 
-type IJointShowOpt interface {
+type IJointOpt interface {
 	IOpt
 	GetMasterId() string
 	GetSlaveId() string
 }
 
-func (cmd JointCmd) Show(args IJointShowOpt) {
+func (cmd JointCmd) Show(args IJointOpt) {
 	man := cmd.manager.(modulebase.JointManager)
-	callback := func(s *mcclient.ClientSession, args IJointShowOpt) error {
+	callback := func(s *mcclient.ClientSession, args IJointOpt) error {
 		params, err := args.Params()
 		if err != nil {
 			return err
@@ -679,3 +689,54 @@ func (cmd JointCmd) Show(args IJointShowOpt) {
 	}
 	cmd.Run("show", args, callback)
 }
+
+func (cmd JointCmd) Attach(args IJointOpt) {
+	man := cmd.manager.(modulebase.JointManager)
+	callback := func(s *mcclient.ClientSession, args IJointOpt) error {
+		params, err := args.Params()
+		if err != nil {
+			return err
+		}
+		result, err := man.Attach(s, args.GetMasterId(), args.GetSlaveId(), params)
+		if err != nil {
+			return err
+		}
+		PrintObject(result)
+		return nil
+	}
+	cmd.Run("attach", args, callback)
+}
+
+func (cmd JointCmd) Detach(args IJointOpt) {
+	man := cmd.manager.(modulebase.JointManager)
+	callback := func(s *mcclient.ClientSession, args IJointOpt) error {
+		params, err := args.Params()
+		if err != nil {
+			return err
+		}
+		result, err := man.Detach(s, args.GetMasterId(), args.GetSlaveId(), params)
+		if err != nil {
+			return err
+		}
+		PrintObject(result)
+		return nil
+	}
+	cmd.Run("detach", args, callback)
+}
+
+func (cmd JointCmd) Update(args IJointOpt) {
+	man := cmd.manager.(modulebase.JointManager)
+	callback := func(s *mcclient.ClientSession, args IJointOpt) error {
+		params, err := args.Params()
+		if err != nil {
+			return err
+		}
+		result, err := man.Update(s, args.GetMasterId(), args.GetSlaveId(), nil, params)
+		if err != nil {
+			return err
+		}
+		PrintObject(result)
+		return nil
+	}
+	cmd.Run("update", args, callback)
+}

cmd/climc/shell/identity/organizations.go

@@ -31,4 +31,5 @@ func init() {
 	orgCmd.Delete(&identity_options.OrganizationIdOptions{})
 	orgCmd.Perform("add-level", &identity_options.OrganizationAddLevelOptions{})
 	orgCmd.Perform("add-node", &identity_options.OrganizationAddNodeOptions{})
+	orgCmd.Perform("clean", &identity_options.OrganizationIdOptions{})
 }

cmd/climc/shell/identity/policies.go

@@ -40,7 +40,7 @@ import (
 	"yunion.io/x/onecloud/pkg/util/tagutils"
 )
 
-func createPolicy(s *mcclient.ClientSession, name string, genName string, policy string, domain string, enabled bool, disabled bool, desc string, scope string, isSystem *bool, objectags, projecttags, domaintags tagutils.TTagSet) error {
+func createPolicy(s *mcclient.ClientSession, name string, genName string, policy string, domain string, enabled bool, disabled bool, desc string, scope string, isSystem *bool, objectags, projecttags, domaintags tagutils.TTagSet, orgNodeId []string) error {
 	params := jsonutils.NewDict()
 	if len(genName) > 0 {
 		params.Add(jsonutils.NewString(genName), "generate_name")
@@ -83,6 +83,10 @@ func createPolicy(s *mcclient.ClientSession, name string, genName string, policy
 		params.Add(jsonutils.Marshal(domaintags), "domain_tags")
 	}
 
+	if len(orgNodeId) > 0 {
+		params.Add(jsonutils.NewStringArray(orgNodeId), "org_node_id")
+	}
+
 	result, err := modules.Policies.Create(s, params)
 	if err != nil {
 		return err
@@ -115,7 +119,12 @@ func createPolicyFromJson(s *mcclient.ClientSession, old jsonutils.JSONObject, a
 		domainTags = make(tagutils.TTagSet, 0)
 		old.Unmarshal(&domainTags, "domain_tags")
 	}
-	return createPolicy(s, argsName, genName, policy, argsDomain, enabled, !enabled, desc, scope, &isSystem, objectTags, projectTags, domainTags)
+	var nodeIds []string
+	if old.Contains("org_node_id") {
+		nodeIds = make([]string, 0)
+		old.Unmarshal(&nodeIds, "org_node_id")
+	}
+	return createPolicy(s, argsName, genName, policy, argsDomain, enabled, !enabled, desc, scope, &isSystem, objectTags, projectTags, domainTags, nodeIds)
 }
 
 func init() {
@@ -141,6 +150,8 @@ func init() {
 		ProjectTags string `help:"project tags"`
 		DomainTags  string `help:"domain tags"`
 		ObjectTags  string `help:"object tags"`
+
+		OrgNodeId []string `help:"node ids of organiazation tree node"`
 	}
 	R(&PolicyCreateOptions{}, "policy-create", "Create a new policy", func(s *mcclient.ClientSession, args *PolicyCreateOptions) error {
 		policyBytes, err := ioutil.ReadFile(args.FILE)
@@ -151,7 +162,7 @@ func init() {
 		objectTags := baseoptions.SplitTag(args.ObjectTags)
 		projectTags := baseoptions.SplitTag(args.ProjectTags)
 		domainTags := baseoptions.SplitTag(args.DomainTags)
-		return createPolicy(s, args.NAME, "", string(policyBytes), args.Domain, args.Enabled, args.Disabled, args.Desc, args.Scope, args.IsSystem, objectTags, projectTags, domainTags)
+		return createPolicy(s, args.NAME, "", string(policyBytes), args.Domain, args.Enabled, args.Disabled, args.Desc, args.Scope, args.IsSystem, objectTags, projectTags, domainTags, args.OrgNodeId)
 	})
 
 	type PolicyExportOptions struct {
@@ -213,6 +224,8 @@ func init() {
 		ProjectTags string `help:"project tags"`
 		DomainTags  string `help:"domain tags"`
 		ObjectTags  string `help:"object tags"`
+
+		OrgNodeId []string `help:"node ids of organiazation tree node"`
 	}
 	updateFunc := func(s *mcclient.ClientSession, args *PolicyPatchOptions) error {
 		policyId, err := modules.Policies.GetId(s, args.ID, nil)
@@ -262,6 +275,10 @@ func init() {
 			params.Add(jsonutils.NewString(args.TagsAction), "tag_update_policy")
 		}
 
+		if len(args.OrgNodeId) > 0 {
+			params.Add(jsonutils.NewStringArray(args.OrgNodeId), "org_node_id")
+		}
+
 		result, err := modules.Policies.Update(s, policyId, params)
 		if err != nil {
 			return err

cmd/climc/shell/identity/projects.go

@@ -40,6 +40,7 @@ func init() {
 	cmd.GetProperty(&identity_options.ProjectGetPropertyTagValueTreeOptions{})
 	cmd.GetProperty(&identity_options.ProjectGetPropertyDomainTagValuePairOptions{})
 	cmd.GetProperty(&identity_options.ProjectGetPropertyDomainTagValueTreeOptions{})
+	cmd.PerformClass("clean", &identity_options.ProjectCleanOptions{})
 
 	type ProjectShowOptions struct {
 		ID     string `help:"ID or Name of project"`
@@ -387,16 +388,18 @@ func init() {
 	})
 
 	type ProjectAddUserGroupOptions struct {
-		Project string   `help:"ID or name of project to add users/groups" positional:"true" optional:"false"`
-		User    []string `help:"ID of user to add"`
-		Group   []string `help:"ID of group to add"`
-		Role    []string `help:"ID of role to add"`
+		Project        string   `help:"ID or name of project to add users/groups" positional:"true" optional:"false"`
+		User           []string `help:"ID of user to add"`
+		Group          []string `help:"ID of group to add"`
+		Role           []string `help:"ID of role to add"`
+		EnableAllUsers bool
 	}
 	R(&ProjectAddUserGroupOptions{}, "project-add-user-group", "Batch add users/groups to project", func(s *mcclient.ClientSession, args *ProjectAddUserGroupOptions) error {
 		input := api.SProjectAddUserGroupInput{}
 		input.Users = args.User
 		input.Groups = args.Group
 		input.Roles = args.Role
+		input.EnableAllUsers = args.EnableAllUsers
 		err := input.Validate()
 		if err != nil {
 			return err

cmd/climc/shell/identity/services.go

@@ -162,6 +162,18 @@ func init() {
 		return nil
 	})
 
+	type ServiceConfigShow2Options struct {
+		TYPE string `help:"service type"`
+	}
+	R(&ServiceConfigShow2Options{}, "service-config-show2", "Show configs of a service", func(s *mcclient.ClientSession, args *ServiceConfigShow2Options) error {
+		conf, err := modules.ServicesV3.GetConfig(s, args.TYPE)
+		if err != nil {
+			return err
+		}
+		fmt.Println(conf.PrettyString())
+		return nil
+	})
+
 	type ServiceConfigOptions struct {
 		SERVICE string   `help:"service name or id"`
 		Config  []string `help:"config options, can be a JSON, a YAML or a key=value pair, e.g:\n    * JSON\n      '{\"default\":{\"password_expiration_seconds\":300}}'\n    * YAML\n      default:\n        password_expiration_seconds: 300\n    * A key=value pair (under default section)\n      password_expiration_seconds=300\n"`