T64: fix and revamp the broken extcommunity-list commands.

13 files changed, 5 insertions, 43 deletions

diff --git a/templates/policy/extcommunity-list/expanded/node.def b/templates/policy/extcommunity-list/expanded/node.def
deleted file mode 100644
index 95f6f003..00000000
--- a/templates/policy/extcommunity-list/expanded/node.def
+++ /dev/null
@@ -1,8 +0,0 @@
-tag:
-priority: 490
-type: txt
-help: Border Gateway Protocol (BGP) extended community-list filter
-
-syntax:expression: pattern $VAR(@) "^[a-zA-Z0-9]+$" ; "Should be alphanumeric name"
-
-end: /opt/vyatta/sbin/vyatta-policy.pl --update-community-list expanded $VAR(@)
diff --git a/templates/policy/extcommunity-list/node.def b/templates/policy/extcommunity-list/node.def
index 9676146c..fee4c402 100644
--- a/templates/policy/extcommunity-list/node.def
+++ b/templates/policy/extcommunity-list/node.def
@@ -1,7 +1,8 @@
 tag:
-priority: 480
+priority: 490
 type: txt
-help: Border Gateway Protocol (BGP) extended communities attribute. Usefull for implementing network policy for MPLS VPN/BGP by restricting routes according to their Route Target or Site of Origin.
-val_help: Type of extended community. standard or expanded.
+help: Border Gateway Protocol (BGP) extended community-list filter
 
-syntax:expression: pattern $VAR(@) "^standard|expanded$" ; "Should be either standard or expanded"
+syntax:expression: pattern $VAR(@) "^[a-zA-Z0-9]+$" ; "Should be alphanumeric name"
+
+end: /opt/vyatta/sbin/vyatta-policy.pl --update-extcommunity-list $VAR(@)
diff --git a/templates/policy/extcommunity-list/expanded/description/node.def b/templates/policy/extcommunity-list/node.tag/description/node.def
index 7a660be4..7a660be4 100644
--- a/templates/policy/extcommunity-list/expanded/description/node.def
+++ b/templates/policy/extcommunity-list/node.tag/description/node.def
diff --git a/templates/policy/extcommunity-list/expanded/rule/node.def b/templates/policy/extcommunity-list/node.tag/rule/node.def
index 7826f33d..7826f33d 100644
--- a/templates/policy/extcommunity-list/expanded/rule/node.def
+++ b/templates/policy/extcommunity-list/node.tag/rule/node.def
diff --git a/templates/policy/extcommunity-list/expanded/rule/node.tag/action/node.def b/templates/policy/extcommunity-list/node.tag/rule/node.tag/action/node.def
index db4bdbc6..db4bdbc6 100644
--- a/templates/policy/extcommunity-list/expanded/rule/node.tag/action/node.def
+++ b/templates/policy/extcommunity-list/node.tag/rule/node.tag/action/node.def
diff --git a/templates/policy/extcommunity-list/expanded/rule/node.tag/description/node.def b/templates/policy/extcommunity-list/node.tag/rule/node.tag/description/node.def
index b8e3095b..b8e3095b 100644
--- a/templates/policy/extcommunity-list/expanded/rule/node.tag/description/node.def
+++ b/templates/policy/extcommunity-list/node.tag/rule/node.tag/description/node.def
diff --git a/templates/policy/extcommunity-list/expanded/rule/node.tag/regex/node.def b/templates/policy/extcommunity-list/node.tag/rule/node.tag/regex/node.def
index fae3784c..fae3784c 100644
--- a/templates/policy/extcommunity-list/expanded/rule/node.tag/regex/node.def
+++ b/templates/policy/extcommunity-list/node.tag/rule/node.tag/regex/node.def
diff --git a/templates/policy/extcommunity-list/standard/description/node.def b/templates/policy/extcommunity-list/standard/description/node.def
deleted file mode 100644
index 7a660be4..00000000
--- a/templates/policy/extcommunity-list/standard/description/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-type: txt
-help: Description for this community list
diff --git a/templates/policy/extcommunity-list/standard/node.def b/templates/policy/extcommunity-list/standard/node.def
deleted file mode 100644
index aec1edcd..00000000
--- a/templates/policy/extcommunity-list/standard/node.def
+++ /dev/null
@@ -1,8 +0,0 @@
-tag:
-priority: 485
-type: txt
-help: Border Gateway Protocol (BGP) extended community-list filter
-
-syntax:expression: pattern $VAR(@) "^[a-zA-Z0-9]+$" ; "Should be alphanumeric name"
-
-end: /opt/vyatta/sbin/vyatta-policy.pl --update-community-list standard $VAR(@)
diff --git a/templates/policy/extcommunity-list/standard/rule/node.def b/templates/policy/extcommunity-list/standard/rule/node.def
deleted file mode 100644
index 7826f33d..00000000
--- a/templates/policy/extcommunity-list/standard/rule/node.def
+++ /dev/null
@@ -1,6 +0,0 @@
-tag:
-type: u32
-help: create a rule for this BGP extended community list
-val_help: u32:1-65535; Extended community-list rule number
-
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "rule number must be between 1 and 65535"
diff --git a/templates/policy/extcommunity-list/standard/rule/node.tag/action/node.def b/templates/policy/extcommunity-list/standard/rule/node.tag/action/node.def
deleted file mode 100644
index db4bdbc6..00000000
--- a/templates/policy/extcommunity-list/standard/rule/node.tag/action/node.def
+++ /dev/null
@@ -1,6 +0,0 @@
-type: txt
-help: Action to take on routes matching this rule [REQUIRED]
-val_help: permit; Permit matching routes
-val_help: deny; Deny matching routes
-
-syntax:expression: $VAR(@) in "permit", "deny"; "action must be permit or deny"
diff --git a/templates/policy/extcommunity-list/standard/rule/node.tag/description/node.def b/templates/policy/extcommunity-list/standard/rule/node.tag/description/node.def
deleted file mode 100644
index b8e3095b..00000000
--- a/templates/policy/extcommunity-list/standard/rule/node.tag/description/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-type: txt
-help: Description for this rule
diff --git a/templates/policy/extcommunity-list/standard/rule/node.tag/regex/node.def b/templates/policy/extcommunity-list/standard/rule/node.tag/regex/node.def
deleted file mode 100644
index 36dd9954..00000000
--- a/templates/policy/extcommunity-list/standard/rule/node.tag/regex/node.def
+++ /dev/null
@@ -1,7 +0,0 @@
-type: txt
-help: Extended community value. Should be either AS:VAL or IP-Address:VAL
-val_help: Community list regular expression
-
-syntax:expression: pattern $VAR(@) "^([0-9]*)|([0-9]{1-3}\.[0-9]{1-3}\.[0-9]{1-3}\.[0-9]{1-3}):[0-9]*$"
-
-commit:expression: $VAR(../action/@) != ""; "You must specify an action"