Skip to content

feat: Add pagination QP to octavia resources #816

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 29, 2024
Merged

feat: Add pagination QP to octavia resources #816

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: 23 additions & 0 deletions openstack_cli/src/dns/v2/zone/share/list.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ use openstack_sdk::api::find_by_name;
use openstack_sdk::api::QueryAsync;
use openstack_sdk::api::{paged, Pagination};
use serde_json::Value;
use std::fmt;
use structable_derive::StructTable;
use tracing::warn;

Expand Down Expand Up @@ -113,6 +114,28 @@ struct ResponseData {
#[structable(optional, pretty)]
shared_zones: Option<Value>,
}
/// `struct` response type
#[derive(Default, Clone, Deserialize, Serialize)]
struct ResponseLinks {
_self: Option<String>,
zone: Option<String>,
}

impl fmt::Display for ResponseLinks {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
let data = Vec::from([
format!(
"_self={}",
self._self.clone().map_or(String::new(), |v| v.to_string())
),
format!(
"zone={}",
self.zone.clone().map_or(String::new(), |v| v.to_string())
),
]);
write!(f, "{}", data.join(";"))
}
}

impl SharesCommand {
/// Perform command action
Expand Down
93 changes: 62 additions & 31 deletions openstack_cli/src/load_balancer/v2/amphorae/list.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ use crate::StructTable;

use openstack_sdk::api::load_balancer::v2::amphorae::list;
use openstack_sdk::api::QueryAsync;
use openstack_sdk::api::{paged, Pagination};
use structable_derive::StructTable;

/// Lists all amphora for the project.
Expand All @@ -57,6 +58,10 @@ pub struct AmphoraesCommand {
/// Path parameters
#[command(flatten)]
path: PathParameters,

/// Total limit of entities count to return. Use this when there are too many entries.
#[arg(long, default_value_t = 10000)]
max_items: usize,
}

/// Query parameters
Expand Down Expand Up @@ -95,9 +100,24 @@ struct QueryParameters {
#[arg(help_heading = "Query parameters", long)]
lb_network_ip: Option<String>,

/// Page size
///
#[arg(help_heading = "Query parameters", long)]
limit: Option<i32>,

#[arg(help_heading = "Query parameters", long)]
loadbalancer_id: Option<String>,

/// ID of the last item in the previous list
///
#[arg(help_heading = "Query parameters", long)]
marker: Option<String>,

/// The page direction.
///
#[arg(action=clap::ArgAction::Set, help_heading = "Query parameters", long)]
page_reverse: Option<bool>,

#[arg(help_heading = "Query parameters", long)]
role: Option<String>,

Expand Down Expand Up @@ -273,42 +293,66 @@ impl AmphoraesCommand {

// Set path parameters
// Set query parameters
if let Some(val) = &self.query.id {
ep_builder.id(val);
if let Some(val) = &self.query.cached_zone {
ep_builder.cached_zone(val);
}
if let Some(val) = &self.query.loadbalancer_id {
ep_builder.loadbalancer_id(val);
if let Some(val) = &self.query.cert_busy {
ep_builder.cert_busy(val);
}
if let Some(val) = &self.query.cert_expiration {
ep_builder.cert_expiration(val);
}
if let Some(val) = &self.query.compute_id {
ep_builder.compute_id(val);
}
if let Some(val) = &self.query.lb_network_ip {
ep_builder.lb_network_ip(val);
if let Some(val) = &self.query.compute_flavor {
ep_builder.compute_flavor(val);
}
if let Some(val) = &self.query.vrrp_ip {
ep_builder.vrrp_ip(val);
if let Some(val) = &self.query.created_at {
ep_builder.created_at(val);
}
if let Some(val) = &self.query.ha_ip {
ep_builder.ha_ip(val);
}
if let Some(val) = &self.query.vrrp_port_id {
ep_builder.vrrp_port_id(val);
}
if let Some(val) = &self.query.ha_port_id {
ep_builder.ha_port_id(val);
}
if let Some(val) = &self.query.cert_expiration {
ep_builder.cert_expiration(val);
if let Some(val) = &self.query.id {
ep_builder.id(val);
}
if let Some(val) = &self.query.cert_busy {
ep_builder.cert_busy(val);
if let Some(val) = &self.query.image_id {
ep_builder.image_id(val);
}
if let Some(val) = &self.query.lb_network_ip {
ep_builder.lb_network_ip(val);
}
if let Some(val) = &self.query.limit {
ep_builder.limit(*val);
}
if let Some(val) = &self.query.loadbalancer_id {
ep_builder.loadbalancer_id(val);
}
if let Some(val) = &self.query.marker {
ep_builder.marker(val);
}
if let Some(val) = &self.query.page_reverse {
ep_builder.page_reverse(*val);
}
if let Some(val) = &self.query.role {
ep_builder.role(val);
}
if let Some(val) = &self.query.status {
ep_builder.status(val);
}
if let Some(val) = &self.query.updated_at {
ep_builder.updated_at(val);
}
if let Some(val) = &self.query.vrrp_ip {
ep_builder.vrrp_ip(val);
}
if let Some(val) = &self.query.vrrp_port_id {
ep_builder.vrrp_port_id(val);
}
if let Some(val) = &self.query.vrrp_interface {
ep_builder.vrrp_interface(val);
}
Expand All @@ -318,28 +362,15 @@ impl AmphoraesCommand {
if let Some(val) = &self.query.vrrp_priority {
ep_builder.vrrp_priority(val);
}
if let Some(val) = &self.query.cached_zone {
ep_builder.cached_zone(val);
}
if let Some(val) = &self.query.created_at {
ep_builder.created_at(val);
}
if let Some(val) = &self.query.updated_at {
ep_builder.updated_at(val);
}
if let Some(val) = &self.query.image_id {
ep_builder.image_id(val);
}
if let Some(val) = &self.query.compute_flavor {
ep_builder.compute_flavor(val);
}
// Set body parameters

let ep = ep_builder
.build()
.map_err(|x| OpenStackCliError::EndpointBuild(x.to_string()))?;

let data: Vec<serde_json::Value> = ep.query_async(client).await?;
let data: Vec<serde_json::Value> = paged(ep, Pagination::Limit(self.max_items))
.query_async(client)
.await?;

op.output_list::<ResponseData>(data)?;
Ok(())
Expand Down
41 changes: 36 additions & 5 deletions openstack_cli/src/load_balancer/v2/availability_zone/list.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ use crate::StructTable;

use openstack_sdk::api::load_balancer::v2::availability_zone::list;
use openstack_sdk::api::QueryAsync;
use openstack_sdk::api::{paged, Pagination};
use structable_derive::StructTable;

/// Lists all Availability Zones.
Expand All @@ -46,6 +47,10 @@ pub struct AvailabilityZonesCommand {
/// Path parameters
#[command(flatten)]
path: PathParameters,

/// Total limit of entities count to return. Use this when there are too many entries.
#[arg(long, default_value_t = 10000)]
max_items: usize,
}

/// Query parameters
Expand All @@ -57,9 +62,24 @@ struct QueryParameters {
#[arg(help_heading = "Query parameters", long)]
description: Option<String>,

/// Page size
///
#[arg(help_heading = "Query parameters", long)]
limit: Option<i32>,

/// ID of the last item in the previous list
///
#[arg(help_heading = "Query parameters", long)]
marker: Option<String>,

#[arg(help_heading = "Query parameters", long)]
name: Option<String>,

/// The page direction.
///
#[arg(action=clap::ArgAction::Set, help_heading = "Query parameters", long)]
page_reverse: Option<bool>,

#[arg(help_heading = "Query parameters", long)]
status: Option<String>,
}
Expand Down Expand Up @@ -103,14 +123,23 @@ impl AvailabilityZonesCommand {

// Set path parameters
// Set query parameters
if let Some(val) = &self.query.name {
ep_builder.name(val);
if let Some(val) = &self.query.availability_zone_profile_id {
ep_builder.availability_zone_profile_id(val);
}
if let Some(val) = &self.query.description {
ep_builder.description(val);
}
if let Some(val) = &self.query.availability_zone_profile_id {
ep_builder.availability_zone_profile_id(val);
if let Some(val) = &self.query.limit {
ep_builder.limit(*val);
}
if let Some(val) = &self.query.marker {
ep_builder.marker(val);
}
if let Some(val) = &self.query.name {
ep_builder.name(val);
}
if let Some(val) = &self.query.page_reverse {
ep_builder.page_reverse(*val);
}
if let Some(val) = &self.query.status {
ep_builder.status(val);
Expand All @@ -121,7 +150,9 @@ impl AvailabilityZonesCommand {
.build()
.map_err(|x| OpenStackCliError::EndpointBuild(x.to_string()))?;

let data: Vec<serde_json::Value> = ep.query_async(client).await?;
let data: Vec<serde_json::Value> = paged(ep, Pagination::Limit(self.max_items))
.query_async(client)
.await?;

op.output_list::<ResponseData>(data)?;
Ok(())
Expand Down
39 changes: 35 additions & 4 deletions openstack_cli/src/load_balancer/v2/availability_zone_profile/list.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ use crate::StructTable;

use openstack_sdk::api::load_balancer::v2::availability_zone_profile::list;
use openstack_sdk::api::QueryAsync;
use openstack_sdk::api::{paged, Pagination};
use structable_derive::StructTable;

/// Lists all Availability Zone Profiles.
Expand All @@ -46,6 +47,10 @@ pub struct AvailabilityZoneProfilesCommand {
/// Path parameters
#[command(flatten)]
path: PathParameters,

/// Total limit of entities count to return. Use this when there are too many entries.
#[arg(long, default_value_t = 10000)]
max_items: usize,
}

/// Query parameters
Expand All @@ -57,9 +62,24 @@ struct QueryParameters {
#[arg(help_heading = "Query parameters", long)]
id: Option<String>,

/// Page size
///
#[arg(help_heading = "Query parameters", long)]
limit: Option<i32>,

/// ID of the last item in the previous list
///
#[arg(help_heading = "Query parameters", long)]
marker: Option<String>,

#[arg(help_heading = "Query parameters", long)]
name: Option<String>,

/// The page direction.
///
#[arg(action=clap::ArgAction::Set, help_heading = "Query parameters", long)]
page_reverse: Option<bool>,

#[arg(help_heading = "Query parameters", long)]
provider_name: Option<String>,
}
Expand Down Expand Up @@ -103,25 +123,36 @@ impl AvailabilityZoneProfilesCommand {

// Set path parameters
// Set query parameters
if let Some(val) = &self.query.availability_zone_data {
ep_builder.availability_zone_data(val);
}
if let Some(val) = &self.query.id {
ep_builder.id(val);
}
if let Some(val) = &self.query.limit {
ep_builder.limit(*val);
}
if let Some(val) = &self.query.marker {
ep_builder.marker(val);
}
if let Some(val) = &self.query.name {
ep_builder.name(val);
}
if let Some(val) = &self.query.page_reverse {
ep_builder.page_reverse(*val);
}
if let Some(val) = &self.query.provider_name {
ep_builder.provider_name(val);
}
if let Some(val) = &self.query.availability_zone_data {
ep_builder.availability_zone_data(val);
}
// Set body parameters

let ep = ep_builder
.build()
.map_err(|x| OpenStackCliError::EndpointBuild(x.to_string()))?;

let data: Vec<serde_json::Value> = ep.query_async(client).await?;
let data: Vec<serde_json::Value> = paged(ep, Pagination::Limit(self.max_items))
.query_async(client)
.await?;

op.output_list::<ResponseData>(data)?;
Ok(())
Expand Down
Loading