openflow-protocol 0.1.8 → 0.1.9

data/spec/messages/get_config_request_spec.rb

@@ -1,27 +1,27 @@
-describe OpenFlow::Protocol::GetConfigRequest do
+describe GetConfigRequest do
   let(:data) { [1, 7, 0, 8, 0, 0, 0, 1].pack('C*') }
 
   it 'should read binary' do
-    msg = OpenFlow::Protocol::GetConfigRequest.read(data)
-    expect(msg.version).to eq(OpenFlow::Protocol::Message::OFP_VERSION)
+    msg = GetConfigRequest.read(data)
+    expect(msg.version).to eq(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 = OpenFlow::Protocol::Parser.read(data)
-    expect(msg.class).to eq(OpenFlow::Protocol::GetConfigRequest)
+    msg = Parser.read(data)
+    expect(msg.class).to eq(GetConfigRequest)
   end
   it 'should initialize with default values' do
-    msg = OpenFlow::Protocol::GetConfigRequest.new
-    expect(msg.version).to eq(OpenFlow::Protocol::Message::OFP_VERSION)
+    msg = GetConfigRequest.new
+    expect(msg.version).to eq(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 = OpenFlow::Protocol::GetConfigRequest.new(xid: 1)
-    expect(msg.version).to eq(OpenFlow::Protocol::Message::OFP_VERSION)
+    msg = GetConfigRequest.new(xid: 1)
+    expect(msg.version).to eq(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,27 +1,27 @@
-describe OpenFlow::Protocol::Hello do
+describe Hello do
   let(:data) { [1, 0, 0, 8, 0, 0, 0, 1].pack('C*') }
 
   it 'should read binary' do
-    msg = OpenFlow::Protocol::Hello.read(data)
-    expect(msg.version).to eq(OpenFlow::Protocol::Message::OFP_VERSION)
+    msg = Hello.read(data)
+    expect(msg.version).to eq(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 = OpenFlow::Protocol::Parser.read(data)
-    expect(msg.class).to eq(OpenFlow::Protocol::Hello)
+    msg = Parser.read(data)
+    expect(msg.class).to eq(Hello)
   end
   it 'should initialize with default values' do
-    msg = OpenFlow::Protocol::Hello.new
-    expect(msg.version).to eq(OpenFlow::Protocol::Message::OFP_VERSION)
+    msg = Hello.new
+    expect(msg.version).to eq(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 = OpenFlow::Protocol::Hello.new(xid: 1)
-    expect(msg.version).to eq(OpenFlow::Protocol::Message::OFP_VERSION)
+    msg = Hello.new(xid: 1)
+    expect(msg.version).to eq(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,4 +1,4 @@
-describe OpenFlow::Protocol::PacketIn do
+describe PacketIn do
   let(:data) {
     [
       1, 10, 0, 64, 0, 0, 0, 1, # header
@@ -32,8 +32,8 @@ describe OpenFlow::Protocol::PacketIn do
   }
 
   it 'should read binary' do
-    msg = OpenFlow::Protocol::PacketIn.read(data)
-    expect(msg.version).to eq(OpenFlow::Protocol::Message::OFP_VERSION)
+    msg = PacketIn.read(data)
+    expect(msg.version).to eq(Message::OFP_VERSION)
     expect(msg.type).to eq(:packet_in)
     expect(msg.len).to eq(64)
     expect(msg.xid).to eq(1)
@@ -46,12 +46,12 @@ describe OpenFlow::Protocol::PacketIn do
     expect(msg.parsed_data.mac_destination).to eq('00:00:00:00:00:02')
   end
   it 'should be parsable' do
-    msg = OpenFlow::Protocol::Parser.read(data)
-    expect(msg.class).to eq(OpenFlow::Protocol::PacketIn)
+    msg = Parser.read(data)
+    expect(msg.class).to eq(PacketIn)
   end
   it 'should initialize with default values' do
-    msg = OpenFlow::Protocol::PacketIn.new
-    expect(msg.version).to eq(OpenFlow::Protocol::Message::OFP_VERSION)
+    msg = PacketIn.new
+    expect(msg.version).to eq(Message::OFP_VERSION)
     expect(msg.type).to eq(:packet_in)
     expect(msg.len).to eq(18)
     expect(msg.xid).to eq(0)
@@ -62,14 +62,14 @@ describe OpenFlow::Protocol::PacketIn do
     expect(msg.data).to be_empty
   end
   it 'should initialize with some values' do
-    msg = OpenFlow::Protocol::PacketIn.new(
+    msg = PacketIn.new(
       xid: 1,
       buffer_id: 1,
       in_port: 1,
       reason: :no_match,
       data: [1, 2].pack('C*')
     )
-    expect(msg.version).to eq(OpenFlow::Protocol::Message::OFP_VERSION)
+    expect(msg.version).to eq(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,4 +1,4 @@
-describe OpenFlow::Protocol::PacketOut do
+describe PacketOut do
   let(:data) {
     [
       1, 13, 0, 26, 0, 0, 0, 1, # header
@@ -16,8 +16,8 @@ describe OpenFlow::Protocol::PacketOut do
   }
 
   it 'should read binary' do
-    msg = OpenFlow::Protocol::PacketOut.read(data)
-    expect(msg.version).to eq(OpenFlow::Protocol::Message::OFP_VERSION)
+    msg = PacketOut.read(data)
+    expect(msg.version).to eq(Message::OFP_VERSION)
     expect(msg.type).to eq(:packet_out)
     expect(msg.len).to eq(26)
     expect(msg.xid).to eq(1)
@@ -28,12 +28,12 @@ describe OpenFlow::Protocol::PacketOut do
     expect(msg.data.length).to eq(2)
   end
   it 'should be parsable' do
-    msg = OpenFlow::Protocol::Parser.read(data)
-    expect(msg.class).to eq(OpenFlow::Protocol::PacketOut)
+    msg = Parser.read(data)
+    expect(msg.class).to eq(PacketOut)
   end
   it 'should initialize with default values' do
-    msg = OpenFlow::Protocol::PacketOut.new
-    expect(msg.version).to eq(OpenFlow::Protocol::Message::OFP_VERSION)
+    msg = PacketOut.new
+    expect(msg.version).to eq(Message::OFP_VERSION)
     expect(msg.type).to eq(:packet_out)
     expect(msg.len).to eq(16)
     expect(msg.xid).to eq(0)
@@ -43,13 +43,13 @@ describe OpenFlow::Protocol::PacketOut do
     expect(msg.data).to be_empty
   end
   it 'should initialize with some values' do
-    msg = OpenFlow::Protocol::PacketOut.new(
+    msg = PacketOut.new(
       xid: 1,
       in_port: 1,
-      actions: [OpenFlow::Protocol::ActionOutput.new(port: 1)],
+      actions: [ActionOutput.new(port: 1)],
       data: [1, 2].pack('C*')
     )
-    expect(msg.version).to eq(OpenFlow::Protocol::Message::OFP_VERSION)
+    expect(msg.version).to eq(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,4 +1,4 @@
-describe OpenFlow::Protocol::Parser do
+describe Parser do
   let(:hello_msg) { [1, 0, 0, 8, 0, 0, 0, 1].pack('C*') }
   let(:packet_out_msg) {
     [
@@ -17,18 +17,18 @@ describe OpenFlow::Protocol::Parser do
   }
 
   it 'should read binary Hello Message' do
-    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)
+    msg = Parser.read(hello_msg)
+    expect(msg.class).to be(Hello)
+    expect(msg.version).to eq(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 = 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)
+    msg = Parser.read(packet_out_msg)
+    expect(msg.class).to be(PacketOut)
+    expect(msg.version).to eq(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,4 +1,4 @@
-describe OpenFlow::Protocol::PortMod do
+describe PortMod do
   let(:data) {
     [
       1, 15, 0, 32, 0, 0, 0, 1, # header
@@ -12,8 +12,8 @@ describe OpenFlow::Protocol::PortMod do
   }
 
   it 'should read binary' do
-    msg = OpenFlow::Protocol::PortMod.read(data)
-    expect(msg.version).to eq(OpenFlow::Protocol::Message::OFP_VERSION)
+    msg = PortMod.read(data)
+    expect(msg.version).to eq(Message::OFP_VERSION)
     expect(msg.type).to eq(:port_mod)
     expect(msg.len).to eq(32)
     expect(msg.xid).to eq(1)
@@ -27,12 +27,12 @@ describe OpenFlow::Protocol::PortMod do
     ])
   end
   it 'should be parsable' do
-    msg = OpenFlow::Protocol::Parser.read(data)
-    expect(msg.class).to eq(OpenFlow::Protocol::PortMod)
+    msg = Parser.read(data)
+    expect(msg.class).to eq(PortMod)
   end
   it 'should initialize with default values' do
-    msg = OpenFlow::Protocol::PortMod.new
-    expect(msg.version).to eq(OpenFlow::Protocol::Message::OFP_VERSION)
+    msg = PortMod.new
+    expect(msg.version).to eq(Message::OFP_VERSION)
     expect(msg.type).to eq(:port_mod)
     expect(msg.len).to eq(32)
     expect(msg.xid).to eq(0)
@@ -43,7 +43,7 @@ describe OpenFlow::Protocol::PortMod do
     expect(msg.advertise).to be_empty
   end
   it 'should initialize with some values' do
-    msg = OpenFlow::Protocol::PortMod.new(
+    msg = PortMod.new(
       xid: 1,
       port_number: 1,
       hardware_address: '00:00:00:00:00:01',
@@ -54,7 +54,7 @@ describe OpenFlow::Protocol::PortMod do
         :port_10mb_full_duplex
       ]
     )
-    expect(msg.version).to eq(OpenFlow::Protocol::Message::OFP_VERSION)
+    expect(msg.version).to eq(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,4 +1,4 @@
-describe OpenFlow::Protocol::PortStatus do
+describe PortStatus do
   let(:data) {
     [
       1, 12, 0, 64, 0, 0, 0, 1, # header
@@ -21,8 +21,8 @@ describe OpenFlow::Protocol::PortStatus do
   }
 
   it 'should read binary' do
-    msg = OpenFlow::Protocol::PortStatus.read(data)
-    expect(msg.version).to eq(OpenFlow::Protocol::Message::OFP_VERSION)
+    msg = PortStatus.read(data)
+    expect(msg.version).to eq(Message::OFP_VERSION)
     expect(msg.type).to eq(:port_status)
     expect(msg.len).to eq(64)
     expect(msg.xid).to eq(1)
@@ -30,12 +30,12 @@ describe OpenFlow::Protocol::PortStatus do
     expect(msg.desc.port_number).to eq(1)
   end
   it 'should be parsable' do
-    msg = OpenFlow::Protocol::Parser.read(data)
-    expect(msg.class).to eq(OpenFlow::Protocol::PortStatus)
+    msg = Parser.read(data)
+    expect(msg.class).to eq(PortStatus)
   end
   it 'should initialize with default values' do
-    msg = OpenFlow::Protocol::PortStatus.new
-    expect(msg.version).to eq(OpenFlow::Protocol::Message::OFP_VERSION)
+    msg = PortStatus.new
+    expect(msg.version).to eq(Message::OFP_VERSION)
     expect(msg.type).to eq(:port_status)
     expect(msg.len).to eq(64)
     expect(msg.xid).to eq(0)
@@ -43,12 +43,12 @@ describe OpenFlow::Protocol::PortStatus do
     expect(msg.desc.port_number).to eq(0)
   end
   it 'should initialize with some values' do
-    msg = OpenFlow::Protocol::PortStatus.new(
+    msg = PortStatus.new(
       xid: 1,
       reason: :delete,
-      desc: OpenFlow::Protocol::PhysicalPort.new(port_number: 1)
+      desc: PhysicalPort.new(port_number: 1)
     )
-    expect(msg.version).to eq(OpenFlow::Protocol::Message::OFP_VERSION)
+    expect(msg.version).to eq(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,4 +1,4 @@
-describe OpenFlow::Protocol::QueueGetConfigReply do
+describe QueueGetConfigReply do
   let(:data) {
     [
       1, 21, 0, 48, 0, 0, 0, 1, # header
@@ -21,8 +21,8 @@ describe OpenFlow::Protocol::QueueGetConfigReply do
   }
 
   it 'should read binary' do
-    msg = OpenFlow::Protocol::QueueGetConfigReply.read(data)
-    expect(msg.version).to eq(OpenFlow::Protocol::Message::OFP_VERSION)
+    msg = QueueGetConfigReply.read(data)
+    expect(msg.version).to eq(Message::OFP_VERSION)
     expect(msg.type).to eq(:queue_get_config_reply)
     expect(msg.len).to eq(48)
     expect(msg.xid).to eq(1)
@@ -33,12 +33,12 @@ describe OpenFlow::Protocol::QueueGetConfigReply do
     expect(msg.queues.last.queue_id).to eq(2)
   end
   it 'should be parsable' do
-    msg = OpenFlow::Protocol::Parser.read(data)
-    expect(msg.class).to eq(OpenFlow::Protocol::QueueGetConfigReply)
+    msg = Parser.read(data)
+    expect(msg.class).to eq(QueueGetConfigReply)
   end
   it 'should initialize with default values' do
-    msg = OpenFlow::Protocol::QueueGetConfigReply.new
-    expect(msg.version).to eq(OpenFlow::Protocol::Message::OFP_VERSION)
+    msg = QueueGetConfigReply.new
+    expect(msg.version).to eq(Message::OFP_VERSION)
     expect(msg.type).to eq(:queue_get_config_reply)
     expect(msg.len).to eq(16)
     expect(msg.xid).to eq(0)
@@ -46,7 +46,7 @@ describe OpenFlow::Protocol::QueueGetConfigReply do
     expect(msg.queues).to be_empty
   end
   it 'should initialize with some values' do
-    msg = OpenFlow::Protocol::QueueGetConfigReply.new(
+    msg = QueueGetConfigReply.new(
       xid: 1,
       port: 2,
       queues: [
@@ -54,7 +54,7 @@ describe OpenFlow::Protocol::QueueGetConfigReply do
         { queue_id: 2 },
       ]
     )
-    expect(msg.version).to eq(OpenFlow::Protocol::Message::OFP_VERSION)
+    expect(msg.version).to eq(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,4 +1,4 @@
-describe OpenFlow::Protocol::QueueGetConfigRequest do
+describe QueueGetConfigRequest do
   let(:data) {
     [
       1, 20, 0, 12, 0, 0, 0, 1, # header
@@ -8,28 +8,28 @@ describe OpenFlow::Protocol::QueueGetConfigRequest do
   }
 
   it 'should read binary' do
-    msg = OpenFlow::Protocol::QueueGetConfigRequest.read(data)
-    expect(msg.version).to eq(OpenFlow::Protocol::Message::OFP_VERSION)
+    msg = QueueGetConfigRequest.read(data)
+    expect(msg.version).to eq(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 = OpenFlow::Protocol::Parser.read(data)
-    expect(msg.class).to eq(OpenFlow::Protocol::QueueGetConfigRequest)
+    msg = Parser.read(data)
+    expect(msg.class).to eq(QueueGetConfigRequest)
   end
   it 'should initialize with default values' do
-    msg = OpenFlow::Protocol::QueueGetConfigRequest.new
-    expect(msg.version).to eq(OpenFlow::Protocol::Message::OFP_VERSION)
+    msg = QueueGetConfigRequest.new
+    expect(msg.version).to eq(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 = OpenFlow::Protocol::QueueGetConfigRequest.new(xid: 1, port: 2)
-    expect(msg.version).to eq(OpenFlow::Protocol::Message::OFP_VERSION)
+    msg = QueueGetConfigRequest.new(xid: 1, port: 2)
+    expect(msg.version).to eq(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,4 +1,4 @@
-describe OpenFlow::Protocol::SetConfig do
+describe SetConfig do
   let(:data) {
     [
       1, 9, 0, 12, 0, 0, 0, 1, # header
@@ -8,8 +8,8 @@ describe OpenFlow::Protocol::SetConfig do
   }
 
   it 'should read binary' do
-    msg = OpenFlow::Protocol::SetConfig.read(data)
-    expect(msg.version).to eq(OpenFlow::Protocol::Message::OFP_VERSION)
+    msg = SetConfig.read(data)
+    expect(msg.version).to eq(Message::OFP_VERSION)
     expect(msg.type).to eq(:set_config)
     expect(msg.len).to eq(12)
     expect(msg.xid).to eq(1)
@@ -17,12 +17,12 @@ describe OpenFlow::Protocol::SetConfig do
     expect(msg.miss_send_length).to eq(0xff)
   end
   it 'should be parsable' do
-    msg = OpenFlow::Protocol::Parser.read(data)
-    expect(msg.class).to eq(OpenFlow::Protocol::SetConfig)
+    msg = Parser.read(data)
+    expect(msg.class).to eq(SetConfig)
   end
   it 'should initialize with default values' do
-    msg = OpenFlow::Protocol::SetConfig.new
-    expect(msg.version).to eq(OpenFlow::Protocol::Message::OFP_VERSION)
+    msg = SetConfig.new
+    expect(msg.version).to eq(Message::OFP_VERSION)
     expect(msg.type).to eq(:set_config)
     expect(msg.len).to eq(12)
     expect(msg.xid).to eq(0)
@@ -30,12 +30,12 @@ describe OpenFlow::Protocol::SetConfig do
     expect(msg.miss_send_length).to eq(0)
   end
   it 'should initialize with some values' do
-    msg = OpenFlow::Protocol::SetConfig.new(
+    msg = SetConfig.new(
       xid: 1,
       flags: :fragments_normal,
       miss_send_length: 0xff
     )
-    expect(msg.version).to eq(OpenFlow::Protocol::Message::OFP_VERSION)
+    expect(msg.version).to eq(Message::OFP_VERSION)
     expect(msg.type).to eq(:set_config)
     expect(msg.len).to eq(12)
     expect(msg.xid).to eq(1)

data/spec/messages/statistics/aggregate_statistics_reply_spec.rb

@@ -1,6 +1,6 @@
-describe OpenFlow::Protocol::AggregateStatisticsReply do
+describe AggregateStatisticsReply do
   it 'should read binary' do
-    stats = OpenFlow::Protocol::AggregateStatisticsReply.read [
+    stats = AggregateStatisticsReply.read [
       0, 0, 0, 0, 0, 0, 0, 10, # packet_count
       0, 0, 0, 0, 0, 0, 0, 80, # byte_count
       0, 0, 0, 4,              # flow_count
@@ -11,13 +11,13 @@ describe OpenFlow::Protocol::AggregateStatisticsReply do
     expect(stats.flow_count).to eq(4)
   end
   it 'should initialize with default values' do
-    stats = OpenFlow::Protocol::AggregateStatisticsReply.new
+    stats = AggregateStatisticsReply.new
     expect(stats.packet_count).to eq(0)
     expect(stats.byte_count).to eq(0)
     expect(stats.flow_count).to eq(0)
   end
   it 'should initialize with some values' do
-    stats = OpenFlow::Protocol::AggregateStatisticsReply.new(
+    stats = AggregateStatisticsReply.new(
       packet_count: 10,
       byte_count: 80,
       flow_count: 4