fix: remove deprecated tables and add FTS ResourceType

Author: HeloiseJoffe

diracx-core/src/diracx/core/models/rss.py

@@ -29,9 +29,9 @@ def __bool__(self) -> bool:
 
 
 class ResourceType(StrEnum):
-    Site = "Site"
     Compute = "ComputeElement"
     Storage = "StorageElement"
+    FTS = "FTS"
 
 
 class StorageElementStatus(BaseModel):
@@ -45,6 +45,10 @@ class ComputeElementStatus(BaseModel):
     all: ResourceStatus
 
 
+class FTSStatus(BaseModel):
+    all: ResourceStatus
+
+
 class SiteStatus(BaseModel):
     all: ResourceStatus
 

diracx-db/src/diracx/db/sql/rss/db.py

@@ -3,8 +3,9 @@
 from sqlalchemy import select
 
 from diracx.core.models.rss import (
-    BannedStatus,
     ComputeElementStatus,
+    FTSStatus,
+    ResourceType,
     StorageElementStatus,
     map_status,
 )
@@ -25,25 +26,27 @@ class ResourceStatusDB(BaseSQLDB):
 
     metadata = RSSBase.metadata
 
-    async def get_site_status(
-        self, name: str, statustype: str = "all", vo: str = "all"
-    ) -> SiteStatusModel:
+    async def get_site_status(self, name: str, vo: str = "all") -> SiteStatusModel:
         stmt = select(SiteStatus.status, SiteStatus.reason).where(
             SiteStatus.name == name,
-            SiteStatus.statustype == statustype,
+            SiteStatus.statustype == "all",
             SiteStatus.vo == vo,
         )
         result = await self.conn.execute(stmt)
         row = result.first()
         if not row:
-            return SiteStatusModel(all=BannedStatus(allowed=False, reason="Not found"))
+            raise ValueError(f"Site {name} not found")
 
         return SiteStatusModel(all=map_status(row.Status, row.Reason))
 
