bgp4r 0.0.15 → 0.0.16

data/test/unit/common_test.rb

@@ -65,6 +65,14 @@ class Common_Test < Test::Unit::TestCase
     assert_equal('10.16.0.0/12', ip3 ^ 1)
     assert_equal('10.32.0.0/12', ip3 ^ 2)
   end
+  def test_ipaddr_v6_arithmetic
+    ip1 = IPAddr.new('2014:aa:bb:cc::1/126')
+    assert_equal('2014:aa:bb:cc::4/126', ip1 ^ 1)
+    assert_equal('2014:aa:bb:cc::8/126', ip1 ^ 2)
+    assert_equal('2014:aa:bb:cc::c/126', ip1 ^ 3)
+    assert_equal('2014:aa:bb:cc::10/126', ip1 ^ 4)
+    assert_equal('2014:aa:bb:cc::14/126', ip1 ^ 5)
+  end
   def test_string_pack
     sbin = ['00'].pack('H*')
     assert_equal '0x0000:  00', sbin.hexlify.join

data/test/unit/messages/update_test.rb

@@ -342,7 +342,7 @@ class Update_Test < Test::Unit::TestCase
     }
     assert_equal(h, upd.to_hash)
     assert_equal(BGP::Route_target, upd.path_attribute.extended_communities.route_target.class)
-    assert_equal(BGP::Route_target, upd.path_attribute.extended_communities.route_target.to_s)
+    assert_equal("Route target: 4:1", upd.path_attribute.extended_communities.route_target.to_s)
     assert_equal(128, upd.path_attribute.mp_reach.safi)
     assert_equal('Label Stack=16000 (bottom) RD=19:17, ID=1, IPv4=10.1.1.0/24', upd.path_attribute.mp_reach.nlris[0].to_s)
   end
@@ -456,9 +456,16 @@ class Update_Test < Test::Unit::TestCase
           :next_hop=>"187.121.193.33"
         }
       }
+      
+      npfx = h[:nlris].size
+      assert_equal(76, npfx)
+      
        u = Update.new h       
+       assert_equal(npfx, u.nlri.size)
+       assert_equal(:igp, u.path_attribute.origin.to_sym)
+       assert_equal('187.121.193.33', u.path_attribute.next_hop.next_hop)
        assert_equal(h, u.to_hash)
-              
+       
        # s = "ffffffffffffffffffffffffffffffff016c02000000254001010040021002076e81cf8b415f0ddd266526652665400304bb79c121c008046e81ffdc123b5880123b58c0123b5900123b59c0123b5a00123b5a40123b5a80123b5ac0123b5bc0123b5d80123b5dc0123b5e00123b5e40123b5e80123b5ec0123b5f00123b5f80123b6080123b60c0123b6180123b61c0123b62c0123b6300123b63401275c5001275c5401275c5801275c6801275c6c01275c7401275c7801275c7c01275c8001275c8401275c9001275c9401275cac01275cb001275cb801275cbc01275cd001275cd401275cdc01275ce801275cec01275cf001275cf801275d1c01275d2001275d2401275d2801275d2c01275d4001275d4401275d6001275d6801275d6c01275da001275ef001275ef401275ef801275efc01275f1001275f1401275f1801275f1c01275f2001275f2401275f2801275f2c012d2d40012d2d44012d2d48012d2d4c012daf80012daf880" 
        # assert_equal(s, u.to_shex)
   end

data/test/unit/neighbor/neighbor_test.rb

@@ -23,6 +23,7 @@
 require "test/unit"
 require 'bgp4r'
 require 'test/helpers/server'
+require 'timeout'
 include BGP
 include BGP::OPT_PARM::CAP
 include BGP::TestHelpers
@@ -32,17 +33,22 @@ class TestBgpNeighbor < Test::Unit::TestCase
   include BGP
   include BGP::OPT_PARM::CAP
   include BGP::TestHelpers
+  def setup
+    # Don't work with jruby: skip
+    skip if RUBY_PLATFORM=='java'
+    super
+  end
   def teardown
     stop_server
   end
   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
