trema 0.3.12 → 0.3.13

data/bin/trema

@@ -21,7 +21,6 @@
 
 $LOAD_PATH.unshift File.expand_path( File.join File.dirname( __FILE__ ), "..", "ruby" )
 
-
 require "rubygems"
 
 require "gli"
@@ -30,257 +29,274 @@ require "trema/util"
 require "trema/version"
 
 
-include GLI::App
-include Trema::Util
-include Trema::Command
+class BinTrema
+  include Trema::Command
+  include Trema::Util
+  include GLI::App
 
 
-program_desc "Trema command-line tool"
+  def initialize
+    program_desc "Trema command-line tool"
 
 
-desc "Displays the current runtime version"
-version Trema::VERSION
+    desc "Displays the current runtime version"
+    version Trema::VERSION
 
 
-desc "Be verbose"
-switch [ :v, :verbose ], :negatable => false
+    desc "Be verbose"
+    switch [ :v, :verbose ], :negatable => false
 
 
-desc "Runs a trema application"
-arg_name "controller"
-command :run do | c |
-  c.desc "Runs as a daemon"
-  c.switch [ :d, :daemonize ], :negatable => false
+    desc "Runs a trema application"
+    arg_name "controller"
+    command :run do | c |
+      c.desc "Runs as a daemon"
+      c.switch [ :d, :daemonize ], :negatable => false
 
-  c.desc "Enables Trema wireshark plugin"
-  c.switch [ :s, :tremashark ], :negatable => false
+      c.desc "Enables Trema wireshark plugin"
+      c.switch [ :s, :tremashark ], :negatable => false
 
-  c.desc "Specifies emulated network configuration"
-  c.flag [ :c, :conf ]
+      c.desc "Specifies emulated network configuration"
+      c.flag [ :c, :conf ]
 
-  c.action do | global_options, options, args |
-    trema_run options
-  end
-end
+      c.action do | global_options, options, args |
+        trema_run options
+      end
+    end
 
 
-desc "Terminates a trema process"
-arg_name "name"
-command :kill do | c |
-  c.action do | global_options, options, args |
-    help_now!( "name is required" ) if args.empty?
-    args.each do | each |
-      trema_kill each
+    desc "Terminates a trema process"
+    arg_name "name"
+    command :kill do | c |
+      c.action do | global_options, options, args |
+        help_now!( "name is required" ) if args.empty?
+        args.each do | each |
+          trema_kill each
+        end
+      end
     end
-  end
-end
 
 
-desc "Starts a killed trema process again"
-arg_name "name"
-command :up do | c |
-  c.action do | global_options, options, args |
-    trema_up args[ 0 ]
-  end
-end
+    desc "Starts a killed trema process again"
+    arg_name "name"
+    command :up do | c |
+      c.action do | global_options, options, args |
+        trema_up args[ 0 ]
+      end
+    end
 
 
-desc "Terminates all trema processes"
-command :killall do | c |
-  c.action do
-    trema_killall
-  end
-end
+    desc "Terminates all trema processes"
+    command :killall do | c |
+      c.action do
+        trema_killall
+      end
+    end
 
 
-desc "Sends UDP packets to destination host"
-command :send_packets do | c |
-  c.desc "host that sends packets"
-  c.flag [ :s, :source ]
+    desc "Sends UDP packets to destination host"
+    command :send_packets do | c |
+      c.desc "host that sends packets"
+      c.flag [ :s, :source ]
 
-  c.desc "host that receives packets"
-  c.flag [ :d, :dest ]
+      c.desc "host that receives packets"
+      c.flag [ :d, :dest ]
 
-  c.desc "number of times to increment the IP source address"
-  c.default_value nil
-  c.flag [ :inc_ip_src ]
+      c.desc "number of times to increment the IP source address"
+      c.default_value nil
+      c.flag [ :inc_ip_src ]
 
-  c.desc "number of times to increment the IP destination address"
-  c.default_value nil
-  c.flag [ :inc_ip_dst ]
+      c.desc "number of times to increment the IP destination address"
+      c.default_value nil
+      c.flag [ :inc_ip_dst ]
 
-  c.desc "set the initial UDP source port"
-  c.flag [ :tp_src ]
+      c.desc "set the initial UDP source port"
+      c.flag [ :tp_src ]
 
