trema 0.2.5 → 0.2.6

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: trema
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 0
   - 2
-  - 5
-  version: 0.2.5
+  - 6
+  version: 0.2.6
 platform: ruby
 authors: 
 - Yasuhito Takamiya
@@ -15,12 +15,12 @@ autorequire:
 bindir: .
 cert_chain: []
 
-date: 2012-08-01 00:00:00 Z
+date: 2012-12-26 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  name: rake
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -29,8 +29,66 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  requirement: *id001
+  type: :runtime
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: gli
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 31
+        segments: 
+        - 2
+        - 5
+        - 2
+        version: 2.5.2
+  requirement: *id002
   type: :runtime
-  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: rake
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id003
+  type: :development
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: rdoc
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id004
+  type: :development
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: aruba
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id005
+  type: :development
 description: Trema is a full-stack, easy-to-use framework for developing OpenFlow controllers in Ruby and C
 email: 
 - yasuhito@gmail.com
@@ -52,9 +110,12 @@ files:
 - README.md
 - Rakefile
 - Rantfile
+- bin/trema
+- 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.echo_reply.feature
@@ -62,35 +123,32 @@ files:
 - features/example.message.features_request.feature
 - features/example.message.hello.feature
 - features/example.message.set_config.feature
+- features/example.message.vendor-action.feature
 - features/example.multi_learning_switch.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/step_definitions/kill_steps.rb
-- features/step_definitions/killall_steps.rb
-- features/step_definitions/log_steps.rb
 - features/step_definitions/misc_steps.rb
-- features/step_definitions/run_steps.rb
 - features/step_definitions/send_packets_steps.rb
-- features/step_definitions/show_stats_steps.rb
 - features/step_definitions/stats_steps.rb
-- features/step_definitions/up_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.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/tutorial.hello_trema.feature
-- features/tutorial.packet_in.feature
-- features/tutorial.switch_info.feature
+- features/trema.up.feature
+- features/trema.version.feature
 - locale/README.ja.md
 - locale/ja/yard.po
 - locale/yard.pot
@@ -112,6 +170,7 @@ files:
 - ruby/trema/command/dump_flows.rb
 - ruby/trema/command/kill.rb
 - ruby/trema/command/killall.rb
+- ruby/trema/command/netns.rb
 - ruby/trema/command/reset_stats.rb
 - ruby/trema/command/ruby.rb
 - ruby/trema/command/run.rb
@@ -119,17 +178,19 @@ files:
 - ruby/trema/command/shell.rb
 - ruby/trema/command/show_stats.rb
 - ruby/trema/command/up.rb
-- ruby/trema/command/usage.rb
 - ruby/trema/command/version.rb
 - ruby/trema/controller.c
 - ruby/trema/controller.h
 - ruby/trema/controller.rb
+- ruby/trema/custom-switch.rb
 - ruby/trema/daemon.rb
 - ruby/trema/desc-stats-reply.rb
 - ruby/trema/dsl.rb
 - ruby/trema/dsl/configuration.rb
 - ruby/trema/dsl/context.rb
+- ruby/trema/dsl/custom-switch.rb
 - ruby/trema/dsl/link.rb
+- ruby/trema/dsl/netns.rb
 - ruby/trema/dsl/parser.rb
 - ruby/trema/dsl/rswitch.rb
 - ruby/trema/dsl/run.rb
@@ -187,6 +248,7 @@ files:
 - ruby/trema/monkey-patch/module/deprecation.rb
 - ruby/trema/monkey-patch/string.rb
 - ruby/trema/monkey-patch/string/inflectors.rb
+- ruby/trema/netns.rb
 - ruby/trema/network-component.rb
 - ruby/trema/ofctl.rb
 - ruby/trema/open-vswitch.rb
@@ -351,9 +413,9 @@ files:
 - src/examples/dumper/dumper.conf
 - src/examples/dumper/dumper.rb
 - src/examples/hello_trema/README
+- 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/hello_trema.rb
 - src/examples/learning_switch/README
 - src/examples/learning_switch/fdb.rb
 - src/examples/learning_switch/learning-switch.rb
@@ -381,6 +443,9 @@ files:
 - src/examples/openflow_message/hello.rb
 - src/examples/openflow_message/set-config.rb
 - src/examples/openflow_message/set_config.c
