Integrating govdpa changes from release v0.1.7

Signed-off-by: Leonardo Milleri <[email protected]>

go.mod

@@ -80,3 +80,5 @@ replace (
 	github.com/containernetworking/cni => github.com/containernetworking/cni v0.8.1
 	github.com/gogo/protobuf => github.com/gogo/protobuf v1.3.2
 )
+
+replace github.com/k8snetworkplumbingwg/govdpa v0.1.3 => github.com/lmilleri/govdpa v0.1.7

go.sum

@@ -275,8 +275,6 @@ github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1
 github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
 github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
 github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM=
-github.com/k8snetworkplumbingwg/govdpa v0.1.3 h1:FZRhTMB1e3yWwSEy+l4eS73WioyMaL+vmFZ8JNwn+Uk=
-github.com/k8snetworkplumbingwg/govdpa v0.1.3/go.mod h1:Jx2rlMquENdCd8M5Oc51xHCt10bQIXTloDU8F4nS4T4=
 github.com/k8snetworkplumbingwg/network-attachment-definition-client v1.1.1-0.20201119153432-9d213757d22d h1:9QbZltQGRFe7temwcTDjj8rIbow48Gv6mIKOxuks+OI=
 github.com/k8snetworkplumbingwg/network-attachment-definition-client v1.1.1-0.20201119153432-9d213757d22d/go.mod h1:+1DpV8uIwteAhxNO0lgRox8gHkTG6w3OeDfAlg+qqjA=
 github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
@@ -292,6 +290,8 @@ github.com/kr/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
+github.com/lmilleri/govdpa v0.1.7 h1:O2+6PwdfgIZBqRAS+IDoYIKwZyjU1FTOBM9EQQ1NbZY=
+github.com/lmilleri/govdpa v0.1.7/go.mod h1:zC+FdDzIqMN38LAuA8L2oADVZjVX5lnHGHpHMNeQuI4=
 github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
 github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
 github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=

pkg/netdevice/vdpa.go

@@ -40,7 +40,7 @@ type vdpaDevice struct {
 
 // GetType returns the VdpaType associated with the VdpaDevice
 func (v *vdpaDevice) GetType() types.VdpaType {
-	currentDriver := v.GetDriver()
+	currentDriver := v.VdpaDevice.Driver()
 	for vtype, driver := range supportedVdpaTypes {
 		if driver == currentDriver {
 			return vtype
@@ -49,6 +49,19 @@ func (v *vdpaDevice) GetType() types.VdpaType {
 	return types.VdpaInvalidType
 }
 
+func (v *vdpaDevice) GetParent() string {
+	return v.VdpaDevice.Name()
+}
+
+func (v *vdpaDevice) GetPath() string {
+	path, err := v.ParentDevicePath()
+	if err != nil {
+		glog.Infof("%s - No path for vDPA device found: %s", v.Name(), err)
+		return ""
+	}
+	return path
+}
+
 // GetVdpaDevice returns a VdpaDevice from a given VF PCI address
 func GetVdpaDevice(pciAddr string) types.VdpaDevice {
 	detailVdpaDev, err := utils.GetVdpaProvider().GetVdpaDeviceByPci(pciAddr)

pkg/utils/vdpa_provider.go

@@ -1,6 +1,8 @@
 package utils
 
 import (
+	"fmt"
+
 	vdpa "github.com/k8snetworkplumbingwg/govdpa/pkg/kvdpa"
 )
 
@@ -25,5 +27,12 @@ func GetVdpaProvider() VdpaProvider {
 }
 
 func (defaultVdpaProvider) GetVdpaDeviceByPci(pciAddr string) (vdpa.VdpaDevice, error) {
-	return vdpa.GetVdpaDeviceByPci(pciAddr)
+	vdpaDevices, err := vdpa.GetVdpaDevicesByPciAddress(pciAddr)
+	if err != nil {
+		return nil, err
+	}
+	if len(vdpaDevices) == 0 {
+		return nil, fmt.Errorf("no vdpa device associated to pciAddress %v", pciAddr)
+	}
+	return vdpaDevices[0], nil
 }