merge conflict

Author: BeArchiTek

.env.example

@@ -6,24 +6,35 @@
 # Used by CLI tools and local scripts to connect to Infrahub
 # Note: The Service Catalog container uses http://infrahub-server:8000 automatically
 # via docker-compose.override.yml for proper Docker networking
-INFRAHUB_ADDRESS=http://localhost:8000
+export INFRAHUB_ADDRESS=http://localhost:8000
 
 # Infrahub UI URL for browser links
 # Used by the Service Catalog to generate clickable links to Infrahub UI pages
 # Should be the URL accessible from your browser (typically http://localhost:8000)
-INFRAHUB_UI_URL=http://localhost:8000
+export INFRAHUB_UI_URL=http://localhost:8000
 
 # Infrahub API authentication token
 # Generate a token in the Infrahub UI under Settings > API Tokens
-INFRAHUB_API_TOKEN=06438eb2-8019-4776-878c-0941b1f1d1ec
+export INFRAHUB_API_TOKEN=06438eb2-8019-4776-878c-0941b1f1d1ec
 
 # Infrahub version to use
 # Specify the version of Infrahub to run (e.g., 1.5.1, stable, latest)
-INFRAHUB_VERSION=1.5.1
+export INFRAHUB_VERSION=1.5.1
 
 # Enable Infrahub Enterprise features
 # Set to "true" to enable enterprise features, "false" for community edition
-INFRAHUB_ENTERPRISE=false
+export INFRAHUB_ENTERPRISE=false
+
+# Use local git repository instead of GitHub
+# Set to "true" to mount the current directory as the git repository in Infrahub
+# This is useful for local development and testing of generator/transform changes
+# When enabled:
+#   - Infrahub will use /upstream (the mounted current directory) as the repo
+#   - Bootstrap script loads objects/git-repo/local-dev.yml
+# When disabled (default):
+#   - Infrahub will clone from GitHub
+#   - Bootstrap script loads objects/git-repo/github.yml
+export INFRAHUB_GIT_LOCAL=false
 
 # =============================================================================
 # Service Catalog Configuration
@@ -33,23 +44,23 @@ INFRAHUB_ENTERPRISE=false
 # Set to "true" to start the service catalog container with 'uv run invoke start'
 # Set to "false" (default) to run only the core Infrahub services
 # The service catalog provides a web UI for managing data center deployments
-INFRAHUB_SERVICE_CATALOG=false
+export INFRAHUB_SERVICE_CATALOG=false
 
 # Default branch to use when the service catalog application starts
 # This is the branch that will be selected by default in the UI
-DEFAULT_BRANCH=main
+export DEFAULT_BRANCH=main
 
 # Time to wait (in seconds) for the Infrahub generator to complete after creating a DC
 # Increase this value if your generators take longer to complete
-GENERATOR_WAIT_TIME=60
+export GENERATOR_WAIT_TIME=60
 
 # API request timeout in seconds
 # Maximum time to wait for API requests to complete
-API_TIMEOUT=30
+export API_TIMEOUT=30
 
 # Number of retry attempts for failed API requests
 # The service catalog will retry failed requests this many times before giving up
-API_RETRY_COUNT=3
+export API_RETRY_COUNT=3
 
 # Streamlit server port (optional)
 # Port on which the Streamlit application will run

CLAUDE.md

@@ -45,8 +45,10 @@ uv run infrahubctl object load objects/bootstrap --branch main
 # Load security data
 uv run infrahubctl object load objects/security/ --branch main
 
-# Add demo repository
-uv run infrahubctl repository add DEMO https://github.com/opsmill/infrahub-bundle-dc.git --read-only --ref main
+# Add bundle-dc repository (loaded from objects/git-repo/*.yml based on INFRAHUB_GIT_LOCAL)
+# - objects/git-repo/github.yml for GitHub (default)
+# - objects/git-repo/local-dev.yml for local /upstream mount
+uv run infrahubctl object load objects/git-repo/github.yml --branch main
 
 # Load event actions (optional)
 uv run infrahubctl object load objects/events/ --branch main
