Use Pio develop branch

trema · Sep 20, 2016 · dd858aa · dd858aa
1 parent 7c1e0f0
commit dd858aa
Show file tree

Hide file tree

Showing 29 changed files with 44 additions and 22 deletions.
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -1,4 +1,5 @@
 AllCops:
+  TargetRubyVersion: 2.3
   Include:
     - ./*.conf
     - ./Gemfile

diff --git a/Gemfile b/Gemfile
@@ -1,3 +1,5 @@
 source 'https://rubygems.org'
 
 gemspec development_group: :test
+
+gem 'pio', github: 'trema/pio', branch: 'develop'
diff --git a/bin/trema b/bin/trema
@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 $LOAD_PATH.unshift File.join(__dir__, '..', 'lib')
 
 require 'rubygems'
@@ -56,7 +57,7 @@ module Trema
         Phut.log_dir = options[:log_dir]
         Phut.socket_dir = options[:socket_dir]
 
-        Pio::OpenFlow.switch_version('OpenFlow13') if options[:openflow13]
+        Pio::OpenFlow.version = :OpenFlow13 if options[:openflow13]
         options[:logging_level] = :debug if global_options[:verbose]
         Trema.logger.level = options[:logging_level]
         @command = Trema::Command.new

diff --git a/features/support/env.rb b/features/support/env.rb
@@ -1 +1,2 @@
+# frozen_string_literal: true
 require 'aruba/cucumber'
diff --git a/features/support/hooks.rb b/features/support/hooks.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 Before do
   @aruba_timeout_seconds = 5
 end

diff --git a/features/trema_run/openflow13_option.feature b/features/trema_run/openflow13_option.feature
@@ -16,7 +16,7 @@ Feature: --openflow13 option
         end
 
         def echo_reply(dpid, message)
-          logger.info "ofp_version = #{message.ofp_version}"
+          logger.info "ofp_version = #{message.version}"
         end
       end
       """

diff --git a/fixtures/event_logger/event_logger.rb b/fixtures/event_logger/event_logger.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # logs Trema events
 class EventLogger < Trema::Controller
   def start(args)

diff --git a/lib/trema.rb b/lib/trema.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'trema/controller'
 require 'trema/dirs'
 require 'trema/drb'

diff --git a/lib/trema/command.rb b/lib/trema/command.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'English'
 
 module Trema

diff --git a/lib/trema/controller.rb b/lib/trema/controller.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'active_support/core_ext/module/delegation'
 require 'phut'
 require 'pio'
@@ -169,9 +170,9 @@ def stop
     def send_flow_mod_add(datapath_id, options)
       flow_mod =
         case Pio::OpenFlow.version
-        when 'OpenFlow10'
+        when :OpenFlow10
           FlowMod.new(FlowModAddOption.new(options).to_hash)
-        when 'OpenFlow13'
+        when :OpenFlow13
           FlowMod.new(FlowModAdd13Option.new(options).to_hash)
         else
           raise "Unsupported OpenFlow version: #{Pio::OpenFlow.version}"

diff --git a/lib/trema/dirs.rb b/lib/trema/dirs.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'tmpdir'
 
 # OpenFlow controller framework.

diff --git a/lib/trema/drb.rb b/lib/trema/drb.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'drb'
 require 'phut'
 

diff --git a/lib/trema/logger.rb b/lib/trema/logger.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'active_support/core_ext/module/attribute_accessors'
 require 'logger'
 require 'phut'

diff --git a/lib/trema/monkey_patch/integer.rb b/lib/trema/monkey_patch/integer.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'trema/monkey_patch/integer/base_conversions'
 require 'trema/monkey_patch/integer/durations'
 

diff --git a/lib/trema/monkey_patch/integer/base_conversions.rb b/lib/trema/monkey_patch/integer/base_conversions.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Trema
   module MonkeyPatch
     module Integer

diff --git a/lib/trema/monkey_patch/integer/durations.rb b/lib/trema/monkey_patch/integer/durations.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Trema
   module MonkeyPatch
     module Integer

diff --git a/lib/trema/switch.rb b/lib/trema/switch.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'pio'
 require 'trema/logger'
 
@@ -17,9 +18,12 @@ def initialize(socket)
     end
 
     def init
-      exchange_hello_messages
-      exchange_echo_messages
-      exchange_features_messages
+      exchange_messages message_to_send: Hello, message_to_receive: Hello
+      exchange_messages(message_to_send: Echo::Request,
+                        message_to_receive: Echo::Reply)
+      @features_reply =
+        exchange_features_messages(message_to_send: Features::Request,
+                                   message_to_receive: Features::Reply)
       self
     end
 
@@ -39,19 +43,9 @@ def read
 
     private
 
-    def exchange_hello_messages
-      write Hello.new
-      expect_receiving Hello
-    end
-
-    def exchange_echo_messages
-      write Echo::Request.new
-      expect_receiving Echo::Reply
-    end
-
-    def exchange_features_messages
-      write Features::Request.new
-      @features_reply = expect_receiving(Features::Reply)
+    def exchange_messages(message_to_send:, message_to_receive:)
+      write message_to_send.new
+      expect_receiving message_to_receive
     end
 
     # rubocop:disable MethodLength
@@ -77,7 +71,7 @@ def expect_receiving(expected_message_klass)
 
     def read_openflow_binary
       header_binary = drain(OPENFLOW_HEADER_LENGTH)
-      header = OpenFlowHeaderParser.read(header_binary)
+      header = OpenFlow::Header.read(header_binary)
       body_binary = drain(header.message_length - OPENFLOW_HEADER_LENGTH)
       raise if (header_binary + body_binary).length != header.message_length
       header_binary + body_binary

diff --git a/lib/trema/version.rb b/lib/trema/version.rb
@@ -1,5 +1,6 @@
+# frozen_string_literal: true
 # Base module.
 module Trema
   # gem version.
-  VERSION = '0.10.1'.freeze
+  VERSION = '0.10.1'
 end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'simplecov'
 require 'codeclimate-test-reporter'
 require 'coveralls'

diff --git a/spec/trema/controller_spec.rb b/spec/trema/controller_spec.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'trema/controller'
 
 describe Trema::Controller do

diff --git a/tasks/cucumber.rake b/tasks/cucumber.rake
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 begin
   require 'cucumber/rake/task'
   Cucumber::Rake::Task.new

diff --git a/tasks/flay.rake b/tasks/flay.rake
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 begin
   require 'rake/tasklib'
   require 'flay'

diff --git a/tasks/flog.rake b/tasks/flog.rake
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 begin
   require 'flog'
 

diff --git a/tasks/gem.rake b/tasks/gem.rake
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 begin
   unless Dir.glob(File.join(__dir__, '../*.gemspec')).empty?
     require 'bundler/gem_tasks'

diff --git a/tasks/reek.rake b/tasks/reek.rake
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 begin
   require 'reek/rake/task'
   Reek::Rake::Task.new do |t|

diff --git a/tasks/relish.rake b/tasks/relish.rake
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 desc 'Push features to relish'
 task 'relish:push' do
   if Kernel.const_defined?(:RELISH_PROJECT)

diff --git a/tasks/rspec.rake b/tasks/rspec.rake
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 begin
   require 'rspec/core/rake_task'
   RSpec::Core::RakeTask.new

diff --git a/tasks/rubocop.rake b/tasks/rubocop.rake
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 begin
   require 'rubocop/rake_task'
   RuboCop::RakeTask.new

diff --git a/tasks/yard.rake b/tasks/yard.rake
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 begin
   require 'yard'
   YARD::Rake::YardocTask.new do |t|
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		# frozen_string_literal: true
		require 'aruba/cucumber'
-Original file line number
+Diff line change
@@ Expand Up / @@ -16,7 +16,7 @@ Feature: --openflow13 option @@
             end
             def echo_reply(dpid, message)
-              logger.info "ofp_version = #{message.ofp_version}"
+              logger.info "ofp_version = #{message.version}"
             end
           end
           """
@@ Expand Down @@