openflow-protocol 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b01ffc73397a6ba7679ac349cf7f32d7a9a790f0
-  data.tar.gz: 51c39851e3ee81bf59879c4dfa76b4260144b2bf
+  metadata.gz: 0bd2f141b6dabeda2e35d99495b355ea25968d55
+  data.tar.gz: ddb27e44037c42ed814a4697fbd6334d096bc0ab
 SHA512:
-  metadata.gz: 51bc3a9d20999dab830ad19ed61a1c76be940eddea2fd11edcfef446f34e8ad3ab5ed8c3eacd9b8569c032527603d245ee6e08d82699e844f157407731e580f5
-  data.tar.gz: 4395f5da25e3339799305a8d791f84fb842fbbadfb06a5a075bf9fe08b11144e6b48166ce750cee13fa7251bf527f8619129e4120107ffc6b3bf3ad0cfad558b
+  metadata.gz: 4c8b7487dcd15935b847a2e9bb120b6f4d17cee7cbb2c3e8cda918c3dcafa32bcf7d95d80badec29995b324fb701a9bb758a4cc4732663e33ede082416b0a50f
+  data.tar.gz: 18992f20220e9f3034a7111d711c913d755ee6de92898a36685e4f09490c1b29f01f02fbfd043d7dbd048bcfec8fd2f37370857f921a761a4751381a4c00e9d2

data/lib/openflow-protocol/messages/packet_in.rb

@@ -19,7 +19,7 @@ module OpenFlow
       end
 
       def parsed_data
-        @parsed_data ||= Ethernet.read(data)
+        @parsed_data ||= PacketProtocols::Ethernet.read(data)
         @parsed_data
       end
     end

data/lib/openflow-protocol/version.rb

@@ -1,5 +1,5 @@
 module OpenFlow
   module Protocol
-    VERSION = '0.1.8'
+    VERSION = '0.1.9'
   end
 end

data/spec/actions/action_enqueue_spec.rb

@@ -1,6 +1,6 @@
-describe OpenFlow::Protocol::ActionEnqueue do
+describe ActionEnqueue do
   it 'should read binary' do
