Merge pull request #1145 from moshe010/constants

use StepInterface constants

Author: metal3-io-bot

pkg/provisioner/ironic/ironic.go

@@ -1216,7 +1216,7 @@ func (p *ironicProvisioner) buildManualCleaningSteps(bmcAccess bmc.AccessDetails
 		cleanSteps = append(
 			cleanSteps,
 			nodes.CleanStep{
-				Interface: "bios",
+				Interface: nodes.InterfaceBIOS,
 				Step:      "apply_configuration",
 				Args: map[string]interface{}{
 					"settings": newSettings,

pkg/provisioner/ironic/raid.go

@@ -205,11 +205,11 @@ func BuildRAIDCleanSteps(raidInterface string, target *metal3v1alpha1.RAIDConfig
 			cleanSteps,
 			[]nodes.CleanStep{
 				{
-					Interface: "raid",
+					Interface: nodes.InterfaceRAID,
 					Step:      "delete_configuration",
 				},
 				{
-					Interface: "deploy",
+					Interface: nodes.InterfaceDeploy,
 					Step:      "erase_devices_metadata",
 				},
 			}...,
@@ -223,7 +223,7 @@ func BuildRAIDCleanSteps(raidInterface string, target *metal3v1alpha1.RAIDConfig
 		cleanSteps = append(
 			cleanSteps,
 			nodes.CleanStep{
-				Interface: "raid",
+				Interface: nodes.InterfaceRAID,
 				Step:      "create_configuration",
 			},
 		)
@@ -251,7 +251,7 @@ func BuildRAIDCleanSteps(raidInterface string, target *metal3v1alpha1.RAIDConfig
 	cleanSteps = append(
 		cleanSteps,
 		nodes.CleanStep{
-			Interface: "raid",
+			Interface: nodes.InterfaceRAID,
 			Step:      "delete_configuration",
 		},
 	)
@@ -266,7 +266,7 @@ func BuildRAIDCleanSteps(raidInterface string, target *metal3v1alpha1.RAIDConfig
 	cleanSteps = append(
 		cleanSteps,
 		nodes.CleanStep{
-			Interface: "raid",
+			Interface: nodes.InterfaceRAID,
 			Step:      "create_configuration",
 		},
 	)

pkg/provisioner/ironic/raid_test.go

@@ -267,11 +267,11 @@ func TestBuildRAIDCleanSteps(t *testing.T) {
 			},
 			expected: []nodes.CleanStep{
 				{
-					Interface: "raid",
+					Interface: nodes.InterfaceRAID,
 					Step:      "delete_configuration",
 				},
 				{
-					Interface: "raid",
+					Interface: nodes.InterfaceRAID,
 					Step:      "create_configuration",
 				},
 			},
@@ -317,7 +317,7 @@ func TestBuildRAIDCleanSteps(t *testing.T) {
 			},
 			expected: []nodes.CleanStep{
 				{
-					Interface: "raid",
+					Interface: nodes.InterfaceRAID,
 					Step:      "delete_configuration",
 				},
 			},
@@ -334,15 +334,15 @@ func TestBuildRAIDCleanSteps(t *testing.T) {
 			},
 			expected: []nodes.CleanStep{
 				{
-					Interface: "raid",
+					Interface: nodes.InterfaceRAID,
 					Step:      "delete_configuration",
 				},
 				{
-					Interface: "deploy",
+					Interface: nodes.InterfaceDeploy,
 					Step:      "erase_devices_metadata",
 				},
 				{
-					Interface: "raid",
+					Interface: nodes.InterfaceRAID,
 					Step:      "create_configuration",
 				},
 			},
@@ -380,11 +380,11 @@ func TestBuildRAIDCleanSteps(t *testing.T) {
 			},
 			expected: []nodes.CleanStep{
 				{
-					Interface: "raid",
+					Interface: nodes.InterfaceRAID,
 					Step:      "delete_configuration",
 				},
 				{
-					Interface: "deploy",
+					Interface: nodes.InterfaceDeploy,
 					Step:      "erase_devices_metadata",
 				},
 			},