@@ -344,7 +346,22 @@ INFRAHUB_ADDRESS="http://localhost:8000"
 INFRAHUB_API_TOKEN="06438eb2-8019-4776-878c-0941b1f1d1ec"
 ```
 
-Note: The token above is a demo token for local development only.
+Optional environment variables for development:
+
+```bash
+# Use local git repository instead of GitHub (for development/testing)
+INFRAHUB_GIT_LOCAL="true"  # Default: false
+```
+
+When `INFRAHUB_GIT_LOCAL=true`:
+
+- Infrahub will use the current directory mounted at `/upstream` as the git repository
+- Useful for testing generator, transform, and check changes without pushing to GitHub
+- The volume mount is configured in `docker-compose.override.yml`
+- Bootstrap script automatically loads `objects/git-repo/local-dev.yml` (pointing to `/upstream`)
+- When disabled (default), bootstrap loads `objects/git-repo/github.yml` (pointing to GitHub URL)
+
+Note: The API token above is a demo token for local development only.
 
 ## Bootstrap Process
 
@@ -366,8 +383,8 @@ uv run infrahubctl object load objects/bootstrap
 # 5. Load security data (optional)
 uv run infrahubctl object load objects/security/
 
-# 6. Add repository
-uv run infrahubctl repository add DEMO https://github.com/opsmill/infrahub-bundle-dc.git --read-only --ref main
+# 6. Add repository (loaded from objects/git-repo/*.yml based on INFRAHUB_GIT_LOCAL)
+uv run infrahubctl object load objects/git-repo/github.yml --branch main
 
 # 7. Load event actions (optional)
 uv run infrahubctl object load objects/events/
@@ -446,6 +463,9 @@ The project includes a Streamlit-based service catalog application:
   - `18_devices.yml` - Pre-configured devices (corp-firewall, cisco-switch-01, etc.)
   - `19_docs.yml` - Documentation links
 - `objects/dc/` - Data center demo scenario files (Arista, Cisco, Juniper, SONiC)
+- `objects/git-repo/` - Repository configuration objects
+  - `github.yml` - GitHub repository configuration (default)
+  - `local-dev.yml` - Local development repository configuration (when INFRAHUB_GIT_LOCAL=true)
 - `objects/security/` - Security-related demo data
 - `objects/cloud_security/` - Cloud security examples
 - `objects/events/` - Event action definitions

docker-compose.override.yml

@@ -9,6 +9,12 @@ services:
       - NEO4J_dbms_memory_heap_max__size=4g
       - NEO4J_dbms_memory_pagecache_size=2g
 
+  # Mount local repository for local development
+  # Used when INFRAHUB_GIT_LOCAL=true to work with local generator/transform changes
+  task-worker:
+    volumes:
+      - ./:/upstream
+
   streamlit-service-catalog:
     build:
       context: ./service_catalog

generators/common.py

@@ -959,6 +959,9 @@ async def create_oob_connections(
                 },
             )
 
+            # Save the cable first so it exists in the database
+            await cable.save(allow_upsert=True)
+
             # Set the connector relationship on both interfaces
             source_endpoint.connector = cable.id
             target_endpoint.connector = cable.id
@@ -969,9 +972,6 @@ async def create_oob_connections(
             batch.add(
                 task=target_endpoint.save, allow_upsert=True, node=target_endpoint
             )
-            batch.add(
-                task=cable.save, allow_upsert=True, node=cable
-            )
         try:
             async for node, _ in batch.execute():
                 hfid_str = ' -> '.join(node.hfid) if isinstance(node.hfid, list) else str(node.hfid)

generators/generate_dc.py

@@ -182,21 +182,21 @@ async def create_fabric_peering(self) -> None:
                 },
             )
 
+            # Save the cable first so it exists in the database
+            await cable.save(allow_upsert=True)
+
             # Set bidirectional connector relationship
             # This allows queries to traverse: interface → connector → cable → connected_endpoints
             source_endpoint.connector = cable.id
             target_endpoint.connector = cable.id
 
-            # Queue all objects for batch save
+            # Queue interface saves for batch
             batch.add(
                 task=source_endpoint.save, allow_upsert=True, node=source_endpoint
             )
             batch.add(
                 task=target_endpoint.save, allow_upsert=True, node=target_endpoint
             )
-            batch.add(
-                task=cable.save, allow_upsert=True, node=cable
-            )
 
         # Execute batch and log results
         async for node, _ in batch.execute():

objects/dc/dc-arista-s.yml

@@ -4,9 +4,9 @@ kind: Object
 spec:
   kind: TopologyDataCenter
   data:
-    - name: DC-3
+    - name: dc-arista
       location: Frankfurt
-      description: Frankfurt Data Center
+      description: Arista Data Center with cEOS switches
       strategy: ospf-ibgp
       design: PHYSICAL DC ARISTA S
       emulation: true

objects/dc/dc-cisco-s-border-leafs.yml

@@ -4,9 +4,9 @@ kind: Object
 spec:
   kind: TopologyDataCenter
   data:
-    - name: DC-1
+    - name: dc-cisco-border
       location: Katowice
-      description: Katowice Data Center
+      description: Cisco Data Center with border leafs
       strategy: ospf-ibgp
       design: PHYSICAL DC CISCO S WITH BORDER LEAFS
       emulation: true

objects/dc/dc-cisco-s.yml

@@ -4,9 +4,9 @@ kind: Object
 spec:
   kind: TopologyDataCenter
   data:
-    - name: DC-2
+    - name: dc-cisco
       location: Munich
-      description: Munich Data Center
+      description: Cisco Data Center with Nexus switches
       strategy: ebgp-ibgp
       design: PHYSICAL DC CISCO S
       emulation: true

objects/dc/dc-juniper-s.yml

@@ -4,9 +4,9 @@ kind: Object
 spec:
   kind: TopologyDataCenter
   data:
-    - name: DC-5
+    - name: dc-juniper
       location: London
-      description: London Data Center with Juniper QFX5220-32CD
+      description: Juniper Data Center with Juniper QFX5220-32CD
       strategy: ospf-ibgp
       design: PHYSICAL DC JUNIPER S
       emulation: true

objects/dc/dc-sonic-border-leafs.yml

@@ -4,9 +4,9 @@ kind: Object
 spec:
   kind: TopologyDataCenter
   data:
-    - name: DC-4
+    - name: dc-sonic
       location: Barcelona
-      description: Barcelona Data Center 4
+      description: SONiC Data Center with border leafs
       strategy: ebgp-ibgp
       design: PHYSICAL DC SONIC S WITH BORDER LEAFS
       emulation: true