pio 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2f4f183d8a7d47bfd6ed73449452f65f0695e8fe
-  data.tar.gz: c184b79b8c5a2e8298caaa40e58d2be00434afa8
+  metadata.gz: cf86d154a2025304879d8c6d252b71a2eda73ef8
+  data.tar.gz: 18e3dda3e1ca8061b51d9ef4d8db29e0ffbde9c8
 SHA512:
-  metadata.gz: 7a84124f47fc65aca6fbfc6edf702fd23b2231537154460c6d34ea93f8a075e2bba08b03c60f05e7c4a7919823b7c2c8f3eecee5f794945e8d997de550046848
-  data.tar.gz: 0a59da76fc8bbaa2d4bded717765876d52db4fd67e97e6b5b4839c4aac28db04afcaccc0f3219971d6b364e7069d707c24fce153b94bda3e963a62918caf2f46
+  metadata.gz: 3a66499af05e0a468ca0d272237d6fabf489f868407d78d62c43083d30b2c7ee01e3b66cdff45533adb44e6aa11a45027e0074934a0b551de68188a53cd0cad9
+  data.tar.gz: 49e01b280cddef5a2400f46a19ef1d622c0da2eeeb4165c1a53fdc5e86b892b95110b027868c6def6f92127dfd95f395bb86ea51b2f162b66e7014688e90ebcb

data/CHANGELOG.md

@@ -1,9 +1,14 @@
 # Changelog
 
