bgp4r 0.0.14 → 0.0.15

data/bgp/messages/message.rb

@@ -39,6 +39,7 @@ module ::BGP
     end
 
     def encode(message='')
+      raise unless @msg_type.is_a?(Integer)
       len = message.size+19
       [[255]*16,len,@msg_type,message].flatten.pack('C16nCa*')
     end

data/bgp/messages/update.rb

@@ -56,6 +56,7 @@ class BGP::Update < BGP::Message
   end
 
   def initialize(*args, &block)
+    @msg_type=UPDATE
     @nlri, @path_attribute, @withdrawn=nil,nil,nil
     @session_info = Info.new
     if args[0].is_a?(String) and args[0].is_packed?
@@ -66,6 +67,10 @@ class BGP::Update < BGP::Message
       end
     elsif args[0].is_a?(self.class)
       parse(args[0].encode, *args[1..-1])
+    elsif args[0].is_a?(Hash)
+      @withdrawn = Withdrawn.new(*args[0][:withdrawns])                if args[0].has_key?(:withdrawns)
+      @path_attribute = Path_attribute.new(args[0][:path_attributes])  if args[0].has_key?(:path_attributes)
+      @nlri = Nlri.new(*args[0][:nlris])                               if args[0].has_key?(:nlris)
     else
       @msg_type=UPDATE
       set(*args)

data/bgp/path_attributes/aggregator.rb

@@ -86,7 +86,7 @@ module BGP
     end
     
     def to_hash
-      {:asn=> asn, :address=> address}
+      {:aggregator=> {:asn=> asn, :address=> address}}
     end
     
   end

data/bgp/path_attributes/aigp.rb

@@ -24,7 +24,7 @@ module BGP
     end
     
     def to_hash
-      {:metric=> to_i}
+      {:aigp=> to_i}
     end
     
     def accumulated_igp_metric
@@ -51,8 +51,8 @@ module BGP
   class Aigp
     class << self
       def new_hash(_arg={})
-        arg = {:metric=>0}.merge(_arg)
-        new arg[:metric]
+        arg = {:aigp=>0}.merge(_arg)
+        new arg[:aigp]
       end
     end
   end

data/bgp/path_attributes/attribute.rb

@@ -188,7 +188,7 @@ module BGP
     attr_reader :type
     
     def <=>(o)
-      0
+      type <=> o.type
     end
     
     def method_missing(name, *args, &block)

data/bgp/path_attributes/attributes.rb

@@ -1,5 +1,6 @@
 %w{ 
-  origin next_hop 
+  origin 
+  next_hop 
   local_pref 
   multi_exit_disc 
   as_path 
@@ -11,6 +12,7 @@
   mp_reach 
   mp_unreach 
   extended_communities 
+  originator_id
   path_attribute
   aigp
 }.each do |attr|

data/bgp/path_attributes/cluster_list.rb

@@ -55,6 +55,8 @@ module BGP
         parse(args[0])
       elsif args[0].is_a?(self.class)
         parse(args[0].encode, *args[1..-1])
+      elsif args[0].is_a?(Hash)
+        add *args[0][:cluster_list]
       else
         add(*args)
       end
@@ -102,7 +104,7 @@ module BGP
     end
     
     def to_hash
-      {:cluster_ids=>@cluster_ids.collect { |c| c.to_s  }}
+      {:cluster_list=>@cluster_ids.collect { |c| c.to_s  }}
     end
       
     def sort!
@@ -116,25 +118,6 @@ module BGP
 
   end
   
-  class Cluster_list
-    class << self
-      def new_hash(arg={})
-        o = new
-        [:cluster_ids].each do |set_type|
-          next unless arg.has_key? set_type
-          case set_type
-          when :cluster_ids
-            o << arg[set_type]
-          else
-            raise
-          end 
-        end
-        o
-        
-      end
-    end
-  end
-
 end
 
 load "../../test/unit/path_attributes/#{ File.basename($0.gsub(/.rb/,'_test.rb'))}" if __FILE__ == $0

data/bgp/path_attributes/extended_communities.rb

@@ -29,20 +29,24 @@ module BGP
   class Extended_communities < Attr
 
     class << self
-      def new_hash(arg={})
+      def new_hash(*args)
+        raise unless args[0].is_a?(Hash)
         o = new
-        arg.keys.each do |comm|
-          case comm
-          when :color           ; o << Color.new(*arg[comm])
-          when :route_target    ; o << Route_target.new(*arg[comm])
-          when :link_bandwidth  ; o << Link_bandwidth.new(*arg[comm])
-          when :ospf_domain_id  ; o << Ospf_domain_id.new(*arg[comm])
-          when :encapsulation   ; o << Encapsulation.new(*arg[comm])
-          when :route_origin    ; o << Route_origin.new(*arg[comm])
-          when :ospf_router_id  ; o << Ospf_router_id.new(arg[comm])
-          else
-            raise
-          end 
+        args.each do |arg|
+          arg.keys.each do |comm|
+            case comm
+            when :extended_communities ; o = new_hash *args[0][:extended_communities]
+            when :color                ; o << Color.new(*arg[comm])
+            when :route_target         ; o << Route_target.new(*arg[comm])
+            when :link_bandwidth       ; o << Link_bandwidth.new(*arg[comm])
+            when :ospf_domain_id       ; o << Ospf_domain_id.new(*arg[comm])
+            when :encapsulation        ; o << Encapsulation.new(*arg[comm])
+            when :route_origin         ; o << Route_origin.new(*arg[comm])
+            when :ospf_router_id       ; o << Ospf_router_id.new(*arg[comm])
+            else
+              raise
+            end 
+          end
         end
         o        
       end
