opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-24 16:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat(region): support hcsop

Browse Source
This commit is contained in:
ioito
2022-12-08 10:44:14 +08:00
parent 13e2749eb0
commit 55f7404d36
19 changed files with 535 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/climc/shell/compute/cloudaccounts.go
+1
View File
@@ -39,6 +39,7 @@ func init() {
cmd.CreateWithKeyword("create-huawei", &options.SHuaweiCloudAccountCreateOptions{})
cmd.CreateWithKeyword("create-hcso", &options.SHCSOAccountCreateOptions{})
cmd.CreateWithKeyword("create-hcs", &options.SHCSAccountCreateOptions{})
cmd.CreateWithKeyword("create-hcsop", &options.SHcsOpCloudAccountCreateOptions{})
cmd.CreateWithKeyword("create-ucloud", &options.SUcloudCloudAccountCreateOptions{})
cmd.CreateWithKeyword("create-zstack", &options.SZStackCloudAccountCreateOptions{})
cmd.CreateWithKeyword("create-s3", &options.SS3CloudAccountCreateOptions{})
go.mod
+1 -1
View File
@@ -84,7 +84,7 @@ require (
k8s.io/client-go v0.19.3
k8s.io/cluster-bootstrap v0.19.3
moul.io/http2curl/v2 v2.3.0
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20221206102331-f6cfd5599d9c
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20221207133418-961c7ec8228e
yunion.io/x/executor v0.0.0-20211018100936-39a2cd966656
yunion.io/x/jsonutils v1.0.1-0.20220819091305-3bab322ab4fd
yunion.io/x/log v1.0.0
go.sum
+2 -2
View File
@@ -1176,8 +1176,8 @@ sigs.k8s.io/structured-merge-diff/v4 v4.0.1/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK
sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=
sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q=
sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20221206102331-f6cfd5599d9c h1:h20NL1FV4KnkX/0xBZwwQROzk/1CGwM/gAXCNDSinSw=
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20221206102331-f6cfd5599d9c/go.mod h1:drc/WDD65r6wI1tSejk19xcl9QwmzZlgJGXN7a9o2KQ=
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20221207133418-961c7ec8228e h1:dCuSbjtLQNENwiMIqsGEgKlNuK02AbwCUHSZGbGtu28=
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20221207133418-961c7ec8228e/go.mod h1:drc/WDD65r6wI1tSejk19xcl9QwmzZlgJGXN7a9o2KQ=
yunion.io/x/executor v0.0.0-20211018100936-39a2cd966656 h1:0zlZD5uhZoIHgLVAWCz2aHaYk2ZrNsACCYD7R6EIBII=
yunion.io/x/executor v0.0.0-20211018100936-39a2cd966656/go.mod h1:Uxuou9WQIeJXNpy7t2fPLL0BYLvLiMvGQwY7Qc6aSws=
yunion.io/x/jsonutils v0.0.0-20190625054549-a964e1e8a051/go.mod h1:4N0/RVzsYL3kH3WE/H1BjUQdFiWu50JGCFQuuy+Z634=
pkg/apis/compute/cloudaccount_const.go
+7 -1
View File
@@ -48,6 +48,7 @@ const (
CLOUD_PROVIDER_AWS = compute.CLOUD_PROVIDER_AWS
CLOUD_PROVIDER_HUAWEI = compute.CLOUD_PROVIDER_HUAWEI
CLOUD_PROVIDER_HCSO = compute.CLOUD_PROVIDER_HCSO
CLOUD_PROVIDER_HCSOP = compute.CLOUD_PROVIDER_HCSOP
CLOUD_PROVIDER_HCS = compute.CLOUD_PROVIDER_HCS
CLOUD_PROVIDER_OPENSTACK = compute.CLOUD_PROVIDER_OPENSTACK
CLOUD_PROVIDER_UCLOUD = compute.CLOUD_PROVIDER_UCLOUD
@@ -107,7 +108,8 @@ var (
CLOUD_PROVIDER_VALID_STATUS = []string{CLOUD_PROVIDER_CONNECTED}
CLOUD_PROVIDER_VALID_HEALTH_STATUS = []string{CLOUD_PROVIDER_HEALTH_NORMAL, CLOUD_PROVIDER_HEALTH_NO_PERMISSION}
PRIVATE_CLOUD_PROVIDERS = []string{CLOUD_PROVIDER_ZSTACK, CLOUD_PROVIDER_OPENSTACK, CLOUD_PROVIDER_APSARA,
CLOUD_PROVIDER_HCSO, CLOUD_PROVIDER_HCS, CLOUD_PROVIDER_INCLOUD_SPHERE, CLOUD_PROVIDER_PROXMOX, CLOUD_PROVIDER_REMOTEFILE}
CLOUD_PROVIDER_HCSO, CLOUD_PROVIDER_HCS, CLOUD_PROVIDER_HCSOP,
CLOUD_PROVIDER_INCLOUD_SPHERE, CLOUD_PROVIDER_PROXMOX, CLOUD_PROVIDER_REMOTEFILE}
CLOUD_PROVIDERS = []string{
CLOUD_PROVIDER_ONECLOUD,
@@ -119,6 +121,7 @@ var (
CLOUD_PROVIDER_AWS,
CLOUD_PROVIDER_HUAWEI,
CLOUD_PROVIDER_HCSO,
CLOUD_PROVIDER_HCSOP,
CLOUD_PROVIDER_HCS,
CLOUD_PROVIDER_OPENSTACK,
CLOUD_PROVIDER_UCLOUD,
@@ -165,6 +168,9 @@ var (
CLOUD_PROVIDER_HCSO: {
HOST_TYPE_HCSO,
},
CLOUD_PROVIDER_HCSOP: {
HOST_TYPE_HCSOP,
},
CLOUD_PROVIDER_HCS: {
HOST_TYPE_HCS,
},
pkg/apis/compute/guest_const.go
+5
View File
@@ -178,6 +178,7 @@ const (
HYPERVISOR_HUAWEI = compute.HYPERVISOR_HUAWEI
HYPERVISOR_HCS = compute.HYPERVISOR_HCS
HYPERVISOR_HCSO = compute.HYPERVISOR_HCSO
HYPERVISOR_HCSOP = compute.HYPERVISOR_HCSOP
HYPERVISOR_OPENSTACK = compute.HYPERVISOR_OPENSTACK
HYPERVISOR_UCLOUD = compute.HYPERVISOR_UCLOUD
HYPERVISOR_ZSTACK = compute.HYPERVISOR_ZSTACK
@@ -244,6 +245,7 @@ var HYPERVISORS = []string{
HYPERVISOR_HUAWEI,
HYPERVISOR_HCSO,
HYPERVISOR_HCS,
HYPERVISOR_HCSOP,
HYPERVISOR_OPENSTACK,
HYPERVISOR_UCLOUD,
HYPERVISOR_ZSTACK,
@@ -285,6 +287,7 @@ var PRIVATE_CLOUD_HYPERVISORS = []string{
HYPERVISOR_CLOUDPODS,
HYPERVISOR_HCSO,
HYPERVISOR_HCS,
HYPERVISOR_HCSOP,
HYPERVISOR_NUTANIX,
HYPERVISOR_BINGO_CLOUD,
HYPERVISOR_INCLOUD_SPHERE,
@@ -306,6 +309,7 @@ var HYPERVISOR_HOSTTYPE = map[string]string{
HYPERVISOR_QCLOUD: HOST_TYPE_QCLOUD,
HYPERVISOR_HUAWEI: HOST_TYPE_HUAWEI,
HYPERVISOR_HCSO: HOST_TYPE_HCSO,
HYPERVISOR_HCSOP: HOST_TYPE_HCSOP,
HYPERVISOR_HCS: HOST_TYPE_HCS,
HYPERVISOR_OPENSTACK: HOST_TYPE_OPENSTACK,
HYPERVISOR_UCLOUD: HOST_TYPE_UCLOUD,
@@ -334,6 +338,7 @@ var HOSTTYPE_HYPERVISOR = map[string]string{
HOST_TYPE_QCLOUD: HYPERVISOR_QCLOUD,
HOST_TYPE_HUAWEI: HYPERVISOR_HUAWEI,
HOST_TYPE_HCSO: HYPERVISOR_HCSO,
HOST_TYPE_HCSOP: HYPERVISOR_HCSOP,
HOST_TYPE_HCS: HYPERVISOR_HCS,
HOST_TYPE_OPENSTACK: HYPERVISOR_OPENSTACK,
HOST_TYPE_UCLOUD: HYPERVISOR_UCLOUD,
pkg/apis/compute/host_const.go
+2
View File
@@ -32,6 +32,7 @@ const (
HOST_TYPE_AZURE = compute.HOST_TYPE_AZURE
HOST_TYPE_HUAWEI = compute.HOST_TYPE_HUAWEI
HOST_TYPE_HCSO = compute.HOST_TYPE_HCSO
HOST_TYPE_HCSOP = compute.HOST_TYPE_HCSOP
HOST_TYPE_HCS = compute.HOST_TYPE_HCS
HOST_TYPE_OPENSTACK = compute.HOST_TYPE_OPENSTACK
HOST_TYPE_UCLOUD = compute.HOST_TYPE_UCLOUD
@@ -122,6 +123,7 @@ var HOST_TYPES = []string{
HOST_TYPE_HUAWEI,
HOST_TYPE_HCSO,
HOST_TYPE_HCS,
HOST_TYPE_HCSOP,
HOST_TYPE_OPENSTACK,
HOST_TYPE_UCLOUD,
HOST_TYPE_ZSTACK,
pkg/apis/compute/network_const.go
+1
View File
@@ -73,6 +73,7 @@ var (
REGIONAL_NETWORK_PROVIDERS = []string{
CLOUD_PROVIDER_HUAWEI,
CLOUD_PROVIDER_HCSO,
CLOUD_PROVIDER_HCSOP,
CLOUD_PROVIDER_HCS,
CLOUD_PROVIDER_CTYUN,
CLOUD_PROVIDER_UCLOUD,
pkg/apis/compute/wire.go
+12
View File
@@ -52,6 +52,18 @@ type WireDetails struct {
HostCount int `json:"host_count"`
}
func (self WireDetails) GetMetricTags() map[string]string {
ret := map[string]string{
"id": self.Id,
"wire_name": self.Name,
"brand": self.Brand,
"domain_id": self.DomainId,
"project_domain": self.ProjectDomain,
"external_id": self.ExternalId,
}
return ret
}
type WireResourceInfoBase struct {
// 二层网络(WIRE)的名称
Wire string `json:"wire"`
pkg/cloudmon/options/options.go
+9 -8
View File
@@ -22,14 +22,6 @@ type CloudMonOptions struct {
common_options.CommonOptions
PingProbeOptions
EndpointType string `default:"internalURL" help:"Defaults to internalURL" choices:"publicURL|internalURL|adminURL"`
ApiVersion string `help:"override default modules service api version"`
ReqTimeout int `default:"600" help:"Number of seconds to wait for a response"`
Insecure bool `default:"true" help:"Allow skip server cert verification if URL is https" short-token:"k"`
CertFile string `help:"certificate file"`
KeyFile string `help:"private key file"`
ResourcesSyncInterval int64 `help:"Increment Sync Interval unit:minute" default:"10"`
CollectMetricInterval int64 `help:"Increment Sync Interval unit:minute" default:"6"`
SkipMetricPullProviders string `help:"Skip indicate provider metric pull" default:""`
@@ -70,6 +62,15 @@ func OnOptionsChange(oldO, newO interface{}) bool {
changed = true
}
}
if oldOpts.ResourcesSyncInterval != newOpts.ResourcesSyncInterval {
changed = true
}
if oldOpts.CollectMetricInterval != newOpts.CollectMetricInterval {
changed = true
}
if oldOpts.CollectServiceMetricIntervalMinute != newOpts.CollectServiceMetricIntervalMinute {
changed = true
}
return changed
}
pkg/cloudmon/providerdriver/base.go
+5 -1
View File
@@ -58,6 +58,10 @@ func (self *SBaseCollectDriver) CollectHostMetrics(ctx context.Context, manager
return cloudprovider.ErrNotImplemented
}
func (self *SBaseCollectDriver) CollectWireMetrics(ctx context.Context, manager api.CloudproviderDetails, provider cloudprovider.ICloudProvider, res map[string]api.WireDetails, start, end time.Time) error {
return cloudprovider.ErrNotImplemented
}
func (self *SBaseCollectDriver) CollectStorageMetrics(ctx context.Context, manager api.CloudproviderDetails, provider cloudprovider.ICloudProvider, res map[string]api.StorageDetails, start, end time.Time) error {
metrics := []influxdb.SMetricData{}
for _, storage := range res {
@@ -317,7 +321,7 @@ func (self *SCollectByResourceIdDriver) CollectHostMetrics(ctx context.Context,
Tags: []influxdb.SKeyValue{},
Metrics: []influxdb.SKeyValue{
{
Key: values.MetricType.Name(),
Key: values.MetricType.Key(),
Value: strconv.FormatFloat(value.Value, 'E', -1, 64),
},
},
pkg/cloudmon/providerdriver/driver.go
+1
View File
@@ -41,6 +41,7 @@ type ICollectDriver interface {
CollectBucketMetrics(ctx context.Context, manager api.CloudproviderDetails, provider cloudprovider.ICloudProvider, res map[string]api.BucketDetails, start, end time.Time) error
CollectK8sMetrics(ctx context.Context, manager api.CloudproviderDetails, provider cloudprovider.ICloudProvider, res map[string]api.KubeClusterDetails, start, end time.Time) error
CollectModelartsPoolMetrics(ctx context.Context, manager api.CloudproviderDetails, provider cloudprovider.ICloudProvider, res map[string]api.ModelartsPoolDetails, start, end time.Time) error
CollectWireMetrics(ctx context.Context, manager api.CloudproviderDetails, provider cloudprovider.ICloudProvider, res map[string]api.WireDetails, start, end time.Time) error
}
func GetDriver(name string) (ICollectDriver, error) {
pkg/cloudmon/providerdriver/hcsop.go
+139
View File
@@ -0,0 +1,139 @@
// Copyright 2019 Yunion
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
package providerdriver
import (
"context"
"strconv"
"sync"
"time"
"yunion.io/x/cloudmux/pkg/cloudprovider"
"yunion.io/x/log"
"yunion.io/x/pkg/errors"
api "yunion.io/x/onecloud/pkg/apis/compute"
"yunion.io/x/onecloud/pkg/cloudmon/options"
"yunion.io/x/onecloud/pkg/util/influxdb"
)
type HcsOpCollect struct {
SCollectByResourceIdDriver
}
func (self *HcsOpCollect) GetProvider() string {
return api.CLOUD_PROVIDER_HCSOP
}
func init() {
Register(&HcsOpCollect{})
}
func (self *HcsOpCollect) IsSupportMetrics() bool {
return true
}
func (self *HcsOpCollect) CollectStorageMetrics(ctx context.Context, manager api.CloudproviderDetails, provider cloudprovider.ICloudProvider, res map[string]api.StorageDetails, start, end time.Time) error {
metrics := []influxdb.SMetricData{}
for _, storage := range res {
metric := influxdb.SMetricData{
Name: string(cloudprovider.METRIC_RESOURCE_TYPE_STORAGE),
Timestamp: time.Now(),
Tags: []influxdb.SKeyValue{},
Metrics: []influxdb.SKeyValue{},
}
for k, v := range storage.GetMetricTags() {
metric.Tags = append(metric.Tags, influxdb.SKeyValue{
Key: k,
Value: v,
})
}
for k, v := range storage.GetMetricPairs() {
metric.Metrics = append(metric.Metrics, influxdb.SKeyValue{
Key: k,
Value: v,
})
}
metrics = append(metrics, metric)
}
return self.sendMetrics(ctx, manager, "storage", len(res), metrics)
}
func (self *HcsOpCollect) CollectWireMetrics(ctx context.Context, manager api.CloudproviderDetails, provider cloudprovider.ICloudProvider, res map[string]api.WireDetails, start, end time.Time) error {
ch := make(chan struct{}, options.Options.CloudResourceCollectMetricsBatchCount)
defer close(ch)
metrics := []influxdb.SMetricData{}
var wg sync.WaitGroup
var mu sync.Mutex
for i := range res {
ch <- struct{}{}
wg.Add(1)
go func(wire api.WireDetails) {
defer func() {
wg.Done()
<-ch
}()
opts := &cloudprovider.MetricListOptions{
ResourceType: cloudprovider.METRIC_RESOURCE_TYPE_WIRE,
StartTime: start,
EndTime: end,
}
opts.ResourceId = wire.ExternalId
tags := []influxdb.SKeyValue{}
for k, v := range wire.GetMetricTags() {
tags = append(tags, influxdb.SKeyValue{
Key: k,
Value: v,
})
}
data, err := provider.GetMetrics(opts)
if err != nil {
if errors.Cause(err) != cloudprovider.ErrNotImplemented && errors.Cause(err) != cloudprovider.ErrNotSupported {
log.Errorf("get rds %s(%s) error: %v", wire.Name, wire.Id, err)
return
}
return
}
for _, values := range data {
for _, value := range values.Values {
metric := influxdb.SMetricData{
Name: values.MetricType.Name(),
Timestamp: value.Timestamp,
Tags: tags,
Metrics: []influxdb.SKeyValue{
{
Key: values.MetricType.Key(),
Value: strconv.FormatFloat(value.Value, 'E', -1, 64),
},
},
}
for k, v := range value.Tags {
metric.Tags = append(metric.Tags, influxdb.SKeyValue{
Key: k,
Value: v,
})
}
mu.Lock()
metrics = append(metrics, metric)
mu.Unlock()
}
}
}(res[i])
}
wg.Wait()
return self.sendMetrics(ctx, manager, "wire", len(res), metrics)
}
pkg/cloudmon/resources/resources.go
+27
View File
@@ -345,6 +345,7 @@ type SResources struct {
KubeClusters TResource
Storages TResource
ModelartsPool TResource
Wires TResource
}
func NewResources() *SResources {
@@ -360,6 +361,7 @@ func NewResources() *SResources {
Buckets: NewBaseResources(&compute.Buckets),
KubeClusters: NewBaseResources(&compute.KubeClusters),
ModelartsPool: NewBaseResources(&compute.ModelartsPools),
Wires: NewBaseResources(&compute.Wires),
}
}
@@ -411,6 +413,10 @@ func (self *SResources) Init(ctx context.Context, userCred mcclient.TokenCredent
if err != nil {
errs = append(errs, errors.Wrapf(err, "ModelartsPool.init"))
}
err = self.Wires.init()
if err != nil {
errs = append(errs, errors.Wrapf(err, "Wires.init"))
}
return errors.NewAggregate(errs)
}()
if err != nil {
@@ -469,6 +475,10 @@ func (self *SResources) IncrementSync(ctx context.Context, userCred mcclient.Tok
if err != nil {
errs = append(errs, errors.Wrapf(err, "ModelartsPool.increment"))
}
err = self.Wires.increment()
if err != nil {
errs = append(errs, errors.Wrapf(err, "Wires.increment"))
}
return errors.NewAggregate(errs)
}()
if err != nil {
@@ -526,6 +536,10 @@ func (self *SResources) DecrementSync(ctx context.Context, userCred mcclient.Tok
if err != nil {
errs = append(errs, errors.Wrapf(err, "ModelartsPool.decrement"))
}
err = self.Wires.decrement()
if err != nil {
errs = append(errs, errors.Wrapf(err, "ModelartsPool.decrement"))
}
return errors.NewAggregate(errs)
}()
if err != nil {
@@ -730,6 +744,19 @@ func (self *SResources) CollectMetrics(ctx context.Context, userCred mcclient.To
if err != nil && errors.Cause(err) != cloudprovider.ErrNotImplemented && errors.Cause(err) != cloudprovider.ErrNotSupported {
log.Errorf("CollectModelartsPoolMetrics for %s(%s) error: %v", manager.Name, manager.Provider, err)
}
resources = self.Wires.getResources(manager.Id)
wires := map[string]api.WireDetails{}
err = jsonutils.Update(&wires, resources)
if err != nil {
log.Errorf("unmarsha wires resources error: %v", err)
}
err = driver.CollectWireMetrics(ctx, manager, provider, wires, startTime, endTime)
if err != nil && errors.Cause(err) != cloudprovider.ErrNotImplemented && errors.Cause(err) != cloudprovider.ErrNotSupported {
log.Errorf("CollectWireMetrics for %s(%s) error: %v", manager.Name, manager.Provider, err)
}
}(cloudproviders[i])
}
wg.Wait()
pkg/compute/guestdrivers/hcsop.go
+189
View File
@@ -0,0 +1,189 @@
// Copyright 2019 Yunion
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
package guestdrivers
import (
"context"
"database/sql"
"fmt"
"yunion.io/x/cloudmux/pkg/cloudprovider"
"yunion.io/x/log"
"yunion.io/x/pkg/errors"
"yunion.io/x/pkg/utils"
"yunion.io/x/sqlchemy"
api "yunion.io/x/onecloud/pkg/apis/compute"
"yunion.io/x/onecloud/pkg/cloudcommon/db"
"yunion.io/x/onecloud/pkg/cloudcommon/db/quotas"
"yunion.io/x/onecloud/pkg/compute/models"
"yunion.io/x/onecloud/pkg/mcclient"
"yunion.io/x/onecloud/pkg/util/billing"
"yunion.io/x/onecloud/pkg/util/rbacutils"
)
type SHCSOPGuestDriver struct {
SManagedVirtualizedGuestDriver
}
func init() {
driver := SHCSOPGuestDriver{}
models.RegisterGuestDriver(&driver)
}
func (self *SHCSOPGuestDriver) GetHypervisor() string {
return api.HYPERVISOR_HCSOP
}
func (self *SHCSOPGuestDriver) GetProvider() string {
return api.CLOUD_PROVIDER_HCSOP
}
func (self *SHCSOPGuestDriver) DoScheduleSKUFilter() bool {
return false
}
func (self *SHCSOPGuestDriver) DoScheduleStorageFilter() bool {
return false
}
func (self *SHCSOPGuestDriver) GetComputeQuotaKeys(scope rbacutils.TRbacScope, ownerId mcclient.IIdentityProvider, brand string) models.SComputeResourceKeys {
keys := models.SComputeResourceKeys{}
keys.SBaseProjectQuotaKeys = quotas.OwnerIdProjectQuotaKeys(scope, ownerId)
keys.CloudEnv = api.CLOUD_ENV_PRIVATE_CLOUD
keys.Provider = api.CLOUD_PROVIDER_HCSOP
keys.Brand = api.CLOUD_PROVIDER_HCSOP
keys.Hypervisor = api.HYPERVISOR_HCSOP
return keys
}
func (self *SHCSOPGuestDriver) GetDefaultSysDiskBackend() string {
return api.STORAGE_HUAWEI_SAS
}
func (self *SHCSOPGuestDriver) GetMinimalSysDiskSizeGb() int {
return 40
}
func (self *SHCSOPGuestDriver) GetStorageTypes() []string {
storages, _ := models.StorageManager.GetStorageTypesByHostType(api.HYPERVISOR_HOSTTYPE[self.GetHypervisor()])
return storages
}
func (self *SHCSOPGuestDriver) ChooseHostStorage(host *models.SHost, guest *models.SGuest, diskConfig *api.DiskConfig, storageIds []string) (*models.SStorage, error) {
return self.chooseHostStorage(self, host, diskConfig.Backend, storageIds), nil
}
func (self *SHCSOPGuestDriver) GetDetachDiskStatus() ([]string, error) {
return []string{api.VM_READY, api.VM_RUNNING}, nil
}
func (self *SHCSOPGuestDriver) GetAttachDiskStatus() ([]string, error) {
return []string{api.VM_READY, api.VM_RUNNING}, nil
}
func (self *SHCSOPGuestDriver) GetRebuildRootStatus() ([]string, error) {
return []string{api.VM_READY, api.VM_RUNNING}, nil
}
func (self *SHCSOPGuestDriver) GetChangeConfigStatus(guest *models.SGuest) ([]string, error) {
return []string{api.VM_READY}, nil
}
func (self *SHCSOPGuestDriver) GetDeployStatus() ([]string, error) {
return []string{api.VM_READY, api.VM_RUNNING}, nil
}
func (self *SHCSOPGuestDriver) ValidateResizeDisk(guest *models.SGuest, disk *models.SDisk, storage *models.SStorage) error {
if !utils.IsInStringArray(guest.Status, []string{api.VM_RUNNING, api.VM_READY}) {
return fmt.Errorf("Cannot resize disk when guest in status %s", guest.Status)
}
return nil
}
func (self *SHCSOPGuestDriver) GetGuestInitialStateAfterCreate() string {
return api.VM_RUNNING
}
func (self *SHCSOPGuestDriver) GetGuestInitialStateAfterRebuild() string {
return api.VM_RUNNING
}
func (self *SHCSOPGuestDriver) GetInstanceCapability() cloudprovider.SInstanceCapability {
return cloudprovider.SInstanceCapability{
Hypervisor: self.GetHypervisor(),
Provider: self.GetProvider(),
DefaultAccount: cloudprovider.SDefaultAccount{
Linux: cloudprovider.SOsDefaultAccount{
DefaultAccount: api.VM_DEFAULT_LINUX_LOGIN_USER,
},
Windows: cloudprovider.SOsDefaultAccount{
DefaultAccount: api.VM_DEFAULT_WINDOWS_LOGIN_USER,
},
},
}
}
func (self *SHCSOPGuestDriver) RemoteDeployGuestSyncHost(ctx context.Context, userCred mcclient.TokenCredential, guest *models.SGuest, host *models.SHost, iVM cloudprovider.ICloudVM) (cloudprovider.ICloudHost, error) {
if hostId := iVM.GetIHostId(); len(hostId) > 0 {
nh, err := db.FetchByExternalIdAndManagerId(models.HostManager, hostId, func(q *sqlchemy.SQuery) *sqlchemy.SQuery {
return q.Equals("manager_id", host.ManagerId)
})
if err != nil {
log.Debugf("failed to found new hostId(%s) for ivm %s(%s) error: %v", hostId, guest.Name, guest.Id, err)
if errors.Cause(err) != sql.ErrNoRows {
return nil, errors.Wrap(err, "FetchByExternalIdAndManagerId")
}
// HYPERVISOR_HCSOP VM被部署到一台全新的宿主机
zone, err := host.GetZone()
if err != nil {
log.Warningf("host %s GetZone: %s", host.GetId(), err)
} else {
_host, err := models.HostManager.NewFromCloudHost(ctx, userCred, iVM.GetIHost(), host.GetCloudprovider(), zone)
if err != nil {
log.Warningf("NewFromCloudHost %s: %s", iVM.GetIHostId(), err)
} else {
host = _host
}
}
} else {
host = nh.(*models.SHost)
}
}
if host.GetId() != guest.HostId {
guest.OnScheduleToHost(ctx, userCred, host.GetId())
}
return host.GetIHost(ctx)
}
func (self *SHCSOPGuestDriver) IsSupportedBillingCycle(bc billing.SBillingCycle) bool {
months := bc.GetMonths()
if (months >= 1 && months <= 9) || (months == 12) || (months == 24) || (months == 36) {
return true
}
return false
}
func (self *SHCSOPGuestDriver) IsNeedInjectPasswordByCloudInit() bool {
return true
}
func (self *SHCSOPGuestDriver) IsSupportSetAutoRenew() bool {
return false
}
pkg/compute/hostdrivers/hcsop.go
+67
View File
@@ -0,0 +1,67 @@
// Copyright 2019 Yunion
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
package hostdrivers
import (
"context"
"fmt"
"yunion.io/x/jsonutils"
api "yunion.io/x/onecloud/pkg/apis/compute"
"yunion.io/x/onecloud/pkg/compute/models"
"yunion.io/x/onecloud/pkg/httperrors"
"yunion.io/x/onecloud/pkg/mcclient"
)
type SHCSOPHostDriver struct {
SManagedVirtualizationHostDriver
}
func init() {
driver := SHCSOPHostDriver{}
models.RegisterHostDriver(&driver)
}
func (self *SHCSOPHostDriver) GetHostType() string {
return api.HOST_TYPE_HCSOP
}
func (self *SHCSOPHostDriver) GetHypervisor() string {
return api.HYPERVISOR_HCSOP
}
// 系统盘必须至少40G
func (self *SHCSOPHostDriver) ValidateDiskSize(storage *models.SStorage, sizeGb int) error {
if sizeGb < 1 || sizeGb > 65536 {
return fmt.Errorf("The %s disk size must be in the range of 1G ~ 65536GB", storage.StorageType)
}
return nil
}
func (self *SHCSOPHostDriver) ValidateResetDisk(ctx context.Context, userCred mcclient.TokenCredential, disk *models.SDisk, snapshot *models.SSnapshot, guests []models.SGuest, data *jsonutils.JSONDict) (*jsonutils.JSONDict, error) {
if len(guests) >= 1 {
if disk.DiskType == api.DISK_TYPE_SYS {
for _, g := range guests {
if g.Status != api.VM_READY {
return nil, httperrors.NewBadRequestError("Server %s must in status ready", g.GetName())
}
}
} else {
return nil, httperrors.NewBadRequestError("Disk must be detached")
}
}
return data, nil
}
pkg/compute/regiondrivers/hcsop.go
+49
View File
@@ -0,0 +1,49 @@
// Copyright 2019 Yunion
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
package regiondrivers
import (
api "yunion.io/x/onecloud/pkg/apis/compute"
"yunion.io/x/onecloud/pkg/compute/models"
)
type SHCSOPRegionDriver struct {
SHuaWeiRegionDriver
}
func init() {
driver := SHCSOPRegionDriver{}
models.RegisterRegionDriver(&driver)
}
func (self *SHCSOPRegionDriver) GetProvider() string {
return api.CLOUD_PROVIDER_HCSOP
}
func (self *SHCSOPRegionDriver) IsSupportedElasticcache() bool {
return true
}
func (self *SHCSOPRegionDriver) IsSecurityGroupBelongVpc() bool {
return true
}
func (self *SHCSOPRegionDriver) IsSupportedElasticcacheSecgroup() bool {
return false
}
func (self *SHCSOPRegionDriver) GetMaxElasticcacheSecurityGroupCount() int {
return 1
}
pkg/mcclient/options/cloudaccounts.go
+12
View File
@@ -341,6 +341,18 @@ func (opts *SZStackCloudAccountCreateOptions) Params() (jsonutils.JSONObject, er
return params, nil
}
type SHcsOpCloudAccountCreateOptions struct {
SCloudAccountCreateBaseOptions
SUserPasswordCredential
AuthURL string `help:"HcsOp auth_url" positional:"true" json:"auth_url"`
}
func (opts *SHcsOpCloudAccountCreateOptions) Params() (jsonutils.JSONObject, error) {
params := jsonutils.Marshal(opts)
params.(*jsonutils.JSONDict).Add(jsonutils.NewString("HCSOP"), "provider")
return params, nil
}
type SS3CloudAccountCreateOptions struct {
SCloudAccountCreateBaseOptions
SAccessKeyCredential
vendor/modules.txt
Vendored
+1 -1
View File
@@ -1439,7 +1439,7 @@ sigs.k8s.io/structured-merge-diff/v4/value
# sigs.k8s.io/yaml v1.2.0
## explicit; go 1.12
sigs.k8s.io/yaml
# yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20221206102331-f6cfd5599d9c
# yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20221207133418-961c7ec8228e
## explicit; go 1.18
yunion.io/x/cloudmux/pkg/apis
yunion.io/x/cloudmux/pkg/apis/billing
vendor/yunion.io/x/cloudmux/pkg/cloudprovider/metrics.go
Generated Vendored
+5
View File
@@ -52,6 +52,7 @@ const (
METRIC_RESOURCE_TYPE_BUCKET TResourceType = "bucket"
METRIC_RESOURCE_TYPE_K8S TResourceType = "k8s"
METRIC_RESOURCE_TYPE_STORAGE TResourceType = "storage"
METRIC_RESOURCE_TYPE_WIRE TResourceType = "wire"
METRIC_RESOURCE_TYPE_CLOUD_ACCOUNT TResourceType = "cloudaccount_balance"
METRIC_RESOURCE_TYPE_MODELARTS_POOL TResourceType = "modelarts"
)
@@ -266,6 +267,10 @@ const (
MODELARTS_POOL_METRIC_TYPE_DISK_AVAILABLE_CAPACITY TMetricType = "modelarts_pool_disk.available_capacity"
MODELARTS_POOL_METRIC_TYPE_DISK_CAPACITY TMetricType = "modelarts_pool_disk.capacity"
MODELARTS_POOL_METRIC_TYPE_DISK_USAGE TMetricType = "modelarts_pool_disk.usage_percent"
WIRE_METRIC_TYPE_CPU_USAGE TMetricType = "wire_cpu.usage_percent"
WIRE_METRIC_TYPE_MEM_USAGE TMetricType = "wire_mem.usage_percent"
WIRE_METRIC_TYPE_NET_RT TMetricType = "wire_net.rt" // 响应时间ms
)
var (