Merge pull request #1127 from ioito/hotfix/qx-isolate-device-sync

fix: support isolate device sync
yunionio · Nov 28, 2024 · 0574df0 · 0574df0
2 parents 2a0e636 + fb8f447
commit 0574df0
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 0 deletions.
diff --git a/pkg/cloudprovider/resources.go b/pkg/cloudprovider/resources.go
@@ -318,6 +318,18 @@ type ICloudHost interface {
 	GetSchedtags() ([]string, error)
 
 	GetOvnVersion() string // just for cloudpods host
+
+	GetIsolateDevices() ([]IsolateDevice, error)
+}
+
+type IsolateDevice interface {
+	GetName() string
+	GetGlobalId() string
+	GetModel() string
+	GetAddr() string
+	GetDevType() string
+	GetNumaNode() int8
+	GetVendorDeviceId() string
 }
 
 type ICloudVM interface {
@@ -400,6 +412,7 @@ type ICloudVM interface {
 
 	AllocatePublicIpAddress() (string, error)
 	GetPowerStates() string
+	GetIsolateDeviceIds() ([]string, error)
 }
 
 type ICloudNic interface {

diff --git a/pkg/multicloud/host_base.go b/pkg/multicloud/host_base.go
@@ -16,7 +16,9 @@ package multicloud
 
 import (
 	"yunion.io/x/cloudmux/pkg/apis"
+	"yunion.io/x/cloudmux/pkg/cloudprovider"
 	"yunion.io/x/jsonutils"
+	"yunion.io/x/pkg/errors"
 )
 
 type SHostBase struct {
@@ -55,3 +57,7 @@ func (host *SHostBase) GetStorageDriver() string {
 func (host *SHostBase) GetStorageInfo() jsonutils.JSONObject {
 	return nil
 }
+
+func (host *SHostBase) GetIsolateDevices() ([]cloudprovider.IsolateDevice, error) {
+	return nil, errors.Wrapf(cloudprovider.ErrNotImplemented, "GetIsolateDevices")
+}
diff --git a/pkg/multicloud/instance_base.go b/pkg/multicloud/instance_base.go
@@ -94,3 +94,7 @@ func (ins *SInstanceBase) GetPowerStates() string {
 func (instance *SInstanceBase) GetError() error {
 	return nil
 }
+
+func (instance *SInstanceBase) GetIsolateDeviceIds() ([]string, error) {
+	return nil, errors.Wrapf(cloudprovider.ErrNotImplemented, "GetIsolateDeviceIds")
+}
diff --git a/pkg/multicloud/remotefile/instance.go b/pkg/multicloud/remotefile/instance.go
@@ -284,3 +284,7 @@ func (self *SInstance) GetPowerStates() string {
 	}
 	return api.VM_POWER_STATES_OFF
 }
+
+func (self *SInstance) GetIsolateDeviceIds() ([]string, error) {
+	return nil, cloudprovider.ErrNotSupported
+}