pio 0.19.0 → 0.20.0

data/spec/pio/{hello13_spec.rb → open_flow13/hello_spec.rb}

@@ -1,13 +1,13 @@
-require 'pio/hello13'
+require 'pio/open_flow13/hello'
 
-describe Pio::Hello13 do
+describe Pio::Hello do
   describe '.read' do
-    When(:result) { Pio::Hello13.read(binary) }
+    When(:result) { Pio::Hello.read(binary) }
 
     context 'with a hello message (no version bitmap)' do
       Given(:binary) { [4, 0, 0, 8, 0, 0, 0, 0].pack('C*') }
 
-      Then { result.class == Pio::Hello13 }
+      Then { result.class == Pio::Hello }
       Then { result.ofp_version == 4 }
       Then { result.message_type == 0 }
       Then { result.message_length == 8 }
@@ -21,7 +21,7 @@ describe Pio::Hello13 do
         [4, 0, 0, 16, 0, 0, 0, 0, 0, 1, 0, 8, 0, 0, 0, 18].pack('C*')
       end
 
-      Then { result.class == Pio::Hello13 }
+      Then { result.class == Pio::Hello }
       Then { result.ofp_version == 4 }
       Then { result.message_type == 0 }
       Then { result.message_length == 16 }
@@ -39,7 +39,7 @@ describe Pio::Hello13 do
 
   describe '.new' do
     context 'with no arguments' do
-      When(:result) { Pio::Hello13.new }
+      When(:result) { Pio::Hello.new }
 
       Then { result.ofp_version == 4 }
       Then { result.message_type == 0 }
@@ -54,7 +54,7 @@ describe Pio::Hello13 do
     end
 
     context 'with transaction_id: 123' do
-      When(:result) { Pio::Hello13.new(transaction_id: 123) }
+      When(:result) { Pio::Hello.new(transaction_id: 123) }
 
       Then { result.ofp_version == 4 }
       Then { result.message_type == 0 }
@@ -69,7 +69,7 @@ describe Pio::Hello13 do
     end
 
     context 'with xid: 123' do
-      When(:result) { Pio::Hello13.new(xid: 123) }
+      When(:result) { Pio::Hello.new(xid: 123) }
 
       Then { result.ofp_version == 4 }
       Then { result.message_type == 0 }
@@ -84,7 +84,7 @@ describe Pio::Hello13 do
     end
 
     context 'with xid: -1' do
-      When(:result) { Pio::Hello13.new(xid: -1) }
+      When(:result) { Pio::Hello.new(xid: -1) }
 
       Then do
         result ==
@@ -94,7 +94,7 @@ describe Pio::Hello13 do
     end
 
     context 'with xid: 2**32' do
-      When(:result) { Pio::Hello13.new(xid: 2**32) }
+      When(:result) { Pio::Hello.new(xid: 2**32) }
 
       Then do
         result ==
@@ -104,7 +104,7 @@ describe Pio::Hello13 do
     end
 
     context 'with invalid_keyword: :foo' do
-      When(:result) { Pio::Hello13.new(invalid_keyword: :foo) }
+      When(:result) { Pio::Hello.new(invalid_keyword: :foo) }
 
       Then do
         result == Failure(RuntimeError, 'Unknown keyword: invalid_keyword')

data/spec/pio/packet_out_spec.rb

@@ -1,4 +1,4 @@
-require 'pio/packet_out'
+require 'pio/open_flow10/packet_out'
 
 describe Pio::PacketOut do
   Given(:header_dump) do
@@ -182,13 +182,13 @@ describe Pio::PacketOut do
       Then { result.actions[0].is_a? Pio::StripVlanHeader }
     end
 
-    context 'with a SetEthSrcAddr action' do
+    context 'with a SetEtherSourceAddr action' do
       When(:user_options) do
         {
           transaction_id: 0x16,
           buffer_id: 0xffffffff,
           in_port: 0xffff,
-          actions: Pio::SetEthSrcAddr.new('11:22:33:44:55:66'),
+          actions: Pio::SetEtherSourceAddr.new('11:22:33:44:55:66'),
           raw_data: data_dump
         }
       end
@@ -196,17 +196,17 @@ describe Pio::PacketOut do
       Then { result.message_length == 0x60 }
       Then { result.actions_len == 0x10 }
       Then { result.actions.length == 1 }
