pio 0.30.0 → 0.30.1

data/spec/pio/arp/reply_spec.rb

@@ -1,9 +1,5 @@
 require 'pio'
 
-describe Pio::ARP::Reply do
-  Then { Pio::ARP::Reply == Pio::Arp::Reply }
-end
-
 describe Pio::Arp::Reply, '.new' do
   ARP_REPLY_DUMP =
     [

data/spec/pio/arp/request_spec.rb

@@ -1,9 +1,5 @@
 require 'pio'
 
-describe Pio::ARP::Request do
-  Then { Pio::ARP::Request == Pio::Arp::Request }
-end
-
 describe Pio::Arp::Request, '.new' do
   ARP_REQUEST_DUMP =
     [

data/spec/pio/arp_spec.rb

@@ -1,9 +1,5 @@
 require 'pio'
 
-describe Pio::ARP do
-  Then { Pio::ARP == Pio::Arp }
-end
-
 describe Pio::Arp do
   describe '.read' do
     context 'with an Arp Request packet' do

data/spec/pio/icmp/reply_spec.rb

@@ -1,9 +1,5 @@
 require 'pio'
 
-describe Pio::ICMP::Reply do
-  Then { Pio::ICMP::Reply == Pio::Icmp::Reply }
-end
-
 describe Pio::Icmp::Reply, '.new' do
   context 'with echo_data' do
     Given(:icmp_reply) do
@@ -12,8 +8,8 @@ describe Pio::Icmp::Reply, '.new' do
         source_mac: '24:db:ac:41:e5:5b',
         source_ip_address: '8.8.8.8',
         destination_ip_address: '192.168.1.102',
-        identifier: 0x123,
-        sequence_number: 0x321,
+        icmp_identifier: 0x123,
+        icmp_sequence_number: 0x321,
         echo_data: 'abcdefghijklmnopqrstuvwabcdefghi'
       )
     end
@@ -77,8 +73,8 @@ describe Pio::Icmp::Reply, '.new' do
           source_mac: '24:db:ac:41:e5:5b',
           source_ip_address: '8.8.8.8',
           destination_ip_address: '192.168.1.102',
-          identifier: 0x123,
-          sequence_number: 0x321
+          icmp_identifier: 0x123,
+          icmp_sequence_number: 0x321
         )
       end
 

data/spec/pio/icmp/request_spec.rb

@@ -1,9 +1,5 @@
 require 'pio'
 
-describe Pio::ICMP::Request do
-  Then { Pio::ICMP::Request == Pio::Icmp::Request }
-end
-
 describe Pio::Icmp do
   Given(:icmp_request) do
     Pio::Icmp::Request.new(
@@ -11,8 +7,8 @@ describe Pio::Icmp do
       source_mac: '74:e5:0b:2a:18:f8',
       source_ip_address: '192.168.1.101',
       destination_ip_address: '8.8.8.8',
-      identifier: 0x123,
-      sequence_number: 0x321,
+      icmp_identifier: 0x123,
+      icmp_sequence_number: 0x321,
       echo_data: 'abcdefghijklmnopqrstuvwabcdefghi'
     ).to_binary
   end
@@ -31,8 +27,8 @@ describe Pio::Icmp::Request, '.new' do
         source_mac: '74:e5:0b:2a:18:f8',
         source_ip_address: '192.168.1.101',
         destination_ip_address: '8.8.8.8',
-        identifier: 0x123,
-        sequence_number: 0x321,
+        icmp_identifier: 0x123,
+        icmp_sequence_number: 0x321,
         echo_data: 'abcdefghijklmnopqrstuvwabcdefghi'
       )
     end
@@ -97,8 +93,8 @@ describe Pio::Icmp::Request, '.new' do
         source_mac: '74:e5:0b:2a:18:f8',
         source_ip_address: '192.168.1.101',
         destination_ip_address: '8.8.8.8',
-        identifier: 0x123,
-        sequence_number: 0x321
+        icmp_identifier: 0x123,
+        icmp_sequence_number: 0x321
       )
     end
 

data/spec/pio/icmp_spec.rb

@@ -1,9 +1,5 @@
 require 'pio'
 
-describe Pio::ICMP do
-  Then { Pio::ICMP == Pio::Icmp }
-end
-
 describe Pio::Icmp, '.read' do
   context 'with an ICMP request frame' do
     Given(:icmp_request_dump) do
