Arranging imports

Reviewed-on: #4

Dockerfile

@@ -0,0 +1,9 @@
+FROM python:latest
+
+WORKDIR /usr/local/bin
+COPY requirements.txt requirements.txt
+RUN pip install -r requirements.txt
+
+COPY src/start.py .
+
+CMD ["src/start.py"]

config/inventory.yml

@@ -0,0 +1,8 @@
+- 1:
+    hostname: '172.16.57.2'
+    username: 'admin'
+    password: 'Netapp12'
+- 2:
+    hostname: '172.16.56.2'
+    username: 'admin'
+    password: 'Netapp12'

requirements.txt

@@ -1,4 +1,7 @@
 fastapi[standard]>=0.116.2
 httpx>=0.28.1
 redis>=6.4.0
-python-dotenv>=1.1.1
+python-dotenv>=1.1.1
+pydantic
+redis[hiredis]
+dotenv

src/aggregate/__init__.py

@@ -1,4 +1,5 @@
 from src.example.router import router as example_router
+
 from .aggregate_router import router as aggregate_router
 
 __all__ = ["example_router", "aggregate_router"]

src/aggregate/aggregate_router.py

@@ -1,21 +1,16 @@
 # contains the router for the aggregates endpoint
-from fastapi import APIRouter, Query
-from enum import Enum
+from fastapi import APIRouter, Query, Request
 from typing import List
-from .aggregate_schema import AggregateSchema
+from .aggregate_schema import AggregateSchema, MetricEnum
 from .aggregate_service import get_aggregates
 
 
-class MetricEnum(str, Enum):
-    relative = "relative"
-    absolute = "absolute"
-
-
 router = APIRouter(tags=["aggregates"])
 
 
 @router.get("/aggregates", response_model=List[AggregateSchema])
 async def aggregates_endpoint(
+    request: Request,
     metric: MetricEnum = Query(MetricEnum.relative, description="Metric type"),
 ):
-    return await get_aggregates(metric)
+    return await get_aggregates(request, metric)

src/aggregate/aggregate_schema.py

@@ -1,8 +1,15 @@
 # contains the schema definitions for aggregates
 from pydantic import BaseModel
+from enum import Enum
 
 
 class AggregateSchema(BaseModel):
     aggregate: str
     node: str
-    available: str
+    available: int
+    available_str: str
+
+
+class MetricEnum(str, Enum):
+    relative = "relative"
+    absolute = "absolute"

src/aggregate/aggregate_service.py

@@ -1,24 +1,38 @@
 # contains the business logic for aggregates
+
 from typing import List
-from .aggregate_schema import AggregateSchema
+
+from fastapi import Request
+from .aggregate_schema import AggregateSchema, MetricEnum
+from logging import getLogger
+from ..utils import round_bytes, get_data_from_ontap
+
+logger = getLogger("uvicorn")
+logger.setLevel("DEBUG")
 
 
-async def get_aggregates(metric: str = "relative") -> List[AggregateSchema]:
+async def get_aggregates(request: Request, metric: str = "relative") -> List[AggregateSchema]:
     # Dummy data for demonstration
     # You can use the metric parameter to filter or modify results as needed
     # For now, just return the same data and show metric usage
-    print(f"Metric used: {metric}")
+    logger.debug(f"Metric used: {metric}")
+    client = request.app.requests_client
+    __aggregates = await get_data_from_ontap(client, logger, "172.16.57.2", "admin", "Netapp12", "storage/aggregates", "fields=name,uuid,space,node,home_node")
+    logger.debug(__aggregates)
+    __aggregates = __aggregates.get("records")
+    if metric == MetricEnum.relative:
+        __aggregates = sorted(__aggregates, key=lambda r: r["space"]["block_storage"].get("used_percent"), reverse=True)
+    elif metric == MetricEnum.absolute:
+        __aggregates = sorted(__aggregates, key=lambda r: r["space"]["block_storage"].get("available"), reverse=False)
 
     aggregates: list = [
         AggregateSchema(
-            aggregate="Aggregate A", node="cluster01-01", available="100.0TB"
-        ),
-        AggregateSchema(
-            aggregate="Aggregate B", node="cluster01-01", available="200.5GB"
-        ),
-        AggregateSchema(
-            aggregate="Aggregate C", node="cluster01-02", available="300.75MB"
-        ),
+            aggregate=a["name"],
+            node=a["node"]["name"],
+            available=a["space"]["block_storage"]["available"],
+            available_str=round_bytes(a["space"]["block_storage"]["available"]),
+        )
+        for a in __aggregates
     ]
 
     return aggregates

src/config/__init__.py

