bgp4r 0.0.7 → 0.0.8

data/bgp/attribute.rb

@@ -168,6 +168,8 @@ module BGP
     include ATTR
     include Comparable
     
+    attr_reader :type
+    
     def method_missing(name, *args, &block)
       if name == :encode4
         send :encode, *args, &block

data/bgp/path_attribute.rb

@@ -62,12 +62,19 @@ module BGP
     def find(klass)
       @attributes.find { |a| a.is_a?(klass) }
     end
-    
+
+    def find_by_type(type)
+      @attributes.find { |a| a.type == type }
+    end
+   
     def size
       @attributes.size
     end
     
     def [](type)
+      if type.is_a?(Fixnum)
+        return find_by_type(type)
+      end
       case type
       when  ORIGIN, :origin
         find(Origin)
@@ -97,14 +104,18 @@ module BGP
         find(Extended_communities)
       when AS4_PATH, :as4_path
         find(As4_path)
-      when AS4_AGGREGATOR, :as4_aggregator
-        find(As4_aggregator)
+      when AS4_AGGREGATOR, :as4_aggregator        
       end
     end
     
-    def has?(klass=nil)
-      if klass
-        @attributes.find { |a| a.is_a?(klass) }.nil? ? false : true
+    def has?(arg=nil)
+      if arg
+        case arg
+        when Class
+          @attributes.find { |a| a.is_a?(arg) }.nil? ? false : true
+        when Fixnum
+          @attributes.find { |a| a.type == arg }.nil? ? false : true
+        end
       else
         @attributes.collect { |attr| attr.class }
       end
@@ -159,6 +170,23 @@ end
 module BGP
 
   class Attr
+    UnknownAttr = Class.new(Attr) do
+      attr_reader :type, :flags, :value
+      def initialize(*args)
+        if args.size>1
+          @flags, @type, len, @value=args
+        else
+          parse(*args)
+        end
+      end
+      def encode
+        super(@value)
+      end
+      def parse(s)
+        @flags, @type, len, @value = super
+      end
+    end
+    
     include BGP::ATTR
     def self.factory(s, as4byte=false)
       flags, type = s.unpack('CC')
@@ -192,14 +220,8 @@ module BGP
       when EXTENDED_COMMUNITY
         Extended_communities.new(s)
       else
-        if flags & 0x10==1
-          len = s.slice!(0,2).unpack("n")[0]
-        else 
-          len = s.slice!(0,1).unpack('C')[0]
-        end
-        s.slice!(0,len)
-        raise RuntimeError, "factory for #{type} to be implemented soon"
-        nil
+        # return  a generic unknown attr.
+        UnknownAttr.new(s)
       end
     end
 

data/bgp4r.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bgp4r}
-  s.version = "0.0.7"
+  s.version = "0.0.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jean-Michel Esnault"]
-  s.date = %q{2010-09-12}
+  s.date = %q{2010-09-30}
   s.description = %q{BGP4R is a BGP-4 ruby library to create,  send, and receive  BGP messages in an  object oriented manner}
   s.email = %q{jesnault@gmail.com}
   s.extra_rdoc_files = [
@@ -52,8 +52,10 @@ Gem::Specification.new do |s|
      "examples/routegen",
      "examples/routegen.yml",
      "examples/simple.rb",
+     "examples/unit-testing/keepalive_set_to_zeo.rb",
      "examples/unit-testing/malformed_update.rb",
      "examples/unit-testing/prepend_aspath.rb",
+     "examples/unit-testing/unknown_transitive_attr.rb",
      "test/aggregator_test.rb",
      "test/as_path_test.rb",
      "test/atomic_aggregate_test.rb",

data/examples/unit-testing/keepalive_set_to_zeo.rb

@@ -0,0 +1,64 @@
+require "test/unit"
+require 'bgp4r'
+require 'timeout'
+
+Thread.abort_on_exception=true
+
+class TestBgp < Test::Unit::TestCase
+  
+  include BGP
+
+  Log.create
+  Log.level=Logger::DEBUG
+  
+  N100 = Class.new(BGP::Neighbor)
+
+  class RecvMsgHandler
+    def initialize(q)
+      @q = q
+    end
+    def update(bgp_msg)
+      @q.enq bgp_msg
+    end
+  end
+  
+  def setup
+    @n100 = N100.new(:my_as=> 100, :remote_addr => '40.0.0.2', :local_addr => '40.0.0.1', :id=> '13.11.19.59', :holdtime=>0)
+    start_peering
+  end
+  
+  def test_verify_that_200_is_prepended_to_aspath
+    assert @n100.is_established?, "Expected to be in Established state. <> #{@n100.state}"
+    queue = Queue.new
+    @n300.add_observer RecvMsgHandler.new(queue)
+  end
+
+  def teardown
+    [@n100].each { |n| n.stop }
+    sleep(0.5)
+  end
+  
+  private
+  
+  def start_peering
+    [@n100].each { |n| 
+      n.capability :as4_byte
+      n.start 
+    }
+  end
+  
+  def recv(q, timeout=5)
+    begin
+       Timeout::timeout(timeout) do |t| 
+         msg = q.deq
+       end
+     rescue Timeout::Error => e
+       nil
+     end
+  end
+  
+  def send_update_to(n)
+    n.send_message update1
+  end
+  
+end

data/examples/unit-testing/malformed_update.rb

@@ -9,8 +9,8 @@ class TestBgp < Test::Unit::TestCase
   
   include BGP
 
-  # Log.create
-  # Log.level=Logger::DEBUG
+  Log.create
+  Log.level=Logger::DEBUG
   
   N100 = Class.new(BGP::Neighbor)
 
@@ -68,7 +68,7 @@ class TestBgp < Test::Unit::TestCase
          Origin.new(0),
          Multi_exit_disc.new(100),
          Local_pref.new(100),
-         As_path.new(100),
+         As_path.new(100)
        ),
        Nlri.new('77.0.0.0/17', '78.0.0.0/18', '79.0.0.0/19')
      )

