pio 0.19.0 → 0.20.0

data/lib/pio/set_ip_tos.rb

@@ -30,7 +30,7 @@ module Pio
     def_delegator :@format, :to_binary_s, :to_binary
 
     def initialize(type_of_service)
-      # nw_tos (IP ToS) value consists of 8 bits, of which only the 6
+      # ip_tos (IP ToS) value consists of 8 bits, of which only the 6
       # high-order bits belong to DSCP, the 2 low-order bits must be
       # zero.
       unless type_of_service.unsigned_8bit? && type_of_service % 4 == 0

data/lib/pio/set_transport_port.rb

@@ -47,12 +47,12 @@ module Pio
   end
 
   # An action to modify the source TCP/UDP port of a packet.
-  class SetTransportSrcPort < SetTransportPort
+  class SetTransportSourcePort < SetTransportPort
     def_format 9
   end
 
   # An action to modify the source TCP/UDP port of a packet.
-  class SetTransportDstPort < SetTransportPort
+  class SetTransportDestinationPort < SetTransportPort
     def_format 10
   end
 end

data/lib/pio/version.rb

@@ -1,5 +1,5 @@
 # Base module.
 module Pio
   # gem version.
-  VERSION = '0.19.0'.freeze
+  VERSION = '0.20.0'.freeze
 end

data/pio.gemspec

@@ -31,7 +31,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'bindata', '~> 2.1.0'
 
   gem.add_development_dependency 'rake'
-  gem.add_development_dependency 'bundler', '~> 1.9.2'
+  gem.add_development_dependency 'bundler', '~> 1.9.4'
   gem.add_development_dependency 'pry', '~> 0.10.1'
 
   # Guard
@@ -56,7 +56,7 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'cucumber', '~> 2.0.0'
   gem.add_development_dependency 'flay', '~> 2.6.1'
   gem.add_development_dependency 'flog', '~> 4.3.2'
-  gem.add_development_dependency 'reek', '~> 2.0.4'
+  gem.add_development_dependency 'reek', '~> 2.1.0'
   gem.add_development_dependency 'rspec', '~> 3.2.0'
   gem.add_development_dependency 'rspec-given', '~> 3.7.0'
   gem.add_development_dependency 'rubocop', '~> 0.30.0'

data/spec/pio/flow_mod_spec.rb

@@ -1,4 +1,4 @@
-require 'pio/flow_mod'
+require 'pio/open_flow10/flow_mod'
 
 describe Pio::FlowMod do
   Given(:dump) do
@@ -39,31 +39,31 @@ describe Pio::FlowMod do
       Then { !flow_mod.body.empty? }
       Then do
         flow_mod.match.wildcards.keys == [
-          :dl_vlan,
-          :dl_src,
-          :dl_dst,
-          :dl_type,
-          :nw_proto,
-          :tp_src,
-          :tp_dst,
-          :nw_src_all,
-          :nw_dst_all,
-          :dl_vlan_pcp,
-          :nw_tos
+          :vlan_vid,
+          :ether_source_address,
+          :ether_destination_address,
+          :ether_type,
+          :ip_protocol,
+          :transport_source_port,
+          :transport_destination_port,
+          :ip_source_address_all,
+          :ip_destination_address_all,
+          :vlan_priority,
+          :ip_tos
         ]
       end
       Then { flow_mod.match.in_port == 1 }
-      Then { flow_mod.match.dl_src == '00:00:00:00:00:00' }
-      Then { flow_mod.match.dl_dst == '00:00:00:00:00:00' }
-      Then { flow_mod.match.dl_vlan == 0 }
-      Then { flow_mod.match.dl_vlan_pcp == 0 }
-      Then { flow_mod.match.dl_type == 0 }
-      Then { flow_mod.match.nw_tos == 0 }
-      Then { flow_mod.match.nw_proto == 0 }
-      Then { flow_mod.match.nw_src == '0.0.0.0' }
-      Then { flow_mod.match.nw_dst == '0.0.0.0' }
-      Then { flow_mod.match.tp_src == 0 }
-      Then { flow_mod.match.tp_dst == 0 }
+      Then { flow_mod.match.ether_source_address == '00:00:00:00:00:00' }
+      Then { flow_mod.match.ether_destination_address == '00:00:00:00:00:00' }
+      Then { flow_mod.match.vlan_vid == 0 }
+      Then { flow_mod.match.vlan_priority == 0 }
+      Then { flow_mod.match.ether_type == 0 }
+      Then { flow_mod.match.ip_tos == 0 }
+      Then { flow_mod.match.ip_protocol == 0 }
+      Then { flow_mod.match.ip_source_address == '0.0.0.0' }
+      Then { flow_mod.match.ip_destination_address == '0.0.0.0' }
+      Then { flow_mod.match.transport_source_port == 0 }
+      Then { flow_mod.match.transport_destination_port == 0 }
       Then { flow_mod.cookie == 1 }
       Then { flow_mod.command == :add }
       Then { flow_mod.idle_timeout == 0 }
