trema 0.2.2.1 → 0.2.3

data/ruby/trema/vendor.h

@@ -1,6 +1,4 @@
 /*
- * Author: Nick Karanatsios <nickkaranatsios@gmail.com>
- *
  * Copyright (C) 2008-2012 NEC Corporation
  *
  * This program is free software; you can redistribute it and/or modify
@@ -30,15 +28,13 @@ extern VALUE cVendor;
 
 
 void Init_vendor( void );
-
-
 void handle_vendor(
-        uint64_t datapath_id,
-        uint32_t transaction_id,
-        uint32_t vendor,
-        const buffer *body,
-        void *user_data
-        );
+  uint64_t datapath_id,
+  uint32_t transaction_id,
+  uint32_t vendor,
+  const buffer *data,
+  void *user_data
+);
 
 
 #endif // VENDOR_H

data/ruby/trema/version.rb

@@ -19,7 +19,7 @@
 
 
 module Trema
-  VERSION = "0.2.2.1"
+  VERSION = "0.2.3"
 end
 
 

data/spec/spec_helper.rb

@@ -49,7 +49,7 @@ end
 
 
 def vswitch name
-  Trema::Switch[ name ]
+  Trema::OpenflowSwitch[ name ]
 end
 
 

data/spec/support/action.rb

@@ -0,0 +1,52 @@
+#
+# 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 "rubygems"
+require "rspec"
+
+
+shared_examples_for "option range" do | option, range |
+  context "when #{ option } is within #{ range }" do
+    let( option ) { range.first }
+    it { expect { subject }.not_to raise_error( ArgumentError ) }
+  end
+
+
+  context "when #{ option } < #{ range.first }" do
+    let( option ) { range.first - 1 }
+    it { expect { subject }.to raise_error( ArgumentError ) }
+  end
+
+
+  context "when #{ option } > #{ range.last }" do
+    let( option ) { range.last + 1 }
+    it { expect { subject }.to raise_error( ArgumentError ) }
+  end
+end
+
+
+RSpec.configure do | config |
+  config.alias_it_should_behave_like_to :it_validates, "it validates"
+end
+
+
+### Local variables:
+### mode: Ruby
+### coding: utf-8-unix
+### indent-tabs-mode: nil
+### End:

data/spec/support/mandatory-option.rb

@@ -0,0 +1,56 @@
+#
+# 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 "rubygems"
+require "rspec"
+
+
+shared_examples_for "any Openflow message with mandatory options" do | options |
+  subject do
+    opt_hash = {}
+    options[ :options ].each do | each |
+      opt_hash[ each[ :name ] ] = __send__( each[ :name ] )
+    end
+    options[ :klass ].new( opt_hash )
+  end
+
+  options[ :options ].each do | each |
+    let( each[ :name ] ) { each[ :sample_value ] }
+  end
+
+
+  options[ :options ].each do | each |
+    context "with :#{ each[ :name ] } (#{ each[ :sample_value ] })" do
+      let( each[ :name ] ) { each[ :sample_value ] }
+      its( each[ :name ] ) { should == each[ :sample_value ] }
+      its( each[ :alias ] ) { should == each[ :sample_value ] } if each[ :alias ]
+    end
+
+    context "without :#{ each[ :name ] }" do
+      let( each[ :name ] ) { nil }
+      it { expect { subject }.to raise_error( ArgumentError, ":#{ each[ :name ] } is a mandatory option" ) }
+    end
+  end
+end
+
+
+### Local variables:
+### mode: Ruby
+### coding: utf-8-unix
+### indent-tabs-mode: nil
+### End:

data/spec/support/openflow-message.rb

@@ -23,8 +23,92 @@ require "rspec"
 
 
 shared_examples_for "any Openflow message with default transaction ID" do
-  its( :transaction_id ) { should be_a_kind_of( Integer ) }
   its( :transaction_id ) { should be_unsigned_32bit }
+  its( :xid ) { should be_unsigned_32bit }
+end
+
+
+shared_examples_for "any Openflow message with transaction ID" do
+  context "transaction_id: -123", :nosudo => true do
+    let( :transaction_id ) { -123 }
+    it { expect { subject }.to raise_error( ArgumentError, "Transaction ID must be an unsigned 32-bit integer" ) }
+  end
+
+  context "transaction_id: 0", :nosudo => true do
+    let( :transaction_id ) { 0 }
+    its( :transaction_id ) { should == 0 }
+    its( :xid ) { should == 0 }
+  end
+
+  context "transaction_id: 123", :nosudo => true do
+    let( :transaction_id ) { 123 }
+    its( :transaction_id ) { should == 123 }
+    its( :xid ) { should == 123 }
+  end
+
+  context "transaction_id: UINT32_MAX", :nosudo => true do
+    let( :transaction_id ) { 2 ** 32 - 1 }
+    its( :transaction_id ) { should == 2 ** 32 - 1 }
+    its( :xid ) { should == 2 ** 32 - 1 }
+  end
+
+  context "transaction_id: UINT32_MAX + 1", :nosudo => true do
+    let( :transaction_id ) { 2 ** 32 }
+    it { expect { subject }.to raise_error( ArgumentError, "Transaction ID must be an unsigned 32-bit integer" ) }
+  end
+end
+
+
+shared_examples_for "any Openflow message with xid" do
+  context "xid: -123", :nosudo => true do
+    let( :xid ) { -123 }
+    it { expect { subject }.to raise_error( ArgumentError, "Transaction ID must be an unsigned 32-bit integer" ) }
+  end
+
+  context "xid: 0", :nosudo => true do
+    let( :xid ) { 0 }
+    its( :xid ) { should == 0 }
+    its( :transaction_id ) { should == 0 }
+  end
+
+  context "xid: 123", :nosudo => true do
+    let( :xid ) { 123 }
+    its( :xid ) { should == 123 }
+    its( :transaction_id ) { should == 123 }
+  end
+
+  context "xid: UINT32_MAX", :nosudo => true do
+    let( :xid ) { 2 ** 32 - 1 }
+    its( :xid ) { should == 2 ** 32 - 1 }
+    its( :transaction_id ) { should == 2 ** 32 - 1 }
+  end
+
+  context "xid: UINT32_MAX + 1", :nosudo => true do
+    let( :xid ) { 2 ** 32 }
+    it { expect { subject }.to raise_error( ArgumentError, "Transaction ID must be an unsigned 32-bit integer" ) }
+  end
+end
+
+
+shared_examples_for "any Openflow message with user_data" do
+  context "user_data: nil", :nosudo => true do
+    let( :user_data ) { nil }
+    its( :user_data ) { should be_nil }
+    it_should_behave_like "any Openflow message with default transaction ID"
+  end
+
+
+  context 'user_data: "USER DATA"', :nosudo => true do
+    let( :user_data ) { "USER DATA" }
+    its( :user_data ) { should == "USER DATA" }
+    it_should_behave_like "any Openflow message with default transaction ID"
+  end
+
+
+  context "user_data: :INVALID_DATA", :nosudo => true do
+    let( :user_data ) { :INVALID_DATA }
+    it { expect { subject }.to raise_error( TypeError ) }
+  end
 end
 
 
@@ -33,12 +117,12 @@ shared_examples_for "any OpenFlow message" do | options |
   name = options[ :name ]
   size = options[ :size ]
   case size
-  when 8
-    let( :uint_max ) { 2 ** 8 - 1 }
-  when 16
-    let( :uint_max ) { 2 ** 16 - 1 }
-  when 32
-    let( :uint_max ) { 2 ** 32 - 1 }
+    when 8
+      let( :uint_max ) { 2 ** 8 - 1 }
+    when 16
+      let( :uint_max ) { 2 ** 16 - 1 }
+    when 32
+      let( :uint_max ) { 2 ** 32 - 1 }
   end
 
 

data/spec/support/port-status.rb

@@ -0,0 +1,38 @@
+#
+# 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 "rubygems"
+require "rspec"
+
+
+shared_examples_for "port status message" do | options |
+  it_should_behave_like(
+    "any Openflow message with mandatory options",
+    :klass => options[ :klass ],
+    :options => [ { :name => :datapath_id, :alias => :dpid, :sample_value => 0xabc },
+                  { :name => :transaction_id, :alias => :xid, :sample_value => 123 },
+                  { :name => :phy_port, :sample_value => "PHY_PORT" } ]
+  )
+end
+
+
+### Local variables:
+### mode: Ruby
+### coding: utf-8-unix
+### indent-tabs-mode: nil
+### End:

data/spec/trema/controller_spec.rb

@@ -36,32 +36,6 @@ module Trema
       it { should include "OFPP_CONTROLLER" }
       it { should include "OFPP_LOCAL" }
       it { should include "OFPP_NONE" }
-
-      it { should include "OFPPR_ADD" }
-      it { should include "OFPPR_DELETE" }
-      it { should include "OFPPR_MODIFY" }
-
-      it { should include "OFPC_FLOW_STATS" }
-      it { should include "OFPC_TABLE_STATS" }
-      it { should include "OFPC_PORT_STATS" }
-      it { should include "OFPC_STP" }
-      it { should include "OFPC_RESERVED" }
-      it { should include "OFPC_IP_REASM" }
-      it { should include "OFPC_QUEUE_STATS" }
-      it { should include "OFPC_ARP_MATCH_IP" }
-
-      it { should include "OFPAT_OUTPUT" }
-      it { should include "OFPAT_SET_VLAN_VID" }
-      it { should include "OFPAT_SET_VLAN_PCP" }
-      it { should include "OFPAT_STRIP_VLAN" }
-      it { should include "OFPAT_SET_DL_SRC" }
-      it { should include "OFPAT_SET_DL_DST" }
-      it { should include "OFPAT_SET_NW_SRC" }
-      it { should include "OFPAT_SET_NW_DST" }
-      it { should include "OFPAT_SET_NW_TOS" }
-      it { should include "OFPAT_SET_TP_DST" }
-      it { should include "OFPAT_ENQUEUE" }
-      it { should include "OFPAT_VENDOR" }
     end
 
 

data/spec/trema/dsl/configuration_spec.rb

@@ -99,9 +99,9 @@ module Trema
         it "should remember switches" do
           @context.should have( 0 ).switches
 
-          Trema::Switch.add mock( "switch #0", :name => "switch #0" )
-          Trema::Switch.add mock( "switch #1", :name => "switch #1" )
-          Trema::Switch.add mock( "switch #2", :name => "switch #2" )
+          Trema::OpenflowSwitch.add mock( "switch #0", :name => "switch #0" )
+          Trema::OpenflowSwitch.add mock( "switch #1", :name => "switch #1" )
+          Trema::OpenflowSwitch.add mock( "switch #2", :name => "switch #2" )
 
           @context.should have( 3 ).switches
 

data/spec/trema/dsl/runner_spec.rb

@@ -35,26 +35,6 @@ module Trema
 
 
       context "when running" do
-        it "should run tremashark" do
-          tremashark = mock
-          tremashark.should_receive( :run ).once
-
-          context = mock(
-            "context",
-            :tremashark => tremashark,
-            :switch_manager => nil,
-            :packetin_filter => nil,
-            :links => {},
-            :hosts => {},
-            :switches => {},
-            :apps => {},
-            :port => 6633
-          )
-
-          Runner.new( context ).run
-        end
-
-
         it "should run switch_manager" do
           @switch_manager.should_receive( :run! ).once
 
@@ -96,16 +76,16 @@ module Trema
 
         it "should create links" do
           link0 = mock( "link0" )
-          link0.should_receive( :delete! ).once.ordered
-          link0.should_receive( :enable! ).once.ordered
+          link0.should_receive( :delete! ).once
+          link0.should_receive( :enable! ).once
 
           link1 = mock( "link1" )
-          link1.should_receive( :delete! ).once.ordered
-          link1.should_receive( :enable! ).once.ordered
+          link1.should_receive( :delete! ).once
+          link1.should_receive( :enable! ).once
 
           link2 = mock( "link2" )
-          link2.should_receive( :delete! ).once.ordered
-          link2.should_receive( :enable! ).once.ordered
+          link2.should_receive( :delete! ).once
+          link2.should_receive( :enable! ).once
 
           context = mock(
             "context",
@@ -128,21 +108,21 @@ module Trema
           host1 = mock( "host1" )
           host2 = mock( "host2" )
 
-          host0.should_receive( :run! ).once.ordered
+          host0.should_receive( :run! ).once
           host0.should_receive( :add_arp_entry ).with do | arg |
             arg.size.should == 2
             arg.should include( host1 )
             arg.should include( host2 )
           end
 
-          host1.should_receive( :run! ).once.ordered
+          host1.should_receive( :run! ).once
           host1.should_receive( :add_arp_entry ).with do | arg |
             arg.size.should == 2
             arg.should include( host0 )
             arg.should include( host2 )
           end
 
-          host2.should_receive( :run! ).once.ordered
+          host2.should_receive( :run! ).once
           host2.should_receive( :add_arp_entry ).with do | arg |
             arg.size.should == 2
             arg.should include( host0 )
@@ -167,13 +147,13 @@ module Trema
 
         it "should run switches" do
           switch0 = mock( "switch0" )
-          switch0.should_receive( :run! ).once.ordered
+          switch0.should_receive( :run! ).once
 
           switch1 = mock( "switch1" )
-          switch1.should_receive( :run! ).once.ordered
+          switch1.should_receive( :run! ).once
 
           switch2 = mock( "switch2" )
-          switch2.should_receive( :run! ).once.ordered
+          switch2.should_receive( :run! ).once
 
           context = mock(
             "context",