@@ -55,11 +59,13 @@ module BGP
 
       if args[0].is_a?(String) and args[0].is_packed?
         parse(args[0])
+        return
       elsif args[0].is_a?(self.class)
         parse(args[0].encode, *args[1..-1])
       else
         add(*args)
       end
+      yield(self) if block_given?
     end
 
     def add(*args)
@@ -80,9 +86,7 @@ module BGP
     alias << add
 
     def to_hash
-      h = {}
-      @communities.each { |c|  h = h.merge( { c.class.to_s.split('::').last.downcase.to_sym => c.instance_eval { value2 } }) }
-      h
+      {:extended_communities=> @communities.collect  { |c| c.to_hash }}
     end
 
     def extended_communities
@@ -94,6 +98,24 @@ module BGP
       s.join("\n")
     end
     
+    def find(klass)
+      communities.find { |c| c.is_a?(klass) }
+    end
+    
+    %w{ 
+      color
+      route_target
+      link_bandwidth
+      ospf_domain_id
+      encapsulation
+      route_origin
+      ospf_router_id      
+    }.each do |ecom|
+      define_method("#{ecom}") do
+        find(BGP.const_get(ecom.capitalize))
+      end
+    end
+    
     def to_s(method=:default)
       super(extended_communities, method)
     end

data/bgp/path_attributes/extended_community.rb

@@ -47,8 +47,7 @@ module BGP
     FLOAT = -1
     
     DEFAULT_OPAQUE_ENCODING = 'H12'
-    
-    
+
     def encode
       [@type, @subtype, _encoded_value_].pack('CCa6')
     end
@@ -128,6 +127,10 @@ module BGP
     def to_s
       "#{name}: #{value}"
     end
+    
+    def to_hash
+      { self.class.to_s.split('::').last.downcase.to_sym => value2 }
+    end
 
     private
 

data/bgp/path_attributes/multi_exit_disc.rb

@@ -75,7 +75,7 @@ module BGP
     end
 
     def to_hash
-      {:multi_exit_disc=>to_i}
+      {:med=>to_i}
     end
 
     private

data/bgp/path_attributes/originator_id.rb

@@ -32,7 +32,7 @@ module BGP
 
     class << self
       def new_hash(arg={})
-        new arg[:origin_id]
+        new arg[:originator_id]
       end
     end
 
@@ -69,7 +69,7 @@ module BGP
     end
     
     def to_hash
-      {:origin_id=> originator_id}
+      {:originator_id=> originator_id}
     end
     
     def originator_id=(val)

data/bgp/path_attributes/path_attribute.rb

@@ -35,6 +35,7 @@ module BGP
         @attributes=[]
         while s.size>0
           @attributes << Attr.factory(*args)
+          @attributes
         end
       elsif args.size ==1 and args[0].is_a?(Hash)
         @attributes = []
@@ -48,13 +49,15 @@ module BGP
           when :as_path                ; As_path.new_hash(args[0][attr])
           when :as4_path               ; As4_path.new_hash(args[0][attr])
           when :origin                 ; Origin.new(args[0][attr])
+          when :originator_id          ; Originator_id.new(args[0][attr])
           when :cluster_list           ; Cluster_list.new(*args[0][attr])
           when :aggregator             ; Aggregator.new(args[0][attr])
           when :as4_aggregator         ; As4_aggregator.new(args[0][attr])
           when :originator_id          ; Originator_id.new(args[0][attr])
           when :communities, :community; Communities.new(args[0][attr])
+          when :aigp                   ; Aigp.new(args[0][attr])
           when :extended_communities, :extended_community
-            Extended_communities.new_hash(args[0][attr])
+            Extended_communities.new_hash(*args[0][attr])
           when :atomic_aggregate       ; Atomic_aggregate.new
             # FIXME: add other attr here ...
           else 
@@ -192,7 +195,21 @@ module BGP
       self
     end
     
-    def delete(*klasses)
+    def sort
+      attributes.sort { |a,b| a.type <=> b.type }
+      Path_attribute.new(*attributes.sort { |a,b| a.type <=> b.type })
+    end
+
+    def sort!
+      attributes.sort! { |a,b| a.type <=> b.type }
+      self
+    end
+
+    def <=>(other)
+      self.sort.to_shex <=> other.sort.to_shex
+    end
+    
+      def delete(*klasses)
       for klass in klasses
         next unless klass.is_a?(Class)
         attributes.delete_if { |x| x.class == klass }
@@ -214,10 +231,14 @@ module BGP
       mp_reach 
       mp_unreach 
       extended_communities 
-    }.each do |attr| 
+    }.each do |attr|
       define_method("has_a_#{attr}_attr?") do
         has? BGP.const_get(attr.capitalize)
       end
+      define_method("#{attr}") do
+        k = BGP.const_get(attr.capitalize)
+        @attributes.find { |a| a.is_a?(k) }
+      end
       eval "alias :has_an_#{attr}? :has_a_#{attr}_attr?" if (attr =~ /^[aeiou]/)
     end
     
@@ -237,6 +258,11 @@ module BGP
       when :communities, :community ; Communities
       end
     end
+    
+    def method_missing(name, *args, &block)
+      super
+    end
+
   end
 end
 
@@ -318,39 +344,6 @@ module BGP
         Unknown.new(s)
       end
     end
