From ae036689c7b6cc5580c3cd05161f9ecd016f0006 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Mon, 30 Mar 2020 14:52:08 +0200 Subject: vrf: T31: align code in vrf node.def files --- .../static/interface-route6/node.tag/next-hop-interface/node.def | 6 +++--- .../vrf/node.tag/static/route6/node.tag/next-hop/node.def | 8 +++----- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/templates/protocols/vrf/node.tag/static/interface-route6/node.tag/next-hop-interface/node.def b/templates/protocols/vrf/node.tag/static/interface-route6/node.tag/next-hop-interface/node.def index ecdfad84..03cf2257 100644 --- a/templates/protocols/vrf/node.tag/static/interface-route6/node.tag/next-hop-interface/node.def +++ b/templates/protocols/vrf/node.tag/static/interface-route6/node.tag/next-hop-interface/node.def @@ -16,16 +16,16 @@ end: fi vtysh -c "configure terminal" \ - -c "no ipv6 route $VAR(../@) $VAR(@) vrf $VRF_NAME" + -c "no ipv6 route $VAR(../@) $VAR(@) vrf $VRF_NAME" else if [[ -n "$VAR(./distance/@)" ]] then DIST="$VAR(./distance/@)" fi vtysh -c "configure terminal" \ - -c "ipv6 route $VAR(../@) $VAR(@) vrf $VRF_NAME $DIST"; + -c "ipv6 route $VAR(../@) $VAR(@) vrf $VRF_NAME $DIST"; fi else vtysh -c "configure terminal" \ - -c "no ipv6 route $VAR(../@) vrf $VRF_NAME $VAR(@)" + -c "no ipv6 route $VAR(../@) vrf $VRF_NAME $VAR(@)" fi diff --git a/templates/protocols/vrf/node.tag/static/route6/node.tag/next-hop/node.def b/templates/protocols/vrf/node.tag/static/route6/node.tag/next-hop/node.def index b8da3114..788b6819 100644 --- a/templates/protocols/vrf/node.tag/static/route6/node.tag/next-hop/node.def +++ b/templates/protocols/vrf/node.tag/static/route6/node.tag/next-hop/node.def @@ -22,18 +22,16 @@ end: -c "no ipv6 route $VAR(../@) $VAR(@) $ifname vrf $VRF_NAME" fi else - if [[ -n "$VAR(./distance/@)" ]] - then + if [[ -n "$VAR(./distance/@)" ]]; then DIST="$VAR(./distance/@)" fi - if [[ -n "$VAR(./interface/@)" ]] - then + if [[ -n "$VAR(./interface/@)" ]]; then INTERFACE="$VAR(./interface/@)" fi vtysh -c "configure terminal" \ - -c "ipv6 route $VAR(../@) $VAR(@) $INTERFACE vrf $VRF_NAME $DIST"; + -c "ipv6 route $VAR(../@) $VAR(@) $INTERFACE vrf $VRF_NAME $DIST"; fi else if ${vyatta_sbindir}/vyatta-gateway-static_route-check.pl \ -- cgit v1.2.3