Skip to content

Commit

Permalink
fix(region): support uis (#21686)
Browse files Browse the repository at this point in the history
  • Loading branch information
ioito authored Nov 26, 2024
1 parent 2c9e04f commit c623f86
Show file tree
Hide file tree
Showing 14 changed files with 340 additions and 7 deletions.
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ require (
k8s.io/cri-api v0.22.17
k8s.io/klog/v2 v2.20.0
moul.io/http2curl/v2 v2.3.0
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20241122072750-91ba50cada6b
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20241125120153-2a0e6362368b
yunion.io/x/executor v0.0.0-20230705125604-c5ac3141db32
yunion.io/x/jsonutils v1.0.1-0.20240930100528-1671a2d0d22f
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 @@ -1376,8 +1376,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.20241122072750-91ba50cada6b h1:ZiDwZXIuH6PvsVu0vtSvdTYQ+FW9QE7g4FTeZUfRAWs=
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20241122072750-91ba50cada6b/go.mod h1:rj/pb3DitJlQaQD8UW1oxx/KD+PzDZqoywzqRJaFE9A=
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20241125120153-2a0e6362368b h1:Usnw/w/qSTX5gLJYhSoMCeUifVxs32c4DNVvLA5RmEQ=
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20241125120153-2a0e6362368b/go.mod h1:rj/pb3DitJlQaQD8UW1oxx/KD+PzDZqoywzqRJaFE9A=
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
5 changes: 5 additions & 0 deletions pkg/apis/compute/cloudaccount_const.go
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ const (
CLOUD_PROVIDER_ORACLE = compute.CLOUD_PROVIDER_ORACLE
CLOUD_PROVIDER_SANGFOR = compute.CLOUD_PROVIDER_SANGFOR
CLOUD_PROVIDER_ZETTAKIT = compute.CLOUD_PROVIDER_ZETTAKIT
CLOUD_PROVIDER_UIS = compute.CLOUD_PROVIDER_UIS

CLOUD_PROVIDER_GENERICS3 = compute.CLOUD_PROVIDER_GENERICS3
CLOUD_PROVIDER_CEPH = compute.CLOUD_PROVIDER_CEPH
Expand Down Expand Up @@ -174,6 +175,7 @@ var (
CLOUD_PROVIDER_ORACLE,
CLOUD_PROVIDER_SANGFOR,
CLOUD_PROVIDER_ZETTAKIT,
CLOUD_PROVIDER_UIS,
}

CLOUD_PROVIDER_HOST_TYPE_MAP = map[string][]string{
Expand Down Expand Up @@ -278,6 +280,9 @@ var (
CLOUD_PROVIDER_ZETTAKIT: {
HOST_TYPE_ZETTAKIT,
},
CLOUD_PROVIDER_UIS: {
HOST_TYPE_UIS,
},
}
)

Expand Down
1 change: 1 addition & 0 deletions pkg/apis/compute/guest_const.go
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,7 @@ const (
HYPERVISOR_ORACLE = compute.HYPERVISOR_ORACLE
HYPERVISOR_SANGFOR = compute.HYPERVISOR_SANGFOR
HYPERVISOR_ZETTAKIT = compute.HYPERVISOR_ZETTAKIT
HYPERVISOR_UIS = compute.HYPERVISOR_UIS

// HYPERVISOR_DEFAULT = HYPERVISOR_KVM
HYPERVISOR_DEFAULT = HYPERVISOR_KVM
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 @@ -58,6 +58,7 @@ const (
HOST_TYPE_ORACLE = compute.HOST_TYPE_ORACLE
HOST_TYPE_SANGFOR = compute.HOST_TYPE_SANGFOR
HOST_TYPE_ZETTAKIT = compute.HOST_TYPE_ZETTAKIT
HOST_TYPE_UIS = compute.HOST_TYPE_UIS

HOST_TYPE_DEFAULT = HOST_TYPE_HYPERVISOR

Expand Down Expand Up @@ -157,6 +158,7 @@ var HOST_TYPES = []string{
HOST_TYPE_ORACLE,
HOST_TYPE_SANGFOR,
HOST_TYPE_ZETTAKIT,
HOST_TYPE_UIS,
}

var ALL_NIC_TYPES = []compute.TNicType{NIC_TYPE_IPMI, NIC_TYPE_ADMIN, NIC_TYPE_NORMAL}
Expand Down
228 changes: 228 additions & 0 deletions pkg/compute/guestdrivers/uis.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,228 @@
// 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 SUisGuestDriver struct {
SManagedVirtualizedGuestDriver
}

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

func (self *SUisGuestDriver) GetHypervisor() string {
return api.HYPERVISOR_UIS
}

func (self *SUisGuestDriver) GetProvider() string {
return api.CLOUD_PROVIDER_UIS
}

func (self *SUisGuestDriver) DoScheduleSKUFilter() bool {
return true
}

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

func (self *SUisGuestDriver) 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_UIS
keys.Brand = api.CLOUD_PROVIDER_UIS
keys.Hypervisor = api.HYPERVISOR_UIS
return keys
}

func (self *SUisGuestDriver) GetDefaultSysDiskBackend() string {
return ""
}

func (self *SUisGuestDriver) GetMinimalSysDiskSizeGb() int {
return 20
}

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

func (self *SUisGuestDriver) 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 *SUisGuestDriver) GetDetachDiskStatus() ([]string, error) {
return []string{api.VM_READY, api.VM_RUNNING}, nil
}

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

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

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

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

func (self *SUisGuestDriver) 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 *SUisGuestDriver) 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 *SUisGuestDriver) GetGuestInitialStateAfterCreate() string {
return api.VM_RUNNING
}

