Skip to content

Commit

Permalink
Merge branch 'release/0.25.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
@yasuhito
yasuhito committed Aug 6, 2015
2 parents 60ad876 + 80f2a21 commit c3603c1
Show file tree
Hide file tree
Showing 50 changed files with 656 additions and 215 deletions.
2 changes: 1 addition & 1 deletion .reek
View file
@@ -1,2 +1,2 @@
UncommunicativeModuleName:
accept: ['Pio::Hello13']
accept: ['Pio::Hello13', 'Pio::OpenFlow10', 'Pio::OpenFlow13']
5 changes: 5 additions & 0 deletions CHANGELOG.md
View file
Expand Up @@ -3,6 +3,11 @@
## develop (unreleased)


## 0.25.0 (8/6/2015)
### New features
* [#211](https://github.com/trema/pio/pull/211): Add new classes `Pio::FlowStats::Request` and `Pio::FlowStats::Reply`.


## 0.24.2 (8/4/2015)
### Bugs fixed
* [#209](https://github.com/trema/pio/issues/209): `Pio::OpenFlow.read` cannot parse Barrier messages.
Expand Down
4 changes: 2 additions & 2 deletions Guardfile
View file
Expand Up @@ -5,8 +5,8 @@ end

guard :rspec, cmd: 'bundle exec rspec' do
watch(%r{^spec/pio/.+_spec\.rb$})
watch(%r{^lib/pio/(.+)\.rb$}) { |m| "spec/pio/#{m[1]}_spec.rb" }
watch('spec/spec_helper.rb') { 'spec' }
watch(%r{^lib/pio/(.+)\.rb$}) { |m| "spec/pio/#{m[1]}_spec.rb" }
watch('spec/spec_helper.rb') { 'spec' }
end

guard :rubocop do
Expand Down
2 changes: 2 additions & 0 deletions README.md
View file
Expand Up @@ -31,6 +31,8 @@ supports the following packet formats:
- [Exact Match](https://relishapp.com/trema/pio/docs/open-flow10/pio-exactmatch)
- [Barrier Request](https://relishapp.com/trema/pio/docs/open-flow10/pio-barrier-request)
- [Barrier Reply](https://relishapp.com/trema/pio/docs/open-flow10/pio-barrier-reply)
- [Flow Stats Request](https://relishapp.com/trema/pio/docs/open-flow10/pio-flowstats-request)
- [Flow Stats Reply](https://relishapp.com/trema/pio/docs/open-flow10/pio-flowstats-reply)
- OpenFlow 1.3
- [Hello](https://relishapp.com/trema/pio/docs/open-flow13/pio-hello)
- [Echo Request](https://relishapp.com/trema/pio/docs/open-flow13/pio-echo-request)
Expand Down
4 changes: 2 additions & 2 deletions features/arp.feature
View file
Expand Up @@ -9,7 +9,7 @@ Feature: Pio::Arp
)
"""
Then it should finish successfully
And the packet have the following fields and values:
And the packet has the following fields and values:
| field | value |
| class | Pio::Arp::Request |
| destination_mac | ff:ff:ff:ff:ff:ff |
Expand All @@ -36,7 +36,7 @@ Feature: Pio::Arp
)
"""
Then it should finish successfully
And the packet have the following fields and values:
And the packet has the following fields and values:
| field | value |
| class | Pio::Arp::Reply |
| destination_mac | 00:26:82:eb:ea:d1 |
Expand Down
8 changes: 4 additions & 4 deletions features/dhcp.feature
View file
Expand Up @@ -15,7 +15,7 @@ Feature: Pio::Dhcp
)
"""
Then it should finish successfully
And the packet have the following fields and values:
And the packet has the following fields and values:
| field | value |
| class | Pio::Dhcp::Ack |
| destination_mac | 11:22:33:44:55:66 |
Expand Down Expand Up @@ -64,7 +64,7 @@ Feature: Pio::Dhcp
)
"""
Then it should finish successfully
And the packet have the following fields and values:
And the packet has the following fields and values:
| field | value |
| class | Pio::Dhcp::Discover |
| destination_mac | ff:ff:ff:ff:ff:ff |
Expand Down Expand Up @@ -112,7 +112,7 @@ Feature: Pio::Dhcp
)
"""
Then it should finish successfully
And the packet have the following fields and values:
And the packet has the following fields and values:
| field | value |
| class | Pio::Dhcp::Request |
| destination_mac | ff:ff:ff:ff:ff:ff |
Expand Down Expand Up @@ -166,7 +166,7 @@ Feature: Pio::Dhcp
)
"""
Then it should finish successfully
And the packet have the following fields and values:
And the packet has the following fields and values:
| field | value |
| class | Pio::Dhcp::Offer |
| destination_mac | 11:22:33:44:55:66 |
Expand Down
4 changes: 2 additions & 2 deletions features/icmp.feature
View file
Expand Up @@ -10,7 +10,7 @@ Feature: Pio::Icmp
)
"""
Then it should finish successfully
And the packet have the following fields and values:
And the packet has the following fields and values:
| field | value |
| class | Pio::Icmp::Request |
| destination_mac | 00:26:82:eb:ea:d1 |
Expand Down Expand Up @@ -49,7 +49,7 @@ Feature: Pio::Icmp
)
"""
Then it should finish successfully
And the packet have the following fields and values:
And the packet has the following fields and values:
| field | value |
| class | Pio::Icmp::Reply |
| destination_mac | 00:16:9d:1d:9c:c4 |
Expand Down
2 changes: 1 addition & 1 deletion features/lldp.feature
View file
Expand Up @@ -5,7 +5,7 @@ Feature: Pio::Lldp
Pio::Lldp.new(dpid: 0x123, port_number: 12, source_mac: '11:22:33:44:55:66')
"""
Then it should finish successfully
And the message have the following fields and values:
And the message has the following fields and values:
| field | value |
| class | Pio::Lldp |
| destination_mac | 01:80:c2:00:00:0e |
Expand Down
8 changes: 4 additions & 4 deletions features/open_flow10/barrier_reply.feature
View file
Expand Up @@ -6,7 +6,7 @@ Feature: Pio::Barrier::Reply
Pio::Barrier::Reply.new
"""
Then it should finish successfully
And the message have the following fields and values:
And the message has the following fields and values:
| field | value |
| ofp_version | 1 |
| message_type | 19 |
Expand All @@ -21,7 +21,7 @@ Feature: Pio::Barrier::Reply
Pio::Barrier::Reply.new(transaction_id: 123)
"""
Then it should finish successfully
And the message have the following fields and values:
And the message has the following fields and values:
| field | value |
| ofp_version | 1 |
| message_type | 19 |
Expand All @@ -36,7 +36,7 @@ Feature: Pio::Barrier::Reply
Pio::Barrier::Reply.new(xid: 123)
"""
Then it should finish successfully
And the message have the following fields and values:
And the message has the following fields and values:
| field | value |
| ofp_version | 1 |
| message_type | 19 |
Expand All @@ -48,7 +48,7 @@ Feature: Pio::Barrier::Reply
Scenario: read
When I try to parse a file named "open_flow10/barrier_reply.raw" with "Barrier::Reply" class
Then it should finish successfully
And the message have the following fields and values:
And the message has the following fields and values:
| field | value |
| ofp_version | 1 |
| message_type | 19 |
Expand Down
8 changes: 4 additions & 4 deletions features/open_flow10/barrier_request.feature
View file
Expand Up @@ -6,7 +6,7 @@ Feature: Pio::Barrier::Request
Pio::Barrier::Request.new
"""
Then it should finish successfully
And the message have the following fields and values:
And the message has the following fields and values:
| field | value |
| ofp_version | 1 |
| message_type | 18 |
Expand All @@ -21,7 +21,7 @@ Feature: Pio::Barrier::Request
Pio::Barrier::Request.new(transaction_id: 123)
"""
Then it should finish successfully
And the message have the following fields and values:
And the message has the following fields and values:
| field | value |
| ofp_version | 1 |
| message_type | 18 |
Expand All @@ -36,7 +36,7 @@ Feature: Pio::Barrier::Request
Pio::Barrier::Request.new(xid: 123)
"""
Then it should finish successfully
And the message have the following fields and values:
And the message has the following fields and values:
| field | value |
| ofp_version | 1 |
| message_type | 18 |
Expand All @@ -48,7 +48,7 @@ Feature: Pio::Barrier::Request
Scenario: read
When I try to parse a file named "open_flow10/barrier_request.raw" with "Barrier::Request" class
Then it should finish successfully
And the message have the following fields and values:
And the message has the following fields and values:
| field | value |
| ofp_version | 1 |
| message_type | 18 |
Expand Down
12 changes: 6 additions & 6 deletions features/open_flow10/echo_reply.feature
View file
Expand Up @@ -6,7 +6,7 @@ Feature: Pio::Echo::Reply
Pio::Echo::Reply.new
"""
Then it should finish successfully
And the message have the following fields and values:
And the message has the following fields and values:
| field | value |
| ofp_version | 1 |
| message_type | 3 |
Expand All @@ -22,7 +22,7 @@ Feature: Pio::Echo::Reply
Pio::Echo::Reply.new(transaction_id: 123)
"""
Then it should finish successfully
And the message have the following fields and values:
And the message has the following fields and values:
| field | value |
| ofp_version | 1 |
| message_type | 3 |
Expand All @@ -38,7 +38,7 @@ Feature: Pio::Echo::Reply
Pio::Echo::Reply.new(xid: 123)
"""
Then it should finish successfully
And the message have the following fields and values:
And the message has the following fields and values:
| field | value |
| ofp_version | 1 |
| message_type | 3 |
Expand All @@ -61,7 +61,7 @@ Feature: Pio::Echo::Reply
Pio::Echo::Reply.new(body: 'echo reply body')
"""
Then it should finish successfully
And the message have the following fields and values:
And the message has the following fields and values:
| field | value |
| ofp_version | 1 |
| message_type | 3 |
Expand All @@ -77,7 +77,7 @@ Feature: Pio::Echo::Reply
Pio::Echo::Reply.new(user_data: 'echo reply body')
"""
Then it should finish successfully
And the message have the following fields and values:
And the message has the following fields and values:
| field | value |
| ofp_version | 1 |
| message_type | 3 |
Expand All @@ -90,7 +90,7 @@ Feature: Pio::Echo::Reply
Scenario: read (no message body)
When I try to parse a file named "open_flow10/echo_reply.raw" with "Pio::Echo::Reply" class
Then it should finish successfully
And the message have the following fields and values:
And the message has the following fields and values:
| field | value |
| ofp_version | 1 |
| message_type | 3 |
Expand Down
12 changes: 6 additions & 6 deletions features/open_flow10/echo_request.feature
View file
Expand Up @@ -6,7 +6,7 @@ Feature: Pio::Echo::Request
Pio::Echo::Request.new
"""
Then it should finish successfully
And the message have the following fields and values:
And the message has the following fields and values:
| field | value |
| ofp_version | 1 |
| message_type | 2 |
Expand All @@ -22,7 +22,7 @@ Feature: Pio::Echo::Request
Pio::Echo::Request.new(transaction_id: 123)
"""
Then it should finish successfully
And the message have the following fields and values:
And the message has the following fields and values:
| field | value |
| ofp_version | 1 |
| message_type | 2 |
Expand All @@ -38,7 +38,7 @@ Feature: Pio::Echo::Request
Pio::Echo::Request.new(xid: 123)
"""
Then it should finish successfully
And the message have the following fields and values:
And the message has the following fields and values:
| field | value |
| ofp_version | 1 |
| message_type | 2 |
Expand All @@ -54,7 +54,7 @@ Feature: Pio::Echo::Request
Pio::Echo::Request.new(body: 'echo request body')
"""
Then it should finish successfully
And the message have the following fields and values:
And the message has the following fields and values:
| field | value |
| ofp_version | 1 |
| message_type | 2 |
Expand All @@ -70,7 +70,7 @@ Feature: Pio::Echo::Request
Pio::Echo::Request.new(user_data: 'echo request body')
"""
Then it should finish successfully
And the message have the following fields and values:
And the message has the following fields and values:
| field | value |
| ofp_version | 1 |
| message_type | 2 |
Expand All @@ -83,7 +83,7 @@ Feature: Pio::Echo::Request
Scenario: read (no message body)
When I try to parse a file named "open_flow10/echo_request.raw" with "Pio::Echo::Request" class
Then it should finish successfully
And the message have the following fields and values:
And the message has the following fields and values:
| field | value |
| ofp_version | 1 |
| message_type | 2 |
Expand Down
4 changes: 2 additions & 2 deletions features/open_flow10/exact_match.feature
View file
@@ -1,7 +1,7 @@
Feature: Pio::ExactMatch
Scenario: new (from ARP request Packet In)
When I create an exact match from "open_flow10/packet_in_arp_request.raw"
And the message have the following fields and values:
And the message has the following fields and values:
| field | value |
| wildcards | {} |
| in_port | 1 |
Expand All @@ -19,7 +19,7 @@ Feature: Pio::ExactMatch

Scenario: new (from Cbench Packet In)
When I create an exact match from "open_flow10/packet_in_cbench.raw"
And the message have the following fields and values:
And the message has the following fields and values:
| field | value |
| wildcards | {} |
| in_port | 1 |
Expand Down
4 changes: 2 additions & 2 deletions features/open_flow10/features_reply.feature
View file
Expand Up @@ -21,7 +21,7 @@ Feature: Pio::Features::Reply
)
"""
Then it should finish successfully
And the message have the following fields and values:
And the message has the following fields and values:
| field | value |
| ofp_version | 1 |
| message_type | 6 |
Expand Down Expand Up @@ -50,7 +50,7 @@ Feature: Pio::Features::Reply
Scenario: read
When I try to parse a file named "open_flow10/features_reply.raw" with "Features::Reply" class
Then it should finish successfully
And the message have the following fields and values:
And the message has the following fields and values:
| field | value |
| ofp_version | 1 |
| message_type | 6 |
Expand Down
8 changes: 4 additions & 4 deletions features/open_flow10/features_request.feature
View file
Expand Up @@ -6,7 +6,7 @@ Feature: Pio::Features::Request
Pio::Features::Request.new
"""
Then it should finish successfully
And the message have the following fields and values:
And the message has the following fields and values:
| field | value |
| ofp_version | 1 |
| message_type | 5 |
Expand All @@ -21,7 +21,7 @@ Feature: Pio::Features::Request
Pio::Features::Request.new(transaction_id: 123)
"""
Then it should finish successfully
And the message have the following fields and values:
And the message has the following fields and values:
| field | value |
| ofp_version | 1 |
| message_type | 5 |
Expand All @@ -36,7 +36,7 @@ Feature: Pio::Features::Request
Pio::Features::Request.new(xid: 123)
"""
Then it should finish successfully
And the message have the following fields and values:
And the message has the following fields and values:
| field | value |
| ofp_version | 1 |
| message_type | 5 |
Expand All @@ -48,7 +48,7 @@ Feature: Pio::Features::Request
Scenario: read
When I try to parse a file named "open_flow10/features_request.raw" with "Pio::Features::Request" class
Then it should finish successfully
And the message have the following fields and values:
And the message has the following fields and values:
| field | value |
| ofp_version | 1 |
| message_type | 5 |
Expand Down

0 comments on commit c3603c1

Please sign in to comment.