Merge pull request #1708 from ioito/automated-cherry-pick-of-#1707-upstream-release-4.0

Automated cherry pick of #1707: fix: support container resource

Author: ioito

pkg/cloudprovider/resources.go

@@ -367,11 +367,6 @@ type ICloudVM interface {
 	GetVga() string
 	GetVdi() string
 
-	// GetOSArch() string
-	// GetOsType() TOsType
-	// GetOSName() string
-	// GetBios() string
-
 	GetMachine() string
 	GetInstanceType() string
 
@@ -418,6 +413,39 @@ type ICloudVM interface {
 	GetPowerStates() string
 	GetHealthStatus() string
 	GetIsolateDeviceIds() ([]string, error)
+
+	GetContainers() ([]ICloudContainer, error)
+}
+
+type SContainerEnv struct {
+	Key   string
+	Value string
+}
+
+type ICloudContainer interface {
+	ICloudResource
+
+	GetImage() string
+	GetCommand() []string
+	GetEnvs() []SContainerEnv
+
+	GetStartedAt() time.Time
+	GetLastFinishedAt() time.Time
+	GetRestartCount() int
+
+	GetVolumentMounts() ([]ICloudVolumeMount, error)
+	GetDevices() ([]IContainerDevice, error)
+}
+
+type ICloudVolumeMount interface {
+	GetName() string
+	IsReadOnly() bool
+	GetType() string
+}
+
+type IContainerDevice interface {
+	GetId() string
+	GetType() string
 }
 
 type ICloudNic interface {

pkg/multicloud/instance_base.go

@@ -102,3 +102,7 @@ func (instance *SInstanceBase) GetError() error {
 func (instance *SInstanceBase) GetIsolateDeviceIds() ([]string, error) {
 	return nil, errors.Wrapf(cloudprovider.ErrNotImplemented, "GetIsolateDeviceIds")
 }
+
+func (instance *SInstanceBase) GetContainers() ([]cloudprovider.ICloudContainer, error) {
+	return nil, errors.Wrapf(cloudprovider.ErrNotImplemented, "GetContainers")
+}

pkg/multicloud/remotefile/instance.go

@@ -292,3 +292,7 @@ func (self *SInstance) GetHealthStatus() string {
 func (self *SInstance) GetIsolateDeviceIds() ([]string, error) {
 	return nil, cloudprovider.ErrNotSupported
 }
+
+func (self *SInstance) GetContainers() ([]cloudprovider.ICloudContainer, error) {
+	return nil, cloudprovider.ErrNotSupported
+}