Merge pull request #724 from zeeke/fix-pciaddr-err

Fix `undefined: pciAddr`
k8snetworkplumbingwg · Jun 25, 2024 · 43bfa6c · 43bfa6c
2 parents 73f0ac6 + c7c1edb
commit 43bfa6c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/pkg/host/internal/sriov/sriov.go b/pkg/host/internal/sriov/sriov.go
@@ -151,7 +151,7 @@ func (s *sriov) getVfInfo(vfAddr string, pfName string, eswitchMode string, devi
 			vf.Mac = link.Attrs().HardwareAddr.String()
 		}
 	}
-	vf.GUID = s.networkHelper.GetNetDevNodeGUID(pciAddr)
+	vf.GUID = s.networkHelper.GetNetDevNodeGUID(vfAddr)
 
 	for _, device := range devices {
 		if vfAddr == device.Address {

diff --git a/pkg/host/internal/sriov/sriov_test.go b/pkg/host/internal/sriov/sriov_test.go
@@ -91,6 +91,8 @@ var _ = Describe("SRIOV", func() {
 				EncapType:    "ether",
 			}).MinTimes(1)
 			hostMock.EXPECT().GetNetDevLinkSpeed("enp216s0f0np0").Return("100000 Mb/s")
+			hostMock.EXPECT().GetNetDevLinkAdminState("enp216s0f0np0").Return("up")
+			hostMock.EXPECT().GetNetDevNodeGUID("0000:d8:00.2").Return("guid1")
 			storeManagerMode.EXPECT().LoadPfsStatus("0000:d8:00.0").Return(nil, false, nil)
 
 			dputilsLibMock.EXPECT().IsSriovPF("0000:d8:00.0").Return(true)
@@ -130,6 +132,7 @@ var _ = Describe("SRIOV", func() {
 				NumVfs:            1,
 				LinkSpeed:         "100000 Mb/s",
 				LinkType:          "ETH",
+				LinkAdminState:    "up",
 				EswitchMode:       "switchdev",
 				ExternallyManaged: false,
 				TotalVfs:          1,
@@ -143,6 +146,7 @@ var _ = Describe("SRIOV", func() {
 					Mtu:             1500,
 					VfID:            0,
 					RepresentorName: "enp216s0f0np0_0",
+					GUID:            "guid1",
 				}},
 			}))
 		})