Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
8 changes: 4 additions & 4 deletions openstack_cli/src/block_storage/v3/attachment/create_327.rs
Original file line number Diff line number Diff line change
Expand Up @@ -157,14 +157,14 @@ impl AttachmentCommand {
// Set Request.attachment data
let args = &self.attachment;
let mut attachment_builder = create_327::AttachmentBuilder::default();
if let Some(val) = &args.instance_uuid {
attachment_builder.instance_uuid(val);
}

if let Some(val) = &args.connector {
attachment_builder.connector(val.iter().cloned());
}

if let Some(val) = &args.instance_uuid {
attachment_builder.instance_uuid(val);
}

attachment_builder.volume_uuid(&args.volume_uuid);

ep_builder.attachment(attachment_builder.build().unwrap());
Expand Down
10 changes: 5 additions & 5 deletions openstack_cli/src/block_storage/v3/attachment/create_354.rs
Original file line number Diff line number Diff line change
Expand Up @@ -172,15 +172,13 @@ impl AttachmentCommand {
// Set Request.attachment data
let args = &self.attachment;
let mut attachment_builder = create_354::AttachmentBuilder::default();
if let Some(val) = &args.instance_uuid {
attachment_builder.instance_uuid(val);
}

if let Some(val) = &args.connector {
attachment_builder.connector(val.iter().cloned());
}

attachment_builder.volume_uuid(&args.volume_uuid);
if let Some(val) = &args.instance_uuid {
attachment_builder.instance_uuid(val);
}

if let Some(val) = &args.mode {
let tmp = match val {
Expand All @@ -190,6 +188,8 @@ impl AttachmentCommand {
attachment_builder.mode(tmp);
}

attachment_builder.volume_uuid(&args.volume_uuid);

ep_builder.attachment(attachment_builder.build().unwrap());

let ep = ep_builder
Expand Down
22 changes: 11 additions & 11 deletions openstack_cli/src/block_storage/v3/attachment/list.rs
Original file line number Diff line number Diff line change
Expand Up @@ -118,23 +118,23 @@ impl AttachmentsCommand {
if let Some(val) = &self.query.all_tenants {
ep_builder.all_tenants(*val);
}
if let Some(val) = &self.query.sort {
ep_builder.sort(val);
}
if let Some(val) = &self.query.sort_key {
ep_builder.sort_key(val);
}
if let Some(val) = &self.query.sort_dir {
ep_builder.sort_dir(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.offset {
ep_builder.offset(*val);
}
if let Some(val) = &self.query.marker {
ep_builder.marker(val);
if let Some(val) = &self.query.sort {
ep_builder.sort(val);
}
if let Some(val) = &self.query.sort_dir {
ep_builder.sort_dir(val);
}
if let Some(val) = &self.query.sort_key {
ep_builder.sort_key(val);
}
// Set body parameters

Expand Down
13 changes: 6 additions & 7 deletions openstack_cli/src/block_storage/v3/backup/create_30.rs
Original file line number Diff line number Diff line change
Expand Up @@ -126,9 +126,6 @@ impl BackupCommand {
// Set Request.backup data
let args = &self.backup;
let mut backup_builder = create_30::BackupBuilder::default();

backup_builder.volume_id(&args.volume_id);

if let Some(val) = &args.container {
backup_builder.container(Some(val.into()));
} else if args.no_container {
Expand All @@ -141,14 +138,14 @@ impl BackupCommand {
backup_builder.description(None);
}

if let Some(val) = &args.incremental {
backup_builder.incremental(*val);
}

if let Some(val) = &args.force {
backup_builder.force(*val);
}

if let Some(val) = &args.incremental {
backup_builder.incremental(*val);
}

if let Some(val) = &args.name {
backup_builder.name(Some(val.into()));
} else if args.no_name {
Expand All @@ -161,6 +158,8 @@ impl BackupCommand {
backup_builder.snapshot_id(None);
}

backup_builder.volume_id(&args.volume_id);

ep_builder.backup(backup_builder.build().unwrap());

let ep = ep_builder
Expand Down
15 changes: 7 additions & 8 deletions openstack_cli/src/block_storage/v3/backup/create_343.rs
Original file line number Diff line number Diff line change
Expand Up @@ -133,9 +133,6 @@ impl BackupCommand {
// Set Request.backup data
let args = &self.backup;
let mut backup_builder = create_343::BackupBuilder::default();

backup_builder.volume_id(&args.volume_id);

if let Some(val) = &args.container {
backup_builder.container(Some(val.into()));
} else if args.no_container {
Expand All @@ -148,12 +145,16 @@ impl BackupCommand {
backup_builder.description(None);
}

if let Some(val) = &args.force {
backup_builder.force(*val);
}

if let Some(val) = &args.incremental {
backup_builder.incremental(*val);
}

if let Some(val) = &args.force {
backup_builder.force(*val);
if let Some(val) = &args.metadata {
backup_builder.metadata(val.iter().cloned());
}

if let Some(val) = &args.name {
Expand All @@ -168,9 +169,7 @@ impl BackupCommand {
backup_builder.snapshot_id(None);
}

if let Some(val) = &args.metadata {
backup_builder.metadata(val.iter().cloned());
}
backup_builder.volume_id(&args.volume_id);

ep_builder.backup(backup_builder.build().unwrap());

Expand Down
25 changes: 12 additions & 13 deletions openstack_cli/src/block_storage/v3/backup/create_351.rs
Original file line number Diff line number Diff line change
Expand Up @@ -143,8 +143,11 @@ impl BackupCommand {
// Set Request.backup data
let args = &self.backup;
let mut backup_builder = create_351::BackupBuilder::default();

backup_builder.volume_id(&args.volume_id);
if let Some(val) = &args.availability_zone {
backup_builder.availability_zone(Some(val.into()));
} else if args.no_availability_zone {
backup_builder.availability_zone(None);
}

if let Some(val) = &args.container {
backup_builder.container(Some(val.into()));
Expand All @@ -158,12 +161,16 @@ impl BackupCommand {
backup_builder.description(None);
}

if let Some(val) = &args.force {
backup_builder.force(*val);
}

if let Some(val) = &args.incremental {
backup_builder.incremental(*val);
}

if let Some(val) = &args.force {
backup_builder.force(*val);
if let Some(val) = &args.metadata {
backup_builder.metadata(val.iter().cloned());
}

if let Some(val) = &args.name {
Expand All @@ -178,15 +185,7 @@ impl BackupCommand {
backup_builder.snapshot_id(None);
}

if let Some(val) = &args.metadata {
backup_builder.metadata(val.iter().cloned());
}

if let Some(val) = &args.availability_zone {
backup_builder.availability_zone(Some(val.into()));
} else if args.no_availability_zone {
backup_builder.availability_zone(None);
}
backup_builder.volume_id(&args.volume_id);

ep_builder.backup(backup_builder.build().unwrap());

Expand Down
24 changes: 12 additions & 12 deletions openstack_cli/src/block_storage/v3/backup/list.rs
Original file line number Diff line number Diff line change
Expand Up @@ -121,18 +121,6 @@ impl BackupsCommand {
if let Some(val) = &self.query.all_tenants {
ep_builder.all_tenants(*val);
}
if let Some(val) = &self.query.with_count {
ep_builder.with_count(*val);
}
if let Some(val) = &self.query.sort {
ep_builder.sort(val);
}
if let Some(val) = &self.query.sort_key {
ep_builder.sort_key(val);
}
if let Some(val) = &self.query.sort_dir {
ep_builder.sort_dir(val);
}
if let Some(val) = &self.query.limit {
ep_builder.limit(*val);
}
Expand All @@ -142,6 +130,18 @@ impl BackupsCommand {
if let Some(val) = &self.query.offset {
ep_builder.offset(*val);
}
if let Some(val) = &self.query.sort {
ep_builder.sort(val);
}
if let Some(val) = &self.query.sort_dir {
ep_builder.sort_dir(val);
}
if let Some(val) = &self.query.sort_key {
ep_builder.sort_key(val);
}
if let Some(val) = &self.query.with_count {
ep_builder.with_count(*val);
}
// Set body parameters

let ep = ep_builder
Expand Down
6 changes: 3 additions & 3 deletions openstack_cli/src/block_storage/v3/backup/set_343.rs
Original file line number Diff line number Diff line change
Expand Up @@ -121,15 +121,15 @@ impl BackupCommand {
// Set Request.backup data
if let Some(lbackup) = &self.backup {
let mut backup_builder = set_343::BackupBuilder::default();
if let Some(val) = &lbackup.name {
backup_builder.name(Some(val.into()));
}
if let Some(val) = &lbackup.description {
backup_builder.description(Some(val.into()));
}
if let Some(val) = &lbackup.metadata {
backup_builder.metadata(val.iter().cloned());
}
if let Some(val) = &lbackup.name {
backup_builder.name(Some(val.into()));
}
ep_builder.backup(backup_builder.build().expect("A valid object"));
}

Expand Down
6 changes: 3 additions & 3 deletions openstack_cli/src/block_storage/v3/backup/set_39.rs
Original file line number Diff line number Diff line change
Expand Up @@ -117,12 +117,12 @@ impl BackupCommand {
// Set Request.backup data
if let Some(lbackup) = &self.backup {
let mut backup_builder = set_39::BackupBuilder::default();
if let Some(val) = &lbackup.name {
backup_builder.name(Some(val.into()));
}
if let Some(val) = &lbackup.description {
backup_builder.description(Some(val.into()));
}
if let Some(val) = &lbackup.name {
backup_builder.name(Some(val.into()));
}
ep_builder.backup(backup_builder.build().expect("A valid object"));
}

Expand Down
22 changes: 11 additions & 11 deletions openstack_cli/src/block_storage/v3/cluster/list.rs
Original file line number Diff line number Diff line change
Expand Up @@ -108,30 +108,30 @@ impl ClustersCommand {

// Set path parameters
// Set query parameters
if let Some(val) = &self.query.frozen {
ep_builder.frozen(*val);
}
if let Some(val) = &self.query.active_backend_id {
ep_builder.active_backend_id(val);
}
if let Some(val) = &self.query.name {
ep_builder.name(val);
}
if let Some(val) = &self.query.binary {
ep_builder.binary(val);
}
if let Some(val) = &self.query.is_up {
ep_builder.is_up(*val);
}
if let Some(val) = &self.query.disabled {
ep_builder.disabled(*val);
}
if let Some(val) = &self.query.num_hosts {
ep_builder.num_hosts(*val);
if let Some(val) = &self.query.frozen {
ep_builder.frozen(*val);
}
if let Some(val) = &self.query.is_up {
ep_builder.is_up(*val);
}
if let Some(val) = &self.query.name {
ep_builder.name(val);
}
if let Some(val) = &self.query.num_down_hosts {
ep_builder.num_down_hosts(*val);
}
if let Some(val) = &self.query.num_hosts {
ep_builder.num_hosts(*val);
}
if let Some(val) = &self.query.replication_stats {
ep_builder.replication_stats(val);
}
Expand Down
12 changes: 6 additions & 6 deletions openstack_cli/src/block_storage/v3/group/create_313.rs
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,12 @@ impl GroupCommand {
// Set Request.group data
let args = &self.group;
let mut group_builder = create_313::GroupBuilder::default();
if let Some(val) = &args.availability_zone {
group_builder.availability_zone(Some(val.into()));
} else if args.no_availability_zone {
group_builder.availability_zone(None);
}

if let Some(val) = &args.description {
group_builder.description(Some(val.into()));
} else if args.no_description {
Expand All @@ -134,12 +140,6 @@ impl GroupCommand {

group_builder.volume_types(args.volume_types.iter().map(Into::into).collect::<Vec<_>>());

if let Some(val) = &args.availability_zone {
group_builder.availability_zone(Some(val.into()));
} else if args.no_availability_zone {
group_builder.availability_zone(None);
}

ep_builder.group(group_builder.build().unwrap());

let ep = ep_builder
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,10 @@ impl GroupCommand {
create_from_src_builder.description(None);
}

if let Some(val) = &args.group_snapshot_id {
create_from_src_builder.group_snapshot_id(val);
}

if let Some(val) = &args.name {
create_from_src_builder.name(Some(val.into()));
} else if args.no_name {
Expand All @@ -114,10 +118,6 @@ impl GroupCommand {
create_from_src_builder.source_group_id(val);
}

if let Some(val) = &args.group_snapshot_id {
create_from_src_builder.group_snapshot_id(val);
}

ep_builder.create_from_src(create_from_src_builder.build().unwrap());

let ep = ep_builder
Expand Down
Loading
Loading