pio 0.10.1 → 0.11.0

data/spec/pio/wildcards_spec.rb

@@ -0,0 +1,115 @@
+require 'bindata'
+require 'pio/match'
+
+describe Pio::Match::Wildcards do
+  # This class has wildcards field.
+  class WildcardTest < BinData::Record
+    wildcards :wildcards
+  end
+
+  describe '.new' do
+    When(:binary) { WildcardTest.new(wildcards: parameters).to_binary_s }
+
+    context 'with no wildcard' do
+      Given(:parameters) { {} }
+
+      Then { binary == ['00000000000000000000000000000000'].pack('B*') }
+    end
+
+    context 'with in_port: true' do
+      Given(:parameters) { { in_port: true } }
+
+      Then { binary == ['00000000000000000000000000000001'].pack('B*') }
+    end
+
+    context 'with nw_src: 0b10101' do
+      Given(:parameters) { { nw_src: 0b10101 } }
+
+      Then { binary == ['00000000000000000001010100000000'].pack('B*') }
+    end
+
+    context 'with nw_src_all: true' do
+      Given(:parameters) { { nw_src_all: true } }
+
+      Then { binary == ['00000000000000000010000000000000'].pack('B*') }
+    end
+
+    context 'with nw_dst: 010101' do
+      Given(:parameters) { { nw_dst: 0b10101 } }
+
+      Then { binary == ['00000000000001010100000000000000'].pack('B*') }
+    end
+
+    context 'with nw_dst_all: true' do
+      Given(:parameters) { { nw_dst_all: true } }
+
+      Then { binary == ['00000000000010000000000000000000'].pack('B*') }
+    end
+
+    context 'with in_port: false' do
+      Given(:parameters) { { in_port: false } }
+
+      Then { binary == ['00000000000000000000000000000000'].pack('B*') }
+    end
+
+    context 'with INVALID_FLAG: true' do
+      Given(:parameters) { { INVALID_FLAG: true } }
+
+      Then do
+        binary == Failure(KeyError, 'key not found: :INVALID_FLAG')
+      end
+    end
+  end
+
+  describe '.read' do
+    When(:wildcards) { Pio::Match::Wildcards.read(binary) }
+
+    context 'with all 0' do
+      Given(:binary) { ['00000000000000000000000000000000'].pack('B*') }
+
+      Then { wildcards == {} }
+    end
+
+    context 'with in_port: true' do
+      Given(:binary) { ['00000000000000000000000000000001'].pack('B*') }
+
+      Then { wildcards == { in_port: true } }
+    end
+
+    context 'with dl_vlan: true' do
+      Given(:binary) { ['00000000000000000000000000000010'].pack('B*') }
+
+      Then { wildcards == { dl_vlan: true } }
+    end
+
+    context 'with nw_src: 010101' do
+      Given(:binary) { ['00000000000000000001010100000000'].pack('B*') }
+
+      Then { wildcards == { nw_src: 0b10101 } }
+    end
+
+    context 'with nw_src: 100000' do
+      Given(:binary) { ['00000000000000000010000000000000'].pack('B*') }
+
+      Then { wildcards == { nw_src_all: true } }
+    end
+
+    context 'with nw_dst: 010101' do
+      Given(:binary) { ['00000000000001010100000000000000'].pack('B*') }
+
+      Then { wildcards == { nw_dst: 0b10101 } }
+    end
+
+    context 'with nw_dst: 100000' do
+      Given(:binary) { ['00000000000010000000000000000000'].pack('B*') }
+
+      Then { wildcards == { nw_dst_all: true } }
+    end
+
+    context 'with in_port: true, nw_src: 010101, nw_tos: true' do
+      Given(:binary) { ['00000000001000000001010100000001'].pack('B*') }
+
+      Then { wildcards == { in_port: true, nw_src: 0b10101, nw_tos: true } }
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pio
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.11.0
 platform: ruby
 authors:
 - Yasuhito Takamiya
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-06 00:00:00.000000000 Z
+date: 2015-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bindata
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.7.11
+        version: 1.7.12
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.7.11
+        version: 1.7.12
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.10.5
+        version: 2.11.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.10.5
+        version: 2.11.1
 - !ruby/object:Gem::Dependency
   name: guard-bundler
   requirement: !ruby/object:Gem::Requirement
