From 05899867642be60a4524d24066f7441b526685e2 Mon Sep 17 00:00:00 2001 From: Daniil Baturin Date: Sun, 1 Sep 2019 22:53:40 +0200 Subject: T1209: cap OSPF max-metric at 100 to match the FRR validation rules. --- .../ospf/max-metric/router-lsa/on-shutdown/node.def | 12 +++++++++--- .../ospf/max-metric/router-lsa/on-startup/node.def | 13 ++++++++++--- 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/templates/protocols/ospf/max-metric/router-lsa/on-shutdown/node.def b/templates/protocols/ospf/max-metric/router-lsa/on-shutdown/node.def index b0f807de..9911dd16 100644 --- a/templates/protocols/ospf/max-metric/router-lsa/on-shutdown/node.def +++ b/templates/protocols/ospf/max-metric/router-lsa/on-shutdown/node.def @@ -3,9 +3,15 @@ help: Advertise stub-router prior to full shutdown of OSPF syntax:expression: $VAR(@) >= 5 && $VAR(@) <= 86400; "must be between 5-86400 seconds" val_help: u32:5-86400; Time (seconds) to advertise self as stub-router -update:expression: "vtysh -c \"configure terminal\" \ - -c \"router ospf\" \ - -c \"max-metric router-lsa on-shutdown $VAR(@)\"; " +update: + METRIC=$VAR(@) + if [ $METRIC -gt 100 ]; then + echo "Warning: $METRIC is not a supported value for OSPF max-metric, reducing to 100"; + METRIC=100; + fi + vtysh -c "configure terminal" \ + -c "router ospf" \ + -c "max-metric router-lsa on-shutdown $METRIC" delete:expression: "vtysh -c \"configure terminal\" \ -c \"router ospf\" \ diff --git a/templates/protocols/ospf/max-metric/router-lsa/on-startup/node.def b/templates/protocols/ospf/max-metric/router-lsa/on-startup/node.def index d54d3012..2992ed48 100644 --- a/templates/protocols/ospf/max-metric/router-lsa/on-startup/node.def +++ b/templates/protocols/ospf/max-metric/router-lsa/on-startup/node.def @@ -3,10 +3,17 @@ help: Automatically advertise stub Router-LSA on startup of OSPF syntax:expression: $VAR(@) >= 5 && $VAR(@) <= 86400; "must be between 5-86400 seconds" val_help: u32:5-86400; Time (seconds) to advertise self as stub-router -update:expression: "vtysh -c \"configure terminal\" \ - -c \"router ospf\" \ - -c \"max-metric router-lsa on-startup $VAR(@)\"; " +update: + METRIC=$VAR(@) + if [ $METRIC -gt 100 ]; then + echo "Warning: $METRIC is not a supported value for OSPF max-metric, reducing to 100"; + METRIC=100; + fi + vtysh -c "configure terminal" \ + -c "router ospf" \ + -c "max-metric router-lsa on-startup $METRIC" delete:expression: "vtysh -c \"configure terminal\" \ -c \"router ospf\" \ -c \"no max-metric router-lsa on-startup \"; " + -- cgit v1.2.3