lib/junoser/parser.rb in junoser-0.4.6 vs lib/junoser/parser.rb in junoser-0.4.7
- old
+ new
@@ -5322,11 +5322,11 @@
b(a(str("interface-range"), arg),
c(
a(str("member"), arg),
b(a(str("member-range"), arg),
sc(
- b(str("end-range"),
+ b(str("to"),
interface_device
)
)
).as(:oneline),
a(str("description"), quote | arg),
@@ -5404,11 +5404,11 @@
b(str("input-native-vlan-push"),
(str("disable") | str("enable"))
),
str("no-pseudowire-down-on-core-isolation"),
b(str("speed"),
- (str("auto") | str("auto-10m-100m") | str("10m") | str("100m") | str("1g") | str("2.5g") | str("5g") | str("10g") | str("40g") | str("oc3") | str("oc12") | str("oc48"))
+ (str("auto") | str("auto-10m-100m") | str("10m") | str("100m") | str("1g") | str("2.5g") | str("5g") | str("10g") | str("40g") | str("100g") | str("200g") | str("400g") | str("800g") | str("oc3") | str("oc12") | str("oc48"))
),
b(str("forwarding-class-accounting"),
c(
b(str("direction"),
(str("ingress") | str("egress") | str("both"))
@@ -21050,11 +21050,11 @@
rule(:chassis_pic_type) do
b(arg.as(:arg),
c(
b(str("pic-mode"),
- (str("10G") | str("25G") | str("40G") | str("100G"))
+ (str("10G") | str("25G") | str("40G") | str("100G") | str("200G") | str("400G") | str("800G"))
),
b(str("tunnel-port"),
chassis_port_type
),
b(str("tunnel-services"),
@@ -27758,11 +27758,11 @@
b(str("input-native-vlan-push"),
(str("disable") | str("enable"))
),
str("no-pseudowire-down-on-core-isolation"),
b(str("speed"),
- (str("auto") | str("auto-10m-100m") | str("10m") | str("100m") | str("1g") | str("2.5g") | str("5g") | str("10g") | str("40g") | str("oc3") | str("oc12") | str("oc48"))
+ (str("auto") | str("auto-10m-100m") | str("10m") | str("100m") | str("1g") | str("2.5g") | str("5g") | str("10g") | str("40g") | str("100g") | str("200g") | str("400g") | str("800g") | str("oc3") | str("oc12") | str("oc48"))
),
b(str("forwarding-class-accounting"),
c(
b(str("direction"),
(str("ingress") | str("egress") | str("both"))
@@ -40177,11 +40177,11 @@
b(str("classifiers"),
c(
b(a(str("dscp"), arg),
c(
b(str("import"),
- (str("default"))
+ (str("default") | arg)
),
b(a(str("forwarding-class"), arg),
c(
a(str("loss-priority"), str("low") | str("high") | str("medium-low") | str("medium-high"),
sc(
@@ -40193,11 +40193,11 @@
)
),
b(a(str("dscp-ipv6"), arg),
c(
b(str("import"),
- (str("default"))
+ (str("default") | arg)
),
b(a(str("forwarding-class"), arg),
c(
a(str("loss-priority"), str("low") | str("high") | str("medium-low") | str("medium-high"),
sc(
@@ -40209,11 +40209,11 @@
)
),
b(a(str("exp"), arg),
c(
b(str("import"),
- (str("default"))
+ (str("default") | arg)
),
b(a(str("forwarding-class"), arg),
c(
a(str("loss-priority"), str("low") | str("high") | str("medium-low") | str("medium-high"),
sc(
@@ -40225,11 +40225,11 @@
)
),
b(a(str("ieee-802.1"), arg),
c(
b(str("import"),
- (str("default"))
+ (str("default") | arg)
),
b(a(str("forwarding-class"), arg),
c(
a(str("loss-priority"), str("low") | str("high") | str("medium-low") | str("medium-high"),
sc(
@@ -40241,11 +40241,11 @@
)
),
b(a(str("inet-precedence"), arg),
c(
b(str("import"),
- (str("default"))
+ (str("default") | arg)
),
b(a(str("forwarding-class"), arg),
c(
a(str("loss-priority"), str("low") | str("high") | str("medium-low") | str("medium-high"),
sc(
@@ -40257,11 +40257,11 @@
)
),
b(a(str("ieee-802.1ad"), arg),
c(
b(str("import"),
- (str("default"))
+ (str("default") | arg)
),
b(a(str("forwarding-class"), arg),
c(
a(str("loss-priority"), str("low") | str("high") | str("medium-low") | str("medium-high"),
sc(
@@ -40897,12 +40897,12 @@
b(str("system-defaults"),
c(
b(str("classifiers"),
c(
b(str("exp"),
- c(
- (str("default") | arg)
+ sc(
+ (str("default") | arg)
)
).as(:oneline)
)
),
b(str("traffic-control-profiles"),
@@ -40976,50 +40976,50 @@
c(
b(str("classifiers"),
c(
str("no-default"),
b(str("exp"),
- c(
- (str("default") | arg)
+ sc(
+ (str("default") | arg)
)
).as(:oneline),
b(str("ieee-802.1"),
sc(
- (str("default")),
+ (str("default") | arg),
str("encapsulated"),
b(str("vlan-tag"),
(str("outer") | str("inner"))
)
)
).as(:oneline),
b(str("dscp"),
- c(
- (str("default") | arg)
+ sc(
+ (str("default") | arg)
)
).as(:oneline),
b(str("dscp-ipv6"),
- c(
- (str("default") | arg)
+ sc(
+ (str("default") | arg)
)
).as(:oneline)
)
),
b(str("rewrite-rules"),
c(
c(
b(str("ieee-802.1"),
sc(
- (str("default")),
+ (str("default") | arg),
str("encapsulated"),
b(str("vlan-tag"),
(str("outer") | str("outer-and-inner"))
)
)
).as(:oneline),
b(str("ieee-802.1ad"),
sc(
- (str("default")),
+ (str("default") | arg),
str("encapsulated"),
b(str("vlan-tag"),
(str("outer") | str("outer-and-inner"))
)
)
@@ -41037,11 +41037,11 @@
b(str("rewrite-rules"),
c(
b(a(str("dscp"), arg),
c(
b(str("import"),
- (str("default"))
+ (str("default") | arg)
),
b(a(str("forwarding-class"), arg),
c(
a(str("loss-priority"), str("low") | str("high") | str("medium-low") | str("medium-high"),
sc(
@@ -41053,11 +41053,11 @@
)
),
b(a(str("dscp-ipv6"), arg),
c(
b(str("import"),
- (str("default"))
+ (str("default") | arg)
),
b(a(str("forwarding-class"), arg),
c(
a(str("loss-priority"), str("low") | str("high") | str("medium-low") | str("medium-high"),
sc(
@@ -41069,11 +41069,11 @@
)
),
b(a(str("exp"), arg),
c(
b(str("import"),
- (str("default"))
+ (str("default") | arg)
),
b(a(str("forwarding-class"), arg),
c(
a(str("loss-priority"), str("low") | str("high") | str("medium-low") | str("medium-high"),
sc(
@@ -41085,11 +41085,11 @@
)
),
b(a(str("ieee-802.1"), arg),
c(
b(str("import"),
- (str("default"))
+ (str("default") | arg)
),
b(a(str("forwarding-class"), arg),
c(
a(str("loss-priority"), str("low") | str("high") | str("medium-low") | str("medium-high"),
sc(
@@ -41101,11 +41101,11 @@
)
),
b(a(str("inet-precedence"), arg),
c(
b(str("import"),
- (str("default"))
+ (str("default") | arg)
),
b(a(str("forwarding-class"), arg),
c(
a(str("loss-priority"), str("low") | str("high") | str("medium-low") | str("medium-high"),
sc(
@@ -41117,11 +41117,11 @@
)
),
b(a(str("frame-relay-de"), arg),
c(
b(str("import"),
- (str("default"))
+ (str("default") | arg)
),
b(a(str("forwarding-class"), arg),
c(
a(str("loss-priority"), str("low") | str("high") | str("medium-low") | str("medium-high"),
sc(
@@ -41133,11 +41133,11 @@
)
),
b(a(str("ieee-802.1ad"), arg),
c(
b(str("import"),
- (str("default"))
+ (str("default") | arg)
),
b(a(str("forwarding-class"), arg),
c(
a(str("loss-priority"), str("low") | str("high") | str("medium-low") | str("medium-high"),
sc(
@@ -41149,11 +41149,11 @@
)
),
b(a(str("inet6-precedence"), arg),
c(
b(str("import"),
- (str("default"))
+ (str("default") | arg)
),
b(a(str("forwarding-class"), arg),
c(
a(str("loss-priority"), str("low") | str("high") | str("medium-low") | str("medium-high"),
sc(
@@ -41648,11 +41648,11 @@
c(
str("include-hierarchy")
)
),
str("logical-interface-aggregate-statistics"),
- a(str("unit"), enum(str("*")),
+ a(str("unit"), enum(arg),
c(
a(str("output-forwarding-class-map"), arg),
a(str("forwarding-class"), arg),
a(str("virtual-channel-group"), arg),
str("vc-shared-scheduler"),
@@ -41699,100 +41699,100 @@
)
).as(:oneline),
b(str("classifiers"),
c(
str("no-default"),
- a(str("dscp"), str("default"),
+ a(str("dscp"), str("default") | arg,
c(
a(str("family"), arg)
)
),
- a(str("dscp-ipv6"), str("default"),
+ a(str("dscp-ipv6"), str("default") | arg,
c(
a(str("family"), arg)
)
),
b(str("exp"),
- c(
- (str("default") | arg)
+ sc(
+ (str("default") | arg)
)
).as(:oneline),
b(str("ieee-802.1"),
sc(
- (str("default")),
+ (str("default") | arg),
b(str("vlan-tag"),
(str("outer") | str("inner") | str("transparent"))
)
)
).as(:oneline),
b(str("inet-precedence"),
- c(
- (str("default") | arg)
+ sc(
+ (str("default") | arg)
)
).as(:oneline),
b(str("ieee-802.1ad"),
sc(
- (str("default")),
+ (str("default") | arg),
b(str("vlan-tag"),
(str("outer") | str("inner"))
)
)
).as(:oneline)
)
),
b(str("ingress-rewrite-rules"),
c(
- a(str("dscp"), str("default")).as(:oneline),
+ a(str("dscp"), str("default") | arg).as(:oneline),
b(str("dscp-ipv6"),
- c(
- (str("default") | arg)
+ sc(
+ (str("default") | arg)
)
).as(:oneline),
- a(str("inet-precedence"), str("default")).as(:oneline)
+ a(str("inet-precedence"), str("default") | arg).as(:oneline)
)
),
b(str("loss-priority-maps"),
c(
b(str("frame-relay-de"),
- c(
- (str("default") | arg)
+ sc(
+ (str("default") | arg)
)
).as(:oneline)
)
),
b(str("rewrite-rules"),
c(
- a(str("dscp"), str("default"),
+ a(str("dscp"), str("default") | arg,
sc(
b(str("protocol"),
(str("mpls") | str("gtp-inet-outer") | str("gtp-inet-both") | str("inet-outer") | str("inet-both"))
)
)
).as(:oneline),
- a(str("dscp-ipv6"), str("default"),
+ a(str("dscp-ipv6"), str("default") | arg,
sc(
b(str("protocol"),
(str("mpls") | str("gtp-inet-outer") | str("gtp-inet-both"))
)
)
).as(:oneline),
- a(str("exp"), str("default"),
+ a(str("exp"), str("default") | arg,
sc(
b(str("protocol"),
(str("mpls-any") | str("mpls-inet-both") | str("mpls-inet-both-non-vpn"))
)
)
).as(:oneline),
b(str("ieee-802.1"),
sc(
- (str("default")),
+ (str("default") | arg),
b(str("vlan-tag"),
(str("outer") | str("outer-and-inner"))
)
)
).as(:oneline),
- a(str("inet-precedence"), str("default"),
+ a(str("inet-precedence"), str("default") | arg,
sc(
b(str("protocol"),
(str("mpls") | str("gtp-inet-outer") | str("gtp-inet-both") | str("inet-outer") | str("inet-both"))
)
)
@@ -41810,23 +41810,23 @@
str("default")
)
)
).as(:oneline),
b(str("frame-relay-de"),
- c(
- (str("default") | arg)
+ sc(
+ (str("default") | arg)
)
).as(:oneline),
b(str("ieee-802.1ad"),
c(
- (str("default")),
+ (str("default") | arg),
b(str("vlan-tag"),
(str("outer") | str("outer-and-inner"))
)
)
),
- a(str("inet6-precedence"), str("default"),
+ a(str("inet6-precedence"), str("default") | arg,
sc(
b(str("protocol"),
(str("mpls"))
)
)
@@ -41834,12 +41834,12 @@
)
),
b(str("loss-priority-rewrites"),
c(
b(str("frame-relay-de"),
- c(
- (str("default") | arg)
+ sc(
+ (str("default") | arg)
)
).as(:oneline)
)
),
b(str("translation-table"),
@@ -41873,54 +41873,54 @@
).as(:oneline)
)
),
b(str("classifiers"),
c(
- a(str("dscp"), str("default")),
- a(str("dscp-ipv6"), str("default")),
+ a(str("dscp"), str("default") | arg),
+ a(str("dscp-ipv6"), str("default") | arg),
b(str("ieee-802.1"),
sc(
- (str("default")),
+ (str("default") | arg),
b(str("vlan-tag"),
(str("outer") | str("inner"))
)
)
).as(:oneline),
b(str("ieee-802.1ad"),
sc(
- (str("default")),
+ (str("default") | arg),
b(str("vlan-tag"),
(str("outer") | str("inner"))
)
)
).as(:oneline),
b(str("inet-precedence"),
- c(
- (str("default") | arg)
+ sc(
+ (str("default") | arg)
)
).as(:oneline)
)
),
a(str("forwarding-class"), arg),
b(str("rewrite-rules"),
c(
- a(str("dscp"), str("default")).as(:oneline),
- a(str("dscp-ipv6"), str("default")).as(:oneline),
+ a(str("dscp"), str("default") | arg).as(:oneline),
+ a(str("dscp-ipv6"), str("default") | arg).as(:oneline),
b(str("ieee-802.1"),
- c(
- (str("default") | arg)
+ sc(
+ (str("default") | arg)
)
).as(:oneline),
b(str("ieee-802.1ad"),
c(
- (str("default")),
+ (str("default") | arg),
b(str("vlan-tag"),
(str("outer"))
)
)
),
- a(str("inet-precedence"), str("default")).as(:oneline)
+ a(str("inet-precedence"), str("default") | arg).as(:oneline)
)
),
b(str("multi-destination"),
c(
b(str("classifiers"),
@@ -43078,11 +43078,11 @@
b(a(str("interface-range"), arg),
c(
a(str("member"), arg),
b(a(str("member-range"), arg),
sc(
- b(str("end-range"),
+ b(str("to"),
interface_device
)
)
).as(:oneline),
a(str("description"), quote | arg),
@@ -43160,11 +43160,11 @@
b(str("input-native-vlan-push"),
(str("disable") | str("enable"))
),
str("no-pseudowire-down-on-core-isolation"),
b(str("speed"),
- (str("auto") | str("auto-10m-100m") | str("10m") | str("100m") | str("1g") | str("2.5g") | str("5g") | str("10g") | str("40g") | str("oc3") | str("oc12") | str("oc48"))
+ (str("auto") | str("auto-10m-100m") | str("10m") | str("100m") | str("1g") | str("2.5g") | str("5g") | str("10g") | str("40g") | str("100g") | str("200g") | str("400g") | str("800g") | str("oc3") | str("oc12") | str("oc48"))
),
b(str("forwarding-class-accounting"),
c(
b(str("direction"),
(str("ingress") | str("egress") | str("both"))
@@ -46530,11 +46530,11 @@
b(a(str("interface-range"), arg),
c(
a(str("member"), arg),
b(a(str("member-range"), arg),
sc(
- b(str("end-range"),
+ b(str("to"),
interface_device
)
)
).as(:oneline),
a(str("description"), quote | arg),
@@ -46612,10 +46612,10 @@
b(str("input-native-vlan-push"),
(str("disable") | str("enable"))
),
str("no-pseudowire-down-on-core-isolation"),
b(str("speed"),
- (str("auto") | str("auto-10m-100m") | str("10m") | str("100m") | str("1g") | str("2.5g") | str("5g") | str("10g") | str("40g") | str("oc3") | str("oc12") | str("oc48"))
+ (str("auto") | str("auto-10m-100m") | str("10m") | str("100m") | str("1g") | str("2.5g") | str("5g") | str("10g") | str("40g") | str("100g") | str("200g") | str("400g") | str("800g") | str("oc3") | str("oc12") | str("oc48"))
),
b(str("forwarding-class-accounting"),
c(
b(str("direction"),
(str("ingress") | str("egress") | str("both"))