-
-    # def self.new_hash(_arg={:arg=>nil})
-    #   #FIXME:
-    #   
-    #   arg = _arg.delete(:arg)
-    #   
-    #   if arg.is_a?(Neighbor::Capabilities)
-    #     as4byte_flag = arg.as4byte?
-    #     path_id_flag = arg
-    #   elsif arg.is_a?(Hash)
-    #     as4byte_flag=arg[:as4byte]
-    #     path_id_flag=arg[:path_id]
-    #   elsif arg.is_a?(TrueClass)
-    #     as4byte_flag=true
-    #     path_id_flag=nil
-    #   elsif arg.respond_to? :as4byte?
-    #     as4byte_flag = arg.as4byte?
-    #     path_id_flag = arg
-    #   else
-    #     as4byte_flag=nil
-    #     path_id_flag=nil
-    #   end
-    # 
-    #   _arg.keys.each { |attr|
-    #     case attr
-    #     when :local_pref ; Local_pref.new(_arg[attr])
-    #     when :next_hop   ; Next_hop.new(_arg[attr])
-    #     else
-    #     end
-    #   }
-    # end
-
-
     
   end
 
@@ -360,9 +353,7 @@ module BGP
   #   
   # p = Path_attribute.new :local_pref=>100, :next_hop => '10.0.0.1', :med=>300
   # # p p
-  # puts p 
-  
-  
+  # puts p   
   
 end
 load "../../test/unit/path_attributes/#{ File.basename($0.gsub(/.rb/,'_test.rb'))}" if __FILE__ == $0

data/bgp4r.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "bgp4r"
-  s.version = "0.0.13"
+  s.version = "0.0.15"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jean-Michel Esnault"]
-  s.date = "2011-10-27"
+  s.date = "2012-02-13"
   s.description = "BGP4R is a BGP-4 ruby library to create,  send, and receive  BGP messages in an  object oriented manner"
   s.email = "bgp4r@esnault.org"
   s.extra_rdoc_files = [
@@ -57,6 +57,7 @@ Gem::Specification.new do |s|
     "bgp/orfs/orf.rb",
     "bgp/orfs/prefix_orf.rb",
     "bgp/path_attributes/aggregator.rb",
+    "bgp/path_attributes/aigp.rb",
     "bgp/path_attributes/as_path.rb",
     "bgp/path_attributes/atomic_aggregate.rb",
     "bgp/path_attributes/attribute.rb",
@@ -79,8 +80,6 @@ Gem::Specification.new do |s|
     "examples/routegen",
     "examples/routegen.yml",
     "examples/simple.rb",
-    "examples/test.rb",
-    "examples/test2.rb",
     "examples/unit-testing/malformed_update_test.rb",
     "examples/unit-testing/no_export_test.rb",
     "examples/unit-testing/prepend_aspath_test.rb",
@@ -108,6 +107,7 @@ Gem::Specification.new do |s|
     "test/unit/nlris/nsap_test.rb",
     "test/unit/nlris/prefix_test.rb",
     "test/unit/nlris/rd_test.rb",
+    "test/unit/nlris/vpn_test.rb",
     "test/unit/optional_parameters/add_path_test.rb",
     "test/unit/optional_parameters/as4_test.rb",
     "test/unit/optional_parameters/capability_test.rb",
@@ -119,7 +119,7 @@ Gem::Specification.new do |s|
     "test/unit/optional_parameters/route_refresh_test.rb",
     "test/unit/orfs/prefix_orf_test.rb",
     "test/unit/path_attributes/aggregator_test.rb",
-    "test/unit/path_attributes/aigp.rb",
+    "test/unit/path_attributes/aigp_test.rb",
     "test/unit/path_attributes/as_path_test.rb",
     "test/unit/path_attributes/atomic_aggregate_test.rb",
     "test/unit/path_attributes/attribute_test.rb",
@@ -134,15 +134,16 @@ Gem::Specification.new do |s|
     "test/unit/path_attributes/next_hop_test.rb",
     "test/unit/path_attributes/origin_test.rb",
     "test/unit/path_attributes/originator_id_test.rb",
-    "test/unit/path_attributes/path_attribute_test.rb"
+    "test/unit/path_attributes/path_attribute_test.rb",
+    "test/unit/path_attributes/tunnel_encapsulation_test (Jean-Michel's Laptop's conflicted copy 2011-11-02).rb"
   ]
   s.homepage = "http://github.com/jesnault/bgp4r/tree/master"
   s.require_paths = ["."]
   s.required_ruby_version = Gem::Requirement.new(">= 1.8.6")
   s.rubyforge_project = "bgp4r"
-  s.rubygems_version = "1.8.10"
+  s.rubygems_version = "1.8.11"
   s.summary = "A BGP-4 Ruby Library"
