From b17b6d8931b142dcd3e2ddc4e213929bfafe9948 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Fri, 29 Jan 2021 15:01:48 +0100 Subject: ospf: T3267: move "interface ip ospf" configuration to "protocols ospf interface" For easier maintenance and operability move the interface specific protocol setting of OSPF to the OSPF protocol section. This is now also in-line with IS-IS. This means to migrate: ethernet eth0 { vif 202 { ip { ospf { authentication { md5 { key-id 10 { md5-key vyosvyos } } } dead-interval 40 hello-interval 10 priority 1 retransmit-interval 5 transmit-delay 1 } } } } to protocols { ospf { interface eth0.201 { authentication { md5 { key-id 10 { md5-key vyosvyos } } } dead-interval 40 hello-interval 10 priority 1 retransmit-interval 5 transmit-delay 1 } } --- .../include/ospf-authentication.xml.i | 45 +++++ interface-definitions/include/ospf-intervals.xml.i | 54 ++++++ interface-definitions/protocols-ospf.xml.in | 186 ++++++++++----------- 3 files changed, 190 insertions(+), 95 deletions(-) create mode 100644 interface-definitions/include/ospf-authentication.xml.i create mode 100644 interface-definitions/include/ospf-intervals.xml.i (limited to 'interface-definitions') diff --git a/interface-definitions/include/ospf-authentication.xml.i b/interface-definitions/include/ospf-authentication.xml.i new file mode 100644 index 000000000..0963e5cc0 --- /dev/null +++ b/interface-definitions/include/ospf-authentication.xml.i @@ -0,0 +1,45 @@ + + + + Authentication + + + + + MD5 key id + + + + + MD5 key id + + u32:1-255 + MD5 key id + + + + + + MD5 authentication type + + txt + MD5 Key (16 characters or less) + + + + + + + + + + Plain text password + + txt + Plain text password (8 characters or less) + + + + + + diff --git a/interface-definitions/include/ospf-intervals.xml.i b/interface-definitions/include/ospf-intervals.xml.i new file mode 100644 index 000000000..e532bd14b --- /dev/null +++ b/interface-definitions/include/ospf-intervals.xml.i @@ -0,0 +1,54 @@ + + + + Interval after which a neighbor is declared dead (default: 40) + + u32:1-65535 + Neighbor dead interval (seconds) + + + + + + 40 + + + + Interval between hello packets (default: 10) + + u32:1-65535 + Hello interval (seconds) + + + + + + 10 + + + + Interval between retransmitting lost link state advertisements (default: 5) + + u32:1-65535 + Retransmit interval (seconds) + + + + + + 5 + + + + Link state transmit delay (default: 1) + + u32:1-65535 + Link state transmit delay (seconds) + + + + + + 1 + + diff --git a/interface-definitions/protocols-ospf.xml.in b/interface-definitions/protocols-ospf.xml.in index 074d0db63..1051e3741 100644 --- a/interface-definitions/protocols-ospf.xml.in +++ b/interface-definitions/protocols-ospf.xml.in @@ -275,101 +275,8 @@ - - - Authentication - - - - - MD5 key id - - - - - MD5 key id - - u32:1-255 - MD5 key id - - - - - - MD5 authentication type - - txt - MD5 Key (16 characters or less) - - - - - - - - - - Plain text password - - txt - Plain text password (8 characters or less) - - - - - - - - Interval after which a neighbor is declared dead (default: 40) - - u32:1-65535 - Neighbor dead interval (seconds) - - - - - - 40 - - - - Interval between hello packets (default: 10) - - u32:1-65535 - Hello interval (seconds) - - - - - - 10 - - - - Interval between retransmitting lost link state advertisements (default: 5) - - u32:1-65535 - Retransmit interval (seconds) - - - - - - 5 - - - - Link state transmit delay (default: 1) - - u32:1-65535 - Link state transmit delay (seconds) - - - - - - 1 - + #include + #include @@ -491,6 +398,95 @@ + + + Interface related configuration + + + + + + #include + #include + + + Bandwidth of interface (Megabit/sec) + + u32:1-100000 + Bandwidth in Megabit/sec (for calculating OSPF cost) + + + + + + + + + Enable Bidirectional Forwarding Detection (BFD) support + + + + + + Interface cost + + u32:1-65535 + OSPF interface cost + + + + + + + + + Disable Maximum Transmission Unit (MTU) mismatch detection + + + + + + Network type + + broadcast non-broadcast point-to-multipoint point-to-point + + + broadcast + Broadcast network type + + + non-broadcast + Non-broadcast network type + + + point-to-multipoint + Point-to-multipoint network type + + + point-to-point + Point-to-point network type + + + ^(broadcast|non-broadcast|point-to-multipoint|point-to-point)$ + + Must be broadcast, non-broadcast, point-to-multipoint or point-to-point + + + + + Router priority (default: 1) + + u32:0-255 + OSPF router priority cost + + + + + + 1 + + + Log changes in adjacency state -- cgit v1.2.3