@@ -64,17 +60,17 @@ describe Pio::Icmp, '.read' do
     Then { icmp_request.ether_type == 0x0800 }
     Then { icmp_request.ip_version == 0x4 }
     Then { icmp_request.ip_header_length == 0x5 }
-    Then { icmp_request.ip_type_of_service == 0x0 }
+    Then { icmp_request.ip_type_of_service.zero? }
     Then { icmp_request.ip_total_length == 60 }
     Then { icmp_request.ip_identifier == 0x39d3 }
-    Then { icmp_request.ip_fragment == 0 }
+    Then { icmp_request.ip_fragment.zero? }
     Then { icmp_request.ip_ttl == 128 }
     Then { icmp_request.ip_protocol == 1 }
     Then { icmp_request.ip_header_checksum == 0x2ed0 }
     Then { icmp_request.source_ip_address.to_s == '192.168.1.102' }
     Then { icmp_request.destination_ip_address.to_s == '8.8.8.8' }
     Then { icmp_request.icmp_type == 8 }
-    Then { icmp_request.icmp_code == 0 }
+    Then { icmp_request.icmp_code.zero? }
     Then { icmp_request.icmp_checksum == 0x4c5b }
     Then { icmp_request.icmp_identifier == 0x0100 }
     Then { icmp_request.icmp_sequence_number == 0x0001 }
@@ -137,17 +133,17 @@ describe Pio::Icmp, '.read' do
     Then { icmp_reply.ether_type == 0x0800 }
     Then { icmp_reply.ip_version == 0x4 }
     Then { icmp_reply.ip_header_length == 0x5 }
-    Then { icmp_reply.ip_type_of_service == 0 }
+    Then { icmp_reply.ip_type_of_service.zero? }
     Then { icmp_reply.ip_total_length == 60 }
-    Then { icmp_reply.ip_identifier == 0 }
-    Then { icmp_reply.ip_fragment == 0 }
+    Then { icmp_reply.ip_identifier.zero? }
+    Then { icmp_reply.ip_fragment.zero? }
     Then { icmp_reply.ip_ttl == 45 }
     Then { icmp_reply.ip_protocol == 1 }
     Then { icmp_reply.ip_header_checksum == 0xbba3 }
     Then { icmp_reply.source_ip_address.to_s == '8.8.8.8' }
     Then { icmp_reply.destination_ip_address.to_s == '192.168.1.102' }
-    Then { icmp_reply.icmp_type == 0 }
-    Then { icmp_reply.icmp_code == 0 }
+    Then { icmp_reply.icmp_type.zero? }
+    Then { icmp_reply.icmp_code.zero? }
     Then { icmp_reply.icmp_checksum == 0x545b }
     Then { icmp_reply.icmp_identifier == 0x0100 }
     Then { icmp_reply.icmp_sequence_number == 0x0001 }

data/spec/pio/monkey_patch/integer_spec.rb

@@ -0,0 +1,23 @@
+require 'pio/monkey_patch/integer'
+
+describe MonkeyPatch::Integer::BaseConversions do
+  describe '0#to_hex' do
+    When(:result) { 0.to_hex }
+    Then { result == '0x00' }
+  end
+
+  describe '1#to_hex' do
+    When(:result) { 1.to_hex }
+    Then { result == '0x01' }
+  end
+
+  describe '250#to_hex' do
+    When(:result) { 250.to_hex }
+    Then { result == '0xfa' }
+  end
+
+  describe '4207849484#to_hex' do
+    When(:result) { 4_207_849_484.to_hex }
+    Then { result == '0xfaceb00c' }
+  end
+end

data/spec/pio/open_flow/nicira_resubmit_spec.rb

@@ -0,0 +1,19 @@
+require 'pio/open_flow/nicira_resubmit'
+
+describe Pio::OpenFlow::NiciraResubmit do
+  describe '.new' do
+    When(:nicira_resubmit) do
+      Pio::OpenFlow::NiciraResubmit.new(port_number)
+    end
+
+    context 'with 1' do
+      Given(:port_number) { 1 }
+
+      Then { nicira_resubmit.action_type == 0xffff }
+      Then { nicira_resubmit.action_length == 16 }
+      Then { nicira_resubmit.vendor == 0x2320 }
+      Then { nicira_resubmit.subtype == 1 }
+      Then { nicira_resubmit.in_port == 1 }
+    end
+  end
+end

