Merge remote-tracking branch 'refs/remotes/origin/main'

Author: BeArchiTek

generators/common.py

@@ -40,7 +40,7 @@ def get_compose_command() -> str:
         # Use local docker-compose.yml file
         if override_file.exists():
             return f"docker compose -p infrahub -f {local_compose_file} -f {override_file}"
-        return f"docker compose -p infrahub -f {local_compose_file}"
+        return f"docker compose -p infrahub-bundle-dc -f {local_compose_file}"
 
     # Fall back to downloading from infrahub.opsmill.io
     # Determine the base URL based on edition

scripts/bootstrap.py

@@ -122,8 +122,8 @@ protocols {
 {%- endfor %}
 {%- endif %}
 
-{%- if bgp %}
-{%- for bgp_config in bgp %}
+{%- if bgp_profiles %}
+{%- for bgp_config in bgp_profiles %}
 
 routing-options {
 {%- if bgp_config.router_id and bgp_config.router_id.address %}

tasks.py

@@ -50,7 +50,7 @@ router ospf {{ ospf_config.process_id }}
 {%- endfor %}
 !
 ! BGP Configuration
-{%- for bgp_config in bgp %}
+{%- for bgp_config in bgp_profiles %}
 router bgp {{ bgp_config.local_as.asn }}
   router-id {{ bgp_config.router_id.address.split('/')[0] }}
 {%- if bgp_config.graceful_restart %}

templates/configs/leafs/juniper_junos.j2

@@ -40,8 +40,8 @@ async def transform(self, data: Any) -> Any:
         # Extract first OSPF config or use empty dict
         ospf = ospf_configs[0] if ospf_configs else {}
 
-        # Restructure BGP data for template
-        # Template expects: bgp.local_as, bgp.router_id, bgp.neighbors
+        # Create both flattened BGP dict (for Arista/Cisco templates)
+        # and pass original bgp_profiles list (for Juniper template)
         bgp = {}
         if bgp_profiles:
             # Get common BGP settings from first profile
@@ -67,7 +67,8 @@ async def transform(self, data: Any) -> Any:
 
         config = {
             "hostname": data.get("name"),
-            "bgp": bgp,
+            "bgp": bgp,  # Flattened dict for Arista/Cisco/SONiC templates
+            "bgp_profiles": bgp_profiles,  # Original list for Juniper template
             "ospf": ospf,
             "interfaces": get_interface_roles(data.get("interfaces")),
             "vlans": get_vlans(data.get("interfaces")),

templates/configs/spines/cisco_nxos.j2

@@ -42,8 +42,8 @@ async def transform(self, data: Any) -> Any:
         # Extract first OSPF config or use empty dict
         ospf = ospf_configs[0] if ospf_configs else {}
 
-        # Restructure BGP data for template
-        # Template expects: bgp.local_as, bgp.router_id, bgp.neighbors
+        # Create both flattened BGP dict (for Arista/Juniper templates)
+        # and pass original bgp_profiles list (for Cisco template)
         bgp = {}
         if bgp_profiles:
             # Get common BGP settings from first profile
@@ -69,7 +69,8 @@ async def transform(self, data: Any) -> Any:
 
         config = {
             "hostname": data.get("name"),
-            "bgp": bgp,
+            "bgp": bgp,  # Flattened dict for Arista/Juniper/SONiC templates
+            "bgp_profiles": bgp_profiles,  # Original list for Cisco template
             "ospf": ospf,
             "interface_roles": get_interface_roles(data.get("interfaces")),
             "loopbacks": get_loopbacks(data.get("interfaces")),