Commit Graph
95 Commits
Author SHA1 Message Date
邱剑 2855cfbf8a Automatic merge from release/2.1.0 -> release/2.2.0
* commit 'ab8d120580317d802d6a1150c86b91bd0641a341':
  server create disk
  minor fix
  attach detach isolate device
  server attach detach network, change bandwidth, some bug fix
  guest desc, guest sendkey, fix disk delete
2018-09-14 17:04:39 +08:00
wanyaoqi f910f6ada7 server attach detach network, change bandwidth, some bug fix 2018-09-14 11:50:22 +08:00
Qiu Jian 2ece630d4a Merge branch 'release/2.1.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-2.2.0-20180914
Conflicts:
	pkg/compute/guestdrivers/aliyun.go
2018-09-14 11:26:23 +08:00
Qiu Jian 76231936a9 Merge branch 'release/2.1.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-bugfix-misc-20180913 2018-09-14 01:47:12 +08:00
Qiu Jian 447b0b4a1c undo changes to virtualjointbase.go 2018-09-14 01:42:59 +08:00
Qiu Jian f7769ef1e3 修正:1. 阿里云rebuild root重构 2. 其他一些fix 2018-09-14 01:15:41 +08:00
周有松 019784716e Automatic merge from release/2.1.0 -> release/2.2.0
* commit 'f603867960fab8c2aa57a0b7f5eea8aaf12c67c9':
  validators: add Optional() to IValidator for use in ValidateUpdateData()
  mcclient: options: set details=true when --pending-delete-all is specified
  cloudcommon: virtualresource: show pending_deleted field when queried
  cloudcommon: virtualresource: optimize list with --field specified
2018-09-13 11:59:58 +08:00
Yousong Zhou dd38b2b53d validators: add Optional() to IValidator for use in ValidateUpdateData() 2018-09-13 02:06:41 +00:00
Yousong Zhou c66e264aff cloudcommon: virtualresource: show pending_deleted field when queried 2018-09-13 02:06:41 +00:00
Yousong Zhou 2ff04e3d97 cloudcommon: virtualresource: optimize list with --field specified
No functional change
2018-09-13 02:06:12 +00:00
邱剑 12b1ef939e Merge pull request #183 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:bugfix/qj-lockman-enable-inmemery-lock to release/2.1.0
* commit '0a29b0add76df86c0d5081db809631c22d728bf1':
  remove binary
  增加:镜像缓存加锁,避免批量创建时重复上传镜像
  remove binary
  使用inmemory lockman
  initial commit
2018-09-12 14:54:15 +08:00
邱剑 9c7b95bef5 Automatic merge from release/2.1.0 -> release/2.2.0
* commit '12b1ef939eb190af6c25790a0b8b5357aa678173':
  remove binary
  增加:镜像缓存加锁,避免批量创建时重复上传镜像
  remove binary
  使用inmemory lockman
  initial commit
2018-09-12 14:54:15 +08:00
邱剑 81cb8297ba Merge pull request #188 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-redundant-params to release/2.2.0
* commit '1a30516b0f82d34401c0f78ff69317a343c0aafa':
  minor fixes
  修正:radix match params只包含匹配的参数
2018-09-12 14:53:37 +08:00
邱剑 922f2ac07e Automatic merge from release/2.1.0 -> release/2.2.0
* commit '8ff02cfd90495a86bad9c1d14107f9a9ca3189de':
  mcclient: options: accomodate time.Time type
  mcclient: options: allow listing all resources including pending_deleted
  validators: rework error handling
  validators: StringMultiChoicesValidator: add test case
2018-09-12 14:09:25 +08:00
Yousong Zhou cc70be165f validators: rework error handling
- Return httperrors by default (return ValidateError when testing)
 - Special casing sql.ErrNoRows for model not found
2018-09-12 01:26:52 +00:00
Yousong Zhou 2b691c5dbd validators: StringMultiChoicesValidator: add test case 2018-09-12 01:26:52 +00:00
Qiu Jian 1a30516b0f minor fixes 2018-09-12 01:14:33 +08:00
Qiu Jian 0a29b0add7 remove binary 2018-09-11 21:51:10 +08:00
Qiu Jian a6d8ee1173 增加:镜像缓存加锁,避免批量创建时重复上传镜像 2018-09-11 21:40:31 +08:00
Qiu Jian cda52bf9b8 remove binary 2018-09-11 13:09:40 +08:00
Qiu Jian 9a6eeb30f6 使用inmemory lockman 2018-09-11 13:07:51 +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
邱剑 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
Yousong Zhou 75f38447fd validators: add BoolValidator 2018-09-10 16:08:17 +00:00
Yousong Zhou b4f00220f9 validators: add ValidatorStringMultiChoices 2018-09-10 16:08:13 +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
邱剑 cb4a0c0185 Automatic merge from release/2.1.0 -> release/2.2.0
* commit 'bc9979d918c926fc1fb865602ffae795ff2e79cc':
  修正:secgroup initializedb需要admin token,修改initAuth同步执行,确保admin token可用