data/spec/pio/open_flow/nicira_resubmit_table_spec.rb

@@ -0,0 +1,20 @@
+require 'pio/open_flow/nicira_resubmit_table'
+
+describe Pio::OpenFlow::NiciraResubmitTable do
+  describe '.new' do
+    When(:nicira_resubmit_table) do
+      Pio::OpenFlow::NiciraResubmitTable.new(options)
+    end
+
+    context 'with in_port: 1, table: 1' do
+      Given(:options) { { in_port: 1, table: 1 } }
+
+      Then { nicira_resubmit_table.action_type == 0xffff }
+      Then { nicira_resubmit_table.action_length == 16 }
+      Then { nicira_resubmit_table.vendor == 0x2320 }
+      Then { nicira_resubmit_table.subtype == 14 }
+      Then { nicira_resubmit_table.in_port == 1 }
+      Then { nicira_resubmit_table.table == 1 }
+    end
+  end
+end

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

@@ -10,7 +10,7 @@ describe Pio::OpenFlow10::Error::HelloFailed do
     context 'with {}' do
       Given(:options) { {} }
 
-      Then { hello_failed.message_length == 12 }
+      Then { hello_failed.length == 12 }
       Then { hello_failed.error_type == :hello_failed }
       Then { hello_failed.error_code == :incompatible }
       Then { hello_failed.description == '' }
@@ -19,7 +19,7 @@ describe Pio::OpenFlow10::Error::HelloFailed do
     context "with description: 'error description'" do
       Given(:options) { { description: 'error description' } }
 
-      Then { hello_failed.message_length == 29 }
+      Then { hello_failed.length == 29 }
       Then { hello_failed.description == 'error description' }
     end
   end

data/spec/pio/open_flow10/flow_mod_spec.rb

@@ -30,9 +30,9 @@ describe Pio::OpenFlow10::FlowMod do
       end
 
       Then { flow_mod.class == Pio::OpenFlow10::FlowMod }
-      Then { flow_mod.ofp_version == 0x1 }
-      Then { flow_mod.message_type == 0xe }
-      Then { flow_mod.message_length == 0x50 }
+      Then { flow_mod.version == 0x1 }
+      Then { flow_mod.type == 0xe }
+      Then { flow_mod.length == 0x50 }
       Then { flow_mod.transaction_id == 0x15 }
       Then { flow_mod.xid == 0x15 }
 
@@ -54,19 +54,19 @@ describe Pio::OpenFlow10::FlowMod do
       Then { flow_mod.match.in_port == 1 }
       Then { flow_mod.match.source_mac_address == '00:00:00:00:00:00' }
       Then { flow_mod.match.destination_mac_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.tos == 0 }
-      Then { flow_mod.match.ip_protocol == 0 }
+      Then { flow_mod.match.vlan_vid.zero? }
+      Then { flow_mod.match.vlan_priority.zero? }
+      Then { flow_mod.match.ether_type.zero? }
+      Then { flow_mod.match.tos.zero? }
+      Then { flow_mod.match.ip_protocol.zero? }
       Then { flow_mod.match.source_ip_address == '0.0.0.0' }
       Then { flow_mod.match.destination_ip_address == '0.0.0.0' }
-      Then { flow_mod.match.transport_source_port == 0 }
-      Then { flow_mod.match.transport_destination_port == 0 }
+      Then { flow_mod.match.transport_source_port.zero? }
+      Then { flow_mod.match.transport_destination_port.zero? }
       Then { flow_mod.cookie == 1 }
       Then { flow_mod.command == :add }
-      Then { flow_mod.idle_timeout == 0 }
-      Then { flow_mod.hard_timeout == 0 }
+      Then { flow_mod.idle_timeout.zero? }
+      Then { flow_mod.hard_timeout.zero? }
       Then { flow_mod.priority == 0xffff }
       Then { flow_mod.buffer_id == 0xffffffff }
       Then { flow_mod.out_port == 2 }
@@ -95,9 +95,9 @@ describe Pio::OpenFlow10::FlowMod do
       end
 
       Then { flow_mod.class == Pio::OpenFlow10::FlowMod }
-      Then { flow_mod.ofp_version == 0x1 }
-      Then { flow_mod.message_type == 0xe }
-      Then { flow_mod.message_length == 0x50 }
+      Then { flow_mod.version == 0x1 }
+      Then { flow_mod.type == 0xe }
+      Then { flow_mod.length == 0x50 }
       Then { flow_mod.transaction_id == 0x15 }
       Then { flow_mod.xid == 0x15 }
 
