OM126 - unit test cases

enhanced mockdata with 7.0 stats and configs
fixed failed test-cases
sorted newly added 7.0 stats/configs in gauge-list

gauge_stats_list.toml

@@ -227,18 +227,16 @@ namespace_gauge_stats =[
 	"xdr_tombstones",
 
     # added in 7.0
+	"data_avail_pct",
+	"data_compression_ratio",
+	"data_total_bytes",
 	"data_used_bytes",
+	"data_used_pct",
+	"index_mounts_used_pct",
 	"index_used_bytes",
 	"set_index_used_bytes",
-	"sindex_used_bytes",
-	"index_used_bytes",
-	"index_mounts_used_pct",
-	"sindex_used_bytes",
 	"sindex_mounts_used_pct",
-	"data_total_bytes",
-	"data_used_pct",
-	"data_avail_pct",
-	"data_compression_ratio",
+	"sindex_used_bytes",
 	"truncating",
 
 ]

gauge_stats_test.go

@@ -29,13 +29,13 @@ func TestGetGaugesCounts(t *testing.T) {
 	initGaugeStats(METRICS_CONFIG_FILE, gaugeList)
 
 	glist := gaugeList.NamespaceStats
-	assert.Equal(t, len(glist), 88)
+	assert.Equal(t, len(glist), 99)
 
 	glist = gaugeList.NodeStats
 	assert.Equal(t, len(glist), 69)
 
 	glist = gaugeList.SetsStats
-	assert.Equal(t, len(glist), 7)
+	assert.Equal(t, len(glist), 9)
 
 	glist = gaugeList.SindexStats
 	assert.Equal(t, len(glist), 13)

helper_test.go

@@ -105,11 +105,12 @@ func splitAndRetrieveStats(s, sep string) map[string]string {
 }
 
 func convertValue(s string) (float64, error) {
-	if f, err := strconv.ParseFloat(s, 64); err == nil {
+	temp_s := strings.TrimSpace(s)
+	if f, err := strconv.ParseFloat(temp_s, 64); err == nil {
 		return f, nil
 	}
 
-	if b, err := strconv.ParseBool(s); err == nil {
+	if b, err := strconv.ParseBool(temp_s); err == nil {
 		if b {
 			return 1, nil
 		}

mock_data_generator_test.go

@@ -280,7 +280,7 @@ type MockNamespacePromMetricGenerator struct {
 func (nsw *MockNamespacePromMetricGenerator) createNamespaceWatcherExpectedOutputs(mas *MockAerospikeServer, nsName string, addNsToKey bool) (map[string][]string, map[string][]string) {
 
 	// regex to check if a stat is storage-engine
-	seDynamicExtractor := regexp.MustCompile(`storage\-engine\.(?P<type>file|device)\[(?P<idx>\d+)\]\.(?P<metric>.+)`)
+	seDynamicExtractor := regexp.MustCompile(`storage\-engine\.(?P<type>file|device|stripe)\[(?P<idx>\d+)\]\.(?P<metric>.+)`)
 	itDynamicExtractor := regexp.MustCompile(`index\-type\.(?P<type>mount)\[(?P<idx>\d+)\]\.(?P<metric>.+)`)
 	sintDynamicExtractor := regexp.MustCompile(`sindex\-type\.(?P<type>mount)\[(?P<idx>\d+)\]\.(?P<metric>.+)`)
 
@@ -331,8 +331,9 @@ func (nsw *MockNamespacePromMetricGenerator) createNamespaceWatcherExpectedOutpu
 						labelsMap["index"] = stats["index-type"]
 					} else if strings.HasPrefix(key, "sindex-type") {
 						labelsMap["sindex"] = stats["sindex-type"]
+					} else {
+						labelsMap["storage_engine"] = stats["storage-engine"]
 					}
-
 					key = strings.ReplaceAll(key, "-", "_")
 					key = strings.ReplaceAll(key, ".", "_")
 
@@ -382,6 +383,7 @@ func (nsw *MockNamespacePromMetricGenerator) createNamespaceWatcherExpectedOutpu
 						metricName = match[3]
 						deviceOrFileName = stats["storage-engine."+metricType+"["+metricIndex+"]"]
 						metric = "aerospike_namespace_storage_engine_" + metricType + "_" + metricName
+						labelsMap["storage_engine"] = stats["storage-engine"]
 
 					} else if strings.HasPrefix(key, "index-type") {
 						match := itDynamicExtractor.FindStringSubmatch(key)

watcher_sindex_test.go

@@ -42,7 +42,9 @@ func TestSindex_PassTwoKeys(t *testing.T) {
 	expectedOutputs := mas.createSindexPassTwoExpectedOutputs(mas)
 	outputs := watcher.passTwoKeys(mas.passone_outputs_map)
 
-	assert.Equal(t, outputs, expectedOutputs)
+	// fmt.Println("\texpectedOutputs: ", expectedOutputs, "\n\toutputs: ", outputs)
+
+	assert.ElementsMatch(t, outputs, expectedOutputs)
 }
 
 func TestSindex_RefreshDefault(t *testing.T) {
@@ -225,6 +227,8 @@ func sindex_runTestCase(t *testing.T) {
 				outputMetricValues := lOutputValues[key]
 				outpuMetricLabels := lOutputLabels[key]
 
+				fmt.Println("Key: ", key, "\n\texpectedValues: ", expectedValues, "\n\toutputMetricValues: ", outputMetricValues, "\n\texpectedLabels: ", expectedLabels, "\n\toutpuMetricLabels: ", outpuMetricLabels)
+
 				// assert - only if the value belongs to the namespace/set we read expected values and processing
 				if strings.HasPrefix(key, namespaceWithSindexName) {
 					assert.Contains(t, expectedValues, outputMetricValues)