fix(region): reset guest quorum child index on guest shutdown (#25136)

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

.editorconfig

@@ -0,0 +1,3 @@
+[*.sh]
+indent_style = space
+indent_size = 4

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

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

.github/workflows/docker.yml

@@ -1,233 +0,0 @@
-name: Docker image
-
-on:
-  push:
-    branches:
-    - master
-    - releases/*
-    #paths:
-    #- 'cmd/*'
-    #- 'pkg/*'
-    #- 'vendor/*'
-
-jobs:
-
-  build:
-    name: Build
-    runs-on: ubuntu-latest
-    steps:
-
-    - name: Set up Go 1.16
-      uses: actions/setup-go@v1
-      with:
-        go-version: 1.16
-      id: go
-
-    - name: Check out code into the Go module directory
-      uses: actions/checkout@v1
-
-    - name: Build
-      run: |
-        sudo apt-get update
-        sudo apt-get install librados-dev librbd-dev # baremetal-agent needs this
-        make cmd/baremetal-agent && ./scripts/bundle_libraries.sh _output/bin/bundles/baremetal-agent _output/bin/baremetal-agent
-        make docker-alpine-build F='-j4 cmd/host cmd/vpcagent cmd/region-dns make cmd/apigateway cmd/climc cmd/keystone make cmd/logger cmd/region cmd/scheduler cmd/webconsole make cmd/yunionconf cmd/glance cmd/torrent cmd/s3gateway make cmd/ansibleserver cmd/cloudnet cmd/notify make cmd/host-deployer make cmd/cloudevent cmd/devtool cmd/cloudid make cmd/*cli make cmd/esxi-agent'
-    - name: Image region
-      uses: elgohr/Publish-Docker-Github-Action@master
-      with:
-        name: registry.cn-beijing.aliyuncs.com/yunionio/region
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
-        registry: registry.cn-beijing.aliyuncs.com
-        snapshot: true
-        dockerfile: build/docker/Dockerfile.region
-
-    - name: Image host
-      uses: elgohr/Publish-Docker-Github-Action@master
-      with:
-        name: registry.cn-beijing.aliyuncs.com/yunionio/host
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
-        registry: registry.cn-beijing.aliyuncs.com
-        snapshot: true
-        dockerfile: build/docker/Dockerfile.host
-
-    - name: Image host-deployer
-      uses: elgohr/Publish-Docker-Github-Action@master
-      with:
-        name: registry.cn-beijing.aliyuncs.com/yunionio/host-deployer
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
-        registry: registry.cn-beijing.aliyuncs.com
-        snapshot: true
-        dockerfile: build/docker/Dockerfile.host-deployer
-
-    - name: Image baremetal-agent
-      uses: elgohr/Publish-Docker-Github-Action@master
-      with:
-        name: registry.cn-beijing.aliyuncs.com/yunionio/baremetal-agent
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
-        registry: registry.cn-beijing.aliyuncs.com
-        snapshot: true
-        dockerfile: build/docker/Dockerfile.baremetal-agent
-
-    - name: Image esxi-agent
-      uses: elgohr/Publish-Docker-Github-Action@master
-      with:
-        name: registry.cn-beijing.aliyuncs.com/yunionio/esxi-agent
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
-        registry: registry.cn-beijing.aliyuncs.com
-        snapshot: true
-        dockerfile: build/docker/Dockerfile.esxi-agent
-
-    - name: Image vpcagent
-      uses: elgohr/Publish-Docker-Github-Action@master
-      with:
-        name: registry.cn-beijing.aliyuncs.com/yunionio/vpcagent
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
-        registry: registry.cn-beijing.aliyuncs.com
-        snapshot: true
-        dockerfile: build/docker/Dockerfile.vpcagent
-
-    - name: Image climc
-      uses: elgohr/Publish-Docker-Github-Action@master
-      with:
-        name: registry.cn-beijing.aliyuncs.com/yunionio/climc
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
-        registry: registry.cn-beijing.aliyuncs.com
-        snapshot: true
-        dockerfile: build/docker/Dockerfile.climc
-
-    - name: Image keystone
-      uses: elgohr/Publish-Docker-Github-Action@master
-      with:
-        name: registry.cn-beijing.aliyuncs.com/yunionio/keystone
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
-        registry: registry.cn-beijing.aliyuncs.com
-        snapshot: true
-        dockerfile: build/docker/Dockerfile.keystone
-
-    - name: Image logger
-      uses: elgohr/Publish-Docker-Github-Action@master
-      with:
-        name: registry.cn-beijing.aliyuncs.com/yunionio/logger
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
-        registry: registry.cn-beijing.aliyuncs.com
-        snapshot: true
-        dockerfile: build/docker/Dockerfile.logger
-
-    - name: Image scheduler
-      uses: elgohr/Publish-Docker-Github-Action@master
-      with:
-        name: registry.cn-beijing.aliyuncs.com/yunionio/scheduler
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
-        registry: registry.cn-beijing.aliyuncs.com
-        snapshot: true
-        dockerfile: build/docker/Dockerfile.scheduler
-
-    - name: Image apigateway
-      uses: elgohr/Publish-Docker-Github-Action@master
-      with:
-        name: registry.cn-beijing.aliyuncs.com/yunionio/apigateway
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
-        registry: registry.cn-beijing.aliyuncs.com
-        snapshot: true
-        dockerfile: build/docker/Dockerfile.apigateway
-
-    - name: Image s3gateway
-      uses: elgohr/Publish-Docker-Github-Action@master
-      with:
-        name: registry.cn-beijing.aliyuncs.com/yunionio/s3gateway
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
-        registry: registry.cn-beijing.aliyuncs.com
-        snapshot: true
-        dockerfile: build/docker/Dockerfile.s3gateway
-
-    - name: Image ansibleserver
-      uses: elgohr/Publish-Docker-Github-Action@master
-      with:
-        name: registry.cn-beijing.aliyuncs.com/yunionio/ansibleserver
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
-        registry: registry.cn-beijing.aliyuncs.com
-        snapshot: true
-        dockerfile: build/docker/Dockerfile.ansibleserver
-
-    - name: Image cloudnet
-      uses: elgohr/Publish-Docker-Github-Action@master
-      with:
-        name: registry.cn-beijing.aliyuncs.com/yunionio/cloudnet
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
-        registry: registry.cn-beijing.aliyuncs.com
-        snapshot: true
-        dockerfile: build/docker/Dockerfile.cloudnet
-
-    - name: Image glance
-      uses: elgohr/Publish-Docker-Github-Action@master
-      with:
-        name: registry.cn-beijing.aliyuncs.com/yunionio/glance
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
-        registry: registry.cn-beijing.aliyuncs.com
-        snapshot: true
-        dockerfile: build/docker/Dockerfile.glance
-
-    - name: Image notify
-      uses: elgohr/Publish-Docker-Github-Action@master
-      with:
-        name: registry.cn-beijing.aliyuncs.com/yunionio/notify
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
-        registry: registry.cn-beijing.aliyuncs.com
-        snapshot: true
-        dockerfile: build/docker/Dockerfile.notify
-
-    - name: Image cloudevent
-      uses: elgohr/Publish-Docker-Github-Action@master
-      with:
-        name: registry.cn-beijing.aliyuncs.com/yunionio/cloudevent
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
-        registry: registry.cn-beijing.aliyuncs.com
-        snapshot: true
-        dockerfile: build/docker/Dockerfile.cloudevent
-
-    - name: Image cloudid
-      uses: elgohr/Publish-Docker-Github-Action@master
-      with:
-        name: registry.cn-beijing.aliyuncs.com/yunionio/cloudid
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
-        registry: registry.cn-beijing.aliyuncs.com
-        snapshot: true
-        dockerfile: build/docker/Dockerfile.cloudid
-
-    - name: Image devtool
-      uses: elgohr/Publish-Docker-Github-Action@master
-      with:
-        name: registry.cn-beijing.aliyuncs.com/yunionio/devtool
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
-        registry: registry.cn-beijing.aliyuncs.com
-        snapshot: true
-        dockerfile: build/docker/Dockerfile.devtool
-
-    - name: Image region DNS
-      uses: elgohr/Publish-Docker-Github-Action@master
-      with:
-        name: registry.cn-beijing.aliyuncs.com/yunionio/region-dns
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
-        registry: registry.cn-beijing.aliyuncs.com
-        snapshot: true
-        dockerfile: build/docker/Dockerfile.region-dns

.github/workflows/docker_apigateway.yml

@@ -0,0 +1,52 @@
+name: Apigateway Docker Image
+
+on:
+  push:
+    branches:
+      - 'releases/**'
+      - 'main'
+      - 'master'
+    paths:
+      - 'pkg/appsrv/**.go'
+      - 'pkg/cloudcommon/db/**.go'
+      - 'pkg/apigateway/**.go'
+      - 'pkg/apis/apigateway/**.go'
+      - 'pkg/mcclient/modules/**.go'
+jobs:
+  build_apigateway:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+      with:
+        fetch-depth: 8
+        
+    - uses: actions/setup-go@v4
+      with:
+        go-version: '1.18'
+        
+    - name: Set up QEMU
+      uses: docker/setup-qemu-action@v2
+      
+    - name: Set up Docker Buildx
+      id: buildx
+      uses: docker/setup-buildx-action@v2
+      
+    - name: Login to Aliyun Container Registry (ACR)
+      uses: docker/login-action@v2
+      with:
+        registry: https://registry.us-west-1.aliyuncs.com
+        username: ${{ secrets.ACR_USERNAME }}
+        password: ${{ secrets.ACR_PASSWORD }}
+       
+    - name: Build And Push Docker Image
+      shell: bash
+      run: |
+          set -o xtrace
+          export GO111MODULE=on
+          branch="${GITHUB_REF#refs/heads/}"
+          timestamp=`TZ="Asia/Shanghai" date +"%Y%m%d%H%M%S"`
+          export VERSION="$branch-$timestamp-solo"
+          export GOOS=linux
+          export ARCH=all
+          export REGISTRY=registry.us-west-1.aliyuncs.com/yunion-dev
+          make image apigateway

.github/workflows/docker_climc.yml

@@ -0,0 +1,50 @@
+name: Climc Docker Image
+
+on:
+  push:
+    branches:
+      - 'releases/**'
+      - 'main'
+      - 'master'
+    paths:
+      - 'cmd/climc/**.go'
+      - 'pkg/mcclient/**.go'
+      - 'vendor/yunion.io/x/structarg/**.go'
+jobs:
+  build_climc:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+      with:
+        fetch-depth: 8
+        
+    - uses: actions/setup-go@v4
+      with:
+        go-version: '1.18'
+        
+    - name: Set up QEMU
+      uses: docker/setup-qemu-action@v2
+      
+    - name: Set up Docker Buildx
+      id: buildx
+      uses: docker/setup-buildx-action@v2
+      
+    - name: Login to Aliyun Container Registry (ACR)
+      uses: docker/login-action@v2
+      with:
+        registry: https://registry.us-west-1.aliyuncs.com
+        username: ${{ secrets.ACR_USERNAME }}
+        password: ${{ secrets.ACR_PASSWORD }}
+        
+    - name: Build And Push Docker Image
+      shell: bash
+      run: |
+          set -o xtrace
+          export GO111MODULE=on
+          branch="${GITHUB_REF#refs/heads/}"
+          timestamp=`TZ="Asia/Shanghai" date +"%Y%m%d%H%M%S"`
+          export VERSION="$branch-$timestamp-solo"
+          export GOOS=linux
+          export ARCH=all
+          export REGISTRY=registry.us-west-1.aliyuncs.com/yunion-dev
+          make image climc

.github/workflows/docker_cloudmon.yml

@@ -0,0 +1,51 @@
+name: Cloudmon Docker Image
+
+on:
+  push:
+    branches:
+      - 'releases/**'
+      - 'main'
+      - 'master'
+    paths:
+      - 'pkg/appsrv/**.go'
+      - 'pkg/cloudmon/**.go'
+      - 'vendor/yunion.io/x/cloudmux/pkg/multicloud/loader/**.go'
+
+jobs:
+  build_webconsole:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+      with:
+        fetch-depth: 8
+        
+    - uses: actions/setup-go@v4
+      with:
+        go-version: '1.18'
+        
+    - name: Set up QEMU
+      uses: docker/setup-qemu-action@v2
+      
+    - name: Set up Docker Buildx
+      id: buildx
+      uses: docker/setup-buildx-action@v2
+      
+    - name: Login to Aliyun Container Registry (ACR)
+      uses: docker/login-action@v2
+      with:
+        registry: https://registry.us-west-1.aliyuncs.com
+        username: ${{ secrets.ACR_USERNAME }}
+        password: ${{ secrets.ACR_PASSWORD }}
+        
+    - name: Build And Push Docker Image
+      shell: bash
+      run: |
+          set -o xtrace
+          export GO111MODULE=on
+          branch="${GITHUB_REF#refs/heads/}"
+          timestamp=`TZ="Asia/Shanghai" date +"%Y%m%d%H%M%S"`
+          export VERSION="$branch-$timestamp-solo"
+          export GOOS=linux
+          export ARCH=all
+          export REGISTRY=registry.us-west-1.aliyuncs.com/yunion-dev
+          make image cloudmon

.github/workflows/docker_esxi_agent.yml

@@ -0,0 +1,49 @@
+name: Esxi Agent Docker Image
+
+on:
+  push:
+    branches:
+      - 'releases/**'
+      - 'main'
+      - 'master'
+    paths:
+      - 'pkg/esxi/**.go'
+
+jobs:
+  build_webconsole:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+      with:
+        fetch-depth: 8
+        
+    - uses: actions/setup-go@v4
+      with:
+        go-version: '1.18'
+        
+    - name: Set up QEMU
+      uses: docker/setup-qemu-action@v2
+      
+    - name: Set up Docker Buildx
+      id: buildx
+      uses: docker/setup-buildx-action@v2
+      
+    - name: Login to Aliyun Container Registry (ACR)
+      uses: docker/login-action@v2
+      with:
+        registry: https://registry.us-west-1.aliyuncs.com
+        username: ${{ secrets.ACR_USERNAME }}
+        password: ${{ secrets.ACR_PASSWORD }}
+        
+    - name: Build And Push Docker Image
+      shell: bash
+      run: |
+          set -o xtrace
+          export GO111MODULE=on
+          branch="${GITHUB_REF#refs/heads/}"
+          timestamp=`TZ="Asia/Shanghai" date +"%Y%m%d%H%M%S"`
+          export VERSION="$branch-$timestamp-solo"
+          export GOOS=linux
+          export ARCH=all
+          export REGISTRY=registry.us-west-1.aliyuncs.com/yunion-dev
+          make image esxi-agent

.github/workflows/docker_glance.yml

@@ -0,0 +1,53 @@
+name: Glance Docker Image
+
+on:
+  push:
+    branches:
+      - 'releases/**'
+      - 'main'
+      - 'master'
+    paths:
+      - 'pkg/appsrv/**.go'
+      - 'pkg/cloudcommon/db/**.go'
+      - 'pkg/image/**.go'
+      - 'pkg/apis/image/**.go'
+      - 'vendor/yunion.io/x/sqlchemy/**.go'
+      - 'vendor/yunion.io/x/jsonutils/**.go'
+jobs:
+  build_glance:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+      with:
+        fetch-depth: 8
+        
+    - uses: actions/setup-go@v4
+      with:
+        go-version: '1.18'
+        
+    - name: Set up QEMU
+      uses: docker/setup-qemu-action@v2
+      
+    - name: Set up Docker Buildx
+      id: buildx
+      uses: docker/setup-buildx-action@v2
+      
+    - name: Login to Aliyun Container Registry (ACR)
+      uses: docker/login-action@v2
+      with:
+        registry: https://registry.us-west-1.aliyuncs.com
+        username: ${{ secrets.ACR_USERNAME }}
+        password: ${{ secrets.ACR_PASSWORD }}
+        
+    - name: Build And Push Docker Image
+      shell: bash
+      run: |
+          set -o xtrace
+          export GO111MODULE=on
+          branch="${GITHUB_REF#refs/heads/}"
+          timestamp=`TZ="Asia/Shanghai" date +"%Y%m%d%H%M%S"`
+          export VERSION="$branch-$timestamp-solo"
+          export GOOS=linux
+          export ARCH=all
+          export REGISTRY=registry.us-west-1.aliyuncs.com/yunion-dev
+          make image glance

.github/workflows/docker_host.yml

@@ -0,0 +1,49 @@
+name: Host Docker Image
+
+on:
+  push:
+    branches:
+      - 'releases/**'
+      - 'main'
+      - 'master'
+    paths:
+      - 'pkg/hostman/**.go'
+      - 'pkg/apis/host/**.go'
+jobs:
+  build_host:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+      with:
+        fetch-depth: 8
+        
+    - uses: actions/setup-go@v4
+      with:
+        go-version: '1.18'
+        
+    - name: Set up QEMU
+      uses: docker/setup-qemu-action@v2
+      
+    - name: Set up Docker Buildx
+      id: buildx
+      uses: docker/setup-buildx-action@v2
+
+    - name: Login to Aliyun Container Registry (ACR)
+      uses: docker/login-action@v2
+      with:
+        registry: https://registry.us-west-1.aliyuncs.com
+        username: ${{ secrets.ACR_USERNAME }}
+        password: ${{ secrets.ACR_PASSWORD }}
+        
+    - name: Build And Push Docker Image
+      shell: bash
+      run: |
+          set -o xtrace
+          export GO111MODULE=on
+          branch="${GITHUB_REF#refs/heads/}"
+          timestamp=`TZ="Asia/Shanghai" date +"%Y%m%d%H%M%S"`
+          export VERSION="$branch-$timestamp-solo"
+          export GOOS=linux
+          export ARCH=all
+          export REGISTRY=registry.us-west-1.aliyuncs.com/yunion-dev
+          make image host

.github/workflows/docker_keystone.yml

@@ -0,0 +1,53 @@
+name: Keystone Docker Image
+
+on:
+  push:
+    branches:
+      - 'releases/**'
+      - 'main'
+      - 'master'
+    paths:
+      - 'pkg/appsrv/**.go'
+      - 'pkg/cloudcommon/db/**.go'
+      - 'pkg/keystone/**.go'
+      - 'pkg/apis/identity/**.go'
+      - 'vendor/yunion.io/x/sqlchemy/**.go'
+      - 'vendor/yunion.io/x/jsonutils/**.go'
+jobs:
+  build_keystone:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+      with:
+        fetch-depth: 8
+        
+    - uses: actions/setup-go@v4
+      with:
+        go-version: '1.18'
+        
+    - name: Set up QEMU
+      uses: docker/setup-qemu-action@v2
+      
+    - name: Set up Docker Buildx
+      id: buildx
+      uses: docker/setup-buildx-action@v2
+      
+    - name: Login to Aliyun Container Registry (ACR)
+      uses: docker/login-action@v2
+      with:
+        registry: https://registry.us-west-1.aliyuncs.com
+        username: ${{ secrets.ACR_USERNAME }}
+        password: ${{ secrets.ACR_PASSWORD }}
+       
+    - name: Build And Push Docker Image
+      shell: bash
+      run: |
+          set -o xtrace
+          export GO111MODULE=on
+          branch="${GITHUB_REF#refs/heads/}"
+          timestamp=`TZ="Asia/Shanghai" date +"%Y%m%d%H%M%S"`
+          export VERSION="$branch-$timestamp-solo"
+          export GOOS=linux
+          export ARCH=all
+          export REGISTRY=registry.us-west-1.aliyuncs.com/yunion-dev
+          make image keystone

.github/workflows/docker_logger.yml

@@ -0,0 +1,53 @@
+name: Logger Docker Image
+
+on:
+  push:
+    branches:
+      - 'releases/**'
+      - 'main'
+      - 'master'
+    paths:
+      - 'pkg/appsrv/**.go'
+      - 'pkg/cloudcommon/db/**.go'
+      - 'pkg/logger/**.go'
+      - 'pkg/apis/logger/**.go'
+      - 'vendor/yunion.io/x/sqlchemy/**.go'
+      - 'vendor/yunion.io/x/jsonutils/**.go'
+jobs:
+  build_webconsole:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+      with:
+        fetch-depth: 8
+        
+    - uses: actions/setup-go@v4
+      with:
+        go-version: '1.18'
+        
+    - name: Set up QEMU
+      uses: docker/setup-qemu-action@v2
+      
+    - name: Set up Docker Buildx
+      id: buildx
+      uses: docker/setup-buildx-action@v2
+      
+    - name: Login to Aliyun Container Registry (ACR)
+      uses: docker/login-action@v2
+      with:
+        registry: https://registry.us-west-1.aliyuncs.com
+        username: ${{ secrets.ACR_USERNAME }}
+        password: ${{ secrets.ACR_PASSWORD }}
+        
+    - name: Build And Push Docker Image
+      shell: bash
+      run: |
+          set -o xtrace
+          export GO111MODULE=on
+          branch="${GITHUB_REF#refs/heads/}"
+          timestamp=`TZ="Asia/Shanghai" date +"%Y%m%d%H%M%S"`
+          export VERSION="$branch-$timestamp-solo"
+          export GOOS=linux
+          export ARCH=all
+          export REGISTRY=registry.us-west-1.aliyuncs.com/yunion-dev
+          make image logger

.github/workflows/docker_notify.yml

@@ -0,0 +1,53 @@
+name: Notify Docker Image
+
+on:
+  push:
+    branches:
+      - 'releases/**'
+      - 'main'
+      - 'master'
+    paths:
+      - 'pkg/appsrv/**.go'
+      - 'pkg/cloudcommon/db/**.go'
+      - 'pkg/notify/**.go'
+      - 'pkg/apis/notify/**.go'
+      - 'vendor/yunion.io/x/sqlchemy/**.go'
+      - 'vendor/yunion.io/x/jsonutils/**.go'
+jobs:
+  build_notify:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+      with:
+        fetch-depth: 8
+        
+    - uses: actions/setup-go@v4
+      with:
+        go-version: '1.18'
+        
+    - name: Set up QEMU
+      uses: docker/setup-qemu-action@v2
+      
+    - name: Set up Docker Buildx
+      id: buildx
+      uses: docker/setup-buildx-action@v2
+      
+    - name: Login to Aliyun Container Registry (ACR)
+      uses: docker/login-action@v2
+      with:
+        registry: https://registry.us-west-1.aliyuncs.com
+        username: ${{ secrets.ACR_USERNAME }}
+        password: ${{ secrets.ACR_PASSWORD }}
+
+    - name: Build And Push Docker Image
+      shell: bash
+      run: |
+          set -o xtrace
+          export GO111MODULE=on
+          branch="${GITHUB_REF#refs/heads/}"
+          timestamp=`TZ="Asia/Shanghai" date +"%Y%m%d%H%M%S"`
+          export VERSION="$branch-$timestamp-solo"
+          export GOOS=linux
+          export ARCH=all
+          export REGISTRY=registry.us-west-1.aliyuncs.com/yunion-dev
+          make image notify

.github/workflows/docker_region.yml

@@ -0,0 +1,54 @@
+name: Region Docker Image
+
+on:
+  push:
+    branches:
+      - 'releases/**'
+      - 'main'
+      - 'master'
+    paths:
+      - 'pkg/appsrv/**.go'
+      - 'pkg/cloudcommon/db/**.go'
+      - 'pkg/compute/**.go'
+      - 'pkg/apis/compute/**.go'
+      - 'vendor/yunion.io/x/cloudmux/**.go'
+      - 'vendor/yunion.io/x/sqlchemy/**.go'
+      - 'vendor/yunion.io/x/jsonutils/**.go'
+jobs:
+  build_region:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+      with:
+        fetch-depth: 8
+        
+    - uses: actions/setup-go@v4
+      with:
+        go-version: '1.18'
+        
+    - name: Set up QEMU
+      uses: docker/setup-qemu-action@v2
+      
+    - name: Set up Docker Buildx
+      id: buildx
+      uses: docker/setup-buildx-action@v2
+      
+    - name: Login to Aliyun Container Registry (ACR)
+      uses: docker/login-action@v2
+      with:
+        registry: https://registry.us-west-1.aliyuncs.com
+        username: ${{ secrets.ACR_USERNAME }}
+        password: ${{ secrets.ACR_PASSWORD }}
+        
+    - name: Build And Push Docker Image
+      shell: bash
+      run: |
+          set -o xtrace
+          export GO111MODULE=on
+          branch="${GITHUB_REF#refs/heads/}"
+          timestamp=`TZ="Asia/Shanghai" date +"%Y%m%d%H%M%S"`
+          export VERSION="$branch-$timestamp-solo"
+          export GOOS=linux
+          export ARCH=all
+          export REGISTRY=registry.us-west-1.aliyuncs.com/yunion-dev
+          make image region

.github/workflows/docker_scheduler.yml

@@ -0,0 +1,50 @@
+name: Scheduler Docker Image
+
+on:
+  push:
+    branches:
+      - 'releases/**'
+      - 'main'
+      - 'master'
+    paths:
+      - 'pkg/scheduler/**.go'
+      - 'pkg/apis/scheduler/**.go'
+
+jobs:
+  build_webconsole:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+      with:
+        fetch-depth: 8
+        
+    - uses: actions/setup-go@v4
+      with:
+        go-version: '1.18'
+        
+    - name: Set up QEMU
+      uses: docker/setup-qemu-action@v2
+      
+    - name: Set up Docker Buildx
+      id: buildx
+      uses: docker/setup-buildx-action@v2
+      
+    - name: Login to Aliyun Container Registry (ACR)
+      uses: docker/login-action@v2
+      with:
+        registry: https://registry.us-west-1.aliyuncs.com
+        username: ${{ secrets.ACR_USERNAME }}
+        password: ${{ secrets.ACR_PASSWORD }}
+        
+    - name: Build And Push Docker Image
+      shell: bash
+      run: |
+          set -o xtrace
+          export GO111MODULE=on
+          branch="${GITHUB_REF#refs/heads/}"
+          timestamp=`TZ="Asia/Shanghai" date +"%Y%m%d%H%M%S"`
+          export VERSION="$branch-$timestamp-solo"
+          export GOOS=linux
+          export ARCH=all
+          export REGISTRY=registry.us-west-1.aliyuncs.com/yunion-dev
+          make image scheduler

.github/workflows/docker_webconsole.yml

@@ -0,0 +1,53 @@
+name: Webconsole Docker Image
+
+on:
+  push:
+    branches:
+      - 'releases/**'
+      - 'main'
+      - 'master'
+    paths:
+      - 'pkg/appsrv/**.go'
+      - 'pkg/cloudcommon/db/**.go'
+      - 'pkg/webconsole/**.go'
+      - 'pkg/apis/webconsole/**.go'
+      - 'vendor/yunion.io/x/sqlchemy/**.go'
+      - 'vendor/yunion.io/x/jsonutils/**.go'
+jobs:
+  build_webconsole:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+      with:
+        fetch-depth: 8
+        
+    - uses: actions/setup-go@v4
+      with:
+        go-version: '1.18'
+        
+    - name: Set up QEMU
+      uses: docker/setup-qemu-action@v2
+      
+    - name: Set up Docker Buildx
+      id: buildx
+      uses: docker/setup-buildx-action@v2
+      
+    - name: Login to Aliyun Container Registry (ACR)
+      uses: docker/login-action@v2
+      with:
+        registry: https://registry.us-west-1.aliyuncs.com
+        username: ${{ secrets.ACR_USERNAME }}
+        password: ${{ secrets.ACR_PASSWORD }}
+        
+    - name: Build And Push Docker Image
+      shell: bash
+      run: |
+          set -o xtrace
+          export GO111MODULE=on
+          branch="${GITHUB_REF#refs/heads/}"
+          timestamp=`TZ="Asia/Shanghai" date +"%Y%m%d%H%M%S"`
+          export VERSION="$branch-$timestamp-solo"
+          export GOOS=linux
+          export ARCH=all
+          export REGISTRY=registry.us-west-1.aliyuncs.com/yunion-dev
+          make image webconsole

Makefile

@@ -287,9 +287,11 @@ GOPROXY ?= direct
 
 mod:
 	GOPROXY=$(GOPROXY) GONOSUMDB=yunion.io/x go get -d yunion.io/x/cloudmux@$(RELEASE_BRANCH)
-	GOPROXY=$(GOPROXY) GONOSUMDB=yunion.io/x go get -d $(patsubst %,%@master,$(shell GO111MODULE=on go mod edit -print  | sed -n -e 's|.*\(yunion.io/x/[a-z].*\) v.*|\1|p' | grep -v '/cloudmux$$'))
-	go mod tidy
-	go mod vendor -v
+	GOPROXY=$(GOPROXY) GONOSUMDB=yunion.io/x go get -d yunion.io/x/sqlchemy@v1.1.2
+	GOPROXY=$(GOPROXY) GONOSUMDB=yunion.io/x go get -d yunion.io/x/pkg@v1.10.1
+	GOPROXY=$(GOPROXY) GONOSUMDB=yunion.io/x go get -d $(patsubst %,%@master,$(shell GO111MODULE=on go mod edit -print  | sed -n -e 's|.*\(yunion.io/x/[a-z].*\) v.*|\1|p' | egrep -v '/cloudmux$$|/sqlchemy$$|/pkg$$'))
+	GOPROXY=$(GOPROXY) GONOSUMDB=yunion.io/x go mod tidy
+	GOPROXY=$(GOPROXY) GONOSUMDB=yunion.io/x go mod vendor -v
 
 define helpText
 Build with docker
@@ -349,7 +351,7 @@ image:
 .PHONY: image
 
 image-telegraf-raid-plugin:
-	VERSION=release-1.6.4 ARCH=all make image telegraf-raid-plugin
+	VERSION=release-1.6.5 ARCH=all make image telegraf-raid-plugin
 
 %:
 	@:

build/climc/root/opt/climc-entrypoint.sh

@@ -0,0 +1,19 @@
+#!/bin/bash
+
+set -e
+
+BASHRC=/etc/profile.d/climc.sh
+
+grep -q rcadmin $BASHRC || echo 'source /etc/yunion/rcadmin' >> $BASHRC
+
+source $BASHRC
+
+climc sshkeypair-inject --admin --target-dir /root/
+
+mkdir -p /etc/dropbear
+
+mkdir -p /var/run/dropbear
+
+test -f /etc/dropbear/dropbear_rsa_host_key || dropbearkey -t rsa -f /etc/dropbear/dropbear_rsa_host_key
+
+dropbear -RFEjk -G root -p 22

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

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

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

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

build/docker/Dockerfile.ansibleserver

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

build/docker/Dockerfile.ansibleserver-base

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

build/docker/Dockerfile.apimap

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

build/docker/Dockerfile.baremetal-agent

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

build/docker/Dockerfile.baremetal-base

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

build/docker/Dockerfile.climc

@@ -1,7 +1,7 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/climc-base:20210901
+FROM registry.cn-beijing.aliyuncs.com/yunionio/climc-base:20230731.5
 
 ADD ./build/climc/root/opt /opt
 
-RUN cat /opt/yunion/scripts/motd/climc.sh >> /root/.bashrc
+RUN cp /opt/yunion/scripts/motd/climc.sh /etc/profile.d/climc.sh && ln -sf /etc/profile.d/climc.sh /root/.bashrc
 
 ADD ./_output/alpine-build/bin/climc ./_output/alpine-build/bin/*cli /opt/yunion/bin/

build/docker/Dockerfile.climc-base

@@ -1,5 +1,9 @@
 FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5
 
+ARG TARGETPLATFORM
+ARG BUILDPLATFORM
+ARG TARGETARCH
+
 MAINTAINER "Zexi Li <lizexi@yunionyun.com>"
 
 ENV TZ Asia/Shanghai
@@ -8,11 +12,13 @@ RUN mkdir -p /opt/yunion/bin
 
 RUN echo http://dl-cdn.alpinelinux.org/alpine/edge/testing >>/etc/apk/repositories
 
-RUN apk add --no-cache bash bash-completion tzdata ca-certificates vim ipmitool kubectl ceph-common && \
+RUN apk add --no-cache bash bash-completion tzdata ca-certificates vim ipmitool ceph-common dropbear shadow && \
     rm -rf /var/cache/apk/*
 
+RUN usermod --shell /bin/bash root
+
+RUN curl https://iso.yunion.cn/binaries/kubernetes-release/release/v1.22.9/bin/linux/${TARGETARCH}/kubectl -o /usr/bin/kubectl && chmod a+x /usr/bin/kubectl
+
 RUN cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
 
-ENV PATH="/opt/yunion/bin:${PATH}"
-
 RUN mkdir -p /opt/yunion/bin

build/docker/Dockerfile.file-repo

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

build/docker/Dockerfile.host-deployer

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

build/docker/Dockerfile.webconsole

@@ -1,3 +1,3 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/webconsole-base:v0.2-1
+FROM registry.cn-beijing.aliyuncs.com/yunionio/webconsole-base:20230731.2
 
 ADD ./_output/alpine-build/bin/webconsole /opt/yunion/bin/webconsole

build/docker/Makefile

@@ -15,22 +15,22 @@ onecloud-base:
 onecloud-base-3-15-4:
 	$(DOCKER_BUILDX)/onecloud-base:$(ONECLOUD_BASE_VERSION_3-15-4) -f ./Dockerfile.onecloud-base-3-15-4 .
 
-ANSIBLESERVER_BASE = v1.1.1
+ANSIBLESERVER_BASE = v1.1.2
 
 ansibleserver-base:
 	$(DOCKER_BUILDX)/ansibleserver-base:$(ANSIBLESERVER_BASE) -f ./Dockerfile.ansibleserver-base .
 
-CLIMC_BASE_VERSION = 20210901
+CLIMC_BASE_VERSION = 20230731.5
 
 climc-base:
 	docker buildx build --platform linux/arm64,linux/amd64 --push \
 		-t registry.cn-beijing.aliyuncs.com/yunionio/climc-base:$(CLIMC_BASE_VERSION) -f ./Dockerfile.climc-base .
 
-WEBCONSOLE_BASE_VERSION = v0.2-1
+WEBCONSOLE_BASE_VERSION = 20230731.2
 webconsole-base:
 	$(DOCKER_BUILDX)/webconsole-base:$(WEBCONSOLE_BASE_VERSION) -f ./Dockerfile.webconsole-base .
 
-BAREMETAL_BASE_VERSION = v0.3.9-20230221.2
+BAREMETAL_BASE_VERSION = v0.3.9-20231219.1
 
 baremetal-base:
 	$(DOCKER_BUILDX)/baremetal-base:$(BAREMETAL_BASE_VERSION) -f ./Dockerfile.baremetal-base .
@@ -44,7 +44,7 @@ GLANCE_BASE_VERSION = v0.0.1
 glance-base:
 	$(DOCKER_BUILDX)/glance-base:$(GLANCE_BASE_VERSION) -f ./Dockerfile.glance-base .
 
-FILE_REPO_VERSION = v0.3.3
+FILE_REPO_VERSION = v0.5.2
 
 file-repo:
 	$(DOCKER_BUILDX)/file-repo:$(FILE_REPO_VERSION) -f ./Dockerfile.file-repo .

build/docker/climc-entrypoint.sh

@@ -0,0 +1,17 @@
+#!/bin/bash
+
+set -e
+
+BASHRC=/root/.bashrc
+
+source $BASHRC
+
+climc sshkeypair-inject --admin
+
+mkdir -p /etc/dropbear
+
+mkdir -p /var/run/dropbear
+
+dropbearkey -t rsa -f /etc/dropbear/dropbear_rsa_host_key
+
+dropbear -RFEjk -G root -p 22

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

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

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

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

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

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

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

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

build/notify/root/opt/yunion/share/local-templates/content@cn/PASSWORD_EXPIRE_SOON.tmpl

@@ -1,2 +1,2 @@
 {{- $d := .resource_details -}}
-{{ $d.account }}:您的密码有效期将过，请及时登录平台更新密码。
+{{ $d.account }}:您的密码将在{{ $d.advance_days }} 天后过期，请及时登录平台更新密码。

build/notify/root/opt/yunion/share/local-templates/content@en/PASSWORD_EXPIRE_SOON.tmpl

@@ -1,2 +1,2 @@
 {{- $d := .resource_details -}}
-{{ $d.account }}:Your password is valid and will expire soon. Please log in to the platform in time to update your password.
+{{ $d.account }}:Your password will expire in {{ $d.advance_days}} days. Please log in to the platform in time to update your password.

build/notify/root/opt/yunion/share/local-templates/title@cn/PASSWORD_EXPIRE_SOON.tmpl

@@ -1,2 +1,2 @@
 {{- $d := .resource_details -}}
-{{ $d.account }}:您的密码有效期将过，请及时登录平台更新密码。
+{{ $d.account }}:您的密码有效期将过

build/notify/root/opt/yunion/share/local-templates/title@en/PASSWORD_EXPIRE_SOON.tmpl

@@ -1,2 +1,2 @@
 {{- $d := .resource_details -}}
-{{ $d.account }}:Your password is valid and will expire soon. Please log in to the platform in time to update your password.
+{{ $d.account }}:Your password is valid and will expire soon

cmd/apimap/main.go

@@ -0,0 +1,21 @@
+// 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/apimap/service"
+
+func main() {
+	service.StartService()
+}

cmd/climc/entry/climc.go

@@ -72,7 +72,7 @@ type BaseOptions struct {
 	OsZoneName     string `default:"$OS_ZONE_NAME" help:"Defaults to env[OS_ZONE_NAME]"`
 	OsEndpointType string `default:"$OS_ENDPOINT_TYPE|internalURL" help:"Defaults to env[OS_ENDPOINT_TYPE] or internalURL" choices:"publicURL|internalURL|adminURL"`
 	// ApiVersion     string `default:"$API_VERSION" help:"override default modules service api version"`
-	OutputFormat string `default:"$CLIMC_OUTPUT_FORMAT|table" choices:"table|kv|json|flatten-table|flatten-kv" help:"output format"`
+	OutputFormat string `default:"$CLIMC_OUTPUT_FORMAT|table" choices:"table|kv|json|yaml|flatten-table|flatten-kv" help:"output format"`
 
 	ParallelRun int `help:"run in parallel to stess test the performance of server"`
 

cmd/climc/main.go

@@ -18,6 +18,7 @@ import (
 	"yunion.io/x/onecloud/cmd/climc/entry"
 	_ "yunion.io/x/onecloud/cmd/climc/shell"
 	_ "yunion.io/x/onecloud/cmd/climc/shell/ansible"
+	_ "yunion.io/x/onecloud/cmd/climc/shell/apimap"
 	_ "yunion.io/x/onecloud/cmd/climc/shell/cloudevent"
 	_ "yunion.io/x/onecloud/cmd/climc/shell/cloudid"
 	_ "yunion.io/x/onecloud/cmd/climc/shell/cloudnet"
@@ -32,7 +33,7 @@ import (
 	_ "yunion.io/x/onecloud/cmd/climc/shell/logger"
 	_ "yunion.io/x/onecloud/cmd/climc/shell/misc"
 	_ "yunion.io/x/onecloud/cmd/climc/shell/monitor"
-	_ "yunion.io/x/onecloud/cmd/climc/shell/notifyv2"
+	_ "yunion.io/x/onecloud/cmd/climc/shell/notify"
 	_ "yunion.io/x/onecloud/cmd/climc/shell/quota"
 	_ "yunion.io/x/onecloud/cmd/climc/shell/scheduledtask"
 	_ "yunion.io/x/onecloud/cmd/climc/shell/scheduler"

cmd/climc/promputils/executor.go

@@ -75,7 +75,7 @@ func Executor(s string) {
 	} else {
 		session.GetClient().SetDebug(false)
 	}
-	if subparser.IsHelpSet() {
+	if subparser != nil && subparser.IsHelpSet() {
 		fmt.Print(subparser.HelpString())
 		return
 	}

cmd/climc/shell/apimap/apimap.go

@@ -0,0 +1,36 @@
+// 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 apimap
+
+import (
+	"fmt"
+
+	"yunion.io/x/onecloud/cmd/climc/shell"
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modules/apimap"
+)
+
+func init() {
+	type GetOptions struct{}
+	shell.R(new(GetOptions), "apimap-vpcagent", "Show net map for vpcagent", func(s *mcclient.ClientSession, _ *GetOptions) error {
+		ret, err := apimap.APIMap.GetVPCAgentTopo(s)
+		if err != nil {
+			return err
+		}
+		fmt.Print(ret.YAMLString())
+		return nil
+	})
+
+}

cmd/climc/shell/compute/backup.go

@@ -49,4 +49,10 @@ func init() {
 	ibCmd.Create(&compute.InstanceBackupManagerCreateFromPackageOptions{})
 	ibCmd.Perform("syncstatus", &compute.DiskBackupSyncstatusOptions{})
 	ibCmd.Perform("set-class-metadata", &options.ResourceMetadataOptions{})
+
+	hbsCmd := shell.NewJointCmd(&modules.HostBackupstorages)
+	hbsCmd.List(&compute.HostBackupStorageListOptions{})
+	hbsCmd.Show(&compute.HostBackupStorageJoinOptions{})
+	hbsCmd.Attach(&compute.HostBackupStorageJoinOptions{})
+	hbsCmd.Detach(&compute.HostBackupStorageJoinOptions{})
 }

cmd/climc/shell/compute/baremetal_profiles.go

@@ -0,0 +1,50 @@
+// Copyright 2019 Yunion
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package compute
+
+import (
+	"yunion.io/x/jsonutils"
+	"yunion.io/x/pkg/errors"
+	"yunion.io/x/pkg/util/printutils"
+
+	"yunion.io/x/onecloud/cmd/climc/shell"
+	"yunion.io/x/onecloud/pkg/mcclient"
+	baremetalmodules "yunion.io/x/onecloud/pkg/mcclient/modules/compute/baremetal"
+	baremetaloptions "yunion.io/x/onecloud/pkg/mcclient/options/compute/baremetal"
+)
+
+func init() {
+	cmd := shell.NewResourceCmd(&baremetalmodules.BaremetalProfiles)
+	cmd.List(new(baremetaloptions.BaremetalProfileListOptions))
+	cmd.Show(new(baremetaloptions.BaremetalProfileIdOptions))
+	cmd.Delete(new(baremetaloptions.BaremetalProfileIdOptions))
+
+	type BaremetalProfileMatchOpts struct {
+		OEMNAME string
+		MODEL   string
+	}
+	R(&BaremetalProfileMatchOpts{}, "baremetal-profile-match", "find match baremetal profile by oemname and model", func(s *mcclient.ClientSession, args *BaremetalProfileMatchOpts) error {
+		specs, err := baremetalmodules.BaremetalProfiles.GetMatchProfiles(s, args.OEMNAME, args.MODEL)
+		if err != nil {
+			return errors.Wrap(err, "GetMatchProfiles")
+		}
+		listResults := printutils.ListResult{}
+		for _, spec := range specs {
+			listResults.Data = append(listResults.Data, jsonutils.Marshal(spec))
+		}
+		printList(&listResults, nil)
+		return nil
+	})
+}

cmd/climc/shell/compute/cloudproviderregions.go

@@ -42,8 +42,8 @@ func init() {
 		}
 		var result *printutils.ListResult
 		var err error
-		if len(args.Manager) > 0 {
-			result, err = modules.CloudproviderregionManager.ListDescendent(s, args.Manager, params)
+		if len(args.Manager) == 1 {
+			result, err = modules.CloudproviderregionManager.ListDescendent(s, args.Manager[0], params)
 		} else if len(args.Region) > 0 {
 			result, err = modules.CloudproviderregionManager.ListDescendent2(s, args.Region, params)
 		} else {

cmd/climc/shell/compute/cloudproviders.go

@@ -26,6 +26,11 @@ import (
 	"yunion.io/x/onecloud/pkg/mcclient/options/compute"
 )
 
+type ClircShowOpt struct {
+	options.BaseIdOptions
+	FollowOutputFormat bool `help:"follow output format"`
+}
+
 func init() {
 	cmd := shell.NewResourceCmd(&modules.Cloudproviders).WithKeyword("cloud-provider")
 	cmd.List(&compute.CloudproviderListOptions{})
@@ -39,17 +44,21 @@ func init() {
 	cmd.Perform("project-mapping", &compute.ClouproviderProjectMappingOptions{})
 	cmd.Perform("set-syncing", &compute.ClouproviderSetSyncingOptions{})
 
-	cmd.GetWithCustomShow("clirc", func(result jsonutils.JSONObject) {
+	cmd.GetWithCustomOptionShow("clirc", func(result jsonutils.JSONObject, opt shell.IGetOpt) {
 		rc := make(map[string]string)
 		err := result.Unmarshal(&rc)
 		if err != nil {
-			log.Errorf("error: %v", err)
+			log.Errorf("Unmarshal error: %v", err)
 			return
 		}
-		for k, v := range rc {
-			fmt.Printf(`export %s='%s'`+"\n", k, v)
+		if opt.(*ClircShowOpt).FollowOutputFormat {
+			shell.PrintObject(result)
+		} else {
+			for k, v := range rc {
+				fmt.Printf(`export %s='%s'`+"\n", k, v)
+			}
 		}
-	}, &options.BaseIdOptions{})
+	}, &ClircShowOpt{})
 	cmd.Get("storage-classes", &compute.CloudproviderStorageClassesOptions{})
 	cmd.Get("change-owner-candidate-domains", &options.BaseIdOptions{})
 	cmd.Get("balance", &options.BaseIdOptions{})

cmd/climc/shell/compute/cloudregions.go

@@ -24,26 +24,14 @@ import (
 	"yunion.io/x/onecloud/pkg/mcclient"
 	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.Cloudregions).WithKeyword("cloud-region")
-	cmd.PerformClass("sync-skus", &options.CloudregionSkuSyncOptions{})
-	cmd.Perform("sync-images", &options.CloudregionIdOptions{})
-
-	R(&options.SkuTaskQueryOptions{}, "cloud-region-sync-task-show", "Show details of skus sync tasks", func(s *mcclient.ClientSession, args *options.SkuTaskQueryOptions) error {
-		params, err := args.Params()
-		if err != nil {
-			return err
-		}
-
-		result, err := modules.Cloudregions.Get(s, "sync-tasks", params)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
+	cmd.PerformClass("sync-skus", &compute.CloudregionSkuSyncOptions{})
+	cmd.Perform("sync-images", &compute.CloudregionIdOptions{})
+	cmd.Perform("purge", &compute.CloudregionPurgeOptions{})
 
 	type CloudregionListOptions struct {
 		options.BaseListOptions

cmd/climc/shell/compute/dbinstance_skus.go

@@ -16,7 +16,6 @@ package compute
 
 import (
 	"yunion.io/x/onecloud/cmd/climc/shell"
-	"yunion.io/x/onecloud/pkg/mcclient"
 	modules "yunion.io/x/onecloud/pkg/mcclient/modules/compute"
 	"yunion.io/x/onecloud/pkg/mcclient/options"
 )
@@ -25,19 +24,4 @@ func init() {
 	cmd := shell.NewResourceCmd(&modules.DBInstanceSkus).WithKeyword("dbinstance-sku")
 	cmd.List(&options.DBInstanceSkuListOption{})
 	cmd.Show(&options.DBInstanceSkuIdOption{})
-	cmd.PerformClass("sync-skus", &options.SkuSyncOptions{})
-
-	R(&options.SkuTaskQueryOptions{}, "dbinstance-sku-sync-task-show", "Show details of skus sync tasks", func(s *mcclient.ClientSession, args *options.SkuTaskQueryOptions) error {
-		params, err := args.Params()
-		if err != nil {
-			return err
-		}
-
-		result, err := modules.DBInstanceSkus.Get(s, "sync-tasks", params)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
 }

cmd/climc/shell/compute/disks.go

@@ -174,6 +174,7 @@ func init() {
 		AutoSnapshot string `help:"enable/disable auto snapshot of disk" choices:"enable|disable"`
 		DiskType     string `help:"Disk type" choices:"data|volume"`
 		IsSsd        *bool  `help:"mark disk as ssd" negative:"no-is-ssd"`
+		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()
@@ -207,6 +208,10 @@ func init() {
 				params.Add(jsonutils.JSONFalse, "is_ssd")
 			}
 		}
+		if args.AutoReset != nil {
+			params.Add(jsonutils.NewBool(*args.AutoReset), "auto_reset")
+		}
+
 		if params.Size() == 0 {
 			return InvalidUpdateError()
 		}

cmd/climc/shell/compute/dnsrecords.go

@@ -15,129 +15,18 @@
 package compute
 
 import (
-	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/cmd/climc/shell"
 	modules "yunion.io/x/onecloud/pkg/mcclient/modules/compute"
-	"yunion.io/x/onecloud/pkg/mcclient/options"
+	"yunion.io/x/onecloud/pkg/mcclient/options/compute"
 )
 
 func init() {
-	R(&options.DNSListOptions{}, "dns-list", "List dns records", func(s *mcclient.ClientSession, opts *options.DNSListOptions) error {
-		params, err := options.ListStructToParams(opts)
-		if err != nil {
-			return err
-		}
-		result, err := modules.DNSRecords.List(s, params)
-		if err != nil {
-			return err
-		}
-		printList(result, modules.DNSRecords.GetColumns(s))
-		return nil
-	})
-
-	R(&options.DNSCreateOptions{}, "dns-create", "Create dns record", func(s *mcclient.ClientSession, opts *options.DNSCreateOptions) error {
-		params, err := opts.Params()
-		if err != nil {
-			return err
-		}
-		rec, e := modules.DNSRecords.Create(s, params)
-		if e != nil {
-			return e
-		}
-		printObject(rec)
-		return nil
-	})
-
-	R(&options.DNSGetOptions{}, "dns-show", "Show details of a dns records", func(s *mcclient.ClientSession, opts *options.DNSGetOptions) error {
-		dns, e := modules.DNSRecords.Get(s, opts.ID, nil)
-		if e != nil {
-			return e
-		}
-		printObject(dns)
-		return nil
-	})
-
-	R(&options.DNSUpdateOptions{}, "dns-update", "Update details of a dns records", func(s *mcclient.ClientSession, opts *options.DNSUpdateOptions) error {
-		params, err := opts.Params()
-		if err != nil {
-			return err
-		}
-		dns, e := modules.DNSRecords.Update(s, opts.ID, params)
-		if e != nil {
-			return e
-		}
-		printObject(dns)
-		return nil
-	})
-
-	R(&options.DNSGetOptions{}, "dns-delete", "Delete a dns record", func(s *mcclient.ClientSession, opts *options.DNSGetOptions) error {
-		dns, e := modules.DNSRecords.Delete(s, opts.ID, nil)
-		if e != nil {
-			return e
-		}
-		printObject(dns)
-		return nil
-	})
-
-	R(&options.DNSGetOptions{}, "dns-public", "Make a dns record publicly available", func(s *mcclient.ClientSession, opts *options.DNSGetOptions) error {
-		dns, e := modules.DNSRecords.PerformAction(s, opts.ID, "public", nil)
-		if e != nil {
-			return e
-		}
-		printObject(dns)
-		return nil
-	})
-
-	R(&options.DNSGetOptions{}, "dns-private", "Make a dns record private", func(s *mcclient.ClientSession, opts *options.DNSGetOptions) error {
-		dns, e := modules.DNSRecords.PerformAction(s, opts.ID, "private", nil)
-		if e != nil {
-			return e
-		}
-		printObject(dns)
-		return nil
-	})
-
-	R(&options.DNSGetOptions{}, "dns-enable", "Enable dns record", func(s *mcclient.ClientSession, opts *options.DNSGetOptions) error {
-		dns, e := modules.DNSRecords.PerformAction(s, opts.ID, "enable", nil)
-		if e != nil {
-			return e
-		}
-		printObject(dns)
-		return nil
-	})
-
-	R(&options.DNSGetOptions{}, "dns-disable", "Disable dns record", func(s *mcclient.ClientSession, opts *options.DNSGetOptions) error {
-		dns, e := modules.DNSRecords.PerformAction(s, opts.ID, "disable", nil)
-		if e != nil {
-			return e
-		}
-		printObject(dns)
-		return nil
-	})
-
-	R(&options.DNSUpdateRecordsOptions{}, "dns-add-records", "Add DNS records to a name", func(s *mcclient.ClientSession, opts *options.DNSUpdateRecordsOptions) error {
-		params, err := opts.Params()
-		if err != nil {
-			return err
-		}
-		dns, e := modules.DNSRecords.PerformAction(s, opts.ID, "add-records", params)
-		if e != nil {
-			return e
-		}
-		printObject(dns)
-		return nil
-	})
-
-	R(&options.DNSUpdateRecordsOptions{}, "dns-remove-records", "Remove DNS records from a name", func(s *mcclient.ClientSession, opts *options.DNSUpdateRecordsOptions) error {
-		params, err := opts.Params()
-		if err != nil {
-			return err
-		}
-		dns, e := modules.DNSRecords.PerformAction(s, opts.ID, "remove-records", params)
-		if e != nil {
-			return e
-		}
-		printObject(dns)
-		return nil
-	})
-
+	cmd := shell.NewResourceCmd(&modules.DnsRecords).WithKeyword("dns-record")
+	cmd.List(&compute.DnsRecordListOptions{})
+	cmd.Create(&compute.DnsRecordCreateOptions{})
+	cmd.Update(&compute.DnsRecordUpdateOptions{})
+	cmd.Show(&compute.DnsRecordIdOptions{})
+	cmd.Delete(&compute.DnsRecordIdOptions{})
+	cmd.Perform("enable", &compute.DnsRecordIdOptions{})
+	cmd.Perform("disable", &compute.DnsRecordIdOptions{})
 }

cmd/climc/shell/compute/dnsrecordsets.go

@@ -1,33 +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"
-)
-
-func init() {
-	cmd := shell.NewResourceCmd(&modules.DnsRecordSets).WithKeyword("dns-recordset")
-	cmd.List(&options.DnsRecordSetListOptions{})
-	cmd.Create(&options.DnsRecordSetCreateOptions{})
-	cmd.Update(&options.DnsRecordSetUpdateOptions{})
-	cmd.Show(&options.DnsRecordSetIdOptions{})
-	cmd.Delete(&options.DnsRecordSetIdOptions{})
-	cmd.Perform("enable", &options.DnsRecordSetIdOptions{})
-	cmd.Perform("disable", &options.DnsRecordSetIdOptions{})
-	cmd.Perform("set-traffic-policies", &options.DnsRecordSetTrafficPolicyOptions{})
-}

cmd/climc/shell/compute/dnszone.go

@@ -22,23 +22,20 @@ 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.DnsZones).WithKeyword("dns-zone")
-	cmd.List(&options.SDnsZoneListOptions{})
-	cmd.Show(&options.SDnsZoneIdOptions{})
-	cmd.ClassShow(&options.DnsZoneCapabilitiesOptions{})
-	cmd.Delete(&options.SDnsZoneIdOptions{})
-	cmd.Create(&options.DnsZoneCreateOptions{})
-	cmd.Perform("syncstatus", &options.SDnsZoneIdOptions{})
-	cmd.Perform("sync-recordsets", &options.SDnsZoneIdOptions{})
-	cmd.Perform("cache", &options.DnsZoneCacheOptions{})
-	cmd.Perform("uncache", &options.DnsZoneUncacheOptions{})
-	cmd.Perform("purge", &options.SDnsZoneIdOptions{})
-	cmd.Perform("add-vpcs", &options.DnsZoneAddVpcsOptions{})
-	cmd.Perform("remove-vpcs", &options.DnsZoneRemoveVpcsOptions{})
+	cmd.List(&compute.SDnsZoneListOptions{})
+	cmd.Show(&compute.SDnsZoneIdOptions{})
+	cmd.ClassShow(&compute.DnsZoneCapabilitiesOptions{})
+	cmd.Delete(&compute.SDnsZoneIdOptions{})
+	cmd.Create(&compute.DnsZoneCreateOptions{})
+	cmd.Perform("syncstatus", &compute.SDnsZoneIdOptions{})
+	cmd.Perform("purge", &compute.SDnsZoneIdOptions{})
+	cmd.Perform("add-vpcs", &compute.DnsZoneAddVpcsOptions{})
+	cmd.Perform("remove-vpcs", &compute.DnsZoneRemoveVpcsOptions{})
 	cmd.GetWithCustomShow("exports", func(result jsonutils.JSONObject) {
 		rr := make(map[string]string)
 		err := result.Unmarshal(&rr)
@@ -49,5 +46,5 @@ func init() {
 		for _, v := range rr {
 			fmt.Printf("%s\n", v)
 		}
-	}, &options.SDnsZoneIdOptions{})
+	}, &compute.SDnsZoneIdOptions{})
 }

cmd/climc/shell/compute/elasticcache.go

@@ -23,11 +23,12 @@ import (
 	"yunion.io/x/onecloud/pkg/mcclient"
 	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.ElasticcacheSkus).WithKeyword("elastic-cache-sku")
-	cmd.PerformClass("sync-skus", &options.SkuSyncOptions{})
+	cmd.PerformClass("sync-skus", &compute.SkuSyncOptions{})
 
 	R(&options.BaseListOptions{}, "elastic-cache-list", "List elastisc cache instance", func(s *mcclient.ClientSession, opts *options.BaseListOptions) error {
 		params, err := options.ListStructToParams(opts)
@@ -411,20 +412,6 @@ func init() {
 		return nil
 	})
 
-	R(&options.SkuTaskQueryOptions{}, "elastic-cache-sku-sync-task-show", "Show details of skus sync tasks", func(s *mcclient.ClientSession, args *options.SkuTaskQueryOptions) error {
-		params, err := args.Params()
-		if err != nil {
-			return err
-		}
-
-		result, err := modules.ElasticcacheSkus.Get(s, "sync-tasks", params)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
 	R(&options.ResourceMetadataOptions{}, "elastic-cache-add-tag", "Set tag of a server", func(s *mcclient.ClientSession, opts *options.ResourceMetadataOptions) error {
 		params, err := opts.Params()
 		if err != nil {

cmd/climc/shell/compute/external_projects.go

@@ -25,6 +25,7 @@ func init() {
 	cmd := shell.NewResourceCmd(&compute.ExternalProjects).WithKeyword("external-project")
 	cmd.List(&opts.ExternalProjectListOptions{})
 	cmd.Create(&opts.ExternalProjectCreateOptions{})
+	cmd.Update(&opts.ExternalProjectUpdateOptions{})
 	cmd.Show(&options.BaseIdOptions{})
 	cmd.Perform("change-project", &opts.ExterProjectChagneProjectOptions{})
 }

cmd/climc/shell/compute/hosts.go

@@ -23,6 +23,7 @@ import (
 	"yunion.io/x/log"
 	"yunion.io/x/pkg/errors"
 	"yunion.io/x/pkg/util/httputils"
+	"yunion.io/x/pkg/util/printutils"
 
 	"yunion.io/x/onecloud/cmd/climc/shell"
 	"yunion.io/x/onecloud/pkg/mcclient"
@@ -41,6 +42,7 @@ func init() {
 	cmd.GetProperty(&compute.HostStatusStatisticsOptions{})
 
 	cmd.Perform("ping", &options.BaseIdOptions{})
+	cmd.Perform("purge", &options.BaseIdOptions{})
 	cmd.Perform("undo-convert", &options.BaseIdOptions{})
 	cmd.Perform("maintenance", &options.BaseIdOptions{})
 	cmd.Perform("unmaintenance", &options.BaseIdOptions{})
@@ -52,6 +54,7 @@ func init() {
 	cmd.Perform("probe-isolated-devices", &options.BaseIdOptions{})
 	cmd.Perform("class-metadata", &options.ResourceMetadataOptions{})
 	cmd.Perform("set-class-metadata", &options.ResourceMetadataOptions{})
+	cmd.Perform("set-commit-bound", &compute.HostSetCommitBoundOptions{})
 
 	cmd.BatchPerform("enable", &options.BaseIdsOptions{})
 	cmd.BatchPerform("disable", &options.BaseIdsOptions{})
@@ -62,18 +65,32 @@ func init() {
 	cmd.BatchPerform("reserve-cpus", &compute.HostReserveCpusOptions{})
 	cmd.BatchPerform("unreserve-cpus", &options.BaseIdsOptions{})
 	cmd.BatchPerform("auto-migrate-on-host-down", &compute.HostAutoMigrateOnHostDownOptions{})
+	cmd.BatchPerform("restart-host-agent", &options.BaseIdsOptions{})
 
 	cmd.Get("ipmi", &options.BaseIdOptions{})
 	cmd.Get("vnc", &options.BaseIdOptions{})
 	cmd.Get("app-options", &options.BaseIdOptions{})
 	cmd.Get("tap-config", &options.BaseIdOptions{})
+	cmd.GetWithCustomShow("nics", func(data jsonutils.JSONObject) {
+		results := printutils.ListResult{}
+		err := data.Unmarshal(&results)
+		if err == nil {
+			printutils.PrintJSONList(&results, []string{
+				"mac",
+				"vlan_id",
+				"interface",
+				"bridge",
+				"ip_addr",
+				"net",
+				"wire",
+			})
+		} else {
+			fmt.Println("error", err)
+		}
+	}, &options.BaseIdOptions{})
 
 	R(&options.BaseIdOptions{}, "host-logininfo", "Get SSH login information of a host", func(s *mcclient.ClientSession, args *options.BaseIdOptions) error {
-		srvid, e := modules.Hosts.GetId(s, args.ID, nil)
-		if e != nil {
-			return e
-		}
-		i, e := modules.Hosts.GetLoginInfo(s, srvid, nil)
+		i, e := modules.Hosts.PerformAction(s, args.ID, "login-info", nil)
 		if e != nil {
 			return e
 		}
@@ -157,17 +174,16 @@ func init() {
 	})
 
 	type HostUpdateOptions struct {
-		ID                string  `help:"ID or Name of Host"`
-		Name              string  `help:"New name of the host"`
-		Desc              string  `help:"New Description of the host"`
-		CpuCommitBound    float64 `help:"CPU overcommit upper bound at this host"`
-		MemoryCommitBound float64 `help:"Memory overcommit upper bound at this host"`
-		MemoryReserved    string  `help:"Memory reserved"`
-		CpuReserved       int64   `help:"CPU reserved"`
-		HostType          string  `help:"Change host type, CAUTION!!!!" choices:"hypervisor|kubelet|esxi|baremetal"`
+		ID             string `help:"ID or Name of Host"`
+		Name           string `help:"New name of the host"`
+		Desc           string `help:"New Description of the host"`
+		MemoryReserved string `help:"Memory reserved"`
+		CpuReserved    int64  `help:"CPU reserved"`
+		HostType       string `help:"Change host type, CAUTION!!!!" choices:"hypervisor|kubelet|esxi|baremetal"`
 		// AccessIp          string  `help:"Change access ip, CAUTION!!!!"`
-		AccessMac string `help:"Change baremetal access MAC, CAUTION!!!!"`
-		Uuid      string `help:"Change baremetal UUID,  CAUTION!!!!"`
+		AccessMac          string `help:"Change baremetal access MAC, CAUTION!!!!"`
+		Uuid               string `help:"Change baremetal UUID,  CAUTION!!!!"`
+		EnableNumaAllocate string `help:"Host enable numa allocate" choices:"True|False"`
 
 		IpmiUsername string `help:"IPMI user"`
 		IpmiPassword string `help:"IPMI password"`
@@ -185,12 +201,6 @@ func init() {
 		if len(args.Desc) > 0 {
 			params.Add(jsonutils.NewString(args.Desc), "description")
 		}
-		if args.CpuCommitBound > 0.0 {
-			params.Add(jsonutils.NewFloat64(args.CpuCommitBound), "cpu_cmtbound")
-		}
-		if args.MemoryCommitBound > 0.0 {
-			params.Add(jsonutils.NewFloat64(args.MemoryCommitBound), "mem_cmtbound")
-		}
 		if len(args.MemoryReserved) > 0 {
 			params.Add(jsonutils.NewString(args.MemoryReserved), "mem_reserved")
 		}
@@ -218,6 +228,13 @@ func init() {
 		if len(args.Sn) > 0 {
 			params.Add(jsonutils.NewString(args.Sn), "sn")
 		}
+		if len(args.EnableNumaAllocate) > 0 {
+			enableNumaAllocate := false
+			if args.EnableNumaAllocate == "True" {
+				enableNumaAllocate = true
+			}
+			params.Add(jsonutils.NewBool(enableNumaAllocate), "enable_numa_allocate")
+		}
 		if params.Size() == 0 {
 			return fmt.Errorf("Not data to update")
 		}
@@ -574,14 +591,10 @@ func init() {
 		Port int    `help:"SSH service port" default:"22"`
 	}
 	R(&HostSSHLoginOptions{}, "host-ssh", "SSH login of a host", func(s *mcclient.ClientSession, args *HostSSHLoginOptions) error {
-		srvid, e := modules.Hosts.GetId(s, args.ID, nil)
-		if e != nil {
-			return e
-		}
-		i, e := modules.Hosts.GetLoginInfo(s, srvid, nil)
+		i, e := modules.Hosts.PerformAction(s, args.ID, "login-info", nil)
 		privateKey := ""
 		if e != nil {
-			if httputils.ErrorCode(e) == 404 || e.Error() == "ciphertext too short" {
+			if httputils.ErrorCode(e) == 404 || strings.Contains(e.Error(), "ciphertext too short") {
 				var err error
 				privateKey, err = modules.Sshkeypairs.FetchPrivateKeyBySession(context.Background(), s)
 				if err != nil {

cmd/climc/shell/compute/instance_snapshots.go

@@ -59,6 +59,17 @@ func init() {
 		printBatchResults(ret, modules.InstanceSnapshots.GetColumns(s))
 		return nil
 	})
+	type InstanceSnapshotPurgeOptions struct {
+		ID string `help:"Delete snapshot id"`
+	}
+	R(&InstanceSnapshotPurgeOptions{}, "instance-snapshot-purge", "Purge snapshots", func(s *mcclient.ClientSession, args *InstanceSnapshotPurgeOptions) error {
+		result, err := modules.InstanceSnapshots.PerformAction(s, args.ID, "purge", nil)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
 
 	type InstanceSnapshotShowOptions struct {
 		ID string `help:"ID or Name of snapshot"`

cmd/climc/shell/compute/isolated_device_models.go

@@ -0,0 +1,98 @@
+// Copyright 2019 Yunion
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package compute
+
+import (
+	"yunion.io/x/jsonutils"
+	"yunion.io/x/pkg/util/printutils"
+
+	"yunion.io/x/onecloud/cmd/climc/shell"
+	"yunion.io/x/onecloud/pkg/mcclient"
+	modules "yunion.io/x/onecloud/pkg/mcclient/modules/compute"
+	baseoptions "yunion.io/x/onecloud/pkg/mcclient/options"
+	options "yunion.io/x/onecloud/pkg/mcclient/options/compute"
+)
+
+func init() {
+	cmd := shell.NewResourceCmd(&modules.IsolatedDeviceModels)
+	cmd.List(new(options.IsolatedDeviceModelListOptions))
+	cmd.Create(new(options.IsolatedDeviceModelCreateOptions))
+	cmd.Update(new(options.IsolatedDeviceModelUpdateOptions))
+	cmd.Delete(new(options.IsolatedDeviceIdsOptions))
+
+	type HostIsolatedDeviceModelListOptions struct {
+		baseoptions.BaseListOptions
+		Host                string `help:"ID or Name of Host"`
+		IsolatedDeviceModel string `help:"ID or Name of Isolated device model"`
+	}
+	R(&HostIsolatedDeviceModelListOptions{}, "host-isolated-device-model-list",
+		"List host Isolated device model pairs", func(s *mcclient.ClientSession, args *HostIsolatedDeviceModelListOptions) error {
+			var params *jsonutils.JSONDict
+			{
+				var err error
+				params, err = args.BaseListOptions.Params()
+				if err != nil {
+					return err
+
+				}
+			}
+			var result *printutils.ListResult
+			var err error
+			if len(args.Host) > 0 {
+				result, err = modules.HostIsolatedDeviceModels.ListDescendent(s, args.Host, params)
+			} else if len(args.IsolatedDeviceModel) > 0 {
+				result, err = modules.HostIsolatedDeviceModels.ListDescendent2(s, args.IsolatedDeviceModel, params)
+			} else {
+				result, err = modules.HostIsolatedDeviceModels.List(s, params)
+			}
+			if err != nil {
+				return err
+			}
+			printList(result, modules.HostIsolatedDeviceModels.GetColumns(s))
+			return nil
+		})
+
+	type HostIsolatedDeviceModelDetailOptions struct {
+		HOST                string `help:"ID or Name of Host"`
+		IsolatedDeviceModel string `help:"ID or Name of Isolated device model"`
+	}
+	R(&HostIsolatedDeviceModelDetailOptions{}, "host-isolated-device-model-show", "Show host isolated-device-model details", func(s *mcclient.ClientSession, args *HostIsolatedDeviceModelDetailOptions) error {
+		result, err := modules.HostIsolatedDeviceModels.Get(s, args.HOST, args.IsolatedDeviceModel, nil)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	R(&HostIsolatedDeviceModelDetailOptions{}, "host-isolated-device-model-detach", "Detach a isolated-device-model from a host", func(s *mcclient.ClientSession, args *HostIsolatedDeviceModelDetailOptions) error {
+		result, err := modules.HostIsolatedDeviceModels.Detach(s, args.HOST, args.IsolatedDeviceModel, nil)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	R(&HostIsolatedDeviceModelDetailOptions{}, "host-isolated-device-model-attach", "Attach a isolated-device-model to a host", func(s *mcclient.ClientSession, args *HostIsolatedDeviceModelDetailOptions) error {
+		params := jsonutils.NewDict()
+		result, err := modules.HostIsolatedDeviceModels.Attach(s, args.HOST, args.IsolatedDeviceModel, params)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+}

cmd/climc/shell/compute/nas_sku.go

@@ -17,7 +17,6 @@ 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"
 )
 
@@ -25,5 +24,5 @@ func init() {
 	cmd := shell.NewResourceCmd(&modules.NasSkus).WithKeyword("nas-sku")
 	cmd.List(&compute.NasSkuListOption{})
 	cmd.Show(&compute.NasSkuIdOption{})
-	cmd.PerformClass("sync-skus", &options.SkuSyncOptions{})
+	cmd.PerformClass("sync-skus", &compute.SkuSyncOptions{})
 }

cmd/climc/shell/compute/nat_sku.go

@@ -17,7 +17,6 @@ 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"
 )
 
@@ -25,5 +24,4 @@ func init() {
 	cmd := shell.NewResourceCmd(&modules.NatSkus).WithKeyword("nat-sku")
 	cmd.List(&compute.NatSkuListOption{})
 	cmd.Show(&compute.NatSkuIdOption{})
-	cmd.PerformClass("sync-skus", &options.SkuSyncOptions{})
 }

cmd/climc/shell/compute/networkaddresses.go

@@ -22,8 +22,8 @@ import (
 
 func init() {
 	cmd := shell.NewResourceCmd(&modules.NetworkAddresses).WithContextManager(&modules.Wires)
-	cmd.BatchCreate(&options.NetworkAddressCreateOptions{})
+	// cmd.BatchCreate(&options.NetworkAddressCreateOptions{})
 	cmd.List(&options.NetworkAddressListOptions{})
 	cmd.Show(&options.NetworkAddressIdOptions{})
-	cmd.Delete(&options.NetworkAddressIdOptions{})
+	cmd.BatchDelete(&options.NetworkAddressIdsOptions{})
 }

cmd/climc/shell/compute/networks.go

@@ -43,6 +43,7 @@ func init() {
 	cmd.Get("change-owner-candidate-domains", &compute_options.NetworkIdOptions{})
 	cmd.Perform("set-class-metadata", &options.ResourceMetadataOptions{})
 	cmd.Perform("switch-wire", &compute_options.NetworkSwitchWireOptions{})
+	cmd.Get("available-addresses", &compute_options.NetworkIdOptions{})
 
 	type NetworkShareOptions struct {
 		ID             string   `help:"ID or Name of the zone to show"`
@@ -114,18 +115,20 @@ func init() {
 	})
 
 	type NetworkCreateOptions2 struct {
-		Wire    string `help:"ID or Name of wire in which the network is created"`
-		Vpc     string `help:"ID or Name of vpc in which the network is created"`
-		Zone    string `help:"ID or Name of zone in which the network is created"`
-		NAME    string `help:"Name of new network"`
-		PREFIX  string `help:"Start of IPv4 address range"`
-		BgpType string `help:"Internet service provider name" positional:"false"`
-		Desc    string `help:"Description" metavar:"DESCRIPTION"`
+		Wire           string `help:"ID or Name of wire in which the network is created"`
+		Vpc            string `help:"ID or Name of vpc in which the network is created"`
+		Zone           string `help:"ID or Name of zone in which the network is created"`
+		NAME           string `help:"Name of new network"`
+		PREFIX         string `help:"Start of IPv4 address range"`
+		BgpType        string `help:"Internet service provider name" positional:"false"`
+		AssignPublicIp bool
+		Desc           string `help:"Description" metavar:"DESCRIPTION"`
 	}
 	R(&NetworkCreateOptions2{}, "network-create2", "Create a virtual network", func(s *mcclient.ClientSession, args *NetworkCreateOptions2) error {
 		params := jsonutils.NewDict()
 		params.Add(jsonutils.NewString(args.NAME), "name")
 		params.Add(jsonutils.NewString(args.PREFIX), "guest_ip_prefix")
+		params.Set("assign_public_ip", jsonutils.NewBool(args.AssignPublicIp))
 		if len(args.BgpType) > 0 {
 			params.Add(jsonutils.NewString(args.BgpType), "bgp_type")
 		}

cmd/climc/shell/compute/servers.go

@@ -114,9 +114,20 @@ func init() {
 	cmd.BatchPerform("enable-memclean", new(options.ServerIdsOptions))
 	cmd.Perform("qga-set-password", &options.ServerQgaSetPassword{})
 	cmd.Perform("qga-command", &options.ServerQgaCommand{})
+	cmd.Perform("qga-ping", &options.ServerQgaPing{})
+	cmd.Perform("qga-guest-info-task", &options.ServerQgaGuestInfoTask{})
+	cmd.Perform("qga-get-network", &options.ServerQgaGetNetwork{})
 	cmd.Perform("set-password", &options.ServerSetPasswordOptions{})
 	cmd.Perform("set-boot-index", &options.ServerSetBootIndexOptions{})
-
+	cmd.Perform("reset-nic-traffic-limit", &options.ServerNicTrafficLimitOptions{})
+	cmd.Perform("set-nic-traffic-limit", &options.ServerNicTrafficLimitOptions{})
+	cmd.Perform("add-sub-ips", &options.ServerAddSubIpsOptions{})
+	cmd.BatchPerform("set-os-info", &options.ServerSetOSInfoOptions{})
+	cmd.BatchPerform("start-rescue", &options.ServerStartOptions{})
+	cmd.BatchPerform("stop-rescue", &options.ServerStartOptions{})
+	cmd.BatchPerform("sync-os-info", &options.ServerIdsOptions{})
+	cmd.BatchPerform("set-root-disk-matcher", &options.ServerSetRootDiskMatcher{})
+	cmd.Perform("disable-auto-merge-snapshot", &options.ServerDisableAutoMergeSnapshot{})
 	cmd.Get("vnc", new(options.ServerVncOptions))
 	cmd.Get("desc", new(options.ServerIdOptions))
 	cmd.Get("status", new(options.ServerIdOptions))
@@ -295,11 +306,6 @@ func init() {
 	})
 
 	R(&options.ServerLoginInfoOptions{}, "server-logininfo", "Get login info of a server", func(s *mcclient.ClientSession, opts *options.ServerLoginInfoOptions) error {
-		srvid, e := modules.Servers.GetId(s, opts.ID, nil)
-		if e != nil {
-			return e
-		}
-
 		params := jsonutils.NewDict()
 		if len(opts.Key) > 0 {
 			privateKey, e := ioutil.ReadFile(opts.Key)
@@ -309,7 +315,7 @@ func init() {
 			params.Add(jsonutils.NewString(string(privateKey)), "private_key")
 		}
 
-		i, e := modules.Servers.GetLoginInfo(s, srvid, params)
+		i, e := modules.Servers.PerformAction(s, opts.ID, "login-info", params)
 		if e != nil {
 			return e
 		}
@@ -395,10 +401,15 @@ func init() {
 	type ServerRemoveExtraOption struct {
 		ID  string `help:"ID or name of server"`
 		KEY string `help:"Option key"`
+
+		Value string `help:"Option value"`
 	}
 	R(&ServerRemoveExtraOption{}, "server-remove-extra-options", "Remove server extra options", func(s *mcclient.ClientSession, args *ServerRemoveExtraOption) error {
 		params := jsonutils.NewDict()
 		params.Add(jsonutils.NewString(args.KEY), "key")
+		if len(args.Value) > 0 {
+			params.Add(jsonutils.NewString(args.Value), "value")
+		}
 		result, err := modules.Servers.PerformAction(s, args.ID, "del-extra-option", params)
 		if err != nil {
 			return err
@@ -856,7 +867,7 @@ func init() {
 			privateKey = string(key)
 		}
 
-		i, e := modules.Servers.GetLoginInfo(s, srvid, params)
+		i, e := modules.Servers.PerformAction(s, srvid, "login-info", params)
 		if e != nil {
 			return e
 		}

cmd/climc/shell/compute/skus.go

@@ -16,7 +16,6 @@ package compute
 
 import (
 	"yunion.io/x/onecloud/cmd/climc/shell"
-	"yunion.io/x/onecloud/pkg/mcclient"
 	modules "yunion.io/x/onecloud/pkg/mcclient/modules/compute"
 	"yunion.io/x/onecloud/pkg/mcclient/options"
 )
@@ -31,19 +30,4 @@ func init() {
 	cmd.Create(&options.ServerSkusCreateOptions{})
 	cmd.Update(&options.ServerSkusUpdateOptions{})
 	cmd.ClassShow(&options.ServerSkusListOptions{})
-	cmd.PerformClass("sync-skus", &options.SkuSyncOptions{})
-
-	R(&options.SkuTaskQueryOptions{}, "server-sku-sync-task-show", "Show details of skus sync tasks", func(s *mcclient.ClientSession, args *options.SkuTaskQueryOptions) error {
-		params, err := args.Params()
-		if err != nil {
-			return err
-		}
-
-		result, err := modules.ServerSkus.Get(s, "sync-tasks", params)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
 }

cmd/climc/shell/compute/sshkeypairs.go

@@ -16,11 +16,17 @@ package compute
 
 import (
 	"fmt"
+	"os"
+	"path"
 
 	"yunion.io/x/jsonutils"
+	"yunion.io/x/pkg/errors"
 
+	"yunion.io/x/onecloud/pkg/hostman/guestfs/fsdriver"
+	deployapi "yunion.io/x/onecloud/pkg/hostman/hostdeployer/apis"
 	"yunion.io/x/onecloud/pkg/mcclient"
 	modules "yunion.io/x/onecloud/pkg/mcclient/modules/compute"
+	"yunion.io/x/onecloud/pkg/util/procutils"
 )
 
 func init() {
@@ -28,7 +34,8 @@ func init() {
 		Project string `help:"get keypair for specific project"`
 		Admin   bool   `help:"get admin keypair, sysadmin ONLY option"`
 	}
-	R(&SshkeypairQueryOptions{}, "sshkeypair-show", "Get ssh keypairs", func(s *mcclient.ClientSession, args *SshkeypairQueryOptions) error {
+
+	getSshKeypair := func(s *mcclient.ClientSession, args *SshkeypairQueryOptions) (string, string, error) {
 		query := jsonutils.NewDict()
 		if args.Admin {
 			query.Add(jsonutils.JSONTrue, "admin")
@@ -37,22 +44,73 @@ func init() {
 		if len(args.Project) == 0 {
 			listResult, err := modules.Sshkeypairs.List(s, query)
 			if err != nil {
-				return err
+				return "", "", err
 			}
 			keys = listResult.Data[0]
 		} else {
 			result, err := modules.Sshkeypairs.GetById(s, args.Project, query)
 			if err != nil {
-				return err
+				return "", "", err
 			}
 			keys = result
 		}
 		privKey, _ := keys.GetString("private_key")
 		pubKey, _ := keys.GetString("public_key")
+		return privKey, pubKey, nil
+	}
+
+	R(&SshkeypairQueryOptions{}, "sshkeypair-show", "Get ssh keypairs", func(s *mcclient.ClientSession, args *SshkeypairQueryOptions) error {
+		privKey, pubKey, err := getSshKeypair(s, args)
+		if err != nil {
+			return err
+		}
 
 		fmt.Print(privKey)
 		fmt.Print(pubKey)
 
 		return nil
 	})
+
+	type SshkeypairInjectOptions struct {
+		SshkeypairQueryOptions
+		TargetDir string `help:"Target directory to save cloud ssh keypair"`
+	}
+	R(&SshkeypairInjectOptions{}, "sshkeypair-inject", "Inject ssh keypairs to local path", func(s *mcclient.ClientSession, args *SshkeypairInjectOptions) error {
+		_, pubKey, err := getSshKeypair(s, &args.SshkeypairQueryOptions)
+		if err != nil {
+			return err
+		}
+		targetDir := args.TargetDir
+		if targetDir == "" {
+			homeDir, err := os.UserHomeDir()
+			if err != nil {
+				return errors.Wrap(err, "get current user's home dir")
+			}
+			targetDir = homeDir
+		}
+		sshDir := path.Join(targetDir, ".ssh")
+		// MkdirAll anyways
+		os.MkdirAll(sshDir, 0700)
+		authFile := path.Join(sshDir, "authorized_keys")
+		var oldKeys string
+
+		if procutils.NewCommand("test", "-f", authFile).Run() == nil {
+			output, err := procutils.NewCommand("cat", authFile).Output()
+			if err != nil {
+				return errors.Wrapf(err, "cat: %s", output)
+			}
+			oldKeys = string(output)
+		}
+		pubKeys := &deployapi.SSHKeys{AdminPublicKey: pubKey}
+		newKeys := fsdriver.MergeAuthorizedKeys(oldKeys, pubKeys, true)
+		if output, err := procutils.NewCommand(
+			"sh", "-c", fmt.Sprintf("echo '%s' > %s", newKeys, authFile)).Output(); err != nil {
+			return errors.Wrapf(err, "write public keys: %s", output)
+		}
+		if output, err := procutils.NewCommand(
+			"chmod", "0644", authFile).Output(); err != nil {
+			return errors.Wrapf(err, "chmod failed %s", output)
+		}
+		return nil
+	})
 }

cmd/climc/shell/compute/storages.go

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

cmd/climc/shell/compute/webconsole.go

@@ -24,19 +24,28 @@ import (
 
 	webconsole_api "yunion.io/x/onecloud/pkg/apis/webconsole"
 	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modules/identity"
 	"yunion.io/x/onecloud/pkg/mcclient/modules/webconsole"
 	o "yunion.io/x/onecloud/pkg/mcclient/options"
 	"yunion.io/x/onecloud/pkg/webconsole/command"
 )
 
-const (
-	DefaultWebconsoleServer = "https://console.yunion.cn/web-console"
-)
-
 func init() {
-	handleResult := func(opt o.WebConsoleOptions, obj jsonutils.JSONObject) error {
+	handleResult := func(s *mcclient.ClientSession, opt o.WebConsoleOptions, obj jsonutils.JSONObject) error {
+		if obj.Contains("access_url") {
+			accessUrl, _ := obj.GetString("access_url")
+			fmt.Println("AccessURL:", accessUrl)
+			return nil
+		}
 		if opt.WebconsoleUrl == "" {
-			opt.WebconsoleUrl = DefaultWebconsoleServer
+			resp, err := identity.ServicesV3.GetSpecific(s, "common", "config", nil)
+			if err != nil {
+				return err
+			}
+			apiServer, _ := resp.GetString("config", "default", "api_server")
+			if len(apiServer) > 0 {
+				opt.WebconsoleUrl = fmt.Sprintf("%s/web-console", apiServer)
+			}
 		}
 		u, err := url.Parse(opt.WebconsoleUrl)
 		if err != nil {
@@ -48,15 +57,23 @@ func init() {
 			return err
 		}
 		connectParams := resp.GetConnectParams()
-		if protocol, err := resp.GetConnectProtocol(); err != nil {
+		protocol, err := resp.GetConnectProtocol()
+		if err != nil {
 			return err
-		} else if !utils.IsInStringArray(protocol, []string{
+		}
+		if !utils.IsInStringArray(protocol, []string{
 			command.PROTOCOL_TTY, webconsole_api.VNC,
-			webconsole_api.SPICE, webconsole_api.WMKS,
+			webconsole_api.SPICE, webconsole_api.WMKS, webconsole_api.WS,
 		}) {
 			fmt.Println(connectParams)
 			return nil
 		}
+		if protocol == webconsole_api.WS {
+			u, err = url.Parse(fmt.Sprintf("%s/ws", opt.WebconsoleUrl))
+			if err != nil {
+				return err
+			}
+		}
 
 		newQuery := url.Values{}
 		newQuery.Set("data", base64.StdEncoding.EncodeToString([]byte(connectParams)))
@@ -74,7 +91,7 @@ func init() {
 		if err != nil {
 			return err
 		}
-		handleResult(args.WebConsoleOptions, ret)
+		handleResult(s, args.WebConsoleOptions, ret)
 		return nil
 	})
 
@@ -87,7 +104,7 @@ func init() {
 		if err != nil {
 			return err
 		}
-		handleResult(args.WebConsoleOptions, ret)
+		handleResult(s, args.WebConsoleOptions, ret)
 		return nil
 	})
 
@@ -96,7 +113,7 @@ func init() {
 		if err != nil {
 			return err
 		}
-		handleResult(args.WebConsoleOptions, ret)
+		handleResult(s, args.WebConsoleOptions, ret)
 		return nil
 	})
 
@@ -109,7 +126,7 @@ func init() {
 		if err != nil {
 			return err
 		}
-		handleResult(args.WebConsoleOptions, ret)
+		handleResult(s, args.WebConsoleOptions, ret)
 		return nil
 	})
 
@@ -118,7 +135,7 @@ func init() {
 		if err != nil {
 			return err
 		}
-		handleResult(args.WebConsoleOptions, ret)
+		handleResult(s, args.WebConsoleOptions, ret)
 		return nil
 	})
 }

cmd/climc/shell/compute/zones.go

@@ -15,161 +15,19 @@
 package compute
 
 import (
-	"yunion.io/x/jsonutils"
-	"yunion.io/x/pkg/util/printutils"
-
-	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/cmd/climc/shell"
 	modules "yunion.io/x/onecloud/pkg/mcclient/modules/compute"
-	"yunion.io/x/onecloud/pkg/mcclient/options"
+	"yunion.io/x/onecloud/pkg/mcclient/options/compute"
 )
 
 func init() {
-	type ZoneListOptions struct {
-		options.BaseListOptions
-		Region    string `help:"cloud region ID or Name" json:"-"`
-		City      string `help:"Filter zone by city of cloudregions"`
-		Usable    *bool  `help:"List all zones where networks are usable"`
-		UsableVpc *bool  `help:"List all zones where vpc are usable"`
-
-		OrderByWires             string
-		OrderByHosts             string
-		OrderByHostsEnabled      string
-		OrderByBaremetals        string
-		OrderByBaremetalsEnabled string
-	}
-	R(&ZoneListOptions{}, "zone-list", "List zones", func(s *mcclient.ClientSession, args *ZoneListOptions) error {
-		params, err := options.ListStructToParams(args)
-		if err != nil {
-			return err
-		}
-		var result *printutils.ListResult
-		if len(args.Region) > 0 {
-			result, err = modules.Zones.ListInContext(s, params, &modules.Cloudregions, args.Region)
-		} else {
-			result, err = modules.Zones.List(s, params)
-		}
-		if err != nil {
-			return err
-		}
-		printList(result, modules.Zones.GetColumns(s))
-		return nil
-	})
-
-	type ZoneUpdateOptions struct {
-		ID       string `help:"ID or Name of zone to update"`
-		Name     string `help:"Name of zone"`
-		NameCN   string `help:"Name in Chinese"`
-		Desc     string `metavar:"<DESCRIPTION>" help:"Description"`
-		Location string `help:"Location"`
-	}
-	R(&ZoneUpdateOptions{}, "zone-update", "Update zone", func(s *mcclient.ClientSession, args *ZoneUpdateOptions) error {
-		params := jsonutils.NewDict()
-		if len(args.Name) > 0 {
-			params.Add(jsonutils.NewString(args.Name), "name")
-		}
-		if len(args.NameCN) > 0 {
-			params.Add(jsonutils.NewString(args.NameCN), "name_cn")
-		}
-		if len(args.Desc) > 0 {
-			params.Add(jsonutils.NewString(args.Desc), "description")
-		}
-		if len(args.Location) > 0 {
-			params.Add(jsonutils.NewString(args.Location), "location")
-		}
-		if params.Size() == 0 {
-			return InvalidUpdateError()
-		}
-		result, err := modules.Zones.Update(s, args.ID, params)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
-	type ZoneShowOptions struct {
-		ID string `help:"ID or Name of the zone to show"`
-	}
-	R(&ZoneShowOptions{}, "zone-show", "Show zone details", func(s *mcclient.ClientSession, args *ZoneShowOptions) error {
-		result, err := modules.Zones.Get(s, args.ID, nil)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
-	R(&ZoneShowOptions{}, "zone-delete", "Delete zone", func(s *mcclient.ClientSession, args *ZoneShowOptions) error {
-		result, err := modules.Zones.Delete(s, args.ID, nil)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
-	type ZoneCapabilityOptions struct {
-		ID     string `help:"Zone ID or Name" json:"-"`
-		Domain string `help:"domain Id or name"`
-	}
-	R(&ZoneCapabilityOptions{}, "zone-capability", "Show zone's capacibilities", func(s *mcclient.ClientSession, args *ZoneCapabilityOptions) error {
-		query, err := options.StructToParams(args)
-		if err != nil {
-			return err
-		}
-		result, err := modules.Zones.GetSpecific(s, args.ID, "capability", query)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
-	type ZoneCreateOptions struct {
-		NAME     string `help:"Name of zone"`
-		NameCN   string `help:"Name in Chinese"`
-		Desc     string `metavar:"<DESCRIPTION>" help:"Description"`
-		Location string `help:"Location"`
-		Region   string `help:"Cloudregion in which zone created"`
-	}
-	R(&ZoneCreateOptions{}, "zone-create", "Create a zone", func(s *mcclient.ClientSession, args *ZoneCreateOptions) error {
-		params := jsonutils.NewDict()
-		params.Add(jsonutils.NewString(args.NAME), "name")
-		if len(args.NameCN) > 0 {
-			params.Add(jsonutils.NewString(args.NameCN), "name_cn")
-		}
-		if len(args.Desc) > 0 {
-			params.Add(jsonutils.NewString(args.Desc), "description")
-		}
-		if len(args.Location) > 0 {
-			params.Add(jsonutils.NewString(args.Location), "location")
-		}
-		if len(args.Region) > 0 {
-			params.Add(jsonutils.NewString(args.Region), "region")
-		}
-		zone, err := modules.Zones.Create(s, params)
-		if err != nil {
-			return err
-		}
-		printObject(zone)
-		return nil
-	})
-
-	type ZoneStatusOptions struct {
-		ID     string `help:"ID or name of zone"`
-		STATUS string `help:"zone status" choices:"enable|disable|soldout"`
-		REASON string `help:"why update status"`
-	}
-	R(&ZoneStatusOptions{}, "zone-update-status", "Update zone status", func(s *mcclient.ClientSession, args *ZoneStatusOptions) error {
-		params := jsonutils.NewDict()
-		params.Set("status", jsonutils.NewString(args.STATUS))
-		params.Set("reason", jsonutils.NewString(args.REASON))
-		result, err := modules.Zones.PerformAction(s, args.ID, "status", params)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
+	cmd := shell.NewResourceCmd(&modules.Zones).WithContextManager(&modules.Cloudregions)
+	cmd.List(&compute.ZoneListOptions{})
+	cmd.Update(&compute.ZoneUpdateOptions{})
+	cmd.Show(&compute.ZoneIdOptions{})
+	cmd.Delete(&compute.ZoneIdOptions{})
+	cmd.Get("capability", &compute.ZoneCapabilityOptions{})
+	cmd.Perform("purge", &compute.ZonePurgeOptions{})
+	cmd.Create(&compute.ZoneCreateOptions{})
+	cmd.PerformWithKeyword("update-status", "status", &compute.ZoneStatusOptions{})
 }

cmd/climc/shell/events/events.go

@@ -21,6 +21,7 @@ import (
 	"yunion.io/x/onecloud/pkg/mcclient/modulebase"
 	"yunion.io/x/onecloud/pkg/mcclient/modules"
 	"yunion.io/x/onecloud/pkg/mcclient/modules/compute"
+	"yunion.io/x/onecloud/pkg/mcclient/modules/k8s"
 )
 
 type BaseEventListOptions struct {
@@ -78,6 +79,10 @@ func doNotifyEventList(s *mcclient.ClientSession, args *EventListOptions) error
 	return DoEventList(modules.NotifyLogs, s, args)
 }
 
+func doK8sEventList(s *mcclient.ClientSession, args *EventListOptions) error {
+	return DoEventList(*k8s.Logs.ResourceManager, s, args)
+}
+
 func DoEventList(man modulebase.ResourceManager, s *mcclient.ClientSession, args *EventListOptions) error {
 	params := jsonutils.NewDict()
 	if len(args.Type) > 0 {
@@ -146,6 +151,12 @@ func DoEventList(man modulebase.ResourceManager, s *mcclient.ClientSession, args
 
 func init() {
 	R(&EventListOptions{}, "event-show", "Show operation event logs", doComputeEventList)
+	R(&EventListOptions{}, "region-event-show", "Show operation event logs", doComputeEventList)
+	R(&EventListOptions{}, "glance-event-show", "Show operation event logs", doImageEventList)
+	R(&EventListOptions{}, "keystone-event-show", "Show operation event logs", doIdentityEventList)
+	R(&EventListOptions{}, "monitor-event-show", "Show operation event logs", doMonitorEventList)
+	R(&EventListOptions{}, "notify-event-show", "Show operation event logs", doNotifyEventList)
+	R(&EventListOptions{}, "kube-event-show", "Show operation event logs", doK8sEventList)
 
 	R(&TypeEventListOptions{}, "server-event", "Show operation event logs of server", func(s *mcclient.ClientSession, args *TypeEventListOptions) error {
 		nargs := EventListOptions{BaseEventListOptions: args.BaseEventListOptions, Id: args.ID, Type: []string{"server"}}

cmd/climc/shell/helper.go

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

cmd/climc/shell/identity/users.go

@@ -17,15 +17,25 @@ package identity
 import (
 	"yunion.io/x/jsonutils"
 
+	"yunion.io/x/onecloud/cmd/climc/shell"
 	api "yunion.io/x/onecloud/pkg/apis/identity"
 	"yunion.io/x/onecloud/pkg/mcclient"
 	"yunion.io/x/onecloud/pkg/mcclient/modulebase"
 	modules "yunion.io/x/onecloud/pkg/mcclient/modules/identity"
 	"yunion.io/x/onecloud/pkg/mcclient/options"
+	identity_options "yunion.io/x/onecloud/pkg/mcclient/options/identity"
 )
 
 func init() {
-	type UserListOptions struct {
+	cmd := shell.NewResourceCmd(&modules.UsersV3)
+	cmd.List(&identity_options.UserListOptions{})
+	cmd.Perform("user-metadata", &options.ResourceMetadataOptions{})
+	cmd.Perform("set-user-metadata", &options.ResourceMetadataOptions{})
+	cmd.Perform("class-metadata", &options.ResourceMetadataOptions{})
+	cmd.Perform("set-class-metadata", &options.ResourceMetadataOptions{})
+	cmd.Perform("metadata", &options.ResourceMetadataOptions{})
+
+	/*type UserListOptions struct {
 		options.BaseListOptions
 		Name                    string `help:"Filter by name"`
 		OrderByDomain           string `help:"order by domain name" choices:"asc|desc"`
@@ -50,7 +60,7 @@ func init() {
 			printList(result, modules.UsersV3.GetColumns(s))
 		}
 		return nil
-	})
+	})*/
 
 	type UserDetailOptions struct {
 		ID     string `help:"ID of user"`
@@ -76,6 +86,7 @@ func init() {
 		printObject(user)
 		return nil
 	})
+
 	R(&UserDetailOptions{}, "user-delete", "Delete user", func(s *mcclient.ClientSession, args *UserDetailOptions) error {
 		query := jsonutils.NewDict()
 		if len(args.Domain) > 0 {

cmd/climc/shell/k8s/clusters.go

@@ -87,6 +87,26 @@ func initKubeCluster() {
 		return nil
 	})
 
+	type SetKubeconfigOptions struct {
+		o.IdentOptions
+		FILE string `json:"filepath of kubeconfig"`
+	}
+	R(new(SetKubeconfigOptions), cmdN("set-kubeconfig"), "Set kubeconfig of a cluster", func(s *mcclient.ClientSession, args *SetKubeconfigOptions) error {
+		content, err := ioutil.ReadFile(args.FILE)
+		if err != nil {
+			return errors.Wrapf(err, "read file content of %q", args.FILE)
+		}
+		input := map[string]string{
+			"kubeconfig": string(content),
+		}
+		ret, err := k8s.KubeClusters.PerformAction(s, args.ID, "set-kubeconfig", jsonutils.Marshal(input))
+		if err != nil {
+			return err
+		}
+		printObject(ret)
+		return nil
+	})
+
 	R(&o.ClusterGetAddonsOpt{}, cmdN("addons"), "Get addon manifest of a cluster", func(s *mcclient.ClientSession, args *o.ClusterGetAddonsOpt) error {
 		params, err := args.Params()
 		if err != nil {

cmd/climc/shell/k8s/container_registry.go

@@ -0,0 +1,123 @@
+// 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 k8s
+
+import (
+	"io"
+	"os"
+	"strings"
+
+	"github.com/cheggaaa/pb/v3"
+
+	"yunion.io/x/jsonutils"
+	"yunion.io/x/pkg/errors"
+
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modules/k8s"
+	o "yunion.io/x/onecloud/pkg/mcclient/options/k8s"
+)
+
+func initContainerRegistry() {
+	cmd := NewK8sResourceCmd(k8s.ContainerRegistries)
+	cmd.List(new(o.RegistryListOptions))
+	cmd.Show(new(o.RegistryGetOptions))
+	cmd.Delete(new(o.RegistryGetOptions))
+	cmd.Create(new(o.RegistryCreateOptions))
+	cmd.Get("images", new(o.RegistryGetImagesOptions))
+	cmd.Get("image-tags", new(o.RegistryGetImageTagsOptions))
+
+	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), "k8s-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 := k8s.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, effective only when --registry is not specified"`
+		Password string `help:"Image registry password, effective only when --registry is not specified"`
+	}
+	R(new(DownloadOptions), "k8s-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)
+			}
+			name := parts[0]
+			tag := parts[1]
+			fileName, src, size, err = k8s.ContainerRegistries.DownloadImage(s, args.Registry, name, tag)
+			if err != nil {
+				return errors.Wrap(err, "download chart")
+			}
+		} else {
+			fileName, src, size, err = k8s.ContainerRegistries.DownloadImageByManager(s, &k8s.DownloadImageByManagerInput{
+				Insecure: args.Insecure,
+				Image:    args.NAME,
+				Username: args.Username,
+				Password: args.Password,
+			})
+		}
+		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()
+		var sink io.Writer = f
+		bar := pb.Full.Start64(size)
+		barReader := bar.NewProxyReader(src)
+		if _, err := io.Copy(sink, barReader); err != nil {
+			return errors.Wrap(err, "save chart")
+		}
+		return nil
+	})
+}

cmd/climc/shell/k8s/k8s.go

@@ -59,6 +59,9 @@ func init() {
 	initRbac()
 
 	initApp()
+
+	// container registry
+	initContainerRegistry()
 }
 
 var (

cmd/climc/shell/k8s/machines.go

@@ -31,4 +31,5 @@ func initKubeMachine() {
 	cmd.Perform("terminate", new(o.IdentOptions))
 	cmd.Get("networkaddress", new(o.MachineListNetworkAddressOptions))
 	cmd.Perform("attach-networkaddress", new(o.MachineAttachNetworkAddressOptions))
+	cmd.Perform("post-prepare-resource", new(o.IdentOptions))
 }

cmd/climc/shell/k8s/releases.go

@@ -53,7 +53,7 @@ func initRelease() {
 			return err
 		}
 
-		res, err := k8s.Releases.Put(s, args.NAME, params)
+		res, err := k8s.Releases.PerformAction(s, args.NAME, "upgrade", params)
 		if err != nil {
 			return err
 		}

cmd/climc/shell/k8s/repos.go

@@ -15,6 +15,16 @@
 package k8s
 
 import (
+	"io"
+	"os"
+	"path/filepath"
+
+	"github.com/cheggaaa/pb/v3"
+
+	"yunion.io/x/jsonutils"
+	"yunion.io/x/pkg/errors"
+
+	"yunion.io/x/onecloud/pkg/mcclient"
 	"yunion.io/x/onecloud/pkg/mcclient/modules/k8s"
 	o "yunion.io/x/onecloud/pkg/mcclient/options/k8s"
 )
@@ -29,4 +39,63 @@ func initRepo() {
 	cmd.Perform("sync", new(o.RepoGetOptions))
 	cmd.Perform("public", new(o.RepoPublicOptions))
 	cmd.Perform("private", new(o.RepoGetOptions))
+
+	type UploadOptions struct {
+		REPO string `help:"The name or id of helm repository`
+		FILE string `help:"Helm packaged file"`
+	}
+	R(new(UploadOptions), "k8s-repo-upload-chart", "Upload chart to the repository", 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)
+		param.(*jsonutils.JSONDict).Add(jsonutils.NewString(filepath.Base(args.FILE)), "chart_name")
+		ret, err := k8s.Repos.UploadChart(s, args.REPO, param, barReader, size)
+		if err != nil {
+			return err
+		}
+		printObject(ret)
+		return nil
+	})
+
+	type DownloadOptions struct {
+		REPO    string `help:"The name or id of helm repository`
+		CHART   string `help:"The name of chart"`
+		Output  string `help:"Saved file path"`
+		Version string `help:"The version of chart"`
+	}
+	R(new(DownloadOptions), "k8s-repo-download-chart", "Download helm chart to a file", func(s *mcclient.ClientSession, args *DownloadOptions) error {
+		chartFileName, src, size, err := k8s.Repos.DownloadChart(s, args.REPO, args.CHART, args.Version)
+		if err != nil {
+			return errors.Wrap(err, "download chart")
+		}
+		output := args.Output
+		if output == "" && chartFileName != "" {
+			output = chartFileName
+		}
+		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()
+		var sink io.Writer = f
+		bar := pb.Full.Start64(size)
+		barReader := bar.NewProxyReader(src)
+		if _, err := io.Copy(sink, barReader); err != nil {
+			return errors.Wrap(err, "save chart")
+		}
+		return nil
+	})
 }

cmd/climc/shell/logger/actions.go

@@ -45,8 +45,9 @@ type BaseActionListOptions struct {
 
 type ActionListOptions struct {
 	BaseActionListOptions
-	Id   string   `help:"" metavar:"OBJ_ID"`
-	Type []string `help:"Type of relevant object" metavar:"OBJ_TYPE"`
+	Service []string `help:"service name`
+	Id      string   `help:"" metavar:"OBJ_ID"`
+	Type    []string `help:"Type of relevant object" metavar:"OBJ_TYPE"`
 }
 
 type TypeActionListOptions struct {
@@ -56,6 +57,9 @@ type TypeActionListOptions struct {
 
 func doActionList(s *mcclient.ClientSession, args *ActionListOptions) error {
 	params := jsonutils.NewDict()
+	if len(args.Service) > 0 {
+		params.Add(jsonutils.NewStringArray(args.Service), "service")
+	}
 	if len(args.Type) > 0 {
 		params.Add(jsonutils.NewStringArray(args.Type), "obj_type")
 	}

cmd/climc/shell/misc/feature.go

@@ -19,12 +19,45 @@ import (
 
 	"yunion.io/x/jsonutils"
 	"yunion.io/x/pkg/errors"
-	"yunion.io/x/pkg/utils"
+	"yunion.io/x/pkg/util/sets"
 
 	"yunion.io/x/onecloud/pkg/mcclient"
 	"yunion.io/x/onecloud/pkg/mcclient/modules/yunionconf"
 )
 
+type GlobalSettingsValue struct {
+	SetupKeys                []string        `json:"setupKeys"`
+	SetupKeysVersion         string          `json:"setupKeysVersion"`
+	SetupOneStackInitialized bool            `json:"setupOneStackInitialized"`
+	ProductVersion           string          `json:"productVersion"`
+	UserDefinedKeys          map[string]bool `json:"userDefinedKeys"`
+}
+
+func NewGlobalSettingsValue(setupKeys []string, setupOneStack bool) *GlobalSettingsValue {
+	settings := &GlobalSettingsValue{
+		SetupOneStackInitialized: setupOneStack,
+		UserDefinedKeys:          make(map[string]bool),
+	}
+	for _, key := range setupKeys {
+		settings.Switch(key, true)
+	}
+	return settings
+}
+
+func (g *GlobalSettingsValue) Switch(featureKey string, on bool) {
+	if g.UserDefinedKeys == nil {
+		g.UserDefinedKeys = map[string]bool{}
+	}
+	g.UserDefinedKeys[featureKey] = on
+	ss := sets.NewString(g.SetupKeys...)
+	if on {
+		ss.Insert(featureKey)
+	} else {
+		ss.Delete(featureKey)
+	}
+	g.SetupKeys = ss.List()
+}
+
 func init() {
 	var features = []string{
 		"onestack",
@@ -61,6 +94,7 @@ func init() {
 		"default",
 		"k8s",
 		"monitor",
+		"bingocloud",
 	}
 
 	const (
@@ -92,10 +126,7 @@ func init() {
 					input := map[string]interface{}{
 						"name":       GlobalSettings,
 						"service_id": YunionAgent,
-						"value": map[string]interface{}{
-							"setupKeys":                []string{name},
-							"setupOneStackInitialized": true,
-						},
+						"value":      NewGlobalSettingsValue([]string{name}, true),
 					}
 					params := jsonutils.Marshal(input)
 					if _, err := yunionconf.Parameters.Create(s, params); err != nil {
@@ -117,33 +148,20 @@ func init() {
 			if err != nil {
 				return errors.Wrap(err, "get value")
 			}
-			setupKeys := []string{}
-			if value.Contains("setupKeys") {
-				if err := value.Unmarshal(&setupKeys, "setupKeys"); err != nil {
-					return errors.Wrap(err, "unmarshal setupKeys")
-				}
+			curConf := new(GlobalSettingsValue)
+			if err := value.Unmarshal(curConf); err != nil {
+				return errors.Wrapf(err, "unmarshal to GlobalSettingsValue: %s", value)
 			}
 			if !enable {
-				if utils.IsInStringArray(name, setupKeys) {
-					newKeys := []string{}
-					for _, key := range setupKeys {
-						if key != name {
-							newKeys = append(newKeys, key)
-						}
-					}
-					setupKeys = newKeys
-				}
-			} else if enable {
-				if !utils.IsInStringArray(name, setupKeys) {
-					setupKeys = append(setupKeys, name)
-				}
+				curConf.Switch(name, false)
+			} else {
+				curConf.Switch(name, true)
 			}
-			value.(*jsonutils.JSONDict).Set("setupKeys", jsonutils.Marshal(setupKeys))
 			id, err := ss.GetString("id")
 			if err != nil {
 				return errors.Errorf("get id from %s", ss)
 			}
-			ss.(*jsonutils.JSONDict).Set("value", value)
+			ss.(*jsonutils.JSONDict).Set("value", jsonutils.Marshal(curConf))
 			obj, err := yunionconf.Parameters.Update(s, id, ss)
 			if err != nil {
 				return errors.Wrapf(err, "update %s(%s)", GlobalSettings, id)

cmd/climc/shell/misc/version.go

@@ -23,6 +23,7 @@ import (
 	"yunion.io/x/pkg/util/printutils"
 	"yunion.io/x/pkg/utils"
 
+	"yunion.io/x/onecloud/pkg/apis"
 	"yunion.io/x/onecloud/pkg/mcclient"
 	"yunion.io/x/onecloud/pkg/mcclient/modulebase"
 	modules "yunion.io/x/onecloud/pkg/mcclient/modules"
@@ -91,7 +92,14 @@ func init() {
 		vers := map[string]string{}
 		for _, service := range services {
 			serviceType, _ := service.GetString("type")
-			if utils.IsInStringArray(serviceType, []string{"offlinecloudmeta"}) {
+			if utils.IsInStringArray(serviceType, []string{
+				apis.SERVICE_TYPE_OFFLINE_CLOUDMETA,
+				apis.SERVICE_TYPE_CLOUDMETA,
+				apis.SERVICE_TYPE_INFLUXDB,
+				apis.SERVICE_TYPE_VICTORIA_METRICS,
+				apis.SERVICE_TYPE_ETCD,
+				"torrent-tracker",
+			}) {
 				continue
 			}
 			ver, err := modules.GetVersion(s, serviceType)

cmd/climc/shell/monitor/alert.go

@@ -15,7 +15,6 @@
 package monitor
 
 import (
-	"encoding/json"
 	"fmt"
 
 	"yunion.io/x/pkg/errors"
@@ -46,11 +45,7 @@ func init() {
 			if err != nil {
 				return errors.Wrap(err, "DoTestRun")
 			}
-			jsonBytes, err := json.MarshalIndent(ret, "", "  ")
-			if err != nil {
-				return errors.Wrap(err, "MarshalIndent")
-			}
-			fmt.Printf("%s\n", jsonBytes)
+			fmt.Printf("%s\n", ret.PrettyString())
 			return nil
 		})
 }

cmd/climc/shell/monitor/alertnotification.go

@@ -36,9 +36,7 @@ func initAlertNotification() {
 				return err
 			}
 			var result *printutils.ListResult
-			if len(args.Alert) > 0 {
-				result, err = monitor.Alertnotification.ListDescendent(s, args.Alert, params)
-			} else if len(args.Notification) > 0 {
+			if len(args.Notification) > 0 {
 				result, err = monitor.Alertnotification.ListDescendent2(s, args.Notification, params)
 			} else {
 				result, err = monitor.Alertnotification.List(s, params)

cmd/climc/shell/monitor/commonalert.go

@@ -15,10 +15,136 @@
 package monitor
 
 import (
+	"yunion.io/x/jsonutils"
+
+	monitorapi "yunion.io/x/onecloud/pkg/apis/monitor"
+	"yunion.io/x/onecloud/pkg/mcclient"
 	modules "yunion.io/x/onecloud/pkg/mcclient/modules/monitor"
 	options "yunion.io/x/onecloud/pkg/mcclient/options/monitor"
 )
 
+type CommonAlertTerm struct {
+	Database    string
+	Measurement string
+	Operator    string // and / or
+	Field       []string
+	FieldFunc   string
+
+	Reduce        string
+	Comparator    string
+	Threshold     float64
+	Filters       []monitorapi.MetricQueryTag
+	FieldOpt      string
+	Name          string
+	ConditionType string
+	From          string
+	Interval      string
+	GroupBy       string
+	Level         string
+}
+
+func newCommonAlertQuery(tem *CommonAlertTerm) *monitorapi.CommonAlertQuery {
+	mq := monitorapi.MetricQuery{
+		Alias:        "",
+		Tz:           "",
+		Database:     tem.Database,
+		Measurement:  tem.Measurement,
+		Tags:         make([]monitorapi.MetricQueryTag, 0),
+		GroupBy:      make([]monitorapi.MetricQueryPart, 0),
+		Selects:      nil,
+		Interval:     "",
+		Policy:       "",
+		ResultFormat: "",
+	}
+
+	for _, field := range tem.Field {
+		sel := monitorapi.MetricQueryPart{
+			Type:   "field",
+			Params: []string{field},
+		}
+		selectPart := []monitorapi.MetricQueryPart{sel}
+		if len(tem.FieldFunc) != 0 {
+			selectPart = append(selectPart, monitorapi.MetricQueryPart{
+				Type:   tem.FieldFunc,
+				Params: []string{},
+			})
+		} else {
+			selectPart = append(selectPart, monitorapi.MetricQueryPart{
+				Type:   "mean",
+				Params: []string{},
+			})
+		}
+		mq.Selects = append(mq.Selects, selectPart)
+	}
+	if len(tem.Filters) != 0 {
+		for _, filter := range tem.Filters {
+			mq.Tags = append(mq.Tags, filter)
+		}
+	}
+
+	alertQ := new(monitorapi.AlertQuery)
+	alertQ.Model = mq
+	alertQ.From = "60m"
+
+	commonAlert := monitorapi.CommonAlertQuery{
+		AlertQuery: alertQ,
+		Reduce:     tem.Reduce,
+		Comparator: tem.Comparator,
+		Threshold:  tem.Threshold,
+		Operator:   tem.Operator,
+	}
+	if tem.FieldOpt != "" {
+		commonAlert.FieldOpt = monitorapi.CommonAlertFieldOpt_Division
+	}
+	if len(tem.ConditionType) != 0 {
+		commonAlert.ConditionType = tem.ConditionType
+	}
+	if len(tem.GroupBy) != 0 {
+		commonAlert.Model.GroupBy = append(commonAlert.Model.GroupBy, monitorapi.MetricQueryPart{
+			Type:   "field",
+			Params: []string{tem.GroupBy},
+		})
+	}
+	return &commonAlert
+}
+
+var (
+	cpuTem = &CommonAlertTerm{
+		Operator:    "or",
+		Database:    "telegraf",
+		Measurement: "vm_cpu",
+		Field:       []string{"usage_active"},
+		Comparator:  ">=",
+		Reduce:      "avg",
+		Threshold:   50,
+		Name:        "lzx-test.cpu.usage_active",
+		Filters: []monitorapi.MetricQueryTag{
+			{
+				Key:      "id",
+				Operator: "=",
+				Value:    "a0eee5dd-3cfe-4ab1-8c79-aee1a8cf4dab",
+			},
+		},
+	}
+	memTem = &CommonAlertTerm{
+		Operator:    "or",
+		Database:    "telegraf",
+		Measurement: "vm_mem",
+		Field:       []string{"used_percent"},
+		Comparator:  ">=",
+		Reduce:      "avg",
+		Threshold:   3,
+		Name:        "lzx-test.mem.avaiable",
+		Filters: []monitorapi.MetricQueryTag{
+			{
+				Key:      "id",
+				Operator: "=",
+				Value:    "a0eee5dd-3cfe-4ab1-8c79-aee1a8cf4dab",
+			},
+		},
+	}
+)
+
 func init() {
 	cmd := NewResourceCmd(modules.CommonAlerts)
 	cmd.Create(new(options.CommonAlertCreateOptions))
@@ -28,4 +154,34 @@ func init() {
 	cmd.Perform("disable", &options.CommonAlertShowOptions{})
 	cmd.BatchDelete(new(options.CommonAlertDeleteOptions))
 	cmd.Perform("config", &options.CommonAlertUpdateOptions{})
+
+	type TestOpt struct {
+		NAME     string
+		RobotIds []string
+		Users    []string
+	}
+	R(&TestOpt{}, "monitor-commonalert-create-mul-test", "create test monitor common alert", func(s *mcclient.ClientSession, opt *TestOpt) error {
+		cpuQ := newCommonAlertQuery(cpuTem)
+		memQ := newCommonAlertQuery(memTem)
+		input := monitorapi.CommonAlertCreateInput{
+			CommonMetricInputQuery: monitorapi.CommonMetricInputQuery{
+				MetricQuery: []*monitorapi.CommonAlertQuery{
+					cpuQ,
+					memQ,
+				},
+			},
+			AlertCreateInput: monitorapi.AlertCreateInput{
+				Name: opt.NAME,
+			},
+			CommonAlertCreateBaseInput: monitorapi.CommonAlertCreateBaseInput{
+				Recipients: opt.Users,
+				RobotIds:   opt.RobotIds,
+				Channel:    []string{"webconsole"},
+				AlertType:  monitorapi.CommonAlertNomalAlertType,
+				Scope:      "system",
+			},
+		}
+		_, err := modules.CommonAlerts.Create(s, jsonutils.Marshal(input))
+		return err
+	})
 }

cmd/climc/shell/monitor/unifiedmonitor.go

@@ -15,7 +15,10 @@
 package monitor
 
 import (
+	"yunion.io/x/pkg/errors"
+
 	"yunion.io/x/onecloud/cmd/climc/shell"
+	"yunion.io/x/onecloud/pkg/mcclient"
 	"yunion.io/x/onecloud/pkg/mcclient/modules/monitor"
 	options "yunion.io/x/onecloud/pkg/mcclient/options/monitor"
 )
@@ -24,5 +27,18 @@ func init() {
 	cmd := shell.NewResourceCmd(monitor.UnifiedMonitorManager).SetPrefix("monitor")
 	cmd.Show(&options.SimpleQueryOptions{})
 	cmd.GetProperty(&options.MeasurementsQueryOptions{})
-	cmd.GetProperty(&options.DatabasesQueryOptions{})
+	// cmd.GetProperty(&options.DatabasesQueryOptions{})
+
+	R(new(options.MetricQueryOptions), "monitor-unifiedmonitor-query", "Perform metrics query", func(s *mcclient.ClientSession, opts *options.MetricQueryOptions) error {
+		input, err := opts.GetQueryInput()
+		if err != nil {
+			return err
+		}
+		resp, err := monitor.UnifiedMonitorManager.PerformQuery(s, input)
+		if err != nil {
+			return errors.Wrap(err, "PerformQuery")
+		}
+		printObject(resp)
+		return nil
+	})
 }

cmd/climc/shell/notify/common.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package notifyv2
+package notify
 
 import (
 	"yunion.io/x/pkg/util/printutils"

cmd/climc/shell/notify/config.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package notifyv2
+package notify
 
 import (
 	"yunion.io/x/onecloud/cmd/climc/shell"
@@ -27,4 +27,5 @@ func init() {
 	cmd.Update(new(options.ConfigUpdateOptions))
 	cmd.Show(new(options.ConfigOptions))
 	cmd.Delete(new(options.ConfigOptions))
+	cmd.GetProperty(new(options.ConfigCapabilityOptions))
 }

cmd/climc/shell/notify/emailqueues.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package notifyv2
+package notify
 
 import (
 	"yunion.io/x/onecloud/cmd/climc/shell"

cmd/climc/shell/notify/notification.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package notifyv2
+package notify
 
 import (
 	"fmt"
@@ -104,6 +104,7 @@ func init() {
 		return nil
 	})
 	type NotificationEventInput struct {
+		AdvanceDays  int
 		Event        string
 		Priority     string
 		MsgBody      string
@@ -122,6 +123,7 @@ func init() {
 			return fmt.Errorf("msg_body should be a json string, like '{'name': 'hello'}'")
 		}
 		params := api.NotificationManagerEventNotifyInput{
+			AdvanceDays:     args.AdvanceDays,
 			ReceiverIds:     []string{},
 			ResourceDetails: dict,
 			Event:           args.Event,

cmd/climc/shell/notify/receiver.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package notifyv2
+package notify
 
 import (
 	"yunion.io/x/onecloud/cmd/climc/shell"
@@ -34,4 +34,5 @@ func init() {
 	cmd.Perform("enable-contact-type", new(options.ReceiverEnableContactTypeInput))
 	cmd.PerformClass("intellij-get", new(options.ReceiverIntellijGetOptions))
 	cmd.PerformClass("get-types", new(options.ReceiverGetTypeOptions))
+	cmd.Perform("get-subscription", new(options.ReceiverGetSubscriptionOptions))
 }

cmd/climc/shell/notify/robot.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package notifyv2
+package notify
 
 import (
 	"yunion.io/x/onecloud/cmd/climc/shell"

cmd/climc/shell/notify/subscription.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package notifyv2
+package notify
 
 import (
 	"yunion.io/x/onecloud/cmd/climc/shell"
@@ -21,9 +21,6 @@ import (
 )
 
 func init() {
-	cmd := shell.NewResourceCmd(&modules.NotifyTopic).WithKeyword("notify-topic")
-	cmd.List(new(notify.TopicListOptions))
-
 	cmd1 := shell.NewResourceCmd(&modules.NotifySubscriber).WithKeyword("notify-subscriber")
 	cmd1.List(new(notify.SubscriberListOptions))
 	cmd1.Create(new(notify.SubscriberCreateOptions))

cmd/climc/shell/notify/template.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package notifyv2
+package notify
 
 import (
 	"yunion.io/x/jsonutils"

cmd/climc/shell/notify/topic.go

@@ -12,16 +12,17 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package compute
+package notify
 
 import (
 	"yunion.io/x/onecloud/cmd/climc/shell"
-	modules "yunion.io/x/onecloud/pkg/mcclient/modules/compute"
-	"yunion.io/x/onecloud/pkg/mcclient/options"
+	modules "yunion.io/x/onecloud/pkg/mcclient/modules/notify"
+	options "yunion.io/x/onecloud/pkg/mcclient/options/notify"
 )
 
 func init() {
-	cmd := shell.NewResourceCmd(&modules.DnsTrafficPolicies).WithKeyword("dns-trafficpolicy")
-	cmd.List(&options.DnsTrafficPolicyListOptions{})
-	cmd.Create(&options.DnsTrafficPolicyCreateOptions{})
+	cmd := shell.NewResourceCmd(&modules.NotifyTopic).WithKeyword("notify-topic")
+	cmd.List(new(options.TopicListOptions))
+	cmd.Update(new(options.TopicUpdateOptions))
+	cmd.Show(new(options.TopicOptions))
 }

cmd/climc/shell/utils.go

@@ -30,6 +30,7 @@ const (
 	OUTPUT_FORMAT_TABLE         = "table"         // pretty table
 	OUTPUT_FORMAT_FLATTEN_TABLE = "flatten-table" // pretty table with flattened keys
 	OUTPUT_FORMAT_JSON          = "json"          // json string
+	OUTPUT_FORMAT_YAML          = "yaml"          // yaml string
 	OUTPUT_FORMAT_KV            = "kv"            // "key: value" as separate line
 	OUTPUT_FORMAT_FLATTEN_KV    = "flatten-kv"    // kv with flattened keys
 )
@@ -47,6 +48,8 @@ func PrintList(list *printutils.ListResult, columns []string) {
 	case OUTPUT_FORMAT_JSON:
 		fmt.Print(jsonutils.Marshal(list).PrettyString())
 		fmt.Print("\n")
+	case OUTPUT_FORMAT_YAML:
+		fmt.Print(jsonutils.Marshal(list).YAMLString())
 	default:
 		fmt.Fprintf(os.Stderr, "unknown output format: %q\n", outputFormat)
 	}
@@ -61,6 +64,8 @@ func PrintObject(obj jsonutils.JSONObject) {
 	case OUTPUT_FORMAT_JSON:
 		fmt.Print(obj.PrettyString())
 		fmt.Print("\n")
+	case OUTPUT_FORMAT_YAML:
+		fmt.Print(obj.YAMLString())
 	case OUTPUT_FORMAT_FLATTEN_TABLE:
 		printObjectRecursive(obj)
 	case OUTPUT_FORMAT_FLATTEN_KV:

cmd/telegraf-raid-plugin/main.go

@@ -44,6 +44,14 @@ const (
 // Failed, Offline, Degraded, Rebuilding, Out of Sync (OSY)
 
 func main() {
+	logLevel := "debug"
+	logVerboseLevel := 5
+	log.SetVerboseLevel(int32(logVerboseLevel))
+	err := log.SetLogLevelByString(log.Logger(), logLevel)
+	if err != nil {
+		log.Fatalf("Set log level %q: %v", logLevel, err)
+	}
+
 	// creates the in-cluster config
 	config, err := rest.InClusterConfig()
 	if err != nil {

docs/README.md

@@ -1,20 +0,0 @@
-# swagger.yaml
-
-使用swagger编辑器
-
-	docker run -d -p 8081:8080 swaggerapi/swagger-editor
-
-swagger文档，https://swagger.io/docs/specification/2-0/basic-structure/
-
-编辑测试：
-
-1. 首先启动swagger-ui
-
-    sudo docker pull swaggerapi/swagger-ui
-    sudo docker run -d -p 80:8080 swaggerapi/swagger-ui
-
-2. 用python启动本地的http server，这是允许CORS的SimpleHTTPServer，监听在8000端口
-
-   python server.py
-
-3. 用浏览器打开swagger-ui的URL：http://<swagger_ui_host>?url=http://<simple_http_server_host>:8000/index.yaml

docs/ansibleplaybook/ansibleplaybook-run.yaml

@@ -1,21 +0,0 @@
-post:
-  summary: 执行ansibleplaybook
-  description: |
-    调用成功后
-
-     - start_time将置为当前时间
-     - end_time置为空
-     - status设置为running
-  parameters:
-    - $ref: "../parameters/ansibleplaybook.yaml#/ansibleplaybookId"
-    - name: ansibleplaybook
-      in: body
-      schema:
-        $ref: "../schemas/ansibleplaybook.yaml#/AnsiblePlaybookCreateRequest"
-  responses:
-    200:
-      description: ansibleplaybook的信息
-      schema:
-        $ref: "../schemas/ansibleplaybook.yaml#/AnsiblePlaybookResponse"
-  tags:
-    - ansibleplaybooks

docs/ansibleplaybook/ansibleplaybook-stop.yaml

@@ -1,20 +0,0 @@
-post:
-  summary: 中止执行ansibleplaybook
-  description: |
-    调用成功后
-
-     - end_time置为当前时间
-     - status设置为canceled
-  parameters:
-    - $ref: "../parameters/ansibleplaybook.yaml#/ansibleplaybookId"
-    - name: ansibleplaybook
-      in: body
-      schema:
-        $ref: "../schemas/ansibleplaybook.yaml#/AnsiblePlaybookCreateRequest"
-  responses:
-    200:
-      description: ansibleplaybook的信息
-      schema:
-        $ref: "../schemas/ansibleplaybook.yaml#/AnsiblePlaybookResponse"
-  tags:
-    - ansibleplaybooks

docs/ansibleplaybook/ansibleplaybook.yaml

@@ -1,41 +0,0 @@
-get:
-  summary: 获取指定ansibleplaybook的信息
-  parameters:
-    - $ref: "../parameters/ansibleplaybook.yaml#/ansibleplaybookId"
-  responses:
-    200:
-      description: ansibleplaybook信息
-      schema:
-        $ref: "../schemas/ansibleplaybook.yaml#/AnsiblePlaybookResponse"
-  tags:
-    - ansibleplaybooks
-
-put:
-  summary: 更新ansibleplaybook自身参数
-  parameters:
-    - $ref: "../parameters/ansibleplaybook.yaml#/ansibleplaybookId"
-    - name: ansibleplaybook
-      in: body
-      schema:
-        $ref: "../schemas/ansibleplaybook.yaml#/AnsiblePlaybookCreateRequest"
-  responses:
-    200:
-      description: ansibleplaybook的信息
-      schema:
-        $ref: "../schemas/ansibleplaybook.yaml#/AnsiblePlaybookResponse"
-  tags:
-    - ansibleplaybooks
-
-delete:
-  summary: 删除指定ansibleplaybook
-  description: |
-    处于运行状态的playbook需先中止执行才允许删除
-  parameters:
-    - $ref: "../parameters/ansibleplaybook.yaml#/ansibleplaybookId"
-  responses:
-    200:
-      description: 被删除ansibleplaybook的信息
-      schema:
-        $ref: "../schemas/ansibleplaybook.yaml#/AnsiblePlaybookResponse"
-  tags:
-    - ansibleplaybooks