Merge branch 'hotfix/0.28.1'

trema · Nov 5, 2015 · e4095b4 · e4095b4
2 parents 19c2257 + 022282a
commit e4095b4
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,11 @@
 ## develop (unreleased)
 
 
+## 0.28.1 (11/5/2015)
+### Changes
+* Remove `OpenFlow10` namespace from `Pio::OpenFlow10::SetSourceMacAddress` and `Pio::OpenFlow10::SetDestinationMacAddress`.
+
+
 ## 0.28.0 (11/5/2015)
 ### New features
 * [#267](https://github.com/trema/pio/pull/267): Add Queue Stats Request message generator.

diff --git a/features/open_flow10/set_destination_mac_address.feature b/features/open_flow10/set_destination_mac_address.feature
@@ -1,10 +1,10 @@
 @open_flow10
-Feature: Pio::OpenFlow10::SetDestinationMacAddress
+Feature: Pio::SetDestinationMacAddress
 
   Scenario: new('11:22:33:44:55:66')
     When I try to create an OpenFlow action with:
       """
-      Pio::OpenFlow10::SetDestinationMacAddress.new('11:22:33:44:55:66')
+      Pio::SetDestinationMacAddress.new('11:22:33:44:55:66')
       """
     Then it should finish successfully
     And the action has the following fields and values:

diff --git a/features/open_flow10/set_source_mac_address.feature b/features/open_flow10/set_source_mac_address.feature
@@ -1,10 +1,10 @@
 @open_flow10
-Feature: Pio::OpenFlow10::SetSourceMacAddress
+Feature: Pio::SetSourceMacAddress
 
   Scenario: new('11:22:33:44:55:66')
     When I try to create an OpenFlow action with:
       """
-      Pio::OpenFlow10::SetSourceMacAddress.new('11:22:33:44:55:66')
+      Pio::SetSourceMacAddress.new('11:22:33:44:55:66')
       """
     Then it should finish successfully
     And the action has the following fields and values:

diff --git a/lib/pio/open_flow.rb b/lib/pio/open_flow.rb
@@ -16,9 +16,10 @@ def self.version
 
     def self.switch_version(version)
       [:Barrier, :Echo, :Features, :FlowMod, :Hello, :Match,
-       :PacketIn, :FlowRemoved, :PacketOut, :SendOutPort, :PortStatus,
-       :Stats, :FlowStats, :DescriptionStats, :AggregateStats,
-       :TableStats, :PortStats, :QueueStats, :Error, :NiciraResubmit,
+       :PacketIn, :FlowRemoved, :PacketOut, :SendOutPort,
+       :SetSourceMacAddress, :SetDestinationMacAddress, :PortStatus, :Stats,
+       :FlowStats, :DescriptionStats, :AggregateStats, :TableStats, :PortStats,
+       :QueueStats, :Error, :NiciraResubmit,
        :NiciraResubmitTable].each do |each|
         set_message_class_name each, version
         @version = version.to_s

diff --git a/lib/pio/version.rb b/lib/pio/version.rb
@@ -1,5 +1,5 @@
 # Base module.
 module Pio
   # gem version.
-  VERSION = '0.28.0'.freeze
+  VERSION = '0.28.1'.freeze
 end