trema 0.3.5 → 0.3.6

data/Gemfile

@@ -22,6 +22,7 @@ group :development do
   gem "rdoc", "~> 3.12"
   gem "redcarpet", "~> 2.2.2"
   gem "reek", "~> 1.2.13"
+  gem "relish", "~> 0.6"
   gem "roodi", "~> 2.1.0"
   gem "rspec", "~> 2.12.0"
   gem "yard", "~> 0.8.3"

data/Rakefile

@@ -43,6 +43,15 @@ rescue LoadError
 end
 
 
+################################################################################
+# Relish
+################################################################################
+
+task :relish do
+  sh "relish push trema/trema"
+end
+
+
 ################################################################################
 # Tests
 ################################################################################

data/Rantfile

@@ -54,7 +54,6 @@ task :default => [
 task :examples => [
   "examples:cbench_switch",
   "examples:dumper",
-  "examples:hello_trema",
   "examples:learning_switch",
   "examples:list_switches",
   "examples:multi_learning_switch",
@@ -645,7 +644,6 @@ end
 standalone_examples = [
   "cbench_switch",
   "dumper",
-  "hello_trema",
   "learning_switch",
   "list_switches",
   "multi_learning_switch",

data/bin/trema

@@ -213,9 +213,17 @@ command :version do | c |
 end
 
 
+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
+
   assert_trema_is_built
 
   if FileTest.exist?( Trema.tmp ) and not FileTest.writable?( Trema.tmp )

data/features/.nav

@@ -0,0 +1,34 @@
+- trema_commands:
+  - version_option.feature
+  - help_option.feature
+  - run.feature
+  - kill.feature
+  - up.feature
+  - killall.feature
+  - send_packets.feature
+  - show_stats.feature
+  - reset_stats.feature
+  - dump_flows.feature
+  - version.feature
+  - help.feature
+- examples:
+  - hello_trema.feature
+  - list_switches.feature
+  - switch_monitor.feature
+  - switch_info.feature
+  - patch_panel.feature
+  - packet_in.feature
+  - dumper.feature
+  - repeater_hub.feature
+  - learning_switch.feature
+  - multi_learning_switch.feature
+  - openflow_message.hello.feature
+  - openflow_message.echo.feature
+  - openflow_message.features_request.feature
+  - message.set_config.feature
+  - message.vendor-action.feature
+  - packetin_filter_config.feature
+- core:
+  - switch_manager.feature
+  - packetin_filter.feature
+  - trema-config.feature

data/features/README.md

@@ -0,0 +1,7 @@
+## Issues
+
+This documentation is
+[open source](https://github.com/trema/trema/tree/develop/features),
+and a work in progress. If you find it incomplete or confusing, please
+[submit an isssue](https://github.com/trema/trema/issues), or, better
+yet, [a pull request](https://github.com/trema/trema/pulls).

data/features/examples/hello_trema.feature

@@ -0,0 +1,23 @@
+Feature: "Hello Trema!" example
+
+  The "Hello Trema!" example ([trema]/src/examples/hello_trema/) is one
+  of the simplest OpenFlow controller implementation. The basic
+  functionality of this controller is to establish a secure channel connection
+  with an OpenFlow switch and output the "Hello [switch's dpid]!" message.
+
+  This demonstrates a minimum template for Trema applications written in Ruby
+  or C. Hence it's a good starting point to learn about Trema programming.
+
+  Background:
+    Given I cd to "../../src/examples/hello_trema/"
+
+  @slow_process
+  Scenario: Run the Ruby example
+    When I run `trema run ./hello-trema.rb -c sample.conf` interactively
+    Then the output should contain "Hello 0xabc!" within the timeout period
+
+  @slow_process
+  Scenario: Run the C example
+    Given I compile "hello_trema.c" into "hello_trema"
+    When I run `trema run ./hello_trema -c sample.conf` interactively
+    Then the output should contain "Hello 0xabc!" within the timeout period

data/features/step_definitions/misc_steps.rb

@@ -16,6 +16,11 @@
 #
 
 
+Given /^I compile "(.*?)" into "(.*?)"$/ do | c_source, executable |
+  run_simple "gcc #{ c_source } #{`trema-config -c -l`} -o #{ executable }", true
+end
+
+
 When /^\*\*\* sleep (\d+) \*\*\*$/ do | sec |
   sleep sec.to_i
 end
@@ -34,6 +39,11 @@ When /^wait until "([^"]*)" is up$/ do | process |
 end
 
 
+Then /^the output should contain "(.*?)" within the timeout period$/ do | expected |
+  step %{I wait for output to contain "#{ expected }"}
+end
+
+
 Then /^([^\s]*) is terminated$/ do | name |
   ps_entry_of( name ).should be_empty
 end

data/features/trema_commands/README.md

@@ -0,0 +1,8 @@
+The `trema` command comes with several sub-commands you can use to
+run your own controllers on emulated network envrionments.
+
+For a full list of sub-commands, run the `trema` command with no arguments:
+
+```
+$ ./trema
+```

data/features/{trema.dump_flows.feature → trema_commands/dump_flows.feature}

@@ -1,4 +1,4 @@
-Feature: trema dump_flows command
+Feature: dump_flows command
 
   In order to inspect all flow entries in a Trema virtual switch
   As a developer using Trema

data/features/{trema.help.feature → trema_commands/help.feature}

@@ -1,4 +1,4 @@
-Feature: trema help
+Feature: help command
 
   In order to understand how to use Trema
   As a developer using Trema

data/features/trema_commands/help_option.feature

@@ -0,0 +1,19 @@
+Feature: --help option
+
+  Use the --help option or just type trema to display the usage of trema command.
+
+  Scenario: trema --help
+    When I run `trema --help`
+    Then the output should match /^NAME/
+     And the output should match /^SYNOPSIS/
+     And the output should match /^VERSION/
+     And the output should match /^GLOBAL OPTIONS/
+     And the output should match /^COMMANDS/
+
+  Scenario: trema
+    When I run `trema`
+    Then the output should match /^NAME/
+     And the output should match /^SYNOPSIS/
+     And the output should match /^VERSION/
+     And the output should match /^GLOBAL OPTIONS/
+     And the output should match /^COMMANDS/

data/features/{trema.kill.feature → trema_commands/kill.feature}

@@ -1,4 +1,4 @@
-Feature: trema kill command
+Feature: kill command
 
   In order to test event handling or just kill unwanted processes
   As a developer using Trema

data/features/{trema.killall.feature → trema_commands/killall.feature}

@@ -1,4 +1,4 @@
-Feature: trema killall command
+Feature: killall command
 
   In order to cleanup the previous trema session
   As a developer using Trema

data/features/{trema.reset_stats.feature → trema_commands/reset_stats.feature}

@@ -1,4 +1,4 @@
-Feature: trema reset_stats command
+Feature: reset_stats command
 
   In order to reset the stats of sent/received packets
   As a developer using Trema

data/features/{trema.run.feature → trema_commands/run.feature}

@@ -1,4 +1,4 @@
-Feature: trema run command
+Feature: run command
 
   In order to launch trema applications
   As a developer using Trema

data/features/{trema.send_packets.feature → trema_commands/send_packets.feature}

@@ -1,4 +1,4 @@
-Feature: trema send_packets command
+Feature: send_packets command
 
   In order to send/receive packets between virtual hosts
   As a developer using Trema

data/features/{trema.show_stats.feature → trema_commands/show_stats.feature}

@@ -1,4 +1,4 @@
-Feature: trema show_stats command
+Feature: show_stats command
 
   In order to get the stats of sent/received packets
   As a developer using Trema

data/features/{trema.up.feature → trema_commands/up.feature}

@@ -1,4 +1,4 @@
-Feature: trema up command
+Feature: up command
 
   In order to restart killed processes
   As a developer using Trema

data/features/{trema.version.feature → trema_commands/version.feature}

@@ -1,4 +1,4 @@
-Feature: trema version command
+Feature: version command
 
   In order to know the current version of Trema
   As a developer using Trema

data/features/trema_commands/version_option.feature

@@ -0,0 +1,7 @@
+Feature: --version option
+
+  Use the --version option to display the current runtime version.
+
+  Scenario: trema --version
+    When I run `trema --version`
+    Then the output should match /trema version \d+\.\d+.\d+/

data/ruby/trema/set-ip-addr.rb

@@ -38,6 +38,11 @@ module Trema
       end
       @ip_address = IPAddr.new( ip_address )
     end
+
+
+    def to_s
+      "#{ self.class.to_s }: ip_address=#{ @ip_address }"
+    end
   end
 end
 

data/ruby/trema/set-ip-dst-addr.rb

@@ -28,6 +28,8 @@ module Trema
     # Creates an action to modify the IPv4 destination address of a
     # packet.
     #
+    # @overload initialize(ip_address)
+    #
     # @example
     #   SetIpDstAddr.new("192.168.1.1")
     #
@@ -37,9 +39,6 @@ module Trema
     # @raise [ArgumentError] if ip_address is an invalid IPv4 address.
     # @raise [TypeError] if ip_address is not a String.
     #
-    def initialize ip_address
-      super ip_address
-    end
   end
 
 

data/ruby/trema/set-ip-src-addr.rb

@@ -27,6 +27,8 @@ module Trema
     #
     # Creates an action to modify the IPv4 source address of a packet.
     #
+    # @overload initialize(ip_address)
+    #
     # @example
     #   SetIpSrcAddr.new("192.168.1.1")
     #
@@ -36,9 +38,6 @@ module Trema
     # @raise [ArgumentError] if ip_address is an invalid IPv4 address.
     # @raise [TypeError] if ip_address is not a String.
     #
-    def initialize ip_address
-      super ip_address
-    end
   end
 
 

data/ruby/trema/version.rb

@@ -17,7 +17,7 @@
 
 
 module Trema
-  VERSION = "0.3.5"
+  VERSION = "0.3.6"
 end
 
 

data/spec/trema/set-ip-addr_spec.rb

@@ -0,0 +1,81 @@
+#
+# 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 File.join( File.dirname( __FILE__ ), "..", "spec_helper" )
+require "trema"
+
+
+[ SetIpSrcAddr, SetIpDstAddr ].each do | klass |
+  describe klass, "#new(ip_address)", :type => "actions" do
+    subject { klass.new( ip_address ) }
+
+
+    context %{with ip_address ("192.168.1.1")} do
+      let( :ip_address ) { "192.168.1.1" }
+
+      its( "ip_address.to_s" ) { should == "192.168.1.1" }
+      its( :to_s ) { should eq( "#{ klass.to_s }: ip_address=192.168.1.1" ) }
+    end
+
+
+    context %{with ip_address ("192.168.1.10")} do
+      let( :ip_address ) { "192.168.1.10" }
+
+      context "when set as FlowMod's action", :sudo => true do
+        it "should insert a new flow entry with action (mod_nw_{src,dst}:192.168.1.10)" do
+          class TestController < Controller; end
+          network {
+            vswitch { datapath_id 0xabc }
+          }.run( TestController ) {
+            controller( "TestController" ).send_flow_mod_add( 0xabc, :actions => subject )
+            sleep 2
+            expect( vswitch( "0xabc" ) ).to have( 1 ).flows
+            expect( vswitch( "0xabc" ).flows[ 0 ].actions ).to match( /mod_nw_(src|dst):192.168.1.10/ )
+            pending( "Test actions as an object using Trema::Switch" ) do
+              expect( vswitch( "0xabc" ) ).to have( 1 ).flows
+              expect( vswitch( "0xabc" ).flows[ 0 ] ).to have( 1 ).actions
+              expect( vswitch( "0xabc" ).flows[ 0 ].actions[ 0 ] ).to be_a( klass )
+              expect( vswitch( "0xabc" ).flows[ 0 ].actions[ 0 ].ip_address.to_s ).to eq( "192.168.1.10" )
+            end
+          }
+        end
+      end
+    end
+
+
+    context %{with invalid ip_address ("1000.1000.1000.1000")} do
+      let( :ip_address ) { "1000.1000.1000.1000" }
+
+      it { expect { subject }.to raise_error( ArgumentError ) }
+    end
+
+
+    context "with invalid ip_address ([1, 2, 3])" do
+      let( :ip_address ) { [ 1, 2, 3 ] }
+
+      it { expect { subject }.to raise_error( TypeError ) }
+    end
+  end
+end
+
+
+### Local variables:
+### mode: Ruby
+### coding: utf-8-unix
+### indent-tabs-mode: nil
+### End:

data/src/examples/hello_trema/.gitignore

@@ -0,0 +1,2 @@
+hello_trema
+

data/src/examples/hello_trema/README.md

@@ -0,0 +1,2 @@
+See https://www.relishapp.com/trema/trema/docs/examples/hello-trema-example
+

data/src/examples/hello_trema/hello-trema.rb

@@ -19,7 +19,6 @@
 class HelloTrema < Controller
   def switch_ready datapath_id
     info "Hello %#x!" % datapath_id
-    shutdown!
   end
 end
 

data/src/examples/hello_trema/hello_trema.c

@@ -25,7 +25,6 @@ handle_switch_ready( uint64_t datapath_id, void *user_data ) {
   UNUSED( user_data );
 
   info( "Hello %#" PRIx64 "!", datapath_id );
-  stop_trema();
 }
 
 

data/src/examples/hello_trema/sample.conf

@@ -0,0 +1 @@
+vswitch { datapath_id "0xabc" }

data/src/lib/linked_list.c

@@ -145,9 +145,6 @@ list_length_of( const list_element *head ) {
  */
 void
 iterate_list( list_element *head, void function( void *data, void *user_data ), void *user_data ) {
-  if ( head == NULL ) {
-    die( "head must not be NULL" );
-  }
   if ( function != NULL ) {
     for ( list_element *e = head; e != NULL; e = e->next ) {
       function( e->data, user_data );

data/trema.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do | s |
   # specify any dependencies here; for example:
   # s.add_development_dependency "rspec"
   s.add_runtime_dependency "rake"
-  s.add_runtime_dependency "gli", "~> 2.5.2"
+  s.add_runtime_dependency "gli", "~> 2.5.4"
   s.add_runtime_dependency "rdoc", "~> 3.12"
 
   s.add_development_dependency "rake"

data/unittests/lib/linked_list_test.c

@@ -303,6 +303,18 @@ test_iterate_list() {
 }
 
 
+static void
+test_iterate_list_on_empty_list() {
+  create_list( &new_list );
+
+  size_t sum_length = 0;
+  iterate_list( new_list, get_sum_length, &sum_length );
+  assert_int_equal( 0, sum_length );
+
+  delete_list( new_list );
+}
+
+
 static bool
 find_bravo( void *data, void *user_data ) {
   UNUSED( user_data );
@@ -403,6 +415,7 @@ main() {
     unit_test( test_list_length_of_empty_list ),
 
     unit_test( test_iterate_list ),
+    unit_test( test_iterate_list_on_empty_list ),
     unit_test( test_find_list_custom ),
     unit_test( test_find_list_custom_fail ),
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: trema
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: 
   segments: 
   - 0
   - 3
-  - 5
-  version: 0.3.5
+  - 6
+  version: 0.3.6
 platform: ruby
 authors: 
 - Yasuhito Takamiya
@@ -15,7 +15,7 @@ autorequire:
 bindir: .
 cert_chain: []
 
-date: 2013-01-30 00:00:00 Z
+date: 2013-02-03 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   prerelease: false
@@ -39,12 +39,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 31
+        hash: 19
         segments: 
         - 2
         - 5
-        - 2
-        version: 2.5.2
+        - 4
+        version: 2.5.4
   requirement: *id002
   type: :runtime
 - !ruby/object:Gem::Dependency 
@@ -129,40 +129,45 @@ files:
 - bin/trema-config
 - build.rb
 - cruise.rb
-- features/example.dumper.feature
-- features/example.hello_trema.feature
-- features/example.learning_switch.feature
-- features/example.list_switches.feature
-- features/example.message.set_config.feature
-- features/example.message.vendor-action.feature
-- features/example.multi_learning_switch.feature
-- features/example.openflow_message.echo.feature
-- features/example.openflow_message.features_request.feature
-- features/example.openflow_message.hello.feature
-- features/example.packet_in.feature
-- features/example.packetin_filter_config.feature
-- features/example.patch_panel.feature
-- features/example.repeater_hub.feature
-- features/example.switch_info.feature
-- features/example.switch_monitor.feature
-- features/packetin_filter.feature
+- features/.nav
+- features/README.md
+- features/core/packetin_filter.feature
+- features/core/switch_manager.feature
+- features/core/trema-config.feature
+- features/examples/dumper.feature
+- features/examples/hello_trema.feature
+- features/examples/learning_switch.feature
+- features/examples/list_switches.feature
+- features/examples/message.set_config.feature
+- features/examples/message.vendor-action.feature
+- features/examples/multi_learning_switch.feature
+- features/examples/openflow_message.echo.feature
+- features/examples/openflow_message.features_request.feature
+- features/examples/openflow_message.hello.feature
+- features/examples/packet_in.feature
+- features/examples/packetin_filter_config.feature
+- features/examples/patch_panel.feature
+- features/examples/repeater_hub.feature
+- features/examples/switch_info.feature
+- features/examples/switch_monitor.feature
 - features/step_definitions/misc_steps.rb
 - features/step_definitions/send_packets_steps.rb
 - features/step_definitions/stats_steps.rb
 - features/support/env.rb
 - features/support/hooks.rb
-- features/switch_manager.feature
-- features/trema-config.feature
-- features/trema.dump_flows.feature
-- features/trema.help.feature
-- features/trema.kill.feature
-- features/trema.killall.feature
-- features/trema.reset_stats.feature
-- features/trema.run.feature
-- features/trema.send_packets.feature
-- features/trema.show_stats.feature
-- features/trema.up.feature
-- features/trema.version.feature
+- features/trema_commands/README.md
+- features/trema_commands/dump_flows.feature
+- features/trema_commands/help.feature
+- features/trema_commands/help_option.feature
+- features/trema_commands/kill.feature
+- features/trema_commands/killall.feature
+- features/trema_commands/reset_stats.feature
+- features/trema_commands/run.feature
+- features/trema_commands/send_packets.feature
+- features/trema_commands/show_stats.feature
+- features/trema_commands/up.feature
+- features/trema_commands/version.feature
+- features/trema_commands/version_option.feature
 - ruby/.gitignore
 - ruby/blocker.rb
 - ruby/extconf.rb
@@ -396,8 +401,7 @@ files:
 - spec/trema/send-out-port_spec.rb
 - spec/trema/set-config_spec.rb
 - spec/trema/set-eth-addr_spec.rb
-- spec/trema/set-ip-dst-addr_spec.rb
-- spec/trema/set-ip-src-addr_spec.rb
+- spec/trema/set-ip-addr_spec.rb
 - spec/trema/set-ip-tos_spec.rb
 - spec/trema/set-transport-dst-port_spec.rb
 - spec/trema/set-transport-src-port_spec.rb
@@ -422,10 +426,11 @@ files:
 - src/examples/dumper/dumper.c
 - src/examples/dumper/dumper.conf
 - src/examples/dumper/dumper.rb
-- src/examples/hello_trema/README
+- src/examples/hello_trema/.gitignore
+- src/examples/hello_trema/README.md
 - src/examples/hello_trema/hello-trema.rb
 - src/examples/hello_trema/hello_trema.c
-- src/examples/hello_trema/hello_trema.conf
+- src/examples/hello_trema/sample.conf
 - src/examples/learning_switch/README
 - src/examples/learning_switch/fdb.rb
 - src/examples/learning_switch/learning-switch.rb

data/features/example.hello_trema.feature

@@ -1,21 +0,0 @@
-Feature: "Hello Trema!" sample application
-
-  In order to learn how to write minimum Trema application
-  As a developer using Trema
-  I want to execute "Hello Trema" sample application
-
-  Background:
-    Given a file named "hello.conf" with:
-      """
-      vswitch { datapath_id "0xabc" }
-      """
-
-  @slow_process
-  Scenario: Run "Hello Trema!" C example
-    When I run `trema run ../../objects/examples/hello_trema/hello_trema -c hello.conf`
-    Then the output should contain exactly "Hello 0xabc!\n"
-
-  @slow_process
-  Scenario: Run "Hello Trema!" Ruby example
-    When I run `trema run ../../src/examples/hello_trema/hello-trema.rb -c hello.conf`
-    Then the output should contain exactly "Hello 0xabc!\n"

data/spec/trema/set-ip-dst-addr_spec.rb

@@ -1,63 +0,0 @@
-#
-# 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 File.join( File.dirname( __FILE__ ), "..", "spec_helper" )
-require "trema"
-
-
-describe SetIpDstAddr, ".new(ip_address)", :type => "actions" do
-  subject { SetIpDstAddr.new( ip_address ) }
-
-  context %{with ip_address ("192.168.1.1")} do
-    let( :ip_address ) { "192.168.1.1" }
-    its( "ip_address.to_s" ) { should == "192.168.1.1" }
-  end
-
-  context %{with invalid ip_address ("192.168.1")} do
-    let( :ip_address ) { "192.168.1" }
-    it { expect { subject }.to raise_error( ArgumentError ) }
-  end
-
-  context "with invalid ip_address ([1, 2, 3])" do
-    let( :ip_address ) { [ 1, 2, 3 ] }
-    it { expect { subject }.to raise_error( TypeError ) }
-  end
-
-  context "when sending a Flow Mod with SetIpDstAddr" do
-    let( :ip_address ) { "192.168.1.1" }
-
-    it "should insert a flow entry with action (mod_nw_dst:192.168.1.1)" do
-      class TestController < Controller; end
-      network {
-        vswitch { datapath_id 0xabc }
-      }.run( TestController ) {
-        controller( "TestController" ).send_flow_mod_add( 0xabc, :actions => subject )
-        sleep 2
-        expect( vswitch( "0xabc" ) ).to have( 1 ).flows
-        expect( vswitch( "0xabc" ).flows[ 0 ].actions ).to eq( "mod_nw_dst:192.168.1.1" )
-      }
-    end
-  end
-end
-
-
-### Local variables:
-### mode: Ruby
-### coding: utf-8-unix
-### indent-tabs-mode: nil
-### End:

data/spec/trema/set-ip-src-addr_spec.rb

@@ -1,63 +0,0 @@
-#
-# 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 File.join( File.dirname( __FILE__ ), "..", "spec_helper" )
-require "trema"
-
-
-describe SetIpSrcAddr, ".new(ip_address)", :type => "actions" do
-  subject { SetIpSrcAddr.new( ip_address ) }
-
-  context %{with ip_address ("192.168.1.1")} do
-    let( :ip_address ) { "192.168.1.1" }
-    its( "ip_address.to_s" ) { should == "192.168.1.1" }
-  end
-
-  context %{with invalid ip_address ("192.168.1")} do
-    let( :ip_address ) { "192.168.1" }
-    it { expect { subject }.to raise_error( ArgumentError ) }
-  end
-
-  context "with invalid ip_address ([1, 2, 3])" do
-    let( :ip_address ) { [ 1, 2, 3 ] }
-    it { expect { subject }.to raise_error( TypeError ) }
-  end
-
-  context "when sending a Flow Mod with SetIpSrcAddr" do
-    let( :ip_address ) { "192.168.1.1" }
-
-    it "should insert a flow entry with action (mod_nw_src:192.168.1.1)" do
-      class TestController < Controller; end
-      network {
-        vswitch { datapath_id 0xabc }
-      }.run( TestController ) {
-        controller( "TestController" ).send_flow_mod_add( 0xabc, :actions => subject )
-        sleep 2
-        expect( vswitch( "0xabc" ) ).to have( 1 ).flows
-        expect( vswitch( "0xabc" ).flows[ 0 ].actions ).to eq( "mod_nw_src:192.168.1.1" )
-      }
-    end
-  end
-end
-
-
-### Local variables:
-### mode: Ruby
-### coding: utf-8-unix
-### indent-tabs-mode: nil
-### End:

data/src/examples/hello_trema/README

@@ -1,13 +0,0 @@
-This directory includes minimum examples of Trema controller in C and Ruby.
-
-
-# How to run (C version)
-
-  % ./trema run ./objects/examples/hello_trema/hello_trema -c src/examples/hello_trema/hello_trema.conf
-
-# How to run (Ruby version)
-
-  % ./trema run ./src/examples/hello_trema/hello_trema.rb -c src/examples/hello_trema/hello_trema.conf
-
-
-Enjoy!

data/src/examples/hello_trema/hello_trema.conf

@@ -1,3 +0,0 @@
-vswitch {
-  datapath_id "0xabc"
-}