Merge pull request #6626 from ioito/automated-cherry-pick-of-#6619-upstream-release-2.12

Automated cherry pick of #6619: fix: 避免azure卸载磁盘失败

.circleci/Dockerfile

@@ -21,6 +21,7 @@ ENV GOROOT="/opt/go"
 ENV PATH="/opt/go/bin:${PATH}"
 
 RUN useradd -c "OneCloud Builder" --create-home --home-dir /home/build --shell /bin/bash build
+USER build
 ENV HOME /home/build
 WORKDIR /home/build
 USER build

.dockerignore

@@ -1,4 +0,0 @@
-/.git
-/vendor
-/cmd
-/pkg

.drone.yml

@@ -2,131 +2,49 @@
 kind: pipeline
 name: build
 
-clone:
-  depth: 1
-
 workspace:
-  base: /home/build/go
+  base: /go
   path: src/yunion.io/x/onecloud
 
 steps:
 - name: build
-  image: yunion/onecloud-ci:latest
+  image: d3lx/golang:yunion
   commands:
-  - CGO_ENABLED=0 make -j 4 cmd/apigateway cmd/baremetal-agent cmd/climc cmd/keystone
-  - CGO_ENABLED=0 make -j 4 cmd/logger cmd/region cmd/scheduler cmd/webconsole
-  - CGO_ENABLED=0 make -j 4 cmd/yunionconf cmd/glance cmd/torrent
+  - make
+  when:
+    event:
+    - pull_request
+    - tag
 
-- name: image-baremetal-agent
+trigger:
+  event:
+  - pull_request
+  - tag
+
+---
+kind: pipeline
+name: release
+
+steps:
+- name: release-img
   image: plugins/docker
   settings:
-    repo: registry.cn-beijing.aliyuncs.com/yunionio/baremetal-agent
+    repo: registry.cn-beijing.aliyuncs.com/yunionio/onecloud
     registry: registry.cn-beijing.aliyuncs.com
-    dockerfile: build/docker/Dockerfile.baremetal-agent
-    tags: "${DRONE_TAG}"
-    username:
-      from_secret: docker_username
-    password:
-      from_secret: docker_password
-
-- name: image-climc
-  image: plugins/docker
-  settings:
-    repo: registry.cn-beijing.aliyuncs.com/yunionio/climc
-    registry: registry.cn-beijing.aliyuncs.com
-    dockerfile: build/docker/Dockerfile.climc
-    tags: "${DRONE_TAG}"
-    username:
-      from_secret: docker_username
-    password:
-      from_secret: docker_password
-
-- name: image-keystone
-  image: plugins/docker
-  settings:
-    repo: registry.cn-beijing.aliyuncs.com/yunionio/keystone
-    registry: registry.cn-beijing.aliyuncs.com
-    dockerfile: build/docker/Dockerfile.keystone
-    tags: "${DRONE_TAG}"
-    username:
-      from_secret: docker_username
-    password:
-      from_secret: docker_password
-
-- name: image-logger
-  image: plugins/docker
-  settings:
-    repo: registry.cn-beijing.aliyuncs.com/yunionio/logger
-    registry: registry.cn-beijing.aliyuncs.com
-    dockerfile: build/docker/Dockerfile.logger
-    tags: "${DRONE_TAG}"
-    username:
-      from_secret: docker_username
-    password:
-      from_secret: docker_password
-
-- name: image-region
-  image: plugins/docker
-  settings:
-    repo: registry.cn-beijing.aliyuncs.com/yunionio/region
-    registry: registry.cn-beijing.aliyuncs.com
-    dockerfile: build/docker/Dockerfile.region
-    tags: "${DRONE_TAG}"
-    username:
-      from_secret: docker_username
-    password:
-      from_secret: docker_password
-
-- name: image-scheduler
-  image: plugins/docker
-  settings:
-    repo: registry.cn-beijing.aliyuncs.com/yunionio/scheduler
-    registry: registry.cn-beijing.aliyuncs.com
-    dockerfile: build/docker/Dockerfile.scheduler
-    tags: "${DRONE_TAG}"
-    username:
-      from_secret: docker_username
-    password:
-      from_secret: docker_password
-
-- name: image-yunionconf
-  image: plugins/docker
-  settings:
-    repo: registry.cn-beijing.aliyuncs.com/yunionio/yunionconf
-    registry: registry.cn-beijing.aliyuncs.com
-    dockerfile: build/docker/Dockerfile.yunionconf
-    tags: "${DRONE_TAG}"
-    username:
-      from_secret: docker_username
-    password:
-      from_secret: docker_password
-
-- name: image-apigateway
-  image: plugins/docker
-  settings:
-    repo: registry.cn-beijing.aliyuncs.com/yunionio/apigateway
-    registry: registry.cn-beijing.aliyuncs.com
-    dockerfile: build/docker/Dockerfile.apigateway
-    tags: "${DRONE_TAG}"
-    username:
-      from_secret: docker_username
-    password:
-      from_secret: docker_password
-
-- name: image-glance
-  image: plugins/docker
-  settings:
-    repo: registry.cn-beijing.aliyuncs.com/yunionio/glance
-    registry: registry.cn-beijing.aliyuncs.com
-    dockerfile: build/docker/Dockerfile.glance
-    tags: "${DRONE_TAG}"
+    tags: "{DRONE_TAG}"
     username:
       from_secret: docker_username
     password:
       from_secret: docker_password
+  when:
+    event:
+    - tag
 
 trigger:
   event:
   - tag
   status:
   - success
+
+depends_on:
+- build

.github/workflows/docker.yml