-      Then { result.actions[0].is_a? Pio::SetEthSrcAddr }
+      Then { result.actions[0].is_a? Pio::SetEtherSourceAddr }
       Then { result.actions[0].mac_address == '11:22:33:44:55:66' }
     end
 
-    context 'with a SetEthDstAddr action' do
+    context 'with a SetEtherDestinationAddr action' do
       When(:user_options) do
         {
           transaction_id: 0x16,
           buffer_id: 0xffffffff,
           in_port: 0xffff,
-          actions: Pio::SetEthDstAddr.new('11:22:33:44:55:66'),
+          actions: Pio::SetEtherDestinationAddr.new('11:22:33:44:55:66'),
           raw_data: data_dump
         }
       end
@@ -214,17 +214,17 @@ describe Pio::PacketOut do
       Then { result.message_length == 0x60 }
       Then { result.actions_len == 0x10 }
       Then { result.actions.length == 1 }
-      Then { result.actions[0].is_a? Pio::SetEthDstAddr }
+      Then { result.actions[0].is_a? Pio::SetEtherDestinationAddr }
       Then { result.actions[0].mac_address == '11:22:33:44:55:66' }
     end
 
-    context 'with a SetIpSrcAddr action' do
+    context 'with a SetIpSourceAddress action' do
       When(:user_options) do
         {
           transaction_id: 0x16,
           buffer_id: 0xffffffff,
           in_port: 0xffff,
-          actions: Pio::SetIpSrcAddr.new('1.2.3.4'),
+          actions: Pio::SetIpSourceAddress.new('1.2.3.4'),
           raw_data: data_dump
         }
       end
@@ -232,17 +232,17 @@ describe Pio::PacketOut do
       Then { result.message_length == 0x58 }
       Then { result.actions_len == 0x8 }
       Then { result.actions.length == 1 }
-      Then { result.actions[0].is_a? Pio::SetIpSrcAddr }
+      Then { result.actions[0].is_a? Pio::SetIpSourceAddress }
       Then { result.actions[0].ip_address == '1.2.3.4' }
     end
 
-    context 'with a SetIpDstAddr action' do
+    context 'with a SetIpDestinationAddress action' do
       When(:user_options) do
         {
           transaction_id: 0x16,
           buffer_id: 0xffffffff,
           in_port: 0xffff,
-          actions: Pio::SetIpDstAddr.new('1.2.3.4'),
+          actions: Pio::SetIpDestinationAddress.new('1.2.3.4'),
           raw_data: data_dump
         }
       end
@@ -250,7 +250,7 @@ describe Pio::PacketOut do
       Then { result.message_length == 0x58 }
       Then { result.actions_len == 0x8 }
       Then { result.actions.length == 1 }
-      Then { result.actions[0].is_a? Pio::SetIpDstAddr }
+      Then { result.actions[0].is_a? Pio::SetIpDestinationAddress }
       Then { result.actions[0].ip_address == '1.2.3.4' }
     end
 
@@ -272,13 +272,13 @@ describe Pio::PacketOut do
       Then { result.actions[0].type_of_service == 32 }
     end
 
-    context 'with a SetTransportSrcPort action' do
+    context 'with a SetTransportSourcePort action' do
       When(:user_options) do
         {
           transaction_id: 0x16,
           buffer_id: 0xffffffff,
           in_port: 0xffff,
-          actions: Pio::SetTransportSrcPort.new(100),
+          actions: Pio::SetTransportSourcePort.new(100),
           raw_data: data_dump
         }
       end
@@ -286,17 +286,17 @@ describe Pio::PacketOut do
       Then { result.message_length == 0x58 }
       Then { result.actions_len == 0x8 }
       Then { result.actions.length == 1 }
-      Then { result.actions[0].is_a? Pio::SetTransportSrcPort }
+      Then { result.actions[0].is_a? Pio::SetTransportSourcePort }
       Then { result.actions[0].port_number == 100 }
     end
 
-    context 'with a SetTransportDstPort action' do
+    context 'with a SetTransportDestinationPort action' do
       When(:user_options) do
         {
           transaction_id: 0x16,
           buffer_id: 0xffffffff,
           in_port: 0xffff,
-          actions: Pio::SetTransportDstPort.new(100),
+          actions: Pio::SetTransportDestinationPort.new(100),
           raw_data: data_dump
         }
       end
