net-connector 0.20.0 → 0.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f04a6944e8273ad350cc4ec2af6f7c1673d40d0bd75a52ee4068c0c5086047c
-  data.tar.gz: c7cb714084fdc5edaca889c3261af88398167db99d181bbfb6dc0db596c45325
+  metadata.gz: 7e379dbe5598c3f170fdcfbc123103c4eb178941508e8fa0df12e2b8043fdf93
+  data.tar.gz: 3ad7934b5aa811031ea1a1283c67743494795472a0361207869d6b16d03cfda0
 SHA512:
-  metadata.gz: f044f6b70db2ca9129878e7e7cc5d8e1ad4ec8e0984c7977ac266f3d86731712be06ac6c97ce86ff5e203c72bc11ea7b19460993fceb145f02350de568961520
-  data.tar.gz: 03e67f261dcbe821f673bee9ac5df06bd82371e23f7effdac6fc2f39ac29e487f2c946591d749d8cff2060f7517240255cebcb851c2e5f74b32cbc48ff1bdd63
+  metadata.gz: 07e68bd1ebd341839e6c45db6e821e76f8371c7b5d2e135a064925be5ca6f0d06189cf22be97fd2d8ea676fc542216dc67bfeff88fd06043b310fe72e642b67b
+  data.tar.gz: 96400e19508ca207d0e4aeccb0dc5aad7529bafebb0e2a4723a10e9d3907e07c5ba9f722afaabf5d78f257184f2b7f27aab82da91c7e64f60ca005188d1aa445

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+## 0.21.0 - 2026-10-30
+
+- Rename neighbor fields to `remote_name`, `remote_interface` and `remote_chassis_id`, retaining `local_interface`. Collection progress reads schema 4 `target`; require ctx_cli 0.5. No legacy accessor aliases.
+
 ## 0.20.0 - 2026-10-29
 
 - Require the latest stable TextFSM 0.5.1, align the minimum dependency matrix, and verify JSON 3 with its original published package instead of a source metadata patch.

data/README.md

