Merge pull request #11144 from zexi/automated-cherry-pick-of-#11142-upstream-release-3.6

Automated cherry pick of #11142: fix(glance): make image is_standard updatable

.circleci/config.yml

@@ -5,10 +5,10 @@ version: 2
 jobs:
   check:
     docker:
-      - image: yunionio/centos-build:1.1-4
+      - image: yunionio/centos-build:1.0-1
         environment:
           ONECLOUD_CI_BUILD: "1"
-    working_directory: /root/go/src/yunion.io/x/onecloud
+    working_directory: /root/go/onecloud
     steps:
       - checkout
       - run:
@@ -18,7 +18,7 @@ jobs:
     requires:
       - check
     docker:
-      - image: yunionio/centos-build:1.1-4
+      - image: yunionio/centos-build:1.0-1
         environment:
           ONECLOUD_CI_BUILD: "1"
 
@@ -26,7 +26,7 @@ jobs:
     #### expecting it in the form of
     ####   /go/src/github.com/circleci/go-tool
     ####   /go/src/bitbucket.org/circleci/go-tool
-    working_directory: /root/go/src/yunion.io/x/onecloud
+    working_directory: /root/go/onecloud
     parallelism: 4
     steps:
       - checkout
@@ -51,10 +51,10 @@ jobs:
     requires:
       - check
     docker:
-      - image: yunionio/centos-build:1.1-4
+      - image: yunionio/centos-build:1.0-1
         environment:
-          ONECLOUD_CI_BUILD: "1"
-    working_directory: /root/go/src/yunion.io/x/onecloud
+          GO111MODULE: "on"
+    working_directory: /root/go/onecloud
     parallelism: 4
     steps:
       - checkout

.github/ISSUE_TEMPLATE/bug_report.md

@@ -18,6 +18,4 @@ assignees: ''
 **Environment**:
 - OS (e.g: `cat /etc/os-release`):
 - Kernel (e.g. `uname -a`):
-<!--
-- Version (e.g. `climc version-list`):
--->
+- Others:

Makefile

@@ -199,53 +199,10 @@ vet-check:
 	./scripts/vet.sh chk
 .PHONY: vet-check
 
-comma:=,
-space:=$(space) $(space)
-# NOTE: keep y18n-packages in alphabetical order
-y18n-src-lang := en-US
-y18n-lang     := en-US,zh-CN
-y18n-packages := \
-		yunion.io/x/onecloud/cmd/apigateway \
-		yunion.io/x/onecloud/cmd/keystone \
-		yunion.io/x/onecloud/cmd/monitor \
-		yunion.io/x/onecloud/cmd/region \
-		yunion.io/x/onecloud/cmd/yunionconf \
-
-define y18n-gen
-	set -o errexit; \
-	set -o pipefail; \
-	export GO111MODULE=off; \
-	y18n \
-		-chdir $(CURDIR) \
-		-dir ./locales/ \
-		-out ./locales/locales.go \
-		-lang $(y18n-lang) \
-		$(y18n-packages) \
-		; \
-	$(foreach lang,$(filter-out $(y18n-src-lang),$(subst $(comma), ,$(y18n-lang))),cp ./locales/$(lang)/{out,messages}.gotext.json;) \
-
-endef
-
-y18n-gen:
-	$(y18n-gen)
-	$(y18n-gen)
-
-.PHONY: y18n-gen
-
-y18n-check:
-	$(y18n-gen)
-	if git status --short ./locales | sed 's/^/$@: /' | grep .; then \
-		echo "$@: Locales content needs care" >&2 ; \
-		false; \
-	fi
-
-.PHONY: y18n-check
-
 check: fmt-check
 check: gendocgo-check
 check: goimports-check
 check: vet-check
-#check: y18n-check
 .PHONY: check
 
 
@@ -268,8 +225,7 @@ dep:
 	@$(MAKE) mod
 
 mod:
-	go get -d $(patsubst %,%@master,$(shell GO111MODULE=on go mod edit -print  | sed -n -e 's|.*\(yunion.io/x/[a-z].*\) v.*|\1|p' | grep -v sqlchemy))
-	go get -d yunion.io/x/sqlchemy@v1.0.0
+	go get -d $(patsubst %,%@master,$(shell GO111MODULE=on go mod edit -print  | sed -n -e 's|.*\(yunion.io/x/[a-z].*\) v.*|\1|p'))
 	go mod tidy
 	go mod vendor -v
 
@@ -330,9 +286,6 @@ image:
 
 .PHONY: image
 
-image-telegraf-raid-plugin:
-	VERSION=release-1.6.3 ARCH=all make image telegraf-raid-plugin
-
 %:
 	@:
 

Makefile.common.mk

@@ -7,8 +7,8 @@ endif
 ModBaseName:=$(notdir $(ModName))
 
 DockerImageRegistry?=registry.cn-beijing.aliyuncs.com
-DockerImageAlpineBuild?=$(DockerImageRegistry)/yunionio/alpine-build:1.1-5
-DockerImageCentOSBuild?=$(DockerImageRegistry)/yunionio/centos-build:1.1-5
+DockerImageAlpineBuild?=$(DockerImageRegistry)/yunionio/alpine-build:1.0-5
+DockerImageCentOSBuild?=$(DockerImageRegistry)/yunionio/centos-build:1.1-4
 
 
 EnvIf=$(if $($(1)),$(1)=$($(1)))

OWNERS

@@ -4,6 +4,12 @@ reviewers:
   - ioito
   - swordqiu
   - tb365
+  - wanyaoqi
+  - yousong
+  - zhaoxiangchun
+  - zhasm
 approvers:
   - swordqiu
+  - yousong
+  - wanyaoqi
   - Zexi

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

@@ -1,3 +0,0 @@
-echo "Welcome to Cloud Shell :-) You may execute climc and other command tools in this shell."
-echo "Please exec 'climc' to get started"
-echo ""

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

@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" ID="_1e55eaf7-5cb9-4601-b557-e322fdfb2baf" entityID="urn:federation:MicrosoftOnline">
-  <Signature xmlns="http://www.w3.org/2000/09/xmldsig#">
-    <SignedInfo>
-      <CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
-      <SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-      <Reference URI="#_1e55eaf7-5cb9-4601-b557-e322fdfb2baf">
-        <Transforms>
-          <Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/>
-          <Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
-        </Transforms>
-        <DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-        <DigestValue>fA33hUaj24/8F8bArDIkH6CpX0k=</DigestValue>
-      </Reference>
-    </SignedInfo>
-    <SignatureValue>p/rlVWxLRIYiHozzWUgsjmQ5ItMZ/ITeEOg/edeo50l7qU8wLM9JD55EHoLpVvxImBcCfY1CxKdq3s1o9Up1jvEcH9KjfYZea1q8hzTkQdt7F2XvxoqDFRLvVwyHHJjygaEvFRXXxml7IDgDx9ScSRhQeGUlTGhI9eAFSaGkChM/FPnmekZ3ngSwbVf4FsTLIArxMqEnV0lXNMTr5NHQ6VL5wZ/cHLNCkkBoY0qWyv2hnYiZiXa4TKjpAN+8QF5GDPv/0ExJwe+aoRAQhdBzhBUICQdQd+v3Rb5SuX++iVfmf4IPMqj8CK4uK7iYXNLCGEO8oFR2KlK/zBpHzw6yCQ==</SignatureValue>
-    <KeyInfo>
-      <X509Data>
-        <X509Certificate>MIIC/TCCAeWgAwIBAgIQF9xAVqfHt7dNSOnsMKYLDjANBgkqhkiG9w0BAQsFADApMScwJQYDVQQDEx5MaXZlIElEIFNUUyBTaWduaW5nIFB1YmxpYyBLZXkwHhcNMTkwNjE4MDAwMDAwWhcNMjEwNjE4MDAwMDAwWjApMScwJQYDVQQDEx5MaXZlIElEIFNUUyBTaWduaW5nIFB1YmxpYyBLZXkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDLwL+mOk+zhgjHPFiZuDaU7coCOMkYyJyWS2B2KWYx7BMmy+SBSlFvvDHIiMXeLnv9DiUnQXtjClZXNqEo2amM/KdXfnCUlwdnqGa89TbB8kM6aBQKCh5Up7vejD+KRpPcOK7DqxWnm037zNKH+6liwRMUD/+lkBODoG1/ThuBVM0Kr1Oowfnkb4JYeF5xZk+2+ThR2dcQzdsz8dBW1GpGopdoM5G1amVhoRPBeNlYUqf0JUPE36Dx0iCmeXX00HTR2gd+/DJFVe34l/VxL4cqufmRcqWHy7axonbpt8svjAervGgueF5W/BVGcO4eVwFzFfnAz7bSaH/zbsNnQkFtAgMBAAGjITAfMB0GA1UdDgQWBBQlxmu/Hj1qB2A306p0Sz9up711AjANBgkqhkiG9w0BAQsFAAOCAQEAEhb+i+J69DvzCTfmC0Mn+uSGzBaW0ksMZNjM8/p/RFueytNo8/DY6TUb9W8l/HSVON782iGG7hIsG68RUIZ5q+/WAB9iBvKkKv5aGZ0bK/eD5boHwBwMa3udTjU68Vkai0A7naISEh22h+lQPvKiftCEzK1x9j2FoAXEMhACnpTwRrrj3SsJXCsMaOKcVw7sCmM4/4wD5I1+dfMSe85rSEzzUCDcCMEg67sBKdO2CFK1GoH21ttrz1CV+xt8Pn9a488kgsp2ZyU+yixS59CrM7onEzt1R4miXWAJAtydNHAmmbgKrTxqf67fEXFcrlFAHexi6vvINZWZPD6+J+q6xg==</X509Certificate>
-      </X509Data>
-    </KeyInfo>
-  </Signature>
-  <SPSSODescriptor WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor use="signing">
-      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
-        <X509Data>
-          <X509Certificate>MIIC/TCCAeWgAwIBAgIQF9xAVqfHt7dNSOnsMKYLDjANBgkqhkiG9w0BAQsFADApMScwJQYDVQQDEx5MaXZlIElEIFNUUyBTaWduaW5nIFB1YmxpYyBLZXkwHhcNMTkwNjE4MDAwMDAwWhcNMjEwNjE4MDAwMDAwWjApMScwJQYDVQQDEx5MaXZlIElEIFNUUyBTaWduaW5nIFB1YmxpYyBLZXkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDLwL+mOk+zhgjHPFiZuDaU7coCOMkYyJyWS2B2KWYx7BMmy+SBSlFvvDHIiMXeLnv9DiUnQXtjClZXNqEo2amM/KdXfnCUlwdnqGa89TbB8kM6aBQKCh5Up7vejD+KRpPcOK7DqxWnm037zNKH+6liwRMUD/+lkBODoG1/ThuBVM0Kr1Oowfnkb4JYeF5xZk+2+ThR2dcQzdsz8dBW1GpGopdoM5G1amVhoRPBeNlYUqf0JUPE36Dx0iCmeXX00HTR2gd+/DJFVe34l/VxL4cqufmRcqWHy7axonbpt8svjAervGgueF5W/BVGcO4eVwFzFfnAz7bSaH/zbsNnQkFtAgMBAAGjITAfMB0GA1UdDgQWBBQlxmu/Hj1qB2A306p0Sz9up711AjANBgkqhkiG9w0BAQsFAAOCAQEAEhb+i+J69DvzCTfmC0Mn+uSGzBaW0ksMZNjM8/p/RFueytNo8/DY6TUb9W8l/HSVON782iGG7hIsG68RUIZ5q+/WAB9iBvKkKv5aGZ0bK/eD5boHwBwMa3udTjU68Vkai0A7naISEh22h+lQPvKiftCEzK1x9j2FoAXEMhACnpTwRrrj3SsJXCsMaOKcVw7sCmM4/4wD5I1+dfMSe85rSEzzUCDcCMEg67sBKdO2CFK1GoH21ttrz1CV+xt8Pn9a488kgsp2ZyU+yixS59CrM7onEzt1R4miXWAJAtydNHAmmbgKrTxqf67fEXFcrlFAHexi6vvINZWZPD6+J+q6xg==</X509Certificate>
-        </X509Data>
-      </KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
-        <X509Data>
-          <X509Certificate>MIIC/TCCAeWgAwIBAgIQbgDHfi3t1JNGVqwD5/7lmjANBgkqhkiG9w0BAQsFADApMScwJQYDVQQDEx5MaXZlIElEIFNUUyBTaWduaW5nIFB1YmxpYyBLZXkwHhcNMjAxMjIxMDAwMDAwWhcNMjUxMjIxMDAwMDAwWjApMScwJQYDVQQDEx5MaXZlIElEIFNUUyBTaWduaW5nIFB1YmxpYyBLZXkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDFT0/0/2qQurnYa0LbJHF9YYozhEH6r9mCxVDBYbewSG4tGgrWpsewQ/96pcczGMQctMvU+h2eX38Hx/f9JAIDbuRQzQlsPhQS7DDZ6WlTXU+t8d/g2C7fpSoLs4KVdJih4xyjLUWj+BK/ijsRjBt4Riw9VbJH/DdWKyoSMbECEiE+s1RtLP/eYoMmNfxyQGqWirCNqVNBTlqzYQp4dgF0foYy4ktoxwmQOVoTcIMFYp1I4pFPI7CxuMLkfK0X7aTbM7YGphvMfJxJkjrQdyI7G5d1t4DNi3zkEbBT7FGAr6qPt3Kn9ralpqJKHdpEBA9N0vNwQo5XTYIhUbPQ16IRAgMBAAGjITAfMB0GA1UdDgQWBBRs7tPmfkksSr67KtElHjYZbeaCTjANBgkqhkiG9w0BAQsFAAOCAQEAJqwMZSjQJ36x+1sty6EeLKQLQewQwPaEC47Zut+8bXed6Q8jMZ0bfa/MM7XquEcabaMZLQuKLft44YXwXXQOfQrI2qjQr3eToJFlDT9hR0rfp9wQqttDxd6Aa6RWwDTgo5oKUQCTKLHhEy8uWzScK0eGt2d7TWTaDXjRSwNq6tM7fRhZs07tKBV3xfi9EQy/mlavAMFRBVm86NSo7AsOG1IOMq03U3ooCWAXh9PdvvHNfHhH19futAnC/HeOjwRF1Qc527aBMphYFQLdiThfmfmiE/AhQqCwZ2oE7uCJhBtR+Kb1ZGhjI35pHfsSqGiFa7Kr+5ave822PDcke89Mvg==</X509Certificate>
-        </X509Data>
-      </KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
-        <X509Data>
-          <X509Certificate>MIIC/TCCAeWgAwIBAgIQbgDHfi3t1JNGVqwD5/7lmjANBgkqhkiG9w0BAQsFADApMScwJQYDVQQDEx5MaXZlIElEIFNUUyBTaWduaW5nIFB1YmxpYyBLZXkwHhcNMjAxMjIxMDAwMDAwWhcNMjUxMjIxMDAwMDAwWjApMScwJQYDVQQDEx5MaXZlIElEIFNUUyBTaWduaW5nIFB1YmxpYyBLZXkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDFT0/0/2qQurnYa0LbJHF9YYozhEH6r9mCxVDBYbewSG4tGgrWpsewQ/96pcczGMQctMvU+h2eX38Hx/f9JAIDbuRQzQlsPhQS7DDZ6WlTXU+t8d/g2C7fpSoLs4KVdJih4xyjLUWj+BK/ijsRjBt4Riw9VbJH/DdWKyoSMbECEiE+s1RtLP/eYoMmNfxyQGqWirCNqVNBTlqzYQp4dgF0foYy4ktoxwmQOVoTcIMFYp1I4pFPI7CxuMLkfK0X7aTbM7YGphvMfJxJkjrQdyI7G5d1t4DNi3zkEbBT7FGAr6qPt3Kn9ralpqJKHdpEBA9N0vNwQo5XTYIhUbPQ16IRAgMBAAGjITAfMB0GA1UdDgQWBBRs7tPmfkksSr67KtElHjYZbeaCTjANBgkqhkiG9w0BAQsFAAOCAQEAJqwMZSjQJ36x+1sty6EeLKQLQewQwPaEC47Zut+8bXed6Q8jMZ0bfa/MM7XquEcabaMZLQuKLft44YXwXXQOfQrI2qjQr3eToJFlDT9hR0rfp9wQqttDxd6Aa6RWwDTgo5oKUQCTKLHhEy8uWzScK0eGt2d7TWTaDXjRSwNq6tM7fRhZs07tKBV3xfi9EQy/mlavAMFRBVm86NSo7AsOG1IOMq03U3ooCWAXh9PdvvHNfHhH19futAnC/HeOjwRF1Qc527aBMphYFQLdiThfmfmiE/AhQqCwZ2oE7uCJhBtR+Kb1ZGhjI35pHfsSqGiFa7Kr+5ave822PDcke89Mvg==</X509Certificate>
-        </X509Data>
-      </KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.microsoftonline.com/login.srf"/>
-    <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</NameIDFormat>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.microsoftonline.com/login.srf" index="0" isDefault="true"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login.microsoftonline.com/login.srf" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://login.microsoftonline.com/login.srf" index="2"/>
-  </SPSSODescriptor>
-  <Extensions>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-  </Extensions>
-</EntityDescriptor>

