From c0d2e3714cf96e20427cd3cc9b9cfeed4b991a6c Mon Sep 17 00:00:00 2001
From: Christian Goll <cgoll@suse.com>
Date: Tue, 12 Nov 2024 16:49:15 +0100
Subject: [PATCH] add tag to tags not nettag

Signed-off-by: Christian Goll <cgoll@suse.com>
---
 CHANGELOG.md                             |  1 +
 internal/app/wwctl/node/set/main_test.go | 44 ++++++++++++++++++++++++
 internal/pkg/api/node/set.go             |  2 +-
 3 files changed, 46 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 73a114af..b7129c01 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -132,6 +132,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Fix "onboot" behavior for NetworkManager, Debian networking, and Suse wicked. #1278
 - Clarified missing steps in Enterprise Linux quickstart. #1179
 - Fix dhcpd.conf static template to include next-server and dhcp-range #1536
+- Fix panic when adding tag with existing netdev #1546
 
 
 ## v4.5.7, 2024-09-11
diff --git a/internal/app/wwctl/node/set/main_test.go b/internal/app/wwctl/node/set/main_test.go
index ec9c4469..73f0107f 100644
--- a/internal/app/wwctl/node/set/main_test.go
+++ b/internal/app/wwctl/node/set/main_test.go
@@ -344,6 +344,50 @@ nodes:
       tag2: value2
 `,
 		},
+		{
+			name:    "single node add tag",
+			args:    []string{"--tagadd", "tag1=foobaar", "n01"},
+			wantErr: false,
+			stdout:  "",
+			inDB: `nodeprofiles:
+  default: {}
+nodes:
+  n01: {}
+`,
+			outDb: `nodeprofiles:
+  default: {}
+nodes:
+  n01:
+    tags:
+      tag1: foobaar
+`,
+		},
+		{
+			name:    "single node add tag with netdev",
+			args:    []string{"--tagadd", "tag1=foobaar", "n01"},
+			wantErr: false,
+			stdout:  "",
+			inDB: `nodeprofiles:
+  default: {}
+nodes:
+  n01:
+    network devices:
+      default:
+        ipaddr: 172.16.130.101
+
+`,
+			outDb: `nodeprofiles:
+  default: {}
+nodes:
+  n01:
+    tags:
+      tag1: foobaar
+    network devices:
+      default:
+        ipaddr: 172.16.130.101
+`,
+		},
+
 		{
 			name:    "single node set fs,part and disk",
 			args:    []string{"--fsname=var", "--fspath=/var", "--fsformat=btrfs", "--partname=var", "--partnumber=1", "--diskname=/dev/vda", "n01"},
diff --git a/internal/pkg/api/node/set.go b/internal/pkg/api/node/set.go
index 3dff91aa..51f7fbe1 100644
--- a/internal/pkg/api/node/set.go
+++ b/internal/pkg/api/node/set.go
@@ -134,7 +134,7 @@ func NodeSetParameterCheck(set *wwapiv1.ConfSetParameter) (nodeDB node.NodesYaml
 				for _, key := range set.NetTagDel {
 					delete(nodePtr.NetDevs[set.Netdev].Tags, key)
 				}
-				for key, val := range set.TagAdd {
+				for key, val := range set.NetTagAdd {
 					nodePtr.NetDevs[set.Netdev].Tags[key] = val
 				}
 			}