junoser 0.4.7 → 0.5.1

data/lib/junoser/ruler.rb

@@ -138,7 +138,7 @@ module Junoser
       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}"}
+      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"] }
@@ -226,7 +226,7 @@ module Junoser
       str.gsub! '"system-name" arg', '"name" (quote | arg)'
 
       # Fix .xsd: argument of "system license keys key" can be quoted
-      str.gsub!(/^(rule\(:license_object\) do.*?"key") arg/m) { "#{$1} (quote | arg)"}
+      str.gsub!(/^(rule\(:license_object\) do.*?"key") arg/m) { "#{$1} (quote | arg)" }
 
       # Fix .xsd: "prefix-limit teardown"
       str.gsub!(/^(\s*)"teardown" (\(.*?as\(:oneline\)\s*\)\s*\))/m) do
@@ -234,8 +234,22 @@ module Junoser
       end
 
       # Fix .xsd: faster interface speed support
-      str.gsub! '"40g" | "oc3"', '"40g" | "100g" | "200g" | "400g" | "800g" | "oc3"'
-      str.gsub! '"100G"', '"100G" | "200G" | "400G" | "800G"'
+      str.gsub! '"400g" | "oc', '"400g" | "800g" | "oc'
+      str.gsub! '"400G"', '"400G" | "800G"'
+
+      # Fix .xsd: "poe"
+      str.gsub!(/^(\s*"interface" \("all" \| "all-extended" \| arg\) \(\s*)c\(/) { "#{$1}sc(" }
+      str.gsub!(/^(\s*)\)(,\s*"fpc" enum\(\("all" \| "fpc-slot-number"\)\) \(\s*)c\((.*"lldp-priority"\s*\)\s*\))/m) do
+        "#{$1}).as(:oneline)#{$2}sc(#{$3}.as(:oneline)"
+      end
+
+      # Fix .xsd: support "set protocols iccp peer xxx liveness-detection single-hop"
+      str.gsub!(/(^rule\(:peer_group\) do.*?\n(\s*)"detection-time" \(\s*c\(\s*"threshold" arg\s*\)\s*\))/m) do
+        "#{$1},\n#{format('"single-hop"', $2)}"
+      end
+
+      # Fix .xsd: support "set interfaces xxx ether-options speed"
+      str.gsub! '"ethernet-1', '"1'
 
       str
     end

data/lib/junoser/version.rb

@@ -1,3 +1,3 @@
 module Junoser
-  VERSION = "0.4.7"
+  VERSION = "0.5.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: junoser
 version: !ruby/object:Gem::Version
-  version: 0.4.7
+  version: 0.5.1
 platform: ruby
 authors:
 - Shintaro Kojima
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-09-19 00:00:00.000000000 Z
+date: 2022-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet
@@ -101,9 +101,11 @@ files:
 - bin/console
 - bin/setup
 - commitlint.config.js
+- example/ex-18.1R3-S6.1.xsd
 - example/get-schema.xml
 - example/junos-18.1R3-S9.rb
 - example/mx-19.3R3-S1.3.rb
+- example/mx-21.2R3-S2.9.rb
 - example/vmx-17.2R1.13.rb
 - example/vsrx-12.1.x47.rb
 - example/vsrx-18.3R1.9.rb