-  s.test_files = ["test/functional", "test/functional/add_path_test.rb", "test/functional/live_feed_test.rb", "test/helpers", "test/helpers/server.rb", "test/misc", "test/misc/misc.rb", "test/unit", "test/unit/common_test.rb", "test/unit/iana_test.rb", "test/unit/messages", "test/unit/messages/capability_test.rb", "test/unit/messages/keepalive_test.rb", "test/unit/messages/markers_test.rb", "test/unit/messages/message_test.rb", "test/unit/messages/notification_test.rb", "test/unit/messages/open_test.rb", "test/unit/messages/route_refresh_test.rb", "test/unit/messages/update_test.rb", "test/unit/neighbor", "test/unit/neighbor/add_path_cap_test.rb", "test/unit/neighbor/neighbor_test.rb", "test/unit/nlris", "test/unit/nlris/inet_test.rb", "test/unit/nlris/label_test.rb", "test/unit/nlris/labeled_test.rb", "test/unit/nlris/nlri_test.rb", "test/unit/nlris/nsap_test.rb", "test/unit/nlris/prefix_test.rb", "test/unit/nlris/rd_test.rb", "test/unit/optional_parameters", "test/unit/optional_parameters/add_path_test.rb", "test/unit/optional_parameters/as4_test.rb", "test/unit/optional_parameters/capability_test.rb", "test/unit/optional_parameters/dynamic_test.rb", "test/unit/optional_parameters/graceful_restart_test.rb", "test/unit/optional_parameters/mbgp_test.rb", "test/unit/optional_parameters/optional_parameter_test.rb", "test/unit/optional_parameters/orf_test.rb", "test/unit/optional_parameters/route_refresh_test.rb", "test/unit/orfs", "test/unit/orfs/prefix_orf_test.rb", "test/unit/path_attributes", "test/unit/path_attributes/aggregator_test.rb", "test/unit/path_attributes/aigp.rb", "test/unit/path_attributes/as_path_test.rb", "test/unit/path_attributes/atomic_aggregate_test.rb", "test/unit/path_attributes/attribute_test.rb", "test/unit/path_attributes/cluster_list_test.rb", "test/unit/path_attributes/communities_test.rb", "test/unit/path_attributes/extended_communities_test.rb", "test/unit/path_attributes/extended_community_test.rb", "test/unit/path_attributes/local_pref_test.rb", "test/unit/path_attributes/mp_reach_test.rb", "test/unit/path_attributes/mp_unreach_test.rb", "test/unit/path_attributes/multi_exit_disc_test.rb", "test/unit/path_attributes/next_hop_test.rb", "test/unit/path_attributes/origin_test.rb", "test/unit/path_attributes/originator_id_test.rb", "test/unit/path_attributes/path_attribute_test.rb"]
+  s.test_files = ["test/functional", "test/functional/add_path_test.rb", "test/functional/live_feed_test.rb", "test/helpers", "test/helpers/server.rb", "test/misc", "test/misc/misc.rb", "test/unit", "test/unit/common_test.rb", "test/unit/iana_test.rb", "test/unit/messages", "test/unit/messages/capability_test.rb", "test/unit/messages/keepalive_test.rb", "test/unit/messages/markers_test.rb", "test/unit/messages/message_test.rb", "test/unit/messages/notification_test.rb", "test/unit/messages/open_test.rb", "test/unit/messages/route_refresh_test.rb", "test/unit/messages/update_test.rb", "test/unit/neighbor", "test/unit/neighbor/add_path_cap_test.rb", "test/unit/neighbor/neighbor_test.rb", "test/unit/nlris", "test/unit/nlris/inet_test.rb", "test/unit/nlris/label_test.rb", "test/unit/nlris/labeled_test.rb", "test/unit/nlris/nlri_test.rb", "test/unit/nlris/nsap_test.rb", "test/unit/nlris/prefix_test.rb", "test/unit/nlris/rd_test.rb", "test/unit/nlris/vpn_test.rb", "test/unit/optional_parameters", "test/unit/optional_parameters/add_path_test.rb", "test/unit/optional_parameters/as4_test.rb", "test/unit/optional_parameters/capability_test.rb", "test/unit/optional_parameters/dynamic_test.rb", "test/unit/optional_parameters/graceful_restart_test.rb", "test/unit/optional_parameters/mbgp_test.rb", "test/unit/optional_parameters/optional_parameter_test.rb", "test/unit/optional_parameters/orf_test.rb", "test/unit/optional_parameters/route_refresh_test.rb", "test/unit/orfs", "test/unit/orfs/prefix_orf_test.rb", "test/unit/path_attributes", "test/unit/path_attributes/aggregator_test.rb", "test/unit/path_attributes/aigp_test.rb", "test/unit/path_attributes/as_path_test.rb", "test/unit/path_attributes/atomic_aggregate_test.rb", "test/unit/path_attributes/attribute_test.rb", "test/unit/path_attributes/cluster_list_test.rb", "test/unit/path_attributes/communities_test.rb", "test/unit/path_attributes/extended_communities_test.rb", "test/unit/path_attributes/extended_community_test.rb", "test/unit/path_attributes/local_pref_test.rb", "test/unit/path_attributes/mp_reach_test.rb", "test/unit/path_attributes/mp_unreach_test.rb", "test/unit/path_attributes/multi_exit_disc_test.rb", "test/unit/path_attributes/next_hop_test.rb", "test/unit/path_attributes/origin_test.rb", "test/unit/path_attributes/originator_id_test.rb", "test/unit/path_attributes/path_attribute_test.rb", "test/unit/path_attributes/tunnel_encapsulation_test (Jean-Michel's Laptop's conflicted copy 2011-11-02).rb"]
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

data/test/unit/messages/update_test.rb

@@ -51,12 +51,12 @@ class Update_Test < Test::Unit::TestCase
       :path_attributes=> {
         :origin=>:incomplete,
         :as_path=>{},
-        :multi_exit_disc=>0,
+        :med=>0,
         :local_pref=>100,
         :communities=>["10283:20103"],
-        :route_target=>[10283, 30000],
-        :cluster_ids=>["0.0.0.1"],
-        :origin_id=>"81.52.17.128",
+        :extended_communities=>[{:route_target=>[10283, 30000]}],
+        :cluster_list=>["0.0.0.1"],
+        :originator_id=>"81.52.17.128",
         :mp_reach=> {
           :safi=>128,
           :afi=>1,
@@ -66,8 +66,15 @@ class Update_Test < Test::Unit::TestCase
       }
     }
   
