lib/junoser/parser.rb in junoser-0.2.2 vs lib/junoser/parser.rb in junoser-0.2.3
- old
+ new
@@ -2149,19 +2149,15 @@
).as(:oneline)
)
),
b(str("attributes-match"),
s(
- b(str("from-event-attribute"),
- arg
- ),
+ a(str("from-event-attribute"), arg),
b(str("condition"),
(str("equals") | str("starts-with") | str("matches"))
),
- b(str("to-event-attribute-value"),
- arg
- )
+ a(str("to-event-attribute-value"), arg)
)
).as(:oneline),
b(str("then"),
c(
str("ignore"),
@@ -2174,13 +2170,11 @@
b(str("upload"),
s(
b(str("filename"),
arg
),
- b(str("destination"),
- arg
- ),
+ a(str("destination"), arg),
c(
a(str("user-name"), arg),
a(str("transfer-delay"), arg),
b(str("retry-count"),
c(
@@ -3923,16 +3917,12 @@
a(str("flag"), str("configuration") | str("routing-socket") | str("compilation") | str("ipc") | str("rules") | str("lookup") | str("all")).as(:oneline)
)
),
b(str("policy"),
s(
- b(str("from-zone-name"),
- arg
- ),
- b(str("to-zone-name"),
- arg
- ),
+ a(str("from-zone-name"), arg),
+ a(str("to-zone-name"), arg),
c(
b(str("policy"),
policy_type
)
)
@@ -5679,10 +5669,16 @@
end
rule(:chassis_fpc_type) do
b(arg.as(:arg),
c(
+ a(str("error"), str("fatal") | str("major") | str("minor"),
+ c(
+ a(str("threshold"), arg),
+ a(str("action"), str("alarm") | str("disable-pfe") | str("offline-pic") | str("log") | str("get-state") | str("offline") | str("reset"))
+ )
+ ),
str("sanity-poll"),
b(str("pic"),
chassis_pic_type
),
b(str("pfe"),
@@ -5854,16 +5850,12 @@
rule(:chassis_fibre_channel_type) do
c(
str("port"),
b(str("port-range"),
s(
- b(str("port-range-low"),
- arg
- ),
- b(str("port-range-high"),
- arg
- )
+ a(str("port-range-low"), arg),
+ a(str("port-range-high"), arg)
)
)
)
end
@@ -7810,13 +7802,11 @@
str("discard"),
a(str("traffic-class"), arg),
a(str("next"), arg),
b(str("logical-system"),
s(
- b(str("logical-system-name"),
- arg
- ),
+ a(str("logical-system-name"), arg),
c(
b(str("routing-instance"),
c(
a(str("routing-instance-name"), arg),
a(str("topology"), arg)
@@ -8361,13 +8351,11 @@
)
),
a(str("next"), arg),
b(str("logical-system"),
s(
- b(str("logical-system-name"),
- arg
- ),
+ a(str("logical-system-name"), arg),
c(
b(str("routing-instance"),
c(
a(str("routing-instance-name"), arg),
a(str("topology"), arg)
@@ -10446,16 +10434,12 @@
b(arg.as(:arg),
c(
a(str("weight"), arg),
b(str("interface"),
s(
- b(str("logical-interface-name"),
- arg
- ),
- b(str("secondary-ip-address"),
- arg
- )
+ a(str("logical-interface-name"), arg),
+ a(str("secondary-ip-address"), arg)
)
)
)
)
end
@@ -18115,16 +18099,12 @@
a(str("flag"), str("configuration") | str("routing-socket") | str("compilation") | str("ipc") | str("rules") | str("lookup") | str("all")).as(:oneline)
)
),
b(str("policy"),
s(
- b(str("from-zone-name"),
- arg
- ),
- b(str("to-zone-name"),
- arg
- ),
+ a(str("from-zone-name"), arg),
+ a(str("to-zone-name"), arg),
c(
b(str("policy"),
policy_type
)
)
@@ -18643,22 +18623,14 @@
c(
b(str("from"),
c(
b(str("vsi-manager"),
s(
- b(str("vsi-manager-id"),
- arg
- ),
- b(str("vsi-type"),
- arg
- ),
- b(str("vsi-version"),
- arg
- ),
- b(str("vsi-instance"),
- arg
- )
+ a(str("vsi-manager-id"), arg),
+ a(str("vsi-type"), arg),
+ a(str("vsi-version"), arg),
+ a(str("vsi-instance"), arg)
)
)
)
),
b(str("then"),
@@ -18904,32 +18876,18 @@
)
).as(:oneline),
b(str("community"),
s(
c(
- b(str("="),
- arg
- ),
- b(str("set"),
- arg
- ),
- b(str("+"),
- arg
- ),
- b(str("add"),
- arg
- ),
- b(str("-"),
- arg
- ),
- b(str("delete"),
- arg
- )
+ a(str("="), arg),
+ a(str("set"), arg),
+ a(str("+"), arg),
+ a(str("add"), arg),
+ a(str("-"), arg),
+ a(str("delete"), arg)
),
- b(str("community-name"),
- arg
- )
+ a(str("community-name"), arg)
)
).as(:oneline),
a(str("damping"), arg),
a(str("as-path-prepend"), quote | arg),
b(str("as-path-expand"),
@@ -19254,32 +19212,18 @@
)
).as(:oneline),
b(str("community"),
s(
c(
- b(str("="),
- arg
- ),
- b(str("set"),
- arg
- ),
- b(str("+"),
- arg
- ),
- b(str("add"),
- arg
- ),
- b(str("-"),
- arg
- ),
- b(str("delete"),
- arg
- )
+ a(str("="), arg),
+ a(str("set"), arg),
+ a(str("+"), arg),
+ a(str("add"), arg),
+ a(str("-"), arg),
+ a(str("delete"), arg)
),
- b(str("community-name"),
- arg
- )
+ a(str("community-name"), arg)
)
).as(:oneline),
a(str("damping"), arg),
a(str("as-path-prepend"), quote | arg),
b(str("as-path-expand"),
@@ -19450,13 +19394,11 @@
).as(:oneline)
end
rule(:control_prefix_list_filter_type) do
s(
- b(str("list_name"),
- arg
- ),
+ a(str("list_name"), arg),
c(
str("exact"),
str("longer"),
str("orlonger")
),
@@ -19571,32 +19513,18 @@
)
).as(:oneline),
b(str("community"),
s(
c(
- b(str("="),
- arg
- ),
- b(str("set"),
- arg
- ),
- b(str("+"),
- arg
- ),
- b(str("add"),
- arg
- ),
- b(str("-"),
- arg
- ),
- b(str("delete"),
- arg
- )
+ a(str("="), arg),
+ a(str("set"), arg),
+ a(str("+"), arg),
+ a(str("add"), arg),
+ a(str("-"), arg),
+ a(str("delete"), arg)
),
- b(str("community-name"),
- arg
- )
+ a(str("community-name"), arg)
)
).as(:oneline),
a(str("damping"), arg),
a(str("as-path-prepend"), quote | arg),
b(str("as-path-expand"),
@@ -19697,22 +19625,14 @@
b(
c(
str("exact"),
str("longer"),
str("orlonger"),
- b(str("upto"),
- arg
- ),
- b(str("through"),
- arg
- ),
- b(str("prefix-length-range"),
- arg
- ),
- b(str("address-mask"),
- arg
- )
+ a(str("upto"), arg),
+ a(str("through"), arg),
+ a(str("prefix-length-range"), arg),
+ a(str("address-mask"), arg)
),
c(
b(str("metric"),
c(
ca(
@@ -19823,32 +19743,18 @@
)
).as(:oneline),
b(str("community"),
s(
c(
- b(str("="),
- arg
- ),
- b(str("set"),
- arg
- ),
- b(str("+"),
- arg
- ),
- b(str("add"),
- arg
- ),
- b(str("-"),
- arg
- ),
- b(str("delete"),
- arg
- )
+ a(str("="), arg),
+ a(str("set"), arg),
+ a(str("+"), arg),
+ a(str("add"), arg),
+ a(str("-"), arg),
+ a(str("delete"), arg)
),
- b(str("community-name"),
- arg
- )
+ a(str("community-name"), arg)
)
).as(:oneline),
a(str("damping"), arg),
a(str("as-path-prepend"), quote | arg),
b(str("as-path-expand"),
@@ -19945,19 +19851,13 @@
b(
c(
str("exact"),
str("longer"),
str("orlonger"),
- b(str("upto"),
- arg
- ),
- b(str("through"),
- arg
- ),
- b(str("prefix-length-range"),
- arg
- )
+ a(str("upto"), arg),
+ a(str("through"), arg),
+ a(str("prefix-length-range"), arg)
),
c(
b(str("metric"),
c(
ca(
@@ -20068,32 +19968,18 @@
)
).as(:oneline),
b(str("community"),
s(
c(
- b(str("="),
- arg
- ),
- b(str("set"),
- arg
- ),
- b(str("+"),
- arg
- ),
- b(str("add"),
- arg
- ),
- b(str("-"),
- arg
- ),
- b(str("delete"),
- arg
- )
+ a(str("="), arg),
+ a(str("set"), arg),
+ a(str("+"), arg),
+ a(str("add"), arg),
+ a(str("-"), arg),
+ a(str("delete"), arg)
),
- b(str("community-name"),
- arg
- )
+ a(str("community-name"), arg)
)
).as(:oneline),
a(str("damping"), arg),
a(str("as-path-prepend"), quote | arg),
b(str("as-path-expand"),
@@ -21437,16 +21323,12 @@
b(str("inter-area-prefix-import"),
policy_algebra
),
b(str("virtual-link"),
s(
- b(str("neighbor-id"),
- arg
- ),
- b(str("transit-area"),
- arg
- ),
+ a(str("neighbor-id"), arg),
+ a(str("transit-area"), arg),
c(
c(
str("disable")
),
a(str("retransmit-interval"), arg),
@@ -21853,16 +21735,12 @@
b(str("inter-area-prefix-import"),
policy_algebra
),
b(str("virtual-link"),
s(
- b(str("neighbor-id"),
- arg
- ),
- b(str("transit-area"),
- arg
- ),
+ a(str("neighbor-id"), arg),
+ a(str("transit-area"), arg),
c(
c(
str("disable")
),
a(str("retransmit-interval"), arg),
@@ -25597,16 +25475,12 @@
b(str("inter-area-prefix-import"),
policy_algebra
),
b(str("virtual-link"),
s(
- b(str("neighbor-id"),
- arg
- ),
- b(str("transit-area"),
- arg
- ),
+ a(str("neighbor-id"), arg),
+ a(str("transit-area"), arg),
c(
c(
str("disable")
),
a(str("retransmit-interval"), arg),
@@ -27319,16 +27193,12 @@
b(str("inter-area-prefix-import"),
policy_algebra
),
b(str("virtual-link"),
s(
- b(str("neighbor-id"),
- arg
- ),
- b(str("transit-area"),
- arg
- ),
+ a(str("neighbor-id"), arg),
+ a(str("transit-area"), arg),
c(
c(
str("disable")
),
a(str("retransmit-interval"), arg),
@@ -27735,16 +27605,12 @@
b(str("inter-area-prefix-import"),
policy_algebra
),
b(str("virtual-link"),
s(
- b(str("neighbor-id"),
- arg
- ),
- b(str("transit-area"),
- arg
- ),
+ a(str("neighbor-id"), arg),
+ a(str("transit-area"), arg),
c(
c(
str("disable")
),
a(str("retransmit-interval"), arg),
@@ -29708,11 +29574,11 @@
b(str("input"),
sampling_input_type
),
b(str("family"),
c(
- b(str("inet"),
+ b((str("inet") | str("mpls")),
c(
c(
str("disable")
),
b(str("output"),
@@ -29727,12 +29593,11 @@
),
b(str("output"),
sampling_family_inet6_output_type
)
)
- ),
- str("mpls")
+ )
)
),
b(a(str("instance"), arg),
c(
str("disable"),
@@ -30265,16 +30130,12 @@
a(str("key"), arg)
)
),
b(str("dlv"),
s(
- b(str("domain"),
- arg
- ),
- b(str("trusted-anchor"),
- arg
- )
+ a(str("domain"), arg),
+ a(str("trusted-anchor"), arg)
)
).as(:oneline),
a(str("secure-domains"), arg)
)
),
@@ -32739,19 +32600,13 @@
arg,
c(
str("exact"),
str("longer"),
str("orlonger"),
- b(str("upto"),
- arg
- ),
- b(str("through"),
- arg
- ),
- b(str("prefix-length-range"),
- arg
- )
+ a(str("upto"), arg),
+ a(str("through"), arg),
+ a(str("prefix-length-range"), arg)
),
c(
str("allow")
)
).as(:oneline)
@@ -34928,16 +34783,12 @@
b(arg.as(:arg),
c(
a(str("description"), quote | arg),
b(str("start-date"),
s(
- b(str("start-date"),
- arg
- ),
- b(str("stop-date"),
- arg
- )
+ a(str("start-date"), arg),
+ a(str("stop-date"), arg)
)
),
b(str("daily"),
daily_object
),
@@ -34969,16 +34820,12 @@
rule(:daily_object) do
c(
c(
b(str("start-time"),
s(
- b(str("start-time-value"),
- arg
- ),
- b(str("stop-time"),
- arg
- )
+ a(str("start-time-value"), arg),
+ a(str("stop-time"), arg)
)
),
str("exclude"),
str("all-day")
)
@@ -37824,15 +37671,11 @@
a(str("priority-cost"), arg)
)
),
b(str("route"),
s(
- b(str("route_address"),
- arg
- ),
- b(str("routing-instance"),
- arg
- ),
+ a(str("route_address"), arg),
+ a(str("routing-instance"), arg),
c(
a(str("priority-cost"), arg)
)
)
).as(:oneline)