Merge pull request #11290 from ioito/automated-cherry-pick-of-#11289-upstream-release-3.7

Automated cherry pick of #11289: fix(host): avoid panic when params is nil

.circleci/config.yml

@@ -5,10 +5,10 @@ version: 2
 jobs:
   check:
     docker:
-      - image: yunionio/centos-build:1.0-1
+      - image: yunionio/centos-build:1.1-4
         environment:
           ONECLOUD_CI_BUILD: "1"
-    working_directory: /root/go/onecloud
+    working_directory: /root/go/src/yunion.io/x/onecloud
     steps:
       - checkout
       - run:
@@ -18,7 +18,7 @@ jobs:
     requires:
       - check
     docker:
-      - image: yunionio/centos-build:1.0-1
+      - image: yunionio/centos-build:1.1-4
         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/onecloud
+    working_directory: /root/go/src/yunion.io/x/onecloud
     parallelism: 4
     steps:
       - checkout
@@ -51,10 +51,10 @@ jobs:
     requires:
       - check
     docker:
-      - image: yunionio/centos-build:1.0-1
+      - image: yunionio/centos-build:1.1-4
         environment:
-          GO111MODULE: "on"
-    working_directory: /root/go/onecloud
+          ONECLOUD_CI_BUILD: "1"
+    working_directory: /root/go/src/yunion.io/x/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,10 +199,53 @@ 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
 
 
@@ -225,8 +268,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
 
@@ -287,9 +329,6 @@ image:
 
 .PHONY: image
 
-image-telegraf-raid-plugin:
-	VERSION=release-1.6.3 ARCH=all make image telegraf-raid-plugin
-
 %:
 	@:
 

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

@@ -0,0 +1,3 @@
+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

@@ -0,0 +1,60 @@
+<?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

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

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

