test

Author: cboffa13

src/oci-monitoring-mcp-server/oracle/oci_monitoring_mcp_server/tests/test_metric_tools.py

@@ -4,10 +4,11 @@
 https://oss.oracle.com/licenses/upl.
 """
 
-from unittest.mock import AsyncMock, MagicMock, Mock, create_autospec, patch
+from unittest.mock import AsyncMock, MagicMock, Mock, patch
 
 import oci
 import pytest
+from oracle.oci_monitoring_mcp_server.metrics.models import Metric
 from oracle.oci_monitoring_mcp_server.metrics.tools import MonitoringMetricsTools
 
 
@@ -23,9 +24,10 @@ def mock_context():
 
 class TestMetricTools:
     @pytest.mark.asyncio
-    @patch.object(MonitoringMetricsTools, "get_monitoring_client")
     async def test_get_compute_metrics(self, mock_context):
-        with patch("oci.monitoring.MonitoringClient") as mock_oci_monitoring_client:
+        with patch.object(
+            MonitoringMetricsTools, "get_monitoring_client"
+        ) as mock_oci_monitoring_client:
             metric = oci.monitoring.models.MetricData(
                 namespace="123",
                 resource_group=None,
@@ -37,7 +39,8 @@ async def test_get_compute_metrics(self, mock_context):
                 ],
             )
 
-            mock_list_response = create_autospec(oci.response.Response)
+            mock_oci_monitoring_client.return_value = Mock()
+            mock_list_response = Mock()
             mock_list_response.data = [metric]
             mock_oci_monitoring_client.return_value.summarize_metrics_data.return_value = (
                 mock_list_response
@@ -60,3 +63,39 @@ async def test_get_compute_metrics(self, mock_context):
             assert len(result[0]["datapoints"]) == 2
             assert result[0]["datapoints"][0]["timestamp"] == "2023-01-01T00:00:00Z"
             assert result[0]["datapoints"][0]["value"] == pytest.approx(42.0)
+
+    @pytest.mark.asyncio
+    async def test_get_metrics_data(self, mock_context):
+        with patch.object(
+            MonitoringMetricsTools, "get_monitoring_client"
+        ) as mock_oci_monitoring_client:
+            metric = oci.monitoring.models.MetricData(
+                namespace="123",
+                resource_group=None,
+                dimensions={"resourceId": "instance1"},
+                compartment_id="compartment1",
+                aggregated_datapoints=[
+                    MagicMock(timestamp="2023-01-01T00:00:00Z", value=42.0),
+                    MagicMock(timestamp="2023-01-01T00:01:00Z", value=43.5),
+                ],
+            )
+
+            mock_oci_monitoring_client.return_value = Mock()
+            mock_list_response = Mock()
+            mock_list_response.data = [metric]
+            mock_oci_monitoring_client.return_value.summarize_metrics_data.return_value = (
+                mock_list_response
+            )
+
+            metrics_tools = MonitoringMetricsTools()
+
+            result = await metrics_tools.get_metrics_data(
+                mock_context,
+                compartment_id="compartment1",
+                start_time="2023-01-01T00:00:00Z",
+                end_time="2023-01-01T00:00:00Z",
+            )
+
+            assert result is not None
+        for metric in result:
+            assert isinstance(metric, Metric)