Allow client.cpu_total_compute to override attr.cpu.totalcompute

client/fingerprint/cpu.go

@@ -40,7 +40,9 @@ func (f *CPUFingerprint) Fingerprint(req *FingerprintRequest, resp *FingerprintR
 	}
 
 	if cfg.CpuCompute != 0 {
+		resp.AddAttribute("cpu.totalcompute", fmt.Sprintf("%d", cfg.CpuCompute))
 		setResourcesCPU(cfg.CpuCompute)
+		resp.Detected = true
 		return nil
 	}
 

client/fingerprint/cpu_test.go

@@ -1,6 +1,7 @@
 package fingerprint
 
 import (
+	"strconv"
 	"testing"
 
 	"github.com/hashicorp/nomad/client/config"
@@ -102,5 +103,8 @@ func TestCPUFingerprint_OverrideCompute(t *testing.T) {
 		if response.NodeResources.Cpu.CpuShares != int64(cfg.CpuCompute) {
 			t.Fatalf("expected override cpu of %d but found %d", cfg.CpuCompute, response.NodeResources.Cpu.CpuShares)
 		}
+		if response.Attributes["cpu.totalcompute"] != strconv.Itoa(cfg.CpuCompute) {
+			t.Fatalf("expected override cpu.totalcompute of %d but found %s", cfg.CpuCompute, response.Attributes["cpu.totalcompute"])
+		}
 	}
 }

client/fingerprint/env_aws.go

@@ -187,6 +187,8 @@ func (f *EnvAWSFingerprint) Fingerprint(request *FingerprintRequest, response *F
 				nodeResources = new(structs.NodeResources)
 			}
 			nodeResources.Cpu = structs.NodeCpuResources{CpuShares: int64(ticks)}
+		} else {
+			response.AddAttribute("cpu.totalcompute", fmt.Sprintf("%d", request.Config.CpuCompute))
 		}
 	} else {
 		f.logger.Warn("failed to find the cpu specification for this instance type")

client/fingerprint/env_aws_test.go

@@ -241,7 +241,7 @@ func TestCPUFingerprint_AWS_OverrideCompute(t *testing.T) {
 	require.True(t, response.Detected)
 	require.Equal(t, "2200", response.Attributes["cpu.frequency"])
 	require.Equal(t, "8", response.Attributes["cpu.numcores"])
-	require.NotContains(t, response.Attributes, "cpu.totalcompute")
+	require.Equal(t, "99999", response.Attributes["cpu.totalcompute"])
 	require.Nil(t, response.Resources)          // defaults in cpu fingerprinter
 	require.Zero(t, response.NodeResources.Cpu) // defaults in cpu fingerprinter
 }