pio 0.14.0 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1fd283fac969bbd9c87f81cbca52df75e1ea0688
-  data.tar.gz: ef718b4d71676d8d5280297e9baa886b593d5d59
+  metadata.gz: 160b6df4de3e742f9bc613203352993fe5f8b1b9
+  data.tar.gz: a35953dba3610759b5d00e111538523bafb65ac5
 SHA512:
-  metadata.gz: dc32c4a9a1b820c3c15bc6e1e32f5ad939021e4e4ffc13e744050e2c503743d81bbec8d4a23e9a2c5a18f770e08c3118f3a1b69f1295644890df5e465c811c7c
-  data.tar.gz: 52d1e44d687f70d594ae39e09dc82b56963bcf3e1fc1c5f5b768319d2001a4bdba43ff9968a81a70bb46b76506af9d37e0dbe61e729da6d840eb40739881ea8e
+  metadata.gz: b558f6a0be89346665789e8847a221791a03db8381dbcb558b6ae3c8580717d91e7f209353b92bd20f54894d1607e68a815eef68fcd34cc135d5f5a86c0e26ee
+  data.tar.gz: 821b6cecaa878417d2338f6e1d1a801f7f98549b721acadeb8fafd5d48dee98e6a485c5efc222381d1a41de5c2823705b4adad2d6227ca10bbd72ecc9bb6633c

data/CHANGELOG.md

@@ -3,6 +3,14 @@
 ## develop (unreleased)
 
 
