net-connector 0.17.2 → 0.18.0

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

@@ -25,15 +25,15 @@ module Net
             raise OptionParser::InvalidArgument unless remaining.empty?
             credentials = values[:environment].keys.any? { |key| key.match?(/USERNAME|PASSWORD/) }
             if values[:stdin_credentials] && (credentials || values[:ask_password] || values[:ask_netdisco_password])
-              raise ArgumentError, "--stdin-credentials 不能与命令行凭据或密码提示同时使用"
+              raise ArgumentError, "--stdin-credentials cannot be combined with command-line credentials or password prompts"
             end
-            read_password(values, :ask_password, "NC_DEVICE_PASSWORD", "设备密码", input: input, output: error)
-            read_password(values, :ask_netdisco_password, "ND_PASSWORD", "Netdisco 密码", input: input, output: error)
+            read_password(values, :ask_password, "NC_DEVICE_PASSWORD", "Device password", input: input, output: error)
+            read_password(values, :ask_netdisco_password, "ND_PASSWORD", "Netdisco password", input: input, output: error)
 
             values
           rescue OptionParser::ParseError
-            limits = mode == :topology ? "并发数须为 1 至 500，设备上限须为正整数" : "并发数须为 1 至 500，抽样须为 1 至 5"
-            raise ArgumentError, "参数无效：#{limits}；使用 --help 查看参数", cause: nil
+            limits = mode == :topology ? "Concurrency must be 1 to 500; device limit must be a positive integer" : "Concurrency must be 1 to 500; sample size must be 1 to 5"
+            raise ArgumentError, "Invalid arguments: #{limits}; use --help for options", cause: nil
           end
 
           # 组装当前模式的选项、帮助和扩展参数，解析器自身不执行设备任务。
@@ -41,80 +41,80 @@ module Net
             raise ArgumentError, "unknown CLI mode" unless %i[backup tftp topology].include?(mode)
 
             OptionParser.new do |opts|
-              default = mode == :topology ? "默认只读规划" : "默认沿用配置"
-              opts.banner = "用法：ruby #{File.basename(program)} [选项]（#{default}）\n命令行参数优先；未指定的项沿用配置及默认值。无筛选时选择全部就绪设备。"
+              default = mode == :topology ? "read-only planning by default" : "use the configuration by default"
+              opts.banner = "Usage: ruby #{File.basename(program)} [options] (#{default})\nCommand-line options take precedence; unspecified values use configuration and defaults. Without filters, all ready devices are selected."
               add_settings(opts, values, mode: mode)
               add_execution(opts, values, mode: mode)
               add_terminal_options(opts, values)
               if mode == :topology
                 add_topology(opts, values)
               else
-                opts.on("--plan", "--inventory-only", "预览过滤后的清单，不连接设备") { values[:inventory_only] = true }
+                opts.on("--plan", "--inventory-only", "Preview filtered inventory without connecting to devices") { values[:inventory_only] = true }
               end
               additional&.call(opts, values)
-              opts.on("--examples", "查看常用命令范例，不执行任务") do
+              opts.on("--examples", "Show common command examples without executing tasks") do
                 output.puts Help.examples(program: program, mode: mode)
                 values[:help] = true
               end
-              opts.on("-h", "--help", "显示常用选项") do
+              opts.on("-h", "--help", "Show common options") do
                 output.puts Help.common(opts, mode: mode)
                 values[:help] = true
               end
-              opts.on("--help-all", "显示完整选项（凭据、SSH、自动化等）") { output.puts opts; values[:help] = true }
+              opts.on("--help-all", "Show all options, including credentials, SSH and automation") { output.puts opts; values[:help] = true }
             end
           end
 
           # 登记进度、JSON、密码输入及配置问答等终端选项。
           def self.add_terminal_options(opts, values)
-            opts.on("--ask-password", "隐藏输入设备密码") { values[:ask_password] = true }
-            opts.on("--ask-netdisco-password", "隐藏输入 Netdisco 密码") { values[:ask_netdisco_password] = true }
+            opts.on("--ask-password", "Prompt for the device password without echoing input") { values[:ask_password] = true }
+            opts.on("--ask-netdisco-password", "Prompt for the Netdisco password without echoing input") { values[:ask_netdisco_password] = true }
             CtxCli::Options.output(opts, values, quiet: :no_progress)
-            opts.on("--stdin-credentials", "从标准输入读取凭据并等待 RUN") { values[:stdin_credentials] = true }
+            opts.on("--stdin-credentials", "Read credentials from stdin and wait for RUN") { values[:stdin_credentials] = true }
             CtxCli::Options.initialization(opts, values)
           end
 
           # 登记互斥的拓扑执行模式和格式化参数，应用模式必须显式选择。
           def self.add_topology(opts, values)
-            { discover: "发现邻居并检查描述", plan: "生成配置计划", apply: "修正、读回并保存" }.each do |mode, description|
+            { discover: "Discover neighbors and check descriptions", plan: "Generate a configuration plan", apply: "Apply corrections, read back and save" }.each do |mode, description|
               opts.on("--#{mode}", description) do
-                raise ArgumentError, "--discover、--plan、--apply 不能同时使用" if values[:topology_mode]
+                raise ArgumentError, "--discover, --plan and --apply are mutually exclusive" if values[:topology_mode]
 
                 values[:topology_mode] = mode
                 values[:apply] = true if mode == :apply
               end
             end
-            opts.on("--inventory-only", "只读取并过滤清单，不连接设备") { values[:inventory_only] = true }
-            opts.on("--limit N", Integer, "最多选择 N 台可发现设备") do |value|
+            opts.on("--inventory-only", "Read and filter inventory without connecting to devices") { values[:inventory_only] = true }
+            opts.on("--limit N", Integer, "Select at most N discoverable devices") do |value|
               raise OptionParser::InvalidArgument unless value.positive?
 
               values[:topology_limit] = value
             end
-            opts.on("--description-format TEXT", "模板仅支持 %{neighbor}、%{port}") { |value| values[:environment]["NC_TOPOLOGY_DESCRIPTION_FORMAT"] = value }
-            opts.on("--full-port-names", "不缩写邻居端口") { values[:environment]["NC_TOPOLOGY_ABBREVIATE"] = "false" }
-            opts.on("--lowercase-ports", "邻居端口转换成小写") { values[:environment]["NC_TOPOLOGY_LOWERCASE"] = "true" }
+            opts.on("--description-format TEXT", "Template supports only %{neighbor} and %{port}") { |value| values[:environment]["NC_TOPOLOGY_DESCRIPTION_FORMAT"] = value }
+            opts.on("--full-port-names", "Keep full neighbor port names") { values[:environment]["NC_TOPOLOGY_ABBREVIATE"] = "false" }
+            opts.on("--lowercase-ports", "Convert neighbor port names to lowercase") { values[:environment]["NC_TOPOLOGY_LOWERCASE"] = "true" }
           end
 
           # 正式 CLI 与批次示例共用并发、抽样、核验和成功策略选项。
           def self.add_execution(opts, values, mode: nil)
-            opts.on("--refresh-inventory", "强制刷新清单；远端失败时回退已验证历史") { values[:force_refresh] = true }
-            opts.on("--cache-only", "仅使用已验证的清单缓存，不查询远端") { values[:environment]["ND_CACHE_MODE"] = "only" }
-            opts.on("--cache-mode MODE", %w[prefer only refresh], "清单缓存 prefer / only / refresh") do |value|
+            opts.on("--refresh-inventory", "Force inventory refresh; fall back to verified history on remote failure") { values[:force_refresh] = true }
+            opts.on("--cache-only", "Use only verified cached inventory without querying the remote source") { values[:environment]["ND_CACHE_MODE"] = "only" }
+            opts.on("--cache-mode MODE", %w[prefer only refresh], "Inventory cache: prefer / only / refresh") do |value|
               values[:environment]["ND_CACHE_MODE"] = value
             end
-            opts.on("-p", "--parallel N", Integer, "并发设备数，1 至 500") do |count|
+            opts.on("-p", "--parallel N", Integer, "Concurrent devices, 1 to 500") do |count|
               raise OptionParser::InvalidArgument unless (1..Settings::MAX_PARALLEL).cover?(count)
 
               values[:environment]["NC_PARALLEL"] = count.to_s
             end
             return if mode == :topology
 
-            opts.on("--sample N", "--limit-per-vendor N", Integer, "每厂商抽样 1 至 5 台") do |count|
+            opts.on("--sample N", "--limit-per-vendor N", Integer, "Sample 1 to 5 devices per vendor") do |count|
               Planner.validate_limit!(count)
               values[:limit] = count
             end
-            opts.on("--tftp-root DIR", "本机 TFTP 服务器文件目录") { |path| values[:tftp_root] = path }
-            opts.on("--all", "选择全部就绪设备") { values[:all] = true }
-            opts.on("--success-policy POLICY", %w[strict selected verified], "成功判定：strict / selected / verified（TFTP 文件核验）") do |policy|
+            opts.on("--tftp-root DIR", "Local directory containing TFTP server files") { |path| values[:tftp_root] = path }
+            opts.on("--all", "Select all ready devices") { values[:all] = true }
+            opts.on("--success-policy POLICY", %w[strict selected verified], "Success policy: strict / selected / verified (TFTP file verification)") do |policy|
               values[:success_policy] = policy.to_sym
             end
           end
@@ -136,7 +136,7 @@ module Net
 
           # CLI > 原进程环境 > YAML > .env；公开环境字段转为内部策略，凭据仍独立读取。
           def self.settings(options, env: ENV, mode: :backup, configuration: nil, defaults: {})
-            raise ArgumentError, "--all 不能与抽样同时使用" if options[:all] && options[:limit]
+            raise ArgumentError, "--all cannot be combined with sampling" if options[:all] && options[:limit]
             if options[:host] && options.fetch(:environment).key?("NC_INCLUDE_HOSTS")
               raise ArgumentError, "--host cannot be combined with --hosts"
             end
@@ -180,14 +180,14 @@ module Net
           def self.add_settings(opts, values, mode: nil)
             add_filters(opts, values)
             {
-              "--username USER" => ["NC_DEVICE_USERNAME", "设备登录用户名"],
-              "--password PASSWORD" => ["NC_DEVICE_PASSWORD", "设备登录密码（可改用 --ask-password）"],
-              "--enable-password PASSWORD" => ["NC_ENABLE_PASSWORD", "设备提权密码"],
-              "--netdisco-url URL" => ["ND_URL", "Netdisco 地址"],
-              "--netdisco-username USER" => ["ND_USERNAME", "Netdisco 用户名"],
-              "--netdisco-password PASSWORD" => ["ND_PASSWORD", "Netdisco 密码"],
-              "--directory DIR" => ["NC_BACKUP_DIRECTORY", "#{mode == :topology ? "拓扑报告" : "备份"}目录，相对启动目录"],
-              "--config FILE" => ["NC_CONFIG", "YAML 配置，相对启动目录"]
+              "--username USER" => ["NC_DEVICE_USERNAME", "Device login username"],
+              "--password PASSWORD" => ["NC_DEVICE_PASSWORD", "Device login password (or use --ask-password)"],
+              "--enable-password PASSWORD" => ["NC_ENABLE_PASSWORD", "Device privilege password"],
+              "--netdisco-url URL" => ["ND_URL", "Netdisco URL"],
+              "--netdisco-username USER" => ["ND_USERNAME", "Netdisco username"],
+              "--netdisco-password PASSWORD" => ["ND_PASSWORD", "Netdisco password"],
+              "--directory DIR" => ["NC_BACKUP_DIRECTORY", "#{mode == :topology ? "Topology report" : "Backup"} directory, relative to the startup directory"],
+              "--config FILE" => ["NC_CONFIG", "YAML configuration, relative to the startup directory"]
             }.each do |flag, (key, description)|
               opts.on(flag, description) do |value|
                 raise OptionParser::InvalidArgument if value.empty?
@@ -195,12 +195,12 @@ module Net
                 values[:environment][key] = value
               end
             end
-            opts.on("--env-file FILE", "最后叠加的环境文件，相对启动目录") { |path| values[:env_file] = path }
-            opts.on("--show-config", "显示生效的非敏感设置与配置来源") { values[:show_config] = true }
-            opts.on("--host-key-policy POLICY", %w[strict accept_new replace], "主机密钥策略：strict / accept_new / replace（变化时自动替换）") do |policy|
+            opts.on("--env-file FILE", "Environment file loaded last, relative to the startup directory") { |path| values[:env_file] = path }
+            opts.on("--show-config", "Show effective nonsensitive settings and configuration sources") { values[:show_config] = true }
+            opts.on("--host-key-policy POLICY", %w[strict accept_new replace], "Host key policy: strict / accept_new / replace (automatically replace changed keys)") do |policy|
               values[:environment]["NC_HOST_KEY_POLICY"] = policy
             end
-            opts.on("--known-hosts FILE", "持久保存主机密钥的文件") do |path|
+            opts.on("--known-hosts FILE", "File for persistent host keys") do |path|
               values[:environment]["NC_KNOWN_HOSTS"] = path
             end
           end
@@ -217,7 +217,7 @@ module Net
                 values[:environment][environment_key] = value
               end
             end
-            opts.on("--host IP", "选择单台设备，可重复") do |value|
+            opts.on("--host IP", "Select one device; may be repeated") do |value|
               raise OptionParser::InvalidArgument if value.empty? || value.match?(/[\/,]/)
 
               begin
@@ -254,7 +254,7 @@ module Net
           def self.read_password(values, flag, key, label, input:, output:)
             return unless values[flag]
 
-            raise ArgumentError, "密码提示与显式密码不能同时使用" if values[:environment].key?(key)
+            raise ArgumentError, "Password prompts cannot be combined with explicit passwords" if values[:environment].key?(key)
             values[:environment][key] = CtxCli::Terminal.new(input: input, out: output).password(label: label)
           end
           private_class_method :read_password, :parser_for

data/lib/net/connector/netdisco/cli/setup.rb

@@ -12,8 +12,8 @@ module Net
         # 首次运行的文件检查和创建问答；完成初始化后必须退出，不触发设备任务。
         class Setup
           ENVIRONMENT_TEMPLATE = <<~TEXT.freeze
-            # 进程环境优先于此文件；命令行参数 > 原进程环境 > YAML > .env > 内置默认值。
-            # 下列凭据按实际认证方式取消注释并填写；不自动保存当前进程中的密码。
+            # Process environment takes precedence over this file; CLI > original process environment > YAML > .env > built-in defaults.
+            # Uncomment and fill in credentials for the authentication method in use; current process passwords are not saved automatically.
             # ND_URL=
             # ND_USERNAME=
             # ND_PASSWORD=
@@ -21,16 +21,16 @@ module Net
             # NC_DEVICE_USERNAME=
             # NC_DEVICE_PASSWORD=
             # NC_ENABLE_PASSWORD=
-            # PostgreSQL 清单使用 ND_DB_HOST / ND_DB_NAME / ND_DB_USER / ND_DB_PASS。
+            # PostgreSQL inventory uses ND_DB_HOST / ND_DB_NAME / ND_DB_USER / ND_DB_PASS.
             # ND_DB_HOST=
             # ND_DB_NAME=
             # ND_DB_USER=
             # ND_DB_PASS=
-            # TFTP SSH 归档使用现有密钥/agent，或设置以下密码。
-            # 密码含 # 或 $ 时请用单引号包裹，例如 KEY='your-password'。
+            # TFTP SSH archiving uses existing keys/agent, or the password below.
+            # Wrap passwords containing # or $ in single quotes, for example KEY='your-password'.
             # NC_TFTP_SSH_PASSWORD=
-            # 公共参数优先写入各入口 YAML；可在运行时使用 -p / --config / --directory。
-            # 未设置 NC_CONFIG 时按系统、用户、入口目录及启动目录逐层发现配置。
+            # Prefer each entrypoint's YAML for common options; use -p / --config / --directory at runtime.
+            # Without NC_CONFIG, configuration is discovered in system, user, entrypoint and startup directories, in that order.
           TEXT
 
           # 保存调用方 IO 与路径；不读取标准输入、不加载凭据、不创建文件。
@@ -51,7 +51,7 @@ module Net
             missing_config = path && missing?(path)
             missing_env = @env_path && missing?(@env_path)
             return !!@options[:init] unless missing_config || missing_env
-            raise ArgumentError, "--interactive 需要交互终端；自动化请使用 --init --non-interactive" if @options[:interactive] && !terminal?
+            raise ArgumentError, "--interactive requires an interactive terminal; use --init --non-interactive for automation" if @options[:interactive] && !terminal?
 
             create_config = missing_config && approved?(path, required: true)
             create_env = missing_env && approved?(@env_path, required: false)
@@ -59,12 +59,12 @@ module Net
             if create_env
               FileUtils.mkdir_p(File.dirname(File.expand_path(@env_path)), mode: 0o700)
               @initializer.create_environment(path: @env_path, contents: ENVIRONMENT_TEMPLATE)
-              @output.puts "已初始化环境模板：#{@env_path}（未写入密码）"
+              @output.puts "Environment template initialized: #{@env_path}(passwords were not written)"
             end
             stopped = create_config || create_env || @options[:init]
-            @output.puts "请检查配置及凭据后再次运行；本次未读取清单、未连接设备。" if stopped
-            @output.puts "HTTP 清单需设置 netdisco.url 或 ND_URL，并提供 ND_API_KEY 或 ND_USERNAME / ND_PASSWORD；设备凭据支持通用及厂商配置。" if create_config && document.dig("netdisco", "source") == "http"
-            @output.puts "TFTP 请填写 tftp.server 或 tftp.servers，并按实际环境配置文件核验目录；未猜测服务器、VRF 或源接口。" if create_config && @mode == :tftp
+            @output.puts "Check configuration and credentials, then run again; inventory was not read and no devices were connected." if stopped
+            @output.puts "HTTP inventory requires netdisco.url or ND_URL and ND_API_KEY or ND_USERNAME / ND_PASSWORD; device credentials support common and per-vendor settings." if create_config && document.dig("netdisco", "source") == "http"
+            @output.puts "For TFTP, set tftp.server or tftp.servers and the file verification directory for your environment; server, VRF and source interface are not inferred." if create_config && @mode == :tftp
             !!stopped
           end
 
@@ -83,14 +83,14 @@ module Net
             end
             FileUtils.mkdir_p(File.dirname(File.expand_path(path)), mode: 0o700)
             @initializer.create(path: path, document: document, interactive: questionnaire?, mode: @mode, inherited_parallel: inherited_parallel)
-            @output.puts "已初始化配置：#{path}"
+            @output.puts "Configuration initialized: #{path}"
             document
           end
 
           # 缺失与无效文件分开处理，拒绝符号链接、目录及不可读取文件。
           def missing?(path)
             stat = File.lstat(path)
-            raise ArgumentError, "配置路径必须是可读普通文件：#{path}" unless stat.file? && File.readable?(path)
+            raise ArgumentError, "Configuration path must be a readable regular file: #{path}" unless stat.file? && File.readable?(path)
 
             false
           rescue Errno::ENOENT
@@ -114,12 +114,12 @@ module Net
           def approved?(path, required:)
             return true if @options[:init]
             unless terminal? && @options[:interactive] != false
-              raise ArgumentError, "缺少配置：#{path}；请先执行 --init --non-interactive 创建，或使用 --config 指定已有文件" if required
+              raise ArgumentError, "Missing configuration: #{path}; first run --init --non-interactive to create it, or use --config to select an existing file" if required
 
               return false
             end
             loop do
-              @output.print "未找到 #{path}，是否创建？[y/N]："
+              @output.print "Not found: #{path}; create it? [y/N]: "
               @output.flush
               line = @input.gets("\n")
               raise EOFError unless line
@@ -127,11 +127,11 @@ module Net
               answer = line.strip.downcase
               return true if %w[y yes].include?(answer)
               if answer.empty? || %w[n no].include?(answer)
-                raise ArgumentError, "未创建必需配置：#{path}；本次停止" if required
+                raise ArgumentError, "Required configuration was not created: #{path}; stopped" if required
 
                 return false
               end
-              @output.puts "请输入 y 或 n。"
+              @output.puts "Enter y or n."
             end
           end
 

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

@@ -43,7 +43,7 @@ module Net
               return 0
             end
             policy = settings.topology_options
-            raise ArgumentError, "应用配置必须显式传入 --apply；--plan 仅生成计划，--discover 只读发现" if policy.mode == :apply && !options[:apply]
+            raise ArgumentError, "Applying configuration requires explicit --apply; --plan only generates a plan and --discover only reads device state" if policy.mode == :apply && !options[:apply]
 
             inventory, credentials = CLI::Credentials.resolve(settings, input: @input, stdin_credentials: options[:stdin_credentials])
             @progress = Progress.new(io: @error, enabled: !options[:no_progress], verbose: options[:verbose])
@@ -58,13 +58,13 @@ module Net
           rescue Interrupt
             130
           rescue EOFError
-            @error.puts "配置输入未完成，已停止；请检查先前提示的文件。"
+            @error.puts "Configuration setup is incomplete; stopped. Check the files listed above."
             2
           rescue ArgumentError, Inventory::Error => exception
-            @error.puts "拓扑参数或清单错误：#{exception.message}"
+            @error.puts "Topology argument or inventory error: #{exception.message}"
             2
           rescue StandardError => exception
-            @error.puts "拓扑未完成（#{Error::Metadata.type(exception.class.name) || "StandardError"}）"
+            @error.puts "Topology incomplete (#{Error::Metadata.type(exception.class.name) || "StandardError"})"
             2
           end
 
@@ -108,8 +108,8 @@ module Net
             status = fleet.inventory_status
             return unless status
 
-            @error.puts "清单刷新失败，使用历史缓存（#{status[:refresh_error_code]}）" if status[:source] == :stale_cache
-            @error.puts "清单缓存写入失败（#{status[:write_error_type]}）" if status[:write_error_type]
+            @error.puts "Inventory refresh failed; using the previous cache (#{status[:refresh_error_code]})" if status[:source] == :stale_cache
+            @error.puts "Inventory cache write failed (#{status[:write_error_type]})" if status[:write_error_type]
           end
 
           # 仅预览就绪清单，不建立设备连接；无选中设备时返回未完成。
@@ -125,7 +125,7 @@ module Net
           # 先发现并保存审批计划，仅在显式应用模式执行变更，失败后保存已有任务回执。
           # 发现结果先落盘并生成校验摘要，再进入应用；取消只汇总回执，不重新下发配置。
           def execute(devices, settings, credentials, policy, options)
-            raise ArgumentError, "请在 topology.directory 或 --directory 设置拓扑报告目录" unless policy.directory
+            raise ArgumentError, "Set the topology report directory with topology.directory or --directory" unless policy.directory
 
             directory = Storage::BatchDirectory.create(policy.directory)
             selected = devices.select(&:ready?)
@@ -137,12 +137,12 @@ module Net
             @events_mutex = Mutex.new
             @task_results = {}
             credentials = observed_credentials(credentials)
-            @progress.operation_plan(selected, parallel: policy.parallel, label: "拓扑发现/规划")
+            @progress.operation_plan(selected, parallel: policy.parallel, label: "Topology discovery/planning")
             outcomes = @progress.with_updates { collect(selected, settings, credentials, policy, directory) }
             save_plan(directory, outcomes)
             if policy.mode == :apply
               applying = outcomes.filter_map { |outcome| @devices_by_host[outcome[:host]] if %i[planned partial_planned].include?(outcome[:status]) }
-              @progress.operation_plan(applying, parallel: policy.parallel, label: "拓扑应用")
+              @progress.operation_plan(applying, parallel: policy.parallel, label: "Topology apply")
               outcomes = @progress.with_updates { apply_plans(outcomes, settings, credentials, policy, directory) }
             end
             summary = build_summary(devices, outcomes, policy, directory)
@@ -266,7 +266,7 @@ module Net
             begin
               # 阻塞 I/O 仍可取消；完成值或同步失败先固定，再交付返回间隙中的异步中断。
               Thread.handle_interrupt(Exception => :on_blocking) do
-                @progress.start(device, label: "拓扑操作")
+                @progress.start(device, label: "Topology operation")
                 result = yield
               rescue StandardError => failure
                 result = { host: device.host, vendor: device.vendor, status: :failed, diagnostic: Diagnostic.from(failure)&.to_h }
@@ -375,7 +375,7 @@ module Net
             summary[:devices].each { |outcome| Netdisco::Topology::Files.write_report(outcome) }
             lines = result_lines(summary) + summary[:devices].flat_map do |item|
               ["#{item[:host]} #{item[:name].to_s.gsub(/[[:cntrl:]]/, " ")} #{Netdisco::Topology::Presentation.status(item[:status], changes: item.fetch(:changes, 0))} changes=#{item.fetch(:changes, 0)}",
-               "  设备报告：#{item[:device_report]}", "  命令文件：#{item[:script_file] || "未生成"}"] +
+               "  Device report: #{item[:device_report]}", "  Command file: #{item[:script_file] || "not generated"}"] +
                 item.fetch(:neighbors, []).map do |row|
                   "  #{row[:interface]} #{row[:status]} current=#{row[:current].inspect} expected=#{row[:expected].inspect}"
                 end + item.fetch(:issues, []).map { |issue| "  #{issue[:interface]} #{Netdisco::Topology::Presentation.reason(issue[:code])}" } +
@@ -398,10 +398,10 @@ module Net
           # 默认只打印设备、接口两层摘要；逐设备及命令详情已经写入独立报告。
           def result_lines(data)
             stats = data.fetch(:statistics)
-            ["结果：#{Netdisco::Topology::Presentation.result(data)}；模式：#{data[:mode]}",
-             "设备：采集完成 #{stats[:collected]} 台；无需修改 #{stats[:unchanged]} 台；有候选变更 #{stats[:change_devices]} 台；失败 #{stats[:failed]} 台",
-             "接口：候选变更 #{stats[:changes]} 个；待核实 #{stats[:review_interfaces]} 个（涉及 #{stats[:review_devices]} 台设备）",
-             "待核实原因：#{Netdisco::Topology::Presentation.issues(data[:devices].flat_map { |item| item.fetch(:issues, []) })}"]
+            ["Result: #{Netdisco::Topology::Presentation.result(data)}; mode: #{data[:mode]}",
+             "Devices: collected #{stats[:collected]}; unchanged #{stats[:unchanged]}; with candidate changes #{stats[:change_devices]}; failed #{stats[:failed]} devices",
+             "Interfaces: candidate changes #{stats[:changes]}; unverified #{stats[:review_interfaces]} (across #{stats[:review_devices]} devices)",
+             "Unverified reasons: #{Netdisco::Topology::Presentation.issues(data[:devices].flat_map { |item| item.fetch(:issues, []) })}"]
           end
 
           # 按 JSON 或安全文本格式输出设备结果及报告位置。
@@ -410,7 +410,7 @@ module Net
               @output.puts JSON.generate(data)
             else
               if data.key?(:total)
-                @output.puts "清单 #{data[:total]} 台；本次 #{data[:ready]} 台；跳过 #{data[:total] - data[:ready]} 台"
+                @output.puts "Inventory #{data[:total]} devices; selected #{data[:ready]}; skipped #{data[:total] - data[:ready]} devices"
               end
               if data.key?(:total)
                 data.fetch(:devices).each do |item|
@@ -421,11 +421,11 @@ module Net
               if data[:directory]
                 @output.puts result_lines(data)
                 scripts = data[:devices].count { |item| item[:script_file] }
-                @output.puts "命令文件：#{File.join(data[:directory], "scripts")}（#{scripts} 台有变更）" if scripts.positive?
-                @output.puts "设备报告：#{File.join(data[:directory], "devices")}"
-                @output.puts "计划：#{File.join(data[:directory], "plan.json")}"
-                @output.puts "报告：#{File.join(data[:directory], "summary.json")}"
-                @output.puts "文本报告：#{File.join(data[:directory], "summary.txt")}"
+                @output.puts "Command file: #{File.join(data[:directory], "scripts")}(#{scripts} devices with changes)" if scripts.positive?
+                @output.puts "Device report: #{File.join(data[:directory], "devices")}"
+                @output.puts "Plan: #{File.join(data[:directory], "plan.json")}"
+                @output.puts "Report: #{File.join(data[:directory], "summary.json")}"
+                @output.puts "Text report: #{File.join(data[:directory], "summary.txt")}"
               end
             end
           end

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

@@ -59,14 +59,14 @@ module Net
           @error.puts "net-backup: #{message}"
           2
         rescue OptionParser::ParseError
-          @error.puts "net-backup: 参数无效；使用 --help 查看参数"
+          @error.puts "net-backup: invalid arguments; use --help for options"
           2
         rescue ArgumentError, KeyError, Errno::ENOENT,
           Psych::Exception, JSON::ParserError, Inventory::Error => exception
           @error.puts "net-backup: #{exception.message}"
           2
         rescue StandardError => exception
-          @error.puts "net-backup 失败（#{exception.class}）"
+          @error.puts "net-backup failed (#{exception.class})"
           2
         end
 
@@ -111,7 +111,7 @@ module Net
                    fleet.plan_backup(limit_per_vendor: limit, **refresh)
                  end
           options[:host]&.split(",")&.each do |host|
-            raise ArgumentError, "清单中未找到设备 #{host}" unless plan.inventory.any? { |device| device.host == host }
+            raise ArgumentError, "Device not found in inventory: #{host}" unless plan.inventory.any? { |device| device.host == host }
           end
           plan
         end
@@ -120,9 +120,9 @@ module Net
         def inventory_warning(fleet)
           status = fleet.inventory_status if fleet.respond_to?(:inventory_status)
           if status && status[:source] == :stale_cache
-            @error.puts "net-backup: 清单刷新失败，使用历史缓存（#{status[:refresh_error_code]}）"
+            @error.puts "net-backup: inventory refresh failed; using the previous cache (#{status[:refresh_error_code]})"
           end
-          @error.puts "net-backup: 清单缓存写入失败（#{status[:write_error_type]}）" if status && status[:write_error_type]
+          @error.puts "net-backup: inventory cache write failed (#{status[:write_error_type]})" if status && status[:write_error_type]
         end
 
         # 仅执行已经校验的计划，保留本地与 TFTP 两种结果语义。
@@ -143,25 +143,25 @@ module Net
         def parse_options
           options = { environment: {} }
           parser = OptionParser.new do |args|
-            args.banner = "用法：net-backup [--config FILE] [--plan | --show-config | --export IP] [--tftp]"
+            args.banner = "Usage: net-backup [--config FILE] [--plan | --show-config | --export IP] [--tftp]"
             Options.add_settings(args, options)
             Options.add_execution(args, options)
-            args.on("--init", "创建用户目录中的缺失配置和环境模板后退出") { options[:init] = true }
-            args.on("--interactive", "通过终端问答创建缺失配置") { options[:interactive] = true }
-            args.on("--non-interactive", "禁用配置问答") { options[:interactive] = false }
-            args.on("--source SOURCE", %w[http postgres], "清单来源：http（默认）或 postgres") { |value| options[:source] = value }
-            args.on("--query SQL", "PostgreSQL 清单查询，使用 $1、$2 绑定参数") { |value| options[:query] = value }
-            args.on("--query-params JSON", "查询参数的 JSON 数组") { |value| options[:query_params] = value }
-            args.on("--plan", "预览设备清单，不连接设备") { options[:plan] = true }
-            args.on("--tftp", "由设备发起 TFTP 备份") { options[:tftp] = true }
-            args.on("--export IP", "导出已保存的本地配置") { |value| options[:export] = value }
-            args.on("--output FILE", "将导出配置写入私有文件") { |value| options[:output] = value }
-            args.on("--max-script-output-bytes N", Integer, "每个脚本的累计响应字节上限") { |value| options[:max_script_output_bytes] = value }
-            args.on("-v", "--version", "显示版本") do
+            args.on("--init", "Create missing configuration and environment templates in the user directory, then exit") { options[:init] = true }
+            args.on("--interactive", "Create missing configuration through terminal prompts") { options[:interactive] = true }
+            args.on("--non-interactive", "Disable configuration prompts") { options[:interactive] = false }
+            args.on("--source SOURCE", %w[http postgres], "Inventory source: http (default) or postgres") { |value| options[:source] = value }
+            args.on("--query SQL", "PostgreSQL inventory query using $1 and $2 bound parameters") { |value| options[:query] = value }
+            args.on("--query-params JSON", "JSON array of query parameters") { |value| options[:query_params] = value }
+            args.on("--plan", "Preview device inventory without connecting to devices") { options[:plan] = true }
+            args.on("--tftp", "Have devices initiate TFTP backups") { options[:tftp] = true }
+            args.on("--export IP", "Export a saved local configuration") { |value| options[:export] = value }
+            args.on("--output FILE", "Write exported configuration to a private file") { |value| options[:output] = value }
+            args.on("--max-script-output-bytes N", Integer, "Cumulative response byte limit per script") { |value| options[:max_script_output_bytes] = value }
+            args.on("-v", "--version", "Show version") do
               @output.puts Net::Connector::VERSION
               options[:done] = true
             end
-            args.on("-h", "--help", "显示帮助") do
+            args.on("-h", "--help", "Show help") do
               @output.puts args
               options[:done] = true
             end
@@ -179,15 +179,15 @@ module Net
           Planner.validate_limit!(options[:limit])
           raise ArgumentError, "--tftp-root requires --tftp" if options[:tftp_root] && !options[:tftp]
           modes = [:show_config, :plan, :export].count { |key| options[key] }
-          raise ArgumentError, "--show-config、--plan 和 --export 只能选择一项" if modes > 1
-          raise ArgumentError, "--output 需要同时指定 --export" if options[:output] && !options[:export]
-          raise ArgumentError, "--all 不能与 --limit-per-vendor 同时使用" if options[:all] && options[:limit]
+          raise ArgumentError, "Select only one of --show-config, --plan and --export" if modes > 1
+          raise ArgumentError, "--output requires --export" if options[:output] && !options[:export]
+          raise ArgumentError, "--all cannot be combined with --limit-per-vendor" if options[:all] && options[:limit]
           if options[:export] && (options[:source] || options[:query] || options[:query_params])
-            raise ArgumentError, "--export 不能与清单查询选项同时使用"
+            raise ArgumentError, "--export cannot be combined with inventory query options"
           end
           if options[:export] && (options[:tftp] || options[:all] || options[:limit] || options[:environment].key?("NC_PARALLEL") || options[:host] ||
             options[:success_policy] || options[:tftp_root] || options[:max_script_output_bytes] || options[:force_refresh])
-            raise ArgumentError, "--export 不能与备份选项同时使用"
+            raise ArgumentError, "--export cannot be combined with backup options"
           end
         end
 

data/lib/net/connector/netdisco/config/defaults.rb

@@ -48,7 +48,7 @@ module Net
             else value
             end
           rescue ArgumentError, TypeError, JSON::ParserError
-            raise ArgumentError, "初始化参数 #{key} 格式无效", cause: nil
+            raise ArgumentError, "Initialization parameter #{key} has an invalid format", cause: nil
           end
 
           # 同一字段声明同时约束加载与生成，不持久化密码或未知环境变量。

data/lib/net/connector/netdisco/config/initializer.rb

@@ -29,7 +29,7 @@ module Net
             values = YAML.safe_load(YAML.dump(document), aliases: false)
             validate!(values)
             interactive = CtxCli::Terminal.tty?(@input, @output) if interactive.nil?
-            configure(values, mode: mode, inherited_parallel: inherited_parallel) if interactive && answer("进入交互配置？[y/N]", "n").casecmp?("y")
+            configure(values, mode: mode, inherited_parallel: inherited_parallel) if interactive && answer("Start interactive configuration? [y/N]", "n").casecmp?("y")
             validate!(values)
             name = mode == :topology ? "topology" : "backup"
             write(path, Net::Connector::Config.dump(values, name: name, path: path))
@@ -54,7 +54,7 @@ module Net
 
           # 显示有效默认值；空输入可由字段选择沿用或保留继承，输入结束则中止生成。
           def answer(label, default, blank: default)
-            @output.print "#{label}#{default.nil? ? "" : " [#{default}]"}："
+            @output.print "#{label}#{default.nil? ? "" : " [#{default}]"}: "
             @output.flush
             line = @input.gets("\n")
             raise EOFError, "configuration input ended before completion" unless line
@@ -67,7 +67,7 @@ module Net
           def field(document, section, key, label, default, list: false)
             values = (document[section] ||= {})
             previous = values.fetch(key, default)
-            label = "#{label}（留空继承）" if key == "parallel" && !values.key?(key)
+            label = "#{label}(leave blank to inherit)" if key == "parallel" && !values.key?(key)
             loop do
               displayed = previous.is_a?(Array) ? previous.join(",") : previous&.to_s
               text = answer(label, displayed, blank: key == "parallel" ? nil : displayed)
@@ -86,30 +86,30 @@ module Net
                 values[key] = value
                 return
               rescue ArgumentError
-                @output.puts "值无效，请重新输入。"
+                @output.puts "Invalid value; enter it again."
               end
             end
           end
 
           # 按清单来源和业务模式逐项填写非敏感配置。
           def configure(document, mode: nil, inherited_parallel:)
-            field(document, "netdisco", "source", "清单来源 http/postgres", "http")
+            field(document, "netdisco", "source", "Inventory source http/postgres", "http")
             if document.dig("netdisco", "source") == "http"
-              field(document, "netdisco", "url", "清单 URL", mode.nil? ? "https://netdisco.example.invalid" : nil)
+              field(document, "netdisco", "url", "Inventory URL", mode.nil? ? "https://netdisco.example.invalid" : nil)
             end
             %w[include_hosts exclude_hosts include_names exclude_names include_models exclude_models].each do |key|
               field(document, "inventory", key, key, [], list: true)
             end
-            field(document, "inventory", "name_match", "名称匹配 contains/prefix/glob", "contains")
-            field(document, "inventory", "model_match", "型号匹配 contains/prefix/glob", "contains")
+            field(document, "inventory", "name_match", "Name matching contains/prefix/glob", "contains")
+            field(document, "inventory", "model_match", "Model matching contains/prefix/glob", "contains")
             %w[include_vendors exclude_vendors].each { |key| field(document, "inventory", key, key, [], list: true) }
             if document.key?("topology")
-              field(document, "topology", "parallel", "拓扑并发数 1..500", inherited_parallel)
-              field(document, "topology", "directory", "拓扑报告目录", "./topologys")
+              field(document, "topology", "parallel", "Topology concurrency 1..500", inherited_parallel)
+              field(document, "topology", "directory", "Topology report directory", "./topologys")
             else
-              field(document, "backup", "parallel", "并发数 1..500", inherited_parallel)
-              field(document, "backup", "directory", "备份目录", "./backups")
-              field(document, "tftp", "server", "TFTP 服务器", nil) if mode.nil? || mode == :tftp
+              field(document, "backup", "parallel", "Concurrency 1..500", inherited_parallel)
+              field(document, "backup", "directory", "Backup directory", "./backups")
+              field(document, "tftp", "server", "TFTP server", nil) if mode.nil? || mode == :tftp
             end
           end