Fixing tests in review of #1568

Signed-off-by: Jonathon Anderson <janderson@ciq.com>

internal/pkg/node/datastructure.go

@@ -15,9 +15,9 @@ const undef string = "UNDEF"
 Structure of which goes to disk
 */
 type NodesYaml struct {
-	NodeProfiles map[string]*Profile
-	Nodes        map[string]*Node
-	Resource     map[string]RemoteRes `yaml:"resource,omitempty"`
+	NodeProfiles map[string]*Profile `yaml:"nodeprofiles"`
+	Nodes        map[string]*Node    `yaml:"nodes"`
+	Resources    map[string]Resource `yaml:"resources,omitempty"`
 }
 
 /*
@@ -54,7 +54,7 @@ type Profile struct {
 	PrimaryNetDev  string                 `yaml:"primary network,omitempty" lopt:"primarynet" sopt:"p" comment:"Set the primary network interface"`
 	Disks          map[string]*Disk       `yaml:"disks,omitempty"`
 	FileSystems    map[string]*FileSystem `yaml:"filesystems,omitempty"`
-	ResourceList   []string               `yaml:"resource_list,omitempty" lopt:"resources" comment:"Set the resources available to the node or profile"`
+	Resources      []string               `yaml:"resources,omitempty" lopt:"resources" comment:"Set the resources available to the node or profile"`
 }
 
 type IpmiConf struct {
@@ -127,13 +127,4 @@ type FileSystem struct {
 	MountOptions   string   `yaml:"mount_options,omitempty" comment:"any special options to be passed to the mount command"`
 }
 
-/*
-Definition of any remote. Can be a nfs share or other FS types
-*/
-
-type RemoteRes map[string]string
-
-// always return so that the resource isn't marshalled
-// func (res RemoteRes) IsZero() bool {
-// 	return true
-// }
+type Resource map[string]string