junoser 0.5.6 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4881a7d03899a61a155ba962e077a6ca784a6ca254ff526d58942e4d106156b8
-  data.tar.gz: bbe11bdff5a203610c548add8633484c799053dd6195f8e247eade567bb2e8a1
+  metadata.gz: d373ec94d7ebe3053b4f01d01d54beb15b49af4e2e8fbab4b29f9641632b5715
+  data.tar.gz: 046c510a4c5072759810abd68c8df4ce25c7cab976806182cdf0020dbd5b3f6c
 SHA512:
-  metadata.gz: 86cf2a739b40ce9254fd610b289af47734e21bd960b0687cc612c4765bd2e4e29241e39e6505a3902bd1c47cb5fea579ed047d9b3de850691407c644e8babdf3
-  data.tar.gz: b850d666c030f79dcbd5c5b269b7a411ab214c607efb3600c6170f8b417772887d2a5b0767adbce90d3d09387a5e122af45818e5a717056346c1d095585e0389
+  metadata.gz: c8acdf3b078ddc961ba28f3be6f9c2b3870b2f3ee85a81b7bec28fee09a390709e0783e520c67ef3b30fe87b15a317d7dcb879bdadd3d3b3d3d101a3fdb05c32
+  data.tar.gz: 9f4ff9fda7f65b1a318dcd43858874e7823e0008028071a0a2b20c951cdbdf04b6665e521044a572fd46f34626a345d543f2df9366524f55d07cf99dbfb55064

data/.github/dependabot.yml

@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"

data/.github/workflows/test-linux.yaml

@@ -9,7 +9,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby-version: ['3.2', '3.1', '3.0']
+        ruby-version: ['3.3', '3.2', '3.1']
         os: [ubuntu-latest]
         experimental: [false]
         include:
@@ -19,7 +19,7 @@ jobs:
 
     name: Test with ruby ${{ matrix.ruby-version }} on ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:

data/CHANGELOG.md

@@ -1,3 +1,27 @@
+## [0.7.0] - 2024-12-19
+
+### Added
+
+* Recreate parser based on MX 22.4R3-S2.11 xsd
+* Newly supported syntax
+  * "groups xxx when"
+  * "snmp stats-cache-lifetime xxx"
+
+
+## [0.6.0] - 2024-09-15
+
+### Added
+
+* Update vSRX syntax to 22.4R1.10
+  * "security"
+  * "chassis cluster"
+* Newly supported syntax
+  * "interfaces xxx enable"
+  * "interfaces xxx unit xxx enable"
+* Rake task
+  * `rule:tree` to show the dependency tree of rules
+
+
 ## [0.5.6] - 2024-05-01
 
 ### Fixed

data/Gemfile.lock

@@ -1,21 +1,21 @@
 PATH
   remote: .
   specs:
-    junoser (0.5.6)
+    junoser (0.7.0)
       parslet
 
 GEM
   remote: https://rubygems.org/
   specs:
-    mini_portile2 (2.8.6)
-    nokogiri (1.16.4)
+    mini_portile2 (2.8.8)
+    nokogiri (1.17.2)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     parslet (2.0.0)
-    power_assert (2.0.3)
-    racc (1.7.3)
+    power_assert (2.0.4)
+    racc (1.8.1)
     rake (13.2.1)
-    test-unit (3.6.2)
+    test-unit (3.6.7)
       power_assert
 
 PLATFORMS
@@ -29,4 +29,4 @@ DEPENDENCIES
   test-unit
 
 BUNDLED WITH
-   2.4.1
+   2.5.16

data/Rakefile

@@ -4,7 +4,7 @@ require 'nokogiri'
 require 'pathname'
 require 'rake/testtask'
 
-xsd_path = File.join(__dir__, 'tmp/junos-system-21.2.xsd')
+xsd_path = File.join(__dir__, 'tmp/junos-system-22.4.xsd')
 rule_path = File.join(__dir__, 'tmp/rule.rb')
 ruby_parser_path = File.join(__dir__, 'lib/junoser/parser.rb')
 js_parser_path = File.join(__dir__, 'tmp/junos.js')
@@ -20,7 +20,7 @@ def open_files(input, output, &block)
 end
 
 def move_wildcards(element)
