Merge branch 'develop' into feature/nicira_reg_load

trema · Nov 11, 2015 · f213f0e · f213f0e
2 parents ad8f74d + 3e726c6
commit f213f0e
Show file tree

Hide file tree

Showing 9 changed files with 40 additions and 44 deletions.
diff --git a/features/open_flow10/nicira_resubmit.feature → features/open_flow/nicira_resubmit.feature b/features/open_flow10/nicira_resubmit.feature → features/open_flow/nicira_resubmit.feature
@@ -1,4 +1,3 @@
-@open_flow10
 Feature: Pio::NiciraResubmit
 
   Scenario: new(1)

diff --git a/...open_flow10/nicira_resubmit_table.feature → ...s/open_flow/nicira_resubmit_table.feature b/...open_flow10/nicira_resubmit_table.feature → ...s/open_flow/nicira_resubmit_table.feature
@@ -1,4 +1,3 @@
-@open_flow10
 Feature: Pio::NiciraResubmitTable
 
   Scenario: new(in_port: 1, table: 1)

diff --git a/lib/pio/open_flow.rb b/lib/pio/open_flow.rb
@@ -19,9 +19,9 @@ def self.switch_version(version)
        :PacketIn, :FlowRemoved, :PacketOut, :SendOutPort,
        :SetSourceMacAddress, :SetDestinationMacAddress, :PortStatus, :Stats,
        :FlowStats, :DescriptionStats, :AggregateStats, :TableStats, :PortStats,
-       :QueueStats, :Error, :NiciraResubmit, :SetArpOperation,
-       :SetArpSenderProtocolAddress, :SetArpSenderHardwareAddress,
-       :NiciraResubmitTable, :NiciraRegMove, :NiciraRegLoad].each do |each|
+       :QueueStats, :Error, :SetArpOperation, :SetArpSenderProtocolAddress,
+       :SetArpSenderHardwareAddress, :NiciraRegMove,
+       :NiciraRegLoad].each do |each|
         set_message_class_name each, version
         @version = version.to_s
       end

diff --git a/lib/pio/open_flow/nicira_resubmit.rb b/lib/pio/open_flow/nicira_resubmit.rb
@@ -0,0 +1,18 @@
+require 'pio/open_flow/nicira_action'
+require 'pio/open_flow10/port16'
+
+module Pio
+  # NXAST_RESUBMIT action
+  class NiciraResubmit < OpenFlow::NiciraAction
+    nicira_action_header action_type: 0xffff,
+                         action_length: 16,
+                         subtype: 1
+    port16 :in_port
+    string :padding, length: 4
+    hide :padding
+
+    def initialize(port_number)
+      super(in_port: port_number)
+    end
+  end
+end
diff --git a/lib/pio/open_flow/nicira_resubmit_table.rb b/lib/pio/open_flow/nicira_resubmit_table.rb
@@ -0,0 +1,15 @@
+require 'pio/open_flow/nicira_action'
+require 'pio/open_flow10/port16'
+
+module Pio
+  # NXAST_RESUBMIT_TABLE action
+  class NiciraResubmitTable < OpenFlow::NiciraAction
+    nicira_action_header action_type: 0xffff,
+                         action_length: 16,
+                         subtype: 14
+    port16 :in_port
+    uint8 :table, initial_value: 0xff
+    string :padding, length: 3
+    hide :padding
+  end
+end
diff --git a/lib/pio/open_flow10.rb b/lib/pio/open_flow10.rb
@@ -27,8 +27,8 @@
 require 'pio/open_flow10/table_stats/request'
 
 # Actions
-require 'pio/open_flow10/nicira_resubmit'
-require 'pio/open_flow10/nicira_resubmit_table'
+require 'pio/open_flow/nicira_resubmit'
+require 'pio/open_flow/nicira_resubmit_table'
 require 'pio/open_flow10/send_out_port'
 require 'pio/open_flow10/set_destination_mac_address'
 require 'pio/open_flow10/set_source_mac_address'

diff --git a/lib/pio/open_flow10/nicira_resubmit.rb b/lib/pio/open_flow10/nicira_resubmit.rb
diff --git a/lib/pio/open_flow10/nicira_resubmit_table.rb b/lib/pio/open_flow10/nicira_resubmit_table.rb
diff --git a/lib/pio/open_flow13.rb b/lib/pio/open_flow13.rb
@@ -13,6 +13,8 @@
 require 'pio/open_flow13/stats_request'
 
 # Actions
+require 'pio/open_flow/nicira_resubmit'
+require 'pio/open_flow/nicira_resubmit_table'
 require 'pio/open_flow13/nicira_reg_load'
 require 'pio/open_flow13/nicira_reg_move'
 require 'pio/open_flow13/send_out_port'