trema 0.2.5 → 0.2.6

data/ruby/trema/command/kill.rb

@@ -1,8 +1,4 @@
 #
-# trema kill 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
@@ -20,8 +16,6 @@
 #
 
 
-require "optparse"
-require "trema/dsl"
 require "trema/util"
 
 
@@ -30,44 +24,45 @@ module Trema
     include Trema::Util
 
 
-    def kill
-      options = OptionParser.new
-      options.banner = "Usage: trema kill NAME [OPTIONS ...]"
-
-      options.on( "-h", "--help" ) do
-        puts options.to_s
-        exit 0
-      end
-      options.on( "-v", "--verbose" ) do
-        $verbose = true
+    def trema_kill name
+      unless maybe_kill( name )
+        exit_now! "unknown name: #{ name }"
       end
+    end
 
-      options.parse! ARGV
 
-      context = Trema::DSL::Context.load_current
+    ############################################################################
+    private
+    ############################################################################
 
-      # [FIXME] Trema apps does not appear in context.apps. why?
-      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 ] ]
-      if host
-        host.shutdown
-        return
-      end
+    def maybe_kill name
+      killed = maybe_kill_app( name ) || nil
+      killed ||= maybe_shutdown_host( name )
+      killed ||= maybe_shutdown_switch( name )
+      # [TODO] kill a link by its name. Needs a good naming convension for link.
+      killed
+    end
 
-      switch = context.switches[ ARGV[ 0 ] ]
-      if switch
-        switch.shutdown
-        return
-      end
 
-      raise "Unknown name: #{ ARGV[ 0 ] }"
+    def maybe_kill_app name
+      app = find_app_by_name( name )
+      app.kill! if app
+      app
+    end
 
-      # [TODO] kill a link by its name. Needs a good naming convension for link.
+
+    def maybe_shutdown_host name
+      host = find_host_by_name( name )
+      host.shutdown! if host
+      host
+    end
+
+
+    def maybe_shutdown_switch name
+      switch = find_switch_by_name( name )
+      switch.shutdown if switch
+      switch
     end
   end
 end

data/ruby/trema/command/killall.rb

@@ -1,8 +1,4 @@
 #
-# trema killall 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
@@ -20,7 +16,6 @@
 #
 
 
-require "optparse"
 require "trema/util"
 
 
@@ -29,20 +24,7 @@ module Trema
     include Trema::Util
 
 
-    def killall
-      options = OptionParser.new
-      options.banner = "Usage: trema killall [OPTIONS ...]"
-
-      options.on( "-h", "--help" ) do
-        puts options.to_s
-        exit 0
-      end
-      options.on( "-v", "--verbose" ) do
-        $verbose = true
-      end
-
-      options.parse! ARGV
-
+    def trema_killall
       cleanup_current_session
     end
   end

data/{features/step_definitions/kill_steps.rb → ruby/trema/command/netns.rb}

@@ -1,6 +1,4 @@
 #
-# Author: Yasuhito Takamiya <yasuhito@gmail.com>
-#
 # Copyright (C) 2008-2012 NEC Corporation
 #
 # This program is free software; you can redistribute it and/or modify
@@ -18,13 +16,23 @@
 #
 
 
-When /^I try trema kill "([^"]*)"$/ do | component |
-  run "./trema kill #{ component }"
+require "trema/util"
+
+
+module Trema
+  module Command
+    include Trema::Util
+
+
+    def trema_netns netns
+      sh "sudo ip netns exec #{ netns } #{ ENV[ 'SHELL' ] }"
+    end
+  end
 end
 
 
 ### Local variables:
 ### mode: Ruby
-### coding: utf-8-unix
+### coding: utf-8
 ### indent-tabs-mode: nil
 ### End:

data/ruby/trema/command/reset_stats.rb

@@ -1,8 +1,4 @@
 #
-# trema reset_stats 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
@@ -20,9 +16,7 @@
 #
 
 
-require "optparse"
 require "trema/cli"
-require "trema/dsl"
 require "trema/util"
 
 
@@ -31,23 +25,9 @@ module Trema
     include Trema::Util
 
 
