pkg/topology: get sysfs parsing from containers/nri-plugins

A proper upstream for the sysfs topology parsing is containers/nri-plugins se we can drop the duplicated code. At the same time, we no longer need to carry scripts/ttar and the sys.ttar unpacking for the tests because the remaining testdata becomes easier to maintain (the original testdata contained PCI BDF paths that trigged issues). Signed-off-by: Mikko Ylinen <[email protected]>
intel · Jun 19, 2023 · d81cdd6 · d81cdd6
1 parent 6ab2833
commit d81cdd6
Show file tree

Hide file tree

Showing 13 changed files with 19 additions and 1,106 deletions.
diff --git a/Makefile b/Makefile
@@ -26,8 +26,6 @@ BUNDLE_METADATA_OPTS ?= $(BUNDLE_CHANNELS) $(BUNDLE_DEFAULT_CHANNEL)
 OLM_MANIFESTS = deployments/operator/manifests
 BUNDLE_DIR = community-operators/operators/intel-device-plugins-operator/$(TAG)
 
-TESTDATA_DIR = pkg/topology/testdata
-
 EXTRA_BUILD_ARGS += --build-arg GOLICENSES_VERSION=$(GOLICENSES_VERSION)
 
 pkgs  = $(shell $(GO) list ./... | grep -v vendor | grep -v e2e | grep -v envtest)
@@ -50,13 +48,7 @@ go-mod-tidy:
 	$(GO) mod download all
 	@report=`$(GO) mod tidy -v 2>&1` ; if [ -n "$$report" ]; then echo "$$report"; exit 1; fi
 
-update-fixture:
-	@scripts/ttar -C $(TESTDATA_DIR) -c -f $(TESTDATA_DIR)/sys.ttar sys/
-
-fixture:
-	@scripts/ttar --recursive-unlink -C $(TESTDATA_DIR) -x -f $(TESTDATA_DIR)/sys.ttar
-
-test: fixture
+test:
 ifndef WHAT
 	@$(GO) test -tags $(BUILDTAGS) -race -coverprofile=coverage.txt -covermode=atomic $(pkgs)
 else
@@ -68,7 +60,7 @@ else
 	    exit $$rc
 endif
 
-test-with-kind: fixture intel-sgx-admissionwebhook intel-fpga-admissionwebhook intel-deviceplugin-operator install-tools
+test-with-kind: intel-sgx-admissionwebhook intel-fpga-admissionwebhook intel-deviceplugin-operator install-tools
 	# Build a Cluster with KinD & Load Images & Install Cert-Manager
 	kind create cluster
 	kind load docker-image $(REG)intel-sgx-admissionwebhook:$(TAG)
@@ -241,7 +233,7 @@ check-github-actions:
 	jq -e '$(images_json) - [$(skip_images)] - .jobs.image.strategy.matrix.image == []' > /dev/null || \
 	(echo "Make sure all images are listed in .github/workflows/ci.yaml"; exit 1)
 
-.PHONY: all format test lint build images $(cmds) $(images) lock-images vendor pre-pull set-version check-github-actions envtest fixture update-fixture install-tools test-image-base-layer
+.PHONY: all format test lint build images $(cmds) $(images) lock-images vendor pre-pull set-version check-github-actions envtest install-tools test-image-base-layer
 
 SPHINXOPTS    =
 SPHINXBUILD   = sphinx-build

diff --git a/go.mod b/go.mod
@@ -3,6 +3,7 @@ module github.com/intel/intel-device-plugins-for-kubernetes
 go 1.20
 
 require (
+	github.com/containers/nri-plugins/pkg/topology v0.0.0-20230417061637-0847843000f8
 	github.com/fsnotify/fsnotify v1.6.0
 	github.com/go-ini/ini v1.67.0
 	github.com/go-logr/logr v1.2.4

diff --git a/go.sum b/go.sum
@@ -72,6 +72,8 @@ github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWH
 github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
 github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
 github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4 h1:/inchEIKaYC1Akx+H+gqO04wryn5h75LSazbRlnya1k=
+github.com/containers/nri-plugins/pkg/topology v0.0.0-20230417061637-0847843000f8 h1:fcv6mtBBQd+woQSqZN1QJ1g91TRwUNNijj1WKjqub5Q=
+github.com/containers/nri-plugins/pkg/topology v0.0.0-20230417061637-0847843000f8/go.mod h1:XHuUl2t6TVLTfGsy8+w3MdxOjSn2hN0lc1PuaxOEFEc=
 github.com/coreos/go-semver v0.3.0 h1:wkHLiw0WNATZnSG7epLsujiMCgPAc9xhjJ4tgnAxmfM=
 github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
 github.com/coreos/go-systemd/v22 v22.4.0 h1:y9YHcjnjynCd/DVbg5j9L/33jQM3MxJlbj/zWskzfGU=

diff --git a/pkg/topology/testdata/sys.ttar b/pkg/topology/testdata/sys.ttar
diff --git a/pkg/topology/testdata/sys/devices/virtual/mem/null/local_cpulist b/pkg/topology/testdata/sys/devices/virtual/mem/null/local_cpulist
@@ -0,0 +1 @@
+0-7
diff --git a/pkg/topology/testdata/sys/devices/virtual/mem/null/numa_node b/pkg/topology/testdata/sys/devices/virtual/mem/null/numa_node
@@ -0,0 +1 @@
+1,2,3
diff --git a/pkg/topology/testdata/sys/devices/virtual/mem/random/local_cpulist b/pkg/topology/testdata/sys/devices/virtual/mem/random/local_cpulist
@@ -0,0 +1 @@
+0-7
diff --git a/pkg/topology/testdata/sys/devices/virtual/mem/random/numa_node b/pkg/topology/testdata/sys/devices/virtual/mem/random/numa_node
@@ -0,0 +1 @@
+-1
diff --git a/pkg/topology/testdata/sys/devices/virtual/tty/tty/local_cpulist b/pkg/topology/testdata/sys/devices/virtual/tty/tty/local_cpulist
@@ -0,0 +1 @@
+0-7
diff --git a/pkg/topology/testdata/sys/devices/virtual/tty/tty/numa_node b/pkg/topology/testdata/sys/devices/virtual/tty/tty/numa_node
@@ -0,0 +1 @@
+4,5,6