junoser 0.3.12 → 0.4.2

data/lib/junoser/ruler.rb

@@ -14,10 +14,9 @@ module Junoser
       str = @rule.read
       str = remove_comments(str)
       str = process_reserved_element(str)
-      str = str.split(/\n/).map {|l| format(process_line(l)) }.join("\n")
+      str = str.split(/\n/).map { |l| format(process_line(l)) }.join("\n")
     end
 
-
     private
 
     def remove_comments(str)
@@ -27,16 +26,16 @@ module Junoser
     def process_line(str)
       return str if str =~ /^(.* do|end)$/
 
-      str.gsub!(/("[^"]+")/) { "str(#$1)" }  # "foo" -> str("foo")
+      str.gsub!(/("[^"]+")/) { "str(#$1)" } # "foo" -> str("foo")
 
-      str.gsub!(/^(\s*)arg(\.as\(:\S+\))? \($/) { "#{$1}b(arg#$2," }  # arg ( -> b(arg,
-      str.gsub!(/^(\s*)(str\(\S+\)) ([^ \t\n\r\f\(|,]+)(\.as\(:\S+\))?(,?)$/) { "#{$1}a(#$2, #$3)#$4#$5" }  # str("foo") bar -> a(str("foo"), bar)
-      str.gsub!(/^(\s*)(str\(\S+\)) (enum)?\((.*)\)(,?)$/) { "#{$1}a(#$2, #$3#$4)#$5" }  # str("foo") (a | b) -> a(str("foo"), a | b)
+      str.gsub!(/^(\s*)arg(\.as\(:\S+\))? \($/) { "#{$1}b(arg#$2," } # arg ( -> b(arg,
+      str.gsub!(/^(\s*)(str\(\S+\)) ([^ \t\n\r\f\(|,]+)(\.as\(:\S+\))?(,?)$/) { "#{$1}a(#$2, #$3)#$4#$5" } # str("foo") bar -> a(str("foo"), bar)
+      str.gsub!(/^(\s*)(str\(\S+\)) (enum)?\((.*)\)(,?)$/) { "#{$1}a(#$2, #$3#$4)#$5" } # str("foo") (a | b) -> a(str("foo"), a | b)
 
-      str.gsub!(/^(\s*)(str\(\S+\)) \($/) { "#{$1}b(#$2," }  # str("foo") ( -> b(str("foo"),
-      str.gsub!(/^(\s*)(enum)?(\(.*\))(\.as\(:\S\))? \($/) { "#{$1}b(#$2#$3#$4," }  # (a | b) ( -> b((a | b),
-      str.gsub!(/^(\s*)(str\(\S+\)) ([^ \t\n\r\f\(|,]+) \($/) { "#{$1}b(a(#$2, #$3)," }  # str("foo") bar ( -> b(a(str("foo"), bar),
-      str.gsub!(/^(\s*)(str\(\S+\)) (enum)?\((.*)\) \($/) { "#{$1}a(#$2, #$3#$4," }  # str("foo") (a | b) ( -> a(str("foo"), a | b,
+      str.gsub!(/^(\s*)(str\(\S+\)) \($/) { "#{$1}b(#$2," } # str("foo") ( -> b(str("foo"),
+      str.gsub!(/^(\s*)(enum)?(\(.*\))(\.as\(:\S\))? \($/) { "#{$1}b(#$2#$3#$4," } # (a | b) ( -> b((a | b),
+      str.gsub!(/^(\s*)(str\(\S+\)) ([^ \t\n\r\f\(|,]+) \($/) { "#{$1}b(a(#$2, #$3)," } # str("foo") bar ( -> b(a(str("foo"), bar),
+      str.gsub!(/^(\s*)(str\(\S+\)) (enum)?\((.*)\) \($/) { "#{$1}a(#$2, #$3#$4," } # str("foo") (a | b) ( -> a(str("foo"), a | b,
 
       str
     end
@@ -46,64 +45,106 @@ module Junoser
 
       str.gsub! /"groups" \(\s*s\(\s*any\s*\)\s*\)/, 'a("groups", arg, configuration)'
 
-      %w[as-number confederation-as metric-value limit-threshold filename filter-name class-name classifier-name link-subscription per-traffic-class-bandwidth template-name].each do |key|
-        str.gsub! %["#{key}" arg], 'arg'
-      end
-
       str.gsub! '"equal-literal"', '"="'
       str.gsub! '"plus-literal"', '"+"'
       str.gsub! '"minus-literal"', '"-"'
 
-      str.gsub!(/\((.*) \| "name"\)/) { "(#$1 | arg)" }
-      str.gsub! '"vlan" ("all" | "vlan-name")', '"vlan" ("all" | arg)'
-      str.gsub!(/\((.*) \| "vlan-id"\)/) { "(#$1 | arg)" }
+      #
+      # Statements can be quoted
+      #
       str.gsub!(/("ssh-\S+") arg/) { "#$1 (quote | arg)" }
+      str.gsub! '"message" arg', '"message" (quote | arg)'
       str.gsub! '"description" arg', '"description" (quote | arg)'
       str.gsub! '"as-path-prepend" arg', '"as-path-prepend" (quote | arg)'
-      str.gsub!(/arg \| (".*")/) { "#$1 | arg" }
-      str.gsub! '"dhcp-service" (', '("dhcp-service" | "dhcp") ('
 
-      str.gsub!(/"inet"(.*)"inet6"/) { %["inet6"#$1"inet"] }
-      str.gsub!(/"icmp"(.*)"icmp6"/) { %["icmp6"#$1"icmp"] }
-      str.gsub!(/"icmp"(.*)"icmpv6"/) { %["icmpv6"#$1"icmp"] }
-      str.gsub!(/"http"(.*)"https"/) { %["https"#$1"http"] }
-      str.gsub!(/"snmp"(.*)"snmptrap"/) { %["snmptrap"#$1"snmp"] }
-      %w[ccc ethernet-over-atm tcc vpls bridge].each do |encap|
-        str.gsub!(/"ethernet"(.*)"ethernet-#{encap}"/) { %["ethernet-#{encap}"#$1"ethernet"] }
+      str.gsub!(/^(\s*)"as-path" arg \(\s*c\(\s*arg/) do
+        format(['"as-path" arg (',
+                '  c(',
+                '    quote | arg'], $1)
       end
-      str.gsub! '"icmp6" |', '"icmp6" | "icmpv6" |'
-      str.gsub!(/"cspf"(.*)"cspf-link"/) { %["cspf-link"#$1"cspf"] }
-      str.gsub!(/"route-filter" (\(\s*control_route_filter_type\s*\))/) { %["route-filter" arg #{$1}.as(:oneline)] }
-      str.gsub!(/"source-address-filter" (\(\s*control_source_address_filter_type\s*\))/) { %["source-adress-filter" arg #{$1}.as(:oneline)] }
 
-      %w[teardown hold-time stub].each do |key|
-        str.gsub!(/^(\s*"#{key}" \(\s*)c\(/) { "#{$1}sc(" }
+      str.gsub!(/^rule\(:regular_expression\) do\s*((?!end).)*\s*end/) do
+        <<~EOS
+          rule(:regular_expression) do
+            (quote | arg).as(:arg)
+          end
+        EOS
       end
-      %w[file confederation].each do |key|
-        str.gsub!(/^(\s*"#{key}" \(\s*)c\(\s*arg,/) { "#{$1}sca(" }
+
+      str.gsub!(/^rule\(:login_user_object\) do\s*arg\.as\(:arg\) \(\s*c\(\s*"full-name" arg,/) do
+        <<~EOS
+          rule(:login_user_object) do
+            arg.as(:arg) (
+              sc(
+                "full-name" (quote | arg),
+        EOS
       end
-      %w[exact longer orlonger].each do |key|
-        str.gsub!(/^(\s*"#{key}") arg/) { "#{$1}" }
+
+      str.gsub!(/^(\s*)"location" arg,\s*"contact" arg,/) do
+        format(['"location" (quote | arg),',
+                '"contact" (quote | arg),'], $1)
       end
 
+      str.gsub!(/^(\s*)"as-path" \(\s*c\(\s*"path" arg/) do
+        format(['"as-path" (',
+                '  c(',
+                '    "path" (quote | arg)'], $1)
+      end
 
-      str.gsub!(/^(\s*)"ieee-802.3ad" \(\s*c\(\s*"lacp" \(\s*c\(/) do
-        format(['"802.3ad" (',
-                '  ca(',
-                '    "lacp" (',
-                '      c(',
-                '        "force-up",'], $1)
+      str.gsub!(/^(\s*)prefix_list_items,\s*"apply-path" arg/) do
+        format(['"apply-path" (quote | arg),',
+                'prefix_list_items'], $1)
       end
-      str.gsub!(/^(\s*)"as-path" arg \(\s*c\(\s*arg/) do
-        format(['"as-path" arg (',
-                '  c(',
-                '    quote | arg'], $1)
+
+      #
+      # "arg" matches anything so move to the end
+      #
+      str.gsub!(/arg \| (".*")/) { "#$1 | arg" }
+      str.gsub!(/^(\s*)c\(\s*arg,$/) { "#{$1}ca(" }
+      str.gsub!(/(rule\(:control_route_filter_type\) do\s*)s\(\s*arg,/) { "#{$1}b(" }
+      str.gsub!(/(rule\(:control_source_address_filter_type\) do\s*)s\(\s*arg,/) { "#{$1}b(" }
+      str.gsub!(/^(rule\(:trace_file_type\) do\s*)ca\(/) { "#{$1}sca(" }
+
+      str.gsub!(/^(rule\(:archive_object\) do\s*)c\(/) { "#{$1}sc(" }
+      str.gsub!(/^(rule\(:server_group_type\) do\s*)c\(\s*c\(\s*arg\s*\)\s*\)/) { "#{$1}s(arg, arg)" }
+
+      str.gsub!(/^(rule\(:rib_group_inet_type\) do)\s*c\(\s*arg/) do
+        format([$1,
+                '  ca(',
+                '    a(arg, arg)'], '')
       end
-      str.gsub!(/^(\s*)"priority" \(\s*c\(\s*arg,\s*arg\s*\)/) do
+
+      # Fix overkill
+      str.gsub!(/^(\s*)"priority" \(\s*ca\(\s*arg\s*\)/) do
         format(['"priority" (',
                 '  a(arg, arg)', $1])
       end
-      str.gsub!(/^(\s*)"path" arg \(\s*c\(\s*c\(\s*"abstract",\s*c\(\s*"loose",\s*"loose-link",\s*"strict"\s*\)\s*\)\.as\(:oneline\)/) do
+
+      #
+      # Longer pattern first
+      #
+      # covers:
+      #   "inet" | "inet6"
+      #
+      #   and even
+      #
+      #   "inet",
+      #   "inet6"
+      str.gsub!(/"cspf"(.*\s*.*)"cspf-link"/) { %["cspf-link"#$1"cspf"] }
+      str.gsub!(/"http"(.*\s*.*)"https"/) { %["https"#$1"http"] }
+      str.gsub!(/"inet"(.*\s*.*)"inet6"/) { %["inet6"#$1"inet"] }
+      str.gsub!(/"icmp"(.*\s*.*)"icmp6"/) { %["icmp6"#$1"icmp"] }
+      str.gsub!(/"icmp"(.*\s*.*)"icmpv6"/) { %["icmpv6"#$1"icmp"] }
+      str.gsub!(/"snmp"(.*\s*.*)"snmptrap"/) { %["snmptrap"#$1"snmp"] }
+      str.gsub!(/"ospf"(.*\s*.*)"ospf3"/) { %["ospf3"#$1"ospf"] }
+      str.gsub! '"tls1" | "tls11" | "tls12"', '"tls11" | "tls12" | "tls1"'
+      str.gsub!(/("group1" \| "group2" \| "group5") \| ([^\)]+)/) { "#{$2} | #{$1}"}
+
+      %w[ccc ethernet-over-atm tcc vpls bridge].each do |encap|
+        str.gsub!(/"ethernet"(.*)"ethernet-#{encap}"/) { %["ethernet-#{encap}"#$1"ethernet"] }
+      end
+
+      str.gsub!(/^(\s*)"path" arg \(\s*c\(\s*sc\(\s*"abstract",\s*c\(\s*"loose",\s*"loose-link",\s*"strict"\s*\)\s*\)\.as\(:oneline\)/) do
         format(['"path" arg (',
                 '  c(',
                 '    b(',
@@ -119,63 +160,75 @@ module Junoser
                 '    )', $1])
       end
 
-      str.gsub!(/^(\s*)c\(\s*\("default"\)\s*\)/) do
-        format(['c(',
-                '  ("default" | arg)',
-                ')'], $1)
-      end
+      #
+      # Fix .xsd: Elements without "nokeyword" flag
+      #
+      str.gsub!(/\((.*) \| "name"\)/) { "(#$1 | arg)" }
+      str.gsub! '"vlan" ("all" | "vlan-name")', '"vlan" ("all" | arg)'
+      str.gsub!(/\((.*) \| "vlan-id"\)/) { "(#$1 | arg)" }
 
-      str.gsub!(/^rule\(:regular_expression\) do\s*((?!end).)*\s*end/) do
-        format(['rule(:regular_expression) do',
-                '  (quote | arg).as(:arg)',
-                'end'])
-      end
-      str.gsub!(/^rule\(:login_user_object\) do\s*arg\.as\(:arg\) \(\s*c\(\s*"full-name" arg,/) do
-        format(['rule(:login_user_object) do',
-                '  arg.as(:arg) (',
-                '    sc(',
-                '        "full-name" (quote | arg),'])
+      %w[filename].each do |key|
+        str.gsub! %["#{key}" arg], 'arg'
       end
 
-      str.gsub!(/(rule\(:control_route_filter_type\) do\s*)s\(\s*arg,/) { "#{$1}b(" }
-      str.gsub!(/(rule\(:control_source_address_filter_type\) do\s*)s\(\s*arg,/) { "#{$1}b(" }
-      str.gsub!(/^(rule\(:trace_file_type\) do\s*)c\(\s*arg,/) { "#{$1}sca(" }
-      str.gsub!(/^(rule\(:archive_object\) do\s*)c\(/) { "#{$1}sc(" }
-      str.gsub!(/^(rule\(:server_group_type\) do\s*)c\(\s*c\(\s*arg\s*\)\s*\)/) { "#{$1}s(arg, arg)" }
-      str.gsub!(/^(rule\(:rib_group_inet_type\) do)\s*c\(\s*arg/) do
-        format([$1,
-                '  ca(',
-                '    a(arg, arg)'], '')
-      end
+      # "filename" fix above leaves "arg". Move to the end
+      str.gsub!(/^(rule\(:esp_trace_file_type\) do\s*)c\(\s*arg,/) { "#{$1}ca(" }
 
-      str.gsub!(/^(\s*)c\(\s*arg,$/) { "#{$1}ca(" }
+      # Fix .xsd: system processes dhcp is valid on some platforms
+      str.gsub! '"dhcp-service" (', '("dhcp-service" | "dhcp") ('
 
-      str.gsub!(/^(\s*)"location" arg,\s*"contact" arg,/) do
-        format(['"location" (quote | arg),',
-                '"contact" (quote | arg),'], $1)
+      # Fix .xsd: "icmpv6" is also acceptable
+      str.gsub! '"icmp6" |', '"icmp6" | "icmpv6" |'
+
+      #
+      # Fix .xsd: "arg" is missing
+      #
+      str.gsub!(/"route-filter" (\(\s*control_route_filter_type\s*\))/) { %["route-filter" arg #{$1}.as(:oneline)] }
+      str.gsub!(/"source-address-filter" (\(\s*control_source_address_filter_type\s*\))/) { %["source-adress-filter" arg #{$1}.as(:oneline)] }
+      %w[file].each do |key|
+        str.gsub!(/^(\s*"#{key}" \(\s*)c\(\s*arg,/) { "#{$1}sca(" }
       end
 
-      str.gsub!(/^(\s*)"as-path" \(\s*c\(\s*"path" arg/) do
-        format(['"as-path" (',
-                '  c(',
-                '    "path" (quote | arg)'], $1)
+      # Fix .xsd: Unnecessary "arg" is added
+      %w[exact longer orlonger].each do |key|
+        str.gsub!(/^(\s*"#{key}") arg/) { "#{$1}" }
       end
 
+      # Fix .xsd: "ieee-802.3ad" is invalid
+      str.gsub! '"ieee-802.3ad"', '"802.3ad"'
+
+      # Fix .xsd: "class-of-service interfaces all unit * classifiers exp foo"
+      str.gsub!(/^(\s*)sc\(\s*\("default"\)\s*\)/) do
+        format(['c(',
+                '  ("default" | arg)',
+                ')'], $1)
+      end
+
+      # Fix .xsd: "from-zone" arg is also required
       str.gsub!(/^(\s*)"policy" \(\s*s\(\s*arg,\s*"to-zone-name" arg,\s*c\(\s*"policy" \(\s*policy_type\s*\)\s*\)/) do
         format(['b(s("from-zone", arg, "to-zone", arg),',
                 '    b("policy", policy_type',
                ], $1)
       end
 
+      # Fix .xsd: "members" accepts [ foo bar ]
+      str.gsub! '"members" arg', '"members" any'
+
+      # Fix .xsd: "term_object" accepts multiple conditions
+      str.gsub!(/^(rule\(:term_object\) do\s*arg\.as\(:arg\) \(\s*)c\(/) { "#{$1}sc(" }
+
+      # Fix .xsd: keywords "dest-nat-rule-match", "src-nat-rule-match", "static-nat-rule-match" are wrong
+      str.gsub!(/"(dest|src|static)-nat-rule-match"/) { '"match"' }
+
       str
     end
 
-    def format(str, offset=OFFSET)
+    def format(str, offset = OFFSET)
       case str
       when String
         str.empty? ? '' : offset + str
       when Array
-        str.map {|s| s.empty? ? '' : offset + s.to_s }.join("\n")
+        str.map { |s| s.empty? ? '' : offset + s.to_s }.join("\n")
       end
     end
 
@@ -206,7 +259,7 @@ module Junoser
 
       begin
         # .xsd doesn't include "apply-groups"
-        if line =~ /(.*)\\s+apply-groups\\s+(\\S+|\\[.*\\])$/
+        if line =~ /(.*)\\s+apply-groups(-except)?\\s+(\\S+|\\[.*\\])$/
           return \$1 == 'set' ? true : parse(\$1)
         end
 

data/lib/junoser/version.rb

@@ -1,3 +1,3 @@
 module Junoser
-  VERSION = "0.3.12"
+  VERSION = "0.4.2"
 end

data/lib/junoser/xsd/base.rb

@@ -1,13 +1,14 @@
 module Junoser
   module Xsd
     module Base
-      attr_reader :xml
+      attr_reader :xml, :parent
 
       OFFSET = '  '
 
       def initialize(xml, options={})
         @xml = xml
         @depth = options[:depth] || 0
+        @parent = options[:parent]
       end
 
       def config
@@ -32,15 +33,17 @@ module Junoser
          ']>'].join("\n#{OFFSET*(@depth+1)}")
       end
 
-
-      private
-
       def oneliner?
-        @oneliner ||= !xml.xpath('./xsd:annotation/xsd:appinfo/flag[text()="oneliner"]').empty?
+        # don't use "/flag" as xsd manipulation automatically add "xsd:" prefix
+        @oneliner ||= !xml.xpath('./xsd:annotation/xsd:appinfo/*[local-name()="flag" and text()="oneliner"]').empty?
       end
 
+
+      private
+
       def nokeyword?
-        @nokeyword ||= !xml.xpath('./xsd:annotation/xsd:appinfo/flag[text()="nokeyword"]').empty?
+        # don't use "/flag" as xsd manipulation automatically add "xsd:" prefix
+        @nokeyword ||= !xml.xpath('./xsd:annotation/xsd:appinfo/*[local-name()="flag" and text()="nokeyword"]').empty?
       end
 
       def has_single_child_of?(klass)

data/lib/junoser/xsd/choice.rb

@@ -10,9 +10,9 @@ module Junoser
         @config ||= children.map {|child|
           case child.name
           when 'element'
-            Junoser::Xsd::Element.new(child, depth: @depth+1)
+            Junoser::Xsd::Element.new(child, depth: @depth+1, parent: self)
           when 'choice'
-            Junoser::Xsd::Choice.new(child, depth: @depth+1)
+            Junoser::Xsd::Choice.new(child, depth: @depth+1, parent: self)
           else
             raise "ERROR: unknown element: #{child.name}"
           end
@@ -29,6 +29,10 @@ module Junoser
           format('c(', config.map(&:to_s).join(",\n"), ')')
         end
       end
+
+      def unbounded?
+        xml['maxOccurs'] == 'unbounded'
+      end
     end
   end
 end

data/lib/junoser/xsd/complex_type.rb

@@ -18,9 +18,9 @@ module Junoser
         @config ||= children.map {|child|
           case child.name
           when 'sequence'
-            Junoser::Xsd::Sequence.new(child, depth: @depth+1)
+            Junoser::Xsd::Sequence.new(child, depth: @depth+1, parent: self)
           when 'simpleContent'
-            Junoser::Xsd::SimpleContent.new(child, depth: @depth+1)
+            Junoser::Xsd::SimpleContent.new(child, depth: @depth+1, parent: self)
           when 'attribute'
             'arg'
           else
@@ -52,7 +52,7 @@ module Junoser
       def argument
         return unless @argument
 
-        arg = Junoser::Xsd::Element.new(@argument, depth: @depth+1).config
+        arg = Junoser::Xsd::Element.new(@argument, depth: @depth+1, parent: self).config
         raise "ERROR: argument shouldn't consist of multiple elements" if arg.size > 1
 
         if root?

data/lib/junoser/xsd/element.rb

@@ -16,9 +16,9 @@ module Junoser
         @config ||= children.map {|child|
           case child.name
           when 'complexType'
-            Junoser::Xsd::ComplexType.new(child, depth: @depth+1)
+            Junoser::Xsd::ComplexType.new(child, depth: @depth+1, parent: self)
           when 'simpleType'
-            Junoser::Xsd::SimpleType.new(child, depth: @depth+1)
+            Junoser::Xsd::SimpleType.new(child, depth: @depth+1, parent: self)
           else
             raise "ERROR: unknown element: #{child.name}"
           end
@@ -70,7 +70,7 @@ module Junoser
         when @argument.name == 'simpleType'
           'arg'
         else
-          arg = Junoser::Xsd::Element.new(@argument, depth: @depth+1).config
+          arg = Junoser::Xsd::Element.new(@argument, depth: @depth+1, parent: self).config
           raise "ERROR: argument shouldn't consist of multiple elements" if arg.size > 1
           arg.first.to_s.strip
         end
@@ -97,6 +97,10 @@ module Junoser
 
       def documentation
         @documentation ||= xml.xpath('./xsd:annotation/xsd:documentation').text
+
+        # Translate multiline documentation into a single line to make it parsable in further processes
+        @documentation.gsub! /\n\s*/, ' '
+
         @documentation.empty? ? nil : @documentation
       end
     end

data/lib/junoser/xsd/restriction.rb

@@ -17,9 +17,9 @@ module Junoser
         @config ||= children.map {|child|
           case child.name
           when 'enumeration'
-            Junoser::Xsd::Enumeration.new(child, depth: @depth+1)
+            Junoser::Xsd::Enumeration.new(child, depth: @depth+1, parent: self)
           when 'simpleType'
-            Junoser::Xsd::SimpleType.new(child, depth: @depth+1)
+            Junoser::Xsd::SimpleType.new(child, depth: @depth+1, parent: self)
           when 'attribute'
           else
             raise "ERROR: unknown element: #{child.name}"

data/lib/junoser/xsd/sequence.rb

@@ -11,9 +11,9 @@ module Junoser
         @config ||= children.map {|child|
           case child.name
           when 'choice'
-            Junoser::Xsd::Choice.new(child, depth: @depth+1)
+            Junoser::Xsd::Choice.new(child, depth: @depth+1, parent: self)
           when 'element'
-            Junoser::Xsd::Element.new(child, depth: @depth+1)
+            Junoser::Xsd::Element.new(child, depth: @depth+1, parent: self)
           when 'any'
             'any'
           else
@@ -28,7 +28,15 @@ module Junoser
         when has_single_child_of?(Junoser::Xsd::Choice)
           child = config.first
           str = child.config.map(&:to_s).reject(&:empty?).join(",\n")
-          format('c(', str, ')') unless str.empty?
+
+          return if str.empty?
+
+          # Assuming that <xsd:sequence> always has <xsd:complexType> as the parent
+          if parent.parent&.oneliner? && config.first.unbounded?
+            format('sc(', str, ')')
+          else
+            format('c(', str, ')')
+          end
         else
           str = config.map {|c| c.is_a?(String) ? format(OFFSET + c) : c.to_s }.reject(&:empty?).join(",\n")
           format('s(', str, ')')