ospf: T3267: move "interface ip ospf" settings to "protocols ospf interface"

19 files changed, 0 insertions, 134 deletions

diff --git a/Makefile.am b/Makefile.am
index dce3ca34..de7bbb57 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,8 +20,6 @@ share_perl5_DATA = lib/Vyatta/Quagga/Config.pm
 
 src_check_prefix_boundary = src/check_prefix_boundary.c
 
-curver_DATA = cfg-version/quagga@6
-
 cpiop = find  . ! -regex '\(.*~\|.*\.bak\|.*\.swp\|.*\#.*\#\)' -print0 | \
 	cpio -0pd
 
diff --git a/cfg-version/quagga@6 b/cfg-version/quagga@6
deleted file mode 100644
index e69de29b..00000000
--- a/cfg-version/quagga@6
+++ /dev/null
diff --git a/debian/vyatta-cfg-quagga.install b/debian/vyatta-cfg-quagga.install
index 24f1d536..a68a7227 100644
--- a/debian/vyatta-cfg-quagga.install
+++ b/debian/vyatta-cfg-quagga.install
@@ -1,6 +1,5 @@
 opt/vyatta/sbin
 opt/vyatta/bin
-opt/vyatta/etc
 opt/vyatta/share/perl5
 opt/vyatta/share/vyatta-cfg/templates/policy
 opt/vyatta/share/vyatta-cfg/templates/protocols