@@ -1,212 +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.12
-      uses: actions/setup-go@v1
-      with:
-        go-version: 1.12
-      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
-        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 && ./scripts/bundle_libraries.sh _output/bin/bundles/host _output/bin/host && ./scripts/host_find_libraries.sh _output/bin/bundles/host
-        make cmd/host-deployer && ./scripts/bundle_libraries.sh _output/bin/bundles/host-deployer _output/bin/host-deployer
-        make cmd/baremetal-agent && ./scripts/bundle_libraries.sh _output/bin/bundles/baremetal-agent _output/bin/baremetal-agent
-        make cmd/cloudevent cmd/devtool
-        make cmd/*cli
-        make cmd/esxi-agent
-
-    - 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 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 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 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 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 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 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

.gitignore

@@ -33,4 +33,3 @@ _output
 GPATH
 GRTAGS
 GTAGS
-pkg/generated

CONTRIBUTING.md

@@ -1,3 +0,0 @@
-# 开发贡献参考
-
-详情见文档 [开发贡献](https://docs.yunion.io/docs/contribute/)

Dockerfile

@@ -0,0 +1,20 @@
+FROM alpine:3.8
+
+MAINTAINER "Zexi Li <lizexi@yunionyun.com>"
+
+ENV TZ Asia/Shanghai
+
+# Fix binary file not found, see:
+# https://stackoverflow.com/questions/34729748/installed-go-binary-not-found-in-path-on-alpine-linux-docker
+RUN mkdir /lib64 && ln -s /lib/libc.musl-x86_64.so.1 /lib64/ld-linux-x86-64.so.2
+
+RUN mkdir -p /opt/yunion/bin
+
+ADD ./_output/bin/climc /opt/yunion/bin/climc
+ADD ./_output/bin/cloudir /opt/yunion/bin/cloudir
+ADD ./_output/bin/glance /opt/yunion/bin/glance
+ADD ./_output/bin/region /opt/yunion/bin/region
+ADD ./_output/bin/region-dns /opt/yunion/bin/region-dns
+ADD ./_output/bin/scheduler /opt/yunion/bin/scheduler
+ADD ./_output/bin/webconsole /opt/yunion/bin/webconsole
+ADD ./_output/bin/yunionconf /opt/yunion/bin/yunionconf

Makefile

@@ -32,11 +32,8 @@ LDFLAGS := "-w \
 
 
 #####################################################
-ifneq ($(DLV),)
-	GO_BUILD_FLAGS += -gcflags "all=-N -l"
-	LDFLAGS = ""
-endif
-GO_BUILD_FLAGS+=-mod vendor -ldflags $(LDFLAGS)
+
+GO_BUILD_FLAGS:=-mod vendor -ldflags $(LDFLAGS)
 GO_BUILD := go build $(GO_BUILD_FLAGS)
 GO_INSTALL := go install -ldflags $(LDFLAGS)
 GO_TEST := go test
@@ -47,8 +44,8 @@ CGO_CFLAGS_ENV = $(shell go env CGO_CFLAGS)
 CGO_LDFLAGS_ENV = $(shell go env CGO_LDFLAGS)
 
 ifdef LIBQEMUIO_PATH
-		X_CGO_CFLAGS := ${CGO_CFLAGS_ENV} -I${LIBQEMUIO_PATH}/src -I${LIBQEMUIO_PATH}/src/include
-		X_CGO_LDFLAGS := ${CGO_LDFLAGS_ENV} -laio -lqemuio -lpthread  -L ${LIBQEMUIO_PATH}/src
+	X_CGO_CFLAGS := ${CGO_CFLAGS_ENV} -I${LIBQEMUIO_PATH}/src -I${LIBQEMUIO_PATH}/src/include
+	X_CGO_LDFLAGS := ${CGO_LDFLAGS_ENV} -laio -lqemuio -lpthread  -L ${LIBQEMUIO_PATH}/src
 endif
 
 export GO111MODULE:=on
@@ -83,9 +80,6 @@ test:
 vet:
 	go vet ./...
 
-cmd/esxi-agent: prepare_dir
-	CGO_ENABLED=0 $(GO_BUILD) -o $(BIN_DIR)/$(shell basename $@) $(REPO_PREFIX)/$@
-
 cmd/%: prepare_dir
 	$(GO_BUILD) -o $(BIN_DIR)/$(shell basename $@) $(REPO_PREFIX)/$@
 
@@ -238,37 +232,3 @@ endef
 help: export helpText:=$(helpText)
 help:
 	@echo "$$helpText"
-
-.PHONY: help
-
-gen-model-api-check:
-	which model-api-gen || (GO111MODULE=off go get -u yunion.io/x/code-generator/cmd/model-api-gen)
-
-gen-model-api: gen-model-api-check
-	$(ROOT_DIR)/scripts/codegen.py model-api
-
-gen-swagger-check:
-	which swagger || (GO111MODULE=off go get -u github.com/go-swagger/go-swagger/cmd/swagger)
-	which swagger-gen || (GO111MODULE=off go get -u yunion.io/x/code-generator/cmd/swagger-gen)
-	which swagger-serve || (GO111MODULE=off go get -u yunion.io/x/code-generator/cmd/swagger-serve)
-
-gen-swagger: gen-swagger-check
-	$(ROOT_DIR)/scripts/codegen.py swagger-code
-	$(ROOT_DIR)/scripts/codegen.py swagger-yaml
-
-swagger-serve: gen-swagger
-	$(ROOT_DIR)/scripts/codegen.py swagger-serve
-
-.PHONY: gen-model-api-check gen-model-api gen-swagger-check gen-swagger swagger-serve
-
-REGISTRY ?= "registry.cn-beijing.aliyuncs.com/yunionio"
-VERSION ?= $(shell git describe --exact-match 2> /dev/null || \
-                git describe --match=$(git rev-parse --short=8 HEAD) --always --dirty --abbrev=8)
-
-image:
-	TAG=$(VERSION) REGISTRY=$(REGISTRY) $(ROOT_DIR)/scripts/docker_push.sh $(filter-out $@,$(MAKECMDGOALS))
-
-.PHONY: image
-
-%:
-	@:

OWNERS

@@ -1,13 +1,11 @@
 # See the OWNERS docs at https://go.k8s.io/owners
 reviewers:
+  - swordqiu
+  - yousong
+  - wanyaoqi
   - Zexi
   - ioito
-  - swordqiu
   - tb365
-  - wanyaoqi
-  - yousong
-  - zhaoxiangchun
-  - zhasm
 approvers:
   - swordqiu
   - yousong

README-CN.md

@@ -1,54 +0,0 @@
-# Yunion OneCloud (云联融合云）
-
-[![CircleCI](https://circleci.com/gh/yunionio/onecloud.svg?style=svg)](https://circleci.com/gh/yunionio/onecloud) 
-[![Build Status](https://travis-ci.com/yunionio/onecloud.svg?branch=master)](https://travis-ci.org/yunionio/onecloud) 
-[![Go Report Card](https://goreportcard.com/badge/github.com/yunionio/onecloud)](https://goreportcard.com/report/github.com/yunionio/onecloud) 
-
-## 什么是云联融合云?
-
-云联融合云（Yunion OneCloud）是一个开源的多云平台。融合云构建在用户分布于多云基础设施之上，通过技术手段将分布于多云的异构IT资源统一管理，将多底层多云的差异向用户屏蔽，并通过网络和调度实现资源的融合与打通，在多云之上进行抽象，向用户呈现统一的使用界面和API接口，让用户就像使用一个云平台一样使用分布于多云的资源，实现一个统一的“云上之云”的云平台。
-
-鉴于企业IT基础设施的两个趋势：1. 企业使用多云基础设施，并且公有云是最主要的基础设施提供者；2. 企业应用将逐步云原生化，企业IT基础设施需要为Kubernetes优化。融合云为此架构而设计。一方面抽象管理底层的多云基础设施，另一方面为多云Kubernetes提供运行环境。融合云为企业未来的的IT基础设施架构而设计。
-
-云联融合云具备以下功能特性:
-
-- 多云资源统一管理
-
-  统一API、镜像、调度、账号体系、监控和计费等操作，能够全面管理 On premises、 私有云、公有云资源。
-
-- 内置私有云
-
-  OneCloud内置完备的私有云实现，提供对用户本地IDC的虚拟机、物理机和负载均衡等资源管理。
-
-- 为多云Kubernetes提供运行环境
-
-  OneCloud自身为运行在Kubernetes的云原生应用，并且能在多云环境部署运行Kubernetes集群。
-
-欢迎安装部署云联融合云，期待大家的反馈！
-
-
-## 部署
-
-请参考文档 [安装部署](https://docs.yunion.io/docs/setup/) 搭建 OneCloud 集群。
-
-
-## 文档
-
-- [文档中心](https://docs.yunion.io/)
-
-- [Swagger API文档](https://docs.yunion.cn/api/)
-
-
-## 架构
-
-![architecture](./docs/architecture.png)
-
-
-## 贡献
-
-我们非常欢迎和感谢开发者向项目做贡献，流程细节请查看 [CONTRIBUTING.md](./CONTRIBUTING.md) 。
-
-
-## License
-
-OneCloud 使用 Apache license 2.0. 详情请看 [LICENSE](./LICENSE) 。

README.md

@@ -4,52 +4,7 @@
 [![Build Status](https://travis-ci.com/yunionio/onecloud.svg?branch=master)](https://travis-ci.org/yunionio/onecloud) 
 [![Go Report Card](https://goreportcard.com/badge/github.com/yunionio/onecloud)](https://goreportcard.com/report/github.com/yunionio/onecloud) 
 
-### [README in Chinese](./README-CN.md)
+# 文档
 
-## What is Yunion OneCloud?
-
-Yunion OneCloud is an open source unified-IaaS cloud platform.
-
-As its name sugguests, 'Yun' means 'cloud' in Chinese and 'Yunion OneCloud' means to unify many distinct clouds into the one that behaves like an integral cloud platform.
-
-As trends show, the enterprise IT infrastructure in the future would be unavoidably heterogeneous and the public clouds should be the major infrastructure providers for many enterprises. Further, the infrastructure would most likely be prepared for the cloud-native applications running on Kubernetes. Yunion OneCloud is built to provide the cloud architecture for this scenario such that it is the middle layer between the underlying cloud infrustructures and the overlay kubernetes clusters across many clouds.
-
-Many may consider Yunion OneCloud as a multi-cloud management platform (MCMP). Rather, we would view it as an IaaS platform as it does not only manage the resources and services from many clouds, but also hides the differences of underlying technologies and exposes one set of APIs that allow programatically interacting with the compute/storage/networking resources across many clouds.
-
-Yunion OneCloud is working on abstracting APIs for the following resources:
-
-* Compute, including virtual machines, images, etc.
-* Storage, including disks, snapshots, object storages, etc.
-* Networking, including load balancers, VPC, virtual networks, NAT gateways, security groups, etc.
-* Accouting and billing, etc.
-* ...
-
-over the following many cloud providers:
-
-* On-premise IT resources, including kvm VM, baremetal, VMware vsphere/ESXi, etc.
-* Private clouds, including OpenStack, etc.
-* Public clouds, including Aliyun, AWS, Azure, Tencent Cloud, Huawei Cloud, etc.
-
-You are welcome to install and try Yunion OneCloud. Looking forward to your feedback.
-
-## Installation
-
-Please refers to [install & deployment](https://docs.yunion.io/docs/setup/) (currently in Chinese Only).
-
-## Documentations
-
-- [Yunion OneCloud Documents](https://docs.yunion.io/)
-
-- [Swagger API](https://docs.yunion.cn/api/)
-
-## Architecture
-
-![architecture](./docs/architecture.png)
-
-## Contribution
-
-You are welcome to contribute to the project. Please refer to [CONTRIBUTING.md](./CONTRIBUTING.md) for guidelines.
-
-## License
-
-Apache License 2.0. See [LICENSE](./LICENSE) 。
+- 文档中心，https://docs.yunion.cn/
+- API文档，https://docs.yunion.cn/api/

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

@@ -1,42 +0,0 @@
-#!/bin/bash
-
-set -e
-
-pushd $(dirname $BASH_SOURCE) > /dev/null
-CUR_DIR=$(pwd -P)
-popd > /dev/null
-
-
-ACCOUNT=$1
-
-if [ -z "$ACCOUNT" ]; then
-    echo "Usage: $0 <cloud-acount-id-or-name>"
-    exit 1
-fi
-
-ACCOUNT_ID=$(climc cloud-account-show $ACCOUNT | grep -w " id " | awk '{print $4}')
-ACCOUNT_NAME=$(climc cloud-account-show $ACCOUNT | grep -w " name " | awk '{print $4}')
-
-if [ -z "$ACCOUNT_ID" ]; then
-    echo "Cloud account $ACCOUNT not found"
-    exit 1
-fi
-
-
-echo "Ready to clean cloud account $ACCOUNT_NAME($ACCOUNT_ID)..."
-
-echo "1. Disable cloud account $ACCOUNT_NAME($ACCOUNT_ID) ..."
-
-climc cloud-account-disable $ACCOUNT_ID
-
-echo "2. Clean all providers ..."
-
-for provider_id in $(climc cloud-provider-list --account $ACCOUNT_ID --limit 0 | egrep '[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}' | awk '{print $2}')
-do
-    echo "### to clean cloud provider $provider_id ..."
-    $CUR_DIR/clean_provider.sh $provider_id
-done
-
-echo "3. Delete cloud account ..."
-
-climc cloud-account-delete $ACCOUNT_ID

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

@@ -1,27 +0,0 @@
-#/bin/bash
-
-set -e
-
-EIP=$1
-
-if [ -z "$EIP" ]; then
-    echo "Usage: $0 <eip_id_or_name>"
-    exit 1
-fi
-
-EIP_NAME=$(climc eip-show $EIP | grep -w " name " | awk '{print $4}')
-EIP_ID=$(climc eip-show $EIP | grep -w " id " | awk '{print $4}')
-
-if [ -z "$EIP_ID" ]; then
-    echo "Cannot find eip $EIP_ID"
-    exit 1
-fi
-
-echo "To clean eip $EIP_NAME($EIP_ID)..."
-
-clean_eip() {
-    local EID=$1
-    climc eip-purge $EID
-}
-
-clean_eip $EIP_ID

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

@@ -1,80 +0,0 @@
-#!/bin/bash
-
-set -e
-
-HOST=$1
-
-if [ -z "$HOST" ]; then
-    echo "Usage: $0 <host_id_or_name>"
-    exit 1
-fi
-
-error_exit() {
-    echo "Error: $1"
-    exit 1
-}
-
-HOSTID=$(climc host-show $HOST | grep -w " id " | awk '{print $4}')
-
-HOSTNAME=$(climc host-show $HOST | grep -w " name " | awk '{print $4}')
-
-if [ -z "$HOSTNAME" ]; then
-    error_exit "Cannot find host $HOST"
-fi
-
-if [ -z "$HOSTID" ]; then
-    error_exit "Cannot find host $HOST"
-fi
-
-echo "Ready to purge host $HOSTNAME($HOSTID)..."
-
-echo "1. Disable $HOSTNAME($HOSTID)"
-
-if ! climc host-disable $HOSTID > /dev/null; then
-    error_exit "Fail to disable $HOST"
-fi
-
-echo "2. Clean servers on $HOSTNAME($HOSTID)"
-
-for i in $(climc server-list --host $HOSTID --admin --limit 2048 --system | egrep '[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}' | awk '{print $2}')
-do
-    climc server-update --delete enable $i > /dev/null
-    climc server-purge $i > /dev/null
-done
-
-for i in $(climc server-list --host $HOSTID --admin --limit 2048 --pending-delete --system | egrep '[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}' | awk '{print $2}')
-do
-    climc server-purge $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}')
-do
-    STORAGENAME=$(climc storage-show $storageid | grep -w " name " | awk '{print $4}')
-    STORAGE_TYPE=$(climc storage-show $storageid | grep -w " storage_type " | awk '{print $4}')
-    if [ "$STORAGE_TYPE" == "local" ]; then
-        for diskid in $(climc disk-list --admin --system --details --search $storageid --limit 2048 | egrep '[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}' | awk '{print $2}')
-        do
-            climc disk-purge $diskid > /dev/null
-        done
-        for diskid in $(climc disk-list --admin --system --details --search $storageid --pending-delete --limit 2048 | egrep '[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}' | awk '{print $2}')
-        do
-            climc disk-purge $diskid > /dev/null
-        done
-    fi
-done
-
-echo "4. Remove host $HOSTNAME($HOSTID)"
-
-BAREMETAL=$(climc host-show $HOSTID | grep -w " is_baremetal " | awk '{print $4}')
-
-HOSTTYPE=$(climc host-show $HOSTID | grep -w " host_type " | awk '{print $4}')
-
-if [ "$BAREMETAL" == "true" ] && [ "$HOSTTYPE" != "baremetal" ]; then
-    climc host-update --host-type baremetal $HOSTID > /dev/null
-fi
-
-climc host-delete $HOSTID > /dev/null
-
-echo "DONE."

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

@@ -1,27 +0,0 @@
-#!/bin/bash
-
-set -e
-
-LB=$1
-
-if [ -z "$LB" ]; then
-    echo "Usage: $0 <loadbalancer_id_or_name>"
-    exit 1
-fi
-
-LB_ID=$(climc lb-show $LB | grep -w " id " | awk '{print $4}')
-LB_NAME=$(climc lb-show $LB | grep -w " name " | awk '{print $4}')
-
-if [ -z "$LB_ID" ]; then
-    echo "Loadbalancer $LB not found"
-    exit 1
-fi
-
-echo "Ready to remove loadbalancer $LB_NAME($LB_ID) ..."
-
-clean_loadbalancer() {
-    local LID=$1
-    climc lb-purge $LID
-}
-
-clean_loadbalancer $LB_ID

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

@@ -1,27 +0,0 @@
-#!/bin/bash
-
-set -e
-
-LB_ACL=$1
-
-if [ -z "$LB_ACL" ]; then
-    echo "Usage: $0 <loadbalancer_id_or_name>"
-    exit 1
-fi
-
-LB_ACL_ID=$(climc lbacl-show $LB_ACL | grep -w " id " | awk '{print $4}')
-LB_ACL_NAME=$(climc lbacl-show $LB_ACL | grep -w " name " | awk '{print $4}')
-
-if [ -z "$LB_ACL_ID" ]; then
-    echo "Loadbalancer ACL $LB_ACL_ID not found"
-    exit 1
-fi
-
-echo "Ready to remove loadbalancer acl $LB_ACL_NAME($LB_ACL_ID) ..."
-
-clean_loadbalancer_acl() {
-    local LID=$1
-    climc lbacl-purge $LID
-}
-
-clean_loadbalancer_acl $LB_ACL_ID

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

@@ -1,27 +0,0 @@
-#!/bin/bash
-
-set -e
-
-LB_CERT=$1
-
-if [ -z "$LB_CERT" ]; then
-    echo "Usage: $0 <loadbalancer_id_or_name>"
-    exit 1
-fi
-
-LB_CERT_ID=$(climc lbcert-show $LB_CERT | grep -w " id " | awk '{print $4}')
-LB_CERT_NAME=$(climc lbcert-show $LB_CERT | grep -w " name " | awk '{print $4}')
-
-if [ -z "$LB_CERT_ID" ]; then
-    echo "Loadbalancer certificate $LB_CERT_ID not found"
-    exit 1
-fi
-
-echo "Ready to remove loadbalancer certificate $LB_CERT_NAME($LB_CERT_ID) ..."
-
-clean_loadbalancer_cert() {
-    local LID=$1
-    climc lbcert-purge $LID
-}
-
-clean_loadbalancer_cert $LB_CERT_ID

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

@@ -1,96 +0,0 @@
-#!/bin/bash
-
-set -e
-
-pushd $(dirname $BASH_SOURCE) > /dev/null
-CUR_DIR=$(pwd -P)
-popd > /dev/null
-
-
-PROVIDER=$1
-
-if [ -z "$PROVIDER" ]; then
-    echo "Usage: $0 <cloud-provider-id-or-name>"
-    exit 1
-fi
-
-PROVIDER_ID=$(climc cloud-provider-show $PROVIDER | grep -w " id " | awk '{print $4}')
-PROVIDER_NAME=$(climc cloud-provider-show $PROVIDER | grep -w " name " | awk '{print $4}')
-
-if [ -z "$PROVIDER_ID" ]; then
-    echo "Cloud provider $PROVIDER not found"
-    exit 1
-fi
-
-
-echo "Ready to clean cloud provider $PROVIDER_NAME($PROVIDER_ID)..."
-
-echo "1. Disable cloud provider $PROVIDER_NAME($PROVIDER_ID) ..."
-
-climc cloud-provider-disable $PROVIDER_ID
-
-echo "2. Clean all hosts ..."
-
-for hostid in $(climc host-list --manager $PROVIDER_ID --admin --show-emulated --limit 0 | egrep '[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}' | awk '{print $2}')
-do
-    $CUR_DIR/clean_host.sh $hostid
-done
-
-echo "3. Clean all loadbalancer ..."
-
-for lbid in $(climc lb-list --manager $PROVIDER_ID --admin --show-emulated --limit 0 | egrep '[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}' | awk '{print $2}')
-do
-    $CUR_DIR/clean_loadbalancer.sh $lbid
-done
-
-echo "4. Clean all loadbalancer acl ..."
-
-for lbaclid in $(climc lbacl-list --manager $PROVIDER_ID --admin --show-emulated --limit 0 | egrep '[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}' | awk '{print $2}')
-do
-    $CUR_DIR/clean_loadbalancer_acl.sh $lbaclid
-done
-
-echo "5. Clean all loadbalancer certificate ..."
-
-for lbcertid in $(climc lbcert-list --manager $PROVIDER_ID --admin --show-emulated --limit 0 | egrep '[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}' | awk '{print $2}')
-do
-    $CUR_DIR/clean_loadbalancer_certificate.sh $lbcertid
-done
-
-echo "6. Clean all vpc ..."
-
-for vpcid in $(climc vpc-list --manager $PROVIDER_ID --admin --show-emulated --limit 0 | egrep '[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}' | awk '{print $2}')
-do
-    $CUR_DIR/clean_vpc.sh $vpcid
-done
-
-echo "7. Clean all eips ..."
-for eipid in $(climc eip-list --admin --manager $PROVIDER_ID --admin --show-emulated --limit 0 | egrep '[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}' | awk '{print $2}')
-do
-    $CUR_DIR/clean_eip.sh $eipid
-done
-
-echo "8. Clean all snapshots ..."
-for snapid in $(climc snapshot-list --admin --manager $PROVIDER_ID --admin --show-emulated --limit 0 | egrep '[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}' | awk '{print $2}')
-do
-    echo "to clean snapshot $snapid ..."
-    $CUR_DIR/clean_snapshot.sh $snapid
-done
-
-echo "9. Clean all storagecache ..."
-
-for cacheid in $(climc storage-cache-list --manager $PROVIDER_ID --admin --show-emulated --limit 0 | egrep '[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}' | awk '{print $2}')
-do
-    $CUR_DIR/clean_storagecache.sh $cacheid
-done
-
-echo "10. Clean all storages ..."
-
-for storeid in $(climc storage-list --manager $PROVIDER_ID --admin --show-emulated --limit 0 | egrep '[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}' | awk '{print $2}')
-do
-    $CUR_DIR/clean_storage.sh $storeid
-done
-
-echo "Delete cloud provider ..."
-
-climc cloud-provider-delete $PROVIDER_ID

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

@@ -1,27 +0,0 @@
-#/bin/bash
-
-set -e
-
-SNAPSHOT=$1
-
-if [ -z "$SNAPSHOT" ]; then
-    echo "Usage: $0 <snapshot_id_or_name>"
-    exit 1
-fi
-
-SNAPSHOT_NAME=$(climc snapshot-show $SNAPSHOT | grep -w " name " | awk '{print $4}')
-SNAPSHOT_ID=$(climc snapshot-show $SNAPSHOT | grep -w " id " | awk '{print $4}')
-
-if [ -z "$SNAPSHOT_ID" ]; then
-    echo "Cannot find snapshot $SNAPSHOT_ID"
-    exit 1
-fi
-
-echo "To clean snapshot $SNAPSHOT_NAME($SNAPSHOT_ID)..."
-
-clean_snapshot() {
-    local SNAP_ID=$1
-    climc snapshot-purge $SNAP_ID > /dev/null
-}
-
-clean_snapshot $SNAPSHOT_ID

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

@@ -1,34 +0,0 @@
-#!/bin/bash
-
-set -e
-
-STORAGE=$1
-
-if [ -z "$STORAGE" ]; then
-    echo "Usage: $0 <storage_id_or_name>"
-    exit 1
-fi
-
-STORAGE_ID=$(climc storage-show $STORAGE | grep -w " id " | awk '{print $4}')
-STORAGE_NAME=$(climc storage-show $STORAGE | grep -w " name " | awk '{print $4}')
-
-if [ -z "$STORAGE_ID" ]; then
-    echo "Storage $STORAGE not found"
-    exit 1
-fi
-
-echo "Clean disks on storage $STORAGE_NAME($STORAGE_ID) ..."
-
-for disk_id in $(climc disk-list --admin --storage $STORAGE_ID --show-emulated --limit 2048 | egrep '[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}' | awk '{print $2}')
-do
-    climc disk-purge $disk_id > /dev/null
-done
-
-for disk_id in $(climc disk-list --admin --storage $STORAGE_ID --show-emulated --pending-delete --limit 2048 | egrep '[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}' | awk '{print $2}')
-do
-    climc disk-purge $disk_id > /dev/null
-done
-
-# CACHE_ID=$(climc storage-show $STORAGE_ID | grep -w " storagecache_id " | awk '{print $4}')
-
-climc storage-delete $STORAGE_ID > /dev/null

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

@@ -1,28 +0,0 @@
-#!/bin/bash
-
-set -e
-
-CACHE=$1
-
-if [ -z "$CACHE" ]; then
-    echo "Usage: $0 <storage_cache_id_or_name>"
-    exit 1
-fi
-
-CACHE_ID=$(climc storage-cache-show $CACHE | grep -w " id " | awk '{print $4}')
-CACHE_NAME=$(climc storage-cache-show $CACHE | grep -w " name " | awk '{print $4}')
-
-if [ -z "$CACHE_ID" ]; then
-    echo "Storage cache $CACHE not found"
-    exit 1
-fi
-
-echo "Ready to remove storagecache $CACHE_NAME($CACHE_ID) ..."
-
-for imgid in $(climc storage-cached-image-list --storagecache $CACHE_ID --show-emulated --limit 0 | egrep '[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}' | awk '{print $4}')
-do
-    climc storagecache-uncache-image $CACHE_ID $imgid --force # > /dev/null
-done
-
-climc storage-cache-delete $CACHE_ID > /dev/null
-

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

@@ -1,55 +0,0 @@
-#/bin/bash
-
-set -e
-
-VPC=$1
-
-if [ -z "$VPC" ]; then
-    echo "Usage: $0 <vpc_id_or_name>"
-    exit 1
-fi
-
-VPC_NAME=$(climc vpc-show $VPC | grep -w " name " | awk '{print $4}')
-VPC_ID=$(climc vpc-show $VPC | grep -w " id " | awk '{print $4}')
-
-if [ -z "$VPC_ID" ]; then
-    echo "Cannot find vpc $VPC"
-    exit 1
-fi
-
-echo "To clean vpc $VPC_NAME($VPC_ID)..."
-
-clean_network() {
-    climc network-purge $1 > /dev/null
-}
-
-
-clean_wire() {
-    local WIRE_ID=$1
-    for net_id in $(climc network-list --admin --wire $WIRE_ID --show-emulated | egrep '[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}' | awk '{print $2}')
-    do
-        clean_network $net_id
-    done
-    climc wire-delete $wire_id > /dev/null
-}
-
-clean_vpc() {
-    local VPC_ID=$1
-    climc vpc-purge $VPC_ID > /dev/null
-}
-
-echo "1. Clean wires ..."
-
-for wire_id in $(climc wire-list --vpc $VPC_ID --show-emulated | egrep '[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}' | awk '{print $2}')
-do
-    clean_wire $wire_id
-done
-
-echo "2. Clean route tables ..."
-for routetable_id in $(climc routetable-list --vpc $VPC_ID --show-emulated | egrep '[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}' | awk '{print $2}')
-do
-    climc routetable-purge $routetable_id >/dev/null
-done
-
-echo "3. clean vpc ..."
-clean_vpc $VPC_ID

build/cloudevent/vars

@@ -1 +0,0 @@
-DESCRIPTION="Yunion Cloudevent"

build/devtool/vars

@@ -1 +0,0 @@
-DESCRIPTION="Yunion DevTools Server"

build/docker/Dockerfile.ansibleserver

@@ -1,3 +0,0 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/ansibleserver-base:latest
-
-ADD ./_output/bin/ansibleserver /opt/yunion/bin/ansibleserver

build/docker/Dockerfile.ansibleserver-base

@@ -1,13 +0,0 @@
-FROM frolvlad/alpine-glibc:glibc-2.28
-
-MAINTAINER "Zexi Li <lizexi@yunionyun.com>"
-
-ENV TZ Asia/Shanghai
-
-RUN mkdir -p /opt/yunion/bin
-
-RUN apk update && \
-    apk add --no-cache tzdata ansible ca-certificates && \
-    rm -rf /var/cache/apk/*
-
-RUN cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime

build/docker/Dockerfile.apigateway

@@ -1,3 +0,0 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:latest
-
-ADD ./_output/bin/apigateway /opt/yunion/bin/apigateway

build/docker/Dockerfile.baremetal-agent

@@ -1,9 +0,0 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/baremetal-base:v0.0.1
-
-MAINTAINER "Zexi Li <lizexi@yunionyun.com>"
-
-RUN mkdir -p /opt/yunion/bin
-
-ADD ./_output/bin/baremetal-agent /opt/yunion/bin/baremetal-agent
-ADD ./_output/bin/.baremetal-agent.bin /opt/yunion/bin/.baremetal-agent.bin
-ADD ./_output/bin/bundles/baremetal-agent /opt/yunion/bin/bundles/baremetal-agent

build/docker/Dockerfile.baremetal-base

@@ -1,34 +0,0 @@
-FROM frolvlad/alpine-glibc:glibc-2.28
-
-MAINTAINER "Yaoqi Wan <wanyaoqi@yunionyun.com>"
-
-RUN mkdir -p /opt/yunion/bin
-
-RUN apk update && \
-    apk add --no-cache ipmitool ethtool tzdata ca-certificates && \
-    rm -rf /var/cache/apk/*
-
-RUN cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
-
-RUN mkdir -p /opt/cloud/yunion/baremetal
-
-# download baremetal-pxerom-*.x86_64.rpm and unpack rpm in current directory
-COPY ./opt/cloud/yunion/baremetal/bootia32.efi /opt/cloud/yunion/baremetal
-COPY ./opt/cloud/yunion/baremetal/bootx64.efi /opt/cloud/yunion/baremetal
-COPY ./opt/cloud/yunion/baremetal/chain.c32 /opt/cloud/yunion/baremetal
-COPY ./opt/cloud/yunion/baremetal/initramfs /opt/cloud/yunion/baremetal
-COPY ./opt/cloud/yunion/baremetal/isolinux.bin /opt/cloud/yunion/baremetal
-COPY ./opt/cloud/yunion/baremetal/kernel /opt/cloud/yunion/baremetal
-COPY ./opt/cloud/yunion/baremetal/ldlinux.c32 /opt/cloud/yunion/baremetal
-COPY ./opt/cloud/yunion/baremetal/ldlinux.e32 /opt/cloud/yunion/baremetal
-COPY ./opt/cloud/yunion/baremetal/ldlinux.e64 /opt/cloud/yunion/baremetal
-COPY ./opt/cloud/yunion/baremetal/libcom32.c32 /opt/cloud/yunion/baremetal
-COPY ./opt/cloud/yunion/baremetal/libutil.c32 /opt/cloud/yunion/baremetal
-COPY ./opt/cloud/yunion/baremetal/lpxelinux.0 /opt/cloud/yunion/baremetal
-COPY ./opt/cloud/yunion/baremetal/menu.c32 /opt/cloud/yunion/baremetal
-COPY ./opt/cloud/yunion/baremetal/pxelinux.0 /opt/cloud/yunion/baremetal
-
-# add mkisofs with bundles libraries
-ADD ./mkisofs /bin/mkisofs
-ADD ./.mkisofs.bin /bin/.mkisofs.bin
-ADD ./bundles/mkisofs /bin/bundles/mkisofs

build/docker/Dockerfile.climc

@@ -1,5 +0,0 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/climc-base:v20200308
-
-ADD ./build/climc/root/opt /opt
-
-ADD ./_output/bin/climc ./_output/bin/*cli /opt/yunion/bin/

build/docker/Dockerfile.climc-base

@@ -1,16 +0,0 @@
-FROM frolvlad/alpine-glibc:glibc-2.28
-
-MAINTAINER "Zexi Li <lizexi@yunionyun.com>"
-
-ENV TZ Asia/Shanghai
-
-RUN mkdir -p /opt/yunion/bin
-
-RUN apk add --no-cache bash bash-completion tzdata ca-certificates vim && \
-    rm -rf /var/cache/apk/*
-
-RUN cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
-
-ENV PATH="/opt/yunion/bin:${PATH}"
-
-RUN mkdir -p /opt/yunion/bin

build/docker/Dockerfile.cloudevent

@@ -1,3 +0,0 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:latest
-
-ADD ./_output/bin/cloudevent /opt/yunion/bin/cloudevent

build/docker/Dockerfile.cloudnet

@@ -1,3 +0,0 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:latest
-
-ADD ./_output/bin/cloudnet /opt/yunion/bin/cloudnet

build/docker/Dockerfile.devtool

@@ -1,3 +0,0 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:latest
-
-ADD ./_output/bin/devtool /opt/yunion/bin/devtool

build/docker/Dockerfile.esxi-agent

@@ -1,4 +0,0 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:latest
-
-COPY ./build/esxi-agent/root/opt/ /opt/
-ADD ./_output/bin/esxi-agent /opt/yunion/bin/esxi-agent

build/docker/Dockerfile.glance

@@ -1,6 +0,0 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/glance-base:latest
-
-MAINTAINER "Zexi Li <lizexi@yunionyun.com>"
-
-RUN mkdir -p /opt/yunion/bin
-ADD ./_output/bin/glance /opt/yunion/bin/glance

build/docker/Dockerfile.glance-base

@@ -1,18 +0,0 @@
-FROM frolvlad/alpine-glibc:glibc-2.28
-
-MAINTAINER "Yaoqi Wan <wanyaoqi@yunionyun.com>"
-
-RUN apk update && \
-    apk add --no-cache tzdata ca-certificates qemu-img && \
-    rm -rf /var/cache/apk/*
-
-RUN cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
-
-ENV TZ Asia/Shanghai
-
-# add executable file torrent
-# make cmd/torrent && ./scripts/bundle-libraries.sh _output/bin/bundles/torrent _output/bin/torrent
-RUN mkdir -p /opt/yunion/bin
-ADD ./_output/bin/torrent /opt/yunion/bin/torrent
-ADD ./_output/bin/.torrent.bin /opt/yunion/bin/.torrent.bin
-ADD ./_output/bin/bundles/torrent /opt/yunion/bin/bundles/torrent

build/docker/Dockerfile.host

@@ -1,11 +0,0 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/host-base:v0.0.1
-
-MAINTAINER "Yaoqi Wan wanyaoqi@yunionyun.com"
-
-ENV TZ Asia/Shanghai
-
-RUN mkdir -p /opt/yunion/bin
-
-ADD ./_output/bin/host /opt/yunion/bin/host
-ADD ./_output/bin/.host.bin /opt/yunion/bin/.host.bin
-ADD ./_output/bin/bundles/host /opt/yunion/bin/bundles/host

build/docker/Dockerfile.host-deployer

@@ -1,11 +0,0 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/host-deployer-base:v0.0.2
-
-MAINTAINER "Yaoqi Wan wanyaoqi@yunionyun.com"
-
-ENV TZ Asia/Shanghai
-
-RUN mkdir -p /opt/yunion/bin
-
-ADD ./_output/bin/host-deployer /opt/yunion/bin/host-deployer
-ADD ./_output/bin/.host-deployer.bin /opt/yunion/bin/.host-deployer.bin
-ADD ./_output/bin/bundles/host-deployer /opt/yunion/bin/bundles/host-deployer

build/docker/Dockerfile.keystone

@@ -1,3 +0,0 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:latest
-
-ADD ./_output/bin/keystone /opt/yunion/bin/keystone

build/docker/Dockerfile.logger

@@ -1,4 +0,0 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:latest
-
-ADD ./_output/bin/logger /opt/yunion/bin/logger
-

build/docker/Dockerfile.notify

@@ -1,4 +0,0 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:latest
-
-COPY ./build/notify/root/opt/ /opt/
-ADD ./_output/bin/notify /opt/yunion/bin/notify

build/docker/Dockerfile.onecloud-base

@@ -1,13 +0,0 @@
-FROM frolvlad/alpine-glibc:glibc-2.28
-
-MAINTAINER "Zexi Li <lizexi@yunionyun.com>"
-
-ENV TZ Asia/Shanghai
-
-RUN mkdir -p /opt/yunion/bin
-
-RUN apk update && \
-    apk add --no-cache tzdata ca-certificates && \
-    rm -rf /var/cache/apk/*
-
-RUN cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime

build/docker/Dockerfile.region

@@ -1,4 +0,0 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:latest
-
-COPY ./build/region/root/opt/ /opt/
-ADD ./_output/bin/region /opt/yunion/bin/region

build/docker/Dockerfile.region-dns

@@ -1,3 +0,0 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:latest
-
-ADD ./_output/bin/region-dns /opt/yunion/bin/region-dns

build/docker/Dockerfile.s3gateway

@@ -1,3 +0,0 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:latest
-
-ADD ./_output/bin/s3gateway /opt/yunion/bin/s3gateway

build/docker/Dockerfile.scheduler

@@ -1,3 +0,0 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:latest
-
-ADD ./_output/bin/scheduler /opt/yunion/bin/scheduler

build/docker/Dockerfile.webconsole

@@ -1,3 +0,0 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/webconsole-base:latest
-
-ADD ./_output/bin/webconsole /opt/yunion/bin/webconsole

build/docker/Dockerfile.webconsole-base

@@ -1,12 +0,0 @@
-FROM yunion/kubectl:1.14.3
-
-MAINTAINER "Zexi Li <lizexi@yunionyun.com>"
-
-ENV TZ Asia/Shanghai
-
-RUN mkdir -p /opt/yunion/bin
-
-RUN apk add --no-cache sshpass ipmitool openssh-client tzdata ca-certificates && \
-    rm -rf /var/cache/apk/*
-
-RUN cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime

build/docker/Dockerfile.yunionconf

@@ -1,4 +0,0 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:latest
-
-ADD ./_output/bin/yunionconf /opt/yunion/bin/yunionconf
-

build/esxi-agent/root/opt/yunion/share/vmware/ovf.xml

@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Envelope xmlns="http://schemas.dmtf.org/ovf/envelope/1"
-          xmlns:ovf="http://schemas.dmtf.org/ovf/envelope/1"
-          xmlns:cim="http://schemas.dmtf.org/wbem/wscim/1/common"
-          xmlns:rasd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData"
-          xmlns:vmw="http://www.vmware.com/schema/ovf"
-          xmlns:vssd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData"
-          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <References>
-    <File ovf:href="{{ .Name }}" ovf:id="file1" ovf:size="{{ .Size }}"/>
-  </References>
-  <DiskSection>
-    <Info>Virtual disk information</Info>
-    <Disk ovf:capacity="{{ .Capacity }}" ovf:capacityAllocationUnits="byte" ovf:diskId="vmdisk1" ovf:fileRef="file1" ovf:format="http://www.vmware.com/interfaces/specifications/vmdk.html#streamOptimized" ovf:populatedSize="0"/>
-  </DiskSection>
-  <VirtualSystem ovf:id="{{ .ImportName }}">
-    <Info>A virtual machine</Info>
-    <Name>{{ .ImportName }}</Name>
-    <OperatingSystemSection ovf:id="100" vmw:osType="other26xLinux64Guest">
-      <Info>The kind of installed guest operating system</Info>
-    </OperatingSystemSection>
-    <VirtualHardwareSection>
-      <Info>Virtual hardware requirements</Info>
-      <System>
-        <vssd:ElementName>Virtual Hardware Family</vssd:ElementName>
-        <vssd:InstanceID>0</vssd:InstanceID>
-        <vssd:VirtualSystemIdentifier>{{ .ImportName }}</vssd:VirtualSystemIdentifier>
-        <vssd:VirtualSystemType>vmx-07</vssd:VirtualSystemType>
-      </System>
-      <Item>
-        <rasd:AllocationUnits>hertz * 10^6</rasd:AllocationUnits>
-        <rasd:Description>Number of Virtual CPUs</rasd:Description>
-        <rasd:ElementName>1 virtual CPU(s)</rasd:ElementName>
-        <rasd:InstanceID>1</rasd:InstanceID>
-        <rasd:ResourceType>3</rasd:ResourceType>
-        <rasd:VirtualQuantity>1</rasd:VirtualQuantity>
-      </Item>
-      <Item>
-        <rasd:AllocationUnits>byte * 2^20</rasd:AllocationUnits>
-        <rasd:Description>Memory Size</rasd:Description>
-        <rasd:ElementName>1024MB of memory</rasd:ElementName>
-        <rasd:InstanceID>2</rasd:InstanceID>
-        <rasd:ResourceType>4</rasd:ResourceType>
-        <rasd:VirtualQuantity>1024</rasd:VirtualQuantity>
-      </Item>
-      <Item>
-        <rasd:Address>0</rasd:Address>
-        <rasd:Description>SCSI Controller</rasd:Description>
-        <rasd:ElementName>SCSI Controller 0</rasd:ElementName>
-        <rasd:InstanceID>3</rasd:InstanceID>
-        <rasd:ResourceSubType>VirtualSCSI</rasd:ResourceSubType>
-        <rasd:ResourceType>6</rasd:ResourceType>
-      </Item>
-      <Item>
-        <rasd:AddressOnParent>0</rasd:AddressOnParent>
-        <rasd:ElementName>Hard Disk 1</rasd:ElementName>
-        <rasd:HostResource>ovf:/disk/vmdisk1</rasd:HostResource>
-        <rasd:InstanceID>9</rasd:InstanceID>
-        <rasd:Parent>3</rasd:Parent>
-        <rasd:ResourceType>17</rasd:ResourceType>
-        <vmw:Config ovf:required="false" vmw:key="backing.writeThrough" vmw:value="false"/>
-      </Item>
-    </VirtualHardwareSection>
-  </VirtualSystem>
-</Envelope>

build/esxi-agent/vars

@@ -1,2 +0,0 @@
-DESCRIPTION="Esxi Agent"
-# SERVICE="yes"

build/executor-server/root/usr/lib/systemd/system/yunion-executor.service

@@ -1,18 +0,0 @@
-[Unit]
-Description=Yunion Command Executor
-Documentation=https://docs.yunion.cn
-
-[Service]
-Type=simple
-User=root
-Group=root
-ExecStart=/opt/yunion/bin/executor-server
-WorkingDirectory=/opt/yunion/bin
-KillMode=process
-Restart=always
-RestartSec=30
-LimitNOFILE=500000
-LimitNPROC=500000
-
-[Install]
-WantedBy=multi-user.target

build/executor-server/vars

@@ -1,2 +0,0 @@
-DESCRIPTION="Yunion Executor Server Command Line Utility"
-SERVICE="yes"

cmd/climc/shell/ansibleplaybooks.go

@@ -15,6 +15,9 @@
 package shell
 
 import (
+	//"fmt"
+	//"strings"
+
 	"yunion.io/x/jsonutils"
 
 	"yunion.io/x/onecloud/pkg/mcclient"

cmd/climc/shell/bucket_options.go

@@ -1,46 +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 shell
-
-import (
-	"yunion.io/x/jsonutils"
-
-	"yunion.io/x/onecloud/pkg/mcclient"
-	"yunion.io/x/onecloud/pkg/mcclient/modules"
-	"yunion.io/x/onecloud/pkg/mcclient/options"
-)
-
-func init() {
-	type BucketOptionsVerifyOptions struct {
-		options.BaseListOptions
-		CloudaccountId       string `help:"cloudaccount Id" required:"true"`
-		BillingReportBucket  string `help:"S3 bucket that stores account billing report"`
-		BillingFilePrefix    string `help:"prefix of billing file name"`
-		BillingBucketAccount string `help:"Id of cloudaccount that can access billing bucket"`
-		UsageReportBucket    string `help:"S3 bucket that stores account usage report"`
-		UsageFilePrefix      string `help:"prefix of usage file name"`
-		UsageBucketAccount   string `help:"Id of cloudaccount that can access usage bucket"`
-	}
-	R(&BucketOptionsVerifyOptions{}, "bucket-options-verify", "billing bucket connection test",
-		func(s *mcclient.ClientSession, args *BucketOptionsVerifyOptions) error {
-			params := jsonutils.Marshal(args)
-			result, err := modules.BucketOptions.PerformAction(s, args.CloudaccountId, "verify", params)
-			if err != nil {
-				return err
-			}
-			printObject(result)
-			return nil
-		})
-}

cmd/climc/shell/cloudaccounts.go

@@ -16,7 +16,6 @@ package shell
 
 import (
 	"fmt"
-	"io/ioutil"
 
 	"yunion.io/x/jsonutils"
 
@@ -26,28 +25,6 @@ import (
 	"yunion.io/x/onecloud/pkg/mcclient/options"
 )
 
-func parseGcpCredential(filename string) (jsonutils.JSONObject, error) {
-	data, err := ioutil.ReadFile(filename)
-	if err != nil {
-		return nil, err
-	}
-	authParams, err := jsonutils.Parse(data)
-	if err != nil {
-		return nil, err
-	}
-	ret := jsonutils.NewDict()
-	for _, k := range []string{
-		"client_email",
-		"project_id",
-		"private_key_id",
-		"private_key",
-	} {
-		v, _ := authParams.Get(k)
-		ret.Add(v, fmt.Sprintf("gcp_%s", k))
-	}
-	return ret, nil
-}
-
 func init() {
 
 	type CloudaccountListOptions struct {
@@ -153,25 +130,6 @@ func init() {
 		return nil
 	})
 
-	R(&options.SGoogleCloudAccountCreateOptions{}, "cloud-account-create-google", "Create a Google cloud account", func(s *mcclient.ClientSession, args *options.SGoogleCloudAccountCreateOptions) error {
-		params := jsonutils.Marshal(args)
-		params.(*jsonutils.JSONDict).Add(jsonutils.NewString("Google"), "provider")
-		authParams, err := parseGcpCredential(args.GoogleJsonFile)
-		if err != nil {
-			return err
-		}
-		err = jsonutils.Update(params, authParams)
-		if err != nil {
-			return err
-		}
-		result, err := modules.Cloudaccounts.Create(s, params)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
 	R(&options.SAWSCloudAccountCreateOptions{}, "cloud-account-create-aws", "Create an AWS cloud account", func(s *mcclient.ClientSession, args *options.SAWSCloudAccountCreateOptions) error {
 		params := jsonutils.Marshal(args).(*jsonutils.JSONDict)
 		options := jsonutils.NewDict()
@@ -273,17 +231,6 @@ func init() {
 		return nil
 	})
 
-	R(&options.SCtyunCloudAccountCreateOptions{}, "cloud-account-create-ctyun", "Create a Ctyun cloud account", func(s *mcclient.ClientSession, args *options.SCtyunCloudAccountCreateOptions) error {
-		params := jsonutils.Marshal(args)
-		params.(*jsonutils.JSONDict).Add(jsonutils.NewString("Ctyun"), "provider")
-		result, err := modules.Cloudaccounts.Create(s, params)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
 	type CloudaccountUpdateOptions struct {
 		ID        string `help:"ID or Name of cloud account"`
 		Name      string `help:"New name to update"`
@@ -501,19 +448,6 @@ func init() {
 		return nil
 	})
 
-	R(&options.SCtyunCloudAccountUpdateOptions{}, "cloud-account-update-ctyun", "update a Ctyun cloud account", func(s *mcclient.ClientSession, args *options.SCtyunCloudAccountUpdateOptions) error {
-		params := jsonutils.Marshal(args).(*jsonutils.JSONDict)
-		if params.Size() == 0 {
-			return InvalidUpdateError()
-		}
-		result, err := modules.Cloudaccounts.Update(s, args.ID, params)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
 	type CloudaccountShowOptions struct {
 		ID string `help:"ID or Name of cloud account"`
 	}
@@ -698,16 +632,6 @@ func init() {
 		return nil
 	})
 
-	R(&options.SCtyunCloudAccountUpdateCredentialOptions{}, "cloud-account-update-credential-ctyun", "Update credential of an Ctyun cloud account", func(s *mcclient.ClientSession, args *options.SCtyunCloudAccountUpdateCredentialOptions) error {
-		params := jsonutils.Marshal(args)
-		result, err := modules.Cloudaccounts.PerformAction(s, args.ID, "update-credential", params)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
 	type CloudaccountSyncOptions struct {
 		ID       string   `help:"ID or Name of cloud account"`
 		Force    bool     `help:"Force sync no matter what"`
@@ -804,34 +728,4 @@ func init() {
 		printObject(result)
 		return nil
 	})
-
-	type CloudaccountSyncSkusOptions struct {
-		ID       string `help:"ID or Name of cloud account"`
-		RESOURCE string `help:"Resource of skus" choices:"serversku|elasticcachesku|dbinstance_sku"`
-		Force    bool   `help:"Force sync no matter what"`
-		Provider string `help:"provider to sync"`
-		Region   string `help:"region to sync"`
-	}
-	R(&CloudaccountSyncSkusOptions{}, "cloud-account-sync-skus", "Sync skus of a cloud account", func(s *mcclient.ClientSession, args *CloudaccountSyncSkusOptions) error {
-		params := jsonutils.NewDict()
-		params.Set("resource", jsonutils.NewString(args.RESOURCE))
-		if args.Force {
-			params.Add(jsonutils.JSONTrue, "force")
-		}
-
-		if len(args.Provider) > 0 {
-			params.Add(jsonutils.NewString(args.Provider), "cloudprovider")
-		}
-
-		if len(args.Region) > 0 {
-			params.Add(jsonutils.NewString(args.Region), "cloudregion")
-		}
-
-		result, err := modules.Cloudaccounts.PerformAction(s, args.ID, "sync-skus", params)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
 }

cmd/climc/shell/cloudevents.go

@@ -1,43 +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 shell
-
-import (
-	"yunion.io/x/onecloud/pkg/mcclient"
-	"yunion.io/x/onecloud/pkg/mcclient/modules"
-	"yunion.io/x/onecloud/pkg/mcclient/options"
-)
-
-func init() {
-
-	type CloudeventListOptions struct {
-		options.BaseListOptions
-
-		Since string `help:"since time"`
-		Until string `hlep:"until time"`
-	}
-	R(&CloudeventListOptions{}, "cloud-event-list", "List cloud events", func(s *mcclient.ClientSession, opts *CloudeventListOptions) error {
-		params, err := options.ListStructToParams(opts)
-		if err != nil {
-			return err
-		}
-		result, err := modules.Cloudevents.List(s, params)
-		if err != nil {
-			return err
-		}
-		printList(result, modules.Cloudevents.GetColumns(s))
-		return nil
-	})
-}

cmd/climc/shell/cloudregions.go

@@ -49,7 +49,7 @@ func init() {
 	type CloudregionCityListOptions struct {
 		Manager  string `help:"List objects belonging to the cloud provider"`
 		Account  string `help:"List objects belonging to the cloud account"`
-		Provider string `help:"List objects from the provider" choices:"VMware|Aliyun|Qcloud|Azure|Aws|Huawei|Openstack|Ucloud|ZStack|Google|Ctyun"`
+		Provider string `help:"List objects from the provider" choices:"VMware|Aliyun|Qcloud|Azure|Aws|Huawei|Openstack|Ucloud|ZStack"`
 		City     string `help:"List regions in the specified city"`
 
 		PublicCloud  *bool `help:"List objects belonging to public cloud" json:"public_cloud"`

cmd/climc/shell/devtoolcronjob.go

@@ -1,222 +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 shell
-
-import (
-	"fmt"
-
-	"yunion.io/x/jsonutils"
-	"yunion.io/x/log"
-
-	"yunion.io/x/onecloud/pkg/mcclient"
-	"yunion.io/x/onecloud/pkg/mcclient/modulebase"
-	"yunion.io/x/onecloud/pkg/mcclient/modules"
-	"yunion.io/x/onecloud/pkg/mcclient/options"
-)
-
-func paramValidator(param jsonutils.JSONObject) (bool, error) {
-	// TODO 移到 server 端
-	log.Infof("paramValidator: param: %+v", param)
-	interval, err := param.Int("interval")
-	if err != nil {
-		return true, nil
-	}
-	day, err := param.Int("day")
-	if err != nil {
-		return true, nil
-	}
-	if interval == 0 && day == 0 {
-		return false, fmt.Errorf("interval and day can not be 0 at the same time")
-	}
-	return true, nil
-}
-
-func init() {
-	type CronjobListOptions struct {
-		options.BaseListOptions
-		Name string `help:"cloud region ID or Name" json:"-"`
-	}
-
-	R(&CronjobListOptions{}, "devtoolcronjob-list", "List Devtool Cronjobs", func(s *mcclient.ClientSession, args *CronjobListOptions) error {
-		params, err := options.ListStructToParams(args)
-		if err != nil {
-			return err
-		}
-		var result *modulebase.ListResult
-		result, err = modules.DevToolCronjobs.List(s, params)
-		printList(result, modules.DevToolCronjobs.GetColumns(s))
-		return nil
-	})
-
-	type CronjobCreateOptions struct {
-		NAME     string `help:"Ansible Playbook ID or Name" json:"-"`
-		Day      int    `help:"Cronjob runs at given day" default:"0"`
-		Hour     int    `help:"Cronjob runs at given hour" default:"0"`
-		Min      int    `help:"Cronjob runs at given min" default:"0"`
-		Sec      int    `help:"Cronjob runs at given sec" default:"0"`
-		Interval int64  `help:"Cronjob runs at given interval" default:"0"`
-		Start    bool   `help:"start job when created" default:"false"`
-		Enabled  bool   `help:"Set job status enabled" default:"false"`
-	}
-	R(
-		&CronjobCreateOptions{},
-		"devtoolcronjob-create",
-		"Create a cronjob repo component",
-		func(s *mcclient.ClientSession, args *CronjobCreateOptions) error {
-			result, err := modules.AnsiblePlaybooks.Get(s, args.NAME, nil)
-			if err != nil {
-				return err
-			}
-			ansiblePlaybookName, err := result.GetString("name")
-			if err != nil {
-				return err
-			}
-
-			ansiblePlaybookID, err := result.GetString("id")
-			if err != nil {
-				return err
-			}
-
-			params := jsonutils.NewDict()
-			params.Add(jsonutils.NewString(ansiblePlaybookName), "name")
-
-			params.Add(jsonutils.NewString(ansiblePlaybookID), "ansible_playbook_id")
-
-			if args.Start {
-				params.Add(jsonutils.JSONTrue, "start")
-
-			}
-			if args.Enabled {
-				params.Add(jsonutils.JSONTrue, "enabled")
-			} else if args.Interval > 0 {
-				params.Add(jsonutils.NewInt(int64(args.Interval)), "interval")
-			} else {
-				params.Add(jsonutils.NewInt(int64(0)), "interval")
-				params.Add(jsonutils.NewInt(int64(args.Day)), "day")
-				params.Add(jsonutils.NewInt(int64(args.Hour)), "hour")
-				params.Add(jsonutils.NewInt(int64(args.Min)), "min")
-				params.Add(jsonutils.NewInt(int64(args.Sec)), "sec")
-			}
-			ok, err := paramValidator(params)
-			if err != nil || !ok {
-				log.Infof("paramValidator error %s", err)
-				return err
-			}
-			cronjob, err := modules.DevToolCronjobs.Create(s, params)
-			if err != nil {
-				log.Errorf("modules.DevToolCronjobs.Create error %s", err)
-				return err
-			}
-			printObject(cronjob)
-			return nil
-		},
-	)
-
-	type DevToolCronjobShowOptions struct {
-		ID string `help:"ID or Name of the DevToolCronjob to show"`
-	}
-	R(&DevToolCronjobShowOptions{}, "devtoolcronjob-show", "Show cronjob details", func(s *mcclient.ClientSession, args *DevToolCronjobShowOptions) error {
-		result, err := modules.DevToolCronjobs.Get(s, args.ID, nil)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
-	type DevToolCronjobUpdateOptions struct {
-		ID       string `help:"ID or Name of DevToolCronjob to update"`
-		Day      int    `help:"Cronjob runs at given day" json:"-" default:"-1"`
-		Hour     int    `help:"Cronjob runs at given hour" json:"-" default:"-1"`
-		Min      int    `help:"Cronjob runs at given min" default:"-1"`
-		Sec      int    `help:"Cronjob runs at given sec" default:"-1"`
-		Interval int    `help:"Cronjob runs at given interval" default:"-1"`
-		Start    bool   `help:"start job when created"`
-		Stop     bool   `help:"start job when created"`
-		Enable   bool   `help:"Set job status enabled"`
-		Disable  bool   `help:"Set job status enabled"`
-	}
-	R(&DevToolCronjobUpdateOptions{}, "devtoolcronjob-update", "Update DevToolCronjob", func(s *mcclient.ClientSession, args *DevToolCronjobUpdateOptions) error {
-		result, err := modules.DevToolCronjobs.Get(s, args.ID, nil)
-		if err != nil {
-			return err
-		}
-
-		params := jsonutils.NewDict()
-		interval, _ := result.Int("interval")
-		day, _ := result.Int("day")
-		params.Add(jsonutils.NewString(args.ID), "id")
-		params.Add(jsonutils.NewInt(int64(interval)), "interval")
-		params.Add(jsonutils.NewInt(int64(day)), "day")
-
-		log.Infof("DevToolCronjobUpdateOptions args: %+v", args)
-		if args.Interval >= 0 {
-			params.Add(jsonutils.NewInt(int64(args.Interval)), "interval")
-			if args.Interval > 0 {
-				params.Add(jsonutils.NewInt(0), "day")
-			}
-		} else if args.Day >= 0 {
-			params.Add(jsonutils.NewInt(int64(args.Day)), "day")
-			if args.Day > 0 {
-				params.Add(jsonutils.NewInt(0), "interval")
-			}
-		}
-		if args.Hour >= 0 {
-			params.Add(jsonutils.NewInt(int64(args.Hour)), "hour")
-		}
-		if args.Min >= 0 {
-			params.Add(jsonutils.NewInt(int64(args.Min)), "min")
-		}
-		if args.Sec >= 0 {
-			params.Add(jsonutils.NewInt(int64(args.Sec)), "sec")
-		}
-
-		ok, err := paramValidator(params)
-		if err != nil || !ok {
-			return err
-		}
-
-		if args.Start && args.Stop {
-			return fmt.Errorf("can not set job start and stop at the same time")
-		} else if args.Start {
-			params.Add(jsonutils.JSONTrue, "start")
-		} else if args.Stop {
-			params.Add(jsonutils.JSONFalse, "start")
-		}
-		if args.Enable && args.Disable {
-			return fmt.Errorf("can not set job enabled and disabled at the same time")
-		} else if args.Enable {
-			params.Add(jsonutils.JSONTrue, "enabled")
-		} else if args.Disable {
-			params.Add(jsonutils.JSONFalse, "enabled")
-		}
-
-		result, err = modules.DevToolCronjobs.Update(s, args.ID, params)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
-	R(&DevToolCronjobShowOptions{}, "devtoolcronjob-delete", "Delete DevToolCronjob", func(s *mcclient.ClientSession, args *DevToolCronjobShowOptions) error {
-		result, err := modules.DevToolCronjobs.Delete(s, args.ID, nil)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-}

cmd/climc/shell/devtooltemplate.go

@@ -1,154 +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 shell
-
-import (
-	"yunion.io/x/jsonutils"
-	"yunion.io/x/log"
-
-	"yunion.io/x/onecloud/pkg/mcclient"
-	"yunion.io/x/onecloud/pkg/mcclient/modulebase"
-	"yunion.io/x/onecloud/pkg/mcclient/modules"
-	"yunion.io/x/onecloud/pkg/mcclient/options"
-)
-
-func init() {
-
-	printAnsiblePlaybookObject := func(obj jsonutils.JSONObject) {
-		dict := obj.(*jsonutils.JSONDict)
-		pbJson, err := dict.Get("playbook")
-		if err != nil {
-			printObject(obj)
-			return
-		}
-		pbStr := pbJson.YAMLString()
-		dict.Set("playbook", jsonutils.NewString(pbStr))
-		printObject(obj)
-	}
-
-	type TemplateListOptions struct {
-		options.BaseListOptions
-		Name string `help:"cloud region ID or Name" json:"-"`
-	}
-
-	R(&TemplateListOptions{}, "devtooltemplate-list", "List Devtool Templates", func(s *mcclient.ClientSession, args *TemplateListOptions) error {
-		params, err := options.ListStructToParams(args)
-		if err != nil {
-			return err
-		}
-		var result *modulebase.ListResult
-		result, err = modules.DevToolTemplates.List(s, params)
-		printList(result, modules.DevToolTemplates.GetColumns(s))
-		return nil
-	})
-
-	R(
-		&options.DevtoolTemplateCreateOptions{},
-		"devtooltemplate-create",
-		"Create a template repo component",
-		func(s *mcclient.ClientSession, opts *options.DevtoolTemplateCreateOptions) error {
-
-			params, err := opts.Params()
-			if err != nil {
-				return err
-			}
-			log.Infof("devtool playbook create opts: %+v", params)
-			apb, err := modules.DevToolTemplates.Create(s, params)
-			if err != nil {
-				return err
-			}
-			printAnsiblePlaybookObject(apb)
-			return nil
-		},
-	)
-
-	R(
-		&options.DevtoolTemplateIdOptions{},
-		"devtooltemplate-show",
-		"Show devtool template",
-		func(s *mcclient.ClientSession, opts *options.DevtoolTemplateIdOptions) error {
-			apb, err := modules.DevToolTemplates.Get(s, opts.ID, nil)
-			if err != nil {
-				return err
-			}
-			printAnsiblePlaybookObject(apb)
-			return nil
-		},
-	)
-
-	R(
-		&options.DevtoolTemplateBindingOptions{},
-		"devtooltemplate-bind",
-		"Binding devtool template to a host/vm",
-		func(s *mcclient.ClientSession, opts *options.DevtoolTemplateBindingOptions) error {
-			params := jsonutils.NewDict()
-			params.Set("server_id", jsonutils.NewString(opts.ServerID))
-			apb, err := modules.DevToolTemplates.PerformAction(s, opts.ID, "bind", params)
-			if err != nil {
-				return err
-			}
-			printAnsiblePlaybookObject(apb)
-			return nil
-		},
-	)
-
-	R(
-		&options.DevtoolTemplateBindingOptions{},
-		"devtooltemplate-unbind",
-		"Binding devtool template to a host/vm",
-		func(s *mcclient.ClientSession, opts *options.DevtoolTemplateBindingOptions) error {
-			params := jsonutils.NewDict()
-			params.Set("server_id", jsonutils.NewString(opts.ServerID))
-			apb, err := modules.DevToolTemplates.PerformAction(s, opts.ID, "unbind", params)
-			if err != nil {
-				return err
-			}
-			printAnsiblePlaybookObject(apb)
-			return nil
-		},
-	)
-
-	R(
-		&options.DevtoolTemplateIdOptions{},
-		"devtooltemplate-delete",
-		"Delete devtool template",
-		func(s *mcclient.ClientSession, opts *options.DevtoolTemplateIdOptions) error {
-			apb, err := modules.DevToolTemplates.Delete(s, opts.ID, nil)
-			if err != nil {
-				return err
-			}
-			printAnsiblePlaybookObject(apb)
-			return nil
-		},
-	)
-
-	R(
-		&options.DevtoolTemplateUpdateOptions{},
-		"devtooltemplate-update",
-		"Update ansible playbook",
-		func(s *mcclient.ClientSession, opts *options.DevtoolTemplateUpdateOptions) error {
-			params, err := opts.Params()
-			if err != nil {
-				return err
-			}
-			apb, err := modules.DevToolTemplates.Update(s, opts.ID, params)
-			if err != nil {
-				return err
-			}
-			printAnsiblePlaybookObject(apb)
-			return nil
-		},
-	)
-}

cmd/climc/shell/globalvpcs.go

@@ -1,51 +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 shell
-
-import (
-	"yunion.io/x/onecloud/pkg/mcclient"
-	"yunion.io/x/onecloud/pkg/mcclient/modules"
-	"yunion.io/x/onecloud/pkg/mcclient/options"
-)
-
-func init() {
-	type GlobalVpcListOptions struct {
-		options.BaseListOptions
-	}
-	R(&GlobalVpcListOptions{}, "global-vpc-list", "List global vpcs", func(s *mcclient.ClientSession, args *GlobalVpcListOptions) error {
-		params, err := options.ListStructToParams(args)
-		if err != nil {
-			return err
-		}
-		result, err := modules.GlobalVpcs.List(s, params)
-		if err != nil {
-			return err
-		}
-		printList(result, modules.GlobalVpcs.GetColumns(s))
-		return nil
-	})
-
-	type GlobalVpcShowOptions struct {
-		ID string `help:"ID or Name of globalvpc"`
-	}
-	R(&GlobalVpcShowOptions{}, "global-vpc-show", "Show details of a global vpc", func(s *mcclient.ClientSession, args *GlobalVpcShowOptions) error {
-		result, err := modules.GlobalVpcs.GetById(s, args.ID, nil)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-}

cmd/climc/shell/guest_template.go

@@ -1,168 +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 shell
-
-import (
-	"fmt"
-
-	"yunion.io/x/jsonutils"
-
-	"yunion.io/x/onecloud/pkg/mcclient"
-	"yunion.io/x/onecloud/pkg/mcclient/modules"
-	"yunion.io/x/onecloud/pkg/mcclient/options"
-)
-
-func init() {
-
-	type GuestTemplateListOptions struct {
-		options.BaseListOptions
-	}
-
-	R(&GuestTemplateListOptions{}, "server-template-list", "List server template", func(s *mcclient.ClientSession,
-		opts *GuestTemplateListOptions) error {
-
-		params, err := options.ListStructToParams(opts)
-		if err != nil {
-			return err
-		}
-		result, err := modules.GuestTemplate.List(s, params)
-		if err != nil {
-			return err
-		}
-		printList(result, modules.GuestTemplate.GetColumns(s))
-		return nil
-	})
-
-	type GuestTemplateCreateOptions struct {
-		options.ServerCreateOptionalOptions
-		NAME string `help:"Name of server template" json:"-"`
-	}
-
-	R(&GuestTemplateCreateOptions{}, "server-template-create", "Create a server template",
-		func(s *mcclient.ClientSession,
-			opts *GuestTemplateCreateOptions) error {
-
-			params, err := opts.OptionalParams()
-			if err != nil {
-				return err
-			}
-			if options.BoolV(opts.DryRun) {
-				fmt.Println("no support operator")
-				return nil
-			}
-
-			dict := jsonutils.NewDict()
-			if opts.GenerateName {
-				dict.Add(jsonutils.NewString(opts.NAME), "generate_name")
-			} else {
-				dict.Add(jsonutils.NewString(opts.NAME), "name")
-			}
-			dict.Add(params.JSON(params), "content")
-			tem, err := modules.GuestTemplate.Create(s, dict)
-			if err != nil {
-				return err
-			}
-			printObject(tem)
-			return nil
-		})
-
-	type GuestTemplateUpdateOptions struct {
-		options.ServerCreateOptionalOptions
-		ID   string `help:"ID of server template"`
-		name string `help:"name of server template"`
-	}
-
-	R(&GuestTemplateUpdateOptions{}, "server-template-update", "Update a server template",
-		func(s *mcclient.ClientSession, opts *GuestTemplateUpdateOptions) error {
-
-			params, err := opts.OptionalParams()
-			if err != nil {
-				return err
-			}
-			if options.BoolV(opts.DryRun) {
-				fmt.Println("no support operator")
-				return nil
-			}
-			dict := jsonutils.NewDict()
-			if len(opts.name) != 0 {
-				dict.Add(jsonutils.NewString(opts.name), "name")
-			}
-			dict.Add(params.JSON(params), "content")
-			tem, err := modules.GuestTemplate.Update(s, opts.ID, dict)
-			if err != nil {
-				return err
-			}
-			printObject(tem)
-			return nil
-		})
-
-	type GuestTemplateOptions struct {
-		ID string `help:"ID or Name of server template"`
-	}
-
-	R(&GuestTemplateOptions{}, "server-template-show", "Show a server template",
-		func(s *mcclient.ClientSession, opts *GuestTemplateOptions) error {
-			tem, err := modules.GuestTemplate.Get(s, opts.ID, jsonutils.JSONNull)
-			if err != nil {
-				return err
-			}
-			printObject(tem)
-			return nil
-		})
-
-	R(&GuestTemplateOptions{}, "server-tempalte-delete", "Delete a server template",
-		func(s *mcclient.ClientSession, opts *GuestTemplateOptions) error {
-
-			tem, err := modules.GuestTemplate.Delete(s, opts.ID, jsonutils.JSONNull)
-			if err != nil {
-				return err
-			}
-			printObject(tem)
-			return nil
-		},
-	)
-
-	R(&GuestTemplateOptions{}, "server-template-private", "Private server template",
-		func(s *mcclient.ClientSession, opts *GuestTemplateOptions) error {
-			tem, err := modules.GuestTemplate.PerformAction(s, opts.ID, "private", jsonutils.JSONNull)
-			if err != nil {
-				return err
-			}
-			printObject(tem)
-			return nil
-		},
-	)
-
-	type GuestTemplatePublicOptions struct {
-		ID          string `help:"ID or Name of server template"`
-		PublicScope string `help:"public scope"`
-	}
-
-	R(&GuestTemplatePublicOptions{}, "server-template-public", "Public server template",
-		func(s *mcclient.ClientSession, opts *GuestTemplatePublicOptions) error {
-
-			dict := jsonutils.NewDict()
-			if len(opts.PublicScope) != 0 {
-				dict.Add(jsonutils.NewString(opts.PublicScope), "public_scope")
-			}
-			tem, err := modules.GuestTemplate.PerformAction(s, opts.ID, "public", dict)
-			if err != nil {
-				return err
-			}
-			printObject(tem)
-			return nil
-		},
-	)
-}

cmd/climc/shell/hosts.go

@@ -38,7 +38,7 @@ func init() {
 		Occupied  bool   `help:"show occupid host" json:"-"`
 		Enabled   bool   `help:"Show enabled host only" json:"-"`
 		Disabled  bool   `help:"Show disabled host only" json:"-"`
-		HostType  string `help:"Host type filter" choices:"baremetal|hypervisor|esxi|kubelet|hyperv|aliyun|azure|qcloud|aws|huawei|ucloud|google|ctyun"`
+		HostType  string `help:"Host type filter" choices:"baremetal|hypervisor|esxi|kubelet|hyperv|aliyun|azure|qcloud|aws|huawei|ucloud"`
 		AnyMac    string `help:"Mac matches one of the host's interface"`
 
 		IsBaremetal *bool `help:"filter host list by is_baremetal=true|false"`
@@ -55,8 +55,6 @@ func init() {
 
 		CdromBoot *bool `help:"filter hosts list by cdrom_boot=true|false"`
 
-		Sn string `help:"find host by sn"`
-
 		options.BaseListOptions
 	}
 	R(&HostListOptions{}, "host-list", "List hosts", func(s *mcclient.ClientSession, opts *HostListOptions) error {
@@ -78,9 +76,6 @@ func init() {
 		if len(opts.Uuid) > 0 {
 			params.Add(jsonutils.NewString(opts.Uuid), "uuid")
 		}
-		if len(opts.Sn) > 0 {
-			params.Add(jsonutils.NewString(opts.Sn), "sn")
-		}
 		result, err := modules.Hosts.List(s, params)
 		if err != nil {
 			return err
@@ -350,7 +345,7 @@ func init() {
 		return nil
 	})
 
-	R(&HostDetailOptions{}, "host-stop", "Power off host", func(s *mcclient.ClientSession, args *HostDetailOptions) error {
+	R(&HostDetailOptions{}, "host-stop", "Power on host", func(s *mcclient.ClientSession, args *HostDetailOptions) error {
 		result, err := modules.Hosts.PerformAction(s, args.ID, "stop", nil)
 		if err != nil {
 			return err

cmd/climc/shell/images.go

@@ -46,11 +46,11 @@ type ImageOptionalOptions struct {
 	OsDist             string   `help:"Distribution name of OS" metavar:"OS_DISTRIBUTION"`
 	OsVersion          string   `help:"Version of OS"`
 	OsCodename         string   `help:"Codename of OS"`
-	OsArch             string   `help:"Os hardware architecture" choices:"x86|x86_64|aarch32|aarch64"`
+	OsArch             string   `help:"Os hardware architecture" choices:"x86|x86_64"`
 	OsLang             string   `help:"OS Language" choices:"zh_CN|en_US"`
 	Preference         int64    `help:"Disk preferences"`
 	Notes              string   `help:"Notes about the image"`
-	Hypervisor         []string `help:"Prefer hypervisor type" choices:"kvm|esxi|baremetal|container|openstack"`
+	Hypervisor         []string `help:"Prefer hypervisor type" choices:"kvm|esxi|baremetal|container"`
 	DiskDriver         string   `help:"Perfer disk driver" choices:"virtio|scsi|pvscsi|ide|sata"`
 	NetDriver          string   `help:"Preferred network driver" choices:"virtio|e1000|vmxnet3"`
 }
@@ -221,9 +221,9 @@ func init() {
 	})
 
 	type ImageUpdateOptions struct {
-		ID          []string `help:"ID or Name of Image"`
-		Name        string   `help:"New name of the image"`
-		Description string   `help:"Description of image"`
+		ID          string `help:"ID or Name of Image"`
+		Name        string `help:"New name of the image"`
+		Description string `help:"Description of image"`
 		ImageOptionalOptions
 	}
 
@@ -239,8 +239,11 @@ func init() {
 		if err != nil {
 			return err
 		}
-		result := modules.Images.BatchUpdate(s, args.ID, params)
-		printBatchResults(result, modules.Images.GetColumns(s))
+		img, err := modules.Images.Update(s, args.ID, params)
+		if err != nil {
+			return err
+		}
+		printObject(img)
 		return nil
 	})
 

cmd/climc/shell/instance_group.go

@@ -29,7 +29,7 @@ func init() {
 		ServiceType string `help:"Service Type"`
 		ParentId    string `help:"Parent ID"`
 		ZoneId      string `help:"Zone ID"`
-		Server      string `help:"Guest ID or Name"`
+		Guest       string `help:"Guest ID or Name"`
 	}
 
 	R(&InstanceGroupListOptions{}, "instance-group-list", "List instance group", func(s *mcclient.ClientSession,

cmd/climc/shell/k8s/clusters.go

@@ -205,70 +205,4 @@ func initKubeCluster() {
 		printObject(ret)
 		return nil
 	})
-
-	R(&o.IdentOptions{}, cmdN("components-status"), "Get cluster component status", func(s *mcclient.ClientSession, args *o.IdentOptions) error {
-		ret, err := k8s.KubeClusters.GetSpecific(s, args.ID, "components-status", nil)
-		if err != nil {
-			return err
-		}
-		printObject(ret)
-		return nil
-	})
-
-	R(&o.ClusterComponentTypeOptions{}, cmdN("component-setting"), "Get cluster component setting", func(s *mcclient.ClientSession, args *o.ClusterComponentTypeOptions) error {
-		q := jsonutils.NewDict()
-		q.Add(jsonutils.NewString(args.TYPE), "type")
-		ret, err := k8s.KubeClusters.GetSpecific(s, args.ID, "component-setting", q)
-		if err != nil {
-			return err
-		}
-		printObject(ret)
-		return nil
-	})
-
-	R(&o.ClusterEnableComponentCephCSIOpt{}, cmdN("component-enable-ceph-csi"), "Enable cluster component", func(s *mcclient.ClientSession, args *o.ClusterEnableComponentCephCSIOpt) error {
-		params, err := args.Params()
-		if err != nil {
-			return err
-		}
-		ret, err := k8s.KubeClusters.PerformAction(s, args.ID, "enable-component", params)
-		if err != nil {
-			return err
-		}
-		printObject(ret)
-		return nil
-	})
-
-	R(&o.ClusterDisableComponent{}, cmdN("component-disable"), "Enable cluster component", func(s *mcclient.ClientSession, args *o.ClusterDisableComponent) error {
-		params := args.Params()
-		ret, err := k8s.KubeClusters.PerformAction(s, args.ID, "disable-component", params)
-		if err != nil {
-			return err
-		}
-		printObject(ret)
-		return nil
-	})
-
-	R(&o.ClusterDisableComponent{}, cmdN("component-delete"), "Delete cluster component", func(s *mcclient.ClientSession, args *o.ClusterDisableComponent) error {
-		params := args.Params()
-		ret, err := k8s.KubeClusters.PerformAction(s, args.ID, "delete-component", params)
-		if err != nil {
-			return err
-		}
-		printObject(ret)
-		return nil
-	})
-
-	R(&o.ClusterUpdateComponentCephCSIOpt{}, cmdN("component-update-ceph-csi"), "Update cluster component", func(s *mcclient.ClientSession, args *o.ClusterUpdateComponentCephCSIOpt) error {
-		params, err := args.Params()
-		if err != nil {
-			return err
-		}
-		ret, err := k8s.KubeClusters.PerformAction(s, args.ID, "update-component", params)
-		if err != nil {
-			return err
-		}
-		printObject(ret)
-		return nil
-	})
 }

cmd/climc/shell/k8s/event.go

@@ -1,9 +0,0 @@
-package k8s
-
-import (
-	"yunion.io/x/onecloud/pkg/mcclient/modules/k8s"
-)
-
-func initEvent() {
-	initK8sNamespaceResource("event", k8s.Events)
-}

cmd/climc/shell/k8s/k8s.go

@@ -16,11 +16,6 @@ package k8s
 
 import (
 	"fmt"
-	"io/ioutil"
-	"os"
-	"os/exec"
-
-	"github.com/ghodss/yaml"
 
 	"yunion.io/x/jsonutils"
 
@@ -62,7 +57,7 @@ func init() {
 	initPVC()
 	initJob()
 	initCronJob()
-	initEvent()
+
 	initRbac()
 
 	initApp()
@@ -222,71 +217,6 @@ func NewK8sNsResourceGetCmd(cmdN CmdNameFactory, manager modulebase.Manager) *Cm
 	)
 }
 
-func NewK8sNsResourceGetRawCmd(cmdN CmdNameFactory, manager k8s.IClusterResourceManager) *Cmd {
-	return NewCommand(
-		&o.NamespaceResourceGetOptions{},
-		cmdN.Do("show-raw"),
-		fmt.Sprintf("Show k8s %s raw data", cmdN.Kind),
-		func(s *mcclient.ClientSession, args *o.NamespaceResourceGetOptions) error {
-			ret, err := manager.GetRaw(s, args.NAME, args.Params())
-			if err != nil {
-				return err
-			}
-			printObjectYAML(ret)
-			return nil
-		},
-	)
-}
-
-func NewK8sResourceEditRawCmd(cmdN CmdNameFactory, manager k8s.IClusterResourceManager) *Cmd {
-	return NewCommand(
-		&o.NamespaceResourceGetOptions{},
-		cmdN.Do("edit-raw"),
-		fmt.Sprintf("Edit and update k8s %s raw data", cmdN.Kind),
-		func(s *mcclient.ClientSession, args *o.NamespaceResourceGetOptions) error {
-			rawData, err := manager.GetRaw(s, args.NAME, args.Params())
-			if err != nil {
-				return err
-			}
-			yamlBytes := rawData.YAMLString()
-			tempfile, err := ioutil.TempFile("", fmt.Sprintf("k8s-%s-%s*.yaml", cmdN.Kind, args.NAME))
-			if err != nil {
-				return err
-			}
-			defer os.Remove(tempfile.Name())
-			if _, err := tempfile.Write([]byte(yamlBytes)); err != nil {
-				return err
-			}
-			if err := tempfile.Close(); err != nil {
-				return err
-			}
-
-			cmd := exec.Command("vim", tempfile.Name())
-			cmd.Stdin = os.Stdin
-			cmd.Stdout = os.Stdout
-			if err := cmd.Run(); err != nil {
-				return err
-			}
-			content, err := ioutil.ReadFile(tempfile.Name())
-			if err != nil {
-				return err
-			}
-			jsonBytes, err := yaml.YAMLToJSON(content)
-			if err != nil {
-				return err
-			}
-			body, err := jsonutils.Parse(jsonBytes)
-			if err != nil {
-				return err
-			}
-			if _, err := manager.UpdateRaw(s, args.NAME, args.Params(), body.(*jsonutils.JSONDict)); err != nil {
-				return err
-			}
-			return nil
-		},
-	)
-}
-
 func NewK8sResourceDeleteCmd(cmdN CmdNameFactory, manager modulebase.Manager) *Cmd {
 	return NewCommand(
 		&o.ResourceDeleteOptions{},
@@ -314,13 +244,11 @@ func NewK8sNsResourceDeleteCmd(cmdN CmdNameFactory, manager modulebase.Manager)
 	return deleteCmd
 }
 
-func initK8sNamespaceResource(kind string, manager k8s.IClusterResourceManager) *ShellCommands {
+func initK8sNamespaceResource(kind string, manager modulebase.Manager) *ShellCommands {
 	cmdN := NewCmdNameFactory(kind)
 	return NewShellCommands(cmdN.Do).AddR(
 		NewK8sNsResourceListCmd(cmdN, manager),
 		NewK8sNsResourceGetCmd(cmdN, manager),
 		NewK8sNsResourceDeleteCmd(cmdN, manager),
-		NewK8sNsResourceGetRawCmd(cmdN, manager),
-		NewK8sResourceEditRawCmd(cmdN, manager),
 	)
 }

cmd/climc/shell/k8s/secret.go

@@ -58,23 +58,4 @@ func initSecret() {
 			return nil
 		})
 	registryCmd.AddR(createCmd)
-
-	cephCSICmd := NewCmdNameFactory("secret-ceph-csi")
-	cephCSICreateCmd := NewCommand(
-		&o.CephCSISecretCreateOptions{},
-		cephCSICmd.Do("create"),
-		"Create ceph csi user secret",
-		func(s *mcclient.ClientSession, args *o.CephCSISecretCreateOptions) error {
-			params, err := args.Params()
-			if err != nil {
-				return err
-			}
-			ret, err := k8s.Secrets.Create(s, params)
-			if err != nil {
-				return err
-			}
-			printObject(ret)
-			return nil
-		})
-	secretCmd.AddR(cephCSICreateCmd)
 }

cmd/climc/shell/k8s/storageclass.go

@@ -15,70 +15,9 @@
 package k8s
 
 import (
-	"yunion.io/x/onecloud/pkg/mcclient"
 	"yunion.io/x/onecloud/pkg/mcclient/modules/k8s"
-	o "yunion.io/x/onecloud/pkg/mcclient/options/k8s"
 )
 
 func initStorageClass() {
-	cmdN := NewCmdNameFactory("storageclass")
-	scCmd := initK8sClusterResource("storageclass", k8s.Storageclass)
-
-	setDefaultCmd := NewCommand(
-		&o.ClusterResourceBaseOptions{},
-		cmdN.Do("set-default"),
-		"Set storageclass as default",
-		func(s *mcclient.ClientSession, args *o.ClusterResourceBaseOptions) error {
-			ret, err := k8s.Storageclass.PerformAction(s, args.NAME, "set-default", args.Params())
-			if err != nil {
-				return err
-			}
-			printObject(ret)
-			return nil
-		},
-	)
-
-	scCmd.AddR(setDefaultCmd)
-
-	addStorageClassCephCSI(scCmd)
-}
-
-func addStorageClassCephCSI(cmd *ShellCommands) {
-	rbdN := NewCmdNameFactory("storageclass-ceph-csi-rbd")
-	rbdCreateCmd := NewCommand(
-		&o.StorageClassCephCSIRBDCreateOptions{},
-		rbdN.Do("create"),
-		"Create ceph csi rbd",
-		func(s *mcclient.ClientSession, args *o.StorageClassCephCSIRBDCreateOptions) error {
-			params, err := args.Params()
-			if err != nil {
-				return err
-			}
-			ret, err := k8s.Storageclass.Create(s, params)
-			if err != nil {
-				return err
-			}
-			printObject(ret)
-			return nil
-		},
-	)
-	testConnCmd := NewCommand(
-		&o.StorageClassCephCSIRBDTestOptions{},
-		rbdN.Do("connection-test"),
-		"Test storageclass connection",
-		func(s *mcclient.ClientSession, args *o.StorageClassCephCSIRBDTestOptions) error {
-			params, err := args.Params()
-			if err != nil {
-				return err
-			}
-			ret, err := k8s.Storageclass.PerformClassAction(s, "connection-test", params)
-			if err != nil {
-				return err
-			}
-			printObject(ret)
-			return nil
-		},
-	)
-
-	cmd.AddR(rbdCreateCmd, testConnCmd)
+	initK8sClusterResource("storageclass", k8s.Storageclass)
 }

cmd/climc/shell/metadata.go

@@ -46,5 +46,4 @@ func init() {
 		printObject(result)
 		return nil
 	})
-
 }

cmd/climc/shell/policies.go

@@ -17,6 +17,8 @@ package shell
 import (
 	"fmt"
 	"io/ioutil"
+	"os"
+	"os/exec"
 	"strings"
 	"time"
 
@@ -30,7 +32,6 @@ import (
 	"yunion.io/x/onecloud/pkg/mcclient/modules"
 	"yunion.io/x/onecloud/pkg/mcclient/options"
 	"yunion.io/x/onecloud/pkg/util/rbacutils"
-	"yunion.io/x/onecloud/pkg/util/shellutils"
 )
 
 func init() {
@@ -134,7 +135,7 @@ func init() {
 		return nil
 	}
 	R(&PolicyPatchOptions{}, "policy-patch", "Patch policy", updateFunc)
-	R(&PolicyPatchOptions{}, "policy-update", "Update policy", updateFunc)
+	R(&PolicyPatchOptions{}, "policy-update", "Patch policy", updateFunc)
 
 	type PolicyPerformOptions struct {
 		ID string `help:"ID of policy to update"`
@@ -211,13 +212,33 @@ func init() {
 			return err
 		}
 
-		yaml, err = shellutils.Edit(yaml)
+		tmpfile, err := ioutil.TempFile("", "policy-blob")
+		if err != nil {
+			return err
+		}
+		defer os.Remove(tmpfile.Name()) // clean up
+
+		if _, err := tmpfile.Write([]byte(yaml)); err != nil {
+			return err
+		}
+		if err := tmpfile.Close(); err != nil {
+			return err
+		}
+
+		cmd := exec.Command("vim", tmpfile.Name())
+		cmd.Stdin = os.Stdin
+		cmd.Stdout = os.Stdout
+		err = cmd.Run()
 		if err != nil {
 			return err
 		}
 
 		params := jsonutils.NewDict()
-		params.Add(jsonutils.NewString(yaml), "policy")
+		policyBytes, err := ioutil.ReadFile(tmpfile.Name())
+		if err != nil {
+			return err
+		}
+		params.Add(jsonutils.NewString(string(policyBytes)), "policy")
 
 		result, err = modules.Policies.Patch(s, policyId, params)
 		if err != nil {
@@ -285,30 +306,12 @@ func init() {
 		if err != nil {
 			log.Fatalf("Set log level %q: %v", "debug", err)
 		}
-		if args.Debug {
-			rbacutils.ShowMatchRuleDebug = true
-		}
 		auth.InitFromClientSession(s)
 		policy.EnableGlobalRbac(15*time.Second, 15*time.Second, false)
 		if args.Debug {
 			consts.EnableRbacDebug()
 		}
 
-		findPolicy := false
-		for !findPolicy {
-			all := policy.PolicyManager.AllPolicies()
-			for _, allP := range all {
-				if len(allP) > 0 {
-					findPolicy = true
-					break
-				}
-			}
-			if findPolicy {
-				break
-			}
-			time.Sleep(time.Second)
-		}
-
 		req := jsonutils.NewDict()
 		for i := 0; i < len(args.Request); i += 1 {
 			parts := strings.Split(args.Request[i], ":")
@@ -374,7 +377,6 @@ func init() {
 				Context: mcclient.SAuthContext{
 					Ip: args.Ip,
 				},
-				Token: "faketoken",
 			}
 		} else {
 			token = s.GetToken()
@@ -386,10 +388,6 @@ func init() {
 		}
 		printObject(result)
 
-		for _, r := range args.Role {
-			fmt.Println("role", r, "matched policies:", policy.PolicyManager.RoleMatchPolicies(r))
-		}
-
 		fmt.Println("userCred:", token)
 		for _, scope := range []rbacutils.TRbacScope{
 			rbacutils.ScopeSystem,
@@ -398,7 +396,7 @@ func init() {
 			rbacutils.ScopeUser,
 			rbacutils.ScopeNone,
 		} {
-			m := policy.PolicyManager.MatchedPolicyNames(scope, token)
+			m := policy.PolicyManager.MatchedPolicies(scope, token)
 			fmt.Println("matched", scope, "policies:", m)
 		}
 

cmd/climc/shell/pprof.go

@@ -1,103 +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 shell
-
-import (
-	"fmt"
-	"io"
-	"io/ioutil"
-	"os"
-	"syscall"
-
-	"yunion.io/x/pkg/util/signalutils"
-
-	"yunion.io/x/onecloud/pkg/mcclient"
-	"yunion.io/x/onecloud/pkg/mcclient/modules"
-	"yunion.io/x/onecloud/pkg/util/netutils2"
-	"yunion.io/x/onecloud/pkg/util/procutils"
-)
-
-func init() {
-	type TraceOptions struct {
-		Second  int    `help:"pprof seconds" short-token:"s"`
-		Service string `help:"Service type"`
-		Address string `help:"Service listen address"`
-	}
-
-	downloadToTemp := func(input io.Reader, pattern string) (string, error) {
-		tmpfile, err := ioutil.TempFile("", pattern)
-		if err != nil {
-			return "", err
-		}
-		defer tmpfile.Close()
-		if _, err := io.Copy(tmpfile, input); err != nil {
-			return "", err
-		}
-		return tmpfile.Name(), nil
-	}
-
-	pprofRun := func(s *mcclient.ClientSession, opts *TraceOptions, pType string, args ...string) error {
-		var (
-			src io.Reader
-			err error
-		)
-		if len(opts.Service) > 0 {
-			src, err = modules.GetPProfByType(s, opts.Service, pType, opts.Second)
-			if err != nil {
-				return err
-			}
-		} else if len(opts.Address) > 0 {
-			src, err = modules.GetNamedAddressPProfByType(s, opts.Address, pType, opts.Second)
-			if err != nil {
-				return err
-			}
-		} else {
-			return fmt.Errorf("no service address provide")
-		}
-
-		tempfile, err := downloadToTemp(src, pType)
-		if err != nil {
-			return err
-		}
-		defer func() { os.Remove(tempfile) }()
-
-		signalutils.RegisterSignal(func() {
-			os.Remove(tempfile)
-			os.Exit(0)
-		}, syscall.SIGHUP, syscall.SIGINT, syscall.SIGQUIT, syscall.SIGTERM)
-		signalutils.StartTrap()
-
-		argv := []string{"tool"}
-		argv = append(argv, args...)
-		argv = append(argv, tempfile)
-		cmd := procutils.NewCommand("go", argv...)
-		if err := cmd.Run(); err != nil {
-			return err
-		}
-		return nil
-	}
-
-	R(&TraceOptions{}, "pprof-trace", "pprof trace of backend service", func(s *mcclient.ClientSession, args *TraceOptions) error {
-		return pprofRun(s, args, "trace", "trace")
-	})
-
-	R(&TraceOptions{}, "pprof-profile", "pprof profile of backend service", func(s *mcclient.ClientSession, args *TraceOptions) error {
-		port, err := netutils2.GetFreePort()
-		if err != nil {
-			return err
-		}
-		return pprofRun(s, args, "profile", "pprof", fmt.Sprintf("-http=:%d", port))
-	})
-}

cmd/climc/shell/quotas.go

@@ -16,232 +16,73 @@ package shell
 
 import (
 	"yunion.io/x/jsonutils"
-	"yunion.io/x/log"
 
 	"yunion.io/x/onecloud/pkg/mcclient"
 	"yunion.io/x/onecloud/pkg/mcclient/modulebase"
 	"yunion.io/x/onecloud/pkg/mcclient/modules"
 )
 
-type ComputeQuotaKeys struct {
-	ZoneQuotaKeys
-
-	Hypervisor string `help:"hypervisor" choices:"kvm|baremetal"`
-}
-
-type ComputeQuotaOptions struct {
-	ComputeQuotaKeys
-
-	Count          int64 `help:"server count" json:"count,omitzero"`
+type QuotaBaseOptions struct {
 	Cpu            int64 `help:"CPU count" json:"cpu,omitzero"`
 	Memory         int64 `help:"Memory size in MB" json:"memory,omitzero"`
 	Storage        int64 `help:"Storage size in MB" json:"storage,omitzero"`
+	Port           int64 `help:"Internal NIC count" json:"port,omitzero"`
+	Eport          int64 `help:"External NIC count" json:"eport,omitzero"`
+	Eip            int64 `help:"Elastic IP count" json:"eip,omitzero"`
+	Bw             int64 `help:"Internal bandwidth in Mbps" json:"bw,omitzero"`
+	Ebw            int64 `help:"External bandwidth in Mbps" json:"ebw,omitzero"`
 	IsolatedDevice int64 `help:"Isolated device count" json:"isolated_device,omitzero"`
-}
-
-type RegionQuotaKeys struct {
-	Provider  string `help:"cloud provider" json:"provider,omitempty"`
-	Brand     string `help:"cloud brand" json:"brand,omitempty"`
-	CloudEnv  string `help:"cloud environment" json:"cloud_env,omitempty" choices:"onpremise|private|public"`
-	AccountId string `help:"cloud account id" json:"account_id,omitempty"`
-	ManagerId string `help:"cloud provider id" json:"manager_id,omitempty"`
-	RegionId  string `help:"region id" json:"region_id,omitempty"`
-}
-
-type RegionQuotaOptions struct {
-	RegionQuotaKeys
-
-	Port  int64 `help:"Internal NIC count" json:"port,omitzero"`
-	Eport int64 `help:"External NIC count" json:"eport,omitzero"`
-	// Bw    int64 `help:"Internal bandwidth in Mbps" json:"bw,omitzero"`
-	// Ebw   int64 `help:"External bandwidth in Mbps" json:"ebw,omitzero"`
-
-	Eip int64 `help:"Elastic IP count" json:"eip,omitzero"`
-
-	Snapshot int64 `help:"Snapshot count" json:"snapshot,omitzero"`
-
-	Bucket    int64 `help:"bucket count" json:"bucket,omitzero"`
-	ObjectGB  int64 `help:"object size in GB" json:"object_gb,omitzero"`
-	ObjectCnt int64 `help:"object count" json:"object_cnt,omitzero"`
-
-	Rds   int64 `help:"Rds count" json:"rds,omitzero"`
-	Cache int64 `help:"redis count" json:"cache,omitzero"`
-
-	Loadbalancer int64 `help:"loadbalancer instance count" json:"loadbalancer,omitzero"`
-}
-
-type ZoneQuotaKeys struct {
-	RegionQuotaKeys
-
-	ZoneId string `help:"zone id" json:"zone_id,omitempty"`
-}
-
-type ZoneQuotaOptions struct {
-	ZoneQuotaKeys
-}
-
-type ProjectQuotaOptions struct {
-	Secgroup int64 `help:"Secgroup count" json:"secgroup,omitzero"`
-}
-
-type ImageQuotaKeys struct {
-	Type string `help:"image type, either iso or image" choices:"iso|image" json:"type,omitempty"`
-}
-
-type ImageQuotaOptions struct {
-	ImageQuotaKeys
-
-	Image int64 `help:"Template count" json:"image,omitzero"`
-}
-
-type QuotaSetBaseOptions struct {
-	Project string `help:"Tenant name or ID to set quota" json:"tenant,omitempty"`
-	Domain  string `help:"Domain name or ID to set quota" json:"domain,omitempty"`
-	Action  string `help:"quota set action" choices:"add|sub|reset|replace|delete|update"`
-}
-
-func printQuotaList(result jsonutils.JSONObject) {
-	printList(modulebase.JSON2ListResult(result), nil)
+	Snapshot       int64 `help:"Snapshot count" json:"snapshot,omitzero"`
+	Image          int64 `help:"Template count" json:"image,omitzero"`
+	Secgroup       int64 `help:"Secgroup count" json:"secgroup,omitzero"`
+	Bucket         int64 `help:"bucket count" json:"bucket,omitzero"`
+	ObjectGB       int64 `help:"object size in GB" json:"object_gb,omitzero"`
+	ObjectCnt      int64 `help:"object count" json:"object_cnt,omitzero"`
 }
 
 func init() {
 	type QuotaOptions struct {
-		Scope   string `help:"scope" choices:"domain|project"`
-		Project string `help:"Tenant name or ID" json:"tenant"`
-		Domain  string `help:"Domain name or ID" json:"domain"`
-		Refresh bool   `help:"refresh" json:"refresh,omitfalse"`
-		Primary bool   `help:"get primary quota ONLY" json:"primary,omitfalse"`
+		Tenant        string `help:"Tenant name or ID"`
+		ProjectDomain string `help:"Domain name or ID"`
 	}
 	R(&QuotaOptions{}, "quota", "Show quota for current user or tenant", func(s *mcclient.ClientSession, args *QuotaOptions) error {
 		params := jsonutils.Marshal(args)
-		log.Debugf("%s", params)
-		quotas, err := modules.Quotas.GetQuota(s, params)
+		result, err := modules.Quotas.GetQuota(s, params)
 		if err != nil {
 			return err
 		}
-		printQuotaList(quotas)
-		return nil
-	})
-	R(&QuotaOptions{}, "project-quota", "Show project-quota for current user or tenant", func(s *mcclient.ClientSession, args *QuotaOptions) error {
-		params := jsonutils.Marshal(args)
-		quotas, err := modules.ProjectQuotas.GetQuota(s, params)
-		if err != nil {
-			return err
-		}
-		printQuotaList(quotas)
-		return nil
-	})
-	R(&QuotaOptions{}, "region-quota", "Show region-quota for current user or tenant", func(s *mcclient.ClientSession, args *QuotaOptions) error {
-		params := jsonutils.Marshal(args)
-		quotas, err := modules.RegionQuotas.GetQuota(s, params)
-		if err != nil {
-			return err
-		}
-		printQuotaList(quotas)
-		return nil
-	})
-	R(&QuotaOptions{}, "zone-quota", "Show zone-quota for current user or tenant", func(s *mcclient.ClientSession, args *QuotaOptions) error {
-		params := jsonutils.Marshal(args)
-		quotas, err := modules.ZoneQuotas.GetQuota(s, params)
-		if err != nil {
-			return err
-		}
-		printQuotaList(quotas)
-		return nil
-	})
-	R(&QuotaOptions{}, "project-quota", "Show project-quota for current user or tenant", func(s *mcclient.ClientSession, args *QuotaOptions) error {
-		params := jsonutils.Marshal(args)
-		result, err := modules.ProjectQuotas.GetQuota(s, params)
-		if err != nil {
-			return err
-		}
-		printQuotaList(result)
+		printObject(result)
 		return nil
 	})
 	R(&QuotaOptions{}, "image-quota", "Show image quota for current user or tenant", func(s *mcclient.ClientSession, args *QuotaOptions) error {
 		params := jsonutils.Marshal(args)
-		quotas, err := modules.ImageQuotas.GetQuota(s, params)
+		result, err := modules.ImageQuotas.GetQuota(s, params)
 		if err != nil {
 			return err
 		}
-		printQuotaList(quotas)
+		printObject(result)
 		return nil
 	})
 
-	type ComputeQuotaSetOptions struct {
-		QuotaSetBaseOptions
-		ComputeQuotaOptions
+	type QuotaSetOptions struct {
+		Tenant        string `help:"Tenant name or ID to set quota" json:"tenant,omitempty"`
+		ProjectDomain string `help:"Domain name or ID to set quota" json:",omitempty"`
+		Action        string `help:"quota set action" choices:"add|reset|replace"`
+		Cascade       bool   `help:"cascade set quota so that auto increment domain quota if total project quota exceeds parent domain quota"`
+		QuotaBaseOptions
 	}
-	R(&ComputeQuotaSetOptions{}, "quota-set", "Set quota for tenant", func(s *mcclient.ClientSession, args *ComputeQuotaSetOptions) error {
+	R(&QuotaSetOptions{}, "quota-set", "Set quota for tenant", func(s *mcclient.ClientSession, args *QuotaSetOptions) error {
 		params := jsonutils.Marshal(args)
-		quotas, e := modules.Quotas.DoQuotaSet(s, params)
+		result, e := modules.Quotas.DoQuotaSet(s, params)
 		if e != nil {
 			return e
 		}
-		printQuotaList(quotas)
-		return nil
-	})
-
-	type RegionQuotaSetOptions struct {
-		QuotaSetBaseOptions
-		RegionQuotaOptions
-	}
-	R(&RegionQuotaSetOptions{}, "region-quota-set", "Set regional quota for tenant", func(s *mcclient.ClientSession, args *RegionQuotaSetOptions) error {
-		params := jsonutils.Marshal(args)
-		quotas, e := modules.RegionQuotas.DoQuotaSet(s, params)
-		if e != nil {
-			return e
-		}
-		printQuotaList(quotas)
-		return nil
-	})
-
-	type ZoneQuotaSetOptions struct {
-		QuotaSetBaseOptions
-		ZoneQuotaOptions
-	}
-	R(&ZoneQuotaSetOptions{}, "zone-quota-set", "Set zonal quota for tenant", func(s *mcclient.ClientSession, args *ZoneQuotaSetOptions) error {
-		params := jsonutils.Marshal(args)
-		quotas, e := modules.ZoneQuotas.DoQuotaSet(s, params)
-		if e != nil {
-			return e
-		}
-		printQuotaList(quotas)
-		return nil
-	})
-
-	type ProjectQuotaSetOptions struct {
-		QuotaSetBaseOptions
-		ProjectQuotaOptions
-	}
-	R(&ProjectQuotaSetOptions{}, "project-quota-set", "Set project quota for tenant", func(s *mcclient.ClientSession, args *ProjectQuotaSetOptions) error {
-		params := jsonutils.Marshal(args)
-		quotas, e := modules.ProjectQuotas.DoQuotaSet(s, params)
-		if e != nil {
-			return e
-		}
-		printQuotaList(quotas)
-		return nil
-	})
-
-	type ImageQuotaSetOptions struct {
-		QuotaSetBaseOptions
-		ImageQuotaOptions
-	}
-	R(&ImageQuotaSetOptions{}, "image-quota-set", "Set image quota for tenant", func(s *mcclient.ClientSession, args *ImageQuotaSetOptions) error {
-		params := jsonutils.Marshal(args)
-		quotas, e := modules.ImageQuotas.DoQuotaSet(s, params)
-		if e != nil {
-			return e
-		}
-		printQuotaList(quotas)
+		printObject(result)
 		return nil
 	})
 
 	type QuotaListOptions struct {
 		ProjectDomain string `help:"domain name or ID to query project quotas"`
-		Refresh       bool   `help:"refresh" json:"refresh,omitfalse"`
-		Primary       bool   `help:"list primary quota ONLY" json:"primary,omitfalse"`
 	}
 	R(&QuotaListOptions{}, "quota-list", "List quota of domains or projects of a domain", func(s *mcclient.ClientSession, args *QuotaListOptions) error {
 		params := jsonutils.Marshal(args)
@@ -249,98 +90,22 @@ func init() {
 		if e != nil {
 			return e
 		}
-		printQuotaList(result)
+		printList(modulebase.JSON2ListResult(result), nil)
 		return nil
 	})
 
-	R(&QuotaListOptions{}, "region-quota-list", "List region quota of domains or projects of a domain", func(s *mcclient.ClientSession, args *QuotaListOptions) error {
-		params := jsonutils.Marshal(args)
-		result, e := modules.RegionQuotas.GetQuotaList(s, params)
-		if e != nil {
-			return e
-		}
-		printQuotaList(result)
-		return nil
-	})
-
-	R(&QuotaListOptions{}, "zone-quota-list", "List zone quota of domains or projects of a domain", func(s *mcclient.ClientSession, args *QuotaListOptions) error {
-		params := jsonutils.Marshal(args)
-		result, e := modules.ZoneQuotas.GetQuotaList(s, params)
-		if e != nil {
-			return e
-		}
-		printQuotaList(result)
-		return nil
-	})
-
-	R(&QuotaListOptions{}, "project-quota-list", "List project quota of domains or projects of a domain", func(s *mcclient.ClientSession, args *QuotaListOptions) error {
-		params := jsonutils.Marshal(args)
-		result, e := modules.ProjectQuotas.GetQuotaList(s, params)
-		if e != nil {
-			return e
-		}
-		printQuotaList(result)
-		return nil
-	})
-
-	R(&QuotaListOptions{}, "image-quota-list", "List image quota of domains or projects of a domain", func(s *mcclient.ClientSession, args *QuotaListOptions) error {
-		params := jsonutils.Marshal(args)
-		result, e := modules.ImageQuotas.GetQuotaList(s, params)
-		if e != nil {
-			return e
-		}
-		printQuotaList(result)
-		return nil
-	})
-
-	type CleanPendingUsageOptions struct {
-		Scope   string `help:"scope" choices:"domain|project"`
-		Project string `help:"Tenant name or ID" json:"tenant"`
-		Domain  string `help:"Domain name or ID" json:"domain"`
+	/*type QuotaCheckOptions struct {
+		TENANT string `help:"Tenant name or ID to check quota" json:"tenant,omitempty"`
+		QuotaBaseOptions
 	}
-	R(&CleanPendingUsageOptions{}, "clean-pending-usage", "Clean pending usage for project or domain", func(s *mcclient.ClientSession, args *CleanPendingUsageOptions) error {
+	R(&QuotaCheckOptions{}, "quota-check", "Check quota for tenant", func(s *mcclient.ClientSession, args *QuotaCheckOptions) error {
 		params := jsonutils.Marshal(args)
-		_, err := modules.Quotas.DoCleanPendingUsage(s, params)
-		if err != nil {
-			return err
+		result, e := modules.Quotas.DoQuotaCheck(s, params)
+		if e != nil {
+			return e
 		}
+		printObject(result)
 		return nil
-	})
-
-	R(&CleanPendingUsageOptions{}, "clean-region-pending-usage", "Clean pending usage for project or domain", func(s *mcclient.ClientSession, args *CleanPendingUsageOptions) error {
-		params := jsonutils.Marshal(args)
-		_, err := modules.RegionQuotas.DoCleanPendingUsage(s, params)
-		if err != nil {
-			return err
-		}
-		return nil
-	})
-
-	R(&CleanPendingUsageOptions{}, "clean-zone-pending-usage", "Clean pending usage for project or domain", func(s *mcclient.ClientSession, args *CleanPendingUsageOptions) error {
-		params := jsonutils.Marshal(args)
-		_, err := modules.ZoneQuotas.DoCleanPendingUsage(s, params)
-		if err != nil {
-			return err
-		}
-		return nil
-	})
-
-	R(&CleanPendingUsageOptions{}, "clean-project-pending-usage", "Clean pending usage for project or domain", func(s *mcclient.ClientSession, args *CleanPendingUsageOptions) error {
-		params := jsonutils.Marshal(args)
-		_, err := modules.ProjectQuotas.DoCleanPendingUsage(s, params)
-		if err != nil {
-			return err
-		}
-		return nil
-	})
-
-	R(&CleanPendingUsageOptions{}, "clean-image-pending-usage", "Clean pending usage for project or domain", func(s *mcclient.ClientSession, args *CleanPendingUsageOptions) error {
-		params := jsonutils.Marshal(args)
-		_, err := modules.ImageQuotas.DoCleanPendingUsage(s, params)
-		if err != nil {
-			return err
-		}
-		return nil
-	})
+	})*/
 
 }