+    assert_equal(h[:path_attributes][:originator_id], m.to_hash[:path_attributes][:originator_id])
+    assert_equal(h[:path_attributes][:as_path], m.to_hash[:path_attributes][:as_path])
+    assert_equal(h[:path_attributes][:multi_exit_disc], m.to_hash[:path_attributes][:multi_exit_disc])
+    assert_equal(h[:path_attributes][:local_pref], m.to_hash[:path_attributes][:local_pref])
+    assert_equal(h[:path_attributes][:originator_id], m.to_hash[:path_attributes][:originator_id])
+    assert_equal(h[:path_attributes][:mp_unreach], m.to_hash[:path_attributes][:mp_unreach])
+    assert_equal(h[:path_attributes], m.to_hash[:path_attributes])
     assert_equal(h, m.to_hash)
-
+  
     s = 'ffffffffffffffffffffffffffffffff0050020000002f40010101400304c0a80105800404000000644005040000006440020402010064c0080c051f00010137003b0af50040200a0a0a0a2020202020'
     m = Message.factory([s].pack('H*'))
     assert_equal(Update, m.class)
@@ -132,6 +139,20 @@ class Update_Test < Test::Unit::TestCase
     assert_equal 2, an_update.nlri.size
     an_update << Nlri.new('21.0.0.0/11', '22.0.0.0/22')
     assert_equal 4, an_update.nlri.size
+    
+    h = {
+      :path_attributes=> {
+        :multi_exit_disc=>100, 
+        :local_pref=>113, 
+        :next_hop=>"10.0.0.1", 
+        :origin=>:egp
+      }, 
+      :nlris=> ["77.0.0.0/17", "88.0.0.0/18", "21.0.0.0/11", "22.0.0.0/22"]
+    }
+
+    upd = Update.new h
+    assert_equal(0, an_update.path_attribute <=> upd.path_attribute)
+    
   end
 
   def test_factory_to_build_update_with_session_info
