From bf8fe41f2d976e8cd10f258110fe7ec98e39fee4 Mon Sep 17 00:00:00 2001
From: Stig Thormodsrud <stig@vyatta.com>
Date: Wed, 28 Nov 2007 17:16:33 -0800
Subject: Change metric to distance in static routes.

---
 .../static/interface-route/node.tag/blackhole/distance/node.def     | 4 ++++
 .../static/interface-route/node.tag/blackhole/metric/node.def       | 4 ----
 .../protocols/static/interface-route/node.tag/blackhole/node.def    | 6 +++---
 .../static/interface-route/node.tag/next-hop-interface/node.def     | 6 +++---
 .../node.tag/next-hop-interface/node.tag/distance/node.def          | 4 ++++
 .../node.tag/next-hop-interface/node.tag/metric/node.def            | 4 ----
 .../protocols/static/route/node.tag/blackhole/distance/node.def     | 4 ++++
 templates/protocols/static/route/node.tag/blackhole/metric/node.def | 4 ----
 templates/protocols/static/route/node.tag/blackhole/node.def        | 6 +++---
 templates/protocols/static/route/node.tag/next-hop/node.def         | 6 +++---
 .../static/route/node.tag/next-hop/node.tag/distance/node.def       | 4 ++++
 .../static/route/node.tag/next-hop/node.tag/metric/node.def         | 4 ----
 12 files changed, 28 insertions(+), 28 deletions(-)
 create mode 100644 templates/protocols/static/interface-route/node.tag/blackhole/distance/node.def
 delete mode 100644 templates/protocols/static/interface-route/node.tag/blackhole/metric/node.def
 create mode 100644 templates/protocols/static/interface-route/node.tag/next-hop-interface/node.tag/distance/node.def
 delete mode 100644 templates/protocols/static/interface-route/node.tag/next-hop-interface/node.tag/metric/node.def
 create mode 100644 templates/protocols/static/route/node.tag/blackhole/distance/node.def
 delete mode 100644 templates/protocols/static/route/node.tag/blackhole/metric/node.def
 create mode 100644 templates/protocols/static/route/node.tag/next-hop/node.tag/distance/node.def
 delete mode 100644 templates/protocols/static/route/node.tag/next-hop/node.tag/metric/node.def

(limited to 'templates/protocols/static')

diff --git a/templates/protocols/static/interface-route/node.tag/blackhole/distance/node.def b/templates/protocols/static/interface-route/node.tag/blackhole/distance/node.def
new file mode 100644
index 00000000..938aea1a
--- /dev/null
+++ b/templates/protocols/static/interface-route/node.tag/blackhole/distance/node.def
@@ -0,0 +1,4 @@
+type: u32
+help: "Distance value for this route"
+syntax: $(@) >= 1 && $(@) <= 255; "Must be between (1-255)"
+#comp_help: <1-255>  Distance for this route
diff --git a/templates/protocols/static/interface-route/node.tag/blackhole/metric/node.def b/templates/protocols/static/interface-route/node.tag/blackhole/metric/node.def
deleted file mode 100644
index 938aea1a..00000000
--- a/templates/protocols/static/interface-route/node.tag/blackhole/metric/node.def
+++ /dev/null
@@ -1,4 +0,0 @@
-type: u32
-help: "Distance value for this route"
-syntax: $(@) >= 1 && $(@) <= 255; "Must be between (1-255)"
-#comp_help: <1-255>  Distance for this route
diff --git a/templates/protocols/static/interface-route/node.tag/blackhole/node.def b/templates/protocols/static/interface-route/node.tag/blackhole/node.def
index aa54eceb..c1a8cc2c 100644
--- a/templates/protocols/static/interface-route/node.tag/blackhole/node.def
+++ b/templates/protocols/static/interface-route/node.tag/blackhole/node.def
@@ -4,8 +4,8 @@ end: "if [ -f \"/tmp/static.\\$PPID\" ]; then \
          /usr/bin/vtysh -c \"configure terminal\" -c \"no ip route $(../@) null0\" ; \
          rm /tmp/static.\\$PPID; \
       else \
-         if [ -n \"$(./metric/@)\" ]; then \
-	    MET=\"$(./metric/@)\"; \
+         if [ -n \"$(./distance/@)\" ]; then \
+	    DIST=\"$(./distance/@)\"; \
          fi; \	       
