waldur-site-agent-cscs-dwdi 0.7.5__py3-none-any.whl → 0.7.7__py3-none-any.whl

waldur_site_agent_cscs_dwdi/backend.py

@@ -5,7 +5,9 @@ from datetime import datetime, timezone
 from typing import Any, Optional
 
 from waldur_api_client.models.resource import Resource as WaldurResource
+from waldur_api_client.types import Unset
 
+from waldur_site_agent.backend import structures
 from waldur_site_agent.backend.backends import BaseBackend
 
 from .client import CSCSDWDIClient
@@ -59,6 +61,21 @@ class CSCSDWDIComputeBackend(BaseBackend):
         if self.socks_proxy:
             logger.info("CSCS-DWDI Compute Backend: Using SOCKS proxy: %s", self.socks_proxy)
 
+    def pull_resource(
+        self, waldur_resource: WaldurResource
+    ) -> Optional[structures.BackendResourceInfo]:
+        """Pull resource from backend with cluster filtering support."""
+        try:
+            backend_id = waldur_resource.backend_id
+            backend_resource_info = self._pull_backend_resource(backend_id, waldur_resource)
+            if backend_resource_info is None:
+                return None
+        except Exception:
+            logger.exception("Error while pulling resource [%s]", backend_id)
+            return None
+        else:
+            return backend_resource_info
+
     def ping(self, raise_exception: bool = False) -> bool:  # noqa: ARG002
         """Check if CSCS-DWDI API is accessible.
 
@@ -71,7 +88,7 @@ class CSCSDWDIComputeBackend(BaseBackend):
         return self.cscs_client.ping()
 
     def _get_usage_report(
-        self, resource_backend_ids: list[str]
+        self, resource_backend_ids: list[str], clusters: Optional[list[str]] = None
     ) -> dict[str, dict[str, dict[str, float]]]:
         """Get usage report for specified resources.
 
@@ -80,6 +97,7 @@ class CSCSDWDIComputeBackend(BaseBackend):
 
         Args:
             resource_backend_ids: List of account identifiers to report on
+            clusters: Optional list of cluster names to filter by
 
         Returns:
             Dictionary mapping account names to usage data:
@@ -120,6 +138,7 @@ class CSCSDWDIComputeBackend(BaseBackend):
                 accounts=resource_backend_ids,
                 from_date=from_date,
                 to_date=to_date,
+                clusters=clusters,
             )
 
             # Process the response
@@ -262,6 +281,69 @@ class CSCSDWDIComputeBackend(BaseBackend):
 
         return usage
 
+    def _pull_backend_resource(
+        self, resource_backend_id: str, waldur_resource: Optional[WaldurResource] = None
+    ) -> Optional[structures.BackendResourceInfo]:
+        """Pull resource data from the DWDI backend for usage reporting.
+
+        For DWDI, we treat the resource_backend_id as an account name
+        and fetch usage data for that account from the DWDI API.
+
+        Args:
+            resource_backend_id: Account name (e.g., 'g207')
+            waldur_resource: Optional Waldur resource object for filtering
+
+        Returns:
+            BackendResourceInfo with usage data or None if account not found
+        """
+        logger.info("Pulling resource %s", resource_backend_id)
+
+        # For DWDI, the resource_backend_id is the account name
+        account_name = resource_backend_id
+
+        # Extract cluster from offering_slug for filtering (always lowercase)
+        clusters = None
+        if (
+            waldur_resource
+            and hasattr(waldur_resource, "offering_slug")
+            and waldur_resource.offering_slug
+            and not isinstance(waldur_resource.offering_slug, Unset)
+        ):
+            # Use offering_slug as cluster name, converted to lowercase
+            cluster_name = waldur_resource.offering_slug.lower()
+            clusters = [cluster_name]
+            logger.info(
+                "Filtering DWDI query by cluster: %s (lowercase from offering_slug)",
+                cluster_name,
+            )
+
+        # Get usage data for this account
+        try:
+            usage_report = self._get_usage_report([account_name], clusters=clusters)
+
+            if account_name not in usage_report:
+                logger.warning("There is no account with ID %s in the DWDI backend", account_name)
+                return None
+
+            # Extract usage data for this account
+            account_usage = usage_report[account_name]
+
+            # Extract users (everyone except TOTAL_ACCOUNT_USAGE)
+            users = [username for username in account_usage if username != "TOTAL_ACCOUNT_USAGE"]
+
+            logger.info(
+                "Found usage data for account %s with %d users: %s", account_name, len(users), users
+            )
+
+            return structures.BackendResourceInfo(
+                users=users,
+                usage=account_usage,
+            )
+
+        except Exception:
+            logger.exception("Error while pulling account %s from DWDI", account_name)
+            return None
+
     # Methods not implemented for reporting-only backend
     def get_account(self, account_name: str) -> Optional[dict[str, Any]]:
         """Not implemented for reporting-only backend."""

