T1006: replace all occurences of check_prefix_boundary with ipaddrcheck.

23 files changed, 23 insertions, 23 deletions

diff --git a/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/aggregate-address/node.def b/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/aggregate-address/node.def
index e03339ca..84b4222e 100644
--- a/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/aggregate-address/node.def
+++ b/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/aggregate-address/node.def
@@ -1,4 +1,4 @@
 tag:
 type: ipv4net
 help: BGP aggregate network
-syntax:expression: exec "${vyatta_sbindir}/check_prefix_boundary $VAR(@)"
+syntax:expression: exec "ipaddrcheck --verbose --is-ipv4-net $VAR(@)"
diff --git a/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/network/node.def b/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/network/node.def
index a1b6068c..1a86f394 100644
--- a/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/network/node.def
+++ b/templates/protocols/bgp/node.tag/address-family/ipv4-unicast/network/node.def
@@ -1,5 +1,5 @@
 tag:
 type: ipv4net
 help: BGP network
-syntax:expression: exec "${vyatta_sbindir}/check_prefix_boundary $VAR(@)"
+syntax:expression: exec "ipaddrcheck --verbose --is-ipv4-net $VAR(@)"
 commit:expression: !($VAR(./backdoor/) != "" && $VAR(./route-map/) != ""); "you may specify route-map or backdoor but not both"
diff --git a/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/aggregate-address/node.def b/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/aggregate-address/node.def
index a17bfe81..fa7a9ae4 100644
--- a/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/aggregate-address/node.def
+++ b/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/aggregate-address/node.def
@@ -2,4 +2,4 @@ tag:
 type: ipv6net
 help: BGP IPv6 aggregate network
 val_help: IPv6 aggregate network
-syntax:expression: exec "${vyatta_sbindir}/check_prefix_boundary $VAR(@)"
+syntax:expression: exec "ipaddrcheck --verbose --is-ipv6-net $VAR(@)"
diff --git a/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/network/node.def b/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/network/node.def
index ad75e82b..41256748 100644
--- a/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/network/node.def
+++ b/templates/protocols/bgp/node.tag/address-family/ipv6-unicast/network/node.def
@@ -2,4 +2,4 @@ tag:
 type: ipv6net
 help: BGP IPv6 network
 val_help: IPv6 network
-syntax:expression: exec "${vyatta_sbindir}/check_prefix_boundary $VAR(@)"
+syntax:expression: exec "ipaddrcheck --verbose --is-ipv6-net $VAR(@)"
diff --git a/templates/protocols/bgp/node.tag/parameters/distance/prefix/node.def b/templates/protocols/bgp/node.tag/parameters/distance/prefix/node.def
index ed1a6e05..10ffb85e 100644
--- a/templates/protocols/bgp/node.tag/parameters/distance/prefix/node.def
+++ b/templates/protocols/bgp/node.tag/parameters/distance/prefix/node.def
@@ -1,5 +1,5 @@
 tag:
 type: ipv4net
 help: Administrative distance for a specific BGP prefix
-syntax:expression: exec "${vyatta_sbindir}/check_prefix_boundary $VAR(@)"
+syntax:expression: exec "ipaddrcheck --verbose --is-any-net $VAR(@)"
 commit:expression: $VAR(./distance/) != ""; "you must set a route distance for this prefix"
diff --git a/templates/protocols/ospf/area/node.tag/network/node.def b/templates/protocols/ospf/area/node.tag/network/node.def
index 9422f008..ebf346db 100644
--- a/templates/protocols/ospf/area/node.tag/network/node.def
+++ b/templates/protocols/ospf/area/node.tag/network/node.def
@@ -1,7 +1,7 @@
 multi:
 type: ipv4net
 help: OSPF network [REQUIRED]
-syntax:expression: exec "${vyatta_sbindir}/check_prefix_boundary $VAR(@)"
+syntax:expression: exec "ipaddrcheck --verbose --is-ipv4-net $VAR(@)"
 create:vtysh -c "configure terminal" \
        -c "router ospf" -c "network $VAR(@) area $VAR(../@)"
 delete:vtysh -c "configure terminal" \
