junoser 0.2.10 → 0.2.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 41b9e50de5819a393cf9067e372ebe246c558080
-  data.tar.gz: 37e5bc216c3384ee235afb8da300bcf5c741565f
+  metadata.gz: 681932944528ce0c17ed6a01d9630eccc3487353
+  data.tar.gz: b93ab704fafd87072e69b836131b48a892e584d7
 SHA512:
-  metadata.gz: bab52e5a8c7c267c4a5e5f002a07487ac4ac7da38a2d51f849b49924dd09f0287bfb3ba6cfe7e13ec98ddd00df2540d7bdd3a45edeec07139a74f65c9ab22017
-  data.tar.gz: effa5919b1a703b9565ca95a5795b3e686496eb4955724b62d7c99dd33cef88510537bba222d2246ccb537aebbd02ca5481291e3e293543197492a669446419b
+  metadata.gz: 1a9be3d00d639ae70468c6fefcf8d7f9d24aa4e1cb45e2203611bf4e1bc13d4cc76e55c0ad12f5e23d1618e5830da0a1497e9c3120117525fc15c32327a63c4c
+  data.tar.gz: 43bf75c835a850e9fcdc0bac537aeaa293d8d45450ee7bd5a0a5b94adf201a6c8a6d8b7e70c65f7dec1b885addfa404d6416ca6329997d079f0e855537b9f712

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.2.11 / 2017-09-07
+
+* Newly supported syntax
+  * forwarding-options analyzer
+  * routing-options dynamic-tunnels <name> udp
+
 ## 0.2.10 / 2017-08-22
 
 * Bug fix

data/example/vsrx-12.1.x47.rb

@@ -16318,6 +16318,9 @@ rule(:juniper_forwarding_options) do
         "accounting" (
           juniper_packet_accounting_options
         ),
+        "analyzer" (
+          smpl_analyzer_type
+        ),
         "port-mirroring" (
           juniper_port_mirror_options
         ),
@@ -29620,7 +29623,8 @@ rule(:dynamic_tunnel_type) do
                   )
               )
           ),
-          "gre"
+          "gre",
+          "udp",
         ),
         "destination-networks" (
           network_type
@@ -38480,3 +38484,164 @@ rule(:juniper_protocols_sflow) do
     )
   )
 end
+
+rule(:smpl_analyzer_type) do
+  arg.as(:arg) (
+    c(
+        "input" (
+          smpl_analyzer_input_type
+        ),
+        "output" (
+          smpl_analyzer_output_type
+        )
+    )
+  )
+end
+
+rule(:smpl_analyzer_input_type) do
+    c(
+        "rate" arg,
+        "maximum-packet-length" arg,
+        "ingress" (
+          smpl_analyzer_ingress_type
+        ),
+        "egress" (
+          smpl_analyzer_egress_type
+        )
+    )
+end
+
+rule(:smpl_analyzer_egress_type) do
+    c(
+        "interface" (
+          analyzer_egress_interface_type
+        ),
+        "routing-instance" (
+          analyzer_egress_routing_instance_type
+        ),
+        "vlan" (
+          analyzer_egress_vlan_type
+        ),
+        "bridge-domain" (
+          analyzer_egress_bridge_domain_type
+        )
+    )
+end
+
+rule(:analyzer_egress_bridge_domain_type) do
+  arg.as(:arg)
+end
+
+rule(:analyzer_egress_interface_type) do
+  ("name" | "all").as(:arg)
+end
+
+rule(:analyzer_egress_routing_instance_type) do
+  arg.as(:arg) (
+    c(
+        "vlan" (
+          analyzer_egress_vlan_type
+        ),
+        "bridge-domain" (
+          analyzer_egress_bridge_domain_type
+        )
+    )
+  )
+end
+
+rule(:analyzer_egress_vlan_type) do
+  arg.as(:arg)
+end
+
+rule(:smpl_analyzer_ingress_type) do
+    c(
+        "interface" (
+          analyzer_ingress_interface_type
+        ),
+        "routing-instance" (
+          analyzer_ingress_routing_instance_type
+        ),
+        "vlan" (
+          analyzer_ingress_vlan_type
+        ),
+        "bridge-domain" (
+          analyzer_ingress_bridge_domain_type
+        )
+    )
+end
+
+rule(:analyzer_ingress_bridge_domain_type) do
+  arg.as(:arg)
+end
+
+rule(:analyzer_ingress_interface_type) do
+  ("name" | "all").as(:arg)
+end
+
+rule(:analyzer_ingress_routing_instance_type) do
+  arg.as(:arg) (
+    c(
+        "vlan" (
+          analyzer_ingress_vlan_type
+        ),
+        "bridge-domain" (
+          analyzer_ingress_bridge_domain_type
+        )
+    )
+  )
+end
+
+rule(:analyzer_ingress_vlan_type) do
+  arg.as(:arg)
+end
+
+rule(:smpl_analyzer_output_type) do
+    c(
+        c(
+          "interface" (
+            interface_name
+          ),
+          "ip-address" (
+            ipv4addr
+          ),
+          "next-hop-group" arg,
+          "routing-instance" (
+            output_routing_instance_type
+          ),
+          "vlan" (
+            pm_rspan_vlan
+          ),
+          "bridge-domain" (
+            pm_rspan_bridge_domain
+          )
+        )
+    )
+end
+
+rule(:output_routing_instance_type) do
+  arg.as(:arg) (
+    c(
+        "ip-address" (
+          ipv4addr
+        ),
+        "vlan" (
+          pm_rspan_vlan
+        ),
+        "bridge-domain" (
+          pm_rspan_bridge_domain
+        )
+    )
+  )
+end
+
+rule(:pm_rspan_bridge_domain) do
+  arg.as(:arg)
+end
+
+rule(:pm_rspan_vlan) do
+  arg.as(:arg) (
+    c(
+        "no-tag"
+    )
+  )
+end

