controller: use link.delay_override to set isis metric when set in valid range

nikw9944 · nikw9944 · commit b3a4aecac82f · 2025-11-05T18:26:30.000Z
diff --git a/controlplane/controller/internal/controller/fixtures/e2e.tmpl b/controlplane/controller/internal/controller/fixtures/e2e.tmpl
@@ -101,6 +101,18 @@ interface Switch1/1/2.100
    isis hello padding
    isis network point-to-point
 !
+interface Switch1/1/3
+   mtu 2048
+   no switchport
+   ip address 172.16.0.4/31
+   pim ipv4 sparse-mode
+   isis enable 1
+   isis circuit-type level-2
+   isis hello-interval 1
+   isis metric 50
+   isis hello padding
+   isis network point-to-point
+!
 interface Loopback1000
    description RP Address
    ip address 10.0.0.0/32
diff --git a/controlplane/controller/internal/controller/server.go b/controlplane/controller/internal/controller/server.go
@@ -364,6 +364,15 @@ func (c *Controller) updateStateCache(ctx context.Context) error {
 			}
 
 			microseconds := math.Ceil(float64(link.DelayNs) / 1000.0)
+
+			if link.DelayOverrideNs != 0 {
+				if link.DelayOverrideNs < 10000 || link.DelayOverrideNs > 1_000_000_000 {
+					c.log.Warn("link delay override is outside valid range (10us - 1s), ignoring", "link_pubkey", base58.Encode(link.PubKey[:]), "device_code", device.Code, "interface", iface.Name, "delay_override_ns", link.DelayOverrideNs)
+				} else {
+					microseconds = math.Ceil(float64(link.DelayOverrideNs) / 1000.0)
+				}
+			}
+
 			d.Interfaces[i].Metric = uint32(microseconds)
 			d.Interfaces[i].IsLink = true
 			linkMetrics.WithLabelValues(device.Code, iface.Name, d.PubKey).Set(float64(d.Interfaces[i].Metric))
diff --git a/controlplane/controller/internal/controller/server_test.go b/controlplane/controller/internal/controller/server_test.go
@@ -815,6 +815,12 @@ func TestStateCache(t *testing.T) {
 							IpNet:         [5]uint8{172, 16, 0, 4, 31},
 							Status:        serviceability.InterfaceStatusActivated,
 						},
+						{
+							InterfaceType: serviceability.InterfaceTypePhysical,
+							Name:          "Ethernet1/3",
+							IpNet:         [5]uint8{172, 16, 0, 6, 31},
+							Status:        serviceability.InterfaceStatusActivated,
+						},
 					},
 					Status: serviceability.DeviceStatusActivated,
 					Code:   "abc01",
@@ -823,24 +829,37 @@ func TestStateCache(t *testing.T) {
 			},
 			Links: []serviceability.Link{
 				{
-					AccountType:    serviceability.LinkType,
-					Owner:          [32]uint8{},
-					SideAPubKey:    [32]uint8{1},
-					SideZPubKey:    [32]uint8{2},
-					DelayNs:        400000000,
-					Status:         serviceability.LinkStatusActivated,
-					SideAIfaceName: "Ethernet1/1",
-					SideZIfaceName: "Ethernet1/1",
+					AccountType:     serviceability.LinkType,
+					Owner:           [32]uint8{},
+					SideAPubKey:     [32]uint8{1},
+					SideZPubKey:     [32]uint8{2},
+					DelayNs:         400000000,
+					DelayOverrideNs: 0,
+					Status:          serviceability.LinkStatusActivated,
+					SideAIfaceName:  "Ethernet1/1",
+					SideZIfaceName:  "Ethernet1/1",
 				},
 				{
-					AccountType:    serviceability.LinkType,
-					Owner:          [32]uint8{},
-					SideAPubKey:    [32]uint8{1},
-					SideZPubKey:    [32]uint8{2},
-					DelayNs:        1000,
-					Status:         serviceability.LinkStatusActivated,
-					SideAIfaceName: "Ethernet1/2",
-					SideZIfaceName: "Ethernet1/2",
+					AccountType:     serviceability.LinkType,
+					Owner:           [32]uint8{},
+					SideAPubKey:     [32]uint8{1},
+					SideZPubKey:     [32]uint8{2},
+					DelayNs:         1000,
+					DelayOverrideNs: 0,
+					Status:          serviceability.LinkStatusActivated,
+					SideAIfaceName:  "Ethernet1/2",
+					SideZIfaceName:  "Ethernet1/2",
+				},
+				{
+					AccountType:     serviceability.LinkType,
+					Owner:           [32]uint8{},
+					SideAPubKey:     [32]uint8{1},
+					SideZPubKey:     [32]uint8{2},
+					DelayNs:         1000,
+					DelayOverrideNs: 50000,
+					Status:          serviceability.LinkStatusActivated,
+					SideAIfaceName:  "Ethernet1/3",
+					SideZIfaceName:  "Ethernet1/3",
 				},
 			},
 			StateCache: stateCache{
@@ -920,6 +939,13 @@ func TestStateCache(t *testing.T) {
 								IsLink:        true,
 								Metric:        1,
 							},
+							{
+								InterfaceType: InterfaceTypePhysical,
+								Ip:            netip.MustParsePrefix("172.16.0.6/31"),
+								Name:          "Ethernet1/3",
+								IsLink:        true,
+								Metric:        50,
+							},
 							{
 								InterfaceType: InterfaceTypeLoopback,
 								LoopbackType:  LoopbackTypeVpnv4,
@@ -1305,6 +1331,11 @@ func TestEndToEnd(t *testing.T) {
 							VlanId:        100,
 							IpNet:         [5]uint8{172, 16, 0, 2, 31},
 						},
+						{
+							Name:          "Switch1/1/3",
+							InterfaceType: serviceability.InterfaceTypePhysical,
+							IpNet:         [5]uint8{172, 16, 0, 4, 31},
+						},
 					},
 				},
 			},
