Merge pull request #911 from Hellcatlk/alternate

metal3-io-bot · web-flow · commit 66307fe8dfd8 · 2021-06-10T13:56:46.000+03:00
Disable raid feature for iRMC server
diff --git a/pkg/bmc/irmc.go b/pkg/bmc/irmc.go
@@ -83,7 +83,7 @@ func (a *iRMCAccessDetails) PowerInterface() string {
 }
 
 func (a *iRMCAccessDetails) RAIDInterface() string {
-	return "irmc"
+	return "no-raid"
 }
 
 func (a *iRMCAccessDetails) VendorInterface() string {
diff --git a/pkg/provisioner/ironic/prepare_test.go b/pkg/provisioner/ironic/prepare_test.go
@@ -158,7 +158,7 @@ func TestPrepare(t *testing.T) {
 			host.Status.Provisioning.ID = nodeUUID
 			prepData := provisioner.PrepareData{}
 			if tc.existRaidConfig {
-				host.Spec.BMC.Address = "irmc://test.bmc/"
+				host.Spec.BMC.Address = "idrac://test.bmc/"
 				prepData.RAIDConfig = &metal3v1alpha1.RAIDConfig{
 					HardwareRAIDVolumes: []metal3v1alpha1.HardwareRAIDVolume{
 						{

Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ func (a *iRMCAccessDetails) PowerInterface() string {`
`83`	`83`	`}`
`84`	`84`
`85`	`85`	`func (a *iRMCAccessDetails) RAIDInterface() string {`
`86`		`- return "irmc"`
	`86`	`+ return "no-raid"`
`87`	`87`	`}`
`88`	`88`
`89`	`89`	`func (a *iRMCAccessDetails) VendorInterface() string {`
Original file line number	Diff line number	Diff line change
`@@ -158,7 +158,7 @@ func TestPrepare(t *testing.T) {`
`158`	`158`	`host.Status.Provisioning.ID = nodeUUID`
`159`	`159`	`prepData := provisioner.PrepareData{}`
`160`	`160`	`if tc.existRaidConfig {`
`161`		`- host.Spec.BMC.Address = "irmc://test.bmc/"`
	`161`	`+ host.Spec.BMC.Address = "idrac://test.bmc/"`
`162`	`162`	`prepData.RAIDConfig = &metal3v1alpha1.RAIDConfig{`
`163`	`163`	`HardwareRAIDVolumes: []metal3v1alpha1.HardwareRAIDVolume{`
`164`	`164`	`{`