Use go-nvlib mode resolution

Signed-off-by: Evan Lezar <elezar@nvidia.com>

pkg/nvcdi/lib.go

@@ -91,7 +91,12 @@ func New(opts ...Option) (Interface, error) {
 		l.nvidiaCTKPath = "/usr/bin/nvidia-ctk"
 	}
 	if l.infolib == nil {
-		l.infolib = info.New()
+		l.infolib = info.New(
+			info.WithRoot(l.driverRoot),
+			info.WithLogger(l.logger),
+			info.WithNvmlLib(l.nvmllib),
+			info.WithDeviceLib(l.devicelib),
+		)
 	}
 
 	l.driver = root.New(
@@ -184,26 +189,19 @@ func (l *nvcdilib) resolveMode() (rmode string) {
 		return l.mode
 	}
 	defer func() {
-		l.logger.Infof("Auto-detected mode as %q", rmode)
+		l.logger.Infof("Auto-detected mode as '%v'", rmode)
 	}()
 
-	isWSL, reason := l.infolib.HasDXCore()
-	l.logger.Debugf("Is WSL-based system? %v: %v", isWSL, reason)
-
-	if isWSL {
+	platform := l.infolib.ResolvePlatform()
+	switch platform {
+	case info.PlatformNVML:
+		return ModeNvml
+	case info.PlatformTegra:
+		return ModeCSV
+	case info.PlatformWSL:
 		return ModeWsl
 	}
-
-	isNvml, reason := l.infolib.HasNvml()
-	l.logger.Debugf("Is NVML-based system? %v: %v", isNvml, reason)
-
-	isTegra, reason := l.infolib.IsTegraSystem()
-	l.logger.Debugf("Is Tegra-based system? %v: %v", isTegra, reason)
-
-	if isTegra && !isNvml {
-		return ModeCSV
-	}
-
+	l.logger.Warningf("Unsupported platform detected: %v; assuming %v", platform, ModeNvml)
 	return ModeNvml
 }
 

pkg/nvcdi/lib_test.go

@@ -1,116 +0,0 @@
-/**
-# Copyright (c) NVIDIA CORPORATION.  All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-**/
-
-package nvcdi
-
-import (
-	"fmt"
-	"testing"
-
-	testlog "github.com/sirupsen/logrus/hooks/test"
-	"github.com/stretchr/testify/require"
-)
-
-func TestResolveMode(t *testing.T) {
-	logger, _ := testlog.NewNullLogger()
-
-	testCases := []struct {
-		mode      string
-		isTegra   bool
-		hasDXCore bool
-		hasNVML   bool
-		expected  string
-	}{
-		{
-			mode:      "auto",
-			hasDXCore: true,
-			expected:  "wsl",
-		},
-		{
-			mode:      "auto",
-			hasDXCore: false,
-			isTegra:   true,
-			hasNVML:   false,
-			expected:  "csv",
-		},
-		{
-			mode:      "auto",
-			hasDXCore: false,
-			isTegra:   false,
-			hasNVML:   false,
-			expected:  "nvml",
-		},
-		{
-			mode:      "auto",
-			hasDXCore: false,
-			isTegra:   true,
-			hasNVML:   true,
-			expected:  "nvml",
-		},
-		{
-			mode:      "auto",
-			hasDXCore: false,
-			isTegra:   false,
-			expected:  "nvml",
-		},
-		{
-			mode:      "nvml",
-			hasDXCore: true,
-			isTegra:   true,
-			expected:  "nvml",
-		},
-		{
-			mode:      "wsl",
-			hasDXCore: false,
-			expected:  "wsl",
-		},
-		{
-			mode:      "not-auto",
-			hasDXCore: true,
-			expected:  "not-auto",
-		},
-	}
-
-	for i, tc := range testCases {
-		t.Run(fmt.Sprintf("test case %d", i), func(t *testing.T) {
-			l := nvcdilib{
-				logger:  logger,
-				mode:    tc.mode,
-				infolib: infoMock{hasDXCore: tc.hasDXCore, isTegra: tc.isTegra, hasNVML: tc.hasNVML},
-			}
-
-			require.Equal(t, tc.expected, l.resolveMode())
-		})
-	}
-}
-
-type infoMock struct {
-	hasDXCore bool
-	isTegra   bool
-	hasNVML   bool
-}
-
-func (i infoMock) HasDXCore() (bool, string) {
-	return i.hasDXCore, ""
-}
-
-func (i infoMock) HasNvml() (bool, string) {
-	return i.hasNVML, ""
-}
-
-func (i infoMock) IsTegraSystem() (bool, string) {
-	return i.isTegra, ""
-}