Merge branch 'snmp-name'

Author: codeout

lib/junoser/js_ruler.rb

@@ -168,6 +168,8 @@ def process_reserved_word(str)
       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"
       str.gsub! 'to-zone-name | Destination zone', 'to-zone | Destination zone'
+      # "system-name | System name override" -> "name | System name override"
+      str.gsub! 'system-name | System name override', 'name | System name override'
 
       fix_route_filter(str)
 

lib/junoser/parser.rb

@@ -8746,7 +8746,7 @@ def enum(object)
               ).as(:oneline),
               b(str("snmp"),
                   c(
-                      a(str("system-name"), arg),
+                      a(str("name"), quote | arg),
                       a(str("description"), quote | arg),
                       a(str("location"), quote | arg),
                       a(str("contact"), quote | arg),
@@ -14289,7 +14289,7 @@ def enum(object)
                               b(str("suppress-tlv-advertisement"),
                                 (str("MANAGEMENT_ADDRESS") | str("SYSTEM_CAPABILITIES") | str("SYSTEM_DESCRIPTION") | str("SYSTEM_NAME") | str("PORT_DESCRIPTION") | str("PORT_ID") | str("CHASSIS_ID"))
                               ),
-                              a(str("system-name"), arg),
+                              a(str("name"), quote | arg),
                               a(str("system-description"), arg),
                               a(str("chassis-id"), arg),
                               b(str("chassis-id-type"),

lib/junoser/ruler.rb

@@ -221,6 +221,9 @@ def process_reserved_element(str)
       str.gsub!(/"(dest|src|static)-nat-rule-match"/) { '"match"' }
 
       str
+
+      # Fix .xsd: "snmp system-name" should be "snmp name"
+      str.gsub! '"system-name" arg', '"name" (quote | arg)'
     end
 
     def format(str, offset = OFFSET)

test/test_valid_statements.rb

@@ -89,6 +89,8 @@ class TestValidStatements < Test::Unit::TestCase
 
       set snmp contact "foo bar"
       set snmp location "foo bar"
+      set snmp name foo
+      set snmp name "foo bar"
 
       set protocols bgp minimum-hold-time 10
       set system dump-on-panic