+- src/examples/openflow_message/vendor-action.rb
+- src/examples/openflow_message/vendor_action.c
+- src/examples/openflow_switch/hello_switch.c
 - src/examples/packet_in/README
 - src/examples/packet_in/packet-in.rb
 - src/examples/packet_in/packet_in.c
@@ -395,15 +460,18 @@ files:
 - src/examples/packetin_filter_config/packetin_filter_config.conf
 - src/examples/packetin_filter_config/utils.c
 - src/examples/packetin_filter_config/utils.h
+- src/examples/patch_panel/network.conf
+- src/examples/patch_panel/patch-panel.conf
+- src/examples/patch_panel/patch-panel.rb
 - src/examples/repeater_hub/README
 - src/examples/repeater_hub/repeater-hub.rb
 - src/examples/repeater_hub/repeater-hub_spec.rb
 - src/examples/repeater_hub/repeater_hub.c
 - src/examples/repeater_hub/repeater_hub.conf
 - src/examples/switch_info/README
+- src/examples/switch_info/switch-info.rb
 - src/examples/switch_info/switch_info.c
 - src/examples/switch_info/switch_info.conf
-- src/examples/switch_info/switch_info.rb
 - src/examples/switch_monitor/switch-monitor.conf
 - src/examples/switch_monitor/switch-monitor.rb
 - src/examples/switch_monitor/switch_monitor.c
@@ -446,6 +514,10 @@ files:
 - src/lib/linked_list.h
 - src/lib/log.c
 - src/lib/log.h
+- src/lib/management_interface.c
+- src/lib/management_interface.h
+- src/lib/management_service_interface.c
+- src/lib/management_service_interface.h
 - src/lib/match.h
 - src/lib/match_table.c
 - src/lib/match_table.h
@@ -486,6 +558,11 @@ files:
 - src/lib/utility.h
 - src/lib/wrapper.c
 - src/lib/wrapper.h
+- src/management/application.c
+- src/management/echo.c
+- src/management/set_logging_level.c
+- src/management/show_stats.c
+- src/management/trema_manager
 - src/packetin_filter/README
 - src/packetin_filter/packetin_filter.c
 - src/switch_manager/README
@@ -546,6 +623,8 @@ files:
 - unittests/lib/hash_table_test.c
 - unittests/lib/linked_list_test.c
 - unittests/lib/log_test.c
+- unittests/lib/management_interface_test.c
+- unittests/lib/management_service_interface_test.c
 - unittests/lib/match_table_test.c
 - unittests/lib/message_queue_test.c
 - unittests/lib/messenger_test.c

data/features/step_definitions/log_steps.rb

@@ -1,90 +0,0 @@
-#
-# Author: Yasuhito Takamiya <yasuhito@gmail.com>
-#
-# 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.
-#
-
-
-Then /^the output should be:$/ do | string |
-  IO.read( @log ).chomp.should == string.chomp
-end
-
-
-Then /^I should not get errors$/ do
-  step "the output should be:", ""
-end
-
-
-Then /^the output should include:$/ do | string |
-  string.chomp.split( "\n" ).each do | each |
-    IO.read( @log ).split( "\n" ).should include( each )
-  end
-end
-
-
-Then /^"([^"]*)" should be executed with option = "([^"]*)"$/ do | executable, options |
-  IO.read( @log ).should match( Regexp.new "#{ executable } #{ options }" )
-end
-
-
-Then /^the log file "([^"]*)" should be:$/ do | log_name, string |
-  IO.read( cucumber_log log_name ).chomp.should == string.chomp
-end
-
-
-Then /^the log file "([^"]*)" should include:$/ do | log_name, string |
-  IO.read( cucumber_log log_name ).split( "\n" ).should include( string )
-end
-
-
-Then /^the log file "([^"]*)" should match:$/ do | log_name, string |
-  IO.read( cucumber_log log_name ).should match( Regexp.new string )
-end
-
-
-Then /^the log file "([^"]*)" should include "([^"]*)" x (\d+)$/ do | log, message, n |
-  IO.read( cucumber_log log ).split( "\n" ).inject( 0 ) do | matched, each |
-    matched += 1 if each.include?( message )
-    matched
-  end.should == n.to_i
-end
-
-
-Then /^the content of "([^"]*)" should be:$/ do | log_name, string |
-  IO.read( cucumber_log log_name ).chomp( "" ).should == string.chomp
-end
-
-
-Then /^the content of "([^"]*)" and "([^"]*)" should be identical$/ do | log1, log2 |
-  IO.read( cucumber_log log1 ).size.should > 0
-  IO.read( cucumber_log log2 ).size.should > 0
-  IO.read( cucumber_log log1 ).chomp.should == IO.read( cucumber_log log2 ).chomp
-end
-
-
-Then /^"([^"]*)" should contain some flow entries$/ do | log |
-  IO.read( cucumber_log log ).size.should > 0
-  IO.read( cucumber_log log ).split( "\n" )[ 2..-1 ].each do | each |
-    each.should match( /actions=FLOOD/ )
-  end
-end
-
-
-### Local variables:
-### mode: Ruby
-### coding: utf-8-unix
-### indent-tabs-mode: nil
-### End:

