refactor: minor changes in tests

NetApp · Dec 4, 2023 · f392221 · f392221
1 parent 917dbb4
commit f392221
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/conf/restperf/9.12.0/workload_detail.yaml b/conf/restperf/9.12.0/workload_detail.yaml
@@ -16,9 +16,9 @@ schedule:
 counters:
   - ^^id
   - ^node.name      => node
-#?  - service_time
-#?  - visits
-#?  - wait_time
+  - service_time
+  - visits
+  - wait_time
 
 resource_map:
   CPU_dblade: backend

diff --git a/conf/restperf/9.12.0/workload_detail_volume.yaml b/conf/restperf/9.12.0/workload_detail_volume.yaml
@@ -14,9 +14,9 @@ schedule:
 
 counters:
   - ^^id
-#?  - service_time
-#?  - visits
-#?  - wait_time
+  - service_time
+  - visits
+  - wait_time
 
 resource_map:
   CPU_dblade : backend

diff --git a/conf/zapiperf/default.yaml b/conf/zapiperf/default.yaml
@@ -61,9 +61,9 @@ objects:
   VscanSVM:                 vscan_svm.yaml
 
 #  Uncomment to collect workload/QOS counters.
-  Workload:             workload.yaml
-  WorkloadVolume:       workload_volume.yaml
+#  Workload:             workload.yaml
+#  WorkloadVolume:       workload_volume.yaml
 
 # The following workload templates may slow down data collection due to a high number of metrics.
-  WorkloadDetail:       workload_detail.yaml
-  WorkloadDetailVolume: workload_detail_volume.yaml
+#  WorkloadDetail:       workload_detail.yaml
+#  WorkloadDetailVolume: workload_detail_volume.yaml
diff --git a/integration/test/counter_usage_test.go → integration/test/nonused_counter_test.go b/integration/test/counter_usage_test.go → integration/test/nonused_counter_test.go
@@ -23,7 +23,7 @@ import (
 func TestCounterUsage(t *testing.T) {
 	utils2.SkipIfMissing(t, utils2.Regression)
 	log.Info().Msg("Testing unused counters")
-	pollerName := "dc1"
+	pollerName := "dc1-zapi"
 	var (
 		restClient *rest2.Client
 		zapiClient *zapi2.Client