+    :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
@@ -56,100 +62,136 @@ class TestBgpNeighbor < Test::Unit::TestCase
   end
   def test_neighbor_state_methods
     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
+    :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
   def test_start
-    start_server(3456)
-    @c = Neighbor.new(4, 100, 180, '0.0.0.2', '127.0.0.1', '127.0.0.1')
-    @c.start :port=> 3456
-    assert_equal('Established', @c.state)
-    assert_equal('Established', @s.state)
+    status = Timeout::timeout(4) {
+      start_server(3456)
+      @c = Neighbor.new(4, 100, 180, '0.0.0.2', '127.0.0.1', '127.0.0.1')
+      @c.start :port=> 3456
+      assert_equal('Established', @c.state)
+      assert_equal('Established', @s.state)
+    }
+  rescue Timeout::Error
+    assert false, "Timeout"
   end
   def test_start_no_blocking
-    start_server(3333)
-    @c = Neighbor.new(4, 100, 180, '0.0.0.2', '127.0.0.1', '127.0.0.1')
-    @c.start :port=> 3333, :no_blocking=>true
-    assert_equal('OpenSent', @c.state)
-    assert_match(/(Active|OpenSent)/, @s.state)
+    status = Timeout::timeout(4) {
+      start_server(3333)
+      @c = Neighbor.new(4, 100, 180, '0.0.0.2', '127.0.0.1', '127.0.0.1')
+      @c.start :port=> 3333, :no_blocking=>true
+      assert_equal('OpenSent', @c.state)
+    }
+  rescue Timeout::Error
+    assert false, "Timeout"
+  end
+  def test_start_blocking
+    status = Timeout::timeout(4) {
+      start_server(3333)
+      @c = Neighbor.new(4, 100, 180, '0.0.0.2', '127.0.0.1', '127.0.0.1')
+      @c.start :port=> 3333, :no_blocking=>false
+      assert_equal('Established', @c.state)
+      assert_match(/Established/, @s.state)
+    }
+  rescue Timeout::Error
+    assert false, "Timeout"
   end
   def test_send_and_receive_path_id_afi_1_safi_1
-    server_add_path_cap = BGP::OPT_PARM::CAP::Add_path.new
-    server_add_path_cap.add(:send_and_recv, 1, 1)
-    start_server(3456, server_add_path_cap)
-    @c = Neighbor.new(4, 100, 180, '0.0.0.2', '127.0.0.1', '127.0.0.1')
-    @c.add_cap server_add_path_cap
-    @c.start :port=> 3456    
-    assert @s.session_info.recv_inet_unicast?, 
-            "Should have the capability to recv inet unicast reachability path info."
-    assert @s.session_info.send_inet_unicast?, 
-            "Should have the capability to send inet unicast reachability path info."
-    assert @c.session_info.recv_inet_unicast?, 
-            "Should have the capability to recv inet unicast reachability path info."
-    assert @c.session_info.send_inet_unicast?, 
-           "Should have the capability to send inet unicast reachability path info."
+    status = Timeout::timeout(4) {
+      server_add_path_cap = BGP::OPT_PARM::CAP::Add_path.new
+      server_add_path_cap.add(:send_and_recv, 1, 1)
+      start_server(3456, server_add_path_cap)
+      @c = Neighbor.new(4, 100, 180, '0.0.0.2', '127.0.0.1', '127.0.0.1')
+      @c.add_cap server_add_path_cap
+      @c.start :port=> 3456    
+      assert @s.session_info.recv_inet_unicast?, 
+      "Should have the capability to recv inet unicast reachability path info."
+      assert @s.session_info.send_inet_unicast?, 
+      "Should have the capability to send inet unicast reachability path info."
+      assert @c.session_info.recv_inet_unicast?, 
+      "Should have the capability to recv inet unicast reachability path info."
+      assert @c.session_info.send_inet_unicast?, 
+      "Should have the capability to send inet unicast reachability path info."
+    }
+  rescue Timeout::Error => e
+    assert false, "timeout"
   end
   def test_send_path_id_afi_1_safi_1
