From 29916bd39344088c84221a4ec2da387b28029097 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Mon, 22 Sep 2008 14:07:09 -0700 Subject: Allow any number of tunnel devices The CLI should not be enforcing arbitrary restrictions on the number of devices. The limit should be based on the resources of the system and only the kernel would know that. So let the user try and make 10000 tunnel devices, maybe its on a 2000 core machine with 64G of memory. Any failure will show up when the attempt is made to create the tunnel device. --- templates/interfaces/tunnel/node.def | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'templates') diff --git a/templates/interfaces/tunnel/node.def b/templates/interfaces/tunnel/node.def index d152dbe5..89ee200c 100644 --- a/templates/interfaces/tunnel/node.def +++ b/templates/interfaces/tunnel/node.def @@ -2,7 +2,8 @@ tag: type: txt help: Set tunnel interface -syntax:expression: exec "echo $VAR(@) | grep \"tun[0-9][0-9]\\{0,2\\}\$\" > /dev/null "; "tunnel must be (tun0-tun999)" +syntax:expression: pattern $VAR(@) "^tun[0-9]+$" \ + ; "tunnel must be (tun0-tun999)" commit:expression: $VAR(./local-ip/) != "" ; \ "Must configure the tunnel local-ip for $VAR(@)" -- cgit v1.2.3 From 3d4b0dcf7e73f6a245c6c2b0a84a9fadad2ccaaf Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Mon, 22 Sep 2008 14:09:54 -0700 Subject: Allow any number of bridge devices The CLI should not be enforcing arbitrary restrictions on the number of devices. The limit should be based on the resources of the system and only the kernel would know that. So let the user try and make 10000 bridge devices, maybe its on a 2000 core machine with 64G of memory. Any failure will show up when the attempt is made to create the tunnel device. --- templates/interfaces/bridge/node.def | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'templates') diff --git a/templates/interfaces/bridge/node.def b/templates/interfaces/bridge/node.def index 0dc3670c..641d369d 100644 --- a/templates/interfaces/bridge/node.def +++ b/templates/interfaces/bridge/node.def @@ -2,7 +2,7 @@ tag: type: txt help: Set bridge interface -syntax:expression: $VAR(@) in "br0", "br1", "br2", "br3", "br4", "br5", "br6", "br7", "br8", "br9" ; "Must be (br0 - br9)" +syntax:expression: pattern $VAR(@) "^br[0-9]+$" ; "Must be (br0 - br999)" create: sudo brctl addbr $VAR(@) @@ -13,4 +13,4 @@ delete: if [ -n "`/usr/sbin/brctl show | grep $VAR(@) | grep eth`" ]; then sudo ip link set $VAR(@) down; sudo brctl delbr $VAR(@); -comp_help: "Enter bridge interface name (br0 - br9)" +comp_help: "Enter bridge interface name (br0 - br999)" -- cgit v1.2.3