save state

hellt · hellt · commit 58f7d9adb1c2 · 2025-01-21T12:25:18.000+01:00
diff --git a/main.py b/main.py
@@ -23,12 +23,12 @@
 
 
 def main():
-    eda = EDAClient(base_url="https://devbox.panda-cobra.ts.net")
-    logger.info(f"Access Token: {eda.token}")
+    with EDAClient(base_url="https://devbox.panda-cobra.ts.net") as eda:
+        my_banner = banner("This is a test banner")
+        eda.add_to_transaction_create(my_banner)
+        resp = eda.commit_transaction()
 
-    my_banner = banner("This is a test banner")
-    # print(my_banner.model_dump())
-    eda.add_to_transaction_create(my_banner)
+        print(resp)
 
     # iface = Interface(
     #     apiVersion="interfaces.eda.nokia.com/v1alpha1",
diff --git a/src/banner.py b/src/banner.py
@@ -14,9 +14,7 @@ def banner(motd_text: str) -> Banner:
             namespace="clab-vlan",
             labels={"app": "banner"},
         ),
-        spec=Spec(
-            motd=motd_text,
-        ),
+        spec=Spec(motd=motd_text, nodeSelector=["containerlab=managed"]),
     )
 
     return banner
diff --git a/src/client.py b/src/client.py
@@ -1,7 +1,9 @@
-from typing import Optional
+import logging
+from typing import Any, Optional
 
 import httpx
-from pydantic import BaseModel, HttpUrl
+from pydantic import BaseModel
+from rich import print
 
 from models.core import (
     Transaction,
@@ -11,6 +13,8 @@
     TransactionValue,
 )
 
+logger = logging.getLogger(__name__)
+
 EDA_VERSION = "v24.12.1"
 
 KC_REALM = "master"
@@ -47,7 +51,9 @@ def add_to_transaction_create(self, resource: BaseModel) -> None:
         """Add resource to transaction"""
         # convert the resource instance of whatever actual type to a TransactionContent
         content = TransactionContent(
-            **resource.model_dump(exclude_unset=True, exclude_defaults=True)
+            **resource.model_dump(
+                exclude_unset=True, exclude_none=True, exclude_defaults=True
+            )
         )
 
         if self.transaction is None:
@@ -67,12 +73,47 @@ def add_to_transaction_create(self, resource: BaseModel) -> None:
                 )
             )
 
-    # def run_transaction(self) -> Any:
-    #     """Run transaction"""
-    #     # convert the transaction instance to a dict
-    #     transaction_dict = self.transaction.model_dump(
-    #         exclude_unset=True, exclude_defaults=True
-    #     )
+    def commit_transaction(self) -> Any:
+        """Commit transaction"""
+
+        # convert the transaction instance to a dict
+        if self.transaction is None:
+            raise ValueError("No transaction to commit")
+
+        self.transaction.retain = True
+        self.transaction.resultType = "normal"
+
+        content = self.transaction.model_dump_json(
+            exclude_unset=True, exclude_none=True, exclude_defaults=True
+        )
+
+        response = self.post(
+            url=self.transaction_endpoint,
+            content=content,
+        )
+        if response.status_code != 200:
+            raise ValueError(response.text)
+
+        tx_id: int = response.json()["id"]
+        logger.info(f"Transaction {tx_id} committed")
+
+        self.get_transaction(tx_id)
+
+    def get_transaction(self, tx_id: int) -> Any:
+        """Get transaction"""
+
+        params = {
+            "waitForComplete": "true",
+            # "failOnErrors": "true"
+        }
+        response = self.get(
+            url=f"{self.transaction_endpoint}/details/{tx_id}",
+            params=params,
+        )
+        if response.status_code != 200:
+            raise ValueError(response.text)
+
+        logger.info(f"Transaction {tx_id} details:\n{response.json()}")
 
 
 def _get_client_secret(kc_url: str) -> str:
