From 10976a7e5dda75f8d8c457733ba88eb761d73276 Mon Sep 17 00:00:00 2001
From: Andreas Skau <andreas.skau@usit.uio.no>
Date: Mon, 4 Dec 2023 15:58:26 +0100
Subject: [PATCH] Delinted

---
 internal/pkg/api/node/list.go      |  2 +-
 internal/pkg/node/constructors.go  |  1 +
 internal/pkg/node/datastructure.go | 17 +++++++++--------
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/internal/pkg/api/node/list.go b/internal/pkg/api/node/list.go
index 4f8b27a0..c8bc35be 100644
--- a/internal/pkg/api/node/list.go
+++ b/internal/pkg/api/node/list.go
@@ -60,7 +60,7 @@ func NodeList(nodeGet *wwapiv1.GetNodeList) (nodeList wwapiv1.NodeList, err erro
 			fmt.Sprintf("%s:=:%s:=:%s:=:%s:=:%s", "NODE NAME", "IPMI IPADDR", "IPMI PORT", "IPMI USERNAME", "IPMI INTERFACE"))
 		for _, n := range node.FilterByName(nodes, nodeGet.Nodes) {
 			nodeList.Output = append(nodeList.Output,
-				fmt.Sprintf("%s:=:%s:=:%s:=:%s:=:%s", n.Id.Print(),
+			fmt.Sprintf("%s:=:%s:=:%s:=:%s:=:%s:=%s", n.Id.Print(),
 					n.Ipmi.Ipaddr.Print(),
 					n.Ipmi.Port.Print(),
 					n.Ipmi.UserName.Print(),
diff --git a/internal/pkg/node/constructors.go b/internal/pkg/node/constructors.go
index 3512154a..25a8944e 100644
--- a/internal/pkg/node/constructors.go
+++ b/internal/pkg/node/constructors.go
@@ -176,6 +176,7 @@ func (config *NodeYaml) FindAllNodes() ([]NodeInfo, error) {
 		n.Ipmi.UserName.Set(node.IpmiUserName)
 		n.Ipmi.Password.Set(node.IpmiPassword)
 		n.Ipmi.Interface.Set(node.IpmiInterface)
+		n.Ipmi.EscapeChar.Set(node.Ipmi.EscapeChar)
 		n.Ipmi.Write.Set(node.IpmiWrite)
 		n.Kernel.Args.Set(node.KernelArgs)
 		n.Kernel.Override.Set(node.KernelOverride)
diff --git a/internal/pkg/node/datastructure.go b/internal/pkg/node/datastructure.go
index 9e5faec7..183e77a1 100644
--- a/internal/pkg/node/datastructure.go
+++ b/internal/pkg/node/datastructure.go
@@ -26,14 +26,15 @@ type NodeConf struct {
 	KernelOverride string `yaml:"kernel override,omitempty"`
 	KernelArgs     string `yaml:"kernel args,omitempty"`
 	// Ipmi settings herer are deprecated and here for backward compatibility
-	IpmiUserName  string `yaml:"ipmi username,omitempty"`
-	IpmiPassword  string `yaml:"ipmi password,omitempty"`
-	IpmiIpaddr    string `yaml:"ipmi ipaddr,omitempty"`
-	IpmiNetmask   string `yaml:"ipmi netmask,omitempty"`
-	IpmiPort      string `yaml:"ipmi port,omitempty"`
-	IpmiGateway   string `yaml:"ipmi gateway,omitempty"`
-	IpmiInterface string `yaml:"ipmi interface,omitempty"`
-	IpmiWrite     string `yaml:"ipmi write,omitempty"`
+	IpmiUserName   string `yaml:"ipmi username,omitempty"`
+	IpmiPassword   string `yaml:"ipmi password,omitempty"`
+	IpmiIpaddr     string `yaml:"ipmi ipaddr,omitempty"`
+	IpmiNetmask    string `yaml:"ipmi netmask,omitempty"`
+	IpmiPort       string `yaml:"ipmi port,omitempty"`
+	IpmiGateway    string `yaml:"ipmi gateway,omitempty"`
+	IpmiInterface  string `yaml:"ipmi interface,omitempty"`
+	IpmiEscapeChar string `yaml:"ipmi escapechar,omitempty"`
+	IpmiWrite      string `yaml:"ipmi write,omitempty"`
 	// Deprecated end
 	RuntimeOverlay []string               `yaml:"runtime overlay,omitempty" lopt:"runtime" sopt:"R" comment:"Set the runtime overlay"`
 	SystemOverlay  []string               `yaml:"system overlay,omitempty" lopt:"wwinit" sopt:"O" comment:"Set the system overlay"`