Network support (#76)

* ignore

* extended link support and network support

* update pkgs

Author: FloSch62

.gitignore

@@ -6,7 +6,7 @@ lab-examples/*
 !lab-examples/*.yml
 !lab-examples/*.yaml
 lab-examples/*flow_panel.yaml
-
+patch.sh
 # Created by https://www.toptal.com/developers/gitignore/api/python
 # Edit at https://www.toptal.com/developers/gitignore?templates=python
 

lab-examples/special_endpoints.clab.yml

@@ -0,0 +1,71 @@
+name: special-endpoints-test
+
+topology:
+  kinds:
+    nokia_srlinux:
+      type: ixrd1
+      image: ghcr.io/nokia/srlinux:latest
+  nodes:
+    srl1:
+      kind: nokia_srlinux
+    srl2:
+      kind: nokia_srlinux
+    br0:
+      kind: bridge
+    br1:
+      kind: ovs-bridge
+
+  links:
+    # Regular link between nodes but extended
+    - endpoints:
+        - node: srl1
+          interface: e1-1
+          mac: 02:42:ac:11:00:02
+        - node: srl2
+          interface: e1-1
+          mac: 02:42:ac:11:00:03
+      type: veth
+      mtu: 1400
+      vars:
+        test: test
+      labels:
+        test: test
+
+    # Management network link
+    - endpoints: [ srl2:e1-2, mgmt-net:srl2-e1-2 ]
+    - endpoints: [ srl2:e1-3, macvlan:enp0s3 ]
+    - endpoints: [ srl1:e1-3, srl2:e1-4 ]
+    - endpoints: [ srl1:e1-4, macvlan:enp0s3 ]
+    - type: host
+      endpoint:
+        node: srl1
+        interface: e1-5
+        mac: 02:42:ac:11:00:04
+      host-interface: eth1
+      mtu: 1400
+      vars:
+        test: test
+      labels:
+        test: test
+    - type: vxlan
+      endpoint:
+        node: srl1
+        interface: e1-6
+      remote: 10.0.0.1
+      vni: 100
+      udp-port: 4789
+      mtu: 1500
+    - type: vxlan-stitch
+      endpoint:
+        node: srl1
+        interface: e1-7
+      remote: 10.0.0.2
+      vni: 100
+      udp-port: 4786
+      mtu: 1500
+    - type: dummy
+      endpoint:
+        node: srl1
+        interface: e1-2
+    - endpoints: [ srl1:e1-8, br0:eth1 ]
+    - endpoints: [ srl1:e1-9, br1:eth1 ]

pyproject.toml

@@ -1,22 +1,22 @@
 [project]
 name = "clab-io-draw"
-version = "0.6.3"
+version = "0.7.0"
 description = "Convert between draw.io and containerlab topology files"
 readme = "README.md"
 requires-python = ">=3.11"
 dependencies = [
     "n2g==0.3.3",
-    "prompt-toolkit==3.0.51",
+    "prompt-toolkit==3.0.52",
     "PyYAML==6.0.2",
     "six==1.17.0",
     "wcwidth==0.2.13",
     "ruamel-yaml==0.18.15",
     "textual-dev==1.7.0",
-    "textual==5.3.0",
+    "textual==6.1.0",
     "networkx>=3.5.0",
     "defusedxml>=0.7.1",
-    "typer>=0.16.1",
-    "pytest>=8.4.1",
+    "typer>=0.17.4",
+    "pytest>=8.4.2",
 ]
 
 [project.scripts]

src/clab_io_draw/clab2drawio.py

@@ -172,58 +172,48 @@ def main(
                     f"User chose theme '{chosen_theme}' but no file found. Keeping old theme."
                 )
 
-    # Check if any nodes have predefined positions from the YAML
-    has_predefined_positions = any(
-        node.pos_x is not None
+    # Determine which nodes have predefined positions
+    predefined = {
+        name: node
+        for name, node in nodes.items()
+        if node.pos_x is not None
         and node.pos_y is not None
         and str(node.pos_x).strip() != ""
         and str(node.pos_y).strip() != ""
-        for node in nodes.values()
-    )
+    }
+
+    has_any_fixed = bool(predefined)
+    all_fixed = len(predefined) == len(nodes)
 
-    if has_predefined_positions:
+    fixed_positions = {}
+    if has_any_fixed:
         logger.debug("Using predefined positions from YAML file with scaling...")
 
-        # Scale factor to ensure adequate spacing between nodes
         x_scale = (styles.get("padding_x", 150) / 100) * 1.5
         y_scale = (styles.get("padding_y", 150) / 100) * 1.5
 
-        # Convert string positions to float and apply scaling
-        for node in nodes.values():
+        for name, node in predefined.items():
             try:
-                if (
-                    node.pos_x is not None
-                    and node.pos_y is not None
-                    and str(node.pos_x).strip() != ""
-                    and str(node.pos_y).strip() != ""
-                ):
-                    node.pos_x = int(node.pos_x) * x_scale
-                    node.pos_y = int(node.pos_y) * y_scale
+                node.pos_x = int(node.pos_x) * x_scale
+                node.pos_y = int(node.pos_y) * y_scale
+                fixed_positions[name] = (node.pos_x, node.pos_y)
             except (ValueError, TypeError):
                 logger.debug(
                     f"Could not convert position for node {node.name}, will use layout position"
                 )
                 node.pos_x = None
                 node.pos_y = None
 
-        # When fixed positions are available, we still assign graph levels for connectivity purposes
-        # but instruct it to skip warnings and not override positions
-        logger.debug(
-            "Using predefined positions - graph levels will only be used for connectivity"
-        )
         graph_manager = GraphLevelManager()
         graph_manager.assign_graphlevels(
-            diagram, verbose=False, skip_warnings=True, respect_fixed_positions=True
+            diagram, verbose=False, skip_warnings=True, respect_fixed_positions=False
         )
     else:
-        # No fixed positions, proceed with normal graph level assignment
         logger.debug("No predefined positions found - assigning graph levels normally")
         graph_manager = GraphLevelManager()
         graph_manager.assign_graphlevels(diagram, verbose=False)
 
-    # Only apply layout manager if we don't have predefined positions
-    if not has_predefined_positions:
-        # Choose layout based on layout argument
+    if not all_fixed:
         if layout == "vertical":
             layout_manager = VerticalLayout()
         else:
@@ -232,24 +222,34 @@ def main(
         logger.debug(f"Applying {layout} layout...")
         layout_manager.apply(diagram, verbose=log_level == LogLevel.DEBUG)
 
+        # Restore positions for nodes that had predefined coordinates
+        for name, (x, y) in fixed_positions.items():
+            node = nodes.get(name)
+            if node:
+                node.pos_x = x
+                node.pos_y = y
+
     # Calculate the diagram size based on the positions of the nodes
-    min_x = min(node.pos_x for node in nodes.values())
-    min_y = min(node.pos_y for node in nodes.values())
-    max_x = max(node.pos_x for node in nodes.values())
-    max_y = max(node.pos_y for node in nodes.values())
+    positioned_nodes = [
+        n for n in nodes.values() if n.pos_x is not None and n.pos_y is not None
+    ]
+    min_x = min(node.pos_x for node in positioned_nodes)
+    min_y = min(node.pos_y for node in positioned_nodes)
+    max_x = max(node.pos_x for node in positioned_nodes)
+    max_y = max(node.pos_y for node in positioned_nodes)
 
     # Determine the necessary adjustments
     adjust_x = -min_x + 100  # Adjust so the minimum x is at least 100
     adjust_y = -min_y + 100  # Adjust so the minimum y is at least 100
 
     # Apply adjustments to each node's position
-    for node in nodes.values():
+    for node in positioned_nodes:
         node.pos_x += adjust_x
         node.pos_y += adjust_y
 
     # Recalculate diagram size if necessary, after adjustment
-    max_x = max(node.pos_x for node in nodes.values())
-    max_y = max(node.pos_y for node in nodes.values())
+    max_x = max(node.pos_x for node in positioned_nodes)
+    max_y = max(node.pos_y for node in positioned_nodes)
 
     max_size_x = max_x + 100  # Adding a margin to the right side
     max_size_y = max_y + 100  # Adding a margin to the bottom