Commit Graph
358 Commits
Author SHA1 Message Date
邱剑 329cf9aa5a Merge pull request #196 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-misc-20180912 to release/2.1.0
* commit '860f6b8c0248f9d3951ae6538ae29d1bf81432a4':
  修正:1. image更新时丢失properties属性 2. 虚拟机Get/List返回增加manager_id字段 3. 创建eip时候chargetype不生效
2018-09-12 20:06:22 +08:00
邱剑 48dd7ffe37 Automatic merge from release/2.0.0 -> release/2.1.0
* commit '883f321db71934a59d6b789d3febf7d8f5579def':
  避免只使用第一个storage
2018-09-12 19:29:08 +08:00
邱剑 883f321db7 Merge pull request #194 in YUNIONIO/onecloud from ~QUXUAN/onecloud:bugfix/qx-storage-choise to release/2.0.0
* commit 'f3b4b4d3146c9ac5b12bad89eb3d48842984aab0':
  避免只使用第一个storage
2018-09-12 19:29:08 +08:00
Qiu Jian 860f6b8c02 修正:1. image更新时丢失properties属性 2. 虚拟机Get/List返回增加manager_id字段 3. 创建eip时候chargetype不生效 2018-09-12 18:22:50 +08:00
屈轩 f3b4b4d314 避免只使用第一个storage 2018-09-12 16:12:47 +08:00
邱剑 f15f944e04 Merge pull request #193 in YUNIONIO/onecloud from ~QUXUAN/onecloud:bugfix/qx-storage-cached-image to release/2.1.0
* commit '063a7c1b00c691ff25223ff1d2f3755a4ae9ae5a':
  避免storagecachedimage数据库操作时panic
2018-09-12 15:34:32 +08:00
屈轩 063a7c1b00 避免storagecachedimage数据库操作时panic 2018-09-12 15:30:35 +08:00
邱剑 e8cf494496 Automatic merge from release/2.0.0 -> release/2.1.0
* commit '5087a48e8e3720f8666972f55946c81c277db2aa':
  避免append同一个network
2018-09-12 15:21:45 +08:00
屈轩 45c7f7345d 避免append同一个network 2018-09-12 15:17:27 +08: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
邱剑 41a806cc8c Merge pull request #189 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:feature/qj-filter-guest-by-eip to release/2.1.0
* commit '9a8d0e77a9794e9b52d8eb2b77ff8a00ec7da42a':
  增加:guests支持with_eip=true和without_eip=true两个过滤条件
2018-09-12 14:53:52 +08:00
邱剑 8ff02cfd90 Merge pull request #187 in YUNIONIO/onecloud from ~ZHOUYOUSONG/onecloud:bugfix/yousong-minors to release/2.1.0
* commit 'af0603d6db82f884552644b3b78f02c8e6ffae56':
  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:24 +08:00
邱剑 2449eb333f Merge pull request #190 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feautre/lzx-webconsole-shell to release/2.1.0
* commit '1fba463cda118632c522b4bf3ee5330e2bfd5c4f':
  - use sh to connect k8s pod - ensure required binaries exist
2018-09-12 14:08:55 +08:00
邱剑 f831c8daea Automatic merge from release/2.0.0 -> release/2.1.0
* commit '4288cd0c33d7f19efc6862d178765e96a841fc5b':
  climc: server deploy and save-image auto_start
2018-09-12 14:07:07 +08:00
Zexi Li f90c7dce3f climc: server deploy and save-image auto_start 2018-09-12 13:46:17 +08:00
Zexi Li 1fba463cda - use sh to connect k8s pod
- ensure required binaries exist
2018-09-12 11:00:08 +08:00
Yousong Zhou af0603d6db mcclient: options: accomodate time.Time type 2018-09-12 01:26:52 +00:00
Yousong Zhou d98e3b325f mcclient: options: allow listing all resources including pending_deleted 2018-09-12 01:26:52 +00: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 9a8d0e77a9 增加:guests支持with_eip=true和without_eip=true两个过滤条件 2018-09-12 02:02:06 +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
邱剑 e2b3cbd1d0 Merge pull request #185 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feature/lzx-cloud-region-usage to release/2.1.0
* commit 'c860812e9179dbeb1c3dbf26628e5dddd1f05566':
  region: cloudregion usage
