lib/junoser/ruler.rb in junoser-0.2.3 vs lib/junoser/ruler.rb in junoser-0.2.4

@@ -47,13 +47,15 @@
       str.gsub! '"plus-literal"', '"+"'
       str.gsub! '"minus-literal"', '"-"'
 
       str.gsub!(/\((.*) \| "name"\)/) { "(#$1 | arg)" }
       str.gsub! '"vlan" ("id-name" | "all")', '"vlan" ("all" | arg)'
+      str.gsub! '"vlan" ("all" | "vlan-name")', '"vlan" ("all" | arg)'
       str.gsub!(/("ssh-\S+") arg/) { "#$1 (quote | arg)" }
       str.gsub! '"description" arg', '"description" (quote | arg)'
       str.gsub! '"as-path-prepend" arg', '"as-path-prepend" (quote | arg)'
       str.gsub! '"path-list" arg (', 'b(ipaddr,'
+      str.gsub! '"dhcp-service" (', '("dhcp-service" | "dhcp") ('
 
       str.gsub!(/(s\(\s*)"address" arg/) { "#{$1}arg" }
       str.gsub!(/^(\s*"idle-timeout" \(\s*c\(\s*c\(\s*"forever",\s*)"timeout" arg/) { "#{$1}arg" }
 
       str = omit_label(str, 'contents', 'syslog_object')