Add idrac redfish virtual media bmc support

pkg/bmc/access.go

@@ -46,6 +46,11 @@ type AccessDetails interface {
 
 	// Boot interface to set
 	BootInterface() string
+
+	ManagementInterface() string
+	PowerInterface() string
+	RAIDInterface() string
+	VendorInterface() string
 }
 
 func getParsedURL(address string) (parsedURL *url.URL, err error) {

pkg/bmc/access_test.go

@@ -351,6 +351,14 @@ func TestStaticDriverInfo(t *testing.T) {
 			driver:   "redfish",
 			boot:     "redfish-virtual-media",
 		},
+
+		{
+			Scenario: "idrac virtual media",
+			input:    "idrac-virtualmedia://192.168.122.1",
+			needsMac: true,
+			driver:   "idrac",
+			boot:     "idrac-redfish-virtual-media",
+		},
 	} {
 		t.Run(tc.Scenario, func(t *testing.T) {
 			acc, err := NewAccessDetails(tc.input)
@@ -584,6 +592,17 @@ func TestDriverInfo(t *testing.T) {
 				"redfish_username":  "",
 			},
 		},
+
+		{
+			Scenario: "idrac virtual media",
+			input:    "idrac-virtualmedia://192.168.122.1/foo/bar",
+			expects: map[string]string{
+				"redfish_address":   "https://192.168.122.1",
+				"redfish_system_id": "/foo/bar",
+				"redfish_password":  "",
+				"redfish_username":  "",
+			},
+		},
 	} {
 		t.Run(tc.Scenario, func(t *testing.T) {
 			acc, err := NewAccessDetails(tc.input)

pkg/bmc/idrac.go

@@ -70,3 +70,19 @@ func (a *iDracAccessDetails) DriverInfo(bmcCreds Credentials) map[string]interfa
 func (a *iDracAccessDetails) BootInterface() string {
 	return "ipxe"
 }
+
+func (a *iDracAccessDetails) ManagementInterface() string {
+	return ""
+}
+
+func (a *iDracAccessDetails) PowerInterface() string {
+	return ""
+}
+
+func (a *iDracAccessDetails) RAIDInterface() string {
+	return ""
+}
+
+func (a *iDracAccessDetails) VendorInterface() string {
+	return ""
+}

pkg/bmc/ipmi.go

@@ -66,3 +66,19 @@ func (a *ipmiAccessDetails) DriverInfo(bmcCreds Credentials) map[string]interfac
 func (a *ipmiAccessDetails) BootInterface() string {
 	return "ipxe"
 }
+
+func (a *ipmiAccessDetails) ManagementInterface() string {
+	return ""
+}
+
+func (a *ipmiAccessDetails) PowerInterface() string {
+	return ""
+}
+
+func (a *ipmiAccessDetails) RAIDInterface() string {
+	return ""
+}
+
+func (a *ipmiAccessDetails) VendorInterface() string {
+	return ""
+}

pkg/bmc/irmc.go

@@ -58,3 +58,19 @@ func (a *iRMCAccessDetails) DriverInfo(bmcCreds Credentials) map[string]interfac
 func (a *iRMCAccessDetails) BootInterface() string {
 	return "pxe"
 }
+
+func (a *iRMCAccessDetails) ManagementInterface() string {
+	return ""
+}
+
+func (a *iRMCAccessDetails) PowerInterface() string {
+	return ""
+}
+
+func (a *iRMCAccessDetails) RAIDInterface() string {
+	return ""
+}
+
+func (a *iRMCAccessDetails) VendorInterface() string {
+	return ""
+}

pkg/bmc/redfish.go

@@ -11,30 +11,45 @@ func init() {
 	registerFactory("redfish+https", newRedfishAccessDetails)
 	registerFactory("redfish-virtualmedia", newRedfishVirtualMediaAccessDetails)
 	registerFactory("ilo5-virtualmedia", newRedfishVirtualMediaAccessDetails)
+	registerFactory("idrac-virtualmedia", newRedfishiDracVirtualMediaAccessDetails)
 }
 
-func newRedfishAccessDetails(parsedURL *url.URL) (AccessDetails, error) {
+func redfishDetails(parsedURL *url.URL) *redfishAccessDetails {
 	return &redfishAccessDetails{
 		bmcType: parsedURL.Scheme,
 		host:    parsedURL.Host,
 		path:    parsedURL.Path,
-	}, nil
+	}
+}
+
+func newRedfishAccessDetails(parsedURL *url.URL) (AccessDetails, error) {
+	return redfishDetails(parsedURL), nil
 }
 
 func newRedfishVirtualMediaAccessDetails(parsedURL *url.URL) (AccessDetails, error) {
-	return &redfishAccessDetails{
-		bmcType:        parsedURL.Scheme,
-		host:           parsedURL.Host,
-		path:           parsedURL.Path,
-		isVirtualMedia: true,
+	return &redfishVirtualMediaAccessDetails{
+		*redfishDetails(parsedURL),
+	}, nil
+}
+
+func newRedfishiDracVirtualMediaAccessDetails(parsedURL *url.URL) (AccessDetails, error) {
+	return &redfishiDracVirtualMediaAccessDetails{
+		*redfishDetails(parsedURL),
 	}, nil
 }
 
 type redfishAccessDetails struct {
-	bmcType        string
-	host           string
-	path           string
-	isVirtualMedia bool
+	bmcType string
+	host    string
+	path    string
+}
+
+type redfishVirtualMediaAccessDetails struct {
+	redfishAccessDetails
+}
+
+type redfishiDracVirtualMediaAccessDetails struct {
+	redfishAccessDetails
 }
 
 const redfishDefaultScheme = "https"
@@ -83,9 +98,53 @@ func (a *redfishAccessDetails) DriverInfo(bmcCreds Credentials) map[string]inter
 
 // That can be either pxe or redfish-virtual-media
 func (a *redfishAccessDetails) BootInterface() string {
-	if a.isVirtualMedia {
-		return "redfish-virtual-media"
-	}
-
 	return "ipxe"
 }
+
+func (a *redfishAccessDetails) ManagementInterface() string {
+	return ""
+}
+
+func (a *redfishAccessDetails) PowerInterface() string {
+	return ""
+}
+
+func (a *redfishAccessDetails) RAIDInterface() string {
+	return ""
+}
+
+func (a *redfishAccessDetails) VendorInterface() string {
+	return ""
+}
+
+// Virtual Media Overrides
+
+func (a *redfishVirtualMediaAccessDetails) BootInterface() string {
+	return "redfish-virtual-media"
+}
+
+// iDrac Virtual Media Overrides
+
+func (a *redfishiDracVirtualMediaAccessDetails) Driver() string {
+	return "idrac"
+}
+
+func (a *redfishiDracVirtualMediaAccessDetails) BootInterface() string {
+	return "idrac-redfish-virtual-media"
+}
+
+func (a *redfishiDracVirtualMediaAccessDetails) ManagementInterface() string {
+	return "idrac-redfish"
+}
+
+func (a *redfishiDracVirtualMediaAccessDetails) PowerInterface() string {
+	return "idrac-redfish"
+}
+
+func (a *redfishiDracVirtualMediaAccessDetails) RAIDInterface() string {
+	return "no-raid"
+}
+
+func (a *redfishiDracVirtualMediaAccessDetails) VendorInterface() string {
+	return "no-vendor"
+}

pkg/provisioner/ironic/ironic.go

@@ -237,10 +237,15 @@ func (p *ironicProvisioner) ValidateManagementAccess(credentialsChanged bool) (r
 		ironicNode, err = nodes.Create(
 			p.client,
 			nodes.CreateOpts{
-				Driver:        p.bmcAccess.Driver(),
-				BootInterface: p.bmcAccess.BootInterface(),
-				Name:          p.host.Name,
-				DriverInfo:    driverInfo,
+				Driver:              p.bmcAccess.Driver(),
+				BootInterface:       p.bmcAccess.BootInterface(),
+				Name:                p.host.Name,
+				DriverInfo:          driverInfo,
+				InspectInterface:    "inspector",
+				ManagementInterface: p.bmcAccess.ManagementInterface(),
+				PowerInterface:      p.bmcAccess.PowerInterface(),
+				RAIDInterface:       p.bmcAccess.RAIDInterface(),
+				VendorInterface:     p.bmcAccess.VendorInterface(),
 			}).Extract()
 		// FIXME(dhellmann): Handle 409 and 503? errors here.
 		if err != nil {