openflow-protocol 0.1.7 → 0.1.8

data/spec/messages/get_config_request_spec.rb

@@ -1,29 +1,27 @@
-require 'spec_helper'
-
-describe OFGetConfigRequest do
+describe OpenFlow::Protocol::GetConfigRequest do
   let(:data) { [1, 7, 0, 8, 0, 0, 0, 1].pack('C*') }
 
   it 'should read binary' do
-    msg = OFGetConfigRequest.read(data)
-    expect(msg.version).to eq(OFMessage::OFP_VERSION)
+    msg = OpenFlow::Protocol::GetConfigRequest.read(data)
+    expect(msg.version).to eq(OpenFlow::Protocol::Message::OFP_VERSION)
     expect(msg.type).to eq(:get_config_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(OFGetConfigRequest)
+    msg = OpenFlow::Protocol::Parser.read(data)
+    expect(msg.class).to eq(OpenFlow::Protocol::GetConfigRequest)
   end
   it 'should initialize with default values' do
-    msg = OFGetConfigRequest.new
-    expect(msg.version).to eq(OFMessage::OFP_VERSION)
+    msg = OpenFlow::Protocol::GetConfigRequest.new
+    expect(msg.version).to eq(OpenFlow::Protocol::Message::OFP_VERSION)
     expect(msg.type).to eq(:get_config_request)
     expect(msg.len).to eq(8)
     expect(msg.xid).to eq(0)
   end
   it 'should initialize with some values' do
-    msg = OFGetConfigRequest.new(xid: 1)
-    expect(msg.version).to eq(OFMessage::OFP_VERSION)
+    msg = OpenFlow::Protocol::GetConfigRequest.new(xid: 1)
+    expect(msg.version).to eq(OpenFlow::Protocol::Message::OFP_VERSION)
     expect(msg.type).to eq(:get_config_request)
     expect(msg.len).to eq(8)
     expect(msg.xid).to eq(1)

data/spec/messages/hello_spec.rb

@@ -1,29 +1,27 @@
-require 'spec_helper'
-
-describe OFHello do
+describe OpenFlow::Protocol::Hello do
   let(:data) { [1, 0, 0, 8, 0, 0, 0, 1].pack('C*') }
 
   it 'should read binary' do
-    msg = OFHello.read(data)
-    expect(msg.version).to eq(OFMessage::OFP_VERSION)
+    msg = OpenFlow::Protocol::Hello.read(data)
+    expect(msg.version).to eq(OpenFlow::Protocol::Message::OFP_VERSION)
     expect(msg.type).to eq(:hello)
     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(OFHello)
+    msg = OpenFlow::Protocol::Parser.read(data)
+    expect(msg.class).to eq(OpenFlow::Protocol::Hello)
   end
   it 'should initialize with default values' do
-    msg = OFHello.new
-    expect(msg.version).to eq(OFMessage::OFP_VERSION)
+    msg = OpenFlow::Protocol::Hello.new
+    expect(msg.version).to eq(OpenFlow::Protocol::Message::OFP_VERSION)
     expect(msg.type).to eq(:hello)
     expect(msg.len).to eq(8)
     expect(msg.xid).to eq(0)
   end
   it 'should initialize with some values' do
-    msg = OFHello.new(xid: 1)
-    expect(msg.version).to eq(OFMessage::OFP_VERSION)
+    msg = OpenFlow::Protocol::Hello.new(xid: 1)
+    expect(msg.version).to eq(OpenFlow::Protocol::Message::OFP_VERSION)
     expect(msg.type).to eq(:hello)
     expect(msg.len).to eq(8)
     expect(msg.xid).to eq(1)

data/spec/messages/packet_in_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe OFPacketIn do
+describe OpenFlow::Protocol::PacketIn do
   let(:data) {
     [
       1, 10, 0, 64, 0, 0, 0, 1, # header
@@ -34,8 +32,8 @@ describe OFPacketIn do
   }
 
   it 'should read binary' do
-    msg = OFPacketIn.read(data)
-    expect(msg.version).to eq(OFMessage::OFP_VERSION)
+    msg = OpenFlow::Protocol::PacketIn.read(data)
+    expect(msg.version).to eq(OpenFlow::Protocol::Message::OFP_VERSION)
     expect(msg.type).to eq(:packet_in)
     expect(msg.len).to eq(64)
     expect(msg.xid).to eq(1)
@@ -48,12 +46,12 @@ describe OFPacketIn do
     expect(msg.parsed_data.mac_destination).to eq('00:00:00:00:00:02')
   end
   it 'should be parsable' do
-    msg = OFParser.read(data)
-    expect(msg.class).to eq(OFPacketIn)
+    msg = OpenFlow::Protocol::Parser.read(data)
+    expect(msg.class).to eq(OpenFlow::Protocol::PacketIn)
   end
   it 'should initialize with default values' do
-    msg = OFPacketIn.new
-    expect(msg.version).to eq(OFMessage::OFP_VERSION)
+    msg = OpenFlow::Protocol::PacketIn.new
+    expect(msg.version).to eq(OpenFlow::Protocol::Message::OFP_VERSION)
     expect(msg.type).to eq(:packet_in)
     expect(msg.len).to eq(18)
     expect(msg.xid).to eq(0)
@@ -64,14 +62,14 @@ describe OFPacketIn do
     expect(msg.data).to be_empty
   end
   it 'should initialize with some values' do
-    msg = OFPacketIn.new(
+    msg = OpenFlow::Protocol::PacketIn.new(
       xid: 1,
       buffer_id: 1,
       in_port: 1,
       reason: :no_match,
       data: [1, 2].pack('C*')
     )
-    expect(msg.version).to eq(OFMessage::OFP_VERSION)
+    expect(msg.version).to eq(OpenFlow::Protocol::Message::OFP_VERSION)
     expect(msg.type).to eq(:packet_in)
     expect(msg.len).to eq(20)
     expect(msg.xid).to eq(1)

data/spec/messages/packet_out_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe OFPacketOut do
+describe OpenFlow::Protocol::PacketOut do
   let(:data) {
     [
       1, 13, 0, 26, 0, 0, 0, 1, # header
@@ -18,8 +16,8 @@ describe OFPacketOut do
   }
 
   it 'should read binary' do
-    msg = OFPacketOut.read(data)
-    expect(msg.version).to eq(OFMessage::OFP_VERSION)
+    msg = OpenFlow::Protocol::PacketOut.read(data)
+    expect(msg.version).to eq(OpenFlow::Protocol::Message::OFP_VERSION)
     expect(msg.type).to eq(:packet_out)
     expect(msg.len).to eq(26)
     expect(msg.xid).to eq(1)
@@ -30,12 +28,12 @@ describe OFPacketOut do
     expect(msg.data.length).to eq(2)
   end
   it 'should be parsable' do
-    msg = OFParser.read(data)
-    expect(msg.class).to eq(OFPacketOut)
+    msg = OpenFlow::Protocol::Parser.read(data)
+    expect(msg.class).to eq(OpenFlow::Protocol::PacketOut)
   end
   it 'should initialize with default values' do
-    msg = OFPacketOut.new
-    expect(msg.version).to eq(OFMessage::OFP_VERSION)
+    msg = OpenFlow::Protocol::PacketOut.new
+    expect(msg.version).to eq(OpenFlow::Protocol::Message::OFP_VERSION)
     expect(msg.type).to eq(:packet_out)
     expect(msg.len).to eq(16)
     expect(msg.xid).to eq(0)
@@ -45,13 +43,13 @@ describe OFPacketOut do
     expect(msg.data).to be_empty
   end
   it 'should initialize with some values' do
-    msg = OFPacketOut.new(
+    msg = OpenFlow::Protocol::PacketOut.new(
       xid: 1,
       in_port: 1,
-      actions: [OFActionOutput.new(port: 1)],
+      actions: [OpenFlow::Protocol::ActionOutput.new(port: 1)],
       data: [1, 2].pack('C*')
     )
-    expect(msg.version).to eq(OFMessage::OFP_VERSION)
+    expect(msg.version).to eq(OpenFlow::Protocol::Message::OFP_VERSION)
     expect(msg.type).to eq(:packet_out)
     expect(msg.len).to eq(26)
     expect(msg.xid).to eq(1)

data/spec/messages/parser_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe OFParser do
+describe OpenFlow::Protocol::Parser do
   let(:hello_msg) { [1, 0, 0, 8, 0, 0, 0, 1].pack('C*') }
   let(:packet_out_msg) {
     [
@@ -19,18 +17,18 @@ describe OFParser do
   }
 
   it 'should read binary Hello Message' do
-    msg = OFParser.read(hello_msg)
-    expect(msg.class).to be(OFHello)
-    expect(msg.version).to eq(OFMessage::OFP_VERSION)
+    msg = OpenFlow::Protocol::Parser.read(hello_msg)
+    expect(msg.class).to be(OpenFlow::Protocol::Hello)
+    expect(msg.version).to eq(OpenFlow::Protocol::Message::OFP_VERSION)
     expect(msg.type).to eq(:hello)
     expect(msg.len).to eq(8)
     expect(msg.xid).to eq(1)
   end
 
   it 'should read binary PacketOut Message' do
-    msg = OFParser.read(packet_out_msg)
-    expect(msg.class).to be(OFPacketOut)
-    expect(msg.version).to eq(OFMessage::OFP_VERSION)
+    msg = OpenFlow::Protocol::Parser.read(packet_out_msg)
+    expect(msg.class).to be(OpenFlow::Protocol::PacketOut)
+    expect(msg.version).to eq(OpenFlow::Protocol::Message::OFP_VERSION)
     expect(msg.type).to eq(:packet_out)
     expect(msg.len).to eq(26)
     expect(msg.xid).to eq(1)

data/spec/messages/port_mod_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe OFPortMod do
+describe OpenFlow::Protocol::PortMod do
   let(:data) {
     [
       1, 15, 0, 32, 0, 0, 0, 1, # header
@@ -14,8 +12,8 @@ describe OFPortMod do
   }
 
   it 'should read binary' do
-    msg = OFPortMod.read(data)
-    expect(msg.version).to eq(OFMessage::OFP_VERSION)
+    msg = OpenFlow::Protocol::PortMod.read(data)
+    expect(msg.version).to eq(OpenFlow::Protocol::Message::OFP_VERSION)
     expect(msg.type).to eq(:port_mod)
     expect(msg.len).to eq(32)
     expect(msg.xid).to eq(1)
@@ -29,12 +27,12 @@ describe OFPortMod do
     ])
   end
   it 'should be parsable' do
-    msg = OFParser.read(data)
-    expect(msg.class).to eq(OFPortMod)
+    msg = OpenFlow::Protocol::Parser.read(data)
+    expect(msg.class).to eq(OpenFlow::Protocol::PortMod)
   end
   it 'should initialize with default values' do
-    msg = OFPortMod.new
-    expect(msg.version).to eq(OFMessage::OFP_VERSION)
+    msg = OpenFlow::Protocol::PortMod.new
+    expect(msg.version).to eq(OpenFlow::Protocol::Message::OFP_VERSION)
     expect(msg.type).to eq(:port_mod)
     expect(msg.len).to eq(32)
     expect(msg.xid).to eq(0)
@@ -45,7 +43,7 @@ describe OFPortMod do
     expect(msg.advertise).to be_empty
   end
   it 'should initialize with some values' do
-    msg = OFPortMod.new(
+    msg = OpenFlow::Protocol::PortMod.new(
       xid: 1,
       port_number: 1,
       hardware_address: '00:00:00:00:00:01',
@@ -56,7 +54,7 @@ describe OFPortMod do
         :port_10mb_full_duplex
       ]
     )
-    expect(msg.version).to eq(OFMessage::OFP_VERSION)
+    expect(msg.version).to eq(OpenFlow::Protocol::Message::OFP_VERSION)
     expect(msg.type).to eq(:port_mod)
     expect(msg.len).to eq(32)
     expect(msg.xid).to eq(1)

data/spec/messages/port_status_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe OFPortStatus do
+describe OpenFlow::Protocol::PortStatus do
   let(:data) {
     [
       1, 12, 0, 64, 0, 0, 0, 1, # header
@@ -23,8 +21,8 @@ describe OFPortStatus do
   }
 
   it 'should read binary' do
-    msg = OFPortStatus.read(data)
-    expect(msg.version).to eq(OFMessage::OFP_VERSION)
+    msg = OpenFlow::Protocol::PortStatus.read(data)
+    expect(msg.version).to eq(OpenFlow::Protocol::Message::OFP_VERSION)
     expect(msg.type).to eq(:port_status)
     expect(msg.len).to eq(64)
     expect(msg.xid).to eq(1)
@@ -32,12 +30,12 @@ describe OFPortStatus do
     expect(msg.desc.port_number).to eq(1)
   end
   it 'should be parsable' do
-    msg = OFParser.read(data)
-    expect(msg.class).to eq(OFPortStatus)
+    msg = OpenFlow::Protocol::Parser.read(data)
+    expect(msg.class).to eq(OpenFlow::Protocol::PortStatus)
   end
   it 'should initialize with default values' do
-    msg = OFPortStatus.new
-    expect(msg.version).to eq(OFMessage::OFP_VERSION)
+    msg = OpenFlow::Protocol::PortStatus.new
+    expect(msg.version).to eq(OpenFlow::Protocol::Message::OFP_VERSION)
     expect(msg.type).to eq(:port_status)
     expect(msg.len).to eq(64)
     expect(msg.xid).to eq(0)
@@ -45,12 +43,12 @@ describe OFPortStatus do
     expect(msg.desc.port_number).to eq(0)
   end
   it 'should initialize with some values' do
-    msg = OFPortStatus.new(
+    msg = OpenFlow::Protocol::PortStatus.new(
       xid: 1,
       reason: :delete,
-      desc: OFPhysicalPort.new(port_number: 1)
+      desc: OpenFlow::Protocol::PhysicalPort.new(port_number: 1)
     )
-    expect(msg.version).to eq(OFMessage::OFP_VERSION)
+    expect(msg.version).to eq(OpenFlow::Protocol::Message::OFP_VERSION)
     expect(msg.type).to eq(:port_status)
     expect(msg.len).to eq(64)
     expect(msg.xid).to eq(1)

data/spec/messages/queue_get_config_reply_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe OFQueueGetConfigReply do
+describe OpenFlow::Protocol::QueueGetConfigReply do
   let(:data) {
     [
       1, 21, 0, 48, 0, 0, 0, 1, # header
@@ -23,8 +21,8 @@ describe OFQueueGetConfigReply do
   }
 
   it 'should read binary' do
-    msg = OFQueueGetConfigReply.read(data)
-    expect(msg.version).to eq(OFMessage::OFP_VERSION)
+    msg = OpenFlow::Protocol::QueueGetConfigReply.read(data)
+    expect(msg.version).to eq(OpenFlow::Protocol::Message::OFP_VERSION)
     expect(msg.type).to eq(:queue_get_config_reply)
     expect(msg.len).to eq(48)
     expect(msg.xid).to eq(1)
@@ -35,12 +33,12 @@ describe OFQueueGetConfigReply do
     expect(msg.queues.last.queue_id).to eq(2)
   end
   it 'should be parsable' do
-    msg = OFParser.read(data)
-    expect(msg.class).to eq(OFQueueGetConfigReply)
+    msg = OpenFlow::Protocol::Parser.read(data)
+    expect(msg.class).to eq(OpenFlow::Protocol::QueueGetConfigReply)
   end
   it 'should initialize with default values' do
-    msg = OFQueueGetConfigReply.new
-    expect(msg.version).to eq(OFMessage::OFP_VERSION)
+    msg = OpenFlow::Protocol::QueueGetConfigReply.new
+    expect(msg.version).to eq(OpenFlow::Protocol::Message::OFP_VERSION)
     expect(msg.type).to eq(:queue_get_config_reply)
     expect(msg.len).to eq(16)
     expect(msg.xid).to eq(0)
@@ -48,7 +46,7 @@ describe OFQueueGetConfigReply do
     expect(msg.queues).to be_empty
   end
   it 'should initialize with some values' do
-    msg = OFQueueGetConfigReply.new(
+    msg = OpenFlow::Protocol::QueueGetConfigReply.new(
       xid: 1,
       port: 2,
       queues: [
@@ -56,7 +54,7 @@ describe OFQueueGetConfigReply do
         { queue_id: 2 },
       ]
     )
-    expect(msg.version).to eq(OFMessage::OFP_VERSION)
+    expect(msg.version).to eq(OpenFlow::Protocol::Message::OFP_VERSION)
     expect(msg.type).to eq(:queue_get_config_reply)
     expect(msg.len).to eq(32)
     expect(msg.xid).to eq(1)

data/spec/messages/queue_get_config_request_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe OFQueueGetConfigRequest do
+describe OpenFlow::Protocol::QueueGetConfigRequest do
   let(:data) {
     [
       1, 20, 0, 12, 0, 0, 0, 1, # header
@@ -10,28 +8,28 @@ describe OFQueueGetConfigRequest do
   }
 
   it 'should read binary' do
-    msg = OFQueueGetConfigRequest.read(data)
-    expect(msg.version).to eq(OFMessage::OFP_VERSION)
+    msg = OpenFlow::Protocol::QueueGetConfigRequest.read(data)
+    expect(msg.version).to eq(OpenFlow::Protocol::Message::OFP_VERSION)
     expect(msg.type).to eq(:queue_get_config_request)
     expect(msg.len).to eq(12)
     expect(msg.xid).to eq(1)
     expect(msg.port).to eq(1)
   end
   it 'should be parsable' do
-    msg = OFParser.read(data)
-    expect(msg.class).to eq(OFQueueGetConfigRequest)
+    msg = OpenFlow::Protocol::Parser.read(data)
+    expect(msg.class).to eq(OpenFlow::Protocol::QueueGetConfigRequest)
   end
   it 'should initialize with default values' do
-    msg = OFQueueGetConfigRequest.new
-    expect(msg.version).to eq(OFMessage::OFP_VERSION)
+    msg = OpenFlow::Protocol::QueueGetConfigRequest.new
+    expect(msg.version).to eq(OpenFlow::Protocol::Message::OFP_VERSION)
     expect(msg.type).to eq(:queue_get_config_request)
     expect(msg.len).to eq(12)
     expect(msg.xid).to eq(0)
     expect(msg.port).to eq(0)
   end
   it 'should initialize with some values' do
-    msg = OFQueueGetConfigRequest.new(xid: 1, port: 2)
-    expect(msg.version).to eq(OFMessage::OFP_VERSION)
+    msg = OpenFlow::Protocol::QueueGetConfigRequest.new(xid: 1, port: 2)
+    expect(msg.version).to eq(OpenFlow::Protocol::Message::OFP_VERSION)
     expect(msg.type).to eq(:queue_get_config_request)
     expect(msg.len).to eq(12)
     expect(msg.xid).to eq(1)

data/spec/messages/set_config_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe OFSetConfig do
+describe OpenFlow::Protocol::SetConfig do
   let(:data) {
     [
       1, 9, 0, 12, 0, 0, 0, 1, # header
@@ -10,8 +8,8 @@ describe OFSetConfig do
   }
 
   it 'should read binary' do
-    msg = OFSetConfig.read(data)
-    expect(msg.version).to eq(OFMessage::OFP_VERSION)
+    msg = OpenFlow::Protocol::SetConfig.read(data)
+    expect(msg.version).to eq(OpenFlow::Protocol::Message::OFP_VERSION)
     expect(msg.type).to eq(:set_config)
     expect(msg.len).to eq(12)
     expect(msg.xid).to eq(1)
@@ -19,12 +17,12 @@ describe OFSetConfig do
     expect(msg.miss_send_length).to eq(0xff)
   end
   it 'should be parsable' do
-    msg = OFParser.read(data)
-    expect(msg.class).to eq(OFSetConfig)
+    msg = OpenFlow::Protocol::Parser.read(data)
+    expect(msg.class).to eq(OpenFlow::Protocol::SetConfig)
   end
   it 'should initialize with default values' do
-    msg = OFSetConfig.new
-    expect(msg.version).to eq(OFMessage::OFP_VERSION)
+    msg = OpenFlow::Protocol::SetConfig.new
+    expect(msg.version).to eq(OpenFlow::Protocol::Message::OFP_VERSION)
     expect(msg.type).to eq(:set_config)
     expect(msg.len).to eq(12)
     expect(msg.xid).to eq(0)
@@ -32,12 +30,12 @@ describe OFSetConfig do
     expect(msg.miss_send_length).to eq(0)
   end
   it 'should initialize with some values' do
-    msg = OFSetConfig.new(
+    msg = OpenFlow::Protocol::SetConfig.new(
       xid: 1,
       flags: :fragments_normal,
       miss_send_length: 0xff
     )
-    expect(msg.version).to eq(OFMessage::OFP_VERSION)
+    expect(msg.version).to eq(OpenFlow::Protocol::Message::OFP_VERSION)
     expect(msg.type).to eq(:set_config)
     expect(msg.len).to eq(12)
     expect(msg.xid).to eq(1)