junoser 0.2.2 → 0.2.3

Sign up to get free protection for your applications and to get access to all the features.
Files changed (18) hide show
  1. checksums.yaml +4 -4
  2. data/.travis.yml +10 -16
  3. data/CHANGELOG.md +14 -1
  4. data/LICENSE.txt +1 -1
  5. data/README.md +1 -1
  6. data/Rakefile +1 -1
  7. data/example/vsrx-12.1.x47.rb +104 -291
  8. data/lib/junoser/parser.rb +89 -246
  9. data/lib/junoser/ruler.rb +2 -2
  10. data/lib/junoser/version.rb +1 -1
  11. data/lib/junoser/xsd/choice.rb +4 -3
  12. data/lib/junoser/xsd/complex_type.rb +2 -2
  13. data/lib/junoser/xsd/element.rb +14 -27
  14. data/lib/junoser/xsd/enumeration.rb +2 -2
  15. data/lib/junoser/xsd/restriction.rb +2 -2
  16. data/lib/junoser/xsd/sequence.rb +3 -3
  17. data/lib/junoser/xsd/simple_content.rb +1 -1
  18. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: b0ad65838e180e1d1d604e24e6778a64769d20f7
4
- data.tar.gz: 490a82d437ef85aa3d491e99304c128695584649
3
+ metadata.gz: 7be39da90e3e4cc1fe59887e5c1a870c5d3aecd2
4
+ data.tar.gz: 0704721d4e179efa93a0f788040667fa165cb8f8
5
5
  SHA512:
6
- metadata.gz: 1158c04d561b57ed319ad29201a5cccc96751c6a1594adae4d834ec3045df82dd8b10d2e19622e394dc0f94487bf6f366f510e09175ca21077b9143098a2ca5b
7
- data.tar.gz: a13fb62da4901c2783d782e44422868628be632c045b05e564a2cc243e13b8ca5ba1ea5956221a10fbacf9c5e740c02fed43917b57b04cad8da4fce2f6e6ad16
6
+ metadata.gz: 434a77e3b1d7430b009fef5219785df71f43ff8d08a5826b5a3f81af3525a7b00ffb0370e1c9a08e852b6206b6cc08f7b45a40bf82307b88c643069ca2d93037
7
+ data.tar.gz: 87293dcbcb0cc72acfc4a61b43f544b2d5d9c75b6977c49b326968d6f1006e2597feae0c45703c9558b3aac1bbe1689006466766ec26f8507237e66d1d942d1a
data/.travis.yml CHANGED
@@ -1,20 +1,14 @@
1
1
  language: ruby
2
- before_install:
3
- - gem update bundler
2
+
4
3
  rvm:
5
- - 2.1.0
6
- - 2.1.1
7
- - 2.1.2
8
- - 2.1.3
9
- - 2.1.4
10
- - 2.1.5
11
- - 2.1.6
12
- - 2.1.7
13
- - 2.1.8
14
- - 2.2.0
15
- - 2.2.1
16
- - 2.2.2
17
- - 2.2.3
18
- - 2.2.4
4
+ - 2.1
5
+ - 2.2
19
6
  - 2.3.0
20
7
  - ruby-head
8
+
9
+ before_install:
10
+ - gem update bundler
11
+
12
+ matrix:
13
+ allow_failures:
14
+ - rvm: ruby-head
data/CHANGELOG.md CHANGED
@@ -1,7 +1,20 @@
1
+ ## 0.2.3 / 2016-08-28
2
+
3
+ * Newly supported syntax
4
+ * chassis fpc N error
5
+ * forwarding-options sampling family mpls
6
+
7
+ ## 0.2.2 / 2016-02-15
8
+
9
+ * Newly supported syntax
10
+ * system services ssh
11
+ * Bug fix
12
+ * choice syntax
13
+
1
14
  ## 0.2.1 / 2016-01-15
2
15
 
3
16
  * Newly supported syntax
4
- services flow-monitoring version9 template
17
+ * services flow-monitoring version9 template
5
18
  * Bug fix
