pio 0.16.0 → 0.17.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (28) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +7 -0
  3. data/README.md +26 -25
  4. data/examples/features_new.rb +20 -17
  5. data/examples/packet_in_new.rb +5 -7
  6. data/examples/packet_out_new.rb +1 -1
  7. data/features/packet_in_read.feature +1 -1
  8. data/features/packet_out_read.feature +1 -2
  9. data/lib/pio/arp/format.rb +1 -1
  10. data/lib/pio/dhcp/frame.rb +2 -2
  11. data/lib/pio/ethernet_header.rb +15 -16
  12. data/lib/pio/exact_match.rb +1 -1
  13. data/lib/pio/features.rb +1 -0
  14. data/lib/pio/icmp/format.rb +2 -2
  15. data/lib/pio/ipv4_address.rb +8 -0
  16. data/lib/pio/ipv4_header.rb +6 -3
  17. data/lib/pio/lldp/frame.rb +1 -1
  18. data/lib/pio/packet_in.rb +19 -24
  19. data/lib/pio/packet_out.rb +3 -3
  20. data/lib/pio/udp.rb +2 -2
  21. data/lib/pio/udp_header.rb +1 -1
  22. data/lib/pio/version.rb +1 -1
  23. data/pio.gemspec +5 -5
  24. data/spec/pio/arp_spec.rb +2 -2
  25. data/spec/pio/ipv4_address_spec.rb +200 -232
  26. data/spec/pio/packet_in_spec.rb +7 -7
  27. data/spec/pio/packet_out_spec.rb +17 -17
  28. metadata +90 -90
data/spec/pio/packet_in_spec.rb CHANGED
@@ -47,7 +47,7 @@ describe Pio::PacketIn do
47
47
  Then { result.total_len == 0x3c }
48
48
  Then { result.in_port == 1 }
49
49
  Then { result.reason == :no_match }
50
- Then { result.data == data_dump }
50
+ Then { result.raw_data == data_dump }
51
51
  end
52
52
 
53
53
  context 'with a Packet-In message generated with PacketIn.new' do
@@ -57,7 +57,7 @@ describe Pio::PacketIn do
57
57
  buffer_id: 0xffffff00,
58
58
  in_port: 1,
59
59
  reason: :no_match,
60
- data: data_dump
60
+ raw_data: data_dump
61
61
  ).to_binary
62
62
  end
63
63
 
@@ -73,7 +73,7 @@ describe Pio::PacketIn do
73
73
  Then { result.total_len == 0x3c }
74
74
  Then { result.in_port == 1 }
75
75
  Then { result.reason == :no_match }
76
- Then { result.data == data_dump }
76
+ Then { result.raw_data == data_dump }
77
77
  end
78
78
 
79
79
  context 'with a Hello message' do
@@ -96,7 +96,7 @@ describe Pio::PacketIn do
96
96
  buffer_id: 0xffffff00,
97
97
  in_port: 1,
98
98
  reason: :no_match,
99
- data: data_dump
99
+ raw_data: data_dump
100
100
  }
101
101
  end
102
102
  When { packet_in.datapath_id = 0xabc }
@@ -113,7 +113,7 @@ describe Pio::PacketIn do
113
113
  Then { packet_in.buffer_id == 0xffffff00 }
114
114
  Then { packet_in.in_port == 1 }
115
115
  Then { packet_in.reason == :no_match }
116
- Then { packet_in.data == data_dump }
116
+ Then { packet_in.raw_data == data_dump }
117
117
  end
118
118
 
119
119
  context 'with xid: option' do
@@ -123,7 +123,7 @@ describe Pio::PacketIn do
123
123
  buffer_id: 0xffffff00,
124
124
  in_port: 1,
125
125
  reason: :no_match,
126
- data: data_dump
126
+ raw_data: data_dump
127
127
  }
128
128
  end
129
129
  When { packet_in.dpid = 0xabc }
@@ -140,7 +140,7 @@ describe Pio::PacketIn do
140
140
  Then { packet_in.buffer_id == 0xffffff00 }
