Commit Graph
174 Commits
Author SHA1 Message Date
Qiu Jian aa5dfb7927 minor updates 2018-11-04 01:42:33 +08:00
Qiu Jian bf456729fe 1.
mcclient.resource增加readfilter和writerfilter,允许为resource增加自定义字段
2. 增加mcclient的获取的缓存,方便缓存mcclient拉取资源
2018-11-03 19:53:53 +08:00
屈轩 fe0a36919c 解决冲突 2018-11-02 13:56:54 +08:00
邱剑 cedcfc1748 Automatic merge from release/2.1.0 -> release/2.2.0
* commit '18484b96308ca6a1e654826894a5d62bc56e15e4':
  添加EIP sync日志
2018-11-02 13:13:58 +08:00
邱剑 18484b9630 Merge pull request #408 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-eip-sync-log to release/2.1.0
* commit 'ccc934c20f9c0dc1ce0bc10303b0fb4ccd1d2795':
  添加EIP sync日志
2018-11-02 13:13:58 +08:00
屈轩 ccc934c20f 添加EIP sync日志 2018-11-02 12:22:13 +08:00
邱剑 5ce6eafb4e Merge pull request #380 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:feature/wyq/server-migrate to release/2.3.0
* commit '24c08ed178bd8b7411a0defc92dc7ab74ffc52fd':
  server migrate all some bugfix
2018-11-01 21:19:18 +08:00
邱剑 918f047cff Automatic merge from release/2.2.0 -> release/2.3.0
* commit '557d28244c144ac079fa3b5e12b2822c8988069a':
  support export filter
2018-10-31 19:50:31 +08:00
wanyaoqi 3151e782e9 support export filter 2018-10-31 19:48:10 +08:00
Qiu Jian e83e1966d2 policyManager增加IsAdminCapable接口 2018-10-31 18:38:19 +08:00
wanyaoqi 24c08ed178 server migrate all
some bugfix
2018-10-31 12:25:40 +08:00
邱剑 a60a66e542 Merge pull request #385 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-recode-cloudcommon-options to release/2.3.0
* commit '3a1264f8da7995e1333bfdb3a0bec3126585c6e8':
  调整cloudcommon的options数据结构,把数据库相关选项合并到DBoptions
2018-10-31 12:23:36 +08:00
wanyaoqi 2874b808d8 fix perform action call allowfunc 2018-10-30 16:17:22 +08:00
Qiu Jian 3a1264f8da 调整cloudcommon的options数据结构,把数据库相关选项合并到DBoptions 2018-10-30 11:59:11 +08:00
Qiu Jian 33f546aafd 重构代码,将policy从db中分离出来,代码更干净一些 2018-10-30 00:12:19 +08:00
邱剑 926fc3a3dd Merge pull request #369 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:feature/qj-rbac-support to release/2.3.0
* commit '5a8bd4848509782e3ce953e9faae864ee09a0d8b':
  改进:rpc支持
  make fmt
  remove slice nil check
  fix quota check rbac check logic
  增加 usages get 和 quotas get/update 的RBAC检查
  JointModel support
  改进:model资源支持rbac认证,需要打开enable_rbac选项,默认关闭。非model资源还不支持
2018-10-29 22:22:31 +08:00
Qiu Jian 5a8bd48485 改进:rpc支持 2018-10-29 22:10:00 +08:00
Qiu Jian 740d6800ef make fmt 2018-10-29 14:54:01 +08:00
Qiu Jian 55645b9b1d fix quota check rbac check logic 2018-10-27 17:37:23 +08:00
Qiu Jian d069a2a469 增加 usages get 和 quotas get/update 的RBAC检查 2018-10-27 17:29:07 +08:00
Qiu Jian 0c06216364 JointModel support 2018-10-27 16:40:41 +08:00
李泽玺 61ddbf921f Merge pull request #368 in YUNIONIO/onecloud from ~LIZEXI/onecloud:bugfix/lzx-list-customize-filters to release/2.3.0
* commit '2cbf21655d8d298347d0b7159ffb7bda1bc2cae1':
  region: make CustomizeFilterList logically
2018-10-27 15:39:15 +08:00
Qiu Jian d0fef591f1 改进:model资源支持rbac认证,需要打开enable_rbac选项,默认关闭。非model资源还不支持 2018-10-27 14:34:09 +08:00
Zexi Li 2cbf21655d region: make CustomizeFilterList logically 2018-10-27 14:29:08 +08:00
Yousong Zhou 06b3495237 validators: add NewVlanIdValidator() 2018-10-26 06:30:43 +00:00
邱剑 56dad60718 Merge pull request #252 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:feature/wyq/baremetal-control to release/2.3.0
* commit '6d21c7e0d2501a385438c01522ad98a6709b19b7':
  baremetal ops some bugfix make dep
