Skip to content

chore: Prepare for octavia filters #807

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gtema merged 1 commit into from
Nov 27, 2024
Merged

chore: Prepare for octavia filters #807

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 13 additions & 10 deletions openstack_tui/src/cloud_worker/load_balancer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,9 +109,10 @@ impl LoadBalancerExt for Cloud {
async fn get_listeners(&mut self, filters: &LoadBalancerListenerFilters) -> Result<Vec<Value>> {
if let Some(session) = &self.cloud {
let ep =
openstack_sdk::api::load_balancer::v2::listener::list::RequestBuilder::try_from(
filters,
)?
//openstack_sdk::api::load_balancer::v2::listener::list::RequestBuilder::try_from(
// filters,
//)?
openstack_sdk::api::load_balancer::v2::listener::list::RequestBuilder::default()
.build()?;

let res: Vec<Value> = ep.query_async(session).await?;
Expand All @@ -133,10 +134,11 @@ impl LoadBalancerExt for Cloud {

async fn get_pools(&mut self, filters: &LoadBalancerPoolFilters) -> Result<Vec<Value>> {
if let Some(session) = &self.cloud {
let ep = openstack_sdk::api::load_balancer::v2::pool::list::RequestBuilder::try_from(
filters,
)?
.build()?;
//let ep = openstack_sdk::api::load_balancer::v2::pool::list::RequestBuilder::try_from(
// filters,
//)?
let ep = openstack_sdk::api::load_balancer::v2::pool::list::RequestBuilder::default()
.build()?;

let res: Vec<Value> = ep.query_async(session).await?;
return Ok(res);
Expand Down Expand Up @@ -167,9 +169,10 @@ impl LoadBalancerExt for Cloud {
) -> Result<Vec<Value>> {
if let Some(session) = &self.cloud {
let ep =
openstack_sdk::api::load_balancer::v2::healthmonitor::list::RequestBuilder::try_from(
filters,
)?
//openstack_sdk::api::load_balancer::v2::healthmonitor::list::RequestBuilder::try_from(
// filters,
//)?
openstack_sdk::api::load_balancer::v2::healthmonitor::list::RequestBuilder::default()
.build()?;

let res: Vec<Value> = ep.query_async(session).await?;
Expand Down
78 changes: 39 additions & 39 deletions openstack_tui/src/cloud_worker/load_balancer/types.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,22 +48,22 @@ impl fmt::Display for LoadBalancerListenerFilters {
}
}

impl TryFrom<&LoadBalancerListenerFilters>
for openstack_sdk::api::load_balancer::v2::listener::list::RequestBuilder
{
type Error = eyre::Report;

fn try_from(value: &LoadBalancerListenerFilters) -> Result<Self, Self::Error> {
let ep_builder = openstack_sdk::api::load_balancer::v2::listener::list::Request::builder();

if let Some(_lb_id) = &value.loadbalancer_id {
// TODO
//ep_builder.loadbalancer_id(lb_id.clone());
}

Ok(ep_builder)
}
}
// impl TryFrom<&LoadBalancerListenerFilters>
// for openstack_sdk::api::load_balancer::v2::listener::list::RequestBuilder<'_>
// {
// type Error = eyre::Report;
//
// fn try_from(value: &LoadBalancerListenerFilters) -> Result<Self, Self::Error> {
// let ep_builder = openstack_sdk::api::load_balancer::v2::listener::list::Request::builder();
//
// if let Some(_lb_id) = &value.loadbalancer_id {
// // TODO
// //ep_builder.loadbalancer_id(lb_id.clone());
// }
//
// Ok(ep_builder)
// }
// }

#[derive(Debug, Default, Clone, PartialEq, Eq, Serialize, Deserialize)]
pub struct LoadBalancerPoolFilters {
Expand All @@ -88,17 +88,17 @@ impl fmt::Display for LoadBalancerPoolFilters {
}
}

impl TryFrom<&LoadBalancerPoolFilters>
for openstack_sdk::api::load_balancer::v2::pool::list::RequestBuilder
{
type Error = eyre::Report;

fn try_from(_value: &LoadBalancerPoolFilters) -> Result<Self, Self::Error> {
let ep_builder = openstack_sdk::api::load_balancer::v2::pool::list::Request::builder();

Ok(ep_builder)
}
}
// impl TryFrom<&LoadBalancerPoolFilters>
// for openstack_sdk::api::load_balancer::v2::pool::list::RequestBuilder<'_>
// {
// type Error = eyre::Report;
//
// fn try_from(_value: &LoadBalancerPoolFilters) -> Result<Self, Self::Error> {
// let ep_builder = openstack_sdk::api::load_balancer::v2::pool::list::Request::builder();
//
// Ok(ep_builder)
// }
// }

#[derive(Debug, Default, Clone, PartialEq, Eq, Serialize, Deserialize)]
pub struct LoadBalancerPoolMemberFilters {
Expand Down Expand Up @@ -155,15 +155,15 @@ impl fmt::Display for LoadBalancerHealthMonitorFilters {
}
}

impl TryFrom<&LoadBalancerHealthMonitorFilters>
for openstack_sdk::api::load_balancer::v2::healthmonitor::list::RequestBuilder
{
type Error = eyre::Report;

fn try_from(_value: &LoadBalancerHealthMonitorFilters) -> Result<Self, Self::Error> {
let ep_builder =
openstack_sdk::api::load_balancer::v2::healthmonitor::list::Request::builder();

Ok(ep_builder)
}
}
// impl TryFrom<&LoadBalancerHealthMonitorFilters>
// for openstack_sdk::api::load_balancer::v2::healthmonitor::list::RequestBuilder<'_>
// {
// type Error = eyre::Report;
//
// fn try_from(_value: &LoadBalancerHealthMonitorFilters) -> Result<Self, Self::Error> {
// let ep_builder =
// openstack_sdk::api::load_balancer::v2::healthmonitor::list::Request::builder();
//
// Ok(ep_builder)
// }
// }