@@ -198,14 +198,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.8
+        version: 0.5.10
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.8
+        version: 0.5.10
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -226,14 +226,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.4
+        version: 0.4.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.4
+        version: 0.4.5
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
@@ -268,42 +268,42 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: 2.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: 2.6.0
 - !ruby/object:Gem::Dependency
   name: flog
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.3.0
+        version: 4.3.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.3.0
+        version: 4.3.1
 - !ruby/object:Gem::Dependency
   name: reek
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.1
+        version: 1.6.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.1
+        version: 1.6.2
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -324,14 +324,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.5.4
+        version: 3.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.5.4
+        version: 3.6.0
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -370,6 +370,8 @@ files:
 - examples/echo_read.rb
 - examples/features_new.rb
 - examples/features_read.rb
+- examples/flow_mod_new.rb
+- examples/flow_mod_read.rb
 - examples/hello_new.rb
 - examples/hello_read.rb
 - examples/icmp_new.rb
@@ -384,6 +386,7 @@ files:
 - features/dhcp_read.feature
 - features/echo_read.feature
 - features/features_read.feature
+- features/flow_mod_read.feature
 - features/hello_read.feature
 - features/icmp_read.feature
 - features/lldp_read.feature
@@ -396,7 +399,6 @@ files:
 - features/packet_data/desc_stats_reply.raw
 - features/packet_data/desc_stats_request.raw
 - features/packet_data/dhcp.pcap
-- features/packet_data/echo.raw
 - features/packet_data/echo_reply.raw
 - features/packet_data/echo_request.raw
 - features/packet_data/error.raw
@@ -404,6 +406,9 @@ files:
 - features/packet_data/features_request.raw
 - features/packet_data/flow_mod_add.raw
 - features/packet_data/flow_mod_delete.raw
+- features/packet_data/flow_mod_delete_strict.raw
+- features/packet_data/flow_mod_modify.raw
+- features/packet_data/flow_mod_modify_strict.raw
 - features/packet_data/flow_removed.raw
 - features/packet_data/flow_stats_reply.raw
 - features/packet_data/flow_stats_request.raw
@@ -457,13 +462,9 @@ files:
 - lib/pio/dhcp/parameter_list.rb
 - lib/pio/dhcp/request.rb
 - lib/pio/echo.rb
-- lib/pio/echo/message.rb
-- lib/pio/echo/reply.rb
-- lib/pio/echo/request.rb
 - lib/pio/enqueue.rb
 - lib/pio/features.rb
-- lib/pio/features/reply.rb
-- lib/pio/features/request.rb
+- lib/pio/flow_mod.rb
 - lib/pio/hello.rb
 - lib/pio/icmp.rb
 - lib/pio/icmp/format.rb
@@ -487,14 +488,15 @@ files:
 - lib/pio/lldp/system_name_value.rb
 - lib/pio/lldp/ttl_tlv.rb
 - lib/pio/mac.rb
+- lib/pio/match.rb
 - lib/pio/message_type_selector.rb
 - lib/pio/monkey_patch/integer.rb
 - lib/pio/monkey_patch/integer/ranges.rb
 - lib/pio/open_flow.rb
+- lib/pio/open_flow/actions.rb
 - lib/pio/open_flow/flags.rb
 - lib/pio/open_flow/message.rb
 - lib/pio/open_flow/open_flow_header.rb
-- lib/pio/open_flow/parser.rb
 - lib/pio/open_flow/phy_port.rb
 - lib/pio/open_flow/port_number.rb
 - lib/pio/open_flow/type.rb
@@ -531,11 +533,10 @@ files:
 - spec/pio/dhcp_spec.rb
 - spec/pio/echo/reply_spec.rb
 - spec/pio/echo/request_spec.rb
-- spec/pio/echo_spec.rb
 - spec/pio/enqueue_spec.rb
 - spec/pio/features/reply_spec.rb
 - spec/pio/features/request_spec.rb
-- spec/pio/features_spec.rb
+- spec/pio/flow_mod_spec.rb
 - spec/pio/hello_spec.rb
 - spec/pio/icmp/reply_spec.rb
 - spec/pio/icmp/request_spec.rb
@@ -544,6 +545,7 @@ files:
 - spec/pio/lldp/options_spec.rb
 - spec/pio/lldp_spec.rb
 - spec/pio/mac_spec.rb