-    server_add_path_cap = BGP::OPT_PARM::CAP::Add_path.new
-    server_add_path_cap.add(:send, 1, 1)
-    client_add_path_cap = BGP::OPT_PARM::CAP::Add_path.new
-    client_add_path_cap.add(:recv, 1, 1)
-    start_server(3456, server_add_path_cap)
-    @c = Neighbor.new(4, 100, 180, '0.0.0.2', '127.0.0.1', '127.0.0.1')
-    @c.add_cap client_add_path_cap
-    @c.start :port=> 3456    
-    assert ! @s.session_info.recv_inet_unicast?, 
-            "Should NOT have the capability to recv inet unicast reachability path info."
-    assert   @s.session_info.send_inet_unicast?, 
-            "Should have the capability to send inet unicast reachability path info."
-    assert @c.session_info.recv_inet_unicast?, 
-            "Should have the capability to recv inet unicast reachability path info."
-    assert ! @c.session_info.send_inet_unicast?, 
-           "Should NOT have the capability to send inet unicast reachability path info."
+    status = Timeout::timeout(4) {
+      server_add_path_cap = BGP::OPT_PARM::CAP::Add_path.new
+      server_add_path_cap.add(:send, 1, 1)
+      client_add_path_cap = BGP::OPT_PARM::CAP::Add_path.new
+      client_add_path_cap.add(:recv, 1, 1)
+      start_server(3456, server_add_path_cap)
+      @c = Neighbor.new(4, 100, 180, '0.0.0.2', '127.0.0.1', '127.0.0.1')
+      @c.add_cap client_add_path_cap
+      @c.start :port=> 3456    
+      assert ! @s.session_info.recv_inet_unicast?, 
+      "Should NOT have the capability to recv inet unicast reachability path info."
+      assert   @s.session_info.send_inet_unicast?, 
+      "Should have the capability to send inet unicast reachability path info."
+      assert @c.session_info.recv_inet_unicast?, 
+      "Should have the capability to recv inet unicast reachability path info."
+      assert ! @c.session_info.send_inet_unicast?, 
+      "Should NOT have the capability to send inet unicast reachability path info."
+    }
+  rescue Timeout::Error => e
+    assert false, "timeout"
+
   end
   def test_recv_path_id_afi_1_safi_1
-    server_add_path_cap = BGP::OPT_PARM::CAP::Add_path.new
-    server_add_path_cap.add(:recv, 1, 1)
-    client_add_path_cap = BGP::OPT_PARM::CAP::Add_path.new
-    client_add_path_cap.add(:send, 1, 1)
-    start_server(3456, server_add_path_cap)
-    @c = Neighbor.new(4, 100, 180, '0.0.0.2', '127.0.0.1', '127.0.0.1')
-    @c.add_cap client_add_path_cap
-    @c.start :port=> 3456    
-    assert  @s.session_info.recv_inet_unicast?, 
-            "Should have the capability to recv inet unicast reachability path info."
-    assert !  @s.session_info.send_inet_unicast?, 
-            "Should NOT have the capability to send inet unicast reachability path info."
-    assert ! @c.session_info.recv_inet_unicast?, 
-            "Should NOT have the capability to recv inet unicast reachability path info."
-    assert  @c.session_info.send_inet_unicast?, 
-           "Should have the capability to send inet unicast reachability path info."
+    status = Timeout::timeout(4) {
+      server_add_path_cap = BGP::OPT_PARM::CAP::Add_path.new
+      server_add_path_cap.add(:recv, 1, 1)
+      client_add_path_cap = BGP::OPT_PARM::CAP::Add_path.new
+      client_add_path_cap.add(:send, 1, 1)
+      start_server(3456, server_add_path_cap)
+      @c = Neighbor.new(4, 100, 180, '0.0.0.2', '127.0.0.1', '127.0.0.1')
+      @c.add_cap client_add_path_cap
+      @c.start :port=> 3456    
+      assert  @s.session_info.recv_inet_unicast?, 
+      "Should have the capability to recv inet unicast reachability path info."
+      assert !  @s.session_info.send_inet_unicast?, 
+      "Should NOT have the capability to send inet unicast reachability path info."
+      assert ! @c.session_info.recv_inet_unicast?, 
+      "Should NOT have the capability to recv inet unicast reachability path info."
+      assert  @c.session_info.send_inet_unicast?, 
+      "Should have the capability to send inet unicast reachability path info."
+    }
+  rescue Timeout::Error => e
+    assert false, "timeout"
+
   end
   def test_nor_recv_nor_send_path_id_afi_1_safi_1