141
141
  Then { packet_in.in_port == 1 }
142
142
  Then { packet_in.reason == :no_match }
143
- Then { packet_in.data == data_dump }
143
+ Then { packet_in.raw_data == data_dump }
144
144
  end
145
145
  end
146
146
  end
data/spec/pio/packet_out_spec.rb CHANGED
@@ -50,7 +50,7 @@ describe Pio::PacketOut do
50
50
  Then { result.actions[0].is_a? Pio::SendOutPort }
51
51
  Then { result.actions[0].port_number == 2 }
52
52
  Then { result.actions[0].max_len == 2**16 - 1 }
53
- Then { result.data.length == 64 }
53
+ Then { result.raw_data.length == 64 }
54
54
  end
55
55
 
56
56
  context 'with a Packet-Out message generated with PacketOut.new' do
@@ -60,7 +60,7 @@ describe Pio::PacketOut do
60
60
  buffer_id: 0xffffffff,
61
61
  in_port: 0xffff,
62
62
  actions: Pio::SendOutPort.new(2),
63
- data: data_dump
63
+ raw_data: data_dump
64
64
  ).to_binary
65
65
  end
66
66
 
@@ -79,7 +79,7 @@ describe Pio::PacketOut do
79
79
  Then { result.actions[0].is_a? Pio::SendOutPort }
80
80
  Then { result.actions[0].port_number == 2 }
81
81
  Then { result.actions[0].max_len == 2**16 - 1 }
82
- Then { result.data.length == 64 }
82
+ Then { result.raw_data.length == 64 }
83
83
  end
84
84
 
85
85
  context 'with a Hello message' do
@@ -102,7 +102,7 @@ describe Pio::PacketOut do
102
102
  buffer_id: 0xffffffff,
103
103
  in_port: 0xffff,
104
104
  actions: Pio::SendOutPort.new(2),
105
- data: data_dump
105
+ raw_data: data_dump
106
106
  }
107
107
  end
108
108
 
@@ -120,7 +120,7 @@ describe Pio::PacketOut do
120
120
  Then { result.actions[0].is_a? Pio::SendOutPort }
121
121
  Then { result.actions[0].port_number == 2 }
122
122
  Then { result.actions[0].max_len == 2**16 - 1 }
123
- Then { result.data.length == 64 }
123
+ Then { result.raw_data.length == 64 }
124
124
 
125
125
  context '#to_binary' do
126
126
  When(:binary) { result.to_binary }
@@ -136,7 +136,7 @@ describe Pio::PacketOut do
136
136
  buffer_id: 0xffffffff,
137
137
  in_port: 0xffff,
138
138
  actions: Pio::SetVlanVid.new(10),
139
- data: data_dump
139
+ raw_data: data_dump
140
140
  }
141
141
  end
142
142
 
@@ -154,7 +154,7 @@ describe Pio::PacketOut do
154
154
  buffer_id: 0xffffffff,
155
155
  in_port: 0xffff,
156
156
  actions: Pio::SetVlanPriority.new(3),
157
- data: data_dump
157
+ raw_data: data_dump
158
158
  }
159
159
  end
160
160
 
@@ -172,7 +172,7 @@ describe Pio::PacketOut do
172
172
  buffer_id: 0xffffffff,
173
173
  in_port: 0xffff,
174
174
  actions: Pio::StripVlanHeader.new,
175
- data: data_dump
175
+ raw_data: data_dump
176
176
  }
177
177
  end
178
178
 
@@ -189,7 +189,7 @@ describe Pio::PacketOut do
189
189
  buffer_id: 0xffffffff,
190
190
  in_port: 0xffff,
191
191
  actions: Pio::SetEthSrcAddr.new('11:22:33:44:55:66'),
192
- data: data_dump
192
+ raw_data: data_dump
193
193
  }
194
194
  end
195
195
 
@@ -207,7 +207,7 @@ describe Pio::PacketOut do
207
207
  buffer_id: 0xffffffff,
208
208
  in_port: 0xffff,