+- spec/pio/match_spec.rb
 - spec/pio/open_flow/phy_port_spec.rb
 - spec/pio/open_flow/type_spec.rb
 - spec/pio/packet_in_spec.rb
@@ -559,6 +561,7 @@ files:
 - spec/pio/set_vlan_priority_spec.rb
 - spec/pio/set_vlan_vid_spec.rb
 - spec/pio/strip_vlan_header_spec.rb
+- spec/pio/wildcards_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/trema/pio
 licenses:
@@ -597,11 +600,10 @@ test_files:
 - spec/pio/dhcp_spec.rb
 - spec/pio/echo/reply_spec.rb
 - spec/pio/echo/request_spec.rb
-- spec/pio/echo_spec.rb
 - spec/pio/enqueue_spec.rb
 - spec/pio/features/reply_spec.rb
 - spec/pio/features/request_spec.rb
-- spec/pio/features_spec.rb
+- spec/pio/flow_mod_spec.rb
 - spec/pio/hello_spec.rb
 - spec/pio/icmp/reply_spec.rb
 - spec/pio/icmp/request_spec.rb
@@ -610,6 +612,7 @@ test_files:
 - spec/pio/lldp/options_spec.rb
 - spec/pio/lldp_spec.rb
 - spec/pio/mac_spec.rb
+- spec/pio/match_spec.rb
 - spec/pio/open_flow/phy_port_spec.rb
 - spec/pio/open_flow/type_spec.rb
 - spec/pio/packet_in_spec.rb
@@ -625,11 +628,13 @@ test_files:
 - spec/pio/set_vlan_priority_spec.rb
 - spec/pio/set_vlan_vid_spec.rb
 - spec/pio/strip_vlan_header_spec.rb
+- spec/pio/wildcards_spec.rb
 - spec/spec_helper.rb
 - features/arp_read.feature
 - features/dhcp_read.feature
 - features/echo_read.feature
 - features/features_read.feature
+- features/flow_mod_read.feature
 - features/hello_read.feature
 - features/icmp_read.feature
 - features/lldp_read.feature
@@ -642,7 +647,6 @@ test_files:
 - features/packet_data/desc_stats_reply.raw
 - features/packet_data/desc_stats_request.raw
 - features/packet_data/dhcp.pcap
-- features/packet_data/echo.raw
 - features/packet_data/echo_reply.raw
 - features/packet_data/echo_request.raw
 - features/packet_data/error.raw
@@ -650,6 +654,9 @@ test_files:
 - features/packet_data/features_request.raw
 - features/packet_data/flow_mod_add.raw
 - features/packet_data/flow_mod_delete.raw
+- features/packet_data/flow_mod_delete_strict.raw
+- features/packet_data/flow_mod_modify.raw
+- features/packet_data/flow_mod_modify_strict.raw
 - features/packet_data/flow_removed.raw
 - features/packet_data/flow_stats_reply.raw
 - features/packet_data/flow_stats_request.raw

data/lib/pio/echo/message.rb

@@ -1,49 +0,0 @@
-require 'pio/open_flow'
-
-module Pio
-  class Echo
-    # Base class of Echo request and reply.
-    class Message < Pio::OpenFlow::Message
-      # Message body of Echo
-      class Body < BinData::Record
-        endian :big
-
-        string :body
-
-        def length
-          body.length
-        end
-
-        def empty?
-          length == 0
-        end
-
-        def ==(other)
-          body == other
-        end
-      end
-
-      # rubocop:disable MethodLength
-      # rubocop:disable AbcSize
-      # This method smells of :reek:FeatureEnvy
-      def initialize(user_options = {})
-        if user_options.respond_to?(:to_i)
-          options = { open_flow_header: { transaction_id: user_options.to_i } }
-        elsif user_options.respond_to?(:fetch)
-          header_options = { transaction_id: user_options[:transaction_id] ||
-                                             user_options[:xid] || 0 }
-          options = { open_flow_header: header_options,
-                      body: { body: user_options[:user_data] } }
-        else
-          fail TypeError
-        end
-        if options[:open_flow_header][:transaction_id] >= 2**32
-          fail ArgumentError, 'Transaction ID >= 2**32'
-        end
-        @format = self.class.const_get(:Format).new(options)
-      end
-      # rubocop:enable AbcSize
-      # rubocop:enable MethodLength
-    end
-  end
-end