openflow-protocol 0.1.7 → 0.1.8

data/spec/structs/physical_port_spec.rb

@@ -1,8 +1,6 @@
-require 'spec_helper'
-
-describe OFPhysicalPort do
+describe OpenFlow::Protocol::PhysicalPort do
   it 'should read binary' do
-    phy_port = OFPhysicalPort.read [
+    phy_port = OpenFlow::Protocol::PhysicalPort.read [
       0, 1,               # port_number
       0, 0, 0, 0, 0, 1,   # hardware_address
       112, 111, 114, 116, # name
@@ -21,13 +19,13 @@ describe OFPhysicalPort do
     expect(phy_port.name).to eq('port-1')
     expect(phy_port.config).to eq([:port_down])
     expect(phy_port.state).to eq([:link_down])
-    expect(phy_port.current_features).to eq(OFPhysicalPort::FEATURES)
-    expect(phy_port.advertised_features).to eq(OFPhysicalPort::FEATURES)
-    expect(phy_port.supported_features).to eq(OFPhysicalPort::FEATURES)
-    expect(phy_port.peer_features).to eq(OFPhysicalPort::FEATURES)
+    expect(phy_port.current_features).to eq(OpenFlow::Protocol::PhysicalPort::FEATURES)
+    expect(phy_port.advertised_features).to eq(OpenFlow::Protocol::PhysicalPort::FEATURES)
+    expect(phy_port.supported_features).to eq(OpenFlow::Protocol::PhysicalPort::FEATURES)
+    expect(phy_port.peer_features).to eq(OpenFlow::Protocol::PhysicalPort::FEATURES)
   end
   it 'should initialize with default values' do
-    phy_port = OFPhysicalPort.new
+    phy_port = OpenFlow::Protocol::PhysicalPort.new
     expect(phy_port.port_number).to eq(0)
     expect(phy_port.hardware_address).to eq('00:00:00:00:00:00')
     expect(phy_port.name).to eq('')
@@ -39,25 +37,25 @@ describe OFPhysicalPort do
     expect(phy_port.peer_features).to be_empty
   end
   it 'should initialize with some values' do
-    phy_port = OFPhysicalPort.new(
+    phy_port = OpenFlow::Protocol::PhysicalPort.new(
       port_number: 1,
       hardware_address: '00:00:00:00:00:01',
       name: 'port-1',
       config: [:port_down],
       state: [:link_down],
-      current_features: OFPhysicalPort::FEATURES,
-      advertised_features: OFPhysicalPort::FEATURES,
-      supported_features: OFPhysicalPort::FEATURES,
-      peer_features: OFPhysicalPort::FEATURES
+      current_features: OpenFlow::Protocol::PhysicalPort::FEATURES,
+      advertised_features: OpenFlow::Protocol::PhysicalPort::FEATURES,
+      supported_features: OpenFlow::Protocol::PhysicalPort::FEATURES,
+      peer_features: OpenFlow::Protocol::PhysicalPort::FEATURES
     )
     expect(phy_port.port_number).to eq(1)
     expect(phy_port.hardware_address).to eq('00:00:00:00:00:01')
     expect(phy_port.name).to eq('port-1')
     expect(phy_port.config).to eq([:port_down])
     expect(phy_port.state).to eq([:link_down])
-    expect(phy_port.current_features).to eq(OFPhysicalPort::FEATURES)
-    expect(phy_port.advertised_features).to eq(OFPhysicalPort::FEATURES)
-    expect(phy_port.supported_features).to eq(OFPhysicalPort::FEATURES)
-    expect(phy_port.peer_features).to eq(OFPhysicalPort::FEATURES)
+    expect(phy_port.current_features).to eq(OpenFlow::Protocol::PhysicalPort::FEATURES)
+    expect(phy_port.advertised_features).to eq(OpenFlow::Protocol::PhysicalPort::FEATURES)
+    expect(phy_port.supported_features).to eq(OpenFlow::Protocol::PhysicalPort::FEATURES)
+    expect(phy_port.peer_features).to eq(OpenFlow::Protocol::PhysicalPort::FEATURES)
   end
 end

data/spec/structs/port_number_spec.rb

@@ -1,38 +1,36 @@
-require 'spec_helper'
-
-describe OFPortNumberStrict do
+describe OpenFlow::Protocol::PortNumberStrict do
   it 'should read binary' do
-    port_number = OFPortNumberStrict.read [0, 1].pack('C*')
+    port_number = OpenFlow::Protocol::PortNumberStrict.read [0, 1].pack('C*')
     expect(port_number).to eq(1)
   end
   it 'should initialize with default values' do
-    port_number = OFPortNumberStrict.new
+    port_number = OpenFlow::Protocol::PortNumberStrict.new
     expect(port_number).to eq(0)
   end
   it 'should initialize with some values' do
-    port_number = OFPortNumberStrict.new(2)
+    port_number = OpenFlow::Protocol::PortNumberStrict.new(2)
     expect(port_number).to eq(2)
   end
   it 'should raise an error if greater than max value' do
-    expect { OFPortNumberStrict.new(:none) }.to raise_error(ArgumentError)
-    expect { OFPortNumberStrict.new(0xff01) }.to raise_error(ArgumentError)
+    expect { OpenFlow::Protocol::PortNumberStrict.new(:none) }.to raise_error(ArgumentError)
+    expect { OpenFlow::Protocol::PortNumberStrict.new(0xff01) }.to raise_error(ArgumentError)
   end
 end
 
-describe OFPortNumber do
+describe OpenFlow::Protocol::PortNumber do
   it 'should read binary' do
-    port_number = OFPortNumber.read [0, 1].pack('C*')
+    port_number = OpenFlow::Protocol::PortNumber.read [0, 1].pack('C*')
     expect(port_number).to eq(1)
   end
   it 'should initialize with default values' do
-    port_number = OFPortNumber.new
+    port_number = OpenFlow::Protocol::PortNumber.new
     expect(port_number).to eq(:none)
   end
   it 'should initialize with some values' do
-    port_number = OFPortNumber.new(:local)
+    port_number = OpenFlow::Protocol::PortNumber.new(:local)
     expect(port_number).to eq(:local)
   end
   it 'should raise an error with invalid port' do
-    expect { OFPortNumber.new(0xff01) }.to raise_error(ArgumentError)
+    expect { OpenFlow::Protocol::PortNumber.new(0xff01) }.to raise_error(ArgumentError)
   end
 end

data/spec/structs/queue_properties/queue_properties_spec.rb

@@ -1,8 +1,6 @@
-require 'spec_helper'
-
-describe OFQueueProperties do
+describe OpenFlow::Protocol::QueueProperties do
   it 'should read binary' do
-    props = OFQueueProperties.read [
+    props = OpenFlow::Protocol::QueueProperties.read [
       # none
       0, 0, 0, 8, 0, 0, 0, 0,
       # min_rate
@@ -15,12 +13,12 @@ describe OFQueueProperties do
     expect(props.last.type).to eq(:min_rate)
   end
   it 'should initialize with default values' do
-    props = OFQueueProperties.new
+    props = OpenFlow::Protocol::QueueProperties.new
     expect(props).to be_empty
   end
   it 'should initialize with some values' do
-    props = OFQueueProperties.new([
-      OFQueuePropertyMinRate.new(rate: 100)
+    props = OpenFlow::Protocol::QueueProperties.new([
+      OpenFlow::Protocol::QueuePropertyMinRate.new(rate: 100)
     ])
     expect(props.length).to eq(1)
     expect(props.first.type).to eq(:min_rate)

data/spec/structs/queue_properties/queue_property_min_rate_spec.rb

@@ -1,8 +1,6 @@
-require 'spec_helper'
-
-describe OFQueuePropertyMinRate do
+describe OpenFlow::Protocol::QueuePropertyMinRate do
   it 'should read binary' do
-    prop = OFQueuePropertyMinRate.read [
+    prop = OpenFlow::Protocol::QueuePropertyMinRate.read [
       0, 1, 0, 16, 0, 0, 0, 0, # header
       0, 100,                  # rate
       0, 0, 0, 0, 0, 0         # padding
@@ -12,19 +10,19 @@ describe OFQueuePropertyMinRate do
     expect(prop.rate).to eq(100)
   end
   it 'should initialize with default values' do
-    prop = OFQueuePropertyMinRate.new
+    prop = OpenFlow::Protocol::QueuePropertyMinRate.new
     expect(prop.type).to eq(:min_rate)
     expect(prop.len).to eq(16)
     expect(prop.rate).to eq(0)
   end
   it 'should initialize with some values' do
-    prop = OFQueuePropertyMinRate.new(rate: 100)
+    prop = OpenFlow::Protocol::QueuePropertyMinRate.new(rate: 100)
     expect(prop.type).to eq(:min_rate)
     expect(prop.len).to eq(16)
     expect(prop.rate).to eq(100)
   end
   it 'should disabled rate when > 1000' do
-    prop = OFQueuePropertyMinRate.new(rate: 1001)
+    prop = OpenFlow::Protocol::QueuePropertyMinRate.new(rate: 1001)
     expect(prop.type).to eq(:min_rate)
     expect(prop.len).to eq(16)
     expect(prop.rate).to eq(:disabled)

data/spec/structs/queue_properties/queue_property_none_spec.rb

@@ -1,13 +1,11 @@
-require 'spec_helper'
-
-describe OFQueuePropertyNone do
+describe OpenFlow::Protocol::QueuePropertyNone do
   it 'should read binary' do
-    prop = OFQueuePropertyNone.read [0, 0, 0, 8, 0, 0, 0, 0].pack('C*')
+    prop = OpenFlow::Protocol::QueuePropertyNone.read [0, 0, 0, 8, 0, 0, 0, 0].pack('C*')
     expect(prop.type).to eq(:none)
     expect(prop.len).to eq(8)
   end
   it 'should initialize with default values' do
-    prop = OFQueuePropertyNone.new
+    prop = OpenFlow::Protocol::QueuePropertyNone.new
     expect(prop.type).to eq(:none)
     expect(prop.len).to eq(8)
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openflow-protocol
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Jérémy Pagé
@@ -16,14 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.1.3
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.4'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -45,69 +59,69 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/actions/action.rb
-- lib/actions/action_enqueue.rb
-- lib/actions/action_output.rb
-- lib/actions/action_set_destination_port.rb
-- lib/actions/action_set_ip_destination.rb
-- lib/actions/action_set_ip_source.rb
-- lib/actions/action_set_ip_tos.rb
-- lib/actions/action_set_mac_destination.rb
-- lib/actions/action_set_mac_source.rb
-- lib/actions/action_set_source_port.rb
-- lib/actions/action_set_vlan_id.rb
-- lib/actions/action_set_vlan_pcp.rb
-- lib/actions/action_strip_vlan.rb
-- lib/actions/action_vendor.rb
-- lib/actions/actions.rb
-- lib/helpers/array_of_subclasses.rb
-- lib/helpers/superclass_base.rb
-- lib/messages/barrier_reply.rb
-- lib/messages/barrier_request.rb
-- lib/messages/echo_reply.rb
-- lib/messages/echo_request.rb
-- lib/messages/error.rb
-- lib/messages/features_reply.rb
-- lib/messages/features_request.rb
-- lib/messages/flow_mod.rb
-- lib/messages/flow_removed.rb
-- lib/messages/get_config_reply.rb
-- lib/messages/get_config_request.rb
-- lib/messages/hello.rb
-- lib/messages/message.rb
-- lib/messages/packet_in.rb
-- lib/messages/packet_out.rb
-- lib/messages/parser.rb
-- lib/messages/port_mod.rb
-- lib/messages/port_status.rb
-- lib/messages/queue_get_config_reply.rb
-- lib/messages/queue_get_config_request.rb
-- lib/messages/set_config.rb
-- lib/messages/statistics.rb
-- lib/messages/statistics/aggregate_statistics_reply.rb
-- lib/messages/statistics/aggregate_statistics_request.rb
-- lib/messages/statistics/description_statistics.rb
-- lib/messages/statistics/flow_statistics_reply.rb
-- lib/messages/statistics/flow_statistics_request.rb
-- lib/messages/statistics/port_statistics_reply.rb
-- lib/messages/statistics/port_statistics_request.rb
-- lib/messages/statistics/queue_statistics_reply.rb
-- lib/messages/statistics/queue_statistics_request.rb
-- lib/messages/statistics/table_statistics.rb
-- lib/messages/statistics/vendor_statistics.rb
-- lib/messages/statistics_reply.rb
-- lib/messages/statistics_request.rb
-- lib/messages/vendor.rb
 - lib/openflow-protocol.rb
+- lib/openflow-protocol/actions/action.rb
+- lib/openflow-protocol/actions/action_enqueue.rb
+- lib/openflow-protocol/actions/action_output.rb
+- lib/openflow-protocol/actions/action_set_destination_port.rb
+- lib/openflow-protocol/actions/action_set_ip_destination.rb
+- lib/openflow-protocol/actions/action_set_ip_source.rb
+- lib/openflow-protocol/actions/action_set_ip_tos.rb
+- lib/openflow-protocol/actions/action_set_mac_destination.rb
+- lib/openflow-protocol/actions/action_set_mac_source.rb
+- lib/openflow-protocol/actions/action_set_source_port.rb
+- lib/openflow-protocol/actions/action_set_vlan_id.rb
+- lib/openflow-protocol/actions/action_set_vlan_pcp.rb
+- lib/openflow-protocol/actions/action_strip_vlan.rb
+- lib/openflow-protocol/actions/action_vendor.rb
+- lib/openflow-protocol/actions/actions.rb
+- lib/openflow-protocol/helpers/array_of_subclasses.rb
+- lib/openflow-protocol/helpers/superclass_base.rb
+- lib/openflow-protocol/messages/barrier_reply.rb
+- lib/openflow-protocol/messages/barrier_request.rb
+- lib/openflow-protocol/messages/echo_reply.rb
+- lib/openflow-protocol/messages/echo_request.rb
+- lib/openflow-protocol/messages/error.rb
+- lib/openflow-protocol/messages/features_reply.rb
+- lib/openflow-protocol/messages/features_request.rb
+- lib/openflow-protocol/messages/flow_mod.rb
+- lib/openflow-protocol/messages/flow_removed.rb
+- lib/openflow-protocol/messages/get_config_reply.rb
+- lib/openflow-protocol/messages/get_config_request.rb
+- lib/openflow-protocol/messages/hello.rb
+- lib/openflow-protocol/messages/message.rb
+- lib/openflow-protocol/messages/packet_in.rb
+- lib/openflow-protocol/messages/packet_out.rb
+- lib/openflow-protocol/messages/parser.rb
+- lib/openflow-protocol/messages/port_mod.rb
+- lib/openflow-protocol/messages/port_status.rb
+- lib/openflow-protocol/messages/queue_get_config_reply.rb
+- lib/openflow-protocol/messages/queue_get_config_request.rb
+- lib/openflow-protocol/messages/set_config.rb
+- lib/openflow-protocol/messages/statistics.rb
+- lib/openflow-protocol/messages/statistics/aggregate_statistics_reply.rb
+- lib/openflow-protocol/messages/statistics/aggregate_statistics_request.rb
+- lib/openflow-protocol/messages/statistics/description_statistics.rb
+- lib/openflow-protocol/messages/statistics/flow_statistics_reply.rb
+- lib/openflow-protocol/messages/statistics/flow_statistics_request.rb
+- lib/openflow-protocol/messages/statistics/port_statistics_reply.rb
+- lib/openflow-protocol/messages/statistics/port_statistics_request.rb
+- lib/openflow-protocol/messages/statistics/queue_statistics_reply.rb
+- lib/openflow-protocol/messages/statistics/queue_statistics_request.rb
+- lib/openflow-protocol/messages/statistics/table_statistics.rb
+- lib/openflow-protocol/messages/statistics/vendor_statistics.rb
+- lib/openflow-protocol/messages/statistics_reply.rb
+- lib/openflow-protocol/messages/statistics_request.rb
+- lib/openflow-protocol/messages/vendor.rb
+- lib/openflow-protocol/structs/match.rb
+- lib/openflow-protocol/structs/packet_queue.rb
+- lib/openflow-protocol/structs/physical_port.rb
+- lib/openflow-protocol/structs/port_number.rb
+- lib/openflow-protocol/structs/queue_properties/queue_properties.rb
+- lib/openflow-protocol/structs/queue_properties/queue_property.rb
+- lib/openflow-protocol/structs/queue_properties/queue_property_min_rate.rb
+- lib/openflow-protocol/structs/queue_properties/queue_property_none.rb
 - lib/openflow-protocol/version.rb
-- lib/structs/match.rb
-- lib/structs/packet_queue.rb
-- lib/structs/physical_port.rb
-- lib/structs/port_number.rb
-- lib/structs/queue_properties/queue_properties.rb
-- lib/structs/queue_properties/queue_property.rb
-- lib/structs/queue_properties/queue_property_min_rate.rb
-- lib/structs/queue_properties/queue_property_none.rb
 - spec/actions/action_enqueue_spec.rb
 - spec/actions/action_output_spec.rb
 - spec/actions/action_set_destination_port_spec.rb

data/lib/actions/action.rb

@@ -1,26 +0,0 @@
-(Dir[File.expand_path '../helpers/**/*.rb', __dir__] +
- Dir[File.expand_path '../structs/**/*.rb', __dir__]).each do |file|
-  require file
-end
-
-class OFAction < SuperclassBase
-  HEADER_LENGTH = 4
-  TYPES = [
-    :output,
-    :set_vlan_id,
-    :set_vlan_pcp,
-    :strip_vlan,
-    :set_mac_source,       # set_dl_src
-    :set_mac_destination,  # set_dl_dst
-    :set_ip_source,        # set_nw_src
-    :set_ip_destination,   # set_nw_dst
-    :set_ip_tos,           # set_nw_tos
-    :set_source_port,      # set_tp_src
-    :set_destination_port, # set_tp_dst
-    :enqueue
-  ]
-  TYPES[0xffff] = :vendor
-
-  enum16 :type, list: TYPES, asserted_value: -> { type_str.to_sym }
-  uint16 :len, value: -> { HEADER_LENGTH + body_length }
-end

data/lib/actions/action_enqueue.rb

@@ -1,12 +0,0 @@
-require_relative 'action'
-
-class OFActionEnqueue < OFAction
-  of_port_number :port
-  uint48 :padding
-  hide :padding
-  uint32 :queue_id, initial_value: 0
-
-  def body_length
-    12
-  end
-end

data/lib/actions/action_output.rb

@@ -1,10 +0,0 @@
-require_relative 'action'
-
-class OFActionOutput < OFAction
-  of_port_number :port
-  uint16 :max_length, initial_value: 0xffff
-
-  def body_length
-    4
-  end
-end

data/lib/actions/action_set_destination_port.rb

@@ -1,3 +0,0 @@
-require_relative 'action_set_source_port'
-
-class OFActionSetDestinationPort < OFActionSetSourcePort; end

data/lib/actions/action_set_ip_destination.rb

@@ -1,3 +0,0 @@
-require_relative 'action_set_ip_source'
-
-class OFActionSetIpDestination < OFActionSetIpSource; end

data/lib/actions/action_set_ip_source.rb

@@ -1,9 +0,0 @@
-require_relative 'action'
-
-class OFActionSetIpSource < OFAction
-  ipv4_address :ip_address
-
-  def body_length
-    4
-  end
-end

data/lib/actions/action_set_ip_tos.rb

@@ -1,11 +0,0 @@
-require_relative 'action'
-
-class OFActionSetIpTos < OFAction
-  uint8 :tos
-  uint24 :padding
-  hide :padding
-
-  def body_length
-    4
-  end
-end