-    server_add_path_cap = BGP::OPT_PARM::CAP::Add_path.new
-    server_add_path_cap.add(:recv, 1, 1)
-    client_add_path_cap = BGP::OPT_PARM::CAP::Add_path.new
-    client_add_path_cap.add(:recv, 1, 1)
-    start_server(3456, server_add_path_cap)
-    @c = Neighbor.new(4, 100, 180, '0.0.0.2', '127.0.0.1', '127.0.0.1')
-    @c.add_cap client_add_path_cap
-    @c.start :port=> 3456    
-    assert ! @s.session_info.recv_inet_unicast?, 
-            "Should NOT have the capability to recv inet unicast reachability path info."
-    assert !  @s.session_info.send_inet_unicast?, 
-            "Should NOT have the capability to send inet unicast reachability path info."
-    assert ! @c.session_info.recv_inet_unicast?, 
-            "Should NOT have the capability to recv inet unicast reachability path info."
-    assert ! @c.session_info.send_inet_unicast?, 
-           "Should have the capability to send inet unicast reachability path info."
+    status = Timeout::timeout(4) {
+      server_add_path_cap = BGP::OPT_PARM::CAP::Add_path.new
+      server_add_path_cap.add(:recv, 1, 1)
+      client_add_path_cap = BGP::OPT_PARM::CAP::Add_path.new
+      client_add_path_cap.add(:recv, 1, 1)
+      start_server(3456, server_add_path_cap)
+      @c = Neighbor.new(4, 100, 180, '0.0.0.2', '127.0.0.1', '127.0.0.1')
+      @c.add_cap client_add_path_cap
+      @c.start :port=> 3456    
+      assert ! @s.session_info.recv_inet_unicast?, 
+      "Should NOT have the capability to recv inet unicast reachability path info."
+      assert !  @s.session_info.send_inet_unicast?, 
+      "Should NOT have the capability to send inet unicast reachability path info."
+      assert ! @c.session_info.recv_inet_unicast?, 
+      "Should NOT have the capability to recv inet unicast reachability path info."
+      assert ! @c.session_info.send_inet_unicast?, 
+      "Should have the capability to send inet unicast reachability path info."
+    }
+  rescue Timeout::Error => e
+    assert false, "timeout"
   end
   def test_add_capabilities_using_sym
     neighbor = Neighbor.new(4,100,180,'0.0.0.2')

data/test/unit/nlris/mapped_ipv4_test.rb

@@ -0,0 +1,19 @@
+#--
+# Copyright 2014 Jean-Michel Esnault.
+# All rights reserved.
+# See LICENSE.txt for permissions.
+#
+#
+# This file is part of BGP4R.
+# 
+
+require "test/unit"
+require 'bgp/nlris/mapped_ipv4'
+
+class TestNlrisIpv4Mapped < Test::Unit::TestCase
+  include BGP
+  def test_ipv4_mapped
+    assert_equal('10.0.0.1', Ipv4_mapped.new('10.0.0.1').to_s)
+    assert_equal('00000000000000000000ffff0a000001', Ipv4_mapped.new('10.0.0.1').to_shex)
+  end
+end

data/test/unit/path_attributes/aggregator_test.rb

@@ -69,4 +69,12 @@ class Aggregator_Test < Test::Unit::TestCase
     assert_equal(ag1.encode,ag2.encode)
     assert_equal({:asn=>100, :address=>"10.0.0.1"}, ag2.to_hash[:aggregator])
   end
+  def test6
+    ag1 = Aggregator.new('10.0.0.1', 100)
+    ag1.asn=200
+    ag1.address='11.0.0.2'
+    assert_equal(200, ag1.asn)
+    assert_equal('11.0.0.2', ag1.address)
+    assert_equal({:asn=>200, :address=>"11.0.0.2"}, ag1.to_hash[:aggregator])
+   end 
 end

