Comment out "backdoor" command as a workaround until cli bug 2525 is fixed.

3 files changed, 25 insertions, 29 deletions

diff --git a/templates/protocols/bgp/node.tag/network/node.def b/templates/protocols/bgp/node.tag/network/node.def
index 5299d456..acd2475b 100644
--- a/templates/protocols/bgp/node.tag/network/node.def
+++ b/templates/protocols/bgp/node.tag/network/node.def
@@ -2,19 +2,30 @@ tag:
 type: ipv4net
 help: Specify a network to announce via BGP
 syntax:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --check-prefix-boundry $VAR(@)"
-commit:expression: !($VAR(./backdoor/) != "" && $VAR(./route-map/) != ""); "May specify route-map or backdoor but not both" 
+
+commit:expression: !($VAR(./backdoor/) != "" && $VAR(./route-map/) != ""); \
+       "May specify route-map or backdoor but not both" 
+
 delete:expression: "touch /tmp/`echo $VAR(@) | sed 's!/!!'`.$PPID"
-end:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -noerr -c \"configure terminal\" -c \"router bgp $VAR(../@)\"     \
-      -c \"no network $VAR(@)\";                                                \
-      if [ -f \"/tmp/`echo $VAR(@) | sed 's!/!!'`.$PPID\" ]; then             \
-        rm -rf /tmp/`echo $VAR(@) | sed 's!/!!'`.$PPID;                       \
-      else                                                                   \
-        if [ -n \"$VAR(./backdoor/)\" ]; then                                   \
-          COND=\"backdoor\";                                                 \
-        fi;                                                                  \
-        if [ -n \"$VAR(./route-map/@)\" ]; then                                 \
-          COND=\"route-map $VAR(./route-map/@)\";                               \
-        fi;                                                                  \
-          ${vyatta_sbindir}/vyatta-vtysh.pl -c \"configure terminal\" -c \"router bgp $VAR(../@)\" \
-          -c \"network $VAR(@) $COND\";                                       \
+
+end:expression: "${vyatta_sbindir}/vyatta-vtysh.pl -noerr         \
+       -c \"configure terminal\"                                  \
+       -c \"router bgp $VAR(../@)\"                               \
+       -c \"no network $VAR(@)\";                                 \
+      if [ -f \"/tmp/`echo $VAR(@) | sed 's!/!!'`.$PPID\" ]; then \
+        rm -rf /tmp/`echo $VAR(@) | sed 's!/!!'`.$PPID;           \
+      else                                                        \
+#
+# Commenting out until cli bug 2525 is fixed
+#
+#        if [ -n \"$VAR(./backdoor/)\" ]; then                     
+#          COND=\"backdoor\";                                      
+#        fi;                                                       
+        if [ -n \"$VAR(./route-map/@)\" ]; then                   \
+          COND=\"route-map $VAR(./route-map/@)\";                 \
+        fi;                                                       \
+          ${vyatta_sbindir}/vyatta-vtysh.pl                       \
+           -c \"configure terminal\"                              \
+           -c \"router bgp $VAR(../@)\"                           \
+           -c \"network $VAR(@) $COND\";                          \
       fi; " 
diff --git a/templates/protocols/bgp/node.tag/network/node.tag/backdoor/node.def b/templates/protocols/bgp/node.tag/network/node.tag/.backdoor/node.def
index b7dc6950..b7dc6950 100644
--- a/templates/protocols/bgp/node.tag/network/node.tag/backdoor/node.def
+++ b/templates/protocols/bgp/node.tag/network/node.tag/.backdoor/node.def
diff --git a/templates/protocols/bgp/node.tag/network/node.tag/backdoor/node.def.#ORIG# b/templates/protocols/bgp/node.tag/network/node.tag/backdoor/node.def.#ORIG#
deleted file mode 100644
index 8105d9c7..00000000
--- a/templates/protocols/bgp/node.tag/network/node.tag/backdoor/node.def.#ORIG#
+++ /dev/null
@@ -1,15 +0,0 @@
-type: bool
-# TODO: this needs to be an exists type
-help: "Specify a BGP backdoor route"
-default: false
-# TODO: back referencing doesn't remove the %2F
-update: "sh -c \" \
-	 PREF=`echo $(../@) | sed 's!%2F!/!'`; \
-         /opt/quagga/bin/vtysh -c \\\"configure terminal\\\" -c \\\"router bgp $(../../@)\\\" \
-          -c \\\"network \\\\$PREF backdoor\\\" \
-         \" "
-delete: "sh -c \" \
-         PREF=`echo $(../@) | sed 's!%2F!/!'`; \
-         /opt/quagga/bin/vtysh -c \\\"configure terminal\\\" -c \\\"router bgp $(../../@)\\\" \
-          -c \\\"no network \\\\$PREF backdoor\\\" \
-         \" "