mirror of
https://github.com/dtzp555-max/aci-sim.git
synced 2026-07-21 21:15:12 +00:00
dtzp555-maxandClaude Fable 5
e52ac1981d
Spine-to-ISN links now use per-link /31 point-to-point sub-interface pairs (Cisco Multi-Site design guide) instead of a shared /24 with a .254 IPN router; ospfIf/ospfAdjEp carry the pair addresses (ISN CSW LLDP mgmt IP unchanged - device-level address). aci-sim graph follows the autoACI topology view logic: solid ISN uplinks, link-type legend entries, and a physical-links table (fabric links + ISN uplinks with /31 local/remote IPs) under the diagram. Tests updated + strengthened; suite: 908 passed. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
130 lines
6.6 KiB
Python
130 lines
6.6 KiB
Python
"""build/underlay.py — bgpInst (local ASN), isisAdjEp + ospfAdjEp.
|
|
|
|
Intra-fabric underlay IGP is IS-IS: isisAdjEp is emitted between every directly
|
|
cabled spine↔leaf pair. OSPF is used ONLY by spines toward the inter-site network
|
|
(IPN/ISN) and ONLY in a multi-site fabric — leaves never peer OSPF with the ISN.
|
|
bgpInst carries the site ASN and anchors all BGP peers (overlay.py adds children).
|
|
|
|
Tier-3 (PR-20): ospfIf also carries `helloIntvl`/`deadIntvl`, fed by
|
|
`isn.ospf_hello`/`isn.ospf_dead` (real ACI defaults 10/40) — previously not
|
|
carried on this MO at all.
|
|
"""
|
|
from __future__ import annotations
|
|
|
|
from aci_sim.mit.mo import MO
|
|
from aci_sim.mit.store import MITStore
|
|
from aci_sim.topology.schema import Site, Topology
|
|
from aci_sim.build.fabric import loopback_ip
|
|
from aci_sim.build.cabling import cabling_links
|
|
|
|
|
|
def build(topo: Topology, site: Site, store: MITStore) -> None:
|
|
"""Emit bgpInst per node + OSPF/IS-IS adjacencies along fabric links."""
|
|
pod = site.pod
|
|
spine_ids = {n.id for n in site.spine_nodes()}
|
|
|
|
# bgpInst per node — carries the site ASN; overlay.py adds bgpPeer children
|
|
for node in site.all_nodes():
|
|
store.add(MO(
|
|
"bgpInst",
|
|
dn=f"topology/pod-{pod}/node-{node.id}/sys/bgp/inst",
|
|
asn=str(site.asn),
|
|
))
|
|
|
|
# isisDom per node (IS-IS is the ACI underlay IGP)
|
|
for node in site.all_nodes():
|
|
store.add(MO(
|
|
"isisDom",
|
|
dn=f"topology/pod-{pod}/node-{node.id}/sys/isis/inst-default/dom-overlay-1",
|
|
name="overlay-1",
|
|
operSt="up",
|
|
))
|
|
|
|
# IS-IS adjacencies — the intra-fabric underlay, between directly-cabled
|
|
# spine↔leaf pairs only. Convention: n1=spine, n2=leaf (same as cabling.py).
|
|
for n1, s1, p1, n2, s2, p2 in cabling_links(site):
|
|
spine_id, leaf_id = (n1, n2) if n1 in spine_ids else (n2, n1)
|
|
spine_port = f"eth{s1}/{p1}" if n1 in spine_ids else f"eth{s2}/{p2}"
|
|
leaf_port = f"eth{s2}/{p2}" if n1 in spine_ids else f"eth{s1}/{p1}"
|
|
spine_lb = loopback_ip(pod, spine_id)
|
|
leaf_lb = loopback_ip(pod, leaf_id)
|
|
|
|
spine_isis_base = f"topology/pod-{pod}/node-{spine_id}/sys/isis/inst-default/dom-overlay-1"
|
|
store.add(MO(
|
|
"isisAdjEp",
|
|
dn=f"{spine_isis_base}/if-[{spine_port}]/adj-[{leaf_lb}]",
|
|
operSt="up", sysId=leaf_lb, lastTrans="00:00:00", numAdjTrans="1",
|
|
))
|
|
leaf_isis_base = f"topology/pod-{pod}/node-{leaf_id}/sys/isis/inst-default/dom-overlay-1"
|
|
store.add(MO(
|
|
"isisAdjEp",
|
|
dn=f"{leaf_isis_base}/if-[{leaf_port}]/adj-[{spine_lb}]",
|
|
operSt="up", sysId=spine_lb, lastTrans="00:00:00", numAdjTrans="1",
|
|
))
|
|
|
|
# OSPF adjacencies — ONLY spine↔IPN/ISN, and ONLY in a multi-site fabric.
|
|
# Leaves never run OSPF to the ISN. One adjacency per spine toward the IPN,
|
|
# modeled on a routed VLAN-4 SUB-INTERFACE of the dedicated ISN uplink port
|
|
# eth1/{49+si} — i.e. "eth1/{49+si}.4" — matching real ACI multi-site
|
|
# spines, which carry the ISN-facing OSPF address on a routed sub-if
|
|
# rather than the bare physical port. interfaces.py builds the underlying
|
|
# plain-port l1PhysIf/ethpmPhysIf on each spine (multi-site only) at that
|
|
# exact base port (LLDP/physical state stays there — see interfaces.py's
|
|
# module docstring); the ospfIf here is a logical child of that port, so
|
|
# it always resolves against a real port inventory entry via its base
|
|
# port (ifId.split('.')[0]).
|
|
# autoACI's fabric_ospf plugin reads ospfIf.id/area/operSt directly; its
|
|
# topology code matches ospfAdjEp by ifId and falls back to the base port
|
|
# (ifId.split('.')[0]) to resolve the LLDP neighbor on the physical port.
|
|
if len(topo.sites) > 1:
|
|
# Point-to-point /31 per spine uplink (RFC 3021), matching the Cisco
|
|
# ACI Multi-Site design guide: each spine's ISN/IPN-facing routed
|
|
# VLAN-4 sub-interface is its own point-to-point subnet (/31 or /30),
|
|
# NOT a shared LAN segment — the IPN router's side of each link is the
|
|
# other address of the /31 pair. Scheme: spine si gets
|
|
# 172.16.{site.id}.{2*si}/31 locally, the IPN peer is .{2*si+1}.
|
|
# Tier-2 (PR-19): isn.ospf_area feeds ospfIf.area/ospfAdjEp.area — was
|
|
# a hardcoded "0.0.0.0" literal; a topology author overriding
|
|
# isn.ospf_area now sees it reflected in the actual OSPF object
|
|
# instead of a value the schema stored but no builder honored.
|
|
ospf_area = topo.isn.ospf_area
|
|
# Tier-3 (PR-20): isn.ospf_hello/ospf_dead (real ACI defaults 10/40)
|
|
# feed ospfIf.helloIntvl/deadIntvl — previously not carried on this
|
|
# MO at all.
|
|
ospf_hello = str(topo.isn.ospf_hello)
|
|
ospf_dead = str(topo.isn.ospf_dead)
|
|
for si, spine in enumerate(site.spine_nodes()):
|
|
ospf_base = f"topology/pod-{pod}/node-{spine.id}/sys/ospf/inst-default/dom-overlay-1"
|
|
store.add(MO("ospfDom", dn=ospf_base, name="overlay-1", operSt="up"))
|
|
# Batch-1 (updated): ospfIf nested between ospfDom and ospfAdjEp
|
|
# is now the routed VLAN-4 sub-interface of the eth1/{49+si} ISN
|
|
# uplink port interfaces.py builds a dedicated l1PhysIf for — real
|
|
# ACI multi-site spines carry the ISN-facing OSPF address on this
|
|
# kind of sub-if, not the bare physical port. NAMING (verified
|
|
# against real spine CLI, e.g. "Eth1/29.29"/"Eth1/33.33" in
|
|
# `show ip ospf neighbors vrf overlay-1`): the ACI-side sub-if
|
|
# NUMBER equals the PORT number — the encap is always vlan-4 but
|
|
# only the IPN/ISN-router side names its sub-if ".4". `addr` is
|
|
# this link's /31 point-to-point address; the ospfAdjEp peer below
|
|
# is the other half of the pair (consumer: autoACI's fabric_ospf.py,
|
|
# which reads ospfIf.id (falling back to ifId) + area + operSt).
|
|
if_port = f"eth1/{49 + si}.{49 + si}"
|
|
local_ip = f"172.16.{site.id}.{2 * si}"
|
|
ipn_peer_ip = f"172.16.{site.id}.{2 * si + 1}"
|
|
if_dn = f"{ospf_base}/if-[{if_port}]"
|
|
store.add(MO(
|
|
"ospfIf",
|
|
dn=if_dn,
|
|
id=if_port,
|
|
area=ospf_area,
|
|
operSt="up",
|
|
helloIntvl=ospf_hello,
|
|
deadIntvl=ospf_dead,
|
|
addr=f"{local_ip}/31",
|
|
))
|
|
store.add(MO(
|
|
"ospfAdjEp",
|
|
dn=f"{if_dn}/adj-[{ipn_peer_ip}]",
|
|
operSt="full", peerIp=ipn_peer_ip, nbrId=ipn_peer_ip, area=ospf_area,
|
|
))
|