@@ -85,3 +85,7 @@ credentials = Net::Connector::Credentials.new(env: ENV).resolve(platform: :cisco
 Catalog owns inventory reading, normalization, duplicate marking and cache status (`#status`). It does not resolve device credentials, log into devices or create operation reports. Pass one policy snapshot throughout a run. Fleet delegates to Catalog and retains operation orchestration.
 
 Credentials reads the injected environment on every `resolve`; it returns an independent frozen hash, or nil when no username is available. Platform-specific `NC_<PLATFORM>_USERNAME`, `_PASSWORD`, and `_ENABLE_PASSWORD` override `NC_DEVICE_USERNAME`, `NC_DEVICE_PASSWORD`, and `NC_ENABLE_PASSWORD` respectively. Blank values fall back. Secrets are never cached or included in object inspection.
+
+## Domain contract migration (2026-10-30)
+
+Rename neighbor fields to `remote_name`, `remote_interface` and `remote_chassis_id`, retaining `local_interface`. Collection progress reads schema 4 `target`; require ctx_cli 0.5. No legacy accessor aliases. See the [schema 4 migration and module contracts](https://github.com/gatework/ctx_runner/blob/main/docs/contracts-2026-10-30.md). Regenerate old collection reports and change plans; changing only their version number is not supported.

data/lib/net/connector/collect/progress.rb

@@ -27,7 +27,7 @@ module Net
                     when "partial" then "Partially complete (#{code})"
                     else "Incomplete (#{code})"
                     end
-          super(host: result.fetch("device").fetch("host"), success: status == "complete",
+          super(host: result.fetch("target").fetch("host"), success: status == "complete",
                 duration_ms: result.fetch("duration_ms"), message: message, error_code: code&.to_sym)
         end
 

data/lib/net/connector/device/interfaces/audit.rb

@@ -64,7 +64,7 @@ module Net
         def inspect_interface(interface, peers)
           peer = peers.first
           current = @descriptions[interface]
-          row = { interface: peer.local_interface, neighbor: peer.neighbor_name, port: peer.neighbor_interface,
+          row = { interface: peer.local_interface, neighbor: peer.remote_name, port: peer.remote_interface,
                   current: current, expected: nil, status: :unverified }
           @comparisons << row
           if peers.size != 1
@@ -78,7 +78,7 @@ module Net
           local = @strategy.configuration_interface(peer.local_interface)
           Description.validate_interface!(local)
           row.merge!(expected: proposed, status: compare_status(current, proposed, peer))
-          @evidence[interface] = [peer.neighbor_name, peer.neighbor_interface, current]
+          @evidence[interface] = [peer.remote_name, peer.remote_interface, current]
           return if row[:status] == :matches
 
           @changes << Change.new(interface: local, old_description: current, new_description: proposed, neighbor: peer)

data/lib/net/connector/device/interfaces/description.rb

@@ -10,11 +10,11 @@ module Net
         # 将邻居名称和接口拼成默认描述；统一邻居接口简称，原始发现记录保持不变。
         def self.format(neighbor, abbreviate: true, lowercase: false)
           port = if abbreviate
-                   Name.short(neighbor.neighbor_interface, lowercase: lowercase)
+                   Name.short(neighbor.remote_interface, lowercase: lowercase)
                  else
-                   lowercase ? neighbor.neighbor_interface.downcase : neighbor.neighbor_interface
+                   lowercase ? neighbor.remote_interface.downcase : neighbor.remote_interface
                  end
-          validate!("To_#{neighbor.neighbor_name.tr(" ", "_")}_#{port.tr(" ", "_")}")
+          validate!("To_#{neighbor.remote_name.tr(" ", "_")}_#{port.tr(" ", "_")}")
         end
 
         # 保留语义相同的旧描述；只归一末尾已知接口别名和大小写，不模糊匹配名称或端口编号。

data/lib/net/connector/device/interfaces/neighbor.rb

@@ -4,11 +4,11 @@ module Net
   module Connector
     class Interfaces
       # 邻居身份拥有独立字符串，格式化回调不能改写发现证据。
-      Neighbor = Data.define(:local_interface, :neighbor_name, :neighbor_interface, :chassis_id, :protocol) do
+      Neighbor = Data.define(:local_interface, :remote_name, :remote_interface, :remote_chassis_id, :protocol) do
         # 复制并冻结本地端口、邻居名称、远端端口及发现协议。
-        def initialize(local_interface:, neighbor_name:, neighbor_interface:, chassis_id:, protocol:)
-          fields = { local_interface: local_interface, neighbor_name: neighbor_name,
-                     neighbor_interface: neighbor_interface, chassis_id: chassis_id }
+        def initialize(local_interface:, remote_name:, remote_interface:, remote_chassis_id:, protocol:)
+          fields = { local_interface: local_interface, remote_name: remote_name,
+                     remote_interface: remote_interface, remote_chassis_id: remote_chassis_id }
           raise ArgumentError, "neighbor fields must be Strings" unless fields.values.all?(String)
           raise ArgumentError, "neighbor protocol must be a Symbol" unless protocol.is_a?(Symbol)
 
@@ -18,8 +18,8 @@ module Net
         # 原始发现数据保留占位符；规划与下发重验共用身份校验，不能把未知名称写入描述。
         # MAC 是合法的 LLDP Port ID，不凭地址形状猜测设备角色，也不拿 chassis ID 补造名称。
         def identity_issue
-          return :unknown_neighbor_name if unknown_identity?(neighbor_name)
-          return :unknown_neighbor_interface if unknown_identity?(neighbor_interface)
+          return :unknown_neighbor_name if unknown_identity?(remote_name)
+          return :unknown_neighbor_interface if unknown_identity?(remote_interface)
 
           nil
         end

data/lib/net/connector/device/interfaces.rb

@@ -88,9 +88,9 @@ module Net
 
         rows.map do |row|
           Neighbor.new(local_interface: row.fetch("LOCAL_INTERFACE").strip.freeze,
-                       neighbor_name: row.fetch("NEIGHBOR_NAME", "").strip.freeze,
-                       neighbor_interface: row.fetch("NEIGHBOR_INTERFACE").strip.freeze,
-                       chassis_id: row.fetch("CHASSIS_ID", "").strip.freeze,
+                       remote_name: row.fetch("NEIGHBOR_NAME", "").strip.freeze,
+                       remote_interface: row.fetch("NEIGHBOR_INTERFACE").strip.freeze,
+                       remote_chassis_id: row.fetch("CHASSIS_ID", "").strip.freeze,
                        protocol: @strategy.protocol).freeze
         end
       end
@@ -272,7 +272,7 @@ module Net
         plan.changes.each do |change|
           Description.validate!(change.new_description)
           unless evidence.fetch(@strategy.interface_key(change.interface)) ==
-                 [change.neighbor.neighbor_name, change.neighbor.neighbor_interface, change.old_description]
+                 [change.neighbor.remote_name, change.neighbor.remote_interface, change.old_description]
             raise ArgumentError, "plan changes do not match its discovery evidence"
           end
         end
@@ -319,7 +319,7 @@ module Net
 
         interfaces.transform_values do |peers|
           peer = peers.fetch(0)
-          [peer.neighbor_name, peer.neighbor_interface, current.fetch(@strategy.interface_key(peer.local_interface))].freeze
+          [peer.remote_name, peer.remote_interface, current.fetch(@strategy.interface_key(peer.local_interface))].freeze
         end.freeze
       end
 

data/lib/net/connector/netdisco/topology/options.rb

@@ -51,10 +51,10 @@ module Net
 
           # 使用当前模板和端口展示策略生成缺失或确需修正的目标描述。
           def description_for(neighbor)
-            port = neighbor.neighbor_interface
+            port = neighbor.remote_interface
             port = Net::Connector::Interfaces::Name.short(port) if abbreviate_ports
             port = port.downcase if lowercase_ports
-            format(neighbor: neighbor.neighbor_name, port: port)
+            format(neighbor: neighbor.remote_name, port: port)
           end
 
           # 仅显式声明的旧名称前缀可保留；不把未知名称、包含匹配或不同编号当作同一邻居。
@@ -63,7 +63,7 @@ module Net
             return true if comparison.equivalent?(current, expected)
 
             neighbor_name_prefixes.any? do |prefix|
-              variant = neighbor.with(neighbor_name: prefix + neighbor.neighbor_name)
+              variant = neighbor.with(remote_name: prefix + neighbor.remote_name)
               comparison.equivalent?(current, description_for(variant))
             end
           end

data/lib/net/connector/version.rb

@@ -3,6 +3,6 @@
 module Net
   module Connector
     # gemspec、CLI 与发布工具共用此版本，运行时读取不触发设备依赖加载。
-    VERSION = "0.20.0"
+    VERSION = "0.21.0"
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: net-connector
 version: !ruby/object:Gem::Version
-  version: 0.20.0
+  version: 0.21.0
 platform: ruby
 authors:
 - net-connector contributors
 bindir: bin
 cert_chain: []
-date: 2026-10-29 00:00:00.000000000 Z
+date: 2026-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ctx_cli
@@ -15,20 +15,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.5.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.5.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: expect-pty
   requirement: !ruby/object:Gem::Requirement