vxlan 0.2.0 → 0.2.2

data/lib/vxlan/configuration_review.rb

@@ -15,6 +15,7 @@ module Vxlan
 
       nve_members_by_vni = @configuration.fetch(:nve).fetch(:members, {})
       vlan_mappings_by_vni = @configuration.fetch(:vlan_vnis).group_by { |_vlan, vni| vni }
+      vrf_vnis = @configuration.fetch(:vrfs).values.filter_map { |settings| settings[:vni] }.to_set
       evpn_vnis = @configuration.fetch(:evpn)
       findings = []
       vlan_mappings_by_vni.each do |vni, entries|
@@ -23,14 +24,24 @@ module Vxlan
         findings << { code: :vlan_vni_without_nve, vni: vni, vlan_ids: entries.map(&:first).sort }
       end
       nve_members_by_vni.each do |vni, settings|
-        next if settings[:associate_vrf]
+        if settings[:associate_vrf]
+          findings << { code: :nve_l3_without_vrf, vni: vni } unless vrf_vnis.include?(vni)
+          next
+        end
 
         findings << { code: :nve_l2_without_vlan, vni: vni } unless vlan_mappings_by_vni.key?(vni)
         if @configuration[:nv_overlay_evpn] && !evpn_vnis.key?(vni)
           findings << { code: :nve_l2_without_evpn, vni: vni }
         end
       end
-      evpn_vnis.each_key { |vni| findings << { code: :evpn_vni_without_nve, vni: vni } unless nve_members_by_vni.key?(vni) }
+      evpn_vnis.each do |vni, settings|
+        member = nve_members_by_vni[vni]
+        if !member
+          findings << { code: :evpn_vni_without_nve, vni: vni }
+        elsif (settings[:type] == "l3") != member[:associate_vrf]
+          findings << { code: :vni_layer_conflict, vni: vni, evpn_type: settings[:type] }
+        end
+      end
       @configuration.fetch(:vrfs).each do |name, settings|
         next unless settings[:vni]
         member = nve_members_by_vni[settings[:vni]]

data/lib/vxlan/prefix_list_references.rb

@@ -14,7 +14,7 @@ module Vxlan
     def call(address_family: "ipv4")
       raise ArgumentError, "Unsupported address family" unless %w[ipv4 ipv6].include?(address_family)
 
-      bindings = route_map_bindings.transform_values(&:uniq)
+      consumers_by_route_map = route_map_consumers.transform_values(&:uniq)
       references = @configuration.fetch(:route_maps).each_with_object({}) do |(name, entries), result|
         entries.sort_by { |entry| entry.fetch(:sequence) }.each do |entry|
           matches = entry.fetch(:prefix_list_matches) do
@@ -22,7 +22,7 @@ module Vxlan
           end
           matches.select { |match| match[:address_family] == address_family }.each do |match|
             route_map_reference = { type: "route_map", name: name, sequence: entry.fetch(:sequence), action: entry.fetch(:action),
-              bindings: bindings.fetch(name, []).dup }
+              bindings: consumers_by_route_map.fetch(name, []).dup }
             route_map_reference[:selector] = match[:selector] unless match[:selector] == "address"
             match.fetch(:names).uniq.each do |prefix_list|
               (result[prefix_list] ||= []) << route_map_reference
@@ -37,7 +37,7 @@ module Vxlan
     private
 
     # 关联关系保留协议、VRF、地址族及对等体，避免共享策略被混用。
-    def route_map_bindings
+    def route_map_consumers
       result = Hash.new { |hash, key| hash[key] = [] }
       bgp = @configuration.fetch(:bgp)
       { "default" => bgp }.merge(bgp.fetch(:vrfs, {})).each do |vrf, settings|

data/lib/vxlan/version.rb

@@ -2,5 +2,5 @@
 
 module Vxlan
   # 公开包版本，供 RubyGems 元数据和运行时调用方共用。
-  VERSION = "0.2.0"
+  VERSION = "0.2.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vxlan
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.2
 platform: ruby
 authors:
 - Gatework contributors
@@ -13,30 +13,30 @@ dependencies:
   name: ctx_parser
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: ctx_driver
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: digest
   requirement: !ruby/object:Gem::Requirement
@@ -81,6 +81,7 @@ files:
 - lib/vxlan.rb
 - lib/vxlan/bgp_neighbors.rb
 - lib/vxlan/cisco_nxos/configuration.rb
+- lib/vxlan/cisco_nxos/configuration_state.rb
 - lib/vxlan/cisco_nxos/document.rb
 - lib/vxlan/cisco_nxos/evpn_l2route.rb
 - lib/vxlan/cisco_nxos/parser.rb