Qiu Jian
e18302866b
1. GetShortDesc()改为GetShortDesc(ctx context.Context)
...
2.
VirtualResource的GetShortDesc()中增加owner_tenant_id和owner_tenant两个字段
2018-12-13 23:55:51 +08:00
wanyaoqi
ecc750107b
fix conflict
2018-12-01 16:18:11 +08:00
Qiu Jian
e42f1a7744
recode
2018-12-01 12:05:41 +08:00
Qiu Jian
bc02b3b433
1.
...
取消userCred.IsSystemAdmin()，在使用policy的应用中，通过userCred.IsAdminAllow判断是否是管理员且具备相应的权限。获取token时，需要传入policy.FilterPolicyCredential，将普通userCred转换成支持rbac的userCred
2. 在应用启动时候，必须设置 SetServiceType，否则退出
2018-11-30 23:00:11 +08:00
Yousong Zhou
49382934e5
treewide: 保留httperrors的格式
2018-11-28 07:33:22 +00:00
Qiu Jian
17175bc0a4
改进：1. 部署VM时注入全局和项目公钥 2. 完善keypair的创建和导入功能 3.
...
其他
2018-10-11 23:04:42 +08:00
TangBin
65880ff857
mcclient error
2018-09-18 14:50:45 +08:00
邱剑
e1627fdd8a
Automatic merge from release/2.1.0 -> release/2.2.0
...
* commit '06af20eb4b9ee058ccb6937409cfcbce166bd5d5':
cloudcommon: virtualresource: allow setting is_system on creation
cloudcommon: db: more readable log on sql error
2018-09-18 12:31:01 +08:00
Yousong Zhou
9efad3e417
cloudcommon: virtualresource: allow setting is_system on creation
...
We have validation against the field yet the rule tag metadata does not
actually allow it
2018-09-18 04:04:04 +00: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
c66e264aff
cloudcommon: virtualresource: show pending_deleted field when queried
2018-09-13 02:06:41 +00: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
Qiu Jian
1a30516b0f
minor fixes
2018-09-12 01:14:33 +08:00
Qiu Jian
9a6eeb30f6
使用inmemory lockman
2018-09-11 13:07:51 +08:00
Qiu Jian
f339a0b3b5
Merge branch 'release/2.0.0' of ssh://git.yunion.io/~qiujian/onecloud into bugfix/qj-resolve-conflict-2.1.0-20180825
...
Conflicts:
pkg/compute/guestdrivers/aliyun.go
pkg/compute/models/disks.go
pkg/compute/tasks/guest_delete_task.go
2018-08-25 17:03:06 +08:00
Qiu Jian
4f24cbe615
remove some debug log
2018-08-25 13:07:25 +08:00
Zexi Li
090a9c5e86
Merge branch 'release/2.0.0' of ssh://git.yunion.io/~lizexi/onecloud into release/2.1.0
2018-08-11 15:11:24 +08:00
Zexi Li
22411ffb53
path move: github.com/yunionio -> yunion.io/x
2018-08-11 14:28:18 +08:00
Qiu Jian
6d81914119
Merge branch 'release/2.0.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-release-2.1.0-conflict-resolve-20180810
...
Conflicts:
pkg/cloudcommon/db/taskman/subtasks.go
pkg/compute/models/guests.go
2018-08-10 12:15:04 +08:00
Qiu Jian
1585d24302
修正：阿里云回收站主机恢复后无系统盘
2018-08-09 23:58:11 +08:00
wanyaoqi
f04463b526
server-stop, server-detach-disk, server-syncstatus, server-monitor, server-purge,
...
fix code, add server-suspend, server-cancel-delete
server-change-config, fix disk-resize
server-deploy
2018-08-09 10:17:04 +08:00
Qiu Jian
b979ce9c45
Update fmt
2018-08-08 00:11:02 +08:00
Zexi Li
b5275a0c29
- mv mcclient to pkg/mcclient
...
- vendor update
2018-08-01 14:13:23 +08:00
Zexi Li
37624f11e2
Add region service.
2018-07-30 12:27:27 +08:00
Qiu Jian