trema 0.3.8 → 0.3.9

data/bin/trema

@@ -148,6 +148,23 @@ command :send_packets do | c |
 end
 
 
+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.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
+
+
 desc "Brings a switch's specified port down"
 command :port_down do | c |
   c.desc "switch name"

data/features/.nav

@@ -6,6 +6,7 @@
   - up.feature
   - killall.feature
   - send_packets.feature
+  - port_up.feature
   - port_down.feature
   - show_stats.feature
   - reset_stats.feature

data/features/trema_commands/port_up.feature

@@ -0,0 +1,74 @@
+Feature: port_up command
+
+  Use this command to ensure that your controller detects network
+  topology changes i.e., failures in switches.
+
+  Trema emulated network offers a set of commands that can change the
+  status of any arbitrary switch port. The `trema port_up` is one such
+  command and its command syntax is as follows:
+
+      $ trema port_up --switch DATAPATH_ID --port PORT_NUMBER
+
+  The above command brings the switch's specified port up. By using
+  this command one can easily test the :port_status handler defined in
+  controllers.
+
+  Background:
+    Given a file named "sample.conf" with:
+    """
+    vswitch { datapath_id 0x1 }
+    vswitch { datapath_id 0x2 }
+
+    link "0x1", "0x2"
+    """
+    And a file named "port-observer.rb" with:
+    """
+    class PortObserver < Controller
+      def switch_ready dpid
+        info "Switch %#x is UP", dpid
+      end
+
+
+      def port_status dpid, message
+        if message.phy_port.up?
+          info "Port #{ message.phy_port.number } (Switch %#x) is UP", dpid
+        elsif message.phy_port.down?
+          info "Port #{ message.phy_port.number } (Switch %#x) is DOWN", dpid
+        end
+      end
+    end
+    """
+
+  @slow_process
+  Scenario: trema port_up --switch 0x1 --port 1
+    Given I run `trema run ./port-observer.rb -c sample.conf` interactively
+    And I wait for output to contain "Switch 0x1 is UP"
+    And I run `trema port_down --switch 0x1 --port 1`
+    And I wait for output to contain "Port 1 (Switch 0x1) is DOWN"
+    When I run `trema port_up --switch 0x1 --port 1`
+    Then the output should contain "Port 1 (Switch 0x1) is UP" within the timeout period
+
+  @slow_process
+  Scenario: trema port_up --switch UNKNOWN --port 1 (unknown switch error)
+    Given I run `trema run ./port-observer.rb -c sample.conf -d`
+    When I run `trema port_up --switch UNKNOWN --port 1`
+    Then the output should contain "error: unknown switch: UNKNOWN"
+
+  @slow_process
+  Scenario: trema port_up --switch 0x1 --port 100 (unknown port error)
+    Given I run `trema run ./port-observer.rb -c sample.conf -d`
+    When I run `trema port_up --switch 0x1 --port 100`
+    Then the output should contain "error: ovs-ofctl: vsw_0x1: couldn't find port `100'"
+
+  @slow_process
+  Scenario: trema port_up --switch 0x1 (no --port option error)
+    Given I run `trema run ./port-observer.rb -c sample.conf -d`
+    When I run `trema port_up --switch 0x1`
+    Then the output should contain "error: --port option is mandatory"
+
+  @slow_process
+  Scenario: trema port_up --port 1 (no --switch option error)
+    Given I run `trema run ./port-observer.rb -c sample.conf -d`
+    When I run `trema port_up --port 1`
+    Then the output should contain "error: --switch option is mandatory"
+

data/ruby/trema/command.rb

@@ -22,6 +22,7 @@ require "trema/command/dump_flows"
 require "trema/command/kill"
 require "trema/command/killall"
 require "trema/command/netns"
+require "trema/command/port_up"
 require "trema/command/port_down"
 require "trema/command/reset_stats"
 require "trema/command/ruby"

data/ruby/trema/command/port_up.rb

@@ -0,0 +1,43 @@
+#
+# 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/cli"
+require "trema/util"
+
+
+module Trema
+  module Command
+    include Trema::Util
+
+
+    def trema_port_up switch_name, port
+      switch = find_switch_by_name( switch_name )
+      raise "unknown switch: #{ switch_name }" if switch.nil?
+
+      error = switch.bring_port_up( port.to_i )
+      raise error if $?.exitstatus != 0
+    end
+  end
+end
+
+
+### Local variables:
+### mode: Ruby
+### coding: utf-8
+### indent-tabs-mode: nil
+### End:

data/ruby/trema/ofctl.rb

@@ -53,6 +53,11 @@ module Trema
     end
 
 
+    def bring_port_up switch, port_number
+      `sudo #{ Executables.ovs_ofctl } mod-port #{ switch.network_device } #{ port_number } up 2>&1`
+    end
+
+
     def bring_port_down switch, port_number
       `sudo #{ Executables.ovs_ofctl } mod-port #{ switch.network_device } #{ port_number } down 2>&1`
     end

data/ruby/trema/open-vswitch.rb

@@ -97,6 +97,11 @@ module Trema
     end
 
 
+    def bring_port_up port_number
+      Ofctl.new.bring_port_up self, port_number
+    end
+
+
     def bring_port_down port_number
       Ofctl.new.bring_port_down self, port_number
     end