data/test/unit/path_attributes/extended_communities_test.rb

@@ -60,17 +60,12 @@ class Extended_communitiesTest < Test::Unit::TestCase
     ec = Extended_communities.new_hash  :ospf_domain_id=> '9.1.0.1'
     ec2 = Extended_communities.new_hash(ec.to_hash)
     assert_equal(ec.to_hash, Extended_communities.new_hash(ec.to_hash).to_hash)
-    ec = Extended_communities.new_hash  :encapsulation=> :l2tpv3
-    ec2 = Extended_communities.new_hash(ec.to_hash)
     assert_equal(ec.to_hash, Extended_communities.new_hash(ec.to_hash).to_hash)
     ec = Extended_communities.new_hash  :route_origin=> ['10.0.1.2', 10]
     ec2 = Extended_communities.new_hash(ec.to_hash)
-    assert_equal(ec.to_hash, Extended_communities.new_hash(ec.to_hash).to_hash)
-    ec = Extended_communities.new_hash  :color => 100, :link_bandwidth => 999_999_999, :route_origin => ['10.0.1.2', 10], :encapsulation => :ipip
-    assert_equal(ec.to_hash, Extended_communities.new_hash(ec.to_hash).to_hash)
-    assert_equal({:color=>100}, ec.color.to_hash)
     ec = Extended_communities.new_hash :extended_communities=>[{:route_target=>[13111, 26054]}]
     assert_equal({:extended_communities=>[{:route_target=>[13111, 26054]}]}, ec.to_hash)
+    assert_equal(ec.to_hash, Extended_communities.new_hash(ec.to_hash).to_hash)
   end
   def test_sort
     ec = Extended_communities.new
@@ -81,7 +76,7 @@ class Extended_communitiesTest < Test::Unit::TestCase
     ec.add(Route_target.new('11.0.1.1',10))
     ec.add(Route_target.new('8.0.1.1',10))
     ec.add(Route_target.new('7.0.1.1',8))
-    ec.add(Encapsulation.new(:l2tpv3))
+    # ec.add(Encapsulation.new(:l2tpv3))
     ec.add(Ospf_domain_id.new('20.0.0.1'))
     ec.add(Route_origin.new('10.0.3.2',9))
     ec.add(Route_target.new('10.0.3.2',7))
@@ -96,8 +91,8 @@ class Extended_communitiesTest < Test::Unit::TestCase
     assert_equal("Ospf domain id: 20.0.0.1:0",ec.sort.communities[7].to_s)
     assert_equal("Ospf router id: 10.0.0.1:0",ec.sort.communities[8].to_s)
     assert_equal("Color: 100",ec.sort.communities[9].to_s)
-    assert_equal("Encapsulation: 1",ec.sort.communities[10].to_s)
-    assert_equal("Link bandwidth: 1000000000.0",ec.sort.communities[11].to_s)
+    # assert_equal("Encapsulation: 1",ec.sort.communities[10].to_s)
+    assert_equal("Link bandwidth: 1000000000.0",ec.sort.communities[10].to_s)
   end
   def test_sort!
     ec = Extended_communities.new
@@ -140,28 +135,43 @@ class Extended_communitiesTest < Test::Unit::TestCase
     assert_equal(0, ec <=> ec2)
     assert(! ec.eql?(ec2))
   end
-  def test_getters
+  def test_getters_setters
     ec = Extended_communities.new do |c|    
       c.add(Color.new(100))
       c.add(Link_bandwidth.new(999_999_999))
       c.add(Route_target.new('10.0.1.2',10))
       c.add(Ospf_domain_id.new('9.1.0.1'))
-      c.add(Route_target.new('11.0.1.1',10))
+      c.add(Route_target.new('11.0.1.1',11))
       c.add(Route_target.new('8.0.1.1',10))
       c.add(Route_target.new('7.0.1.1',8))
-      c.add(Encapsulation.new(:l2tpv3))
+      ### c.add(Encapsulation.new(:l2tpv3))
       c.add(Ospf_domain_id.new('20.0.0.1'))
       c.add(Route_origin.new('10.0.3.2',9))