+## 0.15.0 (2/12/2015)
+### New features
+* [#126](https://github.com/trema/pio/pull/126): Add new class `Pio::PortStatus`.
+* [#126](https://github.com/trema/pio/pull/126): Add new methods `Pio::Type::OpenFlow::PhyPort#up?`, `Pio::Type::OpenFlow::PhyPort#down?`, `Pio::Type::OpenFlow::PhyPort#local?`, `Pio::Type::OpenFlow::PhyPort#datapath_id` and `Pio::Type::OpenFlow::PhyPort#dpid`.
+* [#126](https://github.com/trema/pio/pull/126): Add new methods `Pio::PacketIn#lldp?`.
+* [#126](https://github.com/trema/pio/pull/126): Add new methods `Pio::Features::Reply#physical_ports`.
+
+
 ## 0.14.0 (2/9/2015)
 ### New features
 * [#125](https://github.com/trema/pio/pull/125): Add new accessor methods `Pio::PacketIn#datapath_id` and `Pio::PacketIn#dpid`.

data/README.md

@@ -24,6 +24,7 @@ supports the following packet formats:
     -   Packet-In
     -   Packet-Out
     -   Flow Mod
+    -   Port Status
 -   (…currently there are just a few formats supported but I'm sure this list will grow)
 
 ## Features Overview
@@ -384,5 +385,4 @@ 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/features/port_status_read.feature

@@ -0,0 +1,24 @@
+Feature: Pio::PortStatus.read
+  Scenario: port_status.raw
+    Given a packet data file "port_status.raw"
+    When I try to parse the file with "PortStatus" class
+    Then it should finish successfully
+    And the parsed data have the following field and value:
+    | field                 | value                      |
+    | class                 | Pio::PortStatus            |
+    | ofp_version           | 1                          |
+    | message_type          | 12                         |
+    | message_length        | 64                         |
+    | transaction_id        | 4                          |
+    | xid                   | 4                          |
+    | reason                | delete                     |
+    | desc.port_no          | 65533                      |
+    | desc.hardware_address | 01:02:03:04:05:06          |
+    | desc.name             | foo                        |
+    | desc.config           | [:no_flood]                |
+    | desc.state            | [:stp_forward, :stp_block] |
+    | desc.curr             | [:port_10mb_hd]            |
+    | desc.advertised       | [:port_1gb_fd]             |
+    | desc.supported        | [:port_autoneg]            |
+    | desc.peer             | [:port_pause_asym]         |
+    

data/lib/pio.rb

@@ -12,3 +12,4 @@ require 'pio/lldp'
 require 'pio/mac'
 require 'pio/packet_in'
 require 'pio/packet_out'
+require 'pio/port_status'

data/lib/pio/features.rb

@@ -65,7 +65,19 @@ module Pio
       def_delegators :body, :n_tables
       def_delegators :body, :capabilities
       def_delegators :body, :actions
-      def_delegators :body, :ports
+
+      def ports
+        body.ports.map do |each|
+          each.datapath_id = datapath_id
+          each
+        end
+      end
+
+      def physical_ports
+        ports.select do |each|
+          each.port_no <= PortNumber::MAX
+        end
+      end
     end
   end
 end

data/lib/pio/open_flow/phy_port.rb

@@ -53,9 +53,28 @@ module Pio
         port_feature :supported
         port_feature :peer
 
+        attr_accessor :datapath_id
+        alias_method :dpid, :datapath_id
+
+        def number
+          port_no
+        end
+
         def mac_address
           hardware_address
         end
+
+        def up?
+          !down?
+        end
+
+        def down?
+          config.include?(:port_down) || state.include?(:link_down)
+        end
+
+        def local?
+          port_no == PortNumber::NUMBERS[:local]
+        end
       end
     end
   end

data/lib/pio/open_flow/type.rb

@@ -8,6 +8,7 @@ module Pio
       FEATURES_REQUEST = 5
       FEATURES_REPLY = 6
       PACKET_IN = 10
+      PORT_STATUS = 12
       PACKET_OUT = 13
       FLOW_MOD = 14
     end

data/lib/pio/packet_in.rb

@@ -69,6 +69,7 @@ module Pio
         rest :rest
       end
 
+      # rubocop:disable MethodLength
       def self.read(raw_data)
         ethernet_header = EthernetHeaderParser.read(raw_data)
         case ethernet_header.ether_type
@@ -76,10 +77,13 @@ module Pio
           IPv4Packet.read raw_data
         when 0x0806
           Pio::Arp.read raw_data
+        when 0x88cc
+          Pio::Lldp.read raw_data
         else
           fail 'Failed to parse packet_in data.'
         end
       end
+      # rubocop:enable MethodLength
     end
 
     attr_accessor :datapath_id
@@ -96,6 +100,10 @@ module Pio
       @parsed_data ||= DataParser.read(data)
     end
 
+    def lldp?
+      parsed_data.is_a? Lldp
+    end
+
     def source_mac
       parsed_data.source_mac
     end

data/lib/pio/port_status.rb

@@ -0,0 +1,37 @@
+require 'pio/open_flow'
+
+module Pio
+  # OpenFlow 1.0 Port Status message
+  class PortStatus < OpenFlow::Message.factory(OpenFlow::Type::PORT_STATUS)
+    # What changed about the physical port
+    class Reason < BinData::Primitive
+      REASONS = { add: 0, delete: 1, modify: 2 }
+
+      uint8 :reason
+
+      def get
+        REASONS.invert.fetch(reason)
+      end
+
+      def set(value)
+        self.reason = REASONS.fetch(value)
+      end
+    end
+
+    # Message body of Packet-In.
+    class PortStatusBody < BinData::Record
+      endian :big
+
+      reason :reason
+      uint56 :padding
+      hide :padding
+      phy_port :desc
+    end
+
+    def_delegators :body, :desc
+
+    def reason
+      body.reason.to_s.to_sym
+    end
+  end
+end

data/lib/pio/version.rb

@@ -1,5 +1,5 @@
 # Base module.
 module Pio
   # gem version.
-  VERSION = '0.14.0'.freeze
+  VERSION = '0.15.0'.freeze
 end

data/pio.gemspec

@@ -37,7 +37,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'bindata', '~> 2.1.0'
 
   gem.add_development_dependency 'rake'
-  gem.add_development_dependency 'bundler', '~> 1.7.12'
+  gem.add_development_dependency 'bundler', '~> 1.8.0'
   gem.add_development_dependency 'pry', '~> 0.10.1'
 
   # Guard

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pio
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.15.0
 platform: ruby
 authors:
 - Yasuhito Takamiya
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-08 00:00:00.000000000 Z
+date: 2015-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bindata
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.7.12
+        version: 1.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.7.12
+        version: 1.8.0
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -435,6 +435,7 @@ files:
 - features/packet_data/vendor_stats_request.raw
 - features/packet_in_read.feature
 - features/packet_out_read.feature
+- features/port_status_read.feature
 - features/step_definitions/packet_data_steps.rb
 - features/step_definitions/pending_steps.rb
 - features/support/env.rb
@@ -508,6 +509,7 @@ files:
 - lib/pio/packet_out.rb
 - lib/pio/parse_error.rb
 - lib/pio/pcap.rb
+- lib/pio/port_status.rb
 - lib/pio/send_out_port.rb
 - lib/pio/set_eth_addr.rb
 - lib/pio/set_ip_addr.rb
@@ -679,6 +681,7 @@ test_files:
 - features/packet_data/echo_request.raw
 - features/exact_match.feature
 - features/icmp_read.feature
+- features/port_status_read.feature
 - features/arp_read.feature
 - features/step_definitions/pending_steps.rb
 - features/step_definitions/packet_data_steps.rb