wip

Author: cboffa13

src/oci-monitoring-mcp-server/oracle/oci_monitoring_mcp_server/alarms/tools.py

@@ -56,10 +56,14 @@ def list_alarms(
             "The ID of the compartment containing the resources"
             "monitored by the metric that you are searching for.",
         ],
-    ) -> list[AlarmSummary]:
+    ) -> list[AlarmSummary] | str:
         monitoring_client = self.get_monitoring_client()
-        response: Response = monitoring_client.list_alarms(
+        response: Response | None = monitoring_client.list_alarms(
             compartment_id=compartment_id
         )
+        if response is None:
+            logger.error("Received None response from list_metrics")
+            return "There was no response returned from the Monitoring API"
+
         alarms: List[oci.monitoring.models.AlarmSummary] = response.data
         return [map_alarm_summary(alarm) for alarm in alarms]

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

@@ -4,7 +4,7 @@
 https://oss.oracle.com/licenses/upl.
 """
 
-from unittest.mock import AsyncMock, Mock, create_autospec, patch
+from unittest.mock import AsyncMock, Mock, patch
 
 import oci
 import pytest
@@ -24,6 +24,7 @@ def mock_context():
 
 class TestAlarmTools:
     @pytest.mark.asyncio
+    @patch.object(MonitoringAlarmTools, "get_monitoring_client")
     async def test_list_alarms(self, mock_context):
         with patch("oci.monitoring.MonitoringClient") as mock_oci_monitoring_client:
             mock_alarm1 = oci.monitoring.models.Alarm(
@@ -43,7 +44,8 @@ async def test_list_alarms(self, mock_context):
                 query="MemoryUtilization[1m].mean() > 90",
             )
 
-            mock_list_response = create_autospec(oci.response.Response)
+            mock_oci_monitoring_client.return_value = Mock()
+            mock_list_response = Mock()
             mock_list_response.data = [mock_alarm1, mock_alarm2]
             mock_oci_monitoring_client.return_value.list_alarms.return_value = (
                 mock_list_response

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

@@ -23,6 +23,7 @@ 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:
             metric = oci.monitoring.models.MetricData(