-      c.add(Route_target.new('10.0.3.2',7))
+      c.add(Route_target.new('10.0.3.2',12))
       c.add(Ospf_router_id.new('10.0.0.1'))
     end
     assert_equal('Color: 100',ec.color.to_s)
-    assert_equal('Route target: 10.0.1.2:10',ec.route_target.to_s)
-    assert_equal('Ospf domain id: 9.1.0.1:0',ec.ospf_domain_id.to_s)
-    assert_equal('Encapsulation: 1',ec.encapsulation.to_s)
+    assert_equal('Route target: 10.0.1.2:10',ec.route_target[0].to_s)
+    assert_equal('Ospf domain id: 9.1.0.1:0',ec.ospf_domain_id[0].to_s)
+    ###assert_equal('Encapsulation: 1',ec.encapsulation.to_s)
     assert_equal('Ospf router id: 10.0.0.1:0',ec.ospf_router_id.to_s)
     assert_equal('Link bandwidth: 1000000000.0',ec.link_bandwidth.to_s)
     assert_equal('Route origin: 10.0.3.2:9',ec.route_origin.to_s)
+    ec.route_target= '20.0.1.2', 20
+    ec.link_bandwidth= 100_000
+    assert_equal('Route target: 20.0.1.2:20',ec.route_target[0].to_s)
+    assert_equal('Link bandwidth: 100000.0',ec.link_bandwidth.to_s)
+
+    ec = Extended_communities.new do |c|
+      c.route_target   = '10.0.0.1', 1311
+      c.link_bandwidth = 100_000_000
+      c.ospf_router_id = '1.1.1.1'
+      c.ospf_domain_id = '2.2.2.2'
+      ###c.encapsulation  = 1
+      c.route_origin   = '3.3.3.3', 33
+      c.color          = 1311
+    end
+    
   end
     
 end

data/test/unit/path_attributes/extended_community_test.rb

@@ -108,24 +108,24 @@ class Extended_community_Test < Test::Unit::TestCase
     assert_equal('Color: 10000', Color.new(Color.new(10_000).encode).to_s)
   end
   
-  def test_encapsulation
-    assert_equal('030c000000000000', Encapsulation.new.to_shex)
-    assert_equal('030c000000000001', Encapsulation.new(1).to_shex)
-    assert_equal('030c000000000002', Encapsulation.new(2).to_shex)
-    assert_equal('030c000000000007', Encapsulation.new(7).to_shex)
-    assert_equal('030c000000000001', Encapsulation.new(:l2tpv3).to_shex)
-    assert_equal('030c000000000002', Encapsulation.new(:gre).to_shex)
-    assert_equal('030c000000000007', Encapsulation.new(:ipip).to_shex)
-    assert_equal('Encapsulation: 1', Encapsulation.new(:l2tpv3).to_s)
-    assert_equal('Encapsulation: 7', Encapsulation.new(:ipip).to_s)
-    assert_equal('Encapsulation: 2', Encapsulation.new(:gre).to_s)
-    assert_equal('Encapsulation: 7', Encapsulation.new(Encapsulation.new(7).encode).to_s)    
-  end
+  # def test_encapsulation
+  #   assert_equal('030c000000000000', Encapsulation.new.to_shex)
+  #   assert_equal('030c000000000001', Encapsulation.new(1).to_shex)
+  #   assert_equal('030c000000000002', Encapsulation.new(2).to_shex)
+  #   assert_equal('030c000000000007', Encapsulation.new(7).to_shex)
+  #   assert_equal('030c000000000001', Encapsulation.new(:l2tpv3).to_shex)
+  #   assert_equal('030c000000000002', Encapsulation.new(:gre).to_shex)
+  #   assert_equal('030c000000000007', Encapsulation.new(:ipip).to_shex)
+  #   assert_equal('Encapsulation: 1', Encapsulation.new(:l2tpv3).to_s)
+  #   assert_equal('Encapsulation: 7', Encapsulation.new(:ipip).to_s)
+  #   assert_equal('Encapsulation: 2', Encapsulation.new(:gre).to_s)
+  #   assert_equal('Encapsulation: 7', Encapsulation.new(Encapsulation.new(7).encode).to_s)    
+  # end
 
   def test_factory
     s = '0102070001010008 010208000101000a 01020a000102000a 01020a0003020007 01020b000101000a 
          01030a0003020009 0105090100010000 0105140000010000 01070a0000010000 400400004e6e6b28 
