zhengjiajie
04aaf35132
modify fmt
2018-09-15 19:44:27 +08:00
zhengjiajie
94748d1cdc
modify params
2018-09-15 19:41:35 +08:00
zhengjiajie
175f01e5c9
zhengjiajie modify list method
2018-09-15 19:31:08 +08:00
zhengjiajie
f44ae64773
zhengjiajie modify list method
2018-09-15 19:25:48 +08:00
Qiu Jian
f43c278d90
guestdisk support index filter
2018-09-15 18:04:08 +08:00
屈轩
c60ca1d6eb
resolve conflict
2018-09-15 14:07:45 +08:00
屈轩
c09a63442f
Merge branch 'release/2.2.0' of ssh://git.yunion.io/~quxuan/onecloud into feature/qx-azure
2018-09-15 14:02:21 +08:00
邱剑
86eca9166f
Automatic merge from release/2.1.0 -> release/2.2.0
...
* commit '7199e848d46f7509d5b10eac00d1623ad073e9e7':
adjust import order
fix typos
增加eip操作的状态变化
network/wire/vpc增加zone/region信息
修正：1. 主机创建／rebuild root密码设置问题 2. climc 密码设置问题 3. billing_type字段为空导致创建主机失败问题
2018-09-15 12:53:10 +08:00
邱剑
7199e848d4
Merge pull request #215 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-bugfix-misc-20180914 to release/2.1.0
...
* commit 'd9e401249e5ccd4108e011a47e6145d7ee8e7002':
adjust import order
fix typos
增加eip操作的状态变化
network/wire/vpc增加zone/region信息
修正：1. 主机创建／rebuild root密码设置问题 2. climc 密码设置问题 3. billing_type字段为空导致创建主机失败问题
2018-09-15 12:53:09 +08:00
李泽玺
33a98593cb
Automatic merge from release/2.1.0 -> release/2.2.0
...
* commit '91ca98de309e2aeb2eb5af0f7c4cde213585c721':
region: capabilities add specs
region: query model by spec keys, filter by zone
region: spec handler
2018-09-15 10:16:30 +08:00
李泽玺
91ca98de30
Merge pull request #216 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feature/lzx-spec to release/2.1.0
...
* commit '27f7e0d55f3104f0e9bab68fa77b254b45c6e3c2':
region: capabilities add specs
region: query model by spec keys, filter by zone
region: spec handler
2018-09-15 10:16:30 +08:00
Zexi Li
2d1484f71e
region: query model by spec keys, filter by zone
2018-09-15 05:27:29 +08:00
Qiu Jian
8c2250517f
修正：1. 主机创建／rebuild root密码设置问题 2. climc 密码设置问题 3.
...
billing_type字段为空导致创建主机失败问题
2018-09-15 00:31:58 +08:00
Qiu Jian
aad6aada76
Merge branch 'release/2.1.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-2.2.0-20180914-20
...
Conflicts:
pkg/compute/models/guests.go
2018-09-14 20:21:19 +08:00
邱剑
ced99b919b
Merge pull request #213 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:bugfix/wyq/cache-token to release/2.1.0
...
* commit '197a0df5fdbf388dfd3d21ebc5152f3bf32e41d6':
default unuse cached token
2018-09-14 20:17:51 +08:00
wanyaoqi
197a0df5fd
default unuse cached token
2018-09-14 20:11:28 +08:00
邱剑
a61c905600
Merge pull request #209 in YUNIONIO/onecloud from feature/meter-resouce-detail-export to release/2.2.0
...
* commit '0ff0e22a4c8e71393e04d8ae069743a0d37c7516':
zhengjiajie modify code
fmt code
ftm code
zhengjiajie submit resource result export
2018-09-14 19:42:59 +08:00
zhengjiajie
0ff0e22a4c
zhengjiajie modify code
2018-09-14 19:06:30 +08:00
wanyaoqi
7600710fb4
if disk resized, update disk size to snapshot size
...
did not auto snapshot when guest not in status ready or running
add snapshot-show
2018-09-14 17:30:38 +08:00
屈轩
3c5671d188
Merge branch 'release/2.2.0' of ssh://git.yunion.io/~quxuan/onecloud into feature/qx-azure
2018-09-14 14:29:29 +08:00
邱剑
784dc871e4
Automatic merge from release/2.1.0 -> release/2.2.0
...
* commit 'f331e3917d7eef2efac7ac1f6df3edd7dafffa26':
region: network list by cloudregion
2018-09-14 13:45:35 +08:00
Zexi Li
eb77372794
region: network list by cloudregion
2018-09-14 13:26:43 +08:00
zhengjiajie
ef725ad155
fmt code
2018-09-14 12:38:34 +08:00
zhengjiajie
a9965699ca
ftm code
2018-09-14 12:30:27 +08:00
zhengjiajie
71affd88f4
zhengjiajie submit resource result export
2018-09-14 12:17:17 +08:00
李泽玺
f922bc1b0d
Automatic merge from release/2.1.0 -> release/2.2.0
...
* commit '5b74e3c8e60956682d043f833994dd4d2c9a5c43':
climc: k8s options, code refactor
2018-09-13 18:24:58 +08:00
李泽玺
5b74e3c8e6
Merge pull request #202 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feature/lzx-climc-k8s.v3 to release/2.1.0
...
* commit 'f1fec1b49e2d57456f14a0f7f6db4ceec037a4e2':
climc: k8s options, code refactor
2018-09-13 18:24:57 +08:00
邱剑
5ac4030c8b
Automatic merge from release/2.1.0 -> release/2.2.0
...
* commit '8d55a35d1d76a91ac0db04c2079f14463f1e0833':
zones/<zone_id>/capabilities => zones/<zone_id>/capability climc changes
2018-09-13 16:49:47 +08:00
屈轩
730d83b733
resolve conflict
2018-09-13 16:25:56 +08:00
屈轩
ac979bc8c1
Merge branch 'release/2.2.0' of ssh://git.yunion.io/~quxuan/onecloud into feature/qx-azure
2018-09-13 16:22:53 +08:00
Zexi Li
f1fec1b49e
climc: k8s options, code refactor
2018-09-13 15:04:39 +08:00
TangBin
d4ab9d8b69
bugfix import path error
2018-09-13 14:35:35 +08:00
TangBin
9b6b1a76a6
Merge branch 'release/2.2.0' into feature/tb-paramter-climc
2018-09-13 14:25:12 +08:00
TangBin
b7ca29581f
add yunionconf service
2018-09-13 14:24:20 +08:00
Qiu Jian
7512a060be
zones/<zone_id>/capabilities => zones/<zone_id>/capability climc changes
2018-09-13 13:19:04 +08:00
邱剑
24751ec50a
Automatic merge from release/2.1.0 -> release/2.2.0
...
* commit '329cf9aa5afa944ddacdebee004bafd3e4cdb610':
修正：1. image更新时丢失properties属性 2. 虚拟机Get/List返回增加manager_id字段 3. 创建eip时候chargetype不生效
2018-09-12 20:06:22 +08:00
wanyaoqi
fb330c98be
disk reset
...
minor fixs
2018-09-12 19:59:00 +08:00
Qiu Jian
860f6b8c02
修正：1. image更新时丢失properties属性 2. 虚拟机Get/List返回增加manager_id字段 3. 创建eip时候chargetype不生效
2018-09-12 18:22:50 +08:00
屈轩
20381d0775
resolve conflict
2018-09-12 15:28:34 +08:00
邱剑
3b6b0c3795
Automatic merge from release/2.1.0 -> release/2.2.0
...
* commit 'a1b67853de1238e0d8ce0a569c4d8214dedca934':
mcclient: register WebConsole
climc: support create resource from file, raw put body fix
2018-09-11 21:56:07 +08:00
邱剑
a1b67853de
Merge pull request #175 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feature/lzx-k8s-deploy-from-file to release/2.1.0
...
* commit '32adce2d02d4cc820ccafc9a0cfb4f6227ec5b15':
mcclient: register WebConsole
climc: support create resource from file, raw put body fix
2018-09-11 21:56:06 +08:00
邱剑
33884e5f75
Automatic merge from release/2.1.0 -> release/2.2.0
...
* commit 'e2b3cbd1d09e699a2b7c7be969252b282e034134':
region: cloudregion usage
2018-09-11 21:53:58 +08:00
Zexi Li
c860812e91
region: cloudregion usage
2018-09-11 18:15:40 +08:00
屈轩
224193248f
resolve conflict
2018-09-11 16:39:49 +08:00
邱剑
786489162b
Automatic merge from release/2.1.0 -> release/2.2.0
...
* commit 'e03a31a65d32799840888d124d61f731382569ae':
dep: update structarg
climc: trim angle brackets for required options
validators: add BoolValidator
validators: add ValidatorStringMultiChoices
2018-09-11 00:12:39 +08:00
邱剑
e03a31a65d
Merge pull request #182 in YUNIONIO/onecloud from ~ZHOUYOUSONG/onecloud:bugfix/yousong-minors to release/2.1.0
...
* commit 'ad67ecb7dd46cc0ecf32c3a1104da9d89b9b8054':
dep: update structarg
climc: trim angle brackets for required options
validators: add BoolValidator
validators: add ValidatorStringMultiChoices
2018-09-11 00:12:39 +08:00
Yousong Zhou
2325aa7ad0
climc: trim angle brackets for required options
2018-09-10 16:08:21 +00:00
邱剑
a42cef6e77
Merge pull request #160 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:feature/wyq/local-disk-snapshot to release/2.2.0
...
* commit '5b5733916624792de9fe4c1aa438c0d320e80a4e':
fix code
- local disk snapshot create and delete - auto snapshot everyday - rewrite cornman - make dep and some fix - fix conflict
2018-09-10 23:55:25 +08:00
邱剑
c4ec9a4721
Merge pull request #176 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:feature/qj-server-associate-dissociate-eip to release/2.1.0
...
* commit '9365da05f64000d4bfedbecb298c3820dc7ac189':
增加：server-associate-eip/server-dissociate-eip接口
2018-09-10 23:53:33 +08:00
邱剑
4a53a4154b
Automatic merge from release/2.1.0 -> release/2.2.0
...
* commit 'c4ec9a47212cc1acaf010654eac7e735d35fbb7f':
增加：server-associate-eip/server-dissociate-eip接口
2018-09-10 23:53:33 +08:00
zhengjiajie