209
209
  actions: Pio::SetEthDstAddr.new('11:22:33:44:55:66'),
210
- data: data_dump
210
+ raw_data: data_dump
211
211
  }
212
212
  end
213
213
 
@@ -225,7 +225,7 @@ describe Pio::PacketOut do
225
225
  buffer_id: 0xffffffff,
226
226
  in_port: 0xffff,
227
227
  actions: Pio::SetIpSrcAddr.new('1.2.3.4'),
228
- data: data_dump
228
+ raw_data: data_dump
229
229
  }
230
230
  end
231
231
 
@@ -243,7 +243,7 @@ describe Pio::PacketOut do
243
243
  buffer_id: 0xffffffff,
244
244
  in_port: 0xffff,
245
245
  actions: Pio::SetIpDstAddr.new('1.2.3.4'),
246
- data: data_dump
246
+ raw_data: data_dump
247
247
  }
248
248
  end
249
249
 
@@ -261,7 +261,7 @@ describe Pio::PacketOut do
261
261
  buffer_id: 0xffffffff,
262
262
  in_port: 0xffff,
263
263
  actions: Pio::SetIpTos.new(32),
264
- data: data_dump
264
+ raw_data: data_dump
265
265
  }
266
266
  end
267
267
 
@@ -279,7 +279,7 @@ describe Pio::PacketOut do
279
279
  buffer_id: 0xffffffff,
280
280
  in_port: 0xffff,
281
281
  actions: Pio::SetTransportSrcPort.new(100),
282
- data: data_dump
282
+ raw_data: data_dump
283
283
  }
284
284
  end
285
285
 
@@ -297,7 +297,7 @@ describe Pio::PacketOut do
297
297
  buffer_id: 0xffffffff,
298
298
  in_port: 0xffff,
299
299
  actions: Pio::SetTransportDstPort.new(100),
300
- data: data_dump
300
+ raw_data: data_dump
301
301
  }
302
302
  end
303
303
 
@@ -315,7 +315,7 @@ describe Pio::PacketOut do
315
315
  buffer_id: 0xffffffff,
316
316
  in_port: 0xffff,
317
317
  actions: Pio::Enqueue.new(port_number: 1, queue_id: 2),
318
- data: data_dump
318
+ raw_data: data_dump
319
319
  }
320
320
  end
321
321
 
@@ -334,7 +334,7 @@ describe Pio::PacketOut do
334
334
  buffer_id: 0xffffffff,
335
335
  in_port: 0xffff,
336
336
  actions: [Pio::SendOutPort.new(2), Pio::SetVlanVid.new(10)],
337
- data: data_dump
337
+ raw_data: data_dump
338
338
  }
339
339
  end
340
340
 
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: pio
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.16.0
4
+ version: 0.17.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Yasuhito Takamiya
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-03-02 00:00:00.000000000 Z
11
+ date: 2015-03-06 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bindata
@@ -44,14 +44,14 @@ dependencies:
44
44
  requirements:
45
45
  - - ~>
46
46
  - !ruby/object:Gem::Version
47
- version: 1.8.2
47
+ version: 1.8.4
48
48
  type: :development
49
49
  prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
52
  - - ~>
53
53
  - !ruby/object:Gem::Version
54
- version: 1.8.2
54
+ version: 1.8.4
55
55
  - !ruby/object:Gem::Dependency
56
56
  name: pry
57
57
  requirement: !ruby/object:Gem::Requirement
@@ -72,14 +72,14 @@ dependencies:
72
72
  requirements:
73
73
  - - ~>
74
74
  - !ruby/object:Gem::Version
75
- version: 2.12.1
75
+ version: 2.12.4
76
76
  type: :development
77
77
  prerelease: false
78
78
  version_requirements: !ruby/object:Gem::Requirement
79
79
  requirements:
80
80
  - - ~>
81
81
  - !ruby/object:Gem::Version
82
- version: 2.12.1
82
+ version: 2.12.4
83
83
  - !ruby/object:Gem::Dependency
84
84
  name: guard-bundler
