From d7a744dde44908af030a5ff51b38d55c50fb81a1 Mon Sep 17 00:00:00 2001 From: Alex Zenla Date: Sat, 24 Aug 2024 22:57:57 -0700 Subject: [PATCH] fix(rpc): rename HostStatus to GetHostStatus --- crates/ctl/src/cli/host/status.rs | 4 ++-- .../control/{host_status.rs => get_host_status.rs} | 10 +++++----- crates/daemon/src/control/mod.rs | 14 +++++++------- crates/krata/proto/krata/v1/control.proto | 6 +++--- crates/network/src/lib.rs | 4 ++-- 5 files changed, 19 insertions(+), 19 deletions(-) rename crates/daemon/src/control/{host_status.rs => get_host_status.rs} (80%) diff --git a/crates/ctl/src/cli/host/status.rs b/crates/ctl/src/cli/host/status.rs index a14f5ab..858e610 100644 --- a/crates/ctl/src/cli/host/status.rs +++ b/crates/ctl/src/cli/host/status.rs @@ -1,6 +1,6 @@ use anyhow::Result; use clap::{Parser, ValueEnum}; -use krata::v1::control::{control_service_client::ControlServiceClient, HostStatusRequest}; +use krata::v1::control::{control_service_client::ControlServiceClient, GetHostStatusRequest}; use crate::format::{kv2line, proto2dynamic, proto2kv}; use tonic::{transport::Channel, Request}; @@ -24,7 +24,7 @@ pub struct HostStatusCommand { impl HostStatusCommand { pub async fn run(self, mut client: ControlServiceClient) -> Result<()> { let response = client - .host_status(Request::new(HostStatusRequest {})) + .get_host_status(Request::new(GetHostStatusRequest {})) .await? .into_inner(); match self.format { diff --git a/crates/daemon/src/control/host_status.rs b/crates/daemon/src/control/get_host_status.rs similarity index 80% rename from crates/daemon/src/control/host_status.rs rename to crates/daemon/src/control/get_host_status.rs index 34864b5..c30d1d7 100644 --- a/crates/daemon/src/control/host_status.rs +++ b/crates/daemon/src/control/get_host_status.rs @@ -2,21 +2,21 @@ use crate::command::DaemonCommand; use crate::ip::assignment::IpAssignment; use crate::zlt::ZoneLookupTable; use anyhow::Result; -use krata::v1::control::{HostStatusReply, HostStatusRequest}; +use krata::v1::control::{GetHostStatusReply, GetHostStatusRequest}; -pub struct HostStatusRpc { +pub struct GetHostStatusRpc { ip: IpAssignment, zlt: ZoneLookupTable, } -impl HostStatusRpc { +impl GetHostStatusRpc { pub fn new(ip: IpAssignment, zlt: ZoneLookupTable) -> Self { Self { ip, zlt } } - pub async fn process(self, _request: HostStatusRequest) -> Result { + pub async fn process(self, _request: GetHostStatusRequest) -> Result { let host_reservation = self.ip.retrieve(self.zlt.host_uuid()).await?; - Ok(HostStatusReply { + Ok(GetHostStatusReply { host_domid: self.zlt.host_domid(), host_uuid: self.zlt.host_uuid().to_string(), krata_version: DaemonCommand::version(), diff --git a/crates/daemon/src/control/mod.rs b/crates/daemon/src/control/mod.rs index 69897e4..455d63c 100644 --- a/crates/daemon/src/control/mod.rs +++ b/crates/daemon/src/control/mod.rs @@ -9,7 +9,7 @@ use uuid::Uuid; use krata::v1::control::{ control_service_server::ControlService, CreateZoneReply, CreateZoneRequest, DestroyZoneReply, DestroyZoneRequest, ExecInsideZoneReply, ExecInsideZoneRequest, GetHostCpuTopologyReply, - GetHostCpuTopologyRequest, HostStatusReply, HostStatusRequest, ListDevicesReply, + GetHostCpuTopologyRequest, GetHostStatusReply, GetHostStatusRequest, ListDevicesReply, ListDevicesRequest, ListZonesReply, ListZonesRequest, PullImageReply, PullImageRequest, ReadHypervisorConsoleReply, ReadHypervisorConsoleRequest, ReadZoneMetricsReply, ReadZoneMetricsRequest, ResolveZoneIdReply, ResolveZoneIdRequest, SnoopIdmReply, @@ -28,8 +28,8 @@ use crate::control::create_zone::CreateZoneRpc; use crate::control::destroy_zone::DestroyZoneRpc; use crate::control::exec_inside_zone::ExecInsideZoneRpc; use crate::control::get_host_cpu_topology::GetHostCpuTopologyRpc; +use crate::control::get_host_status::GetHostStatusRpc; use crate::control::get_zone::GetZoneRpc; -use crate::control::host_status::HostStatusRpc; use crate::control::list_devices::ListDevicesRpc; use crate::control::list_zones::ListZonesRpc; use crate::control::pull_image::PullImageRpc; @@ -52,8 +52,8 @@ pub mod create_zone; pub mod destroy_zone; pub mod exec_inside_zone; pub mod get_host_cpu_topology; +pub mod get_host_status; pub mod get_zone; -pub mod host_status; pub mod list_devices; pub mod list_zones; pub mod pull_image; @@ -128,13 +128,13 @@ impl DaemonControlService { #[tonic::async_trait] impl ControlService for DaemonControlService { - async fn host_status( + async fn get_host_status( &self, - request: Request, - ) -> Result, Status> { + request: Request, + ) -> Result, Status> { let request = request.into_inner(); adapt( - HostStatusRpc::new(self.ip.clone(), self.zlt.clone()) + GetHostStatusRpc::new(self.ip.clone(), self.zlt.clone()) .process(request) .await, ) diff --git a/crates/krata/proto/krata/v1/control.proto b/crates/krata/proto/krata/v1/control.proto index d06eb6c..372e135 100644 --- a/crates/krata/proto/krata/v1/control.proto +++ b/crates/krata/proto/krata/v1/control.proto @@ -10,7 +10,7 @@ import "krata/idm/transport.proto"; import "krata/v1/common.proto"; service ControlService { - rpc HostStatus(HostStatusRequest) returns (HostStatusReply); + rpc GetHostStatus(GetHostStatusRequest) returns (GetHostStatusReply); rpc SnoopIdm(SnoopIdmRequest) returns (stream SnoopIdmReply); rpc GetHostCpuTopology(GetHostCpuTopologyRequest) returns (GetHostCpuTopologyReply); rpc SetHostPowerManagementPolicy(SetHostPowerManagementPolicyRequest) returns (SetHostPowerManagementPolicyReply); @@ -39,9 +39,9 @@ service ControlService { rpc ReadHypervisorConsole(ReadHypervisorConsoleRequest) returns (ReadHypervisorConsoleReply); } -message HostStatusRequest {} +message GetHostStatusRequest {} -message HostStatusReply { +message GetHostStatusReply { string host_uuid = 1; uint32 host_domid = 2; string krata_version = 3; diff --git a/crates/network/src/lib.rs b/crates/network/src/lib.rs index edd499a..be93309 100644 --- a/crates/network/src/lib.rs +++ b/crates/network/src/lib.rs @@ -9,7 +9,7 @@ use krata::{ dial::ControlDialAddress, v1::{ common::Zone, - control::{control_service_client::ControlServiceClient, HostStatusRequest}, + control::{control_service_client::ControlServiceClient, GetHostStatusRequest}, }, }; use log::warn; @@ -47,7 +47,7 @@ impl NetworkService { pub async fn new(control_address: ControlDialAddress) -> Result { let mut control = ControlClientProvider::dial(control_address).await?; let host_status = control - .host_status(Request::new(HostStatusRequest {})) + .get_host_status(Request::new(GetHostStatusRequest {})) .await? .into_inner(); let host_ipv4 = Ipv4Cidr::from_str(&host_status.host_ipv4)