@@ -304,7 +304,7 @@ describe Pio::PacketOut do
       Then { result.message_length == 0x58 }
       Then { result.actions_len == 0x8 }
       Then { result.actions.length == 1 }
-      Then { result.actions[0].is_a? Pio::SetTransportDstPort }
+      Then { result.actions[0].is_a? Pio::SetTransportDestinationPort }
       Then { result.actions[0].port_number == 100 }
     end
 

data/spec/pio/set_ether_destination_address_spec.rb

@@ -0,0 +1,28 @@
+require 'pio/set_ether_address'
+
+describe Pio::SetEtherDestinationAddr do
+  describe '.new' do
+    Given(:set_ether_destination_address) do
+      Pio::SetEtherDestinationAddr.new(mac_address)
+    end
+
+    context "with '11:22:33:44:55:66'" do
+      When(:mac_address) { '11:22:33:44:55:66' }
+      Then { set_ether_destination_address.mac_address == '11:22:33:44:55:66' }
+
+      describe '#to_binary' do
+        Then { set_ether_destination_address.to_binary.length == 16 }
+      end
+    end
+
+    context 'with 0x112233445566' do
+      When(:mac_address) { 0x112233445566 }
+      Then { set_ether_destination_address.mac_address == '11:22:33:44:55:66' }
+    end
+
+    context "with Pio::Mac.new('11:22:33:44:55:66')" do
+      When(:mac_address) { Pio::Mac.new('11:22:33:44:55:66') }
+      Then { set_ether_destination_address.mac_address == '11:22:33:44:55:66' }
+    end
+  end
+end

data/spec/pio/set_ether_source_address_spec.rb

@@ -0,0 +1,28 @@
+require 'pio/set_ether_address'
+
+describe Pio::SetEtherSourceAddr do
+  describe '.new' do
+    Given(:set_ether_source_address) do
+      Pio::SetEtherSourceAddr.new(mac_address)
+    end
+
+    context "with '11:22:33:44:55:66'" do
+      When(:mac_address) { '11:22:33:44:55:66' }
+      Then { set_ether_source_address.mac_address == '11:22:33:44:55:66' }
+
+      describe '#to_binary' do
+        Then { set_ether_source_address.to_binary.length == 16 }
+      end
+    end
+
+    context 'with 0x112233445566' do
+      When(:mac_address) { 0x112233445566 }
+      Then { set_ether_source_address.mac_address == '11:22:33:44:55:66' }
+    end
+
+    context "with Pio::Mac.new('11:22:33:44:55:66')" do
+      When(:mac_address) { Pio::Mac.new('11:22:33:44:55:66') }
+      Then { set_ether_source_address.mac_address == '11:22:33:44:55:66' }
+    end
+  end
+end

data/spec/pio/set_ip_destination_address_spec.rb

@@ -0,0 +1,27 @@
+require 'pio/set_ip_address'
+
+describe Pio::SetIpDestinationAddress do
+  describe '.new' do
+    context "with '1.2.3.4'" do
+      When(:set_ip_destination_addr) do
+        Pio::SetIpDestinationAddress.new('1.2.3.4')
+      end
+
+      describe '#ip_address' do
+        Then { set_ip_destination_addr.ip_address == '1.2.3.4' }
+      end
+
+      describe '#type' do
+        Then { set_ip_destination_addr.type == 7 }
+      end
+
+      describe '#message_length' do
+        Then { set_ip_destination_addr.message_length == 8 }
+      end
+
+      describe '#to_binary' do
+        Then { set_ip_destination_addr.to_binary.length == 8 }
+      end
+    end
+  end
+end

data/spec/pio/set_ip_source_address_spec.rb

@@ -0,0 +1,25 @@
+require 'pio/set_ip_address'
+
+describe Pio::SetIpSourceAddress do
+  describe '.new' do
+    context "with '1.2.3.4'" do
+      When(:set_ip_source_addr) { Pio::SetIpSourceAddress.new('1.2.3.4') }
+
+      describe '#ip_address' do
+        Then { set_ip_source_addr.ip_address == '1.2.3.4' }
+      end
+
+      describe '#type' do
+        Then { set_ip_source_addr.type == 6 }
+      end
+
+      describe '#message_length' do
+        Then { set_ip_source_addr.message_length == 8 }
+      end
+
+      describe '#to_binary' do
+        Then { set_ip_source_addr.to_binary.length == 8 }
+      end
+    end
+  end
+end

