Create instance of IB interface in the host object

Signed-off-by: amaslennikov <[email protected]>

pkg/helper/host.go

@@ -35,7 +35,11 @@ func NewHostHelpers(utilsHelper utils.CmdInterface,
 func NewDefaultHostHelpers() (HostHelpersInterface, error) {
 	utilsHelper := utils.New()
 	mlxHelper := mlx.New(utilsHelper)
-	hostManager := host.NewHostManager(utilsHelper)
+	hostManager, err := host.NewHostManager(utilsHelper)
+	if err != nil {
+		log.Log.Error(err, "failed to create host manager")
+		return nil, err
+	}
 	storeManager, err := store.NewManager()
 	if err != nil {
 		log.Log.Error(err, "failed to create store manager")

pkg/host/manager.go

@@ -1,6 +1,7 @@
 package host
 
 import (
+	"github.com/k8snetworkplumbingwg/sriov-network-operator/pkg/host/internal/infiniband"
 	"github.com/k8snetworkplumbingwg/sriov-network-operator/pkg/host/internal/kernel"
 	"github.com/k8snetworkplumbingwg/sriov-network-operator/pkg/host/internal/lib/dputils"
 	"github.com/k8snetworkplumbingwg/sriov-network-operator/pkg/host/internal/lib/ethtool"
@@ -24,6 +25,7 @@ type HostManagerInterface interface {
 	types.UdevInterface
 	types.SriovInterface
 	types.VdpaInterface
+	types.InfinibandInterface
 }
 
 type hostManager struct {
@@ -34,9 +36,10 @@ type hostManager struct {
 	types.UdevInterface
 	types.SriovInterface
 	types.VdpaInterface
+	types.InfinibandInterface
 }
 
-func NewHostManager(utilsInterface utils.CmdInterface) HostManagerInterface {
+func NewHostManager(utilsInterface utils.CmdInterface) (HostManagerInterface, error) {
 	dpUtils := dputils.New()
 	netlinkLib := netlink.New()
 	ethtoolLib := ethtool.New()
@@ -45,7 +48,11 @@ func NewHostManager(utilsInterface utils.CmdInterface) HostManagerInterface {
 	sv := service.New(utilsInterface)
 	u := udev.New(utilsInterface)
 	v := vdpa.New(k, netlinkLib)
-	sr := sriov.New(utilsInterface, k, n, u, v, netlinkLib, dpUtils)
+	ib, err := infiniband.New(netlinkLib, k, n)
+	sr := sriov.New(utilsInterface, k, n, u, v, ib, netlinkLib, dpUtils)
+	if err != nil {
+		return nil, err
+	}
 
 	return &hostManager{
 		utilsInterface,
@@ -55,5 +62,6 @@ func NewHostManager(utilsInterface utils.CmdInterface) HostManagerInterface {
 		u,
 		sr,
 		v,
-	}
+		ib,
+	}, nil
 }

pkg/platforms/platforms.go

@@ -1,6 +1,8 @@
 package platforms
 
 import (
+	"sigs.k8s.io/controller-runtime/pkg/log"
+
 	"github.com/k8snetworkplumbingwg/sriov-network-operator/pkg/host"
 	"github.com/k8snetworkplumbingwg/sriov-network-operator/pkg/platforms/openshift"
 	"github.com/k8snetworkplumbingwg/sriov-network-operator/pkg/platforms/openstack"
@@ -24,7 +26,11 @@ func NewDefaultPlatformHelper() (Interface, error) {
 		return nil, err
 	}
 	utilsHelper := utils.New()
-	hostManager := host.NewHostManager(utilsHelper)
+	hostManager, err := host.NewHostManager(utilsHelper)
+	if err != nil {
+		log.Log.Error(err, "failed to create host manager")
+		return nil, err
+	}
 	openstackContext := openstack.New(hostManager)
 
 	return &platformHelper{

pkg/plugins/k8s/k8s_plugin_test.go

@@ -78,7 +78,7 @@ var _ = Describe("K8s plugin", func() {
 		testCtrl = gomock.NewController(GinkgoT())
 
 		hostHelper = mock_helper.NewMockHostHelpersInterface(testCtrl)
-		realHostMgr := host.NewHostManager(hostHelper)
+		realHostMgr, _ := host.NewHostManager(hostHelper)
 
 		// proxy some functions to real host manager to simplify testing and to additionally validate manifests
 		for _, f := range []string{