85
85
  requirement: !ruby/object:Gem::Requirement
@@ -226,28 +226,28 @@ dependencies:
226
226
  requirements:
227
227
  - - ~>
228
228
  - !ruby/object:Gem::Version
229
- version: 0.4.6
229
+ version: 0.4.7
230
230
  type: :development
231
231
  prerelease: false
232
232
  version_requirements: !ruby/object:Gem::Requirement
233
233
  requirements:
234
234
  - - ~>
235
235
  - !ruby/object:Gem::Version
236
- version: 0.4.6
236
+ version: 0.4.7
237
237
  - !ruby/object:Gem::Dependency
238
238
  name: coveralls
239
239
  requirement: !ruby/object:Gem::Requirement
240
240
  requirements:
241
241
  - - ~>
242
242
  - !ruby/object:Gem::Version
243
- version: 0.7.9
243
+ version: 0.7.11
244
244
  type: :development
245
245
  prerelease: false
246
246
  version_requirements: !ruby/object:Gem::Requirement
247
247
  requirements:
248
248
  - - ~>
249
249
  - !ruby/object:Gem::Version
250
- version: 0.7.9
250
+ version: 0.7.11
251
251
  - !ruby/object:Gem::Dependency
252
252
  name: cucumber
253
253
  requirement: !ruby/object:Gem::Requirement
@@ -296,14 +296,14 @@ dependencies:
296
296
  requirements:
297
297
  - - ~>
298
298
  - !ruby/object:Gem::Version
299
- version: 2.0.0
299
+ version: 2.0.1
300
300
  type: :development
301
301
  prerelease: false
302
302
  version_requirements: !ruby/object:Gem::Requirement
303
303
  requirements:
304
304
  - - ~>
305
305
  - !ruby/object:Gem::Version
306
- version: 2.0.0
306
+ version: 2.0.1
307
307
  - !ruby/object:Gem::Dependency
308
308
  name: rspec
309
309
  requirement: !ruby/object:Gem::Requirement
@@ -589,109 +589,109 @@ required_rubygems_version: !ruby/object:Gem::Requirement
589
589
  version: '0'
590
590
  requirements: []
591
591
  rubyforge_project:
592
- rubygems_version: 2.4.6
592
+ rubygems_version: 2.4.3
593
593
  signing_key:
594
594
  specification_version: 4
595
595
  summary: Packet parser and generator.
596
596
  test_files:
597
- - spec/pio/arp/reply/options_spec.rb
598
- - spec/pio/arp/reply_spec.rb
599
- - spec/pio/arp/request/options_spec.rb
600
- - spec/pio/arp/request_spec.rb
601
- - spec/pio/arp_spec.rb
597
+ - spec/pio/set_eth_src_addr_spec.rb
598
+ - spec/pio/features/request_spec.rb
599
+ - spec/pio/features/reply_spec.rb
600
+ - spec/pio/set_vlan_vid_spec.rb
601
+ - spec/pio/set_transport_dst_port_spec.rb
602
+ - spec/pio/strip_vlan_header_spec.rb
603
+ - spec/pio/ipv4_address_spec.rb
604
+ - spec/pio/open_flow/type_spec.rb
605
+ - spec/pio/open_flow/phy_port_spec.rb
606
+ - spec/pio/enqueue_spec.rb
607
+ - spec/pio/hello_spec.rb
608
+ - spec/pio/set_ip_src_addr_spec.rb
609
+ - spec/pio/dhcp/request_spec.rb
610
+ - spec/pio/dhcp/offer_spec.rb
602
611
  - spec/pio/dhcp/ack_spec.rb
603
612
  - spec/pio/dhcp/discover_spec.rb