@@ -237,7 +258,7 @@ class Update_Test < Test::Unit::TestCase
     h = {
       :path_attributes=>{
         :as_path=>{:sequence=>[100]},
-        :multi_exit_disc=>20,
+        :med=>20,
         :mp_reach=>{
           :nexthop=>["10.0.0.1"],
           :safi=>128,
@@ -307,7 +328,7 @@ class Update_Test < Test::Unit::TestCase
     h = {
       :path_attributes=>{
         :as_path=>{}, 
-        :multi_exit_disc=>0, 
+        :med=>0, 
         :mp_reach=>{
           :nexthop=>["1.1.1.1"], 
           :safi=>128, 
@@ -316,10 +337,14 @@ class Update_Test < Test::Unit::TestCase
         }, 
         :local_pref=>1, 
         :origin=>:egp, 
-        :route_target=>[4, 1]
+        :extended_communities=>[{:route_target=>[4, 1] }]
       }
     }
     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(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
   
   def test_factory_to_build_a_withdrawn_update_for_inet_mpls_vpn_unicast_with_path_id
@@ -342,6 +367,102 @@ class Update_Test < Test::Unit::TestCase
       }
     }
     assert_equal(h, upd.to_hash)
+    upd2 = Update.new upd.to_hash
+    assert_equal(upd2.to_shex, upd.to_shex)
   end
+  
+  def test_to_hash
+    h = {:nlris=>
+      ["59.88.128.0/18",
+        "59.88.192.0/18",
+        "59.89.0.0/18",
+        "59.89.192.0/18",
+        "59.90.0.0/18",
+        "59.90.64.0/18",
+        "59.90.128.0/18",
+        "59.90.192.0/18",
+        "59.91.192.0/18",
+        "59.93.128.0/18",
+        "59.93.192.0/18",
+        "59.94.0.0/18",
+        "59.94.64.0/18",
+        "59.94.128.0/18",
+        "59.94.192.0/18",
+        "59.95.0.0/18",
+        "59.95.128.0/18",
+        "59.96.128.0/18",
+        "59.96.192.0/18",
+        "59.97.128.0/18",
+        "59.97.192.0/18",
+        "59.98.192.0/18",
+        "59.99.0.0/18",
+        "59.99.64.0/18",
+        "117.197.0.0/18",
+        "117.197.64.0/18",
+        "117.197.128.0/18",
+        "117.198.128.0/18",
+        "117.198.192.0/18",
+        "117.199.64.0/18",
+        "117.199.128.0/18",
+        "117.199.192.0/18",
+        "117.200.0.0/18",
+        "117.200.64.0/18",
+        "117.201.0.0/18",
+        "117.201.64.0/18",
+        "117.202.192.0/18",
+        "117.203.0.0/18",
+        "117.203.128.0/18",
+        "117.203.192.0/18",
+        "117.205.0.0/18",
+        "117.205.64.0/18",
+        "117.205.192.0/18",
+        "117.206.128.0/18",
+        "117.206.192.0/18",
+        "117.207.0.0/18",
+        "117.207.128.0/18",
+        "117.209.192.0/18",
+        "117.210.0.0/18",
+        "117.210.64.0/18",
+        "117.210.128.0/18",
+        "117.210.192.0/18",
+        "117.212.0.0/18",
+        "117.212.64.0/18",
+        "117.214.0.0/18",
+        "117.214.128.0/18",
+        "117.214.192.0/18",
+        "117.218.0.0/18",
+        "117.239.0.0/18",
+        "117.239.64.0/18",
+        "117.239.128.0/18",
+        "117.239.192.0/18",
+        "117.241.0.0/18",
+        "117.241.64.0/18",
+        "117.241.128.0/18",
+        "117.241.192.0/18",
+        "117.242.0.0/18",
+        "117.242.64.0/18",
+        "117.242.128.0/18",
+        "117.242.192.0/18",
+        "210.212.0.0/18",
+        "210.212.64.0/18",
+        "210.212.128.0/18",
+        "210.212.192.0/18",
+        "218.248.0.0/18",
+        "218.248.128.0/18"],
+        :path_attributes=> {
+          :communities=>["28289:65500"],
+          :origin=>:igp,
+          :as_path=>{:sequence=>[28289, 53131, 16735, 3549, 9829, 9829, 9829]},
+          :next_hop=>"187.121.193.33"
+        }
+      }
+       u = Update.new h       
+       assert_equal(h, u.to_hash)
+              
+       # s = "ffffffffffffffffffffffffffffffff016c02000000254001010040021002076e81cf8b415f0ddd266526652665400304bb79c121c008046e81ffdc123b5880123b58c0123b5900123b59c0123b5a00123b5a40123b5a80123b5ac0123b5bc0123b5d80123b5dc0123b5e00123b5e40123b5e80123b5ec0123b5f00123b5f80123b6080123b60c0123b6180123b61c0123b62c0123b6300123b63401275c5001275c5401275c5801275c6801275c6c01275c7401275c7801275c7c01275c8001275c8401275c9001275c9401275cac01275cb001275cb801275cbc01275cd001275cd401275cdc01275ce801275cec01275cf001275cf801275d1c01275d2001275d2401275d2801275d2c01275d4001275d4401275d6001275d6801275d6c01275da001275ef001275ef401275ef801275efc01275f1001275f1401275f1801275f1c01275f2001275f2401275f2801275f2c012d2d40012d2d44012d2d48012d2d4c012daf80012daf880" 
+       # assert_equal(s, u.to_shex)
+  end
+  
+  
 
 end

data/test/unit/path_attributes/aggregator_test.rb

@@ -67,6 +67,6 @@ class Aggregator_Test < Test::Unit::TestCase
     ag1 = Aggregator.new('10.0.0.1', 100)
     ag2 = Aggregator.new :asn=> 100, :address=> '10.0.0.1'
     assert_equal(ag1.encode,ag2.encode)
-    assert_equal({:asn=>100, :address=>"10.0.0.1"}, ag2.to_hash)
+    assert_equal({:asn=>100, :address=>"10.0.0.1"}, ag2.to_hash[:aggregator])
   end
 end

data/test/unit/path_attributes/aigp_test.rb

@@ -19,11 +19,11 @@ class TestAigp < Test::Unit::TestCase
   end
   def test_2
     assert Aigp.new_hash
-    assert Aigp.new_hash :metric=> 0x1f2f3f4f5f6f7f8f
+    assert Aigp.new_hash :aigp=> 0x1f2f3f4f5f6f7f8f
     m1 = Aigp.new 0x1f2f3f4f5f6f7f8f
-    m2 = Aigp.new_hash :metric=> 0x1f2f3f4f5f6f7f8f
+    m2 = Aigp.new_hash :aigp=> 0x1f2f3f4f5f6f7f8f
     assert_equal(m1.encode, m2.encode)
-    assert_equal({:metric=>2247084349217275791}, m2.to_hash)
+    assert_equal({:aigp=>2247084349217275791}, m2.to_hash)
   end
 end
 

data/test/unit/path_attributes/cluster_list_test.rb

@@ -38,7 +38,7 @@ class Cluster_list_Test < Test::Unit::TestCase
   end
   def test_2
     cids = ['1.1.1.1', '2.2.2.2', '3.3.3.3']
-    clist1 = Cluster_list.new_hash :cluster_ids=> cids
-    assert_equal( cids, clist1.to_hash[:cluster_ids])
+    clist1 = Cluster_list.new :cluster_list=> cids
+    assert_equal( cids, clist1.to_hash[:cluster_list])
   end
 end

data/test/unit/path_attributes/extended_communities_test.rb

@@ -67,7 +67,10 @@ class Extended_communitiesTest < Test::Unit::TestCase
     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(100, ec.to_hash[:color]) 
+    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)
   end
   def test_sort
     ec = Extended_communities.new
@@ -137,7 +140,28 @@ class Extended_communitiesTest < Test::Unit::TestCase
     assert_equal(0, ec <=> ec2)
     assert(! ec.eql?(ec2))
   end
+  def test_getters
+    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('8.0.1.1',10))
+      c.add(Route_target.new('7.0.1.1',8))
+      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(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('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)
+  end
     
 end
-
-#MiniTest::Unit.autorun

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], :encapsulation => :ipip ],
                             :aggregator=> { :address=>'1.1.1.1', :asn=>100 },
                             :originator_id=> '2.2.2.2',
                             :as4_aggregator=> { :asn=> 200, :address=> '4.4.4.4' },
@@ -204,6 +204,31 @@ class Path_attribute_Test < Test::Unit::TestCase # :nodoc:
     
   end
   
