junoser 0.3.12 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d2f7cf47c90df6c85894a4139d839ef0508328017b341f1b36a3d33af1c80636
-  data.tar.gz: 052afe8daf0090bcc2345a92e1e6b32787a4feb7cfcd45906a58ab46fd7ac822
+  metadata.gz: f37eb9172418859fd2a4144cdd0d4b47c657162e02117cfb9fe73a33fe9ca0e2
+  data.tar.gz: 4791fbaf136985e1b16a4dba7daaf2fc2dbcee8ed85508d2e3c65b5b3f4575b9
 SHA512:
-  metadata.gz: 9b19b660982613861c9747782ff5002c7dc21cab047081e421bf0b45a920b2f40d27125b72e951e780c15cbf8653c632cbee44323553d6b83ff3bbc5276c34bf
-  data.tar.gz: b66c59b3d594714a9dada165a97930e326f82283a4a3a2c9270168197e0072ff09e5d44855582e96b5472e584311d76f4d14a53612d4464898f7dcfb1c9e8ead
+  metadata.gz: 5961c24e760831bf52f6edb82c5972aefb023d99639091fb2c12d95f083ef57e9e2703fd441dbb0c1d5e44b5e386834679e910873e44825c9a7c103243fa2c6c
+  data.tar.gz: 9e41dcfb72bfe2f5b801506c50725a4a0da2f56a09a8ddeedb8cb7d4b8ae82864008c89cdf2da837ced1c83d39d2e7d53640bba5f7dcb459d434e0d173862659

data/.travis.yml

@@ -1,9 +1,9 @@
 language: ruby
 
 rvm:
-  - 2.4
-  - 2.5
   - 2.6
+  - 2.7
+  - 3.0
   - ruby-head
 
 before_install:

data/CHANGELOG.md

@@ -1,9 +1,59 @@
+## [0.4.2] - 2021-08-30
+
+### Added
+
+* Newly supported syntax
+  * "virtual-chassis vcp-snmp-statistics"
+  * "application_object"
+
+### Fixed
+
+* Keywords "tls", "group", "dest-nat-rule-match", "src-nat-rule-match", and "static-nat-rule-match" might be marked as invalid in some hierarchies
+* "applications application xxx term xxx"
+* "security"
+
+
+## [0.4.1] - 2021-06-06
+
+### Added
+
+* Newly supported syntax
+  * "apply-groups-except"
+
+### Fixed
+
+* Keywords "scpf-link", "https", "inet6", "icmp6", "icmpv6", "ospf3", and "snmptrap" might be marked as invalid in some hierarchies
+* "policy-options community xxx members"
+* "policy-options route-distinguisher xxx members"
+* "routing-options confederation members"
+
+
+## [0.4.0] - 2021-05-02
+
+### Added
+
+* Recreate parser based on MX 19.3R3-S1.3 xsd
+
+
+## [0.3.13] - 2020-05-20
+
+### Fixed
+
+* Accept quoted strings under
+  * "system login message"
+  * "policy-options prefix-list xxx apply-path"
+
+* <xsd:documentation/> processing during "rake build:config"
+* <xsd:sequence><xsd:choice maxOccurs="unbounded"></xsd:sequence> should be considered as a sequence
+
+
 ## [0.3.12] - 2020-02-06
 
 ### Fixed
 
 * "insert" statement whose last two tokens are keyword and argument, with the following single "before" (or "after") argument
-  * eg) insert protocols bgp group foo export bar insert baz
+  * eg) insert protocols bgp group foo export bar before baz
+
 
 ## [0.3.11] - 2020-01-28
 
@@ -11,6 +61,7 @@
 
 * junoser-squash supports "activate" statement
 
+
 ## [0.3.10] - 2020-01-27
 
 ### Added
@@ -23,6 +74,7 @@
 * junoser-squash unexpectedly removed "deactivate" statements
 * "deactivate" to "inactive:" translation during "junoser -s"
 
+
 ## [0.3.9] - 2019-11-17
 
 ### Fixed
@@ -30,12 +82,13 @@
 * security policies
 * "junoser -s" and "junoser -d" unexpectedly raises errors
 
+
 ## [0.3.8] - 2019-11-04
 
 ### Added
 
 * Newly supported syntax
-  * security (by porting the hierarchy from vSRX 18.3R1.9)
+  * "security" (by porting the hierarchy from vSRX 18.3R1.9)
 
 
 ## [0.3.7] - 2019-09-03
@@ -60,7 +113,7 @@
 
 ### Fixed
 
-* Accept quoted string for
+* Accept quoted strings under
   * "as-path path"
 
 
@@ -69,16 +122,16 @@
 ### Added
 
 * Newly supported syntax
