junoser 0.4.6 → 0.5.0

data/lib/junoser/js_ruler.rb

@@ -16,8 +16,9 @@ module Junoser
 
     def rule
       str = @rule.read
+      str = process_lines(str)
       str = str.split(/\n/).map {|l|
-        format(process_line(l)) unless l =~ /^ *#/  # Skip additional comment lines
+        process_line(l) unless l =~ /^ *#/  # Skip additional comment lines
       }.compact.join("\n")
       finalize(str)
     end
@@ -161,9 +162,12 @@ module Junoser
     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"
@@ -171,6 +175,18 @@ module Junoser
       # "system-name | System name override" -> "name | System name override"
       str.gsub! 'system-name | System name override', 'name | System name override'
 
+      # "set class-of-service interfaces all unit"
+      str.gsub! '"unit(*)"', '"unit(*|arg)"'
+      # "classifiers xxx"
+      str.gsub! '["default"]', '["default", "arg"]'
+
+      # keywords "dest-nat-rule-match", "src-nat-rule-match", "static-nat-rule-match" are wrong
+      str.gsub!(/"(dest|src|static)-nat-rule-match/) { '"match' }
+
+      # faster interface speed support
+      str.gsub! '"40g", "oc3"', '"40g", "100g", "200g", "400g", "800g", "oc3"'
+      str.gsub! '"100G"', '"100G", "200G", "400G", "800G"'
+
       fix_route_filter(str)
 
       str
@@ -192,6 +208,15 @@ module Junoser
       str
     end
 
+    def process_lines(str)
+      # "set protocols mpls path"
+      str.gsub!(/("path" arg \(.*Route of a label-switched path.*)(\s*)c\(/) do
+        "#{$1}#{$2}s(#{$2}ipaddr,"
+      end
+
+      str
+    end
+
     def finalize(lines)
       lines = balance_parenthesis(lines)
       objectize_arg_of_s(lines)