trema 0.2.0 → 0.2.1

data/Gemfile.lock

@@ -48,7 +48,7 @@ GEM
       sexp_processor (~> 3.0)
     ruby_parser (2.3.1)
       sexp_processor (~> 3.0)
-    sexp_processor (3.0.10)
+    sexp_processor (3.1.0)
     term-ansicolor (1.0.7)
     yard (0.7.5)
 

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/features/trema.feature

@@ -16,6 +16,7 @@ Feature: trema help
       Available commands:
         run            - runs a trema application.
         kill           - terminates a trema process.
+        up             - starts a killed trema process again.
         killall        - terminates all trema processes.
         send_packets   - sends UDP packets to destination host.
         show_stats     - shows stats of packets.

data/features/trema.kill.feature

@@ -46,7 +46,7 @@ Feature: kill a trema process with `trema kill' command
     When I try to run "./trema help kill"
     Then the output should be:
       """
-      Usage: ./trema kill NAME [OPTIONS ...]
+      Usage: trema kill NAME [OPTIONS ...]
           -h, --help
           -v, --verbose
 

data/features/trema.killall.feature

@@ -23,7 +23,7 @@ Feature: kill all trema processes with `trema killall' command
     When I try to run "./trema help killall"
     Then the output should be:
       """
-      Usage: ./trema killall [OPTIONS ...]
+      Usage: trema killall [OPTIONS ...]
           -h, --help
           -v, --verbose
 

data/features/trema.reset_stats.feature

@@ -8,7 +8,7 @@ Feature: reset network stats with `trema reset_stats' command
     When I try to run "./trema help reset_stats"
     Then the output should be:
       """
-      Usage: ./trema reset_stats [OPTIONS ...]
+      Usage: trema reset_stats [OPTIONS ...]
           -h, --help
           -v, --verbose
       """

data/features/tutorial.packet_in.feature

@@ -27,7 +27,7 @@ Feature: Tutorial: Handling packet_in events example
 
 
   Scenario: Handle packet_in in Ruby
-    When I try trema run "./src/examples/packet_in/packet_in.rb" with following configuration (backgrounded):
+    When I try trema run "./src/examples/packet_in/packet-in.rb" with following configuration (backgrounded):
       """
       vswitch("packet_in") { dpid "0xabc" }
 

data/ruby/trema/command.rb

@@ -29,6 +29,7 @@ require "trema/command/run"
 require "trema/command/send_packets"
 require "trema/command/shell"
 require "trema/command/show_stats"
+require "trema/command/up"
 require "trema/command/usage"
 require "trema/command/version"
 

data/ruby/trema/command/dump_flows.rb

@@ -37,7 +37,7 @@ module Trema
       switch = Trema::DSL::Context.load_current.switches[ ARGV[ 0 ] ]
 
       options = OptionParser.new
-      options.banner = "Usage: #{ $PROGRAM_NAME } dump_flows SWITCH [OPTIONS ...]"
+      options.banner = "Usage: trema dump_flows SWITCH [OPTIONS ...]"
 
       options.on( "-h", "--help" ) do
         puts options.to_s

data/ruby/trema/command/kill.rb

@@ -32,7 +32,7 @@ module Trema
 
     def kill
       options = OptionParser.new
-      options.banner = "Usage: #{ $PROGRAM_NAME } kill NAME [OPTIONS ...]"
+      options.banner = "Usage: trema kill NAME [OPTIONS ...]"
 
       options.on( "-h", "--help" ) do
         puts options.to_s
@@ -50,13 +50,22 @@ module Trema
       pid_file = File.join( Trema.pid, "#{ ARGV[ 0 ] }.pid" )
       if FileTest.exist?( pid_file )
         Trema::Process.read( pid_file ).kill!
+        return
       end
 
       host = context.hosts[ ARGV[ 0 ] ]
-      host.shutdown! if host
+      if host
+        host.shutdown
+        return
+      end
 
       switch = context.switches[ ARGV[ 0 ] ]
-      switch.shutdown! if switch
+      if switch
+        switch.shutdown
+        return
+      end
+
+      raise "Unknown name: #{ ARGV[ 0 ] }"
 
       # [TODO] kill a link by its name. Needs a good naming convension for link.
     end

data/ruby/trema/command/killall.rb

@@ -31,7 +31,7 @@ module Trema
 
     def killall
       options = OptionParser.new