diff --git a/interface-templates/ip/ospf/authentication/md5/key-id/node.def b/interface-templates/ip/ospf/authentication/md5/key-id/node.def
deleted file mode 100644
index bc47e563..00000000
--- a/interface-templates/ip/ospf/authentication/md5/key-id/node.def
+++ /dev/null
@@ -1,10 +0,0 @@
-tag:
-type: u32
-help: MD5 key id
-
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; "ID must be between (1-255)"
-val_help: u32:1-255; MD5 key id
-
-commit:expression: $VAR(md5-key/) != ""; \
-       "Must add the md5-key for key-id $VAR(@)"
-
diff --git a/interface-templates/ip/ospf/authentication/md5/key-id/node.tag/md5-key/node.def b/interface-templates/ip/ospf/authentication/md5/key-id/node.tag/md5-key/node.def
deleted file mode 100644
index 4c58f20d..00000000
--- a/interface-templates/ip/ospf/authentication/md5/key-id/node.tag/md5-key/node.def
+++ /dev/null
@@ -1,20 +0,0 @@
-type: txt
-help: MD5 key
-syntax:expression: pattern $VAR(@) "^[^[:space:]]{1,16}$"; "MD5 key must be 16 characters or less"
-val_help: MD5 Key (16 characters or less)
-
-# If this node is created 
-create:
-	vtysh -c "configure terminal" -c "interface $IFNAME" \
-             -c "ip ospf message-digest-key $VAR(../@) md5 $VAR(@)"
-
-# If the value of this node is changed
-update:
-	vtysh -c "configure terminal" -c "interface $IFNAME" \
-             -c "no ip ospf message-digest-key $VAR(../@)" \
-             -c "ip ospf message-digest-key $VAR(../@) md5 $VAR(@)"
-
-# If this node is deleted
-delete:
-        vtysh -c "configure terminal" -c "interface $IFNAME" \
-             -c "no ip ospf message-digest-key $VAR(../@)"
diff --git a/interface-templates/ip/ospf/authentication/md5/node.def b/interface-templates/ip/ospf/authentication/md5/node.def
deleted file mode 100644
index 184fa321..00000000
--- a/interface-templates/ip/ospf/authentication/md5/node.def
+++ /dev/null
@@ -1,10 +0,0 @@
-help: MD5 parameters
-
-create: vtysh -c "configure terminal" \
-	-c "interface $IFNAME" \
-	-c "no ip ospf authentication" \
-	-c "ip ospf authentication message-digest"
-
-delete: vtysh -c "configure terminal" \
-	-c "interface $IFNAME" \
-        -c "no ip ospf authentication"
diff --git a/interface-templates/ip/ospf/authentication/node.def b/interface-templates/ip/ospf/authentication/node.def
deleted file mode 100644
index abf04eab..00000000
--- a/interface-templates/ip/ospf/authentication/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: OSPF interface authentication
-
diff --git a/interface-templates/ip/ospf/authentication/plaintext-password/node.def b/interface-templates/ip/ospf/authentication/plaintext-password/node.def
deleted file mode 100644
index d6b10e35..00000000
--- a/interface-templates/ip/ospf/authentication/plaintext-password/node.def
+++ /dev/null
@@ -1,10 +0,0 @@
-type: txt
-help: Plain text password
-syntax:expression: pattern $VAR(@) "^[^[:space:]]{1,8}$" ; "Password must be 8 characters or less"
-val_help: Plain text password (8 characters or less)
-
-update:vtysh -c "configure terminal" -c "interface $IFNAME" \
-	 -c "no ip ospf authentication " -c "ip ospf authentication " \
-	 -c "ip ospf authentication-key $VAR(@)"
-delete:vtysh -c "configure terminal" -c "interface $IFNAME" \
-	 -c "no ip ospf authentication " -c "no ip ospf authentication-key"
diff --git a/interface-templates/ip/ospf/bandwidth/node.def b/interface-templates/ip/ospf/bandwidth/node.def
deleted file mode 100644
index 1919251b..00000000
--- a/interface-templates/ip/ospf/bandwidth/node.def
+++ /dev/null
@@ -1,7 +0,0 @@
-type: u32
-help: Bandwidth of interface (megabits/sec)
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 100000; "Must be between 1-100000"
-val_help: u32:1-100000; Bandwidth in megabits/sec (for calculating OSPF cost)
-
-update: vtysh -c "configure terminal" -c "interface $IFNAME" -c "bandwidth $VAR(@)" 
-delete: vtysh -c "configure terminal" -c "interface $IFNAME" -c "no bandwidth" 
diff --git a/interface-templates/ip/ospf/bfd/node.def b/interface-templates/ip/ospf/bfd/node.def
deleted file mode 100644
index 619b7415..00000000
--- a/interface-templates/ip/ospf/bfd/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: Enable Bidirectional Forwarding Detection (BFD) support
-create:vtysh -c "configure terminal" -c "interface $IFNAME" -c "ip ospf bfd"
-delete:vtysh -c "configure terminal" -c "interface $IFNAME" -c "no ip ospf bfd"
diff --git a/interface-templates/ip/ospf/cost/node.def b/interface-templates/ip/ospf/cost/node.def
deleted file mode 100644
index fd6d125a..00000000
--- a/interface-templates/ip/ospf/cost/node.def
+++ /dev/null
@@ -1,11 +0,0 @@
-type: u32
-help: Interface cost
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
-val_help: u32:1-65535; OSPF interface cost
-
-update:vtysh -c "configure terminal" \
-	-c "interface $IFNAME" \
-	-c "ip ospf cost $VAR(@)"
-delete:vtysh -c "configure terminal" \
-	-c "interface $IFNAME" \
-	-c "no ip ospf cost"
diff --git a/interface-templates/ip/ospf/dead-interval/node.def b/interface-templates/ip/ospf/dead-interval/node.def
deleted file mode 100644
index 7cb7da8a..00000000
--- a/interface-templates/ip/ospf/dead-interval/node.def
+++ /dev/null
@@ -1,8 +0,0 @@
-type: u32
-help: Interval after which neighbor is dead
-default: 40
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
-val_help: u32:1-65535; OSPF dead interval in seconds (default 40)
-
-update:vtysh -c "configure terminal" -c "interface $IFNAME" -c "ip ospf dead-interval $VAR(@)"
-delete:vtysh -c "configure terminal" -c "interface $IFNAME" -c "no ip ospf dead-interval"
diff --git a/interface-templates/ip/ospf/hello-interval/node.def b/interface-templates/ip/ospf/hello-interval/node.def
deleted file mode 100644
index 35cb00e2..00000000
--- a/interface-templates/ip/ospf/hello-interval/node.def
+++ /dev/null
@@ -1,8 +0,0 @@
-type: u32
-help: Interval between hello packets
-default: 10
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
-val_help: u32:1-65535; Interval between OSPF hello packets in seconds (default 10)
-
-update:vtysh -c "configure terminal" -c "interface $IFNAME" -c "ip ospf hello-interval $VAR(@)"
-delete:vtysh -c "configure terminal" -c "interface $IFNAME" -c "no ip ospf hello-interval"
diff --git a/interface-templates/ip/ospf/mtu-ignore/node.def b/interface-templates/ip/ospf/mtu-ignore/node.def
deleted file mode 100644
index b5250b0a..00000000
--- a/interface-templates/ip/ospf/mtu-ignore/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: Disable Maximum Transmission Unit (MTU) mismatch detection
-create:vtysh -c "configure terminal" -c "interface $IFNAME" -c "ip ospf mtu-ignore"
-delete:vtysh -c "configure terminal" -c "interface $IFNAME" -c "no ip ospf mtu-ignore"
diff --git a/interface-templates/ip/ospf/network/node.def b/interface-templates/ip/ospf/network/node.def
deleted file mode 100644
index 8922eae1..00000000
--- a/interface-templates/ip/ospf/network/node.def
+++ /dev/null
@@ -1,11 +0,0 @@
-type: txt
-help: Network type
-syntax:expression: $VAR(@) in "broadcast", "non-broadcast", "point-to-multipoint", "point-to-point"; \
-       "Must be (broadcast|non-broadcast|point-to-multipoint|point-to-point)"
-update:vtysh -c "configure terminal" -c "interface $IFNAME" -c "ip ospf network $VAR(@)"
-delete:vtysh -c "configure terminal" -c "interface $IFNAME" -c "no ip ospf network"
-
-val_help: broadcast; Broadcast network type
-val_help: non-broadcast; Non-broadcast network type
-val_help: point-to-multipoint; Point-to-multipoint network type
-val_help: point-to-point; Point-to-point network type
diff --git a/interface-templates/ip/ospf/node.def b/interface-templates/ip/ospf/node.def
deleted file mode 100644
index 7011d036..00000000
--- a/interface-templates/ip/ospf/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-priority: 610
-help: Open Shortest Path First (OSPF) parameters
diff --git a/interface-templates/ip/ospf/priority/node.def b/interface-templates/ip/ospf/priority/node.def
deleted file mode 100644
index f7f83d94..00000000
--- a/interface-templates/ip/ospf/priority/node.def
+++ /dev/null
@@ -1,8 +0,0 @@
-type: u32
-help: Router priority
-default: 1
-syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 255; "Must be between 0-255"
-val_help: u32:0-255; Priority (default 1)
-
-update:vtysh -c "configure terminal" -c "interface $IFNAME" -c "ip ospf priority $VAR(@)"
-delete:vtysh -c "configure terminal" -c "interface $IFNAME" -c "no ip ospf priority"
diff --git a/interface-templates/ip/ospf/retransmit-interval/node.def b/interface-templates/ip/ospf/retransmit-interval/node.def
deleted file mode 100644
index 58b94791..00000000
--- a/interface-templates/ip/ospf/retransmit-interval/node.def
+++ /dev/null
@@ -1,10 +0,0 @@
-type: u32
-help: Interval between retransmitting lost link state advertisements
-default: 5
-syntax:expression: $VAR(@) >= 3 && $VAR(@) <= 65535; "Must be between 3-65535"
-val_help: u32:3-65535; Retransmit interval in seconds (default 5)
-
-update: vtysh -c "configure terminal" -c "interface $IFNAME" \
-	-c "ip ospf retransmit-interval $VAR(@)"
-delete: vtysh -c "configure terminal" -c "interface $IFNAME" \
-	-c "no ip ospf retransmit-interval"
diff --git a/interface-templates/ip/ospf/transmit-delay/node.def b/interface-templates/ip/ospf/transmit-delay/node.def
deleted file mode 100644
index ea9b24a4..00000000
--- a/interface-templates/ip/ospf/transmit-delay/node.def
+++ /dev/null
@@ -1,8 +0,0 @@
-type: u32
-help: Link state transmit delay
-default: 1
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
-val_help: u32:1-65535; Transmit delay in seconds (default 1)
-
-update:vtysh -c "configure terminal" -c "interface $IFNAME" -c "ip ospf transmit-delay $VAR(@)"
-delete:vtysh -c "configure terminal" -c "interface $IFNAME" -c "no ip ospf transmit-delay"