bgp4r 0.0.11 → 0.0.12

data/test/path_attributes/mp_unreach_test.rb

@@ -26,36 +26,48 @@ require 'test/unit'
 class Mp_unreach_Test < Test::Unit::TestCase
   include BGP
   def test_1
-    mpur = Mp_unreach.new(:safi=>1, :prefix=>['10.0.0.0/16', '10.1.0.0/16'])
+    mpur = Mp_unreach.new(:safi=>1, :nlris=>['10.0.0.0/16', '10.1.0.0/16'])
     assert_raise(ArgumentError) { Mp_unreach.new }
   end
   
   def test_2
-    mpur = Mp_unreach.new(:safi=>2, :prefix=>['192.168.1.0/24', '192.168.2.0/24'])
+    mpur = Mp_unreach.new(:safi=>2, :nlris=>['192.168.1.0/24', '192.168.2.0/24'])
     assert_equal('800f0b00010218c0a80118c0a802', mpur.to_shex)
     
-     mpur = Mp_unreach.new(:safi=>2, :prefix=>['2007:1::/64', '2007:2::/64','2007:3::/64'])
+     mpur = Mp_unreach.new(:safi=>2, :nlris=>['2007:1::/64', '2007:2::/64','2007:3::/64'])
      assert_equal('800f1e000202402007000100000000402007000200000000402007000300000000', mpur.to_shex)
 
      #mpur = Mp_unreach.new(:safi=>2, :prefix=>['2007:1::/64, 101', '2007:2::/64,102','2007:3::/64, 103'])