cmd/climc/shell/secgroups.go

@@ -27,7 +27,6 @@ import (
 func init() {
 	type SecGroupsListOptions struct {
 		Equals string `help:"Secgroup ID or Name, filter secgroups whose rules equals the specified one"`
-		Server string `help:"Filter secgroups bound to specified server"`
 		options.BaseListOptions
 	}
 
@@ -44,9 +43,6 @@ func init() {
 		if len(args.Equals) > 0 {
 			params.Add(jsonutils.NewString(args.Equals), "equals")
 		}
-		if len(args.Server) > 0 {
-			params.Add(jsonutils.NewString(args.Server), "server")
-		}
 		result, err := modules.SecGroups.List(s, params)
 		if err != nil {
 			return err

cmd/climc/shell/servers.go

@@ -37,7 +37,6 @@ import (
 )
 
 func init() {
-
 	R(&options.ServerListOptions{}, "server-list", "List virtual servers", func(s *mcclient.ClientSession, opts *options.ServerListOptions) error {
 		params, err := options.ListStructToParams(opts)
 		if err != nil {
@@ -332,13 +331,6 @@ func init() {
 		return nil
 	})
 
-	R(&options.ServerIdsOptions{}, "server-resume", "Resume servers", func(s *mcclient.ClientSession,
-		opts *options.ServerIdsOptions) error {
-		ret := modules.Servers.BatchPerformAction(s, opts.ID, "resume", nil)
-		printBatchResults(ret, modules.Servers.GetColumns(s))
-		return nil
-	})
-
 	R(&options.ServerMigrateOptions{}, "server-migrate", "Migrate server", func(s *mcclient.ClientSession, opts *options.ServerMigrateOptions) error {
 		params, err := options.StructToParams(opts)
 		if err != nil {
@@ -473,19 +465,6 @@ func init() {
 		return nil
 	})
 
-	R(&options.ServerModifySrcCheckOptions{}, "server-modify-src-check", "Modify src ip, mac check settings", func(s *mcclient.ClientSession, opts *options.ServerModifySrcCheckOptions) error {
-		params, err := options.StructToParams(opts)
-		if err != nil {
-			return err
-		}
-		srv, err := modules.Servers.PerformAction(s, opts.ID, "modify-src-check", params)
-		if err != nil {
-			return err
-		}
-		printObject(srv)
-		return nil
-	})
-
 	R(&options.ServerSecGroupsOptions{}, "server-set-secgroup", "Set security groups to a VM", func(s *mcclient.ClientSession, opts *options.ServerSecGroupsOptions) error {
 		params, err := options.StructToParams(opts)
 		if err != nil {
@@ -987,7 +966,6 @@ func init() {
 				config.Hosts[i].HostIp = yamlConfig.Hosts[i].HostIp
 				config.Hosts[i].XmlFilePath = yamlConfig.Hosts[i].XmlFilePath
 				config.Hosts[i].Servers = make([]compute.SLibvirtServerConfig, len(yamlConfig.Hosts[i].Servers))
-				config.Hosts[i].MonitorPath = yamlConfig.Hosts[i].MonitorPath
 				for j := 0; j < len(yamlConfig.Hosts[i].Servers); j++ {
 					config.Hosts[i].Servers[j].MacIp = make(map[string]string)
 					mac := yamlConfig.Hosts[i].Servers[j].Mac
@@ -1010,11 +988,11 @@ func init() {
 		if err != nil {
 			return err
 		}
-		//for i := 0; i < len(params); i++ {
-		//	val := jsonutils.NewDict()
-		//	val.Set(modules.Servers.KeywordPlural, params[i])
-		//	params[i] = val
-		//}
+		for i := 0; i < len(params); i++ {
+			val := jsonutils.NewDict()
+			val.Set(modules.Servers.KeywordPlural, params[i])
+			params[i] = val
+		}
 
 		results := modules.Servers.BatchPerformClassAction(s, "import-from-libvirt", params)
 		printBatchResults(results, modules.Servers.GetColumns(s))

cmd/climc/shell/service_catalog.go

@@ -1,162 +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 shell
-
-import (
-	"yunion.io/x/jsonutils"
-
-	"yunion.io/x/onecloud/pkg/mcclient"
-	"yunion.io/x/onecloud/pkg/mcclient/modules"
-	"yunion.io/x/onecloud/pkg/mcclient/options"
-)
-
-func init() {
-	type ServiceCatalogListOpions struct {
-		options.BaseListOptions
-	}
-
-	R(&ServiceCatalogListOpions{}, "service-catalog-list", "List service catalog", func(s *mcclient.ClientSession,
-		opts *ServiceCatalogListOpions) error {
-
-		params, err := options.ListStructToParams(opts)
-		if err != nil {
-			return err
-		}
-		ret, err := modules.ServiceCatalog.List(s, params)
-		if err != nil {
-			return err
-		}
-		printList(ret, modules.ServiceCatalog.GetColumns(s))
-		return nil
-	})
-
-	type ServiceCatalogCreateOptions struct {
-		NAME          string `help:"Name of service catalog"`
-		GuestTemplate string `help:"guest template of service catalog"`
-		IconUrl       string `help:"icon url of service catalog"`
-		GenerateName  bool   `help:"whether to generate name"`
-	}
-
-	R(&ServiceCatalogCreateOptions{}, "service-catalog-create", "Create a service catalog",
-		func(s *mcclient.ClientSession, opts *ServiceCatalogCreateOptions) error {
-
-			params := jsonutils.NewDict()
-			if opts.GenerateName {
-				params.Add(jsonutils.NewString(opts.NAME), "generate_name")
-			} else {
-				params.Add(jsonutils.NewString(opts.NAME), "name")
-			}
-			if len(opts.GuestTemplate) != 0 {
-				params.Add(jsonutils.NewString(opts.GuestTemplate), "guest_template")
-			}
-			if len(opts.IconUrl) != 0 {
-				params.Add(jsonutils.NewString(opts.IconUrl), "icon_url")
-			}
-			serviceCatalog, err := modules.ServiceCatalog.Create(s, params)
-			if err != nil {
-				return err
-			}
-			printObject(serviceCatalog)
-			return nil
-		},
-	)
-
-	type ServiceCatalogOptions struct {
-		ID string `help:"ID or name of service catalog"`
-	}
-
-	R(&ServiceCatalogOptions{}, "service-catalog-show", "show a service catalog", func(s *mcclient.ClientSession,
-		opts *ServiceCatalogOptions) error {
-
-		sc, err := modules.ServiceCatalog.Get(s, opts.ID, jsonutils.JSONNull)
-		if err != nil {
-			return err
-		}
-		printObject(sc)
-		return nil
-	})
-
-	R(&ServiceCatalogOptions{}, "service-catalog-delete", "delete a service catalog", func(s *mcclient.ClientSession,
-		opts *ServiceCatalogOptions) error {
-
-		sc, err := modules.ServiceCatalog.Delete(s, opts.ID, jsonutils.JSONNull)
-		if err != nil {
-			return err
-		}
-		printObject(sc)
-		return nil
-	})
-
-	type ServiceCatalogUpdateOptions struct {
-		ServiceCatalogOptions
-		Name          string `help:"Name of service catalog"`
-		GuestTemplate string `help:"guest template of service catalog"`
-		IconUrl       string `help:"icon url of service catalog"`
-	}
-
-	R(&ServiceCatalogUpdateOptions{}, "service-catalog-update", "update a service catalog",
-		func(s *mcclient.ClientSession, opts *ServiceCatalogUpdateOptions) error {
-			params := jsonutils.NewDict()
-			if len(opts.Name) > 0 {
-				params.Add(jsonutils.NewString(opts.Name), "name")
-			}
-			if len(opts.GuestTemplate) > 0 {
-				params.Add(jsonutils.NewString(opts.GuestTemplate), "guest_template")
-			}
-			if len(opts.IconUrl) > 0 {
-				params.Add(jsonutils.NewString(opts.IconUrl), "icon_url")
-			}
-			sc, err := modules.ServiceCatalog.Update(s, opts.ID, params)
-			if err != nil {
-				return err
-			}
-			printObject(sc)
-			return nil
-		},
-	)
-
-	type ServiceCatalogDeployOptions struct {
-		ServiceCatalogOptions
-		Name         string `help:"Name of guest"`
-		GenerateName bool   `help:"whether to generate name for guest"`
-		Count        int    `help:"count of guest"`
-		ProjectID    string `help:"project id of guest"`
-	}
-
-	R(&ServiceCatalogDeployOptions{}, "service-catalog-deploy", "deploy", func(s *mcclient.ClientSession,
-		opts *ServiceCatalogDeployOptions) error {
-
-		params := jsonutils.NewDict()
-		if opts.GenerateName {
-			params.Add(jsonutils.NewString(opts.Name), "generate_name")
-		} else {
-			params.Add(jsonutils.NewString(opts.Name), "name")
-		}
-		if opts.Count != 0 {
-			params.Add(jsonutils.NewInt(int64(opts.Count)), "count")
-		}
-		if len(opts.ProjectID) > 0 {
-			params.Add(jsonutils.NewString(opts.ProjectID), "project_id")
-		}
-
-		sc, err := modules.ServiceCatalog.PerformAction(s, opts.ID, "deploy", params)
-		if err != nil {
-			return err
-		}
-		printObject(sc)
-		return nil
-	})
-
-}

cmd/climc/shell/services.go

@@ -23,7 +23,6 @@ import (
 	"yunion.io/x/onecloud/pkg/mcclient"
 	"yunion.io/x/onecloud/pkg/mcclient/modules"
 	"yunion.io/x/onecloud/pkg/util/fileutils2"
-	"yunion.io/x/onecloud/pkg/util/shellutils"
 )
 
 func init() {
@@ -240,34 +239,4 @@ func init() {
 		return nil
 	})
 
-	type ServiceConfigEditOptions struct {
-		SERVICE string `help:"service name or id"`
-	}
-	R(&ServiceConfigEditOptions{}, "service-config-edit", "Edit config yaml of a service", func(s *mcclient.ClientSession, args *ServiceConfigEditOptions) error {
-		conf, err := modules.ServicesV3.GetSpecific(s, args.SERVICE, "config", nil)
-		if err != nil {
-			return err
-		}
-		confJson, err := conf.Get("config")
-		if err != nil {
-			return err
-		}
-		content, err := shellutils.Edit(confJson.YAMLString())
-		if err != nil {
-			return err
-		}
-		yamlJson, err := jsonutils.ParseYAML(content)
-		if err != nil {
-			return err
-		}
-		config := jsonutils.NewDict()
-		config.Add(yamlJson, "config")
-		nconf, err := modules.ServicesV3.PerformAction(s, args.SERVICE, "config", config)
-		if err != nil {
-			return err
-		}
-		fmt.Println(nconf.PrettyString())
-		return nil
-	})
-
 }

cmd/climc/shell/snapshot_policy.go

@@ -56,7 +56,7 @@ func init() {
 
 		RetentionDays  int   `help:"snapshot retention days"`
 		RepeatWeekdays []int `help:"snapshot create days on week"`
-		TimePoints     []int `help:"snapshot create time points on one day"`
+		TimePoints     []int `help:"snapshot create time points on one day`
 	}
 
 	R(&SnapshotPolicyCreateOptions{}, "snapshot-policy-create", "Create snapshot policy", func(s *mcclient.ClientSession, args *SnapshotPolicyCreateOptions) error {

cmd/climc/shell/usages.go

@@ -22,9 +22,9 @@ import (
 )
 
 type GeneralUsageOptions struct {
-	HostType []string `help:"Host types" choices:"hypervisor|baremetal|esxi|xen|kubelet|hyperv|aliyun|azure|aws|huawei|qcloud|openstack|ucloud|zstack|google|ctyun"`
-	Provider []string `help:"Provider" choices:"OneCloud|VMware|Aliyun|Azure|Aws|Qcloud|Huawei|OpenStack|Ucloud|ZStack|Google|Ctyun"`
-	Brand    []string `help:"Brands" choices:"OneCloud|VMware|Aliyun|Azure|Aws|Qcloud|Huawei|OpenStack|Ucloud|ZStack|DStack|Google|Ctyun"`
+	HostType []string `help:"Host types" choices:"hypervisor|baremetal|esxi|xen|kubelet|hyperv|aliyun|azure|aws|huawei|qcloud|openstack|ucloud|zstack"`
+	Provider []string `help:"Provider" choices:"OneCloud|VMware|Aliyun|Azure|Aws|Qcloud|Huawei|OpenStack|Ucloud|ZStack"`
+	Brand    []string `help:"Brands" choices:"OneCloud|VMware|Aliyun|Azure|Aws|Qcloud|Huawei|OpenStack|Ucloud|ZStack|DStack"`
 	Project  string   `help:"show usage of specified project"`
 
 	ProjectDomain string `help:"show usage of specified domain"`

cmd/climc/shell/users.go

@@ -159,8 +159,6 @@ func init() {
 		Enabled     bool    `help:"Enabled"`
 		Disabled    bool    `help:"Disabled"`
 
-		SkipPasswordComplexityCheck bool `help:"do password complexity check, default is false"`
-
 		// DefaultProject string `help:"Default project"`
 		SystemAccount bool `help:"is a system account?"`
 		NoWebConsole  bool `help:"allow web console access"`
@@ -178,9 +176,6 @@ func init() {
 		}
 		if args.Password != nil {
 			params.Add(jsonutils.NewString(*args.Password), "password")
-			if args.SkipPasswordComplexityCheck {
-				params.Add(jsonutils.JSONTrue, "skip_password_complexity_check")
-			}
 		}
 		if len(args.Displayname) > 0 {
 			params.Add(jsonutils.NewString(args.Displayname), "displayname")

cmd/climc/shell/vpcs.go

@@ -27,9 +27,8 @@ func init() {
 	type VpcListOptions struct {
 		options.BaseListOptions
 
-		Usable    *bool  `help:"Filter usable vpcs"`
-		Region    string `help:"ID or Name of region" json:"-"`
-		Globalvpc string `help:"Filter by globalvpc"`
+		Usable *bool  `help:"Filter usable vpcs"`
+		Region string `help:"ID or Name of region" json:"-"`
 	}
 	R(&VpcListOptions{}, "vpc-list", "List VPCs", func(s *mcclient.ClientSession, opts *VpcListOptions) error {
 		params, err := options.ListStructToParams(opts)

cmd/cloudevent/main.go

@@ -1,23 +0,0 @@
-// Copyright 2019 Yunion
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package main
-
-import (
-	"yunion.io/x/onecloud/pkg/cloudevent/service"
-)
-
-func main() {
-	service.StartService()
-}

cmd/ctyuncli/main.go

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

cmd/devtool/main.go

@@ -1,26 +0,0 @@
-// Copyright 2019 Yunion
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package main
-
-import (
-	"yunion.io/x/onecloud/pkg/devtool/service"
-	"yunion.io/x/onecloud/pkg/util/atexit"
-)
-
-func main() {
-	defer atexit.Handle()
-
-	service.StartService()
-}

cmd/esxi-agent/main.go

@@ -1,26 +0,0 @@
-// Copyright 2019 Yunion
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package main
-
-import (
-	"yunion.io/x/onecloud/pkg/esxi/service"
-	"yunion.io/x/onecloud/pkg/util/atexit"
-)
-
-func main() {
-	defer atexit.Handle()
-
-	service.New().StartService()
-}

cmd/executor-server/main.go

@@ -1,115 +0,0 @@
-// Copyright 2019 Yunion
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package main
-
-import (
-	"flag"
-	"net"
-	"os"
-	"strings"
-
-	"google.golang.org/grpc"
-
-	"yunion.io/x/executor/apis"
-	"yunion.io/x/executor/server"
-	"yunion.io/x/log"
-
-	"yunion.io/x/onecloud/pkg/util/sysutils"
-)
-
-var socketPath string
-
-func init() {
-	flag.StringVar(&socketPath, "socket-path", "/var/run/exec.sock", "execute service listen socket path")
-}
-
-func main() {
-	if !sysutils.IsRootPermission() {
-		log.Fatalln("executor must run on root permission")
-	}
-	Serve()
-}
-
-type SExecuteService struct {
-}
-
-func NewExecuteService() *SExecuteService {
-	return &SExecuteService{}
-}
-
-func (s *SExecuteService) fixPathEnv() error {
-	var paths = []string{
-		"/usr/local/sbin",
-		"/usr/local/bin",
-		"/sbin",
-		"/bin",
-		"/usr/sbin",
-		"/usr/bin",
-	}
-	return os.Setenv("PATH", strings.Join(paths, ":"))
-}
-
-func (s *SExecuteService) prepareEnv() error {
-	if err := s.fixPathEnv(); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (s *SExecuteService) runService() {
-	grpcServer := grpc.NewServer()
-	apis.RegisterExecutorServer(grpcServer, &server.Executor{})
-	if _, err := os.Stat(socketPath); !os.IsNotExist(err) {
-		conn, err := net.Dial("unix", socketPath)
-		if err == nil {
-			conn.Close()
-			log.Fatalf("socket %s already listening", socketPath)
-		}
-
-		// socket file already exist, remove first
-		if err := os.Remove(socketPath); err != nil {
-			log.Fatalln(err)
-		}
-	}
-
-	listener, err := net.Listen("unix", socketPath)
-	if err != nil {
-		log.Fatalln(err)
-	}
-	defer listener.Close()
-	log.Infof("Init net listener on %s succ", socketPath)
-	err = grpcServer.Serve(listener)
-	if err != nil {
-		log.Fatalln(err)
-	}
-}
-
-func (s *SExecuteService) initService() {
-	if len(socketPath) == 0 {
-		log.Fatalf("missing socket path")
-	}
-	if err := s.prepareEnv(); err != nil {
-		log.Fatalln(err)
-	}
-}
-
-func (s *SExecuteService) Run() {
-	s.initService()
-	s.runService()
-}
-
-func Serve() {
-	NewExecuteService().Run()
-}

cmd/googlecli/main.go

@@ -1,147 +0,0 @@
-// Copyright 2019 Yunion
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package main
-
-import (
-	"fmt"
-	"os"
-
-	"yunion.io/x/log"
-	"yunion.io/x/structarg"
-
-	"yunion.io/x/onecloud/pkg/multicloud/google"
-	_ "yunion.io/x/onecloud/pkg/multicloud/google/shell"
-	"yunion.io/x/onecloud/pkg/util/shellutils"
-)
-
-type BaseOptions struct {
-	Debug        bool   `help:"debug mode"`
-	Help         bool   `help:"Show help"`
-	ClientEmail  string `help:"Client email" default:"$GOOGLE_CLIENT_EMAIL"`
-	ProjectID    string `help:"Project ID" default:"$GOOGLE_PROJECT_ID"`
-	PrivateKeyID string `help:"Private Key ID" default:"$GOOGLE_PRIVATE_KEY_ID"`
-	PrivateKey   string `help:"Private Key" default:"$GOOGLE_PRIVATE_KEY"`
-	RegionID     string `help:"RegionID" default:"$GOOGLE_REGION"`
-	SUBCOMMAND   string `help:"googlecli subcommand" subcommand:"true"`
-}
-
-func getSubcommandParser() (*structarg.ArgumentParser, error) {
-	parse, e := structarg.NewArgumentParser(&BaseOptions{},
-		"googlecli",
-		"Command-line interface to google API.",
-		`See "googlecli help COMMAND" for help on a specific command.`)
-
-	if e != nil {
-		return nil, e
-	}
-
-	subcmd := parse.GetSubcommand()
-	if subcmd == nil {
-		return nil, fmt.Errorf("No subcommand argument.")
-	}
-	type HelpOptions struct {
-		SUBCOMMAND string `help:"sub-command name"`
-	}
-	shellutils.R(&HelpOptions{}, "help", "Show help of a subcommand", func(args *HelpOptions) error {
-		helpstr, e := subcmd.SubHelpString(args.SUBCOMMAND)
-		if e != nil {
-			return e
-		} else {
-			fmt.Print(helpstr)
-			return nil
-		}
-	})
-	for _, v := range shellutils.CommandTable {
-		_, e := subcmd.AddSubParser(v.Options, v.Command, v.Desc, v.Callback)
-		if e != nil {
-			return nil, e
-		}
-	}
-	return parse, nil
-}
-
-func showErrorAndExit(e error) {
-	log.Errorf("%s", e)
-	os.Exit(1)
-}
-
-func newClient(options *BaseOptions) (*google.SRegion, error) {
-	if len(options.ClientEmail) == 0 {
-		return nil, fmt.Errorf("Missing ClientEmail")
-	}
-
-	if len(options.PrivateKeyID) == 0 {
-		return nil, fmt.Errorf("Missing PrivateKeyID")
-	}
-
-	if len(options.PrivateKey) == 0 {
-		return nil, fmt.Errorf("Missing PrivateKey")
-	}
-
-	if len(options.ProjectID) == 0 {
-		return nil, fmt.Errorf("Missing ProjectID")
-	}
-
-	cli, err := google.NewGoogleClient("", "", options.ProjectID, options.ClientEmail, options.PrivateKeyID, options.PrivateKey, options.Debug)
-	if err != nil {
-		return nil, err
-	}
-
-	region := cli.GetRegion(options.RegionID)
-	if region == nil {
-		return nil, fmt.Errorf("No such region %s", options.RegionID)
-	}
-
-	return region, nil
-}
-
-func main() {
-	parser, e := getSubcommandParser()
-	if e != nil {
-		showErrorAndExit(e)
-	}
-	e = parser.ParseArgs(os.Args[1:], false)
-	options := parser.Options().(*BaseOptions)
-
-	if options.Help {
-		fmt.Print(parser.HelpString())
-		return
-	}
-	subcmd := parser.GetSubcommand()
-	subparser := subcmd.GetSubParser()
-	if e != nil {
-		if subparser != nil {
-			fmt.Print(subparser.Usage())
-		} else {
-			fmt.Print(parser.Usage())
-		}
-		showErrorAndExit(e)
-		return
-	}
-	suboptions := subparser.Options()
-	if options.SUBCOMMAND == "help" {
-		e = subcmd.Invoke(suboptions)
-	} else {
-		var region *google.SRegion
-		region, e = newClient(options)
-		if e != nil {
-			showErrorAndExit(e)
-		}
-		e = subcmd.Invoke(region, suboptions)
-	}
-	if e != nil {
-		showErrorAndExit(e)
-	}
-}

docs/README.md

@@ -11,7 +11,7 @@ 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
+    sudo docker run -p 80:8080 swaggerapi/swagger-ui
 
 2. 用python启动本地的http server，这是允许CORS的SimpleHTTPServer，监听在8000端口
 

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

docs/ansibleplaybook/ansibleplaybooks.yaml

@@ -1,23 +0,0 @@
-get:
-  summary: 按指定条件列出ansibleplaybook实例
-  responses:
-    200:
-      description: 实例列表信息
-      schema:
-        $ref: "../schemas/ansibleplaybook.yaml#/AnsiblePlaybookListResponse"
-  tags:
-    - ansibleplaybooks
-post:
-  summary: 创建ansibleplaybook实例
-  parameters:
-    - name: ansibleplaybook
-      in: body
-      schema:
-        $ref: "../schemas/ansibleplaybook.yaml#/AnsiblePlaybookCreateRequest"
-  responses:
-    200:
-      description: 新创建的实例信息
-      schema:
-        $ref: "../schemas/ansibleplaybook.yaml#/AnsiblePlaybookResponse"
-  tags:
-    - ansibleplaybooks

docs/bucket/buckets.yaml

@@ -23,7 +23,7 @@ post:
       required: true
       schema:
         $ref: "../schemas/bucket.yaml#/BucketCreateInput"
-  responses:
+  response:
     200:
       description: 对象存储桶信息
       schema:

docs/bucket/limit.yaml

@@ -1,16 +0,0 @@
-post:
-  summary: 设置存储桶的储存限制，该限制只有在使用OneCloud作为访问对象存储网关才生效。
-  parameters:
-    - $ref: '../parameters/bucket.yaml#/bucket_name'
-    - name: bucket
-      in: body
-      required: true
-      schema:
-        $ref: "../schemas/bucket.yaml#/BucketSetLimitInput"
-  responses:
-    200:
-      description: 指定存储桶的Limit响应
-      schema:
-        $ref: "../schemas/bucket.yaml#/BucketGetResponse"
-  tags:
-    - buckets

docs/cloudaccount/change-project.yaml

@@ -1,16 +0,0 @@
-post:
-  summary: 更新云账号所属项目
-  parameters: 
-    - $ref: '../parameters/cloudaccount.yaml#/cloudaccountId'
-    - in: body
-      name: cloudaccount
-      required: true
-      schema:
-        $ref: '../schemas/cloudaccount.yaml#/CloudaccountChangeProject' 
-  responses:
-    200:
-      description: 云账号信息
-      schema:
-        $ref: '../schemas/cloudaccount.yaml#/CloudaccountResponse'
-  tags:
-    - cloudaccount

docs/cloudaccount/cloudaccount.yaml

@@ -1,40 +0,0 @@
-get:
-  summary: 获取指定云账号详情信息
-  parameters:
-    - $ref: '../parameters/cloudaccount.yaml#/cloudaccountId'
-  responses:
-    200:
-      description: 云账号信息
-      schema:
-        $ref: '../schemas/cloudaccount.yaml#/CloudaccountResponse'
-  tags:
-    - cloudaccount
-
-put:
-  summary: 更新云账号信息
-  parameters:
-    - $ref: '../parameters/cloudaccount.yaml#/cloudaccountId'
-    - in: body
-      name: cloudaccount
-      required: true
-      schema:
-        $ref: '../schemas/cloudaccount.yaml#/CloudaccountUpdate' 
-  responses:
-    200:
-      description: 云账号信息
-      schema:
-        $ref: '../schemas/cloudaccount.yaml#/CloudaccountResponse'
-  tags:
-    - cloudaccount
-
-delete:
-  summary: 删除指定云账号
-  parameters:
-    - $ref: '../parameters/cloudaccount.yaml#/cloudaccountId'
-  responses:
-    200:
-      description: 被删除云账号信息
-      schema:
-        $ref: '../schemas/cloudaccount.yaml#/CloudaccountResponse'
-  tags:
-    - cloudaccount

docs/cloudaccount/cloudaccounts.yaml

@@ -1,30 +0,0 @@
-get:
-  summary: 按指定条件列出云账号
-  parameters:
-    - $ref: '../parameters/common.yaml#/limit'
-    - $ref: '../parameters/common.yaml#/offset'
-    - $ref: '../parameters/common.yaml#/provider'
-    - $ref: '../parameters/common.yaml#/cloud_env'
-
-  responses:
-    200:
-      description: 云账号列表信息
-      schema:
-        $ref: '../schemas/cloudaccount.yaml#/CloudaccountListResponse'
-  tags:
-    - cloudaccount
-post:
-  summary: 创建云账号
-  parameters:
-    - in: body
-      name: cloudaccount
-      required: true
-      schema:
-        $ref: '../schemas/cloudaccount.yaml#/CloudaccountCreate' 
-  responses:
-    200:
-      description: 新创建的云账号信息
-      schema:
-        $ref: '../schemas/cloudaccount.yaml#/CloudaccountResponse'
-  tags:
-    - cloudaccount