6
19
  * template-name
7
20
  * Start CI
data/LICENSE.txt CHANGED
@@ -1,6 +1,6 @@
1
1
  The MIT License (MIT)
2
2
 
3
- Copyright (c) 2015 Shintaro Kojima
3
+ Copyright (c) 2016 Shintaro Kojima
4
4
 
5
5
  Permission is hereby granted, free of charge, to any person obtaining a copy
6
6
  of this software and associated documentation files (the "Software"), to deal
data/README.md CHANGED
@@ -67,4 +67,4 @@ Or send a pull request to fix.
67
67
 
68
68
  ## Copyright and License
69
69
 
70
- Copyright (c) 2015 Shintaro Kojima. Code released under the [MIT license](LICENSE.txt).
70
+ Copyright (c) 2016 Shintaro Kojima. Code released under the [MIT license](LICENSE.txt).
data/Rakefile CHANGED
@@ -4,7 +4,7 @@ require 'nokogiri'
4
4
  require 'pathname'
5
5
  require 'rake/testtask'
6
6
 
7
- xsd_path = File.expand_path('../tmp/junos-system.xsd', Pathname.new(__FILE__).realpath)
7
+ xsd_path = File.expand_path('../tmp/junos-system-12.1.xsd', Pathname.new(__FILE__).realpath)
8
8
  rule_path = File.expand_path('../tmp/rule.rb', Pathname.new(__FILE__).realpath)
9
9
  parser_path = File.expand_path('../lib/junoser/parser.rb', Pathname.new(__FILE__).realpath)
10
10
 
data/example/vsrx-12.1.x47.rb CHANGED
@@ -2107,15 +2107,11 @@ rule(:configuration) do
2107
2107
  ),
2108
2108
  "attributes-match" (
2109
2109
  s(
2110
- "from-event-attribute" (
2111
- arg
2112
- ),
2110
+ "from-event-attribute" arg,
2113
2111
  "condition" (
2114
2112
  ("equals" | "starts-with" | "matches")
2115
2113
  ),
2116
- "to-event-attribute-value" (
2117
- arg
2118
- )
2114
+ "to-event-attribute-value" arg
2119
2115
  )
2120
2116
  ).as(:oneline),
