opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-21 14:19:49 +08:00
Code Issues Packages Projects Releases Wiki Activity
648 Commits 27 Branches 687 Tags
c96849e3343879e60925d2ab92bcfbbb6f43dff1
Commit Graph
232 Commits
Author SHA1 Message Date
Yousong Zhou c96849e334 guests: allow change nic bandwidth to 0 
To restore the default no limit behavior
 2018-10-18 07:18:58 +00:00
Qiu Jian 7a557668fa 在VM的diskinfo详情中增加image_id和image信息 2018-10-11 23:28:03 +08:00
邱剑 e865fc725c Merge pull request #278 in YUNIONIO/onecloud from ~QUXUAN/onecloud:bugfix/qx-region-guest-count to release/2.1.0 
* commit '749c1daac19f4f3a894488f80c1b212e9f168d6c':
  修复查询defautl region时guests count异常
 2018-10-09 21:59:37 +08:00
屈轩 749c1daac1 修复查询defautl region时guests count异常 2018-10-09 21:56:39 +08:00
Qiu Jian 127302cb3b Merge branch 'release/2.0.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-2.1.0-20180930 
Conflicts:
	pkg/compute/models/secgroups.go
 2018-09-30 10:21:22 +08:00
屈轩 8fc8d892fa 显示安全组规则 2018-09-29 18:23:22 +08:00
屈轩 eb95ee7156 添加region对guest统计数据 2018-09-29 11:50:13 +08:00
邱剑 abd31a2fb8 Merge pull request #255 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-cloudprovider-sum-guest to release/2.1.0 
* commit '873724b1fbdef79890367951896768b24fd849e7':
  cloudprovider返回虚机数量信息
 2018-09-27 18:26:34 +08:00
屈轩 873724b1fb cloudprovider返回虚机数量信息 2018-09-27 18:20:44 +08:00
邱剑 4e7702f0ae Merge pull request #250 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-secgroup to release/2.1.0 
* commit '13c576672baa713385c7a14fabf73aca4ec91f85':
  避免私有云安全组规则下发不完成,ruleset后面补充
 2018-09-26 15:48:06 +08:00
屈轩 13c576672b 避免私有云安全组规则下发不完成,ruleset后面补充 2018-09-26 15:30:39 +08:00
Yousong Zhou 8e2e19fde9 hosts: fix possible nil memory access issue 
The code allows the existence of a netinterface to exist without
baremetalnetwork info, yet the host-show does not take into account this
relaxation.  Log the error instead of throwing runtime error bomb

[E 180920 04:21:34 appsrv.(*WorkerManager).execCallback.func1(workers.go:64)] WorkerManager exec callback error: runtime error: invalid memory address or nil pointer dereference
goroutine 160 [running]:
runtime/debug.Stack(0xc420789858, 0x527d43, 0x12cec16)
        /home/yunion/.usr/go/goroot-1.10.4/src/runtime/debug/stack.go:24 +0xa7
runtime/debug.PrintStack()
        /home/yunion/.usr/go/goroot-1.10.4/src/runtime/debug/stack.go:16 +0x22
yunion.io/x/onecloud/pkg/appsrv.(*WorkerManager).execCallback.func1(0xc420958440)
        /home/yunion/go/src/yunion.io/x/onecloud/pkg/appsrv/workers.go:65 +0x9e
panic(0x1021780, 0x1dcd4e0)
        /home/yunion/.usr/go/goroot-1.10.4/src/runtime/panic.go:502 +0x229
yunion.io/x/onecloud/vendor/yunion.io/x/jsonutils.(*JSONDict).SortedKeys(0x0, 0xc4202cbd7b, 0x0, 0x0)
        /home/yunion/go/src/yunion.io/x/onecloud/vendor/yunion.io/x/jsonutils/jsonutils.go:521 +0x37
yunion.io/x/onecloud/vendor/yunion.io/x/jsonutils.(*JSONDict).String(0x0, 0xc4202cbc5b, 0x0)
        /home/yunion/go/src/yunion.io/x/onecloud/vendor/yunion.io/x/jsonutils/jsonutils.go:533 +0x5a
