Skip to content

DZD Metadata: controller - render ibgp/msdp peers #1035

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nikw9944 merged 18 commits into from
Aug 7, 2025
Merged

DZD Metadata: controller - render ibgp/msdp peers #1035

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
4b29c73
vpnv4 peers
nikw9944 Aug 1, 2025
6b4742a
activator does not yet assign IPs
nikw9944 Aug 2, 2025
10dacf2
Skip devices with no LoopbackTypeVpnv4 interface
nikw9944 Aug 3, 2025
f00d889
e2e updates for router-id
nikw9944 Aug 3, 2025
31c1c95
feat(controller): #1022 render IBGP peers
nikw9944 Aug 3, 2025
48c73db
device.txt -> base.config.txt
nikw9944 Aug 3, 2025
f8962c0
Peer removal
nikw9944 Aug 4, 2025
f0cab17
address-family ipv4 / vpn-ipv4
nikw9944 Aug 4, 2025
c169c6f
Fix e2e tests
nikw9944 Aug 4, 2025
d7b7c7b
ipv4-only and msdp peers
nikw9944 Aug 5, 2025
32fd3e9
Update e2e to handle vpnv4 bgp peers
nikw9944 Aug 5, 2025
f4f365f
Fix a typo; ibgp peers are not unknown
nikw9944 Aug 6, 2025
8679cc5
e2e updates
nikw9944 Aug 6, 2025
2109e4d
Fix e2e telemetry test
nikw9944 Aug 6, 2025
64ecee2
Make TunnelTunnelBlock match testnet
nikw9944 Aug 6, 2025
b06bd1c
Add vpnv4/ipv4 tag to bgp neighbor descriptions
nikw9944 Aug 6, 2025
c4d0d88
Remove extra lines from merge
nikw9944 Aug 6, 2025
ccd5e7f
Fix typos
nikw9944 Aug 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
102 changes: 102 additions & 0 deletions controlplane/controller/internal/controller/fixtures/base.config.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,102 @@
!
ip multicast-routing
!
router pim sparse-mode
ipv4
rp address 10.0.0.0 239.0.0.0/24 override
!
vrf instance vrf1
ip routing vrf vrf1
!
hardware access-list update default-result permit
!
no ip access-list MAIN-CONTROL-PLANE-ACL
ip access-list MAIN-CONTROL-PLANE-ACL
counters per-entry
10 permit icmp any any
20 permit ip any any tracked
30 permit udp any any eq bfd ttl eq 255
40 permit udp any any eq bfd-echo ttl eq 254
50 permit udp any any eq multihop-bfd micro-bfd sbfd
60 permit udp any eq sbfd any eq sbfd-initiator
70 permit ospf any any
80 permit tcp any any eq ssh telnet www snmp bgp https msdp ldp netconf-ssh gnmi
90 permit udp any any eq bootps bootpc snmp rip ntp ldp ptp-event ptp-general
100 permit tcp any any eq mlag ttl eq 255
110 permit udp any any eq mlag ttl eq 255
120 permit vrrp any any
130 permit ahp any any
140 permit pim any any
150 permit igmp any any
160 permit tcp any any range 5900 5910
170 permit tcp any any range 50000 50100
180 permit udp any any range 51000 51100
190 permit tcp any any eq 3333
200 permit tcp any any eq nat ttl eq 255
210 permit tcp any eq bgp any
220 permit rsvp any any
230 permit tcp any any eq 9340
240 permit tcp any any eq 9559
250 permit udp any any eq 8503
260 permit udp any any eq lsp-ping
270 permit udp any eq lsp-ping any

