trema 0.2.5 → 0.2.6

data/spec/trema/stats-reply_spec.rb

@@ -30,7 +30,7 @@ describe StatsReply, ".new( VALID OPTIONS )" do
         :hw_desc => "no hardware description",
         :sw_desc => "version xx.xx",
         :serial_num => "1234",
-        :dp_desc => "nec01"                         
+        :dp_desc => "nec01"
       )
     end
 
@@ -62,14 +62,14 @@ describe StatsReply, ".new( VALID OPTIONS )" do
         :actions => actions
       )
     end
-    
+
     it { should respond_to( :to_s ) }
     its ( :length ) { should == 96 }
     its ( :table_id ) { should == 0 }
     its ( :match ) { should be_an_instance_of Match }
     its ( :duration_sec ) { should == 3 }
     its ( :duration_nsec ) { should == 106000000 }
-    its ( :priority ) { should == 65535 } 
+    its ( :priority ) { should == 65535 }
     its ( :idle_timeout ) { should == 0 }
     its ( :hard_timeout ) { should == 0 }
     its ( :cookie ) { should == 866942928268820481 }
@@ -78,23 +78,23 @@ describe StatsReply, ".new( VALID OPTIONS )" do
     its ( :actions ) { should_not be_empty }
   end
 
-  
+
   context "when aggregate-stats-reply is created" do
     subject do
       AggregateStatsReply.new(
         :packet_count => 2,
         :byte_count => 128,
-        :flow_count =>  10 
+        :flow_count =>  10
       )
     end
-    
+
     it { should respond_to( :to_s ) }
     its( :packet_count ) { should == 2 }
     its( :byte_count ) { should == 128 }
     its ( :flow_count ) { should == 10 }
   end
-  
-  
+
+
   context "when table-stats-reply is created" do
     subject do
       TableStatsReply.new(
@@ -107,7 +107,7 @@ describe StatsReply, ".new( VALID OPTIONS )" do
         :matched_count => 1
       )
     end
-    
+
     it { should respond_to( :to_s ) }
     its( :table_id ) { should == 1 }
     its( :name ) { should eq( "classifier" ) }
@@ -117,8 +117,8 @@ describe StatsReply, ".new( VALID OPTIONS )" do
     its( :lookup_count ) { should == 4 }
     its( :matched_count ) { should == 1 }
   end
-  
-  
+
+
   context "when port-stats-reply is created" do
     subject do
       PortStatsReply.new(
@@ -137,7 +137,7 @@ describe StatsReply, ".new( VALID OPTIONS )" do
         :collisions => 1
       )
     end
-    
+
     it { should respond_to( :to_s ) }
     its( :port_no ) { should == 1 }
     its( :rx_packets ) { should == 7 }
@@ -154,7 +154,7 @@ describe StatsReply, ".new( VALID OPTIONS )" do
     its( :collisions ) { should == 1 }
   end
 
-  
+
   context "when queue-stats-reply is created" do
     subject do
       QueueStatsReply.new(
@@ -162,10 +162,10 @@ describe StatsReply, ".new( VALID OPTIONS )" do
         :queue_id => 2,
         :tx_bytes => 1024,
         :tx_packets => 16,
-        :tx_errors => 5 
+        :tx_errors => 5
       )
     end
-    
+
     it { should respond_to( :to_s ) }
     its( :port_no ) { should == 1 }
     its( :queue_id ) { should == 2 }
@@ -173,16 +173,16 @@ describe StatsReply, ".new( VALID OPTIONS )" do
     its( :tx_packets ) { should == 16 }
     its( :tx_errors ) { should  == 5 }
   end
-  
-  
+
+
   context "when vendor-stats-reply is created" do
     subject { VendorStatsReply.new( :vendor_id => 123 ) }
 
     it { should respond_to( :to_s ) }
     its( :vendor_id ) { should == 123 }
   end
-  
-  
+
+
   context "when #stats_request(desc-stats) is sent" do
     it "should #stats_reply(desc-stats)" do
       class DescStatsController < Controller; end