-         /usr/bin/vtysh -c \"configure terminal\" -c \"ip route $(../@) null0 \\$MET \" ; \
+         /usr/bin/vtysh -c \"configure terminal\" -c \"ip route $(../@) null0 \\$DIST \" ; \
       fi; "
diff --git a/templates/protocols/static/interface-route/node.tag/next-hop-interface/node.def b/templates/protocols/static/interface-route/node.tag/next-hop-interface/node.def
index 5553f119..3c80ccec 100644
--- a/templates/protocols/static/interface-route/node.tag/next-hop-interface/node.def
+++ b/templates/protocols/static/interface-route/node.tag/next-hop-interface/node.def
@@ -11,9 +11,9 @@ end: "if [ -f \"/tmp/static.\\$PPID\" ]; then \
          /usr/bin/vtysh -c \"configure terminal\" -c \"no ip route $(../@) $(@)\" ; \
          rm /tmp/static.\\$PPID; \
       else \
-         if [ -n \"$(./metric/@)\" ]; then \
-	    MET=\"$(./metric/@)\"; \
+         if [ -n \"$(./distance/@)\" ]; then \
+	    DIST=\"$(./distance/@)\"; \
          fi; \	       
-         /usr/bin/vtysh -c \"configure terminal\" -c \"ip route $(../@) $(@) \\$MET \" ; \
+         /usr/bin/vtysh -c \"configure terminal\" -c \"ip route $(../@) $(@) \\$DIST \" ; \
       fi; "
 
diff --git a/templates/protocols/static/interface-route/node.tag/next-hop-interface/node.tag/distance/node.def b/templates/protocols/static/interface-route/node.tag/next-hop-interface/node.tag/distance/node.def
new file mode 100644
index 00000000..938aea1a
--- /dev/null
+++ b/templates/protocols/static/interface-route/node.tag/next-hop-interface/node.tag/distance/node.def
@@ -0,0 +1,4 @@
+type: u32
+help: "Distance value for this route"
+syntax: $(@) >= 1 && $(@) <= 255; "Must be between (1-255)"
+#comp_help: <1-255>  Distance for this route
diff --git a/templates/protocols/static/interface-route/node.tag/next-hop-interface/node.tag/metric/node.def b/templates/protocols/static/interface-route/node.tag/next-hop-interface/node.tag/metric/node.def
deleted file mode 100644
index 938aea1a..00000000
--- a/templates/protocols/static/interface-route/node.tag/next-hop-interface/node.tag/metric/node.def
+++ /dev/null
@@ -1,4 +0,0 @@
-type: u32
-help: "Distance value for this route"
-syntax: $(@) >= 1 && $(@) <= 255; "Must be between (1-255)"
-#comp_help: <1-255>  Distance for this route
diff --git a/templates/protocols/static/route/node.tag/blackhole/distance/node.def b/templates/protocols/static/route/node.tag/blackhole/distance/node.def
new file mode 100644
index 00000000..938aea1a
--- /dev/null
+++ b/templates/protocols/static/route/node.tag/blackhole/distance/node.def
@@ -0,0 +1,4 @@
+type: u32
+help: "Distance value for this route"
+syntax: $(@) >= 1 && $(@) <= 255; "Must be between (1-255)"
+#comp_help: <1-255>  Distance for this route
diff --git a/templates/protocols/static/route/node.tag/blackhole/metric/node.def b/templates/protocols/static/route/node.tag/blackhole/metric/node.def
deleted file mode 100644
index 938aea1a..00000000
--- a/templates/protocols/static/route/node.tag/blackhole/metric/node.def
+++ /dev/null
@@ -1,4 +0,0 @@
-type: u32
-help: "Distance value for this route"
-syntax: $(@) >= 1 && $(@) <= 255; "Must be between (1-255)"
-#comp_help: <1-255>  Distance for this route
diff --git a/templates/protocols/static/route/node.tag/blackhole/node.def b/templates/protocols/static/route/node.tag/blackhole/node.def
index aa54eceb..c1a8cc2c 100644
--- a/templates/protocols/static/route/node.tag/blackhole/node.def
+++ b/templates/protocols/static/route/node.tag/blackhole/node.def
@@ -4,8 +4,8 @@ end: "if [ -f \"/tmp/static.\\$PPID\" ]; then \
          /usr/bin/vtysh -c \"configure terminal\" -c \"no ip route $(../@) null0\" ; \
          rm /tmp/static.\\$PPID; \
       else \
-         if [ -n \"$(./metric/@)\" ]; then \
-	    MET=\"$(./metric/@)\"; \
+         if [ -n \"$(./distance/@)\" ]; then \
+	    DIST=\"$(./distance/@)\"; \
          fi; \	       