data/lib/junoser/parser.rb

@@ -16023,7 +16023,7 @@ module Junoser
             ),
             b(str("voip"),
                 c(
-                    a(str("interface"), str("name") | str("access-ports"),
+                    a(str("interface"), arg | str("access-ports"),
                         c(
                             a(str("vlan"), arg),
                             a(str("forwarding-class"), arg)
@@ -16242,7 +16242,7 @@ module Junoser
     end
 
     rule(:analyzer_egress_interface_type) do
-      (str("name") | str("all")).as(:arg)
+      (arg | str("all")).as(:arg)
     end
 
     rule(:analyzer_ingress_type) do
@@ -16257,7 +16257,7 @@ module Junoser
     end
 
     rule(:analyzer_ingress_interface_type) do
-      (str("name") | str("all")).as(:arg)
+      (arg | str("all")).as(:arg)
     end
 
     rule(:analyzer_output_type) do
@@ -16324,6 +16324,9 @@ module Junoser
             b(str("accounting"),
               juniper_packet_accounting_options
             ),
+            b(str("analyzer"),
+              smpl_analyzer_type
+            ),
             b(str("port-mirroring"),
               juniper_port_mirror_options
             ),
@@ -22719,7 +22722,7 @@ module Junoser
                     a(str("ptopo-configuration-maximum-hold-time"), arg),
                     a(str("lldp-configuration-notification-interval"), arg),
                     str("netbios-snooping"),
-                    a(str("interface"), str("name") | str("all"),
+                    a(str("interface"), arg | str("all"),
                         c(
                             c(
                               str("disable")
@@ -22734,7 +22737,7 @@ module Junoser
                       str("disable")
                     ),
                     a(str("fast-start"), arg),
-                    a(str("interface"), str("name") | str("all"),
+                    a(str("interface"), arg | str("all"),
                         c(
                             c(
                               str("disable")
@@ -29470,7 +29473,8 @@ module Junoser
                       )
                   )
               ),
-              str("gre")
+              str("gre"),
+              str("udp"),
             ),
             b(str("destination-networks"),
               network_type
@@ -38275,5 +38279,166 @@ module Junoser
         )
       )
     end
+
+    rule(:smpl_analyzer_type) do
+      b(arg.as(:arg),
+        c(
+            b(str("input"),
+              smpl_analyzer_input_type
+            ),
+            b(str("output"),
+              smpl_analyzer_output_type
+            )
+        )
+      )
+    end
+
+    rule(:smpl_analyzer_input_type) do
+        c(
+            a(str("rate"), arg),
+            a(str("maximum-packet-length"), arg),
+            b(str("ingress"),
+              smpl_analyzer_ingress_type
+            ),
+            b(str("egress"),
+              smpl_analyzer_egress_type
+            )
+        )
+    end
+
+    rule(:smpl_analyzer_egress_type) do
+        c(
+            b(str("interface"),
+              analyzer_egress_interface_type
+            ),
+            b(str("routing-instance"),
+              analyzer_egress_routing_instance_type
+            ),
+            b(str("vlan"),
+              analyzer_egress_vlan_type
+            ),
+            b(str("bridge-domain"),
+              analyzer_egress_bridge_domain_type
+            )
+        )
+    end
+
+    rule(:analyzer_egress_bridge_domain_type) do
+      arg.as(:arg)
+    end
+
+    rule(:analyzer_egress_interface_type) do
+      (arg | str("all")).as(:arg)
+    end
+
+    rule(:analyzer_egress_routing_instance_type) do
+      b(arg.as(:arg),
+        c(
+            b(str("vlan"),
+              analyzer_egress_vlan_type
+            ),
+            b(str("bridge-domain"),
+              analyzer_egress_bridge_domain_type
+            )
+        )
+      )
+    end
+
+    rule(:analyzer_egress_vlan_type) do
+      arg.as(:arg)
+    end
+
+    rule(:smpl_analyzer_ingress_type) do
+        c(
+            b(str("interface"),
+              analyzer_ingress_interface_type
+            ),
+            b(str("routing-instance"),
+              analyzer_ingress_routing_instance_type
+            ),
+            b(str("vlan"),
+              analyzer_ingress_vlan_type
+            ),
+            b(str("bridge-domain"),
+              analyzer_ingress_bridge_domain_type
+            )
+        )
+    end
+
+    rule(:analyzer_ingress_bridge_domain_type) do
+      arg.as(:arg)
+    end
+
+    rule(:analyzer_ingress_interface_type) do
+      (arg | str("all")).as(:arg)
+    end
+
+    rule(:analyzer_ingress_routing_instance_type) do
+      b(arg.as(:arg),
+        c(
+            b(str("vlan"),
+              analyzer_ingress_vlan_type
+            ),
+            b(str("bridge-domain"),
+              analyzer_ingress_bridge_domain_type
+            )
+        )
+      )
+    end
+
+    rule(:analyzer_ingress_vlan_type) do
+      arg.as(:arg)
+    end
+
+    rule(:smpl_analyzer_output_type) do
+        c(
+            c(
+              b(str("interface"),
+                interface_name
+              ),
+              b(str("ip-address"),
+                ipv4addr
+              ),
+              a(str("next-hop-group"), arg),
+              b(str("routing-instance"),
+                output_routing_instance_type
+              ),
+              b(str("vlan"),
+                pm_rspan_vlan
+              ),
+              b(str("bridge-domain"),
+                pm_rspan_bridge_domain
+              )
+            )
+        )
+    end
+
+    rule(:output_routing_instance_type) do
+      b(arg.as(:arg),
+        c(
+            b(str("ip-address"),
+              ipv4addr
+            ),
+            b(str("vlan"),
+              pm_rspan_vlan
+            ),
+            b(str("bridge-domain"),
+              pm_rspan_bridge_domain
+            )
+        )
+      )
+    end
+
+    rule(:pm_rspan_bridge_domain) do
+      arg.as(:arg)
+    end
+
+    rule(:pm_rspan_vlan) do
+      b(arg.as(:arg),
+        c(
+            str("no-tag")
+        )
+      )
+    end
   end
 end

data/lib/junoser/ruler.rb

@@ -48,6 +48,7 @@ module Junoser
       str.gsub! '"minus-literal"', '"-"'
 
       str.gsub!(/\((.*) \| "name"\)/) { "(#$1 | arg)" }
+      str.gsub!(/\("name" \| (.*)\)/) { "(arg | #$1)" }
       str.gsub! '"vlan" ("id-name" | "all")', '"vlan" ("all" | arg)'
       str.gsub! '"vlan" ("all" | "vlan-name")', '"vlan" ("all" | arg)'
       str.gsub!(/("ssh-\S+") arg/) { "#$1 (quote | arg)" }

data/lib/junoser/version.rb

@@ -1,3 +1,3 @@
 module Junoser
-  VERSION = "0.2.10"
+  VERSION = "0.2.11"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: junoser
 version: !ruby/object:Gem::Version
-  version: 0.2.10
+  version: 0.2.11
 platform: ruby
 authors:
 - Shintaro Kojima
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-08-22 00:00:00.000000000 Z
+date: 2017-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet
@@ -141,7 +141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: PEG parser for JUNOS configuration.