yunion.io/x/onecloud/vendor/yunion.io/x/jsonutils.(*JSONArray).String(0xc4206145a0, 0xc42046453a, 0x0)
        /home/yunion/go/src/yunion.io/x/onecloud/vendor/yunion.io/x/jsonutils/jsonutils.go:610 +0x6b
yunion.io/x/onecloud/vendor/yunion.io/x/jsonutils.(*JSONDict).String(0xc42000e388, 0xc42046423a, 0x0)
        /home/yunion/go/src/yunion.io/x/onecloud/vendor/yunion.io/x/jsonutils/jsonutils.go:540 +0xd4
yunion.io/x/onecloud/vendor/yunion.io/x/jsonutils.(*JSONDict).String(0xc42000e3b8, 0x1294d5d, 0xc)
        /home/yunion/go/src/yunion.io/x/onecloud/vendor/yunion.io/x/jsonutils/jsonutils.go:540 +0xd4
yunion.io/x/onecloud/pkg/appsrv.SendJSON(0x13b44c0, 0xc42088e1e0, 0x13c2740, 0xc42000e3b8)
        /home/yunion/go/src/yunion.io/x/onecloud/pkg/appsrv/send.go:27 +0x84
yunion.io/x/onecloud/pkg/appsrv/dispatcher.getHandler(0x13b6740, 0xc4207501b0, 0x13b44c0, 0xc42088e1e0, 0xc42010a000)
        /home/yunion/go/src/yunion.io/x/onecloud/pkg/appsrv/dispatcher/dispatcher.go:165 +0x46a
yunion.io/x/onecloud/pkg/mcclient/auth.Authenticate.func1(0x13b6740, 0xc42088e360, 0x13b44c0, 0xc42088e1e0, 0xc42010a000)
        /home/yunion/go/src/yunion.io/x/onecloud/pkg/mcclient/auth/middleware.go:33 +0x1ba
yunion.io/x/onecloud/pkg/appsrv.(*Application).defaultHandle.func1()
        /home/yunion/go/src/yunion.io/x/onecloud/pkg/appsrv/appsrv.go:271 +0x4a5
yunion.io/x/onecloud/pkg/appsrv.(*WorkerManager).execCallback(0xc4202c8340, 0xc420958440)
        /home/yunion/go/src/yunion.io/x/onecloud/pkg/appsrv/workers.go:72 +0x50
yunion.io/x/onecloud/pkg/appsrv.(*WorkerManager).workerRun(0xc4202c8340, 0x1)
        /home/yunion/go/src/yunion.io/x/onecloud/pkg/appsrv/workers.go:49 +0x78
created by yunion.io/x/onecloud/pkg/appsrv.(*WorkerManager).schedule
        /home/yunion/go/src/yunion.io/x/onecloud/pkg/appsrv/workers.go:84 +0xcc
 2018-09-25 07:49:25 +00:00
邱剑 7d019f0e45 Merge pull request #237 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-secgroup-sync to release/2.1.0 
* commit '3d64601d3978dd1571eba13f179396d33707c1a9':
  避免同步出现重复安全组
 2018-09-20 18:21:55 +08:00
屈轩 3d64601d39 避免同步出现重复安全组 2018-09-20 15:14:55 +08:00
李泽玺 24e0f1867f Merge pull request #240 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feature/lzx-update-container-mem to release/2.1.0 
* commit '79efc7e2d5e17cbcf84d415d9b017c355bf9540e':
  region: guest min memory size to 8MB
 2018-09-20 12:26:31 +08:00
Zexi Li 79efc7e2d5 region: guest min memory size to 8MB 2018-09-20 11:34:46 +08:00
Qiu Jian 6fbc45922c Managed server (aliyun) add manager/manager_id fields 2018-09-20 11:12:14 +08:00
Zexi Li 040722ac8c region: ignore status to update container cpu and memory 2018-09-19 11:55:18 +08:00
邱剑 5ddb796c9d Merge pull request #227 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:feature/qj-support-excel-export to release/2.1.0 
* commit 'ad83b42b1a32cdfaf6aec33a783c9c142d13610c':
  不序列化export_file和export_texts
  修正：qutoa的images使用量不准确
  支持将list的结果导出为excel文件
 2018-09-18 10:26:15 +08:00
