airship/airshipctl
Code Issues Proposed changes

Reuse RemoteDirect function for redfish dell client

Browse Source 
Change-Id: I17726cae6f4d1f99e1cec4fa7a29c1a9e1dee3d5
This commit is contained in:
Kostiantyn Kalynovskyi 2021-01-29 20:30:17 +00:00 committed by Kostyantyn Kalynovskyi
parent a89666a36e
commit 0a5f1e2ca4
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/remote/redfish/client.go
View File

@ -275,8 +275,13 @@ func (c *Client) SystemPowerStatus(ctx context.Context) (power.Status, error) {
// RemoteDirect implements remote direct interface
func (c *Client) RemoteDirect(ctx context.Context, isoURL string) error {
return RemoteDirect(ctx, isoURL, c.redfishURL, c)
}
// RemoteDirect allows to perform remotedirect
func RemoteDirect(ctx context.Context, isoURL, redfishURL string, c ifc.Client) error {
log.Debugf("Bootstrapping ephemeral host with ID '%s' and BMC Address '%s'.", c.NodeID(),
c.redfishURL)
redfishURL)
powerStatus, err := c.SystemPowerStatus(ctx)
if err != nil {

12
pkg/remote/redfish/vendors/dell/client.go vendored
View File

@ -51,8 +51,9 @@ const (
// Client is a wrapper around the standard airshipctl Redfish client. This allows vendor specific Redfish clients to
// override methods without duplicating the entire client.
type Client struct {
username string
password string
username string
password string
redfishURL string
redfish.Client
RedfishAPI redfishAPI.RedfishAPI
RedfishCFG *redfishClient.Configuration
@ -127,6 +128,11 @@ func (c *Client) SetBootSourceByType(ctx context.Context) error {
return nil
}
// RemoteDirect implements remote direct interface
func (c *Client) RemoteDirect(ctx context.Context, isoURL string) error {
return redfish.RemoteDirect(ctx, isoURL, c.redfishURL, c)
}
// newClient returns a client with the capability to make Redfish requests.
func newClient(redfishURL string,
insecure bool,
@ -141,7 +147,7 @@ func newClient(redfishURL string,
return nil, err
}
c := &Client{username, password, *genericClient, genericClient.RedfishAPI, genericClient.RedfishCFG}
c := &Client{username, password, redfishURL, *genericClient, genericClient.RedfishAPI, genericClient.RedfishCFG}
return c, nil
}