mirror of
https://github.com/edera-dev/krata.git
synced 2025-08-03 05:10:55 +00:00
fix(rpc): rename HostStatus to GetHostStatus (#360)
This commit is contained in:
parent
ec74bc8d2b
commit
41aa1aa707
@ -1,6 +1,6 @@
|
|||||||
use anyhow::Result;
|
use anyhow::Result;
|
||||||
use clap::{Parser, ValueEnum};
|
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 crate::format::{kv2line, proto2dynamic, proto2kv};
|
||||||
use tonic::{transport::Channel, Request};
|
use tonic::{transport::Channel, Request};
|
||||||
@ -24,7 +24,7 @@ pub struct HostStatusCommand {
|
|||||||
impl HostStatusCommand {
|
impl HostStatusCommand {
|
||||||
pub async fn run(self, mut client: ControlServiceClient<Channel>) -> Result<()> {
|
pub async fn run(self, mut client: ControlServiceClient<Channel>) -> Result<()> {
|
||||||
let response = client
|
let response = client
|
||||||
.host_status(Request::new(HostStatusRequest {}))
|
.get_host_status(Request::new(GetHostStatusRequest {}))
|
||||||
.await?
|
.await?
|
||||||
.into_inner();
|
.into_inner();
|
||||||
match self.format {
|
match self.format {
|
||||||
|
@ -2,21 +2,21 @@ use crate::command::DaemonCommand;
|
|||||||
use crate::ip::assignment::IpAssignment;
|
use crate::ip::assignment::IpAssignment;
|
||||||
use crate::zlt::ZoneLookupTable;
|
use crate::zlt::ZoneLookupTable;
|
||||||
use anyhow::Result;
|
use anyhow::Result;
|
||||||
use krata::v1::control::{HostStatusReply, HostStatusRequest};
|
use krata::v1::control::{GetHostStatusReply, GetHostStatusRequest};
|
||||||
|
|
||||||
pub struct HostStatusRpc {
|
pub struct GetHostStatusRpc {
|
||||||
ip: IpAssignment,
|
ip: IpAssignment,
|
||||||
zlt: ZoneLookupTable,
|
zlt: ZoneLookupTable,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl HostStatusRpc {
|
impl GetHostStatusRpc {
|
||||||
pub fn new(ip: IpAssignment, zlt: ZoneLookupTable) -> Self {
|
pub fn new(ip: IpAssignment, zlt: ZoneLookupTable) -> Self {
|
||||||
Self { ip, zlt }
|
Self { ip, zlt }
|
||||||
}
|
}
|
||||||
|
|
||||||
pub async fn process(self, _request: HostStatusRequest) -> Result<HostStatusReply> {
|
pub async fn process(self, _request: GetHostStatusRequest) -> Result<GetHostStatusReply> {
|
||||||
let host_reservation = self.ip.retrieve(self.zlt.host_uuid()).await?;
|
let host_reservation = self.ip.retrieve(self.zlt.host_uuid()).await?;
|
||||||
Ok(HostStatusReply {
|
Ok(GetHostStatusReply {
|
||||||
host_domid: self.zlt.host_domid(),
|
host_domid: self.zlt.host_domid(),
|
||||||
host_uuid: self.zlt.host_uuid().to_string(),
|
host_uuid: self.zlt.host_uuid().to_string(),
|
||||||
krata_version: DaemonCommand::version(),
|
krata_version: DaemonCommand::version(),
|
@ -9,7 +9,7 @@ use uuid::Uuid;
|
|||||||
use krata::v1::control::{
|
use krata::v1::control::{
|
||||||
control_service_server::ControlService, CreateZoneReply, CreateZoneRequest, DestroyZoneReply,
|
control_service_server::ControlService, CreateZoneReply, CreateZoneRequest, DestroyZoneReply,
|
||||||
DestroyZoneRequest, ExecInsideZoneReply, ExecInsideZoneRequest, GetHostCpuTopologyReply,
|
DestroyZoneRequest, ExecInsideZoneReply, ExecInsideZoneRequest, GetHostCpuTopologyReply,
|
||||||
GetHostCpuTopologyRequest, HostStatusReply, HostStatusRequest, ListDevicesReply,
|
GetHostCpuTopologyRequest, GetHostStatusReply, GetHostStatusRequest, ListDevicesReply,
|
||||||
ListDevicesRequest, ListZonesReply, ListZonesRequest, PullImageReply, PullImageRequest,
|
ListDevicesRequest, ListZonesReply, ListZonesRequest, PullImageReply, PullImageRequest,
|
||||||
ReadHypervisorConsoleReply, ReadHypervisorConsoleRequest, ReadZoneMetricsReply,
|
ReadHypervisorConsoleReply, ReadHypervisorConsoleRequest, ReadZoneMetricsReply,
|
||||||
ReadZoneMetricsRequest, ResolveZoneIdReply, ResolveZoneIdRequest, SnoopIdmReply,
|
ReadZoneMetricsRequest, ResolveZoneIdReply, ResolveZoneIdRequest, SnoopIdmReply,
|
||||||
@ -28,8 +28,8 @@ use crate::control::create_zone::CreateZoneRpc;
|
|||||||
use crate::control::destroy_zone::DestroyZoneRpc;
|
use crate::control::destroy_zone::DestroyZoneRpc;
|
||||||
use crate::control::exec_inside_zone::ExecInsideZoneRpc;
|
use crate::control::exec_inside_zone::ExecInsideZoneRpc;
|
||||||
use crate::control::get_host_cpu_topology::GetHostCpuTopologyRpc;
|
use crate::control::get_host_cpu_topology::GetHostCpuTopologyRpc;
|
||||||
|
use crate::control::get_host_status::GetHostStatusRpc;
|
||||||
use crate::control::get_zone::GetZoneRpc;
|
use crate::control::get_zone::GetZoneRpc;
|
||||||
use crate::control::host_status::HostStatusRpc;
|
|
||||||
use crate::control::list_devices::ListDevicesRpc;
|
use crate::control::list_devices::ListDevicesRpc;
|
||||||
use crate::control::list_zones::ListZonesRpc;
|
use crate::control::list_zones::ListZonesRpc;
|
||||||
use crate::control::pull_image::PullImageRpc;
|
use crate::control::pull_image::PullImageRpc;
|
||||||
@ -52,8 +52,8 @@ pub mod create_zone;
|
|||||||
pub mod destroy_zone;
|
pub mod destroy_zone;
|
||||||
pub mod exec_inside_zone;
|
pub mod exec_inside_zone;
|
||||||
pub mod get_host_cpu_topology;
|
pub mod get_host_cpu_topology;
|
||||||
|
pub mod get_host_status;
|
||||||
pub mod get_zone;
|
pub mod get_zone;
|
||||||
pub mod host_status;
|
|
||||||
pub mod list_devices;
|
pub mod list_devices;
|
||||||
pub mod list_zones;
|
pub mod list_zones;
|
||||||
pub mod pull_image;
|
pub mod pull_image;
|
||||||
@ -128,13 +128,13 @@ impl DaemonControlService {
|
|||||||
|
|
||||||
#[tonic::async_trait]
|
#[tonic::async_trait]
|
||||||
impl ControlService for DaemonControlService {
|
impl ControlService for DaemonControlService {
|
||||||
async fn host_status(
|
async fn get_host_status(
|
||||||
&self,
|
&self,
|
||||||
request: Request<HostStatusRequest>,
|
request: Request<GetHostStatusRequest>,
|
||||||
) -> Result<Response<HostStatusReply>, Status> {
|
) -> Result<Response<GetHostStatusReply>, Status> {
|
||||||
let request = request.into_inner();
|
let request = request.into_inner();
|
||||||
adapt(
|
adapt(
|
||||||
HostStatusRpc::new(self.ip.clone(), self.zlt.clone())
|
GetHostStatusRpc::new(self.ip.clone(), self.zlt.clone())
|
||||||
.process(request)
|
.process(request)
|
||||||
.await,
|
.await,
|
||||||
)
|
)
|
||||||
|
@ -10,7 +10,7 @@ import "krata/idm/transport.proto";
|
|||||||
import "krata/v1/common.proto";
|
import "krata/v1/common.proto";
|
||||||
|
|
||||||
service ControlService {
|
service ControlService {
|
||||||
rpc HostStatus(HostStatusRequest) returns (HostStatusReply);
|
rpc GetHostStatus(GetHostStatusRequest) returns (GetHostStatusReply);
|
||||||
rpc SnoopIdm(SnoopIdmRequest) returns (stream SnoopIdmReply);
|
rpc SnoopIdm(SnoopIdmRequest) returns (stream SnoopIdmReply);
|
||||||
rpc GetHostCpuTopology(GetHostCpuTopologyRequest) returns (GetHostCpuTopologyReply);
|
rpc GetHostCpuTopology(GetHostCpuTopologyRequest) returns (GetHostCpuTopologyReply);
|
||||||
rpc SetHostPowerManagementPolicy(SetHostPowerManagementPolicyRequest) returns (SetHostPowerManagementPolicyReply);
|
rpc SetHostPowerManagementPolicy(SetHostPowerManagementPolicyRequest) returns (SetHostPowerManagementPolicyReply);
|
||||||
@ -39,9 +39,9 @@ service ControlService {
|
|||||||
rpc ReadHypervisorConsole(ReadHypervisorConsoleRequest) returns (ReadHypervisorConsoleReply);
|
rpc ReadHypervisorConsole(ReadHypervisorConsoleRequest) returns (ReadHypervisorConsoleReply);
|
||||||
}
|
}
|
||||||
|
|
||||||
message HostStatusRequest {}
|
message GetHostStatusRequest {}
|
||||||
|
|
||||||
message HostStatusReply {
|
message GetHostStatusReply {
|
||||||
string host_uuid = 1;
|
string host_uuid = 1;
|
||||||
uint32 host_domid = 2;
|
uint32 host_domid = 2;
|
||||||
string krata_version = 3;
|
string krata_version = 3;
|
||||||
|
@ -9,7 +9,7 @@ use krata::{
|
|||||||
dial::ControlDialAddress,
|
dial::ControlDialAddress,
|
||||||
v1::{
|
v1::{
|
||||||
common::Zone,
|
common::Zone,
|
||||||
control::{control_service_client::ControlServiceClient, HostStatusRequest},
|
control::{control_service_client::ControlServiceClient, GetHostStatusRequest},
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
use log::warn;
|
use log::warn;
|
||||||
@ -47,7 +47,7 @@ impl NetworkService {
|
|||||||
pub async fn new(control_address: ControlDialAddress) -> Result<NetworkService> {
|
pub async fn new(control_address: ControlDialAddress) -> Result<NetworkService> {
|
||||||
let mut control = ControlClientProvider::dial(control_address).await?;
|
let mut control = ControlClientProvider::dial(control_address).await?;
|
||||||
let host_status = control
|
let host_status = control
|
||||||
.host_status(Request::new(HostStatusRequest {}))
|
.get_host_status(Request::new(GetHostStatusRequest {}))
|
||||||
.await?
|
.await?
|
||||||
.into_inner();
|
.into_inner();
|
||||||
let host_ipv4 = Ipv4Cidr::from_str(&host_status.host_ipv4)
|
let host_ipv4 = Ipv4Cidr::from_str(&host_status.host_ipv4)
|
||||||
|
Loading…
Reference in New Issue
Block a user