-  c.desc "number of times to increment the UDP source port"
-  c.default_value nil
-  c.flag [ :inc_tp_src ]
+      c.desc "number of times to increment the UDP source port"
+      c.default_value nil
+      c.flag [ :inc_tp_src ]
 
-  c.desc "set the initial UDP destination port"
-  c.flag [ :tp_dst ]
+      c.desc "set the initial UDP destination port"
+      c.flag [ :tp_dst ]
 
-  c.desc "number of times to increment the UDP destination port"
-  c.default_value nil
-  c.flag [ :inc_tp_dst ]
+      c.desc "number of times to increment the UDP destination port"
+      c.default_value nil
+      c.flag [ :inc_tp_dst ]
 
-  c.desc "send packet rate - packets per second"
-  c.flag [ :pps ]
+      c.desc "send packet rate - packets per second"
+      c.flag [ :pps ]
 
-  c.desc "number of packets to send"
-  c.flag [ :n_pkts ]
+      c.desc "number of packets to send"
+      c.flag [ :n_pkts ]
 
-  c.desc "time duration to send packets"
-  c.flag [ :duration ]
+      c.desc "time duration to send packets"
+      c.flag [ :duration ]
 
-  c.desc "length of UDP payload"
-  c.flag [ :length ]
+      c.desc "length of UDP payload"
+      c.flag [ :length ]
 
-  c.desc "increment UDP payload"
-  c.default_value nil
-  c.flag [ :inc_payload ]
+      c.desc "increment UDP payload"
+      c.default_value nil
+      c.flag [ :inc_payload ]
 
-  c.action do | global_options, options, args |
-    raise "--source option is mandatory" if options[ :source ].nil?
-    raise "--dest option is mandatory" if options[ :dest ].nil?
+      c.action do | global_options, options, args |
+        raise "--source option is mandatory" if options[ :source ].nil?
+        raise "--dest option is mandatory" if options[ :dest ].nil?
 
-    trema_send_packets options[ :source ], options[ :dest ], options
-  end
-end
+        trema_send_packets options[ :source ], options[ :dest ], options
+      end
+    end
 
 
-desc "Brings a switch's specified port up"
-command :port_up do | c |
-  c.desc "switch name"
-  c.flag [ :s, :switch ]
+    desc "Brings a switch's specified port up"
+    command :port_up do | c |
+      c.desc "switch name"
+      c.flag [ :s, :switch ]
 
-  c.desc "port"
-  c.flag [ :p, :port ]
+      c.desc "port"
+      c.flag [ :p, :port ]
 
-  c.action do | global_options, options, args |
-    raise "--switch option is mandatory" if options[ :switch ].nil?
-    raise "--port option is mandatory" if options[ :port ].nil?
+      c.action do | global_options, options, args |
+        raise "--switch option is mandatory" if options[ :switch ].nil?
+        raise "--port option is mandatory" if options[ :port ].nil?
 
-    trema_port_up options[ :switch ], options[ :port ]
-  end
-end
+        trema_port_up options[ :switch ], options[ :port ]
+      end
+    end
 
 
-desc "Brings a switch's specified port down"
-command :port_down do | c |
-  c.desc "switch name"
-  c.flag [ :s, :switch ]
+    desc "Brings a switch's specified port down"
+    command :port_down do | c |
+      c.desc "switch name"
+      c.flag [ :s, :switch ]
 
-  c.desc "port"
-  c.flag [ :p, :port ]
+      c.desc "port"
+      c.flag [ :p, :port ]
 
-  c.action do | global_options, options, args |
-    raise "--switch option is mandatory" if options[ :switch ].nil?
-    raise "--port option is mandatory" if options[ :port ].nil?
+      c.action do | global_options, options, args |
+        raise "--switch option is mandatory" if options[ :switch ].nil?
+        raise "--port option is mandatory" if options[ :port ].nil?
 
-    trema_port_down options[ :switch ], options[ :port ]
-  end
-end
+        trema_port_down options[ :switch ], options[ :port ]
+      end
+    end
 
 
-desc "Shows stats of packets"
-arg_name "host"
-command :show_stats do | c |
-  c.desc "Show stats of packets sent"
-  c.switch [ :t, :tx ], :negatable => false
-  c.desc "Show stats of packets received"
-  c.switch [ :r, :rx ], :negatable => false
+    desc "Shows stats of packets"
+    arg_name "host"
+    command :show_stats do | c |
+      c.desc "Show stats of packets sent"
+      c.switch [ :t, :tx ], :negatable => false
+      c.desc "Show stats of packets received"
+      c.switch [ :r, :rx ], :negatable => false
 