-  ['ipaddr', 'ipv6addr', 'ipprefix'].each do |pattern|
+  %w[ipaddr ipv6addr ipprefix].each do |pattern|
     element.xpath(%[.//xsd:element[@type="#{pattern}"]/xsd:annotation/xsd:appinfo/flag[text()="nokeyword"]/../../..]).each do |wildcard|
       parent = wildcard.parent
       removed = wildcard.remove
@@ -60,12 +60,24 @@ task 'find-srx-methods' do
   vmx = File.read('lib/junoser/parser.rb')
 
   vsrx.scan(/^ +([0-9a-z_]+) *$/).flatten.uniq.sort.each do |method|
-    next if ['arg', 'end', 'ipaddr', 'time'].include?(method)
+    next if %w[arg end ipaddr time].include?(method)
 
     puts method unless vsrx =~ /rule\(:#{method}\)/m || vmx =~ /rule\(:#{method}\)/m
   end
 end
 
+namespace :rule do
+  desc 'Show rule tree'
+  task :tree, [:path] do |_, args|
+    if args.path
+      raise "File not found: #{args.path}" unless File.exist?(args.path)
+      Junoser::RuleTree::Parser.new(File.read(args.path)).print
+    else
+      Junoser::RuleTree::Parser.new($stdin.read).print
+    end
+  end
+end
+
 Rake::TestTask.new do |t|
   t.libs << 'test'
 

data/lib/junoser/development.rb

@@ -2,3 +2,4 @@ require 'underscorable'
 require 'junoser/xsd/parsable'
 require 'junoser/ruler'
 require 'junoser/js_ruler'
+require 'junoser/rule_tree'

data/lib/junoser/js_ruler.rb

@@ -25,6 +25,50 @@ module Junoser
 
     private
 
+    def process_lines(str)
+      # set groups
+      str.gsub! /"groups" \(.*\s*s\(\s*any\s*\)\s*\)/, <<-EOS.strip
+          "groups" arg (  /* Configuration groups */
+            "when" (  /* Specify additional conditions for groups */
+              c(
+                "chassis" arg  /* Chassis id */,
+                "member" arg  /* Member of virtual chassis */,
+                "model" arg  /* Model name */,
+                "node" arg  /* Node of cluster */,
+                "peers" arg  /* Hosts on which this group should be effective */,
+                "routing-engine" arg  /* Routing Engine */,
+                "time" (  /* Time at which group should be effective */
+                  "to" arg  /* End time([yyyy-mm-dd.]hh:mm) */,
+                  arg
+                )
+              )
+            )
+          )
+      EOS
+
+      # set protocols mpls path
+      str.gsub!(/("path" arg \(.*Route of a label-switched path.*)(\s*)c\(/) do
+        "#{$1}#{$2}s(#{$2}ipaddr,"
+      end
+
+      # set protocols iccp peer xxx liveness-detection single-hop
+      str.gsub!(/(^rule\(:peer_group\) do.*?\n(\s*)"detection-time" \(.*?c\(\s*"threshold" arg .*?\)\s*\))/m) do
+        "#{$1},\n#{format('"single-hop"', $2)}"
+      end
+
+      # set forwarding-options dhcp-relay server-group
+      str.gsub!(/^(rule\(:(?:v6_)?server_group_type\) do)\n(.*?)\nend/m) do
+        "#{$1}\n  arg.as(:arg) (\n#{$2}\n  )\nend"
+      end
+
+      # set interfaces xxx enable
+      str.gsub!(/^(rule\(:interfaces_type\) do\s*[^\n]*\s*c\()(\s*)/m) do
+        %[#{$1}#{$2}"enable",#{$2}]
+      end
+
+      str
+    end
+
     def process_line(str)
       str = remove_undefined_variables(str)
       str = process_common_syntax(str)
@@ -210,25 +254,6 @@ 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
-
-      # set protocols iccp peer xxx liveness-detection single-hop
-      str.gsub!(/(^rule\(:peer_group\) do.*?\n(\s*)"detection-time" \(.*?c\(\s*"threshold" arg .*?\)\s*\))/m) do
-        "#{$1},\n#{format('"single-hop"', $2)}"
-      end
-
-      # set forwarding-options dhcp-relay server-group
-      str.gsub!(/^(rule\(:(?:v6_)?server_group_type\) do)\n(.*?)\nend/m) do
-        "#{$1}\n  arg.as(:arg) (\n#{$2}\n  )\nend"
-      end
-
-      str
-    end
-
     def finalize(lines)
       lines = balance_parenthesis(lines)
       objectize_arg_of_s(lines)