+  def test_9
+    pa1 = Path_attribute.new { |p|  
+      p << Multi_exit_disc.new(222)
+      p << Next_hop.new('1.1.1.1')
+      p << Local_pref.new(333)
+      p << As_path.new( :set=> [1,2,3,4], :sequence=> [11,12,13])
+      p << Origin.new(1)
+    }
+    pa2 = Path_attribute.new { |p|  
+      p << Next_hop.new('1.1.1.1')
+      p << Origin.new(1)
+      p << Local_pref.new(333)
+      p << As_path.new(:sequence=> [11,12,14], :set=> [1,2,3,4])
+      p << Multi_exit_disc.new(222)
+    }
+    assert_not_equal(pa1.to_shex,pa2.to_shex)
+    assert_equal(pa1.sort.to_shex, pa2.sort.to_shex)
+    assert_equal(0, pa1 <=> pa2)
+    pa1.add(Communities.new("1:1"))
+    assert_equal(1, pa1 <=> pa2)
+    pa2.insert(Communities.new("1:1"))
+    assert_equal(0, pa1 <=> pa2)
+  end
+    
+  
   def test_path_attribute_path_id_true_and_as4byte_false
     path_attr = Path_attribute.new
     path_attr.insert(
@@ -223,6 +248,63 @@ class Path_attribute_Test < Test::Unit::TestCase # :nodoc:
     # 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
   
+  def test_hash
+    
+    h = {
+      :aigp=> 0x1f2f3f4f5f6f7f8f,
+      :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]}], 
+      :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]}, 
+          {:label=>3382, :prefix=>"172.33.169.92/32", :rd=>[1311, 80037224]}, 
+          {:label=>1452, :prefix=>"10.46.52.31/32",   :rd=>[1311, 3117824]}, 
+          {:label=>3785, :prefix=>"172.41.96.104/32", :rd=>[1311, 45657424]}, 
+          {:label=>5228, :prefix=>"10.46.53.69/32",   :rd=>[1311, 59407624]}, 
+          {:label=>5141, :prefix=>"172.21.55.36/32",  :rd=>[1311, 321617824]}, 
+          {:label=>3724, :prefix=>"10.99.25.81/32",   :rd=>[1311, 311197824]}, 
+          {:label=>2281, :prefix=>"10.35.9.169/32",   :rd=>[1311, 321147824]}, 
+          {:label=>4615, :prefix=>"10.65.128.200/32", :rd=>[1311, 6627884]}, 
+          {:label=>3404, :prefix=>"172.29.96.8/32",   :rd=>[1311, 45657824]}, 
+          {:label=>3767, :prefix=>"10.32.19.165/32",  :rd=>[1311, 44657824]}, 
+          {:label=>3451, :prefix=>"10.14.186.28/32",  :rd=>[1311, 45657824]}, 
+          {:label=>3027, :prefix=>"10.95.176.91/32",  :rd=>[1311, 371197824]}, 
+          {:label=>5034, :prefix=>"10.24.176.99/32",  :rd=>[1311, 321197824]}, 
+          {:label=>3565, :prefix=>"10.72.83.239/32",  :rd=>[1311, 311197824]}, 
+          {:label=>3551, :prefix=>"10.45.142.161/32", :rd=>[1311, 321157824]}, 
+          {:label=>5238, :prefix=>"10.32.83.219/32",  :rd=>[1311, 351177824]}, 
+          {:label=>5223, :prefix=>"10.13.142.117/32", :rd=>[1311, 321197824]}, 
+          {:label=>3360, :prefix=>"172.50.34.141/32", :rd=>[1311, 348987824]},  
+          {:label=>3579, :prefix=>"10.26.42.36/32",   :rd=>[1311, 325697824]}, 
+          {:label=>4118, :prefix=>"10.76.42.34/32",   :rd=>[1311, 347517824]}, 
+          {:label=>3971, :prefix=>"172.21.192.24/32", :rd=>[1311, 86627824]},
+          {:label=>4223, :prefix=>"10.12.209.131/32", :rd=>[1311, 42655824]}, 
+          {:label=>2241, :prefix=>"10.34.186.201/32", :rd=>[1311, 42656824]},
+        ], 
+      }
+    }
+    
+    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])
+    assert_equal(h[:communities], Path_attribute.new(h).to_hash[:communities])
+    assert_equal(h[:cluster_list], Path_attribute.new(h).to_hash[:cluster_list])
+    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
+      
 end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bgp4r
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-05 00:00:00.000000000Z
+date: 2012-02-13 00:00:00.000000000 Z
 dependencies: []
 description: BGP4R is a BGP-4 ruby library to create,  send, and receive  BGP messages
   in an  object oriented manner
@@ -77,15 +77,12 @@ files:
 - bgp/path_attributes/origin.rb
 - bgp/path_attributes/originator_id.rb
 - bgp/path_attributes/path_attribute.rb
-- bgp/path_attributes/tlvs/tlv.rb
 - bgp4r.gemspec
 - bgp4r.rb
 - examples/a_live_feed
 - examples/routegen
 - examples/routegen.yml
 - examples/simple.rb
-- examples/test.rb
-- examples/test2.rb
 - examples/unit-testing/malformed_update_test.rb
 - examples/unit-testing/no_export_test.rb
 - examples/unit-testing/prepend_aspath_test.rb
@@ -141,7 +138,6 @@ files:
 - test/unit/path_attributes/origin_test.rb
 - test/unit/path_attributes/originator_id_test.rb
 - test/unit/path_attributes/path_attribute_test.rb
-- test/unit/path_attributes/tlvs/tlv_test.rb
 - test/unit/path_attributes/tunnel_encapsulation_test (Jean-Michel's Laptop's conflicted
   copy 2011-11-02).rb
 homepage: http://github.com/jesnault/bgp4r/tree/master
@@ -164,7 +160,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: bgp4r
-rubygems_version: 1.8.10
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: A BGP-4 Ruby Library
@@ -220,6 +216,5 @@ test_files:
 - test/unit/path_attributes/origin_test.rb
 - test/unit/path_attributes/originator_id_test.rb
 - test/unit/path_attributes/path_attribute_test.rb