-  c.action do | global_options, options, args |
-    help_now!( "host is required" ) if args.empty?
-    trema_show_stats args[ 0 ], options[ :tx ], options[ :rx ]
-  end
-end
+      c.action do | global_options, options, args |
+        help_now!( "host is required" ) if args.empty?
+        trema_show_stats args[ 0 ], options[ :tx ], options[ :rx ]
+      end
+    end
 
 
-desc "Resets stats of packets"
-arg_name "hosts..."
-command :reset_stats do | c |
-  c.action do | global_options, options, args |
-    hosts = args
-    if hosts.empty?
-      hosts = Trema::DSL::Context.load_current.hosts.keys
+    desc "Resets stats of packets"
+    arg_name "hosts..."
+    command :reset_stats do | c |
+      c.action do | global_options, options, args |
+        hosts = args
+        if hosts.empty?
+          hosts = Trema::DSL::Context.load_current.hosts.keys
+        end
+        hosts.each do | each |
+          trema_reset_stats each
+        end
+      end
     end
-    hosts.each do | each |
-      trema_reset_stats each
+
+
+    desc "Print all flow entries"
+    arg_name "switches..."
+    command :dump_flows do | c |
+      c.action do | global_options, options, args |
+        help_now!( "switches is required" ) if args.empty?
+        trema_dump_flows args
+      end
     end
-  end
-end
 
 
-desc "Print all flow entries"
-arg_name "switches..."
-command :dump_flows do | c |
-  c.action do | global_options, options, args |
-    help_now!( "switches is required" ) if args.empty?
-    trema_dump_flows args
-  end
-end
+    desc "Opens a new shell in the specified network namespace"
+    arg_name "name"
+    command :netns do | c |
+      c.action do | global_options, options, args |
+        trema_netns args[ 0 ]
+      end
+    end
 
 
-desc "Opens a new shell in the specified network namespace"
-arg_name "name"
-command :netns do | c |
-  c.action do | global_options, options, args |
-    trema_netns args[ 0 ]
-  end
-end
+    desc "Opens in your browser Trema's Ruby API documentation"
+    command :ruby do | c |
+      c.action do
+        trema_ruby
+      end
+    end
 
 
-desc "Opens in your browser Trema's Ruby API documentation"
-command :ruby do | c |
-  c.action do
-    trema_ruby
-  end
-end
+    desc "Displays the current runtime version"
+    command :version do | c |
+      c.action do
+        trema_version
+      end
+    end
 
 
-desc "Displays the current runtime version"
-command :version do | c |
-  c.action do
-    trema_version
-  end
-end
+    GLI::Commands::Help.skips_pre = false
 
 
-GLI::Commands::Help.skips_pre = false
+    pre do | global, command, options, args |
+      $verbose = global[ :verbose ]
 
+      if global[ :version ]
+        trema_version
+        exit_now! nil, 0
+      end
 
-pre do | global, command, options, args |
-  $verbose = global[ :verbose ]
+      assert_trema_is_built
 
-  if global[ :version ]
-    trema_version
-    exit_now! nil, 0
-  end
+      if FileTest.exist?( Trema.tmp ) and not FileTest.writable?( Trema.tmp )
+        # Trema is system widely installed with gem command
+        sh "sudo chmod o+w -R #{ Trema.tmp }"
+      end
 
-  assert_trema_is_built
+      FileUtils.mkdir_p Trema.log
+      FileUtils.mkdir_p Trema.pid
+      FileUtils.mkdir_p Trema.sock
 
-  if FileTest.exist?( Trema.tmp ) and not FileTest.writable?( Trema.tmp )
-    # Trema is system widely installed with gem command
-    sh "sudo chmod o+w -R #{ Trema.tmp }"
-  end
+      true
+    end
 
-  FileUtils.mkdir_p Trema.log
-  FileUtils.mkdir_p Trema.pid
-  FileUtils.mkdir_p Trema.sock
 
-  true
-end
+    on_error do | exception |
+      # Error logic here
+      # return false to skip default error handling
+      true
+    end
+  end
 
 
-on_error do | exception |
-  # Error logic here
-  # return false to skip default error handling
-  true
+  def start argv
+    begin
+      run argv
+    rescue
+      puts $!
+      $!.backtrace.each do | each |
+        puts each
+      end
+      exit
+    end
+  end
 end
 
 