2018-10-24 21:26:30 +08:00
邱剑 950c1c6197 Automatic merge from release/2.2.0 -> release/2.3.0
* commit '98552290141f3bc37845b0456776952cb48bcf6c':
  避免因中文问题导致同步时出现相同的Azure资源
2018-10-24 10:43:37 +08:00
邱剑 9855229014 Merge pull request #352 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-duplicate-azure-resource to release/2.2.0
* commit 'a5be2a406ae5089711d71d9167157b8f753851e6':
  避免因中文问题导致同步时出现相同的Azure资源
2018-10-24 10:43:36 +08:00
屈轩 a5be2a406a 避免因中文问题导致同步时出现相同的Azure资源 2018-10-24 10:33:17 +08:00
wanyaoqi 6d21c7e0d2 baremetal ops
some bugfix
make dep
2018-10-23 21:01:00 +08:00
Yousong Zhou 4f0b4ec7c9 govet: treewide
# yunion.io/x/onecloud/pkg/lbagent/utils
  pkg/lbagent/utils/configdir.go:134: unreachable code
  # yunion.io/x/onecloud/pkg/mcclient/modules
  pkg/mcclient/modules/mod_domains.go:243: Sprintf format %s has arg len(result.Data) of wrong type int
  # yunion.io/x/onecloud/pkg/lbagent/models
  pkg/lbagent/models/reflect.go:68: Errorf call needs 1 arg but has 2 args
  # yunion.io/x/onecloud/pkg/cloudcommon/db
  pkg/cloudcommon/db/db_dispatcher.go:1064: Sprintf call needs 1 arg but has 2 args
  # yunion.io/x/onecloud/pkg/scheduler/core
  pkg/scheduler/core/context.go:579: assignment copies lock value to dataItem.Networks: sync.Map contains sync.Mutex
  # yunion.io/x/onecloud/pkg/scheduler/data_manager
  pkg/scheduler/data_manager/candidate_manager.go:353: Errorf format %#v reads arg #1, but call has 0 args
  # yunion.io/x/onecloud/pkg/scheduler/algorithm/predicates/baremetal
  pkg/scheduler/algorithm/predicates/baremetal/network_predicate.go:145: call of u.SetFiltedData copies lock value: sync.Map contains sync.Mutex
  # yunion.io/x/onecloud/pkg/scheduler/algorithm/predicates/guest
  pkg/scheduler/algorithm/predicates/guest/network_predicate.go:207: call of u.SetFiltedData copies lock value: sync.Map contains sync.Mutex
  # yunion.io/x/onecloud/pkg/cloudcommon/db/lockman
  pkg/cloudcommon/db/lockman/inmemory_test.go:49: loop variable id captured by func literal
  # yunion.io/x/onecloud/pkg/util/seclib2
  pkg/util/seclib2/seclib.go:56: unreachable code
  # yunion.io/x/onecloud/cmd/climc/shell
  cmd/climc/shell/alarmlogs.go:46: result of fmt.Errorf call not used
  # yunion.io/x/onecloud/pkg/util/aliyun
  pkg/util/aliyun/disk.go:267: Errorf format %s has arg size of wrong type int64
  pkg/util/aliyun/image.go:93: Sprintf format %s reads arg #1, but call has 0 args
  # yunion.io/x/onecloud/pkg/compute/models
  pkg/compute/models/cachedimages.go:161: Errorf format %d has arg imgId of wrong type string
  pkg/compute/models/disks.go:1274: Errorln call has possible formatting directive %s
  pkg/compute/models/guests.go:1749: Infof format %s has arg self.IsOwner(userCred) of wrong type bool
  pkg/compute/models/hosts.go:1134: Debugf format %s has arg storage of wrong type *models.SStorage
  pkg/compute/models/hosts.go:1135: Debugf format %s has arg self of wrong type *models.SHost
  # yunion.io/x/onecloud/pkg/util/azure
  pkg/util/azure/instance.go:536: unreachable code
  pkg/util/azure/network.go:128: unreachable code
  pkg/util/azure/storage.go:69: unreachable code
  # yunion.io/x/onecloud/pkg/util/azure/shell
  pkg/util/azure/shell/disk.go:20: unreachable code
  pkg/util/azure/shell/network.go:55: unreachable code