diff --git a/templates/protocols/ospf/area/node.tag/range/node.def b/templates/protocols/ospf/area/node.tag/range/node.def
index 94a90ed3..d29b775f 100644
--- a/templates/protocols/ospf/area/node.tag/range/node.def
+++ b/templates/protocols/ospf/area/node.tag/range/node.def
@@ -1,7 +1,7 @@
 tag:
 type: ipv4net
 help: Summarize routes matching prefix (border routers only)
-syntax:expression: exec "${vyatta_sbindir}/check_prefix_boundary $VAR(@)"
+syntax:expression: exec "ipaddrcheck --verbose --is-ipv4-net $VAR(@)"
 
 delete: touch /tmp/ospf-range.$PPID
 
diff --git a/templates/protocols/ospf/area/node.tag/range/node.tag/substitute/node.def b/templates/protocols/ospf/area/node.tag/range/node.tag/substitute/node.def
index f3a8e64d..b5ebba1d 100644
--- a/templates/protocols/ospf/area/node.tag/range/node.tag/substitute/node.def
+++ b/templates/protocols/ospf/area/node.tag/range/node.tag/substitute/node.def
@@ -1,3 +1,3 @@
 type: ipv4net
 help: Announce area range as another prefix
-syntax:expression: exec "${vyatta_sbindir}/check_prefix_boundary $VAR(@)"
+syntax:expression: exec "ipaddrcheck --verbose --is-ipv4-net $VAR(@)"
diff --git a/templates/protocols/ospfv3/area/node.tag/range/node.def b/templates/protocols/ospfv3/area/node.tag/range/node.def
index 4b594cd9..de886a72 100644
--- a/templates/protocols/ospfv3/area/node.tag/range/node.def
+++ b/templates/protocols/ospfv3/area/node.tag/range/node.def
@@ -1,7 +1,7 @@
 tag:
 type: ipv6net
 help: Specify IPv6 prefix (border routers only)
-syntax:expression: exec "${vyatta_sbindir}/check_prefix_boundary $VAR(@)"
+syntax:expression: exec "ipaddrcheck --verbose --is-ipv6-net $VAR(@)"
 
 delete: touch /tmp/ospf6-range.$PPID
 
diff --git a/templates/protocols/rip/network-distance/node.def b/templates/protocols/rip/network-distance/node.def
index 5430f67e..67d50ab7 100644
--- a/templates/protocols/rip/network-distance/node.def
+++ b/templates/protocols/rip/network-distance/node.def
@@ -1,7 +1,7 @@
 tag:
 type: ipv4net
 help: Source network
-syntax:expression: exec "${vyatta_sbindir}/check_prefix_boundary $VAR(@)"
+syntax:expression: exec "ipaddrcheck --verbose --is-ipv4-net $VAR(@)"
 commit:expression: $VAR(./distance/) != ""; "Must specify distance for network $VAR(@)"
 delete:expression: "touch /tmp/rip-dist.$PPID"
 end:expression: "if [ -n \"$VAR(./access-list/@)\" ]; then \
diff --git a/templates/protocols/rip/network/node.def b/templates/protocols/rip/network/node.def
index 28f92307..59af0bd8 100644
--- a/templates/protocols/rip/network/node.def
+++ b/templates/protocols/rip/network/node.def
@@ -1,7 +1,7 @@
 multi:
 type: ipv4net
 help: RIP network
-syntax:expression: exec "${vyatta_sbindir}/check_prefix_boundary $VAR(@)"
+syntax:expression: exec "ipaddrcheck --verbose --is-ipv4-net $VAR(@)"
 create:expression: "vtysh -c \"configure terminal\" -c \"router rip\" \
           -c \"network $VAR(@)\"; "
 delete:expression: "vtysh -c \"configure terminal\" -c \"router rip\" \
diff --git a/templates/protocols/rip/route/node.def b/templates/protocols/rip/route/node.def
index f92b933f..cd43d891 100644
--- a/templates/protocols/rip/route/node.def
+++ b/templates/protocols/rip/route/node.def
@@ -1,7 +1,7 @@
 multi:
 type: ipv4net
 help: RIP static route