@@ -1329,6 +1360,17 @@ func TestEndToEnd(t *testing.T) {
 					SideAIfaceName: "Switch1/1/2.100",
 					SideZIfaceName: "Switch1/1/2.100",
 				},
+				{
+					AccountType:     serviceability.LinkType,
+					Owner:           [32]uint8{},
+					SideAPubKey:     [32]uint8{1},
+					SideZPubKey:     [32]uint8{2},
+					DelayNs:         1000,
+					DelayOverrideNs: 50000,
+					Status:          serviceability.LinkStatusActivated,
+					SideAIfaceName:  "Switch1/1/3",
+					SideZIfaceName:  "Switch1/1/3",
+				},
 			},
 			AgentRequest: &pb.ConfigRequest{
 				Pubkey:   "4uQeVj5tqViQh7yWWGStvkEG1Zmhx6uasJtWCJziofM",
diff --git a/e2e/fixtures/ibrl/doublezero_agent_config_peer_removed.tmpl b/e2e/fixtures/ibrl/doublezero_agent_config_peer_removed.tmpl
@@ -69,6 +69,18 @@ interface Ethernet2
    isis hello padding
    isis network point-to-point
 !
+interface Ethernet4
+   mtu 2048
+   no switchport
+   ip address 172.16.0.22/31
+   pim ipv4 sparse-mode
+   isis enable 1
+   isis circuit-type level-2
+   isis hello-interval 1
+   isis metric 30000
+   isis hello padding
+   isis network point-to-point
+!
 interface Loopback255
    ip address 172.16.0.1/32
    node-segment ipv4 index 1
diff --git a/e2e/fixtures/ibrl/doublezero_agent_config_user_added.tmpl b/e2e/fixtures/ibrl/doublezero_agent_config_user_added.tmpl
@@ -69,6 +69,18 @@ interface Ethernet2
    isis hello padding
    isis network point-to-point
 !
+interface Ethernet4
+   mtu 2048
+   no switchport
+   ip address 172.16.0.22/31
+   pim ipv4 sparse-mode
+   isis enable 1
+   isis circuit-type level-2
+   isis hello-interval 1
+   isis metric 30000
+   isis hello padding
+   isis network point-to-point
+!
 interface Loopback255
    ip address 172.16.0.1/32
    node-segment ipv4 index 1
diff --git a/e2e/fixtures/ibrl/doublezero_agent_config_user_removed.tmpl b/e2e/fixtures/ibrl/doublezero_agent_config_user_removed.tmpl
@@ -69,6 +69,18 @@ interface Ethernet2
    isis hello padding
    isis network point-to-point
 !
+interface Ethernet4
+   mtu 2048
+   no switchport
+   ip address 172.16.0.22/31
+   pim ipv4 sparse-mode
+   isis enable 1
+   isis circuit-type level-2
+   isis hello-interval 1
+   isis metric 30000
+   isis hello padding
+   isis network point-to-point
+!
 interface Loopback255
    ip address 172.16.0.1/32
    node-segment ipv4 index 1
diff --git a/e2e/fixtures/ibrl_with_allocated_addr/doublezero_agent_config_user_added.tmpl b/e2e/fixtures/ibrl_with_allocated_addr/doublezero_agent_config_user_added.tmpl
@@ -69,6 +69,18 @@ interface Ethernet2
    isis hello padding
    isis network point-to-point
 !
+interface Ethernet4
+   mtu 2048
+   no switchport
+   ip address 172.16.0.22/31
+   pim ipv4 sparse-mode
+   isis enable 1
+   isis circuit-type level-2
+   isis hello-interval 1
+   isis metric 30000
+   isis hello padding
+   isis network point-to-point
+!
 interface Loopback255
    ip address 172.16.0.1/32
    node-segment ipv4 index 1
diff --git a/e2e/fixtures/ibrl_with_allocated_addr/doublezero_agent_config_user_removed.tmpl b/e2e/fixtures/ibrl_with_allocated_addr/doublezero_agent_config_user_removed.tmpl
@@ -69,6 +69,18 @@ interface Ethernet2
    isis hello padding
    isis network point-to-point
 !
+interface Ethernet4
+   mtu 2048
+   no switchport
+   ip address 172.16.0.22/31
+   pim ipv4 sparse-mode
+   isis enable 1
+   isis circuit-type level-2
+   isis hello-interval 1
+   isis metric 30000
+   isis hello padding
+   isis network point-to-point
+!
 interface Loopback255
    ip address 172.16.0.1/32
    node-segment ipv4 index 1
diff --git a/e2e/fixtures/multicast_publisher/doublezero_agent_config_user_added.tmpl b/e2e/fixtures/multicast_publisher/doublezero_agent_config_user_added.tmpl
@@ -69,6 +69,18 @@ interface Ethernet2
    isis hello padding
    isis network point-to-point
 !
+interface Ethernet4
+   mtu 2048
+   no switchport
+   ip address 172.16.0.22/31
+   pim ipv4 sparse-mode
+   isis enable 1
+   isis circuit-type level-2
+   isis hello-interval 1
+   isis metric 30000
+   isis hello padding
+   isis network point-to-point
+!
 interface Loopback255
    ip address 172.16.0.1/32
    node-segment ipv4 index 1
diff --git a/e2e/fixtures/multicast_publisher/doublezero_agent_config_user_removed.tmpl b/e2e/fixtures/multicast_publisher/doublezero_agent_config_user_removed.tmpl
@@ -69,6 +69,18 @@ interface Ethernet2
    isis hello padding
    isis network point-to-point
 !
+interface Ethernet4
+   mtu 2048
+   no switchport
+   ip address 172.16.0.22/31
+   pim ipv4 sparse-mode
+   isis enable 1
+   isis circuit-type level-2
+   isis hello-interval 1
+   isis metric 30000
+   isis hello padding
+   isis network point-to-point
+!
 interface Loopback255
    ip address 172.16.0.1/32
    node-segment ipv4 index 1
diff --git a/e2e/fixtures/multicast_subscriber/doublezero_agent_config_user_added.tmpl b/e2e/fixtures/multicast_subscriber/doublezero_agent_config_user_added.tmpl
@@ -69,6 +69,18 @@ interface Ethernet2
    isis hello padding
    isis network point-to-point
 !
+interface Ethernet4
+   mtu 2048
+   no switchport
+   ip address 172.16.0.22/31
+   pim ipv4 sparse-mode
+   isis enable 1
+   isis circuit-type level-2
+   isis hello-interval 1
+   isis metric 30000
+   isis hello padding
+   isis network point-to-point
+!
 interface Loopback255
    ip address 172.16.0.1/32
    node-segment ipv4 index 1
diff --git a/e2e/fixtures/multicast_subscriber/doublezero_agent_config_user_removed.tmpl b/e2e/fixtures/multicast_subscriber/doublezero_agent_config_user_removed.tmpl
@@ -69,6 +69,18 @@ interface Ethernet2
    isis hello padding
    isis network point-to-point
 !
+interface Ethernet4
+   mtu 2048
+   no switchport
+   ip address 172.16.0.22/31
+   pim ipv4 sparse-mode
+   isis enable 1
+   isis circuit-type level-2
+   isis hello-interval 1
+   isis metric 30000
+   isis hello padding
+   isis network point-to-point
+!
 interface Loopback255
    ip address 172.16.0.1/32
    node-segment ipv4 index 1
diff --git a/e2e/main_test.go b/e2e/main_test.go
@@ -179,8 +179,10 @@ func (dn *TestDevnet) Start(t *testing.T) (*devnet.Device, *devnet.Client) {
 		# TODO: When the controller supports dzd metadata, this will have to be updated to reflect actual interfaces
 		doublezero device interface create ny5-dz01 "Ethernet2" -w
 		doublezero device interface create ny5-dz01 "Vlan4001" -w
+		doublezero device interface create ny5-dz01 "Ethernet4" -w
 		doublezero device interface create la2-dz01 "Ethernet2" -w
 		doublezero device interface create la2-dz01 "Ethernet3" -w
+		doublezero device interface create la2-dz01 "Ethernet4" -w
 		doublezero device interface create ld4-dz01 "Vlan4001" -w
 		doublezero device interface create ld4-dz01 "Ethernet3" -w
 		doublezero device interface create ld4-dz01 "Ethernet4" -w
@@ -224,6 +226,7 @@ func (dn *TestDevnet) Start(t *testing.T) (*devnet.Device, *devnet.Client) {
 		echo "==> Populate link information onchain"
 		doublezero link create wan --code "la2-dz01:ny5-dz01" --contributor co01 --side-a la2-dz01 --side-a-interface Ethernet2 --side-z ny5-dz01 --side-z-interface Ethernet2 --bandwidth "10 Gbps" --mtu 9000 --delay-ms 40 --jitter-ms 3 -w
 		doublezero link create wan --code "ny5-dz01:ld4-dz01" --contributor co01 --side-a ny5-dz01 --side-a-interface Vlan4001 --side-z ld4-dz01 --side-z-interface Vlan4001 --bandwidth "10 Gbps" --mtu 9000 --delay-ms 30 --jitter-ms 3
+		doublezero link create wan --code "ny5-dz01:la2-dz01" --contributor co01 --side-a ny5-dz01 --side-a-interface Ethernet4 --side-z la2-dz01 --side-z-interface Ethernet4 --bandwidth "10 Gbps" --mtu 9000 --delay-ms 30 --jitter-ms 3
 		doublezero link create wan --code "ld4-dz01:frk-dz01" --contributor co01 --side-a ld4-dz01 --side-a-interface Ethernet3 --side-z frk-dz01 --side-z-interface Ethernet2 --bandwidth "10 Gbps" --mtu 9000 --delay-ms 25 --jitter-ms 10
 		doublezero link create wan --code "ld4-dz01:sg1-dz01" --contributor co01 --side-a ld4-dz01 --side-a-interface Ethernet4 --side-z sg1-dz01 --side-z-interface Ethernet2 --bandwidth "10 Gbps" --mtu 9000 --delay-ms 120 --jitter-ms 9
 		doublezero link create wan --code "sg1-dz01:ty2-dz01" --contributor co01 --side-a sg1-dz01 --side-a-interface Ethernet3 --side-z ty2-dz01 --side-z-interface Ethernet2 --bandwidth "10 Gbps" --mtu 9000 --delay-ms 40 --jitter-ms 7
diff --git a/smartcontract/sdk/go/serviceability/client_test.go b/smartcontract/sdk/go/serviceability/client_test.go
@@ -58,8 +58,8 @@ f8198607689246e25c9403fba46e89122ff5d0fcc1febb51d4b
 0c3c9010000000080969800000000000500ac10000a1f011100
 00007479322d647a30313a6c61322d647a30310001020304050
 60708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f
-0b000000737769746368312f312f31030000006c6f30ad2570a
-0cf27761cab55a3f26d85fb20
+0b000000737769746368312f312f31030000006c6f30ffc99a3
+b00000000ad2570a0cf27761cab55a3f26d85fb20
 `
 
 var userPayload = `
@@ -327,8 +327,8 @@ func TestSDK_Serviceability_GetProgramData(t *testing.T) {
 			},
 		},
 		{
-			Name:        "parse_valid_tunnel",
-			Description: "parse and populate a valid tunnel struct",
+			Name:        "parse_valid_link",
+			Description: "parse and populate a valid link struct",
 			Payload:     strings.TrimSuffix(tunnelPayload, "\n"),
 			Want: &ProgramData{
 				Links: []Link{
@@ -344,6 +344,7 @@ func TestSDK_Serviceability_GetProgramData(t *testing.T) {
 						Mtu:               9000,
 						DelayNs:           30000000,
 						JitterNs:          10000000,
+						DelayOverrideNs:   999999999,
 						TunnelId:          5,
 						TunnelNet:         [5]byte{0xac, 0x10, 0x00, 0x0a, 0x1f},
 						Status:            LinkStatusActivated,
diff --git a/smartcontract/sdk/go/serviceability/deserialize.go b/smartcontract/sdk/go/serviceability/deserialize.go
@@ -127,6 +127,7 @@ func DeserializeLink(reader *ByteReader, link *Link) {
 	link.ContributorPubKey = reader.ReadPubkey()
 	link.SideAIfaceName = reader.ReadString()
 	link.SideZIfaceName = reader.ReadString()
+	link.DelayOverrideNs = reader.ReadU64()
 	link.PubKey = reader.ReadPubkey()
 }
 
diff --git a/smartcontract/sdk/go/serviceability/state.go b/smartcontract/sdk/go/serviceability/state.go
@@ -356,6 +356,7 @@ type Link struct {
 	ContributorPubKey [32]uint8
 	SideAIfaceName    string
 	SideZIfaceName    string
+	DelayOverrideNs   uint64
 	PubKey            [32]byte
 }
 