func (self *SUisGuestDriver) GetGuestInitialStateAfterRebuild() string {
return api.VM_READY
}

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

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

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

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

func (self *SUisGuestDriver) GetMaxSecurityGroupCount() int {
return 1
}

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

func (self *SUisGuestDriver) IsSupportCdrom(guest *models.SGuest) (bool, error) {
return true, nil
}
45 changes: 45 additions & 0 deletions pkg/compute/hostdrivers/uis.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
// 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 SUisHostDriver struct {
SManagedVirtualizationHostDriver
}

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

func (self *SUisHostDriver) GetHostType() string {
return api.HOST_TYPE_UIS
}

func (self *SUisHostDriver) GetHypervisor() string {
return api.HYPERVISOR_UIS
}

func (self *SUisHostDriver) GetProvider() string {
return api.CLOUD_PROVIDER_UIS
}

func (self *SUisHostDriver) ValidateDiskSize(storage *models.SStorage, sizeGb int) error {
return nil
}
49 changes: 49 additions & 0 deletions pkg/compute/regiondrivers/uis.go
Original file line number Diff line number Diff line change
@@ -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 (
"yunion.io/x/sqlchemy"

api "yunion.io/x/onecloud/pkg/apis/compute"
"yunion.io/x/onecloud/pkg/compute/models"
)

type SUisRegionDriver struct {
SManagedVirtualizationRegionDriver
}

func init() {
driver := SUisRegionDriver{}
models.RegisterRegionDriver(&driver)
}

func (self *SUisRegionDriver) GetProvider() string {
return api.CLOUD_PROVIDER_UIS
}

func (self *SUisRegionDriver) IsSupportedElasticcacheSecgroup() bool {
return false
}

func (self *SUisRegionDriver) GetMaxElasticcacheSecurityGroupCount() int {
return 1
}

func (self *SUisRegionDriver) GetSecurityGroupFilter(vpc *models.SVpc) (func(q *sqlchemy.SQuery) *sqlchemy.SQuery, error) {
return func(q *sqlchemy.SQuery) *sqlchemy.SQuery {
return q.Equals("cloudregion_id", vpc.CloudregionId).Equals("manager_id", vpc.ManagerId)
}, nil
}
Loading

0 comments on commit c623f86

Please sign in to comment.