Node Prep Fix

Author: emmahardison

internal/nodeprep/instruction/instructions.go

@@ -30,6 +30,7 @@ func init() {
 	instructionMap[Key{Protocol: protocol.ISCSI, Distro: nodeinfo.DistroAmzn, PkgMgr: nodeinfo.PkgMgrYum}] = newRHELYumISCSI()
 	instructionMap[Key{Protocol: protocol.ISCSI, Distro: nodeinfo.DistroUbuntu, PkgMgr: nodeinfo.PkgMgrApt}] = newDebianAptISCSI()
 	instructionMap[Key{Protocol: protocol.ISCSI, Distro: nodeinfo.DistroRhcos, PkgMgr: nodeinfo.PkgMgrNone}] = newRHCOSISCSI()
+	instructionMap[Key{Protocol: protocol.ISCSI, Distro: nodeinfo.DistroRhel, PkgMgr: nodeinfo.PkgMgrNone}] = newRHCOSISCSI()
 	instructionMap[Key{Protocol: protocol.ISCSI, Distro: "", PkgMgr: nodeinfo.PkgMgrYum}] = newYumISCSI()
 	instructionMap[Key{Protocol: protocol.ISCSI, Distro: "", PkgMgr: nodeinfo.PkgMgrApt}] = newAptISCSI()
 }

internal/nodeprep/instruction/instructions_test.go

@@ -18,6 +18,7 @@ import (
 func TestInstructions(t *testing.T) {
 	RHELYumISCSI := newRHELYumISCSI()
 	DebianAptISCSI := newDebianAptISCSI()
+	RHCOSISCSI := newRHCOSISCSI()
 	YumISCSI := newYumISCSI()
 	AptISCSI := newAptISCSI()
 
@@ -28,6 +29,7 @@ func TestInstructions(t *testing.T) {
 		scopedInstructions := map[Key]Instructions{}
 		scopedInstructions[Key{Protocol: protocol.ISCSI, Distro: nodeinfo.DistroAmzn, PkgMgr: nodeinfo.PkgMgrYum}] = RHELYumISCSI
 		scopedInstructions[Key{Protocol: protocol.ISCSI, Distro: nodeinfo.DistroUbuntu, PkgMgr: nodeinfo.PkgMgrApt}] = DebianAptISCSI
+		scopedInstructions[Key{Protocol: protocol.ISCSI, Distro: nodeinfo.DistroRhel, PkgMgr: nodeinfo.PkgMgrNone}] = RHCOSISCSI
 		scopedInstructions[Key{Protocol: protocol.ISCSI, Distro: "", PkgMgr: nodeinfo.PkgMgrYum}] = YumISCSI
 		scopedInstructions[Key{Protocol: protocol.ISCSI, Distro: "", PkgMgr: nodeinfo.PkgMgrApt}] = AptISCSI
 		ScopedInstructions(scopedInstructions)
@@ -54,6 +56,12 @@ func TestInstructions(t *testing.T) {
 		},
 	}
 
+	rhelHostSystemResponse := models.HostSystem{
+		OS: models.SystemOS{
+			Distro: nodeinfo.DistroRhel,
+		},
+	}
+
 	const fooDistro nodeinfo.Distro = "foo"
 
 	fooHostSystemResponse := models.HostSystem{
@@ -124,6 +132,27 @@ func TestInstructions(t *testing.T) {
 			setInstructions:      setDefaultInstructions,
 			assertError:          assert.NoError,
 		},
+		"node info returns rhel distro without package manager": {
+			getOSClient: func(controller *gomock.Controller) osutils.Utils {
+				os := mock_osutils.NewMockUtils(controller)
+				os.EXPECT().GetHostSystemInfo(gomock.Any()).Return(&rhelHostSystemResponse, nil)
+				return os
+			},
+			getBinaryClient: func(controller *gomock.Controller) nodeinfo.Binary {
+				binary := mock_nodeinfo.NewMockBinary(controller)
+				binary.EXPECT().FindPath(nodeinfo.PkgMgrYum).Return("")
+				binary.EXPECT().FindPath(nodeinfo.PkgMgrApt).Return("")
+				return binary
+			},
+			expectedNodeInfo: &nodeinfo.NodeInfo{
+				PkgMgr:     nodeinfo.PkgMgrNone,
+				HostSystem: rhelHostSystemResponse,
+				Distro:     nodeinfo.DistroRhel,
+			},
+			expectedInstructions: []Instructions{RHCOSISCSI},
+			setInstructions:      setDefaultInstructions,
+			assertError:          assert.NoError,
+		},
 		"node info returns unknown linux distro without package manager": {
 			getOSClient: func(controller *gomock.Controller) osutils.Utils {
 				os := mock_osutils.NewMockUtils(controller)

internal/nodeprep/nodeinfo/node_info.go

@@ -28,6 +28,7 @@ const (
 	DistroUbuntu  Distro = osutils.Ubuntu
 	DistroAmzn    Distro = "amzn"
 	DistroRhcos   Distro = "rhcos"
+	DistroRhel    Distro = osutils.RHEL
 	DistroUnknown        = "unknown"
 
 	PkgMgrYum  PkgMgr = "yum"