fix(host): guest desc correct rbd disk path (#25394)

* fix(region,host): host register with correct hostname

* fix(region): guest migrate reuse create params schedtag

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

@@ -13,7 +13,7 @@ jobs:
     - name: Setup Go
       uses: actions/setup-go@v4
       with:
-        go-version: '1.26.3'
+        go-version: '1.25'
 
     - name: Install check tools
       shell: bash

.github/workflows/docker_apigateway.yml

@@ -22,7 +22,7 @@ jobs:
         
     - uses: actions/setup-go@v4
       with:
-        go-version: '1.26.3'
+        go-version: '1.25'
         
     - 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.26.3'
+        go-version: '1.25'
         
     - 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.26.3'
+        go-version: '1.25'
         
     - 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.26.3'
+        go-version: '1.25'
         
     - 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.26.3'
+        go-version: '1.25'
         
     - 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.26.3'
+        go-version: '1.25'
         
     - 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.26.3'
+        go-version: '1.25'
         
     - 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.26.3'
+        go-version: '1.25'
         
     - 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.26.3'
+        go-version: '1.25'
         
     - 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.26.3'
+        go-version: '1.25'
         
     - 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.26.3'
+        go-version: '1.25'
         
     - 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.26.3'
+        go-version: '1.25'
         
     - name: Set up QEMU
       uses: docker/setup-qemu-action@v2

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

@@ -4,42 +4,14 @@ on:
   schedule:
     - cron: "0 0 * * *"
 
-permissions:
-  issues: write
-
 jobs:
   issue-check-inactive:
     runs-on: ubuntu-latest
     steps:
-      - name: Label inactive issues as stale
-        env:
-          GH_TOKEN: ${{ github.token }}
-          INACTIVE_DAY: "30"
-          INACTIVE_LABEL: "stale"
-          EXCLUDE_LABEL: "announcement"
-        run: |
-          set -euo pipefail
-          cutoff="$(date -u -d "${INACTIVE_DAY} days ago" +%Y-%m-%dT%H:%M:%SZ)"
-
-          gh issue list \
-            --repo "${{ github.repository }}" \
-            --state open \
-            --limit 1000 \
-            --json number,labels,updatedAt \
-          | jq -c \
-            --arg cutoff "$cutoff" \
-            --arg inactive "$INACTIVE_LABEL" \
-            --arg exclude "$EXCLUDE_LABEL" \
-            '
-              .[]
-              | select(.updatedAt < $cutoff)
-              | select([.labels[].name] | index($exclude) | not)
-              | select([.labels[].name] | index($inactive) | not)
-            ' \
-          | while IFS= read -r issue; do
-              number="$(echo "$issue" | jq -r .number)"
-              echo "Marking issue #${number} as ${INACTIVE_LABEL}"
-              gh issue edit "$number" \
-                --repo "${{ github.repository }}" \
-                --add-label "$INACTIVE_LABEL"
-            done
+      - 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

@@ -4,41 +4,17 @@ on:
   schedule:
     - cron: "0 1 * * *"
 
-permissions:
-  issues: write
-
 jobs:
   issue-close-require:
     runs-on: ubuntu-latest
     steps:
-      - name: Close inactive issues awaiting user feedback
-        env:
-          GH_TOKEN: ${{ github.token }}
-          INACTIVE_DAY: "7"
-        run: |
-          set -euo pipefail
-          cutoff="$(date -u -d "${INACTIVE_DAY} days ago" +%Y-%m-%dT%H:%M:%SZ)"
-          body="$(cat <<'EOF'
-          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.
+      - 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。
-          EOF
-          )"
-          # Trim leading indentation from heredoc lines for a cleaner comment.
-          body="$(printf '%s\n' "$body" | sed 's/^[[:space:]]*//')"
-
-          gh issue list \
-            --repo "${{ github.repository }}" \
-            --state open \
-            --label "stale" \
-            --label "state/awaiting user feedback" \
-            --limit 1000 \
-            --json number,updatedAt \
-          | jq -c --arg cutoff "$cutoff" '.[] | select(.updatedAt < $cutoff)' \
-          | while IFS= read -r issue; do
-              number="$(echo "$issue" | jq -r .number)"
-              echo "Closing issue #${number}"
-              gh issue close "$number" \
-                --repo "${{ github.repository }}" \
-                --comment "$body"
-            done
+            您超过 37 天未反馈信息，我们将关闭该 issue，如有需求您可以重新打开或者提交新的 issue。

.github/workflows/issue-close.yml

@@ -4,19 +4,13 @@ on:
   issues:
     types: [closed]
 
-permissions:
-  issues: write
-
 jobs:
   issue-closed-remove-labels:
     runs-on: ubuntu-latest
     if: "!contains(github.event.issue.labels.*.name, 'stale')"
     steps:
-      - name: Remove state labels when issue that hasn't stale label is closed
-        env:
-          GH_TOKEN: ${{ github.token }}
-        run: |
-          gh issue edit "${{ github.event.issue.number }}" \
-            --repo "${{ github.repository }}" \
-            --remove-label "state/awaiting processing" \
-            --remove-label "state/awaiting user feedback" || true
+      - 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

@@ -4,48 +4,35 @@ on:
 
 name: Add issues workflow labels
 
-permissions:
-  issues: write
-
 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
-        env:
-          GH_TOKEN: ${{ github.token }}
-        run: |
-          gh issue edit "${{ github.event.issue.number }}" \
-            --repo "${{ github.repository }}" \
-            --add-label "state/awaiting processing"
+        uses: actions-cool/issues-helper@v2
+        with:
+          actions: 'add-labels'
+          labels: 'state/awaiting processing'
 
       - name: Remove require reply label
-        env:
-          GH_TOKEN: ${{ github.token }}
-        run: |
-          gh issue edit "${{ github.event.issue.number }}" \
-            --repo "${{ github.repository }}" \
-            --remove-label "state/awaiting user feedback" \
-            --remove-label "stale" || true
+        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 reply label
-        env:
-          GH_TOKEN: ${{ github.token }}
-        run: |
-          gh issue edit "${{ github.event.issue.number }}" \
-            --repo "${{ github.repository }}" \
-            --add-label "state/awaiting user feedback"
+      - 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
-        env:
-          GH_TOKEN: ${{ github.token }}
-        run: |
-          gh issue edit "${{ github.event.issue.number }}" \
-            --repo "${{ github.repository }}" \
-            --remove-label "state/awaiting processing" \
-            --remove-label "stale" || true
+        uses: actions-cool/issues-helper@v2
+        with:
+          actions: 'remove-labels'
+          labels: 'state/awaiting processing,stale'

.github/workflows/issue-open.yml

@@ -4,30 +4,22 @@ on:
   issues:
     types: [opened, reopened]
 
-permissions:
-  issues: write
-
 jobs:
   issue-open-add-labels:
     runs-on: ubuntu-latest
-    if: ${{ !github.event.issue.pull_request }}
     steps:
       - name: Add labels
-        env:
-          GH_TOKEN: ${{ github.token }}
-        run: |
-          gh issue edit "${{ github.event.issue.number }}" \
-            --repo "${{ github.repository }}" \
-            --add-label "state/awaiting processing"
+        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
-        env:
-          GH_TOKEN: ${{ github.token }}
-        run: |
-          gh issue edit "${{ github.event.issue.number }}" \
-            --repo "${{ github.repository }}" \
-            --remove-label "state/awaiting user feedback" \
-            --remove-label "stale" || true
+        uses: actions-cool/issues-helper@v2
+        with:
+          actions: 'remove-labels'
+          labels: 'state/awaiting user feedback,stale'
 
   notify-author-comment:
     runs-on: ubuntu-latest

Makefile

@@ -185,7 +185,6 @@ y18n-lang     := en-US,zh-CN
 y18n-packages := \
 		yunion.io/x/onecloud/cmd/apigateway \
 		yunion.io/x/onecloud/cmd/keystone \
-		yunion.io/x/onecloud/cmd/llm \
 		yunion.io/x/onecloud/cmd/monitor \
 		yunion.io/x/onecloud/cmd/region \
 		yunion.io/x/onecloud/cmd/yunionconf \
@@ -261,7 +260,7 @@ dep:
 	@echo "$$depDeprecated"
 	@$(MAKE) mod
 
-RELEASE_BRANCH:=master
+RELEASE_BRANCH:=release/4.0.3
 GOPROXY ?= direct
 
 mod:

Makefile.common.mk

@@ -8,7 +8,7 @@ endif
 ModBaseName:=$(notdir $(ModName))
 
 DockerImageRegistry?=registry.cn-beijing.aliyuncs.com
-DockerImageAlpineBuild?=$(DockerImageRegistry)/yunionio/alpine-build:3.23-go-1.26.3-0
+DockerImageAlpineBuild?=$(DockerImageRegistry)/yunionio/alpine-build:3.22.2-go-1.24.9-0
 
 EnvIf=$(if $($(1)),$(1)=$($(1)))
 

README-CN.md

@@ -9,9 +9,7 @@
 
 <img src="https://v1.cloudpods.org/images/cloudpods_logo_green.png" alt="Cloudpods" height="100">
 
-Cloudpods是一个开源的Golang实现的云原生的融合多云/混合云的云平台，也就是一个”云上之云”。Cloudpods不仅可以管理本地的虚拟机和物理机资源，还可以管理多个云平台和云账号。Cloudpods隐藏了这些异构基础设施资源的数据模型和API的差异，对外暴露了一套统一的API，允许用户就像用一个云一样地访问多云。从而大大降低了访问多云的复杂度，提升了管理多云的效率。
-
-Cloudpods还提供了 **AI 云**，一个面向大语言模型（LLM）推理与 AI 容器应用的统一管理平台，帮助企业在同一平台完成 AI 工作负载的部署、调度与运维，与 Cloudpods 私有云/多云资源体系无缝集成。
+Cloudpods是一个开源的Golang实现的云原生的融合多云/混合云的云平台，也就是一个“云上之云”。Cloudpods不仅可以管理本地的虚拟机和物理机资源，还可以管理多个云平台和云账号。Cloudpods隐藏了这些异构基础设施资源的数据模型和API的差异，对外暴露了一套统一的API，允许用户就像用一个云一样地访问多云。从而大大降低了访问多云的复杂度，提升了管理多云的效率。
 
 ## 谁需要Cloudpods?
 
@@ -20,25 +18,12 @@ Cloudpods还提供了 **AI 云**，一个面向大语言模型（LLM）推理与
 * 将VMware vSphere虚拟化集群转换为一个可以自服务的私有云平台
 * 在混合云的场景，能够在一个界面访问私有云和公有云
 * 通过一个集中的入口访问分布在多个公有云平台上的多个账号