@@ -190,13 +190,13 @@ describe StatsReply, ".new( VALID OPTIONS )" do
         vswitch( "desc-stats" ) { datapath_id 0xabc }
       }.run( DescStatsController ) {
         controller( "DescStatsController" ).should_receive( :stats_reply ) do | datapath_id, message |
-          datapath_id.should == 0xabc          
+          datapath_id.should == 0xabc
           message.type.should == 0
           message.stats[ 0 ].mfr_desc.should eq( "Nicira Networks, Inc." )
           message.stats[ 0 ].hw_desc.should eq( "Open vSwitch" )
           message.stats[ 0 ].should respond_to :to_s
         end
-        
+
         controller( "DescStatsController" ).send_message( 0xabc,
           DescStatsRequest.new( :transaction_id => 1234 ) )
         sleep 2 # FIXME: wait to send_message
@@ -216,11 +216,11 @@ describe StatsReply, ".new( VALID OPTIONS )" do
         link "host2", "flow-stats"
       }.run( FlowStatsController ) {
         controller( "FlowStatsController" ).send_flow_mod_add(
-          0xabc, 
+          0xabc,
           # match the UDP packet
           :match => Match.new( :dl_type => 0x800, :nw_proto => 17 ),
           # flood the packet
-          :actions => ActionOutput.new( :port => FlowStatsController::OFPP_FLOOD ) 
+          :actions => ActionOutput.new( :port => FlowStatsController::OFPP_FLOOD )
         )
         sleep 1 # FIXME: wait to send_flow_mod_add
         # send two packets
@@ -240,8 +240,8 @@ describe StatsReply, ".new( VALID OPTIONS )" do
       }
     end
   end
-  
-  
+
+
   context "when #stats_request(aggregate_stats) is sent" do
     it "should #stats_reply(aggregate-stats) attributes" do
       class AggregateStatsController < Controller; end
@@ -257,7 +257,7 @@ describe StatsReply, ".new( VALID OPTIONS )" do
           # match the UDP packet
           :match => Match.new( :dl_type => 0x800, :nw_proto => 17 ),
           # flood the packet
-          :actions => ActionOutput.new( :port => AggregateStatsController::OFPP_FLOOD ) 
+          :actions => ActionOutput.new( :port => AggregateStatsController::OFPP_FLOOD )
         )
         sleep 1 # FIXME: wait to send_flow_mod_add
         # send ten packets
@@ -278,8 +278,8 @@ describe StatsReply, ".new( VALID OPTIONS )" do
       }
     end
   end
-  
-  
+
+
   context "when #stats_request(port-stats) is sent" do
     it "should #stats_reply(port-stats)" do
       class PortStatsController < Controller; end
@@ -293,15 +293,16 @@ describe StatsReply, ".new( VALID OPTIONS )" do
         controller( "PortStatsController" ).send_flow_mod_add(
           0xabc,
           :match => Match.new( :dl_type => 0x800, :nw_proto => 17 ),
-          :actions => ActionOutput.new( :port => PortStatsController::OFPP_FLOOD ) 
+          :actions => ActionOutput.new( :port => PortStatsController::OFPP_FLOOD )
         )
+        sleep 1 # FIXME: wait to send_flow_mod_add
         send_packets "host1", "host2"
         sleep 2 # FIXME: wait to send_packets
-        
+
         controller( "PortStatsController" ).should_receive( :stats_reply ) do | datapath_id, message |
           datapath_id.should == 0xabc
           message.type.should == 4
-          message.stats[ 0 ].should be_an_instance_of(Trema::PortStatsReply)
+          message.stats[ 0 ].should be_an_instance_of( Trema::PortStatsReply )
           message.stats[ 0 ].should respond_to :to_s
         end
         controller( "PortStatsController" ).send_message( 0xabc,
@@ -310,8 +311,8 @@ describe StatsReply, ".new( VALID OPTIONS )" do
       }
     end
   end
-  
-  
+
+
   context "when #stats_request(table-stats) is sent" do
     it "should #stats_reply(table-stats)" do
       class TableStatsController < Controller; end