-         430b000000000064 030c000000000007'.split.join
+         430b000000000064 '.split.join # 030c000000000007
     comms = []
     communities = s.scan(/[0-9a-f]{16}/) { |comm| comms << Extended_community.factory([comm].pack('H*'))  }
     assert_equal BGP::Route_target, comms[0].class
@@ -139,7 +139,7 @@ class Extended_community_Test < Test::Unit::TestCase
     assert_equal BGP::Ospf_router_id, comms[8].class
     assert_equal BGP::Link_bandwidth, comms[9].class
     assert_equal BGP::Color, comms[10].class
-    assert_equal BGP::Encapsulation, comms[11].class
+    # assert_equal BGP::Encapsulation, comms[11].class
   end
 
 end

data/test/unit/path_attributes/mp_reach_test.rb

@@ -25,7 +25,7 @@ require 'test/unit'
 
 class Mp_reach_Test < Test::Unit::TestCase
   include BGP
-  
+   
   def test_iso_mapped_ip_addr
     mapped_addr = Iso_ip_mapped.new('10.0.0.1')
     assert_equal('470006010a00000100', mapped_addr.to_shex)
@@ -171,9 +171,6 @@ class Mp_reach_Test < Test::Unit::TestCase
     assert_equal(smpr.split.join, mpr.to_shex)
   end
   
-  
-
-
   def test_afi_3_safi_1_ipv6_mapped_nexthops_ntoh
 
     # Mp Reach (14), length: 57, Flags [O]: 
@@ -198,8 +195,19 @@ class Mp_reach_Test < Test::Unit::TestCase
     
     assert_equal(s.split.join, mpr.to_shex)
     assert_equal("[Oncr] (14)   Mp Reach: [800e3b000301283500002...] '\n    AFI NSAP (3), SAFI Unicast (1)\n    nexthop: 2011::1, 2011::2\n      49.0001.0002.0003.0004.0005.0006.0000.0000.0000.00/104'", mpr.to_s())
+  end    
+  
+  def test_afi_2_safi_2_ipv4_mapped
+    s = '800e30000202102009000900190000000000000000000100402009000100000000402009000200000000402009000300000000'
+    sbin = [s].pack('H*') 
+    mpr = Mp_reach.new(sbin)
+    assert_equal("\n    AFI IPv6 (2), SAFI Multicast (2)\n    nexthop: 2009:9:19::1\n      2009:1::/64\n      2009:2::/64\n      2009:3::/64", mpr.mp_reach)
+    assert_equal(2, mpr.afi)
+    assert_equal(2, mpr.safi)
+    assert_equal(s, mpr.to_shex)
   end
   
+  
   def test_afi_2_safi_2
     s = '800e30000202102009000900190000000000000000000100402009000100000000402009000200000000402009000300000000'
     sbin = [s].pack('H*') 
@@ -600,7 +608,7 @@ class Mp_reach_Test < Test::Unit::TestCase
     assert_equal(mpr3.to_hash, Mp_reach.new(mpr3.to_hash[:mp_reach]).to_hash)
     
   end
-    
+      
   private
   
   def attr_len(attr)

data/test/unit/path_attributes/path_attribute_test.rb

@@ -180,7 +180,7 @@ class Path_attribute_Test < Test::Unit::TestCase # :nodoc:
                             :as_path=> {:set=> [1,2], :sequence=>[3,4], :confed_sequence=>[5,6], :confed_set=>[7,8]},
                             :cluster_list=> ['1.1.1.1', '2.2.2.2', '3.3.3.3'],
                             :communities=> ["145:30", "145:40", "145:50", "145:60", :no_export, :no_advertise,],
