pio 0.27.2 → 0.28.0

data/spec/pio/dhcp_spec.rb

@@ -192,16 +192,16 @@ describe Pio::Dhcp, '.read' do
       it { is_expected.to eq 0x39a6 }
     end
 
-    describe '#ip_source_address' do
-      subject { super().ip_source_address }
+    describe '#source_ip_address' do
+      subject { super().source_ip_address }
       describe '#to_s' do
         subject { super().to_s }
         it { is_expected.to eq '0.0.0.0' }
       end
     end
 
-    describe '#ip_destination_address' do
-      subject { super().ip_destination_address }
+    describe '#destination_ip_address' do
+      subject { super().destination_ip_address }
       describe '#to_s' do
         subject { super().to_s }
         it { is_expected.to eq '255.255.255.255' }
@@ -514,16 +514,16 @@ describe Pio::Dhcp, '.read' do
       it { is_expected.to eq 0xb849 }
     end
 
-    describe '#ip_source_address' do
-      subject { super().ip_source_address }
+    describe '#source_ip_address' do
+      subject { super().source_ip_address }
       describe '#to_s' do
         subject { super().to_s }
         it { is_expected.to eq '192.168.0.10' }
       end
     end
 
-    describe '#ip_destination_address' do
-      subject { super().ip_destination_address }
+    describe '#destination_ip_address' do
+      subject { super().destination_ip_address }
       describe '#to_s' do
         subject { super().to_s }
         it { is_expected.to eq '192.168.0.1' }
@@ -844,16 +844,16 @@ describe Pio::Dhcp, '.read' do
       it { is_expected.to eq 0x39a6 }
     end
 
-    describe '#ip_source_address' do
-      subject { super().ip_source_address }
+    describe '#source_ip_address' do
+      subject { super().source_ip_address }
       describe '#to_s' do
         subject { super().to_s }
         it { is_expected.to eq '0.0.0.0' }
       end
     end
 
-    describe '#ip_destination_address' do
-      subject { super().ip_destination_address }
+    describe '#destination_ip_address' do
+      subject { super().destination_ip_address }
       describe '#to_s' do
         subject { super().to_s }
         it { is_expected.to eq '255.255.255.255' }
@@ -1166,16 +1166,16 @@ describe Pio::Dhcp, '.read' do
       it { is_expected.to eq 0xb849 }
     end
 
-    describe '#ip_source_address' do
-      subject { super().ip_source_address }
+    describe '#source_ip_address' do
+      subject { super().source_ip_address }
       describe '#to_s' do
         subject { super().to_s }
         it { is_expected.to eq '192.168.0.10' }
       end
     end
 
-    describe '#ip_destination_address' do
-      subject { super().ip_destination_address }
+    describe '#destination_ip_address' do
+      subject { super().destination_ip_address }
       describe '#to_s' do
         subject { super().to_s }
         it { is_expected.to eq '192.168.0.1' }

data/spec/pio/icmp/reply_spec.rb

