junoser 0.5.3 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4241a7b2a24ab7118dae491d2538107fdfa0b4a0f8f4fe701e713a00197a424c
-  data.tar.gz: fba378b8cf21dc3ffc554c20ad6b0650844546b54defbe6f1fec15cea6294182
+  metadata.gz: bd8a2424c80ebdcb0ed5600ad8288c998200c086d77959e54e06ef64d454e34d
+  data.tar.gz: b5f2f4bcfd79fc44c64847b3ee5d56ae908711b704451250ef7e26943cf059ae
 SHA512:
-  metadata.gz: 3283f8dfa5972d2ca4bdd25abc0b6c30d9b41266afb6a4ac31b6e9144c46b1adc1e4d03af939fb0ebce2a2e42b57197acaaf38c81005ffe7b1b66df75e42bef0
-  data.tar.gz: a626b7bd44f66b3cc9606a23a4342b5101deedd75f8df70eac66afa87d695971bb598a9546a50d83fea4115a9974cd23c78381a0a76e337d914facab8a8c3ebd
+  metadata.gz: 95a0151dabc6e3b9a1c3c82c1e97cd9fe64546bfc2ca858767ce539fdade394b6b1b9891753a2fcdcf1a261754933c047f37e2d20f9d913beff5dd8c73cf313d
+  data.tar.gz: 487285a5986e28319c1ce38fe64573402e662fad33791d049eff9781b2c140474fb02d819d2151f3e76fb84d553a779446dac48d9ae5428d1dcff1d10c785971

data/CHANGELOG.md

@@ -1,3 +1,25 @@
+## [0.5.5] - 2023-11-14
+
+### Fixed
+
+* junoser-squash unexpectedly removed non-idential lines
+
+
+## [0.5.4] - 2023-07-15
+
+### Added
+
+* Newly supported syntax
+  * "chassis dump-on-panic"
+
+### Fixed
+
+* "policy-options policy-statement xxx from policy" didn't accept `[ ... ]` or `( ... )` expressions
+* "system no-redirects-ipv6" was unexpectedly marked as invalid
+* "snmp trap-group xxx categories chassis-cluster" was unexpectedly marked as invalid
+* error when parsing "class-of-service schedulers foo drop-profile-map ..."
+
+
 ## [0.5.3] - 2023-07-10
 
 ### Added

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    junoser (0.5.3)
+    junoser (0.5.5)
       parslet
 
 GEM

data/lib/junoser/parser.rb

@@ -180,7 +180,7 @@ module Junoser
     end
 
     rule(:policy_algebra) do
-          arg.as(:arg)
+          any.as(:arg)
     end
 
     rule(:regular_expression) do
