Skip to content

Commit 7c8ecc6

Browse files
Remove admin-cli for site-explorer and machine level overrides
Signed-off-by: aadvani <aadvani@nvidia.com>
1 parent ac68846 commit 7c8ecc6

18 files changed

Lines changed: 14 additions & 454 deletions

File tree

crates/admin-cli/src/machine/mod.rs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ pub mod network;
2525
pub mod nvlink_info;
2626
pub mod positions;
2727
pub mod reboot;
28-
pub mod restart_ovs;
2928
pub mod show;
3029

3130
#[cfg(test)]
@@ -79,9 +78,4 @@ pub enum Cmd {
7978
Positions(positions::Args),
8079
#[clap(subcommand, about = "Update/show NVLink info for an MNNVL machine")]
8180
NvlinkInfo(nvlink_info::Args),
82-
#[clap(
83-
name = "restart-ovs-on-use-admin-network-change",
84-
about = "Set OVS restart on admin network change for a machine"
85-
)]
86-
RestartOvs(restart_ovs::Args),
8781
}

crates/admin-cli/src/machine/restart_ovs/args.rs

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

crates/admin-cli/src/machine/restart_ovs/cmd.rs

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

crates/admin-cli/src/machine/restart_ovs/mod.rs

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

crates/admin-cli/src/site_explorer/mod.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ mod is_bmc_in_managed_host;
2626
mod re_explore;
2727
mod refresh_endpoint;
2828
mod remediation;
29-
mod restart_ovs;
3029

3130
#[cfg(test)]
3231
mod tests;
@@ -64,6 +63,4 @@ pub enum Cmd {
6463
IsBmcInManagedHost(is_bmc_in_managed_host::Args),
6564
HaveCredentials(have_credentials::Args),
6665
CopyBfbToDpuRshim(copy_bfb_to_dpu_rshim::Args),
67-
#[clap(about = "Enable or disable OVS restart when admin network configuration changes")]
68-
RestartOvsOnUseAdminNetworkChange(restart_ovs::Args),
6966
}

crates/admin-cli/src/site_explorer/restart_ovs/args.rs

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

crates/admin-cli/src/site_explorer/restart_ovs/cmd.rs

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

crates/admin-cli/src/site_explorer/restart_ovs/mod.rs

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

crates/api-core/src/api.rs

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ use self::rpc::forge_server::Forge;
5959
use crate::cfg::file::CarbideConfig;
6060
use crate::dynamic_settings::DynamicSettings;
6161
use crate::ethernet_virtualization::EthVirtData;
62-
use crate::handlers::machine::set_restart_ovs_on_admin_network_change;
6362
use crate::logging::log_limiter::LogLimiter;
6463
use crate::scout_stream::ConnectionRegistry;
6564
use crate::{CarbideError, CarbideResult};
@@ -3085,13 +3084,6 @@ impl Forge for Api {
30853084
crate::handlers::dpf::modify_dpf_state(self, request).await
30863085
}
30873086

3088-
async fn set_restart_ovs_on_admin_network_change(
3089-
&self,
3090-
request: Request<rpc::SetRestartOvsOnAdminNetworkChangeRequest>,
3091-
) -> Result<Response<()>, Status> {
3092-
set_restart_ovs_on_admin_network_change(self, request).await
3093-
}
3094-
30953087
async fn get_dpf_state(
30963088
&self,
30973089
request: Request<rpc::GetDpfStateRequest>,

crates/api-core/src/handlers/machine.rs

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -865,35 +865,3 @@ pub(crate) async fn update_machine_nv_link_info(
865865

866866
Ok(tonic::Response::new(()))
867867
}
868-
869-
pub(crate) async fn set_restart_ovs_on_admin_network_change(
870-
api: &Api,
871-
request: Request<rpc::SetRestartOvsOnAdminNetworkChangeRequest>,
872-
) -> Result<Response<()>, Status> {
873-
log_request_data(&request);
874-
let request = request.get_ref();
875-
let machine_id = convert_and_log_machine_id(request.machine_id.as_ref())?;
876-
log_machine_id(&machine_id);
877-
878-
if !machine_id.machine_type().is_host() {
879-
return Err(Status::invalid_argument(format!(
880-
"machine_id '{}' must be a host machine ID",
881-
machine_id
882-
)));
883-
}
884-
885-
let valid_values = ["enable", "none", "force_disable"];
886-
if !valid_values.contains(&request.value.as_str()) {
887-
return Err(Status::invalid_argument(format!(
888-
"Invalid value '{}'. Must be one of: enable, none, force_disable",
889-
request.value
890-
)));
891-
}
892-
893-
let mut txn = api.txn_begin().await?;
894-
db::machine::set_restart_ovs_on_use_admin_network_change(&mut txn, &machine_id, &request.value)
895-
.await?;
896-
txn.commit().await?;
897-
898-
Ok(Response::new(()))
899-
}

0 commit comments

Comments
 (0)