lywsvip/cloudpods
1
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-06-24 10:23:43 +08:00
Code Issues Packages Projects Releases Wiki Activity
7,710 Commits 24 Branches 641 Tags
8fc4b2920aa4b49068ded01ff644c144fdf57504
Commit Graph

86 Commits

Author SHA1 Message Date
wanyaoqi
a59e171bf5 feature: 
- postpaid server support expire
- extend distinct tenant filed
- gpu batch perform action
 2019-10-10 12:04:22 +08:00
ioito
c245e147ad add: 支持创建安全组时同时创建规则 2019-09-26 18:04:09 +08:00
ioito
0727b3f1fe fix: sync and set secgroup public scope 2019-08-24 17:11:41 +08:00
yunion-ci-robot
09b00ad0c9 Merge pull request #2097 from wanyaoqi/feature/wyq/secgroups-support-distinct-tenant 
feature: secgroups get distinct tenant
 2019-08-05 19:59:10 +08:00
wanyaoqi
2688753879 secgroups get distinct tenant 2019-08-05 12:00:51 +08:00
ioito
75e4b8140a hotfix: change order_by=guest -> order_by=guest_cnt 2019-08-05 11:13:51 +08:00
ioito
9013a4258b hotfix: change params from order_by_cache=asc|desc to order_by=cache & order=asc|desc 2019-07-31 21:41:55 +08:00
Qiu Jian
f34c8255f2 fix: 1. token add projects when no project specified 2. 
IVirtualResourceManager add GetResourceCount() method 3. domainId not
initialized occasionally
 2019-07-03 22:38:33 +08:00