@@ -9575,7 +9575,7 @@ module Junoser
                               b(str("categories"),
                                   c(
                                       str("authentication"),
-                                      str("chassis"),
+                                      str("chassis-ha-reswatch"),
                                       str("link"),
                                       str("remote-operations"),
                                       str("routing"),
@@ -9587,7 +9587,7 @@ module Junoser
                                       str("services"),
                                       str("chassis-cluster"),
                                       str("chassis-high-availability"),
-                                      str("chassis-ha-reswatch"),
+                                      str("chassis"),
                                       str("timing-events"),
                                       str("dot3oam-events"),
                                       b(str("sonet-alarms"),
@@ -22386,6 +22386,7 @@ module Junoser
                     str("vlan-isolation")
                 )
             ),
+            str("dump-on-panic"),
             # Ported from vSRX 18.3R1.9
             b(str("cluster"),
                 c(
@@ -45007,15 +45008,15 @@ module Junoser
                     a(str("priority"), arg),
                     a(str("excess-priority"), arg),
                     b(str("drop-profile-map"),
-                        s(
-                          b(str("loss-priority"),
-                                (str("low") | str("high") | str("medium-low") | str("medium-high") | str("any"))
+                      s(
+                        s(str("loss-priority"),
+                          (str("low") | str("high") | str("medium-low") | str("medium-high") | str("any"))
                           ),
-                          b(str("protocol"),
-                                (str("tcp") | str("non-tcp") | str("any"))
+                        s(str("protocol"),
+                          (str("tcp") | str("non-tcp") | str("any"))
                           ),
-                          c(
-                            a(str("drop-profile"), arg)
+                        s(str("drop-profile"),
+                          arg
                           )
                         )
                     ).as(:oneline),
@@ -83449,8 +83450,8 @@ module Junoser
             str("no-neighbor-learn"),
             str("no-multicast-echo"),
             str("extended-echo"),
-            str("no-redirects"),
             str("no-redirects-ipv6"),
+            str("no-redirects"),
             str("nd-override-preferred-src"),
             str("no-ping-record-route"),
             str("no-ping-time-stamp"),

data/lib/junoser/ruler.rb

@@ -96,6 +96,19 @@ module Junoser
                 'prefix_list_items'], $1)
       end
 
+      str.gsub!(/^(\s*)"drop-profile-map" \(\s*s\(\s*"loss-priority" \(\s*(.*\s*\),)\s*"protocol" \(\s*(.*\s*\),)\s*c\(\s*"drop-profile" (.*)/) do
+        format([
+                 '"drop-profile-map" (',
+                 '  s(',
+                 '    s("loss-priority",',
+                 "      #{$2}",
+                 '    s("protocol",',
+                 "      #{$3}",
+                 '    s("drop-profile",',
+                 "      #{$4}"
+               ], $1)
+      end
+
       #
       # "arg" matches anything so move to the end
       #
@@ -138,6 +151,8 @@ module Junoser
       str.gsub!(/"snmp"(.*\s*.*)"snmptrap"/) { %["snmptrap"#{$1}"snmp"] }
       str.gsub!(/"ospf"(.*\s*.*)"ospf3"/) { %["ospf3"#{$1}"ospf"] }
       str.gsub!(/"deny"(.*\s*.*)"deny-password"/) { %["deny-password"#{$1}"deny"] }
+      str.gsub!(/"no-redirects"(.*\s*.*)"no-redirects-ipv6"/) { %["no-redirects-ipv6"#{$1}"no-redirects"] }
+      str.gsub!(/"chassis"([^()]*)"chassis-ha-reswatch"/m) { %["chassis-ha-reswatch"#{$1}"chassis"] }
       str.gsub! '"tls1" | "tls11" | "tls12"', '"tls11" | "tls12" | "tls1"'
       str.gsub!(/("group1" \| "group2" \| "group5") \| ([^)]+)/) { "#{$2} | #{$1}" }
 
@@ -252,6 +267,9 @@ module Junoser
       # Fix .xsd: support "set interfaces xxx ether-options speed"
       str.gsub! '"ethernet-1', '"1'
 
+      # Fix .xsd: support "set policy-options policy-statement xxx from policy [expression]"
+      str.gsub!(/^rule\(:policy_algebra\) do(\s*)arg\.as\(:arg\)\send/) { "rule(:policy_algebra) do#{$1}any.as(:arg)\nend" }
+
       str
     end
 

data/lib/junoser/squash.rb

@@ -29,16 +29,18 @@ module Junoser
       end
 
       @lines.uniq!
-      remove_subcommand(@lines).map(&:strip).join("\n")
+      remove_command_context(@lines).map(&:strip).join("\n")
     end
 
     private
 
-    def remove_subcommand(lines)
+    def remove_command_context(lines)
       lines.each_with_index do |l, i|
         lines[i..-1].each do |l2|
-          if l.include?(l2) and l != l2
-            lines.delete(l2)
+          if l2[-1] == " "  # l2 is a command context
+            lines.delete(l2) if l.include?(l2) and l != l2
+          else  # l2 has argument
+            lines.delete(l2) if l.include?("#{l2} ")
           end
         end
       end

data/lib/junoser/version.rb

@@ -1,3 +1,3 @@
 module Junoser
-  VERSION = "0.5.3"
+  VERSION = "0.5.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: junoser
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.5
 platform: ruby
 authors:
 - Shintaro Kojima
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-07-10 00:00:00.000000000 Z
+date: 2023-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet