pio 0.25.0 → 0.26.0

data/spec/pio/{open_flow/phy_port_spec.rb → open_flow10/phy_port16_spec.rb}

@@ -1,14 +1,14 @@
 require 'pio'
 
-describe Pio::OpenFlow::PhyPort do
+describe Pio::OpenFlow10::PhyPort16 do
   describe '.new' do
     When(:phy_port) do
-      Pio::OpenFlow::PhyPort.new(port_no: 1,
-                                 hardware_address: '11:22:33:44:55:66',
-                                 name: 'port123',
-                                 config: [:port_down],
-                                 state: [:link_down],
-                                 curr: [:port_10gb_fd, :port_copper])
+      Pio::OpenFlow10::PhyPort16.new(port_no: 1,
+                                     hardware_address: '11:22:33:44:55:66',
+                                     name: 'port123',
+                                     config: [:port_down],
+                                     state: [:link_down],
+                                     curr: [:port_10gb_fd, :port_copper])
     end
 
     Then { phy_port.port_no == 1 }

data/spec/pio/open_flow10/send_out_port_spec.rb

@@ -6,8 +6,8 @@ describe Pio::OpenFlow10::SendOutPort do
 
     context 'with 1' do
       Given(:options) { 1 }
-      Then { send_out_port.port_number == 1 }
-      Then { send_out_port.max_len == 2**16 - 1 }
+      Then { send_out_port.port == 1 }
+      Then { send_out_port.max_length == 2**16 - 1 }
 
       describe '#==' do
         When(:result) { send_out_port == other }
@@ -28,7 +28,7 @@ describe Pio::OpenFlow10::SendOutPort do
       Given(:options) { 0 }
       Then do
         send_out_port ==
-          Failure(ArgumentError, 'The port_number should be > 0')
+          Failure(ArgumentError, 'The port should be > 0')
       end
     end
 
@@ -36,81 +36,81 @@ describe Pio::OpenFlow10::SendOutPort do
       Given(:options) { 0xff01 }
       Then do
         send_out_port ==
-          Failure(ArgumentError, 'The port_number should be < 0xff00')
+          Failure(ArgumentError, 'The port should be < 0xff00')
       end
     end
 
     context 'with :in_port' do
       Given(:options) { :in_port }
-      Then { send_out_port.port_number == :in_port }
+      Then { send_out_port.port == :in_port }
     end
 
     context 'with :table' do
       Given(:options) { :table }
-      Then { send_out_port.port_number == :table }
+      Then { send_out_port.port == :table }
     end
 
     context 'with :normal' do
       Given(:options) { :normal }
-      Then { send_out_port.port_number == :normal }
+      Then { send_out_port.port == :normal }
     end
 
     context 'with :flood' do
       Given(:options) { :flood }
-      Then { send_out_port.port_number == :flood }
+      Then { send_out_port.port == :flood }
     end
 
     context 'with :all' do
       Given(:options) { :all }
-      Then { send_out_port.port_number == :all }
+      Then { send_out_port.port == :all }
     end
 
     context 'with :controller' do
       Given(:options) { :controller }
-      Then { send_out_port.port_number == :controller }
+      Then { send_out_port.port == :controller }
     end
 
     context 'with :controller' do
       Given(:options) { :local }
-      Then { send_out_port.port_number == :local }
+      Then { send_out_port.port == :local }
     end
 
     context 'with :controller' do
       Given(:options) { :none }
-      Then { send_out_port.port_number == :none }
+      Then { send_out_port.port == :none }
     end
 
-    context 'with port_number: NUMBER option' do
-      Given(:options) { { port_number: 1 } }
-      Then { send_out_port.port_number == 1 }
+    context 'with port: NUMBER option' do
+      Given(:options) { { port: 1 } }
+      Then { send_out_port.port == 1 }
     end
 
-    context 'with port_number: SYMBOL option' do
-      Given(:options) { { port_number: :flood } }
-      Then { send_out_port.port_number == :flood }
+    context 'with port: SYMBOL option' do
+      Given(:options) { { port: :flood } }
+      Then { send_out_port.port == :flood }
     end
 
-    context 'with port_number: and max_len: option' do
-      Given(:options) { { port_number: 1, max_len: 256 } }
-      Then { send_out_port.port_number == 1 }
-      Then { send_out_port.max_len == 256 }
+    context 'with port: and max_length: option' do
+      Given(:options) { { port: 1, max_length: 256 } }
+      Then { send_out_port.port == 1 }
+      Then { send_out_port.max_length == 256 }
     end
 
-    context 'with invalid max_len: (-1) option' do
-      Given(:options) { { port_number: 1, max_len: -1 } }
+    context 'with invalid max_length: (-1) option' do
+      Given(:options) { { port: 1, max_length: -1 } }
       Then do
         send_out_port ==
           Failure(ArgumentError,
-                  'The max_len should be an unsigned 16bit integer.')
+                  'The max_length should be an unsigned 16bit integer.')
       end
     end
 
-    context 'with invalid max_len: (2**16) option' do
-      Given(:options) { { port_number: 1, max_len: 2**16 } }
+    context 'with invalid max_length: (2**16) option' do
+      Given(:options) { { port: 1, max_length: 2**16 } }
       Then do
         send_out_port ==
           Failure(ArgumentError,
-                  'The max_len should be an unsigned 16bit integer.')
+                  'The max_length should be an unsigned 16bit integer.')
       end
     end
   end

data/spec/pio/open_flow10/set_ether_destination_address_spec.rb

@@ -1,9 +1,9 @@
 require 'pio/open_flow10/set_ether_address'
 
-describe Pio::SetEtherDestinationAddr do
+describe Pio::SetEtherDestinationAddress do
   describe '.new' do
     Given(:set_ether_destination_address) do
-      Pio::SetEtherDestinationAddr.new(mac_address)
+      Pio::SetEtherDestinationAddress.new(mac_address)
     end
 
     context "with '11:22:33:44:55:66'" do

data/spec/pio/open_flow10/set_ether_source_address_spec.rb

@@ -1,9 +1,9 @@
 require 'pio/open_flow10/set_ether_address'
 
-describe Pio::SetEtherSourceAddr do
+describe Pio::SetEtherSourceAddress do
   describe '.new' do
     Given(:set_ether_source_address) do
-      Pio::SetEtherSourceAddr.new(mac_address)
+      Pio::SetEtherSourceAddress.new(mac_address)
     end
 
     context "with '11:22:33:44:55:66'" do

data/spec/pio/open_flow10/set_ip_destination_address_spec.rb

@@ -11,12 +11,12 @@ describe Pio::SetIpDestinationAddress do
         Then { set_ip_destination_addr.ip_address == '1.2.3.4' }
       end
 
-      describe '#type' do
-        Then { set_ip_destination_addr.type == 7 }
+      describe '#action_type' do
+        Then { set_ip_destination_addr.action_type == 7 }
       end
 
-      describe '#message_length' do
-        Then { set_ip_destination_addr.message_length == 8 }
+      describe '#length' do
+        Then { set_ip_destination_addr.length == 8 }
       end
 
       describe '#to_binary' do

data/spec/pio/open_flow10/set_ip_source_address_spec.rb

@@ -9,12 +9,12 @@ describe Pio::SetIpSourceAddress do
         Then { set_ip_source_addr.ip_address == '1.2.3.4' }
       end
 
-      describe '#type' do
-        Then { set_ip_source_addr.type == 6 }
+      describe '#action_type' do
+        Then { set_ip_source_addr.action_type == 6 }
       end
 
-      describe '#message_length' do
-        Then { set_ip_source_addr.message_length == 8 }
+      describe '#length' do
+        Then { set_ip_source_addr.length == 8 }
       end
 
       describe '#to_binary' do

data/spec/pio/open_flow10/set_ip_tos_spec.rb

@@ -9,12 +9,12 @@ describe Pio::SetIpTos do
         Then { set_ip_tos.type_of_service == 32 }
       end
 
-      describe '#type' do
-        Then { set_ip_tos.type == 8 }
+      describe '#action_type' do
+        Then { set_ip_tos.action_type == 8 }
       end
 
-      describe '#message_length' do
-        Then { set_ip_tos.message_length == 8 }
+      describe '#length' do
+        Then { set_ip_tos.length == 8 }
       end
 
       describe '#to_binary' do

data/spec/pio/open_flow10/set_transport_destination_port_spec.rb

@@ -3,22 +3,22 @@ require 'pio/open_flow10/set_transport_port'
 describe Pio::SetTransportDestinationPort do
   describe '.new' do
     When(:set_transport_destination_port) do
-      Pio::SetTransportDestinationPort.new(port_number)
+      Pio::SetTransportDestinationPort.new(port)
     end
 
     context 'with 100' do
-      When(:port_number) { 100 }
+      When(:port) { 100 }
 
-      describe '#port_number' do
-        Then { set_transport_destination_port.port_number == 100 }
+      describe '#port' do
+        Then { set_transport_destination_port.port == 100 }
       end
 
-      describe '#type' do
-        Then { set_transport_destination_port.type == 10 }
+      describe '#action_type' do
+        Then { set_transport_destination_port.action_type == 10 }
       end
 
-      describe '#message_length' do
-        Then { set_transport_destination_port.message_length == 8 }
+      describe '#length' do
+        Then { set_transport_destination_port.length == 8 }
       end
 
       describe '#to_binary' do
@@ -27,17 +27,17 @@ describe Pio::SetTransportDestinationPort do
     end
 
     context 'with -1' do
-      When(:port_number) { -1 }
+      When(:port) { -1 }
       Then { set_transport_destination_port == Failure(ArgumentError) }
     end
 
     context 'with 2**16' do
-      When(:port_number) { 2**16 }
+      When(:port) { 2**16 }
       Then { set_transport_destination_port == Failure(ArgumentError) }
     end
 
     context 'with :INVALID_PORT_NUMBER' do
-      When(:port_number) { :INVALID_PORT_NUMBER }
+      When(:port) { :INVALID_PORT_NUMBER }
       Then { set_transport_destination_port == Failure(TypeError) }
     end
   end

data/spec/pio/open_flow10/set_transport_source_port_spec.rb

@@ -3,22 +3,22 @@ require 'pio/open_flow10/set_transport_port'
 describe Pio::SetTransportSourcePort do
   describe '.new' do
     When(:set_transport_source_port) do
-      Pio::SetTransportSourcePort.new port_number
+      Pio::SetTransportSourcePort.new port
     end
 
     context 'with 100' do
-      When(:port_number) { 100 }
+      When(:port) { 100 }
 
-      describe '#port_number' do
-        Then { set_transport_source_port.port_number == 100 }
+      describe '#port' do
+        Then { set_transport_source_port.port == 100 }
       end
 
-      describe '#type' do
-        Then { set_transport_source_port.type == 9 }
+      describe '#action_type' do
+        Then { set_transport_source_port.action_type == 9 }
       end
 
-      describe '#message_length' do
-        Then { set_transport_source_port.message_length == 8 }
+      describe '#length' do
+        Then { set_transport_source_port.length == 8 }
       end
 
       describe '#to_binary' do
@@ -27,17 +27,17 @@ describe Pio::SetTransportSourcePort do
     end
 
     context 'with -1' do
-      When(:port_number) { -1 }
+      When(:port) { -1 }
       Then { set_transport_source_port == Failure(ArgumentError) }
     end
 
     context 'with 2**16' do
-      When(:port_number) { 2**16 }
+      When(:port) { 2**16 }
       Then { set_transport_source_port == Failure(ArgumentError) }
     end
 
     context 'with :INVALID_PORT_NUMBER' do
-      When(:port_number) { :INVALID_PORT_NUMBER }
+      When(:port) { :INVALID_PORT_NUMBER }
       Then { set_transport_source_port == Failure(TypeError) }
     end
   end

data/spec/pio/open_flow10/set_vlan_priority_spec.rb

@@ -11,12 +11,12 @@ describe Pio::SetVlanPriority do
         Then { set_vlan_priority.vlan_priority == 3 }
       end
 
-      describe '#type' do
-        Then { set_vlan_priority.type == 2 }
+      describe '#action_type' do
+        Then { set_vlan_priority.action_type == 2 }
       end
 
-      describe '#message_length' do
-        Then { set_vlan_priority.message_length == 8 }
+      describe '#length' do
+        Then { set_vlan_priority.length == 8 }
       end
 
       describe '#to_binary' do

