Skip to content

Commit e44ad55

Browse files
authored
Rename ReconfiguratorChickenSwitches* to ReconfiguratorConfig* (#9005)
Followup from #8980 (comment).
1 parent 8442cee commit e44ad55

File tree

53 files changed

+789
-912
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+789
-912
lines changed

clients/nexus-client/src/lib.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,10 @@ progenitor::generate_api!(
5757
OximeterReadMode = nexus_types::deployment::OximeterReadMode,
5858
OximeterReadPolicy = nexus_types::deployment::OximeterReadPolicy,
5959
PendingMgsUpdate = nexus_types::deployment::PendingMgsUpdate,
60-
PlannerChickenSwitches = nexus_types::deployment::PlannerChickenSwitches,
61-
ReconfiguratorChickenSwitches = nexus_types::deployment::ReconfiguratorChickenSwitches,
62-
ReconfiguratorChickenSwitchesParam = nexus_types::deployment::ReconfiguratorChickenSwitchesParam,
63-
ReconfiguratorChickenSwitchesView = nexus_types::deployment::ReconfiguratorChickenSwitchesView,
60+
PlannerConfig = nexus_types::deployment::PlannerConfig,
61+
ReconfiguratorConfig = nexus_types::deployment::ReconfiguratorConfig,
62+
ReconfiguratorConfigParam = nexus_types::deployment::ReconfiguratorConfigParam,
63+
ReconfiguratorConfigView = nexus_types::deployment::ReconfiguratorConfigView,
6464
RecoverySiloConfig = nexus_sled_agent_shared::recovery_silo::RecoverySiloConfig,
6565
Srv = nexus_types::internal_api::params::Srv,
6666
TypedUuidForBlueprintKind = omicron_uuid_kinds::BlueprintUuid,

dev-tools/omdb/src/bin/omdb/nexus.rs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
//! omdb commands that query or update specific Nexus instances
66
7-
mod chicken_switches;
87
mod quiesce;
8+
mod reconfigurator_config;
99
mod update_status;
1010

1111
use crate::Omdb;
@@ -19,8 +19,6 @@ use crate::helpers::should_colorize;
1919
use anyhow::Context as _;
2020
use anyhow::bail;
2121
use camino::Utf8PathBuf;
22-
use chicken_switches::ChickenSwitchesArgs;
23-
use chicken_switches::cmd_nexus_chicken_switches;
2422
use chrono::DateTime;
2523
use chrono::SecondsFormat;
2624
use chrono::Utc;
@@ -82,6 +80,8 @@ use omicron_uuid_kinds::SledUuid;
8280
use omicron_uuid_kinds::SupportBundleUuid;
8381
use quiesce::QuiesceArgs;
8482
use quiesce::cmd_nexus_quiesce;
83+
use reconfigurator_config::ReconfiguratorConfigArgs;
84+
use reconfigurator_config::cmd_nexus_reconfigurator_config;
8585
use serde::Deserialize;
8686
use slog_error_chain::InlineErrorChain;
8787
use std::collections::BTreeMap;
@@ -133,8 +133,6 @@ enum NexusCommands {
133133
BackgroundTasks(BackgroundTasksArgs),
134134
/// interact with blueprints
135135
Blueprints(BlueprintsArgs),
136-
/// interact with reconfigurator chicken switches
137-
ChickenSwitches(ChickenSwitchesArgs),
138136
/// interact with clickhouse policy
139137
ClickhousePolicy(ClickhousePolicyArgs),
140138
/// print information about pending MGS updates
@@ -143,6 +141,8 @@ enum NexusCommands {
143141
OximeterReadPolicy(OximeterReadPolicyArgs),
144142
/// view or modify the quiesce status
145143
Quiesce(QuiesceArgs),
144+
/// interact with reconfigurator config
145+
ReconfiguratorConfig(ReconfiguratorConfigArgs),
146146
/// view sagas, create and complete demo sagas
147147
Sagas(SagasArgs),
148148
/// interact with sleds
@@ -698,10 +698,6 @@ impl NexusArgs {
698698
cmd_nexus_blueprints_import(&client, token, args).await
699699
}
700700

701-
NexusCommands::ChickenSwitches(args) => {
702-
cmd_nexus_chicken_switches(&omdb, &client, args).await
703-
}
704-
705701
NexusCommands::ClickhousePolicy(ClickhousePolicyArgs {
706702
command,
707703
}) => match command {
@@ -733,6 +729,10 @@ impl NexusArgs {
733729
cmd_nexus_quiesce(&omdb, &client, args).await
734730
}
735731

732+
NexusCommands::ReconfiguratorConfig(args) => {
733+
cmd_nexus_reconfigurator_config(&omdb, &client, args).await
734+
}
735+
736736
NexusCommands::Sagas(SagasArgs { command }) => {
737737
if self.nexus_internal_url.is_none() {
738738
eprintln!(

dev-tools/omdb/src/bin/omdb/nexus/chicken_switches.rs

Lines changed: 0 additions & 240 deletions
This file was deleted.

0 commit comments

Comments
 (0)