Skip to content

Commit

Permalink
fix(region): support sangfor (#20524)
Browse files Browse the repository at this point in the history
  • Loading branch information
ioito authored Jun 13, 2024
1 parent b3ca5c7 commit b8b0d3d
Show file tree
Hide file tree
Showing 17 changed files with 354 additions and 12 deletions.
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ require (
k8s.io/cri-api v0.22.17
k8s.io/klog/v2 v2.2.0
moul.io/http2curl/v2 v2.3.0
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20240604034047-e1e06dfdf1f9
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20240611023744-6cfb14a28b9f
yunion.io/x/executor v0.0.0-20230705125604-c5ac3141db32
yunion.io/x/jsonutils v1.0.1-0.20240203102553-4096f103b401
yunion.io/x/log v1.0.1-0.20240305175729-7cf2d6cd5a91
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -1309,8 +1309,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.20240604034047-e1e06dfdf1f9 h1:D5VDFE0Ab9rmBT3/MtO4Dqk1oZxLxS90Io3ToC915q8=
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20240604034047-e1e06dfdf1f9/go.mod h1:quoJjGTJ2PjAY0+3YeN5JuN136whECKmfkJQwIsXKjM=
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20240611023744-6cfb14a28b9f h1:JpZpsVjbP+8VlLKBPSfDKUBDxZrCA3Lmwm1iWq1jmbY=
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20240611023744-6cfb14a28b9f/go.mod h1:quoJjGTJ2PjAY0+3YeN5JuN136whECKmfkJQwIsXKjM=
yunion.io/x/executor v0.0.0-20230705125604-c5ac3141db32 h1:v7POYkQwo1XzOxBoIoRVr/k0V9Y5JyjpshlIFa9raug=
yunion.io/x/executor v0.0.0-20230705125604-c5ac3141db32/go.mod h1:Uxuou9WQIeJXNpy7t2fPLL0BYLvLiMvGQwY7Qc6aSws=
yunion.io/x/jsonutils v0.0.0-20190625054549-a964e1e8a051/go.mod h1:4N0/RVzsYL3kH3WE/H1BjUQdFiWu50JGCFQuuy+Z634=
Expand Down
7 changes: 6 additions & 1 deletion pkg/apis/compute/cloudaccount_const.go
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ const (
CLOUD_PROVIDER_CUCLOUD = compute.CLOUD_PROVIDER_CUCLOUD
CLOUD_PROVIDER_QINGCLOUD = compute.CLOUD_PROVIDER_QINGCLOUD
CLOUD_PROVIDER_ORACLE = compute.CLOUD_PROVIDER_ORACLE
CLOUD_PROVIDER_SANGFOR = compute.CLOUD_PROVIDER_SANGFOR

CLOUD_PROVIDER_GENERICS3 = compute.CLOUD_PROVIDER_GENERICS3
CLOUD_PROVIDER_CEPH = compute.CLOUD_PROVIDER_CEPH
Expand Down Expand Up @@ -117,7 +118,7 @@ var (
PRIVATE_CLOUD_PROVIDERS = []string{CLOUD_PROVIDER_ZSTACK, CLOUD_PROVIDER_OPENSTACK, CLOUD_PROVIDER_APSARA,
CLOUD_PROVIDER_HCSO, CLOUD_PROVIDER_HCS, CLOUD_PROVIDER_HCSOP,
CLOUD_PROVIDER_INCLOUD_SPHERE, CLOUD_PROVIDER_PROXMOX, CLOUD_PROVIDER_REMOTEFILE,
CLOUD_PROVIDER_H3C,
CLOUD_PROVIDER_H3C, CLOUD_PROVIDER_SANGFOR,
}
PUBLIC_CLOUD_PROVIDERS = []string{
CLOUD_PROVIDER_ALIYUN,
Expand Down Expand Up @@ -170,6 +171,7 @@ var (
CLOUD_PROVIDER_CUCLOUD,
CLOUD_PROVIDER_QINGCLOUD,
CLOUD_PROVIDER_ORACLE,
CLOUD_PROVIDER_SANGFOR,
}

CLOUD_PROVIDER_HOST_TYPE_MAP = map[string][]string{
Expand Down Expand Up @@ -268,6 +270,9 @@ var (
CLOUD_PROVIDER_ORACLE: {
HOST_TYPE_ORACLE,
},
CLOUD_PROVIDER_SANGFOR: {
HOST_TYPE_SANGFOR,
},
}
)

Expand Down
2 changes: 2 additions & 0 deletions pkg/apis/compute/guest_const.go
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,7 @@ const (
HYPERVISOR_CUCLOUD = compute.HYPERVISOR_CUCLOUD
HYPERVISOR_QINGCLOUD = compute.HYPERVISOR_QINGCLOUD
HYPERVISOR_ORACLE = compute.HYPERVISOR_ORACLE
HYPERVISOR_SANGFOR = compute.HYPERVISOR_SANGFOR

// HYPERVISOR_DEFAULT = HYPERVISOR_KVM
HYPERVISOR_DEFAULT = HYPERVISOR_KVM
Expand Down Expand Up @@ -294,6 +295,7 @@ var HYPERVISORS = []string{
HYPERVISOR_CUCLOUD,
HYPERVISOR_QINGCLOUD,
HYPERVISOR_ORACLE,
HYPERVISOR_SANGFOR,
}

const (
Expand Down
2 changes: 2 additions & 0 deletions pkg/apis/compute/host_const.go
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ const (
HOST_TYPE_CUCLOUD = compute.HOST_TYPE_CUCLOUD
HOST_TYPE_QINGCLOUD = compute.HOST_TYPE_QINGCLOUD
HOST_TYPE_ORACLE = compute.HOST_TYPE_ORACLE
HOST_TYPE_SANGFOR = compute.HOST_TYPE_SANGFOR

HOST_TYPE_DEFAULT = HOST_TYPE_HYPERVISOR

Expand Down Expand Up @@ -153,6 +154,7 @@ var HOST_TYPES = []string{
HOST_TYPE_CUCLOUD,
HOST_TYPE_QINGCLOUD,
HOST_TYPE_ORACLE,
HOST_TYPE_SANGFOR,
}

var ALL_NIC_TYPES = []compute.TNicType{NIC_TYPE_IPMI, NIC_TYPE_ADMIN, NIC_TYPE_NORMAL}
Expand Down
237 changes: 237 additions & 0 deletions pkg/compute/guestdrivers/sangfor.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,237 @@
// 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/util/billing"
"yunion.io/x/pkg/util/cloudinit"
"yunion.io/x/pkg/util/rbacscope"
"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/cloudcommon/db/taskman"
"yunion.io/x/onecloud/pkg/compute/models"
"yunion.io/x/onecloud/pkg/mcclient"
)

type SSangForGuestDriver struct {
SManagedVirtualizedGuestDriver
}

func init() {
driver := SSangForGuestDriver{}
models.RegisterGuestDriver(&driver)
}

func (self *SSangForGuestDriver) GetHypervisor() string {
return api.HYPERVISOR_SANGFOR
}

func (self *SSangForGuestDriver) GetProvider() string {
return api.CLOUD_PROVIDER_SANGFOR
}

func (self *SSangForGuestDriver) DoScheduleSKUFilter() bool {
return false
}

func (self *SSangForGuestDriver) DoScheduleStorageFilter() bool {
return false
}

func (self *SSangForGuestDriver) GetComputeQuotaKeys(scope rbacscope.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_SANGFOR
keys.Brand = api.CLOUD_PROVIDER_SANGFOR
keys.Hypervisor = api.HYPERVISOR_SANGFOR
return keys
}

func (self *SSangForGuestDriver) GetDefaultSysDiskBackend() string {
return api.STORAGE_LOCAL
}

func (self *SSangForGuestDriver) GetMinimalSysDiskSizeGb() int {
return 40
}

func (self *SSangForGuestDriver) GetStorageTypes() []string {
storages, _ := models.StorageManager.GetStorageTypesByProvider(self.GetProvider())
return storages
}

func (self *SSangForGuestDriver) ChooseHostStorage(host *models.SHost, guest *models.SGuest, diskConfig *api.DiskConfig, storageIds []string) (*models.SStorage, error) {
return chooseHostStorage(self, host, diskConfig.Backend, storageIds), nil
}

func (self *SSangForGuestDriver) GetDetachDiskStatus() ([]string, error) {
return []string{api.VM_READY, api.VM_RUNNING}, nil
}

func (self *SSangForGuestDriver) GetAttachDiskStatus() ([]string, error) {
return []string{api.VM_READY, api.VM_RUNNING}, nil
}

func (self *SSangForGuestDriver) GetRebuildRootStatus() ([]string, error) {
return []string{api.VM_READY, api.VM_RUNNING}, nil
}

func (self *SSangForGuestDriver) GetChangeConfigStatus(guest *models.SGuest) ([]string, error) {
return []string{api.VM_READY}, nil
}

func (self *SSangForGuestDriver) GetDeployStatus() ([]string, error) {
return []string{api.VM_READY, api.VM_RUNNING}, nil
}

func (self *SSangForGuestDriver) 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 *SSangForGuestDriver) ValidateCreateData(ctx context.Context, userCred mcclient.TokenCredential, input *api.ServerCreateInput) (*api.ServerCreateInput, error) {
if len(input.UserData) > 0 {
_, err := cloudinit.ParseUserData(input.UserData)
if err != nil {
return nil, err
}
}
if len(input.Cdrom) > 0 {
image, err := models.CachedimageManager.GetCachedimageById(ctx, userCred, input.Cdrom, false)
if err != nil {
return nil, err
}
if len(image.ExternalId) > 0 {
hosts, err := image.GetHosts()
if err != nil {
return nil, err
}
if len(input.PreferHost) == 0 && len(hosts) == 1 {
input.PreferHost = hosts[0].Id
}
}
}
return input, nil
}

func (self *SSangForGuestDriver) GetGuestInitialStateAfterCreate() string {
return api.VM_RUNNING
}

func (self *SSangForGuestDriver) DoGuestCreateDisksTask(ctx context.Context, guest *models.SGuest, task taskman.ITask) error {
subtask, err := taskman.TaskManager.NewTask(ctx, "SangForGuestCreateDiskTask", guest, task.GetUserCred(), task.GetParams(), task.GetTaskId(), "", nil)
if err != nil {
return errors.Wrapf(err, "NewTask")
}
return subtask.ScheduleRun(nil)
}

func (self *SSangForGuestDriver) GetGuestInitialStateAfterRebuild() string {
return api.VM_RUNNING
}

func (self *SSangForGuestDriver) 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 *SSangForGuestDriver) 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_SANGFOR 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 *SSangForGuestDriver) IsSupportedBillingCycle(bc billing.SBillingCycle) bool {
return false
}

func (self *SSangForGuestDriver) IsNeedInjectPasswordByCloudInit() bool {
return false
}

func (self *SSangForGuestDriver) IsSupportSetAutoRenew() bool {
return false
}

func (self *SSangForGuestDriver) RequestSyncSecgroupsOnHost(ctx context.Context, guest *models.SGuest, host *models.SHost, task taskman.ITask) error {
return nil // do nothing, not support securitygroup
}

func (self *SSangForGuestDriver) GetMaxSecurityGroupCount() int {
//暂不支持绑定安全组
return 0
}

func (self *SSangForGuestDriver) RequestGuestHotAddIso(ctx context.Context, guest *models.SGuest, path string, boot bool, task taskman.ITask) error {
task.ScheduleRun(nil)
return nil
}

func (self *SSangForGuestDriver) IsSupportCdrom(guest *models.SGuest) (bool, error) {
return true, nil
}
6 changes: 5 additions & 1 deletion pkg/compute/hostdrivers/managedvirtual.go
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,8 @@ func (self *SManagedVirtualizationHostDriver) CheckAndSetCacheImage(ctx context.
image.OsVersion = input.OsFullVersion
}

size := int64(0)

taskman.LocalTaskRun(task, func() (jsonutils.JSONObject, error) {

lockman.LockRawObject(ctx, models.CachedimageManager.Keyword(), fmt.Sprintf("%s-%s", storageCache.Id, image.ImageId))
Expand Down Expand Up @@ -138,11 +140,12 @@ func (self *SManagedVirtualizationHostDriver) CheckAndSetCacheImage(ctx context.
}()
log.Infof("upload image %s id: %s", image.ImageName, image.ExternalId)
} else {
_, err = iStorageCache.GetIImageById(cachedImage.ExternalId)
_, err := iStorageCache.GetIImageById(cachedImage.ExternalId)
if err != nil {
return nil, errors.Wrapf(err, "iStorageCache.GetIImageById(%s) for %s", cachedImage.ExternalId, iStorageCache.GetGlobalId())
}
image.ExternalId = cachedImage.ExternalId
size = cachedImage.Size
}
if err != nil {
return nil, err
Expand All @@ -155,6 +158,7 @@ func (self *SManagedVirtualizationHostDriver) CheckAndSetCacheImage(ctx context.

ret := jsonutils.NewDict()
ret.Add(jsonutils.NewString(image.ExternalId), "image_id")
ret.Add(jsonutils.NewInt(size), "size")
return ret, nil
})
return nil
Expand Down
41 changes: 41 additions & 0 deletions pkg/compute/hostdrivers/sangfor.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
// 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 (
api "yunion.io/x/onecloud/pkg/apis/compute"
"yunion.io/x/onecloud/pkg/compute/models"
)

type SSangForHostDriver struct {
SManagedVirtualizationHostDriver
}

func init() {
driver := SSangForHostDriver{}
models.RegisterHostDriver(&driver)
}

func (self *SSangForHostDriver) GetHostType() string {
return api.HOST_TYPE_SANGFOR
}

func (self *SSangForHostDriver) GetHypervisor() string {
return api.HYPERVISOR_SANGFOR
}

func (self *SSangForHostDriver) GetProvider() string {
return api.CLOUD_PROVIDER_SANGFOR
}
Loading

0 comments on commit b8b0d3d

Please sign in to comment.