2018-10-22 12:33:41 +00:00
Qiu Jian 73eff73289 Merge branch 'release/2.2.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-20181022-2.3.0
Conflicts:
	pkg/httperrors/httperrors.go
2018-10-22 12:29:07 +08:00
Qiu Jian 4d1d4e56fd 修正:worker timeout之后需要从worker
manager中移除,不再占用worker的数量限额,否则timeout之后,并不能解决整个服务被卡住的问题
2018-10-22 01:38:52 +08:00
邱剑 a72b479bdb Merge pull request #301 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:feature/qj-enable-http-tls to release/2.2.0
* commit '575ea95525aea075b1ae8b542151185ee4ba14c5':
  改进:允许climc指定tls证书,允许服务指定tls证书
2018-10-18 16:01:19 +08:00
邱剑 510ad125db Automatic merge from release/2.2.0 -> release/2.3.0
* commit 'a72b479bdb8bf848b48a315fb667ec4ee38142fc':
  改进:允许climc指定tls证书,允许服务指定tls证书
2018-10-18 16:01:19 +08:00
邱剑 f0e712e8d1 Automatic merge from release/2.0.0 -> release/2.1.0
* commit 'a5dfd52413ab09c3842320a210badfeee56d703b':
  修复parallel task未初始化subtask
2018-10-17 16:58:53 +08:00
邱剑 442040d030 Automatic merge from release/2.2.0 -> release/2.3.0
* commit '084d2f1cdd7b2b3b674ed168a31f015088d105be':
  修复parallel task未初始化subtask
2018-10-17 16:58:53 +08:00
邱剑 084d2f1cdd Automatic merge from release/2.1.0 -> release/2.2.0
* commit 'f0e712e8d1c5fcbba2bfdf6491c2ba9c04486755':
  修复parallel task未初始化subtask
2018-10-17 16:58:53 +08:00
Qiu Jian 575ea95525 改进:允许climc指定tls证书,允许服务指定tls证书 2018-10-17 16:45:11 +08:00
屈轩 42176ea948 修复parallel task未初始化subtask 2018-10-17 16:12:35 +08:00
邱剑 219015d50c Merge pull request #287 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:feature/qj-keypair-improvment to release/2.3.0
* commit 'cfa4f5db945dcef09137c712370edcb3d8e33593':
  server show expired_at column
  修正:1. 阿里云自动设置Import/Export image ram授权,不再需要手动授权 2. 修正公有云注入userdata的问题
  Update vendor
  Update format
  Force format before build
  minor updates
  Update vendor
  改进:1. 部署VM时注入全局和项目公钥 2. 完善keypair的创建和导入功能 3. 其他
2018-10-15 18:20:30 +08:00
Qiu Jian b17b24b232 Update format 2018-10-12 12:13:35 +08:00
Qiu Jian 17175bc0a4 改进:1. 部署VM时注入全局和项目公钥 2. 完善keypair的创建和导入功能 3.
其他
2018-10-11 23:04:42 +08:00
邱剑 0dc3521bad Automatic merge from release/2.2.0 -> release/2.3.0
* commit 'f813b330d2aa93e2b4ac281805661be5a7fabec8':
  fix: region task notify not work
2018-10-11 20:39:01 +08:00
Zexi Li 84ee48335b fix: region task notify not work 2018-10-11 19:04:11 +08:00
邱剑 cc7bd6a101 Automatic merge from release/2.2.0 -> release/2.3.0
* commit '9c8ad6fc82f288b7c53f040f67e64b1d564e0f91':
  允许list description
2018-10-11 12:02:18 +08:00
邱剑 9c8ad6fc82 Automatic merge from release/2.1.0 -> release/2.2.0
* commit '53e1f07f18062d249a88da0fa274c3af11daa21e':
  允许list description
2018-10-11 12:02:18 +08:00
邱剑 53e1f07f18 Merge pull request #282 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-list-description to release/2.1.0
* commit 'd25f48f1de7d91dd1e8f7da1e378e86324d57ab4':
  允许list description
2018-10-11 12:02:17 +08:00
屈轩 d25f48f1de 允许list description 2018-10-10 20:01:21 +08:00
周有松 f7895cb29f Merge pull request #245 in YUNIONIO/onecloud from ~ZHOUYOUSONG/onecloud:feature/yousong-loadbalancer to release/2.3.0
* commit 'af6946ebb5bc0f39a7c2429c9313b6b4053ec6ab':
  loadbalancer: initial version
  loadbalancer: add loadbalancernetworks
  validators: validate certs and keys
  build.sh: support specifying runtime requires
2018-09-30 18:29:03 +08:00