Qiu Jian 70be87bbe5 修正：qutoa的images使用量不准确 2018-09-17 22:36:50 +08:00
Qiu Jian c2111bcc6e 修正：eip操作失败后没有正确恢复状态 2018-09-17 09:16:49 +08:00
邱剑 1bb838607b Merge pull request #220 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-bugfix-misc-20180915 to release/2.1.0 
* commit 'e460919cbe404a9cda851eabadb96cc8575fa524':
  minor fixes
  minior fixes
  guestdisk support index filter
  修正：1. 阿里云刚删除主机的IP地址不能占用 2. rebuild root no-account-init无效 3. 其他问题...
 2018-09-15 21:30:38 +08:00
Qiu Jian fc5b3e68db minior fixes 2018-09-15 18:12:20 +08:00
Qiu Jian f43c278d90 guestdisk support index filter 2018-09-15 18:04:08 +08:00
Zexi Li 1c01d7b45f region: user usage 2018-09-15 17:50:59 +08:00
Qiu Jian c624d4ec6c 修正：1. 阿里云刚删除主机的IP地址不能占用 2. rebuild root 
no-account-init无效 3. 其他问题...
 2018-09-15 17:05:17 +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
Qiu Jian 588829bcb0 fix typos 2018-09-15 12:32:42 +08:00
Qiu Jian ee8e8bc2b5 增加eip操作的状态变化 2018-09-15 12:31:27 +08:00
Qiu Jian 876fadd6a8 network/wire/vpc增加zone/region信息 2018-09-15 10:48:28 +08:00
Zexi Li b7c8d1619f 修正: zone-capability spec 信息不生效 2018-09-15 10:39:56 +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 27f7e0d55f region: capabilities add specs 2018-09-15 10:15:02 +08:00
Zexi Li 2d1484f71e region: query model by spec keys, filter by zone 2018-09-15 05:27:29 +08:00
Zexi Li 2ea45a7120 region: spec handler 2018-09-15 01:49:11 +08:00
Qiu Jian 8c2250517f 修正：1. 主机创建／rebuild root密码设置问题 2. climc 密码设置问题 3. 
billing_type字段为空导致创建主机失败问题
 2018-09-15 00:31:58 +08:00
邱剑 18627f4118 Merge pull request #210 in YUNIONIO/onecloud from ~TANGBIN/onecloud:feature/tb-change-falovr-fix to release/2.1.0 
* commit '0d3d306524efe4a57e7e4165d7307491683f1e39':
  add change flavor fail status
 2018-09-14 19:45:05 +08:00
邱剑 6511872424 Merge pull request #211 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-metadata-charge-type to release/2.1.0 
* commit 'e77106787905b3187fcbdbc24253b7b0792fd559':
  增加 billing_type 和 expire_at 字段，用于计费
 2018-09-14 18:07:10 +08:00
Qiu Jian e771067879 增加 billing_type 和 expire_at 字段，用于计费 2018-09-14 17:49:29 +08:00
邱剑 ab8d120580 Merge pull request #205 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:feature/wyq/server-desc-sendkey-etc to release/2.1.0 
* commit '1d3ed6ef65c769c09d086c3cdc3cb3e45a9e0a7a':
  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
TangBin 0d3d306524 add change flavor fail status 2018-09-14 16:33:23 +08:00
wanyaoqi 1d3ed6ef65 server create disk 2018-09-14 16:03:32 +08:00
wanyaoqi 09cec5721d minor fix 2018-09-14 14:51:56 +08:00
Zexi Li eb77372794 region: network list by cloudregion 2018-09-14 13:26:43 +08:00
wanyaoqi 92bbb9e235 attach detach isolate device 2018-09-14 11:50:22 +08:00
wanyaoqi f910f6ada7 server attach detach network, change bandwidth, some bug fix 2018-09-14 11:50:22 +08:00
wanyaoqi ae336664dd guest desc, guest sendkey, fix disk delete 2018-09-14 11:45:17 +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 f7769ef1e3 修正：1. 阿里云rebuild root重构 2. 其他一些fix 2018-09-14 01:15:41 +08:00
Qiu Jian 013262e25f 修正：zones/<zone_id>/capabilities => zones/<zone_id>/capability 2018-09-13 12:10:29 +08:00