From 479fb897f82e574cbaac5cb6d77a7cea44537dda Mon Sep 17 00:00:00 2001
From: Robert Bays <robert@vyatta.com>
Date: Fri, 6 Aug 2010 16:43:16 -0700
Subject: larkspur specific fix for 5971 (cherry picked from commit
 5023738b93a104ef33c502c78e2c21b4e61a0e90)

---
 .../bgp/node.tag/peer-group/node.tag/.timers/holdtime/node.def     | 7 +++++++
 .../bgp/node.tag/peer-group/node.tag/.timers/keepalive/node.def    | 5 +++++
 .../protocols/bgp/node.tag/peer-group/node.tag/.timers/node.def    | 5 +++++
 .../bgp/node.tag/peer-group/node.tag/timers/holdtime/node.def      | 7 -------
 .../bgp/node.tag/peer-group/node.tag/timers/keepalive/node.def     | 5 -----
 .../protocols/bgp/node.tag/peer-group/node.tag/timers/node.def     | 5 -----
 6 files changed, 17 insertions(+), 17 deletions(-)
 create mode 100644 templates/protocols/bgp/node.tag/peer-group/node.tag/.timers/holdtime/node.def
 create mode 100644 templates/protocols/bgp/node.tag/peer-group/node.tag/.timers/keepalive/node.def
 create mode 100644 templates/protocols/bgp/node.tag/peer-group/node.tag/.timers/node.def
 delete mode 100644 templates/protocols/bgp/node.tag/peer-group/node.tag/timers/holdtime/node.def
 delete mode 100644 templates/protocols/bgp/node.tag/peer-group/node.tag/timers/keepalive/node.def
 delete mode 100644 templates/protocols/bgp/node.tag/peer-group/node.tag/timers/node.def

(limited to 'templates')

diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/.timers/holdtime/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/.timers/holdtime/node.def
new file mode 100644
index 00000000..d97fd47a
--- /dev/null
+++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/.timers/holdtime/node.def
@@ -0,0 +1,7 @@
+type: u32
+default: 180
+help: BGP hold timer for this peer-group
+val_help: u32:1-65535; Hold timer in seconds
+val_help: 0; Disable hold timer
+
+syntax:expression: $VAR(@) == 0 || ($VAR(@) >= 4 && $VAR(@) <= 65535); "Holdtime interval must be 0 or between 4 and 65535"
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/.timers/keepalive/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/.timers/keepalive/node.def
new file mode 100644
index 00000000..5562c9f8
--- /dev/null
+++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/.timers/keepalive/node.def
@@ -0,0 +1,5 @@
+type: u32
+default: 60
+help: BGP keepalive interval for this peer-group
+val_help: u32:1-65535; Keepalive interval in seconds
+syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Keepalive interval must be between 1 and 65535"
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/.timers/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/.timers/node.def
new file mode 100644
index 00000000..362c7f15
--- /dev/null
+++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/.timers/node.def
@@ -0,0 +1,5 @@
+help: Peer-group timers
+# TODO: fix this.  Can set connect &&|| (keepalive && holdtime)
+commit:expression: $VAR(./keepalive/) != ""; "you must set a keepalive interval"
+commit:expression: $VAR(./holdtime/) != ""; "you must set a holdtime interval"
+
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/timers/holdtime/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/timers/holdtime/node.def
deleted file mode 100644
index d97fd47a..00000000
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/timers/holdtime/node.def
+++ /dev/null
@@ -1,7 +0,0 @@
-type: u32
-default: 180
-help: BGP hold timer for this peer-group
-val_help: u32:1-65535; Hold timer in seconds
-val_help: 0; Disable hold timer
-
-syntax:expression: $VAR(@) == 0 || ($VAR(@) >= 4 && $VAR(@) <= 65535); "Holdtime interval must be 0 or between 4 and 65535"
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/timers/keepalive/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/timers/keepalive/node.def
deleted file mode 100644
index 5562c9f8..00000000
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/timers/keepalive/node.def
+++ /dev/null
@@ -1,5 +0,0 @@
-type: u32
-default: 60
-help: BGP keepalive interval for this peer-group
-val_help: u32:1-65535; Keepalive interval in seconds
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Keepalive interval must be between 1 and 65535"
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/timers/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/timers/node.def
deleted file mode 100644
index 362c7f15..00000000
--- a/templates/protocols/bgp/node.tag/peer-group/node.tag/timers/node.def
+++ /dev/null
@@ -1,5 +0,0 @@
-help: Peer-group timers
-# TODO: fix this.  Can set connect &&|| (keepalive && holdtime)
-commit:expression: $VAR(./keepalive/) != ""; "you must set a keepalive interval"
-commit:expression: $VAR(./holdtime/) != ""; "you must set a holdtime interval"
-
-- 
cgit v1.2.3