604
- - spec/pio/dhcp/offer_spec.rb
605
- - spec/pio/dhcp/request_spec.rb
606
- - spec/pio/dhcp_spec.rb
607
- - spec/pio/echo/reply_spec.rb
608
- - spec/pio/echo/request_spec.rb
609
- - spec/pio/enqueue_spec.rb
610
- - spec/pio/features/reply_spec.rb
611
- - spec/pio/features/request_spec.rb
613
+ - spec/pio/set_transport_src_port_spec.rb
614
+ - spec/pio/arp/request_spec.rb
615
+ - spec/pio/arp/reply/options_spec.rb
616
+ - spec/pio/arp/request/options_spec.rb
617
+ - spec/pio/arp/reply_spec.rb
612
618
  - spec/pio/flow_mod_spec.rb
613
- - spec/pio/hello_spec.rb
614
- - spec/pio/icmp/reply_spec.rb
619
+ - spec/pio/lldp/options_spec.rb
620
+ - spec/pio/set_vlan_priority_spec.rb
621
+ - spec/pio/set_ip_dst_addr_spec.rb
622
+ - spec/pio/mac_spec.rb
615
623
  - spec/pio/icmp/request_spec.rb
624
+ - spec/pio/icmp/reply_spec.rb
616
625
  - spec/pio/icmp_spec.rb
617
- - spec/pio/ipv4_address_spec.rb
618
- - spec/pio/lldp/options_spec.rb
626
+ - spec/pio/wildcards_spec.rb
627
+ - spec/pio/dhcp_spec.rb
628
+ - spec/pio/set_ip_tos_spec.rb
629
+ - spec/pio/send_out_port_spec.rb
630
+ - spec/pio/packet_in_spec.rb
619
631
  - spec/pio/lldp_spec.rb
620
- - spec/pio/mac_spec.rb
632
+ - spec/pio/arp_spec.rb
633
+ - spec/pio/echo/request_spec.rb
634
+ - spec/pio/echo/reply_spec.rb
635
+ - spec/pio/set_eth_dst_addr_spec.rb
621
636
  - spec/pio/match_spec.rb
622
- - spec/pio/open_flow/phy_port_spec.rb
623
- - spec/pio/open_flow/type_spec.rb
624
- - spec/pio/packet_in_spec.rb
625
637
  - spec/pio/packet_out_spec.rb
626
- - spec/pio/send_out_port_spec.rb
627
- - spec/pio/set_eth_dst_addr_spec.rb
628
- - spec/pio/set_eth_src_addr_spec.rb
629
- - spec/pio/set_ip_dst_addr_spec.rb
630
- - spec/pio/set_ip_src_addr_spec.rb
631
- - spec/pio/set_ip_tos_spec.rb
632
- - spec/pio/set_transport_dst_port_spec.rb
633
- - spec/pio/set_transport_src_port_spec.rb
634
- - spec/pio/set_vlan_priority_spec.rb
635
- - spec/pio/set_vlan_vid_spec.rb
636
- - spec/pio/strip_vlan_header_spec.rb
637
- - spec/pio/wildcards_spec.rb
638
638
  - spec/spec_helper.rb
639
- - features/arp_read.feature
640
- - features/dhcp_read.feature
641
- - features/echo_read.feature
642
- - features/exact_match.feature
643
- - features/features_read.feature
644
- - features/flow_mod_read.feature
645
639
  - features/hello_read.feature
646
- - features/icmp_read.feature
647
- - features/lldp_read.feature
648
- - features/packet_data/aggregate_stats_reply.raw
649
- - features/packet_data/aggregate_stats_request.raw
650
- - features/packet_data/arp-storm.pcap
651
- - features/packet_data/arp.pcap
652
- - features/packet_data/barrier_reply.raw
653
- - features/packet_data/barrier_request.raw
640
+ - features/support/env.rb
641
+ - features/udp_read.feature
654
642
  - features/packet_data/desc_stats_reply.raw
655
- - features/packet_data/desc_stats_request.raw
656
643
  - features/packet_data/dhcp.pcap
657
644
  - features/packet_data/echo_reply.raw
658
- - features/packet_data/echo_request.raw
659
- - features/packet_data/error.raw
645
+ - features/packet_data/flow_mod_modify_strict.raw
646
+ - features/packet_data/flow_mod_add.raw
660
647
  - features/packet_data/features_reply.raw
