Commit Graph
6987 Commits
Author SHA1 Message Date
TangBin 3fee2d00a8 remove useless code 2018-10-24 19:49:50 +08:00
TangBin 7f6acfcc17 remove useless function 2018-10-24 19:38:52 +08:00
Zhang Dongliang 4174e1fa1e 删除不需要的代码 2018-10-24 19:32:19 +08:00
Zhang Dongliang 187d951283 为websocket服务注册resource 模块、climc 命令行接口 2018-10-24 19:29:43 +08:00
李泽玺 5f962ff073 Automatic merge from release/2.1.0 -> release/2.2.0
* commit '81fbc232ef26bc2b942b5bca8db8587e33ad2472':
  fix: kvm find vnc port index out of range
2018-10-24 19:17:29 +08:00
TangBin bcf7e6f80b add eip 2018-10-24 18:20:11 +08:00
TangBin 3d479e776f add eip 2018-10-24 18:11:44 +08:00
TangBin 70a00a0e4c add more instance filed 2018-10-24 18:02:48 +08:00
TangBin f30f561477 add util method 2018-10-24 17:46:55 +08:00
邱剑 33c0bc7c26 Automatic merge from release/2.2.0 -> release/2.3.0
* commit 'd746c291c3e2e2e6724313c447fc2893069b0de2':
  修正:保护系统默认创建的default资源,不允许删除
2018-10-24 12:08:56 +08:00
Qiu Jian 3ac638239b Merge branch 'release/2.1.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-20180824-2.2.0
Conflicts:
	pkg/httperrors/httperrors.go
2018-10-24 12:07:23 +08:00
Qiu Jian 350f4e4db9 修正:保护系统默认创建的default资源,不允许删除 2018-10-24 12:00:53 +08:00
TangBin 136382f95b remove regions print 2018-10-24 11:56:55 +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
屈轩 9971d6cf88 重写Azure 2018-10-24 10:30:24 +08:00
Qiu Jian 1cb96585bc Merge branch 'release/2.2.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-20181023-2.3.0 2018-10-23 22:31:47 +08:00
邱剑 8772a93010 Merge pull request #348 in YUNIONIO/onecloud from ~WANYAOQI/onecloud:feature/wyq/add-disk-type-in-snapshots to release/2.2.0
* commit 'a3a5259505a5c254b969955b6b70433fe8db7869':
  add disk type in snapshots
2018-10-23 22:23:18 +08:00
邱剑 ef68401f28 Automatic merge from release/2.2.0 -> release/2.3.0
* commit '75dc6762ad31470e851759d717452f5cf53fc2e6':
  避免有重复ip时覆盖部分guest ip
2018-10-23 22:22:00 +08:00
邱剑 75dc6762ad Automatic merge from release/2.1.0 -> release/2.2.0
* commit 'a2c1aaeac47037d9d39cccd4a70ed5875a3914d8':
  避免有重复ip时覆盖部分guest ip
2018-10-23 22:22:00 +08:00
邱剑 a2c1aaeac4 Merge pull request #349 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-guestnetwork to release/2.1.0
* commit '532c41e5a8d65e8fbe293e47e6af8d0f211cb55e':
  避免有重复ip时覆盖部分guest ip
2018-10-23 22:21:59 +08:00
屈轩 532c41e5a8 避免有重复ip时覆盖部分guest ip 2018-10-23 22:15:03 +08:00
wanyaoqi a3a5259505 add disk type in snapshots 2018-10-23 22:07:04 +08:00
wanyaoqi 6d21c7e0d2 baremetal ops
some bugfix
make dep
2018-10-23 21:01:00 +08:00
TangBin 58be5ccda9 add aws cli 2018-10-23 17:54:30 +08:00
TangBin 7db7bcb2ca add image download/upload method 2018-10-23 16:26:53 +08:00
Zexi Li ec62b1b5a8 usage: all.disk.attached and all.disks.detached 2018-10-23 15:41:59 +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
Yousong Zhou 760862f1a0 govet: unexported field with tag defined
pkg/scheduler/cache/candidate/hosts.go:54: struct field storageTypes has json tag but is not exported
2018-10-22 12:32:00 +00:00
Yousong Zhou 5dd5767d94 govet: treewide struct tag fix
govet complains of the form

	struct field tag `required:true` not compatible with reflect.StructTag.Get: bad syntax for struct tag value
2018-10-22 12:31:12 +00:00
TangBin aa10e8c968 temp 2018-10-22 20:15:36 +08:00
李泽玺 1ec41ffcc9 Automatic merge from release/2.1.0 -> release/2.2.0
* commit 'b59926c46cc37ba664e059f9d08235d2cc594aa8':
  fix: server list and details no is_gpu field
2018-10-22 19:59:48 +08:00
李泽玺 c329de6a75 Automatic merge from release/2.2.0 -> release/2.3.0
* commit '1ec41ffcc90e71b5561ffaefaab12ac049446296':
  fix: server list and details no is_gpu field
2018-10-22 19:59:48 +08:00
Qiu Jian 05538b68f3 Merge branch 'release/2.0.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-20181022-2.1.0
Conflicts:
	pkg/compute/models/guests.go
2018-10-22 19:56:49 +08:00
Zexi Li fdcb0148c3 fix: server list and details no is_gpu field 2018-10-22 19:49:59 +08:00
TangBin 66a899bc55 add vmimport init method 2018-10-22 19:44:43 +08:00
TangBin e4cade7db1 add role create method 2018-10-22 18:55:37 +08:00
Qiu Jian 3792d653f1 minor updates 2018-10-22 17:13:57 +08:00
邱剑 dec5b9c1a9 Merge pull request #340 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-allow-purge-eip-snapshot to release/2.2.0
* commit '2adec7a7926fea8ebf0a4531cb73608f989ed88b':
  修正:删除guest时候没有正确清理eip的数据
  allow snapshot-list --manager <cloud-provider-id-or-name>
  修正:补充2.2.0 purge eip/snapshot接口
2018-10-22 17:10:56 +08:00
邱剑 affeb6b1bc Automatic merge from release/2.2.0 -> release/2.3.0
* commit 'dec5b9c1a95372a2079cad8a4264c51c783557f6':
  修正:删除guest时候没有正确清理eip的数据
  allow snapshot-list --manager <cloud-provider-id-or-name>
  修正:补充2.2.0 purge eip/snapshot接口
2018-10-22 17:10:56 +08:00
TangBin c34c4b6219 add create image method 2018-10-22 17:06:50 +08:00
TangBin d4b9032d06 add create image method 2018-10-22 17:06:22 +08:00
Qiu Jian 75752dc915 Merge branch 'release/2.2.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-20181022-1-2.3.0
Conflicts:
	pkg/compute/models/guests.go
2018-10-22 15:27:31 +08:00
Qiu Jian 2adec7a792 修正:删除guest时候没有正确清理eip的数据 2018-10-22 15:21:42 +08:00
Zhang Dongliang 3d7723499d 云服务器关联安全组后,操作日志记录内容应该是“关联安全组” 2018-10-22 15:20:56 +08:00
李泽玺 5050763c32 Merge pull request #326 in YUNIONIO/onecloud from ~LIZEXI/onecloud:feature/lzx-webconsole-graphic to release/2.3.0
* commit 'cb11950f4ff008835007ff7ab0cc1a32cfa7307b':
  webconsole: websockify support base64 subprotocol
  webconsole: websockify adapt graphic protocol like vnc protocol
2018-10-22 15:17:06 +08: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 46a39b5612 allow snapshot-list --manager <cloud-provider-id-or-name> 2018-10-22 12:04:55 +08:00
Qiu Jian b27be13cc3 修正:补充2.2.0 purge eip/snapshot接口 2018-10-22 11:24:54 +08:00