Merge branch 'release/0.18.1'

trema · Mar 11, 2015 · c0b857e · c0b857e
2 parents 73ab68d + 0577716
commit c0b857e
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,14 @@
 # Changelog
 
 ## develop (unreleased)
+
+
+## 0.18.1 (3/11/2015)
+### Changes
+* `Lldp#port_number` returns primitive Ruby objects.
+
+
+## 0.18.0 (3/9/2015)
 ### Changes
 * Deprecated `Pio::Mac#== Integer`.
 * `Pio::PacketIn#source_mac` and `Pio::PacketIn#destination_mac` returns `Pio::Mac`.

diff --git a/features/lldp_read.feature b/features/lldp_read.feature
@@ -3,6 +3,22 @@ Feature: Pio::Lldp.read
     Given a packet data file "lldp.minimal.pcap"
     When I try to parse the file with "Lldp" class
     Then it should finish successfully
+    Then the parsed data #1 have the following field and value:
+    | field                     | value             |
+    | class                     | Pio::Lldp         |
+    | destination_mac           | 01:80:c2:00:00:0e |
+    | source_mac                | 00:04:96:1f:a7:26 |
+    | ether_type                | 35020             |
+    | chassis_id                | 19698525990       |
+    | dpid                      | 19698525990       |
+    | port_id                   | 1/3               |
+    | ttl                       | 120               |
+    | port_description          |                   |
+    | system_name               |                   |
+    | system_description        |                   |
+    | system_capabilities       |                   |
+    | management_address        |                   |
+    | organizationally_specific |                   |
 
   Scenario: lldp.detailed.pcap
     Given a packet data file "lldp.detailed.pcap"

diff --git a/lib/pio/lldp.rb b/lib/pio/lldp.rb
@@ -16,7 +16,6 @@ class Lldp
     def_delegator :@frame, :dpid
     def_delegator :@frame, :optional_tlv
     def_delegator :@frame, :port_id
-    alias_method :port_number, :port_id
     def_delegator :@frame, :ttl
     def_delegator :@frame, :port_description
     def_delegator :@frame, :system_name
@@ -42,6 +41,10 @@ def initialize(options)
       @frame = Frame.new(Options.new(options).to_hash)
     end
 
+    def port_number
+      @frame.port_id.get.snapshot
+    end
+
     def to_binary
       @frame.to_binary_s + "\000" * (64 - @frame.num_bytes)
     end

diff --git a/lib/pio/version.rb b/lib/pio/version.rb
@@ -1,5 +1,5 @@
 # Base module.
 module Pio
   # gem version.
-  VERSION = '0.18.0'.freeze
+  VERSION = '0.18.1'.freeze
 end
diff --git a/spec/pio/lldp_spec.rb b/spec/pio/lldp_spec.rb
@@ -153,6 +153,7 @@
       Then { lldp.chassis_id == 0x192fa7b28d }
       Then { lldp.port_id == 'Uplink to S1' }
       Then { lldp.port_number == 'Uplink to S1' }
+      Then { lldp.port_number.class == String }
       Then { lldp.ttl == 120 }
       Then { lldp.port_description == nil }
       Then { lldp.system_name == nil }
@@ -214,6 +215,7 @@
       Then { lldp.chassis_id == 0x192fa7b28d }
       Then { lldp.port_id == 'Uplink to S1' }
       Then { lldp.port_number == 'Uplink to S1' }
+      Then { lldp.port_number.class == String }
       Then { lldp.ttl == 120 }
       Then { lldp.port_description == 'Summit300-48-Port 1001' }
       Then { lldp.system_name == 'Summit300-48' }