-    def reset_stats
-      sanity_check
-
-      options = OptionParser.new
-      options.banner = "Usage: trema reset_stats [OPTIONS ...]"
-
-      options.on( "-h", "--help" ) do
-        puts options.to_s
-        exit 0
-      end
-      options.on( "-v", "--verbose" ) do
-        $verbose = true
-      end
-
-      options.parse! ARGV
-
-      host = Trema::DSL::Context.load_current.hosts[ ARGV[ 0 ] ]
+    def trema_reset_stats name
+      host = find_host_by_name( name )
+      raise "unknown host: #{ name }" if host.nil?
       Trema::Cli.new( host ).reset_stats
     end
   end

data/ruby/trema/command/ruby.rb

@@ -1,8 +1,4 @@
 #
-# trema ruby 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
@@ -20,7 +16,7 @@
 #
 
 
-require "optparse"
+require "trema/util"
 
 
 module Trema
@@ -28,20 +24,7 @@ module Trema
     include Trema::Util
 
 
-    def ruby
-      options = OptionParser.new
-      options.banner = "Usage: trema ruby [OPTIONS ...]"
-
-      options.on( "-h", "--help" ) do
-        puts options.to_s
-        exit 0
-      end
-      options.on( "-v", "--verbose" ) do
-        $verbose = true
-      end
-
-      options.parse! ARGV
-
+    def trema_ruby
       sh "x-www-browser http://rubydoc.info/github/trema/trema/master/frames"
     end
   end

data/ruby/trema/command/run.rb

@@ -1,8 +1,4 @@
 #
-# trema run 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
@@ -20,7 +16,6 @@
 #
 
 
-require "optparse"
 require "trema/dsl"
 require "trema/util"
 
@@ -30,34 +25,16 @@ module Trema
     include Trema::Util
 
 
-    def run
-      sanity_check
-
-      options = OptionParser.new
-      options.banner = "Usage: #{ $0 } run [OPTIONS ...]"
+    def trema_run options
+      @config_file = options[ :conf ] || nil
 
-      options.on( "-c", "--conf FILE" ) do | v |
-        @config_file = v
-      end
-      options.on( "-d", "--daemonize" ) do
+      if options[ :daemonize ]
         $run_as_daemon = true
       end
-      options.on( "-s", "--tremashark" ) do
+      if options[ :tremashark ]
         $use_tremashark = true
       end
 
-      options.separator ""
-
-      options.on( "-h", "--help" ) do
-        puts options.to_s
-        exit 0
-      end
-      options.on( "-v", "--verbose" ) do
-        $verbose = true
-      end
-
-      options.parse! ARGV
-
       cleanup_current_session
 
       if $run_as_daemon
@@ -65,6 +42,8 @@ module Trema
       else
         begin
           Trema::DSL::Runner.new( load_config ).run
+        rescue SystemExit
+          # This is OK
         ensure
           cleanup_current_session
         end

data/ruby/trema/command/send_packets.rb

@@ -1,8 +1,4 @@
 #
-# trema send_packets 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
@@ -20,7 +16,6 @@
 #
 
 
-require "optparse"
 require "trema/cli"
 require "trema/dsl"
 require "trema/util"
@@ -31,93 +26,14 @@ module Trema
     include Trema::Util
 
 
