Merge pull request #291 from bart0sh/PR0073-copy-topology-module

Copy topology module

Author: Dmitry Rozhkov

go.mod

@@ -7,7 +7,6 @@ require (
 	github.com/go-ini/ini v1.46.0
 	github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b
 	github.com/google/gousb v0.0.0-20190812193832-18f4c1d8a750
-	github.com/intel/cri-resource-manager/pkg/topology v0.0.0-20200207111533-82d10bdaca4e
 	github.com/pkg/errors v0.8.1
 	golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550 // indirect
 	golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456

go.sum

@@ -281,8 +281,6 @@ github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpO
 github.com/imdario/mergo v0.3.5 h1:JboBksRwiiAJWvIYJVo46AfV+IAIKZpfrSzVKj42R4Q=
 github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
 github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
-github.com/intel/cri-resource-manager/pkg/topology v0.0.0-20200207111533-82d10bdaca4e h1:+pD7vYnhjGklatQ/Zs98yB/l6ETL+79WiI3IGM9Bmqk=
-github.com/intel/cri-resource-manager/pkg/topology v0.0.0-20200207111533-82d10bdaca4e/go.mod h1:98ghzNsdMHeewnXWSFGx+Sf1AbZEVcL+mOLvE6DI4OQ=
 github.com/jellevandenhooff/dkim v0.0.0-20150330215556-f50fe3d243e1/go.mod h1:E0B/fFc00Y+Rasa88328GlI/XbtyysCtTHZS8h7IrBU=
 github.com/jimstudt/http-authentication v0.0.0-20140401203705-3eca13d6893a/go.mod h1:wK6yTYYcgjHE1Z1QtXACPDjcFJyBskHEdagmnq3vsP8=
 github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k=

pkg/deviceplugin/api.go

@@ -15,13 +15,7 @@
 package deviceplugin
 
 import (
-	"sort"
-	"strconv"
-	"strings"
-
-	"github.com/pkg/errors"
-
-	"github.com/intel/cri-resource-manager/pkg/topology"
+	"github.com/intel/intel-device-plugins-for-kubernetes/pkg/topology"
 	pluginapi "k8s.io/kubelet/pkg/apis/deviceplugin/v1beta1"
 )
 
@@ -34,45 +28,6 @@ type DeviceInfo struct {
 	topology *pluginapi.TopologyInfo
 }
 
-// getTopologyInfo returns topology information for the list of device nodes
-func getTopologyInfo(devs []string) (*pluginapi.TopologyInfo, error) {
-	var result pluginapi.TopologyInfo
-	nodeIDs := map[int64]struct{}{}
-	for _, dev := range devs {
-		sysfsDevice, err := topology.FindSysFsDevice(dev)
-		if err != nil {
-			return nil, err
-		}
-
-		if sysfsDevice == "" {
-			return nil, errors.Errorf("device %s doesn't exist", dev)
-		}
-
-		hints, err := topology.NewTopologyHints(sysfsDevice)
-		if err != nil {
-			return nil, err
-		}
-
-		for _, hint := range hints {
-			for _, nNode := range strings.Split(hint.NUMAs, ",") {
-				nNodeID, err := strconv.ParseInt(strings.TrimSpace(nNode), 10, 64)
-				if err != nil {
-					return nil, errors.Wrapf(err, "unable to convert numa node %s into int64", nNode)
-				}
-				if nNodeID < 0 {
-					return nil, errors.Wrapf(err, "numa node is negative: %d", nNodeID)
-				}
-				if _, ok := nodeIDs[nNodeID]; !ok {
-					result.Nodes = append(result.Nodes, &pluginapi.NUMANode{ID: nNodeID})
-					nodeIDs[nNodeID] = struct{}{}
-				}
-			}
-		}
-	}
-	sort.Slice(result.Nodes, func(i, j int) bool { return result.Nodes[i].ID < result.Nodes[j].ID })
-	return &result, nil
-}
-
 // NewDeviceInfo makes DeviceInfo struct and adds topology information to it
 func NewDeviceInfo(state string, nodes []pluginapi.DeviceSpec, mounts []pluginapi.Mount, envs map[string]string) DeviceInfo {
 	deviceInfo := DeviceInfo{
@@ -86,7 +41,7 @@ func NewDeviceInfo(state string, nodes []pluginapi.DeviceSpec, mounts []pluginap
 		devPaths = append(devPaths, node.HostPath)
 	}
 
-	topologyInfo, err := getTopologyInfo(devPaths)
+	topologyInfo, err := topology.GetTopologyInfo(devPaths)
 	if err == nil {
 		deviceInfo.topology = topologyInfo
 	}

pkg/topology/testdata/go.mod

@@ -0,0 +1,3 @@
+// This is a kludge to work around the golang toolchain not being able
+// to handle packages with any files with a colon (:) in their name,
+// even if those are not golang sources.

pkg/topology/testdata/sys/devices/pci0000:00/0000:00:02.0/class

@@ -0,0 +1 @@
+0x030000

pkg/topology/testdata/sys/devices/pci0000:00/0000:00:02.0/device

@@ -0,0 +1 @@
+0x5912

pkg/topology/testdata/sys/devices/pci0000:00/0000:00:02.0/drm/card1/dev

@@ -0,0 +1 @@
+226:1

pkg/topology/testdata/sys/devices/pci0000:00/0000:00:02.0/drm/renderD129/dev

@@ -0,0 +1 @@
+226:129

pkg/topology/testdata/sys/devices/pci0000:00/0000:00:02.0/local_cpulist

@@ -0,0 +1 @@
+0-7

pkg/topology/testdata/sys/devices/pci0000:00/0000:00:02.0/local_cpus

@@ -0,0 +1 @@
+ff

pkg/topology/testdata/sys/devices/pci0000:00/0000:00:02.0/numa_node

@@ -0,0 +1 @@
+-1

pkg/topology/testdata/sys/devices/pci0000:00/0000:00:02.0/vendor

@@ -0,0 +1 @@
+0x8086

pkg/topology/testdata/sys/devices/virtual/mem/null/local_cpulist

@@ -0,0 +1 @@
+0-7

pkg/topology/testdata/sys/devices/virtual/mem/null/numa_node

@@ -0,0 +1 @@
+1,2,3

pkg/topology/testdata/sys/devices/virtual/mem/random/local_cpulist

@@ -0,0 +1 @@
+0-7

pkg/topology/testdata/sys/devices/virtual/mem/random/numa_node

@@ -0,0 +1 @@
+-1

pkg/topology/testdata/sys/devices/virtual/tty/tty/local_cpulist

@@ -0,0 +1 @@
+0-7

pkg/topology/testdata/sys/devices/virtual/tty/tty/numa_node

@@ -0,0 +1 @@
+4,5,6

pkg/topology/testdata/sys/kernel/iommu_groups/42/devices/0000:00:02.0

@@ -0,0 +1 @@
+../../../../devices/pci0000:00/0000:00:02.0/