-syntax:expression: exec "${vyatta_sbindir}/check_prefix_boundary $VAR(@)"
+syntax:expression: exec "ipaddrcheck --verbose --is-ipv4-net $VAR(@)"
 create:expression: "vtysh -c \"configure terminal\" -c \"router rip\" \
          -c \"route $VAR(@)\" "
 delete:expression: "vtysh -c \"configure terminal\" -c \"router rip\" \
diff --git a/templates/protocols/ripng/aggregate-address/node.def b/templates/protocols/ripng/aggregate-address/node.def
index 9b8c90d1..811ed064 100644
--- a/templates/protocols/ripng/aggregate-address/node.def
+++ b/templates/protocols/ripng/aggregate-address/node.def
@@ -2,7 +2,7 @@ multi:
 type: ipv6net
 help: Aggregate RIPng route announcement
 
-syntax:expression: exec "${vyatta_sbindir}/check_prefix_boundary $VAR(@)"
+syntax:expression: exec "ipaddrcheck --verbose --is-ipv6-net $VAR(@)"
 
 create: vtysh -c "configure terminal" \
           -c "router ripng"                                       \
diff --git a/templates/protocols/ripng/network/node.def b/templates/protocols/ripng/network/node.def
index 158fa54c..058bcaec 100644
--- a/templates/protocols/ripng/network/node.def
+++ b/templates/protocols/ripng/network/node.def
@@ -2,7 +2,7 @@ multi:
 type: ipv6net
 help: RIPng network
 
-syntax:expression: exec "${vyatta_sbindir}/check_prefix_boundary $VAR(@)"
+syntax:expression: exec "ipaddrcheck --verbose --is-ipv6-net $VAR(@)"
 
 create: vtysh -c "configure terminal" \
           -c "router ripng"                                       \
diff --git a/templates/protocols/ripng/route/node.def b/templates/protocols/ripng/route/node.def
index 5c12110f..b88f31c3 100644
--- a/templates/protocols/ripng/route/node.def
+++ b/templates/protocols/ripng/route/node.def
@@ -2,7 +2,7 @@ multi:
 type: ipv6net
 help: RIPng static route
 
-syntax:expression: exec "${vyatta_sbindir}/check_prefix_boundary $VAR(@)"
+syntax:expression: exec "ipaddrcheck --verbose --is-ipv4-net $VAR(@)"
 
 create: vtysh -c "configure terminal" \
           -c "router ripng"                                       \
diff --git a/templates/protocols/static/interface-route/node.def b/templates/protocols/static/interface-route/node.def
index 73dd97a3..2b9d75ad 100644
--- a/templates/protocols/static/interface-route/node.def
+++ b/templates/protocols/static/interface-route/node.def
@@ -1,7 +1,7 @@
 tag:
 type: ipv4net
 help: Interface based static route
-syntax:expression: exec "${vyatta_sbindir}/check_prefix_boundary $VAR(@)"
+syntax:expression: exec "ipaddrcheck --verbose --is-ipv4-net $VAR(@)"
 
 commit:expression: $VAR(./next-hop-interface/) != "" ; \
        "Must add a next-hop-interface for route $VAR(@)"
diff --git a/templates/protocols/static/interface-route6/node.def b/templates/protocols/static/interface-route6/node.def
index 0015e601..e823dbd6 100644
--- a/templates/protocols/static/interface-route6/node.def
+++ b/templates/protocols/static/interface-route6/node.def
@@ -1,7 +1,7 @@
 tag:
 type: ipv6net
 help: Interface based IPv6 static route
-syntax:expression: exec "${vyatta_sbindir}/check_prefix_boundary $VAR(@)"
+syntax:expression: exec "ipaddrcheck --verbose --is-ipv6-net $VAR(@)"
 
 commit:expression: $VAR(./next-hop-interface/) != "" ; \
        "Must add a next-hop-interface for route $VAR(@)"
diff --git a/templates/protocols/static/route/node.def b/templates/protocols/static/route/node.def
index e46227e5..0d17bb4b 100644
--- a/templates/protocols/static/route/node.def
+++ b/templates/protocols/static/route/node.def
@@ -2,7 +2,7 @@ tag:
 priority: 482
 type: ipv4net
 help: Static route