-    action = OpenFlow::Protocol::ActionEnqueue.read [
+    action = ActionEnqueue.read [
       0, 11, 0, 16,     # header
       0, 1,             # port
       0, 0, 0, 0, 0, 0, # padding
@@ -12,14 +12,14 @@ describe OpenFlow::Protocol::ActionEnqueue do
     expect(action.queue_id).to eq(1)
   end
   it 'should initialize with default values' do
-    action = OpenFlow::Protocol::ActionEnqueue.new
+    action = ActionEnqueue.new
     expect(action.type).to eq(:enqueue)
     expect(action.len).to eq(16)
     expect(action.port).to eq(:none)
     expect(action.queue_id).to eq(0)
   end
   it 'should initialize with some values' do
-    action = OpenFlow::Protocol::ActionEnqueue.new(port: 1, queue_id: 1)
+    action = ActionEnqueue.new(port: 1, queue_id: 1)
     expect(action.type).to eq(:enqueue)
     expect(action.len).to eq(16)
     expect(action.port).to eq(1)

data/spec/actions/action_output_spec.rb

@@ -1,6 +1,6 @@
-describe OpenFlow::Protocol::ActionOutput do
+describe ActionOutput do
   it 'should read binary' do
-    action = OpenFlow::Protocol::ActionOutput.read [
+    action = ActionOutput.read [
       0, 0, 0, 8, # header
       0, 1,       # port
       0xff, 0xff  # max_length
@@ -11,14 +11,14 @@ describe OpenFlow::Protocol::ActionOutput do
     expect(action.max_length).to eq(0xffff)
   end
   it 'should initialize with default values' do
-    action = OpenFlow::Protocol::ActionOutput.new
+    action = ActionOutput.new
     expect(action.type).to eq(:output)
     expect(action.len).to eq(8)
     expect(action.port).to eq(:none)
     expect(action.max_length).to eq(0xffff)
   end
   it 'should initialize with some values' do
-    action = OpenFlow::Protocol::ActionOutput.new(port: 1)
+    action = ActionOutput.new(port: 1)
     expect(action.type).to eq(:output)
     expect(action.len).to eq(8)
     expect(action.port).to eq(1)

data/spec/actions/action_set_destination_port_spec.rb

@@ -1,6 +1,6 @@
-describe OpenFlow::Protocol::ActionSetDestinationPort do
+describe ActionSetDestinationPort do
   it 'should read binary' do
-    action = OpenFlow::Protocol::ActionSetDestinationPort.read [
+    action = ActionSetDestinationPort.read [
       0, 10, 0, 8, # header
       0, 1,        # port
       0, 0         # padding
@@ -10,13 +10,13 @@ describe OpenFlow::Protocol::ActionSetDestinationPort do
     expect(action.port).to eq(1)
   end
   it 'should initialize with default values' do
-    action = OpenFlow::Protocol::ActionSetDestinationPort.new
+    action = ActionSetDestinationPort.new
     expect(action.type).to eq(:set_destination_port)
     expect(action.len).to eq(8)
     expect(action.port).to eq(0)
   end
   it 'should initialize with some values' do
-    action = OpenFlow::Protocol::ActionSetDestinationPort.new(port: 1)
+    action = ActionSetDestinationPort.new(port: 1)
     expect(action.type).to eq(:set_destination_port)
     expect(action.len).to eq(8)
     expect(action.port).to eq(1)

data/spec/actions/action_set_ip_destination_spec.rb

@@ -1,6 +1,6 @@
-describe OpenFlow::Protocol::ActionSetIpDestination do
+describe ActionSetIpDestination do
   it 'should read binary' do
-    action = OpenFlow::Protocol::ActionSetIpDestination.read [
+    action = ActionSetIpDestination.read [
       0, 7, 0, 8, # header
       10, 0, 0, 1 # ip_address
     ].pack('C*')
@@ -9,13 +9,13 @@ describe OpenFlow::Protocol::ActionSetIpDestination do
     expect(action.ip_address).to eq('10.0.0.1')
   end
   it 'should initialize with default values' do
-    action = OpenFlow::Protocol::ActionSetIpDestination.new
+    action = ActionSetIpDestination.new
     expect(action.type).to eq(:set_ip_destination)
     expect(action.len).to eq(8)
     expect(action.ip_address).to eq('0.0.0.0')
   end
   it 'should initialize with some values' do
-    action = OpenFlow::Protocol::ActionSetIpDestination.new(ip_address: '10.0.0.1')
+    action = ActionSetIpDestination.new(ip_address: '10.0.0.1')
     expect(action.type).to eq(:set_ip_destination)
     expect(action.len).to eq(8)
     expect(action.ip_address).to eq('10.0.0.1')

data/spec/actions/action_set_ip_source_spec.rb

@@ -1,6 +1,6 @@
-describe OpenFlow::Protocol::ActionSetIpSource do
+describe ActionSetIpSource do
   it 'should read binary' do
-    action = OpenFlow::Protocol::ActionSetIpSource.read [
+    action = ActionSetIpSource.read [
       0, 6, 0, 8, # header
       10, 0, 0, 1 # ip_address
     ].pack('C*')
@@ -9,13 +9,13 @@ describe OpenFlow::Protocol::ActionSetIpSource do
     expect(action.ip_address).to eq('10.0.0.1')
   end
   it 'should initialize with default values' do
-    action = OpenFlow::Protocol::ActionSetIpSource.new
+    action = ActionSetIpSource.new
     expect(action.type).to eq(:set_ip_source)
     expect(action.len).to eq(8)
     expect(action.ip_address).to eq('0.0.0.0')
   end
   it 'should initialize with some values' do
-    action = OpenFlow::Protocol::ActionSetIpSource.new(ip_address: '10.0.0.1')
+    action = ActionSetIpSource.new(ip_address: '10.0.0.1')
     expect(action.type).to eq(:set_ip_source)
     expect(action.len).to eq(8)
     expect(action.ip_address).to eq('10.0.0.1')

data/spec/actions/action_set_ip_tos_spec.rb

@@ -1,6 +1,6 @@
-describe OpenFlow::Protocol::ActionSetIpTos do
+describe ActionSetIpTos do
   it 'should read binary' do
-    action = OpenFlow::Protocol::ActionSetIpTos.read [
+    action = ActionSetIpTos.read [
       0, 8, 0, 8, # header
       10,         # tos
       0, 0, 0     # padding
@@ -10,13 +10,13 @@ describe OpenFlow::Protocol::ActionSetIpTos do
     expect(action.tos).to eq(10)
   end
   it 'should initialize with default values' do
-    action = OpenFlow::Protocol::ActionSetIpTos.new
+    action = ActionSetIpTos.new
     expect(action.type).to eq(:set_ip_tos)
     expect(action.len).to eq(8)
     expect(action.tos).to eq(0)
   end
   it 'should initialize with some values' do
-    action = OpenFlow::Protocol::ActionSetIpTos.new(tos: 10)
+    action = ActionSetIpTos.new(tos: 10)
     expect(action.type).to eq(:set_ip_tos)
     expect(action.len).to eq(8)
     expect(action.tos).to eq(10)

data/spec/actions/action_set_mac_destination_spec.rb

@@ -1,6 +1,6 @@
-describe OpenFlow::Protocol::ActionSetMacDestination do
+describe ActionSetMacDestination do
   it 'should read binary' do
-    action = OpenFlow::Protocol::ActionSetMacDestination.read [
+    action = ActionSetMacDestination.read [
       0, 5, 0, 16,      # header
       0, 0, 0, 0, 0, 1, # mac_address
       0, 0, 0, 0, 0, 0  # padding
@@ -10,13 +10,13 @@ describe OpenFlow::Protocol::ActionSetMacDestination do
     expect(action.mac_address).to eq('00:00:00:00:00:01')
   end
   it 'should initialize with default values' do
-    action = OpenFlow::Protocol::ActionSetMacDestination.new
+    action = ActionSetMacDestination.new
     expect(action.type).to eq(:set_mac_destination)
     expect(action.len).to eq(16)
     expect(action.mac_address).to eq('00:00:00:00:00:00')
   end
   it 'should initialize with some values' do
-    action = OpenFlow::Protocol::ActionSetMacDestination.new(mac_address: '00:00:00:00:00:01')
+    action = ActionSetMacDestination.new(mac_address: '00:00:00:00:00:01')
     expect(action.type).to eq(:set_mac_destination)
     expect(action.len).to eq(16)
     expect(action.mac_address).to eq('00:00:00:00:00:01')

data/spec/actions/action_set_mac_source_spec.rb

@@ -1,6 +1,6 @@
-describe OpenFlow::Protocol::ActionSetMacSource do
+describe ActionSetMacSource do
   it 'should read binary' do
-    action = OpenFlow::Protocol::ActionSetMacSource.read [
+    action = ActionSetMacSource.read [
       0, 4, 0, 16,      # header
       0, 0, 0, 0, 0, 1, # mac_address
       0, 0, 0, 0, 0, 0  # padding
@@ -10,13 +10,13 @@ describe OpenFlow::Protocol::ActionSetMacSource do
     expect(action.mac_address).to eq('00:00:00:00:00:01')
   end
   it 'should initialize with default values' do
-    action = OpenFlow::Protocol::ActionSetMacSource.new
+    action = ActionSetMacSource.new
     expect(action.type).to eq(:set_mac_source)
     expect(action.len).to eq(16)
     expect(action.mac_address).to eq('00:00:00:00:00:00')
   end
   it 'should initialize with some values' do
-    action = OpenFlow::Protocol::ActionSetMacSource.new(mac_address: '00:00:00:00:00:01')
+    action = ActionSetMacSource.new(mac_address: '00:00:00:00:00:01')
     expect(action.type).to eq(:set_mac_source)
     expect(action.len).to eq(16)
     expect(action.mac_address).to eq('00:00:00:00:00:01')

data/spec/actions/action_set_source_port_spec.rb

@@ -1,6 +1,6 @@
-describe OpenFlow::Protocol::ActionSetSourcePort do
+describe ActionSetSourcePort do
   it 'should read binary' do
-    action = OpenFlow::Protocol::ActionSetSourcePort.read [
+    action = ActionSetSourcePort.read [
       0, 9, 0, 8, # header
       0, 1,       # port
       0, 0        # padding
@@ -10,13 +10,13 @@ describe OpenFlow::Protocol::ActionSetSourcePort do
     expect(action.port).to eq(1)
   end
   it 'should initialize with default values' do
-    action = OpenFlow::Protocol::ActionSetSourcePort.new
+    action = ActionSetSourcePort.new
     expect(action.type).to eq(:set_source_port)
     expect(action.len).to eq(8)
     expect(action.port).to eq(0)
   end
   it 'should initialize with some values' do
-    action = OpenFlow::Protocol::ActionSetSourcePort.new(port: 1)
+    action = ActionSetSourcePort.new(port: 1)
     expect(action.type).to eq(:set_source_port)
     expect(action.len).to eq(8)
     expect(action.port).to eq(1)

data/spec/actions/action_set_vlan_id_spec.rb

@@ -1,6 +1,6 @@
-describe OpenFlow::Protocol::ActionSetVlanId do
+describe ActionSetVlanId do
   it 'should read binary' do
-    action = OpenFlow::Protocol::ActionSetVlanId.read [
+    action = ActionSetVlanId.read [
       0, 1, 0, 8, # header
       0, 1,       # vlan_id
       0, 0        # padding
@@ -10,13 +10,13 @@ describe OpenFlow::Protocol::ActionSetVlanId do
     expect(action.vlan_id).to eq(1)
   end
   it 'should initialize with default values' do
-    action = OpenFlow::Protocol::ActionSetVlanId.new
+    action = ActionSetVlanId.new
     expect(action.type).to eq(:set_vlan_id)
     expect(action.len).to eq(8)
     expect(action.vlan_id).to eq(0)
   end
   it 'should initialize with some values' do
-    action = OpenFlow::Protocol::ActionSetVlanId.new(vlan_id: 1)
+    action = ActionSetVlanId.new(vlan_id: 1)
     expect(action.type).to eq(:set_vlan_id)
     expect(action.len).to eq(8)
     expect(action.vlan_id).to eq(1)

data/spec/actions/action_set_vlan_pcp_spec.rb

@@ -1,6 +1,6 @@
-describe OpenFlow::Protocol::ActionSetVlanPcp do
+describe ActionSetVlanPcp do
   it 'should read binary' do
-    action = OpenFlow::Protocol::ActionSetVlanPcp.read [
+    action = ActionSetVlanPcp.read [
       0, 2, 0, 8, # header
       1,          # vlan_pcp
       0, 0, 0     # padding
@@ -10,13 +10,13 @@ describe OpenFlow::Protocol::ActionSetVlanPcp do
     expect(action.vlan_pcp).to eq(1)
   end
   it 'should initialize with default values' do
-    action = OpenFlow::Protocol::ActionSetVlanPcp.new
+    action = ActionSetVlanPcp.new
     expect(action.type).to eq(:set_vlan_pcp)
     expect(action.len).to eq(8)
     expect(action.vlan_pcp).to eq(0)
   end
   it 'should initialize with some values' do
-    action = OpenFlow::Protocol::ActionSetVlanPcp.new(vlan_pcp: 1)
+    action = ActionSetVlanPcp.new(vlan_pcp: 1)
     expect(action.type).to eq(:set_vlan_pcp)
     expect(action.len).to eq(8)
     expect(action.vlan_pcp).to eq(1)

data/spec/actions/action_strip_vlan_spec.rb

@@ -1,6 +1,6 @@
-describe OpenFlow::Protocol::ActionStripVlan do
+describe ActionStripVlan do
   it 'should read binary' do
-    action = OpenFlow::Protocol::ActionStripVlan.read [
+    action = ActionStripVlan.read [
       0, 3, 0, 8, # header
       0, 0, 0, 0  # padding
     ].pack('C*')
@@ -8,7 +8,7 @@ describe OpenFlow::Protocol::ActionStripVlan do
     expect(action.len).to eq(8)
   end
   it 'should initialize with default values' do
-    action = OpenFlow::Protocol::ActionStripVlan.new
+    action = ActionStripVlan.new
     expect(action.type).to eq(:strip_vlan)
     expect(action.len).to eq(8)
   end

data/spec/actions/action_vendor_spec.rb

@@ -1,6 +1,6 @@
-describe OpenFlow::Protocol::ActionVendor do
+describe ActionVendor do
   it 'should read binary' do
-    action = OpenFlow::Protocol::ActionVendor.read [
+    action = ActionVendor.read [
       0xff, 0xff, 0, 8, # header
       0, 0, 0, 1        # vendor
     ].pack('C*')
@@ -9,13 +9,13 @@ describe OpenFlow::Protocol::ActionVendor do
     expect(action.vendor).to eq(1)
   end
   it 'should initialize with default values' do
-    action = OpenFlow::Protocol::ActionVendor.new
+    action = ActionVendor.new
     expect(action.type).to eq(:vendor)
     expect(action.len).to eq(8)
     expect(action.vendor).to eq(0)
   end
   it 'should initialize with some values' do
-    action = OpenFlow::Protocol::ActionVendor.new(vendor: 1)
+    action = ActionVendor.new(vendor: 1)
     expect(action.type).to eq(:vendor)
     expect(action.len).to eq(8)
     expect(action.vendor).to eq(1)

data/spec/actions/actions_spec.rb

@@ -1,6 +1,6 @@
-describe OpenFlow::Protocol::Actions do
+describe Actions do
   it 'should read binary' do
-    actions = OpenFlow::Protocol::Actions.read [
+    actions = Actions.read [
       # output
       0, 0, 0, 8, # header
       0, 1,       # port
@@ -16,13 +16,13 @@ describe OpenFlow::Protocol::Actions do
     expect(actions.last.type).to eq(:enqueue)
   end
   it 'should initialize with default values' do
-    actions = OpenFlow::Protocol::Actions.new
+    actions = Actions.new
     expect(actions).to be_empty
   end
   it 'should initialize with some values' do
-    actions = OpenFlow::Protocol::Actions.new([
-      OpenFlow::Protocol::ActionOutput.new(port: 1, max_length: 0xffff),
-      OpenFlow::Protocol::ActionEnqueue.new(port: 1, queue_id: 1)
+    actions = Actions.new([
+      ActionOutput.new(port: 1, max_length: 0xffff),
+      ActionEnqueue.new(port: 1, queue_id: 1)
     ])
     expect(actions.length).to eq(2)
     expect(actions.first.type).to eq(:output)

data/spec/messages/barrier_reply_spec.rb

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

data/spec/messages/barrier_request_spec.rb

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