@@ -322,13 +323,14 @@ describe StatsReply, ".new( VALID OPTIONS )" do
         link "host1", "table-stats"
         link "host2", "table-stats"
       }.run( TableStatsController) {
-        controller( "TableStatsController" ).send_flow_mod_add( 
+        controller( "TableStatsController" ).send_flow_mod_add(
           0xabc,
-          :actions => ActionOutput.new( :port => TableStatsController::OFPP_FLOOD ) 
+          :actions => ActionOutput.new( :port => TableStatsController::OFPP_FLOOD )
         )
+        sleep 1 # FIXME: wait to send_flow_mod_add
         send_packets "host1", "host2"
         sleep 2 # FIXME: wait to send_packets
-        
+
         controller( "TableStatsController" ).should_receive( :stats_reply ) do | datapath_id, message |
           datapath_id.should == 0xabc
           message.type.should == 3

data/spec/trema/stats-request_spec.rb

@@ -38,7 +38,7 @@ describe StatsRequest do
   context "when .FlowStatsRequest.new( MANDATORY OPTION MISSING )" do
     subject { FlowStatsRequest.new }
     it "should raise ArgumentError" do
-      expect { subject }.to raise_error( ArgumentError ) 
+      expect { subject }.to raise_error( ArgumentError )
     end
   end
 
@@ -53,8 +53,8 @@ describe StatsRequest do
 
 
   context "when .FlowStatsRequest.new( VALID OPTIONS )" do
-    subject do 
-      FlowStatsRequest.new( 
+    subject do
+      FlowStatsRequest.new(
         :match => Match.new( :dl_type => 0x800, :nw_proto => 17 ),
         :table_id => 1,
         :out_port => 2
@@ -70,7 +70,7 @@ describe StatsRequest do
   context "when .AggregateStatsRequest.new( MANDATORY OPTION MISSING )" do
     subject { AggregateStatsRequest.new }
     it "should raise ArgumentError" do
-      expect { subject }.to raise_error( ArgumentError ) 
+      expect { subject }.to raise_error( ArgumentError )
     end
   end
 
@@ -85,8 +85,8 @@ describe StatsRequest do
 
 
   context "when .AggregateStatsRequest.new( VALID OPTIONS )" do
-    subject do 
-      AggregateStatsRequest.new( 
+    subject do
+      AggregateStatsRequest.new(
         :match => Match.new( :dl_type => 0x800, :nw_proto => 17 ),
         :table_id => 1,
         :out_port => 2

data/spec/trema/strip-vlan-header_spec.rb

@@ -28,6 +28,7 @@ describe StripVlanHeader, ".new" do
         vswitch { datapath_id 0xabc }
       }.run( FlowModAddController ) {
         controller( "FlowModAddController" ).send_flow_mod_add( 0xabc, :actions => StripVlanHeader.new )
+        sleep 2 # FIXME: wait to send_flow_mod_add
         vswitch( "0xabc" ).should have( 1 ).flows
         vswitch( "0xabc" ).flows[ 0 ].actions.should match( /strip_vlan/ )
       }

data/spec/trema/util_spec.rb

@@ -28,11 +28,11 @@ include Trema::Util
 
 
 describe Trema::Util do
-  it "should check the sanity of trema" do
+  it "should assert that trema is built" do
     Trema::Executables.stub!( :compiled? ).and_return( false )
     $stderr.should_receive( :puts ).with( /^ERROR/ )
     lambda do
-      sanity_check
+      assert_trema_is_built
     end.should raise_error( SystemExit )
   end
 
@@ -70,6 +70,7 @@ describe Trema::Util do
     last_session.stub!( :switches ).and_return( switches )
     last_session.stub!( :hosts ).and_return( hosts )
     last_session.stub!( :links ).and_return( links )
+    last_session.stub!( :netnss ).and_return( {} )
     Trema::DSL::Context.stub!( :load_current ).and_return( last_session )
 
     pid_files = [ mock( "PID file #0" ), mock( "PID file #1" ), mock( "PID file #2" ) ]

data/spec/trema/vendor-action_spec.rb

@@ -44,24 +44,25 @@ end
 
 describe VendorAction, ".new( vendor_id, body )" do
   subject { VendorAction.new vendor_id, body }
-  let( :vendor_id ) { 0x00004cff }
+  let( :vendor_id ) { 0x00002320 }
 
-  context %{when body == "deadbeef".unpack( "C*" )} do
-    let( :body ) { "deadbeef".unpack( "C*" ) }
+  context %{when body == [ 0x00, 0x08, 0x54, 0x72, 0x65, 0x6d, 0x61, 0x00 ]} do
+    let( :body ) { [ 0x00, 0x08, 0x54, 0x72, 0x65, 0x6d, 0x61, 0x00 ] }
 
-    its( :vendor_id ) { should == 0x00004cff }
-    its( :body ) { should == [ 100, 101, 97, 100, 98, 101, 101, 102 ] }
+    its( :vendor_id ) { should == 0x00002320 }
+    its( :body ) { should == [ 0, 8, 84, 114, 101, 109, 97, 0 ] }
 
     context "when sending Flow Mod Add with action set to VendorAction" do
       it "should have a flow with action set to VendorAction" do
         class FlowModAddController < Controller; end
-        pending "Use Nicira's vendor ID and body"
         network {
           vswitch { datapath_id 0xabc }
         }.run( FlowModAddController ) {
-          controller( "FlowModAddController" ).send_flow_mod_add( 0xabc, :actions => VendorAction.new( 0x00004cff, "deadbeef".unpack( "C*" ) ) )
+	  body = [ 0x00, 0x08, 0x54, 0x72, 0x65, 0x6d, 0x61, 0x00 ]
+          controller( "FlowModAddController" ).send_flow_mod_add( 0xabc, :actions => VendorAction.new( 0x00002320, body ) )
+	  sleep 2 # FIXME: wait to send_flow_mod_add
           vswitch( "0xabc" ).should have( 1 ).flows
-          vswitch( "0xabc" ).flows[ 0 ].actions.should match( /mod_vendor/ )
+          vswitch( "0xabc" ).flows[ 0 ].actions.should match( /note:54.72.65.6d.61.00/ )
         }
       end
     end

data/src/examples/dumper/dumper.c

@@ -1,6 +1,6 @@
 /*
  * Sample OpenFlow event dumper.
- * 
+ *
  * Author: Yasunobu Chiba
  *
  * Copyright (C) 2008-2012 NEC Corporation
@@ -36,10 +36,12 @@ usage() {
           "OpenFlow Event Dumper.\n"
           "Usage: %s [OPTION]...\n"
           "\n"
-          "  -n, --name=SERVICE_NAME     service name\n"
-          "  -d, --daemonize             run in the background\n"
-          "  -l, --logging_level=LEVEL   set logging level\n"
-          "  -h, --help                  display this help and exit\n"
+          "  -n, --name=SERVICE_NAME         service name\n"
+          "  -d, --daemonize                 run in the background\n"
+          "  -l, --logging_level=LEVEL       set logging level\n"
+          "  -g, --syslog                    output log messages to syslog\n"
+          "  -f, --logging_facility=FACILITY set syslog facility\n"
+          "  -h, --help                      display this help and exit\n"
           , get_executable_name()
         );
 }
@@ -325,7 +327,7 @@ handle_queue_get_config_reply( uint64_t datapath_id, uint32_t transaction_id,
   }
 
   xfree( queues_head );
-}                 
+}
 
 
 int

data/src/examples/dumper/dumper.rb

@@ -160,7 +160,7 @@ class Dumper < Controller
 
   def dump_phy_port port
     # for testing port-status record the mac address if port.number == 2.
-    @hw_addr = port.hw_addr if port.number == 2 
+    @hw_addr = port.hw_addr if port.number == 2
     info "port_no: #{ port.number }"
     info "  hw_addr: #{ port.hw_addr }"
     info "  name: #{ port.name }"

data/{features/step_definitions/killall_steps.rb → src/examples/hello_trema/hello-trema.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,16 @@
 #
 
 
-Given /^I terminated all trema services$/ do
-  run "./trema killall"
+class HelloTrema < Controller
+  def switch_ready datapath_id
+    info "Hello %#x!" % datapath_id
+    shutdown!
+  end
 end
 
 
 ### Local variables:
 ### mode: Ruby
-### coding: utf-8-unix
+### coding: utf-8
 ### indent-tabs-mode: nil
 ### End:

data/src/examples/hello_trema/hello_trema.c

@@ -1,6 +1,4 @@
 /*
- * Hello trema world!
- *
  * Copyright (C) 2008-2012 NEC Corporation
  *
  * This program is free software; you can redistribute it and/or modify
@@ -24,7 +22,9 @@
 
 static void
 handle_switch_ready( uint64_t datapath_id, void *user_data ) {
-  info( "Hello %#" PRIx64 " from %s!", datapath_id, user_data );
+  UNUSED( user_data );
+
+  info( "Hello %#" PRIx64 "!", datapath_id );
   stop_trema();
 }
 
@@ -33,7 +33,7 @@ int
 main( int argc, char *argv[] ) {
   init_trema( &argc, &argv );
 
-  set_switch_ready_handler( handle_switch_ready, argv[ 0 ] );
+  set_switch_ready_handler( handle_switch_ready, NULL );
 
   start_trema();
 

data/src/examples/learning_switch/learning_switch.c

@@ -20,8 +20,8 @@
  */
 
 
-#include <time.h>
 #include <assert.h>
+#include <time.h>
 #include "trema.h"
 
 

data/src/examples/list_switches/list_switches.c

@@ -28,7 +28,7 @@ join( char *result, const list_element *switches ) {
   const list_element *element;
   for ( element = switches; element != NULL; element = element->next ) {
     char tmp[ 19 ]; // "0x" + 64bits in hex + '\0'
-    snprintf( tmp, sizeof( tmp ), "%#" PRIx64, * ( uint64_t *) element->data );
+    snprintf( tmp, sizeof( tmp ), "%#" PRIx64, *( uint64_t * ) element->data );
     strcat( result, tmp );
     strcat( result, comma );
   }
@@ -66,7 +66,7 @@ main( int argc, char *argv[] ) {
   init_trema( &argc, &argv );
   add_periodic_event_callback( 30, timeout, NULL );
 
-  add_periodic_event_callback( 2, ( void ( * ) ( void * ) )send_list_switches_request, NULL );
+  add_periodic_event_callback( 2, ( void ( * )( void * ) ) send_list_switches_request, NULL );
   set_list_switches_reply_handler( handle_list_switches_reply );
 
   start_trema();