build/dhcprelay/root/etc/sysconfig/yunion_dhcprelay

@@ -1,3 +0,0 @@
-INTERFACE=""
-INTERFACE_IP=""
-RELAY=""

build/dhcprelay/root/usr/lib/systemd/system/yunion-dhcprelay.service

@@ -1,22 +0,0 @@
-[Unit]
-Description=Yunion Cloud DHCP Relay Agent
-Documentation=https://docs.yunion.cn
-After=network-online.target
-Wants=network-online.target
-After=network.target
-
-[Service]
-Type=simple
-EnvironmentFile=-/etc/sysconfig/yunion_dhcprelay
-User=root
-Group=root
-ExecStart=/opt/yunion/bin/dhcprelay --interface "$INTERFACE" --ip "$IP" --relay "$RELAY"
-WorkingDirectory=/opt/yunion/bin
-KillMode=process
-Restart=always
-RestartSec=30
-LimitNOFILE=500000
-LimitNPROC=500000
-
-[Install]
-WantedBy=multi-user.target

build/dhcprelay/vars

@@ -1,2 +0,0 @@
-DESCRIPTION="Yunion Tiny DHCP Relay Server"
-SERVICE="yes"

build/docker/Dockerfile.ansibleserver

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

build/docker/Dockerfile.ansibleserver-base

@@ -1,4 +1,4 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.2
 
 MAINTAINER "Yousong Zhou <zhouyousong@yunionyun.com>"
 
@@ -7,7 +7,6 @@ MAINTAINER "Yousong Zhou <zhouyousong@yunionyun.com>"
 RUN set -x \
 	&& apk update \
 	&& apk add openssh-client \
