diff options
Diffstat (limited to 'templates/protocols')
14 files changed, 57 insertions, 5 deletions
diff --git a/templates/protocols/bgp/node.def b/templates/protocols/bgp/node.def index 08c0a91a..ca7a448b 100644 --- a/templates/protocols/bgp/node.def +++ b/templates/protocols/bgp/node.def @@ -8,8 +8,15 @@ syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 4294967294 ; \ "AS number must be between 1 and 4294967294" end: if [ -z "$VAR(.)" ] || [ "$COMMIT_ACTION" != DELETE ]; then + vtysh -d bgpd -c 'conf t' -c 'router bgp $VAR(@)' -c 'no bgp ebgp-requires-policy' + + if [ -z $VAR(./parameters/network-import-check/) ]; then + vtysh -d bgpd -c 'conf t' -c 'router bgp $VAR(@)' -c 'no bgp network import-check' + fi + /opt/vyatta/sbin/vyatta-bgp.pl --main vtysh -d bgpd -c 'sh run' > /opt/vyatta/etc/quagga/bgpd.conf + sudo vtysh --writeconfig --noerror else rm -f /opt/vyatta/etc/quagga/bgpd.conf fi diff --git a/templates/protocols/bgp/node.tag/parameters/graceful-shutdown/node.def b/templates/protocols/bgp/node.tag/parameters/graceful-shutdown/node.def new file mode 100644 index 00000000..4ff73f05 --- /dev/null +++ b/templates/protocols/bgp/node.tag/parameters/graceful-shutdown/node.def @@ -0,0 +1 @@ +help: Graceful shutdown diff --git a/templates/protocols/ospf/node.def b/templates/protocols/ospf/node.def index 613aee78..cf33ba11 100644 --- a/templates/protocols/ospf/node.def +++ b/templates/protocols/ospf/node.def @@ -15,4 +15,5 @@ end: if [ "$COMMIT_ACTION" == DELETE ]; then rm -f /opt/vyatta/etc/quagga/ospfd.conf else vtysh -d ospfd -c 'sh run' > /opt/vyatta/etc/quagga/ospfd.conf + sudo vtysh --writeconfig --noerror fi diff --git a/templates/protocols/ospfv3/area/node.tag/area-type/node.def b/templates/protocols/ospfv3/area/node.tag/area-type/node.def new file mode 100644 index 00000000..21d70cb7 --- /dev/null +++ b/templates/protocols/ospfv3/area/node.tag/area-type/node.def @@ -0,0 +1,2 @@ +help: OSPFv3 Area type +val_help: stub; Stub Area type diff --git a/templates/protocols/ospfv3/area/node.tag/area-type/stub/no-summary/node.def b/templates/protocols/ospfv3/area/node.tag/area-type/stub/no-summary/node.def new file mode 100644 index 00000000..10ce5dd4 --- /dev/null +++ b/templates/protocols/ospfv3/area/node.tag/area-type/stub/no-summary/node.def @@ -0,0 +1,12 @@ +help: Do not inject inter-area routes into stub + +create: + vtysh -c "configure terminal" \ + -c "router ospf6" \ + -c "area $VAR(../../../@) stub no-summary " + +delete: + vtysh -c "configure terminal" \ + -c "router ospf6" \ + -c "no area $VAR(../../../@) stub no-summary " \ + -c "area $VAR(../../../@) stub " diff --git a/templates/protocols/ospfv3/area/node.tag/area-type/stub/node.def b/templates/protocols/ospfv3/area/node.tag/area-type/stub/node.def new file mode 100644 index 00000000..4b49cd3f --- /dev/null +++ b/templates/protocols/ospfv3/area/node.tag/area-type/stub/node.def @@ -0,0 +1,11 @@ +help: Stub OSPFv3 area + +create: + vtysh -c "configure terminal" \ + -c "router ospf6" \ + -c "area $VAR(../../@) stub" + +delete: + vtysh -c "configure terminal" \ + -c "router ospf6" \ + -c "no area $VAR(../../@) stub" diff --git a/templates/protocols/ospfv3/node.def b/templates/protocols/ospfv3/node.def index ffcf8dbc..4bf54837 100644 --- a/templates/protocols/ospfv3/node.def +++ b/templates/protocols/ospfv3/node.def @@ -9,6 +9,7 @@ begin: if [ "$COMMIT_ACTION" != DELETE ]; then -c "no ospf6 router-id" fi vtysh -d ospf6d -c 'sh run' > /opt/vyatta/etc/quagga/ospf6d.conf + sudo vtysh --writeconfig --noerror fi end: if [ "$COMMIT_ACTION" == DELETE ]; then vtysh -c "configure terminal" -c "router ospf6" -c "no router-id" diff --git a/templates/protocols/ripng/node.def b/templates/protocols/ripng/node.def index 6f12edce..ae4e0ebb 100644 --- a/templates/protocols/ripng/node.def +++ b/templates/protocols/ripng/node.def @@ -5,6 +5,7 @@ delete: vtysh -c "configure terminal" -c "no router ripng" end: if [ "$COMMIT_ACTION" != "DELETE" ]; then vtysh -d ripngd -c 'sh run' > /opt/vyatta/etc/quagga/ripngd.conf + sudo vtysh --writeconfig --noerror else rm -f /opt/vyatta/etc/quagga/ripngd.conf fi diff --git a/templates/protocols/static/node.def b/templates/protocols/static/node.def index 0cbd6d1b..0afb363e 100644 --- a/templates/protocols/static/node.def +++ b/templates/protocols/static/node.def @@ -3,6 +3,7 @@ help: Static route parameters end: if [ "$COMMIT_ACTION" != "DELETE" ]; then vtysh -d zebra -c 'sh run' > /opt/vyatta/etc/quagga/zebra.conf + sudo vtysh --writeconfig --noerror else rm -f /opt/vyatta/etc/quagga/zebra.conf fi diff --git a/templates/protocols/static/route/node.tag/dhcp-interface/node.def b/templates/protocols/static/route/node.tag/dhcp-interface/node.def index 7820800b..e1793c08 100644 --- a/templates/protocols/static/route/node.tag/dhcp-interface/node.def +++ b/templates/protocols/static/route/node.tag/dhcp-interface/node.def @@ -1,9 +1,8 @@ type: txt -help: DHCP interface that supplies the next-hop IP address for this static route -allowed: - local -a array ; - array=( /var/lib/dhcp/en* /var/lib/dhcp/eth* /var/lib/dhcp/br* /var/lib/dhcp/bond* ) ; - echo -n ${array[@]##*/} +help: DHCP interface supplying next-hop IP address +val_help: txt; DHCP interface name +allowed: sh -c "${vyos_completion_dir}/list_interfaces.py" +syntax:expression: exec "${vyos_libexec_dir}/validate-value --exec \"${vyos_validators_dir}/interface-name \" --value \'$VAR(@)\'"; "Invalid value" create: sudo /opt/vyatta/sbin/vyatta-update-static-route.pl --interface=$VAR(@) --route=$VAR(../@) --table=main --option=create RIP=$(/opt/vyatta/sbin/vyatta-dhcp-helper.pl --interface=$VAR(@) --want=router) diff --git a/templates/protocols/vrf/node.tag/static/interface-route/node.tag/next-hop-interface/node.tag/next-hop-vrf/node.def b/templates/protocols/vrf/node.tag/static/interface-route/node.tag/next-hop-interface/node.tag/next-hop-vrf/node.def index ee872997..da20f231 100644 --- a/templates/protocols/vrf/node.tag/static/interface-route/node.tag/next-hop-interface/node.tag/next-hop-vrf/node.def +++ b/templates/protocols/vrf/node.tag/static/interface-route/node.tag/next-hop-interface/node.tag/next-hop-vrf/node.def @@ -6,6 +6,10 @@ allowed: local -a params echo -n "${params[@]}" val_help: <vrf> ; Name of VRF to leak to end: + if [ ! -e /sys/class/net/$VAR(@) ] && [ $VAR(@) != "default" ]; then + echo 'VRF "$VAR(@)" does not exist!' + exit 1 + fi if [[ ${COMMIT_ACTION} = 'DELETE' ]] then if ! ${vyatta_sbindir}/vyatta-next-hop-check $VAR(../@) ipv4 address; then 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 52f198b1..bf406bb0 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 @@ -24,6 +24,10 @@ end: fi if [[ -n "$VAR(./next-hop-vrf/@)" ]]; then NEXTHOP_VRF="nexthop-vrf $VAR(./next-hop-vrf/@)" + if [ ! -e /sys/class/net/$NEXTHOP_VRF ] && [ $NEXTHOP_VRF != "default" ]; then + echo 'VRF "$NEXTHOP_VRF" does not exist!' + exit 1 + fi fi vtysh -c "configure terminal" \ diff --git a/templates/protocols/vrf/node.tag/static/route/node.tag/next-hop/node.tag/next-hop-vrf/node.def b/templates/protocols/vrf/node.tag/static/route/node.tag/next-hop/node.tag/next-hop-vrf/node.def index ad3e92a9..c67fe1c4 100644 --- a/templates/protocols/vrf/node.tag/static/route/node.tag/next-hop/node.tag/next-hop-vrf/node.def +++ b/templates/protocols/vrf/node.tag/static/route/node.tag/next-hop/node.tag/next-hop-vrf/node.def @@ -6,6 +6,10 @@ allowed: local -a params echo -n "${params[@]}" val_help: <vrf> ; Name of VRF to leak to end: + if [ ! -e /sys/class/net/$VAR(@) ] && [ $VAR(@) != "default" ]; then + echo 'VRF "$VAR(@)" does not exist!' + exit 1 + fi VRF_NAME=$VAR(../../../../@) if [[ ${COMMIT_ACTION} = 'DELETE' ]] then 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 3fb5b798..1c45d0c1 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 @@ -41,6 +41,10 @@ end: exit 1 fi NEXTHOP_VRF="nexthop-vrf $VAR(./next-hop-vrf/@)" + if [ ! -e /sys/class/net/$NEXTHOP_VRF ] && [ $NEXTHOP_VRF != "default" ]; then + echo 'VRF "$NEXTHOP_VRF" does not exist!' + exit 1 + fi fi vtysh -c "configure terminal" \ |