data/examples/unit-testing/unknown_transitive_attr.rb

@@ -0,0 +1,102 @@
+require "test/unit"
+require 'bgp4r'
+require 'timeout'
+
+Thread.abort_on_exception=true
+
+class TestBgp < Test::Unit::TestCase
+  
+  include BGP
+
+  Log.create
+  Log.level=Logger::DEBUG
+  
+  N100 = Class.new(BGP::Neighbor)
+  N300 = Class.new(BGP::Neighbor)
+
+  class RecvMsgHandler
+    def initialize(q)
+      @q = q
+    end
+    def update(bgp_msg)
+      @q.enq bgp_msg
+    end
+  end
+  
+  def setup
+    @n100 = N100.new(:my_as=> 100, :remote_addr => '40.0.0.2', :local_addr => '40.0.0.1', :id=> '13.11.19.59')
+    @n300 = N300.new(:my_as=> 300, :remote_addr => '40.0.1.1', :local_addr => '40.0.1.2', :id=> '13.11.19.57')
+    start_peering
+  end
+  
+  def test_unknown_transitive_attribute
+    assert @n100.is_established?, "Expected to be in Established state. <> #{@n100.state}"
+    assert @n300.is_established?, "Expected to be in Established state. <> #{@n300.state}"
+    queue = Queue.new
+    @n300.add_observer RecvMsgHandler.new(queue)
+    @n100.send_message update_with_unknown_transitive_attribute
+    msg = recv(queue)
+    assert msg, "Did not receive expected BGP update message."
+    assert msg.path_attribute.has?(255), "The path attribute was expected to contain an attribute type 255"
+    assert_not_nil msg.path_attribute[255]
+    assert_equal 'AN OPTIONAL TRANSITIVE ATTR WITH TYPE 999', msg.path_attribute[255].value
+  end
+
+  def teardown
+    [@n100, @n300].each { |n| n.stop }
+    sleep(0.5)
+  end
+  
+  private
+  
+  def start_peering
+    [@n100, @n300].each { |n| 
+      n.capability :as4_byte
+      n.start 
+    }
+  end
+  
+  def recv(q, timeout=5)
+    begin
+       Timeout::timeout(timeout) do |t| 
+         msg = q.deq
+       end
+     rescue Timeout::Error => e
+       nil
+     end
+  end
+  
+  def update_with_unknown_transitive_attribute
+    my_attr = Class.new(Attr)
+    my_attr.class_eval do
+      attr_reader :type, :flags, :value
+      attr_writer :value
+      def initialize(*args)
+        if args.size>1
+          @flags, @type,	@value = args
+        else
+          arr = parse(*args)
+        end
+      end
+      def parse(s)
+        @flags, @type, len, @value = super
+      end
+      def encode
+        super(value)
+      end
+    end
+    update = Update.new(
+      Path_attribute.new(
+      Next_hop.new('40.0.0.1'),
+      Origin.new(0),
+      Multi_exit_disc.new(100),
+      Local_pref.new(100),
+      As_path.new(100),
+      my_attr.new(ATTR::OPTIONAL_TRANSITIVE, 255, 'AN OPTIONAL TRANSITIVE ATTR WITH TYPE 999'),
+      my_attr.new(ATTR::OPTIONAL_TRANSITIVE, 0, 'AN OPTIONAL TRANSITIVE ATTR WITH TYPE 0')
+    ),
+    Nlri.new('77.0.0.0/17', '78.0.0.0/18', '79.0.0.0/19')
+    )
+  end
+  
+end

