Merge branch 'main' into fix/devicedetailstags

catalystwan/api/monitoring_status_api.py

@@ -5,7 +5,7 @@
 import logging
 from typing import TYPE_CHECKING, List
 
-from catalystwan.endpoints.monitoring_status import MonitoringStatus, Status, UpdateStatus
+from catalystwan.endpoints.monitoring.status import MonitoringStatus, Status, UpdateStatus
 from catalystwan.typed_list import DataSequence
 
 logger = logging.getLogger(__name__)

catalystwan/api/templates/payloads/tenant/tenant_model.py

@@ -8,7 +8,7 @@
 from pydantic import BaseModel, ConfigDict
 
 from catalystwan.api.templates.feature_template import FeatureTemplate
-from catalystwan.endpoints.monitoring_device_details import Tier as TierInfo
+from catalystwan.endpoints.monitoring.device_details import Tier as TierInfo
 from catalystwan.models.tenant import Tenant as TenantInfo
 
 if TYPE_CHECKING:

catalystwan/endpoints/endpoints_container.py

@@ -83,8 +83,9 @@
 from catalystwan.endpoints.configuration_group import ConfigurationGroup
 from catalystwan.endpoints.configuration_settings import ConfigurationSettings
 from catalystwan.endpoints.misc import MiscellaneousEndpoints
-from catalystwan.endpoints.monitoring_device_details import MonitoringDeviceDetails
-from catalystwan.endpoints.monitoring_status import MonitoringStatus
+from catalystwan.endpoints.monitoring.device_details import MonitoringDeviceDetails
+from catalystwan.endpoints.monitoring.server_info import ServerInfo
+from catalystwan.endpoints.monitoring.status import MonitoringStatus
 from catalystwan.endpoints.real_time_monitoring.reboot_history import RealTimeMonitoringRebootHistory
 from catalystwan.endpoints.sdavc_cloud_connector import SDAVCCloudConnector
 from catalystwan.endpoints.tenant_backup_restore import TenantBackupRestore
@@ -198,6 +199,7 @@ def __init__(self, session: ManagerSession):
         self.configuration_software_actions = ConfigurationSoftwareActions(session)
         self.configuration_disaster_recovery = ConfigurationDisasterRecovery(session)
         self.monitoring_device_details = MonitoringDeviceDetails(session)
+        self.monitoring_server_info = ServerInfo(session)
         self.monitoring_status = MonitoringStatus(session)
         self.sdavc_cloud_connector = SDAVCCloudConnector(session)
         self.tenant_backup_restore = TenantBackupRestore(session)

catalystwan/endpoints/monitoring/server_info.py

@@ -0,0 +1,12 @@
+# Copyright 2024 Cisco Systems, Inc. and its affiliates
+
+# mypy: disable-error-code="empty-body"
+
+from catalystwan.endpoints import APIEndpoints, get
+from catalystwan.models.monitoring.server_info import ServerInfoResponse
+
+
+class ServerInfo(APIEndpoints):
+    @get("/server/info")
+    def get_server_info(self) -> ServerInfoResponse:
+        ...

catalystwan/models/monitoring/server_info.py

@@ -0,0 +1,12 @@
+# Copyright 2024 Cisco Systems, Inc. and its affiliates
+
+from pydantic import BaseModel, Field
+
+
+class ServerInfoResponse(BaseModel):
+    """The response may contain an incorrect spelling "Achitecture"."""
+
+    architecture: str = Field(..., alias="Achitecture")
+    available_processors: int = Field(
+        ..., serialization_alias="Available processors", validation_alias="Available processors"
+    )

catalystwan/tests/test_devices_api.py

@@ -10,7 +10,7 @@
 from catalystwan.api.basic_api import DevicesAPI, DeviceStateAPI
 from catalystwan.dataclasses import BfdSessionData, Connection, Device, WanInterface
 from catalystwan.endpoints.endpoints_container import APIEndpointContainter
-from catalystwan.endpoints.monitoring_device_details import DeviceData
+from catalystwan.endpoints.monitoring.device_details import DeviceData
 from catalystwan.endpoints.real_time_monitoring.reboot_history import RebootEntry
 from catalystwan.exceptions import CatalystwanException
 from catalystwan.response import ManagerResponse

catalystwan/tests/test_monitoring_server_info.py

@@ -0,0 +1,49 @@
+# Copyright 2022 Cisco Systems, Inc. and its affiliates
+
+import unittest
+from unittest.mock import MagicMock, patch
+
+from catalystwan.endpoints.monitoring.server_info import ServerInfo
+from catalystwan.models.monitoring.server_info import ServerInfoResponse
+
+
+class TestServerInfo(unittest.TestCase):
+    def setUp(self) -> None:
+        self.mock_server_info_data = {
+            "Achitecture": "x86_64",
+            "Available processors": 4,
+        }  # Note the spelling error
+
+    @patch("catalystwan.session.ManagerSession")
+    def test_get_server_info(self, mock_session):
+        # Arrange
+        # Create a MagicMock for the response that has a dataobj method
+        mock_response = MagicMock()
+        # Set up the mock response's dataobj method to return a ServerInfoResponse
+        mock_response.dataobj.return_value = ServerInfoResponse(**self.mock_server_info_data)
+
+        # Mock the request method of the ManagerSession to return the mock response
+        mock_session_instance = mock_session.return_value
+        mock_session_instance.request.return_value = mock_response
+
+        server_info_api = ServerInfo(mock_session_instance)
+
+        # Act
+        response = server_info_api.get_server_info()
+
+        # Assert
+        self.assertIsInstance(response, ServerInfoResponse)
+        self.assertEqual(response.architecture, self.mock_server_info_data["Achitecture"])
+        self.assertEqual(
+            response.available_processors,
+            self.mock_server_info_data["Available processors"],
+        )
+        self.assertEqual(response.architecture, "x86_64")
+        self.assertEqual(response.available_processors, 4)
+
+        # Ensure the request method was called
+        mock_session_instance.request.assert_called_once()
+
+
+if __name__ == "__main__":
+    unittest.main()

catalystwan/tests/test_monitoring_status_api.py

@@ -5,7 +5,7 @@
 from unittest.mock import MagicMock, patch
 
 from catalystwan.api.monitoring_status_api import MonitoringStatusAPI
-from catalystwan.endpoints.monitoring_status import (
+from catalystwan.endpoints.monitoring.status import (
     DisabledDeviceListResponse,
     EnabledIndexDeviceListResponse,
     Status,