fix: update ELC options in configuration table and adjust test cases for new values

Signed-off-by: Harper, Jason M <[email protected]>

Author: harp-intel

cmd/config/config_tables.go

@@ -87,11 +87,11 @@ func configurationTableValues(outputs map[string]script.ScriptOutput) []table.Fi
 	fields = append(fields, []table.Field{
 		{Name: "Energy Performance Bias", Description: "--epb <0-15>", Values: []string{extract.EPBFromOutput(outputs)}},
 		{Name: "Energy Performance Preference", Description: "--epp <0-255>", Values: []string{extract.EPPFromOutput(outputs)}},
-		{Name: "Scaling Governor", Description: "--gov <performance|powersave>", Values: []string{strings.TrimSpace(outputs[script.ScalingGovernorScriptName].Stdout)}},
+		{Name: "Scaling Governor", Description: "--gov <" + strings.Join(governorOptions, "|") + ">", Values: []string{strings.TrimSpace(outputs[script.ScalingGovernorScriptName].Stdout)}},
 	}...)
 	// add ELC (for SRF, CWF and GNR only)
 	if strings.Contains(uarch, cpus.UarchSRF) || strings.Contains(uarch, cpus.UarchGNR) || strings.Contains(uarch, cpus.UarchCWF) {
-		fields = append(fields, table.Field{Name: "Efficiency Latency Control", Description: "--elc <power-optimized|latency-optimized>", Values: []string{extract.ELCSummaryFromOutput(outputs)}})
+		fields = append(fields, table.Field{Name: "Efficiency Latency Control", Description: "--elc <" + strings.Join(elcOptions, "|") + ">", Values: []string{extract.ELCSummaryFromOutput(outputs)}})
 	}
 	// add prefetchers
 	for _, pf := range extract.PrefetcherDefinitions {
@@ -123,20 +123,20 @@ func configurationTableValues(outputs map[string]script.ScriptOutput) []table.Fi
 			fields = append(fields,
 				table.Field{
 					Name:        pf.ShortName + " prefetcher",
-					Description: "--" + "pref-" + strings.ReplaceAll(strings.ToLower(pf.ShortName), " ", "") + " <enable|disable>",
+					Description: "--" + "pref-" + strings.ReplaceAll(strings.ToLower(pf.ShortName), " ", "") + " <" + strings.Join(prefetcherOptions, "|") + ">",
 					Values:      []string{enabledDisabled}},
 			)
 		}
 	}
 	// add C6
 	c6 := extract.C6FromOutput(outputs)
 	if c6 != "" {
-		fields = append(fields, table.Field{Name: "C6", Description: "--c6 <enable|disable>", Values: []string{c6}})
+		fields = append(fields, table.Field{Name: "C6", Description: "--c6 <" + strings.Join(c6Options, "|") + ">", Values: []string{c6}})
 	}
 	// add C1 Demotion
 	c1Demotion := strings.TrimSpace(outputs[script.C1DemotionScriptName].Stdout)
 	if c1Demotion != "" {
-		fields = append(fields, table.Field{Name: "C1 Demotion", Description: "--c1-demotion <enable|disable>", Values: []string{c1Demotion}})
+		fields = append(fields, table.Field{Name: "C1 Demotion", Description: "--c1-demotion <" + strings.Join(c1DemotionOptions, "|") + ">", Values: []string{c1Demotion}})
 	}
 	return fields
 }

cmd/config/restore_test.go

@@ -142,8 +142,8 @@ func TestConvertValue(t *testing.T) {
 		{"Prefetcher enabled", "pref-l2hw", "Enabled", "enable", false},
 		{"Prefetcher disabled", "pref-l2hw", "Disabled", "disable", false},
 		{"C6 enabled", "c6", "Enabled", "enable", false},
-		{"ELC lowercase", "elc", "power-optimized", "power-optimized", false},
-		{"ELC capitalized", "elc", "Power-Optimized", "power-optimized", false},
+		{"ELC lowercase", "elc", "power", "power", false},
+		{"ELC capitalized", "elc", "Power", "power", false},
 		{"Core SSE freq buckets", "core-max-buckets", "1-44/3.6, 45-52/3.5, 53-60/3.4", "1-44/3.6, 45-52/3.5, 53-60/3.4", false},
 		{"Core SSE freq buckets full", "core-max-buckets", "1-44/3.6, 45-52/3.5, 53-60/3.4, 61-72/3.2, 73-76/3.1, 77-86/3.0", "1-44/3.6, 45-52/3.5, 53-60/3.4, 61-72/3.2, 73-76/3.1, 77-86/3.0", false},
 		{"Core SSE freq buckets invalid", "core-max-buckets", "invalid-format", "", true},