2121
2117
  "then" (
@@ -2132,9 +2128,7 @@ rule(:configuration) do
2132
2128
  "filename" (
2133
2129
  arg
2134
2130
  ),
2135
- "destination" (
2136
- arg
2137
- ),
2131
+ "destination" arg,
2138
2132
  c(
2139
2133
  "user-name" arg,
2140
2134
  "transfer-delay" arg,
@@ -3893,12 +3887,8 @@ rule(:configuration) do
3893
3887
  ),
3894
3888
  "policy" (
3895
3889
  s(
3896
- "from-zone-name" (
3897
- arg
3898
- ),
3899
- "to-zone-name" (
3900
- arg
3901
- ),
3890
+ "from-zone-name" arg,
3891
+ "to-zone-name" arg,
3902
3892
  c(
3903
3893
  "policy" (
3904
3894
  policy_type
@@ -5659,6 +5649,12 @@ end
5659
5649
  rule(:chassis_fpc_type) do
5660
5650
  arg.as(:arg) (
5661
5651
  c(
5652
+ "error" ("fatal" | "major" | "minor") (
5653
+ c(
5654
+ "threshold" arg,
5655
+ "action" ("alarm" | "disable-pfe" | "offline-pic" | "log" | "get-state" | "offline" | "reset")
5656
+ )
5657
+ ),
5662
5658
  "sanity-poll",
5663
5659
  "pic" (
5664
5660
  chassis_pic_type
@@ -5830,12 +5826,8 @@ rule(:chassis_fibre_channel_type) do
5830
5826
  "port",
5831
5827
  "port-range" (
5832
5828
  s(
5833
- "port-range-low" (
5834
- arg
5835
- ),
5836
- "port-range-high" (
5837
- arg
5838
- )
5829
+ "port-range-low" arg,
5830
+ "port-range-high" arg
5839
5831
  )
5840
5832
  )
5841
5833
  )
@@ -7787,9 +7779,7 @@ rule(:inet6_filter) do
7787
7779
  "next" arg,
7788
7780
  "logical-system" (
7789
7781
  s(
7790
- "logical-system-name" (
7791
- arg
7792
- ),
7782
+ "logical-system-name" arg,
7793
7783
  c(
7794
7784
  "routing-instance" (
7795
7785
  c(
@@ -8338,9 +8328,7 @@ rule(:inet_filter) do
8338
8328
  "next" arg,
8339
8329
  "logical-system" (
8340
8330
  s(
8341
- "logical-system-name" (
8342
- arg
8343
- ),
8331
+ "logical-system-name" arg,
8344
8332
  c(
8345
8333
  "routing-instance" (
8346
8334
  c(
@@ -10430,12 +10418,8 @@ rule(:ip_monitoring_address_type) do
10430
10418
  "weight" arg,
10431
10419
  "interface" (
10432
10420
  s(
10433
- "logical-interface-name" (
10434
- arg
10435
- ),
10436
- "secondary-ip-address" (
10437
- arg
10438
- )
10421
+ "logical-interface-name" arg,
10422
+ "secondary-ip-address" arg
10439
10423
  )
10440
10424
  )
10441
10425
  )
@@ -18146,12 +18130,8 @@ rule(:juniper_logical_system) do
18146
18130
  ),
18147
18131
  "policy" (
18148
18132
  s(
18149
- "from-zone-name" (
18150
- arg
18151
- ),
18152
- "to-zone-name" (
18153
- arg
18154
- ),
18133
+ "from-zone-name" arg,
18134
+ "to-zone-name" arg,
18155
18135
  c(
18156
18136
  "policy" (
18157
18137
  policy_type
@@ -18679,18 +18659,10 @@ rule(:juniper_policy_options) do
18679
18659
  c(
18680
18660
  "vsi-manager" (
18681
18661
  s(
18682
- "vsi-manager-id" (
18683
- arg
18684
- ),
18685
- "vsi-type" (
18686
- arg
18687
- ),
18688
- "vsi-version" (
18689
- arg
18690
- ),
18691
- "vsi-instance" (
18692
- arg
18693
- )
18662
+ "vsi-manager-id" arg,
18663
+ "vsi-type" arg,
18664
+ "vsi-version" arg,
18665
+ "vsi-instance" arg
18694
18666
  )
18695
18667
  )
18696
18668
  )
@@ -18951,28 +18923,14 @@ rule(:juniper_policy_options) do
18951
18923
  "community" (
18952
18924
  s(
18953
18925
  c(
18954
- "equal-literal" (
18955
- arg
18956
- ),
18957
- "set" (
18958
- arg
18959
- ),
18960
- "plus-literal" (
18961
- arg
18962
- ),
18963
- "add" (
18964
- arg
18965
- ),
18966
- "minus-literal" (
18967
- arg
18968
- ),
18969
- "delete" (
18970
- arg
18971
- )
18926
+ "equal-literal" arg,
18927
+ "set" arg,
18928
+ "plus-literal" arg,
18929
+ "add" arg,
18930
+ "minus-literal" arg,
18931
+ "delete" arg
18972
18932
  ),
18973
- "community-name" (
18974
- arg
18975
- )
18933
+ "community-name" arg
18976
18934
  )
18977
18935
  ).as(:oneline),
18978
18936
  "damping" arg,
@@ -19314,28 +19272,14 @@ rule(:juniper_policy_options) do
19314
19272
  "community" (
19315
19273
  s(
19316
19274
  c(
19317
- "equal-literal" (
19318
- arg
19319
- ),
19320
- "set" (
19321
- arg
19322
- ),
19323
- "plus-literal" (
19324
- arg
19325
- ),
19326
- "add" (
19327
- arg
19328
- ),
19329
- "minus-literal" (
19330
- arg
19331
- ),
19332
- "delete" (
19333
- arg
19334
- )
19275
+ "equal-literal" arg,
19276
+ "set" arg,
19277
+ "plus-literal" arg,
19278
+ "add" arg,
19279
+ "minus-literal" arg,
19280
+ "delete" arg
19335
19281
  ),
19336
- "community-name" (
19337
- arg
19338
- )
19282
+ "community-name" arg
19339
19283
  )
19340
19284
  ).as(:oneline),
19341
19285
  "damping" arg,
@@ -19510,19 +19454,11 @@ end
19510
19454
 
19511
19455
  rule(:control_prefix_list_filter_type) do
19512
19456
  s(
19513
- "list_name" (
19514
- arg
19515
- ),
19457
+ "list_name" arg,
19516
19458
  c(
19517
- "exact" (
19518
- arg
19519
- ),
19520
- "longer" (
19521
- arg
19522
- ),
19523
- "orlonger" (
19524
- arg
19525
- )
19459
+ "exact" arg,
19460
+ "longer" arg,
19461
+ "orlonger" arg
19526
19462
  ),
19527
19463
  c(
19528
19464
  "metric" (
@@ -19648,28 +19584,14 @@ rule(:control_prefix_list_filter_type) do
19648
19584
  "community" (
19649
19585
  s(
19650
19586
  c(
19651
- "equal-literal" (
19652
- arg
19653
- ),
19654
- "set" (
19655
- arg
19656
- ),
19657
- "plus-literal" (
19658
- arg
19659
- ),
19660
- "add" (
19661
- arg
19662
- ),
19663
- "minus-literal" (
19664
- arg
19665
- ),
19666
- "delete" (
19667
- arg
19668
- )
19587
+ "equal-literal" arg,
19588
+ "set" arg,
19589
+ "plus-literal" arg,
19590
+ "add" arg,
19591
+ "minus-literal" arg,
19592
+ "delete" arg
19669
19593
  ),
19670
- "community-name" (
19671
- arg
19672
- )
19594
+ "community-name" arg
19673
19595
  )
19674
19596
  ).as(:oneline),
19675
19597
  "damping" arg,
@@ -19772,31 +19694,15 @@ end
19772
19694
 
19773
19695
  rule(:control_route_filter_type) do
19774
19696
  s(
19775
- "address" (
19776
- arg
19777
- ),
19697
+ "address" arg,
19778
19698
  c(
19779
- "exact" (
19780
- arg
19781
- ),
19782
- "longer" (
19783
- arg
19784
- ),
19785
- "orlonger" (
19786
- arg
19787
- ),
19788
- "upto" (
19789
- arg
19790
- ),
19791
- "through" (
19792
- arg
19793
- ),
19794
- "prefix-length-range" (
19795
- arg
19796
- ),
19797
- "address-mask" (
19798
- arg
19799
- )
19699
+ "exact" arg,
19700
+ "longer" arg,
19701
+ "orlonger" arg,
19702
+ "upto" arg,
19703
+ "through" arg,
19704
+ "prefix-length-range" arg,
19705
+ "address-mask" arg
19800
19706
  ),
19801
19707
  c(
19802
19708
  "metric" (
@@ -19922,28 +19828,14 @@ rule(:control_route_filter_type) do
19922
19828
  "community" (
19923
19829
  s(
19924
19830
  c(
19925
- "equal-literal" (
19926
- arg
19927
- ),
19928
- "set" (
19929
- arg
19930
- ),
19931
- "plus-literal" (
19932
- arg
19933
- ),
19934
- "add" (
19935
- arg
19936
- ),
19937
- "minus-literal" (
19938
- arg
19939
- ),
19940
- "delete" (
19941
- arg
19942
- )
19831
+ "equal-literal" arg,
19832
+ "set" arg,
19833
+ "plus-literal" arg,
19834
+ "add" arg,
19835
+ "minus-literal" arg,
19836
+ "delete" arg
19943
19837
  ),
19944
- "community-name" (
19945
- arg
19946
- )
19838
+ "community-name" arg
19947
19839
  )
19948
19840
  ).as(:oneline),
19949
19841
  "damping" arg,
@@ -20042,28 +19934,14 @@ end
20042
19934
 
20043
19935
  rule(:control_source_address_filter_type) do
20044
19936
  s(
20045
- "address" (
20046
- arg
20047
- ),
19937
+ "address" arg,
20048
19938
  c(
20049
- "exact" (
20050
- arg
20051
- ),
20052
- "longer" (
20053
- arg
20054
- ),
20055
- "orlonger" (
20056
- arg
20057
- ),
20058
- "upto" (
20059
- arg
20060
- ),
20061
- "through" (
20062
- arg
20063
- ),
20064
- "prefix-length-range" (
20065
- arg
20066
- )
19939
+ "exact" arg,
19940
+ "longer" arg,
19941
+ "orlonger" arg,
19942
+ "upto" arg,
19943
+ "through" arg,
19944
+ "prefix-length-range" arg
20067
19945
  ),
20068
19946
  c(
20069
19947
  "metric" (
@@ -20189,28 +20067,14 @@ rule(:control_source_address_filter_type) do
20189
20067
  "community" (
20190
20068
  s(
20191
20069
  c(
20192
- "equal-literal" (
20193
- arg
20194
- ),
20195
- "set" (
20196
- arg
20197
- ),
20198
- "plus-literal" (
20199
- arg
20200
- ),
20201
- "add" (
20202
- arg
20203
- ),
20204
- "minus-literal" (
20205
- arg
20206
- ),
20207
- "delete" (
20208
- arg
20209
- )
20070
+ "equal-literal" arg,
20071
+ "set" arg,
20072
+ "plus-literal" arg,
20073
+ "add" arg,
20074
+ "minus-literal" arg,
20075
+ "delete" arg
20210
20076
  ),
20211
- "community-name" (
20212
- arg
20213
- )
20077
+ "community-name" arg
20214
20078
  )
20215
20079
  ).as(:oneline),
20216
20080
  "damping" arg,
@@ -21590,12 +21454,8 @@ rule(:juniper_protocols) do
21590
21454
  ),
21591
21455
  "virtual-link" (
21592
21456
  s(
21593
- "neighbor-id" (
21594
- arg
21595
- ),
21596
- "transit-area" (
21597
- arg
21598
- ),
21457
+ "neighbor-id" arg,
21458
+ "transit-area" arg,
21599
21459
  c(
21600
21460
  c(
21601
21461
  "disable"
@@ -22006,12 +21866,8 @@ rule(:juniper_protocols) do
22006
21866
  ),
22007
21867
  "virtual-link" (
22008
21868
  s(
22009
- "neighbor-id" (
22010
- arg
22011
- ),
22012
- "transit-area" (
22013
- arg
22014
- ),
21869
+ "neighbor-id" arg,
21870
+ "transit-area" arg,
22015
21871
  c(
22016
21872
  c(
22017
21873
  "disable"
@@ -25766,12 +25622,8 @@ rule(:juniper_protocols_ospf) do
25766
25622
  ),
25767
25623
  "virtual-link" (
25768
25624
  s(
25769
- "neighbor-id" (
25770
- arg
25771
- ),
25772
- "transit-area" (
25773
- arg
25774
- ),
25625
+ "neighbor-id" arg,
25626
+ "transit-area" arg,
25775
25627
  c(
25776
25628
  c(
25777
25629
  "disable"
@@ -27499,12 +27351,8 @@ rule(:juniper_routing_instance) do
27499
27351
  ),
27500
27352
  "virtual-link" (
27501
27353
  s(
27502
- "neighbor-id" (
27503
- arg
27504
- ),
27505
- "transit-area" (
27506
- arg
27507
- ),
27354
+ "neighbor-id" arg,
27355
+ "transit-area" arg,
27508
27356
  c(
27509
27357
  c(
27510
27358
  "disable"
@@ -27915,12 +27763,8 @@ rule(:juniper_routing_instance) do
27915
27763
  ),
27916
27764
  "virtual-link" (
27917
27765
  s(
27918
- "neighbor-id" (
27919
- arg
27920
- ),
27921
- "transit-area" (
27922
- arg
27923
- ),
27766
+ "neighbor-id" arg,
27767
+ "transit-area" arg,
27924
27768
  c(
27925
27769
  c(
27926
27770
  "disable"
@@ -29903,7 +29747,7 @@ rule(:juniper_sampling_options) do
29903
29747
  ),
29904
29748
  "family" (
29905
29749
  c(
29906
- "inet" (
29750
+ ("inet" | "mpls") (
29907
29751
  c(
29908
29752
  c(
29909
29753
  "disable"
@@ -29922,8 +29766,7 @@ rule(:juniper_sampling_options) do
29922
29766
  sampling_family_inet6_output_type
29923
29767
  )
29924
29768
  )
29925
- ),
29926
- "mpls"
29769
+ )
29927
29770
  )
29928
29771
  ),
29929
29772
  "instance" arg (
@@ -30463,12 +30306,8 @@ rule(:juniper_system) do
30463
30306
  ),
30464
30307
  "dlv" (
30465
30308
  s(
30466
- "domain" (
30467
- arg
30468
- ),
30469
- "trusted-anchor" (
30470
- arg
30471
- )
30309
+ "domain" arg,
30310
+ "trusted-anchor" arg
30472
30311
  )
30473
30312
  ).as(:oneline),
30474
30313
  "secure-domains" arg
@@ -32962,28 +32801,14 @@ end
32962
32801
 
32963
32802
  rule(:martian_type) do
32964
32803
  s(
32965
- "address" (
32966
- arg
32967
- ),
32804
+ "address" arg,
32968
32805
  c(
32969
- "exact" (
32970
- arg
32971
- ),
32972
- "longer" (
32973
- arg
32974
- ),
32975
- "orlonger" (
32976
- arg
32977
- ),
32978
- "upto" (
32979
- arg
32980
- ),
32981
- "through" (
32982
- arg
32983
- ),
32984
- "prefix-length-range" (
32985
- arg
32986
- )
32806
+ "exact" arg,
32807
+ "longer" arg,
32808
+ "orlonger" arg,
32809
+ "upto" arg,
32810
+ "through" arg,
32811
+ "prefix-length-range" arg
32987
32812
  ),
32988
32813
  c(
32989
32814
  "allow"
@@ -35175,12 +35000,8 @@ rule(:scheduler_object_type) do
35175
35000
  "description" arg,
35176
35001
  "start-date" (
35177
35002
  s(
35178
- "start-date" (
35179
- arg
35180
- ),
35181
- "stop-date" (
35182
- arg
35183
- )
35003
+ "start-date" arg,
35004
+ "stop-date" arg
35184
35005
  )
35185
35006
  ),
35186
35007
  "daily" (
@@ -35216,12 +35037,8 @@ rule(:daily_object) do
35216
35037
  c(
35217
35038
  "start-time" (
35218
35039
  s(
35219
- "start-time-value" (
35220
- arg
35221
- ),
35222
- "stop-time" (
35223
- arg
35224
- )
35040
+ "start-time-value" arg,
35041
+ "stop-time" arg
35225
35042
  )
35226
35043
  ),
35227
35044
  "exclude",
@@ -38080,12 +37897,8 @@ rule(:vrrp_group) do
38080
37897
  ),
38081
37898
  "route" (
38082
37899
  s(
38083
- "route_address" (
38084
- arg
38085
- ),
38086
- "routing-instance" (
38087
- arg
38088
- ),
37900
+ "route_address" arg,
37901
+ "routing-instance" arg,
38089
37902
  c(
38090
37903
  "priority-cost" arg
38091
37904
  )