data/spec/pio/set_transport_destination_port_spec.rb

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

data/spec/pio/set_transport_source_port_spec.rb

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

data/spec/pio/wildcards_spec.rb

@@ -1,5 +1,5 @@
 require 'bindata'
-require 'pio/match'
+require 'pio/open_flow10/match'
 
 describe Pio::Match::Wildcards do
   # This class has wildcards field.
@@ -22,26 +22,26 @@ describe Pio::Match::Wildcards do
       Then { binary == ['00000000000000000000000000000001'].pack('B*') }
     end
 
-    context 'with nw_src: 0b10101' do
-      Given(:parameters) { { nw_src: 0b10101 } }
+    context 'with ip_source_address: 0b10101' do
+      Given(:parameters) { { ip_source_address: 0b10101 } }
 
       Then { binary == ['00000000000000000001010100000000'].pack('B*') }
     end
 
-    context 'with nw_src_all: true' do
-      Given(:parameters) { { nw_src_all: true } }
+    context 'with ip_source_address_all: true' do
+      Given(:parameters) { { ip_source_address_all: true } }
 
       Then { binary == ['00000000000000000010000000000000'].pack('B*') }
     end
 
-    context 'with nw_dst: 010101' do
-      Given(:parameters) { { nw_dst: 0b10101 } }
+    context 'with ip_destination_address: 010101' do
+      Given(:parameters) { { ip_destination_address: 0b10101 } }
 
       Then { binary == ['00000000000001010100000000000000'].pack('B*') }
     end
 
-    context 'with nw_dst_all: true' do
-      Given(:parameters) { { nw_dst_all: true } }
+    context 'with ip_destination_address_all: true' do
+      Given(:parameters) { { ip_destination_address_all: true } }
 
       Then { binary == ['00000000000010000000000000000000'].pack('B*') }
     end
@@ -76,40 +76,42 @@ describe Pio::Match::Wildcards do
       Then { wildcards == { in_port: true } }
     end
 
-    context 'with dl_vlan: true' do
+    context 'with vlan_vid: true' do
       Given(:binary) { ['00000000000000000000000000000010'].pack('B*') }
 
-      Then { wildcards == { dl_vlan: true } }
+      Then { wildcards == { vlan_vid: true } }
     end
 
-    context 'with nw_src: 010101' do
+    context 'with ip_source_address: 010101' do
       Given(:binary) { ['00000000000000000001010100000000'].pack('B*') }
 
-      Then { wildcards == { nw_src: 0b10101 } }
+      Then { wildcards == { ip_source_address: 0b10101 } }
     end
 
-    context 'with nw_src: 100000' do
+    context 'with ip_source_address: 100000' do
       Given(:binary) { ['00000000000000000010000000000000'].pack('B*') }
 
-      Then { wildcards == { nw_src_all: true } }
+      Then { wildcards == { ip_source_address_all: true } }
     end
 
-    context 'with nw_dst: 010101' do
+    context 'with ip_destination_address: 010101' do
       Given(:binary) { ['00000000000001010100000000000000'].pack('B*') }
 
-      Then { wildcards == { nw_dst: 0b10101 } }
+      Then { wildcards == { ip_destination_address: 0b10101 } }
     end
 
-    context 'with nw_dst: 100000' do
+    context 'with ip_destination_address: 100000' do
       Given(:binary) { ['00000000000010000000000000000000'].pack('B*') }
 
-      Then { wildcards == { nw_dst_all: true } }
+      Then { wildcards == { ip_destination_address_all: true } }
     end
 
-    context 'with in_port: true, nw_src: 010101, nw_tos: true' do
+    context 'with in_port: true, ip_source_address: 010101, ip_tos: true' do
       Given(:binary) { ['00000000001000000001010100000001'].pack('B*') }
 
-      Then { wildcards == { in_port: true, nw_src: 0b10101, nw_tos: true } }
+      Then do
+        wildcards == { in_port: true, ip_source_address: 0b10101, ip_tos: true }
+      end
     end
   end
 end