data/test/attribute_test.rb

@@ -26,20 +26,34 @@ require 'test/unit'
 
 class ATTR_Test < Test::Unit::TestCase
   include BGP
-  class Attr_test < Attr
-    def initialize
-      @type, @flags = 0, 0
-    end
-    def encode
-      @type=0xee
-      @flags=0xf
-      super()
-    end
-  end
   def test_1
-   assert_equal('f0ee00',Attr_test.new.to_shex)
-   attr = Attr_test.new
-   assert_equal(attr.encode4, attr.encode)
+    my_attr = Class.new(Attr)
+    my_attr.class_eval do
+      attr_reader :type, :flags, :value
+      attr_writer :value
+      def initialize(*args)
+        if args.size>1
+          @flags, @type,	@value = args
+        else
+          arr = parse(*args)
+        end
+      end
+      def parse(s)
+        @flags, @type, len, @value = super
+      end
+      def encode
+        super(value)
+      end
+    end
+    assert_equal('40010101',my_attr.new(['40010101'].pack('H*')).to_shex)
+    assert_equal('40010101',my_attr.new(BGP::ATTR::WELL_KNOWN_MANDATORY, 1, [1].pack('C')).to_shex)
+    
+    bogus_0 = my_attr.new(ATTR::OPTIONAL_TRANSITIVE, 0, 'A BOGUS OPTIONAL TRANSITIVE ATTR WITH TYPE 0')
+    bogus_999 = my_attr.new(ATTR::OPTIONAL_TRANSITIVE, 999, 'AN OPTIONAL TRANSITIVE ATTR WITH TYPE 999')
+    assert_equal bogus_0.to_shex, my_attr.new(bogus_0.encode).to_shex
+    assert_equal bogus_999.to_shex, my_attr.new(bogus_999.encode).to_shex
+    assert_equal 'A BOGUS OPTIONAL TRANSITIVE ATTR WITH TYPE 0', bogus_0.value
+    assert_equal 'AN OPTIONAL TRANSITIVE ATTR WITH TYPE 999', bogus_999.value
   end
 end
 class Attr_factory_Test < Test::Unit::TestCase

data/test/message_test.rb

@@ -134,6 +134,33 @@ class Update_Test < Test::Unit::TestCase
     assert m.as4byte?
   end
 
+  def test_5
+    # build an update from a yaml description
+    # advertised 172.18.179.192/27 
+    # origin igp
+    # nexthop 193.251.127.210
+    # metric 0
+    # locpref 310000
+    # community 3215:102 3215:210 3215:522 3215:588 3215:903 3215:7553 3215:8000 3215:8003
+    # originatorid 193.252.102.210
+    # cluster 0.0.17.49 0.0.29.76 0.0.29.79
+    require 'yaml'
+    require 'pp'
+    s = "
+    ---
+    prefixes:202.44.2.0/24 202.44.3.0/24 202.44.5.0/24 202.44.6.0/24 202.44.7.0/24 
+    origin: incomplete
+    nexthop: 10.0.0.1
+    metric: 0
+    localpref: 13000
+    community: 3230:10 3230:110 3230:411 3230:912 3230:1010 3230:5911 
+    originator-id: 10.0.0.2
+    cluster: 0.0.0.1
+    "
+    
+    
+  end
+
 end
 
 class Open_Test < Test::Unit::TestCase

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 7
-  version: 0.0.7
+  - 8
+  version: 0.0.8
 platform: ruby
 authors: 
 - Jean-Michel Esnault
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-12 00:00:00 -07:00
+date: 2010-09-30 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -63,8 +63,10 @@ files:
 - examples/routegen
 - examples/routegen.yml
 - examples/simple.rb
+- examples/unit-testing/keepalive_set_to_zeo.rb
 - examples/unit-testing/malformed_update.rb
 - examples/unit-testing/prepend_aspath.rb
+- examples/unit-testing/unknown_transitive_attr.rb
 - test/aggregator_test.rb
 - test/as_path_test.rb
 - test/atomic_aggregate_test.rb