-      options.banner = "Usage: #{ $PROGRAM_NAME } killall [OPTIONS ...]"
+      options.banner = "Usage: trema killall [OPTIONS ...]"
 
       options.on( "-h", "--help" ) do
         puts options.to_s

data/ruby/trema/command/reset_stats.rb

@@ -35,7 +35,7 @@ module Trema
       sanity_check
 
       options = OptionParser.new
-      options.banner = "Usage: #{ $PROGRAM_NAME } reset_stats [OPTIONS ...]"
+      options.banner = "Usage: trema reset_stats [OPTIONS ...]"
 
       options.on( "-h", "--help" ) do
         puts options.to_s

data/ruby/trema/command/ruby.rb

@@ -30,7 +30,7 @@ module Trema
 
     def ruby
       options = OptionParser.new
-      options.banner = "Usage: #{ $PROGRAM_NAME } ruby [OPTIONS ...]"
+      options.banner = "Usage: trema ruby [OPTIONS ...]"
 
       options.on( "-h", "--help" ) do
         puts options.to_s

data/ruby/trema/command/up.rb

@@ -0,0 +1,65 @@
+#
+# trema up command.
+#
+# Author: Yasuhito Takamiya <yasuhito@gmail.com>
+#
+# Copyright (C) 2008-2012 NEC Corporation
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License, version 2, as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+
+
+require "optparse"
+require "trema/dsl"
+require "trema/util"
+
+
+module Trema
+  module Command
+    include Trema::Util
+
+
+    def up
+      options = OptionParser.new
+      options.banner = "Usage: trema up NAME [OPTIONS ...]"
+
+      options.on( "-h", "--help" ) do
+        puts options.to_s
+        exit 0
+      end
+      options.on( "-v", "--verbose" ) do
+        $verbose = true
+      end
+
+      options.parse! ARGV
+
+      context = Trema::DSL::Context.load_current
+
+      switch = context.switches[ ARGV[ 0 ] ]
+      if switch
+        switch.run
+        return
+      end
+
+      raise "Unknown name: #{ ARGV[ 0 ] }"
+    end
+  end
+end
+
+
+### Local variables:
+### mode: Ruby
+### coding: utf-8
+### indent-tabs-mode: nil
+### End:

data/ruby/trema/command/usage.rb

@@ -27,16 +27,16 @@ module Trema
 
       ARGV.clear << "--help"
       if command.nil?
-        trema = File.basename( $PROGRAM_NAME )
         puts <<-EOL
-usage: #{ trema } <COMMAND> [OPTIONS ...]
+usage: trema <COMMAND> [OPTIONS ...]
 
 Trema command-line tool
-Type '#{ trema } help <COMMAND>' for help on a specific command.
+Type 'trema help <COMMAND>' for help on a specific command.
 
 Available commands:
   run            - runs a trema application.
   kill           - terminates a trema process.
+  up             - starts a killed trema process again.
   killall        - terminates all trema processes.
   send_packets   - sends UDP packets to destination host.
   show_stats     - shows stats of packets.
@@ -47,7 +47,7 @@ EOL
       elsif method_for( command )
         __send__ method_for( command )
       else
-        STDERR.puts "Type '#{ trema } help' for usage."
+        STDERR.puts "Type 'trema help' for usage."
         exit false
       end
     end

data/ruby/trema/daemon.rb

@@ -64,8 +64,13 @@ module Trema
     end
 
 
-    def run!
+    def run
       raise "'#{ name }' is already running!" if running?
+      run!
+    end
+
+
+    def run!
       FileUtils.rm_f log_file if log_file
       command_block = self.class.class_eval do
         class_variable_get( :@@command )
@@ -87,6 +92,20 @@ module Trema
     #
     # @return [undefined]
     #
+    def shutdown
+      raise "'#{ name }' is not running!" if not running?
+      shutdown!
+    end
+
+
+    #
+    # Kills running daemon process. Errors are ignored.
+    #
+    # @example
+    #   daemon.shutdown!
+    #
+    # @return [undefined]
+    #
     def shutdown!
       Trema::Process.read( pid_file, name ).kill!
     end

data/src/examples/packet_in/{packet_in.rb → packet-in.rb}

@@ -23,6 +23,13 @@
 class PacketinDumper < Controller
   def packet_in datapath_id, event
     puts "received a packet_in"