waldur_site_agent_cscs_dwdi/client.py

@@ -126,7 +126,11 @@ class CSCSDWDIClient:
             return self._token
 
     def get_usage_for_month(
-        self, accounts: list[str], from_date: date, to_date: date
+        self,
+        accounts: list[str],
+        from_date: date,
+        to_date: date,
+        clusters: Optional[list[str]] = None,
     ) -> dict[str, Any]:
         """Get usage data for multiple accounts for a month range.
 
@@ -134,6 +138,7 @@ class CSCSDWDIClient:
             accounts: List of account identifiers to query
             from_date: Start date (beginning of month)
             to_date: End date (end of month)
+            clusters: Optional list of cluster names to filter by
 
         Returns:
             API response with usage data grouped by account
@@ -156,9 +161,13 @@ class CSCSDWDIClient:
         if accounts:
             params["account"] = accounts
 
+        # Add cluster filters if provided
+        if clusters:
+            params["cluster"] = clusters
+
         headers = {"Authorization": f"Bearer {token}"}
 
-        url = f"{self.api_url}/api/v1/compute/usage-month-multiaccount"
+        url = f"{self.api_url}/compute/usage-month/account"
 
         logger.debug(
             "Fetching usage for accounts %s from %s to %s",
@@ -179,7 +188,11 @@ class CSCSDWDIClient:
             return response.json()
 
     def get_usage_for_days(
-        self, accounts: list[str], from_date: date, to_date: date
+        self,
+        accounts: list[str],
+        from_date: date,
+        to_date: date,
+        clusters: Optional[list[str]] = None,
     ) -> dict[str, Any]:
         """Get usage data for multiple accounts for a day range.
 
@@ -187,6 +200,7 @@ class CSCSDWDIClient:
             accounts: List of account identifiers to query
             from_date: Start date
             to_date: End date
+            clusters: Optional list of cluster names to filter by
 
         Returns:
             API response with usage data grouped by account
@@ -209,9 +223,13 @@ class CSCSDWDIClient:
         if accounts:
             params["account"] = accounts
 
+        # Add cluster filters if provided
+        if clusters:
+            params["cluster"] = clusters
+
         headers = {"Authorization": f"Bearer {token}"}
 
