From 99f6ec8d2b248ab7339f5ad3e4659aee3dab3f67 Mon Sep 17 00:00:00 2001
From: MatthewHink <matthew_hink@yahoo.com>
Date: Thu, 7 Apr 2022 15:34:50 -0400
Subject: [PATCH 1/3] Vet and test in CI.

---
 .github/workflows/test.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index c1a71d66..88fb2d46 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -35,3 +35,9 @@ jobs:
 
     - name: Build with go ${{ matrix.go }}
       run: make all
+
+    - name: vet
+      run: make vet
+
+    - name: test
+      run: make test-it

From 9e459a7f69a35ce76a83bad3311d93cf5442a560 Mon Sep 17 00:00:00 2001
From: MatthewHink <matthew_hink@yahoo.com>
Date: Thu, 7 Apr 2022 15:40:41 -0400
Subject: [PATCH 2/3] vet is failing. see if test works.

---
 .github/workflows/test.yml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 88fb2d46..4705b465 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -36,8 +36,11 @@ jobs:
     - name: Build with go ${{ matrix.go }}
       run: make all
 
-    - name: vet
-      run: make vet
+    # vet is failing due to:
+    #  Error: vendor/github.com/mtrmac/gpgme/data.go:4:11: fatal error: gpgme.h: No such file or directory
+    # 4 | // #include <gpgme.h>
+    # - name: vet
+    #  run: make vet
 
     - name: test
       run: make test-it

From 415445b5ca61768ffe7855d8b79b47eb2a601442 Mon Sep 17 00:00:00 2001
From: Christian Goll <cgoll@suse.de>
Date: Sat, 9 Apr 2022 13:31:14 +0200
Subject: [PATCH 3/3] update test format

---
 internal/pkg/node/util_test.go | 31 +++++++++++--------------------
 1 file changed, 11 insertions(+), 20 deletions(-)

diff --git a/internal/pkg/node/util_test.go b/internal/pkg/node/util_test.go
index 78f4127c..c6d82623 100644
--- a/internal/pkg/node/util_test.go
+++ b/internal/pkg/node/util_test.go
@@ -1,8 +1,9 @@
 package node
 
 import (
-	"gopkg.in/yaml.v2"
 	"testing"
+
+	"gopkg.in/yaml.v2"
 )
 
 func NewTestNode() (nodeYaml, error) {
@@ -15,38 +16,28 @@ nodes:
     profiles:
     - default
     network devices:
-      eth0:
+      net0:
         default: true
         hwaddr: 00:00:00:00:12:34
         ipaddr: 1.2.3.4
-        ipcidr: ""
-        prefix: ""
-        netmask: ""
-      eno1:
-        default: true
+        device: eth0
+      net1:
+        default: false
         hwaddr: ab:cd:ef:00:12:34
         ipaddr: 1.2.3.4
-        ipcidr: ""
-        prefix: ""
-        netmask: ""
-      eno2:
-        default: true
+        device: eth1
+      net2:
+        default: false
         hwaddr: aB:Cd:eF:12:34:56
         ipaddr: 1.2.3.4
-        ipcidr: ""
-        prefix: ""
-        netmask: ""
+        device: eth2
   test_node_IPv6:
     profiles:
     - default
     network devices:
-      eth1:
+      net1:
         default: false
-        hwaddr: ""
         ipaddr: fd1a:2b3c:4d5e:06f0:1234:5678:90ab:cdef
-        ipcidr: ""
-        prefix: ""
-        netmask: ""
 `
 	var ret nodeYaml
 	err := yaml.Unmarshal([]byte(data), &ret)