-	&& apk add sshpass \
 	&& apk add ansible \
 	&& apk add tzdata git ca-certificates \
 	&& rm -rf /var/cache/apk/*

build/docker/Dockerfile.apigateway

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

build/docker/Dockerfile.baremetal-agent

@@ -1,11 +1,9 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/baremetal-base:v0.3.3
+FROM registry.cn-beijing.aliyuncs.com/yunionio/baremetal-base:v0.2
 
 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
-RUN apk add librados librbd
-ADD ./_output/alpine-build/bin/baremetal-agent /opt/yunion/bin/baremetal-agent
+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,8 +1,7 @@
-FROM --platform=linux/amd64 registry.cn-beijing.aliyuncs.com/yunionio/centos-build:1.1-4 as build
-RUN yum install -y https://iso.yunion.cn/vm-images/baremetal-pxerom-1.1.0-21092209.x86_64.rpm
-#RUN yum install -y http://192.168.23.50:8083/baremetal-pxerom-1.1.0-21092209.x86_64.rpm
+FROM registry.cn-beijing.aliyuncs.com/yunionio/centos-build:1.1-4 as build
+RUN yum install -y https://iso.yunion.cn/3.6/rpms/packages/host/baremetal-pxerom-1.1.0-20072810.x86_64.rpm
 
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5
+FROM frolvlad/alpine-glibc:glibc-2.28
 
 MAINTAINER "Yaoqi Wan <wanyaoqi@yunionyun.com>"
 

build/docker/Dockerfile.climc

@@ -1,7 +1,5 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/climc-base:20210901
+FROM registry.cn-beijing.aliyuncs.com/yunionio/climc-base:20200820
 
 ADD ./build/climc/root/opt /opt
 
-RUN cat /opt/yunion/scripts/motd/climc.sh >> /root/.bashrc
-
 ADD ./_output/alpine-build/bin/climc ./_output/alpine-build/bin/*cli /opt/yunion/bin/

build/docker/Dockerfile.climc-base

@@ -1,4 +1,4 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.2
 
 MAINTAINER "Zexi Li <lizexi@yunionyun.com>"
 
@@ -6,9 +6,7 @@ ENV TZ Asia/Shanghai
 
 RUN mkdir -p /opt/yunion/bin
 
-RUN echo http://dl-cdn.alpinelinux.org/alpine/edge/testing >>/etc/apk/repositories
-
-RUN apk add --no-cache bash bash-completion tzdata ca-certificates vim ipmitool kubectl ceph-common && \
+RUN apk add --no-cache bash bash-completion tzdata ca-certificates vim && \
     rm -rf /var/cache/apk/*
 
 RUN cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime

build/docker/Dockerfile.cloudevent

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

build/docker/Dockerfile.cloudid

@@ -1,4 +1,4 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.2
 
 COPY ./build/cloudid/root/opt/ /opt/
 ADD ./_output/alpine-build/bin/cloudid /opt/yunion/bin/cloudid

build/docker/Dockerfile.cloudmon

@@ -1,8 +0,0 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5
-
-MAINTAINER "Zexi Li <lizexi@yunionyun.com>"
-
-RUN mkdir -p /etc/yunion/data/
-
-ADD   ./_output/alpine-build/bin/cloudmon \
-      /opt/yunion/bin/

build/docker/Dockerfile.cloudnet

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

build/docker/Dockerfile.cloudproxy

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

build/docker/Dockerfile.devtool

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

build/docker/Dockerfile.esxi-agent

@@ -1,4 +1,4 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.2
 
 COPY ./build/esxi-agent/root/opt/ /opt/
 

build/docker/Dockerfile.file-repo

@@ -1,21 +0,0 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.2
-
-MAINTAINER "Rain Zheng <zhengyu@yunion.com>"
-
-# openssh-client, for ansible ssh connection
-# git, ca-certificates, for fetching ansible roles
-RUN set -x \
-	&& apk update \
-	&& apk add git \
-	&& rm -rf /var/cache/apk/*
-
-# install default playbook and install pkg
-Run mkdir -p /opt/yunion/ansible-install-pkg
-Run wget https://yunioniso.oss-cn-beijing.aliyuncs.com/rpms/telegraf/telegraf-1.19.2-yn~fe11a96b-0.aarch64.rpm -P /opt/yunion/ansible-install-pkg
-Run wget https://yunioniso.oss-cn-beijing.aliyuncs.com/rpms/telegraf/telegraf-1.19.2-yn~fe11a96b-0.x86_64.rpm -P /opt/yunion/ansible-install-pkg
-Run wget https://yunioniso.oss-cn-beijing.aliyuncs.com/rpms/telegraf/telegraf_1.19.2-yn~fe11a96b-0_amd64.deb -P /opt/yunion/ansible-install-pkg
-Run wget https://yunioniso.oss-cn-beijing.aliyuncs.com/rpms/telegraf/telegraf_1.19.2-yn~fe11a96b-0_arm64.deb -P /opt/yunion/ansible-install-pkg
-
-Run mkdir -p /opt/yunion/playbook
-Run mkdir /opt/yunion/playbook/monitor-agent
-Run git clone https://github.com/yunionio/monitor-agent.git /opt/yunion/playbook/monitor-agent --recurse-submodules

build/docker/Dockerfile.glance

@@ -1,7 +1,6 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/torrent:20210815.0
+FROM registry.cn-beijing.aliyuncs.com/yunionio/torrent:20200820
 
 MAINTAINER "Zexi Li <lizexi@yunionyun.com>"
 
-RUN apk add --no-cache s3fs-fuse --repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing
 RUN mkdir -p /opt/yunion/bin
-ADD ./_output/alpine-build/bin/glance /opt/yunion/bin/glance
+ADD ./_output/alpine-build/bin/glance /opt/yunion/bin/glance

build/docker/Dockerfile.host

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

build/docker/Dockerfile.keystone

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

build/docker/Dockerfile.logger

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

build/docker/Dockerfile.monitor

@@ -1,4 +1,4 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.2
 
 COPY ./build/monitor/root/opt/ /opt/
-ADD ./_output/alpine-build/bin/monitor /opt/yunion/bin/monitor
+ADD ./_output/alpine-build/bin/monitor /opt/yunion/bin/monitor

build/docker/Dockerfile.notify

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

build/docker/Dockerfile.onecloud-base

@@ -1,5 +1,4 @@
-# TODO: use 3.14 will lead 'apk add qemu-img fail on arm64'
-FROM alpine:3.13.5
+FROM alpine:3.11
 
 MAINTAINER "Zexi Li <lizexi@yunionyun.com>"
 

build/docker/Dockerfile.region

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

build/docker/Dockerfile.region-dns

@@ -1,4 +1,4 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.2
 
 RUN mkdir -p /opt/yunion/bin
 ADD ./_output/alpine-build/bin/region-dns /opt/yunion/bin/region-dns

build/docker/Dockerfile.s3gateway

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

build/docker/Dockerfile.scheduler

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

build/docker/Dockerfile.telegraf-raid-plugin

@@ -1,3 +1,3 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/yunion-rootfs:v1.1
+FROM registry.cn-beijing.aliyuncs.com/yunionio/yunion-rootfs:v1.0
 
 ADD ./_output/centos-build/bin/telegraf-raid-plugin /opt/yunion/bin/telegraf-raid-plugin

build/docker/Dockerfile.torrent

@@ -1,15 +1,15 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.2
 
-MAINTAINER "Zexi Li <zexi.li@icloud.com>"
-
-# HACK: use v3.14 alpine mirror to upgrade qemu-img
-RUN echo http://dl-cdn.alpinelinux.org/alpine/v3.14/main > /etc/apk/repositories
-RUN echo http://dl-cdn.alpinelinux.org/alpine/v3.14/community >> /etc/apk/repositories
+MAINTAINER "Yaoqi Wan <wanyaoqi@yunionyun.com>"
 
 RUN apk update && \
-    apk add --no-cache qemu-img && \
+    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
 RUN mkdir -p /opt/yunion/bin

build/docker/Dockerfile.vpcagent

@@ -1,4 +1,4 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/openvswitch:2.10.5-1
+FROM registry.cn-beijing.aliyuncs.com/yunionio/openvswitch:2.10.4-1
 
 MAINTAINER "Yousong Zhou <zhouyousong@yunion.cn>"
 

build/docker/Dockerfile.yunionconf

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

build/docker/Makefile

@@ -1,35 +1,3 @@
-REGISTRY ?= "registry.cn-beijing.aliyuncs.com/yunionio"
-DOCKER_BUILD = docker build -t $(REGISTRY)
-DOCKER_BUILDX = docker buildx build --platform linux/arm64,linux/amd64 --push -t $(REGISTRY)
-
-
 debian10-base:
 	docker buildx build --platform linux/arm64,linux/amd64 --push \
 		-t registry.cn-beijing.aliyuncs.com/yunionio/debian10-base:1.0 -f ./Dockerfile.debian-base .
-
-ONECLOUD_BASE_VERSION = v0.3.5
-
-onecloud-base:
-	$(DOCKER_BUILDX)/onecloud-base:$(ONECLOUD_BASE_VERSION) -f ./Dockerfile.onecloud-base .
-
-ANSIBLESERVER_BASE = v1.0.5
-
-ansibleserver-base:
-	$(DOCKER_BUILDX)/ansibleserver-base:$(ANSIBLESERVER_BASE) -f ./Dockerfile.ansibleserver-base .
-
-CLIMC_BASE_VERSION = 20210901
-
-climc-base:
-	docker buildx build --platform linux/arm64,linux/amd64 --push \
-		-t registry.cn-beijing.aliyuncs.com/yunionio/climc-base:$(CLIMC_BASE_VERSION) -f ./Dockerfile.climc-base .
-
-BAREMETAL_BASE_VERSION = v0.3.3
-
-baremetal-base:
-	$(DOCKER_BUILDX)/baremetal-base:$(BAREMETAL_BASE_VERSION) -f ./Dockerfile.baremetal-base .
-	#docker push $(REGISTRY)/baremetal-base:$(BAREMETAL_BASE_VERSION)
-
-FILE_REPO_VERSION = v0.3.3
-
-file-repo:
-	$(DOCKER_BUILDX)/file-repo:$(FILE_REPO_VERSION) -f ./Dockerfile.file-repo .

build/docker/multi-arch/Dockerfile.host

@@ -7,7 +7,7 @@ COPY . /root/go/src/yunion.io/x/onecloud
 WORKDIR /root/go/src/yunion.io/x/onecloud
 RUN make cmd/host
 
-FROM registry.cn-beijing.aliyuncs.com/yunionio/host-base:v0.4.0
+FROM registry.cn-beijing.aliyuncs.com/yunionio/host-base:v0.3
 
 MAINTAINER "Yaoqi Wan wanyaoqi@yunionyun.com"
 

build/docker/multi-arch/Dockerfile.torrent

@@ -1,24 +1,24 @@
 FROM registry.cn-beijing.aliyuncs.com/yunionio/alpine-build:1.0-5 as build
 ARG TARGETPLATFORM
 ARG BUILDPLATFORM
-
 RUN mkdir -p /root/go/src/yunion.io/x/onecloud
 COPY . /root/go/src/yunion.io/x/onecloud
-RUN cd /root/go/src/yunion.io/x/onecloud && make cmd/torrent
 
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5
+WORKDIR /root/go/src/yunion.io/x/onecloud
+RUN make cmd/torrent
 
-MAINTAINER "Zexi Li <zexi.li@icloud.com>"
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.2
 
-# HACK: use v3.14 alpine mirror to upgrade qemu-img
-RUN echo http://dl-cdn.alpinelinux.org/alpine/v3.14/main > /etc/apk/repositories
-RUN echo http://dl-cdn.alpinelinux.org/alpine/v3.14/community >> /etc/apk/repositories
+MAINTAINER "Yaoqi Wan <wanyaoqi@yunionyun.com>"
 
 RUN apk update && \
-    apk add --no-cache qemu-img && \
+    apk add --no-cache tzdata ca-certificates qemu-img && \
     rm -rf /var/cache/apk/*
 
-# TAG=20210815.0
+RUN cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
+
+ENV TZ Asia/Shanghai
+
 # add executable file torrent
 # make cmd/torrent
 RUN mkdir -p /opt/yunion/bin

build/docker/multi-arch/Dockerfile.torrent.dockerignore

@@ -1,2 +0,0 @@
-_output/alpine-build/_cache
-

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

@@ -1,6 +0,0 @@
-{{- $d := .resource_details -}}
-您在{{ $d.project }}项目的
-{{- if $d.brand -}}
-{{ $d.brand }}平台
-{{- end -}}
-{{ .resource_type_display }}{{ $d.name }}已经成功{{ .action_display }}

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

@@ -1,64 +0,0 @@
-{{- $d := .resource_details }}
-{{- $consoleServiceType := list "loadbalancer" "dbinstance" "elasticcache" -}}
-您在{{ $d.project }}项目的
-{{- if $d.brand -}}
-{{ $d.brand }}平台
-{{- end -}}
-{{ .resource_type_display }}{{ $d.name }}已经创建成功
-{{- if $d.private_dns -}}
-，内网地址为{{ $d.private_dns }}:{{ $d.private_connect_port }}
-{{- end -}}
-
-{{- if $d.public_dns -}}
-，外网地址为{{ $d.public_dns }}:{{ $d.public_connect_port }}
-{{- end -}}
-
-{{- if and $d.address_type $d.address -}}
-，服务地址为{{ $d.address_type }}{{ $d.address }}
-{{- end -}}
-
-{{- if $d.ips -}}
-，IP地址为{{ $d.ips }}
-{{- end -}}
-
-{{- if and $d.guest_ip_start $d.guest_ip_end -}}
-，IP范围为{{ $d.guest_ip_start }}-{{ $d.guest_ip_end }}
-{{- end -}}
-
-{{- if $d.ip_addr -}}
-，IP地址为{{ $d.ip_addr }}
-{{- end -}}
-
-{{- if $d.account -}}
-，初始帐号为{{ $d.account }}
-{{- end -}}
-
-{{- if $d.password -}}
-，初始密码为{{ $d.password }}
-{{- end -}}
-
-{{- if $d.keypair -}}
-，访问ssh密钥为{{ $d.keypair }}
-{{- end -}}
-
-{{- if $d.common_name -}}
-，证书域名为{{ $d.common_name }}
-{{- end -}}
-
-{{- if $d.not_after -}}
-，过期时间为{{ $d.not_after }}
-{{- end -}}
-
-{{- if eq .resource_type "server" -}}
-，请使用
-{{- if $d.windows -}}
-远程桌面连接器(RDC)
-{{- else -}}
-SSH
-{{- end -}}
-或控制面板控制台访问虚拟机。
-{{- end -}}
-
-{{- if has .resource_type $consoleServiceType -}}
-，更多信息请前往控制台查看。
-{{- end -}}

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

@@ -1,6 +0,0 @@
-{{- $d := .resource_details -}}
-您在{{ $d.project }}项目的
-{{- if $d.brand -}}
-{{ $d.brand }}平台
-{{- end -}}
-{{ .resource_type_display }}{{ $d.name }}还有{{ .advance_days }}天就要到期释放，如需续期使用，请尽快前往控制台处理

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

@@ -1,2 +0,0 @@
-{{- $d := .resource_details -}}
-您在{{ $d.project }}项目的弹性伸缩组{{ $d.scaling_group }}中的{{ $d.trigger_type_display }}类型伸缩策略{{ $d.name }}满足触发条件，成功{{ $d.action_display }}{{ $d.number }}{{ $d.unit_display }}实例

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

@@ -1,2 +0,0 @@
-{{- $d := .resource_details -}}
-您在{{ $d.project }}项目的定时任务执行成功

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

@@ -1,2 +0,0 @@
-{{- $d := .resource_details -}}
-您在{{ $d.project }}项目的自动快照策略{{ $d.name }}为硬盘{{ $d.disk }}创建快照成功

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

@@ -1,14 +0,0 @@
-{{- $d := .resource_details -}}
-您在{{ $d.project }}项目的
-{{- if $d.brand -}}
-{{ $d.brand }}平台
-{{- end -}}
-{{ .resource_type_display }}{{ $d.name }}已经{{ .action_display }}成功
-{{- if $d.account -}}
-，帐号为{{ $d.account }}
-{{- end -}}
-
-{{- if $d.password -}}
-，密码为{{ $d.password }}
-{{- end -}}
-，更多信息请前往控制台进行查看

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

@@ -1,2 +0,0 @@
-{{- $d := .resource_details -}}
-Your {{ if $d.brand -}} {{ $d.brand }} {{ end -}} {{ .resource_type_display }} {{ $d.name }} {{ if $d.project -}} in project {{ $d.project }} {{ end -}} has been {{ .action_display }} successfully

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

@@ -1,54 +0,0 @@
-{{- $d := .resource_details }}
-{{- $consoleServiceType := list "loadbalancer" "dbinstance" "elasticcache" -}}
-Your {{ if $d.brand -}} {{ $d.brand }} {{ end -}} {{ .resource_type_display }} {{ $d.name }} {{ if $d.project -}} in project {{ $d.project }} {{ end -}} has been created successfully
-{{- if $d.private_dns -}}
-, the intranet address is {{ $d.private_dns }}:{{ $d.private_connect_port }}
-{{- end -}}
-
-{{- if $d.public_dns -}}
-, the internet address is {{ $d.public_dns }}:{{ $d.public_connect_port }}
-{{- end -}}
-
-{{- if and $d.address_type $d.address -}}
-, the service address is {{ $d.address_type }}{{ $d.address }}
-{{- end -}}
-
-{{- if $d.ips -}}
-, the IP address is {{ $d.ips }}
-{{- end -}}
-
-{{- if and $d.guest_ip_start $d.guest_ip_end -}}
-, the IP range is {{ $d.guest_ip_start }}-{{ $d.guest_ip_end }}
-{{- end -}}
-
-{{- if $d.ip_addr -}}
-, the IP address is {{ $d.ip_addr }}
-{{- end -}}
-
-{{- if $d.account -}}
-, the initial account is {{ $d.account }}
-{{- end -}}
-
-{{- if $d.password -}}
-, the initial password is {{ $d.password }}
-{{- end -}}
-
-{{- if $d.keypair -}}
-, the access ssh key is {{ $d.keypair }}
-{{- end -}}
-
-{{- if $d.common_name -}}
-, the certificate domain name is {{ $d.common_name }}
-{{- end -}}
-
-{{- if $d.not_after -}}
-, the expiration is {{ $d.not_after }}
-{{- end -}}
-
-{{- if eq .resource_type "server" -}}
-, and please use {{ if $d.windows -}} Remote Desktop Connector (RDC) {{ else -}} SSH {{ end -}} or the control panel console to access the VM.
-{{- end -}}
-
-{{- if has .resource_type $consoleServiceType -}}
-. For more information, please go to the console to view
-{{- end -}}

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

@@ -1,2 +0,0 @@
-{{- $d := .resource_details -}}
-Your {{ if $d.brand -}} {{ $d.brand }} {{ end -}} {{ .resource_type }} {{ $d.name }} {{ if $d.project -}} in project {{ $d.project }} {{ end -}} will expire and be released in {{ .advance_days }} days. If you need to renew, please go to the console as soon as possible

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

@@ -1,2 +0,0 @@
-{{- $d := .resource_details -}}
-The {{ $d.trigger_type_display }} type scaling policy {{ $d.name }} in the scaling group {{ $d.scaling_group }} of the {{ $d.project }} project satisfies the trigger conditions, and {{ $d.action_display }} {{ $d.number }}{{ $d.unit_display }} instances successfully

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

@@ -1,2 +0,0 @@
-{{- $d := .resource_details -}}
-The scheduled task in {{ $d.project }} successfully {{ $d.operation_display }} the {{ $d.resource_type_display }} {{ $d.resource_name }}

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

@@ -1,2 +0,0 @@
-{{- $d := .resource_details -}}
-The snapshot policy {{ $d.name }} in the {{ $d.project }} project successfully creates a snapshot for the disk {{ $d.disk }}

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

@@ -1,10 +0,0 @@
-{{- $d := .resource_details -}}
-Your {{ if $d.brand -}} {{ $d.brand }} {{ end -}} {{ .resource_type }} {{ $d.name }} {{ if $d.project -}} in project {{ $d.project }} {{ end -}} has been {{ .action_display }} successfully
-{{- if $d.account -}}
-, the acount is {{ $d.account }}
-{{- end -}}
-
-{{- if $d.password -}}
-, the password is {{ $d.password }}
-{{- end -}}
-, and please go to the console to view more information

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

@@ -1,5 +0,0 @@
-{{- $d := .resource_details -}}
-{{- if $d.project -}}
-{{ $d.project }}项目的
-{{- end -}}
-{{ .resource_type_display }}{{ $d.name }}{{ .action_display }}成功

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

@@ -1,5 +0,0 @@
-{{- $d := .resource_details -}}
-{{- if $d.project -}}
-{{ $d.project }}项目的
-{{- end -}}
-{{ .resource_type_display }}{{ $d.name }}创建成功

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

@@ -1,3 +0,0 @@
-{{- $d := .resource_details -}}
-{{ $d.project }}项目的
-{{ .resource_type_display }}{{ $d.name }}到期前{{ .advance_days }}天通知

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

@@ -1,2 +0,0 @@
-{{- $d := .resource_details -}}
-{{ $d.project }}项目的弹性伸缩组{{ $d.scaling_group }}中的伸缩策略{{ $d.name }}满足触发

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

@@ -1,2 +0,0 @@
-{{- $d := .resource_details -}}
-The scheduled task in {{ $d.project }} successfully {{ $d.operation_display }} the {{ $d.resource_type_display }} {{ $d.resource_name }}

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

@@ -1,2 +0,0 @@
-{{- $d := .resource_details -}}
-{{ $d.project }}项目的自动快照策略{{ $d.name }}生效

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

@@ -1,3 +0,0 @@
-{{- $d := .resource_details -}}
-{{ $d.project }}项目的
-{{ .resource_type_display }}{{ $d.name }}{{ .action_display }}成功

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

@@ -1,2 +0,0 @@
-{{- $d := .resource_details -}}
-The {{ .resource_type_display }} {{ .Name }} {{ if $d.project }} in poject {{ $d.project }} {{ end -}} {{ .action_display }} successfully

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

@@ -1,3 +0,0 @@
-{{- $d := .resource_details -}}
-The {{ .resource_type_display }} {{ $d.name }} {{ if $d.project }} in poject {{ $d.project }} {{ end -}} created successfully
-

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

@@ -1,2 +0,0 @@
-{{- $d := .resource_details -}}
-{{ .advance_days }} days notice before {{ .resource_type }} {{ $d.name }} {{ if $d.project -}} in project {{ $d.project }} {{ end -}} expiration

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

@@ -1,2 +0,0 @@
-{{- $d := .resource_details -}}
-The scaling policy {{ $d.name }} in the scaling group {{ $d.scaling_group }} triggered

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

@@ -1,2 +0,0 @@
-{{- $d := .resource_details -}}
-The scheduled task in {{ $d.project }} execute successfully

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

@@ -1,2 +0,0 @@
-{{- $d := .resource_details -}}
-The snapshot policy {{ $d.name }} in the {{ $d.project }} project executed

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

@@ -1,2 +0,0 @@
-{{- $d := .resource_details -}}
-The {{ .resource_type }} {{ $d.name }} {{ if $d.project -}} in project {{ $d.project }} {{ end -}} {{ .action_display }} successfully

build/notify/root/opt/yunion/share/template/content@cn/USER_LOGIN_EXCEPTION

@@ -1,5 +0,0 @@
-{{- if .admin -}}
-{{ .domain }}域下的账号{{ .user }}由于异常登录已被锁定，请您核实用户使用情况。如果需要为用户解锁，请到用户列表启用该用户。
-{{- else -}}
-您的账号{{ .user }}由于异常登录已被锁定，请联系管理员解锁账号。
-{{- end -}}

build/notify/root/opt/yunion/share/template/content@cn/VERIFY.email

@@ -6,12 +6,12 @@
 </head>
 <body>
   <table style="width: 650px; margin-bottom: 20px;" border="0" cellpadding="0" cellspacing="0" align="center">
-  	<tr style="height: 50px; background: #C2DEF2; overflow: hidden;">
+  	<tr style="height: 50px; background: #333; overflow: hidden;">
   		<td>
   			<table style="margin-left: 20px;">
   				<tr>
   					<td>
-                        <img src="data:{{.login_logo_format}};base64,{{.login_logo}}" alt="{{.name}}" style="color: #333; height: 32px; vertical-align: middle;">
+  						<img src="data:{{.login_logo_format}};base64,{{.login_logo}}" alt="" style="color: #fff; height: 32px; vertical-align: middle;">
   					</td>
   				</tr>
   			</table>
@@ -43,7 +43,7 @@
   			<table style="padding: 20px 10px; width: 100%;">
 	  			<tr>
 	  				<td style="padding-bottom: 20px;">
-                        尊敬的{{.receiver_name}}，您好：
+                        尊敬的{{.name}}，您好：
 	  				</td>
 	  			</tr>
 	  			<tr>
@@ -53,10 +53,10 @@
   		</td>
   	</tr>
   	<tr style="width: 96%;">
-        <td colspan="2" style="border-top: 1px dashed #ccc; color: #333; font-size: 12px; padding-bottom: 10px; font-weight: 100; text-align: center">如非本人操作，请及时登录平台并修改密码以保证账户的安全</td>
+        <td colspan="2" style="border-top: 1px dashed #ccc; color: #333; font-size: 12px; padding-bottom: 10px; font-weight: 100;">如非本人操作，请及时登录平台并修改密码以保证账户的安全</td>
 	</tr>
 	<tr>
-		<td colspan="2" style="background: #C2DEF2; text-align: right; padding-right: 20px; font-size: 12px; color: #333; height: 50px;">版权所有 © {{.copyright}} 保留一切权利</td>
+		<td colspan="2" style="background: #333; text-align: right; padding-right: 20px; font-size: 12px; color: #fff; height: 50px;">版权所有 © {{.copyright}} 保留一切权利</td>
 	</tr>
   </table>
 </body>

build/notify/root/opt/yunion/share/template/content@en/USER_LOGIN_EXCEPTION

@@ -1,5 +0,0 @@
-{{- if .admin -}}
-The account {{ .user }} in domain {{ .domain }} has been locked due to abnormal login. Please verify the situation and, if you need to unlock this account, enable it in the user list.
-{{- else -}}
-The account {{ .user }} has been locked due to abnormal login. Please contact the administrator to unlock your account.
-{{- end -}}

build/notify/root/opt/yunion/share/template/content@en/VERIFY.email

@@ -6,12 +6,12 @@
 </head>
 <body>
   <table style="width: 650px; margin-bottom: 20px;" border="0" cellpadding="0" cellspacing="0" align="center">
-  	<tr style="height: 50px; background: #C2DEF2; overflow: hidden;">
+  	<tr style="height: 50px; background: #333; overflow: hidden;">
   		<td>
   			<table style="margin-left: 20px;">
   				<tr>
   					<td>
-                        <img src="data:{{.login_logo_format}};base64,{{.login_logo}}" alt="{{.name}}" style="color: #333; height: 32px; vertical-align: middle;">
+  						<img src="data:{{.login_logo_format}};base64,{{.login_logo}}" alt="" style="color: #fff; height: 32px; vertical-align: middle;">
   					</td>
   				</tr>
   			</table>
@@ -43,7 +43,7 @@
   			<table style="padding: 20px 10px; width: 100%;">
 	  			<tr>
 	  				<td style="padding-bottom: 13px;">
-                        Dear {{.receiver_name}}：
+                        Dear {{.name}}：
 	  				</td>
 	  			</tr>
 	  			<tr>
@@ -56,10 +56,10 @@
   		</td>
   	</tr>
   	<tr style="width: 96%;">
-        <td colspan="2" style="border-top: 1px dashed #ccc; color: #333; font-size: 12px; padding-bottom: 10px; font-weight: 100; padding-left: 10px;">If you are not operating by yourself, please log in to the platform in time and change your password to ensure the security of your account.</td>
+        <td colspan="2" style="border-top: 1px dashed #ccc; color: #333; font-size: 12px; padding-bottom: 10px; font-weight: 100;">If you are not operating by yourself, please log in to the platform in time and change your password to ensure the security of your account.</td>
 	</tr>
 	<tr>
-		<td colspan="2" style="background: #C2DEF2; text-align: right; padding-right: 20px; font-size: 12px; color: #333; height: 50px;">Copyrights © {{.copyright}}. All rights reserved.</td>
+		<td colspan="2" style="background: #333; text-align: right; padding-right: 20px; font-size: 12px; color: #fff; height: 50px;">Copyrights © {{.copyright}}. All rights reserved.</td>
 	</tr>
   </table>
 </body>

build/notify/root/opt/yunion/share/template/title@cn/USER_LOGIN_EXCEPTION

@@ -1 +0,0 @@
-异常登录

build/notify/root/opt/yunion/share/template/title@en/USER_LOGIN_EXCEPTION

@@ -1 +0,0 @@
-Abnormal Login

cmd/ansibleserver/main.go

@@ -15,14 +15,9 @@
 package main
 
 import (
-	"context"
-
 	"yunion.io/x/onecloud/pkg/ansibleserver/service"
-	"yunion.io/x/onecloud/pkg/util/procutils"
 )
 
 func main() {
-	go procutils.WaitZombieLoop(context.TODO())
-
 	service.StartService()
 }

cmd/awscli/main.go

@@ -18,7 +18,6 @@ import (
 	"fmt"
 	"os"
 
-	"yunion.io/x/pkg/errors"
 	"yunion.io/x/structarg"
 
 	"yunion.io/x/onecloud/pkg/multicloud/aws"
@@ -33,7 +32,6 @@ type BaseOptions struct {
 	AccessKey  string `help:"Access key" default:"$AWS_ACCESS_KEY" metavar:"AWS_ACCESS_KEY"`
 	Secret     string `help:"Secret" default:"$AWS_SECRET" metavar:"AWS_SECRET"`
 	RegionId   string `help:"RegionId" default:"$AWS_REGION" metavar:"AWS_REGION"`
-	AccountId  string `help:"Subaccount ID" default:"$AWS_ACCOUNT_ID" metavar:"AWS_ACCOUNT_ID"`
 	SUBCOMMAND string `help:"awscli subcommand" subcommand:"true"`
 }
 
@@ -92,16 +90,15 @@ func newClient(options *BaseOptions) (*aws.SRegion, error) {
 			options.AccessUrl,
 			options.AccessKey,
 			options.Secret,
-			options.AccountId,
 		).Debug(options.Debug),
 	)
 	if err != nil {
 		return nil, err
 	}
 
-	region, err := cli.GetRegion(options.RegionId)
-	if err != nil {
-		return nil, errors.Wrapf(err, "GetRegion(%s)", options.RegionId)
+	region := cli.GetRegion(options.RegionId)
+	if region == nil {
+		return nil, fmt.Errorf("No such region %s", options.RegionId)
 	}
 
 	return region, nil

cmd/baremetal-agent/main.go

@@ -15,17 +15,12 @@
 package main
 
 import (
-	"context"
-
 	"yunion.io/x/onecloud/pkg/baremetal/service"
 	"yunion.io/x/onecloud/pkg/util/atexit"
-	"yunion.io/x/onecloud/pkg/util/procutils"
 )
 
 func main() {
 	defer atexit.Handle()
 
-	go procutils.WaitZombieLoop(context.TODO())
-
 	service.New().StartService()
 }

cmd/climc/main.go

@@ -21,9 +21,7 @@ import (
 	_ "yunion.io/x/onecloud/cmd/climc/shell/cloudevent"
 	_ "yunion.io/x/onecloud/cmd/climc/shell/cloudid"
 	_ "yunion.io/x/onecloud/cmd/climc/shell/cloudnet"
-	_ "yunion.io/x/onecloud/cmd/climc/shell/cloudproxy"
 	_ "yunion.io/x/onecloud/cmd/climc/shell/compute"
-	_ "yunion.io/x/onecloud/cmd/climc/shell/devtool"
 	_ "yunion.io/x/onecloud/cmd/climc/shell/etcd"
 	_ "yunion.io/x/onecloud/cmd/climc/shell/events"
 	_ "yunion.io/x/onecloud/cmd/climc/shell/identity"

cmd/climc/shell/ansible/ansibleplaybook_reference.go

@@ -1,34 +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 ansible
-
-import (
-	"yunion.io/x/onecloud/cmd/climc/shell"
-	"yunion.io/x/onecloud/pkg/mcclient/modules"
-	options "yunion.io/x/onecloud/pkg/mcclient/options/ansible"
-)
-
-func init() {
-	cmd := shell.NewResourceCmd(&modules.AnsiblePlaybookReference).WithKeyword("ansibleplaybook-reference")
-	cmd.List(new(options.APRListOptions))
-	cmd.Show(new(options.APROptions))
-	cmd.Perform("run", new(options.APRRunOptions))
-	cmd.Perform("stop", new(options.APRStopOptions))
-
-	cmd1 := shell.NewResourceCmd(&modules.AnsiblePlaybookInstance).WithKeyword("ansibleplaybook-instance")
-	cmd1.List(new(options.APIListOptions))
-	cmd1.Show(new(options.APIOptions))
-	cmd1.Perform("run", new(options.APIOptions))
-}

cmd/climc/shell/ansible/devtoolcronjob.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package devtool
+package ansible
 
 import (
 	"fmt"

cmd/climc/shell/ansible/devtooltemplate.go

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

cmd/climc/shell/cloudevent/cloudevents.go

@@ -40,18 +40,4 @@ func init() {
 		printList(result, modules.Cloudevents.GetColumns(s))
 		return nil
 	})
-
-	type CloudeventLogsPurgeOptions struct {
-	}
-	R(&CloudeventLogsPurgeOptions{}, "cloud-event-purge", "Purge obsolete cloud event logs", func(s *mcclient.ClientSession, opts *CloudeventLogsPurgeOptions) error {
-		_, err := modules.Cloudevents.PerformClassAction(s, "purge-splitable", nil)
-		if err != nil {
-			return err
-		}
-		_, err = modules.CloudeventLogs.PerformClassAction(s, "purge-splitable", nil)
-		if err != nil {
-			return err
-		}
-		return nil
-	})
 }

cmd/climc/shell/cloudproxy/forwards.go

@@ -1,33 +0,0 @@
-// Copyright 2019 Yunion
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package cloudproxy
-
-import (
-	"yunion.io/x/onecloud/cmd/climc/shell"
-	modules "yunion.io/x/onecloud/pkg/mcclient/modules/cloudproxy"
-	options "yunion.io/x/onecloud/pkg/mcclient/options/cloudproxy"
-)
-
-func init() {
-	cmd := shell.NewResourceCmd(&modules.Forwards)
-	cmd = cmd.WithKeyword("proxy-forward")
-	cmd.Create(&options.ForwardCreateOptions{})
-	cmd.PerformClass("create-from-server", &options.ForwardCreateFromServerOptions{})
-	cmd.Perform("heartbeat", &options.ForwardHeartbeatOptions{})
-	cmd.Update(&options.ForwardUpdateOptions{})
-	cmd.List(&options.ForwardListOptions{})
-	cmd.Show(&options.ForwardShowOptions{})
-	cmd.Delete(&options.ForwardDeleteOptions{})
-}

cmd/climc/shell/cloudproxy/proxy_agents.go

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

cmd/climc/shell/cloudproxy/proxy_endpoints.go

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

cmd/climc/shell/cloudproxy/proxy_matches.go

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

cmd/climc/shell/compute/access_group_caches.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 compute
-
-import (
-	"yunion.io/x/onecloud/cmd/climc/shell"
-	"yunion.io/x/onecloud/pkg/mcclient/modules"
-	"yunion.io/x/onecloud/pkg/mcclient/options/compute"
-)
-
-func init() {
-	cmd := shell.NewResourceCmd(&modules.AccessGroupCaches).WithKeyword("access-group-cache")
-	cmd.List(&compute.AccessGroupCacheListOptions{})
-}

cmd/climc/shell/compute/access_group_rules.go

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

cmd/climc/shell/compute/access_groups.go

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

cmd/climc/shell/compute/cloudaccounts.go

@@ -37,7 +37,6 @@ func init() {
 	cmd.CreateWithKeyword("create-aws", &options.SAWSCloudAccountCreateOptions{})
 	cmd.CreateWithKeyword("create-openstack", &options.SOpenStackCloudAccountCreateOptions{})
 	cmd.CreateWithKeyword("create-huawei", &options.SHuaweiCloudAccountCreateOptions{})
-	cmd.CreateWithKeyword("create-hcso", &options.SHCSOAccountCreateOptions{})
 	cmd.CreateWithKeyword("create-ucloud", &options.SUcloudCloudAccountCreateOptions{})
 	cmd.CreateWithKeyword("create-zstack", &options.SZStackCloudAccountCreateOptions{})
 	cmd.CreateWithKeyword("create-s3", &options.SS3CloudAccountCreateOptions{})
@@ -45,7 +44,6 @@ func init() {
 	cmd.CreateWithKeyword("create-xsky", &options.SXskyCloudAccountCreateOptions{})
 	cmd.CreateWithKeyword("create-ctyun", &options.SCtyunCloudAccountCreateOptions{})
 	cmd.CreateWithKeyword("create-apsara", &options.SApsaraCloudAccountCreateOptions{})
-	cmd.CreateWithKeyword("create-ecloud", &options.SEcloudCloudAccountCreateOptions{})
 
 	cmd.UpdateWithKeyword("update-vmware", &options.SVMwareCloudAccountUpdateOptions{})
 	cmd.UpdateWithKeyword("update-aliyun", &options.SAliyunCloudAccountUpdateOptions{})
@@ -55,7 +53,6 @@ func init() {
 	cmd.UpdateWithKeyword("update-aws", &options.SAWSCloudAccountUpdateOptions{})
 	cmd.UpdateWithKeyword("update-openstack", &options.SOpenStackCloudAccountUpdateOptions{})
 	cmd.UpdateWithKeyword("update-huawei", &options.SHuaweiCloudAccountUpdateOptions{})
-	cmd.UpdateWithKeyword("update-hcso", &options.SHCSOAccountUpdateOptions{})
 	cmd.UpdateWithKeyword("update-ucloud", &options.SUcloudCloudAccountUpdateOptions{})
 	cmd.UpdateWithKeyword("update-zstack", &options.SZStackCloudAccountUpdateOptions{})
 	cmd.UpdateWithKeyword("update-s3", &options.SS3CloudAccountUpdateOptions{})
@@ -71,7 +68,6 @@ func init() {
 	cmd.PerformWithKeyword("update-credential-aws", "update-credential", &options.SAWSCloudAccountUpdateCredentialOptions{})
 	cmd.PerformWithKeyword("update-credential-openstack", "update-credential", &options.SOpenStackCloudAccountUpdateCredentialOptions{})
 	cmd.PerformWithKeyword("update-credential-huawei", "update-credential", &options.SHuaweiCloudAccountUpdateCredentialOptions{})
-	cmd.PerformWithKeyword("update-credential-hcso", "update-credential", &options.SHCSOAccountUpdateCredentialOptions{})
 	cmd.PerformWithKeyword("update-credential-ucloud", "update-credential", &options.SUcloudCloudAccountUpdateCredentialOptions{})
 	cmd.PerformWithKeyword("update-credential-zstack", "update-credential", &options.SZStackCloudAccountUpdateCredentialOptions{})
 	cmd.PerformWithKeyword("update-credential-s3", "update-credential", &options.SS3CloudAccountUpdateCredentialOptions{})
@@ -102,7 +98,6 @@ func init() {
 	cmd.Perform("change-owner", &options.ClouaccountChangeOwnerOptions{})
 	cmd.Perform("change-project", &options.ClouaccountChangeProjectOptions{})
 	cmd.Perform("create-subscription", &options.SubscriptionCreateOptions{})
-	cmd.Perform("project-mapping", &options.ClouaccountProjectMappingOptions{})
 
 	cmd.Get("change-owner-candidate-domains", &options.SCloudAccountIdOptions{})
 	cmd.Get("enrollment-accounts", &options.SCloudAccountIdOptions{})

cmd/climc/shell/compute/cloudproviders.go

@@ -18,38 +18,251 @@ import (
 	"fmt"
 
 	"yunion.io/x/jsonutils"
-	"yunion.io/x/log"
 
-	"yunion.io/x/onecloud/cmd/climc/shell"
+	"yunion.io/x/onecloud/pkg/mcclient"
 	"yunion.io/x/onecloud/pkg/mcclient/modules"
 	"yunion.io/x/onecloud/pkg/mcclient/options"
-	"yunion.io/x/onecloud/pkg/mcclient/options/compute"
 )
 
 func init() {
-	cmd := shell.NewResourceCmd(&modules.Cloudproviders).WithKeyword("cloud-provider")
-	cmd.List(&compute.CloudproviderListOptions{})
-	cmd.Update(&compute.CloudproviderUpdateOptions{})
-	cmd.Show(&options.BaseIdOptions{})
-	cmd.Delete(&options.BaseIdOptions{})
-	cmd.Perform("change-project", &compute.CloudproviderChangeProjectOptions{})
-	cmd.Perform("enable", &options.BaseIdOptions{})
-	cmd.Perform("disable", &options.BaseIdOptions{})
-	cmd.Perform("sync", &compute.CloudproviderSyncOptions{})
-	cmd.Perform("project-mapping", &compute.ClouproviderProjectMappingOptions{})
 
-	cmd.GetWithCustomShow("clirc", func(result jsonutils.JSONObject) {
-		rc := make(map[string]string)
-		err := result.Unmarshal(&rc)
+	type CloudproviderListOptions struct {
+		options.BaseListOptions
+
+		Usable bool `help:"Vpc & Network usable"`
+
+		HasObjectStorage bool     `help:"filter cloudproviders that has object storage"`
+		NoObjectStorage  bool     `help:"filter cloudproviders that has no object storage"`
+		Capability       []string `help:"capability filter" choices:"project|compute|network|loadbalancer|objectstore|rds|cache|event"`
+		Cloudregion      string   `help:"filter cloudproviders by cloudregion"`
+
+		HostSchedtagId string `help:"filter by host schedtag"`
+	}
+	R(&CloudproviderListOptions{}, "cloud-provider-list", "List cloud providers", func(s *mcclient.ClientSession, args *CloudproviderListOptions) error {
+		var params *jsonutils.JSONDict
+		{
+			var err error
+			params, err = args.BaseListOptions.Params()
+			if err != nil {
+				return err
+			}
+
+			if args.Usable {
+				params.Add(jsonutils.NewBool(true), "usable")
+			}
+
+			if args.HasObjectStorage {
+				params.Add(jsonutils.JSONTrue, "has_object_storage")
+			} else if args.NoObjectStorage {
+				params.Add(jsonutils.JSONFalse, "has_object_storage")
+			}
+
+			if len(args.Capability) > 0 {
+				params.Add(jsonutils.NewStringArray(args.Capability), "capability")
+			}
+
+			if len(args.Cloudregion) > 0 {
+				params.Add(jsonutils.NewString(args.Cloudregion), "cloudregion")
+			}
+
+			if len(args.HostSchedtagId) > 0 {
+				params.Add(jsonutils.NewString(args.HostSchedtagId), "host_schedtag_id")
+			}
+		}
+		result, err := modules.Cloudproviders.List(s, params)
 		if err != nil {
-			log.Errorf("error: %v", err)
-			return
+			return err
+		}
+		printList(result, modules.Cloudproviders.GetColumns(s))
+		return nil
+	})
+
+	type CloudproviderUpdateOptions struct {
+		ID        string `help:"ID or Name of cloud provider"`
+		Name      string `help:"New name to update"`
+		AccessUrl string `help:"New access url"`
+		Desc      string `help:"Description"`
+	}
+	R(&CloudproviderUpdateOptions{}, "cloud-provider-update", "Update a cloud provider", func(s *mcclient.ClientSession, args *CloudproviderUpdateOptions) error {
+		params := jsonutils.NewDict()
+		if len(args.Name) > 0 {
+			params.Add(jsonutils.NewString(args.Name), "name")
+		}
+		if len(args.AccessUrl) > 0 {
+			params.Add(jsonutils.NewString(args.AccessUrl), "access_url")
+		}
+		if len(args.Desc) > 0 {
+			params.Add(jsonutils.NewString(args.Desc), "description")
+		}
+		if params.Size() == 0 {
+			return InvalidUpdateError()
+		}
+		result, err := modules.Cloudproviders.Update(s, args.ID, params)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	type CloudproviderChangeProjectOptions struct {
+		ID     string `help:"ID or Name of cloud provider"`
+		TENANT string `help:"ID or Name of tenant"`
+	}
+	R(&CloudproviderChangeProjectOptions{}, "cloud-provider-change-project", "Change project for provider", func(s *mcclient.ClientSession, args *CloudproviderChangeProjectOptions) error {
+		result, err := modules.Cloudproviders.PerformAction(s, args.ID, "change-project", jsonutils.Marshal(map[string]string{"project": args.TENANT}))
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	type CloudproviderShowOptions struct {
+		ID string `help:"ID or Name of cloud provider"`
+	}
+	R(&CloudproviderShowOptions{}, "cloud-provider-show", "Get details of a cloud provider", func(s *mcclient.ClientSession, args *CloudproviderShowOptions) error {
+		result, err := modules.Cloudproviders.Get(s, args.ID, nil)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	R(&CloudproviderShowOptions{}, "cloud-provider-delete", "Delete a cloud provider", func(s *mcclient.ClientSession, args *CloudproviderShowOptions) error {
+		result, err := modules.Cloudproviders.Delete(s, args.ID, nil)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	R(&CloudproviderShowOptions{}, "cloud-provider-enable", "Enable cloud provider", func(s *mcclient.ClientSession, args *CloudproviderShowOptions) error {
+		result, err := modules.Cloudproviders.PerformAction(s, args.ID, "enable", nil)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	R(&CloudproviderShowOptions{}, "cloud-provider-disable", "Disable cloud provider", func(s *mcclient.ClientSession, args *CloudproviderShowOptions) error {
+		result, err := modules.Cloudproviders.PerformAction(s, args.ID, "disable", nil)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	R(&CloudproviderShowOptions{}, "cloud-provider-balance", "Get balance", func(s *mcclient.ClientSession, args *CloudproviderShowOptions) error {
+		result, err := modules.Cloudproviders.GetSpecific(s, args.ID, "balance", nil)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	type CloudproviderUpdateCredentialOptions struct {
+		ID      string `help:"ID or Name of cloud provider"`
+		ACCOUNT string `help:"new account"`
+		SECRET  string `help:"new secret"`
+	}
+	R(&CloudproviderUpdateCredentialOptions{}, "cloud-provider-update-credential", "Update credential of a cloud provider", func(s *mcclient.ClientSession, args *CloudproviderUpdateCredentialOptions) error {
+		params := jsonutils.NewDict()
+		params.Add(jsonutils.NewString(args.ACCOUNT), "account")
+		params.Add(jsonutils.NewString(args.SECRET), "secret")
+
+		result, err := modules.Cloudproviders.PerformAction(s, args.ID, "update-credential", params)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	type CloudproviderSyncOptions struct {
+		ID          string   `help:"ID or Name of cloud provider"`
+		Force       bool     `help:"Force sync no matter what"`
+		FullSync    bool     `help:"Synchronize everything"`
+		ProjectSync bool     `help:"Auto sync project info"`
+		Region      []string `help:"region to sync"`
+		Zone        []string `help:"region to sync"`
+		Host        []string `help:"region to sync"`
+	}
+	R(&CloudproviderSyncOptions{}, "cloud-provider-sync", "Sync of a cloud provider account", func(s *mcclient.ClientSession, args *CloudproviderSyncOptions) error {
+		params := jsonutils.NewDict()
+		if args.Force {
+			params.Add(jsonutils.JSONTrue, "force")
+		}
+		if args.FullSync {
+			params.Add(jsonutils.JSONTrue, "full_sync")
+		}
+		if args.ProjectSync {
+			params.Add(jsonutils.JSONTrue, "project_sync")
+		}
+		if len(args.Region) > 0 {
+			params.Add(jsonutils.NewStringArray(args.Region), "region")
+		}
+		if len(args.Zone) > 0 {
+			params.Add(jsonutils.NewStringArray(args.Zone), "zone")
+		}
+		if len(args.Host) > 0 {
+			params.Add(jsonutils.NewStringArray(args.Host), "host")
+		}
+		result, err := modules.Cloudproviders.PerformAction(s, args.ID, "sync", params)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	type CloudproviderClientRCOptions struct {
+		ID string `help:"ID or name of cloud provider"`
+	}
+	R(&CloudproviderClientRCOptions{}, "cloud-provider-clirc", "Get client RC file of the cloud provider", func(s *mcclient.ClientSession, args *CloudproviderClientRCOptions) error {
+		result, err := modules.Cloudproviders.GetSpecific(s, args.ID, "clirc", nil)
+		if err != nil {
+			return err
+		}
+		rc := make(map[string]string)
+		err = result.Unmarshal(&rc)
+		if err != nil {
+			return err
 		}
 		for k, v := range rc {
 			fmt.Printf(`export %s="%s"`+"\n", k, v)
 		}
-	}, &options.BaseIdOptions{})
-	cmd.Get("storage-classes", &compute.CloudproviderStorageClassesOptions{})
-	cmd.Get("change-owner-candidate-domains", &options.BaseIdOptions{})
-	cmd.Get("balance", &options.BaseIdOptions{})
+		return nil
+	})
+
+	type CloudproviderStorageClassesOptions struct {
+		ID          string `help:"ID or Name of cloud provider" json:"-"`
+		Cloudregion string `help:"cloud region name or Id"`
+	}
+	R(&CloudproviderStorageClassesOptions{}, "cloud-provider-storage-classes", "Get list of supported storage classes of a cloud provider", func(s *mcclient.ClientSession, args *CloudproviderStorageClassesOptions) error {
+		params, err := options.StructToParams(args)
+		if err != nil {
+			return err
+		}
+		result, err := modules.Cloudproviders.GetSpecific(s, args.ID, "storage-classes", params)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	R(&CloudproviderShowOptions{}, "cloud-provider-change-owner-candidate-domains", "Show candiate domains of a cloud provider  changing owner", func(s *mcclient.ClientSession, args *CloudproviderShowOptions) error {
+		result, err := modules.Cloudproviders.GetSpecific(s, args.ID, "change-owner-candidate-domains", nil)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
 }

cmd/climc/shell/compute/cloudregions.go

@@ -29,7 +29,6 @@ import (
 func init() {
 	cmd := shell.NewResourceCmd(&modules.Cloudregions).WithKeyword("cloud-region")
 	cmd.PerformClass("sync-skus", &options.CloudregionSkuSyncOptions{})
-	cmd.Perform("sync-images", &options.CloudregionIdOptions{})
 
 	R(&options.SkuTaskQueryOptions{}, "cloud-region-sync-task-show", "Show details of skus sync tasks", func(s *mcclient.ClientSession, args *options.SkuTaskQueryOptions) error {
 		params, err := args.Params()
@@ -131,24 +130,6 @@ func init() {
 		return nil
 	})
 
-	R(&CloudregionCityListOptions{}, "cloud-city-servers", "List cities where cloud region resides", func(s *mcclient.ClientSession, args *CloudregionCityListOptions) error {
-		params, err := options.StructToParams(args)
-		if err != nil {
-			return err
-		}
-		results, err := modules.Cloudregions.GetCityServers(s, params)
-		if err != nil {
-			return err
-		}
-		listResult := modulebase.ListResult{}
-		listResult.Data, err = results.GetArray()
-		if err != nil {
-			return err
-		}
-		printList(&listResult, nil)
-		return nil
-	})
-
 	type CloudregionCreateOptions struct {
 		Id          string  `help:"ID of the region"`
 		NAME        string  `help:"Name of the region"`

cmd/climc/shell/compute/elasticips.go

@@ -15,24 +15,265 @@
 package compute
 
 import (
-	"yunion.io/x/onecloud/cmd/climc/shell"
+	"yunion.io/x/jsonutils"
+
+	"yunion.io/x/onecloud/pkg/mcclient"
 	"yunion.io/x/onecloud/pkg/mcclient/modules"
 	"yunion.io/x/onecloud/pkg/mcclient/options"
-	"yunion.io/x/onecloud/pkg/mcclient/options/compute"
 )
 
 func init() {
-	cmd := shell.NewResourceCmd(&modules.Elasticips).WithKeyword("eip")
-	cmd.List(&compute.ElasticipListOptions{})
-	cmd.Create(&compute.EipCreateOptions{})
-	cmd.Delete(&options.BaseIdOptions{})
-	cmd.Update(&compute.EipUpdateOptions{})
-	cmd.Show(&options.BaseShowOptions{})
-	cmd.Perform("purge", &options.BaseIdOptions{})
-	cmd.Perform("associate", &compute.EipAssociateOptions{})
-	cmd.Perform("dissociate", &compute.EipDissociateOptions{})
-	cmd.Perform("sync", &options.BaseIdOptions{})
-	cmd.Perform("syncstatus", &options.BaseIdOptions{})
-	cmd.Perform("change-bandwidth", &options.BaseIdOptions{})
-	cmd.Perform("change-owner", &compute.EipChangeOwnerOptions{})
+	type ElasticipListOptions struct {
+		Region string `help:"List eips in cloudregion"`
+
+		Usable                    *bool  `help:"List all zones that is usable"`
+		UsableEipForAssociateType string `help:"With associate id filter which eip can associate"`
+		UsableEipForAssociateId   string `help:"With associate type filter which eip can associate"`
+
+		options.BaseListOptions
+	}
+	R(&ElasticipListOptions{}, "eip-list", "List elastic IPs", func(s *mcclient.ClientSession, opts *ElasticipListOptions) error {
+		params, err := options.ListStructToParams(opts)
+		if err != nil {
+			return err
+		}
+		results, err := modules.Elasticips.List(s, params)
+		if err != nil {
+			return err
+		}
+		printList(results, modules.Elasticips.GetColumns(s))
+		return nil
+	})
+
+	type EipCreateOptions struct {
+		NAME       string `help:"name of the EIP"`
+		Manager    string `help:"cloud provider"`
+		Region     string `help:"cloud region in which EIP is allocated"`
+		Bandwidth  int    `help:"Bandwidth in Mbps"`
+		IpAddr     string `help:"IP address of the EIP" json:"ip_addr"`
+		Network    string `help:"Network of the EIP"`
+		BgpType    string `help:"BgpType of the EIP" positional:"false"`
+		ChargeType string `help:"bandwidth charge type" choices:"traffic|bandwidth"`
+	}
+	R(&EipCreateOptions{}, "eip-create", "Create an EIP", func(s *mcclient.ClientSession, args *EipCreateOptions) error {
+		params := jsonutils.NewDict()
+		params.Add(jsonutils.NewString(args.NAME), "name")
+		if args.Region != "" {
+			params.Add(jsonutils.NewString(args.Region), "region")
+		}
+		if args.Manager != "" {
+			params.Add(jsonutils.NewString(args.Manager), "manager")
+		}
+		if args.Bandwidth != 0 {
+			params.Add(jsonutils.NewInt(int64(args.Bandwidth)), "bandwidth")
+		}
+
+		if len(args.ChargeType) > 0 {
+			params.Add(jsonutils.NewString(args.ChargeType), "charge_type")
+		}
+
+		if len(args.Network) > 0 {
+			params.Add(jsonutils.NewString(args.Network), "network")
+		}
+		if len(args.BgpType) > 0 {
+			params.Add(jsonutils.NewString(args.BgpType), "bgp_type")
+		}
+
+		if len(args.IpAddr) > 0 {
+			params.Add(jsonutils.NewString(args.IpAddr), "ip_addr")
+		}
+
+		result, err := modules.Elasticips.Create(s, params)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	type EipDeleteOptions struct {
+		ID string `help:"ID or name of EIP"`
+	}
+	R(&EipDeleteOptions{}, "eip-delete", "Delete an EIP", func(s *mcclient.ClientSession, args *EipDeleteOptions) error {
+		result, err := modules.Elasticips.Delete(s, args.ID, nil)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	type EipUpdateOptions struct {
+		ID   string `help:"ID or name of EIP"`
+		Name string `help:"New name of EIP"`
+		Desc string `help:"New description of EIP"`
+
+		EnableAutoDellocate  bool `help:"enable automatically dellocate when dissociate from instance"`
+		DisableAutoDellocate bool `help:"disable automatically dellocate when dissociate from instance"`
+	}
+	R(&EipUpdateOptions{}, "eip-update", "Update EIP properties", func(s *mcclient.ClientSession, args *EipUpdateOptions) error {
+		params := jsonutils.NewDict()
+		if len(args.Name) > 0 {
+			params.Add(jsonutils.NewString(args.Name), "name")
+		}
+		if len(args.Desc) > 0 {
+			params.Add(jsonutils.NewString(args.Desc), "description")
+		}
+		if args.EnableAutoDellocate {
+			params.Add(jsonutils.JSONTrue, "auto_dellocate")
+		} else if args.DisableAutoDellocate {
+			params.Add(jsonutils.JSONFalse, "auto_dellocate")
+		}
+		result, err := modules.Elasticips.Update(s, args.ID, params)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	type EipAssociateOptions struct {
+		ID           string `help:"ID or name of EIP"`
+		INSTANCEID   string `help:"ID of instance the eip associated with"`
+		InstanceType string `default:"server" help:"Instance type that the eip associated with, default is server" choices:"server"`
+	}
+	R(&EipAssociateOptions{}, "eip-associate", "Associate an EIP to an instance", func(s *mcclient.ClientSession, args *EipAssociateOptions) error {
+		params := jsonutils.NewDict()
+		params.Add(jsonutils.NewString(args.InstanceType), "instance_type")
+		params.Add(jsonutils.NewString(args.INSTANCEID), "instance_id")
+		result, err := modules.Elasticips.PerformAction(s, args.ID, "associate", params)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	type EipDissociateOptions struct {
+		ID         string `help:"ID or name of EIP"`
+		AutoDelete bool   `help:"automatically delete the dissociate EIP" json:"auto_delete,omitfalse"`
+	}
+	R(&EipDissociateOptions{}, "eip-dissociate", "Dissociate an EIP from an instance", func(s *mcclient.ClientSession, args *EipDissociateOptions) error {
+		params, err := options.StructToParams(args)
+		if err != nil {
+			return err
+		}
+		result, err := modules.Elasticips.PerformAction(s, args.ID, "dissociate", params)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	type EipSingleOptions struct {
+		ID string `help:"ID or name of EIP"`
+	}
+	R(&EipSingleOptions{}, "eip-sync", "Synchronize status of an EIP", func(s *mcclient.ClientSession, args *EipSingleOptions) error {
+		result, err := modules.Elasticips.PerformAction(s, args.ID, "sync", nil)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	R(&EipSingleOptions{}, "eip-syncstatus", "Synchronize status of an EIP", func(s *mcclient.ClientSession, args *EipSingleOptions) error {
+		result, err := modules.Elasticips.PerformAction(s, args.ID, "syncstatus", nil)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	type ServerCreateEipOptions struct {
+		ID         string `help:"server ID or name"`
+		BW         int    `help:"EIP bandwidth in Mbps"`
+		BgpType    string `help:"desired BGP type"`
+		ChargeType string `help:"bandwidth charge type" choices:"traffic|bandwidth"`
+	}
+	R(&ServerCreateEipOptions{}, "server-create-eip", "allocate an EIP and associate EIP to server", func(s *mcclient.ClientSession, args *ServerCreateEipOptions) error {
+		params := jsonutils.NewDict()
+		params.Add(jsonutils.NewInt(int64(args.BW)), "bandwidth")
+
+		if args.BgpType != "" {
+			params.Add(jsonutils.NewString(args.BgpType), "bgp_type")
+		}
+		if len(args.ChargeType) > 0 {
+			params.Add(jsonutils.NewString(args.ChargeType), "charge_type")
+		}
+
+		result, err := modules.Servers.PerformAction(s, args.ID, "create-eip", params)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	type EipShowOptions struct {
+		ID string `help:"ID or name of EIP"`
+	}
+	R(&EipShowOptions{}, "eip-show", "show details of an EIP", func(s *mcclient.ClientSession, args *EipShowOptions) error {
+		result, err := modules.Elasticips.Get(s, args.ID, nil)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	type EipChangeBandwidthOptions struct {
+		ID string `help:"ID or name of the EIP"`
+		BW int    `help:"new bandwidth of EIP"`
+	}
+	R(&EipChangeBandwidthOptions{}, "eip-change-bandwidth", "Change maximal bandwidth of EIP", func(s *mcclient.ClientSession, args *EipChangeBandwidthOptions) error {
+		params := jsonutils.NewDict()
+		params.Add(jsonutils.NewInt(int64(args.BW)), "bandwidth")
+		result, err := modules.Elasticips.PerformAction(s, args.ID, "change-bandwidth", params)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	type EipPurgeOptions struct {
+		ID string `help:"ID or name of EIP"`
+	}
+	R(&EipPurgeOptions{}, "eip-purge", "Purge EIP db records", func(s *mcclient.ClientSession, args *EipPurgeOptions) error {
+		result, err := modules.Elasticips.PerformAction(s, args.ID, "purge", nil)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	type EipChangeOwnerOptions struct {
+		ID      string `help:"EIP to change owner"`
+		PROJECT string `help:"Project ID or change"`
+		RawId   bool   `help:"User raw ID, instead of name"`
+	}
+	R(&EipChangeOwnerOptions{}, "eip-change-owner", "Change owner porject of a eip", func(s *mcclient.ClientSession, opts *EipChangeOwnerOptions) error {
+		params := jsonutils.NewDict()
+		if opts.RawId {
+			projid, err := modules.Projects.GetId(s, opts.PROJECT, nil)
+			if err != nil {
+				return err
+			}
+			params.Add(jsonutils.NewString(projid), "tenant")
+			params.Add(jsonutils.JSONTrue, "raw_id")
+		} else {
+			params.Add(jsonutils.NewString(opts.PROJECT), "tenant")
+		}
+		srv, err := modules.Elasticips.PerformAction(s, opts.ID, "change-owner", params)
+		if err != nil {
+			return err
+		}
+		printObject(srv)
+		return nil
+	})
+
 }

cmd/climc/shell/compute/filesystem.go

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

cmd/climc/shell/compute/hosts.go

@@ -15,51 +15,162 @@
 package compute
 
 import (
-	"context"
 	"fmt"
 
 	"yunion.io/x/jsonutils"
 	"yunion.io/x/log"
-	"yunion.io/x/pkg/errors"
 
-	"yunion.io/x/onecloud/cmd/climc/shell"
 	"yunion.io/x/onecloud/pkg/mcclient"
 	"yunion.io/x/onecloud/pkg/mcclient/modules"
 	"yunion.io/x/onecloud/pkg/mcclient/options"
-	"yunion.io/x/onecloud/pkg/mcclient/options/compute"
 	"yunion.io/x/onecloud/pkg/util/fileutils2"
-	"yunion.io/x/onecloud/pkg/util/httputils"
 	"yunion.io/x/onecloud/pkg/util/ssh"
 )
 
 func init() {
-	cmd := shell.NewResourceCmd(&modules.Hosts)
-	cmd.List(&compute.HostListOptions{})
-	cmd.Show(&options.BaseShowOptions{})
-	cmd.GetMetadata(&options.BaseIdOptions{})
-	cmd.GetProperty(&compute.HostStatusStatisticsOptions{})
+	type HostListOptions struct {
+		Schedtag  string `help:"List hosts in schedtag"`
+		Zone      string `help:"List hosts in zone"`
+		Region    string `help:"List hosts in region"`
+		Wire      string `help:"List hosts in wire"`
+		Image     string `help:"List hosts cached images" json:"cachedimage"`
+		Storage   string `help:"List hosts attached to storages"`
+		Baremetal string `help:"List hosts that is managed by baremetal system" choices:"true|false"`
+		Empty     bool   `help:"show empty host" json:"-"`
+		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"`
+		AnyMac    string `help:"Mac matches one of the host's interface"`
+		AnyIp     string `help:"IP matches one of the host's interface"`
 
-	cmd.Perform("ping", &options.BaseIdOptions{})
-	cmd.Perform("undo-convert", &options.BaseIdOptions{})
-	cmd.Perform("maintenance", &options.BaseIdOptions{})
-	cmd.Perform("unmaintenance", &options.BaseIdOptions{})
-	cmd.Perform("start", &options.BaseIdOptions{})
-	cmd.Perform("stop", &options.BaseIdOptions{})
-	cmd.Perform("reset", &options.BaseIdOptions{})
-	cmd.BatchDelete(&options.BaseIdsOptions{})
-	cmd.Perform("remove-all-netifs", &options.BaseIdOptions{})
+		IsBaremetal *bool `help:"filter host list by is_baremetal=true|false"`
 
-	cmd.BatchPerform("enable", &options.BaseIdsOptions{})
-	cmd.BatchPerform("disable", &options.BaseIdsOptions{})
-	cmd.BatchPerform("syncstatus", &options.BaseIdsOptions{})
-	cmd.BatchPerform("sync-config", &options.BaseIdsOptions{})
-	cmd.BatchPerform("prepare", &options.BaseIdsOptions{})
-	cmd.BatchPerform("ipmi-probe", &options.BaseIdsOptions{})
+		ResourceType string `help:"Resource type" choices:"shared|prepaid|dedicated"`
 
-	cmd.Get("ipmi", &options.BaseIdOptions{})
-	cmd.Get("vnc", &options.BaseIdOptions{})
+		Usable *bool `help:"List all zones that is usable"`
 
-	R(&options.BaseIdOptions{}, "host-logininfo", "Get SSH login information of a host", func(s *mcclient.ClientSession, args *options.BaseIdOptions) error {
+		Hypervisor string `help:"filter hosts by hypervisor"`
+
+		StorageNotAttached bool `help:"List hosts not attach specified storage"`
+
+		Uuid string `help:"find host with given system uuid"`
+
+		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 {
+		params, err := options.ListStructToParams(opts)
+		if err != nil {
+			return err
+		}
+
+		if opts.Empty {
+			params.Add(jsonutils.JSONTrue, "is_empty")
+		} else if opts.Occupied {
+			params.Add(jsonutils.JSONFalse, "is_empty")
+		}
+		if opts.Enabled {
+			params.Add(jsonutils.NewInt(1), "enabled")
+		} else if opts.Disabled {
+			params.Add(jsonutils.NewInt(0), "enabled")
+		}
+		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
+		}
+		printList(result, modules.Hosts.GetColumns(s))
+		return nil
+	})
+
+	type HostDetailOptions struct {
+		ID string `help:"ID or name of host"`
+	}
+	R(&HostDetailOptions{}, "host-show", "Show details of a host", func(s *mcclient.ClientSession, args *HostDetailOptions) error {
+		result, err := modules.Hosts.Get(s, args.ID, nil)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	R(&HostDetailOptions{}, "host-ping", "Ping a host", func(s *mcclient.ClientSession, args *HostDetailOptions) error {
+		result, err := modules.Hosts.PerformAction(s, args.ID, "ping", nil)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	R(&HostDetailOptions{}, "host-metadata", "Show metadata of a host", func(s *mcclient.ClientSession, args *HostDetailOptions) error {
+		result, err := modules.Hosts.GetMetadata(s, args.ID, nil)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	type HostOpsOptions struct {
+		ID []string `help:"ID or name of hosts"`
+	}
+	R(&HostOpsOptions{}, "host-enable", "Enable a host", func(s *mcclient.ClientSession, args *HostOpsOptions) error {
+		results := modules.Hosts.BatchPerformAction(s, args.ID, "enable", nil)
+		printBatchResults(results, modules.Hosts.GetColumns(s))
+		return nil
+	})
+
+	R(&HostOpsOptions{}, "host-disable", "Disable a host", func(s *mcclient.ClientSession, args *HostOpsOptions) error {
+		results := modules.Hosts.BatchPerformAction(s, args.ID, "disable", nil)
+		printBatchResults(results, modules.Hosts.GetColumns(s))
+		return nil
+	})
+
+	R(&HostOpsOptions{}, "host-syncstatus", "Synchronize status of a host", func(s *mcclient.ClientSession, args *HostOpsOptions) error {
+		results := modules.Hosts.BatchPerformAction(s, args.ID, "syncstatus", nil)
+		printBatchResults(results, modules.Hosts.GetColumns(s))
+		return nil
+	})
+
+	R(&HostOpsOptions{}, "host-sync-config", "Synchronize config of a host", func(s *mcclient.ClientSession, args *HostOpsOptions) error {
+		results := modules.Hosts.BatchPerformAction(s, args.ID, "sync-config", nil)
+		printBatchResults(results, modules.Hosts.GetColumns(s))
+		return nil
+	})
+
+	R(&HostOpsOptions{}, "host-prepare", "Prepare a host for installation", func(s *mcclient.ClientSession, args *HostOpsOptions) error {
+		results := modules.Hosts.BatchPerformAction(s, args.ID, "prepare", nil)
+		printBatchResults(results, modules.Hosts.GetColumns(s))
+		return nil
+	})
+
+	R(&HostOpsOptions{}, "host-ipmi-probe", "Do ipmi probe host", func(s *mcclient.ClientSession, args *HostOpsOptions) error {
+		results := modules.Hosts.BatchPerformAction(s, args.ID, "ipmi-probe", nil)
+		printBatchResults(results, modules.Hosts.GetColumns(s))
+		return nil
+	})
+
+	R(&HostDetailOptions{}, "host-ipmi", "Get IPMI information of a host", func(s *mcclient.ClientSession, args *HostDetailOptions) error {
+		result, err := modules.Hosts.GetSpecific(s, args.ID, "ipmi", nil)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	R(&HostDetailOptions{}, "host-logininfo", "Get SSH login information of a host", func(s *mcclient.ClientSession, args *HostDetailOptions) error {
 		srvid, e := modules.Hosts.GetId(s, args.ID, nil)
 		if e != nil {
 			return e
@@ -72,6 +183,15 @@ func init() {
 		return nil
 	})
 
+	R(&HostDetailOptions{}, "host-vnc", "Get VNC information of a host", func(s *mcclient.ClientSession, args *HostDetailOptions) error {
+		result, err := modules.Hosts.GetSpecific(s, args.ID, "vnc", nil)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
 	type HostPropertyOptions struct {
 	}
 
@@ -84,7 +204,7 @@ func init() {
 		return nil
 	})
 
-	R(&compute.HostListOptions{}, "host-node-count", "Get host node count", func(s *mcclient.ClientSession, opts *compute.HostListOptions) error {
+	R(&HostListOptions{}, "host-node-count", "Get host node count", func(s *mcclient.ClientSession, opts *HostListOptions) error {
 		params, err := options.ListStructToParams(opts)
 		if err != nil {
 			return err
@@ -226,6 +346,67 @@ func init() {
 		printObject(result)
 		return nil
 	})
+
+	R(&HostDetailOptions{}, "host-undo-convert", "Undo converting a host to hypervisor", func(s *mcclient.ClientSession, args *HostDetailOptions) error {
+		result, err := modules.Hosts.PerformAction(s, args.ID, "undo-convert", nil)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	R(&HostDetailOptions{}, "host-maintenance", "Reboot host into PXE offline OS, do maintenance jobs", func(s *mcclient.ClientSession, args *HostDetailOptions) error {
+		result, err := modules.Hosts.PerformAction(s, args.ID, "maintenance", nil)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	R(&HostDetailOptions{}, "host-unmaintenance", "Reboot host back into disk installed OS", func(s *mcclient.ClientSession, args *HostDetailOptions) error {
+		result, err := modules.Hosts.PerformAction(s, args.ID, "unmaintenance", nil)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	R(&HostDetailOptions{}, "host-start", "Power on host", func(s *mcclient.ClientSession, args *HostDetailOptions) error {
+		result, err := modules.Hosts.PerformAction(s, args.ID, "start", nil)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	R(&HostDetailOptions{}, "host-stop", "Power off host", func(s *mcclient.ClientSession, args *HostDetailOptions) error {
+		result, err := modules.Hosts.PerformAction(s, args.ID, "stop", nil)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	R(&HostDetailOptions{}, "host-reset", "Power reset host", func(s *mcclient.ClientSession, args *HostDetailOptions) error {
+		result, err := modules.Hosts.PerformAction(s, args.ID, "reset", nil)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	R(&HostOpsOptions{}, "host-delete", "Delete host record", func(s *mcclient.ClientSession, args *HostOpsOptions) error {
+		results := modules.Hosts.BatchDelete(s, args.ID, nil)
+		printBatchResults(results, modules.Hosts.GetColumns(s))
+		return nil
+	})
+
 	type HostAddNetIfOptions struct {
 		ID        string `help:"ID or Name of host"`
 		WIRE      string `help:"ID or Name of wire to attach"`
@@ -323,6 +504,15 @@ func init() {
 		return nil
 	})
 
+	R(&HostDetailOptions{}, "host-remove-all-netifs", "Remvoe all netifs expect admin&ipmi netifs", func(s *mcclient.ClientSession, args *HostDetailOptions) error {
+		result, err := modules.Hosts.PerformAction(s, args.ID, "remove-all-netifs", nil)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
 	type HostCacheImageActionOptions struct {
 		ID     string `help:"ID or name of host"`
 		IMAGE  string `help:"ID or name of image"`
@@ -526,36 +716,9 @@ func init() {
 			return e
 		}
 		i, e := modules.Hosts.GetLoginInfo(s, srvid, nil)
-		privateKey := ""
 		if e != nil {
-			if httputils.ErrorCode(e) == 404 {
-				var err error
-				privateKey, err = modules.Sshkeypairs.FetchPrivateKeyBySession(context.Background(), s)
-				if err != nil {
-					return errors.Wrap(err, "fetch private key")
-				}
-				params := jsonutils.NewDict()
-				params.Add(jsonutils.NewString(string(args.ID)), "ID")
-				ret, err := modules.Hosts.Get(s, args.ID, params)
-				if err != nil {
-					return errors.Wrap(err, "get host by ID")
-				}
-				ip, err := ret.GetString("access_ip")
-				if err != nil {
-					return errors.Wrap(err, "get the ip of the host")
-				}
-
-				jsonItem := jsonutils.NewDict()
-				jsonItem.Add(jsonutils.NewString(ip), "ip")
-				jsonItem.Add(jsonutils.NewString("root"), "username")
-				jsonItem.Add(jsonutils.NewString(""), "password")
-				jsonItem.Add(jsonutils.NewInt(22), "port")
-				i = jsonItem
-			} else {
-				return e
-			}
+			return e
 		}
-
 		host, err := i.GetString("ip")
 		if err != nil {
 			return err
@@ -572,7 +735,7 @@ func init() {
 		if args.Port != 22 {
 			port = args.Port
 		}
-		sshCli, err := ssh.NewClient(host, port, user, passwd, privateKey)
+		sshCli, err := ssh.NewClient(host, port, user, passwd, "")
 		if err != nil {
 			return err
 		}

cmd/climc/shell/compute/mount_targets.go

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