-exit run( ARGV )
+exit BinTrema.new.start( ARGV )
 
 
 ### Local variables:

data/ruby/trema/command/run.rb

@@ -72,7 +72,7 @@ module Trema
         controller_file = ARGV[ 0 ].split.first
         if ruby_controller?
           require "trema"
-          include Trema
+          Object.__send__ :include, Trema
           ARGV.replace ARGV[ 0 ].split[ 1..-1 ]
           $LOAD_PATH << File.dirname( controller_file )
           load controller_file

data/ruby/trema/features-reply.c

@@ -68,7 +68,7 @@ features_reply_alloc( VALUE klass ) {
  *   @option options [Number] :actions
  *     supported actions expressed as a 32-bit bitmap.
  *   @option options [Port] :port
- *     an array of {Port} objects detailing physical port description and function.
+ *     an array of {Port} objects detailing port description and function.
  *   @return [FeaturesReply]
  */
 static VALUE
@@ -117,8 +117,6 @@ features_reply_init( VALUE self, VALUE options ) {
     features_reply->actions = htonl( ( uint32_t ) NUM2UINT( tmp ) );
   }
 
-  // TODO: ports
-
   rb_iv_set( self, "@attribute", options );
 
   return self;
@@ -203,7 +201,7 @@ features_reply_actions( VALUE self ) {
 
 
 /*
- * An array of {Port} objects detailing physical port description and function.
+ * An array of {Port} objects detailing port description and function.
  *
  * @return [Array<Port>] the value of ports.
  */
@@ -213,6 +211,17 @@ features_reply_ports( VALUE self ) {
 }
 
 
+/*
+ * An array of {Port} objects detailing physical port description and function.
+ *
+ * @return [Array<Port>] the value of ports.
+ */
+static VALUE
+features_reply_physical_ports( VALUE self ) {
+  return rb_hash_aref( rb_iv_get( self, "@attribute" ), ID2SYM( rb_intern( "physical_ports" ) ) );
+}
+
+
 void
 Init_features_reply() {
   mTrema = rb_define_module( "Trema" );
@@ -227,6 +236,7 @@ Init_features_reply() {
   rb_define_method( cFeaturesReply, "capabilities", features_reply_capabilities, 0 );
   rb_define_method( cFeaturesReply, "actions", features_reply_actions, 0 );
   rb_define_method( cFeaturesReply, "ports", features_reply_ports, 0 );
+  rb_define_method( cFeaturesReply, "physical_ports", features_reply_physical_ports, 0 );
 }
 
 
@@ -242,11 +252,15 @@ handle_switch_ready( uint64_t datapath_id, void *controller ) {
  * Extract and map {Port} to +ofp_phy_port+ structure.
  */
 static VALUE
-ports_from( const list_element *phy_ports ) {
+ports_from( const list_element *c_ports ) {
   VALUE ports = rb_ary_new();
 
+  if ( c_ports == NULL ) {
+    return ports;
+  }
+
   list_element *port_head = xmalloc( sizeof( list_element ) );
-  memcpy( port_head, phy_ports, sizeof( list_element ) );
+  memcpy( port_head, c_ports, sizeof( list_element ) );
   list_element *port = NULL;
   for ( port = port_head; port != NULL; port = port->next ) {
     rb_ary_push( ports, port_from( ( struct ofp_phy_port * ) port->data ) );
@@ -256,6 +270,14 @@ ports_from( const list_element *phy_ports ) {
 }
 
 
+static void
+append_physical_port( void *port, void *physical_ports ) {
+  if ( ( ( struct ofp_phy_port * ) port )->port_no <= OFPP_MAX ) {
+    append_to_tail( ( list_element ** ) physical_ports, port );
+  }
+}
+
+
 void
 handle_features_reply(
   uint64_t datapath_id,
@@ -264,7 +286,7 @@ handle_features_reply(
   uint8_t n_tables,
   uint32_t capabilities,
   uint32_t actions,
-  const list_element *phy_ports,
+  const list_element *ports,
   void *controller
 ) {
   if ( rb_respond_to( ( VALUE ) controller, rb_intern( "features_reply" ) ) == Qfalse ) {
@@ -278,7 +300,16 @@ handle_features_reply(
   rb_hash_aset( attributes, ID2SYM( rb_intern( "n_tables" ) ), UINT2NUM( n_tables ) );
   rb_hash_aset( attributes, ID2SYM( rb_intern( "capabilities" ) ), UINT2NUM( capabilities ) );
   rb_hash_aset( attributes, ID2SYM( rb_intern( "actions" ) ), UINT2NUM( actions ) );
-  rb_hash_aset( attributes, ID2SYM( rb_intern( "ports" ) ), ports_from( phy_ports ) );
+  rb_hash_aset( attributes, ID2SYM( rb_intern( "ports" ) ), ports_from( ports ) );
+
+  list_element *tmp_ports = xmalloc( sizeof( list_element ) );
+  memcpy( tmp_ports, ports, sizeof( list_element ) );
+  list_element *physical_ports = xmalloc( sizeof( list_element ) );
+  create_list( &physical_ports );
+  iterate_list( tmp_ports, append_physical_port, &physical_ports );
+  rb_hash_aset( attributes, ID2SYM( rb_intern( "physical_ports" ) ), ports_from( physical_ports ) );
+  xfree( physical_ports );
+  xfree( tmp_ports );
 
   VALUE features_reply = rb_funcall( cFeaturesReply, rb_intern( "new" ), 1, attributes );
   rb_funcall( ( VALUE ) controller, rb_intern( "features_reply" ), 2, ULL2NUM( datapath_id ), features_reply );

data/ruby/trema/packet-in.c

@@ -593,6 +593,22 @@ packet_in_ipv4_daddr( VALUE self ) {
 }
 
 
+/*
+ * Is it a LLDP packet?
+ *
+ * @return [Boolean] whether the packet is a LLDP packet or not.
+ */
+static VALUE
+packet_in_is_lldp( VALUE self ) {
+  if ( ( get_packet_in_info( self )->format & NW_LLDP ) ) {
+    return Qtrue;
+  }
+  else {
+    return Qfalse;
+  }
+}
+
+
 /*
  * Is it an ICMPv4 packet?
  *
@@ -1103,6 +1119,7 @@ Init_packet_in() {
   rb_define_method( cPacketIn, "vtag?", packet_in_is_vtag, 0 );
   rb_define_method( cPacketIn, "arp?", packet_in_is_arp, 0 );
   rb_define_method( cPacketIn, "ipv4?", packet_in_is_ipv4, 0 );
+  rb_define_method( cPacketIn, "lldp?", packet_in_is_lldp, 0 );
   rb_define_method( cPacketIn, "icmpv4?", packet_in_is_icmpv4, 0 );
   rb_define_method( cPacketIn, "igmp?", packet_in_is_igmp, 0 );
   rb_define_method( cPacketIn, "tcp?", packet_in_is_tcp, 0 );

data/ruby/trema/version.rb

@@ -17,7 +17,7 @@
 
 
 module Trema
-  VERSION = "0.3.12"
+  VERSION = "0.3.13"
 end
 
 

data/spec/trema/packet-in_spec.rb

@@ -131,6 +131,7 @@ describe Trema::PacketIn do
           expect( message.vtag? ).to be_false
           expect( message.arp? ).to be_true
           expect( message.ipv4? ).to be_false
+          expect( message.lldp? ).to be_false
           expect( message.tcp? ).to be_false
           expect( message.udp? ).to be_false
           expect( message.icmpv4? ).to be_false
@@ -241,6 +242,7 @@ describe Trema::PacketIn do
           expect( message.vtag? ).to be_false
           expect( message.arp? ).to be_false
           expect( message.ipv4? ).to be_true
+          expect( message.lldp? ).to be_false
           expect( message.udp? ).to be_false
           expect( message.tcp? ).to be_true
           expect( message.icmpv4? ).to be_false
@@ -324,6 +326,7 @@ describe Trema::PacketIn do
           expect( message.vtag? ).to be_false
           expect( message.arp? ).to be_false
           expect( message.ipv4? ).to be_true
+          expect( message.lldp? ).to be_false
           expect( message.tcp? ).to be_false
           expect( message.udp? ).to be_true
           expect( message.icmpv4? ).to be_false
@@ -404,6 +407,7 @@ describe Trema::PacketIn do
           expect( message.vtag? ).to be_true
           expect( message.arp? ).to be_false
           expect( message.ipv4? ).to be_true
+          expect( message.lldp? ).to be_false
           expect( message.udp? ).to be_false
           expect( message.tcp? ).to be_false
           expect( message.icmpv4? ).to be_true
@@ -487,6 +491,7 @@ describe Trema::PacketIn do
           expect( message.vtag? ).to be_false
           expect( message.arp? ).to be_false
           expect( message.ipv4? ).to be_true
+          expect( message.lldp? ).to be_false
           expect( message.udp? ).to be_false
           expect( message.tcp? ).to be_false
           expect( message.icmpv4? ).to be_false
@@ -523,6 +528,50 @@ describe Trema::PacketIn do
       }
     end
 
+    it "should have correct LLDP packet fields" do
+      network {
+        vswitch( "packet-in" ) { datapath_id 0xabc }
+        vhost "host1"
+        vhost "host2"
+        link "host1", "packet-in"
+        link "host2", "packet-in"
+      }.run( PacketInSendController ) {
+        data = [
+          0x01, 0x80, 0xC2, 0x00, 0x00, 0x0E, # dst
+          0x00, 0x00, 0x00, 0x00, 0x00, 0x02, # src
+          0x88, 0xcc, # ether type
+          0x02, 0x05, 0x07, 0x30, 0x78, 0x65, 0x31, # Chasis ID
+          0x04, 0x02, 0x07, 0x31, # Port ID
+          0x06, 0x02, 0x00, 0xb4, # TTL
+          0x00, 0x00, # EOF
+          0xa5, 0xa5, 0xa5, 0xa5, 0xa5, 0xa5, 
+          0xa5, 0xa5, 0xa5, 0xa5, 0xa5, 0xa5, 
+          0xa5, 0xa5, 0xa5, 0xa5, 0xa5, 0xa5, 
+          0xa5, 0xa5, 0xa5, 0xa5, 0xa5, 0xa5, 
+          0xa5, 0xa5, 0xa5, 0xa5, 0xa5, 0xa5, 
+          0xa5, 0xa5, 0xa5, 0xa5, 0xa5
+        ].pack( "C*" )
+        controller( "PacketInSendController" ).should_receive( :packet_in ) do | datapath_id, message |
+          expect( message.in_port ).to be > 0
+          expect( message.vtag? ).to be_false
+          expect( message.arp? ).to be_false
+          expect( message.ipv4? ).to be_false
+          expect( message.lldp? ).to be_true
+          expect( message.udp? ).to be_false
+          expect( message.tcp? ).to be_false
+          expect( message.icmpv4? ).to be_false
+          expect( message.igmp? ).to be_false
+        end
+
+        controller( "PacketInSendController" ).send_packet_out(
+          0xabc,
+          :data => data,
+          :actions => Trema::ActionOutput.new( :port => Controller::OFPP_CONTROLLER )
+        )
+        sleep 2
+      }
+    end
+
   end
 
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: trema
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: 
   segments: 
   - 0
   - 3
-  - 12
-  version: 0.3.12
+  - 13
+  version: 0.3.13
 platform: ruby
 authors: 
 - Yasuhito Takamiya
@@ -15,7 +15,7 @@ autorequire:
 bindir: .
 cert_chain: []
 
-date: 2013-02-15 00:00:00 Z
+date: 2013-02-18 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   prerelease: false
@@ -31,8 +31,8 @@ dependencies:
         - 2
         - 3
         version: 1.2.3
-  requirement: *id001
   type: :runtime
+  requirement: *id001
 - !ruby/object:Gem::Dependency 
   prerelease: false
   name: gli
@@ -47,8 +47,8 @@ dependencies:
         - 5
         - 4
         version: 2.5.4
-  requirement: *id002
   type: :runtime
+  requirement: *id002
 - !ruby/object:Gem::Dependency 
   prerelease: false
   name: rake
@@ -63,8 +63,8 @@ dependencies:
         - 0
         - 3
         version: 10.0.3
-  requirement: *id003
   type: :runtime
+  requirement: *id003
 - !ruby/object:Gem::Dependency 
   prerelease: false
   name: rdoc
@@ -79,8 +79,8 @@ dependencies:
         - 12
         - 1
         version: 3.12.1
-  requirement: *id004
   type: :runtime
+  requirement: *id004
 description: Trema is a full-stack, easy-to-use framework for developing OpenFlow controllers in Ruby and C.
 email: 
 - yasuhito@gmail.com
@@ -787,7 +787,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Full-stack OpenFlow framework.