+## 0.8.2 (12/18/2014)
+
+### Bugs fixed
+* [#100](https://github.com/trema/pio/pull/100): Fix bug when passing `ports:` option to `Pio::Features::Request.new`.
+
+
 ## 0.8.1 (6/5/2014)
 
 ### Misc
-
 * Updated bundled gems.
 * Modernized Gemfile and .gemspec.
 

data/README.md

@@ -1,10 +1,11 @@
 # Pio
 
-<a href='https://rubygems.org/gems/pio'><img src='http://img.shields.io/gem/v/pio.svg' alt='Gem Version' /></a>
-<a href='https://travis-ci.org/trema/pio'><img src='http://img.shields.io/travis/trema/pio/develop.svg' alt='Build Status' /></a>
-<a href='https://codeclimate.com/github/trema/pio'><img src='http://img.shields.io/codeclimate/github/trema/pio.svg' alt='Code Climate' /></a>
-<a href='https://coveralls.io/r/trema/pio?branch=develop'><img src='http://img.shields.io/coveralls/trema/pio/develop.svg' alt='Coverage Status' /></a>
-<a href='https://gemnasium.com/trema/pio'><img src='https://gemnasium.com/trema/pio.svg' alt='Dependency Status' /></a>
+<a href='https://rubygems.org/gems/pio'><img src='http://img.shields.io/gem/v/pio.svg?style=flat' alt='Gem Version' /></a>
+<a href='https://travis-ci.org/trema/pio'><img src='http://img.shields.io/travis/trema/pio/develop.svg?style=flat' alt='Build Status' /></a>
+<a href='https://codeclimate.com/github/trema/pio'><img src='http://img.shields.io/codeclimate/github/trema/pio.svg?style=flat' alt='Code Climate' /></a>
+<a href='https://coveralls.io/r/trema/pio?branch=develop'><img src='http://img.shields.io/coveralls/trema/pio/develop.svg?style=flat' alt='Coverage Status' /></a>
+<a href='https://gemnasium.com/trema/pio'><img src='http://img.shields.io/gemnasium/trema/pio.svg?style=flat' alt='Dependency Status' /></a>
+<a href='https://gitter.im/trema/pio'><img src='https://badges.gitter.im/Join Chat.svg?style=flat' alt='Gitter Chat' /></a>
 <a href="http://inch-pages.github.io/github/trema/pio"><img src="http://inch-pages.github.io/github/trema/pio.svg" alt="Inline docs"></a>
 
 <a href="http://www.flickr.com/photos/mongogushi/4226014070/" title="pio pencil by mongo gushi, on Flickr"><img src="http://farm5.staticflickr.com/4022/4226014070_cdeb7c1e5d_n.jpg" width="320" height="290" alt="pio pencil"></a>
@@ -228,12 +229,23 @@ generate an Features Request/Reply message like below:
 
     # The Features xid (transaction_id)
     # should be same as that of the request.
-    reply = Pio::Features::Reply.new(xid: request.xid,
-                                     dpid: 0x123,
-                                     n_buffers: 0x100,
-                                     n_tables: 0xfe,
-                                     capabilities: 0xc7,
-                                     actions: 0xfff)
+    reply = Pio::Features::Reply.new(
+              xid: request.xid,
+              dpid: 0x123,
+              n_buffers: 0x100,
+              n_tables: 0xfe,
+              capabilities: [:flow_stats, :table_stats, :port_stats,
+                             :queue_stats, :arp_match_ip],
+              actions: [:output, :set_vlan_vid, :set_vlan_pcp, :strip_vlan,
+                        :set_dl_src, :set_dl_dst, :set_nw_src, :set_nw_dst,
+                        :set_nw_tos, :set_tp_src, :set_tp_dst, :enqueue],
+              ports: [{ port_no: 1,
+                        hardware_address: '11:22:33:44:55:66',
+                        name: 'port123',
+                        config: [:port_down],
+                        state: [:link_down],
+                        curr: [:port_10gb_fd, :port_copper] }]
+            )
     reply.to_binary  # => Features Reply message in binary format.
 
 ## Installation
@@ -269,4 +281,5 @@ and install it by running Bundler:
 ## License
 
 Pio is released under the GNU General Public License version 3.0:
+
 -   <http://www.gnu.org/licenses/gpl.html>

data/Rakefile

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'bundler/gem_tasks'
 
 # rubocop:disable HashSyntax

data/examples/features_new.rb

@@ -5,10 +5,21 @@ request.to_binary  # => Features Request message in binary format.
 
 # The Features xid (transaction_id)
 # should be same as that of the request.
-reply = Pio::Features::Reply.new(xid: request.xid,
-                                 dpid: 0x123,
-                                 n_buffers: 0x100,
-                                 n_tables: 0xfe,
-                                 capabilities: 0xc7,
-                                 actions: 0xfff)
+reply = Pio::Features::Reply.new(
+          xid: request.xid,
+          dpid: 0x123,
+          n_buffers: 0x100,
+          n_tables: 0xfe,
+          capabilities: [:flow_stats, :table_stats, :port_stats,
+                         :queue_stats, :arp_match_ip],
+          actions: [:output, :set_vlan_vid, :set_vlan_pcp, :strip_vlan,
+                    :set_dl_src, :set_dl_dst, :set_nw_src, :set_nw_dst,
+                    :set_nw_tos, :set_tp_src, :set_tp_dst, :enqueue],
+          ports: [{ port_no: 1,
+                    hardware_address: '11:22:33:44:55:66',
+                    name: 'port123',
+                    config: [:port_down],
+                    state: [:link_down],
+                    curr: [:port_10gb_fd, :port_copper] }]
+        )
 reply.to_binary  # => Features Reply message in binary format.

data/features/step_definitions/packet_data_steps.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 Given(/^a packet data file "(.*?)"$/) do |name|
   path = File.expand_path(File.join(File.dirname(__FILE__),
                                     '..', 'packet_data', name))

data/features/step_definitions/pending_steps.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 Given(/^PENDING/) do
   pending
 end

data/features/support/env.rb

@@ -1,4 +1,2 @@
-# encoding: utf-8
-
 require 'pio'
 require 'pio/pcap'

data/lib/pio.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'pio/parse_error'
 
 require 'pio/arp'

data/lib/pio/arp.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'pio/arp/format'
 require 'pio/arp/request'
 require 'pio/arp/reply'

data/lib/pio/arp/format.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'bindata'
 require 'pio/type/ethernet_header'
 require 'pio/type/ip_address'

data/lib/pio/arp/message.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'forwardable'
 require 'pio/arp/format'
 
@@ -9,31 +7,25 @@ module Pio
     class Message
       extend Forwardable
 
-      def_delegators :@frame, :destination_mac
-      def_delegators :@frame, :source_mac
-      def_delegators :@frame, :ether_type
-      def_delegators :@frame, :hardware_type
-      def_delegators :@frame, :protocol_type
-      def_delegators :@frame, :hardware_length
-      def_delegators :@frame, :protocol_length
-      def_delegators :@frame, :operation
-      def_delegators :@frame, :sender_hardware_address
-      def_delegators :@frame, :sender_protocol_address
-      def_delegators :@frame, :target_hardware_address
-      def_delegators :@frame, :target_protocol_address
-      def_delegators :@frame, :to_binary
-
-      def self.create_from(frame)
-        message = allocate
-        message.instance_variable_set :@frame, frame
-        message
-      end
+      def_delegators :@format, :destination_mac
+      def_delegators :@format, :source_mac
+      def_delegators :@format, :ether_type
+      def_delegators :@format, :hardware_type
+      def_delegators :@format, :protocol_type
+      def_delegators :@format, :hardware_length
+      def_delegators :@format, :protocol_length
+      def_delegators :@format, :operation
+      def_delegators :@format, :sender_hardware_address
+      def_delegators :@format, :sender_protocol_address
+      def_delegators :@format, :target_hardware_address
+      def_delegators :@format, :target_protocol_address
+      def_delegators :@format, :to_binary
 
       private_class_method :new
 
       def initialize(user_options)
         options = self.class.const_get(:Options).new(user_options.dup.freeze)
-        @frame = Arp::Format.new(options.to_hash)
+        @format = Arp::Format.new(options.to_hash)
       end
     end
   end

data/lib/pio/arp/reply.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'pio/arp/message'
 require 'pio/mac'
 require 'pio/options'

data/lib/pio/arp/request.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'pio/arp/message'
 require 'pio/mac'
 require 'pio/options'

data/lib/pio/dhcp.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 # Packet parser and generator library.
 module Pio
   # Dhcp parser and generator.

data/lib/pio/dhcp/ack.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'pio/dhcp/boot_reply'
 
 module Pio

data/lib/pio/dhcp/boot_reply.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'pio/dhcp/message'
 require 'pio/dhcp/boot_reply_options'
 

data/lib/pio/dhcp/boot_reply_options.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'pio/options'
 require 'pio/dhcp/common_options'
 require 'pio/dhcp/dhcp_tlv_options'

data/lib/pio/dhcp/boot_request.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'pio/dhcp/message'
 require 'pio/dhcp/boot_request_options'
 

data/lib/pio/dhcp/boot_request_options.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'pio/options'
 require 'pio/dhcp/common_options'
 require 'pio/dhcp/dhcp_tlv_options'

data/lib/pio/dhcp/client_id.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'pio/type/mac_address'
 
 module Pio

data/lib/pio/dhcp/common_options.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module Pio
   class Dhcp
     # DHCP Common Options.

data/lib/pio/dhcp/csum_util.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module Pio
   class Dhcp
     # Checksum Calculate Utility.

data/lib/pio/dhcp/dhcp_field.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'pio/dhcp/optional_tlv'
 require 'pio/type/ip_address'
 require 'pio/type/mac_address'

data/lib/pio/dhcp/dhcp_tlv_options.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'pio/dhcp/common_options'
 
 module Pio

data/lib/pio/dhcp/discover.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'pio/dhcp/boot_request'
 
 module Pio

data/lib/pio/dhcp/field_util.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module Pio
   class Dhcp
     # Dhcp Field Read Methods.

data/lib/pio/dhcp/frame.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'pio/type/ethernet_header'
 require 'pio/type/ipv4_header'
 require 'pio/type/udp_header'

data/lib/pio/dhcp/message.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'pio/dhcp/frame'
 require 'forwardable'
 

data/lib/pio/dhcp/offer.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'pio/dhcp/boot_reply'
 
 module Pio

data/lib/pio/dhcp/optional_tlv.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'pio/dhcp/parameter_list'
 require 'pio/dhcp/client_id'
 require 'pio/type/ip_address'

data/lib/pio/dhcp/parameter_list.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'bindata'
 
 module Pio

data/lib/pio/dhcp/request.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'pio/dhcp/boot_request'
 
 module Pio

data/lib/pio/echo.rb

@@ -1,18 +1,15 @@
-# encoding: utf-8
-
 require 'pio/echo/format'
 require 'pio/echo/reply'
 require 'pio/echo/request'
 require 'pio/message_type_selector'
+require 'pio/open_flow'
 
 module Pio
   # OpenFlow Echo Request and Reply message parser.
   class Echo
     extend MessageTypeSelector
 
-    REQUEST = 2
-    REPLY = 3
-
-    message_type REQUEST => Request, REPLY => Reply
+    message_type Pio::OpenFlow::Type::ECHO_REQUEST => Request,
+                 Pio::OpenFlow::Type::ECHO_REPLY => Reply
   end
 end

data/lib/pio/echo/format.rb

@@ -1,17 +1,21 @@
-# encoding: utf-8
-
 require 'bindata'
-require 'pio/type/open_flow'
+require 'pio/open_flow'
 
 module Pio
   class Echo
-    # OpenFlow 1.0 Echo message format.
+    # OpenFlow 1.0 Echo request and reply message parser.
     class Format < BinData::Record
-      extend Type::OpenFlow
+      include Pio::OpenFlow::Type
+
+      def message_type
+        open_flow_header.message_type
+      end
 
       endian :big
 
-      openflow_header
+      open_flow_header :open_flow_header
+      virtual assert: -> { [ECHO_REQUEST, ECHO_REPLY].include?(message_type) }
+
       string :body
     end
   end