Merge pull request #43 from opsmill/ps-fix-create-dc-generator

Fix issue with cable generation in create_dc generator

Author: PhillSimonds

generators/common.py

@@ -1125,26 +1125,51 @@ async def create_oob_connections(
                 kind=(InterfacePhysical if connection_type == "management" else DcimConsoleInterface),
                 name__value=connection["source_interface"],
                 device__name__value=connection["source"],
+                prefetch_relationships=True,
+                populate_store=True,
             )
             target_endpoint = await self.client.get(
                 kind=(InterfacePhysical if connection_type == "management" else DcimConsoleInterface),
                 name__value=connection["destination_interface"],
                 device__name__value=connection["target"],
+                prefetch_relationships=True,
+                populate_store=True,
             )
 
             source_endpoint.status.value = "active"
             source_endpoint.description.value = f"Connection to {' -> '.join(target_endpoint.hfid or [])}"
             target_endpoint.status.value = "active"
             target_endpoint.description.value = f"Connection to {' -> '.join(source_endpoint.hfid or [])}"
 
-            # Create cable to connect the endpoints
+            # Check if either endpoint already has a cable attached
+            # Note: Accessing .peer can raise ValueError if the related node exists
+            # but doesn't have an ID/HFID (e.g., hasn't been saved yet). We catch
+            # this and treat it as "no existing cable".
+            existing_cable_id = None
+            try:
+                if source_endpoint.connector.peer:
+                    existing_cable_id = source_endpoint.connector.peer.id
+            except ValueError:
+                pass  # No existing cable or peer doesn't have an ID
+            if not existing_cable_id:
+                try:
+                    if target_endpoint.connector.peer:
+                        existing_cable_id = target_endpoint.connector.peer.id
+                except ValueError:
+                    pass  # No existing cable or peer doesn't have an ID
+
+            # Create or update cable to connect the endpoints
+            cable_data: dict[str, Any] = {
+                "status": "connected",
+                "cable_type": "cat6",  # Use cat6 for management/console connections
+                "connected_endpoints": [source_endpoint.id, target_endpoint.id],
+            }
+            if existing_cable_id:
+                cable_data["id"] = existing_cable_id
+
             cable = await self.client.create(
                 kind=DcimCable,
-                data={
-                    "status": "connected",
-                    "cable_type": "cat6",  # Use cat6 for management/console connections
-                    "connected_endpoints": [source_endpoint.id, target_endpoint.id],
-                },
+                data=cable_data,
             )
 
             # Save the cable first so it exists in the database

generators/generate_dc.py

@@ -14,6 +14,8 @@
 dual loopbacks (underlay + VTEP), and proper BGP peer group configuration.
 """
 
+from typing import Any
+
 from infrahub_sdk.generator import InfrahubGenerator
 from infrahub_sdk.protocols import CoreNumberPool
 
@@ -142,11 +144,15 @@ async def create_fabric_peering(self) -> None:
                 kind=InterfacePhysical,
                 name__value=connection["source_interface"],
                 device__name__value=connection["source"],
+                prefetch_relationships=True,
+                populate_store=True,
             )
             target_endpoint = await self.client.get(
                 kind=InterfacePhysical,
                 name__value=connection["destination_interface"],
                 device__name__value=connection["target"],
+                prefetch_relationships=True,
+                populate_store=True,
             )
 
             # Configure source interface
@@ -159,15 +165,36 @@ async def create_fabric_peering(self) -> None:
             target_endpoint.description.value = f"Peering connection to {' -> '.join(source_endpoint.hfid or [])}"
             target_endpoint.role.value = interface_role
 
-            # Create cable object connecting both endpoints
+            # Check if either endpoint already has a cable attached
+            # Note: Accessing .peer can raise ValueError if the related node exists
+            # but doesn't have an ID/HFID (e.g., hasn't been saved yet). We catch
+            # this and treat it as "no existing cable".
+            existing_cable_id = None
+            try:
+                if source_endpoint.connector.peer:
+                    existing_cable_id = source_endpoint.connector.peer.id
+            except ValueError:
+                pass  # No existing cable or peer doesn't have an ID
+            if not existing_cable_id:
+                try:
+                    if target_endpoint.connector.peer:
+                        existing_cable_id = target_endpoint.connector.peer.id
+                except ValueError:
+                    pass  # No existing cable or peer doesn't have an ID
+
+            # Create or update cable object connecting both endpoints
             # Uses DAC (Direct Attach Copper) passive cables for fabric links
+            cable_data: dict[str, Any] = {
+                "status": "connected",
+                "cable_type": "dac-passive",
+                "connected_endpoints": [source_endpoint.id, target_endpoint.id],
+            }
+            if existing_cable_id:
+                cable_data["id"] = existing_cable_id
+
             cable = await self.client.create(
                 kind=DcimCable,
-                data={
-                    "status": "connected",
-                    "cable_type": "dac-passive",
-                    "connected_endpoints": [source_endpoint.id, target_endpoint.id],
-                },
+                data=cable_data,
             )
 
             # Save the cable first so it exists in the database

pyproject.toml

@@ -13,7 +13,7 @@ authors = [
 ]
 requires-python = ">=3.10,<3.13"
 dependencies = [
-    "infrahub-sdk[all]>=1.17.0,<2.0.0",
+    "infrahub-sdk[all,ctl]==1.18.1",
     "invoke>=2.2.1,<3.0.0",
     "rich>=13.9.4,<14.0.0",
 ]

schemas/base/dcim.yml

@@ -137,7 +137,6 @@ generics:
     relationships:
       - name: connected_endpoints
         peer: DcimEndpoint
-        optional: true
         cardinality: many
         order_weight: 1500
         kind: Generic