-                            :extended_communities=> [ :color => 100, :link_bandwidth => 999_999_999, :route_origin => ['10.0.1.2', 10], :encapsulation => :ipip ],
+                            :extended_communities=> [ :color => 100, :link_bandwidth => 999_999_999, :route_origin => ['10.0.1.2', 10], ],
                             :aggregator=> { :address=>'1.1.1.1', :asn=>100 },
                             :originator_id=> '2.2.2.2',
                             :as4_aggregator=> { :asn=> 200, :address=> '4.4.4.4' },
@@ -294,7 +294,6 @@ class Path_attribute_Test < Test::Unit::TestCase # :nodoc:
         ], 
       }
     }
-    
     assert_equal(h[:local_pref], Path_attribute.new(h).to_hash[:local_pref])
     assert_equal(h[:as_path], Path_attribute.new(h).to_hash[:as_path])
     assert_equal(h[:extended_communities], Path_attribute.new(h).to_hash[:extended_communities])
@@ -303,8 +302,60 @@ class Path_attribute_Test < Test::Unit::TestCase # :nodoc:
     assert_equal(h[:aggregator], Path_attribute.new(h).to_hash[:aggregator])
     assert_equal(h[:mp_reach], Path_attribute.new(h).to_hash[:mp_reach])
     assert_equal(h, Path_attribute.new(h).to_hash)
+  end
+  
+  def test_setters
+    h = {
+      :aigp=> 0x1f2f3f4f5f6f7f8f,
+      :nexthop=> '2.2.2.2',
+      :aggregator=>{:asn=>100, :address=>"10.0.0.1"},
+      :cluster_list=>["1.0.1.1"], 
+      :as_path=>{}, 
+      :communities=>["1133:2015"], 
+      :local_pref=>113, 
+      :origin=>:incomplete,
+      :med=>10, 
+      :extended_communities=>[{:route_target=>[13111, 26054]}, {:ospf_domain_id=>'1.1.1.1'}], 
+      :originator_id=>"196.168.28.123", 
+      :mp_reach=>{
+        :nexthop=>["10.0.0.2"], :afi=>1, :safi=>128, 
+        :nlris=>[
+          {:label=>2226, :prefix=>"172.23.21.113/32", :rd=>[1311, 4567814]}, 
+          {:label=>2151, :prefix=>"10.48.9.175/32",   :rd=>[1311, 32117824]}, 
+        ], 
+      }
+    }
     
+    pa = Path_attribute.new h
+    pa.origin=:egp
+    pa.as_path_sequence=[1,2,3,4]
+    pa.next_hop='1.2.3.4'
+    pa.local_pref=20
+    pa.med=30
+    pa.communities="1113:2805"
+    pa.aggregator.asn=200
+    pa.aggregator.address='11.0.0.2'
+    pa.originator_id='2.2.2.2'
+    pa.cluster_list=['11.1.1.1','12.2.2.2']
+    pa.extended_communities.route_target= '10.0.0.1', 1311
+    pa.extended_communities.link_bandwidth= 100_000_000
+    pa.extended_communities.ospf_router_id= '1.1.1.1'
+    pa.extended_communities.ospf_domain_id= '2.2.2.2'
+    # pa.extended_communities.encapsulation=1
+    pa.extended_communities.route_origin= '3.3.3.3', 33
+    pa.extended_communities.color=1311    
+    assert_equal(1, pa[Origin].to_i)
+    assert_equal(:egp, pa.origin.to_sym)
+    assert_equal("1 2 3 4", pa.as_path.as_path)
+    assert_equal(200, pa.aggregator.asn)
+    assert_equal("11.0.0.2", pa.aggregator.address)
+    assert_equal("2.2.2.2", pa.originator_id.originator_id)
+    assert_equal("b010101", pa.cluster_list.to_ary[0].to_s(16))
+    assert_equal("c020202", pa.cluster_list.to_ary[1].to_s(16))
+    assert_equal("Route target: 10.0.0.1:1311", pa.extended_communities.route_target.to_s)
+    assert_equal("Ospf domain id: 2.2.2.2:0", pa.extended_communities.ospf_domain_id.to_s)
+    assert_equal("Link bandwidth: 100000000.0", pa.extended_communities.link_bandwidth.to_s)
   end
-      
+  
 end