Merge pull request metal3-io#933 from dtantsur/redfish-vendor

Do not disable iDRAC Redfish vendor interfaces
matthewei · Sep 13, 2021 · 88aa058 · 88aa058
2 parents c0179b1 + 9940901
commit 88aa058
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 17 deletions.
diff --git a/pkg/bmc/access_test.go b/pkg/bmc/access_test.go
@@ -456,7 +456,6 @@ func TestStaticDriverInfo(t *testing.T) {
 			management: "",
 			power:      "",
 			raid:       "no-raid",
-			vendor:     "",
 		},
 
 		{
@@ -469,7 +468,6 @@ func TestStaticDriverInfo(t *testing.T) {
 			management: "",
 			power:      "",
 			raid:       "no-raid",
-			vendor:     "",
 		},
 
 		{
@@ -482,7 +480,6 @@ func TestStaticDriverInfo(t *testing.T) {
 			management: "",
 			power:      "",
 			raid:       "no-raid",
-			vendor:     "",
 		},
 
 		{
@@ -495,7 +492,6 @@ func TestStaticDriverInfo(t *testing.T) {
 			management: "",
 			power:      "",
 			raid:       "irmc",
-			vendor:     "",
 		},
 
 		{
@@ -508,7 +504,6 @@ func TestStaticDriverInfo(t *testing.T) {
 			management: "",
 			power:      "",
 			raid:       "no-raid",
-			vendor:     "",
 		},
 
 		{
@@ -521,7 +516,6 @@ func TestStaticDriverInfo(t *testing.T) {
 			management: "",
 			power:      "",
 			raid:       "no-raid",
-			vendor:     "",
 		},
 
 		{
@@ -534,7 +528,6 @@ func TestStaticDriverInfo(t *testing.T) {
 			management: "",
 			power:      "",
 			raid:       "no-raid",
-			vendor:     "",
 		},
 
 		{
@@ -547,7 +540,6 @@ func TestStaticDriverInfo(t *testing.T) {
 			management: "",
 			power:      "",
 			raid:       "no-raid",
-			vendor:     "",
 		},
 
 		{
@@ -560,7 +552,7 @@ func TestStaticDriverInfo(t *testing.T) {
 			management: "idrac-redfish",
 			power:      "idrac-redfish",
 			raid:       "no-raid",
-			vendor:     "no-vendor",
+			vendor:     "idrac-redfish",
 		},
 
 		{
@@ -600,7 +592,7 @@ func TestStaticDriverInfo(t *testing.T) {
 			management: "idrac-redfish",
 			power:      "idrac-redfish",
 			raid:       "no-raid",
-			vendor:     "no-vendor",
+			vendor:     "idrac-redfish",
 		},
 
 		{
@@ -613,7 +605,7 @@ func TestStaticDriverInfo(t *testing.T) {
 			management: "idrac-redfish",
 			power:      "idrac-redfish",
 			raid:       "no-raid",
-			vendor:     "no-vendor",
+			vendor:     "idrac-redfish",
 		},
 
 		{
@@ -626,7 +618,7 @@ func TestStaticDriverInfo(t *testing.T) {
 			management: "idrac-redfish",
 			power:      "idrac-redfish",
 			raid:       "no-raid",
-			vendor:     "no-vendor",
+			vendor:     "idrac-redfish",
 		},
 
 		{
@@ -639,7 +631,6 @@ func TestStaticDriverInfo(t *testing.T) {
 			management: "ibmc",
 			power:      "ibmc",
 			raid:       "no-raid",
-			vendor:     "",
 		},
 
 		{
@@ -652,7 +643,6 @@ func TestStaticDriverInfo(t *testing.T) {
 			management: "",
 			power:      "",
 			raid:       "no-raid",
-			vendor:     "",
 		},
 
 		{
@@ -665,7 +655,6 @@ func TestStaticDriverInfo(t *testing.T) {
 			management: "",
 			power:      "",
 			raid:       "ilo5",
-			vendor:     "",
 		},
 	} {
 		t.Run(tc.Scenario, func(t *testing.T) {
@@ -687,6 +676,10 @@ func TestStaticDriverInfo(t *testing.T) {
 				t.Fatalf("Unexpected bios interface %q, expected %q",
 					acc.BIOSInterface(), tc.bios)
 			}
+			if acc.VendorInterface() != tc.vendor {
+				t.Fatalf("Unexpected vendor interface %q, expected %q",
+					acc.VendorInterface(), tc.vendor)
+			}
 		})
 	}
 }

diff --git a/pkg/bmc/idrac_virtualmedia.go b/pkg/bmc/idrac_virtualmedia.go
@@ -91,7 +91,8 @@ func (a *redfishiDracVirtualMediaAccessDetails) RAIDInterface() string {
 }
 
 func (a *redfishiDracVirtualMediaAccessDetails) VendorInterface() string {
-	return "no-vendor"
+	// NOTE(dtantsur): the idrac hardware type defaults to WSMAN vendor, we need to use the Redfish implementation.
+	return "idrac-redfish"
 }
 
 func (a *redfishiDracVirtualMediaAccessDetails) SupportsSecureBoot() bool {

diff --git a/pkg/bmc/redfish.go b/pkg/bmc/redfish.go
@@ -162,7 +162,8 @@ func (a *redfishiDracAccessDetails) RAIDInterface() string {
 }
 
 func (a *redfishiDracAccessDetails) VendorInterface() string {
-	return "no-vendor"
+	// NOTE(dtantsur): the idrac hardware type defaults to WSMAN vendor, we need to use the Redfish implementation.
+	return "idrac-redfish"
 }
 
 func (a *redfishiDracAccessDetails) BuildBIOSSettings(firmwareConfig *metal3v1alpha1.FirmwareConfig) (settings []map[string]string, err error) {