Merge branch 'member-range'

Author: codeout

lib/junoser/js_ruler.rb

@@ -161,9 +161,12 @@ def process_word(str)
     end
 
     def process_reserved_word(str)
-      # ieee-802.3ad  -> 802.3ad
+      # ieee-802.3ad -> 802.3ad
       str.gsub! 'ieee-802.3ad', '802.3ad'
 
+      # end-range -> to
+      str.gsub! '"end-range"', '"to"'
+
       # "policy | Define a policy context from this zone" -> "from-zone | Define a policy context from this zone"
       str.gsub! 'policy | Define a policy context from this zone', 'from-zone | Define a policy context from this zone'
       # "to-zone-name | Destination zone" -> "to-zone | Destination zone"

lib/junoser/parser.rb

@@ -5324,7 +5324,7 @@ def enum(object)
                               a(str("member"), arg),
                               b(a(str("member-range"), arg),
                                   sc(
-                                      b(str("end-range"),
+                                      b(str("to"),
                                         interface_device
                                       )
                                   )
@@ -43080,7 +43080,7 @@ def enum(object)
                             a(str("member"), arg),
                             b(a(str("member-range"), arg),
                                 sc(
-                                    b(str("end-range"),
+                                    b(str("to"),
                                       interface_device
                                     )
                                 )
@@ -46532,7 +46532,7 @@ def enum(object)
                                     a(str("member"), arg),
                                     b(a(str("member-range"), arg),
                                         sc(
-                                            b(str("end-range"),
+                                            b(str("to"),
                                               interface_device
                                             )
                                         )

lib/junoser/ruler.rb

@@ -180,6 +180,9 @@ def process_reserved_element(str)
       # Fix .xsd: "icmpv6" is also acceptable
       str.gsub! '"icmp6" |', '"icmp6" | "icmpv6" |'
 
+      # Fix .xsd: "end-range" of "member-range"
+      str.gsub! '"end-range"', '"to"'
+
       #
       # Fix .xsd: "arg" is missing
       #

test/test_valid_statements.rb

@@ -154,6 +154,8 @@ class TestValidStatements < Test::Unit::TestCase
       set protocols bgp group foo family inet unicast prefix-limit teardown 80 idle-timeout
       set protocols bgp group foo family inet unicast prefix-limit teardown 80 idle-timeout 60
       set protocols bgp group foo family inet unicast prefix-limit teardown 80 idle-timeout forever
+
+      set interfaces interface-range foo member-range ge-0/0/0 to ge-0/0/2
     EOS
 
     config.split("\n").each do |l|