data/features/step_definitions/run_steps.rb

@@ -1,91 +0,0 @@
-#
-# Author: Yasuhito Takamiya <yasuhito@gmail.com>
-#
-# 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.
-#
-
-
-When /^I try to run "([^"]*)"$/ do | command |
-  @log ||= new_tmp_log
-  run "#{ command } >> #{ @log }"
-end
-
-
-When /^I try to run "([^"]*)" \(log = "([^"]*)"\)$/ do | command, log_name |
-  run "#{ command } > #{ cucumber_log log_name } 2>&1"
-end
-
-
-When /^I try trema run "([^"]*)" with following configuration \((.*)\):$/ do | args, options, config |
-  verbose = if /verbose/=~ options
-              "--verbose"
-            else
-              ""
-            end
-  @log ||= new_tmp_log
-
-  trema_run = Proc.new do
-    Tempfile.open( "trema.conf" ) do | f |
-      f.puts config
-      f.flush
-      run "./trema run \"#{ args }\" -c #{ f.path } #{ verbose } >> #{ @log } 2>&1"
-    end
-  end
-
-  if /background/=~ options
-    pid = Process.fork do
-      trema_run.call
-    end
-    Process.detach pid
-  else
-    trema_run.call
-  end
-end
-
-
-Given /^I try trema run "([^"]*)" example with following configuration \(backgrounded\):$/ do | example, config |
-  controller = nil
-  name = nil
-  if /\.rb\Z/=~ example
-    controller = "./src/examples/#{ File.basename( example, ".rb" ).tr( "-", "_" ) }/#{ example }"
-    name = File.basename( example, ".rb" ).camelize
-  else
-    controller = "./objects/examples/#{ example }/#{ example }"
-    name = example
-  end
-  step %{I try trema run "#{ controller }" with following configuration (backgrounded):}, config
-  step %{wait until "#{ name }" is up}
-end
-
-
-When /^I try trema run "([^"]*)" with following configuration:$/ do | args, config |
-  step "I try trema run \"#{ args }\" with following configuration (no options):", config
-end
-
-
-Then /^"([^"]*)" exits abnormally with an error message:$/ do | command, message |
-  log = "error.log"
-  step %{I try to run "#{ command }" (log = "#{ log }")} rescue error_occured = true
-  error_occured.should be_true
-  step %{the content of "#{ log }" should be:}, message
-end
-
-
-### Local variables:
-### mode: Ruby
-### coding: utf-8-unix
-### indent-tabs-mode: nil
-### End:

data/features/trema.feature

@@ -1,27 +0,0 @@
-Feature: trema help
-
-  As a Trema user
-  I want to see the help message of trema command
-  So that I can learn how to use trema
-
-  Scenario: trema help
-    When I try to run "./trema help"
-    Then the output should be:
-      """
-      usage: trema <COMMAND> [OPTIONS ...]
-
-      Trema command-line tool
-      Type 'trema help <COMMAND>' for help on a specific command.
-
-      Available commands:
-        run            - runs a trema application.
-        kill           - terminates a trema process.
-        up             - starts a killed trema process again.
-        killall        - terminates all trema processes.
-        send_packets   - sends UDP packets to destination host.
-        show_stats     - shows stats of packets.
-        reset_stats    - resets stats of packets.
-        dump_flows     - print all flow entries.
-        ruby           - opens in your browser Trema's Ruby API documentation.
-        version        - displays the current runtime version.
-      """