trema 0.2.5 → 0.2.6

data/ruby/trema/command/up.rb

@@ -1,8 +1,4 @@
 #
-# 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
@@ -20,8 +16,6 @@
 #
 
 
-require "optparse"
-require "trema/dsl"
 require "trema/util"
 
 
@@ -30,29 +24,14 @@ module Trema
     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 ] ]
+    def trema_up name
+      switch = find_switch_by_name( name )
       if switch
         switch.run
-        return
+      else
+        # TODO: support vlink
+        raise "Unknown name: #{ name }"
       end
-
-      raise "Unknown name: #{ ARGV[ 0 ] }"
     end
   end
 end

data/ruby/trema/command/version.rb

@@ -1,8 +1,4 @@
 #
-# trema version 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
@@ -25,7 +21,7 @@ require "trema/version"
 
 module Trema
   module Command
-    def show_version
+    def trema_version
       puts "trema version #{ Trema::VERSION }"
     end
   end

data/ruby/trema/controller.c

@@ -57,11 +57,9 @@ handle_timer_event( void *self ) {
  *   @example
  *     send_message datapath_id, FeaturesRequest.new
  *
- *
- *   @param [Number] datapath_id
+ *   @param [Integer] datapath_id
  *     the datapath to which a message is sent.
- *
- *   @param [FeaturesRequest] message
+ *   @param [Hello, EchoRequest, EchoReply, FeaturesRequest, SetConfig, GetConfigRequest, QueueGetConfigRequest, StatsRequest, BarrierRequest, PortMod, Vendor] message
  *     the message to be sent.
  */
 static VALUE
@@ -94,12 +92,12 @@ append_action( openflow_actions *actions, VALUE action ) {
   }
   else if ( rb_funcall( action, rb_intern( "is_a?" ), 1, rb_path2class( "Trema::SetEthDstAddr" ) ) == Qtrue ) {
     uint8_t dl_dst[ OFP_ETH_ALEN ];
-    uint8_t *ptr = ( uint8_t* ) dl_addr_to_a( rb_funcall( action, rb_intern( "mac_address" ), 0 ), dl_dst );
+    uint8_t *ptr = ( uint8_t * ) dl_addr_to_a( rb_funcall( action, rb_intern( "mac_address" ), 0 ), dl_dst );
     append_action_set_dl_dst( actions, ptr );
   }
   else if ( rb_funcall( action, rb_intern( "is_a?" ), 1, rb_path2class( "Trema::SetEthSrcAddr" ) ) == Qtrue ) {
     uint8_t dl_src[ OFP_ETH_ALEN ];
-    uint8_t *ptr = ( uint8_t* ) dl_addr_to_a( rb_funcall( action, rb_intern( "mac_address" ), 0 ), dl_src );
+    uint8_t *ptr = ( uint8_t * ) dl_addr_to_a( rb_funcall( action, rb_intern( "mac_address" ), 0 ), dl_src );
     append_action_set_dl_src( actions, ptr );
   }
   else if ( rb_funcall( action, rb_intern( "is_a?" ), 1, rb_path2class( "Trema::SetIpDstAddr" ) ) == Qtrue ) {
@@ -133,9 +131,9 @@ append_action( openflow_actions *actions, VALUE action ) {
       Check_Type( rbody, T_ARRAY );
       uint16_t length = ( uint16_t ) RARRAY_LEN( rbody );
       buffer *body = alloc_buffer_with_length( length );
-      int i;
-      for ( i = 0; i < length; i++ ) {
-        ( ( uint8_t * ) body->data )[ i ] = ( uint8_t ) FIX2INT( RARRAY_PTR( rbody )[ i ] );
+      void *p = append_back_buffer( body, length );
+      for ( int i = 0; i < length; i++ ) {
+        ( ( uint8_t * ) p )[ i ] = ( uint8_t ) FIX2INT( RARRAY_PTR( rbody )[ i ] );
       }
       append_action_vendor( actions, ( uint32_t ) NUM2UINT( vendor_id ), body );
       free_buffer( body );
@@ -221,17 +219,17 @@ controller_send_flow_mod( uint16_t command, int argc, VALUE *argv, VALUE self )
 
     VALUE opt_idle_timeout = rb_hash_aref( options, ID2SYM( rb_intern( "idle_timeout" ) ) );
     if ( opt_idle_timeout != Qnil ) {
-      idle_timeout = ( uint16_t )NUM2UINT( opt_idle_timeout );
+      idle_timeout = ( uint16_t ) NUM2UINT( opt_idle_timeout );
     }
 
     VALUE opt_hard_timeout = rb_hash_aref( options, ID2SYM( rb_intern( "hard_timeout" ) ) );
     if ( opt_hard_timeout != Qnil ) {
-      hard_timeout = ( uint16_t )NUM2UINT( opt_hard_timeout );
+      hard_timeout = ( uint16_t ) NUM2UINT( opt_hard_timeout );
     }
 
     VALUE opt_priority = rb_hash_aref( options, ID2SYM( rb_intern( "priority" ) ) );
     if ( opt_priority != Qnil ) {
-      priority = ( uint16_t )NUM2UINT( opt_priority );
+      priority = ( uint16_t ) NUM2UINT( opt_priority );
     }
 
     VALUE opt_buffer_id = rb_hash_aref( options, ID2SYM( rb_intern( "buffer_id" ) ) );
@@ -241,7 +239,7 @@ controller_send_flow_mod( uint16_t command, int argc, VALUE *argv, VALUE self )
 
     VALUE opt_out_port = rb_hash_aref( options, ID2SYM( rb_intern( "out_port" ) ) );
     if ( opt_out_port != Qnil ) {
-      out_port = ( uint16_t )NUM2UINT( opt_out_port );
+      out_port = ( uint16_t ) NUM2UINT( opt_out_port );
     }
 
     VALUE opt_send_flow_rem = rb_hash_aref( options, ID2SYM( rb_intern( "send_flow_rem" ) ) );
@@ -498,8 +496,8 @@ controller_send_packet_out( int argc, VALUE *argv, VALUE self ) {
 
     opt_zero_padding = rb_hash_aref( options, ID2SYM( rb_intern( "zero_padding" ) ) );
     if ( opt_zero_padding != Qnil ) {
-      if ( TYPE( opt_zero_padding ) != T_TRUE && TYPE( opt_zero_padding ) != T_FALSE) {
-        rb_raise(rb_eTypeError, ":zero_padding must be true or false");
+      if ( TYPE( opt_zero_padding ) != T_TRUE && TYPE( opt_zero_padding ) != T_FALSE ) {
+        rb_raise( rb_eTypeError, ":zero_padding must be true or false" );
       }
     }
   }
@@ -544,7 +542,7 @@ controller_run( VALUE self ) {
   rb_gv_set( "$PROGRAM_NAME", name );
 
   int argc = 3;
-  char **argv = xmalloc( sizeof ( char * ) * ( uint32_t ) ( argc + 1 ) );
+  char **argv = xmalloc( sizeof( char * ) * ( uint32_t ) ( argc + 1 ) );
   argv[ 0 ] = STR2CSTR( name );
   argv[ 1 ] = ( char * ) ( uintptr_t ) "--name";
   argv[ 2 ] = STR2CSTR( name );

data/ruby/trema/custom-switch.rb

@@ -0,0 +1,56 @@
+#
+# Copyright (C) 2012 Hiroyasu OHYAMA
+#
+# 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 "trema/hardware-switch"
+
+
+module Trema
+  class CustomSwitch < HardwareSwitch
+    include Trema::Daemon
+
+
+    log_file { |vswitch| "customswitch.#{ vswitch.name }.log" }
+
+    
+    def initialize stanza
+      super stanza
+    end
+
+
+    def command
+      "CHIBACH_TMP=#{ Trema.tmp } #{ path } -i #{ dpid_short } > #{ log_file } &"
+    end
+
+
+    ############################################################################
+    private
+    ############################################################################
+
+
+    def path
+      File.join( Trema.home, @stanza[ :path ] )
+    end
+  end
+end
+
+
+### Local variables:
+### mode: Ruby
+### coding: utf-8-unix
+### indent-tabs-mode: nil
+### End:

data/ruby/trema/desc-stats-reply.rb

@@ -23,10 +23,10 @@ require "trema/stats-helper"
 
 module Trema
   class DescStatsReply < StatsHelper
-    FIELDS = %w(mfr_desc hw_desc sw_desc serial_num dp_desc ) 
+    FIELDS = %w(mfr_desc hw_desc sw_desc serial_num dp_desc )
     FIELDS.each { |field| attr_reader field.intern }
 
-    
+
     # Descriptive information about a vswitch.
     # A user would not explicitly instantiate a {DescStatsReply} object but
     # would be created as a result of parsing the +OFPT_STATS_REPLY(OFPST_DESC)+
@@ -34,10 +34,10 @@ module Trema
     #
     # @overload initialize(options={})
     #
-    #   @example 
+    #   @example
     #     DescStatsReply.new(
     #       :mfr_desc => "Nicira Networks, Inc.",
-    #       :hw_desc => "Open vSwitch", 
+    #       :hw_desc => "Open vSwitch",
     #       :sw_desc => "1.2.2"
     #       :serial_num => "None"
     #     )
@@ -63,7 +63,7 @@ module Trema
     #   @return [DescStatsReply]
     #     an object that encapsulates the OFPST_STATS_REPLY(OFPST_DESC) OpenFlow message.
     #
-    def initialize options 
+    def initialize options
       super FIELDS, options
     end
   end

data/ruby/trema/dsl/configuration.rb

@@ -87,6 +87,9 @@ module Trema
       attr_reader :switches
 
 
+      attr_reader :netnss
+
+
       #
       # Creates a new Trema configuration
       #
@@ -103,6 +106,7 @@ module Trema
         @packetin_filter = Trema::PacketinFilter.clear
         @switch_manager = Trema::SwitchManager.clear
         @switches = Trema::OpenflowSwitch.clear
+        @netnss = Trema::Netns.clear
       end
 
 

data/{features/step_definitions/up_steps.rb → ruby/trema/dsl/custom-switch.rb}

@@ -1,7 +1,7 @@
 #
-# Author: Yasuhito Takamiya <yasuhito@gmail.com>
+# The syntax definition of custom_switch { ... } stanza in Trema DSL.
 #
-# Copyright (C) 2008-2012 NEC Corporation
+# Copyright (C) 2012 Hiroyasu OHYAMA
 #
 # 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
@@ -18,8 +18,22 @@
 #
 
 
-When /^I try trema up "([^"]*)"$/ do | component |
-  run "./trema up #{ component }"
+require "trema/dsl/switch"
+
+
+module Trema
+  module DSL
+    class CustomSwitch < Switch
+      def initialize name = nil
+        super name
+      end
+
+
+      def path filepath
+        @path = filepath
+      end
+    end
+  end
 end
 
 

data/ruby/trema/dsl/netns.rb

@@ -0,0 +1,78 @@
+#
+# 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 "trema/dsl/stanza"
+require "trema/dsl/syntax-error"
+
+
+module Trema
+  module DSL
+    #
+    # The syntax definition of netns { ... } stanza in Trema DSL.
+    #
+    class Netns < Stanza
+      #
+      # Set IP address
+      #
+      # @example
+      #   stanza.ip "192.168.100.1"
+      #
+      # @return [undefined]
+      #
+      # @api public
+      #
+      def ip str
+        @ip = str
+        if @name.nil?
+          @name = @ip
+        end
+      end
+
+
+      #
+      # Set netmask
+      #
+      # @example
+      #   stanza.netmask "255.255.0.0"
+      #
+      # @return [undefined]
+      #
+      # @api public
+      #
+      def netmask str
+        @netmask = str
+      end
+
+
+      def route options
+        if options[ :net ].nil? or options[ :gw ].nil?
+          raise ":net and :gw option is a mandatory"
+        end
+        @net = options[ :net ]
+        @gw = options[ :gw ]
+      end
+    end
+  end
+end
+
+
+### Local variables:
+### mode: Ruby
+### coding: utf-8-unix
+### indent-tabs-mode: nil
+### End:

data/ruby/trema/dsl/parser.rb

@@ -53,6 +53,8 @@ module Trema
           peers = each.peers
           config.hosts[ peers[ 0 ] ].interface = each.name if config.hosts[ peers[ 0 ] ]
           config.hosts[ peers[ 1 ] ].interface = each.name_peer if config.hosts[ peers[ 1 ] ]
+          config.netnss[ peers[ 0 ] ].interface = each.name if config.netnss[ peers[ 0 ] ]
+          config.netnss[ peers[ 1 ] ].interface = each.name_peer if config.netnss[ peers[ 1 ] ]
           config.switches[ peers[ 0 ] ] << each.name if config.switches[ peers[ 0 ] ]
           config.switches[ peers[ 1 ] ] << each.name_peer if config.switches[ peers[ 1 ] ]
         end

data/ruby/trema/dsl/runner.rb

@@ -88,6 +88,7 @@ module Trema
         maybe_create_links
         maybe_run_hosts
         maybe_run_switches
+        maybe_run_netnss
       end
 
 
@@ -134,6 +135,13 @@ module Trema
       end
 
 
+      def maybe_run_netnss
+        @context.netnss.each do | name, netns |
+          netns.run!
+        end
+      end
+
+
       def maybe_run_apps
         return if @context.apps.values.empty?
 

data/ruby/trema/dsl/syntax.rb

@@ -22,19 +22,23 @@
 
 require "trema/app"
 require "trema/dsl/link"
+require "trema/dsl/netns"
 require "trema/dsl/rswitch"
 require "trema/dsl/run"
 require "trema/dsl/switch"
 require "trema/dsl/vhost"
 require "trema/dsl/vswitch"
+require "trema/dsl/custom-switch"
 require "trema/hardware-switch"
 require "trema/host"
 require "trema/link"
 require "trema/monkey-patch/module"
+require "trema/netns"
 require "trema/open-vswitch"
 require "trema/packetin-filter"
 require "trema/ruby-switch"
 require "trema/switch-manager"
+require "trema/custom-switch"
 
 
 module Trema
@@ -77,6 +81,13 @@ module Trema
       end
 
 
+      def custom_switch name = nil, &block
+        stanza = Trema::DSL::CustomSwitch.new( name )
+        stanza.instance_eval( &block )
+        Trema::CustomSwitch.new stanza
+      end
+
+
       def vhost name = nil, &block
         stanza = Trema::DSL::Vhost.new( name )
         stanza.instance_eval( &block ) if block
@@ -84,6 +95,13 @@ module Trema
       end
 
 
+      def netns name, &block
+        stanza = Trema::DSL::Netns.new( name )
+        stanza.instance_eval( &block ) if block
+        Trema::Netns.new( stanza )
+      end
+
+
       def filter rule
         Trema::PacketinFilter.new( rule )
       end