openflow-protocol 0.1.7 → 0.1.8

data/spec/messages/statistics_request_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe OFStatisticsRequest do
+describe OpenFlow::Protocol::StatisticsRequest do
   let(:data) {
     [
       1, 16, 0, 12, 0, 0, 0, 1, # header
@@ -11,8 +9,8 @@ describe OFStatisticsRequest do
 
   context 'with description' do
     it 'should read binary' do
-      msg = OFStatisticsRequest.read(data)
-      expect(msg.version).to eq(OFMessage::OFP_VERSION)
+      msg = OpenFlow::Protocol::StatisticsRequest.read(data)
+      expect(msg.version).to eq(OpenFlow::Protocol::Message::OFP_VERSION)
       expect(msg.type).to eq(:statistics_request)
       expect(msg.len).to eq(12)
       expect(msg.xid).to eq(1)
@@ -21,12 +19,12 @@ describe OFStatisticsRequest do
       expect(msg.statistics).to be_empty
     end
     it 'should be parsable' do
-      msg = OFParser.read(data)
-      expect(msg.class).to eq(OFStatisticsRequest)
+      msg = OpenFlow::Protocol::Parser.read(data)
+      expect(msg.class).to eq(OpenFlow::Protocol::StatisticsRequest)
     end
     it 'should initialize with default values' do
-      msg = OFStatisticsRequest.new
-      expect(msg.version).to eq(OFMessage::OFP_VERSION)
+      msg = OpenFlow::Protocol::StatisticsRequest.new
+      expect(msg.version).to eq(OpenFlow::Protocol::Message::OFP_VERSION)
       expect(msg.type).to eq(:statistics_request)
       expect(msg.len).to eq(12)
       expect(msg.xid).to eq(0)
@@ -35,11 +33,11 @@ describe OFStatisticsRequest do
       expect(msg.statistics).to be_empty
     end
     it 'should initialize with some values' do
-      msg = OFStatisticsRequest.new(
+      msg = OpenFlow::Protocol::StatisticsRequest.new(
         xid: 1,
         statistic_type: :description
       )
-      expect(msg.version).to eq(OFMessage::OFP_VERSION)
+      expect(msg.version).to eq(OpenFlow::Protocol::Message::OFP_VERSION)
       expect(msg.type).to eq(:statistics_request)
       expect(msg.len).to eq(12)
       expect(msg.xid).to eq(1)
@@ -51,7 +49,7 @@ describe OFStatisticsRequest do
 
   context 'with flow' do
     it 'should read binary' do
-      msg = OFStatisticsRequest.read [
+      msg = OpenFlow::Protocol::StatisticsRequest.read [
         1, 16, 0, 56, 0, 0, 0, 1, # header
         0, 1,                     # statistic_type
         0, 0,                     # flags
@@ -78,7 +76,7 @@ describe OFStatisticsRequest do
         0,    # padding
         0, 1  # out_port
       ].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_request)
       expect(msg.len).to eq(56)
       expect(msg.xid).to eq(1)
@@ -87,8 +85,8 @@ describe OFStatisticsRequest do
       expect(msg.statistics.table_id).to eq(1)
     end
     it 'should initialize with default values' do
-      msg = OFStatisticsRequest.new(statistic_type: :flow)
-      expect(msg.version).to eq(OFMessage::OFP_VERSION)
+      msg = OpenFlow::Protocol::StatisticsRequest.new(statistic_type: :flow)
+      expect(msg.version).to eq(OpenFlow::Protocol::Message::OFP_VERSION)
       expect(msg.type).to eq(:statistics_request)
       expect(msg.len).to eq(56)
       expect(msg.xid).to eq(0)
@@ -97,14 +95,14 @@ describe OFStatisticsRequest do
       expect(msg.statistics.table_id).to eq(:all)
     end
     it 'should initialize with some values' do
-      msg = OFStatisticsRequest.new(
+      msg = OpenFlow::Protocol::StatisticsRequest.new(
         xid: 1,
         statistic_type: :flow,
         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_request)
       expect(msg.len).to eq(56)
       expect(msg.xid).to eq(1)
@@ -116,7 +114,7 @@ describe OFStatisticsRequest do
 
   context 'with aggregate' do
     it 'should read binary' do
-      msg = OFStatisticsRequest.read [
+      msg = OpenFlow::Protocol::StatisticsRequest.read [
         1, 16, 0, 56, 0, 0, 0, 1, # header
         0, 2,                     # statistic_type
         0, 0,                     # flags
@@ -143,7 +141,7 @@ describe OFStatisticsRequest do
         0,    # padding
         0, 1  # out_port
       ].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_request)
       expect(msg.len).to eq(56)
       expect(msg.xid).to eq(1)
@@ -152,8 +150,8 @@ describe OFStatisticsRequest do
       expect(msg.statistics.table_id).to eq(1)
     end
     it 'should initialize with default values' do
-      msg = OFStatisticsRequest.new(statistic_type: :aggregate)
-      expect(msg.version).to eq(OFMessage::OFP_VERSION)
+      msg = OpenFlow::Protocol::StatisticsRequest.new(statistic_type: :aggregate)
+      expect(msg.version).to eq(OpenFlow::Protocol::Message::OFP_VERSION)
       expect(msg.type).to eq(:statistics_request)
       expect(msg.len).to eq(56)
       expect(msg.xid).to eq(0)
@@ -162,14 +160,14 @@ describe OFStatisticsRequest do
       expect(msg.statistics.table_id).to eq(:all)
     end
     it 'should initialize with some values' do
-      msg = OFStatisticsRequest.new(
+      msg = OpenFlow::Protocol::StatisticsRequest.new(
         xid: 1,
         statistic_type: :aggregate,
         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_request)
       expect(msg.len).to eq(56)
       expect(msg.xid).to eq(1)
@@ -181,12 +179,12 @@ describe OFStatisticsRequest do
 
   context 'with table' do
     it 'should read binary' do
-      msg = OFStatisticsRequest.read [
+      msg = OpenFlow::Protocol::StatisticsRequest.read [
         1, 16, 0, 12, 0, 0, 0, 1, # header
         0, 3,                     # statistic_type
         0, 0,                     # flags
       ].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_request)
       expect(msg.len).to eq(12)
       expect(msg.xid).to eq(1)
@@ -195,8 +193,8 @@ describe OFStatisticsRequest do
       expect(msg.statistics).to be_empty
     end
     it 'should initialize with default values' do
-      msg = OFStatisticsRequest.new(statistic_type: :table)
-      expect(msg.version).to eq(OFMessage::OFP_VERSION)
+      msg = OpenFlow::Protocol::StatisticsRequest.new(statistic_type: :table)
+      expect(msg.version).to eq(OpenFlow::Protocol::Message::OFP_VERSION)
       expect(msg.type).to eq(:statistics_request)
       expect(msg.len).to eq(12)
       expect(msg.xid).to eq(0)
@@ -205,11 +203,11 @@ describe OFStatisticsRequest do
       expect(msg.statistics).to be_empty
     end
     it 'should initialize with some values' do
-      msg = OFStatisticsRequest.new(
+      msg = OpenFlow::Protocol::StatisticsRequest.new(
         xid: 1,
         statistic_type: :table
       )
-      expect(msg.version).to eq(OFMessage::OFP_VERSION)
+      expect(msg.version).to eq(OpenFlow::Protocol::Message::OFP_VERSION)
       expect(msg.type).to eq(:statistics_request)
       expect(msg.len).to eq(12)
       expect(msg.xid).to eq(1)
@@ -221,7 +219,7 @@ describe OFStatisticsRequest do
 
   context 'with port' do
     it 'should read binary' do
-      msg = OFStatisticsRequest.read [
+      msg = OpenFlow::Protocol::StatisticsRequest.read [
         1, 16, 0, 20, 0, 0, 0, 1, # header
         0, 4,                     # statistic_type
         0, 0,                     # flags
@@ -230,7 +228,7 @@ describe OFStatisticsRequest do
         0, 1,            # port_number
         0, 0, 0, 0, 0, 0 # padding
       ].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_request)
       expect(msg.len).to eq(20)
       expect(msg.xid).to eq(1)
@@ -239,8 +237,8 @@ describe OFStatisticsRequest do
       expect(msg.statistics.port_number).to eq(1)
     end
     it 'should initialize with default values' do
-      msg = OFStatisticsRequest.new(statistic_type: :port)
-      expect(msg.version).to eq(OFMessage::OFP_VERSION)
+      msg = OpenFlow::Protocol::StatisticsRequest.new(statistic_type: :port)
+      expect(msg.version).to eq(OpenFlow::Protocol::Message::OFP_VERSION)
       expect(msg.type).to eq(:statistics_request)
       expect(msg.len).to eq(20)
       expect(msg.xid).to eq(0)
@@ -249,12 +247,12 @@ describe OFStatisticsRequest do
       expect(msg.statistics.port_number).to eq(:none)
     end
     it 'should initialize with some values' do
-      msg = OFStatisticsRequest.new(
+      msg = OpenFlow::Protocol::StatisticsRequest.new(
         xid: 1,
         statistic_type: :port,
         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_request)
       expect(msg.len).to eq(20)
       expect(msg.xid).to eq(1)
@@ -266,7 +264,7 @@ describe OFStatisticsRequest do
 
   context 'with queue' do
     it 'should read binary' do
-      msg = OFStatisticsRequest.read [
+      msg = OpenFlow::Protocol::StatisticsRequest.read [
         1, 16, 0, 20, 0, 0, 0, 1, # header
         0, 5,                     # statistic_type
         0, 0,                     # flags
@@ -276,7 +274,7 @@ describe OFStatisticsRequest do
         0, 0,      # padding
         0, 0, 0, 1 # queue_id
       ].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_request)
       expect(msg.len).to eq(20)
       expect(msg.xid).to eq(1)
@@ -285,8 +283,8 @@ describe OFStatisticsRequest do
       expect(msg.statistics.port_number).to eq(1)
     end
     it 'should initialize with default values' do
-      msg = OFStatisticsRequest.new(statistic_type: :queue)
-      expect(msg.version).to eq(OFMessage::OFP_VERSION)
+      msg = OpenFlow::Protocol::StatisticsRequest.new(statistic_type: :queue)
+      expect(msg.version).to eq(OpenFlow::Protocol::Message::OFP_VERSION)
       expect(msg.type).to eq(:statistics_request)
       expect(msg.len).to eq(20)
       expect(msg.xid).to eq(0)
@@ -295,12 +293,12 @@ describe OFStatisticsRequest do
       expect(msg.statistics.port_number).to eq(:all)
     end
     it 'should initialize with some values' do
-      msg = OFStatisticsRequest.new(
+      msg = OpenFlow::Protocol::StatisticsRequest.new(
         xid: 1,
         statistic_type: :queue,
         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_request)
       expect(msg.len).to eq(20)
       expect(msg.xid).to eq(1)
@@ -312,7 +310,7 @@ describe OFStatisticsRequest do
 
   context 'with vendor' do
     it 'should read binary' do
-      msg = OFStatisticsRequest.read [
+      msg = OpenFlow::Protocol::StatisticsRequest.read [
         1, 16, 0, 20, 0, 0, 0, 1, # header
         0xff, 0xff,               # statistic_type
         0, 0,                     # flags
@@ -321,7 +319,7 @@ describe OFStatisticsRequest do
         0, 0, 0, 1, # vendor
         1, 2, 3, 4  # body
       ].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_request)
       expect(msg.len).to eq(20)
       expect(msg.xid).to eq(1)
@@ -331,8 +329,8 @@ describe OFStatisticsRequest do
       expect(msg.statistics.body).to eq([1, 2, 3, 4].pack('C*'))
     end
     it 'should initialize with default values' do
-      msg = OFStatisticsRequest.new(statistic_type: :vendor)
-      expect(msg.version).to eq(OFMessage::OFP_VERSION)
+      msg = OpenFlow::Protocol::StatisticsRequest.new(statistic_type: :vendor)
+      expect(msg.version).to eq(OpenFlow::Protocol::Message::OFP_VERSION)
       expect(msg.type).to eq(:statistics_request)
       expect(msg.len).to eq(16)
       expect(msg.xid).to eq(0)
@@ -342,7 +340,7 @@ describe OFStatisticsRequest do
       expect(msg.statistics.body).to be_empty
     end
     it 'should initialize with some values' do
-      msg = OFStatisticsRequest.new(
+      msg = OpenFlow::Protocol::StatisticsRequest.new(
         xid: 1,
         statistic_type: :vendor,
         statistics: {
@@ -350,7 +348,7 @@ describe OFStatisticsRequest 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_request)
       expect(msg.len).to eq(20)
       expect(msg.xid).to eq(1)

data/spec/messages/vendor_spec.rb

@@ -1,6 +1,4 @@
-require 'spec_helper'
-
-describe OFVendor do
+describe OpenFlow::Protocol::Vendor do
   let(:data) {
     [
       1, 4, 0, 12, 0, 0, 0, 1, # header
@@ -9,8 +7,8 @@ describe OFVendor do
   }
 
   it 'should read binary' do
-    msg = OFVendor.read(data)
-    expect(msg.version).to eq(OFMessage::OFP_VERSION)
+    msg = OpenFlow::Protocol::Vendor.read(data)
+    expect(msg.version).to eq(OpenFlow::Protocol::Message::OFP_VERSION)
     expect(msg.type).to eq(:vendor)
     expect(msg.len).to eq(12)
     expect(msg.xid).to eq(1)
@@ -18,16 +16,16 @@ describe OFVendor do
     expect(msg.data).to be_empty
   end
   it 'should be parsable' do
-    msg = OFParser.read(data)
-    expect(msg.class).to eq(OFVendor)
+    msg = OpenFlow::Protocol::Parser.read(data)
+    expect(msg.class).to eq(OpenFlow::Protocol::Vendor)
   end
   it 'should read binary with data' do
-    msg = OFVendor.read [
+    msg = OpenFlow::Protocol::Vendor.read [
       1, 4, 0, 14, 0, 0, 0, 1, # header
       0, 0, 0, 1,              # vendor
       10, 20                   # data
     ].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(:vendor)
     expect(msg.len).to eq(14)
     expect(msg.xid).to eq(1)
@@ -35,8 +33,8 @@ describe OFVendor do
     expect(msg.data.length).to eq(2)
   end
   it 'should initialize with default values' do
-    msg = OFVendor.new
-    expect(msg.version).to eq(OFMessage::OFP_VERSION)
+    msg = OpenFlow::Protocol::Vendor.new
+    expect(msg.version).to eq(OpenFlow::Protocol::Message::OFP_VERSION)
     expect(msg.type).to eq(:vendor)
     expect(msg.len).to eq(12)
     expect(msg.xid).to eq(0)
@@ -44,8 +42,8 @@ describe OFVendor do
     expect(msg.data).to be_empty
   end
   it 'should initialize with some values' do
-    msg = OFVendor.new(xid: 1, vendor: 1)
-    expect(msg.version).to eq(OFMessage::OFP_VERSION)
+    msg = OpenFlow::Protocol::Vendor.new(xid: 1, vendor: 1)
+    expect(msg.version).to eq(OpenFlow::Protocol::Message::OFP_VERSION)
     expect(msg.type).to eq(:vendor)
     expect(msg.len).to eq(12)
     expect(msg.xid).to eq(1)
@@ -53,8 +51,8 @@ describe OFVendor do
     expect(msg.data).to be_empty
   end
   it 'should initialize with data' do
-    msg = OFVendor.new(vendor: 1, data: [10, 20].pack('C*'))
-    expect(msg.version).to eq(OFMessage::OFP_VERSION)
+    msg = OpenFlow::Protocol::Vendor.new(vendor: 1, data: [10, 20].pack('C*'))
+    expect(msg.version).to eq(OpenFlow::Protocol::Message::OFP_VERSION)
     expect(msg.type).to eq(:vendor)
     expect(msg.len).to eq(14)
     expect(msg.xid).to eq(0)

data/spec/spec_helper.rb

@@ -1,4 +1,4 @@
-require_relative '../lib/openflow-protocol'
+require 'openflow-protocol'
 
 class String
   def pad(length, value = [0].pack('C*'))

data/spec/structs/match_spec.rb

@@ -1,8 +1,6 @@
-require 'spec_helper'
-
-describe OFMatch do
+describe OpenFlow::Protocol::Match do
   it 'should read binary' do
-    match = OFMatch.read [
+    match = OpenFlow::Protocol::Match.read [
       0, 0x30, 0x20, 0x4f, # wildcards
       0, 0,                # in_port
       0, 0, 0, 0, 0, 0,    # mac_source
@@ -43,8 +41,8 @@ describe OFMatch do
     expect(match.destination_port).to eq(3000)
   end
   it 'should initialize with default values' do
-    match = OFMatch.new
-    expect(match.wildcards).to eq(OFMatch::Wildcards::ALL_FLAGS)
+    match = OpenFlow::Protocol::Match.new
+    expect(match.wildcards).to eq(OpenFlow::Protocol::Match::Wildcards::ALL_FLAGS)
     expect(match.in_port).to eq(0)
     expect(match.mac_source).to eq('00:00:00:00:00:00')
     expect(match.mac_destination).to eq('00:00:00:00:00:00')
@@ -59,7 +57,7 @@ describe OFMatch do
     expect(match.destination_port).to eq(0)
   end
   it 'should initialize with some values' do
-    match = OFMatch.new(
+    match = OpenFlow::Protocol::Match.new(
       wildcards: {
         in_port: true,
         mac_source: true,
@@ -101,7 +99,7 @@ describe OFMatch do
     expect(match.destination_port).to eq(3000)
   end
   it 'should initialize with wildcards as array' do
-    match = OFMatch.new(
+    match = OpenFlow::Protocol::Match.new(
       wildcards: [:in_port, :mac_source, :mac_destination]
     )
     expect(match.wildcards).to eq(
@@ -111,7 +109,7 @@ describe OFMatch do
     )
   end
   it 'should initialize wildcards based on matching values given' do
-    match = OFMatch.create(
+    match = OpenFlow::Protocol::Match.create(
       mac_source: '00:00:00:00:00:01',
       mac_destination: '00:00:00:00:00:02',
       mac_protocol: :ipv4,

data/spec/structs/packet_queue_spec.rb

@@ -1,8 +1,6 @@
-require 'spec_helper'
-
-describe OFPacketQueue do
+describe OpenFlow::Protocol::PacketQueue do
   it 'should read binary' do
-    queue = OFPacketQueue.read [
+    queue = OpenFlow::Protocol::PacketQueue.read [
       0, 0, 0, 1, # queue_id
       0, 24,      # len
       0, 0,       # padding
@@ -19,14 +17,14 @@ describe OFPacketQueue do
     expect(queue.properties.first.rate).to eq(100)
   end
   it 'should initialize with default values' do
-    queue = OFPacketQueue.new
+    queue = OpenFlow::Protocol::PacketQueue.new
     expect(queue.queue_id).to eq(0)
     expect(queue.len).to eq(8)
   end
   it 'should initialize with some values' do
-    queue = OFPacketQueue.new(
+    queue = OpenFlow::Protocol::PacketQueue.new(
       queue_id: 1,
-      properties: [OFQueuePropertyMinRate.new(rate: 100)]
+      properties: [OpenFlow::Protocol::QueuePropertyMinRate.new(rate: 100)]
     )
     expect(queue.queue_id).to eq(1)
     expect(queue.len).to eq(24)