@@ -119,19 +119,19 @@ describe Pio::OpenFlow10::FlowMod do
       Then { flow_mod.match.in_port == 1 }
       Then { flow_mod.match.source_mac_address == '00:00:00:00:00:00' }
       Then { flow_mod.match.destination_mac_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.tos == 0 }
-      Then { flow_mod.match.ip_protocol == 0 }
+      Then { flow_mod.match.vlan_vid.zero? }
+      Then { flow_mod.match.vlan_priority.zero? }
+      Then { flow_mod.match.ether_type.zero? }
+      Then { flow_mod.match.tos.zero? }
+      Then { flow_mod.match.ip_protocol.zero? }
       Then { flow_mod.match.source_ip_address == '0.0.0.0' }
       Then { flow_mod.match.destination_ip_address == '0.0.0.0' }
-      Then { flow_mod.match.transport_source_port == 0 }
-      Then { flow_mod.match.transport_destination_port == 0 }
+      Then { flow_mod.match.transport_source_port.zero? }
+      Then { flow_mod.match.transport_destination_port.zero? }
       Then { flow_mod.cookie == 1 }
       Then { flow_mod.command == :add }
-      Then { flow_mod.idle_timeout == 0 }
-      Then { flow_mod.hard_timeout == 0 }
+      Then { flow_mod.idle_timeout.zero? }
+      Then { flow_mod.hard_timeout.zero? }
       Then { flow_mod.priority == 0xffff }
       Then { flow_mod.buffer_id == 0xffffffff }
       Then { flow_mod.out_port == 2 }

data/spec/pio/open_flow10/flow_stats_request_spec.rb

@@ -17,9 +17,9 @@ describe Pio::OpenFlow10::FlowStats::Request do
       end
 
       Then { flow_stats_request.class == Pio::OpenFlow10::FlowStats::Request }
-      Then { flow_stats_request.ofp_version == 1 }
-      Then { flow_stats_request.message_type == 16 }
-      Then { flow_stats_request.message_length == 56 }
+      Then { flow_stats_request.version == 1 }
+      Then { flow_stats_request.type == 16 }
+      Then { flow_stats_request.length == 56 }
       Then { flow_stats_request.transaction_id == 13 }
       Then { flow_stats_request.xid == 13 }
       Then { flow_stats_request.stats_type == :flow }

data/spec/pio/open_flow10/hello_spec.rb

@@ -2,6 +2,4 @@ require 'pio/open_flow10/hello'
 
 describe Pio::OpenFlow10::Hello do
   it_should_behave_like('an OpenFlow message', Pio::OpenFlow10::Hello)
-  it_should_behave_like('an OpenFlow message with no body',
-                        Pio::OpenFlow10::Hello)
 end

data/spec/pio/open_flow10/match_spec.rb

@@ -43,15 +43,15 @@ describe Pio::OpenFlow10::Match do
       Then { match.in_port == 1 }
       Then { match.source_mac_address == '00:00:00:00:00:00' }
       Then { match.destination_mac_address == '00:00:00:00:00:00' }
-      Then { match.vlan_vid == 0 }
-      Then { match.vlan_priority == 0 }
-      Then { match.ether_type == 0 }
-      Then { match.tos == 0 }
-      Then { match.ip_protocol == 0 }
+      Then { match.vlan_vid.zero? }
+      Then { match.vlan_priority.zero? }
+      Then { match.ether_type.zero? }
+      Then { match.tos.zero? }
+      Then { match.ip_protocol.zero? }
       Then { match.source_ip_address == '0.0.0.0' }
       Then { match.destination_ip_address == '0.0.0.0' }
-      Then { match.transport_source_port == 0 }
-      Then { match.transport_destination_port == 0 }
+      Then { match.transport_source_port.zero? }
+      Then { match.transport_destination_port.zero? }
     end
 
     context 'with a Match binary generated with Pio::OpenFlow10::Match.new' do
@@ -78,19 +78,19 @@ describe Pio::OpenFlow10::Match do
         ]
       end
       And { match.wildcards[:source_ip_address] = 12 }
-      Then { match.in_port == 0 }
+      Then { match.in_port.zero? }
       Then { match.source_mac_address == '00:00:00:00:00:00' }
       Then { match.destination_mac_address == '00:00:00:00:00:00' }
-      Then { match.vlan_vid == 0 }
-      Then { match.vlan_priority == 0 }
-      Then { match.ether_type == 0 }
-      Then { match.tos == 0 }
-      Then { match.ip_protocol == 0 }
+      Then { match.vlan_vid.zero? }
+      Then { match.vlan_priority.zero? }
+      Then { match.ether_type.zero? }
+      Then { match.tos.zero? }
+      Then { match.ip_protocol.zero? }
       Then { match.source_ip_address == '192.168.1.0' }
       Then { match.source_ip_address.prefixlen == 24 }
       Then { match.destination_ip_address == '0.0.0.0' }
-      Then { match.transport_source_port == 0 }
-      Then { match.transport_destination_port == 0 }
+      Then { match.transport_source_port.zero? }
+      Then { match.transport_destination_port.zero? }
     end
   end
 
@@ -117,15 +117,15 @@ describe Pio::OpenFlow10::Match do
       Then { match.in_port == 1 }
       Then { match.source_mac_address == '00:00:00:00:00:00' }
       Then { match.destination_mac_address == '00:00:00:00:00:00' }
-      Then { match.vlan_vid == 0 }
-      Then { match.vlan_priority == 0 }
-      Then { match.ether_type == 0 }
-      Then { match.tos == 0 }
-      Then { match.ip_protocol == 0 }
+      Then { match.vlan_vid.zero? }
+      Then { match.vlan_priority.zero? }
+      Then { match.ether_type.zero? }
+      Then { match.tos.zero? }
+      Then { match.ip_protocol.zero? }
       Then { match.source_ip_address == '0.0.0.0' }
       Then { match.destination_ip_address == '0.0.0.0' }
-      Then { match.transport_source_port == 0 }
-      Then { match.transport_destination_port == 0 }
+      Then { match.transport_source_port.zero? }
+      Then { match.transport_destination_port.zero? }
 
       describe '#==' do
         When(:result) { match == other }
@@ -156,18 +156,18 @@ describe Pio::OpenFlow10::Match do
         ]
       end
       Then { match.wildcards.fetch(:source_ip_address) == 8 }
-      Then { match.in_port == 0 }
+      Then { match.in_port.zero? }
       Then { match.source_mac_address == '00:00:00:00:00:00' }
       Then { match.destination_mac_address == '00:00:00:00:00:00' }
-      Then { match.vlan_vid == 0 }
-      Then { match.vlan_priority == 0 }
-      Then { match.ether_type == 0 }
-      Then { match.tos == 0 }
-      Then { match.ip_protocol == 0 }
+      Then { match.vlan_vid.zero? }
+      Then { match.vlan_priority.zero? }
+      Then { match.ether_type.zero? }
+      Then { match.tos.zero? }
+      Then { match.ip_protocol.zero? }
       Then { match.source_ip_address == '192.168.1.0/24' }
       Then { match.destination_ip_address == '0.0.0.0' }
-      Then { match.transport_source_port == 0 }
-      Then { match.transport_destination_port == 0 }
+      Then { match.transport_source_port.zero? }
+      Then { match.transport_destination_port.zero? }
     end
 
     context "with destination_ip_address: '192.168.1.0/24'" do
@@ -189,18 +189,18 @@ describe Pio::OpenFlow10::Match do
         ]
       end
       Then { match.wildcards.fetch(:destination_ip_address) == 8 }
-      Then { match.in_port == 0 }
+      Then { match.in_port.zero? }
       Then { match.source_mac_address == '00:00:00:00:00:00' }
       Then { match.destination_mac_address == '00:00:00:00:00:00' }
-      Then { match.vlan_vid == 0 }
-      Then { match.vlan_priority == 0 }
-      Then { match.ether_type == 0 }
-      Then { match.tos == 0 }
-      Then { match.ip_protocol == 0 }
+      Then { match.vlan_vid.zero? }
+      Then { match.vlan_priority.zero? }
+      Then { match.ether_type.zero? }
+      Then { match.tos.zero? }
+      Then { match.ip_protocol.zero? }
       Then { match.source_ip_address == '0.0.0.0' }
       Then { match.destination_ip_address == '192.168.1.0/24' }
-      Then { match.transport_source_port == 0 }
-      Then { match.transport_destination_port == 0 }
+      Then { match.transport_source_port.zero? }
+      Then { match.transport_destination_port.zero? }
     end
   end
 end