648
+ - features/packet_data/aggregate_stats_reply.raw
649
+ - features/packet_data/queue_get_config_reply.raw
650
+ - features/packet_data/arp.pcap
661
651
  - features/packet_data/features_request.raw
662
- - features/packet_data/flow_mod_add.raw
663
- - features/packet_data/flow_mod_delete.raw
664
- - features/packet_data/flow_mod_delete_strict.raw
665
- - features/packet_data/flow_mod_modify.raw
666
- - features/packet_data/flow_mod_modify_strict.raw
667
- - features/packet_data/flow_removed.raw
668
- - features/packet_data/flow_stats_reply.raw
669
652
  - features/packet_data/flow_stats_request.raw
670
- - features/packet_data/get_config_reply.raw
671
- - features/packet_data/get_config_request.raw
672
- - features/packet_data/hello.raw
673
- - features/packet_data/icmp.pcap
674
- - features/packet_data/lldp.detailed.pcap
675
- - features/packet_data/lldp.minimal.pcap
676
653
  - features/packet_data/packet_in_arp_request.raw
677
- - features/packet_data/packet_in_cbench.raw
678
- - features/packet_data/packet_out.raw
679
- - features/packet_data/port_mod.raw
680
- - features/packet_data/port_stats_reply.raw
681
654
  - features/packet_data/port_stats_request.raw
682
- - features/packet_data/port_status.raw
683
- - features/packet_data/queue_get_config_reply.raw
684
- - features/packet_data/queue_get_config_request.raw
655
+ - features/packet_data/flow_mod_delete_strict.raw
656
+ - features/packet_data/barrier_reply.raw
657
+ - features/packet_data/get_config_request.raw
658
+ - features/packet_data/vendor.raw
659
+ - features/packet_data/port_mod.raw
660
+ - features/packet_data/get_config_reply.raw
661
+ - features/packet_data/lldp.minimal.pcap
662
+ - features/packet_data/hello.raw
663
+ - features/packet_data/flow_removed.raw
685
664
  - features/packet_data/set_config.raw
665
+ - features/packet_data/port_stats_reply.raw
666
+ - features/packet_data/packet_out.raw
686
667
  - features/packet_data/table_stats_reply.raw
687
- - features/packet_data/table_stats_request.raw
688
- - features/packet_data/vendor.raw
668
+ - features/packet_data/packet_in_cbench.raw
669
+ - features/packet_data/queue_get_config_request.raw
670
+ - features/packet_data/error.raw
689
671
  - features/packet_data/vendor_stats_request.raw
690
- - features/packet_in_read.feature
691
- - features/packet_out_read.feature
672
+ - features/packet_data/icmp.pcap
673
+ - features/packet_data/arp-storm.pcap
674
+ - features/packet_data/flow_stats_reply.raw
675
+ - features/packet_data/desc_stats_request.raw
676
+ - features/packet_data/barrier_request.raw
677
+ - features/packet_data/table_stats_request.raw
678
+ - features/packet_data/port_status.raw
679
+ - features/packet_data/flow_mod_modify.raw
680
+ - features/packet_data/flow_mod_delete.raw
681
+ - features/packet_data/lldp.detailed.pcap
682
+ - features/packet_data/aggregate_stats_request.raw
683
+ - features/packet_data/echo_request.raw
684
+ - features/exact_match.feature
685
+ - features/icmp_read.feature
692
686
  - features/port_status_read.feature
693
- - features/step_definitions/packet_data_steps.rb
687
+ - features/arp_read.feature
694
688
  - features/step_definitions/pending_steps.rb
695
- - features/support/env.rb
696
- - features/udp_read.feature
689
+ - features/step_definitions/packet_data_steps.rb
690
+ - features/flow_mod_read.feature
691
+ - features/lldp_read.feature
692
+ - features/dhcp_read.feature
693
+ - features/features_read.feature
694
+ - features/packet_out_read.feature
695
+ - features/packet_in_read.feature
696
+ - features/echo_read.feature
697
697
  has_rdoc: