net-connector 0.4.2 → 0.6.0

data/lib/net/connector/netdisco/settings.rb

@@ -63,6 +63,13 @@ module Net
 
         def client(policy: snapshot(mode: :inventory))
           options = policy.client_options
+          if policy.inventory_source == :postgres
+            connection = DatabaseClient::CONNECTION_ENV.each_with_object({}) do |(key, name), values|
+              item = secret_value(name)
+              values[key] = item if item
+            end
+            return DatabaseClient.new(connection_options: connection, **options)
+          end
           raise ArgumentError, "NETDISCO_URL is required" unless options.fetch(:url)
 
           authentication = if (token = secret_value("NETDISCO_API_KEY"))
@@ -73,9 +80,17 @@ module Net
           Client.new(**options, **authentication)
         end
 
-        # 原生客户端和 --show-config 共享同一预算、地址与 HTTP 策略校验。
+        def inventory_source
+          source = value("NETDISCO_SOURCE") || "http"
+          raise ArgumentError, "NETDISCO_SOURCE must be http or postgres" unless %w[http postgres].include?(source)
+
+          source.to_sym
+        end
+
+        # 原生客户端和 --show-config 共享预算校验；只验证所选来源的查询设置。
         def client_options
-          options = Client::DEFAULTS.to_h do |name, default|
+          defaults = inventory_source == :postgres ? DatabaseClient::DEFAULTS : Client::DEFAULTS
+          options = defaults.to_h do |name, default|
             key = "NETDISCO_#{name.to_s.upcase}"
             parsed = case name
                      when :inventory_timeout then number(key, default)
@@ -84,6 +99,13 @@ module Net
                      end
             [name, parsed]
           end
+          if inventory_source == :postgres
+            query = value("NETDISCO_QUERY") || (raise ArgumentError, "NETDISCO_QUERY is required for postgres")
+            return DatabaseClient.options(query: query, query_params: json("NETDISCO_QUERY_PARAMS", []), **options)
+          end
+          if value("NETDISCO_QUERY") || value("NETDISCO_QUERY_PARAMS")
+            raise ArgumentError, "SQL query settings require NETDISCO_SOURCE=postgres"
+          end
           options = Client.options(**options)
           url = value("NETDISCO_URL")
           Client.validate_url!(url, allow_insecure_http: options.fetch(:allow_insecure_http)) if url
@@ -164,12 +186,6 @@ module Net
           options.freeze
         end
 
-        # 兼容原入口；Fleet 传入本批策略，独立调用则读取当前策略和当前秘密。
-        def credentials_for(device, policy: snapshot(mode: :backup))
-          credentials = device_credentials_for(device)
-          policy.connection_options(device.vendor).merge(credentials) if credentials
-        end
-
         def device_credentials_for(device)
           prefix = "NET_CONNECTOR_#{device.vendor.to_s.upcase}_"
           username = secret_value(prefix + "USERNAME") || secret_value("NET_CONNECTOR_DEVICE_USERNAME")
@@ -195,7 +211,7 @@ module Net
 
         def config_hash
           {
-            netdisco: client_options,
+            netdisco: client_options.merge(source: inventory_source),
             backup: { directory: backup_directory, concurrency: concurrency, limit_per_vendor: limit_per_vendor },
             inventory: { include_hosts: list("NET_CONNECTOR_INCLUDE_HOSTS"),
                          exclude_hosts: list("NET_CONNECTOR_EXCLUDE_HOSTS"),
@@ -285,6 +301,7 @@ module Net
         end
 
         def required_secret(key) = secret_value(key) || (raise ArgumentError, "#{key} is required")
+
         def present?(value) = value.is_a?(String) && !value.strip.empty?
       end
     end

data/lib/net/connector/netdisco.rb

@@ -2,6 +2,7 @@
 
 require_relative "../connector"
 require_relative "netdisco/client"
+require_relative "netdisco/database_client"
 require_relative "netdisco/rules"
 require_relative "netdisco/device"
 require_relative "netdisco/config_file"

data/lib/net/connector/{operations → storage}/backup_lock.rb

@@ -7,7 +7,7 @@ module Net
   module Connector
     class BackupBusy < Error; end
 
-    module Operations
+    module Storage
       # 路径锁在设备采集之前取得；锁文件长期保留，避免等待者落在已经删除的 inode 上。
       class BackupLock
         STORAGE_KEY = :net_connector_backup_delegation
@@ -61,7 +61,7 @@ module Net
         end
 
         # 仅持有实际 flock 的同一 Fiber 可授权一次内层采集，避免把路径锁变成任意可重入锁。
-        def delegate
+        def with_delegated_lock
           raise ThreadError, "backup path delegation requires lock ownership" unless @owner == [Process.pid, Fiber.current]
 
           previous = Thread.current[STORAGE_KEY]

data/lib/net/connector/{operations → storage}/private_file.rb

@@ -4,7 +4,7 @@ require "tempfile"
 
 module Net
   module Connector
-    module Operations
+    module Storage
       # 文件同步和目录项同步分别记录；原子可见不等于断电后仍能恢复新目录项。
       module PrivateFile
         Receipt = Data.define(:path, :state, :phase) do
@@ -62,13 +62,8 @@ module Net
           [WriteError, PersistenceError, DirectorySyncUnsupported].any? { |type| error.instance_of?(type) }
         end
 
-        # 保留原路径返回值；失败时可从异常 receipt 判断目录项是否已经替换。
+        # 统一返回写入回执；失败时从异常 receipt 判断目录项是否已经替换。
         def self.write(path, contents)
-          write_receipt(path, contents)
-          path
-        end
-
-        def self.write_receipt(path, contents)
           raise ArgumentError, "path must be a nonempty String" unless path.is_a?(String) && !path.empty?
 
           receipt = Receipt.new(path: File.expand_path(path), state: :not_committed, phase: :resolve_parent)

data/lib/net/connector/{operations → storage}/safe_file.rb

@@ -4,7 +4,7 @@ require "digest"
 
 module Net
   module Connector
-    module Operations
+    module Storage
       # 对同一 FD 做类型检查和读取；NOFOLLOW 只保护最后一个路径分量，目录由调用方保护。
       module SafeFile
         Fingerprint = Data.define(:path, :sha256, :mode, :dev, :ino)

data/lib/net/connector/{operations → storage}/saved_config.rb

@@ -4,11 +4,10 @@ require "fileutils"
 require "ipaddr"
 require_relative "private_file"
 require_relative "safe_file"
-require_relative "saved_config/legacy_index"
 
 module Net
   module Connector
-    module Operations
+    module Storage
       # 直接导出已有本地配置，无需访问 Netdisco。
       class SavedConfig
         # 只用规范化的管理地址标识配置，避免设备改名改变备份身份。
@@ -20,16 +19,14 @@ module Net
           raise ArgumentError, "host must be an IP address"
         end
 
-        # 默认每次实时查找；批次显式 indexed 时共享一份惰性的旧命名文件快照。
-        def initialize(directory:, indexed: false)
+        # 只读取规范设备地址对应的文件，不维护第二套历史文件命名。
+        def initialize(directory:)
           raise ArgumentError, "directory must be a nonempty String" unless directory.is_a?(String) && !directory.empty?
-          raise ArgumentError, "indexed must be true or false" unless [true, false].include?(indexed)
 
           @directory = File.expand_path(directory).freeze
-          @legacy_index = LegacyIndex.new(@directory) if indexed
         end
 
-        # 优先查找固定文件名；仅在不存在时兼容唯一的旧命名文件。
+        # 从同一已验证文件描述符取得路径或内容。
         def find(host, required: true)
           with_file(host, required: required) { |path, _file, _stat| path }
         end
@@ -43,34 +40,12 @@ module Net
           with_file(host) { |_path, file, _stat| file.read }
         end
 
-        def resolve_path(host, required:)
-          filename = self.class.filename(host)
-          path = File.join(@directory, filename)
-          unless File.exist?(path) || File.symlink?(path)
-            entries = if @legacy_index
-                        @legacy_index.candidates(filename)
-                      else
-                        Dir.children(@directory).select { |name| name.end_with?("-#{filename}") }
-                      end
-            return nil if entries.empty? && !required
-
-            raise ArgumentError, "no saved configuration for #{host}" if entries.empty?
-            raise ArgumentError, "multiple saved configurations for #{host}" if entries.size > 1
-
-            path = @legacy_index ? entries.first : File.join(@directory, entries.first)
-          end
-          path
-        end
-
         def with_file(host, required: true)
-          path = resolve_path(host, required: required)
-          return nil unless path
-          return @legacy_index.open(path) { |name, file, stat| yield name, file, stat } if path.is_a?(LegacyIndex::Entry)
-
-          SafeFile.open(path) { |file, stat| yield path, file, stat }
+          path = File.join(@directory, self.class.filename(host))
+          SafeFile.open(path, missing: !required) { |file, stat| yield path, file, stat }
         end
 
-        private :resolve_path, :with_file
+        private :with_file
 
         # 将已保存配置写入目标文件或标准输出。
         def export(host:, output: nil, io: $stdout)
@@ -81,7 +56,7 @@ module Net
             destination = File.expand_path(output)
             directory = File.dirname(destination)
             FileUtils.mkdir_p(directory, mode: 0o700)
-            PrivateFile.write(destination, contents)
+            PrivateFile.write(destination, contents).path
           else
             io.binmode if io.respond_to?(:binmode)
             io.write(contents)
@@ -91,9 +66,9 @@ module Net
 
         # 使用指定模板解析已有配置，无需访问设备或 Netdisco。
         def parse(host:, template:, template_dir: nil)
-          require_relative "parse_output"
+          require_relative "../textfsm"
 
-          parser = ParseOutput.new(template_dir: template_dir)
+          parser = TextFSM.new(template_dir: template_dir)
           parser.call(read(host), template: template, host: host)
         end
       end

data/lib/net/connector/storage.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Net
+  module Connector
+    # 文件存储不依赖设备连接；备份、离线导出和批量报告共享这些原语。
+    module Storage
+      autoload :BackupLock, File.expand_path("storage/backup_lock", __dir__)
+      autoload :PrivateFile, File.expand_path("storage/private_file", __dir__)
+      autoload :SafeFile, File.expand_path("storage/safe_file", __dir__)
+      autoload :SavedConfig, File.expand_path("storage/saved_config", __dir__)
+    end
+
+    autoload :BackupBusy, File.expand_path("storage/backup_lock", __dir__)
+  end
+end

data/lib/net/connector/textfsm.rb

@@ -0,0 +1,72 @@
+# frozen_string_literal: true
+
+require_relative "engine/errors"
+require_relative "engine/terminal_text"
+
+module Net
+  module Connector
+    # 将设备命令回显或配置文本按 TextFSM 模板转换为结构化记录。
+    class TextFSM
+      # 设备入口与功能实现共置，Base 只组合能力，不重复业务流程。
+      module Capability
+        # 执行命令并按厂商、命令或显式 TextFSM 模板返回结构化记录。
+        def parse_command(command, template: nil, template_dir: nil)
+          parser = TextFSM.new(template_dir: template_dir)
+          parser.call(execute_command(command).value!, template: template, vendor: vendor, command: command, host: host)
+        end
+
+        # 采集运行配置并使用指定 TextFSM 模板提取结构化记录。
+        def parse_config(template:, template_dir: nil)
+          parser = TextFSM.new(template_dir: template_dir)
+          parser.call(running_config.value!, template: template, host: host)
+        end
+      end
+
+      DEFAULT_TEMPLATE_DIR = File.expand_path("templates", __dir__).freeze
+
+      # 配置模板目录和 Netmiko 风格的命令索引文件。
+      def initialize(template_dir: nil, index: "index")
+        template_dir ||= DEFAULT_TEMPLATE_DIR
+        raise ArgumentError, "template_dir must be a nonempty String" unless template_dir.is_a?(String) && !template_dir.empty?
+        raise ArgumentError, "index must be a nonempty String" unless index.is_a?(String) && !index.empty?
+
+        @template_dir = File.expand_path(template_dir)
+        @index = index
+      end
+
+      # 显式模板按路径读取；未指定时按厂商和命令从索引选择模板。
+      def call(text, template: nil, vendor: nil, command: nil, host: nil)
+        require "textfsm"
+
+        text = TerminalText.render(text, host: host)
+        if template
+          raise ArgumentError, "template must be a nonempty String" unless template.is_a?(String) && !template.empty?
+
+          ::TextFSM::Parser.from_file(File.expand_path(template, @template_dir)).parse_hashes(text)
+        else
+          raise ArgumentError, "vendor and command are required for template lookup" unless vendor && command.is_a?(String) && !command.empty?
+
+          attributes = { "Vendor" => vendor.to_s, "Command" => command }
+          table = ::TextFSM::CliTable.new(index: @index, template_dir: @template_dir)
+          unless table.index.match(attributes)
+            raise ParsingError.new("no TextFSM template matches this vendor and command",
+                                   code: :template_missing, host: host, phase: :parse)
+          end
+          table.parse(text, attributes: attributes).to_hashes
+        end
+      rescue ::TextFSM::IndexError
+        raise ParsingError.new("TextFSM template index is invalid",
+                               code: :template_invalid, host: host, phase: :parse), cause: nil
+      rescue ::TextFSM::TemplateError
+        raise ParsingError.new("TextFSM template is invalid",
+                               code: :template_invalid, host: host, phase: :parse), cause: nil
+      rescue ::TextFSM::ParseError
+        raise ParsingError.new("TextFSM could not parse the device output",
+                               code: :parse_failed, host: host, phase: :parse), cause: nil
+      rescue IOError, SystemCallError
+        raise ParsingError.new("unable to read TextFSM template",
+                               code: :template_unreadable, host: host, phase: :parse), cause: nil
+      end
+    end
+  end
+end

data/lib/net/connector/vendor/cisco_ios/tftp_backup.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require_relative "../../operations/tftp/strategy"
+require_relative "../../device/tftp/strategy"
 
 module Net
   module Connector
     module CiscoIos
-      class TftpBackup < Operations::Tftp::Strategy
+      class TftpBackup < Tftp::Strategy
         # 在连接前拒绝当前厂商不支持的参数组合。
         def validate_options!(_target, source_file:, vrf: nil)
           raise ArgumentError, "Cisco IOS does not use source_file" unless source_file.nil?
@@ -28,7 +28,7 @@ module Net
         end
 
         # 检查设备回显是否确认 TFTP 传输完成。
-        def complete?(result)
+        def device_reported_complete?(result)
           completion_lines(result).any? do |line|
             copied_bytes?(line) || line.match?(/\A\[OK(?:\s*-\s*[1-9]\d*\s+bytes)?\]\z/i)
           end

data/lib/net/connector/vendor/cisco_ios/topology.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require_relative "../../operations/topology/immediate_strategy"
+require_relative "../../device/topology/immediate_strategy"
 
 module Net
   module Connector
     module CiscoIos
-      class Topology < Operations::Topology::ImmediateStrategy
+      class Topology < Topology::ImmediateStrategy
         # IOS 提供 CDP 邻居、配置描述读取和描述变更。
         def self.supports?(capability)
           %i[neighbors interface_descriptions interface_description_changes].include?(capability)
@@ -21,10 +21,10 @@ module Net
         def protocol = :cdp
 
         # 进入全局配置视图。
-        def enter_configuration = "configure terminal"
+        def enter_configuration_command = "configure terminal"
 
         # 先回到执行视图读回，随后才执行档案中的保存命令。
-        def leave_configuration = ["end"]
+        def leave_configuration_commands = ["end"]
 
         def persistence_pattern = /\A(?:\[OK\]|Copy complete\.)\z/i
 
@@ -40,7 +40,7 @@ module Net
 
         # 复用公共接口描述命令，保留本机接口原名。
         def change_commands(change)
-          InterfaceDescription.commands(interface: change.interface, description: change.new_description)
+          Net::Connector::Topology::InterfaceDescription.commands(interface: change.interface, description: change.new_description)
         end
       end
     end

data/lib/net/connector/vendor/cisco_nxos/tftp_backup.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require_relative "../../operations/tftp/strategy"
+require_relative "../../device/tftp/strategy"
 
 module Net
   module Connector
     module CiscoNxos
-      class TftpBackup < Operations::Tftp::Strategy
+      class TftpBackup < Tftp::Strategy
         # 在连接前拒绝当前厂商不支持的参数组合。
         def validate_options!(_target, source_file:, **)
           raise ArgumentError, "Cisco NX-OS does not use source_file" unless source_file.nil?
@@ -27,7 +27,7 @@ module Net
         end
 
         # 检查设备回显是否确认 TFTP 传输完成。
-        def complete?(result)
+        def device_reported_complete?(result)
           completion_lines(result).any? do |line|
             line.match?(/\A
               (?:transfer|copy)(?:\s+operation)?\s+

data/lib/net/connector/vendor/h3c/tftp_backup.rb

@@ -1,21 +1,21 @@
 # frozen_string_literal: true
 
-require_relative "../../operations/tftp/file_upload"
+require_relative "../../device/tftp/file_upload"
 
 module Net
   module Connector
     module H3c
-      class TftpBackup < Operations::Tftp::FileUpload
+      class TftpBackup < Tftp::FileUpload
         # 自动探测选择的是启动配置；显式文件仍不能推断为运行或启动配置。
         def receipt_metadata(target, source_file:, explicit_source:)
           super.merge(configuration_kind: explicit_source ? :saved_file : :startup)
         end
 
         # 选取并校验 H3C 启动配置文件路径。
-        def source_file(value)
+        def resolve_source_file(value)
           return TftpTarget.validate_source_file!(value) if value
 
-          output = @device.execute("display startup").value!
+          output = @device.execute_command("display startup").value!
           rendered = TerminalRenderer.render(output)
           path = rendered[/^\s*Next main startup saved-configuration file:\s*(\S+)/i, 1]
           path ||= rendered[/^\s*Current startup saved-configuration file:\s*(\S+)/i, 1]

data/lib/net/connector/vendor/h3c/topology.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require_relative "../../operations/topology/immediate_strategy"
+require_relative "../../device/topology/immediate_strategy"
 
 module Net
   module Connector
     module H3c
-      class Topology < Operations::Topology::ImmediateStrategy
+      class Topology < Topology::ImmediateStrategy
         TABLE_HEADER = /^\s*(?:System Name\s+Local Interface\b|(?:Local Interface|LocalIf)\s+)/i
         # H3C 提供 LLDP 邻居、配置描述读取和描述变更。
         def self.supports?(capability)
@@ -19,10 +19,10 @@ module Net
         def description_template = "h3c_interface_descriptions.textfsm"
 
         # 进入系统视图以修改接口描述。
-        def enter_configuration = "system-view"
+        def enter_configuration_command = "system-view"
 
         # 返回用户视图读回；保存交给后续独立阶段。
-        def leave_configuration = ["return"]
+        def leave_configuration_commands = ["return"]
 
         def persistence_pattern = /\ASaved the current configuration to mainboard device successfully\.\z/i
 
@@ -52,7 +52,7 @@ module Net
 
         # 在接口视图设置描述后用 quit 返回系统视图。
         def change_commands(change)
-          InterfaceDescription.commands(interface: change.interface, description: change.new_description, leave: "quit")
+          Net::Connector::Topology::InterfaceDescription.commands(interface: change.interface, description: change.new_description, leave: "quit")
         end
 
         private

data/lib/net/connector/vendor/h3c.rb

@@ -56,7 +56,7 @@ module Net
           return command unless /\A[ \t]*rule[ \t]+XXX[ \t]+append\b/i.match?(command.text)
 
           rule_id = execution.context[:rule_id]
-          raise execution.failure("new rule ID has not been acquired") unless rule_id
+          raise execution.build_error("new rule ID has not been acquired") unless rule_id
 
           command.with_text(command.text.sub(/XXX/i, rule_id))
         end
@@ -65,9 +65,9 @@ module Net
         def after_command(command, _response, execution)
           return unless /\A[ \t]*rule[ \t]+pass\b/i.match?(command.text)
 
-          response = execution.query("dis this")
+          response = execution.execute_command("dis this")
           rule_id = response.raw[/rule\s+(\d+)\s+pass[^\n]+\n\s*#/i, 1]
-          raise execution.failure("device did not return the new rule ID") unless rule_id
+          raise execution.build_error("device did not return the new rule ID") unless rule_id
 
           execution.context[:rule_id] = rule_id
         end

data/lib/net/connector/vendor/hillstone/tftp_backup.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require_relative "../../operations/tftp/strategy"
+require_relative "../../device/tftp/strategy"
 
 module Net
   module Connector
     module Hillstone
-      class TftpBackup < Operations::Tftp::Strategy
+      class TftpBackup < Tftp::Strategy
         # 山石原生导出的配置文件使用 dat 扩展名。
         def self.file_extension = "dat"
 
@@ -31,7 +31,7 @@ module Net
         end
 
         # 检查设备回显是否确认 TFTP 传输完成。
-        def complete?(result)
+        def device_reported_complete?(result)
           !completion_line(result).nil?
         end
 

data/lib/net/connector/vendor/hillstone/topology.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require_relative "../../operations/topology/immediate_strategy"
+require_relative "../../device/topology/immediate_strategy"
 
 module Net
   module Connector
     module Hillstone
-      class Topology < Operations::Topology::ImmediateStrategy
+      class Topology < Topology::ImmediateStrategy
         # 山石提供 LLDP 邻居、配置描述读取和描述变更。
         def self.supports?(capability)
           %i[neighbors interface_descriptions interface_description_changes].include?(capability)
@@ -18,10 +18,10 @@ module Net
         def description_template = "hillstone_interface_descriptions.textfsm"
 
         # 进入配置视图。
-        def enter_configuration = "configure"
+        def enter_configuration_command = "configure"
 
         # 退出配置视图后先读回，保存动作随后单独执行。
-        def leave_configuration = ["exit"]
+        def leave_configuration_commands = ["exit"]
 
         def persistence_pattern = /\ASaving configuration is finished\.?\z/i
 
@@ -43,7 +43,7 @@ module Net
 
         # 复用公共接口描述命令。
         def change_commands(change)
-          InterfaceDescription.commands(interface: change.interface, description: change.new_description)
+          Net::Connector::Topology::InterfaceDescription.commands(interface: change.interface, description: change.new_description)
         end
 
         private

data/lib/net/connector/vendor/huawei/tftp_backup.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require_relative "../../operations/tftp/file_upload"
+require_relative "../../device/tftp/file_upload"
 
 module Net
   module Connector
     module Huawei
-      class TftpBackup < Operations::Tftp::FileUpload
+      class TftpBackup < Tftp::FileUpload
         # 缺少源文件也必须在首次设备 I/O 之前拒绝。
         def validate_options!(target, source_file:, vrf: nil)
           super
@@ -13,7 +13,7 @@ module Net
         end
 
         # 要求调用方提供合法的华为启动配置文件路径。
-        def source_file(value)
+        def resolve_source_file(value)
           raise ArgumentError, "Huawei TFTP backup requires source_file" unless value
 
           TftpTarget.validate_source_file!(value)

data/lib/net/connector/vendor/palo_alto/running_config.rb

@@ -23,7 +23,7 @@ module Net
         end
 
         # 采集前后都检查候选差异，拒绝把未提交配置误作运行配置。
-        def check_response(command, response, _execution)
+        def validate_response!(command, response, _execution)
           return unless command.text == "show config diff"
           return if body(response.output, command.text).empty?
 

data/lib/net/connector/vendor/palo_alto/tftp_backup.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require_relative "../../operations/tftp/strategy"
+require_relative "../../device/tftp/strategy"
 
 module Net
   module Connector
     module PaloAlto
-      class TftpBackup < Operations::Tftp::Strategy
+      class TftpBackup < Tftp::Strategy
         FILENAME = "running-config.xml"
 
         # 返回 PAN-OS 固定使用的运行配置文件名。
@@ -33,7 +33,7 @@ module Net
         end
 
         # 检查设备回显是否确认 TFTP 传输完成。
-        def complete?(result)
+        def device_reported_complete?(result)
           completion_lines(result).any? do |line|
             line.match?(/\ASent\s+[1-9]\d*\s+bytes(?:\s+in\s+[\d.]+\s+(?:secs?|seconds?))?[.!]?\z/i)
           end

data/lib/net/connector/vendor/palo_alto/topology.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require_relative "../../operations/topology/strategy"
+require_relative "../../device/topology/strategy"
 
 module Net
   module Connector
     module PaloAlto
-      class Topology < Operations::Topology::Strategy
+      class Topology < Topology::Strategy
         # 候选配置缺少经固件实验确认的所有权/commit 协议，暂只提供读取能力。
         def self.supports?(capability)
           %i[neighbors interface_descriptions].include?(capability)
@@ -20,10 +20,7 @@ module Net
         def description_template = "palo_alto_interface_descriptions.textfsm"
 
         # 进入候选配置视图。
-        def enter_configuration = "configure"
-
-        # 提交候选配置后退出配置视图。
-        def finish_commands = ["commit", "exit"]
+        def enter_configuration_command = "configure"
 
         # 只计入非空邻居块，跳过没有对端的本机接口。
         def expected_neighbor_count(output, _template)

data/lib/net/connector/vendor/radware/tftp_backup.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require_relative "../../operations/tftp/strategy"
+require_relative "../../device/tftp/strategy"
 
 module Net
   module Connector
     module Radware
-      class TftpBackup < Operations::Tftp::Strategy
+      class TftpBackup < Tftp::Strategy
         # Radware 原生导出生成压缩配置归档。
         def self.file_extension = "tgz"
 
@@ -32,7 +32,7 @@ module Net
         end
 
         # 检查设备回显是否确认 TFTP 传输完成。
-        def complete?(result)
+        def device_reported_complete?(result)
           completion_lines(result).any? do |line|
             line.match?(/\A
               (?:Current\s+)?(?:configuration|config)\s+