@@ -0,0 +1,3 @@
+from src.config.router import router as config_router
+
+__all__ = ["config_router"]

src/config/config.http

@@ -0,0 +1,14 @@
+POST http://127.0.0.1:8000/config
+Content-Type: application/json
+
+{
+  "cluster_list": [
+    {
+      "hostname": "cluster1.demo.netapp.com",
+      "username": "admin",
+      "password": "Netapp1!"
+    }
+  ]
+}
+
+###

src/config/router.py

@@ -0,0 +1,22 @@
+import logging
+
+from fastapi import APIRouter
+
+from .schema import ConfigReturnSchema, ConfigSchema
+
+logger = logging.getLogger("uvicorn")
+
+router = APIRouter(tags=["config"])
+
+
+@router.post(
+    "/config", summary="Upload a configuration", response_model=ConfigReturnSchema
+)
+async def create_config(config: ConfigSchema) -> ConfigSchema:
+    """
+    Endpoint to receive and store configuration data.
+
+    ⚠️ at this time the configuration is not stored anywhere. It's like logging to /dev/null
+    """
+    logger.info("Received configuration data")
+    return config

src/config/schema.py

@@ -0,0 +1,21 @@
+# contains the schema definitions for the config service
+from pydantic import BaseModel
+
+
+class ConfigEntrySchema(BaseModel):
+    hostname: str
+    username: str
+    password: str
+
+
+class ConfigOutSchema(BaseModel):
+    hostname: str
+    username: str
+
+
+class ConfigReturnSchema(BaseModel):
+    cluster_list: list[ConfigOutSchema]
+
+
+class ConfigSchema(BaseModel):
+    cluster_list: list[ConfigEntrySchema]

src/config/service.py

@@ -0,0 +1,2 @@
+# contains the business logic for the config service
+async def save_config() -> None: ...

src/database.py

@@ -0,0 +1,40 @@
+import json
+import logging
+from redis import Redis, ConnectionError
+from typing import List
+from pydantic import TypeAdapter
+from schema import ConfigSchema
+
+
+def setup_db_conn(redishost, redisport: str):
+    ''' Setup Redis connection and return it open'''
+    log = logging.getLogger('uvicorn')
+    try:
+        redisclient = Redis(host=redishost, port=redisport, decode_responses=True)
+        if redisclient.ping():
+            log.info(f"Connected to Redis DB {redishost} on port {redisport}")
+        else:
+            log.error(f"Cannot connect to Redis DB {redishost} on port {redisport}")
+            exit(1)
+        return redisclient
+    except ConnectionError as e:
+        print(f"FATAL: Redis DB {redishost} is unreachable on port {redisport}. Err: {e}")
+        return None
+    except Exception as e:
+        print(f"FATAL: {e}")
+        return None
+
+def get_inventory_from_redis(redisclient: Redis):
+    ''' Read inventory from Redis '''
+    cluster_inv = redisclient.hgetall('cluster_inventory')
+    if 'inventory' in cluster_inv:
+        return json.loads(cluster_inv['inventory'])
+    return {}
+
+def get_config_from_db(redisclient: Redis) -> ConfigSchema:
+    ''' Load inventory to global vars'''
+    GLOBAL_INVENTORY = get_inventory_from_redis(redisclient)
+
+    GLOBAL_INVENTORY_VALID = TypeAdapter(List[ConfigSchema]).validate_python(GLOBAL_INVENTORY)
+
+    return GLOBAL_INVENTORY_VALID

src/example/router.py

@@ -1,5 +1,6 @@
 # contains the router for the aggregate endpoint
 from fastapi import APIRouter
+
 from .schema import ExampleSchema
 
 router = APIRouter(tags=["aggregate"])

src/example/schema.py

@@ -5,3 +5,11 @@ from pydantic import BaseModel
 class ExampleSchema(BaseModel):
     example_field: str
     another_field: int
+
+class ClusterCreds(BaseModel):
+    """A structure to hold basic auth cluster credentials for a cluster"""
+    username:      str
+    password:      str
+    hostname:      str  = None
+    cert_filepath: Path = None
+    key_filepath:  Path = None

src/initialize.py

