trema 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dab9ad5e8073729f235b8255bf9f22c9bdd41ec1
-  data.tar.gz: e7171cd9de212debc0c72c9bb111d06afdcfa07b
+  metadata.gz: 8ba4d24fdaf57d51c18d72a343c23d3ceb6f5ffb
+  data.tar.gz: c982a5ed2c86f493542ed578c2a4b5639efdfe01
 SHA512:
-  metadata.gz: 3cab3c7b79b83d0cfb210dbd05cc4a905fe646ee2c878a7a4f7e0f58753d000da4bff0abfc8826def84e469c67c781f6894bcd4395b0b552f8e3627611ad2e18
-  data.tar.gz: df6da3aa3099902242749ddeceaccc21eef3a948cd2f0dd754e15b3d39b6f66a5ff48ab17669961bf4641485df25f2d55fb8e9c885f0d42dba277e6a244dc5e2
+  metadata.gz: 3101604fddd57d89825dd25b82adec759170a2683b814150d87b295d50c35b6d4be698b0e5400a8513ebc2344ba1e4e84dc2ba370dc73780a1c408e7a178e551
+  data.tar.gz: b41a030af51e5ef322b61021268cf83b4080e1c9618ca355c2b0a5a7876b4fab3445aa0c35ac51bb02b90ead858eb459e3c0bdf14b30ae453650418da0abe512

data/.rubocop.yml

@@ -6,9 +6,9 @@ AllCops:
     - ./Rakefile
     - tasks/*.rake
   Exclude:
-    - bin/*
     - tmp/**/*
     - vendor/**/*
+    - !ruby/regexp /bin\/(?:(?!trema).)*$/
 
 Style/StringLiterals:
   EnforcedStyle: single_quotes

data/.travis.yml

@@ -13,11 +13,11 @@ rvm:
   - 2.0
   - 2.1
   - 2.2
+  - 2.3.0
   - ruby-head
 
 matrix:
   allow_failures:
-    - rvm: 2.1
     - rvm: ruby-head
   fast_finish: true
 

data/CHANGELOG.md

@@ -3,6 +3,13 @@
 ## develop (unreleased)
 
 
