From cd7492f79bdbdf36203932ce04f648dd62d4d25c Mon Sep 17 00:00:00 2001
From: Tomofumi Hayashi <tohayash@redhat.com>
Date: Mon, 19 Apr 2021 23:20:07 +0900
Subject: [PATCH] Add cluster network name in pod network annotation

This addresses #656
---
 pkg/multus/multus_test.go |  2 +-
 pkg/types/conf.go         |  2 ++
 pkg/types/conf_test.go    | 36 ++++++++++++++++++++++++++++++++++++
 3 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/pkg/multus/multus_test.go b/pkg/multus/multus_test.go
index 6b2b0cdcd..484925413 100644
--- a/pkg/multus/multus_test.go
+++ b/pkg/multus/multus_test.go
@@ -1508,7 +1508,7 @@ var _ = Describe("multus operations cniVersion 0.2.0 config", func() {
 		recorder := clientInfo.EventRecorder.(*record.FakeRecorder)
 		events := collectEvents(recorder.Events)
 		Expect(len(events)).To(Equal(3))
-		Expect(events[0]).To(Equal("Normal AddedInterface Add eth0 [1.1.1.2/24]"))
+		Expect(events[0]).To(Equal("Normal AddedInterface Add eth0 [1.1.1.2/24] from weave1"))
 		Expect(events[1]).To(Equal("Normal AddedInterface Add net1 [1.1.1.3/24] from test/net1"))
 		Expect(events[2]).To(Equal("Normal AddedInterface Add net2 [1.1.1.4/24] from test/net2"))
 	})
diff --git a/pkg/types/conf.go b/pkg/types/conf.go
index 2a1a60ea6..d399edce6 100644
--- a/pkg/types/conf.go
+++ b/pkg/types/conf.go
@@ -54,6 +54,7 @@ func LoadDelegateNetConfList(bytes []byte, delegateConf *DelegateNetConf) error
 		return logging.Errorf("LoadDelegateNetConfList: a plugin delegate must have the 'type' field")
 	}
 	delegateConf.ConfListPlugin = true
+	delegateConf.Name = delegateConf.ConfList.Name
 	return nil
 }
 
@@ -66,6 +67,7 @@ func LoadDelegateNetConf(bytes []byte, net *NetworkSelectionElement, deviceID st
 	if err := json.Unmarshal(bytes, &delegateConf.Conf); err != nil {
 		return nil, logging.Errorf("LoadDelegateNetConf: error unmarshalling delegate config: %v", err)
 	}
+	delegateConf.Name = delegateConf.Conf.Name
 
 	// Do some minimal validation
 	if delegateConf.Conf.Type == "" {
diff --git a/pkg/types/conf_test.go b/pkg/types/conf_test.go
index f69b2b375..94c4bab87 100644
--- a/pkg/types/conf_test.go
+++ b/pkg/types/conf_test.go
@@ -725,6 +725,7 @@ var _ = Describe("config operations", func() {
 			"type": "multus",
 			"kubeconfig": "/etc/kubernetes/node-kubeconfig.yaml",
 			"delegates": [{
+				"name": "weave",
 				"type": "weave-net"
 			}],
 		  "runtimeConfig": {
@@ -809,4 +810,39 @@ var _ = Describe("config operations", func() {
 		// The original RuntimeConfig must have not been overwritten
 		Expect(origRuntimeConfig).To(Equal(RuntimeConfig{}))
 	})
+
+	It("test DelegateConf Name is delivered", func() {
+		conf := `{
+			"name": "node-cni-network",
+			"type": "multus",
+			"kubeconfig": "/etc/kubernetes/node-kubeconfig.yaml",
+			"delegates": [{
+				"name": "weave",
+				"type": "weave-net"
+			}]
+		}`
+
+		n, err := LoadNetConf([]byte(conf))
+		Expect(err).NotTo(HaveOccurred())
+		Expect(len(n.Delegates)).To(BeEquivalentTo(1))
+		Expect(n.Delegates[0].Name).To(Equal("weave"))
+	})
+
+	It("test DelegateConfList Name is delivered", func() {
+		conf := `{
+			"name": "node-cni-network",
+			"type": "multus",
+			"kubeconfig": "/etc/kubernetes/node-kubeconfig.yaml",
+			"delegates": [{
+				"name": "weave-list",
+				"plugins": [ {"type" :"weave"} ]
+			}]
+		}`
+
+		n, err := LoadNetConf([]byte(conf))
+		Expect(err).NotTo(HaveOccurred())
+		Expect(len(n.Delegates)).To(BeEquivalentTo(1))
+		Expect(n.Delegates[0].Name).To(Equal("weave-list"))
+	})
+
 })