-- test/unit/path_attributes/tlvs/tlv_test.rb
 - test/unit/path_attributes/tunnel_encapsulation_test (Jean-Michel's Laptop's conflicted
   copy 2011-11-02).rb

data/bgp/path_attributes/tlvs/tlv.rb

@@ -1,18 +0,0 @@
-module BGP
-  module TLV
-    attr_accessor :tlv_type
-    def encode(value)
-      p 'IN ENCODE TLV'
-      [@tlv_type, value.size, value].pack('nna*')
-    end
-  end
-  module STLV
-    attr_accessor :stlv_type
-    def encode(value)
-       [@stlv_type, value.size, value].pack('CCa*')
-    end
-  end
-end
-
-load "../../../test/unit/path_attributes/tlvs/#{ File.basename($0.gsub(/.rb/,'_test.rb'))}" if __FILE__ == $0
-

data/examples/test.rb

@@ -1,15 +0,0 @@
-require 'bgp4r'
-include BGP
-Log.create
-n = Neighbor.new 4, 1, 180, '1.1.1.1','127.0.0.1', '127.0.0.1'
-# n.start :auto_retry => true
-n.start :port=> 8090
-
-sleep(200)
-
-
-__END__
-
-
-@c = Neighbor.new(4, 100, 180, '0.0.0.2', '127.0.0.1', '127.0.0.1')
-@c.add_cap add_path_cap2

data/examples/test2.rb

@@ -1,116 +0,0 @@
-
-require 'rubygems'
-require 'eventmachine'
-require 'bgp4r'
-
-
-include BGP
-
-pa = Path_attribute.new(
-  Origin.new,
-  Next_hop.new('10.0.0.1'),
-  Local_pref.new(300),
-  Communities.new('10:1 10:2 10:3'),
-  As_path.new('100 200 300 400')
-)
-
-times = 133
-pack=13
-nlri = IPAddr.new '11.0.0.1/24'
-
-nlris = Nlri.new
-
-updates = Fiber.new do
-  (1..times.to_i).each do |n|
-    nlris << (nlri ^ n)
-    next unless (n % pack) == 0 or (n == times)
-    Fiber.yield Update.new(pa, nlris)
-    nlris = Nlri.new
-  end
-end
-
-p updates.resume
-p updates.resume
-p updates.resume
-
-
-
-
-
-__END__
-
-
-pa = Path_attribute.new(
-  Origin.new(@origin),
-  Next_hop.new(@nexthop),
-  Local_pref.new(@local_pref),
-  Communities.new(*(@communities.split.map { |com| com.to_i})),
-  As_path.new(*(@as_path.split.map { |as| as.to_i}))
-)
-
-
-nlris = Nlri.new
-(1..@times.to_i).each do |n|
-  nlris << (@nlri ^ n)
-  next unless (n % @pack) == 0 or (n == @times)
-  neighbor.send_message Update.new(pa, nlris)
-  nlris = Nlri.new
-end
-
-words = Fiber.new do File.foreach("testfile") do |line|
-line.scan(/\w+/) do |word| Fiber.yield word.downcase
-end end
-end
-Prepared exclusively for Jean-Michel Esnault
-FIBERS 176
-counts = Hash.new(0) while word = words.resume
-  counts[word] += 1
-end
-
-
-
-
-__END__
-
-
-
-
-Thread.abort_on_exception = true
-
-Log.create
-
-class Session
-  def initialize
-  end
-  def start(arg={})
-    options = {:duration=> 120, :as=> 1, :holdtime=> 180, :id=> '2.2.2.2', :peer=> '127.0.0.1'}.merge(arg)
-    
-    Thread.new do 
-      EM.run do
-        @c = EM.connect(options[:peer], 8090, 
-                BGP::ConnectionHandler, 4, 
-                options[:as], options[:holdtime], options[:id], options[:peer])
-        @c.add_observer(self)
-      end
-    end
-  end
-  
-  def update(*args)
-  end
-  
-  def stop
-    EM.stop
-  end
-end
-
-n = Session.new
-n.start :duration=> 120, :as=> 1, :holdtime=> 10, :id=> '2.2.2.2', :peer=> '127.0.0.1'
-
-p 'HERE ABOUT TO SLEEP'
-sleep(20)
-p $c
-p "ABOUT TO SHUT DOWN EM"
-n.stop
-
-
-__END__

data/test/unit/path_attributes/tlvs/tlv_test.rb

@@ -1,33 +0,0 @@
-require "test/unit"
-
-require "bgp/path_attributes/tlvs/tlv"
-require 'bgp/path_attributes/attribute'
-
-module BGP
-  class MyAttr < Attr
-    include TLV
-    include STLV
-    def initialize(value)
-      @flags, @type = OPTIONAL_NON_TRANSITIVE, 55
-      @value = value
-      @tlv_type=1
-      @stlv_type=2
-    end
-    def encode
-      super(@value)
-    end
-  end
-end
-
-class TestBgpPathAttributesTlvsTlv < Test::Unit::TestCase
-  include BGP
-  def test_1
-    attr = MyAttr.new([0xdeadbeef, 0xdeadbeef, 0xdeadbeef, 0xdeadbeef].pack('N*'))
-    assert_equal('803716 0001 0012 02 10 deadbeef deadbeef deadbeef deadbeef'.split.join, attr.to_shex)
-    assert_equal(2, attr.stlv_type)
-    assert_equal(1, attr.tlv_type)
-  end
-end
-
-
-