-  * protocols bgp minimum-hold-time xxx
-  * system dump-on-panic
-  * chassis fpc x pic x port x number-of-sub-ports x
+  * "protocols bgp minimum-hold-time xxx"
+  * "system dump-on-panic"
+  * "chassis fpc x pic x port x number-of-sub-ports x"
 
 
 ## [0.3.3] - 2018-10-09
 
 ### Fixed
 
-* Accept quoted string for
+* Accept quoted strings under
   * "snmp location"
   * "snmp contact"
 
@@ -121,7 +174,7 @@
 ### Added
 
 * Newly supported syntax
-  * class-of-service shared-buffer
+  * "class-of-service shared-buffer"
 
 
 ## [0.2.11] - 2017-09-07
@@ -129,15 +182,15 @@
 ### Added
 
 * Newly supported syntax
-  * forwarding-options analyzer
-  * routing-options dynamic-tunnels <name> udp
+  * "forwarding-options analyzer"
+  * "routing-options dynamic-tunnels <name> udp"
 
 
 ## [0.2.10] - 2017-08-22
 
 ### Fixed
 
-* routing-options dynamic-tunnels
+* "routing-options dynamic-tunnels"
 
 
 ## [0.2.9] - 2017-06-09
@@ -145,14 +198,14 @@
 ### Added
 
 * Newly supported syntax
-  * protocols sflow
+  * "protocols sflow"
 
 
 ## [0.2.8] - 2017-05-17
 
 ### Fixed
 
-* chassis forwarding-options
+* "chassis forwarding-options"
 
 
 ## [0.2.7] - 2017-05-01
@@ -160,9 +213,9 @@
 ### Added
 
 * Newly supported syntax
-  * system processes app-engine-virtual-machine-management-service
-  * system processes app-engine-management-service
-  * chassis fpc ? pic ? tunnel-services
+  * "system processes app-engine-virtual-machine-management-service"
+  * "system processes app-engine-management-service"
+  * "chassis fpc ? pic ? tunnel-services"
 
 
 ## [0.2.6] - 2017-04-21
@@ -170,7 +223,7 @@
 ### Added
 
 * Newly supported syntax
-  * chassis fpc ? pic ? port ? channel-speed ?
+  * "chassis fpc ? pic ? port ? channel-speed ?"
 
 ## [0.2.5] - 2017-04-18
 
@@ -184,7 +237,7 @@
 ### Added
 
 * Newly supported syntax
-  * system processes app-engine-virtual-machine-management-service traceoptions
+  * "system processes app-engine-virtual-machine-management-service traceoptions"
   * Some platforms expect "system processes dhcp", not "system processes dhcp-service"
   * "storm-control" under family bridge
 
@@ -198,8 +251,8 @@
 ### Added
 
 * Newly supported syntax
-  * chassis fpc N error
-  * forwarding-options sampling family mpls
+  * "chassis fpc N error"
+  * "forwarding-options sampling family mpls"
 
 
 ## [0.2.2] - 2016-02-15
@@ -207,7 +260,7 @@
 ### Added
 
 * Newly supported syntax
-  * system services ssh
+  * "system services ssh"
 
 ### Fixed
 
@@ -224,7 +277,7 @@
 
 ### Fixed
 
-* template-name
+* "template-name"
 
 
 ## [0.2.0] - 2015-12-26
@@ -243,44 +296,44 @@
 
 ### Fixed
 
-* 802.3ad
-* ether-options
-* storm-control default
-* vrf-target
-* maximum-prefix teardown
-* traceoptions
-* system syslog archive
-* system login user
-* routing-options confederation
-* hold-time
-* protocols ospf area x.x.x.x stub default-metric x x
-* protocols rsvp interface xxx subscription x
-* traceoptions cspf-link
-* protocols mpls priority
-* protocols mpls label-switched-path xxx primary xxx bandwidth xxx
-* protocols xxx rib-group xxx xxx
-* protocols mpls path xxx xxx
+* "802.3ad"
+* "ether-options"
+* "storm-control default"
+* "vrf-target"
+* "maximum-prefix teardown"
+* "traceoptions"
+* "system syslog archive"
+* "system login user"
+* "routing-options confederation"
+* "hold-time"
+* "protocols ospf area x.x.x.x stub default-metric x x"
+* "protocols rsvp interface xxx subscription x"
+* "traceoptions cspf-link"
+* "protocols mpls priority"
+* "protocols mpls label-switched-path xxx primary xxx bandwidth xxx"
+* "protocols xxx rib-group xxx xxx"
+* "protocols mpls path xxx xxx"
 
 
 ## [0.1.6] - 2015-10-31
 
 ### Fixed
 
-* route-filter statement should be translated into one-line
+* "route-filter" statement should be translated into one-line
 
 
 ## [0.1.5] - 2015-09-11
 
 ### Fixed
 
-* mistakenly processed '{' and '}' in as-path string
+* Mistakenly processed '{' and '}' in as-path string
 
 
 ## [0.1.4] - 2015-09-11
 
 ### Fixed
 