280 remark Permit TWAMP (UDP 862)
290 permit udp any any eq 862
!
system control-plane
ip access-group MAIN-CONTROL-PLANE-ACL in
!
router bgp 65342
router-id 14.14.14.14
no neighbor 12.12.12.12
neighbor 12.12.12.12 remote-as 65342
neighbor 12.12.12.12 next-hop-self
neighbor 12.12.12.12 update-source Loopback256
neighbor 12.12.12.12 description remote-dzd-ipv4
neighbor 12.12.12.12 send-community
no neighbor 15.15.15.15
neighbor 15.15.15.15 remote-as 65342
neighbor 15.15.15.15 next-hop-self
neighbor 15.15.15.15 update-source Loopback255
neighbor 15.15.15.15 description remote-dzd-vpnv4
neighbor 15.15.15.15 send-community
address-family ipv4
neighbor 12.12.12.12 activate
no neighbor 15.15.15.15 activate
!
address-family vpn-ipv4
neighbor 15.15.15.15 activate
!
vrf vrf1
rd 65342:1
route-target import vpn-ipv4 65342:1
route-target export vpn-ipv4 65342:1
router-id 7.7.7.7
!
ip community-list COMM-ALL_USERS permit 21682:1200
ip community-list COMM-ALL_MCAST_USERS permit 21682:1300
!
no ip access-list SEC-USER-PUB-MCAST-IN
ip access-list SEC-USER-PUB-MCAST-IN
counters per-entry
permit icmp any any
permit tcp any any eq bgp
permit ip any 224.0.0.13/32
permit ip any 239.0.0.0/24
deny ip any any
!
no ip access-list SEC-USER-SUB-MCAST-IN
ip access-list SEC-USER-SUB-MCAST-IN
counters per-entry
permit icmp any any
permit tcp any any eq bgp
permit ip any 224.0.0.13/32
deny ip any any
!
no router msdp
router msdp
peer 12.12.12.12
mesh-group DZ-1
local-interface Loopback256
description remote-dzd
9 changes: 8 additions & 1 deletion controlplane/controller/internal/controller/fixtures/e2e.last.user.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,14 +176,21 @@ default interface Tunnel562
default interface Tunnel563
!
router bgp 65342
router-id 14.14.14.14
address-family ipv4
no neighbor 169.254.0.13
no neighbor 172.16.0.1
no neighbor 169.254.0.13
!
address-family vpn-ipv4
no neighbor 172.16.0.1
no neighbor 169.254.0.13
!
vrf vrf1
rd 65342:1
route-target import vpn-ipv4 65342:1
route-target export vpn-ipv4 65342:1
router-id 2.2.2.2
no neighbor 172.16.0.1
no neighbor 169.254.0.13
!
ip community-list COMM-ALL_USERS permit 21682:1200
Expand Down
9 changes: 8 additions & 1 deletion controlplane/controller/internal/controller/fixtures/e2e.peer.removal.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,7 @@ default interface Tunnel562
default interface Tunnel563
!
router bgp 65342
router-id 14.14.14.14
no neighbor 169.254.0.3
neighbor 169.254.0.3 remote-as 65000
neighbor 169.254.0.3 passive
Expand All @@ -211,7 +212,12 @@ router bgp 65342
neighbor 169.254.0.3 maximum-accepted-routes 1
address-family ipv4
neighbor 169.254.0.3 activate
no neighbor 169.254.0.7
no neighbor 172.16.0.1
no neighbor 169.254.0.7
!
address-family vpn-ipv4
no neighbor 172.16.0.1
no neighbor 169.254.0.7
!
vrf vrf1
rd 65342:1
Expand All @@ -226,6 +232,7 @@ router bgp 65342
neighbor 169.254.0.1 route-map RM-USER-500-OUT out
neighbor 169.254.0.1 maximum-routes 1
neighbor 169.254.0.1 maximum-accepted-routes 1
no neighbor 172.16.0.1
no neighbor 169.254.0.7
!
ip community-list COMM-ALL_USERS permit 21682:1200
Expand Down
3 changes: 3 additions & 0 deletions controlplane/controller/internal/controller/fixtures/e2e.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,7 @@ default interface Tunnel562
default interface Tunnel563
!
router bgp 65342
router-id 14.14.14.14
no neighbor 169.254.0.3
neighbor 169.254.0.3 remote-as 65000
neighbor 169.254.0.3 passive
Expand All @@ -212,6 +213,8 @@ router bgp 65342
address-family ipv4
neighbor 169.254.0.3 activate
!
address-family vpn-ipv4
!
vrf vrf1
rd 65342:1
route-target import vpn-ipv4 65342:1
Expand Down
3 changes: 3 additions & 0 deletions controlplane/controller/internal/controller/fixtures/mixed.tunnel.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@ interface Tunnel503
no shutdown
!
router bgp 65342
router-id 14.14.14.14
no neighbor 169.254.0.1
neighbor 169.254.0.1 remote-as 65000
neighbor 169.254.0.1 passive
Expand Down Expand Up @@ -140,6 +141,8 @@ router bgp 65342
neighbor 169.254.0.5 activate
neighbor 169.254.0.7 activate
!
address-family vpn-ipv4
!
vrf vrf1
rd 65342:1
route-target import vpn-ipv4 65342:1
Expand Down
3 changes: 3 additions & 0 deletions controlplane/controller/internal/controller/fixtures/multicast.tunnel.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ interface Tunnel502
no shutdown
!
router bgp 65342
router-id 14.14.14.14
no neighbor 169.254.0.1
neighbor 169.254.0.1 remote-as 65000
neighbor 169.254.0.1 passive
Expand Down Expand Up @@ -127,6 +128,8 @@ router bgp 65342
neighbor 169.254.0.3 activate
neighbor 169.254.0.5 activate
!
address-family vpn-ipv4
!
vrf vrf1
rd 65342:1
route-target import vpn-ipv4 65342:1
Expand Down
3 changes: 3 additions & 0 deletions controlplane/controller/internal/controller/fixtures/nohardware.tunnel.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@ interface Tunnel503
no shutdown
!
router bgp 65342
router-id 14.14.14.14
no neighbor 169.254.0.1
neighbor 169.254.0.1 remote-as 65000
neighbor 169.254.0.1 passive
Expand Down Expand Up @@ -135,6 +136,8 @@ router bgp 65342
neighbor 169.254.0.5 activate
neighbor 169.254.0.7 activate
!
address-family vpn-ipv4
!
vrf vrf1
rd 65342:1
route-target import vpn-ipv4 65342:1
Expand Down
3 changes: 3 additions & 0 deletions controlplane/controller/internal/controller/fixtures/unicast.tunnel.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,11 @@ interface Tunnel502
no shutdown
!
router bgp 65342
router-id 14.14.14.14
address-family ipv4
!
address-family vpn-ipv4
!
vrf vrf1
rd 65342:1
route-target import vpn-ipv4 65342:1
Expand Down
6 changes: 5 additions & 1 deletion controlplane/controller/internal/controller/fixtures/unknown.peer.removal.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,12 @@ interface Tunnel502
no shutdown
!
router bgp 65342
router-id 14.14.14.14
address-family ipv4
no neighbor 169.254.0.7
no neighbor 169.254.0.7
!
address-family vpn-ipv4
no neighbor 169.254.0.7
!
vrf vrf1
rd 65342:1
Expand Down
22 changes: 18 additions & 4 deletions controlplane/controller/internal/controller/models.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ package controller

import (
"net"

"github.com/malbeclabs/doublezero/smartcontract/sdk/go/serviceability"
)

var (
Expand All @@ -11,10 +13,15 @@ var (
)

type Device struct {
PubKey string
PublicIP net.IP
Tunnels []*Tunnel
TunnelSlots int
PubKey string
PublicIP net.IP
Vpn4vLoopbackIP net.IP
Ipv4LoopbackIP net.IP
Tunnels []*Tunnel
TunnelSlots int
Interfaces []serviceability.Interface
Vpn4vLoopbackIntfName string
Ipv4LoopbackIntfName string
}

func NewDevice(ip net.IP, publicKey string) *Device {
Expand Down Expand Up @@ -59,8 +66,15 @@ type Tunnel struct {
MulticastPublishers []net.IP
}

type BgpPeer struct {
PeerIP net.IP
PeerName string
}

type templateData struct {
Device *Device
Vpnv4BgpPeers []BgpPeer
Ipv4BgpPeers []BgpPeer
UnknownBgpPeers []net.IP
MulticastGroupBlock string
NoHardware bool
Expand Down
Loading
Loading