-        url = f"{self.api_url}/api/v1/compute/usage-day-multiaccount"
+        url = f"{self.api_url}/compute/usage-day/account"
 
         logger.debug(
             "Fetching daily usage for accounts %s from %s to %s",
@@ -272,7 +290,7 @@ class CSCSDWDIClient:
 
         headers = {"Authorization": f"Bearer {token}"}
 
-        url = f"{self.api_url}/api/v1/storage/usage-month/filesystem_name/data_type"
+        url = f"{self.api_url}/storage/usage-month/{filesystem}/{data_type}"
 
         logger.debug(
             "Fetching storage usage for paths %s for month %s",
@@ -332,7 +350,7 @@ class CSCSDWDIClient:
 
         headers = {"Authorization": f"Bearer {token}"}
 
-        url = f"{self.api_url}/api/v1/storage/usage-day/filesystem_name/data_type"
+        url = f"{self.api_url}/storage/usage-day/{filesystem}/{data_type}"
 
         logger.debug(
             "Fetching storage usage for paths %s for date %s",
@@ -368,7 +386,7 @@ class CSCSDWDIClient:
                 "to": today.strftime("%Y-%m-%d"),
             }
 
-            url = f"{self.api_url}/api/v1/compute/usage-day-multiaccount"
+            url = f"{self.api_url}/compute/usage-day"
 
             # Configure httpx client with SOCKS proxy if specified
             client_args: dict[str, Any] = {"timeout": 10.0}
@@ -399,7 +417,10 @@ class CSCSDWDIClient:
                 "exact-date": today.strftime("%Y-%m-%d"),
             }
 
-            url = f"{self.api_url}/api/v1/storage/usage-day/filesystem_name/data_type"
+            # Use default values for ping test
+            filesystem = "lustre"
+            data_type = "projects"
+            url = f"{self.api_url}/storage/usage-day/{filesystem}/{data_type}"
 
             # Configure httpx client with SOCKS proxy if specified
             client_args: dict[str, Any] = {"timeout": 10.0}

{waldur_site_agent_cscs_dwdi-0.7.5.dist-info → waldur_site_agent_cscs_dwdi-0.7.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: waldur-site-agent-cscs-dwdi
-Version: 0.7.5
+Version: 0.7.7
 Summary: CSCS-DWDI reporting plugin for Waldur Site Agent
 Author-email: OpenNode Team <info@opennodecloud.com>
 Requires-Python: <4,>=3.9

waldur_site_agent_cscs_dwdi-0.7.7.dist-info/RECORD

@@ -0,0 +1,7 @@
+waldur_site_agent_cscs_dwdi/__init__.py,sha256=OHO1yF5NTGt0otI-GollR_ppPXP--aUZRCdaT5-8IWw,56
+waldur_site_agent_cscs_dwdi/backend.py,sha256=AWZuuY24KDGB5RWZhonoPrbIKpnrPc6D5WwwE6E8F6Y,30155
+waldur_site_agent_cscs_dwdi/client.py,sha256=6YrMky3pUfBJSAMYFAavBOz7-pooQIfqNjsBVk__K6g,14314
+waldur_site_agent_cscs_dwdi-0.7.7.dist-info/METADATA,sha256=xW5hgZAnbQ3MPK90TZv6jhB-8QPzmLeZVC608zV9z4Q,8131
+waldur_site_agent_cscs_dwdi-0.7.7.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+waldur_site_agent_cscs_dwdi-0.7.7.dist-info/entry_points.txt,sha256=gbp1thULdYQN4leLZeM8TBoruPSGQEKQxlQ0fg8u3Ug,187
+waldur_site_agent_cscs_dwdi-0.7.7.dist-info/RECORD,,

waldur_site_agent_cscs_dwdi-0.7.5.dist-info/RECORD

@@ -1,7 +0,0 @@
-waldur_site_agent_cscs_dwdi/__init__.py,sha256=OHO1yF5NTGt0otI-GollR_ppPXP--aUZRCdaT5-8IWw,56
-waldur_site_agent_cscs_dwdi/backend.py,sha256=2A53fAvjwnCaxsuA42bdqxHEp0DrwN1F4MYoB1ryCuQ,26846
-waldur_site_agent_cscs_dwdi/client.py,sha256=sqCBpioe5d6sJwp-iVGUL3AUIOxkXqTEA6u6mmd0F_Y,13782
-waldur_site_agent_cscs_dwdi-0.7.5.dist-info/METADATA,sha256=ncgQidSFZxvbh4jjAipUfQ7zhZrDm_qnCvcDzc_brag,8131
-waldur_site_agent_cscs_dwdi-0.7.5.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-waldur_site_agent_cscs_dwdi-0.7.5.dist-info/entry_points.txt,sha256=gbp1thULdYQN4leLZeM8TBoruPSGQEKQxlQ0fg8u3Ug,187
-waldur_site_agent_cscs_dwdi-0.7.5.dist-info/RECORD,,