-* missing community operator in policy-statement didn't fail
+* Missing community operator in policy-statement didn't fail
 
 
 ## [0.1.3] - 2015-07-26

data/Gemfile.lock

@@ -1,19 +1,21 @@
 PATH
   remote: .
   specs:
-    junoser (0.3.12)
+    junoser (0.4.2)
       parslet
 
 GEM
   remote: https://rubygems.org/
   specs:
-    mini_portile2 (2.4.0)
-    nokogiri (1.10.4)
-      mini_portile2 (~> 2.4.0)
-    parslet (1.8.2)
-    power_assert (1.1.5)
-    rake (10.5.0)
-    test-unit (3.3.3)
+    mini_portile2 (2.5.3)
+    nokogiri (1.11.7)
+      mini_portile2 (~> 2.5.0)
+      racc (~> 1.4)
+    parslet (2.0.0)
+    power_assert (2.0.0)
+    racc (1.5.2)
+    rake (13.0.3)
+    test-unit (3.4.4)
       power_assert
 
 PLATFORMS
@@ -23,8 +25,8 @@ DEPENDENCIES
   bundler (~> 2.0)
   junoser!
   nokogiri
-  rake (~> 10.0)
+  rake (~> 13.0)
   test-unit
 
 BUNDLED WITH
-   2.1.2
+   2.2.16

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2020 Shintaro Kojima
+Copyright (c) 2015-2021 Shintaro Kojima
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -28,34 +28,70 @@ $ gem install junoser
 
 ### Usage
 
-To verify configurations syntax:
+#### Syntax validation
 
 ```zsh
 $ junoser -c config.txt
-```
 
-or
+# or
 
-```zsh
 $ cat config.txt | junoser -c
 ```
 
-To translate configuration into "display set" form:
+#### Syntax translation
+
+##### Structured form into "display set"
 
 ```zsh
-$ /exe/junoser -d config.txt
+$ junoser -d config.txt
 set protocols bgp group ebgp-peers neighbor 192.0.2.2
-```
 
-or
+# or
 
-```zsh
 $ cat config.txt | junoser -d
 set protocols bgp group ebgp-peers neighbor 192.0.2.2
 ```
 
-Use ```junoser -s``` to translate into structured form.
+##### "display set" into structured form
+
+```zsh
+$ junoser -s config.txt
+
+# or
+
+$ cat config.txt | junoser -s
+```
+
+
+## Updating parser for new directives
+
+From [Juniper
+website](https://support.juniper.net/support/downloads/), you can
+download the XSD schema for the version of JunOS you want to target:
 
+ - Junos XML API
+ - Select your version
+ - Application Tools
+ - XML Schema for Configurator Data
+
+Alternatively, you can retrieve the schema with Netconf:
+
+```zsh
+$ ssh -Csp 830 JUNOS netconf < example/get-schema.xml | sed -n '/^<xsd:schema/,/^<\/xsd:schema/p' > junos-XXX.xsd
+```
+
+Put it in `tmp/`, update `xsd_path` in `Rakefile` and run:
+
+```zsh
+$ bundle exec rake build:config build:rule
+```
+
+Alternatively, you may look in `example/` for some prebuilt rules
+file. If you want to use them, copy one to `tmp/rules.rb` and run:
+
+```zsh
+$ bundle exec rake build:rule
+```
 
 ## Contributing
 
@@ -67,4 +103,4 @@ Or send a pull request to fix.
 
 ## Copyright and License
 
-Copyright (c) 2020 Shintaro Kojima. Code released under the [MIT license](LICENSE.txt).
+Copyright (c) 2015-2021 Shintaro Kojima. Code released under the [MIT license](LICENSE.txt).

data/Rakefile

@@ -4,10 +4,10 @@ require 'nokogiri'
 require 'pathname'
 require 'rake/testtask'
 
-xsd_path = File.join(__dir__, 'tmp/junos-system-17.2.xsd')
+xsd_path = File.join(__dir__, 'tmp/junos-system-19.3.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/schema.js')
+js_parser_path = File.join(__dir__, 'tmp/junos.js')
 
 def open_files(input, output, &block)
   i = open(input)
@@ -19,12 +19,22 @@ def open_files(input, output, &block)
   o.close
 end
 
+def move_wildcards(element)
+  ['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
+      parent << removed
+    end
+  end
+end
 
 namespace :build do
   desc 'Build an intermediate config hierarchy'
   task :config do
     open_files(xsd_path, rule_path) do |input, output|
       Nokogiri::XML(input).root.remove_unused.xpath('/xsd:schema/*').each do |e|
+        move_wildcards e # Move wildcard elements to the end of siblings as they capture keywords unexpectedly
         output.puts e.to_config
       end
     end
@@ -56,7 +66,6 @@ task 'find-srx-methods' do
   end
 end
 
-
 Rake::TestTask.new do |t|
   t.libs << 'test'