2018-09-11 21:53:57 +08:00
邱剑 5516983e02 Merge pull request #184 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-disk-sync to release/2.1.0
* commit 'b7be94f2d265c93df941fa98a35a15ca5b6f8154':
  同步云盘名称
2018-09-11 21:52:20 +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
wanyaoqi 07ef04aae2 support filter attached disk 2018-09-11 19:44:00 +08:00
Zexi Li c860812e91 region: cloudregion usage 2018-09-11 18:15:40 +08:00
屈轩 b7be94f2d2 同步云盘名称 2018-09-11 17:00:07 +08:00
Zexi Li 32adce2d02 mcclient: register WebConsole 2018-09-11 15:39:59 +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
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
邱剑 f32205086e Merge pull request #181 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-secgroup-rules to release/2.1.0
* commit '48ce6b7c0e78ee81f0d6b23ede1b49158b002e06':
  protocol为空则指定protocol为any
2018-09-10 23:53:54 +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
邱剑 480d7cd65e Merge pull request #170 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:feature/qj-aliyun-account-balance to release/2.1.0
* commit '0c79c6e4e6a907073e25dcde0645b457a151e0a8':
  增加阿里云账户余额接口支持
2018-09-10 23:53:17 +08:00
Qiu Jian 4f403ad9f2 initial commit 2018-09-10 23:30:31 +08:00
屈轩 48ce6b7c0e protocol为空则指定protocol为any 2018-09-10 16:42:39 +08:00
Zexi Li eb3ff786a7 climc: support create resource from file, raw put body fix 2018-09-10 16:32:18 +08:00
Qiu Jian 2c9e203bb3 修正:secgroup initializedb需要admin
token,修改initAuth同步执行,确保admin token可用
2018-09-10 16:03:42 +08:00
Zhang Dongliang 7f624c46b5 go fmt. 2018-09-10 15:43:20 +08:00
Zhang Dongliang 3ffe3fc722 去掉临时调试信息; gofmt 2018-09-10 15:40:55 +08:00
Zhang Dongliang 6199b3b7a4 去掉临时调试信息 2018-09-10 15:38:20 +08:00
Qiu Jian 9365da05f6 增加:server-associate-eip/server-dissociate-eip接口 2018-09-10 14:15:43 +08:00
邱剑 481a6a1ae6 Merge pull request #171 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:feature/qj-general-capabilities to release/2.1.0
* commit '3c8ea2cddf8e586d280dac8849e7e50c0dabbb13':
  增加/capabilities接口,获取后端的总体能力信息,用于按需显示云端服务菜单
2018-09-10 11:18:22 +08:00
邱剑 f5c95dc358 Merge pull request #166 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:bugfix/wyq/fix-host-vnc to release/2.1.0
* commit 'bf71e62224bdd4a2a7d9aa2c24b2687e26aad091':
  regionv2 support vnc connect baremetal
2018-09-09 19:13:40 +08:00
邱剑 5de6c10a4b Merge pull request #167 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-fix-aliyun-vm-unaccessible to release/2.1.0
* commit '1aa1fba80111ad9fc4a9f80d99efeba47f947753':
  修正:已经绑定EIP的主机不能再绑定EIP
  修正:1. 阿里云主机镜像正确设置Platform后,可以正确初始化密码和蜜钥 2. 系统启动默认创建default安全组,主机默认安全组设置为default。defalt安全组默认出入都开放
2018-09-09 09:06:07 +08:00
Qiu Jian 1aa1fba801 修正:已经绑定EIP的主机不能再绑定EIP 2018-09-07 14:32:57 +08:00