-     mpur = Mp_unreach.new(:safi=>4, :nlri=> [
+     mpur = Mp_unreach.new(:safi=>4, :nlris=> [
        {:prefix=>'2007:1::/64', :label=> 101},
        {:prefix=>'2007:2::/64', :label=> 102},
        {:prefix=>'2007:3::/64', :label=> 103},])
+       
+    
     assert_equal('800f27000204580006512007000100000000580006612007000200000000580006712007000300000000', mpur.to_shex)
     assert_match(/^800f..000204/,mpur.to_shex)
     assert_match(/58000651200700010000000058/,mpur.to_shex)
     assert_match(/58000661200700020000000058/,mpur.to_shex)
     assert_match(/580006712007000300000000$/,mpur.to_shex)
 
-    mpur = Mp_unreach.new(:safi=>128, :nlri=> [
+    mpur = Mp_unreach.new(:safi=>128, :nlris=> [
       {:rd=> Rd.new(100,100), :prefix=> Prefix.new('192.168.1.0/24'), :label=>101},
       {:rd=> Rd.new(100,100), :prefix=> Prefix.new('192.168.2.0/24'), :label=>102},
       {:rd=> Rd.new(100,100), :prefix=> Prefix.new('192.168.3.0/24'), :label=>103},])
+
+
     assert_match(/^800f..000180/,mpur.to_shex)
     assert_equal("700006510000006400000064c0a801",mpur.nlris[0].to_shex)
     assert_equal("700006610000006400000064c0a802",mpur.nlris[1].to_shex)
 
+    mpur = Mp_unreach.new(:safi=>128, :nlris=> [
+      {:rd=> Rd.new(100,100), :prefix=> '192.168.1.0/24', :label=>101},
+      {:rd=> Rd.new(100,100), :prefix=> '192.168.2.0/24', :label=>102},
+      {:rd=> Rd.new(100,100), :prefix=> '192.168.3.0/24', :label=>103},])
+      assert_match(/^800f..000180/,mpur.to_shex)
+      assert_equal("700006510000006400000064c0a801",mpur.nlris[0].to_shex)
+      assert_equal("700006610000006400000064c0a802",mpur.nlris[1].to_shex)
+
   end
   
   def test_3
@@ -64,4 +76,100 @@ class Mp_unreach_Test < Test::Unit::TestCase
     assert_equal '800f03000102', Mp_unreach.new(:afi=>1, :safi=>2).to_shex
   end
   
+  def test_afi_1
+    mpr1 =  Mp_unreach.new(:safi=>1, :nlris=> '192.168.1.0/24')
+    mpr2 =  Mp_unreach.new(:safi=>1, :nlris=> '192.168.1.0/24', :path_id=>100)
+    mpr3 =  Mp_unreach.new(:safi=>2, :nlris=> ['192.168.1.0/24','192.168.2.0/24'])
+    mpr4 =  Mp_unreach.new(:safi=>2, :nlris=> ['192.168.1.0/24','192.168.2.0/24'], :path_id=>100)
+    mpr5 =  Mp_unreach.new(:safi=>1, :nlris=> [
+      {:prefix=> '192.168.1.0/24', :path_id=> 100},
+      {:prefix=> '192.168.2.0/24', :path_id=> 101},
+      {:prefix=> '192.168.2.0/24', :path_id=> 102},
+    ])
+    
+    
+    # 
+    # puts mpr1
+    # puts mpr2
+    # puts mpr3
+    # puts mpr4
+    # puts mpr5
+    # 
+    assert_equal('800f0700010118c0a801', mpr1.to_shex)
+    assert_equal('800f0b0001010000006418c0a801', mpr2.to_shex)
+    assert_equal attr_len(mpr1)+4, attr_len(mpr2)
+    
+    assert_equal('800f0b00010218c0a80118c0a802', mpr3.to_shex)
+    assert_equal('800f130001020000006418c0a8010000006418c0a802', mpr4.to_shex)
+    assert_equal attr_len(mpr3)+8, attr_len(mpr4)
+    
+    assert_equal('800f1b0001010000006418c0a8010000006518c0a8020000006618c0a802', mpr5.to_shex)
+    
+  end
+  
+  def test_safi_2_afi_2
+    unreach1 = Mp_unreach.new( :safi=>2, :nlris=> [
+      {:prefix=> '2007:1::/64'}, 
+      {:prefix=> '2007:2::/64'}, 
+      {:prefix=> '2007:3::/64'} 
+    ]
+    )
+    assert_equal(3, unreach1.nlris.size)
+    assert_equal(2,unreach1.afi)
+    assert_equal(2,unreach1.safi)
+
+    unreach2 = Mp_unreach.new( :safi=>2, :nlris=> [
+      {:prefix=> '2007:1::/64', :path_id=> 101}, 
+      {:prefix=> '2007:2::/64', :path_id=> 102}, 
+      {:prefix=> '2007:3::/64', :path_id=> 103} 
+    ]
+    )
+    
+    s1 = '80 0f 1e 0002 02          40 2007000100000000          40 2007000200000000          40 2007000300000000'
+    s2 = '80 0f 2a 0002 02 00000065 40 2007000100000000 00000066 40 2007000200000000 00000067 40 2007000300000000'
+    assert_equal(s1.split.join,unreach1.to_shex)
+    assert_equal(s2.split.join,unreach2.to_shex)
+
+    assert_equal(s1.split.join, Mp_unreach.new(unreach1.encode).to_shex)
+    assert_equal(s2.split.join, Mp_unreach.new(unreach2.encode,true).to_shex)
+  
+  end
+  
+  def test_safi_128
+    
+    # ffff ffff ffff ffff ffff ffff ffff ffff
+    # 0031 0200 0000 1a
+    # 90 0f 0016 0001 80 00000001 70 800000 00000001000000010a0101
+    # 80 0f 12   0001 80          70 03e801 00000001000000010a0101
+    # 80 0f 16   0001 80 00000001 70 03e801 00000001000000010a0101
+    
+    # Mp Reach (14), length: 9216, Flags [OE]: 
+    #   AFI IPv4 (1), SAFI Labeled VPN Unicast (128)
+    #   nexthop: 1.1.1.1
+    #     ID=1, Label Stack=16000 (bottom) RD=1:1, IPv4=10.1.1.0/24
+    #  0x0000:  0180 0c00 0000 0000 0000 0001 0101 0100
+    #  0x0001:  0000 0001 7003 e801 0000 0001 0000 0001
+    #  0x0002:  0a01 01
+    
+    unreach1 = Mp_unreach.new( :safi=> 128, :nlris => [{:rd=> Rd.new(1,1), :prefix=> '10.1.1.0/24', :label=>16000},])
+    unreach2 = Mp_unreach.new( :safi=> 128, :nlris => [{:rd=> Rd.new(1,1), :prefix=> '10.1.1.0/24', :label=>16000, :path_id=> 1},])
+    
+    assert_equal(16000,  Label.new(['03e801'].pack('H*')).to_hash[:label])
+    assert_equal(524288, Label.new(['800000'].pack('H*')).to_hash[:label])
+    
+    s1 = '80 0f 12 0001 80 70 03e801 000000010000000 10a0101'.split.join
+    s2 = '80 0f 16   0001 80 00000001 70 03e801 00000001000000010a0101'.split.join
+    assert_equal(s1, unreach1.to_shex)
+    assert_equal(s1, Mp_unreach.new(unreach1.encode).to_shex)
+    assert_equal(s2, unreach2.to_shex)
+    assert_equal(s2, Mp_unreach.new(unreach2.encode,true).to_shex)
+    
+  end
+  
+  private
+  
+   def attr_len(attr)
+     attr.encode[2,1].unpack('C')[0]
+   end
+  
 end

data/test/path_attributes/path_attribute_test.rb

@@ -22,6 +22,7 @@
 
 require 'test/unit'
 require 'bgp/path_attributes/path_attribute'
+require 'bgp/path_attributes/attributes'
 
 class Path_attribute_Test < Test::Unit::TestCase # :nodoc:
   include BGP
@@ -141,5 +142,36 @@ class Path_attribute_Test < Test::Unit::TestCase # :nodoc:
     assert @pa.has_a_local_pref_attr?
     assert ! @pa.has_a_aggregator_attr?
     assert ! @pa.has_a_mp_unreach_attr?
-  end  
-end
+  end
+
+  def test_7
+    s =   '800e1000010404ffffffff0030000651c0a800'
+    sbin = [s].pack('H*')
+    assert_equal(BGP::Mp_reach, Attr.factory(sbin, :path_id=>false).class)
+    s = '800e1400010404ffffffff000000006430000651c0a800'
+    sbin = [s].pack('H*')
+    assert_equal(BGP::Mp_reach, Attr.factory(sbin, :path_id=>true).class)
+  end
+  
+  def test_path_attribute_path_id_true_and_as4byte_false
+    path_attr = Path_attribute.new
+    path_attr.insert(
+    Origin.new,
+    As_path.new(100),
+    Mp_reach.new( :safi=>128, :nexthop=> ['10.0.0.1'], :path_id=> 100, :nlris=> [
+      {:rd=> [100,100], :prefix=> '192.168.0.0/24', :label=>101},
+      {:rd=> [100,100], :prefix=> '192.168.1.0/24', :label=>102},
+      {:rd=> [100,100], :prefix=> '192.168.2.0/24', :label=>103},
+    ])
+    )
+    assert_match(/ID=100, Label Stack=101/, path_attr.to_s)
+    path_attr_new = Path_attribute.new(path_attr.encode(true), :as4byte=> true, :path_id=>true)
+    assert_equal(path_attr.to_shex, path_attr_new.to_shex)
+    
+    # TODO: UT: a path attr with mp_reach w path_id and ! as4
+    # TODO: UT: a path attr with mp_unreach w path_id
+    # TODO: UT: a path attr with mp_reach w path_id and as4
+    
+  end
+  
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 11
-  version: 0.0.11
+  - 12
+  version: 0.0.12
 platform: ruby
 authors: 
 - Jean-Michel Esnault
@@ -14,12 +14,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-08 00:00:00 -08:00
+date: 2011-02-13 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
 description: BGP4R is a BGP-4 ruby library to create,  send, and receive  BGP messages in an  object oriented manner
-email: jesnault@gmail.com
+email: bgp4r@esnault.org
 executables: []
 
 extensions: []
@@ -44,7 +44,8 @@ files:
 - bgp/messages/route_refresh.rb
 - bgp/messages/update.rb
 - bgp/misc/live_feed.rb
-- bgp/neighbor.rb
+- bgp/neighbor/add_path_cap.rb
+- bgp/neighbor/neighbor.rb
 - bgp/nlris/inet.rb
 - bgp/nlris/label.rb
 - bgp/nlris/labeled.rb
@@ -53,6 +54,7 @@ files:
 - bgp/nlris/prefix.rb
 - bgp/nlris/rd.rb
 - bgp/nlris/vpn.rb
+- bgp/optional_parameters/add_path.rb
 - bgp/optional_parameters/as4.rb
 - bgp/optional_parameters/capabilities.rb
 - bgp/optional_parameters/capability.rb
@@ -90,8 +92,13 @@ files:
 - examples/unit-testing/malformed_update.rb
 - examples/unit-testing/no_export.rb
 - examples/unit-testing/prepend_aspath.rb
+- examples/unit-testing/test.rb
+- examples/unit-testing/test1.rb
+- examples/unit-testing/test2.rb
 - examples/unit-testing/unknown_transitive_attr.rb
 - test/common_test.rb
+- test/helpers/server.rb
+- test/iana_test.rb
 - test/messages/capability_test.rb
 - test/messages/keepalive_test.rb
 - test/messages/markers_test.rb
@@ -102,12 +109,14 @@ files:
 - test/messages/update_test.rb
 - test/misc/live_feed_test.rb
 - test/misc/misc.rb
-- test/neighbor_test.rb
+- test/neighbor/add_path_cap_test.rb
+- test/neighbor/neighbor_test.rb
 - test/nlris/ext_nlri_test.rb
 - test/nlris/inet_test.rb
 - test/nlris/labeled_test.rb
 - test/nlris/nlri_test.rb
 - test/nlris/rd_test.rb
+- test/optional_parameters/add_path_test.rb
 - test/optional_parameters/as4_test.rb
 - test/optional_parameters/capability_test.rb
 - test/optional_parameters/dynamic_test.rb
@@ -167,6 +176,8 @@ specification_version: 3
 summary: A BGP-4 Ruby Library
 test_files: 
 - test/common_test.rb
+- test/helpers/server.rb
+- test/iana_test.rb
 - test/messages/capability_test.rb
 - test/messages/keepalive_test.rb
 - test/messages/markers_test.rb
@@ -177,12 +188,14 @@ test_files:
 - test/messages/update_test.rb
 - test/misc/live_feed_test.rb
 - test/misc/misc.rb
-- test/neighbor_test.rb
+- test/neighbor/add_path_cap_test.rb
+- test/neighbor/neighbor_test.rb
 - test/nlris/ext_nlri_test.rb
 - test/nlris/inet_test.rb
 - test/nlris/labeled_test.rb
 - test/nlris/nlri_test.rb
 - test/nlris/rd_test.rb
+- test/optional_parameters/add_path_test.rb
 - test/optional_parameters/as4_test.rb
 - test/optional_parameters/capability_test.rb
 - test/optional_parameters/dynamic_test.rb

data/test/neighbor_test.rb

@@ -1,62 +0,0 @@
-#--
-# Copyright 2008, 2009 Jean-Michel Esnault.
-# All rights reserved.
-# See LICENSE.txt for permissions.
-#
-#
-# This file is part of BGP4R.
-# 
-# BGP4R is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-# 
-# BGP4R 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 BGP4R.  If not, see <http://www.gnu.org/licenses/>.
-#++
-
-require "test/unit"
-require 'bgp4r'
-
-class TestBgpNeighbor < Test::Unit::TestCase
-  include BGP
-  include BGP::OPT_PARM::CAP
-  def test_open_msg
-    neighbor = Neighbor.new \
-      :version=> 4, 
-      :my_as=> 100, 
-      :remote_addr => '192.168.1.200',
-      :local_addr => '192.168.1.5', 
-      :id=> '1.1.1.1', 
-      :holdtime=> 20
-    neighbor.capability Mbgp.ipv4_unicast
-    neighbor.capability Mbgp.ipv4_multicast
-    neighbor.capability Route_refresh.new
-    neighbor.capability Route_refresh.new 128
-    neighbor.capability As4.new(100)
-    open_msg = neighbor.open
-    assert_equal(5,open_msg.opt_parms.size)
-    assert_equal(4,open_msg.version)
-    assert_equal(20,open_msg.holdtime)
-    assert_equal(100,open_msg.local_as)
-    # puts neighbor
-  end
-  def test_states
-    neighbor = Neighbor.new \
-      :version=> 4, 
-      :my_as=> 100, 
-      :remote_addr => '192.168.1.200', 
-      :local_addr => '192.168.1.5', 
-      :id=> '1.1.1.1', 
-      :holdtime=> 20
-      assert neighbor.is_idle?
-      assert ! neighbor.is_established?
-      assert ! neighbor.is_openrecv?
-      assert ! neighbor.is_openconfirm?  
-  end
-end