Merge branch 'main' into uv

Author: FloSch62

.github/workflows/cicd.yml

@@ -1,11 +1,8 @@
 name: CICD
 
 on:
-  push:
-    branches: ["**"]
-    tags: ["*.*.*"]
   release:
-    types: [created]
+    types: [published, prereleased]
 
 env:
   REGISTRY: ghcr.io
@@ -28,7 +25,6 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
 
-      # replaces slashes with dashes in platform name
       - name: Convert platform pairs
         run: |
           platform=${{ matrix.platform }}
@@ -38,7 +34,6 @@ jobs:
         uses: docker/setup-buildx-action@v3
 
       - name: Log into registry ${{ env.REGISTRY }}
-        if: github.event_name != 'pull_request'
         uses: docker/login-action@v3
         with:
           registry: ${{ env.REGISTRY }}
@@ -58,7 +53,7 @@ jobs:
           context: .
           platforms: ${{ matrix.platform }}
           labels: ${{ steps.meta.outputs.labels }}
-          outputs: type=image,name=${{ env.REGISTRY }}/${{ github.repository }},push-by-digest=true,name-canonical=true,push=${{ github.event_name != 'pull_request' }}
+          outputs: type=image,name=${{ env.REGISTRY }}/${{ github.repository }},push-by-digest=true,name-canonical=true,push=true
 
       - name: Export digest
         run: |
@@ -76,7 +71,6 @@ jobs:
 
   merge:
     runs-on: ubuntu-latest
-    if: ${{ github.event_name != 'pull_request' }}
     needs:
       - build
     steps:
@@ -96,14 +90,10 @@ jobs:
         with:
           images: ${{ env.REGISTRY }}/${{ github.repository }}
           tags: |
-            type=ref,event=branch
             type=ref,event=tag
-            type=ref,event=pr
-            type=sha
             type=semver,pattern={{version}}
 
       - name: Log into registry ${{ env.REGISTRY }}
-        if: github.event_name != 'pull_request'
         uses: docker/login-action@v3
         with:
           registry: ${{ env.REGISTRY }}

.github/workflows/release-event.json

@@ -1,6 +1,6 @@
 {
     "act": true,
-    "action": "created",
+    "action": "published",
     "ref": "refs/tags/v0.0.10",
     "sha": "b7e12928f13caf61af40d3e8788649a1a8f24c22",
     "release": {

.gitignore

@@ -1,4 +1,8 @@
 venv/*
 __pycache__
 test/*
-launch.json
+launch.json
+lab-examples/*
+!lab-examples/*.yml
+!lab-examples/*.yaml
+lab-examples/*flow_panel.yaml

clab2drawio.py

@@ -18,17 +18,18 @@
 
 logger = logging.getLogger(__name__)
 
+
 def main(
     input_file: str,
     output_file: str,
     grafana: bool,
     theme: str,
-    include_unlinked_nodes: bool=False,
-    no_links: bool=False,
-    layout: str="vertical",
-    verbose: bool=False,
-    interactive: bool=False,
-    grafana_config_path: str=None,
+    include_unlinked_nodes: bool = False,
+    no_links: bool = False,
+    layout: str = "vertical",
+    verbose: bool = False,
+    interactive: bool = False,
+    grafana_config_path: str = None,
 ) -> None:
     """
     Main function to generate a topology diagram from a containerlab YAML or draw.io XML file.
@@ -42,7 +43,7 @@ def main(
     :param layout: Layout direction ("vertical" or "horizontal").
     :param verbose: Enable verbose output.
     :param interactive: Run in interactive mode to define graph-levels and icons.
-    """    
+    """
     logger.debug("Starting clab2drawio main function.")
     loader = TopologyLoader()
     try:
@@ -91,7 +92,7 @@ def main(
     # Use NodeLinkBuilder to build nodes and links
     logger.debug("Building nodes and links...")
     builder = NodeLinkBuilder(containerlab_data, styles, prefix, lab_name)
-    nodes, links = builder.build_nodes_and_links()    
+    nodes, links = builder.build_nodes_and_links()
 
     diagram.nodes = nodes
 
@@ -194,11 +195,15 @@ def main(
         output_folder = os.path.dirname(grafana_output_file) or "."
         diagram.grafana_dashboard_file = grafana_output_file
         os.makedirs(output_folder, exist_ok=True)
-        
-        grafana_dashboard = GrafanaDashboard(diagram, grafana_config_path=grafana_config_path)
+
+        grafana_dashboard = GrafanaDashboard(
+            diagram, grafana_config_path=grafana_config_path
+        )
         panel_config = grafana_dashboard.create_panel_yaml()
 
-        flow_panel_output_file = os.path.splitext(grafana_output_file)[0] + ".flow_panel.yaml"
+        flow_panel_output_file = (
+            os.path.splitext(grafana_output_file)[0] + ".flow_panel.yaml"
+        )
         with open(flow_panel_output_file, "w") as f:
             f.write(panel_config)
         print("Saved flow panel YAML to:", flow_panel_output_file)
@@ -223,6 +228,7 @@ def main(
 
     print("Saved file to:", output_file)
 
+
 if __name__ == "__main__":
     args = parse_arguments()
 

cli/parser_clab2drawio.py

@@ -1,5 +1,6 @@
 import argparse
 
+
 def parse_arguments():
     """
     Parse command-line arguments for clab2drawio tool.
@@ -32,7 +33,7 @@ def parse_arguments():
         "--grafana-config",
         type=str,
         default=None,
-        help="Path to a Grafana YAML config file. If omitted, defaults are used."
+        help="Path to a Grafana YAML config file. If omitted, defaults are used.",
     )
     parser.add_argument(
         "--include-unlinked-nodes",

cli/parser_drawio2clab.py

@@ -1,5 +1,6 @@
 import argparse
 
+
 def parse_arguments():
     """
     Parse command-line arguments for drawio2clab tool.
@@ -9,9 +10,17 @@ def parse_arguments():
     parser = argparse.ArgumentParser(
         description="Convert a .drawio file to a Containerlab YAML file."
     )
-    parser.add_argument("-i", "--input", required=True, help="The input .drawio XML file.")
+    parser.add_argument(
+        "-i", "--input", required=True, help="The input .drawio XML file."
+    )
     parser.add_argument("-o", "--output", required=False, help="The output YAML file.")
-    parser.add_argument("--style", choices=["block", "flow"], default="flow", help="YAML style.")
-    parser.add_argument("--diagram-name", required=False, help="Name of the diagram to parse.")
-    parser.add_argument("--default-kind", default="nokia_srlinux", help="Default node kind.")
+    parser.add_argument(
+        "--style", choices=["block", "flow"], default="flow", help="YAML style."
+    )
+    parser.add_argument(
+        "--diagram-name", required=False, help="Name of the diagram to parse."
+    )
+    parser.add_argument(
+        "--default-kind", default="nokia_srlinux", help="Default node kind."
+    )
     return parser.parse_args()