+    info "datapath_id: #{ datapath_id.to_hex }"
+    info "transaction_id: #{ event.transaction_id.to_hex }"
+    info "buffer_id: #{ event.buffer_id.to_hex }"
+    info "total_len: #{ event.total_len }"
+    info "in_port: #{ event.in_port }"
+    info "reason: #{ event.reason.to_hex }"
+    info "data: #{ event.data.unpack "H*" }"
   end
 end
 

data/trema

@@ -30,10 +30,35 @@ require "trema/command"
 require "trema/path"
 
 
+def setup_tmp
+  if not FileTest.writable?( Trema.tmp )
+    # Trema is system widely installed with gem command
+    sh "sudo chmod o+w -R #{ Trema.tmp }"
+  end
+
+  FileUtils.mkdir_p Trema.log
+  FileUtils.mkdir_p Trema.pid
+  FileUtils.mkdir_p Trema.sock
+end
+
+
 def method_for command
+  case command
+    when "version", "-V", "--version"
+      return :version
+    when "ruby"
+      return :ruby
+    when "help", "-h", "--help", "/?", "-?"
+      return :usage
+  end
+
+  setup_tmp
+
   case command
     when "run", "start"
       return :run
+    when "up"
+      return :up
     when "kill", "stop", "off", "down"
       return :kill
     when "killall"
@@ -44,26 +69,16 @@ def method_for command
       return :show_stats
     when "reset_stats"
       return :reset_stats
-    when "ruby"
-      return :ruby
     when "dump_flows", "dump_flow"
       return :dump_flows
-    when "version", "-V", "--version"
-      return :version
     when "shell", NilClass
       return :shell
-    when "help", "-h", "--help", "/?", "-?"
-      return :usage
     else
       return nil
   end
 end
 
 
-FileUtils.mkdir_p Trema.log
-FileUtils.mkdir_p Trema.pid
-FileUtils.mkdir_p Trema.sock
-
 command = ARGV.shift
 if method_for( command )
   begin

data/trema.gemspec

@@ -5,12 +5,12 @@
 
 Gem::Specification.new do |s|
   s.name = "trema"
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Yasuhito Takamiya"]
   s.bindir = ["."]
-  s.date = "2012-02-29"
+  s.date = "2012-03-05"
   s.description = "Trema is a full-stack, easy-to-use framework for developing OpenFlow controllers in Ruby/C"
   s.email = "yasuhito@gmail.com"
   s.executables = ["trema", "trema-config"]
@@ -117,6 +117,7 @@ Gem::Specification.new do |s|
     "ruby/trema/command/send_packets.rb",
     "ruby/trema/command/shell.rb",
     "ruby/trema/command/show_stats.rb",
+    "ruby/trema/command/up.rb",
     "ruby/trema/command/usage.rb",
     "ruby/trema/command/version.rb",
     "ruby/trema/controller.c",
@@ -340,9 +341,9 @@ Gem::Specification.new do |s|
     "src/examples/openflow_message/set-config.rb",
     "src/examples/openflow_message/set_config.c",
     "src/examples/packet_in/README",
+    "src/examples/packet_in/packet-in.rb",
     "src/examples/packet_in/packet_in.c",
     "src/examples/packet_in/packet_in.conf",
-    "src/examples/packet_in/packet_in.rb",
     "src/examples/packetin_filter_config/README",
     "src/examples/packetin_filter_config/add_filter.c",
     "src/examples/packetin_filter_config/delete_filter.c",

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: trema
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Yasuhito Takamiya
@@ -16,7 +16,7 @@ bindir:
 - .
 cert_chain: []
 
-date: 2012-02-29 00:00:00 Z
+date: 2012-03-05 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: bundler
@@ -333,6 +333,7 @@ files:
 - ruby/trema/command/send_packets.rb
 - ruby/trema/command/shell.rb
 - ruby/trema/command/show_stats.rb
+- ruby/trema/command/up.rb
 - ruby/trema/command/usage.rb
 - ruby/trema/command/version.rb
 - ruby/trema/controller.c
@@ -556,9 +557,9 @@ files:
 - src/examples/openflow_message/set-config.rb
 - src/examples/openflow_message/set_config.c
 - src/examples/packet_in/README
+- src/examples/packet_in/packet-in.rb
 - src/examples/packet_in/packet_in.c
 - src/examples/packet_in/packet_in.conf
-- src/examples/packet_in/packet_in.rb
 - src/examples/packetin_filter_config/README
 - src/examples/packetin_filter_config/add_filter.c
 - src/examples/packetin_filter_config/delete_filter.c