@@ -104,31 +104,31 @@ describe Pio::FlowMod do
       Then { !flow_mod.body.empty? }
       Then do
         flow_mod.match.wildcards.keys == [
-          :dl_vlan,
-          :dl_src,
-          :dl_dst,
-          :dl_type,
-          :nw_proto,
-          :tp_src,
-          :tp_dst,
-          :nw_src_all,
-          :nw_dst_all,
-          :dl_vlan_pcp,
-          :nw_tos
+          :vlan_vid,
+          :ether_source_address,
+          :ether_destination_address,
+          :ether_type,
+          :ip_protocol,
+          :transport_source_port,
+          :transport_destination_port,
+          :ip_source_address_all,
+          :ip_destination_address_all,
+          :vlan_priority,
+          :ip_tos
         ]
       end
       Then { flow_mod.match.in_port == 1 }
-      Then { flow_mod.match.dl_src == '00:00:00:00:00:00' }
-      Then { flow_mod.match.dl_dst == '00:00:00:00:00:00' }
-      Then { flow_mod.match.dl_vlan == 0 }
-      Then { flow_mod.match.dl_vlan_pcp == 0 }
-      Then { flow_mod.match.dl_type == 0 }
-      Then { flow_mod.match.nw_tos == 0 }
-      Then { flow_mod.match.nw_proto == 0 }
-      Then { flow_mod.match.nw_src == '0.0.0.0' }
-      Then { flow_mod.match.nw_dst == '0.0.0.0' }
-      Then { flow_mod.match.tp_src == 0 }
-      Then { flow_mod.match.tp_dst == 0 }
+      Then { flow_mod.match.ether_source_address == '00:00:00:00:00:00' }
+      Then { flow_mod.match.ether_destination_address == '00:00:00:00:00:00' }
+      Then { flow_mod.match.vlan_vid == 0 }
+      Then { flow_mod.match.vlan_priority == 0 }
+      Then { flow_mod.match.ether_type == 0 }
+      Then { flow_mod.match.ip_tos == 0 }
+      Then { flow_mod.match.ip_protocol == 0 }
+      Then { flow_mod.match.ip_source_address == '0.0.0.0' }
+      Then { flow_mod.match.ip_destination_address == '0.0.0.0' }
+      Then { flow_mod.match.transport_source_port == 0 }
+      Then { flow_mod.match.transport_destination_port == 0 }
       Then { flow_mod.cookie == 1 }
       Then { flow_mod.command == :add }
       Then { flow_mod.idle_timeout == 0 }

data/spec/pio/match_spec.rb

@@ -1,4 +1,4 @@
-require 'pio/match'
+require 'pio/open_flow10/match'
 
 describe Pio::Match do
   describe '.read' do
@@ -27,66 +27,68 @@ describe Pio::Match do
 
       Then do
         match.wildcards.keys == [
-          :dl_vlan,
-          :dl_src,
-          :dl_dst,
-          :dl_type,
-          :nw_proto,
-          :tp_src,
-          :tp_dst,
-          :nw_src_all,
-          :nw_dst_all,
-          :dl_vlan_pcp,
-          :nw_tos
+          :vlan_vid,
+          :ether_source_address,
+          :ether_destination_address,
+          :ether_type,
+          :ip_protocol,
+          :transport_source_port,
+          :transport_destination_port,
+          :ip_source_address_all,
+          :ip_destination_address_all,
+          :vlan_priority,
+          :ip_tos
         ]
       end
       Then { match.in_port == 1 }
-      Then { match.dl_src == '00:00:00:00:00:00' }
-      Then { match.dl_dst == '00:00:00:00:00:00' }
-      Then { match.dl_vlan == 0 }
-      Then { match.dl_vlan_pcp == 0 }
-      Then { match.dl_type == 0 }
-      Then { match.nw_tos == 0 }
-      Then { match.nw_proto == 0 }
-      Then { match.nw_src == '0.0.0.0' }
-      Then { match.nw_dst == '0.0.0.0' }
-      Then { match.tp_src == 0 }
-      Then { match.tp_dst == 0 }
+      Then { match.ether_source_address == '00:00:00:00:00:00' }
+      Then { match.ether_destination_address == '00:00:00:00:00:00' }
+      Then { match.vlan_vid == 0 }
+      Then { match.vlan_priority == 0 }
+      Then { match.ether_type == 0 }
+      Then { match.ip_tos == 0 }
+      Then { match.ip_protocol == 0 }
+      Then { match.ip_source_address == '0.0.0.0' }
+      Then { match.ip_destination_address == '0.0.0.0' }
+      Then { match.transport_source_port == 0 }
+      Then { match.transport_destination_port == 0 }
     end
 
     context 'with a Match binary generated with Pio::Match.new' do