data/ruby/trema/path.rb

@@ -66,10 +66,10 @@ module Trema
   dir :tmp, "pid"
   dir :tmp, "sock"
   dir :vendor, "cmockery-20110428", :vendor_cmockery
-  dir :vendor, "oflops-0.03", :vendor_oflops
+  dir :vendor, "oflops-0.03.trema1", :vendor_oflops
   dir :vendor, "openflow-1.0.0", :vendor_openflow
   dir :vendor, "openflow.git", :vendor_openflow_git
-  dir :vendor, "openvswitch-1.2.2", :vendor_openvswitch
+  dir :vendor, "openvswitch-1.2.2.trema1", :vendor_openvswitch
   dir :vendor, "phost", :vendor_phost
   dir :vendor, "ruby-ifconfig-1.2", :vendor_ruby_ifconfig
   file :cmockery, "include/google/cmockery.h"

data/ruby/trema/version.rb

@@ -17,7 +17,7 @@
 
 
 module Trema
-  VERSION = "0.3.8"
+  VERSION = "0.3.9"
 end
 
 

data/vendor/.gitignore

@@ -1,6 +1,6 @@
 /cmockery-20110428
-/oflops-0.03
+/oflops-0.03.trema1
 /openflow-1.0.0
 /openflow.git
-/openvswitch-1.2.2
+/openvswitch-1.2.2.trema1
 /phost

data/vendor/README.md

@@ -18,3 +18,12 @@ of this OpenFlow controller platform, we disabled the functions. In addition,
 because there are some issues on OpenFlow messages that cbench (a performance
 measurement tool for OpenFlow controllers) sends, we fixed them. Any changes
 from the repository of oflops can be found in oflops_no_snmp+1.0.0.patch.
+
+Notes on Open vSwitch (vendor/openvswitch)
+------------------------------------------
+
+In the recent glibc, we need to link librt to use POSIX timer functions
+such as "timer_create" or "timer_settime". To use openvswitch-1.2.2
+on distributions with the recent glibc, we modified "configure" to
+search librt and Open vSwitch tarball distributed with Trema contains
+the fix. The change can be found in openvswitch-1.2.2_librt-check.diff.

data/vendor/openvswitch-1.2.2_librt-check.diff

@@ -0,0 +1,21 @@
+diff --git a/configure.ac b/configure.ac
+index 99ed8f0..de43aae 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -13,7 +13,7 @@
+ # limitations under the License.
+ 
+ AC_PREREQ(2.64)
+-AC_INIT(openvswitch, 1.2.2, ovs-bugs@openvswitch.org)
++AC_INIT(openvswitch, 1.2.2.trema1, ovs-bugs@openvswitch.org)
+ NX_BUILDNR
+ AC_CONFIG_SRCDIR([datapath/datapath.c])
+ AC_CONFIG_MACRO_DIR([m4])
+@@ -41,6 +41,7 @@ AC_SYS_LARGEFILE
+ 
+ AC_SEARCH_LIBS([pow], [m])
+ AC_SEARCH_LIBS([clock_gettime], [rt])
++AC_SEARCH_LIBS([timer_create], [rt])
+ 
+ OVS_CHECK_COVERAGE
+ OVS_CHECK_NDEBUG

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: trema
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: 
   segments: 
   - 0
   - 3
-  - 8
-  version: 0.3.8
+  - 9
+  version: 0.3.9
 platform: ruby
 authors: 
 - Yasuhito Takamiya
@@ -15,7 +15,7 @@ autorequire:
 bindir: .
 cert_chain: []
 
-date: 2013-02-06 00:00:00 Z
+date: 2013-02-07 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   prerelease: false
@@ -163,6 +163,7 @@ files:
 - features/trema_commands/kill.feature
 - features/trema_commands/killall.feature
 - features/trema_commands/port_down.feature
+- features/trema_commands/port_up.feature
 - features/trema_commands/reset_stats.feature
 - features/trema_commands/run.feature
 - features/trema_commands/send_packets.feature
@@ -190,6 +191,7 @@ files:
 - ruby/trema/command/killall.rb
 - ruby/trema/command/netns.rb
 - ruby/trema/command/port_down.rb
+- ruby/trema/command/port_up.rb
 - ruby/trema/command/reset_stats.rb
 - ruby/trema/command/ruby.rb
 - ruby/trema/command/run.rb
@@ -689,11 +691,12 @@ files:
 - vendor/.gitignore
 - vendor/README.md
 - vendor/cmockery-20110428.tar.gz
-- vendor/oflops-0.03.tar.gz
-- vendor/oflops_no_snmp+1.0.0.patch
+- vendor/oflops-0.03.trema1.tar.gz
+- vendor/oflops_no_snmp+1.0.0.diff
 - vendor/openflow-1.0.0.tar.gz
 - vendor/openflow.git.tar.gz
-- vendor/openvswitch-1.2.2.tar.gz
+- vendor/openvswitch-1.2.2.trema1.tar.gz
+- vendor/openvswitch-1.2.2_librt-check.diff
 - vendor/packet-openflow.diff
 - vendor/phost/doc/COPYING
 - vendor/phost/doc/README