data/spec/pio/open_flow10/set_vlan_vid_spec.rb

@@ -11,12 +11,12 @@ describe Pio::SetVlanVid do
         Then { set_vlan_vid.vlan_id == 10 }
       end
 
-      describe '#type' do
-        Then { set_vlan_vid.type == 1 }
+      describe '#action_type' do
+        Then { set_vlan_vid.action_type == 1 }
       end
 
-      describe '#message_length' do
-        Then { set_vlan_vid.message_length == 8 }
+      describe '#length' do
+        Then { set_vlan_vid.length == 8 }
       end
 
       describe '#to_binary' do

data/spec/pio/open_flow10/strip_vlan_header_spec.rb

@@ -3,14 +3,14 @@ require 'pio/open_flow10/strip_vlan_header'
 describe Pio::StripVlanHeader do
   Given(:strip_vlan_header) { Pio::StripVlanHeader.new }
 
-  describe '#type' do
-    When(:type) { strip_vlan_header.type }
-    Then { type == 3 }
+  describe '#action_type' do
+    When(:action_type) { strip_vlan_header.action_type }
+    Then { action_type == 3 }
   end
 
-  describe '#message_length' do
-    When(:message_length) { strip_vlan_header.message_length }
-    Then { message_length == 8 }
+  describe '#length' do
+    When(:length) { strip_vlan_header.length }
+    Then { length == 8 }
   end
 
   describe '#to_binary' do

data/spec/pio/open_flow13/error/bad_request_spec.rb

@@ -0,0 +1,6 @@
+require 'pio/open_flow13/error/bad_request'
+
+describe Pio::OpenFlow13::Error::BadRequest do
+  it_should_behave_like('an OpenFlow message',
+                        Pio::OpenFlow13::Error::BadRequest)
+end

data/spec/pio/open_flow13/error/hello_failed_spec.rb

@@ -0,0 +1,26 @@
+require 'pio/open_flow13/error/hello_failed'
+
+describe Pio::OpenFlow13::Error::HelloFailed do
+  it_should_behave_like('an OpenFlow message',
+                        Pio::OpenFlow13::Error::HelloFailed)
+
+  describe '.new' do
+    When(:hello_failed) { Pio::OpenFlow13::Error::HelloFailed.new(options) }
+
+    context 'with {}' do
+      Given(:options) { {} }
+
+      Then { hello_failed.length == 12 }
+      Then { hello_failed.error_type == :hello_failed }
+      Then { hello_failed.error_code == :incompatible }
+      Then { hello_failed.description == '' }
+    end
+
+    context "with description: 'error description'" do
+      Given(:options) { { description: 'error description' } }
+
+      Then { hello_failed.length == 29 }
+      Then { hello_failed.description == 'error description' }
+    end
+  end
+end

data/spec/pio/open_flow13/hello_spec.rb

@@ -11,7 +11,7 @@ describe Pio::OpenFlow13::Hello do
       Then { result.class == Pio::OpenFlow13::Hello }
       Then { result.ofp_version == 4 }
       Then { result.message_type == 0 }
-      Then { result.message_length == 8 }
+      Then { result.length == 8 }
       Then { result.transaction_id == 0 }
       Then { result.xid == 0 }
       Then { result.supported_versions.empty? }
@@ -25,7 +25,7 @@ describe Pio::OpenFlow13::Hello do
       Then { result.class == Pio::OpenFlow13::Hello }
       Then { result.ofp_version == 4 }
       Then { result.message_type == 0 }
-      Then { result.message_length == 16 }
+      Then { result.length == 16 }
       Then { result.transaction_id == 0 }
       Then { result.xid == 0 }
       Then { result.supported_versions == [:open_flow10, :open_flow13] }
@@ -48,7 +48,7 @@ describe Pio::OpenFlow13::Hello do
 
       Then { result.ofp_version == 4 }
       Then { result.message_type == 0 }
-      Then { result.message_length == 16 }
+      Then { result.length == 16 }
       Then { result.transaction_id == 0 }
       Then { result.xid == 0 }
       Then { result.supported_versions == [:open_flow13] }