-         /usr/bin/vtysh -c \"configure terminal\" -c \"ip route $(../@) null0 \\$MET \" ; \
+         /usr/bin/vtysh -c \"configure terminal\" -c \"ip route $(../@) null0 \\$DIST \" ; \
       fi; "
diff --git a/templates/protocols/static/route/node.tag/next-hop/node.def b/templates/protocols/static/route/node.tag/next-hop/node.def
index 46625591..6d9288cf 100644
--- a/templates/protocols/static/route/node.tag/next-hop/node.def
+++ b/templates/protocols/static/route/node.tag/next-hop/node.def
@@ -6,8 +6,8 @@ end: "if [ -f \"/tmp/static.\\$PPID\" ]; then \
          /usr/bin/vtysh -c \"configure terminal\" -c \"no ip route $(../@) $(@)\" ; \
          rm /tmp/static.\\$PPID; \
       else \
-         if [ -n \"$(./metric/@)\" ]; then \
-	    MET=\"$(./metric/@)\"; \
+         if [ -n \"$(./distance/@)\" ]; then \
+	    DIST=\"$(./distance/@)\"; \
          fi; \	       
-         /usr/bin/vtysh -c \"configure terminal\" -c \"ip route $(../@) $(@) \\$MET \" ; \
+         /usr/bin/vtysh -c \"configure terminal\" -c \"ip route $(../@) $(@) \\$DIST \" ; \
       fi; "
diff --git a/templates/protocols/static/route/node.tag/next-hop/node.tag/distance/node.def b/templates/protocols/static/route/node.tag/next-hop/node.tag/distance/node.def
new file mode 100644
index 00000000..938aea1a
--- /dev/null
+++ b/templates/protocols/static/route/node.tag/next-hop/node.tag/distance/node.def
@@ -0,0 +1,4 @@
+type: u32
+help: "Distance value for this route"
+syntax: $(@) >= 1 && $(@) <= 255; "Must be between (1-255)"
+#comp_help: <1-255>  Distance for this route
diff --git a/templates/protocols/static/route/node.tag/next-hop/node.tag/metric/node.def b/templates/protocols/static/route/node.tag/next-hop/node.tag/metric/node.def
deleted file mode 100644
index 938aea1a..00000000
--- a/templates/protocols/static/route/node.tag/next-hop/node.tag/metric/node.def
+++ /dev/null
@@ -1,4 +0,0 @@
-type: u32
-help: "Distance value for this route"
-syntax: $(@) >= 1 && $(@) <= 255; "Must be between (1-255)"
-#comp_help: <1-255>  Distance for this route
-- 
cgit v1.2.3