@@ -10,8 +10,8 @@ describe Pio::Icmp::Reply, '.new' do
       Pio::Icmp::Reply.new(
         destination_mac: '00:26:82:eb:ea:d1',
         source_mac: '24:db:ac:41:e5:5b',
-        ip_source_address: '8.8.8.8',
-        ip_destination_address: '192.168.1.102',
+        source_ip_address: '8.8.8.8',
+        destination_ip_address: '192.168.1.102',
         identifier: 0x123,
         sequence_number: 0x321,
         echo_data: 'abcdefghijklmnopqrstuvwabcdefghi'
@@ -75,8 +75,8 @@ describe Pio::Icmp::Reply, '.new' do
         Pio::Icmp::Reply.new(
           destination_mac: '00:26:82:eb:ea:d1',
           source_mac: '24:db:ac:41:e5:5b',
-          ip_source_address: '8.8.8.8',
-          ip_destination_address: '192.168.1.102',
+          source_ip_address: '8.8.8.8',
+          destination_ip_address: '192.168.1.102',
           identifier: 0x123,
           sequence_number: 0x321
         )

data/spec/pio/icmp/request_spec.rb

@@ -9,8 +9,8 @@ describe Pio::Icmp do
     Pio::Icmp::Request.new(
       destination_mac: '24:db:ac:41:e5:5b',
       source_mac: '74:e5:0b:2a:18:f8',
-      ip_source_address: '192.168.1.101',
-      ip_destination_address: '8.8.8.8',
+      source_ip_address: '192.168.1.101',
+      destination_ip_address: '8.8.8.8',
       identifier: 0x123,
       sequence_number: 0x321,
       echo_data: 'abcdefghijklmnopqrstuvwabcdefghi'
@@ -29,8 +29,8 @@ describe Pio::Icmp::Request, '.new' do
       Pio::Icmp::Request.new(
         destination_mac: '24:db:ac:41:e5:5b',
         source_mac: '74:e5:0b:2a:18:f8',
-        ip_source_address: '192.168.1.101',
-        ip_destination_address: '8.8.8.8',
+        source_ip_address: '192.168.1.101',
+        destination_ip_address: '8.8.8.8',
         identifier: 0x123,
         sequence_number: 0x321,
         echo_data: 'abcdefghijklmnopqrstuvwabcdefghi'
@@ -95,8 +95,8 @@ describe Pio::Icmp::Request, '.new' do
       Pio::Icmp::Request.new(
         destination_mac: '24:db:ac:41:e5:5b',
         source_mac: '74:e5:0b:2a:18:f8',
-        ip_source_address: '192.168.1.101',
-        ip_destination_address: '8.8.8.8',
+        source_ip_address: '192.168.1.101',
+        destination_ip_address: '8.8.8.8',
         identifier: 0x123,
         sequence_number: 0x321
       )

data/spec/pio/icmp_spec.rb

@@ -71,8 +71,8 @@ describe Pio::Icmp, '.read' do
     Then { icmp_request.ip_ttl == 128 }
     Then { icmp_request.ip_protocol == 1 }
     Then { icmp_request.ip_header_checksum == 0x2ed0 }
-    Then { icmp_request.ip_source_address.to_s == '192.168.1.102' }
-    Then { icmp_request.ip_destination_address.to_s == '8.8.8.8' }
+    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_checksum == 0x4c5b }
@@ -144,8 +144,8 @@ describe Pio::Icmp, '.read' do
     Then { icmp_reply.ip_ttl == 45 }
     Then { icmp_reply.ip_protocol == 1 }
     Then { icmp_reply.ip_header_checksum == 0xbba3 }
-    Then { icmp_reply.ip_source_address.to_s == '8.8.8.8' }
-    Then { icmp_reply.ip_destination_address.to_s == '192.168.1.102' }
+    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_checksum == 0x545b }

data/spec/pio/open_flow10/enqueue_spec.rb

@@ -1,9 +1,9 @@
 require 'pio/open_flow10/enqueue'
 
-describe Pio::Enqueue do
+describe Pio::OpenFlow10::Enqueue do
   describe '.new' do
     context 'with port: 1, queue_id: 2' do
-      When(:enqueue) { Pio::Enqueue.new(port: 1, queue_id: 2) }
+      When(:enqueue) { Pio::OpenFlow10::Enqueue.new(port: 1, queue_id: 2) }
 
       describe '#port' do
         Then { enqueue.port == 1 }
@@ -17,8 +17,8 @@ describe Pio::Enqueue do
         Then { enqueue.action_type == 11 }
       end
 
-      describe '#length' do
-        Then { enqueue.length == 16 }
+      describe '#action_length' do
+        Then { enqueue.action_length == 16 }
       end
 
       describe '#to_binary' do
@@ -27,7 +27,9 @@ describe Pio::Enqueue do
     end
 
     context 'with port: :in_port, queue_id: 2' do
-      When(:enqueue) { Pio::Enqueue.new(port: :in_port, queue_id: 2) }
+      When(:enqueue) do
+        Pio::OpenFlow10::Enqueue.new(port: :in_port, queue_id: 2)
+      end
 
       describe '#port' do
         Then { enqueue.port == :in_port }
@@ -35,32 +37,32 @@ describe Pio::Enqueue do
     end
 
     context 'with port: :local, queue_id: 2' do
-      When(:enqueue) { Pio::Enqueue.new(port: :local, queue_id: 2) }
+      When(:enqueue) { Pio::OpenFlow10::Enqueue.new(port: :local, queue_id: 2) }
       Then { enqueue == Failure(ArgumentError) }
     end
 
     context 'with port: -1, queue_id: 2' do
-      When(:enqueue) { Pio::Enqueue.new(port: -1, queue_id: 2) }
+      When(:enqueue) { Pio::OpenFlow10::Enqueue.new(port: -1, queue_id: 2) }
       Then { enqueue == Failure(ArgumentError) }
     end
 
     context 'with port: 0xff00, queue_id: 2' do
-      When(:enqueue) { Pio::Enqueue.new(port: 0xff00, queue_id: 2) }
+      When(:enqueue) { Pio::OpenFlow10::Enqueue.new(port: 0xff00, queue_id: 2) }
       Then { enqueue == Failure(ArgumentError) }
     end
 
     context 'with port: 1, queue_id: -2' do
-      When(:enqueue) { Pio::Enqueue.new(port: 1, queue_id: -2) }
+      When(:enqueue) { Pio::OpenFlow10::Enqueue.new(port: 1, queue_id: -2) }
       Then { enqueue == Failure(ArgumentError) }
     end
 
     context 'with port: 1' do
-      When(:enqueue) { Pio::Enqueue.new(port: 1) }
+      When(:enqueue) { Pio::OpenFlow10::Enqueue.new(port: 1) }
       Then { enqueue == Failure(ArgumentError) }
     end
 
     context 'with queue_id: 2' do
-      When(:enqueue) { Pio::Enqueue.new(queue_id: 2) }
+      When(:enqueue) { Pio::OpenFlow10::Enqueue.new(queue_id: 2) }
       Then { enqueue == Failure(ArgumentError) }
     end
   end

data/spec/pio/open_flow10/flow_mod_spec.rb

@@ -39,28 +39,28 @@ describe Pio::OpenFlow10::FlowMod do
       Then do
         flow_mod.match.wildcards.keys == [
           :vlan_vid,
-          :ether_source_address,
-          :ether_destination_address,
+          :source_mac_address,
+          :destination_mac_address,
           :ether_type,
           :ip_protocol,
           :transport_source_port,
           :transport_destination_port,
-          :ip_source_address_all,
-          :ip_destination_address_all,
+          :source_ip_address_all,
+          :destination_ip_address_all,
           :vlan_priority,
-          :ip_tos
+          :tos
         ]
       end
       Then { flow_mod.match.in_port == 1 }
-      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.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.ip_tos == 0 }
+      Then { flow_mod.match.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.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.cookie == 1 }
@@ -104,28 +104,28 @@ describe Pio::OpenFlow10::FlowMod do
       Then do
         flow_mod.match.wildcards.keys == [
           :vlan_vid,
-          :ether_source_address,
-          :ether_destination_address,
+          :source_mac_address,
+          :destination_mac_address,
           :ether_type,
           :ip_protocol,
           :transport_source_port,
           :transport_destination_port,
-          :ip_source_address_all,
-          :ip_destination_address_all,
+          :source_ip_address_all,
+          :destination_ip_address_all,
           :vlan_priority,
-          :ip_tos
+          :tos
         ]
       end
       Then { flow_mod.match.in_port == 1 }
-      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.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.ip_tos == 0 }
+      Then { flow_mod.match.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.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.cookie == 1 }

data/spec/pio/open_flow10/flow_stats_request_spec.rb

@@ -25,11 +25,11 @@ describe Pio::OpenFlow10::FlowStats::Request do
       Then { flow_stats_request.stats_type == :flow }
       Then do
         flow_stats_request.match.wildcards.keys.sort ==
-          [:ether_destination_address, :ether_source_address,
-           :ether_type, :in_port, :ip_destination_address_all,
-           :ip_protocol, :ip_source_address_all, :ip_tos,
+          [:destination_mac_address, :source_mac_address,
+           :ether_type, :in_port, :destination_ip_address_all,
+           :ip_protocol, :source_ip_address_all, :tos,
            :transport_destination_port, :transport_source_port,
-           :vlan_priority, :vlan_vid]
+           :vlan_priority, :vlan_vid].sort
       end
       Then { flow_stats_request.table_id == 0xff }
       Then { flow_stats_request.out_port == :none }

data/spec/pio/open_flow10/match_spec.rb

@@ -28,28 +28,28 @@ describe Pio::OpenFlow10::Match do
       Then do
         match.wildcards.keys == [
           :vlan_vid,
-          :ether_source_address,
-          :ether_destination_address,
+          :source_mac_address,
+          :destination_mac_address,
           :ether_type,
           :ip_protocol,
           :transport_source_port,
           :transport_destination_port,
-          :ip_source_address_all,
-          :ip_destination_address_all,
+          :source_ip_address_all,
+          :destination_ip_address_all,
           :vlan_priority,
-          :ip_tos
+          :tos
         ]
       end
       Then { match.in_port == 1 }
-      Then { match.ether_source_address == '00:00:00:00:00:00' }
-      Then { match.ether_destination_address == '00:00:00:00:00:00' }
+      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.ip_tos == 0 }
+      Then { match.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.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 }
     end
@@ -57,7 +57,7 @@ describe Pio::OpenFlow10::Match do
     context 'with a Match binary generated with Pio::OpenFlow10::Match.new' do
       Given(:binary) do
         Pio::OpenFlow10::Match
-          .new(ip_source_address: '192.168.1.0/24')
+          .new(source_ip_address: '192.168.1.0/24')
           .to_binary_s
       end
 
@@ -65,30 +65,30 @@ describe Pio::OpenFlow10::Match do
         match.wildcards.keys == [
           :in_port,
           :vlan_vid,
-          :ether_source_address,
-          :ether_destination_address,
+          :source_mac_address,
+          :destination_mac_address,
           :ether_type,
           :ip_protocol,
           :transport_source_port,
           :transport_destination_port,
-          :ip_source_address,
-          :ip_destination_address_all,
+          :source_ip_address,
+          :destination_ip_address_all,
           :vlan_priority,
-          :ip_tos
+          :tos
         ]
       end
-      And { match.wildcards[:ip_source_address] = 12 }
+      And { match.wildcards[:source_ip_address] = 12 }
       Then { match.in_port == 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.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.ip_tos == 0 }
+      Then { match.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.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 }
     end
@@ -102,28 +102,28 @@ describe Pio::OpenFlow10::Match do
       Then do
         match.wildcards.keys == [
           :vlan_vid,
-          :ether_source_address,
-          :ether_destination_address,
+          :source_mac_address,
+          :destination_mac_address,
           :ether_type,
           :ip_protocol,
           :transport_source_port,
           :transport_destination_port,
-          :ip_source_address_all,
-          :ip_destination_address_all,
+          :source_ip_address_all,
+          :destination_ip_address_all,
           :vlan_priority,
-          :ip_tos
+          :tos
         ]
       end
       Then { match.in_port == 1 }
-      Then { match.ether_source_address == '00:00:00:00:00:00' }
-      Then { match.ether_destination_address == '00:00:00:00:00:00' }
+      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.ip_tos == 0 }
+      Then { match.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.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 }
 
@@ -137,68 +137,68 @@ describe Pio::OpenFlow10::Match do
       end
     end
 
-    context "with ip_source_address: '192.168.1.0/24'" do
-      Given(:options) { { ip_source_address: '192.168.1.0/24' } }
+    context "with source_ip_address: '192.168.1.0/24'" do
+      Given(:options) { { source_ip_address: '192.168.1.0/24' } }
       Then do
         match.wildcards.keys == [
           :in_port,
           :vlan_vid,
-          :ether_source_address,
-          :ether_destination_address,
+          :source_mac_address,
+          :destination_mac_address,
           :ether_type,
           :ip_protocol,
           :transport_source_port,
           :transport_destination_port,
-          :ip_source_address,
-          :ip_destination_address_all,
+          :source_ip_address,
+          :destination_ip_address_all,
           :vlan_priority,
-          :ip_tos
+          :tos
         ]
       end
-      Then { match.wildcards.fetch(:ip_source_address) == 8 }
+      Then { match.wildcards.fetch(:source_ip_address) == 8 }
       Then { match.in_port == 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.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.ip_tos == 0 }
+      Then { match.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.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 }
     end
 
-    context "with ip_destination_address: '192.168.1.0/24'" do
-      Given(:options) { { ip_destination_address: '192.168.1.0/24' } }
+    context "with destination_ip_address: '192.168.1.0/24'" do
+      Given(:options) { { destination_ip_address: '192.168.1.0/24' } }
       Then do
         match.wildcards.keys == [
           :in_port,
           :vlan_vid,
-          :ether_source_address,
-          :ether_destination_address,
+          :source_mac_address,
+          :destination_mac_address,
           :ether_type,
           :ip_protocol,
           :transport_source_port,
           :transport_destination_port,
-          :ip_source_address_all,
-          :ip_destination_address,
+          :source_ip_address_all,
+          :destination_ip_address,
           :vlan_priority,
-          :ip_tos
+          :tos
         ]
       end
-      Then { match.wildcards.fetch(:ip_destination_address) == 8 }
+      Then { match.wildcards.fetch(:destination_ip_address) == 8 }
       Then { match.in_port == 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.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.ip_tos == 0 }
+      Then { match.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.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 }
     end