openflow-protocol 0.1.7 → 0.1.8

data/spec/messages/statistics/aggregate_statistics_reply_spec.rb

@@ -1,8 +1,6 @@
-require 'spec_helper'
-
-describe OFAggregateStatisticsReply do
+describe OpenFlow::Protocol::AggregateStatisticsReply do
   it 'should read binary' do
-    stats = OFAggregateStatisticsReply.read [
+    stats = OpenFlow::Protocol::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
@@ -13,13 +11,13 @@ describe OFAggregateStatisticsReply do
     expect(stats.flow_count).to eq(4)
   end
   it 'should initialize with default values' do
-    stats = OFAggregateStatisticsReply.new
+    stats = OpenFlow::Protocol::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 = OFAggregateStatisticsReply.new(
+    stats = OpenFlow::Protocol::AggregateStatisticsReply.new(
       packet_count: 10,
       byte_count: 80,
       flow_count: 4

data/spec/messages/statistics/aggregate_statistics_request_spec.rb

@@ -1,8 +1,6 @@
-require 'spec_helper'
-
-describe OFAggregateStatisticsRequest do
+describe OpenFlow::Protocol::AggregateStatisticsRequest do
   it 'should read binary' do
-    stats = OFAggregateStatisticsRequest.read [
+    stats = OpenFlow::Protocol::AggregateStatisticsRequest.read [
       # match
       0, 0x30, 0x20, 0x4f, # wildcards
       0, 0,                # in_port
@@ -29,13 +27,13 @@ describe OFAggregateStatisticsRequest do
     expect(stats.out_port).to eq(1)
   end
   it 'should initialize with default values' do
-    stats = OFAggregateStatisticsRequest.new
+    stats = OpenFlow::Protocol::AggregateStatisticsRequest.new
     expect(stats.match.ip_destination).to eq('0.0.0.0')
     expect(stats.table_id).to eq(:all)
     expect(stats.out_port).to eq(:none)
   end
   it 'should initialize with some values' do
-    stats = OFAggregateStatisticsRequest.new(
+    stats = OpenFlow::Protocol::AggregateStatisticsRequest.new(
       table_id: 1,
       out_port: 1
     )

data/spec/messages/statistics/description_statistics_spec.rb

@@ -1,12 +1,14 @@
-require 'spec_helper'
+describe OpenFlow::Protocol::DescriptionStatistics do
+  let(:desc) {
+    'Manufacturer description'.pad(256) +
+    'Hardware description'.pad(256) +
+    'Software description'.pad(256) +
+    '123456789'.pad(32) +
+    'Datapath description'.pad(256)
+  }
 
-describe OFDescriptionStatistics do
   it 'should read binary' do
-    stats = OFDescriptionStatistics.read 'Manufacturer description'.pad(256) +
-                                         'Hardware description'.pad(256) +
-                                         'Software description'.pad(256) +
-                                         '123456789'.pad(32) +
-                                         'Datapath description'.pad(256)
+    stats = OpenFlow::Protocol::DescriptionStatistics.read(desc)
     expect(stats.manufacturer_description).to eq('Manufacturer description')
     expect(stats.hardware_description).to eq('Hardware description')
     expect(stats.software_description).to eq('Software description')
@@ -14,7 +16,7 @@ describe OFDescriptionStatistics do
     expect(stats.datapath_description).to eq('Datapath description')
   end
   it 'should initialize with default values' do
-    stats = OFDescriptionStatistics.new
+    stats = OpenFlow::Protocol::DescriptionStatistics.new
     expect(stats.manufacturer_description).to eq('')
     expect(stats.hardware_description).to eq('')
     expect(stats.software_description).to eq('')
@@ -22,7 +24,7 @@ describe OFDescriptionStatistics do
     expect(stats.datapath_description).to eq('')
   end
   it 'should initialize with some values' do
-    stats = OFDescriptionStatistics.new(
+    stats = OpenFlow::Protocol::DescriptionStatistics.new(
       manufacturer_description: 'Manufacturer description',
       hardware_description: 'Hardware description',
       software_description: 'Software description',

data/spec/messages/statistics/flow_statistics_reply_spec.rb

@@ -1,8 +1,6 @@
-require 'spec_helper'
-
-describe OFFlowStatisticsReply do
+describe OpenFlow::Protocol::FlowStatisticsReply do
   it 'should read binary' do
-    stats = OFFlowStatisticsReply.read [
+    stats = OpenFlow::Protocol::FlowStatisticsReply.read [
       0, 96, # len
       1,     # table_id
       0,     # padding
@@ -53,7 +51,7 @@ describe OFFlowStatisticsReply do
     expect(stats.actions.length).to eq(1)
   end
   it 'should initialize with default values' do
-    stats = OFFlowStatisticsReply.new
+    stats = OpenFlow::Protocol::FlowStatisticsReply.new
     expect(stats.len).to eq(88)
     expect(stats.table_id).to eq(:all)
     expect(stats.match.ip_destination).to eq('0.0.0.0')
@@ -67,7 +65,7 @@ describe OFFlowStatisticsReply do
     expect(stats.actions).to be_empty
   end
   it 'should initialize with some values' do
-    stats = OFFlowStatisticsReply.new(
+    stats = OpenFlow::Protocol::FlowStatisticsReply.new(
     )
 
   end

data/spec/messages/statistics/flow_statistics_request_spec.rb

@@ -1,8 +1,6 @@
-require 'spec_helper'
-
-describe OFFlowStatisticsRequest do
+describe OpenFlow::Protocol::FlowStatisticsRequest do
   it 'should read binary' do
-    stats = OFFlowStatisticsRequest.read [
+    stats = OpenFlow::Protocol::FlowStatisticsRequest.read [
       # match
       0, 0x30, 0x20, 0x4f, # wildcards
       0, 0,                # in_port
@@ -29,13 +27,13 @@ describe OFFlowStatisticsRequest do
     expect(stats.out_port).to eq(1)
   end
   it 'should initialize with default values' do
-    stats = OFFlowStatisticsRequest.new
+    stats = OpenFlow::Protocol::FlowStatisticsRequest.new
     expect(stats.match.ip_destination).to eq('0.0.0.0')
     expect(stats.table_id).to eq(:all)
     expect(stats.out_port).to eq(:none)
   end
   it 'should initialize with some values' do
-    stats = OFFlowStatisticsRequest.new(
+    stats = OpenFlow::Protocol::FlowStatisticsRequest.new(
       table_id: 1,
       out_port: 1
     )

data/spec/messages/statistics/port_statistics_reply_spec.rb

@@ -1,8 +1,6 @@
-require 'spec_helper'
-
-describe OFPortStatisticsReply do
+describe OpenFlow::Protocol::PortStatisticsReply do
   it 'should read binary' do
-    stats = OFPortStatisticsReply.read [
+    stats = OpenFlow::Protocol::PortStatisticsReply.read [
       0, 1,                    # port_number
       0, 0, 0, 0, 0, 0,        # padding
       0, 0, 0, 0, 0, 0, 0, 10, # receive_packets
@@ -33,7 +31,7 @@ describe OFPortStatisticsReply do
     expect(stats.collisions).to eq(3)
   end
   it 'should initialize with default values' do
-    stats = OFPortStatisticsReply.new
+    stats = OpenFlow::Protocol::PortStatisticsReply.new
     expect(stats.port_number).to eq(0)
     expect(stats.receive_packets).to eq(0)
     expect(stats.transmit_packets).to eq(0)
@@ -49,7 +47,7 @@ describe OFPortStatisticsReply do
     expect(stats.collisions).to eq(0)
   end
   it 'should initialize with some values' do
-    stats = OFPortStatisticsReply.new(
+    stats = OpenFlow::Protocol::PortStatisticsReply.new(
       port_number: 1,
       receive_packets: 10,
       transmit_packets: 10,

data/spec/messages/statistics/port_statistics_request_spec.rb

@@ -1,19 +1,17 @@
-require 'spec_helper'
-
-describe OFPortStatisticsRequest do
+describe OpenFlow::Protocol::PortStatisticsRequest do
   it 'should read binary' do
-    stats = OFPortStatisticsRequest.read [
+    stats = OpenFlow::Protocol::PortStatisticsRequest.read [
       0, 1,            # port_number
       0, 0, 0, 0, 0, 0 # padding
     ].pack('C*')
     expect(stats.port_number).to eq(1)
   end
   it 'should initialize with default values' do
-    stats = OFPortStatisticsRequest.new
+    stats = OpenFlow::Protocol::PortStatisticsRequest.new
     expect(stats.port_number).to eq(:none)
   end
   it 'should initialize with some values' do
-    stats = OFPortStatisticsRequest.new(port_number: 1)
+    stats = OpenFlow::Protocol::PortStatisticsRequest.new(port_number: 1)
     expect(stats.port_number).to eq(1)
   end
 end

data/spec/messages/statistics/queue_statistics_reply_spec.rb

@@ -1,8 +1,6 @@
-require 'spec_helper'
-
-describe OFQueueStatisticsReply do
+describe OpenFlow::Protocol::QueueStatisticsReply do
   it 'should read binary' do
-    stats = OFQueueStatisticsReply.read [
+    stats = OpenFlow::Protocol::QueueStatisticsReply.read [
       0, 1,                    # port_number
       0, 0,                    # padding
       0, 0, 0, 1,              # queue_id
@@ -17,7 +15,7 @@ describe OFQueueStatisticsReply do
     expect(stats.transmit_errors).to eq(2)
   end
   it 'should initialize with default values' do
-    stats = OFQueueStatisticsReply.new
+    stats = OpenFlow::Protocol::QueueStatisticsReply.new
     expect(stats.port_number).to eq(0)
     # expect(stats.queue_id).to eq(:all)
     # TODO: QUEUE_IDS somewhere!
@@ -26,7 +24,7 @@ describe OFQueueStatisticsReply do
     expect(stats.transmit_errors).to eq(0)
   end
   it 'should initialize with some values' do
-    stats = OFQueueStatisticsReply.new(
+    stats = OpenFlow::Protocol::QueueStatisticsReply.new(
       port_number: 1,
       queue_id: 1,
       transmit_bytes: 80,

data/spec/messages/statistics/queue_statistics_request_spec.rb

@@ -1,8 +1,6 @@
-require 'spec_helper'
-
-describe OFQueueStatisticsRequest do
+describe OpenFlow::Protocol::QueueStatisticsRequest do
   it 'should read binary' do
-    stats = OFQueueStatisticsRequest.read [
+    stats = OpenFlow::Protocol::QueueStatisticsRequest.read [
       0, 1,      # port_number
       0, 0,      # padding
       0, 0, 0, 1 # queue_id
@@ -11,12 +9,12 @@ describe OFQueueStatisticsRequest do
     expect(stats.queue_id).to eq(1)
   end
   it 'should initialize with default values' do
-    stats = OFQueueStatisticsRequest.new
+    stats = OpenFlow::Protocol::QueueStatisticsRequest.new
     expect(stats.port_number).to eq(:all)
     expect(stats.queue_id).to eq(:all)
   end
   it 'should initialize with some values' do
-    stats = OFQueueStatisticsRequest.new(
+    stats = OpenFlow::Protocol::QueueStatisticsRequest.new(
       port_number: 1,
       queue_id: 1
     )

data/spec/messages/statistics/table_statistics_spec.rb

@@ -1,8 +1,6 @@
-require 'spec_helper'
-
-describe OFTableStatistics do
+describe OpenFlow::Protocol::TableStatistics do
   it 'should read binary' do
-    stats = OFTableStatistics.read [
+    stats = OpenFlow::Protocol::TableStatistics.read [
       1,                                # table_id
       0, 0, 0,                          # padding
       116, 97, 98, 108, 101, 45, 49, 0, # name
@@ -24,7 +22,7 @@ describe OFTableStatistics do
     expect(stats.matched_count).to eq(1)
   end
   it 'should initialize with default values' do
-    stats = OFTableStatistics.new
+    stats = OpenFlow::Protocol::TableStatistics.new
     expect(stats.table_id).to eq(0)
     expect(stats.name).to eq('')
     expect(stats.wildcards).to be_empty
@@ -34,7 +32,7 @@ describe OFTableStatistics do
     expect(stats.matched_count).to eq(0)
   end
   it 'should initialize with some values' do
-    stats = OFTableStatistics.new(
+    stats = OpenFlow::Protocol::TableStatistics.new(
       table_id: 1,
       name: 'table-1',
       wildcards: [:in_port, :ip_source_all, :ip_destination_all],

data/spec/messages/statistics/vendor_statistics_spec.rb

@@ -1,8 +1,6 @@
-require 'spec_helper'
-
-describe OFVendorStatistics do
+describe OpenFlow::Protocol::VendorStatistics do
   it 'should read binary' do
-    stats = OFVendorStatistics.read [
+    stats = OpenFlow::Protocol::VendorStatistics.read [
       0, 0, 0, 1, # vendor
       1, 2, 3, 4  # body
     ].pack('C*')
@@ -10,12 +8,12 @@ describe OFVendorStatistics do
     expect(stats.body).to eq([1, 2, 3, 4].pack('C*'))
   end
   it 'should initialize with default values' do
-    stats = OFVendorStatistics.new
+    stats = OpenFlow::Protocol::VendorStatistics.new
     expect(stats.vendor).to eq(0)
     expect(stats.body).to be_empty
   end
   it 'should initialize with some values' do
-    stats = OFVendorStatistics.new(
+    stats = OpenFlow::Protocol::VendorStatistics.new(
       vendor: 1,
       body: [1, 2, 3, 4].pack('C*')
     )

data/spec/messages/statistics_reply_spec.rb

@@ -1,11 +1,9 @@
-require 'spec_helper'
-
-describe OFStatisticsReply do
+describe OpenFlow::Protocol::StatisticsReply do
   context 'with description' do
     let(:desc) {
       'Manufacturer description'.pad(256) +
       'Hardware description'.pad(256) +
-      'Software description'.pad(256) +
+      'SOpenFlow::Protocol::tware description'.pad(256) +
       '123456789'.pad(32) +
       'Datapath description'.pad(256)
     }
@@ -18,8 +16,8 @@ describe OFStatisticsReply do
     }
 
     it 'should read binary' do
-      msg = OFStatisticsReply.read(data)
-      expect(msg.version).to eq(OFMessage::OFP_VERSION)
+      msg = OpenFlow::Protocol::StatisticsReply.read(data)
+      expect(msg.version).to eq(OpenFlow::Protocol::Message::OFP_VERSION)
       expect(msg.type).to eq(:statistics_reply)
       expect(msg.len).to eq(1068)
       expect(msg.xid).to eq(1)
@@ -28,12 +26,12 @@ describe OFStatisticsReply do
       expect(msg.statistics.serial_number).to eq('123456789')
     end
     it 'should be parsable' do
-      msg = OFParser.read(data)
-      expect(msg.class).to eq(OFStatisticsReply)
+      msg = OpenFlow::Protocol::Parser.read(data)
+      expect(msg.class).to eq(OpenFlow::Protocol::StatisticsReply)
     end
     it 'should initialize with default values' do
-      msg = OFStatisticsReply.new
-      expect(msg.version).to eq(OFMessage::OFP_VERSION)
+      msg = OpenFlow::Protocol::StatisticsReply.new
+      expect(msg.version).to eq(OpenFlow::Protocol::Message::OFP_VERSION)
       expect(msg.type).to eq(:statistics_reply)
       expect(msg.len).to eq(1068)
       expect(msg.xid).to eq(0)
@@ -42,7 +40,7 @@ describe OFStatisticsReply do
       expect(msg.statistics.serial_number).to eq('')
     end
     it 'should initialize with some values' do
-      msg = OFStatisticsReply.new(
+      msg = OpenFlow::Protocol::StatisticsReply.new(
         xid: 1,
         statistic_type: :description,
         flags: [:reply_more],
@@ -50,7 +48,7 @@ describe OFStatisticsReply do
           serial_number: '123456789'
         }
       )
-      expect(msg.version).to eq(OFMessage::OFP_VERSION)
+      expect(msg.version).to eq(OpenFlow::Protocol::Message::OFP_VERSION)
       expect(msg.type).to eq(:statistics_reply)
       expect(msg.len).to eq(1068)
       expect(msg.xid).to eq(1)
@@ -108,8 +106,8 @@ describe OFStatisticsReply do
     }
 
     it 'should read binary' do
-      msg = OFStatisticsReply.read(data)
-      expect(msg.version).to eq(OFMessage::OFP_VERSION)
+      msg = OpenFlow::Protocol::StatisticsReply.read(data)
+      expect(msg.version).to eq(OpenFlow::Protocol::Message::OFP_VERSION)
       expect(msg.type).to eq(:statistics_reply)
       expect(msg.len).to eq(108)
       expect(msg.xid).to eq(1)
@@ -119,12 +117,12 @@ describe OFStatisticsReply do
       expect(msg.statistics.actions.length).to eq(1)
     end
     it 'should be parsable' do
-      msg = OFParser.read(data)
-      expect(msg.class).to eq(OFStatisticsReply)
+      msg = OpenFlow::Protocol::Parser.read(data)
+      expect(msg.class).to eq(OpenFlow::Protocol::StatisticsReply)
     end
     it 'should initialize with default values' do
-      msg = OFStatisticsReply.new(statistic_type: :flow)
-      expect(msg.version).to eq(OFMessage::OFP_VERSION)
+      msg = OpenFlow::Protocol::StatisticsReply.new(statistic_type: :flow)
+      expect(msg.version).to eq(OpenFlow::Protocol::Message::OFP_VERSION)
       expect(msg.type).to eq(:statistics_reply)
       expect(msg.len).to eq(100)
       expect(msg.xid).to eq(0)
@@ -134,16 +132,16 @@ describe OFStatisticsReply do
       expect(msg.statistics.actions).to be_empty
     end
     it 'should initialize with some values' do
-      msg = OFStatisticsReply.new(
+      msg = OpenFlow::Protocol::StatisticsReply.new(
         xid: 1,
         statistic_type: :flow,
         flags: [:reply_more],
         statistics: {
           table_id: 1,
-          actions: [OFActionOutput.new(port: 1)]
+          actions: [OpenFlow::Protocol::ActionOutput.new(port: 1)]
         }
       )
-      expect(msg.version).to eq(OFMessage::OFP_VERSION)
+      expect(msg.version).to eq(OpenFlow::Protocol::Message::OFP_VERSION)
       expect(msg.type).to eq(:statistics_reply)
       expect(msg.len).to eq(108)
       expect(msg.xid).to eq(1)
@@ -170,8 +168,8 @@ describe OFStatisticsReply do
     }
 
     it 'should read binary' do
-      msg = OFStatisticsReply.read(data)
-      expect(msg.version).to eq(OFMessage::OFP_VERSION)
+      msg = OpenFlow::Protocol::StatisticsReply.read(data)
+      expect(msg.version).to eq(OpenFlow::Protocol::Message::OFP_VERSION)
       expect(msg.type).to eq(:statistics_reply)
       expect(msg.len).to eq(36)
       expect(msg.xid).to eq(1)
@@ -180,8 +178,8 @@ describe OFStatisticsReply do
       expect(msg.statistics.packet_count).to eq(10)
     end
     it 'should initialize with default values' do
-      msg = OFStatisticsReply.new(statistic_type: :aggregate)
-      expect(msg.version).to eq(OFMessage::OFP_VERSION)
+      msg = OpenFlow::Protocol::StatisticsReply.new(statistic_type: :aggregate)
+      expect(msg.version).to eq(OpenFlow::Protocol::Message::OFP_VERSION)
       expect(msg.type).to eq(:statistics_reply)
       expect(msg.len).to eq(36)
       expect(msg.xid).to eq(0)
@@ -190,11 +188,11 @@ describe OFStatisticsReply do
       expect(msg.statistics.packet_count).to eq(0)
     end
     it 'should be parsable' do
-      msg = OFParser.read(data)
-      expect(msg.class).to eq(OFStatisticsReply)
+      msg = OpenFlow::Protocol::Parser.read(data)
+      expect(msg.class).to eq(OpenFlow::Protocol::StatisticsReply)
     end
     it 'should initialize with some values' do
-      msg = OFStatisticsReply.new(
+      msg = OpenFlow::Protocol::StatisticsReply.new(
         xid: 1,
         statistic_type: :aggregate,
         flags: [:reply_more],
@@ -204,7 +202,7 @@ describe OFStatisticsReply do
           flow_count: 4
         }
       )
-      expect(msg.version).to eq(OFMessage::OFP_VERSION)
+      expect(msg.version).to eq(OpenFlow::Protocol::Message::OFP_VERSION)
       expect(msg.type).to eq(:statistics_reply)
       expect(msg.len).to eq(36)
       expect(msg.xid).to eq(1)
@@ -221,7 +219,7 @@ describe OFStatisticsReply do
         0, 3,                     # statistic_type
         0, 1,                     # flags
 
-        # array of table_statistics
+        # array OpenFlow::Protocol:: table_statistics
         1,                                # table_id
         0, 0, 0,                          # padding
         116, 97, 98, 108, 101, 45, 49, 0, # name
@@ -237,8 +235,8 @@ describe OFStatisticsReply do
     }
 
     it 'should read binary' do
-      msg = OFStatisticsReply.read(data)
-      expect(msg.version).to eq(OFMessage::OFP_VERSION)
+      msg = OpenFlow::Protocol::StatisticsReply.read(data)
+      expect(msg.version).to eq(OpenFlow::Protocol::Message::OFP_VERSION)
       expect(msg.type).to eq(:statistics_reply)
       expect(msg.len).to eq(76)
       expect(msg.xid).to eq(1)
@@ -248,12 +246,12 @@ describe OFStatisticsReply do
       expect(msg.statistics.first.table_id).to eq(1)
     end
     it 'should be parsable' do
-      msg = OFParser.read(data)
-      expect(msg.class).to eq(OFStatisticsReply)
+      msg = OpenFlow::Protocol::Parser.read(data)
+      expect(msg.class).to eq(OpenFlow::Protocol::StatisticsReply)
     end
     it 'should initialize with default values' do
-      msg = OFStatisticsReply.new(statistic_type: :table)
-      expect(msg.version).to eq(OFMessage::OFP_VERSION)
+      msg = OpenFlow::Protocol::StatisticsReply.new(statistic_type: :table)
+      expect(msg.version).to eq(OpenFlow::Protocol::Message::OFP_VERSION)
       expect(msg.type).to eq(:statistics_reply)
       expect(msg.len).to eq(12)
       expect(msg.xid).to eq(0)
@@ -262,13 +260,13 @@ describe OFStatisticsReply do
       expect(msg.statistics).to be_empty
     end
     it 'should initialize with some values' do
-      msg = OFStatisticsReply.new(
+      msg = OpenFlow::Protocol::StatisticsReply.new(
         xid: 1,
         statistic_type: :table,
         flags: [:reply_more],
         statistics: [{table_id: 1}]
       )
-      expect(msg.version).to eq(OFMessage::OFP_VERSION)
+      expect(msg.version).to eq(OpenFlow::Protocol::Message::OFP_VERSION)
       expect(msg.type).to eq(:statistics_reply)
       expect(msg.len).to eq(76)
       expect(msg.xid).to eq(1)
@@ -286,7 +284,7 @@ describe OFStatisticsReply do
         0, 4,                      # statistic_type
         0, 1,                      # flags
 
-        # array of port_statistics_reply
+        # array OpenFlow::Protocol:: port_statistics_reply
         0, 1,                    # port_number
         0, 0, 0, 0, 0, 0,        # padding
         0, 0, 0, 0, 0, 0, 0, 10, # receive_packets
@@ -305,8 +303,8 @@ describe OFStatisticsReply do
     }
 
     it 'should read binary' do
-      msg = OFStatisticsReply.read(data)
-      expect(msg.version).to eq(OFMessage::OFP_VERSION)
+      msg = OpenFlow::Protocol::StatisticsReply.read(data)
+      expect(msg.version).to eq(OpenFlow::Protocol::Message::OFP_VERSION)
       expect(msg.type).to eq(:statistics_reply)
       expect(msg.len).to eq(116)
       expect(msg.xid).to eq(1)
@@ -316,12 +314,12 @@ describe OFStatisticsReply do
       expect(msg.statistics.first.port_number).to eq(1)
     end
     it 'should be parsable' do
-      msg = OFParser.read(data)
-      expect(msg.class).to eq(OFStatisticsReply)
+      msg = OpenFlow::Protocol::Parser.read(data)
+      expect(msg.class).to eq(OpenFlow::Protocol::StatisticsReply)
     end
     it 'should initialize with default values' do
-      msg = OFStatisticsReply.new(statistic_type: :port)
-      expect(msg.version).to eq(OFMessage::OFP_VERSION)
+      msg = OpenFlow::Protocol::StatisticsReply.new(statistic_type: :port)
+      expect(msg.version).to eq(OpenFlow::Protocol::Message::OFP_VERSION)
       expect(msg.type).to eq(:statistics_reply)
       expect(msg.len).to eq(12)
       expect(msg.xid).to eq(0)
@@ -330,13 +328,13 @@ describe OFStatisticsReply do
       expect(msg.statistics).to be_empty
     end
     it 'should initialize with some values' do
-      msg = OFStatisticsReply.new(
+      msg = OpenFlow::Protocol::StatisticsReply.new(
         xid: 1,
         statistic_type: :port,
         flags: [:reply_more],
         statistics: [{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(:statistics_reply)
       expect(msg.len).to eq(116)
       expect(msg.xid).to eq(1)
@@ -354,7 +352,7 @@ describe OFStatisticsReply do
         0, 5,                     # statistic_type
         0, 1,                     # flags
 
-        # array of queue_statistics_reply
+        # array OpenFlow::Protocol:: queue_statistics_reply
         0, 1,                    # port_number
         0, 0,                    # padding
         0, 0, 0, 1,              # queue_id
@@ -365,8 +363,8 @@ describe OFStatisticsReply do
     }
 
     it 'should read binary' do
-      msg = OFStatisticsReply.read(data)
-      expect(msg.version).to eq(OFMessage::OFP_VERSION)
+      msg = OpenFlow::Protocol::StatisticsReply.read(data)
+      expect(msg.version).to eq(OpenFlow::Protocol::Message::OFP_VERSION)
       expect(msg.type).to eq(:statistics_reply)
       expect(msg.len).to eq(44)
       expect(msg.xid).to eq(1)
@@ -376,12 +374,12 @@ describe OFStatisticsReply do
       expect(msg.statistics.first.port_number).to eq(1)
     end
     it 'should be parsable' do
-      msg = OFParser.read(data)
-      expect(msg.class).to eq(OFStatisticsReply)
+      msg = OpenFlow::Protocol::Parser.read(data)
+      expect(msg.class).to eq(OpenFlow::Protocol::StatisticsReply)
     end
     it 'should initialize with default values' do
-      msg = OFStatisticsReply.new(statistic_type: :queue)
-      expect(msg.version).to eq(OFMessage::OFP_VERSION)
+      msg = OpenFlow::Protocol::StatisticsReply.new(statistic_type: :queue)
+      expect(msg.version).to eq(OpenFlow::Protocol::Message::OFP_VERSION)
       expect(msg.type).to eq(:statistics_reply)
       expect(msg.len).to eq(12)
       expect(msg.xid).to eq(0)
@@ -390,13 +388,13 @@ describe OFStatisticsReply do
       expect(msg.statistics).to be_empty
     end
     it 'should initialize with some values' do
-      msg = OFStatisticsReply.new(
+      msg = OpenFlow::Protocol::StatisticsReply.new(
         xid: 1,
         statistic_type: :queue,
         flags: [:reply_more],
         statistics: [{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(:statistics_reply)
       expect(msg.len).to eq(44)
       expect(msg.xid).to eq(1)
@@ -421,8 +419,8 @@ describe OFStatisticsReply do
     }
 
     it 'should read binary' do
-      msg = OFStatisticsReply.read(data)
-      expect(msg.version).to eq(OFMessage::OFP_VERSION)
+      msg = OpenFlow::Protocol::StatisticsReply.read(data)
+      expect(msg.version).to eq(OpenFlow::Protocol::Message::OFP_VERSION)
       expect(msg.type).to eq(:statistics_reply)
       expect(msg.len).to eq(20)
       expect(msg.xid).to eq(1)
@@ -432,12 +430,12 @@ describe OFStatisticsReply do
       expect(msg.statistics.body).to eq([1, 2, 3, 4].pack('C*'))
     end
     it 'should be parsable' do
-      msg = OFParser.read(data)
-      expect(msg.class).to eq(OFStatisticsReply)
+      msg = OpenFlow::Protocol::Parser.read(data)
+      expect(msg.class).to eq(OpenFlow::Protocol::StatisticsReply)
     end
     it 'should initialize with default values' do
-      msg = OFStatisticsReply.new(statistic_type: :vendor)
-      expect(msg.version).to eq(OFMessage::OFP_VERSION)
+      msg = OpenFlow::Protocol::StatisticsReply.new(statistic_type: :vendor)
+      expect(msg.version).to eq(OpenFlow::Protocol::Message::OFP_VERSION)
       expect(msg.type).to eq(:statistics_reply)
       expect(msg.len).to eq(16)
       expect(msg.xid).to eq(0)
@@ -447,7 +445,7 @@ describe OFStatisticsReply do
       expect(msg.statistics.body).to be_empty
     end
     it 'should initialize with some values' do
-      msg = OFStatisticsReply.new(
+      msg = OpenFlow::Protocol::StatisticsReply.new(
         xid: 1,
         statistic_type: :vendor,
         statistics: {
@@ -455,7 +453,7 @@ describe OFStatisticsReply do
           body: [1, 2, 3, 4].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(:statistics_reply)
       expect(msg.len).to eq(20)
       expect(msg.xid).to eq(1)