+## 0.10.0 (2/17/2015)
+### New features
+* [#418](https://github.com/trema/trema/pull/418): Ruby 2.3.0 support
+* [#419](https://github.com/trema/trema/pull/419): Add trema reset_stats command
+* [#421](https://github.com/trema/trema/pull/421): Add Trema::Logger#unknown method
+
+
 ## 0.9.0 (12/17/2015)
 ### New features
 * [#415](https://github.com/trema/trema/pull/415): Add `trema netns [command]` command.

data/bin/trema

@@ -11,6 +11,7 @@ require 'trema'
 # OpenFlow controller framework.
 module Trema
   # trema command.
+  # rubocop:disable ModuleLength
   module App
     extend GLI::App
 
@@ -50,22 +51,33 @@ module Trema
         Phut.log_dir = options[:log_dir]
         Phut.socket_dir = options[:socket_dir]
         Pio::OpenFlow.switch_version('OpenFlow13') if options[:openflow13]
+        begin
+          options[:logging_level] =
+            { debug: ::Logger::DEBUG,
+              info: ::Logger::INFO,
+              warn: ::Logger::WARN,
+              error: ::Logger::ERROR,
+              fatal: ::Logger::FATAL,
+              unknown: ::Logger::UNKNOWN
+            }.fetch(options[:logging_level].to_sym)
+          options[:logging_level] = ::Logger::DEBUG if global_options[:verbose]
+        rescue KeyError
+          raise(ArgumentError,
+                "Invalid log level: #{options[:logging_level]}")
+        end
         require 'trema/switch'
         Trema::Command.new.run(args, global_options.merge(options))
       end
     end
 
     desc 'Print all flow entries'
-    arg_name 'switches...'
+    arg_name 'switch'
     command :dump_flows do |c|
-      c.desc 'Location to put socket files'
+      c.desc 'Location to find socket files'
       c.flag [:S, :socket_dir], default_value: Trema::DEFAULT_SOCKET_DIR
 
       c.action do |_global_options, options, args|
-        Phut.socket_dir = options[:socket_dir]
-        args.each do |each|
-          puts Trema.fetch(each, options.fetch(:socket_dir)).dump_flows
-        end
+        puts Trema.fetch(args.first, options.fetch(:socket_dir)).dump_flows
       end
     end
 
@@ -82,8 +94,8 @@ module Trema
       c.flag [:S, :socket_dir], default_value: Trema::DEFAULT_SOCKET_DIR
 
       c.action do |_global_options, options, _args|
-        fail '--source option is mandatory' if options[:source].nil?
-        fail '--dest option is mandatory' if options[:dest].nil?
+        raise '--source option is mandatory' if options[:source].nil?
+        raise '--dest option is mandatory' if options[:dest].nil?
         dest = Trema.fetch(options.fetch(:dest), options.fetch(:socket_dir))
         Phut::VhostDaemon.
           process(options.fetch(:source), options.fetch(:socket_dir)).
@@ -126,6 +138,16 @@ module Trema
       end
     end
 
+    desc 'Reset stats of packets'
+    command :reset_stats do |c|
+      c.desc 'Location to find socket files'
+      c.flag [:S, :socket_dir], default_value: Trema::DEFAULT_SOCKET_DIR
+
+      c.action do |_global_options, options, _args|
+        Trema.vhosts(options[:socket_dir]).each(&:reset_stats)
+      end
+    end
+
     desc "Brings a switch's specified port up"
     command :port_up do |c|
       c.desc 'switch name'
@@ -136,8 +158,8 @@ module Trema
       c.flag [:S, :socket_dir], default_value: Trema::DEFAULT_SOCKET_DIR
 
       c.action do |_global_options, options, _args|
-        fail '--switch option is mandatory' if options[:switch].nil?
-        fail '--port option is mandatory' if options[:port].nil?
+        raise '--switch option is mandatory' if options[:switch].nil?
+        raise '--port option is mandatory' if options[:port].nil?
         Trema.trema_processes(options[:socket_dir]).each do |trema|
           begin
             trema.port_up(options[:switch], options[:port].to_i)
@@ -158,8 +180,8 @@ module Trema
       c.flag [:S, :socket_dir], default_value: Trema::DEFAULT_SOCKET_DIR
 
       c.action do |_global_options, options, _args|
-        fail '--switch option is mandatory' if options[:switch].nil?
-        fail '--port option is mandatory' if options[:port].nil?
+        raise '--switch option is mandatory' if options[:switch].nil?
+        raise '--port option is mandatory' if options[:port].nil?
         Trema.trema_processes(options[:socket_dir]).each do |trema|
           begin
             trema.port_down(options[:switch], options[:port].to_i)
@@ -234,37 +256,40 @@ module Trema
       end
     end
 
+    # rubocop:disable LineLength
     desc 'Opens a new shell or runs a command in the specified network namespace'
     arg_name 'name [command]'
     command :netns do |c|
-      c.action do |global_options, options, args|
+      c.action do |_global_options, _options, args|
         command_args = args[1..-1]
-        if command_args && command_args.size > 0
+        if command_args && !command_args.empty?
           system "sudo ip netns exec #{args[0]} #{command_args.join(' ')}"
         else
           system "sudo ip netns exec #{args[0]} #{ENV['SHELL']}"
         end
       end
     end
+    # rubocop:enable LineLength
 
     default_command :help
 
     on_error do |e|
       case e
       when OptionParser::ParseError,
-        Trema::NoControllerDefined,
-        Trema::InvalidLoggingLevel,
-        Phut::OpenVswitch::AlreadyRunning,
-        GLI::UnknownCommandArgument
+           Trema::NoControllerDefined,
+           Phut::OpenVswitch::AlreadyRunning,
+           GLI::UnknownCommandArgument,
+           ArgumentError
         true
       when Interrupt
         exit false
       else
         # show backtrace
-        fail e
+        raise e
       end
     end
 
     exit run(ARGV)
   end
+  # rubocop:enable ModuleLength
 end

data/features/.nav

@@ -1,16 +1,16 @@
 - trema_run (trema run command):
   - run.feature (basic usage)
+  - conf_option.feature
+  - daemonize_option.feature
+  - openflow13_option.feature
   - log_dir_option.feature
   - pid_dir_option.feature
   - socket_dir_option.feature
-  - conf_option.feature
-  - daemonize_option.feature
   - logging_level_option.feature
-  - openflow13_option.feature
   - port_option.feature
 
 - trema_dump_flows (trema dump_flows command):
-  - dump_flows.feature
+  - dump_flows.feature (basic usage)
 
 - trema_killall (trema killall command):
   - killall.feature (basic usage)
@@ -38,6 +38,7 @@
   - warn.feature
   - error.feature
   - fatal.feature
+  - unknown.feature
 
 - api (controller API):
   - logging.feature

data/features/logger/unknown.feature

@@ -0,0 +1,47 @@
+Feature: Trema::Controller#logger.unknown
+  Background:
+    Given I set the environment variables to:
+      | variable         | value |
+      | TREMA_LOG_DIR    | .     |
+      | TREMA_PID_DIR    | .     |
+      | TREMA_SOCKET_DIR | .     |
+    And a file named "hello.rb" with:
+      """ruby
+      class Hello < Trema::Controller
+        def start(_args)
+          logger.unknown 'Konnichi Wa'
+        end
+      end
+      """
+
+  @sudo
+  Scenario: the default logging level
+    When I trema run "hello.rb" interactively
+    And sleep 2
+    And I trema killall "Hello"
+    Then the output should contain "Konnichi Wa"
+    And the file "Hello.log" should contain "ANY -- : Konnichi Wa"
+
+  @sudo
+  Scenario: --logging_level unknown
+    When I run `trema run hello.rb --logging_level unknown` interactively
+    And sleep 2
+    And I trema killall "Hello"
+    Then the output should contain "Konnichi Wa"
+    And the file "Hello.log" should contain "ANY -- : Konnichi Wa"
+
+  @sudo
+  Scenario: -v
+    When I run `trema -v run hello.rb` interactively
+    And sleep 2
+    And I trema killall "Hello"
+    Then the output should contain "Konnichi Wa"
+    And the file "Hello.log" should contain "ANY -- : Konnichi Wa"
+
+  @sudo
+  Scenario: --verbose
+    When I run `trema --verbose run hello.rb` interactively
+    And sleep 2
+    And I trema killall "Hello"
+    Then the output should contain "Konnichi Wa"
+    And the file "Hello.log" should contain "ANY -- : Konnichi Wa"

data/features/step_definitions/dump_flows_steps.rb

@@ -1,9 +1,8 @@
 Then(/^the switch "(.*?)" has (\d+) flow entr(?:y|ies)$/) do |switch, number|
-  # FIXME: Read TREMA_SOCKET_DIR in trema dump_flows
-  command = "trema dump_flows #{switch} -S ."
+  command = "trema dump_flows #{switch}"
   step "I successfully run `#{command}`"
   dump_flows = aruba.command_monitor.find(Aruba.platform.detect_ruby(command))
-  expect(dump_flows.output.split("\n").size - 1).to eq(number.to_i)
+  expect(dump_flows.output.split("\n").size).to eq(number.to_i)
 end
 
 Then(/^the switch "(.*?)" has no flow entry$/) do |switch|

data/features/step_definitions/show_stats_steps.rb

@@ -15,7 +15,7 @@ Then(/^the number of packets sent from "(.*?)" should be:$/) do |host_name, tabl
       when /-> (\S+) = (\d+) packet/
         result[Regexp.last_match(1)] = Regexp.last_match(2).to_i
       else
-        fail "Failed to parse line '#{each}'"
+        raise "Failed to parse line '#{each}'"
       end
     end
   end
@@ -45,7 +45,7 @@ Then(/^the number of packets received by "(.*?)" should be:$/) do |host_name, ta
         next unless received
         result[Regexp.last_match(1)] = Regexp.last_match(3).to_i
       else
-        fail "Failed to parse line '#{each}'"
+        raise "Failed to parse line '#{each}'"
       end
     end
   end
@@ -74,7 +74,7 @@ Then(/^the total number of received packets should be:$/) do |table|
           next unless received
           result += Regexp.last_match(3).to_i
         else
-          fail "Failed to parse line '#{each}'"
+          raise "Failed to parse line '#{each}'"
         end
       end
     end

data/features/support/hooks.rb

@@ -3,7 +3,7 @@ Before do
 end
 
 Before('@sudo') do
-  fail 'sudo authentication failed' unless system 'sudo -v'
+  raise 'sudo authentication failed' unless system 'sudo -v'
   @aruba_timeout_seconds = 15
 end
 

data/features/trema_dump_flows/README.md

@@ -0,0 +1,5 @@
+`trema dump_flows` Prints to the console all flow entries in switch's tables.
+
+```
+trema [global options] dump_flows [command options] switch
+```

data/features/trema_dump_flows/dump_flows.feature

@@ -19,31 +19,37 @@ Feature: dump_flows
       """
     And a file named "trema.conf" with:
       """ruby
-      vswitch { datapath_id 0xabc }
+      vswitch('of_switch') { datapath_id 0xabc }
       """
 
   @sudo
   Scenario: dump_flows (no flow entries)
     Given I trema run "noop_controller.rb" with the configuration "trema.conf"
-    When I successfully run `trema dump_flows 0xabc`
-    Then the output from "trema dump_flows 0xabc" should not contain "actions=drop"
+    When I successfully run `trema dump_flows of_switch`
+    Then the output from "trema dump_flows of_switch" should contain exactly ""
 
   @sudo
   Scenario: dump_flows (one flow entry)
     Given I trema run "flow_mod_controller.rb" with the configuration "trema.conf"
-    When I successfully run `trema dump_flows 0xabc`
-    Then the output from "trema dump_flows 0xabc" should contain "actions=drop"
+    When I successfully run `trema dump_flows of_switch`
+    Then the output should match:
+      """
+      ^cookie=0x0, duration=\d+\.\d+s, table=0, n_packets=0, n_bytes=0, idle_age=\d+, priority=0 actions=drop
+      """
 
   @sudo
   Scenario: dump_flows OpenFlow 1.3 (no flow entries)
     Given I use OpenFlow 1.3
     And I trema run "noop_controller.rb" with the configuration "trema.conf"
-    When I successfully run `trema dump_flows 0xabc`
-    Then the output from "trema dump_flows 0xabc" should not contain "actions=drop"
+    When I successfully run `trema dump_flows of_switch`
+    Then the output from "trema dump_flows of_switch" should contain exactly ""
 
   @sudo
   Scenario: dump_flows OpenFlow 1.3 (one flow entry)
     Given I use OpenFlow 1.3
     And I trema run "flow_mod_controller.rb" with the configuration "trema.conf"
-    When I successfully run `trema dump_flows 0xabc`
-    Then the output from "trema dump_flows 0xabc" should contain "actions=drop"
+    When I successfully run `trema dump_flows of_switch`
+    Then the output should match:
+      """
+      ^cookie=0x0, duration=\d+\.\d+s, table=0, n_packets=0, n_bytes=0, priority=0 actions=drop
+      """

data/features/trema_dump_flows/socket_dir_option.feature

@@ -0,0 +1,47 @@
+Feature: -S (--socket_dir) option
+
+  -S (--socket_dir) option specifies the location to find socket files
+
+  Background:
+    Given I set the environment variables to:
+      | variable         | value |
+      | TREMA_LOG_DIR    | .     |
+      | TREMA_PID_DIR    | .     |
+    And a file named "flow_mod_controller.rb" with:
+      """ruby
+      class FlowModController < Trema::Controller
+        def switch_ready(datapath_id)
+          send_flow_mod_add(datapath_id, match: Match.new)
+        end
+      end
+      """
+    And a file named "trema.conf" with:
+      """ruby
+      vswitch('of_switch') { datapath_id 0xabc }
+      """
+    And I successfully run `trema run flow_mod_controller.rb -c trema.conf -S . -d`
+  
+  @sudo
+  Scenario: -S option
+    When I successfully run `trema dump_flows of_switch -S .`
+    Then the output should match:
+      """
+      ^cookie=0x0, duration=\d+\.\d+s, table=0, n_packets=0, n_bytes=0, idle_age=\d+, priority=0 actions=drop
+      """
+
+  @sudo
+  Scenario: --socket_dir option
+    When I successfully run `trema dump_flows of_switch --socket_dir .`
+    Then the output should match:
+      """
+      ^cookie=0x0, duration=\d+\.\d+s, table=0, n_packets=0, n_bytes=0, idle_age=\d+, priority=0 actions=drop
+      """
+
+  @sudo
+  Scenario: "No such directory" error
+    When I run `trema dump_flows of_switch --socket_dir sock`
+    Then the exit status should not be 0
+    And the stderr should contain:
+      """
+      No such directory
+      """

data/features/trema_netns/netns.feature

@@ -45,11 +45,11 @@ Feature: netns
   @sudo
   Scenario Outline: netns namespece command
     When I run `<command>`
-    Then the stdout should contain "<output>"
+    Then the stdout should contain "<message>"
     Examples:
-       |command                                  |output                             |
-       |trema netns host1 ip add show host1      |192.168.1.2                        |
-       |trema netns host1 -- ping -c1 192.168.1.3|1 packets transmitted, 1 received, |
-       |trema netns host1 "ping -c1 192.168.1.3" |1 packets transmitted, 1 received, |
-       |trema netns host1 "ip addr \| grep 127"  |127.0.0.1                          |
-       |trema netns host1 ls $PWD                |simple_hub.conf                    |
+      | command                                   | message                            |
+      | trema netns host1 ip add show host1       | 192.168.1.2                        |
+      | trema netns host1 -- ping -c1 192.168.1.3 | 1 packets transmitted, 1 received, |
+      | trema netns host1 "ping -c1 192.168.1.3"  | 1 packets transmitted, 1 received, |
+      | trema netns host1 "ip addr show lo"       | 127.0.0.1                          |
+      | trema netns host1 ls $PWD                 | simple_hub.conf                    |

data/features/trema_reset_stats/reset_stats.feature

@@ -0,0 +1,37 @@
+Feature: reset_stats
+  Background:
+    Given I set the environment variables to:
+      | variable         | value |
+      | TREMA_LOG_DIR    | .     |
+      | TREMA_PID_DIR    | .     |
+      | TREMA_SOCKET_DIR | .     |
+    And a file named "flood.rb" with:
+      """ruby
+      class Flood < Trema::Controller
+        def packet_in(datapath_id, message)
+          send_packet_out(
+            datapath_id,
+            packet_in: message,
+            actions: SendOutPort.new(:flood)
+          )
+        end
+      end
+      """
+    And a file named "trema.conf" with:
+      """ruby
+      vswitch { datapath_id 0xabc }
+      vhost('host1') { ip '192.168.0.1' }
+      vhost('host2') { ip '192.168.0.2' }
+      link '0xabc', 'host1'
+      link '0xabc', 'host2'
+      """
+
+  @sudo
+  Scenario: run controller_file
+    When I successfully run `trema run flood.rb -c trema.conf -d` 
+    And I successfully run `trema send_packets --source host1 --dest host2`
+    And I successfully run `trema reset_stats`
+    Then I successfully run `trema show_stats host1`
+    And the output from "trema show_stats host1" should contain exactly ""
+    And I successfully run `trema show_stats host2`
+    And the output from "trema show_stats host2" should contain exactly ""

data/features/trema_run/conf_option.feature

@@ -54,7 +54,7 @@ Feature: -c (--conf) option
       """
     When I run `trema run null_controller.rb -c invalid_trema.conf`
     Then the exit status should not be 0
-    Then the output should contain "uninitialized constant Phut::Syntax::Baz (NameError)"
+    Then the output should match /uninitialized constant .*::Baz \(NameError\)/
 
   @sudo
   Scenario: SyntaxError

data/features/trema_run/logging_level_option.feature

@@ -26,10 +26,10 @@ Feature: -l (--logging_level) option
     And the file "Hello.log" should contain "DEBUG -- : Konnichi Wa"
 
   @sudo
-  Scenario: "Invalid logging level" error
+  Scenario: "Invalid log level" error
     When I run `trema run hello.rb --logging_level hoge -d`
     Then the exit status should not be 0
     And the stderr should contain:
       """
-      Invalid logging level: hoge
+      Invalid log level: hoge
       """

data/features/trema_run/socket_dir_option.feature

@@ -17,14 +17,12 @@ Feature: -S (--socket_dir) option
     When I successfully run `trema run null_controller.rb -S . -d`
     And sleep 3
     Then a socket file named "NullController.ctl" should exist
-    And a socket file named "trema.NullController.ctl" should exist
 
   @sudo
   Scenario: --socket_dir option
     When I successfully run `trema run null_controller.rb --socket_dir . -d`
     And sleep 3
     Then a socket file named "NullController.ctl" should exist
-    And a socket file named "trema.NullController.ctl" should exist
 
   @sudo
   Scenario: "No such directory" error

data/lib/trema/command.rb

@@ -1,16 +1,13 @@
 require 'English'
 
 module Trema
-  class InvalidLoggingLevel < StandardError; end
-
   # trema command
   # rubocop:disable ClassLength
   class Command
-    def self.unix_domain_socket(name = nil, check = false)
-      file_name = name ? "trema.#{name}.ctl" : 'trema.ctl'
-      path = File.expand_path(File.join Phut.socket_dir, file_name)
+    def self.unix_domain_socket(name, check = false)
+      path = File.expand_path(File.join(Phut.socket_dir, "#{name}.ctl"))
       if check && !FileTest.socket?(path)
-        fail "Socket file #{path} does not exist."
+        raise "Socket file #{path} does not exist."
       end
       'drbunix:' + path
     end
@@ -22,24 +19,11 @@ module Trema
     def run(args, options)
       @args = args
       @daemon = options[:daemonize]
-
-      begin
-        Controller.logging_level =
-          { debug: ::Logger::DEBUG,
-            info: ::Logger::INFO,
-            warn: ::Logger::WARN,
-            error: ::Logger::ERROR,
-            fatal: ::Logger::FATAL }.fetch(options[:logging_level].to_sym)
-        Controller.logging_level = ::Logger::DEBUG if options[:verbose]
-      rescue KeyError
-        raise(InvalidLoggingLevel,
-              "Invalid logging level: #{options[:logging_level]}")
-      end
-
       $LOAD_PATH.unshift File.expand_path(File.dirname(@args.first))
       load @args.first
       port_number = (options[:port] || Controller::DEFAULT_TCP_PORT).to_i
-      @controller = Controller.create(port_number)
+      @controller =
+        Controller.create(port_number, options.fetch(:logging_level))
 
       trap_signals
       create_pid_file
@@ -119,9 +103,9 @@ module Trema
     # rubocop:enable MethodLength
 
     def start_controller_and_drb_threads
+      DRb.start_service Command.unix_domain_socket(@controller.name), self
       @controller_thread = Thread.new { @controller.run @args[1..-1] }
       @controller_thread.abort_on_exception = true
-      DRb.start_service Command.unix_domain_socket(@controller.name), self
       DRb.thread.join
     rescue
       killall
@@ -166,7 +150,7 @@ module Trema
     # rubocop:enable MethodLength
 
     def create_pid_file
-      fail "#{name} is already running." if running?
+      raise "#{name} is already running." if running?
       update_pid_file
     end
 

data/lib/trema/controller.rb

@@ -107,13 +107,9 @@ module Trema
       # rubocop:enable MethodLength
     end
 
-    class << self
-      attr_accessor :logging_level
-    end
-
     include Pio
 
-    SWITCH = {}
+    SWITCH = {} # rubocop:disable MutableConstant
     DEFAULT_TCP_PORT = 6653
 
     # @return [Logger]
@@ -134,19 +130,21 @@ module Trema
     end
 
     # @private
-    def self.create(port_number = DEFAULT_TCP_PORT)
+    def self.create(port_number = DEFAULT_TCP_PORT,
+                    logging_level = ::Logger::INFO)
       unless @controller_klass
-        fail NoControllerDefined, 'No controller class is defined.'
+        raise NoControllerDefined, 'No controller class is defined.'
       end
-      @controller_klass.new(port_number)
+      @controller_klass.new(port_number, logging_level)
     end
 
     # @private
-    def initialize(port_number = DEFAULT_TCP_PORT)
+    def initialize(port_number = DEFAULT_TCP_PORT,
+                   logging_level = ::Logger::INFO)
       @port_number = port_number
       @threads = []
       @logger = Logger.new(name)
-      @logger.level = Controller.logging_level
+      @logger.level = logging_level
     end
 
     # @private
@@ -154,9 +152,6 @@ module Trema
     # explicitly, because this is called implicitly by "trema run"
     # command.
     def run(args)
-      drb_socket_file =
-        File.expand_path(File.join(Phut.socket_dir, "#{name}.ctl"))
-      @drb = DRb::DRbServer.new 'drbunix:' + drb_socket_file, self
       maybe_send_handler :start, args
       socket = TCPServer.open('<any>', @port_number)
       start_timers
@@ -168,7 +163,6 @@ module Trema
     end
 
     def stop
-      @drb.stop_service if @drb
       @threads.map(&:kill)
     end
 
@@ -182,7 +176,7 @@ module Trema
         when 'OpenFlow13'
           FlowMod.new(FlowModAdd13Option.new(options).to_hash)
         else
-          fail "Unsupported OpenFlow version: #{Pio::OpenFlow.version}"
+          raise "Unsupported OpenFlow version: #{Pio::OpenFlow.version}"
         end
       send_message datapath_id, flow_mod
     end
@@ -318,14 +312,14 @@ module Trema
         when :modify
           maybe_send_handler :port_modify, datapath_id, message
         else
-          fail "Invalid Port Status message: #{message.inspect}"
+          raise "Invalid Port Status message: #{message.inspect}"
         end
       when Barrier::Reply
         maybe_send_handler :barrier_reply, datapath_id, message
       when DescriptionStats::Reply
         maybe_send_handler :description_stats_reply, datapath_id, message
       else
-        fail "Unknown OpenFlow message: #{message.inspect}"
+        raise "Unknown OpenFlow message: #{message.inspect}"
       end
     end
     # rubocop:enable MethodLength

data/lib/trema/drb.rb

@@ -5,18 +5,24 @@ require 'phut'
 module Trema
   def self.trema_process(controller_name, socket_dir)
     Phut.socket_dir = socket_dir
-    socket_path = File.join(Phut.socket_dir, "trema.#{controller_name}.ctl")
+    socket_path = File.join(Phut.socket_dir, "#{controller_name}.ctl")
     unless FileTest.socket?(socket_path)
-      fail %(Controller process "#{controller_name}" does not exist.)
+      raise %(Controller process "#{controller_name}" does not exist.)
     end
     DRbObject.new_with_uri('drbunix:' + socket_path)
   end
 
   def self.trema_processes(socket_dir = Phut.socket_dir)
     Phut.socket_dir = socket_dir
-    Dir.glob(File.join Phut.socket_dir, 'trema.*.ctl').map do |each|
-      DRbObject.new_with_uri('drbunix:' + each)
-    end
+    all = Dir.glob(File.join(Phut.socket_dir, '*.ctl'))
+    vhosts = Dir.glob(File.join(Phut.socket_dir, 'vhost.*.ctl'))
+    (all - vhosts).map { |each| DRbObject.new_with_uri("drbunix:#{each}") }
+  end
+
+  def self.vhosts(socket_dir = Phut.socket_dir)
+    Phut.socket_dir = socket_dir
+    vhosts = Dir.glob(File.join(Phut.socket_dir, 'vhost.*.ctl'))
+    vhosts.map { |each| DRbObject.new_with_uri("drbunix:#{each}") }
   end
 
   def self.fetch(name, socket_dir)
@@ -27,6 +33,6 @@ module Trema
         next
       end
     end
-    fail %("#{name}" does not exist.)
+    raise %("#{name}" does not exist.)
   end
 end

data/lib/trema/logger.rb

@@ -11,6 +11,10 @@ module Trema
       end
     end
 
+    def unknown(message)
+      output :unknown, message
+    end
+
     def fatal(message)
       output :fatal, message
     end

data/lib/trema/switch.rb

@@ -23,10 +23,10 @@ module Trema
     end
 
     def datapath_id
-      fail 'Switch is not initialized.' unless @features_reply
+      raise 'Switch is not initialized.' unless @features_reply
       @features_reply.datapath_id
     end
-    alias_method :dpid, :datapath_id
+    alias dpid datapath_id
 
     def write(message)
       @socket.write message.to_binary
@@ -68,7 +68,7 @@ module Trema
           @error_message = message
           fail InitError, message.description
         else
-          fail "Failed to receive #{expected_message_klass} message"
+          raise "Failed to receive #{expected_message_klass} message"
         end
       end
     end
@@ -78,7 +78,7 @@ module Trema
       header_binary = drain(OPENFLOW_HEADER_LENGTH)
       header = OpenFlowHeaderParser.read(header_binary)
       body_binary = drain(header.message_length - OPENFLOW_HEADER_LENGTH)
-      fail if (header_binary + body_binary).length != header.message_length
+      raise if (header_binary + body_binary).length != header.message_length
       header_binary + body_binary
     end
 

data/lib/trema/version.rb

@@ -1,5 +1,5 @@
 # Base module.
 module Trema
   # gem version.
-  VERSION = '0.9.0'.freeze
+  VERSION = '0.10.0'.freeze
 end

data/trema.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency 'bundler', '~> 1.11.2'
   gem.add_dependency 'gli', '~> 2.13.4'
-  gem.add_dependency 'phut', '~> 0.7.5'
+  gem.add_dependency 'phut', '~> 0.7.7'
   gem.add_dependency 'pio', '~> 0.30.0'
 
   # Docs
@@ -31,13 +31,13 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'yard', '~> 0.8.7.6'
 
   # Test
-  gem.add_development_dependency 'aruba', '~> 0.11.2'
+  gem.add_development_dependency 'aruba', '~> 0.13.0'
   gem.add_development_dependency 'codeclimate-test-reporter', '~> 0.4.8'
   gem.add_development_dependency 'coveralls', '~> 0.8.10'
-  gem.add_development_dependency 'cucumber', '~> 2.1.0'
+  gem.add_development_dependency 'cucumber', '~> 2.3.2'
   gem.add_development_dependency 'rake'
-  gem.add_development_dependency 'reek', '~> 3.7.1'
+  gem.add_development_dependency 'reek', '~> 3.10.2'
   gem.add_development_dependency 'rspec', '~> 3.4.0'
-  gem.add_development_dependency 'rspec-given', '~> 3.7.1'
-  gem.add_development_dependency 'rubocop', '~> 0.35.1'
+  gem.add_development_dependency 'rspec-given', '~> 3.8.0'
+  gem.add_development_dependency 'rubocop', '~> 0.37.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trema
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Yasuhito Takamiya
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-17 00:00:00.000000000 Z
+date: 2016-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.5
+        version: 0.7.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.5
+        version: 0.7.7
 - !ruby/object:Gem::Dependency
   name: pio
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.13.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.13.0
 - !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.3.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.3.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -170,14 +170,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.7.1
+        version: 3.10.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.7.1
+        version: 3.10.2
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -198,28 +198,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.7.1
+        version: 3.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.7.1
+        version: 3.8.0
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.35.1
+        version: 0.37.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.35.1
+        version: 0.37.2
 description: Trema is a full-stack, easy-to-use framework for developing OpenFlow
   controllers in Ruby.
 email:
@@ -257,6 +257,7 @@ files:
 - features/logger/error.feature
 - features/logger/fatal.feature
 - features/logger/info.feature
+- features/logger/unknown.feature
 - features/logger/warn.feature
 - features/step_definitions/.gitignore
 - features/step_definitions/.rubocop.yml
@@ -276,13 +277,16 @@ files:
 - features/trema_delete_link/README.md
 - features/trema_delete_link/delete_link.feature
 - features/trema_delete_link/socket_dir_option.feature
+- features/trema_dump_flows/README.md
 - features/trema_dump_flows/dump_flows.feature
+- features/trema_dump_flows/socket_dir_option.feature
 - features/trema_killall/README.md
 - features/trema_killall/all_option.feature
 - features/trema_killall/killall.feature
 - features/trema_killall/socket_dir_option.feature
 - features/trema_netns/README.md
 - features/trema_netns/netns.feature
+- features/trema_reset_stats/reset_stats.feature
 - features/trema_run/README.md
 - features/trema_run/conf_option.feature
 - features/trema_run/daemonize_option.feature
@@ -345,7 +349,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Full-stack OpenFlow framework.