-syntax:expression: exec "${vyatta_sbindir}/check_prefix_boundary $VAR(@)"
+syntax:expression: exec "ipaddrcheck --verbose --is-ipv4-net $VAR(@)"
 
 commit:expression: $VAR(./next-hop/) != "" || $VAR(./blackhole/) != "" || $VAR(./dhcp-interface/) != ""; \
                    "Must add either a next-hop or blackhole or dhcp-interface for route $VAR(@)"
diff --git a/templates/protocols/static/route6/node.def b/templates/protocols/static/route6/node.def
index de3f1cd8..597578a4 100644
--- a/templates/protocols/static/route6/node.def
+++ b/templates/protocols/static/route6/node.def
@@ -1,7 +1,7 @@
 tag:
 type: ipv6net
 help: Static IPv6 route
-syntax:expression: exec "${vyatta_sbindir}/check_prefix_boundary $VAR(@)"
+syntax:expression: exec "ipaddrcheck --verbose --is-ipv6-net $VAR(@)"
 
 commit:expression: $VAR(./next-hop/) != "" || $VAR(./blackhole/) != ""; \
                    "Must add either a next-hop or blackhole for route $VAR(@)"
diff --git a/templates/protocols/static/table/node.tag/interface-route/node.def b/templates/protocols/static/table/node.tag/interface-route/node.def
index 73dd97a3..2b9d75ad 100644
--- a/templates/protocols/static/table/node.tag/interface-route/node.def
+++ b/templates/protocols/static/table/node.tag/interface-route/node.def
@@ -1,7 +1,7 @@
 tag:
 type: ipv4net
 help: Interface based static route
-syntax:expression: exec "${vyatta_sbindir}/check_prefix_boundary $VAR(@)"
+syntax:expression: exec "ipaddrcheck --verbose --is-ipv4-net $VAR(@)"
 
 commit:expression: $VAR(./next-hop-interface/) != "" ; \
        "Must add a next-hop-interface for route $VAR(@)"
diff --git a/templates/protocols/static/table/node.tag/interface-route6/node.def b/templates/protocols/static/table/node.tag/interface-route6/node.def
index 0015e601..e823dbd6 100644
--- a/templates/protocols/static/table/node.tag/interface-route6/node.def
+++ b/templates/protocols/static/table/node.tag/interface-route6/node.def
@@ -1,7 +1,7 @@
 tag:
 type: ipv6net
 help: Interface based IPv6 static route
-syntax:expression: exec "${vyatta_sbindir}/check_prefix_boundary $VAR(@)"
+syntax:expression: exec "ipaddrcheck --verbose --is-ipv6-net $VAR(@)"
 
 commit:expression: $VAR(./next-hop-interface/) != "" ; \
        "Must add a next-hop-interface for route $VAR(@)"
diff --git a/templates/protocols/static/table/node.tag/route/node.def b/templates/protocols/static/table/node.tag/route/node.def
index e86812db..85e75fe7 100644
--- a/templates/protocols/static/table/node.tag/route/node.def
+++ b/templates/protocols/static/table/node.tag/route/node.def
@@ -1,7 +1,7 @@
 tag:
 type: ipv4net
 help: Static route
-syntax:expression: exec "${vyatta_sbindir}/check_prefix_boundary $VAR(@)"
+syntax:expression: exec "ipaddrcheck --verbose --is-ipv4-net $VAR(@)"
 
 commit:expression: $VAR(./next-hop/) != "" || $VAR(./blackhole/) != "" || $VAR(./dhcp-interface/) != ""; \
                    "Must add either a next-hop or blackhole or dhcp-interface for route $VAR(@)"
diff --git a/templates/protocols/static/table/node.tag/route6/node.def b/templates/protocols/static/table/node.tag/route6/node.def
index de3f1cd8..597578a4 100644
--- a/templates/protocols/static/table/node.tag/route6/node.def
+++ b/templates/protocols/static/table/node.tag/route6/node.def
@@ -1,7 +1,7 @@
 tag:
 type: ipv6net
 help: Static IPv6 route
-syntax:expression: exec "${vyatta_sbindir}/check_prefix_boundary $VAR(@)"
+syntax:expression: exec "ipaddrcheck --verbose --is-ipv6-net $VAR(@)"
 
 commit:expression: $VAR(./next-hop/) != "" || $VAR(./blackhole/) != ""; \
                    "Must add either a next-hop or blackhole for route $VAR(@)"