Fixes google#2783 - takes package ID into consideration when calculating count of unique properties

Signed-off-by: Maciej "Iwan" Iwanowski <[email protected]>

Author: iwankgb

utils/sysfs/sysfs.go

@@ -487,7 +487,13 @@ func GetUniqueCPUPropertyCount(cpuBusPath string, propertyName string) int {
 			klog.Errorf("Cannot open %s, number of unique %s  set to 0", propertyPath, propertyName)
 			return 0
 		}
-		uniques[string(propertyVal)] = true
+		packagePath := filepath.Join(sysCPUPath, sysFsCPUTopology, CPUPhysicalPackageID)
+		packageVal, err := ioutil.ReadFile(packagePath)
+		if err != nil {
+			klog.Errorf("Cannot open %s, number of unique %s  set to 0", packagePath, CPUPhysicalPackageID)
+			return 0
+		}
+		uniques[fmt.Sprintf("%s_%s", propertyVal, packageVal)] = true
 	}
 	return len(uniques)
 }

utils/sysfs/sysfs_test.go

@@ -265,7 +265,6 @@ func TestGetUniqueCPUPropertyCountOnRaspberryPi4(t *testing.T) {
 	assert.Equal(t, 1, count)
 }
 
-
 func TestGetUniqueCPUPropertyCountOnEpyc7402(t *testing.T) {
 	// Mock unix.Uname() so it does not return x86_64, no matter what.
 	unameOrig := uname
@@ -282,7 +281,6 @@ func TestGetUniqueCPUPropertyCountOnEpyc7402(t *testing.T) {
 	assert.Equal(t, 24, count)
 }
 
-
 func TestGetUniqueCPUPropertyCountOnEpyc7402NoHT(t *testing.T) {
 	// Mock unix.Uname() so it does not return x86_64, no matter what.
 	unameOrig := uname
@@ -299,7 +297,6 @@ func TestGetUniqueCPUPropertyCountOnEpyc7402NoHT(t *testing.T) {
 	assert.Equal(t, 24, count)
 }
 
-
 func TestGetUniqueCPUPropertyCountOnXeon4214(t *testing.T) {
 	// Mock unix.Uname() so it does not return x86_64, no matter what.
 	unameOrig := uname
@@ -316,7 +313,6 @@ func TestGetUniqueCPUPropertyCountOnXeon4214(t *testing.T) {
 	assert.Equal(t, 24, count)
 }
 
-
 func TestGetUniqueCPUPropertyCountOnXeon5218NoHT(t *testing.T) {
 	// Mock unix.Uname() so it does not return x86_64, no matter what.
 	unameOrig := uname