kelvin/warewulf
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Renamed vnfs to container, finished VNFS and kernel refactoring

Browse Source
This commit is contained in:
Gregory Kurtzer
2020-12-06 00:47:00 -08:00
parent 0095b55624
commit 8c11c2b304
44 changed files with 143 additions and 504 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
internal/pkg/node/constructors.go
View File

@@ -59,7 +59,7 @@ func (self *nodeYaml) FindAllNodes() ([]NodeInfo, error) {
n.Id.Set(nodename)
n.Comment.Set(node.Comment)
n.Vnfs.Set(node.Vnfs)
n.ContainerName.Set(node.ContainerName)
n.KernelVersion.Set(node.KernelVersion)
n.KernelArgs.Set(node.KernelArgs)
n.ClusterName.Set(node.ClusterName)
@@ -97,7 +97,7 @@ func (self *nodeYaml) FindAllNodes() ([]NodeInfo, error) {
n.Comment.SetAlt(self.NodeProfiles[p].Comment, pstring)
n.ClusterName.SetAlt(self.NodeProfiles[p].ClusterName, pstring)
n.Vnfs.SetAlt(self.NodeProfiles[p].Vnfs, pstring)
n.ContainerName.SetAlt(self.NodeProfiles[p].ContainerName, pstring)
n.KernelVersion.SetAlt(self.NodeProfiles[p].KernelVersion, pstring)
n.KernelArgs.SetAlt(self.NodeProfiles[p].KernelArgs, pstring)
n.Ipxe.SetAlt(self.NodeProfiles[p].Ipxe, pstring)
@@ -140,7 +140,7 @@ func (self *nodeYaml) FindAllProfiles() ([]NodeInfo, error) {
p.Id.Set(name)
p.Comment.Set(profile.Comment)
p.Vnfs.Set(profile.Vnfs)
p.ContainerName.Set(profile.ContainerName)
p.Ipxe.Set(profile.Ipxe)
p.KernelVersion.Set(profile.KernelVersion)
p.KernelArgs.Set(profile.KernelArgs)

4
internal/pkg/node/datastructure.go
View File

@@ -19,7 +19,7 @@ type NodeConf struct {
Comment string `yaml:"comment,omitempty"`
Disabled bool `yaml:"disabled,omitempty"`
ClusterName string `yaml:"cluster name,omitempty"`
Vnfs string `yaml:"vnfs,omitempty"`
ContainerName string `yaml:"container name,omitempty"`
Ipxe string `yaml:"ipxe template,omitempty"`
KernelVersion string `yaml:"kernel version,omitempty"`
KernelArgs string `yaml:"kernel args,omitempty"`
@@ -60,7 +60,7 @@ type NodeInfo struct {
Cid Entry
Comment Entry
ClusterName Entry
Vnfs Entry
ContainerName Entry
Ipxe Entry
KernelVersion Entry
KernelArgs Entry

4
internal/pkg/node/modifiers.go
View File

@@ -54,7 +54,7 @@ func (self *nodeYaml) NodeUpdate(node NodeInfo) error {
}
self.Nodes[nodeID].Comment = node.Comment.GetReal()
self.Nodes[nodeID].Vnfs = node.Vnfs.GetReal()
self.Nodes[nodeID].ContainerName = node.ContainerName.GetReal()
self.Nodes[nodeID].ClusterName = node.ClusterName.GetReal()
self.Nodes[nodeID].Ipxe = node.Ipxe.GetReal()
self.Nodes[nodeID].KernelVersion = node.KernelVersion.GetReal()
@@ -125,7 +125,7 @@ func (self *nodeYaml) ProfileUpdate(profile NodeInfo) error {
return errors.New("Profile name does not exist: " + profileID)
}
self.NodeProfiles[profileID].Comment = profile.Comment.GetReal()
self.NodeProfiles[profileID].Vnfs = profile.Vnfs.GetReal()
self.NodeProfiles[profileID].ContainerName = profile.ContainerName.GetReal()
self.NodeProfiles[profileID].Ipxe = profile.Ipxe.GetReal()
self.NodeProfiles[profileID].ClusterName = profile.ClusterName.GetReal()
self.NodeProfiles[profileID].KernelVersion = profile.KernelVersion.GetReal()