-      Given(:binary) { Pio::Match.new(nw_src: '192.168.1.0/24').to_binary_s }
+      Given(:binary) do
+        Pio::Match.new(ip_source_address: '192.168.1.0/24').to_binary_s
+      end
 
       Then do
         match.wildcards.keys == [
           :in_port,
-          :dl_vlan,
-          :dl_src,
-          :dl_dst,
-          :dl_type,
-          :nw_proto,
-          :tp_src,
-          :tp_dst,
-          :nw_src,
-          :nw_dst_all,
-          :dl_vlan_pcp,
-          :nw_tos
+          :vlan_vid,
+          :ether_source_address,
+          :ether_destination_address,
+          :ether_type,
+          :ip_protocol,
+          :transport_source_port,
+          :transport_destination_port,
+          :ip_source_address,
+          :ip_destination_address_all,
+          :vlan_priority,
+          :ip_tos
         ]
       end
-      And { match.wildcards[:nw_src] = 12 }
+      And { match.wildcards[:ip_source_address] = 12 }
       Then { match.in_port == 0 }
-      Then { match.dl_src == '00:00:00:00:00:00' }
-      Then { match.dl_dst == '00:00:00:00:00:00' }
-      Then { match.dl_vlan == 0 }
-      Then { match.dl_vlan_pcp == 0 }
-      Then { match.dl_type == 0 }
-      Then { match.nw_tos == 0 }
-      Then { match.nw_proto == 0 }
-      Then { match.nw_src == '192.168.1.0' }
-      Then { match.nw_src.prefixlen == 24 }
-      Then { match.nw_dst == '0.0.0.0' }
-      Then { match.tp_src == 0 }
-      Then { match.tp_dst == 0 }
+      Then { match.ether_source_address == '00:00:00:00:00:00' }
+      Then { match.ether_destination_address == '00:00:00:00:00:00' }
+      Then { match.vlan_vid == 0 }
+      Then { match.vlan_priority == 0 }
+      Then { match.ether_type == 0 }
+      Then { match.ip_tos == 0 }
+      Then { match.ip_protocol == 0 }
+      Then { match.ip_source_address == '192.168.1.0' }
+      Then { match.ip_source_address.prefixlen == 24 }
+      Then { match.ip_destination_address == '0.0.0.0' }
+      Then { match.transport_source_port == 0 }
+      Then { match.transport_destination_port == 0 }
     end
   end
 
@@ -97,31 +99,31 @@ describe Pio::Match do
       Given(:options) { { in_port: 1 } }
       Then do
         match.wildcards.keys == [
-          :dl_vlan,
-          :dl_src,
-          :dl_dst,
-          :dl_type,
-          :nw_proto,
-          :tp_src,
-          :tp_dst,
-          :nw_src_all,
-          :nw_dst_all,
-          :dl_vlan_pcp,
-          :nw_tos
+          :vlan_vid,
+          :ether_source_address,
+          :ether_destination_address,
+          :ether_type,
+          :ip_protocol,
+          :transport_source_port,
+          :transport_destination_port,
+          :ip_source_address_all,
+          :ip_destination_address_all,
+          :vlan_priority,
+          :ip_tos
         ]
       end
       Then { match.in_port == 1 }
-      Then { match.dl_src == '00:00:00:00:00:00' }
-      Then { match.dl_dst == '00:00:00:00:00:00' }
-      Then { match.dl_vlan == 0 }
-      Then { match.dl_vlan_pcp == 0 }
-      Then { match.dl_type == 0 }
-      Then { match.nw_tos == 0 }
-      Then { match.nw_proto == 0 }
-      Then { match.nw_src == '0.0.0.0' }
-      Then { match.nw_dst == '0.0.0.0' }
-      Then { match.tp_src == 0 }
-      Then { match.tp_dst == 0 }
+      Then { match.ether_source_address == '00:00:00:00:00:00' }
+      Then { match.ether_destination_address == '00:00:00:00:00:00' }
+      Then { match.vlan_vid == 0 }
+      Then { match.vlan_priority == 0 }
+      Then { match.ether_type == 0 }
+      Then { match.ip_tos == 0 }
+      Then { match.ip_protocol == 0 }
+      Then { match.ip_source_address == '0.0.0.0' }
+      Then { match.ip_destination_address == '0.0.0.0' }
+      Then { match.transport_source_port == 0 }
+      Then { match.transport_destination_port == 0 }
 
       describe '#==' do
         When(:result) { match == other }
