junoser 0.1.6 → 0.2.0

data/lib/junoser/ruler.rb

@@ -38,8 +38,11 @@ module Junoser
 
     def process_reserved_element(str)
       str.gsub! /"\$\S+"/, 'arg'
-      str.gsub! '"as-number" arg', 'arg'
-      str.gsub! '"confederation-as" arg', 'arg'
+
+      %w[as-number confederation-as metric-value limit-threshold filename filter-name class-name classifier-name link-subscription per-traffic-class-bandwidth].each do |key|
+        str.gsub! %["#{key}" arg], 'arg'
+      end
+
       str.gsub! '"equal-literal"', '"="'
       str.gsub! '"plus-literal"', '"+"'
       str.gsub! '"minus-literal"', '"-"'
@@ -47,73 +50,94 @@ module Junoser
       str.gsub!(/\((.*) \| "name"\)/) { "(#$1 | arg)" }
       str.gsub! '"vlan" ("id-name" | "all")', '"vlan" ("all" | arg)'
       str.gsub!(/("ssh-\S+") arg/) { "#$1 (quote | arg)" }
-      str.gsub! '"metric-value" arg', 'arg'
-      str.gsub! '"limit-threshold" arg', 'arg'
-      str.gsub! '"filename" arg', '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!(/(s\(\s*)"address" \(\s*arg\s*\)/) { "#{$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')
+      str = omit_label(str, 'interface', 'cos_interfaces_type')
+      str = omit_label(str, 'interface', 'ir_interfaces_type')
+      str = omit_label(str, 'interface', 'interfaces_type')
+      str = omit_label(str, 'client-address-list', 'client_address_object')
+      str = omit_label(str, 'prefix-list-item', 'prefix_list_items')
+      str = omit_label(str, 'instance', 'juniper_routing_instance')
+      str = omit_label(str, 'vlan', 'vlan_type')
+
+      str.gsub!(/"icmp"(.*)"icmp6"/) { %["icmpv6"#$1"icmp"] }
+      str.gsub!(/"http"(.*)"https"/) { %["https"#$1"http"] }
+      str.gsub!(/"snmp"(.*)"snmptrap"/) { %["snmptrap"#$1"snmp"] }
+      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)] }
+      str.gsub!(/("next-hop" \(\s*c\(\s*c\(\s*[^)]*)"address" \(\s*ipaddr\s*\)/) { "#{$1}ipaddr" }
+
+      %w[metric metric2 metric3 metric4 tag tag2 preference preference2 color color2 local-preference].each do |key|
+        str.gsub!(/^(\s*"#{key}" \(\s*c\(\s*c\(\s*)"#{key}" arg/) { "#{$1}arg" }
+      end
+      str.gsub!(/^(\s*"vrf-target" \(\s*)c\(\s*"community" arg,/) { "#{$1}ca(" }
+      str.gsub!(/^(\s*)"priority" \(\s*c\(\s*"setup-priority" arg,\s*"reservation-priority" arg\s*\)\s*\)/) { %[#{$1}a("priority", a(arg, arg)).as(:oneline)] }
+
+      %w[teardown hold-time stub].each do |key|
+        str.gsub!(/^(\s*"#{key}" \(\s*)c\(/) { "#{$1}sc(" }
+      end
+      %w[file confederation].each do |key|
+        str.gsub!(/^(\s*"#{key}" \(\s*)c\(\s*arg,/) { "#{$1}sca(" }
+      end
+      %w[exact longer orlonger].each do |key|
+        str.gsub!(/^(\s*"#{key}") \(\s*arg\s*\)/) { "#{$1}" }
+      end
 
       str.gsub!(/^(\s*)"inline-services"/) do
         format(['"inline-services" (',
                 '  "bandwidth" ("1g" | "10g")',
                 ')'], $1)
       end
-      str.gsub!(/^(\s*)"ieee-802.3ad" \(\s*sc\(\s*"lacp" \(\s*sc\(/) do
+      str.gsub!(/^(\s*)"ieee-802.3ad" \(\s*c\(\s*"lacp" \(\s*c\(/) do
         format(['"802.3ad" (',
-                '  sc(',
-                '    arg,',
+                '  ca(',
                 '    "lacp" (',
-                '      sc(',
+                '      c(',
                 '        "force-up",'], $1)
       end
-      str.gsub!(/^(\s*)"as-path" \(\s*sc\(\s*"path" arg/) do
+      str.gsub!(/^(\s*)"as-path" \(\s*c\(\s*"path" arg,/) do
         format(['"as-path" (',
-                '  sc(',
-                '    arg'], $1)
+                '  ca('], $1)
       end
-      str.gsub!(/^(\s*)"as-path" arg \(\s*sc\(\s*"path" arg\s*\)/) do
+      str.gsub!(/^(\s*)"as-path" arg \(\s*c\(\s*"path" arg\s*\)/) do
         format(['"as-path" arg (',
-                '  sc(',
+                '  c(',
                 '    quote,',
                 '    arg',
                 '  )'], $1)
       end
+      str.gsub!(/^(\s*)"ribgroup-name" arg$/) do
+        format(['arg (',
+                '  arg',
+                ')'], $1)
+      end
 
       str.gsub!(/^rule\(:regular_expression\) do\s*((?!end).)*\s*end/) do
-        "rule(:regular_expression) do
-  (quote | arg).as(:arg)
-end"
+        format(['rule(:regular_expression) do',
+                '  (quote | arg).as(:arg)',
+                'end'])
       end
-
-      str.gsub!(/("next-hop" \(\s*sc\(\s*c\(\s*[^)]*)"address" \(\s*ipaddr\s*\)/) { "#{$1}ipaddr" }
-
-      %w[metric metric2 metric3 metric4 tag tag2 preference preference2 color color2 local-preference].each do |key|
-        str.gsub!(/^(\s*"#{key}" \(\s*sc\(\s*c\(\s*)"#{key}" arg/) { "#{$1}arg" }
+      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),'])
       end
 
-      str.gsub!(/(s\(\s*)"address" \(\s*arg\s*\)/) { "#{$1}arg" }
-      str.gsub!(/^(\s*"idle-timeout" \(\s*sc\(\s*c\(\s*"forever",\s*)"timeout" arg/) { "#{$1}arg" }
-
-      str = omit_label(str, 'contents', 'syslog_object')
-      str = omit_label(str, 'interface', 'cos_interfaces_type')
-      str = omit_label(str, 'interface', 'ir_interfaces_type')
-      str = omit_label(str, 'interface', 'interfaces_type')
-      str = omit_label(str, 'client-address-list', 'client_address_object')
-      str = omit_label(str, 'prefix-list-item', 'prefix_list_items')
-      str = omit_label(str, 'instance', 'juniper_routing_instance')
-      str = omit_label(str, 'vlan', 'vlan_type')
-
-      str.gsub!(/"icmp"(.*)"icmp6"/) { %["icmpv6"#$1"icmp"] }
-      str.gsub!(/"http"(.*)"https"/) { %["https"#$1"http"] }
-      str.gsub!(/"snmp"(.*)"snmptrap"/) { %["snmptrap"#$1"snmp"] }
-
-      str.gsub!(/(rule\(:juniper_policy_options\) do\s*)sc\(/) { "#{$1}c(" }
-
-      str.gsub!(/"route-filter" (\(\s*control_route_filter_type\s*\))/) { %["route-filter" arg #{$1}.as(:oneline)] }
+      str.gsub!(/(rule\(:juniper_policy_options\) do\s*)c\(/) { "#{$1}c(" }
       str.gsub!(/(rule\(:control_route_filter_type\) do\s*)s\(\s*arg,/) { "#{$1}b(" }
-      str.gsub!(/"source-address-filter" (\(\s*control_source_address_filter_type\s*\))/) { %["source-adress-filter" arg #{$1}.as(:oneline)] }
       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!(/^(\s*)c\(\s*arg,$/) { "#{$1}ca(" }
 
       str
     end
@@ -152,6 +176,10 @@ module Junoser
       objects.inject {|rule, object| rule | object }
     end
 
+    def ca(*objects)
+      objects.inject {|rule, object| rule | object } | arg
+    end
+
     # sequence
     def s(*objects)
       # TODO:  eval "minOccurs" attribute of choice element
@@ -163,6 +191,10 @@ module Junoser
       (c(*objects) >> space.maybe).repeat(0)
     end
 
+    def sca(*objects)
+      (c(*objects, arg) >> space.maybe).repeat(0)
+    end
+
     rule(:arg)     { match('\\S').repeat(1) }
     rule(:space)   { match('\\s').repeat(1) }
     rule(:any)     { match('.').repeat(1) }

data/lib/junoser/version.rb

@@ -1,3 +1,3 @@
 module Junoser
-  VERSION = "0.1.6"
+  VERSION = "0.2.0"
 end

data/lib/junoser/xsd/sequence.rb

@@ -28,7 +28,7 @@ module Junoser
         when has_single_child_of?(Junoser::Xsd::Choice)
           child = config.first
           str = child.config.map(&:to_s).compact.join(",\n")
-          format('sc(', str, ')') unless str.empty?
+          format('c(', str, ')') unless str.empty?
         else
           str = config.map {|c| c.is_a?(String) ? format(OFFSET + c) : c.to_s }.compact.join(",\n")
           format('s(', str, ')')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: junoser
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.2.0
 platform: ruby
 authors:
 - Shintaro Kojima
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-10-30 00:00:00.000000000 Z
+date: 2015-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet
@@ -153,9 +153,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: PEG parser for JUNOS configuration.
 test_files: []
-has_rdoc: