openflow-protocol 0.1.7 → 0.1.8

data/spec/actions/action_enqueue_spec.rb

@@ -1,8 +1,6 @@
-require 'spec_helper'
-
-describe OFActionEnqueue do
+describe OpenFlow::Protocol::ActionEnqueue do
   it 'should read binary' do
-    action = OFActionEnqueue.read [
+    action = OpenFlow::Protocol::ActionEnqueue.read [
       0, 11, 0, 16,     # header
       0, 1,             # port
       0, 0, 0, 0, 0, 0, # padding
@@ -14,14 +12,14 @@ describe OFActionEnqueue do
     expect(action.queue_id).to eq(1)
   end
   it 'should initialize with default values' do
-    action = OFActionEnqueue.new
+    action = OpenFlow::Protocol::ActionEnqueue.new
     expect(action.type).to eq(:enqueue)
     expect(action.len).to eq(16)
     expect(action.port).to eq(:none)
     expect(action.queue_id).to eq(0)
   end
   it 'should initialize with some values' do
-    action = OFActionEnqueue.new(port: 1, queue_id: 1)
+    action = OpenFlow::Protocol::ActionEnqueue.new(port: 1, queue_id: 1)
     expect(action.type).to eq(:enqueue)
     expect(action.len).to eq(16)
     expect(action.port).to eq(1)

data/spec/actions/action_output_spec.rb

@@ -1,8 +1,6 @@
-require 'spec_helper'
-
-describe OFActionOutput do
+describe OpenFlow::Protocol::ActionOutput do
   it 'should read binary' do
-    action = OFActionOutput.read [
+    action = OpenFlow::Protocol::ActionOutput.read [
       0, 0, 0, 8, # header
       0, 1,       # port
       0xff, 0xff  # max_length
@@ -13,14 +11,14 @@ describe OFActionOutput do
     expect(action.max_length).to eq(0xffff)
   end
   it 'should initialize with default values' do
-    action = OFActionOutput.new
+    action = OpenFlow::Protocol::ActionOutput.new
     expect(action.type).to eq(:output)
     expect(action.len).to eq(8)
     expect(action.port).to eq(:none)
     expect(action.max_length).to eq(0xffff)
   end
   it 'should initialize with some values' do
-    action = OFActionOutput.new(port: 1)
+    action = OpenFlow::Protocol::ActionOutput.new(port: 1)
     expect(action.type).to eq(:output)
     expect(action.len).to eq(8)
     expect(action.port).to eq(1)

data/spec/actions/action_set_destination_port_spec.rb

@@ -1,8 +1,6 @@
-require 'spec_helper'
-
-describe OFActionSetDestinationPort do
+describe OpenFlow::Protocol::ActionSetDestinationPort do
   it 'should read binary' do
-    action = OFActionSetDestinationPort.read [
+    action = OpenFlow::Protocol::ActionSetDestinationPort.read [
       0, 10, 0, 8, # header
       0, 1,        # port
       0, 0         # padding
@@ -12,13 +10,13 @@ describe OFActionSetDestinationPort do
     expect(action.port).to eq(1)
   end
   it 'should initialize with default values' do
-    action = OFActionSetDestinationPort.new
+    action = OpenFlow::Protocol::ActionSetDestinationPort.new
     expect(action.type).to eq(:set_destination_port)
     expect(action.len).to eq(8)
     expect(action.port).to eq(0)
   end
   it 'should initialize with some values' do
-    action = OFActionSetDestinationPort.new(port: 1)
+    action = OpenFlow::Protocol::ActionSetDestinationPort.new(port: 1)
     expect(action.type).to eq(:set_destination_port)
     expect(action.len).to eq(8)
     expect(action.port).to eq(1)

data/spec/actions/action_set_ip_destination_spec.rb

@@ -1,8 +1,6 @@
-require 'spec_helper'
-
-describe OFActionSetIpDestination do
+describe OpenFlow::Protocol::ActionSetIpDestination do
   it 'should read binary' do
-    action = OFActionSetIpDestination.read [
+    action = OpenFlow::Protocol::ActionSetIpDestination.read [
       0, 7, 0, 8, # header
       10, 0, 0, 1 # ip_address
     ].pack('C*')
@@ -11,13 +9,13 @@ describe OFActionSetIpDestination do
     expect(action.ip_address).to eq('10.0.0.1')
   end
   it 'should initialize with default values' do
-    action = OFActionSetIpDestination.new
+    action = OpenFlow::Protocol::ActionSetIpDestination.new
     expect(action.type).to eq(:set_ip_destination)
     expect(action.len).to eq(8)
     expect(action.ip_address).to eq('0.0.0.0')
   end
   it 'should initialize with some values' do
-    action = OFActionSetIpDestination.new(ip_address: '10.0.0.1')
+    action = OpenFlow::Protocol::ActionSetIpDestination.new(ip_address: '10.0.0.1')
     expect(action.type).to eq(:set_ip_destination)
     expect(action.len).to eq(8)
     expect(action.ip_address).to eq('10.0.0.1')

data/spec/actions/action_set_ip_source_spec.rb

@@ -1,8 +1,6 @@
-require 'spec_helper'
-
-describe OFActionSetIpSource do
+describe OpenFlow::Protocol::ActionSetIpSource do
   it 'should read binary' do
-    action = OFActionSetIpSource.read [
+    action = OpenFlow::Protocol::ActionSetIpSource.read [
       0, 6, 0, 8, # header
       10, 0, 0, 1 # ip_address
     ].pack('C*')
@@ -11,13 +9,13 @@ describe OFActionSetIpSource do
     expect(action.ip_address).to eq('10.0.0.1')
   end
   it 'should initialize with default values' do
-    action = OFActionSetIpSource.new
+    action = OpenFlow::Protocol::ActionSetIpSource.new
     expect(action.type).to eq(:set_ip_source)
     expect(action.len).to eq(8)
     expect(action.ip_address).to eq('0.0.0.0')
   end
   it 'should initialize with some values' do
-    action = OFActionSetIpSource.new(ip_address: '10.0.0.1')
+    action = OpenFlow::Protocol::ActionSetIpSource.new(ip_address: '10.0.0.1')
     expect(action.type).to eq(:set_ip_source)
     expect(action.len).to eq(8)
     expect(action.ip_address).to eq('10.0.0.1')

data/spec/actions/action_set_ip_tos_spec.rb

@@ -1,8 +1,6 @@
-require 'spec_helper'
-
-describe OFActionSetIpTos do
+describe OpenFlow::Protocol::ActionSetIpTos do
   it 'should read binary' do
-    action = OFActionSetIpTos.read [
+    action = OpenFlow::Protocol::ActionSetIpTos.read [
       0, 8, 0, 8, # header
       10,         # tos
       0, 0, 0     # padding
@@ -12,13 +10,13 @@ describe OFActionSetIpTos do
     expect(action.tos).to eq(10)
   end
   it 'should initialize with default values' do
-    action = OFActionSetIpTos.new
+    action = OpenFlow::Protocol::ActionSetIpTos.new
     expect(action.type).to eq(:set_ip_tos)
     expect(action.len).to eq(8)
     expect(action.tos).to eq(0)
   end
   it 'should initialize with some values' do
-    action = OFActionSetIpTos.new(tos: 10)
+    action = OpenFlow::Protocol::ActionSetIpTos.new(tos: 10)
     expect(action.type).to eq(:set_ip_tos)
     expect(action.len).to eq(8)
     expect(action.tos).to eq(10)

data/spec/actions/action_set_mac_destination_spec.rb

@@ -1,8 +1,6 @@
-require 'spec_helper'
-
-describe OFActionSetMacDestination do
+describe OpenFlow::Protocol::ActionSetMacDestination do
   it 'should read binary' do
-    action = OFActionSetMacDestination.read [
+    action = OpenFlow::Protocol::ActionSetMacDestination.read [
       0, 5, 0, 16,      # header
       0, 0, 0, 0, 0, 1, # mac_address
       0, 0, 0, 0, 0, 0  # padding
@@ -12,13 +10,13 @@ describe OFActionSetMacDestination do
     expect(action.mac_address).to eq('00:00:00:00:00:01')
   end
   it 'should initialize with default values' do
-    action = OFActionSetMacDestination.new
+    action = OpenFlow::Protocol::ActionSetMacDestination.new
     expect(action.type).to eq(:set_mac_destination)
     expect(action.len).to eq(16)
     expect(action.mac_address).to eq('00:00:00:00:00:00')
   end
   it 'should initialize with some values' do
-    action = OFActionSetMacDestination.new(mac_address: '00:00:00:00:00:01')
+    action = OpenFlow::Protocol::ActionSetMacDestination.new(mac_address: '00:00:00:00:00:01')
     expect(action.type).to eq(:set_mac_destination)
     expect(action.len).to eq(16)
     expect(action.mac_address).to eq('00:00:00:00:00:01')

data/spec/actions/action_set_mac_source_spec.rb

@@ -1,8 +1,6 @@
-require 'spec_helper'
-
-describe OFActionSetMacSource do
+describe OpenFlow::Protocol::ActionSetMacSource do
   it 'should read binary' do
-    action = OFActionSetMacSource.read [
+    action = OpenFlow::Protocol::ActionSetMacSource.read [
       0, 4, 0, 16,      # header
       0, 0, 0, 0, 0, 1, # mac_address
       0, 0, 0, 0, 0, 0  # padding
@@ -12,13 +10,13 @@ describe OFActionSetMacSource do
     expect(action.mac_address).to eq('00:00:00:00:00:01')
   end
   it 'should initialize with default values' do
-    action = OFActionSetMacSource.new
+    action = OpenFlow::Protocol::ActionSetMacSource.new
     expect(action.type).to eq(:set_mac_source)
     expect(action.len).to eq(16)
     expect(action.mac_address).to eq('00:00:00:00:00:00')
   end
   it 'should initialize with some values' do
-    action = OFActionSetMacSource.new(mac_address: '00:00:00:00:00:01')
+    action = OpenFlow::Protocol::ActionSetMacSource.new(mac_address: '00:00:00:00:00:01')
     expect(action.type).to eq(:set_mac_source)
     expect(action.len).to eq(16)
     expect(action.mac_address).to eq('00:00:00:00:00:01')

data/spec/actions/action_set_source_port_spec.rb

@@ -1,8 +1,6 @@
-require 'spec_helper'
-
-describe OFActionSetSourcePort do
+describe OpenFlow::Protocol::ActionSetSourcePort do
   it 'should read binary' do
-    action = OFActionSetSourcePort.read [
+    action = OpenFlow::Protocol::ActionSetSourcePort.read [
       0, 9, 0, 8, # header
       0, 1,       # port
       0, 0        # padding
@@ -12,13 +10,13 @@ describe OFActionSetSourcePort do
     expect(action.port).to eq(1)
   end
   it 'should initialize with default values' do
-    action = OFActionSetSourcePort.new
+    action = OpenFlow::Protocol::ActionSetSourcePort.new
     expect(action.type).to eq(:set_source_port)
     expect(action.len).to eq(8)
     expect(action.port).to eq(0)
   end
   it 'should initialize with some values' do
-    action = OFActionSetSourcePort.new(port: 1)
+    action = OpenFlow::Protocol::ActionSetSourcePort.new(port: 1)
     expect(action.type).to eq(:set_source_port)
     expect(action.len).to eq(8)
     expect(action.port).to eq(1)

data/spec/actions/action_set_vlan_id_spec.rb

@@ -1,8 +1,6 @@
-require 'spec_helper'
-
-describe OFActionSetVlanId do
+describe OpenFlow::Protocol::ActionSetVlanId do
   it 'should read binary' do
-    action = OFActionSetVlanId.read [
+    action = OpenFlow::Protocol::ActionSetVlanId.read [
       0, 1, 0, 8, # header
       0, 1,       # vlan_id
       0, 0        # padding
@@ -12,13 +10,13 @@ describe OFActionSetVlanId do
     expect(action.vlan_id).to eq(1)
   end
   it 'should initialize with default values' do
-    action = OFActionSetVlanId.new
+    action = OpenFlow::Protocol::ActionSetVlanId.new
     expect(action.type).to eq(:set_vlan_id)
     expect(action.len).to eq(8)
     expect(action.vlan_id).to eq(0)
   end
   it 'should initialize with some values' do
-    action = OFActionSetVlanId.new(vlan_id: 1)
+    action = OpenFlow::Protocol::ActionSetVlanId.new(vlan_id: 1)
     expect(action.type).to eq(:set_vlan_id)
     expect(action.len).to eq(8)
     expect(action.vlan_id).to eq(1)

data/spec/actions/action_set_vlan_pcp_spec.rb

@@ -1,8 +1,6 @@
-require 'spec_helper'
-
-describe OFActionSetVlanPcp do
+describe OpenFlow::Protocol::ActionSetVlanPcp do
   it 'should read binary' do
-    action = OFActionSetVlanPcp.read [
+    action = OpenFlow::Protocol::ActionSetVlanPcp.read [
       0, 2, 0, 8, # header
       1,          # vlan_pcp
       0, 0, 0     # padding
@@ -12,13 +10,13 @@ describe OFActionSetVlanPcp do
     expect(action.vlan_pcp).to eq(1)
   end
   it 'should initialize with default values' do
-    action = OFActionSetVlanPcp.new
+    action = OpenFlow::Protocol::ActionSetVlanPcp.new
     expect(action.type).to eq(:set_vlan_pcp)
     expect(action.len).to eq(8)
     expect(action.vlan_pcp).to eq(0)
   end
   it 'should initialize with some values' do
-    action = OFActionSetVlanPcp.new(vlan_pcp: 1)
+    action = OpenFlow::Protocol::ActionSetVlanPcp.new(vlan_pcp: 1)
     expect(action.type).to eq(:set_vlan_pcp)
     expect(action.len).to eq(8)
     expect(action.vlan_pcp).to eq(1)

data/spec/actions/action_strip_vlan_spec.rb

@@ -1,8 +1,6 @@
-require 'spec_helper'
-
-describe OFActionStripVlan do
+describe OpenFlow::Protocol::ActionStripVlan do
   it 'should read binary' do
-    action = OFActionStripVlan.read [
+    action = OpenFlow::Protocol::ActionStripVlan.read [
       0, 3, 0, 8, # header
       0, 0, 0, 0  # padding
     ].pack('C*')
@@ -10,7 +8,7 @@ describe OFActionStripVlan do
     expect(action.len).to eq(8)
   end
   it 'should initialize with default values' do
-    action = OFActionStripVlan.new
+    action = OpenFlow::Protocol::ActionStripVlan.new
     expect(action.type).to eq(:strip_vlan)
     expect(action.len).to eq(8)
   end

data/spec/actions/action_vendor_spec.rb

@@ -1,8 +1,6 @@
-require 'spec_helper'
-
-describe OFActionVendor do
+describe OpenFlow::Protocol::ActionVendor do
   it 'should read binary' do
-    action = OFActionVendor.read [
+    action = OpenFlow::Protocol::ActionVendor.read [
       0xff, 0xff, 0, 8, # header
       0, 0, 0, 1        # vendor
     ].pack('C*')
@@ -11,13 +9,13 @@ describe OFActionVendor do
     expect(action.vendor).to eq(1)
   end
   it 'should initialize with default values' do
-    action = OFActionVendor.new
+    action = OpenFlow::Protocol::ActionVendor.new
     expect(action.type).to eq(:vendor)
     expect(action.len).to eq(8)
     expect(action.vendor).to eq(0)
   end
   it 'should initialize with some values' do
-    action = OFActionVendor.new(vendor: 1)
+    action = OpenFlow::Protocol::ActionVendor.new(vendor: 1)
     expect(action.type).to eq(:vendor)
     expect(action.len).to eq(8)
     expect(action.vendor).to eq(1)

data/spec/actions/actions_spec.rb

@@ -1,8 +1,6 @@
-require 'spec_helper'
-
-describe OFActions do
+describe OpenFlow::Protocol::Actions do
   it 'should read binary' do
-    actions = OFActions.read [
+    actions = OpenFlow::Protocol::Actions.read [
       # output
       0, 0, 0, 8, # header
       0, 1,       # port
@@ -18,13 +16,13 @@ describe OFActions do
     expect(actions.last.type).to eq(:enqueue)
   end
   it 'should initialize with default values' do
-    actions = OFActions.new
+    actions = OpenFlow::Protocol::Actions.new
     expect(actions).to be_empty
   end
   it 'should initialize with some values' do
-    actions = OFActions.new([
-      OFActionOutput.new(port: 1, max_length: 0xffff),
-      OFActionEnqueue.new(port: 1, queue_id: 1)
+    actions = OpenFlow::Protocol::Actions.new([
+      OpenFlow::Protocol::ActionOutput.new(port: 1, max_length: 0xffff),
+      OpenFlow::Protocol::ActionEnqueue.new(port: 1, queue_id: 1)
     ])
     expect(actions.length).to eq(2)
     expect(actions.first.type).to eq(:output)

data/spec/messages/barrier_reply_spec.rb

@@ -1,29 +1,27 @@
-require 'spec_helper'
-
-describe OFBarrierReply do
+describe OpenFlow::Protocol::BarrierReply do
   let(:data) { [1, 19, 0, 8, 0, 0, 0, 1].pack('C*') }
 
   it 'should read binary' do
-    msg = OFBarrierReply.read(data)
-    expect(msg.version).to eq(OFMessage::OFP_VERSION)
+    msg = OpenFlow::Protocol::BarrierReply.read(data)
+    expect(msg.version).to eq(OpenFlow::Protocol::Message::OFP_VERSION)
     expect(msg.type).to eq(:barrier_reply)
     expect(msg.len).to eq(8)
     expect(msg.xid).to eq(1)
   end
   it 'should be parsable' do
-    msg = OFParser.read(data)
-    expect(msg.class).to eq(OFBarrierReply)
+    msg = OpenFlow::Protocol::Parser.read(data)
+    expect(msg.class).to eq(OpenFlow::Protocol::BarrierReply)
   end
   it 'should initialize with default values' do
-    msg = OFBarrierReply.new
-    expect(msg.version).to eq(OFMessage::OFP_VERSION)
+    msg = OpenFlow::Protocol::BarrierReply.new
+    expect(msg.version).to eq(OpenFlow::Protocol::Message::OFP_VERSION)
     expect(msg.type).to eq(:barrier_reply)
     expect(msg.len).to eq(8)
     expect(msg.xid).to eq(0)
   end
   it 'should initialize with some values' do
-    msg = OFBarrierReply.new(xid: 1)
-    expect(msg.version).to eq(OFMessage::OFP_VERSION)
+    msg = OpenFlow::Protocol::BarrierReply.new(xid: 1)
+    expect(msg.version).to eq(OpenFlow::Protocol::Message::OFP_VERSION)
     expect(msg.type).to eq(:barrier_reply)
     expect(msg.len).to eq(8)
     expect(msg.xid).to eq(1)

data/spec/messages/barrier_request_spec.rb

@@ -1,29 +1,27 @@
-require 'spec_helper'
-
-describe OFBarrierRequest do
+describe OpenFlow::Protocol::BarrierRequest do
   let(:data) { [1, 18, 0, 8, 0, 0, 0, 1].pack('C*') }
 
   it 'should read binary' do
-    msg = OFBarrierRequest.read(data)
-    expect(msg.version).to eq(OFMessage::OFP_VERSION)
+    msg = OpenFlow::Protocol::BarrierRequest.read(data)
+    expect(msg.version).to eq(OpenFlow::Protocol::Message::OFP_VERSION)
     expect(msg.type).to eq(:barrier_request)
     expect(msg.len).to eq(8)
     expect(msg.xid).to eq(1)
   end
   it 'should be parsable' do
-    msg = OFParser.read(data)
-    expect(msg.class).to eq(OFBarrierRequest)
+    msg = OpenFlow::Protocol::Parser.read(data)
+    expect(msg.class).to eq(OpenFlow::Protocol::BarrierRequest)
   end
   it 'should initialize with default values' do
-    msg = OFBarrierRequest.new
-    expect(msg.version).to eq(OFMessage::OFP_VERSION)
+    msg = OpenFlow::Protocol::BarrierRequest.new
+    expect(msg.version).to eq(OpenFlow::Protocol::Message::OFP_VERSION)
     expect(msg.type).to eq(:barrier_request)
     expect(msg.len).to eq(8)
     expect(msg.xid).to eq(0)
   end
   it 'should initialize with some values' do
-    msg = OFBarrierRequest.new(xid: 1)
-    expect(msg.version).to eq(OFMessage::OFP_VERSION)
+    msg = OpenFlow::Protocol::BarrierRequest.new(xid: 1)
+    expect(msg.version).to eq(OpenFlow::Protocol::Message::OFP_VERSION)
     expect(msg.type).to eq(:barrier_request)
     expect(msg.len).to eq(8)
     expect(msg.xid).to eq(1)