@@ -133,70 +135,70 @@ describe Pio::Match do
       end
     end
 
-    context "with nw_src: '192.168.1.0/24'" do
-      Given(:options) { { nw_src: '192.168.1.0/24' } }
+    context "with ip_source_address: '192.168.1.0/24'" do
+      Given(:options) { { ip_source_address: '192.168.1.0/24' } }
       Then do
         match.wildcards.keys == [
           :in_port,
-          :dl_vlan,
-          :dl_src,
-          :dl_dst,
-          :dl_type,
-          :nw_proto,
-          :tp_src,
-          :tp_dst,
-          :nw_src,
-          :nw_dst_all,
-          :dl_vlan_pcp,
-          :nw_tos
+          :vlan_vid,
+          :ether_source_address,
+          :ether_destination_address,
+          :ether_type,
+          :ip_protocol,
+          :transport_source_port,
+          :transport_destination_port,
+          :ip_source_address,
+          :ip_destination_address_all,
+          :vlan_priority,
+          :ip_tos
         ]
       end
-      Then { match.wildcards.fetch(:nw_src) == 8 }
+      Then { match.wildcards.fetch(:ip_source_address) == 8 }
       Then { match.in_port == 0 }
-      Then { match.dl_src == '00:00:00:00:00:00' }
-      Then { match.dl_dst == '00:00:00:00:00:00' }
-      Then { match.dl_vlan == 0 }
-      Then { match.dl_vlan_pcp == 0 }
-      Then { match.dl_type == 0 }
-      Then { match.nw_tos == 0 }
-      Then { match.nw_proto == 0 }
-      Then { match.nw_src == '192.168.1.0/24' }
-      Then { match.nw_dst == '0.0.0.0' }
-      Then { match.tp_src == 0 }
-      Then { match.tp_dst == 0 }
+      Then { match.ether_source_address == '00:00:00:00:00:00' }
+      Then { match.ether_destination_address == '00:00:00:00:00:00' }
+      Then { match.vlan_vid == 0 }
+      Then { match.vlan_priority == 0 }
+      Then { match.ether_type == 0 }
+      Then { match.ip_tos == 0 }
+      Then { match.ip_protocol == 0 }
+      Then { match.ip_source_address == '192.168.1.0/24' }
+      Then { match.ip_destination_address == '0.0.0.0' }
+      Then { match.transport_source_port == 0 }
+      Then { match.transport_destination_port == 0 }
     end
 
-    context "with nw_dst: '192.168.1.0/24'" do
-      Given(:options) { { nw_dst: '192.168.1.0/24' } }
+    context "with ip_destination_address: '192.168.1.0/24'" do
+      Given(:options) { { ip_destination_address: '192.168.1.0/24' } }
       Then do
         match.wildcards.keys == [
           :in_port,
-          :dl_vlan,
-          :dl_src,
-          :dl_dst,
-          :dl_type,
-          :nw_proto,
-          :tp_src,
-          :tp_dst,
-          :nw_src_all,
-          :nw_dst,
-          :dl_vlan_pcp,
-          :nw_tos
+          :vlan_vid,
+          :ether_source_address,
+          :ether_destination_address,
+          :ether_type,
+          :ip_protocol,
+          :transport_source_port,
+          :transport_destination_port,
+          :ip_source_address_all,
+          :ip_destination_address,
+          :vlan_priority,
+          :ip_tos
         ]
       end
-      Then { match.wildcards.fetch(:nw_dst) == 8 }
+      Then { match.wildcards.fetch(:ip_destination_address) == 8 }
       Then { match.in_port == 0 }
-      Then { match.dl_src == '00:00:00:00:00:00' }
-      Then { match.dl_dst == '00:00:00:00:00:00' }
-      Then { match.dl_vlan == 0 }
-      Then { match.dl_vlan_pcp == 0 }
-      Then { match.dl_type == 0 }
-      Then { match.nw_tos == 0 }
-      Then { match.nw_proto == 0 }
-      Then { match.nw_src == '0.0.0.0' }
-      Then { match.nw_dst == '192.168.1.0/24' }
-      Then { match.tp_src == 0 }
-      Then { match.tp_dst == 0 }
+      Then { match.ether_source_address == '00:00:00:00:00:00' }
+      Then { match.ether_destination_address == '00:00:00:00:00:00' }
+      Then { match.vlan_vid == 0 }
+      Then { match.vlan_priority == 0 }
+      Then { match.ether_type == 0 }
+      Then { match.ip_tos == 0 }
+      Then { match.ip_protocol == 0 }
+      Then { match.ip_source_address == '0.0.0.0' }
+      Then { match.ip_destination_address == '192.168.1.0/24' }
+      Then { match.transport_source_port == 0 }
+      Then { match.transport_destination_port == 0 }
     end
   end
 end