ioito
77716076d5 secgroup-list remove rules 2019-06-16 18:48:42 +08:00
Qiu Jian
b7027934db feature: 3-level policies, system/domain/project 2019-05-31 13:56:02 +08:00
Qiu Jian
a95c0bac62 update query.Count to query.CountWithError 2019-04-23 12:02:35 +08:00
Qiu Jian
29c1fd3855 fix: clearn up codes that impacted by query.Count return value changes 2019-04-23 11:32:16 +08:00
Qiu Jian
da57161fd0 fix: move all consts in compute/models to apis/compute 2019-04-17 09:23:19 +08:00
Yousong Zhou
0d94e869eb Bugfix/yousong use xxxln (#235) 
* treewide: fix typo cloudprovide

* dep: update yunion.io/x/log

* treewide: log.Errorf(err.Error()) to log.Errorln(err)
 2019-04-04 18:45:32 +08:00
屈轩
8abff83afc 同步安全组以公有云为主 2019-04-02 20:48:09 +08:00
屈轩
01398c5138 加入自动同步时自动合并安全组 2019-04-02 20:48:09 +08:00
Qiu Jian
004d9b6f95 update copyright headers of all source 2019-03-29 14:47:48 +08:00
屈轩
890099d99b remove guest secgroup rule detail (#39) 2019-03-27 20:59:37 +08:00
屈轩
845c159cac 更新参数名称 2019-03-25 22:27:59 +08:00
屈轩
c288c21ae2 支持过滤未关联某个安全组的虚机列表 2019-03-22 17:14:37 +08:00
屈轩
a372336ca6 完成安全组同步代码重构 2019-03-18 15:44:44 +08:00
Qiu Jian
e74f31b7c0 fix: cleanup project sync codes 2019-03-14 09:46:29 +08:00
周有松
a97e2faea8 Automatic merge from release/2.6.0 -> release/2.7.0 
* commit '84d91f281103767b964a6b09aeba85c854a59c5e':
  修正一些错误信息描述
 2019-03-07 16:57:59 +08:00
屈轩
58ee33c3f0 修正一些错误信息描述 2019-03-07 16:48:15 +08:00
Qiu Jian
cb23c9c1a1 Merge branch 'release/2.7.0' of ssh://git.yunion.io/~qiujian/onecloud into feature/qj-sync-with-lock 2019-03-06 00:11:44 +08:00
屈轩
0ce6b70998 更改ProjectSource -> ProjectSrc 2019-03-05 12:05:02 +08:00
屈轩
8bd0bc0024 补充其他资源项目同步 2019-03-04 16:36:47 +08:00
Qiu Jian
62ebc90f2a feature: allow auto sychrnoization of cloud account 2019-03-04 01:09:34 +08:00
邱剑
0edeb53d28 update models with db.Update interface 2019-02-22 12:06:13 +08:00
邱剑
cd61e90012 Automatic merge from release/2.4.0 -> release/2.5.0 
* commit '6f933566da6f033e430fa0a7f69fd169dbc3b8ce':
  删除安全组后先隐藏后删除
 2019-02-11 20:43:38 +08:00
邱剑
6f933566da Automatic merge from release/2.3.0 -> release/2.4.0 
* commit '379e0ac7bc6f64d0a9679cc4998d0abfd68af156':
  删除安全组后先隐藏后删除
 2019-02-11 20:43:38 +08:00
屈轩
ccfc1168e0 删除安全组后先隐藏后删除 2019-02-11 20:10:27 +08:00
屈轩
3b60fa1238 避免前端更改描述字段后刷新没有相关字段 2019-01-15 15:48:23 +08:00
屈轩
bdcbd2a8f4 避免参数ports未生效问题 2019-01-10 20:11:43 +08:00
屈轩
0ac4a7bff4 支持批量添加安全组规则 2019-01-04 12:30:53 +08:00
Qiu Jian
2e587bd6ab glance重构 update 1 
Conflicts:
	Gopkg.lock
	pkg/appsrv/appsrv.go
	pkg/cloudcommon/options.go
	pkg/compute/models/hosts.go
	pkg/compute/models/quotas.go
	pkg/compute/service/service.go
	pkg/mcclient/mcclient.go
 2018-12-26 22:52:13 +08:00
屈轩
6950eff779 冲突解决 2018-12-24 16:10:58 +08:00
邱剑
8c08a27eb6 Automatic merge from release/2.2.0 -> release/2.3.0 
* commit '38a8bfa55899247a87b0ac7b55c89ac28877e014':
  安全组不统计容器、物理机、Vmware数量
 2018-12-24 15:57:27 +08:00
屈轩
5a590cffab 安全组不统计容器、物理机、Vmware数量 2018-12-24 15:17:12 +08:00
邱剑
bdda0a880e Automatic merge from release/2.3.0 -> release/2.4.0 
* commit '0b9ecf9613b41075cf5993a57b313005315d247c':
  避免公有云绑定安全组，因名称问题导致同步失败
 2018-12-21 20:02:36 +08:00
屈轩
833e2161d9 避免公有云绑定安全组，因名称问题导致同步失败 2018-12-21 15:49:22 +08:00
Qiu Jian
00027c55bb Merge branch 'release/2.3.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-2.4.0-20181216-2 
Conflicts:
	pkg/compute/models/guest_actions.go
 2018-12-17 00:17:38 +08:00
屈轩
e61d1d17df 冲突解决 2018-12-16 13:07:47 +08:00
屈轩
251765d4b6 未关联主机的安全组规则可以同步 2018-12-15 13:26:16 +08:00
邱剑
c1fca5e883 Automatic merge from release/2.3.0 -> release/2.4.0 
* commit 'c82e4da35fde0bba71279e66f11ef8128aade241':
  避免同步cache中的安全组
 2018-12-12 21:24:22 +08:00
屈轩
064d082ef2 解决冲突 2018-12-12 21:23:23 +08:00
屈轩
7a3ddc7caf 避免同步cache中的安全组 2018-12-12 17:01:14 +08:00
屈轩
e34e45d008 限制虚机绑定安全组数量 2018-12-05 12:40:47 +08:00
屈轩
2608e8e6b9 初始化model 2018-12-03 21:12:44 +08:00
邱剑
ed77d515d1 Automatic merge from release/2.2.0 -> release/2.3.0 
* commit '309a2ca0b459a0466eab0229e8e25a899d888946':
  大部分公有云不需要将安全组拆分为单个单个的规则
 2018-11-30 23:04:03 +08:00