-* 当前只使用一个公有云账号但希望将来使用多云的用户
-* 需要部署和管理 LLM 推理服务及 AI 容器应用，并需要 GPU 调度支持的用户
+* 当前只使用一个云公有云账号但希望将来使用多云的用户
 
 ## 功能
 
 请访问[产品介绍](https://www.cloudpods.org/docs/introduction/)页面了解详细信息。
 
-### AI 云
-
-* **AI 推理服务**：部署和管理 LLM 推理实例（支持 Ollama、vLLM、SGLang 等），支持 GPU 调度、模型挂载与推理服务地址分配。
-* **AI 应用管理**：一站式部署 LLM 应用编排、智能体助手、图像生成等 AI 容器应用。
-* **模型库**：统一管理模型来源、版本与缓存，支持多实例复用、离线分发，避免重复下载。
-* **模板与镜像**：通过模板定义 CPU/内存/GPU 等资源规格，通过镜像管理容器运行环境，实现标准化交付。
-* **GPU 运维**：GPU 设备自动探测与注册，支持 NVIDIA/CUDA 环境的统一配置与管理。
-
-支持的 AI 工作负载：
-* AI 推理：Ollama、vLLM、SGLang
-* AI 应用：OpenClaw、Dify、ComfyUI、Hermes Agent
-
 ### 支持的云平台
 
 * 公有云:
@@ -52,38 +37,29 @@ Cloudpods还提供了 **AI 云**，一个面向大语言模型（LLM）推理与
   * 天翼云
   * 移动云
   * 京东云
-  * 火山引擎
-  * 百度云
-  * 金山云
-  * 青云
-  * Oracle Cloud
-  * 联通云
 * 私有云:
   * OpenStack
   * ZStack
-  * Alibaba Cloud Apsara (阿里飞天)
+  * Alibaba Cloud Aspara (阿里飞天)
   * Huawei HCSO (华为HCSO)
   * Nutanix
-  * BingoCloud
-  * OceanBase
 * 本地基础设施资源:
   * 基于 KVM 实现的轻量级私有云
-  * VMware vSphere vCenter/ESXi
-  * Proxmox VE
-  * 裸金属 (IPMI, Redfish API)
-  * 对象存储 (Minio, Ceph, XSky)
+  * VMWare vSphere vCenter/ESXi
+  * Baremetals (IPMI, Redfish API)
+  * Object storages (Minio, Ceph, XSky)
   * NAS (Ceph)
 
 ### 支持的云资源
 
-* 服务器：实例、磁盘、网卡、网络、VPC、存储、宿主机、二层网络、快照、快照策略、安全组、弹性 IP、SSH 密钥对、镜像
-* 负载均衡：实例、监听、后端服务器组、后端服务器、TLS 证书、访问控制
-* 对象存储：存储桶、对象
-* NAS：文件系统、权限组、挂载点
-* RDS：实例、账号、备份、数据库、参数、权限
-* 弹性缓存：实例、账号、备份、参数
-* DNS：DNS 区域、DNS 记录
-* VPC：VPC、VPC 对等连接、跨 VPC 网络、NAT 网关、DNAT/SNAT 规则、路由表、路由条目
+* Servers: instances, disks, network interfaces, networks, vpcs, storages, hosts, wires, snapshots, snapshot policies, security groups, elastic IPs, SSH keypairs, images
+* Load Balancers: instances, listeners, backend groups, backends, TLS certificates, ACLs
+* Object Storage: buckets, objects
+* NAS: file_systems, access_groups, mount_targets
+* RDS: instances, accounts, backups, databases, parameters, privileges
+* Elastic Cache: instances, accounts, backups, parameters
+* DNS: DNS zones, DNS records
+* VPC: VPCs, VPC peering, inter-VPC network, NAT gateway, DNAT/SNAT rules, route tables, route entries
 
 ## 安装部署
 

README.md

@@ -11,34 +11,19 @@
 
 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.
 
-Cloudpods also provides **AI Cloud**, a unified management platform for large language model (LLM) inference and AI container applications, helping enterprises deploy, schedule, and operate AI workloads on a single platform, seamlessly integrated with the Cloudpods private cloud / multi-cloud resource ecosystem.
-
 ## Who needs Cloudpods?
 
 * Those who need a simple solution to virtualize a few physical servers into a private cloud
 * Those who need a compact and fully automatic baremetal lift-cycle management solution
 * Those who want to turn a VMware vSphere virtualization cluster into a private cloud
 * Those who need a cohesive view of both public and private cloud in a hybrid cloud setup
-* Those who need a centric portal to access multiple accounts from multiple public clouds
+* Those who need a centric portal to access multiple acccounts from multiple public clouds
 * Those who is currently using a single cloud account, but will not lose the possibility to adopt multicloud strategy
-* Those who need to deploy and manage LLM inference services and AI container applications with GPU support
 
 ## Features
 
 See [Introduction](https://www.cloudpods.org/docs/introduction/) for details.
 
-### AI Cloud
-
-* **AI Inference Services**: Deploy and manage LLM inference instances (Ollama, vLLM, SGLang, and more) with GPU scheduling, model mounting, and inference service address allocation.
-* **AI Application Management**: One-stop deployment of LLM application orchestration, agent assistants, image generation, and other AI container applications.
-* **Model Library**: Unified management of model sources, versions, and caches, supporting multi-instance reuse and offline distribution.
-* **Templates and Images**: Define resource specifications (CPU/memory/GPU) through templates, manage container runtime environments through images.
-* **GPU Operations**: Automatic GPU device detection and registration, unified NVIDIA/CUDA environment configuration and management.
-
-Supported AI workloads:
-* AI Inference: Ollama, vLLM, SGLang
-* AI Applications: OpenClaw, Dify, ComfyUI, Hermes Agent
-
 ### Supported cloud providers
 
 * Public Clouds:
@@ -52,24 +37,15 @@ Supported AI workloads:
   * Ctyun (China Telecom)
   * ECloud (China Mobile)
   * JDCloud
-  * Volcengine
-  * Baidu Cloud
-  * Kingsoft Cloud
-  * QingCloud
-  * Oracle Cloud
-  * China Unicom Cloud
 * Private Clouds:
   * OpenStack
   * ZStack
-  * Alibaba Cloud Apsara
+  * Alibaba Cloud Aspara
   * Huawei HCSO
   * Nutanix
-  * BingoCloud
-  * OceanBase
 * On-premise resources:
   * Lightweight private cloud built on KVM
-  * VMware vSphere vCenter/ESXi
-  * Proxmox VE
+  * VMWare vSphere vCenter/ESXi
   * Baremetals (IPMI, Redfish API)
   * Object storages (Minio, Ceph, XSky)
   * NAS (Ceph)
@@ -108,7 +84,7 @@ Please check this [issue](https://github.com/yunionio/cloudpods/issues/11427) fo
 
 ## Changelog
 
-See [Release Notes](https://www.cloudpods.org/en/docs/release-notes/) and [Changelog](https://www.cloudpods.org/en/docs/development/changelog/) 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
 
@@ -121,3 +97,4 @@ Apache License 2.0. See [LICENSE](./LICENSE).
 ## AI-generated doc
 
 [DeepWiki](https://deepwiki.com/yunionio/cloudpods) provides an amazing AI-generated doc of this project, you may refer to it for more detailed and comprehensive understanding of codes.
+

build/aiproxy/vars

@@ -1 +0,0 @@
-DESCRIPTION="Yunion Cloud AI Proxy Service"

build/build.sh

@@ -79,8 +79,6 @@ echo "# Yunion RPM spec
 %global pkgname yunion-$PKG
 %global homedir /var/run/%{owner}
 %global use_systemd $SERVICE
-%global debug_package %{nil}
-%global __strip /usr/bin/eu-strip
 
 Name: %{pkgname}
 Version: $VERSION

build/docker/Dockerfile.aiproxy

@@ -1,3 +0,0 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v3.22.2-0
-
-ADD ./_output/alpine-build/bin/aiproxy /opt/yunion/bin/aiproxy

build/docker/Dockerfile.ansibleserver

@@ -2,7 +2,7 @@ FROM registry.cn-beijing.aliyuncs.com/yunionio/ansibleserver-base:3.22.2-0
 
 # https://github.com/yunionio/telegraf/blob/yn-release-1.36/Makefile.yn#L28
 # install playbook and telegraf install pkg
-COPY --from=registry.cn-beijing.aliyuncs.com/yunionio/file-repo:v0.5.5 /opt/yunion/playbook /opt/yunion/playbook
-COPY --from=registry.cn-beijing.aliyuncs.com/yunionio/file-repo:v0.5.5 /opt/yunion/ansible-install-pkg /opt/yunion/ansible-install-pkg
+COPY --from=registry.cn-beijing.aliyuncs.com/yunionio/file-repo:v0.5.3 /opt/yunion/playbook /opt/yunion/playbook
+COPY --from=registry.cn-beijing.aliyuncs.com/yunionio/file-repo:v0.5.3 /opt/yunion/ansible-install-pkg /opt/yunion/ansible-install-pkg
 
 ADD ./_output/alpine-build/bin/ansibleserver /opt/yunion/bin/ansibleserver

build/docker/Dockerfile.baremetal-agent

@@ -1,4 +1,4 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/baremetal-base:v0.3.9-20260724.0
+FROM registry.cn-beijing.aliyuncs.com/yunionio/baremetal-base:v0.3.9-20251215.0
 
 LABEL maintainer="Zexi Li <lizexi@yunionyun.com>"
 

build/docker/Dockerfile.baremetal-base

@@ -1,8 +1,8 @@
 #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:v4.0.0-20251203.0 as yunionos
+FROM registry.cn-beijing.aliyuncs.com/yunionio/yunionos:v4.0.0-20251201.0 as yunionos
 
-FROM registry.cn-beijing.aliyuncs.com/cloudpods/centos:8 as grub-stage
+FROM centos:8 as grub-stage
 
 RUN sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-*
 RUN sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-*

build/docker/Dockerfile.host-deployer

@@ -1,4 +1,4 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/host-deployer-base:1.5.11
+FROM registry.cn-beijing.aliyuncs.com/yunionio/host-deployer-base:1.5.9
 
 LABEL maintainer="Yaoqi Wan wanyaoqi@yunionyun.com"
 

build/docker/Makefile

@@ -1,7 +1,6 @@
 REGISTRY ?= "registry.cn-beijing.aliyuncs.com/yunionio"
 DOCKER_BUILD = docker build -t $(REGISTRY)
 DOCKER_BUILDX = docker buildx build --platform linux/arm64,linux/amd64,linux/riscv64 --push -t $(REGISTRY)
-DOCKER_BUILDX_BM = docker buildx build --platform linux/arm64,linux/amd64 --push -t $(REGISTRY)
 
 
 debian10-base:
@@ -41,7 +40,7 @@ WEBCONSOLE_BASE_VERSION_3-22-2 = 3.22.2-1
 webconsole-base:
 	$(DOCKER_BUILDX)/webconsole-base:$(WEBCONSOLE_BASE_VERSION_3-22-2) -f ./Dockerfile.webconsole-base .
 
-BAREMETAL_BASE_VERSION = v0.3.9-20260724.0
+BAREMETAL_BASE_VERSION = v0.3.9-20251112.1
 
 FEDORA_RISCV64_VERSION = 42
 fedora-riscv64-base:
@@ -54,9 +53,8 @@ baremetal-base-riscv: fedora-riscv64-base
          $(DOCKER_BUILDX)/baremetal-base:$(BAREMETAL_BASE_VERSION) -f ./Dockerfile.baremetal-base-riscv .
          #docker push $(REGISTRY)/baremetal-base:$(BAREMETAL_BASE_VERSION)
 
-# TODO: support riscv64 for baremetal-base
 baremetal-base:
-	$(DOCKER_BUILDX_BM)/baremetal-base:$(BAREMETAL_BASE_VERSION) -f ./Dockerfile.baremetal-base .
+	$(DOCKER_BUILDX)/baremetal-base:$(BAREMETAL_BASE_VERSION) -f ./Dockerfile.baremetal-base .
 	#docker push $(REGISTRY)/baremetal-base:$(BAREMETAL_BASE_VERSION)
 
 TORRENT_VERSION = 20210815.0

cmd/aiproxy/main.go

@@ -1,26 +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 main
-
-import (
-	"yunion.io/x/onecloud/pkg/aiproxy/service"
-	"yunion.io/x/onecloud/pkg/util/atexit"
-)
-
-func main() {
-	defer atexit.Handle()
-
-	service.StartService()
-}

cmd/climc/main.go

@@ -17,7 +17,6 @@ package main
 import (
 	"yunion.io/x/onecloud/cmd/climc/entry"
 	_ "yunion.io/x/onecloud/cmd/climc/shell"
-	_ "yunion.io/x/onecloud/cmd/climc/shell/aiproxy"
 	_ "yunion.io/x/onecloud/cmd/climc/shell/ansible"
 	_ "yunion.io/x/onecloud/cmd/climc/shell/apimap"
 	_ "yunion.io/x/onecloud/cmd/climc/shell/cloudevent"

cmd/climc/shell/aiproxy/ai_key.go

@@ -1,31 +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 aiproxy
-
-import (
-	"yunion.io/x/onecloud/cmd/climc/shell"
-	apmodules "yunion.io/x/onecloud/pkg/mcclient/modules/aiproxy"
-	apoptions "yunion.io/x/onecloud/pkg/mcclient/options/aiproxy"
-)
-
-func init() {
-	cmd := shell.NewResourceCmd(&apmodules.AiKeys)
-	cmd.Create(new(apoptions.AiKeyCreateOptions))
-	cmd.List(new(apoptions.AiKeyListOptions))
-	cmd.Show(new(apoptions.AiKeyShowOptions))
-	cmd.Update(new(apoptions.AiKeyUpdateOptions))
-	cmd.Delete(new(apoptions.AiKeyDeleteOptions))
-	registerEnableDisable(cmd)
-}

cmd/climc/shell/aiproxy/ai_model.go

@@ -1,31 +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 aiproxy
-
-import (
-	"yunion.io/x/onecloud/cmd/climc/shell"
-	apmodules "yunion.io/x/onecloud/pkg/mcclient/modules/aiproxy"
-	apoptions "yunion.io/x/onecloud/pkg/mcclient/options/aiproxy"
-)
-
-func init() {
-	cmd := shell.NewResourceCmd(&apmodules.AiModels)
-	cmd.Create(new(apoptions.AiModelCreateOptions))
-	cmd.List(new(apoptions.AiModelListOptions))
-	cmd.Show(new(apoptions.AiModelShowOptions))
-	cmd.Update(new(apoptions.AiModelUpdateOptions))
-	cmd.Delete(new(apoptions.AiModelDeleteOptions))
-	registerEnableDisable(cmd)
-}

cmd/climc/shell/aiproxy/ai_provider.go

@@ -1,35 +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 aiproxy
-
-import (
-	"yunion.io/x/onecloud/cmd/climc/shell"
-	apmodules "yunion.io/x/onecloud/pkg/mcclient/modules/aiproxy"
-	"yunion.io/x/onecloud/pkg/mcclient/options"
-	apoptions "yunion.io/x/onecloud/pkg/mcclient/options/aiproxy"
-)
-
-func init() {
-	cmd := shell.NewResourceCmd(&apmodules.AiProviders)
-	cmd.Create(new(apoptions.AiProviderCreateOptions))
-	cmd.List(new(apoptions.AiProviderListOptions))
-	cmd.Show(new(apoptions.AiProviderShowOptions))
-	cmd.Update(new(apoptions.AiProviderUpdateOptions))
-	cmd.Delete(new(apoptions.AiProviderDeleteOptions))
-	cmd.PerformClass("test-connectivity", new(apoptions.AiProviderTestConnectivityOptions))
-	cmd.Perform("test-connectivity", new(options.BaseIdOptions))
-	cmd.Perform("set-models", new(apoptions.AiProviderSetModelsOptions))
-	registerEnableDisable(cmd)
-}

cmd/climc/shell/aiproxy/ai_proxy_node.go

@@ -1,32 +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 aiproxy
-
-import (
-	"yunion.io/x/onecloud/cmd/climc/shell"
-	apmodules "yunion.io/x/onecloud/pkg/mcclient/modules/aiproxy"
-	apoptions "yunion.io/x/onecloud/pkg/mcclient/options/aiproxy"
-)
-
-func init() {
-	cmd := shell.NewResourceCmd(&apmodules.AiProxyNodes)
-	cmd.Create(new(apoptions.AiProxyNodeCreateOptions))
-	cmd.List(new(apoptions.AiProxyNodeListOptions))
-	cmd.Show(new(apoptions.AiProxyNodeShowOptions))
-	cmd.Update(new(apoptions.AiProxyNodeUpdateOptions))
-	cmd.Delete(new(apoptions.AiProxyNodeDeleteOptions))
-	registerEnableDisable(cmd)
-	cmd.PerformClass("register", new(apoptions.AiProxyNodeRegisterOptions))
-}

cmd/climc/shell/aiproxy/ai_proxy_usage.go

@@ -1,55 +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 aiproxy
-
-import (
-	"yunion.io/x/onecloud/cmd/climc/shell"
-	"yunion.io/x/onecloud/pkg/mcclient"
-	"yunion.io/x/onecloud/pkg/mcclient/modulebase"
-	apmodules "yunion.io/x/onecloud/pkg/mcclient/modules/aiproxy"
-	apoptions "yunion.io/x/onecloud/pkg/mcclient/options/aiproxy"
-)
-
-func init() {
-	cmd := shell.NewResourceCmd(&apmodules.AIProxyUsage)
-	cmd.ClassShow(new(apoptions.AiProxyUsageOverviewOptions))
-	cmd.ClassShow(new(apoptions.AiProxyUsageAnalysisOptions))
-	cmd.RunWithDesc("event-list", "List ai_proxy_usage events", new(apoptions.AiProxyUsageEventListOptions),
-		func(s *mcclient.ClientSession, args *apoptions.AiProxyUsageEventListOptions) error {
-			params, err := args.Params()
-			if err != nil {
-				return err
-			}
-			ret, err := apmodules.AIProxyUsage.Get(s, args.GetId(), params)
-			if err != nil {
-				return err
-			}
-			shell.PrintList(modulebase.JSON2ListResult(ret), []string{
-				"id",
-				"timestamp",
-				"model",
-				"provider",
-				"source",
-				"api_key_label",
-				"input_tokens",
-				"output_tokens",
-				"total_tokens",
-				"latency_ms",
-				"result",
-				"status_code",
-			})
-			return nil
-		})
-}

cmd/climc/shell/aiproxy/ai_routing.go

@@ -1,32 +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 aiproxy
-
-import (
-	"yunion.io/x/onecloud/cmd/climc/shell"
-	apmodules "yunion.io/x/onecloud/pkg/mcclient/modules/aiproxy"
-	apoptions "yunion.io/x/onecloud/pkg/mcclient/options/aiproxy"
-)
-
-func init() {
-	cmd := shell.NewResourceCmd(&apmodules.AiRoutings)
-	cmd.Create(new(apoptions.AiRoutingCreateOptions))
-	cmd.List(new(apoptions.AiRoutingListOptions))
-	cmd.Show(new(apoptions.AiRoutingShowOptions))
-	cmd.Update(new(apoptions.AiRoutingUpdateOptions))
-	cmd.Delete(new(apoptions.AiRoutingDeleteOptions))
-	cmd.Perform("set-models", new(apoptions.AiRoutingSetModelsOptions))
-	registerEnableDisable(cmd)
-}

cmd/climc/shell/aiproxy/ai_routing_model.go

@@ -1,30 +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 aiproxy
-
-import (
-	"yunion.io/x/onecloud/cmd/climc/shell"
-	apmodules "yunion.io/x/onecloud/pkg/mcclient/modules/aiproxy"
-	apoptions "yunion.io/x/onecloud/pkg/mcclient/options/aiproxy"
-)
-
-func init() {
-	cmd := shell.NewResourceCmd(&apmodules.AiRoutingModels)
-	cmd.Create(new(apoptions.AiRoutingModelCreateOptions))
-	cmd.List(new(apoptions.AiRoutingModelListOptions))
-	cmd.Show(new(apoptions.AiRoutingModelShowOptions))
-	cmd.Update(new(apoptions.AiRoutingModelUpdateOptions))
-	cmd.Delete(new(apoptions.AiRoutingModelDeleteOptions))
-}

cmd/climc/shell/aiproxy/ai_virtual_key.go

@@ -1,31 +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 aiproxy
-
-import (
-	"yunion.io/x/onecloud/cmd/climc/shell"
-	apmodules "yunion.io/x/onecloud/pkg/mcclient/modules/aiproxy"
-	apoptions "yunion.io/x/onecloud/pkg/mcclient/options/aiproxy"
-)
-
-func init() {
-	cmd := shell.NewResourceCmd(&apmodules.AiVirtualKeys)
-	cmd.Create(new(apoptions.AiVirtualKeyCreateOptions))
-	cmd.List(new(apoptions.AiVirtualKeyListOptions))
-	cmd.Show(new(apoptions.AiVirtualKeyShowOptions))
-	cmd.Update(new(apoptions.AiVirtualKeyUpdateOptions))
-	cmd.Delete(new(apoptions.AiVirtualKeyDeleteOptions))
-	registerEnableDisable(cmd)
-}

cmd/climc/shell/aiproxy/codex_config.go

@@ -1,26 +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 aiproxy
-
-import (
-	"yunion.io/x/onecloud/pkg/aiproxy/codexconfig"
-	"yunion.io/x/onecloud/pkg/mcclient"
-)
-
-func init() {
-	R(&codexconfig.Options{}, "ai-codex-config", "Generate Codex CLI config for aiproxy", func(s *mcclient.ClientSession, args *codexconfig.Options) error {
-		return codexconfig.Run(s, args)
-	})
-}

cmd/climc/shell/aiproxy/common.go

@@ -1,21 +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 aiproxy
-
-import (
-	"yunion.io/x/onecloud/cmd/climc/shell"
-)
-
-var R = shell.R

cmd/climc/shell/aiproxy/doc.go

@@ -1,16 +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 aiproxy registers climc commands for the aiproxy service.
-package aiproxy // import "yunion.io/x/onecloud/cmd/climc/shell/aiproxy"

cmd/climc/shell/aiproxy/enabled.go

@@ -1,25 +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 aiproxy
-
-import (
-	"yunion.io/x/onecloud/cmd/climc/shell"
-	baseoptions "yunion.io/x/onecloud/pkg/mcclient/options"
-)
-
-func registerEnableDisable(cmd *shell.ResourceCmd) {
-	cmd.Perform("enable", new(baseoptions.BaseIdOptions))
-	cmd.Perform("disable", new(baseoptions.BaseIdOptions))
-}

cmd/climc/shell/aiproxy/test_anthropic.go

@@ -1,26 +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 aiproxy
-
-import (
-	"yunion.io/x/onecloud/pkg/aiproxy/ft"
-	"yunion.io/x/onecloud/pkg/mcclient"
-)
-
-func init() {
-	R(&ft.AnthropicOptions{}, "ai-test-anthropic", "Run aiproxy Anthropic Messages API E2E test", func(s *mcclient.ClientSession, args *ft.AnthropicOptions) error {
-		return ft.RunAnthropicTest(s, args)
-	})
-}

cmd/climc/shell/aiproxy/test_chat.go

@@ -1,26 +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 aiproxy
-
-import (
-	"yunion.io/x/onecloud/pkg/aiproxy/ft"
-	"yunion.io/x/onecloud/pkg/mcclient"
-)
-
-func init() {
-	R(&ft.ChatOptions{}, "ai-test-chat", "Run aiproxy OpenAI chat E2E test", func(s *mcclient.ClientSession, args *ft.ChatOptions) error {
-		return ft.RunChatTest(s, args)
-	})
-}

cmd/climc/shell/aiproxy/test_provider_create.go

@@ -1,26 +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 aiproxy
-
-import (
-	"yunion.io/x/onecloud/pkg/aiproxy/ft"
-	"yunion.io/x/onecloud/pkg/mcclient"
-)
-
-func init() {
-	R(&ft.ProviderCreateOptions{}, "ai-test-provider-create", "Create custom ai_provider and verify", func(s *mcclient.ClientSession, args *ft.ProviderCreateOptions) error {
-		return ft.RunProviderCreateTest(s, args)
-	})
-}

cmd/climc/shell/ansible/ansibleplaybooks.go

@@ -19,7 +19,7 @@ import (
 
 	"yunion.io/x/onecloud/pkg/mcclient"
 	modules "yunion.io/x/onecloud/pkg/mcclient/modules/ansible"
-	options "yunion.io/x/onecloud/pkg/mcclient/options/ansible"
+	"yunion.io/x/onecloud/pkg/mcclient/options"
 )
 
 func init() {

cmd/climc/shell/cloudnet/meshnetworks.go

@@ -56,9 +56,6 @@ func init() {
 	})
 	R(&options.MeshNetworkUpdateOptions{}, "meshnetwork-update", "Update mesh network", func(s *mcclient.ClientSession, opts *options.MeshNetworkUpdateOptions) error {
 		params, err := base_options.StructToParams(opts)
-		if err != nil {
-			return err
-		}
 		mn, err := modules.MeshNetworks.Update(s, opts.ID, params)
 		if err != nil {
 			return err

cmd/climc/shell/cloudnet/routers.go

@@ -56,9 +56,6 @@ func init() {
 	})
 	R(&options.RouterUpdateOptions{}, "router-update", "Update router", func(s *mcclient.ClientSession, opts *options.RouterUpdateOptions) error {
 		params, err := base_options.StructToParams(opts)
-		if err != nil {
-			return err
-		}
 		router, err := modules.Routers.Update(s, opts.ID, params)
 		if err != nil {
 			return err

cmd/climc/shell/cloudnet/routes.go

@@ -56,9 +56,6 @@ func init() {
 	})
 	R(&options.RouteUpdateOptions{}, "router-route-update", "Update router route", func(s *mcclient.ClientSession, opts *options.RouteUpdateOptions) error {
 		params, err := base_options.StructToParams(opts)
-		if err != nil {
-			return err
-		}
 		router, err := modules.Routes.Update(s, opts.ID, params)
 		if err != nil {
 			return err

cmd/climc/shell/cloudnet/rules.go

@@ -56,9 +56,6 @@ func init() {
 	})
 	R(&options.RuleUpdateOptions{}, "router-rule-update", "Update router rule", func(s *mcclient.ClientSession, opts *options.RuleUpdateOptions) error {
 		params, err := base_options.StructToParams(opts)
-		if err != nil {
-			return err
-		}
 		router, err := modules.Rules.Update(s, opts.ID, params)
 		if err != nil {
 			return err

cmd/climc/shell/compute/baremetalnetworks.go

@@ -58,7 +58,7 @@ func init() {
 
 	type HostNetworkDetailOptions struct {
 		HOST    string `help:"ID or Name of Host"`
-		NETWORK string `help:"ID or Name of Network"`
+		NETWORK string `help:"ID or Name of Wire"`
 	}
 	R(&HostNetworkDetailOptions{}, "host-network-show", "Show baremetal network details", func(s *mcclient.ClientSession, args *HostNetworkDetailOptions) error {
 		result, err := modules.Baremetalnetworks.Get(s, args.HOST, args.NETWORK, nil)

cmd/climc/shell/compute/cloudaccounts.go

@@ -24,7 +24,7 @@ func init() {
 
 	cmd := shell.NewResourceCmd(&modules.Cloudaccounts).WithKeyword("cloud-account")
 	cmd.List(&options.CloudaccountListOptions{})
-	cmd.Show(&options.CloudaccountShowOptions{})
+	cmd.Show(&options.SCloudAccountIdOptions{})
 	cmd.Delete(&options.SCloudAccountIdOptions{})
 	cmd.Update(&options.SCloudAccountUpdateBaseOptions{})
 	// cmd.PerformClassWithKeyword("preparenets-vmware", "prepare-nets", &options.SVMwareCloudAccountPrepareNetsOptions{})
@@ -41,7 +41,6 @@ func init() {
 	cmd.CreateWithKeyword("create-hcs", &options.SHCSAccountCreateOptions{})
 	cmd.CreateWithKeyword("create-hcsop", &options.SHcsOpCloudAccountCreateOptions{})
 	cmd.CreateWithKeyword("create-ucloud", &options.SUcloudCloudAccountCreateOptions{})
-	cmd.CreateWithKeyword("create-rockbase", &options.SRockbaseAccountCreateOptions{})
 	cmd.CreateWithKeyword("create-volcengine", &options.SVolcengineCloudAccountCreateOptions{})
 	cmd.CreateWithKeyword("create-zstack", &options.SZStackCloudAccountCreateOptions{})
 	cmd.CreateWithKeyword("create-s3", &options.SS3CloudAccountCreateOptions{})
@@ -77,7 +76,6 @@ func init() {
 	cmd.UpdateWithKeyword("update-hcso", &options.SHCSOAccountUpdateOptions{})
 	cmd.UpdateWithKeyword("update-hcs", &options.SHCSAccountUpdateOptions{})
 	cmd.UpdateWithKeyword("update-ucloud", &options.SUcloudCloudAccountUpdateOptions{})
-	cmd.UpdateWithKeyword("update-rockbase", &options.SRockbaseAccountUpdateOptions{})
 	cmd.UpdateWithKeyword("update-volcengine", &options.SVolcengineCloudAccountUpdateOptions{})
 	cmd.UpdateWithKeyword("update-zstack", &options.SZStackCloudAccountUpdateOptions{})
 	cmd.UpdateWithKeyword("update-s3", &options.SS3CloudAccountUpdateOptions{})
@@ -109,7 +107,6 @@ 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-rockbase", "update-credential", &options.SRockbaseAccountUpdateCredentialOptions{})
 	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{})
@@ -135,7 +132,6 @@ 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-rockbase", "test-connectivity", &options.SRockbaseAccountUpdateCredentialOptions{})
 	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/climc/shell/compute/cloudproviderregions.go

@@ -26,7 +26,7 @@ import (
 func init() {
 	type CloudproviderRegionListOptions struct {
 		options.BaseListOptions
-		Region string `help:"ID or Name of Region"`
+		Region string `help:"ID or Name of Host"`
 
 		Capability []string `help:"capability filter" choices:"project|compute|network|loadbalancer|objectstore|rds|cache|event"`
 	}

cmd/climc/shell/compute/cloudregions.go

@@ -34,18 +34,15 @@ func init() {
 	cmd.Perform("purge", &compute.CloudregionPurgeOptions{})
 
 	type CloudregionListOptions struct {
-		_ struct{} `mcp-desc:"【创建流程中的中间步骤】本工具不能完成创建。指定云厂商时必须传 provider，例如创建阿里云：provider=[\"Aliyun\"]。创建虚拟机时必须 usable=true（MCP 默认注入）。查完后继续 capability/镜像/sku，最后 climc_server_create。严禁只查区域后停止"`
-
 		options.BaseListOptions
 
-		Usable    *bool  `help:"只列网络可用的区域；创建虚拟机时必须为 true（MCP 默认注入 usable=true）" mcp:"true"`
-		UsableVpc *bool  `help:"List regions where VPC are usable" mcp:"true"`
-		Service   string `help:"List regions which service has available skus" choices:"dbinstances|servers|elasticcaches" mcp:"true"`
-		ReadOnly  *bool  `help:"List regions with read only account"`
+		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|elasticcaches"`
 
-		City string `help:"List regions in the specified city" mcp:"true"`
+		City string `help:"List regions in the specified city"`
 
-		Capability []string `help:"capability filter" choices:"project|compute|network|loadbalancer|objectstore|rds|cache|event" mcp:"true"`
+		Capability []string `help:"capability filter" choices:"project|compute|network|loadbalancer|objectstore|rds|cache|event"`
 
 		DistinctField string `help:"list the specified distinct field, e.g. city, region"`
 
@@ -151,7 +148,7 @@ func init() {
 		Desc        string  `help:"Description" json:"description" token:"desc"`
 		Latitude    float32 `help:"region geographical location - latitude"`
 		Longitude   float32 `help:"region geographical location - longitude"`
-		City        string  `help:"region geographical location - city, e.g. Beijing, Frankfurt"`
+		City        string  `help:"region geograpical location - city, e.g. Beijing, Frankfurt"`
 		CountryCode string  `help:"region geographical location - ISO country code, e.g. CN"`
 	}
 	R(&CloudregionCreateOptions{}, "cloud-region-create", "Create a cloud region", func(s *mcclient.ClientSession, args *CloudregionCreateOptions) error {
@@ -194,7 +191,7 @@ func init() {
 		Desc        string  `help:"Description of the region" json:"description" token:"desc"`
 		Latitude    float32 `help:"region geographical location - latitude"`
 		Longitude   float32 `help:"region geographical location - longitude"`
-		City        string  `help:"region geographical location - city, e.g. Beijing, Frankfurt"`
+		City        string  `help:"region geograpical location - city, e.g. Beijing, Frankfurt"`
 		CountryCode string  `help:"region geographical location - ISO country code, e.g. CN"`
 	}
 	R(&CloudregionUpdateOptions{}, "cloud-region-update", "Update a cloud region", func(s *mcclient.ClientSession, args *CloudregionUpdateOptions) error {
@@ -226,18 +223,13 @@ func init() {
 	})
 
 	type CloudregionCapabiltyOptions struct {
-		_ struct{} `mcp-desc:"【创建流程中的中间步骤】查询区域能力，尤其是可用磁盘存储类型（storage_types2 / system_storage_types）。公有云创建前必须调用：ID 用 climc_cloud_region_list 返回的 id。从返回中选系统盘 backend（如 cloud_essd、cloud_ssd），写入 disk 的 backend=。查完继续镜像/网络/sku，最后 climc_server_create"`
-
-		ID     string `help:"ID or name of cloud region to check；必须用 cloud-region-list 的 id" json:"-" mcp:"required"`
-		Domain string `help:"cloud region domain" mcp:"true"`
+		ID     string `help:"ID or name of cloud region to check" json:"-"`
+		Domain string `help:"cloud region domain"`
 
 		ShowEmulated bool `help:"show emulated cloud region"`
 	}
 	R(&CloudregionCapabiltyOptions{}, "cloud-region-capability", "Show region's capacibilities", func(s *mcclient.ClientSession, args *CloudregionCapabiltyOptions) error {
 		query, err := options.StructToParams(args)
-		if err != nil {
-			return err
-		}
 		result, err := modules.Cloudregions.GetSpecific(s, args.ID, "capability", query)
 		if err != nil {
 			return err

cmd/climc/shell/compute/common.go

@@ -24,7 +24,7 @@ var (
 	R                 = shell.R
 	printList         = shell.PrintList
 	printObject       = shell.PrintObject
-	printBatchResults = shell.PrintBatchResults
+	printBatchResults = printutils.PrintJSONBatchResults
 
 	InvalidUpdateError   = shell.InvalidUpdateError
 	printObjectRecursive = printutils.PrintJSONObjectRecursive

cmd/climc/shell/compute/dbinstances.go

@@ -29,7 +29,7 @@ func init() {
 	cmd.List(&compute.DBInstanceListOptions{})
 	cmd.Create(&compute.DBInstanceCreateOptions{})
 	cmd.Update(&compute.DBInstanceUpdateOptions{})
-	cmd.Show(&compute.DBInstanceShowOptions{})
+	cmd.Show(&compute.DBInstanceIdOptions{})
 	cmd.Delete(&compute.DBInstanceDeleteOptions{})
 	cmd.Perform("renew", &compute.DBInstanceRenewOptions{})
 	cmd.Perform("change-config", &compute.DBInstanceChangeConfigOptions{})

cmd/climc/shell/compute/disks.go

@@ -42,7 +42,7 @@ import (
 func init() {
 	cmd := shell.NewResourceCmd(&modules.Disks)
 	cmd.List(&compute_options.DiskListOptions{})
-	cmd.Show(&compute_options.DiskShowOptions{})
+	cmd.Show(&compute_options.DiskIdOptions{})
 	cmd.Perform("public", &compute_options.DiskIdOptions{})
 	cmd.Perform("private", &compute_options.DiskIdOptions{})
 	cmd.Perform("syncstatus", &compute_options.DiskIdOptions{})
@@ -55,7 +55,13 @@ func init() {
 	cmd.Perform("change-billing-type", new(compute_options.DiskChangeBillingTypeOptions))
 	cmd.Perform("change-storage-type", &compute_options.DiskChangeStorageTypeOptions{})
 
-	R(&compute_options.DiskDeleteOptions{}, "disk-delete", "Delete a disk", func(s *mcclient.ClientSession, args *compute_options.DiskDeleteOptions) error {
+	type DiskDeleteOptions struct {
+		ID                    []string `help:"ID of disks to delete" metavar:"DISK"`
+		OverridePendingDelete bool     `help:"Delete disk directly instead of pending delete" short-token:"f"`
+		DeleteSnapshots       bool     `help:"Delete disk snapshots before delete disk"`
+	}
+
+	R(&DiskDeleteOptions{}, "disk-delete", "Delete a disk", func(s *mcclient.ClientSession, args *DiskDeleteOptions) error {
 		params := jsonutils.NewDict()
 		if args.OverridePendingDelete {
 			params.Add(jsonutils.JSONTrue, "override_pending_delete")
@@ -94,7 +100,7 @@ func init() {
 		AutoSnapshot string `help:"enable/disable auto snapshot of disk" choices:"enable|disable"`
 		DiskType     string `help:"Disk type" choices:"data|volume|sys"`
 		IsSsd        *bool  `help:"mark disk as ssd" negative:"no-is-ssd"`
-		AutoReset    *bool  `help:"Enable auto reset disk after guest shutdown"`
+		AutoReset    *bool  `help:"Enable auto reset disk after geust shutdown"`
 	}
 	R(&DiskUpdateOptions{}, "disk-update", "Update property of a virtual disk", func(s *mcclient.ClientSession, args *DiskUpdateOptions) error {
 		params := jsonutils.NewDict()
@@ -167,7 +173,11 @@ func init() {
 		return nil
 	})
 
-	R(&compute_options.DiskResizeOptions{}, "disk-resize", "Resize a disk", func(s *mcclient.ClientSession, args *compute_options.DiskResizeOptions) error {
+	type DiskResizeOptions struct {
+		DISK string `help:"ID or name of disk"`
+		SIZE string `help:"Size of disk"`
+	}
+	R(&DiskResizeOptions{}, "disk-resize", "Resize a disk", func(s *mcclient.ClientSession, args *DiskResizeOptions) error {
 		params := jsonutils.NewDict()
 		params.Add(jsonutils.NewString(args.SIZE), "size")
 		disk, err := modules.Disks.PerformAction(s, args.DISK, "resize", params)
@@ -179,7 +189,7 @@ func init() {
 	})
 	type DiskResetOptions struct {
 		DISK      string `help:"ID or name of disk"`
-		SNAPSHOT  string `help:"Snapshot ID of disk"`
+		SNAPSHOT  string `help:"snapshots ID of disk"`
 		AutoStart bool   `help:"Autostart guest"`
 	}
 	R(&DiskResetOptions{}, "disk-reset", "Resize a disk", func(s *mcclient.ClientSession, args *DiskResetOptions) error {
@@ -235,9 +245,9 @@ func init() {
 
 	type DiskChangeOwnerOptions struct {
 		ID      string `help:"Disk to change owner" json:"-"`
-		PROJECT string `help:"Project ID or name" json:"tenant"`
+		PROJECT string `help:"Project ID or change" json:"tenant"`
 	}
-	R(&DiskChangeOwnerOptions{}, "disk-change-owner", "Change owner project of a disk", func(s *mcclient.ClientSession, opts *DiskChangeOwnerOptions) error {
+	R(&DiskChangeOwnerOptions{}, "disk-change-owner", "Change owner porject of a disk", func(s *mcclient.ClientSession, opts *DiskChangeOwnerOptions) error {
 		params, err := options.StructToParams(opts)
 		if err != nil {
 			return err

cmd/climc/shell/compute/elasticcache.go

@@ -27,7 +27,7 @@ import (
 func init() {
 	cmd := shell.NewResourceCmd(&modules.ElasticCache).WithKeyword("elastic-cache")
 	cmd.List(&compute.ElasticCacheListOptions{})
-	cmd.Show(&compute.ElasticCacheShowOptions{})
+	cmd.Show(&compute.ElasticCacheIdOption{})
 	cmd.Create(&compute.ElasticCacheCreateOptions{})
 	cmd.Delete(&compute.ElasticCacheIdOption{})
 	cmd.Perform("restart", &compute.ElasticCacheIdOption{})

cmd/climc/shell/compute/elasticips.go

@@ -27,7 +27,7 @@ func init() {
 	cmd.Create(&compute.EipCreateOptions{})
 	cmd.Delete(&options.BaseIdOptions{})
 	cmd.Update(&compute.EipUpdateOptions{})
-	cmd.Show(&compute.EipShowOptions{})
+	cmd.Show(&options.BaseShowOptions{})
 	cmd.Perform("purge", &options.BaseIdOptions{})
 	cmd.Perform("associate", &compute.EipAssociateOptions{})
 	cmd.Perform("dissociate", &compute.EipDissociateOptions{})

cmd/climc/shell/compute/hosts.go

@@ -36,7 +36,7 @@ import (
 
 func init() {
 	cmd := shell.NewResourceCmd(&modules.Hosts)
-	cmd.List(&compute.HostListForMcpOptions{})
+	cmd.List(&compute.HostListOptions{})
 	cmd.GetMetadata(&options.BaseIdOptions{})
 	cmd.GetProperty(&compute.HostStatusStatisticsOptions{})
 	cmd.Update(&compute.HostUpdateOptions{})
@@ -77,7 +77,6 @@ func init() {
 		stats, _ := data.GetArray("workers")
 		printList(&printutils.ListResult{Data: stats}, nil)
 	}, &options.BaseIdOptions{})
-	cmd.Get("api-stats", &options.BaseIdOptions{})
 	cmd.Get("tap-config", &options.BaseIdOptions{})
 	cmd.GetWithCustomShow("nics", func(data jsonutils.JSONObject) {
 		results := printutils.ListResult{}

cmd/climc/shell/compute/ipsets.go

@@ -1,31 +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/cmd/climc/shell"
-	modules "yunion.io/x/onecloud/pkg/mcclient/modules/compute"
-	"yunion.io/x/onecloud/pkg/mcclient/options/compute"
-)
-
-func init() {
-	cmd := shell.NewResourceCmd(&modules.IpSets)
-	cmd.List(&compute.IpSetListOptions{})
-	cmd.Show(&compute.IpSetIdOptions{})
-	cmd.Create(&compute.IpSetCreateOptions{})
-	cmd.Update(&compute.IpSetUpdateOptions{})
-	cmd.Delete(&compute.IpSetIdOptions{})
-	cmd.Perform("syncstatus", &compute.IpSetIdOptions{})
-}

cmd/climc/shell/compute/isolatedevices.go

@@ -26,12 +26,8 @@ func init() {
 	cmd.List(&compute.DeviceListOptions{})
 	cmd.Update(&compute.DeviceUpdateOptions{})
 	cmd.Show(&compute.DeviceShowOptions{})
-	cmd.Create(&compute.DeviceCreateOptions{})
 	cmd.BatchDelete(&compute.DeviceDeleteOptions{})
 	cmd.BatchPerform("purge", &compute.DevicePurgeOptions{})
 	cmd.Perform("public", &options.SharableResourcePublicOptions{})
 	cmd.Perform("private", &options.BaseIdOptions{})
-
-	scmd := shell.NewResourceCmd(&modules.ServerIsolatedDevices)
-	scmd.List(&compute.ServerDeviceListOptions{})
 }

cmd/climc/shell/compute/kafka.go

@@ -25,7 +25,7 @@ func init() {
 	cmd := shell.NewResourceCmd(&modules.Kafkas)
 	cmd.List(&compute.KafkaListOptions{})
 	cmd.Update(&compute.KafkaUpdateOptions{})
-	cmd.Show(&compute.KafkaShowOptions{})
+	cmd.Show(&compute.KafkaIdOption{})
 	cmd.Get("topics", &options.BaseIdOptions{})
 	cmd.Delete(&compute.KafkaIdOption{})
 	cmd.Perform("syncstatus", &compute.KafkaIdOption{})

cmd/climc/shell/compute/loadbalanceragents.go

@@ -97,9 +97,6 @@ func init() {
 	})
 	R(&options.LoadbalancerAgentUpdateOptions{}, "lbagent-update", "Update lbagent", func(s *mcclient.ClientSession, opts *options.LoadbalancerAgentUpdateOptions) error {
 		params, err := opts.Params()
-		if err != nil {
-			return err
-		}
 		lbagent, err := modules.LoadbalancerAgents.Update(s, opts.ID, params)
 		if err != nil {
 			return err

cmd/climc/shell/compute/loadbalancerbackends.go

@@ -55,9 +55,6 @@ func init() {
 	})
 	R(&options.LoadbalancerBackendUpdateOptions{}, "lbbackend-update", "Update lbbackend", func(s *mcclient.ClientSession, opts *options.LoadbalancerBackendUpdateOptions) error {
 		params, err := opts.Params()
-		if err != nil {
-			return err
-		}
 		lbbackend, err := modules.LoadbalancerBackends.Update(s, opts.ID, params)
 		if err != nil {
 			return err

cmd/climc/shell/compute/loadbalancerlistenerrules.go

@@ -54,9 +54,6 @@ func init() {
 	})
 	R(&options.LoadbalancerListenerRuleUpdateOptions{}, "lblistenerrule-update", "Update lblistenerrule", func(s *mcclient.ClientSession, opts *options.LoadbalancerListenerRuleUpdateOptions) error {
 		params, err := opts.Params()
-		if err != nil {
-			return err
-		}
 		lblistenerrule, err := modules.LoadbalancerListenerRules.Update(s, opts.ID, params)
 		if err != nil {
 			return err

cmd/climc/shell/compute/loadbalancerlisteners.go

@@ -87,9 +87,6 @@ func init() {
 	})
 	R(&options.LoadbalancerListenerUpdateOptions{}, "lblistener-update", "Update lblistener", func(s *mcclient.ClientSession, opts *options.LoadbalancerListenerUpdateOptions) error {
 		params, err := opts.Params()
-		if err != nil {
-			return err
-		}
 		lblistener, err := modules.LoadbalancerListeners.Update(s, opts.ID, params)
 		if err != nil {
 			return err

cmd/climc/shell/compute/mongodb.go

@@ -25,7 +25,7 @@ func init() {
 	cmd := shell.NewResourceCmd(&modules.MongoDB)
 	cmd.List(&compute.MongoDBListOptions{})
 	cmd.Update(&compute.MongoDBUpdateOptions{})
-	cmd.Show(&compute.MongoDBShowOptions{})
+	cmd.Show(&options.BaseIdOptions{})
 	cmd.Delete(&options.BaseIdOptions{})
 	cmd.Get("backups", &options.BaseIdOptions{})
 	cmd.Perform("syncstatus", &options.BaseIdOptions{})

cmd/climc/shell/compute/networkinterfacenetworks.go

@@ -25,7 +25,7 @@ import (
 func init() {
 
 	type NetworkinterfaceNetworkListOptions struct {
-		Networkinterface string `help:"ID or Name of Networkinterface"`
+		Networkinterface string `help:"ID or Name of Server"`
 		Network          string `help:"Network ID or name"`
 	}
 	R(&NetworkinterfaceNetworkListOptions{}, "networkinterface-network-list", "List server network pairs", func(s *mcclient.ClientSession, args *NetworkinterfaceNetworkListOptions) error {

cmd/climc/shell/compute/networks.go

@@ -212,7 +212,7 @@ func init() {
 
 	type NetworkChangeOwnerOptions struct {
 		ID      string `help:"Network to change owner" json:"-"`
-		PROJECT string `help:"Project ID or name" json:"tenant"`
+		PROJECT string `help:"Project ID or change" json:"tenant"`
 	}
 	R(&NetworkChangeOwnerOptions{}, "network-change-owner", "Change owner project of a network", func(s *mcclient.ClientSession, args *NetworkChangeOwnerOptions) error {
 		params, err := options.StructToParams(args)

cmd/climc/shell/compute/proxysettings.go

@@ -57,9 +57,6 @@ func init() {
 	})
 	R(&options.ProxySettingUpdateOptions{}, "proxysetting-update", "Update proxysetting", func(s *mcclient.ClientSession, opts *options.ProxySettingUpdateOptions) error {
 		params, err := options.StructToParams(opts)
-		if err != nil {
-			return err
-		}
 		proxysetting, err := modules.ProxySettings.Update(s, opts.ID, params)
 		if err != nil {
 			return err

cmd/climc/shell/compute/reservedips.go

@@ -24,10 +24,10 @@ import (
 
 func init() {
 	type NetworkReserveIPOptions struct {
-		NETWORK  string   `help:"ID or name of network"`
+		NETWORK  string   `help:"IP or name of network"`
 		NOTES    string   `help:"Why reserve this IP"`
 		IPS      []string `help:"IPs to reserve"`
-		Duration string   `help:"reservation duration, e.g. 1D, 1H, 2M"`
+		Duration string   `help:"reservation duration, e.g. 1I, 1H, 2M"`
 		Status   string   `help:"ip status"`
 	}
 	R(&NetworkReserveIPOptions{}, "network-reserve-ip", "Reserve an IP address from pool", func(s *mcclient.ClientSession, args *NetworkReserveIPOptions) error {
@@ -49,7 +49,7 @@ func init() {
 	})
 
 	type NetworkReleaseReservedIPOptions struct {
-		NETWORK string `help:"ID or name of network"`
+		NETWORK string `help:"IP or name of network"`
 		IP      string `help:"IP to release"`
 	}
 	R(&NetworkReleaseReservedIPOptions{}, "network-release-reserved-ip", "Release a reserved IP into pool", func(s *mcclient.ClientSession, args *NetworkReleaseReservedIPOptions) error {

cmd/climc/shell/compute/scaling_policy.go

@@ -49,9 +49,6 @@ func init() {
 	R(&ScalingPolicyListOptions{}, "scaling-policy-list", "List Scaling Policy", func(s *mcclient.ClientSession,
 		args *ScalingPolicyListOptions) error {
 		params, err := options.ListStructToParams(args)
-		if err != nil {
-			return err
-		}
 		policies, err := modules.ScalingPolicy.List(s, params)
 		if err != nil {
 			return err

cmd/climc/shell/compute/secgrouprules.go

@@ -17,14 +17,15 @@ 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"
 	"yunion.io/x/onecloud/pkg/mcclient/options/compute"
 )
 
 func init() {
 	cmd := shell.NewResourceCmd(&modules.SecGroupRules).WithKeyword("secgroup-rule")
 	cmd.List(&compute.SecGroupRulesListOptions{})
-	cmd.Show(&compute.SecGroupRuleShowOptions{})
-	cmd.Delete(&compute.SecGroupRuleDeleteOptions{})
+	cmd.Show(&options.BaseShowOptions{})
+	cmd.Delete(&options.BaseIdOptions{})
 	cmd.Create(&compute.SecGroupRulesCreateOptions{})
 	cmd.Update(&compute.SecGroupRulesUpdateOptions{})
 }

cmd/climc/shell/compute/secgroups.go

@@ -25,9 +25,9 @@ func init() {
 	cmd := shell.NewResourceCmd(&modules.SecGroups)
 	cmd.List(&options.SecgroupListOptions{})
 	cmd.Create(&options.SecgroupCreateOptions{})
-	cmd.Show(&options.SecgroupShowOptions{})
+	cmd.Show(&options.SecgroupIdOptions{})
 	cmd.Update(&baseoptions.BaseUpdateOptions{})
-	cmd.Delete(&options.SecgroupDeleteOptions{})
+	cmd.Delete(&options.SecgroupIdOptions{})
 	cmd.Perform("public", &options.SecgroupIdOptions{})
 	cmd.Perform("syncstatus", &options.SecgroupIdOptions{})
 	cmd.Perform("private", &options.SecgroupIdOptions{})

cmd/climc/shell/compute/serverdisks.go

@@ -77,10 +77,22 @@ func init() {
 	type ServerDiskUpdateOptions struct {
 		SERVER string `help:"ID or Name of server"`
 		DISK   string `help:"ID or Name of Disk"`
+		Driver string `help:"Driver of vDisk" choices:"virtio|ide|sata|scsi|pvscsi"`
+		Cache  string `help:"Cache mode of vDisk" choices:"writethrough|none|writeback|directsync"`
+		Aio    string `help:"Asynchronous IO mode of vDisk" choices:"native|threads"`
 		Index  int64  `help:"Index of vDisk" default:"-1"`
 	}
 	R(&ServerDiskUpdateOptions{}, "server-disk-update", "Update details of a virtual disk of a virtual server", func(s *mcclient.ClientSession, args *ServerDiskUpdateOptions) error {
 		params := jsonutils.NewDict()
+		if len(args.Driver) > 0 {
+			params.Add(jsonutils.NewString(args.Driver), "driver")
+		}
+		if len(args.Cache) > 0 {
+			params.Add(jsonutils.NewString(args.Cache), "cache_mode")
+		}
+		if len(args.Aio) > 0 {
+			params.Add(jsonutils.NewString(args.Aio), "aio_mode")
+		}
 		if args.Index >= 0 {
 			params.Add(jsonutils.NewInt(args.Index), "index")
 		}
@@ -113,12 +125,10 @@ func init() {
 	})
 
 	type ServerAttachDiskOptions struct {
-		_ struct{} `mcp-desc:"将已有硬盘挂载到虚机。SERVER/DISK 为 id/name；可选 driver。先 climc_server_list + climc_disk_list"`
-
 		SERVER string `help:"ID or name of server"`
-		DISK   string `help:"ID or name of disk to attach"`
-		Driver string `help:"Disk driver" choices:"virtio|ide|scsi" mcp:"true"`
-		Cache  string `help:"Cache mode" choices:"writeback|none|writethrough" mcp:"true"`
+		DISK   string `help:"ID of name of disk to attach"`
+		Driver string `help:"Driver" choices:"virtio|ide|scsi"`
+		Cache  string `help:"Cache mode" choices:"writeback|none|writethrought"`
 	}
 	R(&ServerAttachDiskOptions{}, "server-attach-disk", "Attach an existing virtual disks to a virtual server", func(s *mcclient.ClientSession, args *ServerAttachDiskOptions) error {
 		params := jsonutils.NewDict()
@@ -138,11 +148,9 @@ func init() {
 	})
 
 	type ServerDetachDiskOptions struct {
-		_ struct{} `mcp-desc:"从虚机卸载硬盘。SERVER/DISK 为 id/name；可选 delete-disk。先 climc_server_list / climc_disk_list"`
-
 		SERVER     string `help:"ID or name of server"`
 		DISK       string `help:"ID or name of disk to detach"`
-		DeleteDisk bool   `help:"Delete the disk after detach (ignored if disk has auto_delete)" mcp:"true"`
+		DeleteDisk bool   `help:"Delete disk if the disk not has flag of auto_delete when detached"`
 	}
 	R(&ServerDetachDiskOptions{}, "server-detach-disk", "Detach a disk from a virtual server", func(s *mcclient.ClientSession, args *ServerDetachDiskOptions) error {
 		params := jsonutils.NewDict()

cmd/climc/shell/compute/serverisolatedevices.go

@@ -23,15 +23,15 @@ import (
 
 func init() {
 	type ServerAttachDeviceOptions struct {
-		SERVER  string `help:"ID or name of server"`
-		DEVICE  string `help:"ID of isolated device to attach"`
-		GpuType string `help:"Type of GPU to attach to" choices:"HPC|VGA"`
+		SERVER string `help:"ID or name of server"`
+		DEVICE string `help:"ID of isolated device to attach"`
+		Type   string `help:"Device type" choices:"GPU-HPC|GPU-VGA|PCI"`
 	}
 	R(&ServerAttachDeviceOptions{}, "server-attach-isolated-device", "Attach an existing isolated device to a virtual server", func(s *mcclient.ClientSession, args *ServerAttachDeviceOptions) error {
 		params := jsonutils.NewDict()
 		params.Add(jsonutils.NewString(args.DEVICE), "device")
-		if args.GpuType != "" {
-			params.Add(jsonutils.NewString(args.GpuType), "gpu_type")
+		if len(args.Type) > 0 {
+			params.Add(jsonutils.NewString(args.Type), "dev_type")
 		}
 		srv, err := modules.Servers.PerformAction(s, args.SERVER, "attach-isolated-device", params)
 		if err != nil {
@@ -42,18 +42,12 @@ func init() {
 	})
 
 	type ServerDetachDeviceOptions struct {
-		SERVER  string `help:"ID or name of server"`
-		DEVICE  string `help:"ID of isolated device to detach"`
-		INDEX   int    `help:"Index of isolated device to detach"`
-		IsForce bool   `help:"Force detach isolated device"`
+		SERVER string `help:"ID or name of server"`
+		DEVICE string `help:"ID of isolated device to attach"`
 	}
 	R(&ServerDetachDeviceOptions{}, "server-detach-isolated-device", "Detach a isolated device from a virtual server", func(s *mcclient.ClientSession, args *ServerDetachDeviceOptions) error {
 		params := jsonutils.NewDict()
 		params.Add(jsonutils.NewString(args.DEVICE), "device")
-		params.Add(jsonutils.NewInt(int64(args.INDEX)), "index")
-		if args.IsForce {
-			params.Set("is_force", jsonutils.JSONTrue)
-		}
 		srv, err := modules.Servers.PerformAction(s, args.SERVER, "detach-isolated-device", params)
 		if err != nil {
 			return err

cmd/climc/shell/compute/servernetworks.go

@@ -96,7 +96,7 @@ func init() {
 
 	type ServerNetworkUpdateOptions struct {
 		SERVER      string   `help:"ID or Name of Server"`
-		NETWORK     string   `help:"ID or Name of Network"`
+		NETWORK     string   `help:"ID or Name of Wire"`
 		Mac         string   `help:"Mac of NIC"`
 		Driver      string   `help:"Driver model of vNIC" choices:"virtio|e1000|vmxnet3|rtl8139"`
 		Index       int64    `help:"Index of NIC" default:"-1"`
@@ -205,7 +205,7 @@ func init() {
 		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 from a virtual server", func(s *mcclient.ClientSession, args *ServerDetachNetworkOptions) error {
+	R(&ServerDetachNetworkOptions{}, "server-detach-network", "Detach the virtual network fron a virtual server", func(s *mcclient.ClientSession, args *ServerDetachNetworkOptions) error {
 		params := jsonutils.NewDict()
 		// params.Add(jsonutils.NewString(args.NETWORK), "net_id")
 		if args.Reserve {

cmd/climc/shell/compute/servers.go

@@ -127,9 +127,8 @@ func init() {
 	cmd.Perform("update-sub-ips", &options.ServerUpdateSubIpsOptions{})
 	cmd.BatchPerform("restore-virtual-isolated-devices", &options.ServerIdsOptions{})
 	cmd.BatchPerform("set-os-info", &options.ServerSetOSInfoOptions{})
-	// 与 server-start 复用参数时单独包一层，避免继承 mcp-desc 被注册为 MCP tool
-	cmd.BatchPerform("start-rescue", &options.ServerStartRescueOptions{})
-	cmd.BatchPerform("stop-rescue", &options.ServerStopRescueOptions{})
+	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.Perform("disable-auto-merge-snapshot", &options.ServerDisableAutoMergeSnapshot{})
@@ -159,7 +158,6 @@ func init() {
 	cmd.Perform("set-network-secgroup", new(options.ServerNetworkSecGroupsOptions))
 	cmd.Perform("add-network-secgroup", new(options.ServerNetworkSecGroupsOptions))
 	cmd.Perform("revoke-network-secgroup", new(options.ServerNetworkSecGroupsOptions))
-	cmd.Perform("change-disk-driver", new(options.ServerChangeDiskDriverOptions))
 
 	cmd.GetProperty(&options.ServerStatusStatisticsOptions{})
 	cmd.GetProperty(&options.ServerProjectStatisticsOptions{})
@@ -294,7 +292,7 @@ func init() {
 
 	type ServerDiskSnapshotOptions struct {
 		SERVER       string `help:"server ID or Name"`
-		DISK         string `help:"Disk ID for snapshot creation"`
+		DISK         string `help:"create snapshot disk id"`
 		SNAPSHOTNAME string `help:"Snapshot name"`
 	}
 	R(&ServerDiskSnapshotOptions{}, "server-disk-create-snapshot", "Task server disk snapshot", func(s *mcclient.ClientSession, args *ServerDiskSnapshotOptions) error {
@@ -734,7 +732,7 @@ func init() {
 
 	type ServerSnapshotAndClone struct {
 		ID          string `help:"ID or name of VM" json:"-"`
-		NAME        string `help:"New instance name" json:"name"`
+		NAME        string `help:"Newly instance name" json:"name"`
 		AutoStart   bool   `help:"Auto start new guest"`
 		AllowDelete bool   `help:"Allow new guest delete" json:"-"`
 		Count       int    `help:"Guest count"`
@@ -773,7 +771,7 @@ func init() {
 		ID   string `help:"ID or name of server"`
 		Save string `help:"save xml into this file"`
 	}
-	R(&ServerJnlpOptions{}, "server-jnlp", "Get baremetal server jnlp file content", func(s *mcclient.ClientSession, args *ServerJnlpOptions) error {
+	R(&ServerJnlpOptions{}, "server-jnlp", "Get baremetal server jnlp file contentn", func(s *mcclient.ClientSession, args *ServerJnlpOptions) error {
 		spec, err := modules.Servers.GetSpecific(s, args.ID, "jnlp", nil)
 		if err != nil {
 			return err

cmd/climc/shell/compute/skus.go

@@ -30,5 +30,4 @@ func init() {
 	cmd.Create(&options.ServerSkusCreateOptions{})
 	cmd.Update(&options.ServerSkusUpdateOptions{})
 	cmd.ClassShow(&options.ServerSkusListOptions{})
-	cmd.PerformClass("batch-update-price", &options.ServerSkusBatchUpdatePriceOptions{})
 }

cmd/climc/shell/compute/snapshots.go

@@ -24,18 +24,16 @@ import (
 
 func init() {
 	type SnapshotsListOptions struct {
-		_ struct{} `mcp-desc:"列出磁盘快照。可用 disk/server/disk-type 过滤"`
-
 		options.BaseListOptions
 
-		Disk        string `help:"Disk snapshots" json:"disk_id" mcp:"true"`
-		FakeDeleted bool   `help:"Show fake deleted snapshot or not" mcp:"true"`
+		Disk        string `help:"Disk snapshots" json:"disk_id"`
+		FakeDeleted bool   `help:"Show fake deleted snapshot or not"`
 		Local       *bool  `help:"Show local snapshots"`
 		Share       *bool  `help:"Show shared snapshots"`
-		DiskType    string `help:"Filter by disk type" choices:"sys|data" mcp:"true"`
-		Server      string `help:"Filter by server" json:"server_id" mcp:"true"`
-		Unused      bool   `mcp:"true"`
-		StorageId   string `help:"Filter by storage id" mcp:"true"`
+		DiskType    string `help:"Filter by disk type" choices:"sys|data"`
+		Server      string `help:"Filter by server" json:"server_id"`
+		Unused      bool
+		StorageId   string `help:"Filter by storage id"`
 
 		OrderByGuest    string
 		OrderByDiskName string

cmd/climc/shell/compute/specs.go

@@ -32,7 +32,7 @@ func init() {
 		HostType string `help:"Host type filter" choices:"baremetal|hypervisor|esxi|kubelet|hyperv"`
 		Gpu      bool   `help:"Only show gpu devices"`
 		Zone     string `help:"Filter by zone id or name"`
-		Occupied bool   `help:"show occupied host" json:"-"`
+		Occupied bool   `help:"show occupid host" json:"-"`
 	}
 	R(&ListOptions{}, "spec", "List all kinds of model specs", func(s *mcclient.ClientSession, args *ListOptions) error {
 		var params *jsonutils.JSONDict
@@ -76,7 +76,7 @@ func init() {
 		DiskSpec    []string `help:"Disk spec string, like 'Linux_adapter0_HDD_111Gx4'"`
 		Nic         int64    `help:"#Nics count of host" metavar:"<NIC_COUNT>"`
 		GpuModel    []string `help:"GPU model, like 'GeForce GTX 1050 Ti'"`
-		Occupied    bool     `help:"Show occupied host" json:"-"`
+		Occupied    bool     `help:"Show occupid host" json:"-"`
 		Manufacture string   `help:"Manufacture of host"`
 		Model       string   `help:"Model of host"`
 	}

cmd/climc/shell/compute/usages.go

@@ -31,19 +31,17 @@ import (
 )
 
 type GeneralUsageOptions struct {
-	_ struct{} `mcp-desc:"资源用量汇总（usages/general-usage）。报表「资源概览」用本工具，不要用各资源 list 凑。项目级传 project=项目名/id；域级传 project-domain；平台级 scope=system。返回 servers/rds/cache/loadbalancer/buckets/eip/snapshot/vpcs/networks/ports 及 running_servers、disks.attached 等"`
+	HostType []string `help:"Host types" choices:"hypervisor|baremetal|esxi|xen|kubelet|hyperv|aliyun|azure|aws|huawei|qcloud|openstack|ucloud|zstack|google|ctyun|cnware"`
+	Provider []string `help:"Provider" choices:"OneCloud|VMware|Aliyun|Azure|Aws|Qcloud|Huawei|OpenStack|Ucloud|VolcEngine|ZStack|Google|Ctyun|CNWare"`
+	Brand    []string `help:"Brands" choices:"OneCloud|VMware|Aliyun|Azure|Aws|Qcloud|Huawei|OpenStack|Ucloud|VolcEngine|ZStack|Google|Ctyun|CNWare"`
+	Project  string   `help:"show usage of specified project"`
 
-	HostType []string `help:"Host types" choices:"hypervisor|baremetal|esxi|xen|kubelet|hyperv|aliyun|azure|aws|huawei|qcloud|openstack|ucloud|zstack|google|ctyun|cnware" mcp:"true"`
-	Provider []string `help:"Provider" choices:"OneCloud|VMware|Aliyun|Azure|Aws|Qcloud|Huawei|OpenStack|Ucloud|VolcEngine|ZStack|Google|Ctyun|CNWare" mcp:"true"`
-	Brand    []string `help:"Brands" choices:"OneCloud|VMware|Aliyun|Azure|Aws|Qcloud|Huawei|OpenStack|Ucloud|VolcEngine|ZStack|Google|Ctyun|CNWare" mcp:"true"`
-	Project  string   `help:"show usage of specified project" mcp:"true"`
+	ProjectDomain string `help:"show usage of specified domain"`
 
-	ProjectDomain string `help:"show usage of specified domain" mcp:"true"`
+	CloudEnv string `help:"show usage of specified cloudenv" choices:"public|private|onpremise"`
+	Scope    string `help:"show usage of specified privilege scope" choices:"system|domain|project"`
 
-	CloudEnv string `help:"show usage of specified cloudenv" choices:"public|private|onpremise" mcp:"true"`
-	Scope    string `help:"show usage of specified privilege scope" choices:"system|domain|project" mcp:"true"`
-
-	Refresh bool `help:"force refresh usage statistics" mcp:"true"`
+	Refresh bool `help:"force refresh usage statistics"`
 }
 
 func fetchHostTypeOptions(args *GeneralUsageOptions) *jsonutils.JSONDict {

cmd/climc/shell/devtool/devtoolcronjob.go

@@ -57,9 +57,6 @@ func init() {
 		}
 		var result *printutils.ListResult
 		result, err = modules.DevToolCronjobs.List(s, params)
-		if err != nil {
-			return err
-		}
 		printList(result, modules.DevToolCronjobs.GetColumns(s))
 		return nil
 	})

cmd/climc/shell/devtool/devtooltemplate.go

@@ -50,9 +50,6 @@ func init() {
 		}
 		var result *printutils.ListResult
 		result, err = modules.DevToolTemplates.List(s, params)
-		if err != nil {
-			return err
-		}
 		printList(result, modules.DevToolTemplates.GetColumns(s))
 		return nil
 	})

cmd/climc/shell/events/events.go

@@ -25,15 +25,15 @@ import (
 )
 
 type BaseEventListOptions struct {
-	Scope      string   `help:"RBAC scope" choices:"project|domain|system"`
+	Scope      string   `help:"scope" choices:"project|domain|system"`
 	Since      string   `help:"Show logs since specific date" metavar:"DATETIME"`
 	Until      string   `help:"Show logs until specific date" metavar:"DATETIME"`
 	Limit      int64    `help:"Limit number of logs" default:"20"`
-	Offset     int64    `help:"Offset for pagination"`
+	Offset     int64    `help:"Offset"`
 	Ascending  bool     `help:"Ascending order"`
 	Descending bool     `help:"Descending order"`
 	OrderBy    string   `help:"order by specific field"`
-	Action     []string `help:"Filter by log action"`
+	Action     []string `help:"Log action"`
 
 	User    string `help:"filter by operator user"`
 	Project string `help:"filter by operator user's project"`

cmd/climc/shell/identity/common.go

@@ -22,9 +22,9 @@ import (
 
 var (
 	R                 = shell.R
-	printList         = shell.PrintList
-	printObject       = shell.PrintObject
-	printBatchResults = shell.PrintBatchResults
+	printList         = printutils.PrintJSONList
+	printObject       = printutils.PrintJSONObject
+	printBatchResults = printutils.PrintJSONBatchResults
 
 	InvalidUpdateError   = shell.InvalidUpdateError
 	printObjectRecursive = printutils.PrintJSONObjectRecursive

cmd/climc/shell/identity/credentials.go

@@ -28,7 +28,7 @@ import (
 
 func init() {
 	type CredentialListOptions struct {
-		Scope      string `help:"RBAC scope" choices:"project|domain|system"`
+		Scope      string `help:"scope" choices:"project|domain|system"`
 		Type       string `help:"credential type" choices:"totp|recovery_secret|aksk|enc_key|container_image"`
 		User       string `help:"filter by user"`
 		UserDomain string `help:"the domain of user"`

cmd/climc/shell/identity/domains.go

@@ -32,12 +32,10 @@ func init() {
 	cmd.GetProperty(&identity_options.DomainGetPropertyTagValuePairOptions{})
 	cmd.GetProperty(&identity_options.DomainGetPropertyTagValueTreeOptions{})
 
-	type DomainShowOptions struct {
-		_ struct{} `mcp-desc:"查询域详情。ID 可用 climc_domain_list 返回的 id/name"`
-
+	type DomainDetailOptions struct {
 		ID string `help:"ID or domain"`
 	}
-	R(&DomainShowOptions{}, "domain-show", "Show detail of domain", func(s *mcclient.ClientSession, args *DomainShowOptions) error {
+	R(&DomainDetailOptions{}, "domain-show", "Show detail of domain", func(s *mcclient.ClientSession, args *DomainDetailOptions) error {
 		result, err := modules.Domains.Get(s, args.ID, nil)
 		if err != nil {
 			return err
@@ -45,12 +43,7 @@ func init() {
 		printObject(result)
 		return nil
 	})
-	type DomainDeleteOptions struct {
-		_ struct{} `mcp-desc:"删除域。若尚不知 id，先用 climc_domain_list 定位；确认域下无项目/用户后再删"`
-
-		ID string `help:"ID or domain"`
-	}
-	R(&DomainDeleteOptions{}, "domain-delete", "Delete a domain", func(s *mcclient.ClientSession, args *DomainDeleteOptions) error {
+	R(&DomainDetailOptions{}, "domain-delete", "Delete a domain", func(s *mcclient.ClientSession, args *DomainDetailOptions) error {
 		objId, err := modules.Domains.GetId(s, args.ID, nil)
 		if err != nil {
 			return err
@@ -79,14 +72,12 @@ func init() {
 	}) */
 
 	type DomainCreateOptions struct {
-		_ struct{} `mcp-desc:"创建域。NAME 必填；可选 displayname/desc/enabled"`
-
 		NAME     string `help:"Name of domain"`
-		Desc     string `help:"Description" mcp:"true"`
-		Enabled  bool   `help:"Set the domain enabled" mcp:"true"`
-		Disabled bool   `help:"Set the domain disabled" mcp:"true"`
+		Desc     string `help:"Description"`
+		Enabled  bool   `help:"Set the domain enabled"`
+		Disabled bool   `help:"Set the domain disabled"`
 
-		Displayname string `help:"display name" mcp:"true"`
+		Displayname string `help:"display name"`
 	}
 	R(&DomainCreateOptions{}, "domain-create", "Create a new domain", func(s *mcclient.ClientSession, args *DomainCreateOptions) error {
 		params := jsonutils.NewDict()

cmd/climc/shell/identity/identityproviders.go

@@ -775,17 +775,4 @@ func init() {
 		printObject(result)
 		return nil
 	})
-
-	type IdentityProviderGetPropertyAttributeNamesOptions struct {
-		DRIVER   string `help:"driver of idp to query" json:"driver" choices:"oidc|oauth2|saml|cas"`
-		TEMPLATE string `help:"template of idp to query" json:"template"`
-	}
-	R(&IdentityProviderGetPropertyAttributeNamesOptions{}, "idp-attribute-names", "Get property attribute names of a idp", func(s *mcclient.ClientSession, args *IdentityProviderGetPropertyAttributeNamesOptions) error {
-		result, err := modules.IdentityProviders.Get(s, "attribute-names", jsonutils.Marshal(args))
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
 }

cmd/climc/shell/identity/projects.go

@@ -43,10 +43,8 @@ func init() {
 	cmd.PerformClass("clean", &identity_options.ProjectCleanOptions{})
 
 	type ProjectShowOptions struct {
-		_ struct{} `mcp-desc:"查询项目详情。ID 可用 climc_project_list 返回的 id/name；跨域时可传 domain"`
-
 		ID     string `help:"ID or Name of project"`
-		Domain string `help:"Domain" mcp:"true"`
+		Domain string `help:"Domain"`
 	}
 	R(&ProjectShowOptions{}, "project-show", "Show details of project", func(s *mcclient.ClientSession, args *ProjectShowOptions) error {
 		query := jsonutils.NewDict()
@@ -64,13 +62,7 @@ func init() {
 		printObject(result)
 		return nil
 	})
-	type ProjectDeleteOptions struct {
-		_ struct{} `mcp-desc:"删除项目。若尚不知 id，先用 climc_project_list 定位；跨域时可传 domain"`
-
-		ID     string `help:"ID or Name of project"`
-		Domain string `help:"Domain" mcp:"true"`
-	}
-	R(&ProjectDeleteOptions{}, "project-delete", "Delete a project", func(s *mcclient.ClientSession, args *ProjectDeleteOptions) error {
+	R(&ProjectShowOptions{}, "project-delete", "Delete a project", func(s *mcclient.ClientSession, args *ProjectShowOptions) error {
 		query := jsonutils.NewDict()
 		if len(args.Domain) > 0 {
 			domainId, err := modules.Domains.GetId(s, args.Domain, nil)
@@ -91,14 +83,12 @@ func init() {
 	})
 
 	type ProjectCreateOptions struct {
-		_ struct{} `mcp-desc:"创建项目。NAME 必填；可选 domain/displayname/desc"`
-
 		NAME        string `help:"Name of new project"`
-		Displayname string `help:"display name" mcp:"true"`
-		Domain      string `help:"Domain" mcp:"true"`
-		Desc        string `help:"Description" mcp:"true"`
-		Enabled     bool   `help:"Project is enabled" mcp:"true"`
-		Disabled    bool   `help:"Project is disabled" mcp:"true"`
+		Displayname string `help:"display name"`
+		Domain      string `help:"Domain"`
+		Desc        string `help:"Description"`
+		Enabled     bool   `help:"Project is enabled"`
+		Disabled    bool   `help:"Project is disabled"`
 	}
 	R(&ProjectCreateOptions{}, "project-create", "Create a project", func(s *mcclient.ClientSession, args *ProjectCreateOptions) error {
 		params := jsonutils.NewDict()

cmd/climc/shell/identity/role_assignments.go

@@ -37,11 +37,11 @@ func init() {
 		RoleDomain    string   `help:"Domain for role"`
 		Limit         int64    `help:"maximal returned number of rows"`
 		Offset        int64    `help:"offset index of returned results"`
-		Users         []string `help:"filter by user id or name"`
-		Groups        []string `help:"filter by group id or name"`
-		Roles         []string `help:"filter by role id or name"`
-		Projects      []string `help:"filter by project id or name"`
-		Domains       []string `help:"filter by domain id or name"`
+		Users         []string `help:"fitler by user id or name"`
+		Groups        []string `help:"fitler by group id or name"`
+		Roles         []string `help:"fitler by role id or name"`
+		Projects      []string `help:"fitler by project id or name"`
+		Domains       []string `help:"fitler by domain id or name"`
 
 		ProjectDomainId string
 		ProjectDomains  []string `help:"filter by project's domain id or name"`

cmd/climc/shell/identity/users.go

@@ -64,14 +64,12 @@ func init() {
 		return nil
 	})*/
 
-	type UserShowOptions struct {
-		_ struct{} `mcp-desc:"查询用户详情。ID 可用 climc_user_list 返回的 id/name；跨域时可传 domain"`
-
+	type UserDetailOptions struct {
 		ID     string `help:"ID of user"`
-		Domain string `help:"Domain" mcp:"true"`
-		System bool   `help:"show system user" mcp:"true"`
+		Domain string `help:"Domain"`
+		System bool   `help:"show system user"`
 	}
-	R(&UserShowOptions{}, "user-show", "Show details of user", func(s *mcclient.ClientSession, args *UserShowOptions) error {
+	R(&UserDetailOptions{}, "user-show", "Show details of user", func(s *mcclient.ClientSession, args *UserDetailOptions) error {
 		query := jsonutils.NewDict()
 		if len(args.Domain) > 0 {
 			domainId, err := modules.Domains.GetId(s, args.Domain, nil)
@@ -91,14 +89,7 @@ func init() {
 		return nil
 	})
 
-	type UserDeleteOptions struct {
-		_ struct{} `mcp-desc:"删除用户。若尚不知 id，先用 climc_user_list 定位；跨域时可传 domain"`
-
-		ID     string `help:"ID of user"`
-		Domain string `help:"Domain" mcp:"true"`
-		System bool   `help:"show system user" mcp:"true"`
-	}
-	R(&UserDeleteOptions{}, "user-delete", "Delete user", func(s *mcclient.ClientSession, args *UserDeleteOptions) error {
+	R(&UserDetailOptions{}, "user-delete", "Delete user", func(s *mcclient.ClientSession, args *UserDetailOptions) error {
 		query := jsonutils.NewDict()
 		if len(args.Domain) > 0 {
 			domainId, err := modules.Domains.GetId(s, args.Domain, nil)
@@ -118,11 +109,6 @@ func init() {
 		return nil
 	})
 
-	type UserDetailOptions struct {
-		ID     string `help:"ID of user"`
-		Domain string `help:"Domain"`
-		System bool   `help:"show system user"`
-	}
 	R(&UserDetailOptions{}, "user-project-list", "List projects of user", func(s *mcclient.ClientSession, args *UserDetailOptions) error {
 		query := jsonutils.NewDict()
 		if len(args.Domain) > 0 {
@@ -184,31 +170,29 @@ func init() {
 	})
 
 	type UserCreateOptions struct {
-		_ struct{} `mcp-desc:"创建用户。NAME 必填；建议传 password；可选 domain/email/mobile/displayname"`
-
 		NAME        string  `help:"Name of the new user"`
-		Domain      string  `help:"Domain" mcp:"true"`
-		Desc        string  `help:"Description" mcp:"true"`
-		Password    *string `help:"Password" mcp:"true"`
-		Displayname string  `help:"Displayname" mcp:"true"`
-		Email       string  `help:"Email" mcp:"true"`
-		Mobile      string  `help:"Mobile" mcp:"true"`
-		Enabled     bool    `help:"Enabled" mcp:"true"`
-		Disabled    bool    `help:"Disabled" mcp:"true"`
+		Domain      string  `help:"Domain"`
+		Desc        string  `help:"Description"`
+		Password    *string `help:"Password"`
+		Displayname string  `help:"Displayname"`
+		Email       string  `help:"Email"`
+		Mobile      string  `help:"Mobile"`
+		Enabled     bool    `help:"Enabled"`
+		Disabled    bool    `help:"Disabled"`
 
-		SkipPasswordComplexityCheck bool `help:"skip password complexity check" mcp:"true"`
+		SkipPasswordComplexityCheck bool `help:"do password complexity check, default is false"`
 
 		// DefaultProject string `help:"Default project"`
-		SystemAccount bool `help:"is a system account?" mcp:"true"`
-		NoWebConsole  bool `help:"disallow web console access" mcp:"true"`
-		EnableMfa     bool `help:"enable TOTP mfa" mcp:"true"`
+		SystemAccount bool `help:"is a system account?"`
+		NoWebConsole  bool `help:"allow web console access"`
+		EnableMfa     bool `help:"enable TOTP mfa"`
 
-		IdpId       string `help:"Id of identity provider to link with" mcp:"true"`
-		IdpEntityId string `help:"Entity id of identity provider to link with" mcp:"true"`
+		IdpId       string `help:"Id of identity provider to link with"`
+		IdpEntityId string `help:"Entity id of identity provider to link with"`
 
-		Lang string `help:"user default language" mcp:"true"`
+		Lang string `help:"user default language"`
 
-		Expire string `help:"user expired at" mcp:"true"`
+		Expire string `help:"user expired at"`
 	}
 	R(&UserCreateOptions{}, "user-create", "Create a user", func(s *mcclient.ClientSession, args *UserCreateOptions) error {
 		params := jsonutils.NewDict()

cmd/climc/shell/image/common.go

@@ -22,9 +22,9 @@ import (
 
 var (
 	R                 = shell.R
-	printList         = shell.PrintList
-	printObject       = shell.PrintObject
-	printBatchResults = shell.PrintBatchResults
+	printList         = printutils.PrintJSONList
+	printObject       = printutils.PrintJSONObject
+	printBatchResults = printutils.PrintJSONBatchResults
 
 	InvalidUpdateError   = shell.InvalidUpdateError
 	printObjectRecursive = printutils.PrintJSONObjectRecursive

cmd/climc/shell/image/container.go

@@ -1,138 +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 image
-
-import (
-	"io"
-	"os"
-	"strings"
-
-	"github.com/cheggaaa/pb/v3"
-
-	"yunion.io/x/jsonutils"
-	"yunion.io/x/pkg/errors"
-
-	"yunion.io/x/onecloud/cmd/climc/shell"
-	"yunion.io/x/onecloud/pkg/mcclient"
-	modules "yunion.io/x/onecloud/pkg/mcclient/modules/image"
-	baseoptions "yunion.io/x/onecloud/pkg/mcclient/options"
-	options "yunion.io/x/onecloud/pkg/mcclient/options/image"
-)
-
-func init() {
-	cmd := shell.NewResourceCmd(modules.ContainerRegistries)
-	cmd.List(new(options.ContainerRegistryListOptions))
-	cmd.Show(new(options.ContainerRegistryIdOptions))
-	cmd.Create(new(options.ContainerRegistryCreateOptions))
-	cmd.Delete(new(options.ContainerRegistryIdOptions))
-	cmd.Get("images", new(options.ContainerRegistryGetImagesOptions))
-	cmd.Get("image-tags", new(options.ContainerRegistryGetImageTagsOptions))
-	cmd.Get("config", new(options.ContainerRegistryIdOptions))
-	cmd.PerformClass("import-from-kubeserver", new(options.ContainerRegistryImportOptions))
-	cmd.Perform("public", &baseoptions.BasePublicOptions{})
-	cmd.Perform("private", &baseoptions.BaseIdOptions{})
-
-	type UploadOptions struct {
-		REGISTRY string `help:"The name or id of registry" json:"-"`
-		FILE     string `help:"The container tar image" json:"-"`
-		Name     string `help:"Override image name" json:"name"`
-		Tag      string `help:"Override image tag" json:"tag"`
-	}
-	R(new(UploadOptions), "container-registry-upload-image", "Upload a docker image", func(s *mcclient.ClientSession, args *UploadOptions) error {
-		f, err := os.Open(args.FILE)
-		if err != nil {
-			return err
-		}
-		defer f.Close()
-		finfo, err := f.Stat()
-		if err != nil {
-			return err
-		}
-		size := finfo.Size()
-		bar := pb.Full.Start64(size)
-		barReader := bar.NewProxyReader(f)
-		param := jsonutils.Marshal(args)
-		img, err := modules.ContainerRegistries.UploadImage(s, args.REGISTRY, param, barReader, size)
-		if err != nil {
-			return err
-		}
-		printObject(img)
-		return nil
-	})
-
-	type DownloadOptions struct {
-		NAME     string `help:"The name of image, e.g. 'influxdb:1.7.7'"`
-		Registry string `help:"The name or id of registry" json:"-"`
-		Output   string `help:"Saved file path"`
-		Insecure bool   `help:"Set insecure"`
-		Username string `help:"Image registry username"`
-		Password string `help:"Image registry password"`
-	}
-	R(new(DownloadOptions), "container-registry-download-image", "Download container image to a file", func(s *mcclient.ClientSession, args *DownloadOptions) error {
-		var (
-			fileName string
-			src      io.Reader
-			size     int64
-			err      error
-		)
-		if args.Registry != "" {
-			parts := strings.Split(args.NAME, ":")
-			if len(parts) != 2 {
-				return errors.Errorf("invalid NAME %q, use format <name>:<tag>", args.NAME)
-			}
-			fileName, src, size, err = modules.ContainerRegistries.DownloadImage(s, args.Registry, parts[0], parts[1])
-			if err != nil {
-				return errors.Wrap(err, "download image")
-			}
-		} else {
-			fileName, src, size, err = modules.ContainerRegistries.DownloadImageByManager(s, &modules.DownloadImageByManagerInput{
-				Insecure: args.Insecure,
-				Image:    args.NAME,
-				Username: args.Username,
-				Password: args.Password,
-			})
-			if err != nil {
-				return errors.Wrap(err, "download image by manager")
-			}
-		}
-		output := args.Output
-		if output == "" && fileName != "" {
-			output = fileName
-		}
-		if output == "" {
-			return errors.Errorf("--output filepath must provide")
-		}
-		f, err := os.Create(output)
-		if err != nil {
-			return errors.Wrapf(err, "create saved file: %q", args.Output)
-		}
-		defer f.Close()
-		bar := pb.Full.Start64(size)
-		barReader := bar.NewProxyReader(src)
-		if _, err := io.Copy(f, barReader); err != nil {
-			return errors.Wrap(err, "save image")
-		}
-		return nil
-	})
-
-	imgCmd := shell.NewResourceCmd(&modules.ContainerImages)
-	imgCmd.List(new(options.ContainerImageListOptions))
-	imgCmd.Show(new(options.ContainerImageIdOptions))
-	imgCmd.Create(new(options.ContainerImageCreateOptions))
-	imgCmd.Update(new(options.ContainerImageUpdateOptions))
-	imgCmd.Delete(new(options.ContainerImageIdOptions))
-	imgCmd.Perform("public", &baseoptions.BasePublicOptions{})
-	imgCmd.Perform("private", &baseoptions.BaseIdOptions{})
-}

cmd/climc/shell/image/images.go

@@ -56,10 +56,10 @@ type ImageOptionalOptions struct {
 	OsCodename         string   `help:"Codename of OS"`
 	OsArch             string   `help:"Os hardware architecture" choices:"x86|x86_64|aarch32|aarch64|riscv32|riscv64"`
 	OsLang             string   `help:"OS Language" choices:"zh_CN|en_US"`
-	Preference         int64    `help:"Image disk preference weight"`
+	Preference         int64    `help:"Disk preferences"`
 	Notes              string   `help:"Notes about the image"`
 	Hypervisor         []string `help:"Prefer hypervisor type" choices:"kvm|esxi|baremetal|container|openstack|ctyun"`
-	DiskDriver         string   `help:"Prefer disk driver" choices:"virtio|scsi|pvscsi|ide|sata"`
+	DiskDriver         string   `help:"Perfer disk driver" choices:"virtio|scsi|pvscsi|ide|sata"`
 	NetDriver          string   `help:"Preferred network driver" choices:"virtio|e1000|vmxnet3"`
 	DisableUsbKbd      bool     `help:"Disable usb keyboard on this image(for hypervisor kvm)"`
 	BootMode           string   `help:"UEFI support" choices:"UEFI|BIOS"`

cmd/climc/shell/k8s/clusters.go

@@ -52,7 +52,6 @@ func initKubeCluster() {
 	cmd.Perform("delete-machines", new(o.KubeClusterDeleteMachinesOptions))
 	cmd.Perform("add-machines", new(o.KubeClusterAddMachinesOptions))
 	cmd.PerformClass("gc", new(o.ClusterGCOpts))
-	cmd.PerformClass("history-data-clean", new(o.ClusterHistoryDataCleanOpts))
 	cmd.Perform("set-extra-config", new(o.ClusterSetExtraConfigOpt))
 	cmd.Get("extra-config", new(o.IdentOptions))
 
@@ -312,9 +311,6 @@ func initKubeCluster() {
 
 		// 2. edit yaml
 		yaml, err := shellutils.Edit(setting.YAMLString())
-		if err != nil {
-			return errors.Wrap(err, "edit component setting")
-		}
 		if len(yaml) == 0 {
 			if !args.Force {
 				log.Infof("Nothing to update")

cmd/climc/shell/k8s/container_registry.go

@@ -43,7 +43,7 @@ func initContainerRegistry() {
 	type UploadOptions struct {
 		REGISTRY string `help:"The name or id of registry" json:"-"`
 		FILE     string `help:"The container tar image" json:"-"`
-		Name     string `help:"Override image name" json:"name"`
+		Name     string `help:"Override image name" json:"name`
 		Tag      string `help:"Override image tag" json:"tag"`
 	}
 	R(new(UploadOptions), "k8s-container-registry-upload-image", "Upload a docker image", func(s *mcclient.ClientSession, args *UploadOptions) error {
@@ -101,9 +101,6 @@ func initContainerRegistry() {
 				Username: args.Username,
 				Password: args.Password,
 			})
-			if err != nil {
-				return errors.Wrap(err, "download image by manager")
-			}
 		}
 		output := args.Output
 		if output == "" && fileName != "" {