fixes to allow brain-mock to run on real nodes
This commit is contained in:
parent
b13b545501
commit
ac2012f04d
16
src/data.rs
16
src/data.rs
@ -383,10 +383,10 @@ impl BrainData {
|
|||||||
&& n.avail_vcpus >= filters.vcpus
|
&& n.avail_vcpus >= filters.vcpus
|
||||||
&& n.avail_mem_mb >= filters.memory_mb
|
&& n.avail_mem_mb >= filters.memory_mb
|
||||||
&& n.avail_storage_gbs >= filters.storage_gb
|
&& n.avail_storage_gbs >= filters.storage_gb
|
||||||
&& (!filters.country.is_empty() && (n.country == filters.country))
|
&& (filters.country.is_empty() || (n.country == filters.country))
|
||||||
&& (!filters.city.is_empty() && (n.city == filters.city))
|
&& (filters.city.is_empty() || (n.city == filters.city))
|
||||||
&& (!filters.region.is_empty() && (n.region == filters.region))
|
&& (filters.region.is_empty() || (n.region == filters.region))
|
||||||
&& (!filters.ip.is_empty() && (n.ip == filters.ip))
|
&& (filters.ip.is_empty() || (n.ip == filters.ip))
|
||||||
})
|
})
|
||||||
.cloned()
|
.cloned()
|
||||||
.collect()
|
.collect()
|
||||||
@ -407,10 +407,10 @@ impl BrainData {
|
|||||||
&& n.avail_vcpus >= filters.vcpus
|
&& n.avail_vcpus >= filters.vcpus
|
||||||
&& n.avail_mem_mb >= filters.memory_mb
|
&& n.avail_mem_mb >= filters.memory_mb
|
||||||
&& n.avail_storage_gbs >= filters.storage_gb
|
&& n.avail_storage_gbs >= filters.storage_gb
|
||||||
&& (!filters.country.is_empty() && (n.country == filters.country))
|
&& (filters.country.is_empty() || (n.country == filters.country))
|
||||||
&& (!filters.city.is_empty() && (n.city == filters.city))
|
&& (filters.city.is_empty() || (n.city == filters.city))
|
||||||
&& (!filters.region.is_empty() && (n.region == filters.region))
|
&& (filters.region.is_empty() || (n.region == filters.region))
|
||||||
&& (!filters.ip.is_empty() && (n.ip == filters.ip))
|
&& (filters.ip.is_empty() || (n.ip == filters.ip))
|
||||||
})
|
})
|
||||||
.cloned()
|
.cloned()
|
||||||
}
|
}
|
||||||
|
@ -99,7 +99,7 @@ impl BrainDaemonService for BrainDaemonMock {
|
|||||||
&self,
|
&self,
|
||||||
req: Request<Streaming<NodeResourceReq>>,
|
req: Request<Streaming<NodeResourceReq>>,
|
||||||
) -> Result<Response<Empty>, Status> {
|
) -> Result<Response<Empty>, Status> {
|
||||||
debug!("Some node connected to stream NewVMResp");
|
debug!("Some node connected to stream NodeResourceReq");
|
||||||
let mut resp_stream = req.into_inner();
|
let mut resp_stream = req.into_inner();
|
||||||
// Don't do this in prod.
|
// Don't do this in prod.
|
||||||
let mut node_pubkey = String::new();
|
let mut node_pubkey = String::new();
|
||||||
@ -272,7 +272,7 @@ impl BrainDaemonService for BrainDaemonMock {
|
|||||||
&self,
|
&self,
|
||||||
req: Request<Streaming<UpdateVmResp>>,
|
req: Request<Streaming<UpdateVmResp>>,
|
||||||
) -> Result<Response<Empty>, Status> {
|
) -> Result<Response<Empty>, Status> {
|
||||||
debug!("Some node connected to stream NewVMResp");
|
debug!("Some node connected to stream UpdateVmResp");
|
||||||
let mut resp_stream = req.into_inner();
|
let mut resp_stream = req.into_inner();
|
||||||
while let Some(update_vm_resp) = resp_stream.next().await {
|
while let Some(update_vm_resp) = resp_stream.next().await {
|
||||||
match update_vm_resp {
|
match update_vm_resp {
|
||||||
|
@ -15,7 +15,7 @@ async fn main() {
|
|||||||
.filter_level(log::LevelFilter::Debug)
|
.filter_level(log::LevelFilter::Debug)
|
||||||
.init();
|
.init();
|
||||||
let data = Arc::new(BrainData::new());
|
let data = Arc::new(BrainData::new());
|
||||||
let addr = "[::1]:31337".parse().unwrap();
|
let addr = "0.0.0.0:31337".parse().unwrap();
|
||||||
|
|
||||||
let daemon_server = BrainDaemonServiceServer::new(BrainDaemonMock::new(data.clone()));
|
let daemon_server = BrainDaemonServiceServer::new(BrainDaemonMock::new(data.clone()));
|
||||||
let cli_server = BrainCliServiceServer::new(BrainCliMock::new(data.clone()));
|
let cli_server = BrainCliServiceServer::new(BrainCliMock::new(data.clone()));
|
||||||
|
Loading…
Reference in New Issue
Block a user