2018-09-10 23:53:11 +08:00
Qiu Jian 4f403ad9f2 initial commit 2018-09-10 23:30:31 +08:00
Qiu Jian 2c9e203bb3 修正:secgroup initializedb需要admin
token,修改initAuth同步执行,确保admin token可用
2018-09-10 16:03:42 +08:00
李泽玺 ee447e4750 Merge pull request #173 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:feature/qj-merge-path-params-into-querystring to release/2.2.0
* commit '035ad926c85b8e7d5a341253253a3453ac0e4ef9':
  改进:把path中的params合并到querystring中,这样允许在listItemFilter中访问这些params参数,并且实现对数据的过滤
2018-09-10 10:17:56 +08:00
Qiu Jian 035ad926c8 改进:把path中的params合并到querystring中,这样允许在listItemFilter中访问这些params参数,并且实现对数据的过滤 2018-09-08 17:33:46 +08:00
wanyaoqi 4f2b50a869 - local disk snapshot create and delete
- auto snapshot everyday
- rewrite cornman
- make dep and some fix
- fix conflict
2018-09-06 16:22:36 +08:00
Qiu Jian 7c795f7975 修正:1. 阿里云主机镜像正确设置Platform后,可以正确初始化密码和蜜钥
2.
系统启动默认创建default安全组,主机默认安全组设置为default。defalt安全组默认出入都开放
2018-09-06 15:10:55 +08:00
Qiu Jian 45f7f6febe Merge branch 'release/2.1.0' of ssh://git.yunion.io/~qiujian/onecloud into feature/qj-elastic-ip 2018-09-04 23:46:43 +08:00
Qiu Jian f4f2d8fb97 浮动IP支持 2018-09-04 23:04:29 +08:00
邱剑 fa50e68031 Merge pull request #150 in YUNIONIO/onecloud from feature/rex-logclient-20180822-1018 to release/2.1.0
* commit '4249e2486a04bd080218b59fc12ffe1f416ad6fa':
  阿里云服务器同步、全量同步操作日志。
  阿里云解绑
  rm log
  日志接口重构;阿里云修改密码、变更配置加日志
  阿里云变更配置增加日志
  更改项目
  接口重构,与OpsLog.LogEvent 保持一致
  阿里云重装系统、开机关机、同步状态日志
  阿里云虚机删除日志
  阿里云创建虚机失败时记录 actionlog
  增加logclient; aliyun server crud 操作
  增加logclient
2018-09-03 21:13:41 +08:00
屈轩 4f024ad282 添加同步log信息 2018-09-03 10:53:19 +08:00
李泽玺 c43c79c178 Automatic merge from release/2.0.0 -> release/2.1.0
* commit 'b8bbd34001d2248eca3ceced5428900c9ddd0fd1':
  mcclient: options: BaseListOptions: make OrderBy a list option
  resourcebase: updated_at: set list:"user"
2018-09-01 10:57:09 +08:00
李泽玺 b8bbd34001 Merge pull request #145 in YUNIONIO/onecloud from ~ZHOUYOUSONG/onecloud:bugfix/yousong-minors to release/2.0.0
* commit '0094a5cffc925796cc7ef1095f0c12592054c30e':
  mcclient: options: BaseListOptions: make OrderBy a list option
  resourcebase: updated_at: set list:"user"
2018-09-01 10:57:07 +08:00
Yousong Zhou c559bcd933 resourcebase: updated_at: set list:"user" 2018-08-31 11:07:13 +00:00
Zhang Dongliang adfb5ae364 日志接口重构;阿里云修改密码、变更配置加日志 2018-08-31 09:39:11 +08:00
邱剑 4ed958cf84 Automatic merge from release/2.0.0 -> release/2.1.0
* commit '2dd13257361edec640f0bdb9d4616a37df7cd211':
  cloudcommon: add validator helpers
2018-08-31 01:24:08 +08:00
Yousong Zhou 7ad2624a7c cloudcommon: add validator helpers 2018-08-30 07:47:08 +00:00
wanyaoqi e2d4054367 extend joint filter 2018-08-29 17:55:13 +08:00
Zhang Dongliang 5a1bb8dd97 merge release/2.1.0 2018-08-29 15:52:53 +08:00
Zhang Dongliang 3b8562a22c 更改项目 2018-08-29 15:43:59 +08:00
wanyaoqi 1e5a231e06 make dep and fix words releated->related 2018-08-28 13:39:54 +08:00
Zhang Dongliang eb135f71dc 接口重构,与OpsLog.LogEvent 保持一致 2018-08-27 18:00:13 +08:00
wanyaoqi d1607e7be6 support joint filter 2018-08-25 18:58:24 +08:00
TangBin 8167aa0c85 fix Conflict 2018-08-25 18:07:54 +08:00