-    async def get_compute_status(
-        self, name: str, vo: str = "all"
-    ) -> ComputeElementStatus:
-        stmt = select(ResourceStatus.status, ResourceStatus.reason).where(
+    async def get_resource_status(
+        self,
+        name: str,
+        vo: str = "all",
+    ) -> ComputeElementStatus | FTSStatus:
+        stmt = select(
+            ResourceStatus.status, ResourceStatus.reason, ResourceStatus.elementtype
+        ).where(
             ResourceStatus.name == name,
             ResourceStatus.statustype == "all",
             ResourceStatus.vo == vo,
@@ -52,11 +55,16 @@ async def get_compute_status(
         row = result.first()
 
         if not row:
-            return ComputeElementStatus(
-                all=BannedStatus(allowed=False, reason="Not found")
-            )
+            raise ValueError(f"Resource {name} not found")
+
+        element_type = ResourceType(row.ElementType)
+
+        if element_type == ResourceType.Compute:
+            return ComputeElementStatus(all=map_status(row.Status, row.Reason))
+        if element_type == ResourceType.FTS:
+            return FTSStatus(all=map_status(row.Status, row.Reason))
 
-        return ComputeElementStatus(all=map_status(row.Status, row.Reason))
+        raise ValueError(f"Unexpected resource type {element_type}")
 
     async def get_storage_status(
         self, name: str, vo: str = "all"
@@ -72,7 +80,7 @@ async def get_status(statustype: str):
             row = result.first()
 
             if not row:
-                return BannedStatus(allowed=False, reason="Not found")
+                raise ValueError(f"StorageElement {name} not found")
 
             return map_status(row.Status, row.Reason)
 

diracx-db/src/diracx/db/sql/rss/schema.py

@@ -84,10 +84,6 @@ class ResourceStatus(ElementStatusBase, RSSBase):
     __tablename__ = "ResourceStatus"
 
 
-class NodeStatus(ElementStatusBase, RSSBase):
-    __tablename__ = "NodeStatus"
-
-
 # tables with schema defined in ElementStatusBaseWithID
 
 
@@ -105,11 +101,3 @@ class ResourceLog(ElementStatusBaseWithID, RSSBase):
 
 class ResourceHistory(ElementStatusBaseWithID, RSSBase):
     __tablename__ = "ResourceHistory"
-
-
-class NodeLog(ElementStatusBaseWithID, RSSBase):
-    __tablename__ = "NodeLog"
-
-
-class NodeHistory(ElementStatusBaseWithID, RSSBase):
-    __tablename__ = "NodeHistory"

diracx-db/tests/rss/test_rss_db.py

@@ -10,6 +10,7 @@
     AllowedStatus,
     BannedStatus,
     ComputeElementStatus,
+    FTSStatus,
     StorageElementStatus,
     map_status,
 )
@@ -76,17 +77,14 @@ async def test_site_status(rss_db: ResourceStatusDB):
     assert bool(result.all) is True
 
     # Test with an unknow Site (should not be found)
-    async with rss_db as rss_db:
-        result = await rss_db.get_site_status("UnknownSite")
-    assert isinstance(result, SiteStatusModel)
-    assert isinstance(result.all, BannedStatus)
-    assert bool(result.all) is False
-    assert result.all.reason == "Not found"
+    with pytest.raises(ValueError, match="Site Unknown not found"):
+        async with rss_db as rss_db:
+            await rss_db.get_site_status("Unknown")
 
 
-async def test_compute_status(rss_db: ResourceStatusDB):
-    # Insert a test Compute Element
+async def test_resource_status(rss_db: ResourceStatusDB):
     async with rss_db.engine.begin() as conn:
+        # Insert a test Compute Element
         await conn.execute(
             insert(rss_db.metadata.tables["ResourceStatus"]).values(
                 Name="TestCompute",
@@ -101,21 +99,60 @@ async def test_compute_status(rss_db: ResourceStatusDB):
                 TokenOwner="test",
             )
         )
+        # Insert a test FTS
+        await conn.execute(
+            insert(rss_db.metadata.tables["ResourceStatus"]).values(
+                Name="TestFTS",
+                StatusType="all",
+                VO="all",
+                Status="Active",
+                Reason="All good",
+                DateEffective=_NOW,
+                TokenExpiration=_FAR,
+                LastCheckTime=_NOW,
+                ElementType="FTS",
+                TokenOwner="test",
+            )
+        )
+        # Insert a wrong test
+        await conn.execute(
+            insert(rss_db.metadata.tables["ResourceStatus"]).values(
+                Name="WrongTest",
+                StatusType="all",
+                VO="all",
+                Status="Active",
+                Reason="All good",
+                DateEffective=_NOW,
+                TokenExpiration=_FAR,
+                LastCheckTime=_NOW,
+                ElementType="WrongTest",
+                TokenOwner="WrongTest",
+            )
+        )
 
     # Test with the test Compute Element (should be found)
     async with rss_db as rss_db:
-        result = await rss_db.get_compute_status("TestCompute")
+        result = await rss_db.get_resource_status("TestCompute")
     assert isinstance(result, ComputeElementStatus)
     assert isinstance(result.all, AllowedStatus)
     assert bool(result.all) is True
 
-    # Test with an unknow Compute Element (should not be found)
+    # Test with the test FTS (should be found)
     async with rss_db as rss_db:
-        result = await rss_db.get_compute_status("UnknownCompute")
-    assert isinstance(result, ComputeElementStatus)
-    assert isinstance(result.all, BannedStatus)
-    assert bool(result.all) is False
-    assert result.all.reason == "Not found"
+        result = await rss_db.get_resource_status("TestFTS")
+    assert isinstance(result, FTSStatus)
+    assert isinstance(result.all, AllowedStatus)
+    assert bool(result.all) is True
+
+    # Test with a wrong Resource type
+    with pytest.raises(ValueError, match="not a valid ResourceType"):
+        async with rss_db as rss_db:
+            await rss_db.get_resource_status("WrongTest")
+
+    # Test with an unknow Resource (should not be found)
+    with pytest.raises(ValueError, match="Resource Unknown not found"):
+        async with rss_db as rss_db:
+            await rss_db.get_resource_status("Unknown")
 
 
 async def test_storage_status(rss_db: ResourceStatusDB):
@@ -151,18 +188,6 @@ async def test_storage_status(rss_db: ResourceStatusDB):
     assert bool(result.remove) is True
 
     # Test with an unknow Storage Element (should not be found)
-    async with rss_db as rss_db:
-        result = await rss_db.get_storage_status("UnknownStorage")
-    assert isinstance(result, StorageElementStatus)
-    assert isinstance(result.read, BannedStatus)
-    assert isinstance(result.write, BannedStatus)
-    assert isinstance(result.check, BannedStatus)
-    assert isinstance(result.remove, BannedStatus)
-    assert bool(result.read) is False
-    assert bool(result.write) is False
-    assert bool(result.check) is False
-    assert bool(result.remove) is False
-    assert result.read.reason == "Not found"
-    assert result.write.reason == "Not found"
-    assert result.check.reason == "Not found"
-    assert result.remove.reason == "Not found"
+    with pytest.raises(ValueError, match="StorageElement Unknown not found"):
+        async with rss_db as rss_db:
+            await rss_db.get_storage_status("Unknown")