@@ -0,0 +1,44 @@
+import os
+import json
+import logging
+import yaml
+
+from pathlib import Path
+from dotenv import load_dotenv
+from database import setup_db_conn
+from schema import ConfigSchema
+from typing import List
+from pydantic import TypeAdapter
+
+def initialize_config():
+    load_dotenv()
+    log = logging.getLogger('uvicorn')
+    ENV_INVENTORYPATH = os.getenv('cluster_inventory_path')
+    ENV_REDISHOST = os.getenv('redis_host')
+    ENV_REDISPORT = os.getenv('redis_port')
+
+    log.info(f"Found Cluster Inventory file at: {ENV_INVENTORYPATH}")
+    if not ENV_INVENTORYPATH or not Path(ENV_INVENTORYPATH).is_file():
+        print(f"FATAL: Inventory file {ENV_INVENTORYPATH} is missing or not a file.")
+        return False
+    try:
+        with open(ENV_INVENTORYPATH, 'r') as f:
+            inv = yaml.safe_load(f)
+            inventory = json.dumps(inv) 
+    except Exception as e:
+        print(f"FATAL: Cannot read inventory file {ENV_INVENTORYPATH}. Err: {e}")
+        return False
+
+    print(f'[INFO] Importing configuration to DB...')
+    try:
+        GLOBAL_INVENTORY_VALID = TypeAdapter(List[ConfigSchema]).validate_python(inv)
+        redis_conn = setup_db_conn(ENV_REDISHOST, ENV_REDISPORT)
+        redis_conn.hset('cluster_inventory', mapping={'inventory': inventory})
+        redis_conn.close()
+
+        log.info("Configuration has been loaded.") 
+        return True
+
+    except Exception as e: 
+        print(f"FATAL: Redis DB error: {e}")
+        return False

src/main.py

@@ -1,23 +1,48 @@
-from src.service import load_config
-from fastapi import FastAPI
+import os
 import logging
+
+from fastapi import FastAPI
+
 from src.aggregate import aggregate_router
+from src.config import config_router
+
+from contextlib import asynccontextmanager
+
+from database import setup_db_conn, get_config_from_db
+from src.initialize import initialize_config
+from utils import setup_logging
 
 logger = logging.getLogger("uvicorn")
-
 logger.info("Starting application")
-config = load_config()
 
 app = FastAPI()
 app.include_router(aggregate_router)
+app.include_router(config_router)
 
 
-@app.get("/")
-async def main():
-    return {"Hello": "World"}
+@asynccontextmanager
+async def lifespan(app: FastAPI):
+    """make loading it async"""
+    log = logging.getLogger("uvicorn")
+    cfg_init_result = initialize_config()
+
+    shared_redis_conn = setup_db_conn(os.getenv("redis_host"), os.getenv("redis_port"))
+    if not shared_redis_conn:
+        log.error("Cannot connect to Redis DB. Exiting...")
+        exit(1)
+
+    inv_check = get_config_from_db(shared_redis_conn)
+    log.info(f"[DEBUG] Data validity healthcheck (DEVELOPER MODE): {inv_check}")
+    if not cfg_init_result:
+        log.error("Configuration initialization failed. Exiting...")
+        # exit(1)
+
+    yield
+    log.info("Shutting down FastAPI app...")
 
 
-@app.get("/config")
-async def get_config():
-    """Endpoint to get the current configuration."""
-    return config.model_dump()
+setup_logging()
+log = logging.getLogger("uvicorn")
+
+log.info("Starting FastAPI app...")
+app = FastAPI(lifespan=lifespan)

src/service.py

@@ -1,6 +1,7 @@
-from dotenv import dotenv_values
 import logging
 
+from dotenv import dotenv_values
+
 from src.schema import ConfigSchema
 
 logger = logging.getLogger("uvicorn")

src/utils.py

@@ -0,0 +1,33 @@
+import logging
+import httpx
+
+def round_bytes(size_in_bytes: int) -> str:
+    # Helper function to convert bytes to a human-readable format
+    for unit in ["B", "KiB", "MiB", "GiB", "TiB", "PiB"]:
+        if size_in_bytes < 1024:
+            return f"{size_in_bytes:.2f}{unit}"
+        size_in_bytes /= 1024
+    return f"{size_in_bytes:.2f}EB"
+
+
+async def get_data_from_ontap(client, logger, hostname: str, username: str, password: str, endpoint: str, query_string: str = ""):
+    url = f"https://{hostname}/api/{endpoint}"
+    if query_string:
+        url += f"?{query_string}"
+    async with client as _client:
+        try:
+            logger.debug(f"Fetching data from ONTAP: {url}")
+            response = await _client.get(url, auth=(username, password))
+            response.raise_for_status()
+            return response.json()
+        except httpx.HTTPError as e:
+            logger.error(f"HTTP error occurred: {e}")
+            return None
+
+def setup_logging() -> None:
+    """Configure logging for the application"""
+    logging.basicConfig(
+        level=logging.DEBUG,
+        format="[%(asctime)s] [%(levelname)5s] %(message)s"
+    )
+    print(f"Logger is initialized.")