-    def send_packets
-      sanity_check
-
-      source = nil
-      dest = nil
-      cli_options = {}
-
-      dsl_parser = Trema::DSL::Parser.new
-
-      options = OptionParser.new
-      options.banner = "Usage: #{ $0 } send_packets --source HOSTNAME --dest HOSTNAME [OPTIONS ...]"
-
-      options.on( "-s", "--source HOSTNAME" ) do | v |
-        source = Trema::DSL::Context.load_current.hosts[ v ]
-        raise "Unknown host: #{ v }" if source.nil?
-      end
-      options.on( "--inc_ip_src [NUMBER]" ) do | v |
-        if v
-          cli_options[ :inc_ip_src ] = v
-        else
-          cli_options[ :inc_ip_src ] = true
-        end
-      end
-      options.on( "-d", "--dest HOSTNAME" ) do | v |
-        dest = Trema::DSL::Context.load_current.hosts[ v ]
-        raise "Unknown host: #{ v }" if dest.nil?
-      end
-      options.on( "--inc_ip_dst [NUMBER]" ) do | v |
-        if v
-          cli_options[ :inc_ip_dst ] = v
-        else
-          cli_options[ :inc_ip_dst ] = true
-        end
-      end
-      options.on( "--tp_src NUMBER" ) do | v |
-        cli_options[ :tp_src ] = v
-      end
-      options.on( "--inc_tp_src [NUMBER]" ) do | v |
-        if v
-          cli_options[ :inc_tp_src ] = v
-        else
-          cli_options[ :inc_tp_src ] = true
-        end
-      end
-      options.on( "--tp_dst NUMBER" ) do | v |
-        cli_options[ :tp_dst ] = v
-      end
-      options.on( "--inc_tp_dst [NUMBER]" ) do | v |
-        if v
-          cli_options[ :inc_tp_dst ] = v
-        else
-          cli_options[ :inc_tp_dst ] = true
-        end
-      end
-      options.on( "--pps NUMBER" ) do | v |
-        cli_options[ :pps ] = v
-      end
-      options.on( "--n_pkts NUMBER" ) do | v |
-        cli_options[ :n_pkts ] = v
-      end
-      options.on( "--duration NUMBER" ) do | v |
-        cli_options[ :duration ] = v
-      end
-      options.on( "--length NUMBER" ) do | v |
-        cli_options[ :length ] = v
-      end
-      options.on( "--inc_payload [NUMBER]" ) do | v |
-        if v
-          cli_options[ :inc_payload ] = v
-        else
-          cli_options[ :inc_payload ] = true
-        end
-      end
-
-      options.separator ""
-
-      options.on( "-h", "--help" ) do
-        puts options.to_s
-        exit 0
-      end
-      options.on( "-v", "--verbose" ) do
-        $verbose = true
-      end
+    def trema_send_packets source_name, dest_name, options
+      source = find_host_by_name( source_name )
+      raise "unknown host: #{ source_name }" if source.nil?
 
-      options.parse! ARGV
+      dest = find_host_by_name( dest_name )
+      raise "unknown host: #{ dest_name }" if dest.nil?
 
-      Trema::Cli.new( source ).send_packets( dest, cli_options )
+      Trema::Cli.new( source ).send_packets( dest, options )
     end
   end
 end

data/ruby/trema/command/show_stats.rb

@@ -1,8 +1,4 @@
 #
-# trema show_stats 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
@@ -20,9 +16,7 @@
 #
 
 
-require "optparse"
 require "trema/cli"
-require "trema/dsl"
 require "trema/util"
 
 
@@ -31,47 +25,34 @@ module Trema
     include Trema::Util
 
 
-    def show_stats
-      sanity_check
-
-      stats = nil
+    def trema_show_stats hostname, tx, rx
+      cli = get_cli( hostname )
 
-      options = OptionParser.new
-      options.banner = "Usage: #{ $0 } show_stats HOSTNAME [OPTIONS ...]"
-
-      options.on( "-t", "--tx" ) do
-        stats = :tx
-      end
-      options.on( "-r", "--rx" ) do
-        stats = :rx
+      unless tx || rx
+        show_tx_and_rx cli
       end
+      cli.show_tx_stats if tx
+      cli.show_rx_stats if rx
+    end
 
-      options.separator ""
 
-      options.on( "-h", "--help" ) do
-        puts options.to_s
-        exit 0
-      end
-      options.on( "-v", "--verbose" ) do
-        $verbose = true
-      end
+    ############################################################################
+    private
+    ############################################################################
 
-      options.parse! ARGV
 
-      host = Trema::DSL::Context.load_current.hosts[ ARGV[ 0 ] ]
-      raise "Unknown host: #{ ARGV[ 0 ] }" if host.nil?
+    def show_tx_and_rx cli
+      puts "Sent packets:"
+      cli.show_tx_stats
+      puts "Received packets:"
+      cli.show_rx_stats
+    end
 
-      case stats
-      when :tx
-        Trema::Cli.new( host ).show_tx_stats
-      when :rx
-        Trema::Cli.new( host ).show_rx_stats
-      else
-        puts "Sent packets:"
-        Trema::Cli.new( host ).show_tx_stats
-        puts "Received packets:"
-        Trema::Cli.new( host ).show_rx_stats
-      end
+
+    def get_cli name
+      host = find_host_by_name( name )
+      exit_now! "unknown host: #{ name }" if host.nil?
+      Trema::Cli.new host
     end
   end
 end