@@ -0,0 +1,22 @@
+[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

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

build/docker/Dockerfile.ansibleserver

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

build/docker/Dockerfile.ansibleserver-base

@@ -7,6 +7,7 @@ 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.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.2
+FROM frolvlad/alpine-glibc:glibc-2.28
 
 MAINTAINER "Yaoqi Wan <wanyaoqi@yunionyun.com>"
 

build/docker/Dockerfile.climc

@@ -1,5 +1,7 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/climc-base:20210701
+FROM registry.cn-beijing.aliyuncs.com/yunionio/climc-base:20210508
 
 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

@@ -6,7 +6,9 @@ ENV TZ Asia/Shanghai
 
 RUN mkdir -p /opt/yunion/bin
 
-RUN apk add --no-cache bash bash-completion tzdata ca-certificates vim && \
+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 && \
     rm -rf /var/cache/apk/*
 
 RUN cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime

build/docker/Dockerfile.cloudproxy

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

build/docker/Dockerfile.file-repo

@@ -0,0 +1,22 @@
+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://dl.influxdata.com/telegraf/releases/telegraf-1.17.0-1.x86_64.rpm -P /opt/yunion/ansible-install-pkg
+Run wget https://dl.influxdata.com/telegraf/releases/telegraf-1.17.0-1.aarch64.rpm -P /opt/yunion/ansible-install-pkg
+Run wget https://dl.influxdata.com/telegraf/releases/telegraf-1.17.0_windows_amd64.zip -P /opt/yunion/ansible-install-pkg
+Run wget https://dl.influxdata.com/telegraf/releases/telegraf_1.17.0-1_amd64.deb -P /opt/yunion/ansible-install-pkg
+Run wget https://dl.influxdata.com/telegraf/releases/telegraf_1.17.0-1_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

@@ -2,5 +2,6 @@ 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

build/docker/Dockerfile.host

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

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.vpcagent

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

build/docker/Makefile

@@ -1,20 +1,7 @@
-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 .
 
-CLIMC_BASE_VERSION = 20210701
-
 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)
+		-t registry.cn-beijing.aliyuncs.com/yunionio/climc-base:$(VERSION) -f ./Dockerfile.climc-base .

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.3
+FROM registry.cn-beijing.aliyuncs.com/yunionio/host-base:v0.4.0
 
 MAINTAINER "Yaoqi Wan wanyaoqi@yunionyun.com"
 

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

@@ -0,0 +1,6 @@
+{{- $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

@@ -0,0 +1,64 @@
+{{- $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

@@ -0,0 +1,6 @@
+{{- $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

@@ -0,0 +1,2 @@
+{{- $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

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

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

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

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

@@ -0,0 +1,14 @@
+{{- $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

@@ -0,0 +1,2 @@
+{{- $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

@@ -0,0 +1,54 @@
+{{- $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

@@ -0,0 +1,2 @@
+{{- $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

@@ -0,0 +1,2 @@
+{{- $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

@@ -0,0 +1,2 @@
+{{- $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

@@ -0,0 +1,2 @@
+{{- $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

@@ -0,0 +1,10 @@
+{{- $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

@@ -0,0 +1,5 @@
+{{- $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

@@ -0,0 +1,5 @@
+{{- $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

@@ -0,0 +1,3 @@
+{{- $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

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

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

@@ -0,0 +1,2 @@
+{{- $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

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

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

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

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

@@ -0,0 +1,2 @@
+{{- $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

@@ -0,0 +1,3 @@
+{{- $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

@@ -0,0 +1,2 @@
+{{- $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

@@ -0,0 +1,2 @@
+{{- $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

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

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

@@ -0,0 +1,2 @@
+{{- $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

@@ -0,0 +1,2 @@
+{{- $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

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

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

@@ -0,0 +1,5 @@
+{{- 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: #333; overflow: hidden;">
+  	<tr style="height: 50px; background: #C2DEF2; overflow: hidden;">
   		<td>
   			<table style="margin-left: 20px;">
   				<tr>
   					<td>
-  						<img src="data:{{.login_logo_format}};base64,{{.login_logo}}" alt="" style="color: #fff; height: 32px; vertical-align: middle;">
+                        <img src="data:{{.login_logo_format}};base64,{{.login_logo}}" alt="{{.name}}" style="color: #333; 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 {{.name}}：
+                        Dear {{.receiver_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;">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; 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>
 	</tr>
 	<tr>
-		<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>
+		<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>
 	</tr>
   </table>
 </body>

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

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

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

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

cmd/awscli/main.go

@@ -18,6 +18,7 @@ import (
 	"fmt"
 	"os"
 
+	"yunion.io/x/pkg/errors"
 	"yunion.io/x/structarg"
 
 	"yunion.io/x/onecloud/pkg/multicloud/aws"
@@ -32,6 +33,7 @@ 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"`
 }
 
@@ -90,15 +92,16 @@ 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 := cli.GetRegion(options.RegionId)
-	if region == nil {
-		return nil, fmt.Errorf("No such region %s", options.RegionId)
+	region, err := cli.GetRegion(options.RegionId)
+	if err != nil {
+		return nil, errors.Wrapf(err, "GetRegion(%s)", options.RegionId)
 	}
 
 	return region, nil

cmd/climc/main.go

@@ -21,7 +21,9 @@ 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

@@ -0,0 +1,34 @@
+// 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/cloudproxy/forwards.go

@@ -0,0 +1,33 @@
+// 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

@@ -0,0 +1,31 @@
+// 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/climc/shell/cloudproxy/proxy_endpoints.go

@@ -0,0 +1,32 @@
+// 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

@@ -0,0 +1,31 @@
+// 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

@@ -0,0 +1,26 @@
+// 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

@@ -0,0 +1,29 @@
+// 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

@@ -0,0 +1,30 @@
+// 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

@@ -44,6 +44,7 @@ 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{})
@@ -98,6 +99,7 @@ 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/cloudregions.go

@@ -29,6 +29,7 @@ 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()
@@ -130,6 +131,24 @@ 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,265 +15,24 @@
 package compute
 
 import (
-	"yunion.io/x/jsonutils"
-
-	"yunion.io/x/onecloud/pkg/mcclient"
+	"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() {
-	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 := 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{})
 }

cmd/climc/shell/compute/filesystem.go

@@ -0,0 +1,31 @@
+// 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

@@ -60,6 +60,8 @@ func init() {
 
 		Sn string `help:"find host by sn"`
 
+		OrderByServerCount string `help:"Order by server count" choices:"desc|asc"`
+
 		options.BaseListOptions
 	}
 	R(&HostListOptions{}, "host-list", "List hosts", func(s *mcclient.ClientSession, opts *HostListOptions) error {

cmd/climc/shell/compute/mount_targets.go

@@ -0,0 +1,31 @@
+// 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{})
+}

cmd/climc/shell/compute/nas_sku.go

@@ -0,0 +1,29 @@
+// 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.NasSkus).WithKeyword("nas-sku")
+	cmd.List(&compute.NasSkuListOption{})
+	cmd.Show(&compute.NasSkuIdOption{})
+	cmd.PerformClass("sync-skus", &options.SkuSyncOptions{})
+}

cmd/climc/shell/compute/nat_sku.go

@@ -0,0 +1,29 @@
+// 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.NatSkus).WithKeyword("nat-sku")
+	cmd.List(&compute.NatSkuListOption{})
+	cmd.Show(&compute.NatSkuIdOption{})
+	cmd.PerformClass("sync-skus", &options.SkuSyncOptions{})
+}

cmd/climc/shell/compute/natdtable.go

@@ -20,11 +20,12 @@ import (
 	"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() {
 
-	R(&options.NatDTableListOptions{}, "dnat-list", "List DNAT entries", func(s *mcclient.ClientSession, opts *options.NatDTableListOptions) error {
+	R(&compute.NatDTableListOptions{}, "dnat-list", "List DNAT entries", func(s *mcclient.ClientSession, opts *compute.NatDTableListOptions) error {
 		params, err := options.ListStructToParams(opts)
 		if err != nil {
 			return err
@@ -36,7 +37,7 @@ func init() {
 		printList(result, modules.NatDTable.GetColumns(s))
 		return nil
 	})
-	R(&options.NatDDeleteShowOptions{}, "dnat-delete", "Delete a DNAT", func(s *mcclient.ClientSession, args *options.NatDDeleteShowOptions) error {
+	R(&compute.NatDDeleteShowOptions{}, "dnat-delete", "Delete a DNAT", func(s *mcclient.ClientSession, args *compute.NatDDeleteShowOptions) error {
 		results, err := modules.NatDTable.Delete(s, args.ID, nil)
 		if err != nil {
 			return err
@@ -44,7 +45,7 @@ func init() {
 		printObject(results)
 		return nil
 	})
-	R(&options.NatDDeleteShowOptions{}, "dnat-show", "Show a DNAT", func(s *mcclient.ClientSession, args *options.NatDDeleteShowOptions) error {
+	R(&compute.NatDDeleteShowOptions{}, "dnat-show", "Show a DNAT", func(s *mcclient.ClientSession, args *compute.NatDDeleteShowOptions) error {
 		results, err := modules.NatDTable.Get(s, args.ID, nil)
 		if err != nil {
 			return err
@@ -53,7 +54,7 @@ func init() {
 		return nil
 	})
 
-	R(&options.NatDCreateOptions{}, "dnat-create", "Create a DNAT", func(s *mcclient.ClientSession, args *options.NatDCreateOptions) error {
+	R(&compute.NatDCreateOptions{}, "dnat-create", "Create a DNAT", func(s *mcclient.ClientSession, args *compute.NatDCreateOptions) error {
 		params := jsonutils.NewDict()
 		params.Add(jsonutils.NewString(args.NAME), "name")
 		params.Add(jsonutils.NewString(args.NATGATEWAYID), "natgateway_id")

cmd/climc/shell/compute/natgateways.go

@@ -15,67 +15,20 @@
 package compute
 
 import (
-	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/cmd/climc/shell"
+	api "yunion.io/x/onecloud/pkg/apis/compute"
 	"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.NatGateways).WithKeyword("nat")
 
-	R(&options.NatGatewayListOptions{}, "natgateway-list", "List NAT gateways", func(s *mcclient.ClientSession, opts *options.NatGatewayListOptions) error {
-		params, err := options.ListStructToParams(opts)
-		if err != nil {
-			return err
-		}
-		result, err := modules.NatGateways.List(s, params)
-		if err != nil {
-			return err
-		}
-		printList(result, modules.NatGateways.GetColumns(s))
-		return nil
-	})
-
-	R(&options.NatGatewayIdOptions{}, "natgateway-show", "Show a NAT gateway", func(s *mcclient.ClientSession, args *options.NatGatewayIdOptions) error {
-		results, err := modules.NatGateways.Get(s, args.ID, nil)
-		if err != nil {
-			return err
-		}
-		printObject(results)
-		return nil
-	})
-
-	R(&options.NatGatewayIdOptions{}, "natgateway-syncstatus", "Sync NAT gateway status", func(s *mcclient.ClientSession, args *options.NatGatewayIdOptions) error {
-		result, err := modules.NatGateways.PerformAction(s, args.ID, "syncstatus", nil)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
-	type NatGatewayListEipOptions struct {
-		ID string `help:"ID"`
-	}
-
-	R(&NatGatewayListEipOptions{}, "natgateway-dnat-resources", "list resources in dnats of natgateway",
-		func(s *mcclient.ClientSession, opts *NatGatewayListEipOptions) error {
-
-			ret, err := modules.NatGateways.PerformAction(s, opts.ID, "dnat-resources", nil)
-			if err != nil {
-				return err
-			}
-			printObject(ret)
-			return nil
-		})
-
-	R(&NatGatewayListEipOptions{}, "natgateway-snat-resources", "list resources in snats of natgateway",
-		func(s *mcclient.ClientSession, opts *NatGatewayListEipOptions) error {
-
-			ret, err := modules.NatGateways.PerformAction(s, opts.ID, "snat-resources", nil)
-			if err != nil {
-				return err
-			}
-			printObject(ret)
-			return nil
-		})
+	cmd.List(&compute.NatGatewayListOptions{})
+	cmd.Create(&api.NatgatewayCreateInput{})
+	cmd.Show(&compute.NatGatewayIdOptions{})
+	cmd.Delete(&compute.NatGatewayDeleteOption{})
+	cmd.Perform("syncstauts", &compute.NatGatewayIdOptions{})
+	cmd.Perform("cancel-expire", &compute.NatGatewayIdOptions{})
+	cmd.Perform("postpaid-expire", &compute.NatPostpaidExpireOptions{})
 }

cmd/climc/shell/compute/natstable.go

@@ -20,11 +20,12 @@ import (
 	"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() {
 
-	R(&options.NatSTableListOptions{}, "snat-list", "List SNAT entries", func(s *mcclient.ClientSession, opts *options.NatSTableListOptions) error {
+	R(&compute.NatSTableListOptions{}, "snat-list", "List SNAT entries", func(s *mcclient.ClientSession, opts *compute.NatSTableListOptions) error {
 		params, err := options.ListStructToParams(opts)
 		if err != nil {
 			return err
@@ -36,7 +37,7 @@ func init() {
 		printList(result, modules.NatSTable.GetColumns(s))
 		return nil
 	})
-	R(&options.NatSDeleteShowOptions{}, "snat-delete", "Delete a SNAT", func(s *mcclient.ClientSession, args *options.NatSDeleteShowOptions) error {
+	R(&compute.NatSDeleteShowOptions{}, "snat-delete", "Delete a SNAT", func(s *mcclient.ClientSession, args *compute.NatSDeleteShowOptions) error {
 		results, err := modules.NatSTable.Delete(s, args.ID, nil)
 		if err != nil {
 			return err
@@ -45,7 +46,7 @@ func init() {
 		return nil
 	})
 
-	R(&options.NatSDeleteShowOptions{}, "snat-show", "Show a SNAT", func(s *mcclient.ClientSession, args *options.NatSDeleteShowOptions) error {
+	R(&compute.NatSDeleteShowOptions{}, "snat-show", "Show a SNAT", func(s *mcclient.ClientSession, args *compute.NatSDeleteShowOptions) error {
 		results, err := modules.NatSTable.Get(s, args.ID, nil)
 		if err != nil {
 			return err
@@ -54,7 +55,7 @@ func init() {
 		return nil
 	})
 
-	R(&options.NatSCreateOptions{}, "snat-create", "Create a SNAT", func(s *mcclient.ClientSession, args *options.NatSCreateOptions) error {
+	R(&compute.NatSCreateOptions{}, "snat-create", "Create a SNAT", func(s *mcclient.ClientSession, args *compute.NatSCreateOptions) error {
 		params := jsonutils.NewDict()
 		params.Add(jsonutils.NewString(args.NAME), "name")
 		params.Add(jsonutils.NewString(args.NATGATEWAYID), "natgateway_id")

cmd/climc/shell/compute/project_mappings.go

@@ -0,0 +1,33 @@
+// 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.ProjectMappings)
+	cmd.List(&compute.ProjectMappingListOptions{})
+	cmd.Update(&compute.ProjectMappingUpdateOption{})
+	cmd.Delete(&options.BaseIdOptions{})
+	cmd.Show(&options.BaseIdOptions{})
+	cmd.Create(&compute.ProjectMappingCreateOption{})
+	cmd.Perform("enable", &options.BaseIdOptions{})
+	cmd.Perform("disable", &options.BaseIdOptions{})
+}

cmd/climc/shell/compute/secgroupcaches.go

@@ -15,48 +15,16 @@
 package compute
 
 import (
-	"yunion.io/x/onecloud/pkg/mcclient"
+	"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() {
-	type SecGroupCacheListOptions struct {
-		options.BaseListOptions
-		Secgroup string `help:"Secgroup ID or Name"`
-	}
-
-	R(&SecGroupCacheListOptions{}, "secgroup-cache-list", "List security group caches", func(s *mcclient.ClientSession, args *SecGroupCacheListOptions) error {
-		params, err := options.ListStructToParams(args)
-		if err != nil {
-			return err
-		}
-		result, err := modules.SecGroupCaches.List(s, params)
-		if err != nil {
-			return err
-		}
-		printList(result, modules.SecGroupCaches.GetColumns(s))
-		return nil
-	})
-	type SecGroupCacheIdOptions struct {
-		ID string `help:"ID or Name or secgroup cache"`
-	}
-	R(&SecGroupCacheIdOptions{}, "secgroup-cache-show", "Show security group cache", func(s *mcclient.ClientSession, args *SecGroupCacheIdOptions) error {
-		result, err := modules.SecGroupCaches.Get(s, args.ID, nil)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
-	R(&SecGroupCacheIdOptions{}, "secgroup-cache-delete", "Delete security group cache", func(s *mcclient.ClientSession, args *SecGroupCacheIdOptions) error {
-		result, err := modules.SecGroupCaches.Delete(s, args.ID, nil)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
+	cmd := shell.NewResourceCmd(&modules.SecGroupCaches).WithKeyword("secgroup-cache")
+	cmd.List(&compute.SecGroupCacheListOptions{})
+	cmd.Show(&compute.SecGroupCacheIdOptions{})
+	cmd.Delete(&compute.SecGroupCacheIdOptions{})
+	cmd.Perform("syncstatus", &compute.SecGroupCacheIdOptions{})
+	cmd.Get("references", &compute.SecGroupCacheIdOptions{})
 }

cmd/climc/shell/compute/secgroups.go

@@ -36,4 +36,5 @@ func init() {
 	cmd.Perform("purge", &options.SecgroupIdOptions{})
 	cmd.Perform("change-owner", &options.SecgroupChangeOwnerOptions{})
 	cmd.Perform("import-rules", &options.SecgroupImportRulesOptions{})
+	cmd.Get("references", &options.SecgroupIdOptions{})
 }

cmd/climc/shell/compute/server_forward.go

@@ -0,0 +1,28 @@
+// 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"
+)
+
+func init() {
+	cmd := shell.NewResourceCmd(&modules.Servers)
+	cmd.Perform("open-forward", &options.ServerOpenForwardOptions{})
+	cmd.Perform("close-forward", &options.ServerCloseForwardOptions{})
+	cmd.Perform("list-forward", &options.ServerListForwardOptions{})
+}

cmd/climc/shell/compute/servers.go

@@ -85,13 +85,16 @@ func init() {
 	cmd.Perform("set-auto-renew", new(options.ServerSetAutoRenew))
 	cmd.Perform("save-template", new(options.ServerSaveImageOptions))
 	cmd.Perform("remote-update", new(options.ServerRemoteUpdateOptions))
-	cmd.Perform("migrate-network", &options.ServerMigrateNetworkOptions{})
+	cmd.Perform("create-eip", &options.ServerCreateEipOptions{})
+	cmd.Perform("make-sshable", &options.ServerMakeSshableOptions{})
 
 	cmd.Get("vnc", new(options.ServerIdOptions))
 	cmd.Get("desc", new(options.ServerIdOptions))
 	cmd.Get("status", new(options.ServerIdOptions))
 	cmd.Get("iso", new(options.ServerIdOptions))
 	cmd.Get("create-params", new(options.ServerIdOptions))
+	cmd.Get("sshable", new(options.ServerIdOptions))
+	cmd.Get("make-sshable-cmd", new(options.ServerIdOptions))
 	cmd.Get("change-owner-candidate-domains", new(options.ServerChangeOwnerCandidateDomainsOptions))
 
 	type ServerTaskShowOptions struct {
@@ -176,19 +179,6 @@ func init() {
 		return nil
 	})
 
-	R(&options.ResourceMetadataOptions{}, "server-set-metadata", "Set raw metadata of a server", func(s *mcclient.ClientSession, opts *options.ResourceMetadataOptions) error {
-		params, err := opts.Params()
-		if err != nil {
-			return err
-		}
-		result, err := modules.Servers.PerformAction(s, opts.ID, "metadata", params)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
 	R(&options.ServerCreateFromInstanceSnapshot{}, "server-create-from-instance-snapshot", "server create from instance snapshot",
 		func(s *mcclient.ClientSession, opts *options.ServerCreateFromInstanceSnapshot) error {
 			params := &compute.ServerCreateInput{}

cmd/climc/shell/compute/storages.go

@@ -15,268 +15,27 @@
 package compute
 
 import (
-	"fmt"
-
-	"yunion.io/x/jsonutils"
-
-	"yunion.io/x/onecloud/pkg/mcclient"
-	"yunion.io/x/onecloud/pkg/mcclient/modulebase"
+	"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() {
-	type StorageListOptions struct {
-		options.BaseListOptions
-
-		Share    *bool  `help:"Share storage list"`
-		Local    *bool  `help:"Local storage list"`
-		Usable   *bool  `help:"Usable storage list"`
-		Zone     string `help:"List storages in zone" json:"-"`
-		Region   string `help:"List storages in region"`
-		Schedtag string `help:"filter storage by schedtag"`
-
-		HostSchedtagId string `help:"filter storage by host schedtag"`
-		ImageId        string `help:"filter storage by image"`
-	}
-	R(&StorageListOptions{}, "storage-list", "List storages", func(s *mcclient.ClientSession, opts *StorageListOptions) error {
-		params, err := options.ListStructToParams(opts)
-		if err != nil {
-			return err
-		}
-		var result *modulebase.ListResult
-		if len(opts.Zone) > 0 {
-			result, err = modules.Storages.ListInContext(s, params, &modules.Zones, opts.Zone)
-		} else {
-			result, err = modules.Storages.List(s, params)
-		}
-		if err != nil {
-			return err
-		}
-		printList(result, modules.Storages.GetColumns(s))
-		return nil
-	})
-
-	type StorageUpdateOptions struct {
-		ID                    string  `help:"ID or Name of storage to update"`
-		Name                  string  `help:"New Name of storage"`
-		Desc                  string  `help:"Description"`
-		CommitBound           float64 `help:"Upper bound of storage overcommit rate" json:"cmtbound"`
-		MediumType            string  `help:"Medium type" choices:"ssd|rotate"`
-		RbdRadosMonOpTimeout  int64   `help:"ceph rados_mon_op_timeout"`
-		RbdRadosOsdOpTimeout  int64   `help:"ceph rados_osd_op_timeout"`
-		RbdClientMountTimeout int64   `help:"ceph client_mount_timeout"`
-		RbdKey                string  `help:"ceph rbd key"`
-		Reserved              string  `help:"Reserved storage space"`
-		Capacity              int     `help:"Capacity for storage"`
-	}
-	R(&StorageUpdateOptions{}, "storage-update", "Update a storage", func(s *mcclient.ClientSession, args *StorageUpdateOptions) error {
-		params, err := options.StructToParams(args)
-		if err != nil {
-			return err
-		}
-
-		result, err := modules.Storages.Update(s, args.ID, params)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
-	type StorageCreateOptions struct {
-		NAME                  string `help:"Name of the Storage"`
-		ZONE                  string `help:"Zone id of storage"`
-		Capacity              int64  `help:"Capacity of the Storage"`
-		MediumType            string `help:"Medium type" choices:"ssd|rotate"`
-		StorageType           string `help:"Storage type" choices:"local|nas|vsan|rbd|nfs|gpfs|baremetal"`
-		RbdMonHost            string `help:"Ceph mon_host config"`
-		RbdRadosMonOpTimeout  int64  `help:"ceph rados_mon_op_timeout"`
-		RbdRadosOsdOpTimeout  int64  `help:"ceph rados_osd_op_timeout"`
-		RbdClientMountTimeout int64  `help:"ceph client_mount_timeout"`
-		RbdKey                string `help:"Ceph key config"`
-		RbdPool               string `help:"Ceph Pool Name"`
-		NfsHost               string `help:"NFS host"`
-		NfsSharedDir          string `help:"NFS shared dir"`
-	}
-	R(&StorageCreateOptions{}, "storage-create", "Create a Storage", func(s *mcclient.ClientSession, args *StorageCreateOptions) error {
-		params, err := options.StructToParams(args)
-		if err != nil {
-			return err
-		}
-
-		if args.StorageType == "rbd" {
-			if args.RbdMonHost == "" || args.RbdKey == "" || args.RbdPool == "" {
-				return fmt.Errorf("Not enough arguments, missing mon_host、key or pool")
-			}
-		} else if args.StorageType == "nfs" {
-			if len(args.NfsHost) == 0 || len(args.NfsSharedDir) == 0 {
-				return fmt.Errorf("Storage type nfs missing conf host or shared dir")
-			}
-		}
-		storage, err := modules.Storages.Create(s, params)
-		if err != nil {
-			return err
-		}
-		printObject(storage)
-		return nil
-	})
-
-	type StorageShowOptions struct {
-		ID string `help:"ID or Name of the storage to show"`
-	}
-	R(&StorageShowOptions{}, "storage-show", "Show storage details", func(s *mcclient.ClientSession, args *StorageShowOptions) error {
-		result, err := modules.Storages.Get(s, args.ID, nil)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
-	R(&StorageShowOptions{}, "storage-delete", "Delete a storage", func(s *mcclient.ClientSession, args *StorageShowOptions) error {
-		result, err := modules.Storages.Delete(s, args.ID, nil)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
-	R(&StorageShowOptions{}, "storage-enable", "Enable a storage", func(s *mcclient.ClientSession, args *StorageShowOptions) error {
-		result, err := modules.Storages.PerformAction(s, args.ID, "enable", nil)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
-	R(&StorageShowOptions{}, "storage-disable", "Disable a storage", func(s *mcclient.ClientSession, args *StorageShowOptions) error {
-		result, err := modules.Storages.PerformAction(s, args.ID, "disable", nil)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
-	R(&StorageShowOptions{}, "storage-online", "Online a storage", func(s *mcclient.ClientSession, args *StorageShowOptions) error {
-		result, err := modules.Storages.PerformAction(s, args.ID, "online", nil)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
-	R(&StorageShowOptions{}, "storage-offline", "Offline a storage", func(s *mcclient.ClientSession, args *StorageShowOptions) error {
-		result, err := modules.Storages.PerformAction(s, args.ID, "offline", nil)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
-	type StorageCacheImageActionOptions struct {
-		ID     string `help:"ID or name of storage"`
-		IMAGE  string `help:"ID or name of image"`
-		Force  bool   `help:"Force refresh cache, even if the image exists in cache"`
-		Format string `help:"Image force" choices:"iso|vmdk|qcow2|vhd"`
-	}
-	R(&StorageCacheImageActionOptions{}, "storage-cache-image", "Ask a storage to cache a image", func(s *mcclient.ClientSession, args *StorageCacheImageActionOptions) error {
-		params := jsonutils.NewDict()
-		params.Add(jsonutils.NewString(args.IMAGE), "image")
-		if args.Force {
-			params.Add(jsonutils.JSONTrue, "is_force")
-		}
-		if len(args.Format) > 0 {
-			params.Add(jsonutils.NewString(args.Format), "format")
-		}
-		storage, err := modules.Storages.PerformAction(s, args.ID, "cache-image", params)
-		if err != nil {
-			return err
-		}
-		printObject(storage)
-		return nil
-	})
-
-	type StorageUncacheImageActionOptions struct {
-		ID    string `help:"ID or name of storage"`
-		IMAGE string `help:"ID or name of image"`
-		Force bool   `help:"Force uncache, even if the image exists in cache"`
-	}
-	R(&StorageUncacheImageActionOptions{}, "storage-uncache-image", "Ask a storage to remove image from its cache", func(s *mcclient.ClientSession, args *StorageUncacheImageActionOptions) error {
-		params := jsonutils.NewDict()
-		params.Add(jsonutils.NewString(args.IMAGE), "image")
-		if args.Force {
-			params.Add(jsonutils.JSONTrue, "is_force")
-		}
-		storage, err := modules.Storages.PerformAction(s, args.ID, "uncache-image", params)
-		if err != nil {
-			return err
-		}
-		printObject(storage)
-		return nil
-	})
-
-	type StorageChangeOwnerOptions struct {
-		ID            string `help:"ID or name of storage" json:"-"`
-		ProjectDomain string `json:"project_domain" help:"target domain"`
-	}
-	R(&StorageChangeOwnerOptions{}, "storage-change-owner", "Change owner domain of storage", func(s *mcclient.ClientSession, args *StorageChangeOwnerOptions) error {
-		if len(args.ProjectDomain) == 0 {
-			return fmt.Errorf("empty project_domain")
-		}
-		params := jsonutils.Marshal(args)
-		ret, err := modules.Storages.PerformAction(s, args.ID, "change-owner", params)
-		if err != nil {
-			return err
-		}
-		printObject(ret)
-		return nil
-	})
-
-	type StorageForceDetachHost struct {
-		ID   string `help:"ID or name of storage" json:"-"`
-		Host string `help:"ID or name of host"`
-	}
-	R(&StorageForceDetachHost{}, "storage-public", "Force detach host", func(s *mcclient.ClientSession, args *StorageForceDetachHost) error {
-		params := jsonutils.Marshal(args)
-		result, err := modules.Storages.PerformAction(s, args.ID, "force-detach-host", params)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
-	type StoragePublicOptions struct {
-		ID            string   `help:"ID or name of storage" json:"-"`
-		Scope         string   `help:"sharing scope" choices:"system|domain"`
-		SharedDomains []string `help:"share to domains"`
-	}
-	R(&StoragePublicOptions{}, "storage-public", "Make a storage public", func(s *mcclient.ClientSession, args *StoragePublicOptions) error {
-		params := jsonutils.Marshal(args)
-		result, err := modules.Storages.PerformAction(s, args.ID, "public", params)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
-	type StoragePrivateOptions struct {
-		ID string `help:"ID or name of storage" json:"-"`
-	}
-	R(&StoragePrivateOptions{}, "storage-private", "Make a storage private", func(s *mcclient.ClientSession, args *StoragePrivateOptions) error {
-		params := jsonutils.Marshal(args)
-		result, err := modules.Storages.PerformAction(s, args.ID, "private", params)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
+	cmd := shell.NewResourceCmd(&modules.Storages).WithContextManager(&modules.Zones)
+	cmd.List(&compute.StorageListOptions{})
+	cmd.Update(&compute.StorageUpdateOptions{})
+	cmd.Create(&compute.StorageCreateOptions{})
+	cmd.Show(&options.BaseShowOptions{})
+	cmd.Delete(&options.BaseIdOptions{})
+	cmd.Perform("enable", &options.BaseIdOptions{})
+	cmd.Perform("disable", &options.BaseIdOptions{})
+	cmd.Perform("online", &options.BaseIdOptions{})
+	cmd.Perform("offline", &options.BaseIdOptions{})
+	cmd.Perform("cache-image", &compute.StorageCacheImageActionOptions{})
+	cmd.Perform("uncache-image", &compute.StorageUncacheImageActionOptions{})
+	cmd.Perform("change-owner", &options.ChangeOwnerOptions{})
+	cmd.Perform("force-detach-host", &compute.StorageForceDetachHost{})
+	cmd.Perform("public", &options.BasePublicOptions{})
+	cmd.Perform("private", &options.BaseIdOptions{})
 }

cmd/climc/shell/compute/webconsole.go

@@ -24,7 +24,7 @@ import (
 
 	webconsole_api "yunion.io/x/onecloud/pkg/apis/webconsole"
 	"yunion.io/x/onecloud/pkg/mcclient"
-	"yunion.io/x/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/onecloud/pkg/mcclient/modules/webconsole"
 	o "yunion.io/x/onecloud/pkg/mcclient/options"
 	"yunion.io/x/onecloud/pkg/webconsole/command"
 )
@@ -70,7 +70,7 @@ func init() {
 		if err != nil {
 			return err
 		}
-		ret, err := modules.WebConsole.DoK8sShellConnect(s, args.NAME, params)
+		ret, err := webconsole.WebConsole.DoK8sShellConnect(s, args.NAME, params)
 		if err != nil {
 			return err
 		}
@@ -83,7 +83,7 @@ func init() {
 		if err != nil {
 			return err
 		}
-		ret, err := modules.WebConsole.DoK8sLogConnect(s, args.NAME, params)
+		ret, err := webconsole.WebConsole.DoK8sLogConnect(s, args.NAME, params)
 		if err != nil {
 			return err
 		}
@@ -92,7 +92,7 @@ func init() {
 	})
 
 	R(&o.WebConsoleBaremetalOptions{}, "webconsole-baremetal", "Connect baremetal host webconsole", func(s *mcclient.ClientSession, args *o.WebConsoleBaremetalOptions) error {
-		ret, err := modules.WebConsole.DoBaremetalConnect(s, args.ID, nil)
+		ret, err := webconsole.WebConsole.DoBaremetalConnect(s, args.ID, nil)
 		if err != nil {
 			return err
 		}
@@ -105,7 +105,7 @@ func init() {
 		if err != nil {
 			return err
 		}
-		ret, err := modules.WebConsole.DoSshConnect(s, args.IP, params)
+		ret, err := webconsole.WebConsole.DoSshConnect(s, args.IP, params)
 		if err != nil {
 			return err
 		}
@@ -114,7 +114,7 @@ func init() {
 	})
 
 	R(&o.WebConsoleServerOptions{}, "webconsole-server", "Connect server remote graphic console", func(s *mcclient.ClientSession, args *o.WebConsoleServerOptions) error {
-		ret, err := modules.WebConsole.DoServerConnect(s, args.ID, nil)
+		ret, err := webconsole.WebConsole.DoServerConnect(s, args.ID, nil)
 		if err != nil {
 			return err
 		}

cmd/climc/shell/compute/wires.go

@@ -15,160 +15,21 @@
 package compute
 
 import (
-	"yunion.io/x/jsonutils"
-
-	"yunion.io/x/onecloud/pkg/mcclient"
-	"yunion.io/x/onecloud/pkg/mcclient/modulebase"
+	"yunion.io/x/onecloud/cmd/climc/shell"
 	"yunion.io/x/onecloud/pkg/mcclient/modules"
 	"yunion.io/x/onecloud/pkg/mcclient/options"
 )
 
 func init() {
-	type WireListOptions struct {
-		options.BaseListOptions
-
-		Bandwidth *int `help:"List wires by bandwidth"`
-
-		Region string `help:"List wires in region"`
-		Zone   string `help:"list wires in zone" json:"-"`
-		Vpc    string `help:"List wires in vpc"`
-		Host   string `help:"List wires attached to a host"`
-	}
-	R(&WireListOptions{}, "wire-list", "List wires", func(s *mcclient.ClientSession, opts *WireListOptions) error {
-		params, err := options.ListStructToParams(opts)
-		if err != nil {
-			return err
-		}
-
-		var result *modulebase.ListResult
-		if len(opts.Zone) > 0 {
-			result, err = modules.Wires.ListInContext(s, params, &modules.Zones, opts.Zone)
-		} else {
-			result, err = modules.Wires.List(s, params)
-		}
-		if err != nil {
-			return err
-		}
-		printList(result, modules.Wires.GetColumns(s))
-		return nil
-	})
-
-	type WireUpdateOptions struct {
-		ID   string `help:"ID or Name of zone to update"`
-		Name string `help:"Name of wire"`
-		Desc string `metavar:"<DESCRIPTION>" help:"Description"`
-		Bw   int64  `help:"Bandwidth in mbps"`
-		Mtu  int64  `help:"mtu in bytes"`
-	}
-	R(&WireUpdateOptions{}, "wire-update", "Update wire", func(s *mcclient.ClientSession, args *WireUpdateOptions) 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.Bw > 0 {
-			params.Add(jsonutils.NewInt(args.Bw), "bandwidth")
-		}
-		if args.Mtu > 0 {
-			params.Add(jsonutils.NewInt(args.Mtu), "mtu")
-		}
-		if params.Size() == 0 {
-			return InvalidUpdateError()
-		}
-		result, err := modules.Wires.Update(s, args.ID, params)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
-	type WireCreateOptions struct {
-		ZONE string `help:"Zone ID or Name"`
-		Vpc  string `help:"VPC ID or Name" default:"default"`
-		NAME string `help:"Name of wire"`
-		BW   int64  `help:"Bandwidth in mbps"`
-		Mtu  int64  `help:"mtu in bytes"`
-		Desc string `metavar:"<DESCRIPTION>" help:"Description"`
-	}
-	R(&WireCreateOptions{}, "wire-create", "Create a wire", func(s *mcclient.ClientSession, args *WireCreateOptions) error {
-		params := jsonutils.NewDict()
-		params.Add(jsonutils.NewString(args.NAME), "name")
-		params.Add(jsonutils.NewInt(args.BW), "bandwidth")
-		if args.Mtu > 0 {
-			params.Add(jsonutils.NewInt(args.Mtu), "mtu")
-		}
-		if len(args.Vpc) > 0 {
-			params.Add(jsonutils.NewString(args.Vpc), "vpc")
-		}
-		if len(args.Desc) > 0 {
-			params.Add(jsonutils.NewString(args.Desc), "description")
-		}
-		result, err := modules.Wires.CreateInContext(s, params, &modules.Zones, args.ZONE)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
-	type WireShowOptions struct {
-		ID string `help:"ID or Name of the wire to show"`
-	}
-	R(&WireShowOptions{}, "wire-show", "Show wire details", func(s *mcclient.ClientSession, args *WireShowOptions) error {
-		result, err := modules.Wires.Get(s, args.ID, nil)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
-	R(&WireShowOptions{}, "wire-delete", "Delete wire", func(s *mcclient.ClientSession, args *WireShowOptions) error {
-		result, err := modules.Wires.Delete(s, args.ID, nil)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
-	type WirePublicOptions struct {
-		ID            string   `help:"ID or name of wire" json:"-"`
-		Scope         string   `help:"sharing scope" choices:"system|domain"`
-		SharedDomains []string `help:"share to domains"`
-	}
-	R(&WirePublicOptions{}, "wire-public", "Make wire public", func(s *mcclient.ClientSession, args *WirePublicOptions) error {
-		params := jsonutils.Marshal(args)
-		result, err := modules.Wires.PerformAction(s, args.ID, "public", params)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
-	type WirePrivateOptions struct {
-		ID string `help:"ID or name of wire" json:"-"`
-	}
-	R(&WirePrivateOptions{}, "wire-private", "Make wire private", func(s *mcclient.ClientSession, args *WirePrivateOptions) error {
-		params := jsonutils.Marshal(args)
-		result, err := modules.Wires.PerformAction(s, args.ID, "private", params)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
-	R(&WireShowOptions{}, "wire-change-owner-candidate-domains", "Show candiate domains of a wire for changing owner", func(s *mcclient.ClientSession, args *WireShowOptions) error {
-		result, err := modules.Wires.GetSpecific(s, args.ID, "change-owner-candidate-domains", nil)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
+	cmd := shell.NewResourceCmd(&modules.Wires).WithKeyword("wire")
+	cmd.List(new(options.WireListOptions))
+	cmd.Create(new(options.WireCreateOptions))
+	cmd.Update(new(options.WireUpdateOptions))
+	cmd.Show(new(options.WireOptions))
+	cmd.Delete(new(options.WireOptions))
+	cmd.Perform("public", new(options.WirePublicOptions))
+	cmd.Perform("private", new(options.WireOptions))
+	cmd.Perform("change-owner-candidate-domains", new(options.WireOptions))
+	cmd.PerformWithKeyword("merge", "merge-from", new(options.WireMergeOptions))
+	cmd.Perform("merge-network", new(options.WireOptions))
 }

cmd/climc/shell/devtool/common.go

@@ -0,0 +1,27 @@
+// 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 devtool
+
+import (
+	"yunion.io/x/onecloud/cmd/climc/shell"
+	"yunion.io/x/onecloud/pkg/util/printutils"
+)
+
+var (
+	R                 = shell.R
+	printList         = printutils.PrintJSONList
+	printObject       = printutils.PrintJSONObject
+	printBatchResults = printutils.PrintJSONBatchResults
+)

cmd/climc/shell/devtool/devtoolcronjob.go

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

cmd/climc/shell/devtool/devtooltemplate.go

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

cmd/climc/shell/devtool/script.go

@@ -0,0 +1,29 @@
+// 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 devtool
+
+import (
+	"yunion.io/x/onecloud/cmd/climc/shell"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
+	options "yunion.io/x/onecloud/pkg/mcclient/options/devtool"
+)
+
+func init() {
+	cmd := shell.NewResourceCmd(&modules.DevToolScripts).WithKeyword("devtool-script")
+	cmd.List(new(options.ScriptListOptions))
+	cmd.Perform("apply", new(options.ScriptApplyOptions))
+	cmd1 := shell.NewResourceCmd(&modules.DevToolScriptApplyRecords).WithKeyword("devtool-script-record")
+	cmd1.List(new(options.ScriptApplyRecordListOptions))
+}

cmd/climc/shell/helper.go

@@ -128,7 +128,7 @@ func (cmd ResourceCmd) RunWithDesc(action, desc string, args interface{}, callba
 	if ok {
 		desc = descArgs.Description()
 	}
-	R(args, fmt.Sprintf("%s%s-%s", prefix, cmd.keyword, action), desc, callback)
+	R(args, fmt.Sprintf("%s%s-%s", prefix, strings.ReplaceAll(cmd.keyword, "_", "-"), action), desc, callback)
 }
 
 func (cmd ResourceCmd) Run(action string, args interface{}, callback interface{}) {

cmd/climc/shell/identity/policies.go

@@ -24,26 +24,79 @@ import (
 	"yunion.io/x/jsonutils"
 	"yunion.io/x/log"
 
-	"yunion.io/x/onecloud/cmd/climc/shell"
 	api "yunion.io/x/onecloud/pkg/apis/identity"
 	"yunion.io/x/onecloud/pkg/cloudcommon/consts"
 	"yunion.io/x/onecloud/pkg/cloudcommon/policy"
 	"yunion.io/x/onecloud/pkg/mcclient"
 	"yunion.io/x/onecloud/pkg/mcclient/auth"
 	"yunion.io/x/onecloud/pkg/mcclient/modules"
-	"yunion.io/x/onecloud/pkg/mcclient/options/identity"
+	"yunion.io/x/onecloud/pkg/mcclient/options"
 	"yunion.io/x/onecloud/pkg/util/fileutils2"
 	"yunion.io/x/onecloud/pkg/util/rbacutils"
 	"yunion.io/x/onecloud/pkg/util/shellutils"
 )
 
+func createPolicy(s *mcclient.ClientSession, name string, policy string, domain string, enabled bool, disabled bool, desc string, scope string, isSystem *bool) error {
+	params := jsonutils.NewDict()
+	params.Add(jsonutils.NewString(name), "type")
+	params.Add(jsonutils.NewString(policy), "policy")
+	if len(domain) > 0 {
+		params.Add(jsonutils.NewString(domain), "project_domain_id")
+	}
+	if enabled {
+		params.Add(jsonutils.JSONTrue, "enabled")
+	} else if disabled {
+		params.Add(jsonutils.JSONFalse, "enabled")
+	}
+	if len(desc) > 0 {
+		params.Add(jsonutils.NewString(desc), "description")
+	}
+	if len(scope) > 0 {
+		params.Add(jsonutils.NewString(scope), "scope")
+	}
+	if isSystem != nil {
+		if *isSystem {
+			params.Add(jsonutils.JSONTrue, "is_system")
+		} else {
+			params.Add(jsonutils.JSONFalse, "is_system")
+		}
+	}
+
+	result, err := modules.Policies.Create(s, params)
+	if err != nil {
+		return err
+	}
+
+	printObject(result)
+
+	return nil
+
+}
+
 func init() {
-	cmd := shell.NewResourceCmd(&modules.Policies)
-	cmd.List(&identity.PolicyListOptions{})
+	type PolicyListOptions struct {
+		options.BaseListOptions
+		Type          string `help:"filter by type"`
+		IsSystem      *bool  `help:"filter by is_system" negative:"is_no_system"`
+		Format        string `help:"policy format, default to yaml" default:"yaml" choices:"yaml|json"`
+		OrderByDomain string `help:"order by domain name" choices:"asc|desc"`
+	}
+	R(&PolicyListOptions{}, "policy-list", "List all policies", func(s *mcclient.ClientSession, args *PolicyListOptions) error {
+		params, err := options.ListStructToParams(args)
+		if err != nil {
+			return err
+		}
+		result, err := modules.Policies.List(s, params)
+		if err != nil {
+			return err
+		}
+		printList(result, modules.Policies.GetColumns(s))
+		return nil
+	})
 
 	type PolicyCreateOptions struct {
 		Domain   string `help:"domain of the policy"`
-		TYPE     string `help:"type of the policy"`
+		NAME     string `help:"name of the policy"`
 		FILE     string `help:"path to policy file"`
 		Enabled  bool   `help:"create policy enabled"`
 		Disabled bool   `help:"create policy disabled"`
@@ -57,39 +110,25 @@ func init() {
 			return err
 		}
 
-		params := jsonutils.NewDict()
-		params.Add(jsonutils.NewString(args.TYPE), "type")
-		params.Add(jsonutils.NewString(string(policyBytes)), "policy")
-		if len(args.Domain) > 0 {
-			params.Add(jsonutils.NewString(args.Domain), "domain")
-		}
-		if args.Enabled {
-			params.Add(jsonutils.JSONTrue, "enabled")
-		} else if args.Disabled {
-			params.Add(jsonutils.JSONFalse, "enabled")
-		}
-		if len(args.Desc) > 0 {
-			params.Add(jsonutils.NewString(args.Desc), "description")
-		}
-		if len(args.Scope) > 0 {
-			params.Add(jsonutils.NewString(args.Scope), "scope")
-		}
-		if args.IsSystem != nil {
-			if *args.IsSystem {
-				params.Add(jsonutils.JSONTrue, "is_system")
-			} else {
-				params.Add(jsonutils.JSONFalse, "is_system")
-			}
-		}
+		return createPolicy(s, args.NAME, string(policyBytes), args.Domain, args.Enabled, args.Disabled, args.Desc, args.Scope, args.IsSystem)
+	})
 
-		result, err := modules.Policies.Create(s, params)
+	type PolicyCloneOptions struct {
+		Domain string `help:"domain of the policy"`
+		OLD    string `help:"name or id of the old policy"`
+		NAME   string `help:"name of the policy"`
+	}
+	R(&PolicyCloneOptions{}, "policy-clone", "Clone a policy", func(s *mcclient.ClientSession, args *PolicyCloneOptions) error {
+		old, err := modules.Policies.Get(s, args.OLD, nil)
 		if err != nil {
 			return err
 		}
-
-		printObject(result)
-
-		return nil
+		policy, _ := old.GetString("policy")
+		enabled, _ := old.Bool("enabled")
+		desc, _ := old.GetString("description")
+		scope, _ := old.GetString("scope")
+		isSystem, _ := old.Bool("is_system")
+		return createPolicy(s, args.NAME, policy, args.Domain, enabled, !enabled, desc, scope, &isSystem)
 	})
 
 	type PolicyPatchOptions struct {

cmd/climc/shell/identity/role_assignments.go

@@ -43,7 +43,8 @@ func init() {
 		Projects      []string `help:"fitler by project id or name"`
 		Domains       []string `help:"fitler by domain id or name"`
 
-		ProjectDomains []string `help:"filter by project's domain id or name"`
+		ProjectDomainId string
+		ProjectDomains  []string `help:"filter by project's domain id or name"`
 	}
 	R(&RoleAssignmentsOptions{}, "role-assignments", "List all role assignments", func(s *mcclient.ClientSession, args *RoleAssignmentsOptions) error {
 		query := jsonutils.NewDict()
@@ -71,6 +72,9 @@ func init() {
 			}
 			query.Add(jsonutils.NewString(pid), "scope", "project", "id")
 		}
+		if len(args.ProjectDomainId) > 0 {
+			query.Add(jsonutils.NewString(args.ProjectDomainId), "project_domain_id")
+		}
 		if len(args.User) > 0 {
 			uid, err := getUserId(s, args.User, args.UserDomain)
 			if err != nil {

cmd/climc/shell/identity/roles.go

@@ -17,21 +17,100 @@ package identity
 import (
 	"yunion.io/x/jsonutils"
 
-	"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/identity"
 )
 
 func init() {
-	cmd := shell.NewResourceCmd(&modules.RolesV3)
-	cmd.List(&identity.RoleListOptions{})
-	cmd.Show(&identity.RoleDetailOptions{})
-	cmd.Delete(&identity.RoleDetailOptions{})
-	cmd.Create(&identity.RoleCreateOptions{})
-	cmd.Perform("public", &options.BaseIdOptions{})
-	cmd.Perform("private", &options.BaseIdOptions{})
+	type RoleListOptions struct {
+		options.BaseListOptions
+		OrderByDomain string `help:"order by domain name" choices:"asc|desc"`
+	}
+	R(&RoleListOptions{}, "role-list", "List keystone Roles", func(s *mcclient.ClientSession, args *RoleListOptions) error {
+		params, err := options.ListStructToParams(args)
+		if err != nil {
+			return err
+		}
+		result, err := modules.RolesV3.List(s, params)
+		if err != nil {
+			return err
+		}
+		printList(result, modules.RolesV3.GetColumns(s))
+		return nil
+	})
+
+	type RoleDetailOptions struct {
+		ID     string `help:"ID or name of role"`
+		Domain string `help:"Domain"`
+	}
+	R(&RoleDetailOptions{}, "role-show", "Show details of a role", func(s *mcclient.ClientSession, args *RoleDetailOptions) error {
+		query := jsonutils.NewDict()
+		if len(args.Domain) > 0 {
+			domainId, err := modules.Domains.GetId(s, args.Domain, nil)
+			if err != nil {
+				return err
+			}
+			query.Add(jsonutils.NewString(domainId), "domain_id")
+		}
+		role, err := modules.RolesV3.Get(s, args.ID, query)
+		if err != nil {
+			return err
+		}
+		printObject(role)
+		return nil
+	})
+	R(&RoleDetailOptions{}, "role-delete", "Delete a role", func(s *mcclient.ClientSession, args *RoleDetailOptions) error {
+		query := jsonutils.NewDict()
+		if len(args.Domain) > 0 {
+			domainId, err := modules.Domains.GetId(s, args.Domain, nil)
+			if err != nil {
+				return err
+			}
+			query.Add(jsonutils.NewString(domainId), "domain_id")
+		}
+		rid, err := modules.RolesV3.GetId(s, args.ID, query)
+		if err != nil {
+			return err
+		}
+		role, err := modules.RolesV3.Delete(s, rid, nil)
+		if err != nil {
+			return err
+		}
+		printObject(role)
+		return nil
+	})
+
+	type RoleCreateOptions struct {
+		NAME   string `help:"Role name"`
+		Domain string `help:"Domain"`
+		Desc   string `help:"Description"`
+
+		PublicScope string `help:"public scope" choices:"none|system"`
+	}
+	R(&RoleCreateOptions{}, "role-create", "Create a new role", func(s *mcclient.ClientSession, args *RoleCreateOptions) error {
+		params := jsonutils.NewDict()
+		params.Add(jsonutils.NewString(args.NAME), "name")
+		if len(args.Domain) > 0 {
+			domainId, err := modules.Domains.GetId(s, args.Domain, nil)
+			if err != nil {
+				return err
+			}
+			params.Add(jsonutils.NewString(domainId), "domain_id")
+		}
+		if len(args.Desc) > 0 {
+			params.Add(jsonutils.NewString(args.Desc), "description")
+		}
+		if len(args.PublicScope) > 0 {
+			params.Add(jsonutils.NewString(args.PublicScope), "public_scope")
+		}
+		role, err := modules.RolesV3.Create(s, params)
+		if err != nil {
+			return err
+		}
+		printObject(role)
+		return nil
+	})
 
 	type RoleUpdateOptions struct {
 		ID     string `help:"Role ID or Name"`
@@ -66,4 +145,25 @@ func init() {
 		printObject(role)
 		return nil
 	})
+
+	type RolePerformOptions struct {
+		ID string `help:"ID of role to update"`
+	}
+	R(&RolePerformOptions{}, "role-public", "Mark a role public", func(s *mcclient.ClientSession, args *RolePerformOptions) error {
+		result, err := modules.RolesV3.PerformAction(s, args.ID, "public", nil)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	R(&RolePerformOptions{}, "role-private", "Mark a role private", func(s *mcclient.ClientSession, args *RolePerformOptions) error {
+		result, err := modules.RolesV3.PerformAction(s, args.ID, "private", nil)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
 }

cmd/climc/shell/k8s/clusters.go

@@ -16,12 +16,18 @@ package k8s
 
 import (
 	"fmt"
+	"io/ioutil"
+	"os"
+	"path/filepath"
 
 	"yunion.io/x/jsonutils"
+	"yunion.io/x/log"
+	"yunion.io/x/pkg/errors"
 
 	"yunion.io/x/onecloud/pkg/mcclient"
 	"yunion.io/x/onecloud/pkg/mcclient/modules/k8s"
 	o "yunion.io/x/onecloud/pkg/mcclient/options/k8s"
+	"yunion.io/x/onecloud/pkg/util/shellutils"
 )
 
 func initKubeCluster() {
@@ -33,9 +39,10 @@ func initKubeCluster() {
 	cmd.ShowEvent()
 	cmd.List(new(o.ClusterListOptions))
 	cmd.Show(new(o.IdentOptions))
-	cmd.Create(new(o.KubeClusterCreateOptions))
+	cmd.Create(new(o.K8SClusterCreateOptions))
 	cmd.Perform("sync", new(o.ClusterSyncOptions))
 	cmd.Perform("syncstatus", new(o.IdentOptions))
+	cmd.Perform("deploy", new(o.IdentOptions))
 	cmd.Get("components-status", new(o.IdentOptions))
 	cmd.Get("api-resources", new(o.IdentOptions))
 	cmd.Get("cluster-users", new(o.IdentOptions))
@@ -77,8 +84,12 @@ func initKubeCluster() {
 		return nil
 	})
 
-	R(&o.IdentOptions{}, cmdN("addons"), "Get addon manifest of a cluster", func(s *mcclient.ClientSession, args *o.IdentOptions) error {
-		ret, err := k8s.KubeClusters.GetSpecific(s, args.ID, "addons", nil)
+	R(&o.ClusterGetAddonsOpt{}, cmdN("addons"), "Get addon manifest of a cluster", func(s *mcclient.ClientSession, args *o.ClusterGetAddonsOpt) error {
+		params, err := args.Params()
+		if err != nil {
+			return err
+		}
+		ret, err := k8s.KubeClusters.GetSpecific(s, args.ID, "addons", params)
 		if err != nil {
 			return err
 		}
@@ -130,40 +141,24 @@ func initKubeCluster() {
 		return nil
 	})
 
-	R(&o.ClusterComponentTypeOptions{}, cmdN("component-setting"), "Get cluster component setting", func(s *mcclient.ClientSession, args *o.ClusterComponentTypeOptions) error {
+	getComponentSetting := func(s *mcclient.ClientSession, args *o.ClusterComponentType, asHelmValues bool) (jsonutils.JSONObject, error) {
 		q := jsonutils.NewDict()
 		q.Add(jsonutils.NewString(args.TYPE), "type")
-		ret, err := k8s.KubeClusters.GetSpecific(s, args.ID, "component-setting", q)
-		if err != nil {
-			return err
-		}
-		printObject(ret)
-		return nil
-	})
+		q.Add(jsonutils.JSONTrue, "system")
+		q.Add(jsonutils.NewBool(asHelmValues), "as_helm_values")
+		return k8s.KubeClusters.GetSpecific(s, args.ID, "component-setting", q)
+	}
 
-	R(&o.ClusterEnableComponentCephCSIOpt{}, cmdN("component-enable-ceph-csi"), "Enable cluster ceph csi component", func(s *mcclient.ClientSession, args *o.ClusterEnableComponentCephCSIOpt) error {
-		params, err := args.Params()
+	R(&o.ClusterComponentTypeOptions{}, cmdN("component-setting"), "Get cluster component setting", func(s *mcclient.ClientSession, args *o.ClusterComponentTypeOptions) error {
+		ret, err := getComponentSetting(s, &args.ClusterComponentType, args.AsHelmValues)
 		if err != nil {
 			return err
 		}
-		ret, err := k8s.KubeClusters.PerformAction(s, args.ID, "enable-component", params)
-		if err != nil {
-			return err
+		if args.AsHelmValues {
+			printObjectYAML(ret)
+		} else {
+			printObject(ret)
 		}
-		printObject(ret)
-		return nil
-	})
-
-	R(&o.ClusterEnableComponentMonitorOpt{}, cmdN("component-enable-monitor"), "Enable cluster monitor component", func(s *mcclient.ClientSession, args *o.ClusterEnableComponentMonitorOpt) error {
-		params, err := args.Params()
-		if err != nil {
-			return err
-		}
-		ret, err := k8s.KubeClusters.PerformAction(s, args.ID, "enable-component", params)
-		if err != nil {
-			return err
-		}
-		printObject(ret)
 		return nil
 	})
 
@@ -206,6 +201,32 @@ func initKubeCluster() {
 		return nil
 	})
 
+	R(&o.ClusterEnableComponentMinioOpt{}, cmdN("component-enable-minio"), "Enable cluster minio component", func(s *mcclient.ClientSession, args *o.ClusterEnableComponentMinioOpt) error {
+		params, err := args.Params()
+		if err != nil {
+			return err
+		}
+		ret, err := k8s.KubeClusters.PerformAction(s, args.ID, "enable-component", params)
+		if err != nil {
+			return err
+		}
+		printObject(ret)
+		return nil
+	})
+
+	R(&o.ClusterEnableComponentThanosOpt{}, cmdN("component-enable-thanos"), "Enable cluster thanos component", func(s *mcclient.ClientSession, args *o.ClusterEnableComponentThanosOpt) error {
+		params, err := args.Params()
+		if err != nil {
+			return err
+		}
+		ret, err := k8s.KubeClusters.PerformAction(s, args.ID, "enable-component", params)
+		if err != nil {
+			return err
+		}
+		printObject(ret)
+		return nil
+	})
+
 	R(&o.ClusterDisableComponent{}, cmdN("component-disable"), "Enable cluster component", func(s *mcclient.ClientSession, args *o.ClusterDisableComponent) error {
 		params := args.Params()
 		ret, err := k8s.KubeClusters.PerformAction(s, args.ID, "disable-component", params)
@@ -226,7 +247,7 @@ func initKubeCluster() {
 		return nil
 	})
 
-	R(&o.ClusterUpdateComponentCephCSIOpt{}, cmdN("component-update-ceph-csi"), "Update cluster component", func(s *mcclient.ClientSession, args *o.ClusterUpdateComponentCephCSIOpt) error {
+	R(&o.ClusterUpdateComponentCephCSIOpt{}, cmdN("component-update-ceph-csi"), "Update cluster component ceph csi", func(s *mcclient.ClientSession, args *o.ClusterUpdateComponentCephCSIOpt) error {
 		params, err := args.Params()
 		if err != nil {
 			return err
@@ -238,4 +259,95 @@ func initKubeCluster() {
 		printObject(ret)
 		return nil
 	})
+
+	R(&o.ClusterComponentType{}, cmdN("component-update"), "Update cluster component", func(s *mcclient.ClientSession, args *o.ClusterComponentType) error {
+		// 1. get current setting
+		setting, err := getComponentSetting(s, args, false)
+		if err != nil {
+			return errors.Wrap(err, "get component setting")
+		}
+
+		// 2. edit yaml
+		yaml, err := shellutils.Edit(setting.YAMLString())
+		if len(yaml) == 0 {
+			log.Infof("Nothing to update")
+			return nil
+		}
+		nowSetting, err := jsonutils.ParseYAML(yaml)
+		if err != nil {
+			return err
+		}
+		params := args.Params(args.TYPE)
+		params.Update(nowSetting)
+
+		// 3. call update api
+		ret, err := k8s.KubeClusters.PerformAction(s, args.ID, "update-component", params)
+		if err != nil {
+			return err
+		}
+		printObject(ret)
+		return nil
+	})
+
+	type GetKubesprayConfigOpt struct {
+		o.IdentOptions
+		OUTPUT string `help:"Output directory to store config files"`
+	}
+
+	R(&GetKubesprayConfigOpt{}, cmdN("kubespray-config"), "Get cluster kubespray config", func(s *mcclient.ClientSession, args *GetKubesprayConfigOpt) error {
+		conf, err := k8s.KubeClusters.GetSpecific(s, args.ID, "kubespray-config", nil)
+		if err != nil {
+			return err
+		}
+
+		inventoryContent, err := conf.GetString("inventory_content")
+		if err != nil {
+			return errors.Wrap(err, "get inventory content")
+		}
+
+		vars, err := conf.Get("vars")
+		if err != nil {
+			return errors.Wrap(err, "get variables")
+		}
+
+		privateKey, err := conf.GetString("private_key")
+		if err != nil {
+			return errors.Wrap(err, "get private key")
+		}
+
+		if err := os.MkdirAll(args.OUTPUT, 0755); err != nil {
+			return errors.Wrap(err, "mkdir")
+		}
+
+		writeFile := func(name, content string) error {
+			fp := filepath.Join(args.OUTPUT, name)
+			log.Infof("Write file: %s", fp)
+			if err := ioutil.WriteFile(fp, []byte(content), 0644); err != nil {
+				return errors.Wrap(err, "write file")
+			}
+			if err := os.Chmod(fp, 0600); err != nil {
+				return errors.Wrap(err, "chmod")
+			}
+			return nil
+		}
+
+		iPath := filepath.Join(args.OUTPUT, "hosts.ini")
+		vPath := filepath.Join(args.OUTPUT, "vars.json")
+		kPath := filepath.Join(args.OUTPUT, "private_key")
+
+		for fPath, content := range map[string]string{
+			iPath: inventoryContent,
+			vPath: vars.PrettyString(),
+			kPath: privateKey,
+		} {
+			name := filepath.Base(fPath)
+			if err := writeFile(name, content); err != nil {
+				return errors.Wrapf(err, "write file %s", name)
+			}
+		}
+
+		fmt.Printf("try cmd:\nansible-playbook -i %s cluster.yml -b -v --private-key %s --extra-vars @%s\n", iPath, kPath, vPath)
+
+		return nil
+	})
 }

cmd/climc/shell/k8s/machines.go

@@ -29,4 +29,6 @@ func initKubeMachine() {
 	cmd.BatchDelete(new(o.IdentsOptions))
 	cmd.Perform("recreate", new(o.IdentOptions))
 	cmd.Perform("terminate", new(o.IdentOptions))
+	cmd.Get("networkaddress", new(o.MachineListNetworkAddressOptions))
+	cmd.Perform("attach-networkaddress", new(o.MachineAttachNetworkAddressOptions))
 }

cmd/climc/shell/meter/budgets.go

@@ -0,0 +1,30 @@
+// 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 meter
+
+import (
+	"yunion.io/x/onecloud/cmd/climc/shell"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
+	options "yunion.io/x/onecloud/pkg/mcclient/options/meter"
+)
+
+func init() {
+	cmd := shell.NewResourceCmd(&modules.Budgets).WithKeyword("budget")
+	cmd.List(new(options.BudgetListOptions))
+	cmd.Create(new(options.BudgetCreateOptions))
+	cmd.Update(new(options.BudgetUpdateOptions))
+	cmd.Delete(new(options.BudgetDeleteOptions))
+	cmd.Perform("sync-alerts", new(options.BudgetSyncAlertsOptions))
+}

cmd/climc/shell/meter/costreports.go

@@ -0,0 +1,29 @@
+// 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 meter
+
+import (
+	"yunion.io/x/onecloud/cmd/climc/shell"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
+	options "yunion.io/x/onecloud/pkg/mcclient/options/meter"
+)
+
+func init() {
+	cmd := shell.NewResourceCmd(&modules.CostReports).WithKeyword("cost-report")
+	cmd.List(new(options.CostReportListOptions))
+	cmd.Create(new(options.CostReportCreateOptions))
+	cmd.Update(new(options.CostReportUpdateOptions))
+	cmd.Delete(new(options.CostReportDeleteOptions))
+}

cmd/climc/shell/meter/meter-events.go

@@ -0,0 +1,29 @@
+// 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 meter
+
+import (
+	"yunion.io/x/onecloud/cmd/climc/shell/events"
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
+)
+
+func doMeterEventList(s *mcclient.ClientSession, args *events.EventListOptions) error {
+	return events.DoEventList(modules.MeterLogs, s, args)
+}
+
+func init() {
+	R(&events.EventListOptions{}, "meter-event-show", "Show operation meter event logs", doMeterEventList)
+}

cmd/climc/shell/meter/reservations.go

@@ -0,0 +1,26 @@
+// 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 meter
+
+import (
+	"yunion.io/x/onecloud/cmd/climc/shell"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
+	options "yunion.io/x/onecloud/pkg/mcclient/options/meter"
+)
+
+func init() {
+	cmd := shell.NewResourceCmd(&modules.Reservations).WithKeyword("reservation")
+	cmd.List(new(options.ReservationListOptions))
+}