opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-08-30 17:13:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(baremetal): some tasks don't implement IServerBaseDeployTask interface (#20786)

Browse Source
This commit is contained in:
Zexi Li
2024-07-10 16:15:46 +08:00
committed by GitHub
parent cc2930e86b
commit b66d955fe9
6 changed files with 26 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/baremetal/tasks/basedeploy.go
+6 -6
View File
@@ -32,8 +32,8 @@ type IServerBaseDeployTask interface {
IPXEBootTask
RemoveEFIOSEntry() bool
DoDeploys(term *ssh.Client) (jsonutils.JSONObject, error)
PostDeploys(term *ssh.Client) error
DoDeploys(ctx context.Context, term *ssh.Client) (jsonutils.JSONObject, error)
PostDeploys(ctx context.Context, term *ssh.Client) error
}
type SBaremetalServerBaseDeployTask struct {
@@ -85,11 +85,11 @@ func (self *SBaremetalServerBaseDeployTask) RemoveEFIOSEntry() bool {
return false
}
func (self *SBaremetalServerBaseDeployTask) DoDeploys(_ *ssh.Client) (jsonutils.JSONObject, error) {
func (self *SBaremetalServerBaseDeployTask) DoDeploys(ctx context.Context, _ *ssh.Client) (jsonutils.JSONObject, error) {
return nil, nil
}
func (self *SBaremetalServerBaseDeployTask) PostDeploys(_ *ssh.Client) error {
func (self *SBaremetalServerBaseDeployTask) PostDeploys(_ context.Context, _ *ssh.Client) error {
return nil
}
@@ -102,7 +102,7 @@ func (self *SBaremetalServerBaseDeployTask) OnPXEBoot(ctx context.Context, term
}
}
result, err := self.IServerBaseDeployTask().DoDeploys(term)
result, err := self.IServerBaseDeployTask().DoDeploys(ctx, term)
if err != nil {
return errors.Wrap(err, "Do deploy")
}
@@ -119,7 +119,7 @@ func (self *SBaremetalServerBaseDeployTask) OnPXEBoot(ctx context.Context, term
return errors.Wrap(err, "Sync disk")
}
if err := self.IServerBaseDeployTask().PostDeploys(term); err != nil {
if err := self.IServerBaseDeployTask().PostDeploys(ctx, term); err != nil {
return errors.Wrap(err, "post deploy")
}
pkg/baremetal/tasks/create.go
+3 -1
View File
@@ -25,6 +25,8 @@ import (
"yunion.io/x/onecloud/pkg/util/ssh"
)
var _ IServerBaseDeployTask = new(SBaremetalServerCreateTask)
type SBaremetalServerCreateTask struct {
SBaremetalServerBaseDeployTask
}
@@ -94,7 +96,7 @@ func doPoweroff(term *ssh.Client) error {
return nil
}
func (self *SBaremetalServerCreateTask) PostDeploys(term *ssh.Client) error {
func (self *SBaremetalServerCreateTask) PostDeploys(ctx context.Context, term *ssh.Client) error {
if self.Baremetal.HasBMC() {
return doPoweroff(term)
}
pkg/baremetal/tasks/deploy.go
+5 -1
View File
@@ -15,6 +15,8 @@
package tasks
import (
"context"
"yunion.io/x/jsonutils"
"yunion.io/x/pkg/errors"
@@ -22,6 +24,8 @@ import (
"yunion.io/x/onecloud/pkg/util/ssh"
)
var _ IServerBaseDeployTask = new(SBaremetalServerDeployTask)
type SBaremetalServerDeployTask struct {
SBaremetalServerBaseDeployTask
}
@@ -48,7 +52,7 @@ func (self *SBaremetalServerDeployTask) RemoveEFIOSEntry() bool {
return false
}
func (self *SBaremetalServerDeployTask) DoDeploys(term *ssh.Client) (jsonutils.JSONObject, error) {
func (self *SBaremetalServerDeployTask) DoDeploys(ctx context.Context, term *ssh.Client) (jsonutils.JSONObject, error) {
tool, err := self.Baremetal.GetServer().NewConfigedSSHPartitionTool(term)
if err != nil {
return nil, errors.Wrap(err, "NewConfigedSSHPartitionTool")
pkg/baremetal/tasks/destroy.go
+5 -1
View File
@@ -15,6 +15,8 @@
package tasks
import (
"context"
"yunion.io/x/jsonutils"
"yunion.io/x/log"
@@ -22,6 +24,8 @@ import (
"yunion.io/x/onecloud/pkg/util/ssh"
)
var _ IServerBaseDeployTask = new(SBaremetalServerDestroyTask)
type SBaremetalServerDestroyTask struct {
SBaremetalServerBaseDeployTask
}
@@ -48,7 +52,7 @@ func (self *SBaremetalServerDestroyTask) RemoveEFIOSEntry() bool {
return true
}
func (self *SBaremetalServerDestroyTask) DoDeploys(term *ssh.Client) (jsonutils.JSONObject, error) {
func (self *SBaremetalServerDestroyTask) DoDeploys(ctx context.Context, term *ssh.Client) (jsonutils.JSONObject, error) {
if err := self.Baremetal.GetServer().DoEraseDisk(term); err != nil {
log.Errorf("Delete server do erase disk: %v", err)
}
pkg/baremetal/tasks/rebuild.go
+5 -2
View File
@@ -15,6 +15,7 @@
package tasks
import (
"context"
"fmt"
"yunion.io/x/jsonutils"
@@ -24,6 +25,8 @@ import (
"yunion.io/x/onecloud/pkg/util/ssh"
)
var _ IServerBaseDeployTask = new(SBaremetalServerRebuildTask)
type SBaremetalServerRebuildTask struct {
SBaremetalServerBaseDeployTask
}
@@ -50,7 +53,7 @@ func (self *SBaremetalServerRebuildTask) RemoveEFIOSEntry() bool {
return true
}
func (self *SBaremetalServerRebuildTask) DoDeploys(term *ssh.Client) (jsonutils.JSONObject, error) {
func (self *SBaremetalServerRebuildTask) DoDeploys(ctx context.Context, term *ssh.Client) (jsonutils.JSONObject, error) {
tool, err := self.Baremetal.GetServer().NewConfigedSSHPartitionTool(term)
if err != nil {
return nil, errors.Wrap(err, "NewConfigedSSHPartitionTool")
@@ -73,7 +76,7 @@ func (self *SBaremetalServerRebuildTask) DoDeploys(term *ssh.Client) (jsonutils.
return data, nil
}
func (self *SBaremetalServerRebuildTask) PostDeploys(term *ssh.Client) error {
func (self *SBaremetalServerRebuildTask) PostDeploys(ctx context.Context, term *ssh.Client) error {
if self.Baremetal.HasBMC() {
return doPoweroff(term)
}
pkg/baremetal/tasks/reprepare.go
+2
View File
@@ -23,6 +23,8 @@ import (
"yunion.io/x/onecloud/pkg/util/ssh"
)
var _ IServerBaseDeployTask = new(SBaremetalReprepareTask)
type SBaremetalReprepareTask struct {
SBaremetalServerBaseDeployTask
}