[Fix] Added 'Service' to IntegTests

Author: aadam19

test/efa/efa_test.go

@@ -37,20 +37,31 @@ const (
 	podEfaRdmaReadBytes      = "pod_efa_rdma_read_bytes"
 	podEfaRdmaWriteBytes     = "pod_efa_rdma_write_bytes"
 	podEfaRdmaWriteRecvBytes = "pod_efa_rdma_write_recv_bytes"
+	podEfaLimit              = "pod_efa_limit"
+	podEfaRequest            = "pod_efa_request"
+	podEfaUsageTotal         = "pod_efa_usage_total"
+	podEfaReservedCapacity   = "pod_efa_reserved_capacity"
 
 	nodeEfaRxBytes            = "node_efa_rx_bytes"
 	nodeEfaTxBytes            = "node_efa_tx_bytes"
 	nodeEfaRxDropped          = "node_efa_rx_dropped"
 	nodeEfaRdmaReadBytes      = "node_efa_rdma_read_bytes"
 	nodeEfaRdmaWriteBytes     = "node_efa_rdma_write_bytes"
 	nodeEfaRdmaWriteRecvBytes = "node_efa_rdma_write_recv_bytes"
+	nodeEfaLimit              = "node_efa_limit"
+	nodeEfaUsageTotal         = "node_efa_usage_total"
+	nodeEfaReservedCapacity   = "node_efa_reserved_capacity"
+	nodeEfaUnreservedCapacity = "node_efa_unreserved_capacity"
+	nodeEfaAvailableCapacity  = "node_efa_available_capacity"
 )
 
 var expectedDimsToMetricsIntegTest = map[string][]string{
 	"ClusterName": {
 		//containerEfaRxBytes, containerEfaTxBytes, containerEfaRxDropped, containerEfaRdmaReadBytes, containerEfaRdmaWriteBytes, containerEfaRdmaWriteRecvBytes,
 		//podEfaRxBytes, podEfaTxBytes, podEfaRxDropped, podEfaRdmaReadBytes, podEfaRdmaWriteBytes, podEfaRdmaWriteRecvBytes,
 		nodeEfaRxBytes, nodeEfaTxBytes, nodeEfaRxDropped, nodeEfaRdmaReadBytes, nodeEfaRdmaWriteBytes, nodeEfaRdmaWriteRecvBytes,
+		podEfaLimit, podEfaRequest, podEfaUsageTotal, podEfaReservedCapacity,
+		nodeEfaLimit, nodeEfaUsageTotal, nodeEfaReservedCapacity, nodeEfaUnreservedCapacity, nodeEfaAvailableCapacity,
 	},
 	//"ClusterName-Namespace-PodName-ContainerName": {
 	//	containerEfaRxBytes, containerEfaTxBytes, containerEfaRxDropped, containerEfaRdmaReadBytes, containerEfaRdmaWriteBytes, containerEfaRdmaWriteRecvBytes,
@@ -61,17 +72,23 @@ var expectedDimsToMetricsIntegTest = map[string][]string{
 	//"ClusterName-Namespace": {
 	//	podEfaRxBytes, podEfaTxBytes, podEfaRxDropped, podEfaRdmaReadBytes, podEfaRdmaWriteBytes, podEfaRdmaWriteRecvBytes,
 	//},
-	//"ClusterName-Namespace-Service": {
-	//	podEfaRxBytes, podEfaTxBytes, podEfaRxDropped, podEfaRdmaReadBytes, podEfaRdmaWriteBytes, podEfaRdmaWriteRecvBytes,
-	//},
-	//"ClusterName-Namespace-PodName": {
-	//	podEfaRxBytes, podEfaTxBytes, podEfaRxDropped, podEfaRdmaReadBytes, podEfaRdmaWriteBytes, podEfaRdmaWriteRecvBytes,
-	//},
+	"ClusterName-Namespace-Service": {
+		// podEfaRxBytes, podEfaTxBytes, podEfaRxDropped, podEfaRdmaReadBytes, podEfaRdmaWriteBytes, podEfaRdmaWriteRecvBytes,
+		podEfaLimit, podEfaRequest, podEfaUsageTotal, podEfaReservedCapacity,
+	},
+	"ClusterName-Namespace-PodName": {
+		//	podEfaRxBytes, podEfaTxBytes, podEfaRxDropped, podEfaRdmaReadBytes, podEfaRdmaWriteBytes, podEfaRdmaWriteRecvBytes,
+		podEfaLimit, podEfaRequest, podEfaUsageTotal, podEfaReservedCapacity,
+	},
 	//"ClusterName-Namespace-PodName-FullPodName": {
 	//	podEfaRxBytes, podEfaTxBytes, podEfaRxDropped, podEfaRdmaReadBytes, podEfaRdmaWriteBytes, podEfaRdmaWriteRecvBytes,
 	//},
+	"ClusterName-FullPodName-Namespace-PodName": {
+		podEfaLimit, podEfaRequest, podEfaUsageTotal, podEfaReservedCapacity,
+	},
 	"ClusterName-InstanceId-NodeName": {
 		nodeEfaRxBytes, nodeEfaTxBytes, nodeEfaRxDropped, nodeEfaRdmaReadBytes, nodeEfaRdmaWriteBytes, nodeEfaRdmaWriteRecvBytes,
+		nodeEfaLimit, nodeEfaUsageTotal, nodeEfaReservedCapacity, nodeEfaUnreservedCapacity, nodeEfaAvailableCapacity,
 	},
 	"ClusterName-InstanceId-InstanceType-NetworkInterfaceId-NodeName": {
 		nodeEfaRxBytes, nodeEfaTxBytes, nodeEfaRxDropped, nodeEfaRdmaReadBytes, nodeEfaRdmaWriteBytes, nodeEfaRdmaWriteRecvBytes,

test/metric_value_benchmark/eks_resources/test_schemas/node_efa.json

@@ -19,13 +19,19 @@
     "node_efa_rdma_write_recv_bytes": {},
     "node_efa_rx_bytes": {},
     "node_efa_rx_dropped": {},
-    "node_efa_tx_bytes": {}
+    "node_efa_tx_bytes": {},
+    "node_efa_limit": {},
+    "node_efa_usage_total": {},
+    "node_efa_reserved_capacity": {},
+    "node_efa_unreserved_capacity": {},
+    "node_efa_available_capacity": {}
   },
   "required": [
     "ClusterName",
     "InstanceId",
     "InstanceType",
     "NetworkInterfaceId",
+    "Service",
     "NodeName",
     "Timestamp",
     "Type",

test/metric_value_benchmark/eks_resources/test_schemas/pod_efa.json

@@ -6,27 +6,43 @@
   "properties": {
     "CloudWatchMetrics": {},
     "ClusterName": {},
+    "ContainerName": {},
+    "FullPodName": {},
+    "Hostname": {},
     "InstanceId": {},
     "InstanceType": {},
+    "K8sPodName": {},
+    "Namespace": {},
     "NetworkInterfaceId": {},
     "NodeName": {},
+    "OTelLib": {},
+    "PodName": {},
     "Timestamp": {},
     "Type": {},
+    "UUID": {},
     "Version": {},
     "kubernetes": {},
     "node_efa_rdma_read_bytes": {},
     "node_efa_rdma_write_bytes": {},
     "node_efa_rdma_write_recv_bytes": {},
     "node_efa_rx_bytes": {},
     "node_efa_rx_dropped": {},
-    "node_efa_tx_bytes": {}
+    "node_efa_tx_bytes": {},
+    "pod_efa_limit": {},
+    "pod_efa_request": {},
+    "pod_efa_usage_total": {},
+    "pod_efa_reserved_capacity": {}
   },
   "required": [
     "ClusterName",
+    "FullPodName",
     "InstanceId",
     "InstanceType",
+    "Namespace",
     "NetworkInterfaceId",
+    "Service",
     "NodeName",
+    "PodName",
     "Timestamp",
     "Type",
     "Version",