diff --git a/Cargo.lock b/Cargo.lock index 2ae6f6210..73223091e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2747,6 +2747,95 @@ dependencies = [ "vcpkg", ] +[[package]] +name = "openstack-cli-api" +version = "0.1.0" +dependencies = [ + "clap", + "eyre", + "http", + "openstack-cli-core", + "openstack_sdk", + "serde_json", + "tracing", +] + +[[package]] +name = "openstack-cli-auth" +version = "0.1.0" +dependencies = [ + "chrono", + "clap", + "eyre", + "openstack-cli-core", + "openstack-sdk-core", + "openstack_sdk", + "secrecy", + "serde", + "serde_json", + "structable", + "tracing", +] + +[[package]] +name = "openstack-cli-block-storage" +version = "0.1.0" +dependencies = [ + "clap", + "eyre", + "http", + "openstack-cli-core", + "openstack-sdk-core", + "openstack_sdk", + "openstack_types", + "serde_json", + "tracing", +] + +[[package]] +name = "openstack-cli-catalog" +version = "0.1.0" +dependencies = [ + "clap", + "openstack-cli-core", + "openstack-sdk-core", + "openstack_sdk", + "serde", + "serde_json", + "structable", + "tracing", +] + +[[package]] +name = "openstack-cli-compute" +version = "0.1.0" +dependencies = [ + "clap", + "eyre", + "http", + "openstack-cli-core", + "openstack-sdk-core", + "openstack_sdk", + "openstack_types", + "serde_json", + "tracing", +] + +[[package]] +name = "openstack-cli-container-infrastructure-management" +version = "0.1.0" +dependencies = [ + "clap", + "eyre", + "http", + "openstack-cli-core", + "openstack-sdk-core", + "openstack_sdk", + "openstack_types", + "serde_json", + "tracing", +] + [[package]] name = "openstack-cli-core" version = "0.13.5" @@ -2779,6 +2868,120 @@ dependencies = [ "url", ] +[[package]] +name = "openstack-cli-dns" +version = "0.1.0" +dependencies = [ + "clap", + "eyre", + "http", + "openstack-cli-core", + "openstack-sdk-core", + "openstack_sdk", + "openstack_types", + "serde_json", + "tracing", +] + +[[package]] +name = "openstack-cli-identity" +version = "0.1.0" +dependencies = [ + "base64 0.22.1", + "clap", + "dialoguer", + "eyre", + "http", + "openstack-cli-core", + "openstack-sdk-core", + "openstack_sdk", + "openstack_types", + "serde_json", + "tracing", + "webauthn-authenticator-rs", + "webauthn-rs-proto", +] + +[[package]] +name = "openstack-cli-image" +version = "0.1.0" +dependencies = [ + "clap", + "eyre", + "http", + "json-patch", + "openstack-cli-core", + "openstack-sdk-core", + "openstack_sdk", + "openstack_types", + "serde_json", + "tracing", +] + +[[package]] +name = "openstack-cli-load-balancer" +version = "0.1.0" +dependencies = [ + "clap", + "eyre", + "http", + "openstack-cli-core", + "openstack-sdk-core", + "openstack_sdk", + "openstack_types", + "serde_json", + "tracing", +] + +[[package]] +name = "openstack-cli-network" +version = "0.1.0" +dependencies = [ + "clap", + "eyre", + "http", + "openstack-cli-core", + "openstack-sdk-core", + "openstack_sdk", + "openstack_types", + "serde_json", + "tracing", +] + +[[package]] +name = "openstack-cli-object-store" +version = "0.1.0" +dependencies = [ + "bytes", + "clap", + "eyre", + "http", + "openstack-cli-core", + "openstack-sdk-core", + "openstack_sdk", + "openstack_types", + "regex", + "serde", + "serde_json", + "structable", + "tracing", +] + +[[package]] +name = "openstack-cli-placement" +version = "0.1.0" +dependencies = [ + "clap", + "eyre", + "http", + "openstack-cli-core", + "openstack-sdk-core", + "openstack_sdk", + "openstack_types", + "serde_json", + "tracing", +] + [[package]] name = "openstack-sdk-auth-applicationcredential" version = "0.1.0" @@ -3088,9 +3291,6 @@ name = "openstack_cli" version = "0.13.5" dependencies = [ "assert_cmd", - "base64 0.22.1", - "bytes", - "chrono", "clap", "clap_complete", "color-eyre", @@ -3098,27 +3298,30 @@ dependencies = [ "eyre", "futures", "http", - "json-patch", "md5", + "openstack-cli-api", + "openstack-cli-auth", + "openstack-cli-block-storage", + "openstack-cli-catalog", + "openstack-cli-compute", + "openstack-cli-container-infrastructure-management", "openstack-cli-core", + "openstack-cli-dns", + "openstack-cli-identity", + "openstack-cli-image", + "openstack-cli-load-balancer", + "openstack-cli-network", + "openstack-cli-object-store", + "openstack-cli-placement", "openstack_sdk", - "openstack_types", "rand 0.10.0", - "regex", "reqwest", - "secrecy", - "serde", "serde_json", "strip-ansi-escapes", - "structable", "tempfile", - "thiserror 2.0.18", "tokio", "tracing", "tracing-subscriber", - "url", - "webauthn-authenticator-rs", - "webauthn-rs-proto", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index f2c8d796d..5e3f0e822 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,11 +15,25 @@ members = [ "auth-websso", "sdk-core", "openstack_sdk", + "cli-core", + "cli-cmd/api", + "cli-cmd/auth", + "cli-cmd/block-storage", + "cli-cmd/catalog", + "cli-cmd/compute", + "cli-cmd/container-infrastructure-management", + "cli-cmd/dns", + "cli-cmd/identity", + "cli-cmd/image", + "cli-cmd/load-balancer", + "cli-cmd/network", + "cli-cmd/object-store", + "cli-cmd/placement", "openstack_cli", "openstack_tui", "openstack_types", "xtask", - "fuzz", "cli-core", + "fuzz", ] default-members = ["openstack_cli", "openstack_sdk", "openstack_tui", "openstack_types"] @@ -92,3 +106,4 @@ result_large_err = "allow" unwrap_used = "deny" expect_used = "deny" enum_glob_use = "deny" +module_inception = "allow" diff --git a/Dockerfile b/Dockerfile index e1e17a502..8952c5d7f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,87 +1,42 @@ ################ -##### Builder -FROM rust:1.94.0-slim@sha256:d6782f2b326a10eaf593eb90cafc34a03a287b4a25fe4d0c693c90304b06f6d7 AS builder +##### chef +FROM rust:1.94.0-slim@sha256:d6782f2b326a10eaf593eb90cafc34a03a287b4a25fe4d0c693c90304b06f6d7 AS chef RUN rustup target add x86_64-unknown-linux-musl &&\ apt update && \ apt install -y musl-tools musl-dev && \ update-ca-certificates -WORKDIR /usr/src - -# Create blank project -RUN USER=root cargo new openstack +RUN cargo install --locked cargo-chef +WORKDIR app -# We want dependencies cached, so copy those first. -COPY Cargo.toml Cargo.lock /usr/src/openstack/ -COPY sdk-core/Cargo.toml /usr/src/openstack/sdk-core/ -COPY auth-application-credential/Cargo.toml /usr/src/openstack/auth-application-credential/ -COPY auth-core/Cargo.toml /usr/src/openstack/auth-core/ -COPY auth-federation/Cargo.toml /usr/src/openstack/auth-federation/ -COPY auth-jwt/Cargo.toml /usr/src/openstack/auth-jwt/ -COPY auth-multifactor/Cargo.toml /usr/src/openstack/auth-multifactor/ -COPY auth-oidcaccesstoken/Cargo.toml /usr/src/openstack/auth-oidcaccesstoken/ -COPY auth-passkey/Cargo.toml /usr/src/openstack/auth-passkey/ -COPY auth-password/Cargo.toml /usr/src/openstack/auth-password/ -COPY auth-receipt/Cargo.toml /usr/src/openstack/auth-receipt/ -COPY auth-token/Cargo.toml /usr/src/openstack/auth-token/ -COPY auth-totp/Cargo.toml /usr/src/openstack/auth-totp/ -COPY auth-websso/Cargo.toml /usr/src/openstack/auth-websso/ -COPY cli-core/Cargo.toml /usr/src/openstack/cli-core/ -COPY openstack_sdk/Cargo.toml /usr/src/openstack/openstack_sdk/ -COPY openstack_cli/Cargo.toml /usr/src/openstack/openstack_cli/ -COPY openstack_tui/Cargo.toml /usr/src/openstack/openstack_tui/ -COPY openstack_types/Cargo.toml /usr/src/openstack/openstack_types/ -COPY xtask/Cargo.toml /usr/src/openstack/xtask/ -COPY fuzz/Cargo.toml /usr/src/openstack/fuzz/ -RUN mkdir -p openstack/openstack_cli/src/bin && touch openstack/openstack_cli/src/lib.rs &&\ - cp openstack/src/main.rs openstack/openstack_cli/src/bin/osc.rs &&\ - mkdir -p openstack/openstack_tui/src/bin && touch openstack/openstack_tui/src/lib.rs &&\ - cp openstack/src/main.rs openstack/openstack_tui/src/bin/ostui.rs &&\ - mkdir -p openstack/openstack_sdk/src && touch openstack/openstack_sdk/src/lib.rs &&\ - mkdir -p openstack/openstack_sdk_core/src && touch openstack/openstack_sdk_core/src/lib.rs &&\ - mkdir -p /usr/src/openstack/xtask/src && touch openstack/xtask/src/lib.rs &&\ - mkdir -p openstack/fuzz/src && touch openstack/fuzz/src/lib.rs &&\ - mkdir -p openstack/openstack_sdk/examples &&\ - mkdir -p openstack/sdk-core/examples &&\ - mkdir -p openstack/openstack_types/src && touch openstack/openstack_types/src/lib.rs &&\ - touch openstack/openstack_sdk/examples/query_find.rs &&\ - touch openstack/openstack_sdk/examples/paged.rs &&\ - touch openstack/openstack_sdk/examples/query.rs &&\ - touch openstack/openstack_sdk/examples/ignore.rs &&\ - touch openstack/sdk-core/examples/ignore.rs &&\ - touch openstack/sdk-core/examples/paged.rs &&\ - touch openstack/sdk-core/examples/query.rs &&\ - mkdir -p openstack/auth-application-credential/src &&touch openstack/auth-application-credential/src/lib.rs &&\ - mkdir -p openstack/auth-core/src &&touch openstack/auth-core/src/lib.rs &&\ - mkdir -p openstack/auth-federation/src && touch openstack/auth-federation/src/lib.rs &&\ - mkdir -p openstack/auth-jwt/src && touch openstack/auth-jwt/src/lib.rs &&\ - mkdir -p openstack/auth-multifactor/src && touch openstack/auth-multifactor/src/lib.rs &&\ - mkdir -p openstack/auth-oidcaccesstoken/src && touch openstack/auth-oidcaccesstoken/src/lib.rs &&\ - mkdir -p openstack/auth-passkey/src && touch openstack/auth-passkey/src/lib.rs &&\ - mkdir -p openstack/auth-password/src && touch openstack/auth-password/src/lib.rs &&\ - mkdir -p openstack/auth-receipt/src && touch openstack/auth-receipt/src/lib.rs &&\ - mkdir -p openstack/auth-token/src && touch openstack/auth-token/src/lib.rs &&\ - mkdir -p openstack/auth-totp/src && touch openstack/auth-totp/src/lib.rs &&\ - mkdir -p openstack/auth-websso/src && touch openstack/auth-websso/src/lib.rs &&\ - mkdir -p openstack/cli-core/src && touch openstack/cli-core/src/lib.rs +################ +##### Planner +FROM chef as planner +COPY . . +# Prepare the build recipe +RUN cargo chef prepare --recipe-path recipe.json -# Set the working directory -WORKDIR /usr/src/openstack -RUN rm -rf src +################ +##### Builder +FROM chef AS builder -## Install target platform (Cross-Compilation) --> Needed for Alpine -RUN rustup target add x86_64-unknown-linux-musl +RUN rustup target add x86_64-unknown-linux-musl &&\ + apt update && \ + apt install -y musl-tools musl-dev && \ + update-ca-certificates -## This is a dummy build to get the dependencies cached. -RUN cargo build --target x86_64-unknown-linux-musl --release -p openstack_cli +## ## Install target platform (Cross-Compilation) --> Needed for Alpine +#RUN rustup target add x86_64-unknown-linux-musl -# Now copy in the rest of the sources -COPY . /usr/src/openstack/ +# Copy the build recipe +COPY --from=planner /app/recipe.json recipe.json -## Touch main.rs to prevent cached release build -RUN touch openstack_sdk/src/lib.rs && touch openstack_cli/src/bin/osc.rs && touch openstack_cli/src/lib.rs && touch openstack_types/src/lib.rs +# Build dependencies with the cargo-chef +RUN cargo chef cook --target x86_64-unknown-linux-musl --release --recipe-path recipe.json +# # Now copy in the rest of the sources +COPY . . # This is the actual application build. RUN cargo build --target x86_64-unknown-linux-musl --release --bin osc @@ -94,4 +49,4 @@ LABEL maintainer="Artem Goncharov" RUN apk add --no-cache bash # Copy application binary from builder image -COPY --from=builder /usr/src/openstack/target/x86_64-unknown-linux-musl/release/osc /usr/local/bin +COPY --from=builder /app/target/x86_64-unknown-linux-musl/release/osc /usr/local/bin diff --git a/auth-oidcaccesstoken/src/lib.rs b/auth-oidcaccesstoken/src/lib.rs index 27111e383..242015725 100644 --- a/auth-oidcaccesstoken/src/lib.rs +++ b/auth-oidcaccesstoken/src/lib.rs @@ -91,7 +91,7 @@ impl OpenStackAuthType for OidcAccessTokenAuthenticator { )?; let request = http_client.post(endpoint).build()?; - let response = execute_auth_request(&http_client, request).await?; + let response = execute_auth_request(http_client, request).await?; let auth_token = AuthToken::from_reqwest_response(response).await?; diff --git a/cli-cmd/api/Cargo.toml b/cli-cmd/api/Cargo.toml new file mode 100644 index 000000000..44de61dd1 --- /dev/null +++ b/cli-cmd/api/Cargo.toml @@ -0,0 +1,22 @@ +[package] +name = "openstack-cli-api" +description = "OpenStack CLI Api commands" +version = "0.1.0" +license.workspace = true +edition.workspace = true +authors.workspace = true +rust-version.workspace = true +homepage.workspace = true +repository.workspace = true + +[dependencies] +clap = { workspace = true } +openstack-cli-core = { version = "0.13", path = "../../cli-core/" } +openstack_sdk = { path="../../openstack_sdk", version = "^0.22", default-features = false, features = ["async", "identity"] } +eyre = { workspace = true } +http = { workspace = true } +serde_json = {workspace = true} +tracing = { workspace = true} + +[lints] +workspace = true diff --git a/openstack_cli/src/api/mod.rs b/cli-cmd/api/src/lib.rs similarity index 95% rename from openstack_cli/src/api/mod.rs rename to cli-cmd/api/src/lib.rs index 69c91c23d..e8fd53dda 100644 --- a/openstack_cli/src/api/mod.rs +++ b/cli-cmd/api/src/lib.rs @@ -21,17 +21,16 @@ use serde_json::Value; use std::io::{self, Write}; use tracing::info; +use openstack_cli_core::cli::CliArgs; +use openstack_cli_core::common::parse_key_val; +use openstack_cli_core::error::OpenStackCliError; +use openstack_cli_core::output::OutputProcessor; use openstack_sdk::{ AsyncOpenStack, api::{AsyncClient, RestClient}, types::ServiceType, }; -use crate::Cli; -use crate::OpenStackCliError; -use crate::common::parse_key_val; -use crate::output::OutputProcessor; - /// Supported http methods #[derive(Clone, Debug, Eq, PartialEq, PartialOrd, Ord, ValueEnum)] pub enum Method { @@ -101,9 +100,9 @@ pub struct ApiCommand { impl ApiCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, client: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { info!("Perform REST API call {:?}", self); diff --git a/cli-cmd/auth/Cargo.toml b/cli-cmd/auth/Cargo.toml new file mode 100644 index 000000000..c450dabf8 --- /dev/null +++ b/cli-cmd/auth/Cargo.toml @@ -0,0 +1,27 @@ +[package] +name = "openstack-cli-auth" +description = "OpenStack CLI auth commands" +version = "0.1.0" +license.workspace = true +edition.workspace = true +authors.workspace = true +rust-version.workspace = true +homepage.workspace = true +repository.workspace = true + +[dependencies] +chrono.workspace = true +clap.workspace = true +eyre.workspace = true +openstack-cli-core = { version = "0.13", path = "../../cli-core/" } +openstack_sdk = { path="../../openstack_sdk", version = "^0.22", default-features = false, features = ["async", "identity"] } +openstack-sdk-core = { path="../../sdk-core", version = "^0.22" } +secrecy.workspace = true +serde.workspace = true +serde_json.workspace = true +structable = { workspace = true } +tracing.workspace = true + + +[lints] +workspace = true diff --git a/openstack_cli/src/auth/mod.rs b/cli-cmd/auth/src/lib.rs similarity index 89% rename from openstack_cli/src/auth/mod.rs rename to cli-cmd/auth/src/lib.rs index b1263e044..7a1f8b22c 100644 --- a/openstack_cli/src/auth/mod.rs +++ b/cli-cmd/auth/src/lib.rs @@ -16,10 +16,9 @@ use clap::{Parser, Subcommand}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; - pub mod login; pub mod show; @@ -31,7 +30,7 @@ pub mod show; pub struct AuthCommand { /// Authentication commands #[command(subcommand)] - pub(crate) command: AuthCommands, + pub command: AuthCommands, } #[allow(missing_docs)] @@ -43,9 +42,9 @@ pub enum AuthCommands { impl AuthCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, client: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/auth/login.rs b/cli-cmd/auth/src/login.rs similarity index 92% rename from openstack_cli/src/auth/login.rs rename to cli-cmd/auth/src/login.rs index 9de81721a..72344cf75 100644 --- a/openstack_cli/src/auth/login.rs +++ b/cli-cmd/auth/src/login.rs @@ -20,8 +20,7 @@ use eyre::eyre; use secrecy::ExposeSecret; use tracing::info; -use crate::{Cli, OpenStackCliError}; - +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; use openstack_sdk::AsyncOpenStack; /// Fetch a new valid authorization token for the cloud. @@ -37,9 +36,9 @@ pub struct LoginCommand { impl LoginCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - _parsed_args: &Cli, + _parsed_args: &C, client: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { info!("Show auth info"); diff --git a/openstack_cli/src/auth/show.rs b/cli-cmd/auth/src/show.rs similarity index 94% rename from openstack_cli/src/auth/show.rs rename to cli-cmd/auth/src/show.rs index 9ffecb393..a1e46f484 100644 --- a/openstack_cli/src/auth/show.rs +++ b/cli-cmd/auth/src/show.rs @@ -19,13 +19,11 @@ use serde::{Deserialize, Serialize}; use serde_json::Value; use tracing::info; -use crate::Cli; -use crate::OpenStackCliError; -use crate::output::{self, OutputProcessor}; -use structable::{StructTable, StructTableOptions}; - +use openstack_cli_core::output::{OutputFor, OutputProcessor}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; use openstack_sdk::AsyncOpenStack; use openstack_sdk::types::identity::v3::AuthResponse; +use structable::{StructTable, StructTableOptions}; /// Show current authorization information for the cloud /// @@ -110,9 +108,9 @@ impl TryFrom<&AuthResponse> for Auth { impl ShowCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, client: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { info!("Show auth info"); @@ -121,7 +119,7 @@ impl ShowCommand { if let Some(auth_info) = client.get_auth_info() { match op.target { - output::OutputFor::Human => { + OutputFor::Human => { op.output_human(&Auth::try_from(&auth_info)?)?; } _ => { diff --git a/cli-cmd/block-storage/Cargo.toml b/cli-cmd/block-storage/Cargo.toml new file mode 100644 index 000000000..791f52db6 --- /dev/null +++ b/cli-cmd/block-storage/Cargo.toml @@ -0,0 +1,24 @@ +[package] +name = "openstack-cli-block-storage" +description = "OpenStack CLI Block Storage commands" +version = "0.1.0" +license.workspace = true +edition.workspace = true +authors.workspace = true +rust-version.workspace = true +homepage.workspace = true +repository.workspace = true + +[dependencies] +clap = { workspace = true } +openstack-cli-core = { version = "0.13", path = "../../cli-core/" } +openstack_sdk = { path="../../openstack_sdk", version = "^0.22", default-features = false, features = ["async", "block_storage", "identity"] } +openstack-sdk-core = { path="../../sdk-core", version = "^0.22" } +openstack_types = { path="../../openstack_types", version = "^0.22" } +eyre = { workspace = true } +http = { workspace = true } +serde_json = {workspace = true} +tracing = { workspace = true} + +[lints] +workspace = true diff --git a/openstack_cli/src/block_storage/mod.rs b/cli-cmd/block-storage/src/lib.rs similarity index 95% rename from openstack_cli/src/block_storage/mod.rs rename to cli-cmd/block-storage/src/lib.rs index 35da041c7..ce01ee13b 100644 --- a/openstack_cli/src/block_storage/mod.rs +++ b/cli-cmd/block-storage/src/lib.rs @@ -12,5 +12,5 @@ // // SPDX-License-Identifier: Apache-2.0 -//! Block Storage commands +//! Block storage commands. pub mod v3; diff --git a/openstack_cli/src/block_storage/v3.rs b/cli-cmd/block-storage/src/v3.rs similarity index 97% rename from openstack_cli/src/block_storage/v3.rs rename to cli-cmd/block-storage/src/v3.rs index 55dd4e76d..b8b0ce7ca 100644 --- a/openstack_cli/src/block_storage/v3.rs +++ b/cli-cmd/block-storage/src/v3.rs @@ -15,10 +15,9 @@ //! Block storage v3 commands use clap::{Parser, Subcommand}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; use openstack_sdk::{AsyncOpenStack, types::ServiceType}; -use crate::{Cli, OpenStackCliError}; - pub mod attachment; pub mod availability_zone; pub mod backup; @@ -86,9 +85,9 @@ pub enum BlockStorageCommands { impl BlockStorageCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { session diff --git a/openstack_cli/src/block_storage/v3/attachment.rs b/cli-cmd/block-storage/src/v3/attachment.rs similarity index 96% rename from openstack_cli/src/block_storage/v3/attachment.rs rename to cli-cmd/block-storage/src/v3/attachment.rs index 9e0fb14ae..596f45834 100644 --- a/openstack_cli/src/block_storage/v3/attachment.rs +++ b/cli-cmd/block-storage/src/v3/attachment.rs @@ -17,8 +17,7 @@ use clap::{Parser, Subcommand}; -use crate::{Cli, OpenStackCliError}; - +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; use openstack_sdk::AsyncOpenStack; pub mod create_327; @@ -77,9 +76,9 @@ pub enum AttachmentCommands { impl AttachmentCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/block_storage/v3/attachment/create_327.rs b/cli-cmd/block-storage/src/v3/attachment/create_327.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/attachment/create_327.rs rename to cli-cmd/block-storage/src/v3/attachment/create_327.rs diff --git a/openstack_cli/src/block_storage/v3/attachment/create_354.rs b/cli-cmd/block-storage/src/v3/attachment/create_354.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/attachment/create_354.rs rename to cli-cmd/block-storage/src/v3/attachment/create_354.rs diff --git a/openstack_cli/src/block_storage/v3/attachment/delete.rs b/cli-cmd/block-storage/src/v3/attachment/delete.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/attachment/delete.rs rename to cli-cmd/block-storage/src/v3/attachment/delete.rs diff --git a/openstack_cli/src/block_storage/v3/attachment/list.rs b/cli-cmd/block-storage/src/v3/attachment/list.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/attachment/list.rs rename to cli-cmd/block-storage/src/v3/attachment/list.rs diff --git a/openstack_cli/src/block_storage/v3/attachment/os_complete_344.rs b/cli-cmd/block-storage/src/v3/attachment/os_complete_344.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/attachment/os_complete_344.rs rename to cli-cmd/block-storage/src/v3/attachment/os_complete_344.rs diff --git a/openstack_cli/src/block_storage/v3/attachment/set_327.rs b/cli-cmd/block-storage/src/v3/attachment/set_327.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/attachment/set_327.rs rename to cli-cmd/block-storage/src/v3/attachment/set_327.rs diff --git a/openstack_cli/src/block_storage/v3/attachment/show.rs b/cli-cmd/block-storage/src/v3/attachment/show.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/attachment/show.rs rename to cli-cmd/block-storage/src/v3/attachment/show.rs diff --git a/openstack_cli/src/block_storage/v3/availability_zone.rs b/cli-cmd/block-storage/src/v3/availability_zone.rs similarity index 91% rename from openstack_cli/src/block_storage/v3/availability_zone.rs rename to cli-cmd/block-storage/src/v3/availability_zone.rs index 928a4748f..b61e61d5c 100644 --- a/openstack_cli/src/block_storage/v3/availability_zone.rs +++ b/cli-cmd/block-storage/src/v3/availability_zone.rs @@ -16,10 +16,9 @@ use clap::{Parser, Subcommand}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; - pub mod list; /// Availability zones @@ -41,9 +40,9 @@ pub enum AvailabilityZoneCommands { impl AvailabilityZoneCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/block_storage/v3/availability_zone/list.rs b/cli-cmd/block-storage/src/v3/availability_zone/list.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/availability_zone/list.rs rename to cli-cmd/block-storage/src/v3/availability_zone/list.rs diff --git a/openstack_cli/src/block_storage/v3/backup.rs b/cli-cmd/block-storage/src/v3/backup.rs similarity index 96% rename from openstack_cli/src/block_storage/v3/backup.rs rename to cli-cmd/block-storage/src/v3/backup.rs index 343662016..935d4b10a 100644 --- a/openstack_cli/src/block_storage/v3/backup.rs +++ b/cli-cmd/block-storage/src/v3/backup.rs @@ -17,8 +17,7 @@ use clap::{Parser, Subcommand}; -use crate::{Cli, OpenStackCliError}; - +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; use openstack_sdk::AsyncOpenStack; pub mod create_30; @@ -75,9 +74,9 @@ pub enum BackupCommands { impl BackupCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/block_storage/v3/backup/create_30.rs b/cli-cmd/block-storage/src/v3/backup/create_30.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/backup/create_30.rs rename to cli-cmd/block-storage/src/v3/backup/create_30.rs diff --git a/openstack_cli/src/block_storage/v3/backup/create_343.rs b/cli-cmd/block-storage/src/v3/backup/create_343.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/backup/create_343.rs rename to cli-cmd/block-storage/src/v3/backup/create_343.rs diff --git a/openstack_cli/src/block_storage/v3/backup/create_351.rs b/cli-cmd/block-storage/src/v3/backup/create_351.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/backup/create_351.rs rename to cli-cmd/block-storage/src/v3/backup/create_351.rs diff --git a/openstack_cli/src/block_storage/v3/backup/delete.rs b/cli-cmd/block-storage/src/v3/backup/delete.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/backup/delete.rs rename to cli-cmd/block-storage/src/v3/backup/delete.rs diff --git a/openstack_cli/src/block_storage/v3/backup/export_record/get.rs b/cli-cmd/block-storage/src/v3/backup/export_record/get.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/backup/export_record/get.rs rename to cli-cmd/block-storage/src/v3/backup/export_record/get.rs diff --git a/openstack_cli/src/block_storage/v3/backup/import_record/create.rs b/cli-cmd/block-storage/src/v3/backup/import_record/create.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/backup/import_record/create.rs rename to cli-cmd/block-storage/src/v3/backup/import_record/create.rs diff --git a/openstack_cli/src/block_storage/v3/backup/list.rs b/cli-cmd/block-storage/src/v3/backup/list.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/backup/list.rs rename to cli-cmd/block-storage/src/v3/backup/list.rs diff --git a/openstack_cli/src/block_storage/v3/backup/os_force_delete.rs b/cli-cmd/block-storage/src/v3/backup/os_force_delete.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/backup/os_force_delete.rs rename to cli-cmd/block-storage/src/v3/backup/os_force_delete.rs diff --git a/openstack_cli/src/block_storage/v3/backup/os_reset_status.rs b/cli-cmd/block-storage/src/v3/backup/os_reset_status.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/backup/os_reset_status.rs rename to cli-cmd/block-storage/src/v3/backup/os_reset_status.rs diff --git a/openstack_cli/src/block_storage/v3/backup/restore/create.rs b/cli-cmd/block-storage/src/v3/backup/restore/create.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/backup/restore/create.rs rename to cli-cmd/block-storage/src/v3/backup/restore/create.rs diff --git a/openstack_cli/src/block_storage/v3/backup/set_343.rs b/cli-cmd/block-storage/src/v3/backup/set_343.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/backup/set_343.rs rename to cli-cmd/block-storage/src/v3/backup/set_343.rs diff --git a/openstack_cli/src/block_storage/v3/backup/set_39.rs b/cli-cmd/block-storage/src/v3/backup/set_39.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/backup/set_39.rs rename to cli-cmd/block-storage/src/v3/backup/set_39.rs diff --git a/openstack_cli/src/block_storage/v3/backup/show.rs b/cli-cmd/block-storage/src/v3/backup/show.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/backup/show.rs rename to cli-cmd/block-storage/src/v3/backup/show.rs diff --git a/openstack_cli/src/block_storage/v3/capability/show.rs b/cli-cmd/block-storage/src/v3/capability/show.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/capability/show.rs rename to cli-cmd/block-storage/src/v3/capability/show.rs diff --git a/openstack_cli/src/block_storage/v3/cgsnapshot/create.rs b/cli-cmd/block-storage/src/v3/cgsnapshot/create.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/cgsnapshot/create.rs rename to cli-cmd/block-storage/src/v3/cgsnapshot/create.rs diff --git a/openstack_cli/src/block_storage/v3/cgsnapshot/delete.rs b/cli-cmd/block-storage/src/v3/cgsnapshot/delete.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/cgsnapshot/delete.rs rename to cli-cmd/block-storage/src/v3/cgsnapshot/delete.rs diff --git a/openstack_cli/src/block_storage/v3/cgsnapshot/list.rs b/cli-cmd/block-storage/src/v3/cgsnapshot/list.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/cgsnapshot/list.rs rename to cli-cmd/block-storage/src/v3/cgsnapshot/list.rs diff --git a/openstack_cli/src/block_storage/v3/cgsnapshot/show.rs b/cli-cmd/block-storage/src/v3/cgsnapshot/show.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/cgsnapshot/show.rs rename to cli-cmd/block-storage/src/v3/cgsnapshot/show.rs diff --git a/openstack_cli/src/block_storage/v3/cluster.rs b/cli-cmd/block-storage/src/v3/cluster.rs similarity index 95% rename from openstack_cli/src/block_storage/v3/cluster.rs rename to cli-cmd/block-storage/src/v3/cluster.rs index 8e066e008..0b1f53173 100644 --- a/openstack_cli/src/block_storage/v3/cluster.rs +++ b/cli-cmd/block-storage/src/v3/cluster.rs @@ -17,8 +17,7 @@ use clap::{Parser, Subcommand}; -use crate::{Cli, OpenStackCliError}; - +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; use openstack_sdk::AsyncOpenStack; pub mod list; @@ -62,9 +61,9 @@ pub enum ClusterCommands { impl ClusterCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/block_storage/v3/cluster/list.rs b/cli-cmd/block-storage/src/v3/cluster/list.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/cluster/list.rs rename to cli-cmd/block-storage/src/v3/cluster/list.rs diff --git a/openstack_cli/src/block_storage/v3/cluster/show.rs b/cli-cmd/block-storage/src/v3/cluster/show.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/cluster/show.rs rename to cli-cmd/block-storage/src/v3/cluster/show.rs diff --git a/openstack_cli/src/block_storage/v3/consistencygroup/create.rs b/cli-cmd/block-storage/src/v3/consistencygroup/create.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/consistencygroup/create.rs rename to cli-cmd/block-storage/src/v3/consistencygroup/create.rs diff --git a/openstack_cli/src/block_storage/v3/consistencygroup/create_from_src/create.rs b/cli-cmd/block-storage/src/v3/consistencygroup/create_from_src/create.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/consistencygroup/create_from_src/create.rs rename to cli-cmd/block-storage/src/v3/consistencygroup/create_from_src/create.rs diff --git a/openstack_cli/src/block_storage/v3/consistencygroup/delete.rs b/cli-cmd/block-storage/src/v3/consistencygroup/delete.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/consistencygroup/delete.rs rename to cli-cmd/block-storage/src/v3/consistencygroup/delete.rs diff --git a/openstack_cli/src/block_storage/v3/consistencygroup/delete/create.rs b/cli-cmd/block-storage/src/v3/consistencygroup/delete/create.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/consistencygroup/delete/create.rs rename to cli-cmd/block-storage/src/v3/consistencygroup/delete/create.rs diff --git a/openstack_cli/src/block_storage/v3/consistencygroup/list.rs b/cli-cmd/block-storage/src/v3/consistencygroup/list.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/consistencygroup/list.rs rename to cli-cmd/block-storage/src/v3/consistencygroup/list.rs diff --git a/openstack_cli/src/block_storage/v3/consistencygroup/set.rs b/cli-cmd/block-storage/src/v3/consistencygroup/set.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/consistencygroup/set.rs rename to cli-cmd/block-storage/src/v3/consistencygroup/set.rs diff --git a/openstack_cli/src/block_storage/v3/consistencygroup/show.rs b/cli-cmd/block-storage/src/v3/consistencygroup/show.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/consistencygroup/show.rs rename to cli-cmd/block-storage/src/v3/consistencygroup/show.rs diff --git a/openstack_cli/src/block_storage/v3/default_type.rs b/cli-cmd/block-storage/src/v3/default_type.rs similarity index 94% rename from openstack_cli/src/block_storage/v3/default_type.rs rename to cli-cmd/block-storage/src/v3/default_type.rs index 71cf96e72..732a7a6a6 100644 --- a/openstack_cli/src/block_storage/v3/default_type.rs +++ b/cli-cmd/block-storage/src/v3/default_type.rs @@ -16,8 +16,7 @@ use clap::{Parser, Subcommand}; -use crate::{Cli, OpenStackCliError}; - +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; use openstack_sdk::AsyncOpenStack; pub mod delete; @@ -57,9 +56,9 @@ pub enum DefaultTypeCommands { impl DefaultTypeCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/block_storage/v3/default_type/delete.rs b/cli-cmd/block-storage/src/v3/default_type/delete.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/default_type/delete.rs rename to cli-cmd/block-storage/src/v3/default_type/delete.rs diff --git a/openstack_cli/src/block_storage/v3/default_type/list.rs b/cli-cmd/block-storage/src/v3/default_type/list.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/default_type/list.rs rename to cli-cmd/block-storage/src/v3/default_type/list.rs diff --git a/openstack_cli/src/block_storage/v3/default_type/set_362.rs b/cli-cmd/block-storage/src/v3/default_type/set_362.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/default_type/set_362.rs rename to cli-cmd/block-storage/src/v3/default_type/set_362.rs diff --git a/openstack_cli/src/block_storage/v3/default_type/show.rs b/cli-cmd/block-storage/src/v3/default_type/show.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/default_type/show.rs rename to cli-cmd/block-storage/src/v3/default_type/show.rs diff --git a/openstack_cli/src/block_storage/v3/extension.rs b/cli-cmd/block-storage/src/v3/extension.rs similarity index 90% rename from openstack_cli/src/block_storage/v3/extension.rs rename to cli-cmd/block-storage/src/v3/extension.rs index 7888e96e1..6629ff68a 100644 --- a/openstack_cli/src/block_storage/v3/extension.rs +++ b/cli-cmd/block-storage/src/v3/extension.rs @@ -16,8 +16,7 @@ use clap::{Parser, Subcommand}; -use crate::{Cli, OpenStackCliError}; - +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; use openstack_sdk::AsyncOpenStack; pub mod list; @@ -39,9 +38,9 @@ pub enum ExtensionCommands { impl ExtensionCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/block_storage/v3/extension/list.rs b/cli-cmd/block-storage/src/v3/extension/list.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/extension/list.rs rename to cli-cmd/block-storage/src/v3/extension/list.rs diff --git a/openstack_cli/src/block_storage/v3/group.rs b/cli-cmd/block-storage/src/v3/group.rs similarity index 97% rename from openstack_cli/src/block_storage/v3/group.rs rename to cli-cmd/block-storage/src/v3/group.rs index a0d353d3a..8a1ff893c 100644 --- a/openstack_cli/src/block_storage/v3/group.rs +++ b/cli-cmd/block-storage/src/v3/group.rs @@ -16,8 +16,7 @@ use clap::{Parser, Subcommand}; -use crate::{Cli, OpenStackCliError}; - +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; use openstack_sdk::AsyncOpenStack; pub mod create_313; @@ -77,9 +76,9 @@ pub enum GroupCommands { impl GroupCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/block_storage/v3/group/create_313.rs b/cli-cmd/block-storage/src/v3/group/create_313.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/group/create_313.rs rename to cli-cmd/block-storage/src/v3/group/create_313.rs diff --git a/openstack_cli/src/block_storage/v3/group/create_from_src_314.rs b/cli-cmd/block-storage/src/v3/group/create_from_src_314.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/group/create_from_src_314.rs rename to cli-cmd/block-storage/src/v3/group/create_from_src_314.rs diff --git a/openstack_cli/src/block_storage/v3/group/delete_313.rs b/cli-cmd/block-storage/src/v3/group/delete_313.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/group/delete_313.rs rename to cli-cmd/block-storage/src/v3/group/delete_313.rs diff --git a/openstack_cli/src/block_storage/v3/group/disable_replication_338.rs b/cli-cmd/block-storage/src/v3/group/disable_replication_338.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/group/disable_replication_338.rs rename to cli-cmd/block-storage/src/v3/group/disable_replication_338.rs diff --git a/openstack_cli/src/block_storage/v3/group/enable_replication_338.rs b/cli-cmd/block-storage/src/v3/group/enable_replication_338.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/group/enable_replication_338.rs rename to cli-cmd/block-storage/src/v3/group/enable_replication_338.rs diff --git a/openstack_cli/src/block_storage/v3/group/failover_replication_338.rs b/cli-cmd/block-storage/src/v3/group/failover_replication_338.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/group/failover_replication_338.rs rename to cli-cmd/block-storage/src/v3/group/failover_replication_338.rs diff --git a/openstack_cli/src/block_storage/v3/group/list.rs b/cli-cmd/block-storage/src/v3/group/list.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/group/list.rs rename to cli-cmd/block-storage/src/v3/group/list.rs diff --git a/openstack_cli/src/block_storage/v3/group/list_replication_targets_338.rs b/cli-cmd/block-storage/src/v3/group/list_replication_targets_338.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/group/list_replication_targets_338.rs rename to cli-cmd/block-storage/src/v3/group/list_replication_targets_338.rs diff --git a/openstack_cli/src/block_storage/v3/group/reset_status_320.rs b/cli-cmd/block-storage/src/v3/group/reset_status_320.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/group/reset_status_320.rs rename to cli-cmd/block-storage/src/v3/group/reset_status_320.rs diff --git a/openstack_cli/src/block_storage/v3/group/set_313.rs b/cli-cmd/block-storage/src/v3/group/set_313.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/group/set_313.rs rename to cli-cmd/block-storage/src/v3/group/set_313.rs diff --git a/openstack_cli/src/block_storage/v3/group/show.rs b/cli-cmd/block-storage/src/v3/group/show.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/group/show.rs rename to cli-cmd/block-storage/src/v3/group/show.rs diff --git a/openstack_cli/src/block_storage/v3/group_snapshot.rs b/cli-cmd/block-storage/src/v3/group_snapshot.rs similarity index 94% rename from openstack_cli/src/block_storage/v3/group_snapshot.rs rename to cli-cmd/block-storage/src/v3/group_snapshot.rs index dd3be8438..4da3534c1 100644 --- a/openstack_cli/src/block_storage/v3/group_snapshot.rs +++ b/cli-cmd/block-storage/src/v3/group_snapshot.rs @@ -16,8 +16,7 @@ use clap::{Parser, Subcommand}; -use crate::{Cli, OpenStackCliError}; - +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; use openstack_sdk::AsyncOpenStack; pub mod create_314; @@ -51,9 +50,9 @@ pub enum GroupSnapshotCommands { impl GroupSnapshotCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/block_storage/v3/group_snapshot/create_314.rs b/cli-cmd/block-storage/src/v3/group_snapshot/create_314.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/group_snapshot/create_314.rs rename to cli-cmd/block-storage/src/v3/group_snapshot/create_314.rs diff --git a/openstack_cli/src/block_storage/v3/group_snapshot/delete.rs b/cli-cmd/block-storage/src/v3/group_snapshot/delete.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/group_snapshot/delete.rs rename to cli-cmd/block-storage/src/v3/group_snapshot/delete.rs diff --git a/openstack_cli/src/block_storage/v3/group_snapshot/list.rs b/cli-cmd/block-storage/src/v3/group_snapshot/list.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/group_snapshot/list.rs rename to cli-cmd/block-storage/src/v3/group_snapshot/list.rs diff --git a/openstack_cli/src/block_storage/v3/group_snapshot/reset_status_319.rs b/cli-cmd/block-storage/src/v3/group_snapshot/reset_status_319.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/group_snapshot/reset_status_319.rs rename to cli-cmd/block-storage/src/v3/group_snapshot/reset_status_319.rs diff --git a/openstack_cli/src/block_storage/v3/group_snapshot/show.rs b/cli-cmd/block-storage/src/v3/group_snapshot/show.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/group_snapshot/show.rs rename to cli-cmd/block-storage/src/v3/group_snapshot/show.rs diff --git a/openstack_cli/src/block_storage/v3/group_type.rs b/cli-cmd/block-storage/src/v3/group_type.rs similarity index 94% rename from openstack_cli/src/block_storage/v3/group_type.rs rename to cli-cmd/block-storage/src/v3/group_type.rs index 95611bce8..8937fee76 100644 --- a/openstack_cli/src/block_storage/v3/group_type.rs +++ b/cli-cmd/block-storage/src/v3/group_type.rs @@ -16,8 +16,7 @@ use clap::{Parser, Subcommand}; -use crate::{Cli, OpenStackCliError}; - +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; use openstack_sdk::AsyncOpenStack; pub mod create_311; @@ -53,9 +52,9 @@ pub enum GroupTypeCommands { impl GroupTypeCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/block_storage/v3/group_type/create_311.rs b/cli-cmd/block-storage/src/v3/group_type/create_311.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/group_type/create_311.rs rename to cli-cmd/block-storage/src/v3/group_type/create_311.rs diff --git a/openstack_cli/src/block_storage/v3/group_type/delete.rs b/cli-cmd/block-storage/src/v3/group_type/delete.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/group_type/delete.rs rename to cli-cmd/block-storage/src/v3/group_type/delete.rs diff --git a/openstack_cli/src/block_storage/v3/group_type/group_spec.rs b/cli-cmd/block-storage/src/v3/group_type/group_spec.rs similarity index 93% rename from openstack_cli/src/block_storage/v3/group_type/group_spec.rs rename to cli-cmd/block-storage/src/v3/group_type/group_spec.rs index 9e7fd276c..5395b4f01 100644 --- a/openstack_cli/src/block_storage/v3/group_type/group_spec.rs +++ b/cli-cmd/block-storage/src/v3/group_type/group_spec.rs @@ -15,10 +15,9 @@ //! Group Type group_spec use clap::{Parser, Subcommand}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; - pub mod create_311; pub mod delete; pub mod list; @@ -49,9 +48,9 @@ pub enum GroupSpecCommands { impl GroupSpecCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/block_storage/v3/group_type/group_spec/create_311.rs b/cli-cmd/block-storage/src/v3/group_type/group_spec/create_311.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/group_type/group_spec/create_311.rs rename to cli-cmd/block-storage/src/v3/group_type/group_spec/create_311.rs diff --git a/openstack_cli/src/block_storage/v3/group_type/group_spec/delete.rs b/cli-cmd/block-storage/src/v3/group_type/group_spec/delete.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/group_type/group_spec/delete.rs rename to cli-cmd/block-storage/src/v3/group_type/group_spec/delete.rs diff --git a/openstack_cli/src/block_storage/v3/group_type/group_spec/list.rs b/cli-cmd/block-storage/src/v3/group_type/group_spec/list.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/group_type/group_spec/list.rs rename to cli-cmd/block-storage/src/v3/group_type/group_spec/list.rs diff --git a/openstack_cli/src/block_storage/v3/group_type/group_spec/set_311.rs b/cli-cmd/block-storage/src/v3/group_type/group_spec/set_311.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/group_type/group_spec/set_311.rs rename to cli-cmd/block-storage/src/v3/group_type/group_spec/set_311.rs diff --git a/openstack_cli/src/block_storage/v3/group_type/group_spec/show.rs b/cli-cmd/block-storage/src/v3/group_type/group_spec/show.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/group_type/group_spec/show.rs rename to cli-cmd/block-storage/src/v3/group_type/group_spec/show.rs diff --git a/openstack_cli/src/block_storage/v3/group_type/list.rs b/cli-cmd/block-storage/src/v3/group_type/list.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/group_type/list.rs rename to cli-cmd/block-storage/src/v3/group_type/list.rs diff --git a/openstack_cli/src/block_storage/v3/group_type/set_311.rs b/cli-cmd/block-storage/src/v3/group_type/set_311.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/group_type/set_311.rs rename to cli-cmd/block-storage/src/v3/group_type/set_311.rs diff --git a/openstack_cli/src/block_storage/v3/group_type/show.rs b/cli-cmd/block-storage/src/v3/group_type/show.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/group_type/show.rs rename to cli-cmd/block-storage/src/v3/group_type/show.rs diff --git a/openstack_cli/src/block_storage/v3/host.rs b/cli-cmd/block-storage/src/v3/host.rs similarity index 91% rename from openstack_cli/src/block_storage/v3/host.rs rename to cli-cmd/block-storage/src/v3/host.rs index 94f63ad7c..a9b04c038 100644 --- a/openstack_cli/src/block_storage/v3/host.rs +++ b/cli-cmd/block-storage/src/v3/host.rs @@ -16,8 +16,7 @@ use clap::{Parser, Subcommand}; -use crate::{Cli, OpenStackCliError}; - +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; use openstack_sdk::AsyncOpenStack; pub mod list; @@ -45,9 +44,9 @@ pub enum HostCommands { impl HostCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/block_storage/v3/host/list.rs b/cli-cmd/block-storage/src/v3/host/list.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/host/list.rs rename to cli-cmd/block-storage/src/v3/host/list.rs diff --git a/openstack_cli/src/block_storage/v3/host/show.rs b/cli-cmd/block-storage/src/v3/host/show.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/host/show.rs rename to cli-cmd/block-storage/src/v3/host/show.rs diff --git a/openstack_cli/src/block_storage/v3/limit.rs b/cli-cmd/block-storage/src/v3/limit.rs similarity index 91% rename from openstack_cli/src/block_storage/v3/limit.rs rename to cli-cmd/block-storage/src/v3/limit.rs index 3029534e3..4f259273d 100644 --- a/openstack_cli/src/block_storage/v3/limit.rs +++ b/cli-cmd/block-storage/src/v3/limit.rs @@ -17,8 +17,7 @@ use clap::{Parser, Subcommand}; -use crate::{Cli, OpenStackCliError}; - +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; use openstack_sdk::AsyncOpenStack; pub mod list; @@ -42,9 +41,9 @@ pub enum LimitCommands { impl LimitCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/block_storage/v3/limit/list.rs b/cli-cmd/block-storage/src/v3/limit/list.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/limit/list.rs rename to cli-cmd/block-storage/src/v3/limit/list.rs diff --git a/openstack_cli/src/block_storage/v3/manageable_snapshot/create.rs b/cli-cmd/block-storage/src/v3/manageable_snapshot/create.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/manageable_snapshot/create.rs rename to cli-cmd/block-storage/src/v3/manageable_snapshot/create.rs diff --git a/openstack_cli/src/block_storage/v3/manageable_snapshot/get.rs b/cli-cmd/block-storage/src/v3/manageable_snapshot/get.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/manageable_snapshot/get.rs rename to cli-cmd/block-storage/src/v3/manageable_snapshot/get.rs diff --git a/openstack_cli/src/block_storage/v3/manageable_snapshot/list.rs b/cli-cmd/block-storage/src/v3/manageable_snapshot/list.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/manageable_snapshot/list.rs rename to cli-cmd/block-storage/src/v3/manageable_snapshot/list.rs diff --git a/openstack_cli/src/block_storage/v3/manageable_volume/create.rs b/cli-cmd/block-storage/src/v3/manageable_volume/create.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/manageable_volume/create.rs rename to cli-cmd/block-storage/src/v3/manageable_volume/create.rs diff --git a/openstack_cli/src/block_storage/v3/manageable_volume/create_30.rs b/cli-cmd/block-storage/src/v3/manageable_volume/create_30.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/manageable_volume/create_30.rs rename to cli-cmd/block-storage/src/v3/manageable_volume/create_30.rs diff --git a/openstack_cli/src/block_storage/v3/manageable_volume/create_316.rs b/cli-cmd/block-storage/src/v3/manageable_volume/create_316.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/manageable_volume/create_316.rs rename to cli-cmd/block-storage/src/v3/manageable_volume/create_316.rs diff --git a/openstack_cli/src/block_storage/v3/manageable_volume/get.rs b/cli-cmd/block-storage/src/v3/manageable_volume/get.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/manageable_volume/get.rs rename to cli-cmd/block-storage/src/v3/manageable_volume/get.rs diff --git a/openstack_cli/src/block_storage/v3/manageable_volume/list.rs b/cli-cmd/block-storage/src/v3/manageable_volume/list.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/manageable_volume/list.rs rename to cli-cmd/block-storage/src/v3/manageable_volume/list.rs diff --git a/openstack_cli/src/block_storage/v3/message.rs b/cli-cmd/block-storage/src/v3/message.rs similarity index 92% rename from openstack_cli/src/block_storage/v3/message.rs rename to cli-cmd/block-storage/src/v3/message.rs index fc44ceadc..728cf4a53 100644 --- a/openstack_cli/src/block_storage/v3/message.rs +++ b/cli-cmd/block-storage/src/v3/message.rs @@ -17,8 +17,7 @@ use clap::{Parser, Subcommand}; -use crate::{Cli, OpenStackCliError}; - +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; use openstack_sdk::AsyncOpenStack; pub mod delete; @@ -47,9 +46,9 @@ pub enum MessageCommands { impl MessageCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/block_storage/v3/message/delete.rs b/cli-cmd/block-storage/src/v3/message/delete.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/message/delete.rs rename to cli-cmd/block-storage/src/v3/message/delete.rs diff --git a/openstack_cli/src/block_storage/v3/message/list.rs b/cli-cmd/block-storage/src/v3/message/list.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/message/list.rs rename to cli-cmd/block-storage/src/v3/message/list.rs diff --git a/openstack_cli/src/block_storage/v3/message/show.rs b/cli-cmd/block-storage/src/v3/message/show.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/message/show.rs rename to cli-cmd/block-storage/src/v3/message/show.rs diff --git a/openstack_cli/src/block_storage/v3/os_volume_transfer.rs b/cli-cmd/block-storage/src/v3/os_volume_transfer.rs similarity index 93% rename from openstack_cli/src/block_storage/v3/os_volume_transfer.rs rename to cli-cmd/block-storage/src/v3/os_volume_transfer.rs index 6fa09ef92..739350259 100644 --- a/openstack_cli/src/block_storage/v3/os_volume_transfer.rs +++ b/cli-cmd/block-storage/src/v3/os_volume_transfer.rs @@ -17,8 +17,7 @@ use clap::{Parser, Subcommand}; -use crate::{Cli, OpenStackCliError}; - +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; use openstack_sdk::AsyncOpenStack; pub mod accept; @@ -50,9 +49,9 @@ pub enum VolumeTransferCommands { impl VolumeTransferCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/block_storage/v3/os_volume_transfer/accept.rs b/cli-cmd/block-storage/src/v3/os_volume_transfer/accept.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/os_volume_transfer/accept.rs rename to cli-cmd/block-storage/src/v3/os_volume_transfer/accept.rs diff --git a/openstack_cli/src/block_storage/v3/os_volume_transfer/create.rs b/cli-cmd/block-storage/src/v3/os_volume_transfer/create.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/os_volume_transfer/create.rs rename to cli-cmd/block-storage/src/v3/os_volume_transfer/create.rs diff --git a/openstack_cli/src/block_storage/v3/os_volume_transfer/delete.rs b/cli-cmd/block-storage/src/v3/os_volume_transfer/delete.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/os_volume_transfer/delete.rs rename to cli-cmd/block-storage/src/v3/os_volume_transfer/delete.rs diff --git a/openstack_cli/src/block_storage/v3/os_volume_transfer/list.rs b/cli-cmd/block-storage/src/v3/os_volume_transfer/list.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/os_volume_transfer/list.rs rename to cli-cmd/block-storage/src/v3/os_volume_transfer/list.rs diff --git a/openstack_cli/src/block_storage/v3/os_volume_transfer/show.rs b/cli-cmd/block-storage/src/v3/os_volume_transfer/show.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/os_volume_transfer/show.rs rename to cli-cmd/block-storage/src/v3/os_volume_transfer/show.rs diff --git a/openstack_cli/src/block_storage/v3/qos_spec.rs b/cli-cmd/block-storage/src/v3/qos_spec.rs similarity index 95% rename from openstack_cli/src/block_storage/v3/qos_spec.rs rename to cli-cmd/block-storage/src/v3/qos_spec.rs index 86a023d57..086ff3510 100644 --- a/openstack_cli/src/block_storage/v3/qos_spec.rs +++ b/cli-cmd/block-storage/src/v3/qos_spec.rs @@ -16,8 +16,7 @@ use clap::{Parser, Subcommand}; -use crate::{Cli, OpenStackCliError}; - +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; use openstack_sdk::AsyncOpenStack; pub mod associate; @@ -62,9 +61,9 @@ pub enum QosSpecCommands { impl QosSpecCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/block_storage/v3/qos_spec/associate.rs b/cli-cmd/block-storage/src/v3/qos_spec/associate.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/qos_spec/associate.rs rename to cli-cmd/block-storage/src/v3/qos_spec/associate.rs diff --git a/openstack_cli/src/block_storage/v3/qos_spec/association.rs b/cli-cmd/block-storage/src/v3/qos_spec/association.rs similarity index 90% rename from openstack_cli/src/block_storage/v3/qos_spec/association.rs rename to cli-cmd/block-storage/src/v3/qos_spec/association.rs index 718fc629b..8b5a29839 100644 --- a/openstack_cli/src/block_storage/v3/qos_spec/association.rs +++ b/cli-cmd/block-storage/src/v3/qos_spec/association.rs @@ -16,8 +16,7 @@ use clap::{Parser, Subcommand}; -use crate::{Cli, OpenStackCliError}; - +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; use openstack_sdk::AsyncOpenStack; pub mod list; @@ -39,9 +38,9 @@ pub enum AssociationCommands { impl AssociationCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/block_storage/v3/qos_spec/association/list.rs b/cli-cmd/block-storage/src/v3/qos_spec/association/list.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/qos_spec/association/list.rs rename to cli-cmd/block-storage/src/v3/qos_spec/association/list.rs diff --git a/openstack_cli/src/block_storage/v3/qos_spec/create.rs b/cli-cmd/block-storage/src/v3/qos_spec/create.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/qos_spec/create.rs rename to cli-cmd/block-storage/src/v3/qos_spec/create.rs diff --git a/openstack_cli/src/block_storage/v3/qos_spec/delete.rs b/cli-cmd/block-storage/src/v3/qos_spec/delete.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/qos_spec/delete.rs rename to cli-cmd/block-storage/src/v3/qos_spec/delete.rs diff --git a/openstack_cli/src/block_storage/v3/qos_spec/delete_keys.rs b/cli-cmd/block-storage/src/v3/qos_spec/delete_keys.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/qos_spec/delete_keys.rs rename to cli-cmd/block-storage/src/v3/qos_spec/delete_keys.rs diff --git a/openstack_cli/src/block_storage/v3/qos_spec/disassociate.rs b/cli-cmd/block-storage/src/v3/qos_spec/disassociate.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/qos_spec/disassociate.rs rename to cli-cmd/block-storage/src/v3/qos_spec/disassociate.rs diff --git a/openstack_cli/src/block_storage/v3/qos_spec/disassociate_all.rs b/cli-cmd/block-storage/src/v3/qos_spec/disassociate_all.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/qos_spec/disassociate_all.rs rename to cli-cmd/block-storage/src/v3/qos_spec/disassociate_all.rs diff --git a/openstack_cli/src/block_storage/v3/qos_spec/list.rs b/cli-cmd/block-storage/src/v3/qos_spec/list.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/qos_spec/list.rs rename to cli-cmd/block-storage/src/v3/qos_spec/list.rs diff --git a/openstack_cli/src/block_storage/v3/qos_spec/set.rs b/cli-cmd/block-storage/src/v3/qos_spec/set.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/qos_spec/set.rs rename to cli-cmd/block-storage/src/v3/qos_spec/set.rs diff --git a/openstack_cli/src/block_storage/v3/qos_spec/show.rs b/cli-cmd/block-storage/src/v3/qos_spec/show.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/qos_spec/show.rs rename to cli-cmd/block-storage/src/v3/qos_spec/show.rs diff --git a/openstack_cli/src/block_storage/v3/quota_class_set.rs b/cli-cmd/block-storage/src/v3/quota_class_set.rs similarity index 92% rename from openstack_cli/src/block_storage/v3/quota_class_set.rs rename to cli-cmd/block-storage/src/v3/quota_class_set.rs index 1dc0ac42b..3875b7db9 100644 --- a/openstack_cli/src/block_storage/v3/quota_class_set.rs +++ b/cli-cmd/block-storage/src/v3/quota_class_set.rs @@ -16,8 +16,7 @@ use clap::{Parser, Subcommand}; -use crate::{Cli, OpenStackCliError}; - +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; use openstack_sdk::AsyncOpenStack; pub mod set; @@ -45,9 +44,9 @@ pub enum QuotaClassSetCommands { impl QuotaClassSetCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/block_storage/v3/quota_class_set/set.rs b/cli-cmd/block-storage/src/v3/quota_class_set/set.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/quota_class_set/set.rs rename to cli-cmd/block-storage/src/v3/quota_class_set/set.rs diff --git a/openstack_cli/src/block_storage/v3/quota_class_set/show.rs b/cli-cmd/block-storage/src/v3/quota_class_set/show.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/quota_class_set/show.rs rename to cli-cmd/block-storage/src/v3/quota_class_set/show.rs diff --git a/openstack_cli/src/block_storage/v3/quota_set.rs b/cli-cmd/block-storage/src/v3/quota_set.rs similarity index 94% rename from openstack_cli/src/block_storage/v3/quota_set.rs rename to cli-cmd/block-storage/src/v3/quota_set.rs index 84e9a685d..ea4299daa 100644 --- a/openstack_cli/src/block_storage/v3/quota_set.rs +++ b/cli-cmd/block-storage/src/v3/quota_set.rs @@ -16,8 +16,7 @@ use clap::{Parser, Subcommand}; -use crate::{Cli, OpenStackCliError}; - +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; use openstack_sdk::AsyncOpenStack; pub mod defaults; @@ -61,9 +60,9 @@ pub enum QuotaSetCommands { impl QuotaSetCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/block_storage/v3/quota_set/defaults.rs b/cli-cmd/block-storage/src/v3/quota_set/defaults.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/quota_set/defaults.rs rename to cli-cmd/block-storage/src/v3/quota_set/defaults.rs diff --git a/openstack_cli/src/block_storage/v3/quota_set/delete.rs b/cli-cmd/block-storage/src/v3/quota_set/delete.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/quota_set/delete.rs rename to cli-cmd/block-storage/src/v3/quota_set/delete.rs diff --git a/openstack_cli/src/block_storage/v3/quota_set/set.rs b/cli-cmd/block-storage/src/v3/quota_set/set.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/quota_set/set.rs rename to cli-cmd/block-storage/src/v3/quota_set/set.rs diff --git a/openstack_cli/src/block_storage/v3/quota_set/show.rs b/cli-cmd/block-storage/src/v3/quota_set/show.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/quota_set/show.rs rename to cli-cmd/block-storage/src/v3/quota_set/show.rs diff --git a/openstack_cli/src/block_storage/v3/resource_filter.rs b/cli-cmd/block-storage/src/v3/resource_filter.rs similarity index 91% rename from openstack_cli/src/block_storage/v3/resource_filter.rs rename to cli-cmd/block-storage/src/v3/resource_filter.rs index dc91df7ce..497e59149 100644 --- a/openstack_cli/src/block_storage/v3/resource_filter.rs +++ b/cli-cmd/block-storage/src/v3/resource_filter.rs @@ -17,8 +17,7 @@ use clap::{Parser, Subcommand}; -use crate::{Cli, OpenStackCliError}; - +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; use openstack_sdk::AsyncOpenStack; pub mod list; @@ -42,9 +41,9 @@ pub enum ResourceFilterCommands { impl ResourceFilterCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/block_storage/v3/resource_filter/list.rs b/cli-cmd/block-storage/src/v3/resource_filter/list.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/resource_filter/list.rs rename to cli-cmd/block-storage/src/v3/resource_filter/list.rs diff --git a/openstack_cli/src/block_storage/v3/scheduler_stat.rs b/cli-cmd/block-storage/src/v3/scheduler_stat.rs similarity index 91% rename from openstack_cli/src/block_storage/v3/scheduler_stat.rs rename to cli-cmd/block-storage/src/v3/scheduler_stat.rs index 9cccc1121..cb956b9cd 100644 --- a/openstack_cli/src/block_storage/v3/scheduler_stat.rs +++ b/cli-cmd/block-storage/src/v3/scheduler_stat.rs @@ -17,8 +17,7 @@ use clap::{Parser, Subcommand}; -use crate::{Cli, OpenStackCliError}; - +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; use openstack_sdk::AsyncOpenStack; pub mod pool; @@ -41,9 +40,9 @@ pub enum SchedulerStatCommands { impl SchedulerStatCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/block_storage/v3/scheduler_stat/pool.rs b/cli-cmd/block-storage/src/v3/scheduler_stat/pool.rs similarity index 91% rename from openstack_cli/src/block_storage/v3/scheduler_stat/pool.rs rename to cli-cmd/block-storage/src/v3/scheduler_stat/pool.rs index f9afe6e9e..4e93166dc 100644 --- a/openstack_cli/src/block_storage/v3/scheduler_stat/pool.rs +++ b/cli-cmd/block-storage/src/v3/scheduler_stat/pool.rs @@ -17,8 +17,7 @@ use clap::{Parser, Subcommand}; -use crate::{Cli, OpenStackCliError}; - +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; use openstack_sdk::AsyncOpenStack; pub mod list; @@ -42,9 +41,9 @@ pub enum PoolCommands { impl PoolCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/block_storage/v3/scheduler_stat/pool/list.rs b/cli-cmd/block-storage/src/v3/scheduler_stat/pool/list.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/scheduler_stat/pool/list.rs rename to cli-cmd/block-storage/src/v3/scheduler_stat/pool/list.rs diff --git a/openstack_cli/src/block_storage/v3/service.rs b/cli-cmd/block-storage/src/v3/service.rs similarity index 91% rename from openstack_cli/src/block_storage/v3/service.rs rename to cli-cmd/block-storage/src/v3/service.rs index b249d2077..9dcab331f 100644 --- a/openstack_cli/src/block_storage/v3/service.rs +++ b/cli-cmd/block-storage/src/v3/service.rs @@ -17,8 +17,7 @@ use clap::{Parser, Subcommand}; -use crate::{Cli, OpenStackCliError}; - +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; use openstack_sdk::AsyncOpenStack; pub mod list; @@ -43,9 +42,9 @@ pub enum ServiceCommands { impl ServiceCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/block_storage/v3/service/list.rs b/cli-cmd/block-storage/src/v3/service/list.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/service/list.rs rename to cli-cmd/block-storage/src/v3/service/list.rs diff --git a/openstack_cli/src/block_storage/v3/snapshot.rs b/cli-cmd/block-storage/src/v3/snapshot.rs similarity index 96% rename from openstack_cli/src/block_storage/v3/snapshot.rs rename to cli-cmd/block-storage/src/v3/snapshot.rs index 17592c261..0eeb0734c 100644 --- a/openstack_cli/src/block_storage/v3/snapshot.rs +++ b/cli-cmd/block-storage/src/v3/snapshot.rs @@ -17,8 +17,7 @@ use clap::{Parser, Subcommand}; -use crate::{Cli, OpenStackCliError}; - +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; use openstack_sdk::AsyncOpenStack; pub mod create; @@ -78,9 +77,9 @@ pub enum SnapshotCommands { impl SnapshotCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/block_storage/v3/snapshot/create.rs b/cli-cmd/block-storage/src/v3/snapshot/create.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/snapshot/create.rs rename to cli-cmd/block-storage/src/v3/snapshot/create.rs diff --git a/openstack_cli/src/block_storage/v3/snapshot/delete.rs b/cli-cmd/block-storage/src/v3/snapshot/delete.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/snapshot/delete.rs rename to cli-cmd/block-storage/src/v3/snapshot/delete.rs diff --git a/openstack_cli/src/block_storage/v3/snapshot/list.rs b/cli-cmd/block-storage/src/v3/snapshot/list.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/snapshot/list.rs rename to cli-cmd/block-storage/src/v3/snapshot/list.rs diff --git a/openstack_cli/src/block_storage/v3/snapshot/metadata/create.rs b/cli-cmd/block-storage/src/v3/snapshot/metadata/create.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/snapshot/metadata/create.rs rename to cli-cmd/block-storage/src/v3/snapshot/metadata/create.rs diff --git a/openstack_cli/src/block_storage/v3/snapshot/metadata/delete.rs b/cli-cmd/block-storage/src/v3/snapshot/metadata/delete.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/snapshot/metadata/delete.rs rename to cli-cmd/block-storage/src/v3/snapshot/metadata/delete.rs diff --git a/openstack_cli/src/block_storage/v3/snapshot/metadata/list.rs b/cli-cmd/block-storage/src/v3/snapshot/metadata/list.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/snapshot/metadata/list.rs rename to cli-cmd/block-storage/src/v3/snapshot/metadata/list.rs diff --git a/openstack_cli/src/block_storage/v3/snapshot/metadata/replace.rs b/cli-cmd/block-storage/src/v3/snapshot/metadata/replace.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/snapshot/metadata/replace.rs rename to cli-cmd/block-storage/src/v3/snapshot/metadata/replace.rs diff --git a/openstack_cli/src/block_storage/v3/snapshot/metadata/set.rs b/cli-cmd/block-storage/src/v3/snapshot/metadata/set.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/snapshot/metadata/set.rs rename to cli-cmd/block-storage/src/v3/snapshot/metadata/set.rs diff --git a/openstack_cli/src/block_storage/v3/snapshot/metadata/show.rs b/cli-cmd/block-storage/src/v3/snapshot/metadata/show.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/snapshot/metadata/show.rs rename to cli-cmd/block-storage/src/v3/snapshot/metadata/show.rs diff --git a/openstack_cli/src/block_storage/v3/snapshot/os_force_delete.rs b/cli-cmd/block-storage/src/v3/snapshot/os_force_delete.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/snapshot/os_force_delete.rs rename to cli-cmd/block-storage/src/v3/snapshot/os_force_delete.rs diff --git a/openstack_cli/src/block_storage/v3/snapshot/os_reset_status.rs b/cli-cmd/block-storage/src/v3/snapshot/os_reset_status.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/snapshot/os_reset_status.rs rename to cli-cmd/block-storage/src/v3/snapshot/os_reset_status.rs diff --git a/openstack_cli/src/block_storage/v3/snapshot/os_unmanage.rs b/cli-cmd/block-storage/src/v3/snapshot/os_unmanage.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/snapshot/os_unmanage.rs rename to cli-cmd/block-storage/src/v3/snapshot/os_unmanage.rs diff --git a/openstack_cli/src/block_storage/v3/snapshot/os_update_snapshot_status.rs b/cli-cmd/block-storage/src/v3/snapshot/os_update_snapshot_status.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/snapshot/os_update_snapshot_status.rs rename to cli-cmd/block-storage/src/v3/snapshot/os_update_snapshot_status.rs diff --git a/openstack_cli/src/block_storage/v3/snapshot/set.rs b/cli-cmd/block-storage/src/v3/snapshot/set.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/snapshot/set.rs rename to cli-cmd/block-storage/src/v3/snapshot/set.rs diff --git a/openstack_cli/src/block_storage/v3/snapshot/show.rs b/cli-cmd/block-storage/src/v3/snapshot/show.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/snapshot/show.rs rename to cli-cmd/block-storage/src/v3/snapshot/show.rs diff --git a/openstack_cli/src/block_storage/v3/snapshot_manage.rs b/cli-cmd/block-storage/src/v3/snapshot_manage.rs similarity index 92% rename from openstack_cli/src/block_storage/v3/snapshot_manage.rs rename to cli-cmd/block-storage/src/v3/snapshot_manage.rs index 8b9d80b2b..f77e3ff77 100644 --- a/openstack_cli/src/block_storage/v3/snapshot_manage.rs +++ b/cli-cmd/block-storage/src/v3/snapshot_manage.rs @@ -17,8 +17,7 @@ use clap::{Parser, Subcommand}; -use crate::{Cli, OpenStackCliError}; - +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; use openstack_sdk::AsyncOpenStack; pub mod create; @@ -44,9 +43,9 @@ pub enum SnapshotManageCommands { impl SnapshotManageCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/block_storage/v3/snapshot_manage/create.rs b/cli-cmd/block-storage/src/v3/snapshot_manage/create.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/snapshot_manage/create.rs rename to cli-cmd/block-storage/src/v3/snapshot_manage/create.rs diff --git a/openstack_cli/src/block_storage/v3/snapshot_manage/get.rs b/cli-cmd/block-storage/src/v3/snapshot_manage/get.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/snapshot_manage/get.rs rename to cli-cmd/block-storage/src/v3/snapshot_manage/get.rs diff --git a/openstack_cli/src/block_storage/v3/snapshot_manage/list.rs b/cli-cmd/block-storage/src/v3/snapshot_manage/list.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/snapshot_manage/list.rs rename to cli-cmd/block-storage/src/v3/snapshot_manage/list.rs diff --git a/openstack_cli/src/block_storage/v3/type.rs b/cli-cmd/block-storage/src/v3/type.rs similarity index 96% rename from openstack_cli/src/block_storage/v3/type.rs rename to cli-cmd/block-storage/src/v3/type.rs index def336a6a..a4bdbeb22 100644 --- a/openstack_cli/src/block_storage/v3/type.rs +++ b/cli-cmd/block-storage/src/v3/type.rs @@ -17,8 +17,7 @@ use clap::{Parser, Subcommand}; -use crate::{Cli, OpenStackCliError}; - +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; use openstack_sdk::AsyncOpenStack; pub mod add_project_access; @@ -66,9 +65,9 @@ pub enum VolumeTypeCommands { impl VolumeTypeCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/block_storage/v3/type/add_project_access.rs b/cli-cmd/block-storage/src/v3/type/add_project_access.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/type/add_project_access.rs rename to cli-cmd/block-storage/src/v3/type/add_project_access.rs diff --git a/openstack_cli/src/block_storage/v3/type/create.rs b/cli-cmd/block-storage/src/v3/type/create.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/type/create.rs rename to cli-cmd/block-storage/src/v3/type/create.rs diff --git a/openstack_cli/src/block_storage/v3/type/delete.rs b/cli-cmd/block-storage/src/v3/type/delete.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/type/delete.rs rename to cli-cmd/block-storage/src/v3/type/delete.rs diff --git a/openstack_cli/src/block_storage/v3/type/encryption.rs b/cli-cmd/block-storage/src/v3/type/encryption.rs similarity index 93% rename from openstack_cli/src/block_storage/v3/type/encryption.rs rename to cli-cmd/block-storage/src/v3/type/encryption.rs index 62ef76c38..d8e2ddc8b 100644 --- a/openstack_cli/src/block_storage/v3/type/encryption.rs +++ b/cli-cmd/block-storage/src/v3/type/encryption.rs @@ -17,8 +17,7 @@ use clap::{Parser, Subcommand}; -use crate::{Cli, OpenStackCliError}; - +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; use openstack_sdk::AsyncOpenStack; pub mod create; @@ -33,7 +32,7 @@ pub mod show; /// used to specify actionable information for a back-end storage device. #[derive(Parser)] pub struct EncryptionCommand { - /// sumcommnd + /// subcommand. #[command(subcommand)] command: EncryptionCommands, } @@ -51,9 +50,9 @@ pub enum EncryptionCommands { impl EncryptionCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/block_storage/v3/type/encryption/create.rs b/cli-cmd/block-storage/src/v3/type/encryption/create.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/type/encryption/create.rs rename to cli-cmd/block-storage/src/v3/type/encryption/create.rs diff --git a/openstack_cli/src/block_storage/v3/type/encryption/delete.rs b/cli-cmd/block-storage/src/v3/type/encryption/delete.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/type/encryption/delete.rs rename to cli-cmd/block-storage/src/v3/type/encryption/delete.rs diff --git a/openstack_cli/src/block_storage/v3/type/encryption/list.rs b/cli-cmd/block-storage/src/v3/type/encryption/list.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/type/encryption/list.rs rename to cli-cmd/block-storage/src/v3/type/encryption/list.rs diff --git a/openstack_cli/src/block_storage/v3/type/encryption/set.rs b/cli-cmd/block-storage/src/v3/type/encryption/set.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/type/encryption/set.rs rename to cli-cmd/block-storage/src/v3/type/encryption/set.rs diff --git a/openstack_cli/src/block_storage/v3/type/encryption/show.rs b/cli-cmd/block-storage/src/v3/type/encryption/show.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/type/encryption/show.rs rename to cli-cmd/block-storage/src/v3/type/encryption/show.rs diff --git a/openstack_cli/src/block_storage/v3/type/extra_spec.rs b/cli-cmd/block-storage/src/v3/type/extra_spec.rs similarity index 93% rename from openstack_cli/src/block_storage/v3/type/extra_spec.rs rename to cli-cmd/block-storage/src/v3/type/extra_spec.rs index f2b3355c7..324356691 100644 --- a/openstack_cli/src/block_storage/v3/type/extra_spec.rs +++ b/cli-cmd/block-storage/src/v3/type/extra_spec.rs @@ -15,10 +15,9 @@ //! Block Storage Type Extra Specs commands use clap::{Parser, Subcommand}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; - pub mod create; pub mod delete; pub mod list; @@ -46,9 +45,9 @@ pub enum ExtraSpecsCommands { impl ExtraSpecsCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/block_storage/v3/type/extra_spec/create.rs b/cli-cmd/block-storage/src/v3/type/extra_spec/create.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/type/extra_spec/create.rs rename to cli-cmd/block-storage/src/v3/type/extra_spec/create.rs diff --git a/openstack_cli/src/block_storage/v3/type/extra_spec/delete.rs b/cli-cmd/block-storage/src/v3/type/extra_spec/delete.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/type/extra_spec/delete.rs rename to cli-cmd/block-storage/src/v3/type/extra_spec/delete.rs diff --git a/openstack_cli/src/block_storage/v3/type/extra_spec/list.rs b/cli-cmd/block-storage/src/v3/type/extra_spec/list.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/type/extra_spec/list.rs rename to cli-cmd/block-storage/src/v3/type/extra_spec/list.rs diff --git a/openstack_cli/src/block_storage/v3/type/extra_spec/set.rs b/cli-cmd/block-storage/src/v3/type/extra_spec/set.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/type/extra_spec/set.rs rename to cli-cmd/block-storage/src/v3/type/extra_spec/set.rs diff --git a/openstack_cli/src/block_storage/v3/type/extra_spec/show.rs b/cli-cmd/block-storage/src/v3/type/extra_spec/show.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/type/extra_spec/show.rs rename to cli-cmd/block-storage/src/v3/type/extra_spec/show.rs diff --git a/openstack_cli/src/block_storage/v3/type/list.rs b/cli-cmd/block-storage/src/v3/type/list.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/type/list.rs rename to cli-cmd/block-storage/src/v3/type/list.rs diff --git a/openstack_cli/src/block_storage/v3/type/remove_project_access.rs b/cli-cmd/block-storage/src/v3/type/remove_project_access.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/type/remove_project_access.rs rename to cli-cmd/block-storage/src/v3/type/remove_project_access.rs diff --git a/openstack_cli/src/block_storage/v3/type/set.rs b/cli-cmd/block-storage/src/v3/type/set.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/type/set.rs rename to cli-cmd/block-storage/src/v3/type/set.rs diff --git a/openstack_cli/src/block_storage/v3/type/show.rs b/cli-cmd/block-storage/src/v3/type/show.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/type/show.rs rename to cli-cmd/block-storage/src/v3/type/show.rs diff --git a/openstack_cli/src/block_storage/v3/type/volume_type_access/get.rs b/cli-cmd/block-storage/src/v3/type/volume_type_access/get.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/type/volume_type_access/get.rs rename to cli-cmd/block-storage/src/v3/type/volume_type_access/get.rs diff --git a/openstack_cli/src/block_storage/v3/version/get.rs b/cli-cmd/block-storage/src/v3/version/get.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/version/get.rs rename to cli-cmd/block-storage/src/v3/version/get.rs diff --git a/openstack_cli/src/block_storage/v3/volume.rs b/cli-cmd/block-storage/src/v3/volume.rs similarity index 95% rename from openstack_cli/src/block_storage/v3/volume.rs rename to cli-cmd/block-storage/src/v3/volume.rs index 6fb1e5d07..e792dff6c 100644 --- a/openstack_cli/src/block_storage/v3/volume.rs +++ b/cli-cmd/block-storage/src/v3/volume.rs @@ -17,8 +17,7 @@ use clap::{Parser, Subcommand}; -use crate::{Cli, OpenStackCliError}; - +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; use openstack_sdk::AsyncOpenStack; pub mod create_30; @@ -62,9 +61,9 @@ pub enum VolumeCommands { impl VolumeCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/block_storage/v3/volume/create_30.rs b/cli-cmd/block-storage/src/v3/volume/create_30.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/volume/create_30.rs rename to cli-cmd/block-storage/src/v3/volume/create_30.rs diff --git a/openstack_cli/src/block_storage/v3/volume/create_313.rs b/cli-cmd/block-storage/src/v3/volume/create_313.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/volume/create_313.rs rename to cli-cmd/block-storage/src/v3/volume/create_313.rs diff --git a/openstack_cli/src/block_storage/v3/volume/create_347.rs b/cli-cmd/block-storage/src/v3/volume/create_347.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/volume/create_347.rs rename to cli-cmd/block-storage/src/v3/volume/create_347.rs diff --git a/openstack_cli/src/block_storage/v3/volume/create_353.rs b/cli-cmd/block-storage/src/v3/volume/create_353.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/volume/create_353.rs rename to cli-cmd/block-storage/src/v3/volume/create_353.rs diff --git a/openstack_cli/src/block_storage/v3/volume/delete.rs b/cli-cmd/block-storage/src/v3/volume/delete.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/volume/delete.rs rename to cli-cmd/block-storage/src/v3/volume/delete.rs diff --git a/openstack_cli/src/block_storage/v3/volume/encryption/list.rs b/cli-cmd/block-storage/src/v3/volume/encryption/list.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/volume/encryption/list.rs rename to cli-cmd/block-storage/src/v3/volume/encryption/list.rs diff --git a/openstack_cli/src/block_storage/v3/volume/encryption/show.rs b/cli-cmd/block-storage/src/v3/volume/encryption/show.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/volume/encryption/show.rs rename to cli-cmd/block-storage/src/v3/volume/encryption/show.rs diff --git a/openstack_cli/src/block_storage/v3/volume/list.rs b/cli-cmd/block-storage/src/v3/volume/list.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/volume/list.rs rename to cli-cmd/block-storage/src/v3/volume/list.rs diff --git a/openstack_cli/src/block_storage/v3/volume/metadata.rs b/cli-cmd/block-storage/src/v3/volume/metadata.rs similarity index 94% rename from openstack_cli/src/block_storage/v3/volume/metadata.rs rename to cli-cmd/block-storage/src/v3/volume/metadata.rs index 1b7a81033..a05b18b08 100644 --- a/openstack_cli/src/block_storage/v3/volume/metadata.rs +++ b/cli-cmd/block-storage/src/v3/volume/metadata.rs @@ -15,10 +15,9 @@ //! Block storage volume metadata commands use clap::{Parser, Subcommand}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; - mod create; mod delete; mod list; @@ -52,9 +51,9 @@ pub enum MetadataCommands { impl MetadataCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/block_storage/v3/volume/metadata/create.rs b/cli-cmd/block-storage/src/v3/volume/metadata/create.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/volume/metadata/create.rs rename to cli-cmd/block-storage/src/v3/volume/metadata/create.rs diff --git a/openstack_cli/src/block_storage/v3/volume/metadata/delete.rs b/cli-cmd/block-storage/src/v3/volume/metadata/delete.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/volume/metadata/delete.rs rename to cli-cmd/block-storage/src/v3/volume/metadata/delete.rs diff --git a/openstack_cli/src/block_storage/v3/volume/metadata/list.rs b/cli-cmd/block-storage/src/v3/volume/metadata/list.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/volume/metadata/list.rs rename to cli-cmd/block-storage/src/v3/volume/metadata/list.rs diff --git a/openstack_cli/src/block_storage/v3/volume/metadata/replace.rs b/cli-cmd/block-storage/src/v3/volume/metadata/replace.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/volume/metadata/replace.rs rename to cli-cmd/block-storage/src/v3/volume/metadata/replace.rs diff --git a/openstack_cli/src/block_storage/v3/volume/metadata/set.rs b/cli-cmd/block-storage/src/v3/volume/metadata/set.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/volume/metadata/set.rs rename to cli-cmd/block-storage/src/v3/volume/metadata/set.rs diff --git a/openstack_cli/src/block_storage/v3/volume/metadata/show.rs b/cli-cmd/block-storage/src/v3/volume/metadata/show.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/volume/metadata/show.rs rename to cli-cmd/block-storage/src/v3/volume/metadata/show.rs diff --git a/openstack_cli/src/block_storage/v3/volume/os_attach.rs b/cli-cmd/block-storage/src/v3/volume/os_attach.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/volume/os_attach.rs rename to cli-cmd/block-storage/src/v3/volume/os_attach.rs diff --git a/openstack_cli/src/block_storage/v3/volume/os_begin_detaching.rs b/cli-cmd/block-storage/src/v3/volume/os_begin_detaching.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/volume/os_begin_detaching.rs rename to cli-cmd/block-storage/src/v3/volume/os_begin_detaching.rs diff --git a/openstack_cli/src/block_storage/v3/volume/os_detach.rs b/cli-cmd/block-storage/src/v3/volume/os_detach.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/volume/os_detach.rs rename to cli-cmd/block-storage/src/v3/volume/os_detach.rs diff --git a/openstack_cli/src/block_storage/v3/volume/os_extend.rs b/cli-cmd/block-storage/src/v3/volume/os_extend.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/volume/os_extend.rs rename to cli-cmd/block-storage/src/v3/volume/os_extend.rs diff --git a/openstack_cli/src/block_storage/v3/volume/os_extend_volume_completion.rs b/cli-cmd/block-storage/src/v3/volume/os_extend_volume_completion.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/volume/os_extend_volume_completion.rs rename to cli-cmd/block-storage/src/v3/volume/os_extend_volume_completion.rs diff --git a/openstack_cli/src/block_storage/v3/volume/os_force_delete.rs b/cli-cmd/block-storage/src/v3/volume/os_force_delete.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/volume/os_force_delete.rs rename to cli-cmd/block-storage/src/v3/volume/os_force_delete.rs diff --git a/openstack_cli/src/block_storage/v3/volume/os_force_detach.rs b/cli-cmd/block-storage/src/v3/volume/os_force_detach.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/volume/os_force_detach.rs rename to cli-cmd/block-storage/src/v3/volume/os_force_detach.rs diff --git a/openstack_cli/src/block_storage/v3/volume/os_initialize_connection.rs b/cli-cmd/block-storage/src/v3/volume/os_initialize_connection.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/volume/os_initialize_connection.rs rename to cli-cmd/block-storage/src/v3/volume/os_initialize_connection.rs diff --git a/openstack_cli/src/block_storage/v3/volume/os_migrate_volume_30.rs b/cli-cmd/block-storage/src/v3/volume/os_migrate_volume_30.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/volume/os_migrate_volume_30.rs rename to cli-cmd/block-storage/src/v3/volume/os_migrate_volume_30.rs diff --git a/openstack_cli/src/block_storage/v3/volume/os_migrate_volume_316.rs b/cli-cmd/block-storage/src/v3/volume/os_migrate_volume_316.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/volume/os_migrate_volume_316.rs rename to cli-cmd/block-storage/src/v3/volume/os_migrate_volume_316.rs diff --git a/openstack_cli/src/block_storage/v3/volume/os_migrate_volume_completion.rs b/cli-cmd/block-storage/src/v3/volume/os_migrate_volume_completion.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/volume/os_migrate_volume_completion.rs rename to cli-cmd/block-storage/src/v3/volume/os_migrate_volume_completion.rs diff --git a/openstack_cli/src/block_storage/v3/volume/os_reimage_368.rs b/cli-cmd/block-storage/src/v3/volume/os_reimage_368.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/volume/os_reimage_368.rs rename to cli-cmd/block-storage/src/v3/volume/os_reimage_368.rs diff --git a/openstack_cli/src/block_storage/v3/volume/os_reserve.rs b/cli-cmd/block-storage/src/v3/volume/os_reserve.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/volume/os_reserve.rs rename to cli-cmd/block-storage/src/v3/volume/os_reserve.rs diff --git a/openstack_cli/src/block_storage/v3/volume/os_reset_status.rs b/cli-cmd/block-storage/src/v3/volume/os_reset_status.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/volume/os_reset_status.rs rename to cli-cmd/block-storage/src/v3/volume/os_reset_status.rs diff --git a/openstack_cli/src/block_storage/v3/volume/os_retype.rs b/cli-cmd/block-storage/src/v3/volume/os_retype.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/volume/os_retype.rs rename to cli-cmd/block-storage/src/v3/volume/os_retype.rs diff --git a/openstack_cli/src/block_storage/v3/volume/os_roll_detaching.rs b/cli-cmd/block-storage/src/v3/volume/os_roll_detaching.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/volume/os_roll_detaching.rs rename to cli-cmd/block-storage/src/v3/volume/os_roll_detaching.rs diff --git a/openstack_cli/src/block_storage/v3/volume/os_set_bootable.rs b/cli-cmd/block-storage/src/v3/volume/os_set_bootable.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/volume/os_set_bootable.rs rename to cli-cmd/block-storage/src/v3/volume/os_set_bootable.rs diff --git a/openstack_cli/src/block_storage/v3/volume/os_set_image_metadata.rs b/cli-cmd/block-storage/src/v3/volume/os_set_image_metadata.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/volume/os_set_image_metadata.rs rename to cli-cmd/block-storage/src/v3/volume/os_set_image_metadata.rs diff --git a/openstack_cli/src/block_storage/v3/volume/os_show_image_metadata.rs b/cli-cmd/block-storage/src/v3/volume/os_show_image_metadata.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/volume/os_show_image_metadata.rs rename to cli-cmd/block-storage/src/v3/volume/os_show_image_metadata.rs diff --git a/openstack_cli/src/block_storage/v3/volume/os_terminate_connection.rs b/cli-cmd/block-storage/src/v3/volume/os_terminate_connection.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/volume/os_terminate_connection.rs rename to cli-cmd/block-storage/src/v3/volume/os_terminate_connection.rs diff --git a/openstack_cli/src/block_storage/v3/volume/os_unmanage.rs b/cli-cmd/block-storage/src/v3/volume/os_unmanage.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/volume/os_unmanage.rs rename to cli-cmd/block-storage/src/v3/volume/os_unmanage.rs diff --git a/openstack_cli/src/block_storage/v3/volume/os_unreserve.rs b/cli-cmd/block-storage/src/v3/volume/os_unreserve.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/volume/os_unreserve.rs rename to cli-cmd/block-storage/src/v3/volume/os_unreserve.rs diff --git a/openstack_cli/src/block_storage/v3/volume/os_unset_image_metadata.rs b/cli-cmd/block-storage/src/v3/volume/os_unset_image_metadata.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/volume/os_unset_image_metadata.rs rename to cli-cmd/block-storage/src/v3/volume/os_unset_image_metadata.rs diff --git a/openstack_cli/src/block_storage/v3/volume/os_update_readonly_flag.rs b/cli-cmd/block-storage/src/v3/volume/os_update_readonly_flag.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/volume/os_update_readonly_flag.rs rename to cli-cmd/block-storage/src/v3/volume/os_update_readonly_flag.rs diff --git a/openstack_cli/src/block_storage/v3/volume/os_volume_upload_image_30.rs b/cli-cmd/block-storage/src/v3/volume/os_volume_upload_image_30.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/volume/os_volume_upload_image_30.rs rename to cli-cmd/block-storage/src/v3/volume/os_volume_upload_image_30.rs diff --git a/openstack_cli/src/block_storage/v3/volume/os_volume_upload_image_31.rs b/cli-cmd/block-storage/src/v3/volume/os_volume_upload_image_31.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/volume/os_volume_upload_image_31.rs rename to cli-cmd/block-storage/src/v3/volume/os_volume_upload_image_31.rs diff --git a/openstack_cli/src/block_storage/v3/volume/revert.rs b/cli-cmd/block-storage/src/v3/volume/revert.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/volume/revert.rs rename to cli-cmd/block-storage/src/v3/volume/revert.rs diff --git a/openstack_cli/src/block_storage/v3/volume/revert_340.rs b/cli-cmd/block-storage/src/v3/volume/revert_340.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/volume/revert_340.rs rename to cli-cmd/block-storage/src/v3/volume/revert_340.rs diff --git a/openstack_cli/src/block_storage/v3/volume/set_30.rs b/cli-cmd/block-storage/src/v3/volume/set_30.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/volume/set_30.rs rename to cli-cmd/block-storage/src/v3/volume/set_30.rs diff --git a/openstack_cli/src/block_storage/v3/volume/set_353.rs b/cli-cmd/block-storage/src/v3/volume/set_353.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/volume/set_353.rs rename to cli-cmd/block-storage/src/v3/volume/set_353.rs diff --git a/openstack_cli/src/block_storage/v3/volume/show.rs b/cli-cmd/block-storage/src/v3/volume/show.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/volume/show.rs rename to cli-cmd/block-storage/src/v3/volume/show.rs diff --git a/openstack_cli/src/block_storage/v3/volume/summary/get.rs b/cli-cmd/block-storage/src/v3/volume/summary/get.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/volume/summary/get.rs rename to cli-cmd/block-storage/src/v3/volume/summary/get.rs diff --git a/openstack_cli/src/block_storage/v3/volume_manage.rs b/cli-cmd/block-storage/src/v3/volume_manage.rs similarity index 93% rename from openstack_cli/src/block_storage/v3/volume_manage.rs rename to cli-cmd/block-storage/src/v3/volume_manage.rs index 88329d736..e92d168ef 100644 --- a/openstack_cli/src/block_storage/v3/volume_manage.rs +++ b/cli-cmd/block-storage/src/v3/volume_manage.rs @@ -17,8 +17,7 @@ use clap::{Parser, Subcommand}; -use crate::{Cli, OpenStackCliError}; - +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; use openstack_sdk::AsyncOpenStack; pub mod create_30; @@ -47,9 +46,9 @@ pub enum VolumeManageCommands { impl VolumeManageCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/block_storage/v3/volume_manage/create_30.rs b/cli-cmd/block-storage/src/v3/volume_manage/create_30.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/volume_manage/create_30.rs rename to cli-cmd/block-storage/src/v3/volume_manage/create_30.rs diff --git a/openstack_cli/src/block_storage/v3/volume_manage/create_316.rs b/cli-cmd/block-storage/src/v3/volume_manage/create_316.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/volume_manage/create_316.rs rename to cli-cmd/block-storage/src/v3/volume_manage/create_316.rs diff --git a/openstack_cli/src/block_storage/v3/volume_manage/get.rs b/cli-cmd/block-storage/src/v3/volume_manage/get.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/volume_manage/get.rs rename to cli-cmd/block-storage/src/v3/volume_manage/get.rs diff --git a/openstack_cli/src/block_storage/v3/volume_manage/list.rs b/cli-cmd/block-storage/src/v3/volume_manage/list.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/volume_manage/list.rs rename to cli-cmd/block-storage/src/v3/volume_manage/list.rs diff --git a/openstack_cli/src/block_storage/v3/volume_transfer.rs b/cli-cmd/block-storage/src/v3/volume_transfer.rs similarity index 94% rename from openstack_cli/src/block_storage/v3/volume_transfer.rs rename to cli-cmd/block-storage/src/v3/volume_transfer.rs index cf39715d1..bb9a9a979 100644 --- a/openstack_cli/src/block_storage/v3/volume_transfer.rs +++ b/cli-cmd/block-storage/src/v3/volume_transfer.rs @@ -17,8 +17,7 @@ use clap::{Parser, Subcommand}; -use crate::{Cli, OpenStackCliError}; - +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; use openstack_sdk::AsyncOpenStack; pub mod accept; @@ -52,9 +51,9 @@ pub enum VolumeTransferCommands { impl VolumeTransferCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/block_storage/v3/volume_transfer/accept.rs b/cli-cmd/block-storage/src/v3/volume_transfer/accept.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/volume_transfer/accept.rs rename to cli-cmd/block-storage/src/v3/volume_transfer/accept.rs diff --git a/openstack_cli/src/block_storage/v3/volume_transfer/create_30.rs b/cli-cmd/block-storage/src/v3/volume_transfer/create_30.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/volume_transfer/create_30.rs rename to cli-cmd/block-storage/src/v3/volume_transfer/create_30.rs diff --git a/openstack_cli/src/block_storage/v3/volume_transfer/create_355.rs b/cli-cmd/block-storage/src/v3/volume_transfer/create_355.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/volume_transfer/create_355.rs rename to cli-cmd/block-storage/src/v3/volume_transfer/create_355.rs diff --git a/openstack_cli/src/block_storage/v3/volume_transfer/delete.rs b/cli-cmd/block-storage/src/v3/volume_transfer/delete.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/volume_transfer/delete.rs rename to cli-cmd/block-storage/src/v3/volume_transfer/delete.rs diff --git a/openstack_cli/src/block_storage/v3/volume_transfer/list.rs b/cli-cmd/block-storage/src/v3/volume_transfer/list.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/volume_transfer/list.rs rename to cli-cmd/block-storage/src/v3/volume_transfer/list.rs diff --git a/openstack_cli/src/block_storage/v3/volume_transfer/show.rs b/cli-cmd/block-storage/src/v3/volume_transfer/show.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/volume_transfer/show.rs rename to cli-cmd/block-storage/src/v3/volume_transfer/show.rs diff --git a/openstack_cli/src/block_storage/v3/worker/cleanup/create_324.rs b/cli-cmd/block-storage/src/v3/worker/cleanup/create_324.rs similarity index 100% rename from openstack_cli/src/block_storage/v3/worker/cleanup/create_324.rs rename to cli-cmd/block-storage/src/v3/worker/cleanup/create_324.rs diff --git a/cli-cmd/catalog/Cargo.toml b/cli-cmd/catalog/Cargo.toml new file mode 100644 index 000000000..ffc7214a5 --- /dev/null +++ b/cli-cmd/catalog/Cargo.toml @@ -0,0 +1,23 @@ +[package] +name = "openstack-cli-catalog" +description = "OpenStack CLI Catalog commands" +version = "0.1.0" +license.workspace = true +edition.workspace = true +authors.workspace = true +rust-version.workspace = true +homepage.workspace = true +repository.workspace = true + +[dependencies] +clap.workspace = true +openstack-cli-core = { version = "0.13", path = "../../cli-core/" } +openstack_sdk = { path="../../openstack_sdk", version = "^0.22", default-features = false, features = ["async", "identity"] } +openstack-sdk-core = { path="../../sdk-core", version = "^0.22" } +serde.workspace = true +serde_json.workspace = true +structable = { workspace = true } +tracing.workspace = true + +[lints] +workspace = true diff --git a/openstack_cli/src/catalog/mod.rs b/cli-cmd/catalog/src/lib.rs similarity index 91% rename from openstack_cli/src/catalog/mod.rs rename to cli-cmd/catalog/src/lib.rs index 5fe14c5a4..fd77f78e1 100644 --- a/openstack_cli/src/catalog/mod.rs +++ b/cli-cmd/catalog/src/lib.rs @@ -16,11 +16,9 @@ use clap::{Parser, Subcommand}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; use openstack_sdk::AsyncOpenStack; -use crate::Cli; -use crate::OpenStackCliError; - mod list; mod show; @@ -42,9 +40,9 @@ pub enum CatalogCommands { impl CatalogCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/catalog/list.rs b/cli-cmd/catalog/src/list.rs similarity index 93% rename from openstack_cli/src/catalog/list.rs rename to cli-cmd/catalog/src/list.rs index 056931ddd..5b15b1197 100644 --- a/openstack_cli/src/catalog/list.rs +++ b/cli-cmd/catalog/src/list.rs @@ -22,11 +22,9 @@ use serde_json::Value; use std::fmt; use tracing::info; +use openstack_cli_core::output::OutputProcessor; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; use openstack_sdk::AsyncOpenStack; - -use crate::Cli; -use crate::OpenStackCliError; -use crate::output::OutputProcessor; use structable::StructTable; use structable::StructTableOptions; @@ -93,9 +91,9 @@ impl fmt::Display for VecCatalogEndpoints { impl ListCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, client: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { info!("Show Catalog"); diff --git a/openstack_cli/src/catalog/show.rs b/cli-cmd/catalog/src/show.rs similarity index 92% rename from openstack_cli/src/catalog/show.rs rename to cli-cmd/catalog/src/show.rs index a473cef1d..b8f68069e 100644 --- a/openstack_cli/src/catalog/show.rs +++ b/cli-cmd/catalog/src/show.rs @@ -19,11 +19,9 @@ use serde::{Deserialize, Serialize}; use serde_json::Value; use tracing::info; +use openstack_cli_core::output::OutputProcessor; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; use openstack_sdk::AsyncOpenStack; - -use crate::Cli; -use crate::OpenStackCliError; -use crate::output::OutputProcessor; use structable::StructTable; use structable::StructTableOptions; @@ -50,9 +48,9 @@ pub struct CatalogEndpoint { impl ShowCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, client: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { info!("Show service endpoint catalog configuration"); diff --git a/cli-cmd/compute/Cargo.toml b/cli-cmd/compute/Cargo.toml new file mode 100644 index 000000000..f075fae5a --- /dev/null +++ b/cli-cmd/compute/Cargo.toml @@ -0,0 +1,24 @@ +[package] +name = "openstack-cli-compute" +description = "OpenStack CLI Compute commands" +version = "0.1.0" +license.workspace = true +edition.workspace = true +authors.workspace = true +rust-version.workspace = true +homepage.workspace = true +repository.workspace = true + +[dependencies] +clap = { workspace = true } +openstack-cli-core = { version = "0.13", path = "../../cli-core/" } +openstack_sdk = { path="../../openstack_sdk", version = "^0.22", default-features = false, features = ["async", "compute", "identity"] } +openstack-sdk-core = { path="../../sdk-core", version = "^0.22" } +openstack_types = { path="../../openstack_types", version = "^0.22" } +eyre = { workspace = true } +http = { workspace = true } +serde_json = {workspace = true} +tracing = { workspace = true} + +[lints] +workspace = true diff --git a/openstack_cli/src/compute/mod.rs b/cli-cmd/compute/src/lib.rs similarity index 95% rename from openstack_cli/src/compute/mod.rs rename to cli-cmd/compute/src/lib.rs index 5ab3bcd45..0c6a575e8 100644 --- a/openstack_cli/src/compute/mod.rs +++ b/cli-cmd/compute/src/lib.rs @@ -12,5 +12,5 @@ // // SPDX-License-Identifier: Apache-2.0 -//! Compute service commands +//! Compute API command pub mod v2; diff --git a/openstack_cli/src/compute/v2.rs b/cli-cmd/compute/src/v2.rs similarity index 97% rename from openstack_cli/src/compute/v2.rs rename to cli-cmd/compute/src/v2.rs index 944c2db10..2fd2b507a 100644 --- a/openstack_cli/src/compute/v2.rs +++ b/cli-cmd/compute/src/v2.rs @@ -16,10 +16,9 @@ use clap::{Parser, Subcommand}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; use openstack_sdk::{AsyncOpenStack, types::ServiceType}; -use crate::{Cli, OpenStackCliError}; - pub mod aggregate; pub mod assisted_volume_snapshot; pub mod availability_zone; @@ -73,9 +72,9 @@ pub enum ComputeCommands { impl ComputeCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { session diff --git a/openstack_cli/src/compute/v2/aggregate.rs b/cli-cmd/compute/src/v2/aggregate.rs similarity index 95% rename from openstack_cli/src/compute/v2/aggregate.rs rename to cli-cmd/compute/src/v2/aggregate.rs index b9f5c478a..a9b423e1f 100644 --- a/openstack_cli/src/compute/v2/aggregate.rs +++ b/cli-cmd/compute/src/v2/aggregate.rs @@ -17,7 +17,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; pub mod add_host; pub mod create_21; @@ -70,9 +70,9 @@ pub enum AggregateCommands { impl AggregateCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/compute/v2/aggregate/add_host.rs b/cli-cmd/compute/src/v2/aggregate/add_host.rs similarity index 100% rename from openstack_cli/src/compute/v2/aggregate/add_host.rs rename to cli-cmd/compute/src/v2/aggregate/add_host.rs diff --git a/openstack_cli/src/compute/v2/aggregate/create_20.rs b/cli-cmd/compute/src/v2/aggregate/create_20.rs similarity index 100% rename from openstack_cli/src/compute/v2/aggregate/create_20.rs rename to cli-cmd/compute/src/v2/aggregate/create_20.rs diff --git a/openstack_cli/src/compute/v2/aggregate/create_21.rs b/cli-cmd/compute/src/v2/aggregate/create_21.rs similarity index 100% rename from openstack_cli/src/compute/v2/aggregate/create_21.rs rename to cli-cmd/compute/src/v2/aggregate/create_21.rs diff --git a/openstack_cli/src/compute/v2/aggregate/delete.rs b/cli-cmd/compute/src/v2/aggregate/delete.rs similarity index 100% rename from openstack_cli/src/compute/v2/aggregate/delete.rs rename to cli-cmd/compute/src/v2/aggregate/delete.rs diff --git a/openstack_cli/src/compute/v2/aggregate/image/cache_281.rs b/cli-cmd/compute/src/v2/aggregate/image/cache_281.rs similarity index 100% rename from openstack_cli/src/compute/v2/aggregate/image/cache_281.rs rename to cli-cmd/compute/src/v2/aggregate/image/cache_281.rs diff --git a/openstack_cli/src/compute/v2/aggregate/list.rs b/cli-cmd/compute/src/v2/aggregate/list.rs similarity index 100% rename from openstack_cli/src/compute/v2/aggregate/list.rs rename to cli-cmd/compute/src/v2/aggregate/list.rs diff --git a/openstack_cli/src/compute/v2/aggregate/remove_host.rs b/cli-cmd/compute/src/v2/aggregate/remove_host.rs similarity index 100% rename from openstack_cli/src/compute/v2/aggregate/remove_host.rs rename to cli-cmd/compute/src/v2/aggregate/remove_host.rs diff --git a/openstack_cli/src/compute/v2/aggregate/set_20.rs b/cli-cmd/compute/src/v2/aggregate/set_20.rs similarity index 100% rename from openstack_cli/src/compute/v2/aggregate/set_20.rs rename to cli-cmd/compute/src/v2/aggregate/set_20.rs diff --git a/openstack_cli/src/compute/v2/aggregate/set_21.rs b/cli-cmd/compute/src/v2/aggregate/set_21.rs similarity index 100% rename from openstack_cli/src/compute/v2/aggregate/set_21.rs rename to cli-cmd/compute/src/v2/aggregate/set_21.rs diff --git a/openstack_cli/src/compute/v2/aggregate/set_metadata.rs b/cli-cmd/compute/src/v2/aggregate/set_metadata.rs similarity index 100% rename from openstack_cli/src/compute/v2/aggregate/set_metadata.rs rename to cli-cmd/compute/src/v2/aggregate/set_metadata.rs diff --git a/openstack_cli/src/compute/v2/aggregate/show.rs b/cli-cmd/compute/src/v2/aggregate/show.rs similarity index 100% rename from openstack_cli/src/compute/v2/aggregate/show.rs rename to cli-cmd/compute/src/v2/aggregate/show.rs diff --git a/openstack_cli/src/compute/v2/assisted_volume_snapshot.rs b/cli-cmd/compute/src/v2/assisted_volume_snapshot.rs similarity index 94% rename from openstack_cli/src/compute/v2/assisted_volume_snapshot.rs rename to cli-cmd/compute/src/v2/assisted_volume_snapshot.rs index 27b4499ff..d75da761e 100644 --- a/openstack_cli/src/compute/v2/assisted_volume_snapshot.rs +++ b/cli-cmd/compute/src/v2/assisted_volume_snapshot.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; pub mod create; pub mod delete; @@ -53,9 +53,9 @@ pub enum AssistedVolumeSnapshotCommands { impl AssistedVolumeSnapshotCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/compute/v2/assisted_volume_snapshot/create.rs b/cli-cmd/compute/src/v2/assisted_volume_snapshot/create.rs similarity index 100% rename from openstack_cli/src/compute/v2/assisted_volume_snapshot/create.rs rename to cli-cmd/compute/src/v2/assisted_volume_snapshot/create.rs diff --git a/openstack_cli/src/compute/v2/assisted_volume_snapshot/delete.rs b/cli-cmd/compute/src/v2/assisted_volume_snapshot/delete.rs similarity index 100% rename from openstack_cli/src/compute/v2/assisted_volume_snapshot/delete.rs rename to cli-cmd/compute/src/v2/assisted_volume_snapshot/delete.rs diff --git a/openstack_cli/src/compute/v2/availability_zone.rs b/cli-cmd/compute/src/v2/availability_zone.rs similarity index 93% rename from openstack_cli/src/compute/v2/availability_zone.rs rename to cli-cmd/compute/src/v2/availability_zone.rs index 03c98dba1..ec705bce2 100644 --- a/openstack_cli/src/compute/v2/availability_zone.rs +++ b/cli-cmd/compute/src/v2/availability_zone.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; pub mod list; pub mod list_detail; @@ -47,9 +47,9 @@ pub enum AvailabilityZoneCommands { impl AvailabilityZoneCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/compute/v2/availability_zone/list.rs b/cli-cmd/compute/src/v2/availability_zone/list.rs similarity index 100% rename from openstack_cli/src/compute/v2/availability_zone/list.rs rename to cli-cmd/compute/src/v2/availability_zone/list.rs diff --git a/openstack_cli/src/compute/v2/availability_zone/list_detail.rs b/cli-cmd/compute/src/v2/availability_zone/list_detail.rs similarity index 100% rename from openstack_cli/src/compute/v2/availability_zone/list_detail.rs rename to cli-cmd/compute/src/v2/availability_zone/list_detail.rs diff --git a/openstack_cli/src/compute/v2/console_auth_token/show.rs b/cli-cmd/compute/src/v2/console_auth_token/show.rs similarity index 100% rename from openstack_cli/src/compute/v2/console_auth_token/show.rs rename to cli-cmd/compute/src/v2/console_auth_token/show.rs diff --git a/openstack_cli/src/compute/v2/extension.rs b/cli-cmd/compute/src/v2/extension.rs similarity index 91% rename from openstack_cli/src/compute/v2/extension.rs rename to cli-cmd/compute/src/v2/extension.rs index 21155a0d7..09039bcc9 100644 --- a/openstack_cli/src/compute/v2/extension.rs +++ b/cli-cmd/compute/src/v2/extension.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; pub mod list; pub mod show; @@ -41,9 +41,9 @@ pub enum ExtensionCommands { impl ExtensionCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/compute/v2/extension/list.rs b/cli-cmd/compute/src/v2/extension/list.rs similarity index 100% rename from openstack_cli/src/compute/v2/extension/list.rs rename to cli-cmd/compute/src/v2/extension/list.rs diff --git a/openstack_cli/src/compute/v2/extension/show.rs b/cli-cmd/compute/src/v2/extension/show.rs similarity index 100% rename from openstack_cli/src/compute/v2/extension/show.rs rename to cli-cmd/compute/src/v2/extension/show.rs diff --git a/openstack_cli/src/compute/v2/flavor.rs b/cli-cmd/compute/src/v2/flavor.rs similarity index 95% rename from openstack_cli/src/compute/v2/flavor.rs rename to cli-cmd/compute/src/v2/flavor.rs index f4816dfa4..13d45826b 100644 --- a/openstack_cli/src/compute/v2/flavor.rs +++ b/cli-cmd/compute/src/v2/flavor.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; pub mod add_tenant_access; pub mod create_20; @@ -63,9 +63,9 @@ pub enum FlavorCommands { impl FlavorCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/compute/v2/flavor/add_tenant_access.rs b/cli-cmd/compute/src/v2/flavor/add_tenant_access.rs similarity index 100% rename from openstack_cli/src/compute/v2/flavor/add_tenant_access.rs rename to cli-cmd/compute/src/v2/flavor/add_tenant_access.rs diff --git a/openstack_cli/src/compute/v2/flavor/create_20.rs b/cli-cmd/compute/src/v2/flavor/create_20.rs similarity index 100% rename from openstack_cli/src/compute/v2/flavor/create_20.rs rename to cli-cmd/compute/src/v2/flavor/create_20.rs diff --git a/openstack_cli/src/compute/v2/flavor/create_21.rs b/cli-cmd/compute/src/v2/flavor/create_21.rs similarity index 100% rename from openstack_cli/src/compute/v2/flavor/create_21.rs rename to cli-cmd/compute/src/v2/flavor/create_21.rs diff --git a/openstack_cli/src/compute/v2/flavor/create_2102.rs b/cli-cmd/compute/src/v2/flavor/create_2102.rs similarity index 100% rename from openstack_cli/src/compute/v2/flavor/create_2102.rs rename to cli-cmd/compute/src/v2/flavor/create_2102.rs diff --git a/openstack_cli/src/compute/v2/flavor/create_255.rs b/cli-cmd/compute/src/v2/flavor/create_255.rs similarity index 100% rename from openstack_cli/src/compute/v2/flavor/create_255.rs rename to cli-cmd/compute/src/v2/flavor/create_255.rs diff --git a/openstack_cli/src/compute/v2/flavor/delete.rs b/cli-cmd/compute/src/v2/flavor/delete.rs similarity index 100% rename from openstack_cli/src/compute/v2/flavor/delete.rs rename to cli-cmd/compute/src/v2/flavor/delete.rs diff --git a/openstack_cli/src/compute/v2/flavor/extra_spec.rs b/cli-cmd/compute/src/v2/flavor/extra_spec.rs similarity index 94% rename from openstack_cli/src/compute/v2/flavor/extra_spec.rs rename to cli-cmd/compute/src/v2/flavor/extra_spec.rs index 3458538a9..5ad9b4311 100644 --- a/openstack_cli/src/compute/v2/flavor/extra_spec.rs +++ b/cli-cmd/compute/src/v2/flavor/extra_spec.rs @@ -17,7 +17,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; mod create; mod delete; @@ -57,9 +57,9 @@ pub enum ExtraSpecsCommands { impl ExtraSpecsCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/compute/v2/flavor/extra_spec/create.rs b/cli-cmd/compute/src/v2/flavor/extra_spec/create.rs similarity index 100% rename from openstack_cli/src/compute/v2/flavor/extra_spec/create.rs rename to cli-cmd/compute/src/v2/flavor/extra_spec/create.rs diff --git a/openstack_cli/src/compute/v2/flavor/extra_spec/delete.rs b/cli-cmd/compute/src/v2/flavor/extra_spec/delete.rs similarity index 100% rename from openstack_cli/src/compute/v2/flavor/extra_spec/delete.rs rename to cli-cmd/compute/src/v2/flavor/extra_spec/delete.rs diff --git a/openstack_cli/src/compute/v2/flavor/extra_spec/list.rs b/cli-cmd/compute/src/v2/flavor/extra_spec/list.rs similarity index 100% rename from openstack_cli/src/compute/v2/flavor/extra_spec/list.rs rename to cli-cmd/compute/src/v2/flavor/extra_spec/list.rs diff --git a/openstack_cli/src/compute/v2/flavor/extra_spec/set.rs b/cli-cmd/compute/src/v2/flavor/extra_spec/set.rs similarity index 100% rename from openstack_cli/src/compute/v2/flavor/extra_spec/set.rs rename to cli-cmd/compute/src/v2/flavor/extra_spec/set.rs diff --git a/openstack_cli/src/compute/v2/flavor/extra_spec/show.rs b/cli-cmd/compute/src/v2/flavor/extra_spec/show.rs similarity index 100% rename from openstack_cli/src/compute/v2/flavor/extra_spec/show.rs rename to cli-cmd/compute/src/v2/flavor/extra_spec/show.rs diff --git a/openstack_cli/src/compute/v2/flavor/flavor_access.rs b/cli-cmd/compute/src/v2/flavor/flavor_access.rs similarity index 89% rename from openstack_cli/src/compute/v2/flavor/flavor_access.rs rename to cli-cmd/compute/src/v2/flavor/flavor_access.rs index 3db8ef863..ee67710f0 100644 --- a/openstack_cli/src/compute/v2/flavor/flavor_access.rs +++ b/cli-cmd/compute/src/v2/flavor/flavor_access.rs @@ -16,12 +16,11 @@ use clap::{Parser, Subcommand}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; - -use crate::compute::v2::flavor::add_tenant_access; -use crate::compute::v2::flavor::remove_tenant_access; +use crate::v2::flavor::add_tenant_access; +use crate::v2::flavor::remove_tenant_access; mod list; @@ -49,9 +48,9 @@ pub enum FlavorAccessCommands { impl FlavorAccessCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/compute/v2/flavor/flavor_access/list.rs b/cli-cmd/compute/src/v2/flavor/flavor_access/list.rs similarity index 100% rename from openstack_cli/src/compute/v2/flavor/flavor_access/list.rs rename to cli-cmd/compute/src/v2/flavor/flavor_access/list.rs diff --git a/openstack_cli/src/compute/v2/flavor/list.rs b/cli-cmd/compute/src/v2/flavor/list.rs similarity index 100% rename from openstack_cli/src/compute/v2/flavor/list.rs rename to cli-cmd/compute/src/v2/flavor/list.rs diff --git a/openstack_cli/src/compute/v2/flavor/remove_tenant_access.rs b/cli-cmd/compute/src/v2/flavor/remove_tenant_access.rs similarity index 100% rename from openstack_cli/src/compute/v2/flavor/remove_tenant_access.rs rename to cli-cmd/compute/src/v2/flavor/remove_tenant_access.rs diff --git a/openstack_cli/src/compute/v2/flavor/set_255.rs b/cli-cmd/compute/src/v2/flavor/set_255.rs similarity index 100% rename from openstack_cli/src/compute/v2/flavor/set_255.rs rename to cli-cmd/compute/src/v2/flavor/set_255.rs diff --git a/openstack_cli/src/compute/v2/flavor/show.rs b/cli-cmd/compute/src/v2/flavor/show.rs similarity index 100% rename from openstack_cli/src/compute/v2/flavor/show.rs rename to cli-cmd/compute/src/v2/flavor/show.rs diff --git a/openstack_cli/src/compute/v2/floating_ip/create.rs b/cli-cmd/compute/src/v2/floating_ip/create.rs similarity index 100% rename from openstack_cli/src/compute/v2/floating_ip/create.rs rename to cli-cmd/compute/src/v2/floating_ip/create.rs diff --git a/openstack_cli/src/compute/v2/floating_ip/delete.rs b/cli-cmd/compute/src/v2/floating_ip/delete.rs similarity index 100% rename from openstack_cli/src/compute/v2/floating_ip/delete.rs rename to cli-cmd/compute/src/v2/floating_ip/delete.rs diff --git a/openstack_cli/src/compute/v2/floating_ip/list.rs b/cli-cmd/compute/src/v2/floating_ip/list.rs similarity index 100% rename from openstack_cli/src/compute/v2/floating_ip/list.rs rename to cli-cmd/compute/src/v2/floating_ip/list.rs diff --git a/openstack_cli/src/compute/v2/floating_ip/show.rs b/cli-cmd/compute/src/v2/floating_ip/show.rs similarity index 100% rename from openstack_cli/src/compute/v2/floating_ip/show.rs rename to cli-cmd/compute/src/v2/floating_ip/show.rs diff --git a/openstack_cli/src/compute/v2/floating_ips_bulk/create.rs b/cli-cmd/compute/src/v2/floating_ips_bulk/create.rs similarity index 100% rename from openstack_cli/src/compute/v2/floating_ips_bulk/create.rs rename to cli-cmd/compute/src/v2/floating_ips_bulk/create.rs diff --git a/openstack_cli/src/compute/v2/floating_ips_bulk/list.rs b/cli-cmd/compute/src/v2/floating_ips_bulk/list.rs similarity index 100% rename from openstack_cli/src/compute/v2/floating_ips_bulk/list.rs rename to cli-cmd/compute/src/v2/floating_ips_bulk/list.rs diff --git a/openstack_cli/src/compute/v2/floating_ips_bulk/set.rs b/cli-cmd/compute/src/v2/floating_ips_bulk/set.rs similarity index 100% rename from openstack_cli/src/compute/v2/floating_ips_bulk/set.rs rename to cli-cmd/compute/src/v2/floating_ips_bulk/set.rs diff --git a/openstack_cli/src/compute/v2/floating_ips_bulk/show.rs b/cli-cmd/compute/src/v2/floating_ips_bulk/show.rs similarity index 100% rename from openstack_cli/src/compute/v2/floating_ips_bulk/show.rs rename to cli-cmd/compute/src/v2/floating_ips_bulk/show.rs diff --git a/openstack_cli/src/compute/v2/hypervisor.rs b/cli-cmd/compute/src/v2/hypervisor.rs similarity index 93% rename from openstack_cli/src/compute/v2/hypervisor.rs rename to cli-cmd/compute/src/v2/hypervisor.rs index b7129d3ea..2cac0a3f7 100644 --- a/openstack_cli/src/compute/v2/hypervisor.rs +++ b/cli-cmd/compute/src/v2/hypervisor.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; pub mod list; pub mod show; @@ -46,9 +46,9 @@ pub enum HypervisorCommands { impl HypervisorCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/compute/v2/hypervisor/list.rs b/cli-cmd/compute/src/v2/hypervisor/list.rs similarity index 100% rename from openstack_cli/src/compute/v2/hypervisor/list.rs rename to cli-cmd/compute/src/v2/hypervisor/list.rs diff --git a/openstack_cli/src/compute/v2/hypervisor/search/get.rs b/cli-cmd/compute/src/v2/hypervisor/search/get.rs similarity index 100% rename from openstack_cli/src/compute/v2/hypervisor/search/get.rs rename to cli-cmd/compute/src/v2/hypervisor/search/get.rs diff --git a/openstack_cli/src/compute/v2/hypervisor/server/get.rs b/cli-cmd/compute/src/v2/hypervisor/server/get.rs similarity index 100% rename from openstack_cli/src/compute/v2/hypervisor/server/get.rs rename to cli-cmd/compute/src/v2/hypervisor/server/get.rs diff --git a/openstack_cli/src/compute/v2/hypervisor/show.rs b/cli-cmd/compute/src/v2/hypervisor/show.rs similarity index 100% rename from openstack_cli/src/compute/v2/hypervisor/show.rs rename to cli-cmd/compute/src/v2/hypervisor/show.rs diff --git a/openstack_cli/src/compute/v2/hypervisor/statistic/get.rs b/cli-cmd/compute/src/v2/hypervisor/statistic/get.rs similarity index 100% rename from openstack_cli/src/compute/v2/hypervisor/statistic/get.rs rename to cli-cmd/compute/src/v2/hypervisor/statistic/get.rs diff --git a/openstack_cli/src/compute/v2/hypervisor/uptime/get.rs b/cli-cmd/compute/src/v2/hypervisor/uptime/get.rs similarity index 100% rename from openstack_cli/src/compute/v2/hypervisor/uptime/get.rs rename to cli-cmd/compute/src/v2/hypervisor/uptime/get.rs diff --git a/openstack_cli/src/compute/v2/instance_usage_audit_log.rs b/cli-cmd/compute/src/v2/instance_usage_audit_log.rs similarity index 93% rename from openstack_cli/src/compute/v2/instance_usage_audit_log.rs rename to cli-cmd/compute/src/v2/instance_usage_audit_log.rs index cfb20a571..9cf359584 100644 --- a/openstack_cli/src/compute/v2/instance_usage_audit_log.rs +++ b/cli-cmd/compute/src/v2/instance_usage_audit_log.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; pub mod list; pub mod show; @@ -48,9 +48,9 @@ pub enum InstanceUsageAuditLogCommands { impl InstanceUsageAuditLogCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/compute/v2/instance_usage_audit_log/list.rs b/cli-cmd/compute/src/v2/instance_usage_audit_log/list.rs similarity index 100% rename from openstack_cli/src/compute/v2/instance_usage_audit_log/list.rs rename to cli-cmd/compute/src/v2/instance_usage_audit_log/list.rs diff --git a/openstack_cli/src/compute/v2/instance_usage_audit_log/show.rs b/cli-cmd/compute/src/v2/instance_usage_audit_log/show.rs similarity index 100% rename from openstack_cli/src/compute/v2/instance_usage_audit_log/show.rs rename to cli-cmd/compute/src/v2/instance_usage_audit_log/show.rs diff --git a/openstack_cli/src/compute/v2/keypair.rs b/cli-cmd/compute/src/v2/keypair.rs similarity index 94% rename from openstack_cli/src/compute/v2/keypair.rs rename to cli-cmd/compute/src/v2/keypair.rs index e3f40c912..8b739a9d7 100644 --- a/openstack_cli/src/compute/v2/keypair.rs +++ b/cli-cmd/compute/src/v2/keypair.rs @@ -20,7 +20,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; pub mod create_20; pub mod create_21; @@ -58,9 +58,9 @@ pub enum KeypairCommands { impl KeypairCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/compute/v2/keypair/create_20.rs b/cli-cmd/compute/src/v2/keypair/create_20.rs similarity index 100% rename from openstack_cli/src/compute/v2/keypair/create_20.rs rename to cli-cmd/compute/src/v2/keypair/create_20.rs diff --git a/openstack_cli/src/compute/v2/keypair/create_21.rs b/cli-cmd/compute/src/v2/keypair/create_21.rs similarity index 100% rename from openstack_cli/src/compute/v2/keypair/create_21.rs rename to cli-cmd/compute/src/v2/keypair/create_21.rs diff --git a/openstack_cli/src/compute/v2/keypair/create_210.rs b/cli-cmd/compute/src/v2/keypair/create_210.rs similarity index 100% rename from openstack_cli/src/compute/v2/keypair/create_210.rs rename to cli-cmd/compute/src/v2/keypair/create_210.rs diff --git a/openstack_cli/src/compute/v2/keypair/create_22.rs b/cli-cmd/compute/src/v2/keypair/create_22.rs similarity index 100% rename from openstack_cli/src/compute/v2/keypair/create_22.rs rename to cli-cmd/compute/src/v2/keypair/create_22.rs diff --git a/openstack_cli/src/compute/v2/keypair/create_292.rs b/cli-cmd/compute/src/v2/keypair/create_292.rs similarity index 100% rename from openstack_cli/src/compute/v2/keypair/create_292.rs rename to cli-cmd/compute/src/v2/keypair/create_292.rs diff --git a/openstack_cli/src/compute/v2/keypair/delete.rs b/cli-cmd/compute/src/v2/keypair/delete.rs similarity index 100% rename from openstack_cli/src/compute/v2/keypair/delete.rs rename to cli-cmd/compute/src/v2/keypair/delete.rs diff --git a/openstack_cli/src/compute/v2/keypair/list.rs b/cli-cmd/compute/src/v2/keypair/list.rs similarity index 100% rename from openstack_cli/src/compute/v2/keypair/list.rs rename to cli-cmd/compute/src/v2/keypair/list.rs diff --git a/openstack_cli/src/compute/v2/keypair/show.rs b/cli-cmd/compute/src/v2/keypair/show.rs similarity index 100% rename from openstack_cli/src/compute/v2/keypair/show.rs rename to cli-cmd/compute/src/v2/keypair/show.rs diff --git a/openstack_cli/src/compute/v2/limit.rs b/cli-cmd/compute/src/v2/limit.rs similarity index 90% rename from openstack_cli/src/compute/v2/limit.rs rename to cli-cmd/compute/src/v2/limit.rs index 064186aaa..264701921 100644 --- a/openstack_cli/src/compute/v2/limit.rs +++ b/cli-cmd/compute/src/v2/limit.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; pub mod list; @@ -41,9 +41,9 @@ pub enum LimitCommands { impl LimitCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/compute/v2/limit/list.rs b/cli-cmd/compute/src/v2/limit/list.rs similarity index 100% rename from openstack_cli/src/compute/v2/limit/list.rs rename to cli-cmd/compute/src/v2/limit/list.rs diff --git a/openstack_cli/src/compute/v2/migration.rs b/cli-cmd/compute/src/v2/migration.rs similarity index 90% rename from openstack_cli/src/compute/v2/migration.rs rename to cli-cmd/compute/src/v2/migration.rs index b07f92e29..731ff26a3 100644 --- a/openstack_cli/src/compute/v2/migration.rs +++ b/cli-cmd/compute/src/v2/migration.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; pub mod get; @@ -41,9 +41,9 @@ pub enum MigrationCommands { impl MigrationCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/compute/v2/migration/get.rs b/cli-cmd/compute/src/v2/migration/get.rs similarity index 100% rename from openstack_cli/src/compute/v2/migration/get.rs rename to cli-cmd/compute/src/v2/migration/get.rs diff --git a/openstack_cli/src/compute/v2/quota_class_set.rs b/cli-cmd/compute/src/v2/quota_class_set.rs similarity index 95% rename from openstack_cli/src/compute/v2/quota_class_set.rs rename to cli-cmd/compute/src/v2/quota_class_set.rs index 4cde2063f..753c5fbd3 100644 --- a/openstack_cli/src/compute/v2/quota_class_set.rs +++ b/cli-cmd/compute/src/v2/quota_class_set.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; pub mod set_21; pub mod show; @@ -69,9 +69,9 @@ pub enum QuotaClassSetCommands { impl QuotaClassSetCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/compute/v2/quota_class_set/set_21.rs b/cli-cmd/compute/src/v2/quota_class_set/set_21.rs similarity index 100% rename from openstack_cli/src/compute/v2/quota_class_set/set_21.rs rename to cli-cmd/compute/src/v2/quota_class_set/set_21.rs diff --git a/openstack_cli/src/compute/v2/quota_class_set/set_250.rs b/cli-cmd/compute/src/v2/quota_class_set/set_250.rs similarity index 100% rename from openstack_cli/src/compute/v2/quota_class_set/set_250.rs rename to cli-cmd/compute/src/v2/quota_class_set/set_250.rs diff --git a/openstack_cli/src/compute/v2/quota_class_set/set_257.rs b/cli-cmd/compute/src/v2/quota_class_set/set_257.rs similarity index 100% rename from openstack_cli/src/compute/v2/quota_class_set/set_257.rs rename to cli-cmd/compute/src/v2/quota_class_set/set_257.rs diff --git a/openstack_cli/src/compute/v2/quota_class_set/show.rs b/cli-cmd/compute/src/v2/quota_class_set/show.rs similarity index 100% rename from openstack_cli/src/compute/v2/quota_class_set/show.rs rename to cli-cmd/compute/src/v2/quota_class_set/show.rs diff --git a/openstack_cli/src/compute/v2/quota_set.rs b/cli-cmd/compute/src/v2/quota_set.rs similarity index 94% rename from openstack_cli/src/compute/v2/quota_set.rs rename to cli-cmd/compute/src/v2/quota_set.rs index bcb9d172a..516500810 100644 --- a/openstack_cli/src/compute/v2/quota_set.rs +++ b/cli-cmd/compute/src/v2/quota_set.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; pub mod defaults; pub mod delete; @@ -53,9 +53,9 @@ pub enum QuotaSetCommands { impl QuotaSetCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/compute/v2/quota_set/defaults.rs b/cli-cmd/compute/src/v2/quota_set/defaults.rs similarity index 100% rename from openstack_cli/src/compute/v2/quota_set/defaults.rs rename to cli-cmd/compute/src/v2/quota_set/defaults.rs diff --git a/openstack_cli/src/compute/v2/quota_set/delete.rs b/cli-cmd/compute/src/v2/quota_set/delete.rs similarity index 100% rename from openstack_cli/src/compute/v2/quota_set/delete.rs rename to cli-cmd/compute/src/v2/quota_set/delete.rs diff --git a/openstack_cli/src/compute/v2/quota_set/details.rs b/cli-cmd/compute/src/v2/quota_set/details.rs similarity index 100% rename from openstack_cli/src/compute/v2/quota_set/details.rs rename to cli-cmd/compute/src/v2/quota_set/details.rs diff --git a/openstack_cli/src/compute/v2/quota_set/set_20.rs b/cli-cmd/compute/src/v2/quota_set/set_20.rs similarity index 100% rename from openstack_cli/src/compute/v2/quota_set/set_20.rs rename to cli-cmd/compute/src/v2/quota_set/set_20.rs diff --git a/openstack_cli/src/compute/v2/quota_set/set_236.rs b/cli-cmd/compute/src/v2/quota_set/set_236.rs similarity index 100% rename from openstack_cli/src/compute/v2/quota_set/set_236.rs rename to cli-cmd/compute/src/v2/quota_set/set_236.rs diff --git a/openstack_cli/src/compute/v2/quota_set/set_257.rs b/cli-cmd/compute/src/v2/quota_set/set_257.rs similarity index 100% rename from openstack_cli/src/compute/v2/quota_set/set_257.rs rename to cli-cmd/compute/src/v2/quota_set/set_257.rs diff --git a/openstack_cli/src/compute/v2/quota_set/show.rs b/cli-cmd/compute/src/v2/quota_set/show.rs similarity index 100% rename from openstack_cli/src/compute/v2/quota_set/show.rs rename to cli-cmd/compute/src/v2/quota_set/show.rs diff --git a/openstack_cli/src/compute/v2/server.rs b/cli-cmd/compute/src/v2/server.rs similarity index 99% rename from openstack_cli/src/compute/v2/server.rs rename to cli-cmd/compute/src/v2/server.rs index 9b60e0a07..f3465e09a 100644 --- a/openstack_cli/src/compute/v2/server.rs +++ b/cli-cmd/compute/src/v2/server.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; pub mod add_fixed_ip_21; pub mod add_floating_ip_21; @@ -260,9 +260,9 @@ pub enum ServerCommands { impl ServerCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/compute/v2/server/add_fixed_ip_21.rs b/cli-cmd/compute/src/v2/server/add_fixed_ip_21.rs similarity index 100% rename from openstack_cli/src/compute/v2/server/add_fixed_ip_21.rs rename to cli-cmd/compute/src/v2/server/add_fixed_ip_21.rs diff --git a/openstack_cli/src/compute/v2/server/add_floating_ip_21.rs b/cli-cmd/compute/src/v2/server/add_floating_ip_21.rs similarity index 100% rename from openstack_cli/src/compute/v2/server/add_floating_ip_21.rs rename to cli-cmd/compute/src/v2/server/add_floating_ip_21.rs diff --git a/openstack_cli/src/compute/v2/server/add_security_group.rs b/cli-cmd/compute/src/v2/server/add_security_group.rs similarity index 100% rename from openstack_cli/src/compute/v2/server/add_security_group.rs rename to cli-cmd/compute/src/v2/server/add_security_group.rs diff --git a/openstack_cli/src/compute/v2/server/change_password.rs b/cli-cmd/compute/src/v2/server/change_password.rs similarity index 100% rename from openstack_cli/src/compute/v2/server/change_password.rs rename to cli-cmd/compute/src/v2/server/change_password.rs diff --git a/openstack_cli/src/compute/v2/server/confirm_resize.rs b/cli-cmd/compute/src/v2/server/confirm_resize.rs similarity index 100% rename from openstack_cli/src/compute/v2/server/confirm_resize.rs rename to cli-cmd/compute/src/v2/server/confirm_resize.rs diff --git a/openstack_cli/src/compute/v2/server/create_20.rs b/cli-cmd/compute/src/v2/server/create_20.rs similarity index 100% rename from openstack_cli/src/compute/v2/server/create_20.rs rename to cli-cmd/compute/src/v2/server/create_20.rs diff --git a/openstack_cli/src/compute/v2/server/create_21.rs b/cli-cmd/compute/src/v2/server/create_21.rs similarity index 100% rename from openstack_cli/src/compute/v2/server/create_21.rs rename to cli-cmd/compute/src/v2/server/create_21.rs diff --git a/openstack_cli/src/compute/v2/server/create_219.rs b/cli-cmd/compute/src/v2/server/create_219.rs similarity index 100% rename from openstack_cli/src/compute/v2/server/create_219.rs rename to cli-cmd/compute/src/v2/server/create_219.rs diff --git a/openstack_cli/src/compute/v2/server/create_232.rs b/cli-cmd/compute/src/v2/server/create_232.rs similarity index 100% rename from openstack_cli/src/compute/v2/server/create_232.rs rename to cli-cmd/compute/src/v2/server/create_232.rs diff --git a/openstack_cli/src/compute/v2/server/create_233.rs b/cli-cmd/compute/src/v2/server/create_233.rs similarity index 100% rename from openstack_cli/src/compute/v2/server/create_233.rs rename to cli-cmd/compute/src/v2/server/create_233.rs diff --git a/openstack_cli/src/compute/v2/server/create_237.rs b/cli-cmd/compute/src/v2/server/create_237.rs similarity index 100% rename from openstack_cli/src/compute/v2/server/create_237.rs rename to cli-cmd/compute/src/v2/server/create_237.rs diff --git a/openstack_cli/src/compute/v2/server/create_242.rs b/cli-cmd/compute/src/v2/server/create_242.rs similarity index 100% rename from openstack_cli/src/compute/v2/server/create_242.rs rename to cli-cmd/compute/src/v2/server/create_242.rs diff --git a/openstack_cli/src/compute/v2/server/create_252.rs b/cli-cmd/compute/src/v2/server/create_252.rs similarity index 100% rename from openstack_cli/src/compute/v2/server/create_252.rs rename to cli-cmd/compute/src/v2/server/create_252.rs diff --git a/openstack_cli/src/compute/v2/server/create_257.rs b/cli-cmd/compute/src/v2/server/create_257.rs similarity index 100% rename from openstack_cli/src/compute/v2/server/create_257.rs rename to cli-cmd/compute/src/v2/server/create_257.rs diff --git a/openstack_cli/src/compute/v2/server/create_263.rs b/cli-cmd/compute/src/v2/server/create_263.rs similarity index 100% rename from openstack_cli/src/compute/v2/server/create_263.rs rename to cli-cmd/compute/src/v2/server/create_263.rs diff --git a/openstack_cli/src/compute/v2/server/create_267.rs b/cli-cmd/compute/src/v2/server/create_267.rs similarity index 100% rename from openstack_cli/src/compute/v2/server/create_267.rs rename to cli-cmd/compute/src/v2/server/create_267.rs diff --git a/openstack_cli/src/compute/v2/server/create_274.rs b/cli-cmd/compute/src/v2/server/create_274.rs similarity index 100% rename from openstack_cli/src/compute/v2/server/create_274.rs rename to cli-cmd/compute/src/v2/server/create_274.rs diff --git a/openstack_cli/src/compute/v2/server/create_290.rs b/cli-cmd/compute/src/v2/server/create_290.rs similarity index 100% rename from openstack_cli/src/compute/v2/server/create_290.rs rename to cli-cmd/compute/src/v2/server/create_290.rs diff --git a/openstack_cli/src/compute/v2/server/create_294.rs b/cli-cmd/compute/src/v2/server/create_294.rs similarity index 100% rename from openstack_cli/src/compute/v2/server/create_294.rs rename to cli-cmd/compute/src/v2/server/create_294.rs diff --git a/openstack_cli/src/compute/v2/server/create_backup_20.rs b/cli-cmd/compute/src/v2/server/create_backup_20.rs similarity index 100% rename from openstack_cli/src/compute/v2/server/create_backup_20.rs rename to cli-cmd/compute/src/v2/server/create_backup_20.rs diff --git a/openstack_cli/src/compute/v2/server/create_backup_21.rs b/cli-cmd/compute/src/v2/server/create_backup_21.rs similarity index 100% rename from openstack_cli/src/compute/v2/server/create_backup_21.rs rename to cli-cmd/compute/src/v2/server/create_backup_21.rs diff --git a/openstack_cli/src/compute/v2/server/create_image_20.rs b/cli-cmd/compute/src/v2/server/create_image_20.rs similarity index 100% rename from openstack_cli/src/compute/v2/server/create_image_20.rs rename to cli-cmd/compute/src/v2/server/create_image_20.rs diff --git a/openstack_cli/src/compute/v2/server/create_image_21.rs b/cli-cmd/compute/src/v2/server/create_image_21.rs similarity index 100% rename from openstack_cli/src/compute/v2/server/create_image_21.rs rename to cli-cmd/compute/src/v2/server/create_image_21.rs diff --git a/openstack_cli/src/compute/v2/server/delete.rs b/cli-cmd/compute/src/v2/server/delete.rs similarity index 100% rename from openstack_cli/src/compute/v2/server/delete.rs rename to cli-cmd/compute/src/v2/server/delete.rs diff --git a/openstack_cli/src/compute/v2/server/diagnostic/get.rs b/cli-cmd/compute/src/v2/server/diagnostic/get.rs similarity index 100% rename from openstack_cli/src/compute/v2/server/diagnostic/get.rs rename to cli-cmd/compute/src/v2/server/diagnostic/get.rs diff --git a/openstack_cli/src/compute/v2/server/evacuate_20.rs b/cli-cmd/compute/src/v2/server/evacuate_20.rs similarity index 100% rename from openstack_cli/src/compute/v2/server/evacuate_20.rs rename to cli-cmd/compute/src/v2/server/evacuate_20.rs diff --git a/openstack_cli/src/compute/v2/server/evacuate_214.rs b/cli-cmd/compute/src/v2/server/evacuate_214.rs similarity index 100% rename from openstack_cli/src/compute/v2/server/evacuate_214.rs rename to cli-cmd/compute/src/v2/server/evacuate_214.rs diff --git a/openstack_cli/src/compute/v2/server/evacuate_229.rs b/cli-cmd/compute/src/v2/server/evacuate_229.rs similarity index 100% rename from openstack_cli/src/compute/v2/server/evacuate_229.rs rename to cli-cmd/compute/src/v2/server/evacuate_229.rs diff --git a/openstack_cli/src/compute/v2/server/evacuate_268.rs b/cli-cmd/compute/src/v2/server/evacuate_268.rs similarity index 100% rename from openstack_cli/src/compute/v2/server/evacuate_268.rs rename to cli-cmd/compute/src/v2/server/evacuate_268.rs diff --git a/openstack_cli/src/compute/v2/server/evacuate_295.rs b/cli-cmd/compute/src/v2/server/evacuate_295.rs similarity index 100% rename from openstack_cli/src/compute/v2/server/evacuate_295.rs rename to cli-cmd/compute/src/v2/server/evacuate_295.rs diff --git a/openstack_cli/src/compute/v2/server/force_delete.rs b/cli-cmd/compute/src/v2/server/force_delete.rs similarity index 100% rename from openstack_cli/src/compute/v2/server/force_delete.rs rename to cli-cmd/compute/src/v2/server/force_delete.rs diff --git a/openstack_cli/src/compute/v2/server/inject_network_info.rs b/cli-cmd/compute/src/v2/server/inject_network_info.rs similarity index 100% rename from openstack_cli/src/compute/v2/server/inject_network_info.rs rename to cli-cmd/compute/src/v2/server/inject_network_info.rs diff --git a/openstack_cli/src/compute/v2/server/instance_action.rs b/cli-cmd/compute/src/v2/server/instance_action.rs similarity index 92% rename from openstack_cli/src/compute/v2/server/instance_action.rs rename to cli-cmd/compute/src/v2/server/instance_action.rs index bc4582f0f..bc89d5bc9 100644 --- a/openstack_cli/src/compute/v2/server/instance_action.rs +++ b/cli-cmd/compute/src/v2/server/instance_action.rs @@ -17,7 +17,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; mod list; mod show; @@ -42,9 +42,9 @@ pub enum InstanceActionCommands { impl InstanceActionCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/compute/v2/server/instance_action/list.rs b/cli-cmd/compute/src/v2/server/instance_action/list.rs similarity index 100% rename from openstack_cli/src/compute/v2/server/instance_action/list.rs rename to cli-cmd/compute/src/v2/server/instance_action/list.rs diff --git a/openstack_cli/src/compute/v2/server/instance_action/show.rs b/cli-cmd/compute/src/v2/server/instance_action/show.rs similarity index 100% rename from openstack_cli/src/compute/v2/server/instance_action/show.rs rename to cli-cmd/compute/src/v2/server/instance_action/show.rs diff --git a/openstack_cli/src/compute/v2/server/interface.rs b/cli-cmd/compute/src/v2/server/interface.rs similarity index 93% rename from openstack_cli/src/compute/v2/server/interface.rs rename to cli-cmd/compute/src/v2/server/interface.rs index 05ed71ef5..7f3f477f0 100644 --- a/openstack_cli/src/compute/v2/server/interface.rs +++ b/cli-cmd/compute/src/v2/server/interface.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; mod create_249; mod delete; @@ -50,9 +50,9 @@ pub enum InterfaceCommands { impl InterfaceCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/compute/v2/server/interface/create_20.rs b/cli-cmd/compute/src/v2/server/interface/create_20.rs similarity index 100% rename from openstack_cli/src/compute/v2/server/interface/create_20.rs rename to cli-cmd/compute/src/v2/server/interface/create_20.rs diff --git a/openstack_cli/src/compute/v2/server/interface/create_249.rs b/cli-cmd/compute/src/v2/server/interface/create_249.rs similarity index 100% rename from openstack_cli/src/compute/v2/server/interface/create_249.rs rename to cli-cmd/compute/src/v2/server/interface/create_249.rs diff --git a/openstack_cli/src/compute/v2/server/interface/delete.rs b/cli-cmd/compute/src/v2/server/interface/delete.rs similarity index 100% rename from openstack_cli/src/compute/v2/server/interface/delete.rs rename to cli-cmd/compute/src/v2/server/interface/delete.rs diff --git a/openstack_cli/src/compute/v2/server/interface/list.rs b/cli-cmd/compute/src/v2/server/interface/list.rs similarity index 100% rename from openstack_cli/src/compute/v2/server/interface/list.rs rename to cli-cmd/compute/src/v2/server/interface/list.rs diff --git a/openstack_cli/src/compute/v2/server/interface/show.rs b/cli-cmd/compute/src/v2/server/interface/show.rs similarity index 100% rename from openstack_cli/src/compute/v2/server/interface/show.rs rename to cli-cmd/compute/src/v2/server/interface/show.rs diff --git a/openstack_cli/src/compute/v2/server/ip.rs b/cli-cmd/compute/src/v2/server/ip.rs similarity index 91% rename from openstack_cli/src/compute/v2/server/ip.rs rename to cli-cmd/compute/src/v2/server/ip.rs index dd56d400a..2df058a92 100644 --- a/openstack_cli/src/compute/v2/server/ip.rs +++ b/cli-cmd/compute/src/v2/server/ip.rs @@ -17,7 +17,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; mod list; mod show; @@ -42,9 +42,9 @@ pub enum IpCommands { impl IpCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/compute/v2/server/ip/list.rs b/cli-cmd/compute/src/v2/server/ip/list.rs similarity index 100% rename from openstack_cli/src/compute/v2/server/ip/list.rs rename to cli-cmd/compute/src/v2/server/ip/list.rs diff --git a/openstack_cli/src/compute/v2/server/ip/show.rs b/cli-cmd/compute/src/v2/server/ip/show.rs similarity index 100% rename from openstack_cli/src/compute/v2/server/ip/show.rs rename to cli-cmd/compute/src/v2/server/ip/show.rs diff --git a/openstack_cli/src/compute/v2/server/list.rs b/cli-cmd/compute/src/v2/server/list.rs similarity index 100% rename from openstack_cli/src/compute/v2/server/list.rs rename to cli-cmd/compute/src/v2/server/list.rs diff --git a/openstack_cli/src/compute/v2/server/lock_21.rs b/cli-cmd/compute/src/v2/server/lock_21.rs similarity index 100% rename from openstack_cli/src/compute/v2/server/lock_21.rs rename to cli-cmd/compute/src/v2/server/lock_21.rs diff --git a/openstack_cli/src/compute/v2/server/lock_273.rs b/cli-cmd/compute/src/v2/server/lock_273.rs similarity index 100% rename from openstack_cli/src/compute/v2/server/lock_273.rs rename to cli-cmd/compute/src/v2/server/lock_273.rs diff --git a/openstack_cli/src/compute/v2/server/metadata.rs b/cli-cmd/compute/src/v2/server/metadata.rs similarity index 94% rename from openstack_cli/src/compute/v2/server/metadata.rs rename to cli-cmd/compute/src/v2/server/metadata.rs index fc8eaccff..975f8c6b5 100644 --- a/openstack_cli/src/compute/v2/server/metadata.rs +++ b/cli-cmd/compute/src/v2/server/metadata.rs @@ -17,7 +17,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; mod create; mod delete; @@ -53,9 +53,9 @@ pub enum MetadataCommands { impl MetadataCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/compute/v2/server/metadata/create.rs b/cli-cmd/compute/src/v2/server/metadata/create.rs similarity index 100% rename from openstack_cli/src/compute/v2/server/metadata/create.rs rename to cli-cmd/compute/src/v2/server/metadata/create.rs diff --git a/openstack_cli/src/compute/v2/server/metadata/delete.rs b/cli-cmd/compute/src/v2/server/metadata/delete.rs similarity index 100% rename from openstack_cli/src/compute/v2/server/metadata/delete.rs rename to cli-cmd/compute/src/v2/server/metadata/delete.rs diff --git a/openstack_cli/src/compute/v2/server/metadata/list.rs b/cli-cmd/compute/src/v2/server/metadata/list.rs similarity index 100% rename from openstack_cli/src/compute/v2/server/metadata/list.rs rename to cli-cmd/compute/src/v2/server/metadata/list.rs diff --git a/openstack_cli/src/compute/v2/server/metadata/replace.rs b/cli-cmd/compute/src/v2/server/metadata/replace.rs similarity index 100% rename from openstack_cli/src/compute/v2/server/metadata/replace.rs rename to cli-cmd/compute/src/v2/server/metadata/replace.rs diff --git a/openstack_cli/src/compute/v2/server/metadata/set.rs b/cli-cmd/compute/src/v2/server/metadata/set.rs similarity index 100% rename from openstack_cli/src/compute/v2/server/metadata/set.rs rename to cli-cmd/compute/src/v2/server/metadata/set.rs diff --git a/openstack_cli/src/compute/v2/server/metadata/show.rs b/cli-cmd/compute/src/v2/server/metadata/show.rs similarity index 100% rename from openstack_cli/src/compute/v2/server/metadata/show.rs rename to cli-cmd/compute/src/v2/server/metadata/show.rs diff --git a/openstack_cli/src/compute/v2/server/migrate_256.rs b/cli-cmd/compute/src/v2/server/migrate_256.rs similarity index 100% rename from openstack_cli/src/compute/v2/server/migrate_256.rs rename to cli-cmd/compute/src/v2/server/migrate_256.rs diff --git a/openstack_cli/src/compute/v2/server/migration.rs b/cli-cmd/compute/src/v2/server/migration.rs similarity index 93% rename from openstack_cli/src/compute/v2/server/migration.rs rename to cli-cmd/compute/src/v2/server/migration.rs index 9a884fbe9..bc9110f96 100644 --- a/openstack_cli/src/compute/v2/server/migration.rs +++ b/cli-cmd/compute/src/v2/server/migration.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; mod delete; mod force_complete_222; @@ -48,9 +48,9 @@ pub enum MigrationCommands { impl MigrationCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/compute/v2/server/migration/delete.rs b/cli-cmd/compute/src/v2/server/migration/delete.rs similarity index 100% rename from openstack_cli/src/compute/v2/server/migration/delete.rs rename to cli-cmd/compute/src/v2/server/migration/delete.rs diff --git a/openstack_cli/src/compute/v2/server/migration/force_complete_222.rs b/cli-cmd/compute/src/v2/server/migration/force_complete_222.rs similarity index 100% rename from openstack_cli/src/compute/v2/server/migration/force_complete_222.rs rename to cli-cmd/compute/src/v2/server/migration/force_complete_222.rs diff --git a/openstack_cli/src/compute/v2/server/migration/list.rs b/cli-cmd/compute/src/v2/server/migration/list.rs similarity index 100% rename from openstack_cli/src/compute/v2/server/migration/list.rs rename to cli-cmd/compute/src/v2/server/migration/list.rs diff --git a/openstack_cli/src/compute/v2/server/migration/show.rs b/cli-cmd/compute/src/v2/server/migration/show.rs similarity index 100% rename from openstack_cli/src/compute/v2/server/migration/show.rs rename to cli-cmd/compute/src/v2/server/migration/show.rs diff --git a/openstack_cli/src/compute/v2/server/os_get_console_output.rs b/cli-cmd/compute/src/v2/server/os_get_console_output.rs similarity index 100% rename from openstack_cli/src/compute/v2/server/os_get_console_output.rs rename to cli-cmd/compute/src/v2/server/os_get_console_output.rs diff --git a/openstack_cli/src/compute/v2/server/os_get_rdpconsole.rs b/cli-cmd/compute/src/v2/server/os_get_rdpconsole.rs similarity index 100% rename from openstack_cli/src/compute/v2/server/os_get_rdpconsole.rs rename to cli-cmd/compute/src/v2/server/os_get_rdpconsole.rs diff --git a/openstack_cli/src/compute/v2/server/os_get_rdpconsole_21.rs b/cli-cmd/compute/src/v2/server/os_get_rdpconsole_21.rs similarity index 98% rename from openstack_cli/src/compute/v2/server/os_get_rdpconsole_21.rs rename to cli-cmd/compute/src/v2/server/os_get_rdpconsole_21.rs index 1c2c2cec5..d2aa6df27 100644 --- a/openstack_cli/src/compute/v2/server/os_get_rdpconsole_21.rs +++ b/cli-cmd/compute/src/v2/server/os_get_rdpconsole_21.rs @@ -115,9 +115,9 @@ struct ResponseData { impl ServerCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, client: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { info!("Action Server"); diff --git a/openstack_cli/src/compute/v2/server/os_get_serial_console.rs b/cli-cmd/compute/src/v2/server/os_get_serial_console.rs similarity index 97% rename from openstack_cli/src/compute/v2/server/os_get_serial_console.rs rename to cli-cmd/compute/src/v2/server/os_get_serial_console.rs index f69311dbe..2a60dbab9 100644 --- a/openstack_cli/src/compute/v2/server/os_get_serial_console.rs +++ b/cli-cmd/compute/src/v2/server/os_get_serial_console.rs @@ -65,9 +65,9 @@ pub struct ResponseData {} #[async_trait] impl OSCCommand for ServerCmd { - async fn take_action( + async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, client: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { info!("Action Server with {:?}", self.args); diff --git a/openstack_cli/src/compute/v2/server/os_get_serial_console_21.rs b/cli-cmd/compute/src/v2/server/os_get_serial_console_21.rs similarity index 100% rename from openstack_cli/src/compute/v2/server/os_get_serial_console_21.rs rename to cli-cmd/compute/src/v2/server/os_get_serial_console_21.rs diff --git a/openstack_cli/src/compute/v2/server/os_get_spiceconsole.rs b/cli-cmd/compute/src/v2/server/os_get_spiceconsole.rs similarity index 97% rename from openstack_cli/src/compute/v2/server/os_get_spiceconsole.rs rename to cli-cmd/compute/src/v2/server/os_get_spiceconsole.rs index 776c356f6..8f0278fc0 100644 --- a/openstack_cli/src/compute/v2/server/os_get_spiceconsole.rs +++ b/cli-cmd/compute/src/v2/server/os_get_spiceconsole.rs @@ -65,9 +65,9 @@ pub struct ResponseData {} #[async_trait] impl OSCCommand for ServerCmd { - async fn take_action( + async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, client: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { info!("Action Server with {:?}", self.args); diff --git a/openstack_cli/src/compute/v2/server/os_get_spiceconsole_21.rs b/cli-cmd/compute/src/v2/server/os_get_spiceconsole_21.rs similarity index 100% rename from openstack_cli/src/compute/v2/server/os_get_spiceconsole_21.rs rename to cli-cmd/compute/src/v2/server/os_get_spiceconsole_21.rs diff --git a/openstack_cli/src/compute/v2/server/os_get_vncconsole.rs b/cli-cmd/compute/src/v2/server/os_get_vncconsole.rs similarity index 97% rename from openstack_cli/src/compute/v2/server/os_get_vncconsole.rs rename to cli-cmd/compute/src/v2/server/os_get_vncconsole.rs index ca85f3d53..6cafc860c 100644 --- a/openstack_cli/src/compute/v2/server/os_get_vncconsole.rs +++ b/cli-cmd/compute/src/v2/server/os_get_vncconsole.rs @@ -65,9 +65,9 @@ pub struct ResponseData {} #[async_trait] impl OSCCommand for ServerCmd { - async fn take_action( + async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, client: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { info!("Action Server with {:?}", self.args); diff --git a/openstack_cli/src/compute/v2/server/os_get_vncconsole_21.rs b/cli-cmd/compute/src/v2/server/os_get_vncconsole_21.rs similarity index 100% rename from openstack_cli/src/compute/v2/server/os_get_vncconsole_21.rs rename to cli-cmd/compute/src/v2/server/os_get_vncconsole_21.rs diff --git a/openstack_cli/src/compute/v2/server/os_migrate_live_20.rs b/cli-cmd/compute/src/v2/server/os_migrate_live_20.rs similarity index 100% rename from openstack_cli/src/compute/v2/server/os_migrate_live_20.rs rename to cli-cmd/compute/src/v2/server/os_migrate_live_20.rs diff --git a/openstack_cli/src/compute/v2/server/os_migrate_live_225.rs b/cli-cmd/compute/src/v2/server/os_migrate_live_225.rs similarity index 100% rename from openstack_cli/src/compute/v2/server/os_migrate_live_225.rs rename to cli-cmd/compute/src/v2/server/os_migrate_live_225.rs diff --git a/openstack_cli/src/compute/v2/server/os_migrate_live_230.rs b/cli-cmd/compute/src/v2/server/os_migrate_live_230.rs similarity index 100% rename from openstack_cli/src/compute/v2/server/os_migrate_live_230.rs rename to cli-cmd/compute/src/v2/server/os_migrate_live_230.rs diff --git a/openstack_cli/src/compute/v2/server/os_migrate_live_268.rs b/cli-cmd/compute/src/v2/server/os_migrate_live_268.rs similarity index 100% rename from openstack_cli/src/compute/v2/server/os_migrate_live_268.rs rename to cli-cmd/compute/src/v2/server/os_migrate_live_268.rs diff --git a/openstack_cli/src/compute/v2/server/os_reset_state.rs b/cli-cmd/compute/src/v2/server/os_reset_state.rs similarity index 100% rename from openstack_cli/src/compute/v2/server/os_reset_state.rs rename to cli-cmd/compute/src/v2/server/os_reset_state.rs diff --git a/openstack_cli/src/compute/v2/server/os_start.rs b/cli-cmd/compute/src/v2/server/os_start.rs similarity index 100% rename from openstack_cli/src/compute/v2/server/os_start.rs rename to cli-cmd/compute/src/v2/server/os_start.rs diff --git a/openstack_cli/src/compute/v2/server/os_stop.rs b/cli-cmd/compute/src/v2/server/os_stop.rs similarity index 100% rename from openstack_cli/src/compute/v2/server/os_stop.rs rename to cli-cmd/compute/src/v2/server/os_stop.rs diff --git a/openstack_cli/src/compute/v2/server/pause.rs b/cli-cmd/compute/src/v2/server/pause.rs similarity index 100% rename from openstack_cli/src/compute/v2/server/pause.rs rename to cli-cmd/compute/src/v2/server/pause.rs diff --git a/openstack_cli/src/compute/v2/server/reboot.rs b/cli-cmd/compute/src/v2/server/reboot.rs similarity index 100% rename from openstack_cli/src/compute/v2/server/reboot.rs rename to cli-cmd/compute/src/v2/server/reboot.rs diff --git a/openstack_cli/src/compute/v2/server/rebuild_20.rs b/cli-cmd/compute/src/v2/server/rebuild_20.rs similarity index 100% rename from openstack_cli/src/compute/v2/server/rebuild_20.rs rename to cli-cmd/compute/src/v2/server/rebuild_20.rs diff --git a/openstack_cli/src/compute/v2/server/rebuild_21.rs b/cli-cmd/compute/src/v2/server/rebuild_21.rs similarity index 100% rename from openstack_cli/src/compute/v2/server/rebuild_21.rs rename to cli-cmd/compute/src/v2/server/rebuild_21.rs diff --git a/openstack_cli/src/compute/v2/server/rebuild_219.rs b/cli-cmd/compute/src/v2/server/rebuild_219.rs similarity index 100% rename from openstack_cli/src/compute/v2/server/rebuild_219.rs rename to cli-cmd/compute/src/v2/server/rebuild_219.rs diff --git a/openstack_cli/src/compute/v2/server/rebuild_254.rs b/cli-cmd/compute/src/v2/server/rebuild_254.rs similarity index 100% rename from openstack_cli/src/compute/v2/server/rebuild_254.rs rename to cli-cmd/compute/src/v2/server/rebuild_254.rs diff --git a/openstack_cli/src/compute/v2/server/rebuild_257.rs b/cli-cmd/compute/src/v2/server/rebuild_257.rs similarity index 100% rename from openstack_cli/src/compute/v2/server/rebuild_257.rs rename to cli-cmd/compute/src/v2/server/rebuild_257.rs diff --git a/openstack_cli/src/compute/v2/server/rebuild_263.rs b/cli-cmd/compute/src/v2/server/rebuild_263.rs similarity index 100% rename from openstack_cli/src/compute/v2/server/rebuild_263.rs rename to cli-cmd/compute/src/v2/server/rebuild_263.rs diff --git a/openstack_cli/src/compute/v2/server/rebuild_290.rs b/cli-cmd/compute/src/v2/server/rebuild_290.rs similarity index 100% rename from openstack_cli/src/compute/v2/server/rebuild_290.rs rename to cli-cmd/compute/src/v2/server/rebuild_290.rs diff --git a/openstack_cli/src/compute/v2/server/rebuild_294.rs b/cli-cmd/compute/src/v2/server/rebuild_294.rs similarity index 100% rename from openstack_cli/src/compute/v2/server/rebuild_294.rs rename to cli-cmd/compute/src/v2/server/rebuild_294.rs diff --git a/openstack_cli/src/compute/v2/server/remote_console.rs b/cli-cmd/compute/src/v2/server/remote_console.rs similarity index 92% rename from openstack_cli/src/compute/v2/server/remote_console.rs rename to cli-cmd/compute/src/v2/server/remote_console.rs index 5cdccc47f..30582c304 100644 --- a/openstack_cli/src/compute/v2/server/remote_console.rs +++ b/cli-cmd/compute/src/v2/server/remote_console.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; mod create_26; mod create_28; @@ -43,9 +43,9 @@ pub enum RemoteConsoleCommands { impl RemoteConsoleCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/compute/v2/server/remote_console/create_26.rs b/cli-cmd/compute/src/v2/server/remote_console/create_26.rs similarity index 100% rename from openstack_cli/src/compute/v2/server/remote_console/create_26.rs rename to cli-cmd/compute/src/v2/server/remote_console/create_26.rs diff --git a/openstack_cli/src/compute/v2/server/remote_console/create_28.rs b/cli-cmd/compute/src/v2/server/remote_console/create_28.rs similarity index 100% rename from openstack_cli/src/compute/v2/server/remote_console/create_28.rs rename to cli-cmd/compute/src/v2/server/remote_console/create_28.rs diff --git a/openstack_cli/src/compute/v2/server/remote_console/create_299.rs b/cli-cmd/compute/src/v2/server/remote_console/create_299.rs similarity index 100% rename from openstack_cli/src/compute/v2/server/remote_console/create_299.rs rename to cli-cmd/compute/src/v2/server/remote_console/create_299.rs diff --git a/openstack_cli/src/compute/v2/server/remove_fixed_ip_21.rs b/cli-cmd/compute/src/v2/server/remove_fixed_ip_21.rs similarity index 100% rename from openstack_cli/src/compute/v2/server/remove_fixed_ip_21.rs rename to cli-cmd/compute/src/v2/server/remove_fixed_ip_21.rs diff --git a/openstack_cli/src/compute/v2/server/remove_floating_ip_21.rs b/cli-cmd/compute/src/v2/server/remove_floating_ip_21.rs similarity index 100% rename from openstack_cli/src/compute/v2/server/remove_floating_ip_21.rs rename to cli-cmd/compute/src/v2/server/remove_floating_ip_21.rs diff --git a/openstack_cli/src/compute/v2/server/remove_security_group.rs b/cli-cmd/compute/src/v2/server/remove_security_group.rs similarity index 100% rename from openstack_cli/src/compute/v2/server/remove_security_group.rs rename to cli-cmd/compute/src/v2/server/remove_security_group.rs diff --git a/openstack_cli/src/compute/v2/server/rescue.rs b/cli-cmd/compute/src/v2/server/rescue.rs similarity index 100% rename from openstack_cli/src/compute/v2/server/rescue.rs rename to cli-cmd/compute/src/v2/server/rescue.rs diff --git a/openstack_cli/src/compute/v2/server/reset_network.rs b/cli-cmd/compute/src/v2/server/reset_network.rs similarity index 100% rename from openstack_cli/src/compute/v2/server/reset_network.rs rename to cli-cmd/compute/src/v2/server/reset_network.rs diff --git a/openstack_cli/src/compute/v2/server/resize.rs b/cli-cmd/compute/src/v2/server/resize.rs similarity index 100% rename from openstack_cli/src/compute/v2/server/resize.rs rename to cli-cmd/compute/src/v2/server/resize.rs diff --git a/openstack_cli/src/compute/v2/server/restore.rs b/cli-cmd/compute/src/v2/server/restore.rs similarity index 100% rename from openstack_cli/src/compute/v2/server/restore.rs rename to cli-cmd/compute/src/v2/server/restore.rs diff --git a/openstack_cli/src/compute/v2/server/resume.rs b/cli-cmd/compute/src/v2/server/resume.rs similarity index 100% rename from openstack_cli/src/compute/v2/server/resume.rs rename to cli-cmd/compute/src/v2/server/resume.rs diff --git a/openstack_cli/src/compute/v2/server/revert_resize.rs b/cli-cmd/compute/src/v2/server/revert_resize.rs similarity index 100% rename from openstack_cli/src/compute/v2/server/revert_resize.rs rename to cli-cmd/compute/src/v2/server/revert_resize.rs diff --git a/openstack_cli/src/compute/v2/server/security_group/list.rs b/cli-cmd/compute/src/v2/server/security_group/list.rs similarity index 100% rename from openstack_cli/src/compute/v2/server/security_group/list.rs rename to cli-cmd/compute/src/v2/server/security_group/list.rs diff --git a/openstack_cli/src/compute/v2/server/server_password.rs b/cli-cmd/compute/src/v2/server/server_password.rs similarity index 92% rename from openstack_cli/src/compute/v2/server/server_password.rs rename to cli-cmd/compute/src/v2/server/server_password.rs index af40180ce..811ffc2c2 100644 --- a/openstack_cli/src/compute/v2/server/server_password.rs +++ b/cli-cmd/compute/src/v2/server/server_password.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; mod delete; mod get; @@ -45,9 +45,9 @@ pub enum PasswordCommands { impl PasswordCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/compute/v2/server/server_password/delete.rs b/cli-cmd/compute/src/v2/server/server_password/delete.rs similarity index 100% rename from openstack_cli/src/compute/v2/server/server_password/delete.rs rename to cli-cmd/compute/src/v2/server/server_password/delete.rs diff --git a/openstack_cli/src/compute/v2/server/server_password/get.rs b/cli-cmd/compute/src/v2/server/server_password/get.rs similarity index 100% rename from openstack_cli/src/compute/v2/server/server_password/get.rs rename to cli-cmd/compute/src/v2/server/server_password/get.rs diff --git a/openstack_cli/src/compute/v2/server/set_20.rs b/cli-cmd/compute/src/v2/server/set_20.rs similarity index 100% rename from openstack_cli/src/compute/v2/server/set_20.rs rename to cli-cmd/compute/src/v2/server/set_20.rs diff --git a/openstack_cli/src/compute/v2/server/set_21.rs b/cli-cmd/compute/src/v2/server/set_21.rs similarity index 100% rename from openstack_cli/src/compute/v2/server/set_21.rs rename to cli-cmd/compute/src/v2/server/set_21.rs diff --git a/openstack_cli/src/compute/v2/server/set_219.rs b/cli-cmd/compute/src/v2/server/set_219.rs similarity index 100% rename from openstack_cli/src/compute/v2/server/set_219.rs rename to cli-cmd/compute/src/v2/server/set_219.rs diff --git a/openstack_cli/src/compute/v2/server/set_290.rs b/cli-cmd/compute/src/v2/server/set_290.rs similarity index 100% rename from openstack_cli/src/compute/v2/server/set_290.rs rename to cli-cmd/compute/src/v2/server/set_290.rs diff --git a/openstack_cli/src/compute/v2/server/set_294.rs b/cli-cmd/compute/src/v2/server/set_294.rs similarity index 100% rename from openstack_cli/src/compute/v2/server/set_294.rs rename to cli-cmd/compute/src/v2/server/set_294.rs diff --git a/openstack_cli/src/compute/v2/server/share/create_297.rs b/cli-cmd/compute/src/v2/server/share/create_297.rs similarity index 100% rename from openstack_cli/src/compute/v2/server/share/create_297.rs rename to cli-cmd/compute/src/v2/server/share/create_297.rs diff --git a/openstack_cli/src/compute/v2/server/share/delete.rs b/cli-cmd/compute/src/v2/server/share/delete.rs similarity index 100% rename from openstack_cli/src/compute/v2/server/share/delete.rs rename to cli-cmd/compute/src/v2/server/share/delete.rs diff --git a/openstack_cli/src/compute/v2/server/share/list.rs b/cli-cmd/compute/src/v2/server/share/list.rs similarity index 100% rename from openstack_cli/src/compute/v2/server/share/list.rs rename to cli-cmd/compute/src/v2/server/share/list.rs diff --git a/openstack_cli/src/compute/v2/server/share/show.rs b/cli-cmd/compute/src/v2/server/share/show.rs similarity index 100% rename from openstack_cli/src/compute/v2/server/share/show.rs rename to cli-cmd/compute/src/v2/server/share/show.rs diff --git a/openstack_cli/src/compute/v2/server/shelve.rs b/cli-cmd/compute/src/v2/server/shelve.rs similarity index 100% rename from openstack_cli/src/compute/v2/server/shelve.rs rename to cli-cmd/compute/src/v2/server/shelve.rs diff --git a/openstack_cli/src/compute/v2/server/shelve_offload.rs b/cli-cmd/compute/src/v2/server/shelve_offload.rs similarity index 100% rename from openstack_cli/src/compute/v2/server/shelve_offload.rs rename to cli-cmd/compute/src/v2/server/shelve_offload.rs diff --git a/openstack_cli/src/compute/v2/server/show.rs b/cli-cmd/compute/src/v2/server/show.rs similarity index 100% rename from openstack_cli/src/compute/v2/server/show.rs rename to cli-cmd/compute/src/v2/server/show.rs diff --git a/openstack_cli/src/compute/v2/server/suspend.rs b/cli-cmd/compute/src/v2/server/suspend.rs similarity index 100% rename from openstack_cli/src/compute/v2/server/suspend.rs rename to cli-cmd/compute/src/v2/server/suspend.rs diff --git a/openstack_cli/src/compute/v2/server/tag.rs b/cli-cmd/compute/src/v2/server/tag.rs similarity index 94% rename from openstack_cli/src/compute/v2/server/tag.rs rename to cli-cmd/compute/src/v2/server/tag.rs index 4a41990a6..66c70226a 100644 --- a/openstack_cli/src/compute/v2/server/tag.rs +++ b/cli-cmd/compute/src/v2/server/tag.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; mod delete; mod delete_all; @@ -68,9 +68,9 @@ pub enum TagCommands { impl TagCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/compute/v2/server/tag/delete.rs b/cli-cmd/compute/src/v2/server/tag/delete.rs similarity index 100% rename from openstack_cli/src/compute/v2/server/tag/delete.rs rename to cli-cmd/compute/src/v2/server/tag/delete.rs diff --git a/openstack_cli/src/compute/v2/server/tag/delete_all.rs b/cli-cmd/compute/src/v2/server/tag/delete_all.rs similarity index 100% rename from openstack_cli/src/compute/v2/server/tag/delete_all.rs rename to cli-cmd/compute/src/v2/server/tag/delete_all.rs diff --git a/openstack_cli/src/compute/v2/server/tag/list.rs b/cli-cmd/compute/src/v2/server/tag/list.rs similarity index 100% rename from openstack_cli/src/compute/v2/server/tag/list.rs rename to cli-cmd/compute/src/v2/server/tag/list.rs diff --git a/openstack_cli/src/compute/v2/server/tag/replace_226.rs b/cli-cmd/compute/src/v2/server/tag/replace_226.rs similarity index 100% rename from openstack_cli/src/compute/v2/server/tag/replace_226.rs rename to cli-cmd/compute/src/v2/server/tag/replace_226.rs diff --git a/openstack_cli/src/compute/v2/server/tag/set.rs b/cli-cmd/compute/src/v2/server/tag/set.rs similarity index 100% rename from openstack_cli/src/compute/v2/server/tag/set.rs rename to cli-cmd/compute/src/v2/server/tag/set.rs diff --git a/openstack_cli/src/compute/v2/server/tag/show.rs b/cli-cmd/compute/src/v2/server/tag/show.rs similarity index 100% rename from openstack_cli/src/compute/v2/server/tag/show.rs rename to cli-cmd/compute/src/v2/server/tag/show.rs diff --git a/openstack_cli/src/compute/v2/server/topology/list.rs b/cli-cmd/compute/src/v2/server/topology/list.rs similarity index 100% rename from openstack_cli/src/compute/v2/server/topology/list.rs rename to cli-cmd/compute/src/v2/server/topology/list.rs diff --git a/openstack_cli/src/compute/v2/server/trigger_crash_dump_217.rs b/cli-cmd/compute/src/v2/server/trigger_crash_dump_217.rs similarity index 100% rename from openstack_cli/src/compute/v2/server/trigger_crash_dump_217.rs rename to cli-cmd/compute/src/v2/server/trigger_crash_dump_217.rs diff --git a/openstack_cli/src/compute/v2/server/unlock_21.rs b/cli-cmd/compute/src/v2/server/unlock_21.rs similarity index 100% rename from openstack_cli/src/compute/v2/server/unlock_21.rs rename to cli-cmd/compute/src/v2/server/unlock_21.rs diff --git a/openstack_cli/src/compute/v2/server/unpause.rs b/cli-cmd/compute/src/v2/server/unpause.rs similarity index 100% rename from openstack_cli/src/compute/v2/server/unpause.rs rename to cli-cmd/compute/src/v2/server/unpause.rs diff --git a/openstack_cli/src/compute/v2/server/unrescue.rs b/cli-cmd/compute/src/v2/server/unrescue.rs similarity index 100% rename from openstack_cli/src/compute/v2/server/unrescue.rs rename to cli-cmd/compute/src/v2/server/unrescue.rs diff --git a/openstack_cli/src/compute/v2/server/unshelve_21.rs b/cli-cmd/compute/src/v2/server/unshelve_21.rs similarity index 100% rename from openstack_cli/src/compute/v2/server/unshelve_21.rs rename to cli-cmd/compute/src/v2/server/unshelve_21.rs diff --git a/openstack_cli/src/compute/v2/server/unshelve_277.rs b/cli-cmd/compute/src/v2/server/unshelve_277.rs similarity index 100% rename from openstack_cli/src/compute/v2/server/unshelve_277.rs rename to cli-cmd/compute/src/v2/server/unshelve_277.rs diff --git a/openstack_cli/src/compute/v2/server/unshelve_291.rs b/cli-cmd/compute/src/v2/server/unshelve_291.rs similarity index 100% rename from openstack_cli/src/compute/v2/server/unshelve_291.rs rename to cli-cmd/compute/src/v2/server/unshelve_291.rs diff --git a/openstack_cli/src/compute/v2/server/virtual_interface/get.rs b/cli-cmd/compute/src/v2/server/virtual_interface/get.rs similarity index 98% rename from openstack_cli/src/compute/v2/server/virtual_interface/get.rs rename to cli-cmd/compute/src/v2/server/virtual_interface/get.rs index 6c6cca541..7253d14c4 100644 --- a/openstack_cli/src/compute/v2/server/virtual_interface/get.rs +++ b/cli-cmd/compute/src/v2/server/virtual_interface/get.rs @@ -88,9 +88,9 @@ impl StructTable for ResponseData { #[async_trait] impl OSCCommand for VirtualInterfaceCmd { - async fn take_action( + async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, client: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { info!("Get VirtualInterface with {:?}", self.args); diff --git a/openstack_cli/src/compute/v2/server/volume_attachment.rs b/cli-cmd/compute/src/v2/server/volume_attachment.rs similarity index 95% rename from openstack_cli/src/compute/v2/server/volume_attachment.rs rename to cli-cmd/compute/src/v2/server/volume_attachment.rs index 0090f2263..5c4a9041d 100644 --- a/openstack_cli/src/compute/v2/server/volume_attachment.rs +++ b/cli-cmd/compute/src/v2/server/volume_attachment.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; mod create_20; mod create_249; @@ -59,9 +59,9 @@ pub enum VolumeAttachmentCommands { impl VolumeAttachmentCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/compute/v2/server/volume_attachment/create_20.rs b/cli-cmd/compute/src/v2/server/volume_attachment/create_20.rs similarity index 100% rename from openstack_cli/src/compute/v2/server/volume_attachment/create_20.rs rename to cli-cmd/compute/src/v2/server/volume_attachment/create_20.rs diff --git a/openstack_cli/src/compute/v2/server/volume_attachment/create_249.rs b/cli-cmd/compute/src/v2/server/volume_attachment/create_249.rs similarity index 100% rename from openstack_cli/src/compute/v2/server/volume_attachment/create_249.rs rename to cli-cmd/compute/src/v2/server/volume_attachment/create_249.rs diff --git a/openstack_cli/src/compute/v2/server/volume_attachment/create_279.rs b/cli-cmd/compute/src/v2/server/volume_attachment/create_279.rs similarity index 100% rename from openstack_cli/src/compute/v2/server/volume_attachment/create_279.rs rename to cli-cmd/compute/src/v2/server/volume_attachment/create_279.rs diff --git a/openstack_cli/src/compute/v2/server/volume_attachment/delete.rs b/cli-cmd/compute/src/v2/server/volume_attachment/delete.rs similarity index 100% rename from openstack_cli/src/compute/v2/server/volume_attachment/delete.rs rename to cli-cmd/compute/src/v2/server/volume_attachment/delete.rs diff --git a/openstack_cli/src/compute/v2/server/volume_attachment/list.rs b/cli-cmd/compute/src/v2/server/volume_attachment/list.rs similarity index 100% rename from openstack_cli/src/compute/v2/server/volume_attachment/list.rs rename to cli-cmd/compute/src/v2/server/volume_attachment/list.rs diff --git a/openstack_cli/src/compute/v2/server/volume_attachment/set_20.rs b/cli-cmd/compute/src/v2/server/volume_attachment/set_20.rs similarity index 100% rename from openstack_cli/src/compute/v2/server/volume_attachment/set_20.rs rename to cli-cmd/compute/src/v2/server/volume_attachment/set_20.rs diff --git a/openstack_cli/src/compute/v2/server/volume_attachment/set_285.rs b/cli-cmd/compute/src/v2/server/volume_attachment/set_285.rs similarity index 100% rename from openstack_cli/src/compute/v2/server/volume_attachment/set_285.rs rename to cli-cmd/compute/src/v2/server/volume_attachment/set_285.rs diff --git a/openstack_cli/src/compute/v2/server/volume_attachment/show.rs b/cli-cmd/compute/src/v2/server/volume_attachment/show.rs similarity index 100% rename from openstack_cli/src/compute/v2/server/volume_attachment/show.rs rename to cli-cmd/compute/src/v2/server/volume_attachment/show.rs diff --git a/openstack_cli/src/compute/v2/server_external_event.rs b/cli-cmd/compute/src/v2/server_external_event.rs similarity index 95% rename from openstack_cli/src/compute/v2/server_external_event.rs rename to cli-cmd/compute/src/v2/server_external_event.rs index f5fde15a6..0e9af1b31 100644 --- a/openstack_cli/src/compute/v2/server_external_event.rs +++ b/cli-cmd/compute/src/v2/server_external_event.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; pub mod create_20; pub mod create_251; @@ -59,9 +59,9 @@ pub enum ServerExternalEventCommands { impl ServerExternalEventCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/compute/v2/server_external_event/create_20.rs b/cli-cmd/compute/src/v2/server_external_event/create_20.rs similarity index 100% rename from openstack_cli/src/compute/v2/server_external_event/create_20.rs rename to cli-cmd/compute/src/v2/server_external_event/create_20.rs diff --git a/openstack_cli/src/compute/v2/server_external_event/create_251.rs b/cli-cmd/compute/src/v2/server_external_event/create_251.rs similarity index 100% rename from openstack_cli/src/compute/v2/server_external_event/create_251.rs rename to cli-cmd/compute/src/v2/server_external_event/create_251.rs diff --git a/openstack_cli/src/compute/v2/server_external_event/create_276.rs b/cli-cmd/compute/src/v2/server_external_event/create_276.rs similarity index 100% rename from openstack_cli/src/compute/v2/server_external_event/create_276.rs rename to cli-cmd/compute/src/v2/server_external_event/create_276.rs diff --git a/openstack_cli/src/compute/v2/server_external_event/create_282.rs b/cli-cmd/compute/src/v2/server_external_event/create_282.rs similarity index 100% rename from openstack_cli/src/compute/v2/server_external_event/create_282.rs rename to cli-cmd/compute/src/v2/server_external_event/create_282.rs diff --git a/openstack_cli/src/compute/v2/server_external_event/create_293.rs b/cli-cmd/compute/src/v2/server_external_event/create_293.rs similarity index 100% rename from openstack_cli/src/compute/v2/server_external_event/create_293.rs rename to cli-cmd/compute/src/v2/server_external_event/create_293.rs diff --git a/openstack_cli/src/compute/v2/server_group.rs b/cli-cmd/compute/src/v2/server_group.rs similarity index 94% rename from openstack_cli/src/compute/v2/server_group.rs rename to cli-cmd/compute/src/v2/server_group.rs index 99e88c2a4..7c3e9de50 100644 --- a/openstack_cli/src/compute/v2/server_group.rs +++ b/cli-cmd/compute/src/v2/server_group.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; pub mod create_20; pub mod create_215; @@ -52,9 +52,9 @@ pub enum ServerGroupCommands { impl ServerGroupCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/compute/v2/server_group/create_20.rs b/cli-cmd/compute/src/v2/server_group/create_20.rs similarity index 100% rename from openstack_cli/src/compute/v2/server_group/create_20.rs rename to cli-cmd/compute/src/v2/server_group/create_20.rs diff --git a/openstack_cli/src/compute/v2/server_group/create_215.rs b/cli-cmd/compute/src/v2/server_group/create_215.rs similarity index 100% rename from openstack_cli/src/compute/v2/server_group/create_215.rs rename to cli-cmd/compute/src/v2/server_group/create_215.rs diff --git a/openstack_cli/src/compute/v2/server_group/create_264.rs b/cli-cmd/compute/src/v2/server_group/create_264.rs similarity index 100% rename from openstack_cli/src/compute/v2/server_group/create_264.rs rename to cli-cmd/compute/src/v2/server_group/create_264.rs diff --git a/openstack_cli/src/compute/v2/server_group/delete.rs b/cli-cmd/compute/src/v2/server_group/delete.rs similarity index 100% rename from openstack_cli/src/compute/v2/server_group/delete.rs rename to cli-cmd/compute/src/v2/server_group/delete.rs diff --git a/openstack_cli/src/compute/v2/server_group/list.rs b/cli-cmd/compute/src/v2/server_group/list.rs similarity index 100% rename from openstack_cli/src/compute/v2/server_group/list.rs rename to cli-cmd/compute/src/v2/server_group/list.rs diff --git a/openstack_cli/src/compute/v2/server_group/show.rs b/cli-cmd/compute/src/v2/server_group/show.rs similarity index 100% rename from openstack_cli/src/compute/v2/server_group/show.rs rename to cli-cmd/compute/src/v2/server_group/show.rs diff --git a/openstack_cli/src/compute/v2/service.rs b/cli-cmd/compute/src/v2/service.rs similarity index 93% rename from openstack_cli/src/compute/v2/service.rs rename to cli-cmd/compute/src/v2/service.rs index 46fcea233..659a1220e 100644 --- a/openstack_cli/src/compute/v2/service.rs +++ b/cli-cmd/compute/src/v2/service.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; pub mod delete; pub mod list; @@ -50,9 +50,9 @@ pub enum ServiceCommands { impl ServiceCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/compute/v2/service/delete.rs b/cli-cmd/compute/src/v2/service/delete.rs similarity index 100% rename from openstack_cli/src/compute/v2/service/delete.rs rename to cli-cmd/compute/src/v2/service/delete.rs diff --git a/openstack_cli/src/compute/v2/service/list.rs b/cli-cmd/compute/src/v2/service/list.rs similarity index 100% rename from openstack_cli/src/compute/v2/service/list.rs rename to cli-cmd/compute/src/v2/service/list.rs diff --git a/openstack_cli/src/compute/v2/service/set_20.rs b/cli-cmd/compute/src/v2/service/set_20.rs similarity index 100% rename from openstack_cli/src/compute/v2/service/set_20.rs rename to cli-cmd/compute/src/v2/service/set_20.rs diff --git a/openstack_cli/src/compute/v2/service/set_211.rs b/cli-cmd/compute/src/v2/service/set_211.rs similarity index 100% rename from openstack_cli/src/compute/v2/service/set_211.rs rename to cli-cmd/compute/src/v2/service/set_211.rs diff --git a/openstack_cli/src/compute/v2/service/set_253.rs b/cli-cmd/compute/src/v2/service/set_253.rs similarity index 100% rename from openstack_cli/src/compute/v2/service/set_253.rs rename to cli-cmd/compute/src/v2/service/set_253.rs diff --git a/openstack_cli/src/compute/v2/simple_tenant_usage.rs b/cli-cmd/compute/src/v2/simple_tenant_usage.rs similarity index 95% rename from openstack_cli/src/compute/v2/simple_tenant_usage.rs rename to cli-cmd/compute/src/v2/simple_tenant_usage.rs index ff4156193..95759cd7d 100644 --- a/openstack_cli/src/compute/v2/simple_tenant_usage.rs +++ b/cli-cmd/compute/src/v2/simple_tenant_usage.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; pub mod list; pub mod show; @@ -72,9 +72,9 @@ pub enum SimpleTenantUsageCommands { impl SimpleTenantUsageCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/compute/v2/simple_tenant_usage/list.rs b/cli-cmd/compute/src/v2/simple_tenant_usage/list.rs similarity index 100% rename from openstack_cli/src/compute/v2/simple_tenant_usage/list.rs rename to cli-cmd/compute/src/v2/simple_tenant_usage/list.rs diff --git a/openstack_cli/src/compute/v2/simple_tenant_usage/show.rs b/cli-cmd/compute/src/v2/simple_tenant_usage/show.rs similarity index 100% rename from openstack_cli/src/compute/v2/simple_tenant_usage/show.rs rename to cli-cmd/compute/src/v2/simple_tenant_usage/show.rs diff --git a/openstack_cli/src/compute/v2/version/get.rs b/cli-cmd/compute/src/v2/version/get.rs similarity index 100% rename from openstack_cli/src/compute/v2/version/get.rs rename to cli-cmd/compute/src/v2/version/get.rs diff --git a/openstack_cli/src/compute/v2/version/show.rs b/cli-cmd/compute/src/v2/version/show.rs similarity index 100% rename from openstack_cli/src/compute/v2/version/show.rs rename to cli-cmd/compute/src/v2/version/show.rs diff --git a/cli-cmd/container-infrastructure-management/Cargo.toml b/cli-cmd/container-infrastructure-management/Cargo.toml new file mode 100644 index 000000000..20fec7da9 --- /dev/null +++ b/cli-cmd/container-infrastructure-management/Cargo.toml @@ -0,0 +1,24 @@ +[package] +name = "openstack-cli-container-infrastructure-management" +description = "OpenStack CLI Container infra commands" +version = "0.1.0" +license.workspace = true +edition.workspace = true +authors.workspace = true +rust-version.workspace = true +homepage.workspace = true +repository.workspace = true + +[dependencies] +clap = { workspace = true } +openstack-cli-core = { version = "0.13", path = "../../cli-core/" } +openstack_sdk = { path="../../openstack_sdk", version = "^0.22", default-features = false, features = ["async", "container_infra"] } +openstack-sdk-core = { path="../../sdk-core", version = "^0.22" } +openstack_types = { path="../../openstack_types", version = "^0.22" } +eyre = { workspace = true } +http = { workspace = true } +serde_json = {workspace = true} +tracing = { workspace = true} + +[lints] +workspace = true diff --git a/cli-cmd/container-infrastructure-management/src/lib.rs b/cli-cmd/container-infrastructure-management/src/lib.rs new file mode 100644 index 000000000..8f2e74480 --- /dev/null +++ b/cli-cmd/container-infrastructure-management/src/lib.rs @@ -0,0 +1,16 @@ +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// +// SPDX-License-Identifier: Apache-2.0 + +//! Container Infrastructure Management API command +pub mod v1; diff --git a/openstack_cli/src/container_infrastructure_management/v1.rs b/cli-cmd/container-infrastructure-management/src/v1.rs similarity index 95% rename from openstack_cli/src/container_infrastructure_management/v1.rs rename to cli-cmd/container-infrastructure-management/src/v1.rs index 2c388d762..6bf18adaa 100644 --- a/openstack_cli/src/container_infrastructure_management/v1.rs +++ b/cli-cmd/container-infrastructure-management/src/v1.rs @@ -16,10 +16,9 @@ use clap::{Parser, Subcommand}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; use openstack_sdk::{AsyncOpenStack, types::ServiceType}; -use crate::{Cli, OpenStackCliError}; - pub mod certificate; pub mod cluster; pub mod clustertemplate; @@ -54,9 +53,9 @@ pub enum ContainerInfrastructureCommands { impl ContainerInfrastructureCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { session diff --git a/openstack_cli/src/container_infrastructure_management/v1/certificate.rs b/cli-cmd/container-infrastructure-management/src/v1/certificate.rs similarity index 92% rename from openstack_cli/src/container_infrastructure_management/v1/certificate.rs rename to cli-cmd/container-infrastructure-management/src/v1/certificate.rs index 803fe5673..e48da5eef 100644 --- a/openstack_cli/src/container_infrastructure_management/v1/certificate.rs +++ b/cli-cmd/container-infrastructure-management/src/v1/certificate.rs @@ -15,10 +15,9 @@ //! Container infrastructure cluster certificate management use clap::{Parser, Subcommand}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; - pub mod create; pub mod show; @@ -42,9 +41,9 @@ pub enum CertificateCommands { impl CertificateCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/container_infrastructure_management/v1/certificate/create.rs b/cli-cmd/container-infrastructure-management/src/v1/certificate/create.rs similarity index 100% rename from openstack_cli/src/container_infrastructure_management/v1/certificate/create.rs rename to cli-cmd/container-infrastructure-management/src/v1/certificate/create.rs diff --git a/openstack_cli/src/container_infrastructure_management/v1/certificate/show.rs b/cli-cmd/container-infrastructure-management/src/v1/certificate/show.rs similarity index 100% rename from openstack_cli/src/container_infrastructure_management/v1/certificate/show.rs rename to cli-cmd/container-infrastructure-management/src/v1/certificate/show.rs diff --git a/openstack_cli/src/container_infrastructure_management/v1/cluster.rs b/cli-cmd/container-infrastructure-management/src/v1/cluster.rs similarity index 94% rename from openstack_cli/src/container_infrastructure_management/v1/cluster.rs rename to cli-cmd/container-infrastructure-management/src/v1/cluster.rs index 5b44237ba..2150e9d24 100644 --- a/openstack_cli/src/container_infrastructure_management/v1/cluster.rs +++ b/cli-cmd/container-infrastructure-management/src/v1/cluster.rs @@ -15,10 +15,9 @@ //! Container infrastructure cluster management use clap::{Parser, Subcommand}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; - pub mod create; pub mod delete; pub mod list; @@ -50,9 +49,9 @@ pub enum ClusterCommands { impl ClusterCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/container_infrastructure_management/v1/cluster/action/resize/create.rs b/cli-cmd/container-infrastructure-management/src/v1/cluster/action/resize/create.rs similarity index 100% rename from openstack_cli/src/container_infrastructure_management/v1/cluster/action/resize/create.rs rename to cli-cmd/container-infrastructure-management/src/v1/cluster/action/resize/create.rs diff --git a/openstack_cli/src/container_infrastructure_management/v1/cluster/action/upgrade/create.rs b/cli-cmd/container-infrastructure-management/src/v1/cluster/action/upgrade/create.rs similarity index 100% rename from openstack_cli/src/container_infrastructure_management/v1/cluster/action/upgrade/create.rs rename to cli-cmd/container-infrastructure-management/src/v1/cluster/action/upgrade/create.rs diff --git a/openstack_cli/src/container_infrastructure_management/v1/cluster/create.rs b/cli-cmd/container-infrastructure-management/src/v1/cluster/create.rs similarity index 100% rename from openstack_cli/src/container_infrastructure_management/v1/cluster/create.rs rename to cli-cmd/container-infrastructure-management/src/v1/cluster/create.rs diff --git a/openstack_cli/src/container_infrastructure_management/v1/cluster/delete.rs b/cli-cmd/container-infrastructure-management/src/v1/cluster/delete.rs similarity index 100% rename from openstack_cli/src/container_infrastructure_management/v1/cluster/delete.rs rename to cli-cmd/container-infrastructure-management/src/v1/cluster/delete.rs diff --git a/openstack_cli/src/container_infrastructure_management/v1/cluster/list.rs b/cli-cmd/container-infrastructure-management/src/v1/cluster/list.rs similarity index 100% rename from openstack_cli/src/container_infrastructure_management/v1/cluster/list.rs rename to cli-cmd/container-infrastructure-management/src/v1/cluster/list.rs diff --git a/openstack_cli/src/container_infrastructure_management/v1/cluster/nodegroup.rs b/cli-cmd/container-infrastructure-management/src/v1/cluster/nodegroup.rs similarity index 94% rename from openstack_cli/src/container_infrastructure_management/v1/cluster/nodegroup.rs rename to cli-cmd/container-infrastructure-management/src/v1/cluster/nodegroup.rs index 8433b058d..062487d40 100644 --- a/openstack_cli/src/container_infrastructure_management/v1/cluster/nodegroup.rs +++ b/cli-cmd/container-infrastructure-management/src/v1/cluster/nodegroup.rs @@ -17,7 +17,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; pub mod create; pub mod delete; @@ -50,9 +50,9 @@ pub enum NodegroupCommands { impl NodegroupCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/container_infrastructure_management/v1/cluster/nodegroup/create.rs b/cli-cmd/container-infrastructure-management/src/v1/cluster/nodegroup/create.rs similarity index 100% rename from openstack_cli/src/container_infrastructure_management/v1/cluster/nodegroup/create.rs rename to cli-cmd/container-infrastructure-management/src/v1/cluster/nodegroup/create.rs diff --git a/openstack_cli/src/container_infrastructure_management/v1/cluster/nodegroup/delete.rs b/cli-cmd/container-infrastructure-management/src/v1/cluster/nodegroup/delete.rs similarity index 100% rename from openstack_cli/src/container_infrastructure_management/v1/cluster/nodegroup/delete.rs rename to cli-cmd/container-infrastructure-management/src/v1/cluster/nodegroup/delete.rs diff --git a/openstack_cli/src/container_infrastructure_management/v1/cluster/nodegroup/delete_all.rs b/cli-cmd/container-infrastructure-management/src/v1/cluster/nodegroup/delete_all.rs similarity index 100% rename from openstack_cli/src/container_infrastructure_management/v1/cluster/nodegroup/delete_all.rs rename to cli-cmd/container-infrastructure-management/src/v1/cluster/nodegroup/delete_all.rs diff --git a/openstack_cli/src/container_infrastructure_management/v1/cluster/nodegroup/list.rs b/cli-cmd/container-infrastructure-management/src/v1/cluster/nodegroup/list.rs similarity index 100% rename from openstack_cli/src/container_infrastructure_management/v1/cluster/nodegroup/list.rs rename to cli-cmd/container-infrastructure-management/src/v1/cluster/nodegroup/list.rs diff --git a/openstack_cli/src/container_infrastructure_management/v1/cluster/nodegroup/set.rs b/cli-cmd/container-infrastructure-management/src/v1/cluster/nodegroup/set.rs similarity index 100% rename from openstack_cli/src/container_infrastructure_management/v1/cluster/nodegroup/set.rs rename to cli-cmd/container-infrastructure-management/src/v1/cluster/nodegroup/set.rs diff --git a/openstack_cli/src/container_infrastructure_management/v1/cluster/nodegroup/show.rs b/cli-cmd/container-infrastructure-management/src/v1/cluster/nodegroup/show.rs similarity index 100% rename from openstack_cli/src/container_infrastructure_management/v1/cluster/nodegroup/show.rs rename to cli-cmd/container-infrastructure-management/src/v1/cluster/nodegroup/show.rs diff --git a/openstack_cli/src/container_infrastructure_management/v1/cluster/set.rs b/cli-cmd/container-infrastructure-management/src/v1/cluster/set.rs similarity index 100% rename from openstack_cli/src/container_infrastructure_management/v1/cluster/set.rs rename to cli-cmd/container-infrastructure-management/src/v1/cluster/set.rs diff --git a/openstack_cli/src/container_infrastructure_management/v1/cluster/show.rs b/cli-cmd/container-infrastructure-management/src/v1/cluster/show.rs similarity index 100% rename from openstack_cli/src/container_infrastructure_management/v1/cluster/show.rs rename to cli-cmd/container-infrastructure-management/src/v1/cluster/show.rs diff --git a/openstack_cli/src/container_infrastructure_management/v1/clustertemplate.rs b/cli-cmd/container-infrastructure-management/src/v1/clustertemplate.rs similarity index 93% rename from openstack_cli/src/container_infrastructure_management/v1/clustertemplate.rs rename to cli-cmd/container-infrastructure-management/src/v1/clustertemplate.rs index 5235a129d..f0f76a75f 100644 --- a/openstack_cli/src/container_infrastructure_management/v1/clustertemplate.rs +++ b/cli-cmd/container-infrastructure-management/src/v1/clustertemplate.rs @@ -15,10 +15,9 @@ //! Container infrastructure cluster management use clap::{Parser, Subcommand}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; - pub mod create; pub mod delete; pub mod list; @@ -46,9 +45,9 @@ pub enum ClustertemplateCommands { impl ClustertemplateCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/container_infrastructure_management/v1/clustertemplate/create.rs b/cli-cmd/container-infrastructure-management/src/v1/clustertemplate/create.rs similarity index 100% rename from openstack_cli/src/container_infrastructure_management/v1/clustertemplate/create.rs rename to cli-cmd/container-infrastructure-management/src/v1/clustertemplate/create.rs diff --git a/openstack_cli/src/container_infrastructure_management/v1/clustertemplate/delete.rs b/cli-cmd/container-infrastructure-management/src/v1/clustertemplate/delete.rs similarity index 100% rename from openstack_cli/src/container_infrastructure_management/v1/clustertemplate/delete.rs rename to cli-cmd/container-infrastructure-management/src/v1/clustertemplate/delete.rs diff --git a/openstack_cli/src/container_infrastructure_management/v1/clustertemplate/list.rs b/cli-cmd/container-infrastructure-management/src/v1/clustertemplate/list.rs similarity index 100% rename from openstack_cli/src/container_infrastructure_management/v1/clustertemplate/list.rs rename to cli-cmd/container-infrastructure-management/src/v1/clustertemplate/list.rs diff --git a/openstack_cli/src/container_infrastructure_management/v1/clustertemplate/show.rs b/cli-cmd/container-infrastructure-management/src/v1/clustertemplate/show.rs similarity index 100% rename from openstack_cli/src/container_infrastructure_management/v1/clustertemplate/show.rs rename to cli-cmd/container-infrastructure-management/src/v1/clustertemplate/show.rs diff --git a/openstack_cli/src/container_infrastructure_management/v1/federation.rs b/cli-cmd/container-infrastructure-management/src/v1/federation.rs similarity index 92% rename from openstack_cli/src/container_infrastructure_management/v1/federation.rs rename to cli-cmd/container-infrastructure-management/src/v1/federation.rs index d1472c157..262e33278 100644 --- a/openstack_cli/src/container_infrastructure_management/v1/federation.rs +++ b/cli-cmd/container-infrastructure-management/src/v1/federation.rs @@ -15,10 +15,9 @@ //! Container infrastructure cluster management use clap::{Parser, Subcommand}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; - pub mod create; pub mod delete; pub mod list; @@ -44,9 +43,9 @@ pub enum FederationCommands { impl FederationCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/container_infrastructure_management/v1/federation/create.rs b/cli-cmd/container-infrastructure-management/src/v1/federation/create.rs similarity index 100% rename from openstack_cli/src/container_infrastructure_management/v1/federation/create.rs rename to cli-cmd/container-infrastructure-management/src/v1/federation/create.rs diff --git a/openstack_cli/src/container_infrastructure_management/v1/federation/delete.rs b/cli-cmd/container-infrastructure-management/src/v1/federation/delete.rs similarity index 100% rename from openstack_cli/src/container_infrastructure_management/v1/federation/delete.rs rename to cli-cmd/container-infrastructure-management/src/v1/federation/delete.rs diff --git a/openstack_cli/src/container_infrastructure_management/v1/federation/list.rs b/cli-cmd/container-infrastructure-management/src/v1/federation/list.rs similarity index 100% rename from openstack_cli/src/container_infrastructure_management/v1/federation/list.rs rename to cli-cmd/container-infrastructure-management/src/v1/federation/list.rs diff --git a/openstack_cli/src/container_infrastructure_management/v1/federation/show.rs b/cli-cmd/container-infrastructure-management/src/v1/federation/show.rs similarity index 100% rename from openstack_cli/src/container_infrastructure_management/v1/federation/show.rs rename to cli-cmd/container-infrastructure-management/src/v1/federation/show.rs diff --git a/openstack_cli/src/container_infrastructure_management/v1/mservice.rs b/cli-cmd/container-infrastructure-management/src/v1/mservice.rs similarity index 91% rename from openstack_cli/src/container_infrastructure_management/v1/mservice.rs rename to cli-cmd/container-infrastructure-management/src/v1/mservice.rs index 3552687d3..82c6cde92 100644 --- a/openstack_cli/src/container_infrastructure_management/v1/mservice.rs +++ b/cli-cmd/container-infrastructure-management/src/v1/mservice.rs @@ -15,10 +15,9 @@ //! Container infrastructure service management use clap::{Parser, Subcommand}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; - pub mod list; /// Magnum Stats API @@ -40,9 +39,9 @@ pub enum ServiceCommands { impl ServiceCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/container_infrastructure_management/v1/mservice/list.rs b/cli-cmd/container-infrastructure-management/src/v1/mservice/list.rs similarity index 100% rename from openstack_cli/src/container_infrastructure_management/v1/mservice/list.rs rename to cli-cmd/container-infrastructure-management/src/v1/mservice/list.rs diff --git a/openstack_cli/src/container_infrastructure_management/v1/quota.rs b/cli-cmd/container-infrastructure-management/src/v1/quota.rs similarity index 92% rename from openstack_cli/src/container_infrastructure_management/v1/quota.rs rename to cli-cmd/container-infrastructure-management/src/v1/quota.rs index 44fe4037c..3329a6172 100644 --- a/openstack_cli/src/container_infrastructure_management/v1/quota.rs +++ b/cli-cmd/container-infrastructure-management/src/v1/quota.rs @@ -15,10 +15,9 @@ //! Container infrastructure quota management use clap::{Parser, Subcommand}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; - pub mod create; pub mod delete; pub mod list; @@ -46,9 +45,9 @@ pub enum QuotaCommands { impl QuotaCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/container_infrastructure_management/v1/quota/create.rs b/cli-cmd/container-infrastructure-management/src/v1/quota/create.rs similarity index 100% rename from openstack_cli/src/container_infrastructure_management/v1/quota/create.rs rename to cli-cmd/container-infrastructure-management/src/v1/quota/create.rs diff --git a/openstack_cli/src/container_infrastructure_management/v1/quota/delete.rs b/cli-cmd/container-infrastructure-management/src/v1/quota/delete.rs similarity index 100% rename from openstack_cli/src/container_infrastructure_management/v1/quota/delete.rs rename to cli-cmd/container-infrastructure-management/src/v1/quota/delete.rs diff --git a/openstack_cli/src/container_infrastructure_management/v1/quota/list.rs b/cli-cmd/container-infrastructure-management/src/v1/quota/list.rs similarity index 100% rename from openstack_cli/src/container_infrastructure_management/v1/quota/list.rs rename to cli-cmd/container-infrastructure-management/src/v1/quota/list.rs diff --git a/openstack_cli/src/container_infrastructure_management/v1/quota/show.rs b/cli-cmd/container-infrastructure-management/src/v1/quota/show.rs similarity index 100% rename from openstack_cli/src/container_infrastructure_management/v1/quota/show.rs rename to cli-cmd/container-infrastructure-management/src/v1/quota/show.rs diff --git a/openstack_cli/src/container_infrastructure_management/v1/stat.rs b/cli-cmd/container-infrastructure-management/src/v1/stat.rs similarity index 91% rename from openstack_cli/src/container_infrastructure_management/v1/stat.rs rename to cli-cmd/container-infrastructure-management/src/v1/stat.rs index 496d6d336..85216ddc1 100644 --- a/openstack_cli/src/container_infrastructure_management/v1/stat.rs +++ b/cli-cmd/container-infrastructure-management/src/v1/stat.rs @@ -15,10 +15,9 @@ //! Container infrastructure stat management use clap::{Parser, Subcommand}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; - pub mod get; /// Magnum Stats API @@ -41,9 +40,9 @@ pub enum StatCommands { impl StatCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/container_infrastructure_management/v1/stat/get.rs b/cli-cmd/container-infrastructure-management/src/v1/stat/get.rs similarity index 100% rename from openstack_cli/src/container_infrastructure_management/v1/stat/get.rs rename to cli-cmd/container-infrastructure-management/src/v1/stat/get.rs diff --git a/openstack_cli/src/container_infrastructure_management/v1/version.rs b/cli-cmd/container-infrastructure-management/src/v1/version.rs similarity index 90% rename from openstack_cli/src/container_infrastructure_management/v1/version.rs rename to cli-cmd/container-infrastructure-management/src/v1/version.rs index df6f96fa3..b6c4d05aa 100644 --- a/openstack_cli/src/container_infrastructure_management/v1/version.rs +++ b/cli-cmd/container-infrastructure-management/src/v1/version.rs @@ -15,10 +15,9 @@ //! Container infrastructure cluster management use clap::{Parser, Subcommand}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; - pub mod get; /// Manage Version @@ -39,9 +38,9 @@ pub enum VersionCommands { impl VersionCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/container_infrastructure_management/v1/version/get.rs b/cli-cmd/container-infrastructure-management/src/v1/version/get.rs similarity index 100% rename from openstack_cli/src/container_infrastructure_management/v1/version/get.rs rename to cli-cmd/container-infrastructure-management/src/v1/version/get.rs diff --git a/cli-cmd/dns/Cargo.toml b/cli-cmd/dns/Cargo.toml new file mode 100644 index 000000000..42b9024e3 --- /dev/null +++ b/cli-cmd/dns/Cargo.toml @@ -0,0 +1,24 @@ +[package] +name = "openstack-cli-dns" +description = "OpenStack CLI DNS commands" +version = "0.1.0" +license.workspace = true +edition.workspace = true +authors.workspace = true +rust-version.workspace = true +homepage.workspace = true +repository.workspace = true + +[dependencies] +clap = { workspace = true } +openstack-cli-core = { version = "0.13", path = "../../cli-core/" } +openstack_sdk = { path="../../openstack_sdk", version = "^0.22", default-features = false, features = ["async", "dns", "identity"] } +openstack-sdk-core = { path="../../sdk-core", version = "^0.22" } +openstack_types = { path="../../openstack_types", version = "^0.22" } +eyre = { workspace = true } +http = { workspace = true } +serde_json = {workspace = true} +tracing = { workspace = true} + +[lints] +workspace = true diff --git a/openstack_cli/src/dns/mod.rs b/cli-cmd/dns/src/lib.rs similarity index 94% rename from openstack_cli/src/dns/mod.rs rename to cli-cmd/dns/src/lib.rs index cc2445697..9896266ef 100644 --- a/openstack_cli/src/dns/mod.rs +++ b/cli-cmd/dns/src/lib.rs @@ -12,5 +12,5 @@ // // SPDX-License-Identifier: Apache-2.0 -//! DNS (Designate) API bindings +//! DNS API command. pub mod v2; diff --git a/openstack_cli/src/dns/v2.rs b/cli-cmd/dns/src/v2.rs similarity index 93% rename from openstack_cli/src/dns/v2.rs rename to cli-cmd/dns/src/v2.rs index 7967502bf..ec8e07dcb 100644 --- a/openstack_cli/src/dns/v2.rs +++ b/cli-cmd/dns/src/v2.rs @@ -16,10 +16,9 @@ use clap::{Parser, Subcommand}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; use openstack_sdk::{AsyncOpenStack, types::ServiceType}; -use crate::{Cli, OpenStackCliError}; - pub mod limit; pub mod quota; pub mod recordset; @@ -47,9 +46,9 @@ pub enum DnsCommands { impl DnsCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { session.discover_service_endpoint(&ServiceType::Dns).await?; diff --git a/openstack_cli/src/dns/v2/blacklist/create.rs b/cli-cmd/dns/src/v2/blacklist/create.rs similarity index 100% rename from openstack_cli/src/dns/v2/blacklist/create.rs rename to cli-cmd/dns/src/v2/blacklist/create.rs diff --git a/openstack_cli/src/dns/v2/blacklist/delete.rs b/cli-cmd/dns/src/v2/blacklist/delete.rs similarity index 100% rename from openstack_cli/src/dns/v2/blacklist/delete.rs rename to cli-cmd/dns/src/v2/blacklist/delete.rs diff --git a/openstack_cli/src/dns/v2/blacklist/list.rs b/cli-cmd/dns/src/v2/blacklist/list.rs similarity index 100% rename from openstack_cli/src/dns/v2/blacklist/list.rs rename to cli-cmd/dns/src/v2/blacklist/list.rs diff --git a/openstack_cli/src/dns/v2/blacklist/set.rs b/cli-cmd/dns/src/v2/blacklist/set.rs similarity index 100% rename from openstack_cli/src/dns/v2/blacklist/set.rs rename to cli-cmd/dns/src/v2/blacklist/set.rs diff --git a/openstack_cli/src/dns/v2/blacklist/show.rs b/cli-cmd/dns/src/v2/blacklist/show.rs similarity index 100% rename from openstack_cli/src/dns/v2/blacklist/show.rs rename to cli-cmd/dns/src/v2/blacklist/show.rs diff --git a/openstack_cli/src/dns/v2/limit.rs b/cli-cmd/dns/src/v2/limit.rs similarity index 90% rename from openstack_cli/src/dns/v2/limit.rs rename to cli-cmd/dns/src/v2/limit.rs index fe79082e4..2339ac6a4 100644 --- a/openstack_cli/src/dns/v2/limit.rs +++ b/cli-cmd/dns/src/v2/limit.rs @@ -15,10 +15,9 @@ //! DNS Limits management use clap::{Parser, Subcommand}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; - pub mod get; /// DNS Project limits operations @@ -39,9 +38,9 @@ pub enum LimitCommands { impl LimitCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/dns/v2/limit/get.rs b/cli-cmd/dns/src/v2/limit/get.rs similarity index 100% rename from openstack_cli/src/dns/v2/limit/get.rs rename to cli-cmd/dns/src/v2/limit/get.rs diff --git a/openstack_cli/src/dns/v2/pool/create.rs b/cli-cmd/dns/src/v2/pool/create.rs similarity index 100% rename from openstack_cli/src/dns/v2/pool/create.rs rename to cli-cmd/dns/src/v2/pool/create.rs diff --git a/openstack_cli/src/dns/v2/pool/delete.rs b/cli-cmd/dns/src/v2/pool/delete.rs similarity index 100% rename from openstack_cli/src/dns/v2/pool/delete.rs rename to cli-cmd/dns/src/v2/pool/delete.rs diff --git a/openstack_cli/src/dns/v2/pool/list.rs b/cli-cmd/dns/src/v2/pool/list.rs similarity index 100% rename from openstack_cli/src/dns/v2/pool/list.rs rename to cli-cmd/dns/src/v2/pool/list.rs diff --git a/openstack_cli/src/dns/v2/pool/set.rs b/cli-cmd/dns/src/v2/pool/set.rs similarity index 100% rename from openstack_cli/src/dns/v2/pool/set.rs rename to cli-cmd/dns/src/v2/pool/set.rs diff --git a/openstack_cli/src/dns/v2/pool/show.rs b/cli-cmd/dns/src/v2/pool/show.rs similarity index 100% rename from openstack_cli/src/dns/v2/pool/show.rs rename to cli-cmd/dns/src/v2/pool/show.rs diff --git a/openstack_cli/src/dns/v2/quota.rs b/cli-cmd/dns/src/v2/quota.rs similarity index 91% rename from openstack_cli/src/dns/v2/quota.rs rename to cli-cmd/dns/src/v2/quota.rs index e104dedda..4b46623c5 100644 --- a/openstack_cli/src/dns/v2/quota.rs +++ b/cli-cmd/dns/src/v2/quota.rs @@ -15,10 +15,9 @@ //! DNS Quota management use clap::{Parser, Subcommand}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; - pub mod delete; pub mod set; pub mod show; @@ -42,9 +41,9 @@ pub enum QuotaCommands { impl QuotaCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/dns/v2/quota/delete.rs b/cli-cmd/dns/src/v2/quota/delete.rs similarity index 100% rename from openstack_cli/src/dns/v2/quota/delete.rs rename to cli-cmd/dns/src/v2/quota/delete.rs diff --git a/openstack_cli/src/dns/v2/quota/set.rs b/cli-cmd/dns/src/v2/quota/set.rs similarity index 100% rename from openstack_cli/src/dns/v2/quota/set.rs rename to cli-cmd/dns/src/v2/quota/set.rs diff --git a/openstack_cli/src/dns/v2/quota/show.rs b/cli-cmd/dns/src/v2/quota/show.rs similarity index 100% rename from openstack_cli/src/dns/v2/quota/show.rs rename to cli-cmd/dns/src/v2/quota/show.rs diff --git a/openstack_cli/src/dns/v2/recordset.rs b/cli-cmd/dns/src/v2/recordset.rs similarity index 91% rename from openstack_cli/src/dns/v2/recordset.rs rename to cli-cmd/dns/src/v2/recordset.rs index f38d447e7..4f5942682 100644 --- a/openstack_cli/src/dns/v2/recordset.rs +++ b/cli-cmd/dns/src/v2/recordset.rs @@ -15,10 +15,9 @@ //! DNS project Recordsets management use clap::{Parser, Subcommand}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; - pub mod list; /// DNS Project recordsets operations @@ -40,9 +39,9 @@ pub enum RecordsetCommands { impl RecordsetCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/dns/v2/recordset/list.rs b/cli-cmd/dns/src/v2/recordset/list.rs similarity index 100% rename from openstack_cli/src/dns/v2/recordset/list.rs rename to cli-cmd/dns/src/v2/recordset/list.rs diff --git a/openstack_cli/src/dns/v2/recordset/show.rs b/cli-cmd/dns/src/v2/recordset/show.rs similarity index 100% rename from openstack_cli/src/dns/v2/recordset/show.rs rename to cli-cmd/dns/src/v2/recordset/show.rs diff --git a/openstack_cli/src/dns/v2/reverse.rs b/cli-cmd/dns/src/v2/reverse.rs similarity index 90% rename from openstack_cli/src/dns/v2/reverse.rs rename to cli-cmd/dns/src/v2/reverse.rs index 88d06e307..84d5ea5b1 100644 --- a/openstack_cli/src/dns/v2/reverse.rs +++ b/cli-cmd/dns/src/v2/reverse.rs @@ -15,10 +15,9 @@ //! DNS Reverse records management use clap::{Parser, Subcommand}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; - pub mod floatingip; /// DNS Reverse recordsets (PTR) operations @@ -38,9 +37,9 @@ pub enum ReverseCommands { impl ReverseCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/dns/v2/reverse/floatingip.rs b/cli-cmd/dns/src/v2/reverse/floatingip.rs similarity index 92% rename from openstack_cli/src/dns/v2/reverse/floatingip.rs rename to cli-cmd/dns/src/v2/reverse/floatingip.rs index a229b7c20..682d69972 100644 --- a/openstack_cli/src/dns/v2/reverse/floatingip.rs +++ b/cli-cmd/dns/src/v2/reverse/floatingip.rs @@ -15,10 +15,9 @@ //! DNS PTR records management use clap::{Parser, Subcommand}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; - pub mod list; pub mod set; pub mod show; @@ -42,9 +41,9 @@ pub enum FloatingipCommands { impl FloatingipCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/dns/v2/reverse/floatingip/list.rs b/cli-cmd/dns/src/v2/reverse/floatingip/list.rs similarity index 100% rename from openstack_cli/src/dns/v2/reverse/floatingip/list.rs rename to cli-cmd/dns/src/v2/reverse/floatingip/list.rs diff --git a/openstack_cli/src/dns/v2/reverse/floatingip/set.rs b/cli-cmd/dns/src/v2/reverse/floatingip/set.rs similarity index 100% rename from openstack_cli/src/dns/v2/reverse/floatingip/set.rs rename to cli-cmd/dns/src/v2/reverse/floatingip/set.rs diff --git a/openstack_cli/src/dns/v2/reverse/floatingip/show.rs b/cli-cmd/dns/src/v2/reverse/floatingip/show.rs similarity index 100% rename from openstack_cli/src/dns/v2/reverse/floatingip/show.rs rename to cli-cmd/dns/src/v2/reverse/floatingip/show.rs diff --git a/openstack_cli/src/dns/v2/service_status/list.rs b/cli-cmd/dns/src/v2/service_status/list.rs similarity index 100% rename from openstack_cli/src/dns/v2/service_status/list.rs rename to cli-cmd/dns/src/v2/service_status/list.rs diff --git a/openstack_cli/src/dns/v2/service_status/show.rs b/cli-cmd/dns/src/v2/service_status/show.rs similarity index 100% rename from openstack_cli/src/dns/v2/service_status/show.rs rename to cli-cmd/dns/src/v2/service_status/show.rs diff --git a/openstack_cli/src/dns/v2/tld/create.rs b/cli-cmd/dns/src/v2/tld/create.rs similarity index 100% rename from openstack_cli/src/dns/v2/tld/create.rs rename to cli-cmd/dns/src/v2/tld/create.rs diff --git a/openstack_cli/src/dns/v2/tld/delete.rs b/cli-cmd/dns/src/v2/tld/delete.rs similarity index 100% rename from openstack_cli/src/dns/v2/tld/delete.rs rename to cli-cmd/dns/src/v2/tld/delete.rs diff --git a/openstack_cli/src/dns/v2/tld/list.rs b/cli-cmd/dns/src/v2/tld/list.rs similarity index 100% rename from openstack_cli/src/dns/v2/tld/list.rs rename to cli-cmd/dns/src/v2/tld/list.rs diff --git a/openstack_cli/src/dns/v2/tld/set.rs b/cli-cmd/dns/src/v2/tld/set.rs similarity index 100% rename from openstack_cli/src/dns/v2/tld/set.rs rename to cli-cmd/dns/src/v2/tld/set.rs diff --git a/openstack_cli/src/dns/v2/tld/show.rs b/cli-cmd/dns/src/v2/tld/show.rs similarity index 100% rename from openstack_cli/src/dns/v2/tld/show.rs rename to cli-cmd/dns/src/v2/tld/show.rs diff --git a/openstack_cli/src/dns/v2/tsigkey/create.rs b/cli-cmd/dns/src/v2/tlsig/create.rs similarity index 100% rename from openstack_cli/src/dns/v2/tsigkey/create.rs rename to cli-cmd/dns/src/v2/tlsig/create.rs diff --git a/openstack_cli/src/dns/v2/tsigkey/delete.rs b/cli-cmd/dns/src/v2/tlsig/delete.rs similarity index 100% rename from openstack_cli/src/dns/v2/tsigkey/delete.rs rename to cli-cmd/dns/src/v2/tlsig/delete.rs diff --git a/openstack_cli/src/dns/v2/tsigkey/list.rs b/cli-cmd/dns/src/v2/tlsig/list.rs similarity index 100% rename from openstack_cli/src/dns/v2/tsigkey/list.rs rename to cli-cmd/dns/src/v2/tlsig/list.rs diff --git a/openstack_cli/src/dns/v2/tsigkey/set.rs b/cli-cmd/dns/src/v2/tlsig/set.rs similarity index 100% rename from openstack_cli/src/dns/v2/tsigkey/set.rs rename to cli-cmd/dns/src/v2/tlsig/set.rs diff --git a/openstack_cli/src/dns/v2/tsigkey/show.rs b/cli-cmd/dns/src/v2/tlsig/show.rs similarity index 100% rename from openstack_cli/src/dns/v2/tsigkey/show.rs rename to cli-cmd/dns/src/v2/tlsig/show.rs diff --git a/openstack_cli/src/dns/v2/zone.rs b/cli-cmd/dns/src/v2/zone.rs similarity index 93% rename from openstack_cli/src/dns/v2/zone.rs rename to cli-cmd/dns/src/v2/zone.rs index c0db38e48..69db5dd21 100644 --- a/openstack_cli/src/dns/v2/zone.rs +++ b/cli-cmd/dns/src/v2/zone.rs @@ -15,10 +15,9 @@ //! DNS Zone management use clap::{Parser, Subcommand}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; - pub mod create; pub mod delete; pub mod list; @@ -50,9 +49,9 @@ pub enum ZoneCommands { impl ZoneCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/dns/v2/zone/create.rs b/cli-cmd/dns/src/v2/zone/create.rs similarity index 100% rename from openstack_cli/src/dns/v2/zone/create.rs rename to cli-cmd/dns/src/v2/zone/create.rs diff --git a/openstack_cli/src/dns/v2/zone/delete.rs b/cli-cmd/dns/src/v2/zone/delete.rs similarity index 100% rename from openstack_cli/src/dns/v2/zone/delete.rs rename to cli-cmd/dns/src/v2/zone/delete.rs diff --git a/openstack_cli/src/dns/v2/zone/list.rs b/cli-cmd/dns/src/v2/zone/list.rs similarity index 100% rename from openstack_cli/src/dns/v2/zone/list.rs rename to cli-cmd/dns/src/v2/zone/list.rs diff --git a/openstack_cli/src/dns/v2/zone/nameserver.rs b/cli-cmd/dns/src/v2/zone/nameserver.rs similarity index 90% rename from openstack_cli/src/dns/v2/zone/nameserver.rs rename to cli-cmd/dns/src/v2/zone/nameserver.rs index aec67ac18..7469d4d8f 100644 --- a/openstack_cli/src/dns/v2/zone/nameserver.rs +++ b/cli-cmd/dns/src/v2/zone/nameserver.rs @@ -15,10 +15,9 @@ //! DNS Zone Nameserver management use clap::{Parser, Subcommand}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; - pub mod list; /// DNS recordsets operations @@ -38,9 +37,9 @@ pub enum NameserverCommands { impl NameserverCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/dns/v2/zone/nameserver/list.rs b/cli-cmd/dns/src/v2/zone/nameserver/list.rs similarity index 100% rename from openstack_cli/src/dns/v2/zone/nameserver/list.rs rename to cli-cmd/dns/src/v2/zone/nameserver/list.rs diff --git a/openstack_cli/src/dns/v2/zone/recordset.rs b/cli-cmd/dns/src/v2/zone/recordset.rs similarity index 93% rename from openstack_cli/src/dns/v2/zone/recordset.rs rename to cli-cmd/dns/src/v2/zone/recordset.rs index eb7e062e7..1dc25cf01 100644 --- a/openstack_cli/src/dns/v2/zone/recordset.rs +++ b/cli-cmd/dns/src/v2/zone/recordset.rs @@ -15,10 +15,9 @@ //! DNS Zone Recordsets management use clap::{Parser, Subcommand}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; - pub mod create; pub mod delete; pub mod list; @@ -46,9 +45,9 @@ pub enum RecordsetCommands { impl RecordsetCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/dns/v2/zone/recordset/create.rs b/cli-cmd/dns/src/v2/zone/recordset/create.rs similarity index 100% rename from openstack_cli/src/dns/v2/zone/recordset/create.rs rename to cli-cmd/dns/src/v2/zone/recordset/create.rs diff --git a/openstack_cli/src/dns/v2/zone/recordset/delete.rs b/cli-cmd/dns/src/v2/zone/recordset/delete.rs similarity index 100% rename from openstack_cli/src/dns/v2/zone/recordset/delete.rs rename to cli-cmd/dns/src/v2/zone/recordset/delete.rs diff --git a/openstack_cli/src/dns/v2/zone/recordset/list.rs b/cli-cmd/dns/src/v2/zone/recordset/list.rs similarity index 100% rename from openstack_cli/src/dns/v2/zone/recordset/list.rs rename to cli-cmd/dns/src/v2/zone/recordset/list.rs diff --git a/openstack_cli/src/dns/v2/zone/recordset/set.rs b/cli-cmd/dns/src/v2/zone/recordset/set.rs similarity index 100% rename from openstack_cli/src/dns/v2/zone/recordset/set.rs rename to cli-cmd/dns/src/v2/zone/recordset/set.rs diff --git a/openstack_cli/src/dns/v2/zone/recordset/show.rs b/cli-cmd/dns/src/v2/zone/recordset/show.rs similarity index 100% rename from openstack_cli/src/dns/v2/zone/recordset/show.rs rename to cli-cmd/dns/src/v2/zone/recordset/show.rs diff --git a/openstack_cli/src/dns/v2/zone/set.rs b/cli-cmd/dns/src/v2/zone/set.rs similarity index 100% rename from openstack_cli/src/dns/v2/zone/set.rs rename to cli-cmd/dns/src/v2/zone/set.rs diff --git a/openstack_cli/src/dns/v2/zone/share/create.rs b/cli-cmd/dns/src/v2/zone/share/create.rs similarity index 100% rename from openstack_cli/src/dns/v2/zone/share/create.rs rename to cli-cmd/dns/src/v2/zone/share/create.rs diff --git a/openstack_cli/src/dns/v2/zone/share/delete.rs b/cli-cmd/dns/src/v2/zone/share/delete.rs similarity index 100% rename from openstack_cli/src/dns/v2/zone/share/delete.rs rename to cli-cmd/dns/src/v2/zone/share/delete.rs diff --git a/openstack_cli/src/dns/v2/zone/share/list.rs b/cli-cmd/dns/src/v2/zone/share/list.rs similarity index 100% rename from openstack_cli/src/dns/v2/zone/share/list.rs rename to cli-cmd/dns/src/v2/zone/share/list.rs diff --git a/openstack_cli/src/dns/v2/zone/share/show.rs b/cli-cmd/dns/src/v2/zone/share/show.rs similarity index 100% rename from openstack_cli/src/dns/v2/zone/share/show.rs rename to cli-cmd/dns/src/v2/zone/share/show.rs diff --git a/openstack_cli/src/dns/v2/zone/show.rs b/cli-cmd/dns/src/v2/zone/show.rs similarity index 100% rename from openstack_cli/src/dns/v2/zone/show.rs rename to cli-cmd/dns/src/v2/zone/show.rs diff --git a/openstack_cli/src/dns/v2/zone/task/abandon.rs b/cli-cmd/dns/src/v2/zone/task/abandon.rs similarity index 100% rename from openstack_cli/src/dns/v2/zone/task/abandon.rs rename to cli-cmd/dns/src/v2/zone/task/abandon.rs diff --git a/openstack_cli/src/dns/v2/zone/task/export/create.rs b/cli-cmd/dns/src/v2/zone/task/export/create.rs similarity index 100% rename from openstack_cli/src/dns/v2/zone/task/export/create.rs rename to cli-cmd/dns/src/v2/zone/task/export/create.rs diff --git a/openstack_cli/src/dns/v2/zone/task/export/delete.rs b/cli-cmd/dns/src/v2/zone/task/export/delete.rs similarity index 100% rename from openstack_cli/src/dns/v2/zone/task/export/delete.rs rename to cli-cmd/dns/src/v2/zone/task/export/delete.rs diff --git a/openstack_cli/src/dns/v2/zone/task/export/export/get.rs b/cli-cmd/dns/src/v2/zone/task/export/export/get.rs similarity index 100% rename from openstack_cli/src/dns/v2/zone/task/export/export/get.rs rename to cli-cmd/dns/src/v2/zone/task/export/export/get.rs diff --git a/openstack_cli/src/dns/v2/zone/task/export/list.rs b/cli-cmd/dns/src/v2/zone/task/export/list.rs similarity index 100% rename from openstack_cli/src/dns/v2/zone/task/export/list.rs rename to cli-cmd/dns/src/v2/zone/task/export/list.rs diff --git a/openstack_cli/src/dns/v2/zone/task/export/show.rs b/cli-cmd/dns/src/v2/zone/task/export/show.rs similarity index 100% rename from openstack_cli/src/dns/v2/zone/task/export/show.rs rename to cli-cmd/dns/src/v2/zone/task/export/show.rs diff --git a/openstack_cli/src/dns/v2/zone/task/import/create.rs b/cli-cmd/dns/src/v2/zone/task/import/create.rs similarity index 100% rename from openstack_cli/src/dns/v2/zone/task/import/create.rs rename to cli-cmd/dns/src/v2/zone/task/import/create.rs diff --git a/openstack_cli/src/dns/v2/zone/task/import/delete.rs b/cli-cmd/dns/src/v2/zone/task/import/delete.rs similarity index 100% rename from openstack_cli/src/dns/v2/zone/task/import/delete.rs rename to cli-cmd/dns/src/v2/zone/task/import/delete.rs diff --git a/openstack_cli/src/dns/v2/zone/task/import/list.rs b/cli-cmd/dns/src/v2/zone/task/import/list.rs similarity index 100% rename from openstack_cli/src/dns/v2/zone/task/import/list.rs rename to cli-cmd/dns/src/v2/zone/task/import/list.rs diff --git a/openstack_cli/src/dns/v2/zone/task/import/show.rs b/cli-cmd/dns/src/v2/zone/task/import/show.rs similarity index 100% rename from openstack_cli/src/dns/v2/zone/task/import/show.rs rename to cli-cmd/dns/src/v2/zone/task/import/show.rs diff --git a/openstack_cli/src/dns/v2/zone/task/pool_move.rs b/cli-cmd/dns/src/v2/zone/task/pool_move.rs similarity index 100% rename from openstack_cli/src/dns/v2/zone/task/pool_move.rs rename to cli-cmd/dns/src/v2/zone/task/pool_move.rs diff --git a/openstack_cli/src/dns/v2/zone/task/transfer_accept/create.rs b/cli-cmd/dns/src/v2/zone/task/transfer_accept/create.rs similarity index 100% rename from openstack_cli/src/dns/v2/zone/task/transfer_accept/create.rs rename to cli-cmd/dns/src/v2/zone/task/transfer_accept/create.rs diff --git a/openstack_cli/src/dns/v2/zone/task/transfer_accept/list.rs b/cli-cmd/dns/src/v2/zone/task/transfer_accept/list.rs similarity index 100% rename from openstack_cli/src/dns/v2/zone/task/transfer_accept/list.rs rename to cli-cmd/dns/src/v2/zone/task/transfer_accept/list.rs diff --git a/openstack_cli/src/dns/v2/zone/task/transfer_accept/show.rs b/cli-cmd/dns/src/v2/zone/task/transfer_accept/show.rs similarity index 100% rename from openstack_cli/src/dns/v2/zone/task/transfer_accept/show.rs rename to cli-cmd/dns/src/v2/zone/task/transfer_accept/show.rs diff --git a/openstack_cli/src/dns/v2/zone/task/transfer_request/create.rs b/cli-cmd/dns/src/v2/zone/task/transfer_request/create.rs similarity index 100% rename from openstack_cli/src/dns/v2/zone/task/transfer_request/create.rs rename to cli-cmd/dns/src/v2/zone/task/transfer_request/create.rs diff --git a/openstack_cli/src/dns/v2/zone/task/transfer_request/delete.rs b/cli-cmd/dns/src/v2/zone/task/transfer_request/delete.rs similarity index 100% rename from openstack_cli/src/dns/v2/zone/task/transfer_request/delete.rs rename to cli-cmd/dns/src/v2/zone/task/transfer_request/delete.rs diff --git a/openstack_cli/src/dns/v2/zone/task/transfer_request/list.rs b/cli-cmd/dns/src/v2/zone/task/transfer_request/list.rs similarity index 100% rename from openstack_cli/src/dns/v2/zone/task/transfer_request/list.rs rename to cli-cmd/dns/src/v2/zone/task/transfer_request/list.rs diff --git a/openstack_cli/src/dns/v2/zone/task/transfer_request/set.rs b/cli-cmd/dns/src/v2/zone/task/transfer_request/set.rs similarity index 100% rename from openstack_cli/src/dns/v2/zone/task/transfer_request/set.rs rename to cli-cmd/dns/src/v2/zone/task/transfer_request/set.rs diff --git a/openstack_cli/src/dns/v2/zone/task/transfer_request/show.rs b/cli-cmd/dns/src/v2/zone/task/transfer_request/show.rs similarity index 100% rename from openstack_cli/src/dns/v2/zone/task/transfer_request/show.rs rename to cli-cmd/dns/src/v2/zone/task/transfer_request/show.rs diff --git a/openstack_cli/src/dns/v2/zone/task/xfr.rs b/cli-cmd/dns/src/v2/zone/task/xfr.rs similarity index 100% rename from openstack_cli/src/dns/v2/zone/task/xfr.rs rename to cli-cmd/dns/src/v2/zone/task/xfr.rs diff --git a/cli-cmd/identity/Cargo.toml b/cli-cmd/identity/Cargo.toml new file mode 100644 index 000000000..75c71ba8a --- /dev/null +++ b/cli-cmd/identity/Cargo.toml @@ -0,0 +1,32 @@ +[package] +name = "openstack-cli-identity" +description = "OpenStack CLI Identity commands" +version = "0.1.0" +license.workspace = true +edition.workspace = true +authors.workspace = true +rust-version.workspace = true +homepage.workspace = true +repository.workspace = true + +[dependencies] +base64 = { workspace = true, optional = true } +clap.workspace = true +dialoguer.workspace = true +openstack-cli-core = { version = "0.13", path = "../../cli-core/" } +openstack_sdk = { path="../../openstack_sdk", version = "^0.22", default-features = false, features = ["async", "identity"] } +openstack-sdk-core = { path="../../sdk-core", version = "^0.22" } +openstack_types = { path="../../openstack_types", version = "^0.22" } +eyre.workspace = true +http.workspace = true +serde_json.workspace = true +tracing.workspace = true +webauthn-authenticator-rs = { workspace = true, optional = true } +webauthn-rs-proto = { workspace = true, optional = true } + +[lints] +workspace = true + +[features] +keystone_ng = ["openstack_sdk/keystone_ng", "openstack_types/keystone_ng"] +passkey = ["keystone_ng", "openstack_sdk/passkey", "dep:webauthn-authenticator-rs", "dep:webauthn-rs-proto", "dep:base64"] diff --git a/openstack_cli/src/identity/mod.rs b/cli-cmd/identity/src/lib.rs similarity index 100% rename from openstack_cli/src/identity/mod.rs rename to cli-cmd/identity/src/lib.rs diff --git a/openstack_cli/src/identity/v3.rs b/cli-cmd/identity/src/v3.rs similarity index 97% rename from openstack_cli/src/identity/v3.rs rename to cli-cmd/identity/src/v3.rs index 91094611a..6d7fe0b4b 100644 --- a/openstack_cli/src/identity/v3.rs +++ b/cli-cmd/identity/src/v3.rs @@ -17,7 +17,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; pub mod auth; pub mod credential; @@ -83,9 +83,9 @@ pub enum IdentityCommands { impl IdentityCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/identity/v3/auth.rs b/cli-cmd/identity/src/v3/auth.rs similarity index 96% rename from openstack_cli/src/identity/v3/auth.rs rename to cli-cmd/identity/src/v3/auth.rs index fe7ff433e..df570ae6d 100644 --- a/openstack_cli/src/identity/v3/auth.rs +++ b/cli-cmd/identity/src/v3/auth.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; pub mod catalog; pub mod domain; @@ -85,9 +85,9 @@ pub enum AuthCommands { impl AuthCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/identity/v3/auth/catalog.rs b/cli-cmd/identity/src/v3/auth/catalog.rs similarity index 91% rename from openstack_cli/src/identity/v3/auth/catalog.rs rename to cli-cmd/identity/src/v3/auth/catalog.rs index c60ef5e8c..e913f7bb6 100644 --- a/openstack_cli/src/identity/v3/auth/catalog.rs +++ b/cli-cmd/identity/src/v3/auth/catalog.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; pub mod list; @@ -44,9 +44,9 @@ pub enum CatalogCommands { impl CatalogCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/identity/v3/auth/catalog/list.rs b/cli-cmd/identity/src/v3/auth/catalog/list.rs similarity index 100% rename from openstack_cli/src/identity/v3/auth/catalog/list.rs rename to cli-cmd/identity/src/v3/auth/catalog/list.rs diff --git a/openstack_cli/src/identity/v3/auth/domain.rs b/cli-cmd/identity/src/v3/auth/domain.rs similarity index 90% rename from openstack_cli/src/identity/v3/auth/domain.rs rename to cli-cmd/identity/src/v3/auth/domain.rs index cba026e05..40d4a2732 100644 --- a/openstack_cli/src/identity/v3/auth/domain.rs +++ b/cli-cmd/identity/src/v3/auth/domain.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; pub mod list; @@ -41,9 +41,9 @@ pub enum DomainCommands { impl DomainCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/identity/v3/auth/domain/list.rs b/cli-cmd/identity/src/v3/auth/domain/list.rs similarity index 100% rename from openstack_cli/src/identity/v3/auth/domain/list.rs rename to cli-cmd/identity/src/v3/auth/domain/list.rs diff --git a/openstack_cli/src/identity/v3/auth/os_federation.rs b/cli-cmd/identity/src/v3/auth/os_federation.rs similarity index 92% rename from openstack_cli/src/identity/v3/auth/os_federation.rs rename to cli-cmd/identity/src/v3/auth/os_federation.rs index b35f95cbb..9053d2e02 100644 --- a/openstack_cli/src/identity/v3/auth/os_federation.rs +++ b/cli-cmd/identity/src/v3/auth/os_federation.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; pub mod identity_provider; //mod saml2; @@ -45,9 +45,9 @@ pub enum OsFederationCommands { impl OsFederationCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/identity/v3/auth/os_federation/identity_provider.rs b/cli-cmd/identity/src/v3/auth/os_federation/identity_provider.rs similarity index 91% rename from openstack_cli/src/identity/v3/auth/os_federation/identity_provider.rs rename to cli-cmd/identity/src/v3/auth/os_federation/identity_provider.rs index 0e646ad12..ea793217c 100644 --- a/openstack_cli/src/identity/v3/auth/os_federation/identity_provider.rs +++ b/cli-cmd/identity/src/v3/auth/os_federation/identity_provider.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; pub mod protocol; @@ -39,9 +39,9 @@ pub enum IdentityProviderCommands { impl IdentityProviderCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/identity/v3/auth/os_federation/identity_provider/protocol.rs b/cli-cmd/identity/src/v3/auth/os_federation/identity_provider/protocol.rs similarity index 90% rename from openstack_cli/src/identity/v3/auth/os_federation/identity_provider/protocol.rs rename to cli-cmd/identity/src/v3/auth/os_federation/identity_provider/protocol.rs index a55f8b079..66d80ef4c 100644 --- a/openstack_cli/src/identity/v3/auth/os_federation/identity_provider/protocol.rs +++ b/cli-cmd/identity/src/v3/auth/os_federation/identity_provider/protocol.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; pub mod websso; @@ -39,9 +39,9 @@ pub enum ProtocolCommands { impl ProtocolCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/identity/v3/auth/os_federation/identity_provider/protocol/websso.rs b/cli-cmd/identity/src/v3/auth/os_federation/identity_provider/protocol/websso.rs similarity index 91% rename from openstack_cli/src/identity/v3/auth/os_federation/identity_provider/protocol/websso.rs rename to cli-cmd/identity/src/v3/auth/os_federation/identity_provider/protocol/websso.rs index 9a8e09596..92fd8c479 100644 --- a/openstack_cli/src/identity/v3/auth/os_federation/identity_provider/protocol/websso.rs +++ b/cli-cmd/identity/src/v3/auth/os_federation/identity_provider/protocol/websso.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; pub mod create; pub mod get; @@ -41,9 +41,9 @@ pub enum WebssoCommands { impl WebssoCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/identity/v3/auth/os_federation/identity_provider/protocol/websso/create.rs b/cli-cmd/identity/src/v3/auth/os_federation/identity_provider/protocol/websso/create.rs similarity index 100% rename from openstack_cli/src/identity/v3/auth/os_federation/identity_provider/protocol/websso/create.rs rename to cli-cmd/identity/src/v3/auth/os_federation/identity_provider/protocol/websso/create.rs diff --git a/openstack_cli/src/identity/v3/auth/os_federation/identity_provider/protocol/websso/get.rs b/cli-cmd/identity/src/v3/auth/os_federation/identity_provider/protocol/websso/get.rs similarity index 100% rename from openstack_cli/src/identity/v3/auth/os_federation/identity_provider/protocol/websso/get.rs rename to cli-cmd/identity/src/v3/auth/os_federation/identity_provider/protocol/websso/get.rs diff --git a/openstack_cli/src/identity/v3/auth/os_federation/saml2.rs b/cli-cmd/identity/src/v3/auth/os_federation/saml2.rs similarity index 92% rename from openstack_cli/src/identity/v3/auth/os_federation/saml2.rs rename to cli-cmd/identity/src/v3/auth/os_federation/saml2.rs index 6771fa499..8a0dd3ddb 100644 --- a/openstack_cli/src/identity/v3/auth/os_federation/saml2.rs +++ b/cli-cmd/identity/src/v3/auth/os_federation/saml2.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; pub mod create; pub mod ecp; @@ -43,9 +43,9 @@ pub enum Saml2Commands { impl Saml2Command { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/identity/v3/auth/os_federation/saml2/create.rs b/cli-cmd/identity/src/v3/auth/os_federation/saml2/create.rs similarity index 100% rename from openstack_cli/src/identity/v3/auth/os_federation/saml2/create.rs rename to cli-cmd/identity/src/v3/auth/os_federation/saml2/create.rs diff --git a/openstack_cli/src/identity/v3/auth/os_federation/saml2/ecp.rs b/cli-cmd/identity/src/v3/auth/os_federation/saml2/ecp.rs similarity index 91% rename from openstack_cli/src/identity/v3/auth/os_federation/saml2/ecp.rs rename to cli-cmd/identity/src/v3/auth/os_federation/saml2/ecp.rs index 9f1594d2c..007168cbb 100644 --- a/openstack_cli/src/identity/v3/auth/os_federation/saml2/ecp.rs +++ b/cli-cmd/identity/src/v3/auth/os_federation/saml2/ecp.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; pub mod create; pub mod get; @@ -41,9 +41,9 @@ pub enum EcpCommands { impl EcpCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/identity/v3/auth/os_federation/saml2/ecp/create.rs b/cli-cmd/identity/src/v3/auth/os_federation/saml2/ecp/create.rs similarity index 100% rename from openstack_cli/src/identity/v3/auth/os_federation/saml2/ecp/create.rs rename to cli-cmd/identity/src/v3/auth/os_federation/saml2/ecp/create.rs diff --git a/openstack_cli/src/identity/v3/auth/os_federation/saml2/ecp/get.rs b/cli-cmd/identity/src/v3/auth/os_federation/saml2/ecp/get.rs similarity index 100% rename from openstack_cli/src/identity/v3/auth/os_federation/saml2/ecp/get.rs rename to cli-cmd/identity/src/v3/auth/os_federation/saml2/ecp/get.rs diff --git a/openstack_cli/src/identity/v3/auth/os_federation/saml2/get.rs b/cli-cmd/identity/src/v3/auth/os_federation/saml2/get.rs similarity index 100% rename from openstack_cli/src/identity/v3/auth/os_federation/saml2/get.rs rename to cli-cmd/identity/src/v3/auth/os_federation/saml2/get.rs diff --git a/openstack_cli/src/identity/v3/auth/os_federation/websso.rs b/cli-cmd/identity/src/v3/auth/os_federation/websso.rs similarity index 91% rename from openstack_cli/src/identity/v3/auth/os_federation/websso.rs rename to cli-cmd/identity/src/v3/auth/os_federation/websso.rs index b1739a738..0f5b0e570 100644 --- a/openstack_cli/src/identity/v3/auth/os_federation/websso.rs +++ b/cli-cmd/identity/src/v3/auth/os_federation/websso.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; pub mod create; pub mod show; @@ -41,9 +41,9 @@ pub enum WebssoCommands { impl WebssoCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/identity/v3/auth/os_federation/websso/create.rs b/cli-cmd/identity/src/v3/auth/os_federation/websso/create.rs similarity index 100% rename from openstack_cli/src/identity/v3/auth/os_federation/websso/create.rs rename to cli-cmd/identity/src/v3/auth/os_federation/websso/create.rs diff --git a/openstack_cli/src/identity/v3/auth/os_federation/websso/show.rs b/cli-cmd/identity/src/v3/auth/os_federation/websso/show.rs similarity index 100% rename from openstack_cli/src/identity/v3/auth/os_federation/websso/show.rs rename to cli-cmd/identity/src/v3/auth/os_federation/websso/show.rs diff --git a/openstack_cli/src/identity/v3/auth/project.rs b/cli-cmd/identity/src/v3/auth/project.rs similarity index 90% rename from openstack_cli/src/identity/v3/auth/project.rs rename to cli-cmd/identity/src/v3/auth/project.rs index 57a48f5dd..d54905298 100644 --- a/openstack_cli/src/identity/v3/auth/project.rs +++ b/cli-cmd/identity/src/v3/auth/project.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; pub mod list; @@ -41,9 +41,9 @@ pub enum ProjectCommands { impl ProjectCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/identity/v3/auth/project/list.rs b/cli-cmd/identity/src/v3/auth/project/list.rs similarity index 100% rename from openstack_cli/src/identity/v3/auth/project/list.rs rename to cli-cmd/identity/src/v3/auth/project/list.rs diff --git a/openstack_cli/src/identity/v3/auth/system.rs b/cli-cmd/identity/src/v3/auth/system.rs similarity index 90% rename from openstack_cli/src/identity/v3/auth/system.rs rename to cli-cmd/identity/src/v3/auth/system.rs index 7b89a9912..f201b62a3 100644 --- a/openstack_cli/src/identity/v3/auth/system.rs +++ b/cli-cmd/identity/src/v3/auth/system.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; pub mod list; @@ -41,9 +41,9 @@ pub enum SystemCommands { impl SystemCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/identity/v3/auth/system/list.rs b/cli-cmd/identity/src/v3/auth/system/list.rs similarity index 100% rename from openstack_cli/src/identity/v3/auth/system/list.rs rename to cli-cmd/identity/src/v3/auth/system/list.rs diff --git a/openstack_cli/src/identity/v3/auth/token.rs b/cli-cmd/identity/src/v3/auth/token.rs similarity index 92% rename from openstack_cli/src/identity/v3/auth/token.rs rename to cli-cmd/identity/src/v3/auth/token.rs index d083ee4ad..ff58d4329 100644 --- a/openstack_cli/src/identity/v3/auth/token.rs +++ b/cli-cmd/identity/src/v3/auth/token.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; //mod create; pub mod delete; @@ -45,9 +45,9 @@ pub enum TokenCommands { impl TokenCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/identity/v3/auth/token/create.rs b/cli-cmd/identity/src/v3/auth/token/create.rs similarity index 100% rename from openstack_cli/src/identity/v3/auth/token/create.rs rename to cli-cmd/identity/src/v3/auth/token/create.rs diff --git a/openstack_cli/src/identity/v3/auth/token/delete.rs b/cli-cmd/identity/src/v3/auth/token/delete.rs similarity index 100% rename from openstack_cli/src/identity/v3/auth/token/delete.rs rename to cli-cmd/identity/src/v3/auth/token/delete.rs diff --git a/openstack_cli/src/identity/v3/auth/token/get.rs b/cli-cmd/identity/src/v3/auth/token/get.rs similarity index 100% rename from openstack_cli/src/identity/v3/auth/token/get.rs rename to cli-cmd/identity/src/v3/auth/token/get.rs diff --git a/openstack_cli/src/identity/v3/auth/token/os_pki/revoked.rs b/cli-cmd/identity/src/v3/auth/token/os_pki/revoked.rs similarity index 90% rename from openstack_cli/src/identity/v3/auth/token/os_pki/revoked.rs rename to cli-cmd/identity/src/v3/auth/token/os_pki/revoked.rs index 858f0b382..04b56dd2d 100644 --- a/openstack_cli/src/identity/v3/auth/token/os_pki/revoked.rs +++ b/cli-cmd/identity/src/v3/auth/token/os_pki/revoked.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; mod get; @@ -40,9 +40,9 @@ pub enum RevokedCommands { impl RevokedCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/identity/v3/auth/token/os_pki/revoked/get.rs b/cli-cmd/identity/src/v3/auth/token/os_pki/revoked/get.rs similarity index 100% rename from openstack_cli/src/identity/v3/auth/token/os_pki/revoked/get.rs rename to cli-cmd/identity/src/v3/auth/token/os_pki/revoked/get.rs diff --git a/openstack_cli/src/identity/v3/credential.rs b/cli-cmd/identity/src/v3/credential.rs similarity index 94% rename from openstack_cli/src/identity/v3/credential.rs rename to cli-cmd/identity/src/v3/credential.rs index 9b6fb0fcf..1370765e8 100644 --- a/openstack_cli/src/identity/v3/credential.rs +++ b/cli-cmd/identity/src/v3/credential.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; pub mod create; pub mod delete; @@ -54,9 +54,9 @@ pub enum CredentialCommands { impl CredentialCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/identity/v3/credential/create.rs b/cli-cmd/identity/src/v3/credential/create.rs similarity index 100% rename from openstack_cli/src/identity/v3/credential/create.rs rename to cli-cmd/identity/src/v3/credential/create.rs diff --git a/openstack_cli/src/identity/v3/credential/delete.rs b/cli-cmd/identity/src/v3/credential/delete.rs similarity index 100% rename from openstack_cli/src/identity/v3/credential/delete.rs rename to cli-cmd/identity/src/v3/credential/delete.rs diff --git a/openstack_cli/src/identity/v3/credential/list.rs b/cli-cmd/identity/src/v3/credential/list.rs similarity index 100% rename from openstack_cli/src/identity/v3/credential/list.rs rename to cli-cmd/identity/src/v3/credential/list.rs diff --git a/openstack_cli/src/identity/v3/credential/set.rs b/cli-cmd/identity/src/v3/credential/set.rs similarity index 100% rename from openstack_cli/src/identity/v3/credential/set.rs rename to cli-cmd/identity/src/v3/credential/set.rs diff --git a/openstack_cli/src/identity/v3/credential/show.rs b/cli-cmd/identity/src/v3/credential/show.rs similarity index 100% rename from openstack_cli/src/identity/v3/credential/show.rs rename to cli-cmd/identity/src/v3/credential/show.rs diff --git a/openstack_cli/src/identity/v3/domain.rs b/cli-cmd/identity/src/v3/domain.rs similarity index 95% rename from openstack_cli/src/identity/v3/domain.rs rename to cli-cmd/identity/src/v3/domain.rs index 07a0623a4..7d0915fb5 100644 --- a/openstack_cli/src/identity/v3/domain.rs +++ b/cli-cmd/identity/src/v3/domain.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; pub mod config; pub mod create; @@ -70,9 +70,9 @@ pub enum DomainCommands { impl DomainCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/identity/v3/domain/config.rs b/cli-cmd/identity/src/v3/domain/config.rs similarity index 96% rename from openstack_cli/src/identity/v3/domain/config.rs rename to cli-cmd/identity/src/v3/domain/config.rs index df2c8f5aa..17c5ed13d 100644 --- a/openstack_cli/src/identity/v3/domain/config.rs +++ b/cli-cmd/identity/src/v3/domain/config.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; pub mod default; pub mod delete_all; @@ -75,9 +75,9 @@ pub enum ConfigCommands { impl ConfigCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/identity/v3/domain/config/default.rs b/cli-cmd/identity/src/v3/domain/config/default.rs similarity index 100% rename from openstack_cli/src/identity/v3/domain/config/default.rs rename to cli-cmd/identity/src/v3/domain/config/default.rs diff --git a/openstack_cli/src/identity/v3/domain/config/delete_all.rs b/cli-cmd/identity/src/v3/domain/config/delete_all.rs similarity index 100% rename from openstack_cli/src/identity/v3/domain/config/delete_all.rs rename to cli-cmd/identity/src/v3/domain/config/delete_all.rs diff --git a/openstack_cli/src/identity/v3/domain/config/group.rs b/cli-cmd/identity/src/v3/domain/config/group.rs similarity index 93% rename from openstack_cli/src/identity/v3/domain/config/group.rs rename to cli-cmd/identity/src/v3/domain/config/group.rs index b1b60e9fc..626e7eed8 100644 --- a/openstack_cli/src/identity/v3/domain/config/group.rs +++ b/cli-cmd/identity/src/v3/domain/config/group.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; pub mod default; pub mod delete; @@ -50,9 +50,9 @@ pub enum GroupCommands { impl GroupCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/identity/v3/domain/config/group/default.rs b/cli-cmd/identity/src/v3/domain/config/group/default.rs similarity index 100% rename from openstack_cli/src/identity/v3/domain/config/group/default.rs rename to cli-cmd/identity/src/v3/domain/config/group/default.rs diff --git a/openstack_cli/src/identity/v3/domain/config/group/delete.rs b/cli-cmd/identity/src/v3/domain/config/group/delete.rs similarity index 100% rename from openstack_cli/src/identity/v3/domain/config/group/delete.rs rename to cli-cmd/identity/src/v3/domain/config/group/delete.rs diff --git a/openstack_cli/src/identity/v3/domain/config/group/option.rs b/cli-cmd/identity/src/v3/domain/config/group/option.rs similarity index 93% rename from openstack_cli/src/identity/v3/domain/config/group/option.rs rename to cli-cmd/identity/src/v3/domain/config/group/option.rs index 093f75732..e81efbdf6 100644 --- a/openstack_cli/src/identity/v3/domain/config/group/option.rs +++ b/cli-cmd/identity/src/v3/domain/config/group/option.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; pub mod default; pub mod delete; @@ -47,9 +47,9 @@ pub enum OptionCommands { impl OptionCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/identity/v3/domain/config/group/option/default.rs b/cli-cmd/identity/src/v3/domain/config/group/option/default.rs similarity index 100% rename from openstack_cli/src/identity/v3/domain/config/group/option/default.rs rename to cli-cmd/identity/src/v3/domain/config/group/option/default.rs diff --git a/openstack_cli/src/identity/v3/domain/config/group/option/delete.rs b/cli-cmd/identity/src/v3/domain/config/group/option/delete.rs similarity index 100% rename from openstack_cli/src/identity/v3/domain/config/group/option/delete.rs rename to cli-cmd/identity/src/v3/domain/config/group/option/delete.rs diff --git a/openstack_cli/src/identity/v3/domain/config/group/option/set.rs b/cli-cmd/identity/src/v3/domain/config/group/option/set.rs similarity index 100% rename from openstack_cli/src/identity/v3/domain/config/group/option/set.rs rename to cli-cmd/identity/src/v3/domain/config/group/option/set.rs diff --git a/openstack_cli/src/identity/v3/domain/config/group/option/show.rs b/cli-cmd/identity/src/v3/domain/config/group/option/show.rs similarity index 100% rename from openstack_cli/src/identity/v3/domain/config/group/option/show.rs rename to cli-cmd/identity/src/v3/domain/config/group/option/show.rs diff --git a/openstack_cli/src/identity/v3/domain/config/group/set.rs b/cli-cmd/identity/src/v3/domain/config/group/set.rs similarity index 100% rename from openstack_cli/src/identity/v3/domain/config/group/set.rs rename to cli-cmd/identity/src/v3/domain/config/group/set.rs diff --git a/openstack_cli/src/identity/v3/domain/config/group/show.rs b/cli-cmd/identity/src/v3/domain/config/group/show.rs similarity index 100% rename from openstack_cli/src/identity/v3/domain/config/group/show.rs rename to cli-cmd/identity/src/v3/domain/config/group/show.rs diff --git a/openstack_cli/src/identity/v3/domain/config/list.rs b/cli-cmd/identity/src/v3/domain/config/list.rs similarity index 100% rename from openstack_cli/src/identity/v3/domain/config/list.rs rename to cli-cmd/identity/src/v3/domain/config/list.rs diff --git a/openstack_cli/src/identity/v3/domain/config/replace.rs b/cli-cmd/identity/src/v3/domain/config/replace.rs similarity index 100% rename from openstack_cli/src/identity/v3/domain/config/replace.rs rename to cli-cmd/identity/src/v3/domain/config/replace.rs diff --git a/openstack_cli/src/identity/v3/domain/config/set.rs b/cli-cmd/identity/src/v3/domain/config/set.rs similarity index 100% rename from openstack_cli/src/identity/v3/domain/config/set.rs rename to cli-cmd/identity/src/v3/domain/config/set.rs diff --git a/openstack_cli/src/identity/v3/domain/create.rs b/cli-cmd/identity/src/v3/domain/create.rs similarity index 100% rename from openstack_cli/src/identity/v3/domain/create.rs rename to cli-cmd/identity/src/v3/domain/create.rs diff --git a/openstack_cli/src/identity/v3/domain/delete.rs b/cli-cmd/identity/src/v3/domain/delete.rs similarity index 100% rename from openstack_cli/src/identity/v3/domain/delete.rs rename to cli-cmd/identity/src/v3/domain/delete.rs diff --git a/openstack_cli/src/identity/v3/domain/group.rs b/cli-cmd/identity/src/v3/domain/group.rs similarity index 90% rename from openstack_cli/src/identity/v3/domain/group.rs rename to cli-cmd/identity/src/v3/domain/group.rs index 3ba798020..47f14f0b5 100644 --- a/openstack_cli/src/identity/v3/domain/group.rs +++ b/cli-cmd/identity/src/v3/domain/group.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; pub mod role; @@ -39,9 +39,9 @@ pub enum GroupCommands { impl GroupCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/identity/v3/domain/group/role.rs b/cli-cmd/identity/src/v3/domain/group/role.rs similarity index 95% rename from openstack_cli/src/identity/v3/domain/group/role.rs rename to cli-cmd/identity/src/v3/domain/group/role.rs index 29b79d598..4e68dd513 100644 --- a/openstack_cli/src/identity/v3/domain/group/role.rs +++ b/cli-cmd/identity/src/v3/domain/group/role.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; pub mod delete; pub mod list; @@ -58,9 +58,9 @@ pub enum RoleCommands { impl RoleCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/identity/v3/domain/group/role/delete.rs b/cli-cmd/identity/src/v3/domain/group/role/delete.rs similarity index 100% rename from openstack_cli/src/identity/v3/domain/group/role/delete.rs rename to cli-cmd/identity/src/v3/domain/group/role/delete.rs diff --git a/openstack_cli/src/identity/v3/domain/group/role/list.rs b/cli-cmd/identity/src/v3/domain/group/role/list.rs similarity index 100% rename from openstack_cli/src/identity/v3/domain/group/role/list.rs rename to cli-cmd/identity/src/v3/domain/group/role/list.rs diff --git a/openstack_cli/src/identity/v3/domain/group/role/set.rs b/cli-cmd/identity/src/v3/domain/group/role/set.rs similarity index 100% rename from openstack_cli/src/identity/v3/domain/group/role/set.rs rename to cli-cmd/identity/src/v3/domain/group/role/set.rs diff --git a/openstack_cli/src/identity/v3/domain/group/role/show.rs b/cli-cmd/identity/src/v3/domain/group/role/show.rs similarity index 100% rename from openstack_cli/src/identity/v3/domain/group/role/show.rs rename to cli-cmd/identity/src/v3/domain/group/role/show.rs diff --git a/openstack_cli/src/identity/v3/domain/list.rs b/cli-cmd/identity/src/v3/domain/list.rs similarity index 100% rename from openstack_cli/src/identity/v3/domain/list.rs rename to cli-cmd/identity/src/v3/domain/list.rs diff --git a/openstack_cli/src/identity/v3/domain/set.rs b/cli-cmd/identity/src/v3/domain/set.rs similarity index 100% rename from openstack_cli/src/identity/v3/domain/set.rs rename to cli-cmd/identity/src/v3/domain/set.rs diff --git a/openstack_cli/src/identity/v3/domain/show.rs b/cli-cmd/identity/src/v3/domain/show.rs similarity index 100% rename from openstack_cli/src/identity/v3/domain/show.rs rename to cli-cmd/identity/src/v3/domain/show.rs diff --git a/openstack_cli/src/identity/v3/domain/user.rs b/cli-cmd/identity/src/v3/domain/user.rs similarity index 90% rename from openstack_cli/src/identity/v3/domain/user.rs rename to cli-cmd/identity/src/v3/domain/user.rs index 98f1a3e1b..e84e4cc37 100644 --- a/openstack_cli/src/identity/v3/domain/user.rs +++ b/cli-cmd/identity/src/v3/domain/user.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; pub mod role; @@ -39,9 +39,9 @@ pub enum UserCommands { impl UserCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/identity/v3/domain/user/role.rs b/cli-cmd/identity/src/v3/domain/user/role.rs similarity index 95% rename from openstack_cli/src/identity/v3/domain/user/role.rs rename to cli-cmd/identity/src/v3/domain/user/role.rs index 72e929b9e..00b27fd06 100644 --- a/openstack_cli/src/identity/v3/domain/user/role.rs +++ b/cli-cmd/identity/src/v3/domain/user/role.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; pub mod delete; pub mod list; @@ -58,9 +58,9 @@ pub enum RoleCommands { impl RoleCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/identity/v3/domain/user/role/delete.rs b/cli-cmd/identity/src/v3/domain/user/role/delete.rs similarity index 100% rename from openstack_cli/src/identity/v3/domain/user/role/delete.rs rename to cli-cmd/identity/src/v3/domain/user/role/delete.rs diff --git a/openstack_cli/src/identity/v3/domain/user/role/list.rs b/cli-cmd/identity/src/v3/domain/user/role/list.rs similarity index 100% rename from openstack_cli/src/identity/v3/domain/user/role/list.rs rename to cli-cmd/identity/src/v3/domain/user/role/list.rs diff --git a/openstack_cli/src/identity/v3/domain/user/role/set.rs b/cli-cmd/identity/src/v3/domain/user/role/set.rs similarity index 100% rename from openstack_cli/src/identity/v3/domain/user/role/set.rs rename to cli-cmd/identity/src/v3/domain/user/role/set.rs diff --git a/openstack_cli/src/identity/v3/domain/user/role/show.rs b/cli-cmd/identity/src/v3/domain/user/role/show.rs similarity index 100% rename from openstack_cli/src/identity/v3/domain/user/role/show.rs rename to cli-cmd/identity/src/v3/domain/user/role/show.rs diff --git a/openstack_cli/src/identity/v3/ec2token/create.rs b/cli-cmd/identity/src/v3/ec2token/create.rs similarity index 100% rename from openstack_cli/src/identity/v3/ec2token/create.rs rename to cli-cmd/identity/src/v3/ec2token/create.rs diff --git a/openstack_cli/src/identity/v3/ec2token/get.rs b/cli-cmd/identity/src/v3/ec2token/get.rs similarity index 100% rename from openstack_cli/src/identity/v3/ec2token/get.rs rename to cli-cmd/identity/src/v3/ec2token/get.rs diff --git a/openstack_cli/src/identity/v3/endpoint.rs b/cli-cmd/identity/src/v3/endpoint.rs similarity index 93% rename from openstack_cli/src/identity/v3/endpoint.rs rename to cli-cmd/identity/src/v3/endpoint.rs index a3a9413a4..a0da85646 100644 --- a/openstack_cli/src/identity/v3/endpoint.rs +++ b/cli-cmd/identity/src/v3/endpoint.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; pub mod create; pub mod delete; @@ -46,9 +46,9 @@ pub enum EndpointCommands { impl EndpointCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/identity/v3/endpoint/create.rs b/cli-cmd/identity/src/v3/endpoint/create.rs similarity index 100% rename from openstack_cli/src/identity/v3/endpoint/create.rs rename to cli-cmd/identity/src/v3/endpoint/create.rs diff --git a/openstack_cli/src/identity/v3/endpoint/delete.rs b/cli-cmd/identity/src/v3/endpoint/delete.rs similarity index 100% rename from openstack_cli/src/identity/v3/endpoint/delete.rs rename to cli-cmd/identity/src/v3/endpoint/delete.rs diff --git a/openstack_cli/src/identity/v3/endpoint/list.rs b/cli-cmd/identity/src/v3/endpoint/list.rs similarity index 100% rename from openstack_cli/src/identity/v3/endpoint/list.rs rename to cli-cmd/identity/src/v3/endpoint/list.rs diff --git a/openstack_cli/src/identity/v3/endpoint/os_endpoint_policy/policy/get.rs b/cli-cmd/identity/src/v3/endpoint/os_endpoint_policy/policy/get.rs similarity index 100% rename from openstack_cli/src/identity/v3/endpoint/os_endpoint_policy/policy/get.rs rename to cli-cmd/identity/src/v3/endpoint/os_endpoint_policy/policy/get.rs diff --git a/openstack_cli/src/identity/v3/endpoint/set.rs b/cli-cmd/identity/src/v3/endpoint/set.rs similarity index 100% rename from openstack_cli/src/identity/v3/endpoint/set.rs rename to cli-cmd/identity/src/v3/endpoint/set.rs diff --git a/openstack_cli/src/identity/v3/endpoint/show.rs b/cli-cmd/identity/src/v3/endpoint/show.rs similarity index 100% rename from openstack_cli/src/identity/v3/endpoint/show.rs rename to cli-cmd/identity/src/v3/endpoint/show.rs diff --git a/openstack_cli/src/identity/v3/group.rs b/cli-cmd/identity/src/v3/group.rs similarity index 95% rename from openstack_cli/src/identity/v3/group.rs rename to cli-cmd/identity/src/v3/group.rs index 45e3d5fa9..28bfb7d81 100644 --- a/openstack_cli/src/identity/v3/group.rs +++ b/cli-cmd/identity/src/v3/group.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; pub mod create; pub mod delete; @@ -64,9 +64,9 @@ pub enum GroupCommands { impl GroupCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/identity/v3/group/create.rs b/cli-cmd/identity/src/v3/group/create.rs similarity index 100% rename from openstack_cli/src/identity/v3/group/create.rs rename to cli-cmd/identity/src/v3/group/create.rs diff --git a/openstack_cli/src/identity/v3/group/delete.rs b/cli-cmd/identity/src/v3/group/delete.rs similarity index 100% rename from openstack_cli/src/identity/v3/group/delete.rs rename to cli-cmd/identity/src/v3/group/delete.rs diff --git a/openstack_cli/src/identity/v3/group/list.rs b/cli-cmd/identity/src/v3/group/list.rs similarity index 100% rename from openstack_cli/src/identity/v3/group/list.rs rename to cli-cmd/identity/src/v3/group/list.rs diff --git a/openstack_cli/src/identity/v3/group/set.rs b/cli-cmd/identity/src/v3/group/set.rs similarity index 100% rename from openstack_cli/src/identity/v3/group/set.rs rename to cli-cmd/identity/src/v3/group/set.rs diff --git a/openstack_cli/src/identity/v3/group/show.rs b/cli-cmd/identity/src/v3/group/show.rs similarity index 100% rename from openstack_cli/src/identity/v3/group/show.rs rename to cli-cmd/identity/src/v3/group/show.rs diff --git a/openstack_cli/src/identity/v3/group/user.rs b/cli-cmd/identity/src/v3/group/user.rs similarity index 92% rename from openstack_cli/src/identity/v3/group/user.rs rename to cli-cmd/identity/src/v3/group/user.rs index c2dc414f1..c4f2e2274 100644 --- a/openstack_cli/src/identity/v3/group/user.rs +++ b/cli-cmd/identity/src/v3/group/user.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; pub mod delete; pub mod list; @@ -47,9 +47,9 @@ pub enum UserCommands { impl UserCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/identity/v3/group/user/delete.rs b/cli-cmd/identity/src/v3/group/user/delete.rs similarity index 100% rename from openstack_cli/src/identity/v3/group/user/delete.rs rename to cli-cmd/identity/src/v3/group/user/delete.rs diff --git a/openstack_cli/src/identity/v3/group/user/list.rs b/cli-cmd/identity/src/v3/group/user/list.rs similarity index 100% rename from openstack_cli/src/identity/v3/group/user/list.rs rename to cli-cmd/identity/src/v3/group/user/list.rs diff --git a/openstack_cli/src/identity/v3/group/user/set.rs b/cli-cmd/identity/src/v3/group/user/set.rs similarity index 100% rename from openstack_cli/src/identity/v3/group/user/set.rs rename to cli-cmd/identity/src/v3/group/user/set.rs diff --git a/openstack_cli/src/identity/v3/group/user/show.rs b/cli-cmd/identity/src/v3/group/user/show.rs similarity index 100% rename from openstack_cli/src/identity/v3/group/user/show.rs rename to cli-cmd/identity/src/v3/group/user/show.rs diff --git a/openstack_cli/src/identity/v3/limit.rs b/cli-cmd/identity/src/v3/limit.rs similarity index 94% rename from openstack_cli/src/identity/v3/limit.rs rename to cli-cmd/identity/src/v3/limit.rs index 8634b43e6..3b91f5947 100644 --- a/openstack_cli/src/identity/v3/limit.rs +++ b/cli-cmd/identity/src/v3/limit.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; pub mod create; pub mod delete; @@ -57,9 +57,9 @@ pub enum LimitCommands { impl LimitCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/identity/v3/limit/create.rs b/cli-cmd/identity/src/v3/limit/create.rs similarity index 100% rename from openstack_cli/src/identity/v3/limit/create.rs rename to cli-cmd/identity/src/v3/limit/create.rs diff --git a/openstack_cli/src/identity/v3/limit/delete.rs b/cli-cmd/identity/src/v3/limit/delete.rs similarity index 100% rename from openstack_cli/src/identity/v3/limit/delete.rs rename to cli-cmd/identity/src/v3/limit/delete.rs diff --git a/openstack_cli/src/identity/v3/limit/list.rs b/cli-cmd/identity/src/v3/limit/list.rs similarity index 100% rename from openstack_cli/src/identity/v3/limit/list.rs rename to cli-cmd/identity/src/v3/limit/list.rs diff --git a/openstack_cli/src/identity/v3/limit/model/get.rs b/cli-cmd/identity/src/v3/limit/model/get.rs similarity index 100% rename from openstack_cli/src/identity/v3/limit/model/get.rs rename to cli-cmd/identity/src/v3/limit/model/get.rs diff --git a/openstack_cli/src/identity/v3/limit/set.rs b/cli-cmd/identity/src/v3/limit/set.rs similarity index 100% rename from openstack_cli/src/identity/v3/limit/set.rs rename to cli-cmd/identity/src/v3/limit/set.rs diff --git a/openstack_cli/src/identity/v3/limit/show.rs b/cli-cmd/identity/src/v3/limit/show.rs similarity index 100% rename from openstack_cli/src/identity/v3/limit/show.rs rename to cli-cmd/identity/src/v3/limit/show.rs diff --git a/openstack_cli/src/identity/v3/os_ep_filter.rs b/cli-cmd/identity/src/v3/os_ep_filter.rs similarity index 95% rename from openstack_cli/src/identity/v3/os_ep_filter.rs rename to cli-cmd/identity/src/v3/os_ep_filter.rs index 530cf8aa9..953383bbb 100644 --- a/openstack_cli/src/identity/v3/os_ep_filter.rs +++ b/cli-cmd/identity/src/v3/os_ep_filter.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; pub mod endpoint; pub mod endpoint_group; @@ -53,9 +53,9 @@ pub enum EndpointFilterCommands { impl EndpointFilterCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/identity/v3/os_ep_filter/endpoint.rs b/cli-cmd/identity/src/v3/os_ep_filter/endpoint.rs similarity index 90% rename from openstack_cli/src/identity/v3/os_ep_filter/endpoint.rs rename to cli-cmd/identity/src/v3/os_ep_filter/endpoint.rs index 7fd0fb3b3..dcca70415 100644 --- a/openstack_cli/src/identity/v3/os_ep_filter/endpoint.rs +++ b/cli-cmd/identity/src/v3/os_ep_filter/endpoint.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; pub mod project; @@ -38,9 +38,9 @@ pub enum EndpointCommands { impl EndpointCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/identity/v3/os_ep_filter/endpoint/project.rs b/cli-cmd/identity/src/v3/os_ep_filter/endpoint/project.rs similarity index 90% rename from openstack_cli/src/identity/v3/os_ep_filter/endpoint/project.rs rename to cli-cmd/identity/src/v3/os_ep_filter/endpoint/project.rs index 74d085218..cbc13017f 100644 --- a/openstack_cli/src/identity/v3/os_ep_filter/endpoint/project.rs +++ b/cli-cmd/identity/src/v3/os_ep_filter/endpoint/project.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; mod get; @@ -39,9 +39,9 @@ pub enum ProjectCommands { impl ProjectCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/identity/v3/os_ep_filter/endpoint/project/get.rs b/cli-cmd/identity/src/v3/os_ep_filter/endpoint/project/get.rs similarity index 100% rename from openstack_cli/src/identity/v3/os_ep_filter/endpoint/project/get.rs rename to cli-cmd/identity/src/v3/os_ep_filter/endpoint/project/get.rs diff --git a/openstack_cli/src/identity/v3/os_ep_filter/endpoint_group.rs b/cli-cmd/identity/src/v3/os_ep_filter/endpoint_group.rs similarity index 94% rename from openstack_cli/src/identity/v3/os_ep_filter/endpoint_group.rs rename to cli-cmd/identity/src/v3/os_ep_filter/endpoint_group.rs index 6bdb96979..e4fd29efc 100644 --- a/openstack_cli/src/identity/v3/os_ep_filter/endpoint_group.rs +++ b/cli-cmd/identity/src/v3/os_ep_filter/endpoint_group.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; pub mod create; pub mod delete; @@ -50,9 +50,9 @@ pub enum EndpointGroupCommands { impl EndpointGroupCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/identity/v3/os_ep_filter/endpoint_group/create.rs b/cli-cmd/identity/src/v3/os_ep_filter/endpoint_group/create.rs similarity index 100% rename from openstack_cli/src/identity/v3/os_ep_filter/endpoint_group/create.rs rename to cli-cmd/identity/src/v3/os_ep_filter/endpoint_group/create.rs diff --git a/openstack_cli/src/identity/v3/os_ep_filter/endpoint_group/delete.rs b/cli-cmd/identity/src/v3/os_ep_filter/endpoint_group/delete.rs similarity index 100% rename from openstack_cli/src/identity/v3/os_ep_filter/endpoint_group/delete.rs rename to cli-cmd/identity/src/v3/os_ep_filter/endpoint_group/delete.rs diff --git a/openstack_cli/src/identity/v3/os_ep_filter/endpoint_group/endpoint.rs b/cli-cmd/identity/src/v3/os_ep_filter/endpoint_group/endpoint.rs similarity index 90% rename from openstack_cli/src/identity/v3/os_ep_filter/endpoint_group/endpoint.rs rename to cli-cmd/identity/src/v3/os_ep_filter/endpoint_group/endpoint.rs index 3a4d6e7c0..96fe3e602 100644 --- a/openstack_cli/src/identity/v3/os_ep_filter/endpoint_group/endpoint.rs +++ b/cli-cmd/identity/src/v3/os_ep_filter/endpoint_group/endpoint.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; mod get; @@ -39,9 +39,9 @@ pub enum EndpointCommands { impl EndpointCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/identity/v3/os_ep_filter/endpoint_group/endpoint/get.rs b/cli-cmd/identity/src/v3/os_ep_filter/endpoint_group/endpoint/get.rs similarity index 100% rename from openstack_cli/src/identity/v3/os_ep_filter/endpoint_group/endpoint/get.rs rename to cli-cmd/identity/src/v3/os_ep_filter/endpoint_group/endpoint/get.rs diff --git a/openstack_cli/src/identity/v3/os_ep_filter/endpoint_group/list.rs b/cli-cmd/identity/src/v3/os_ep_filter/endpoint_group/list.rs similarity index 100% rename from openstack_cli/src/identity/v3/os_ep_filter/endpoint_group/list.rs rename to cli-cmd/identity/src/v3/os_ep_filter/endpoint_group/list.rs diff --git a/openstack_cli/src/identity/v3/os_ep_filter/endpoint_group/project.rs b/cli-cmd/identity/src/v3/os_ep_filter/endpoint_group/project.rs similarity index 92% rename from openstack_cli/src/identity/v3/os_ep_filter/endpoint_group/project.rs rename to cli-cmd/identity/src/v3/os_ep_filter/endpoint_group/project.rs index 599f9aeb3..460096538 100644 --- a/openstack_cli/src/identity/v3/os_ep_filter/endpoint_group/project.rs +++ b/cli-cmd/identity/src/v3/os_ep_filter/endpoint_group/project.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; mod delete; mod list; @@ -44,9 +44,9 @@ pub enum ProjectCommands { impl ProjectCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/identity/v3/os_ep_filter/endpoint_group/project/delete.rs b/cli-cmd/identity/src/v3/os_ep_filter/endpoint_group/project/delete.rs similarity index 100% rename from openstack_cli/src/identity/v3/os_ep_filter/endpoint_group/project/delete.rs rename to cli-cmd/identity/src/v3/os_ep_filter/endpoint_group/project/delete.rs diff --git a/openstack_cli/src/identity/v3/os_ep_filter/endpoint_group/project/list.rs b/cli-cmd/identity/src/v3/os_ep_filter/endpoint_group/project/list.rs similarity index 100% rename from openstack_cli/src/identity/v3/os_ep_filter/endpoint_group/project/list.rs rename to cli-cmd/identity/src/v3/os_ep_filter/endpoint_group/project/list.rs diff --git a/openstack_cli/src/identity/v3/os_ep_filter/endpoint_group/project/set.rs b/cli-cmd/identity/src/v3/os_ep_filter/endpoint_group/project/set.rs similarity index 100% rename from openstack_cli/src/identity/v3/os_ep_filter/endpoint_group/project/set.rs rename to cli-cmd/identity/src/v3/os_ep_filter/endpoint_group/project/set.rs diff --git a/openstack_cli/src/identity/v3/os_ep_filter/endpoint_group/project/show.rs b/cli-cmd/identity/src/v3/os_ep_filter/endpoint_group/project/show.rs similarity index 100% rename from openstack_cli/src/identity/v3/os_ep_filter/endpoint_group/project/show.rs rename to cli-cmd/identity/src/v3/os_ep_filter/endpoint_group/project/show.rs diff --git a/openstack_cli/src/identity/v3/os_ep_filter/endpoint_group/set.rs b/cli-cmd/identity/src/v3/os_ep_filter/endpoint_group/set.rs similarity index 100% rename from openstack_cli/src/identity/v3/os_ep_filter/endpoint_group/set.rs rename to cli-cmd/identity/src/v3/os_ep_filter/endpoint_group/set.rs diff --git a/openstack_cli/src/identity/v3/os_ep_filter/endpoint_group/show.rs b/cli-cmd/identity/src/v3/os_ep_filter/endpoint_group/show.rs similarity index 100% rename from openstack_cli/src/identity/v3/os_ep_filter/endpoint_group/show.rs rename to cli-cmd/identity/src/v3/os_ep_filter/endpoint_group/show.rs diff --git a/openstack_cli/src/identity/v3/os_ep_filter/project.rs b/cli-cmd/identity/src/v3/os_ep_filter/project.rs similarity index 91% rename from openstack_cli/src/identity/v3/os_ep_filter/project.rs rename to cli-cmd/identity/src/v3/os_ep_filter/project.rs index 326b6ad05..c5bf60501 100644 --- a/openstack_cli/src/identity/v3/os_ep_filter/project.rs +++ b/cli-cmd/identity/src/v3/os_ep_filter/project.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; pub mod endpoint; pub mod endpoint_group; @@ -40,9 +40,9 @@ pub enum ProjectCommands { impl ProjectCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/identity/v3/os_ep_filter/project/endpoint.rs b/cli-cmd/identity/src/v3/os_ep_filter/project/endpoint.rs similarity index 92% rename from openstack_cli/src/identity/v3/os_ep_filter/project/endpoint.rs rename to cli-cmd/identity/src/v3/os_ep_filter/project/endpoint.rs index 46daa2021..b381d1d61 100644 --- a/openstack_cli/src/identity/v3/os_ep_filter/project/endpoint.rs +++ b/cli-cmd/identity/src/v3/os_ep_filter/project/endpoint.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; pub mod delete; pub mod list; @@ -44,9 +44,9 @@ pub enum EndpointCommands { impl EndpointCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/identity/v3/os_ep_filter/project/endpoint/delete.rs b/cli-cmd/identity/src/v3/os_ep_filter/project/endpoint/delete.rs similarity index 100% rename from openstack_cli/src/identity/v3/os_ep_filter/project/endpoint/delete.rs rename to cli-cmd/identity/src/v3/os_ep_filter/project/endpoint/delete.rs diff --git a/openstack_cli/src/identity/v3/os_ep_filter/project/endpoint/list.rs b/cli-cmd/identity/src/v3/os_ep_filter/project/endpoint/list.rs similarity index 100% rename from openstack_cli/src/identity/v3/os_ep_filter/project/endpoint/list.rs rename to cli-cmd/identity/src/v3/os_ep_filter/project/endpoint/list.rs diff --git a/openstack_cli/src/identity/v3/os_ep_filter/project/endpoint/set.rs b/cli-cmd/identity/src/v3/os_ep_filter/project/endpoint/set.rs similarity index 100% rename from openstack_cli/src/identity/v3/os_ep_filter/project/endpoint/set.rs rename to cli-cmd/identity/src/v3/os_ep_filter/project/endpoint/set.rs diff --git a/openstack_cli/src/identity/v3/os_ep_filter/project/endpoint/show.rs b/cli-cmd/identity/src/v3/os_ep_filter/project/endpoint/show.rs similarity index 100% rename from openstack_cli/src/identity/v3/os_ep_filter/project/endpoint/show.rs rename to cli-cmd/identity/src/v3/os_ep_filter/project/endpoint/show.rs diff --git a/openstack_cli/src/identity/v3/os_ep_filter/project/endpoint_group.rs b/cli-cmd/identity/src/v3/os_ep_filter/project/endpoint_group.rs similarity index 91% rename from openstack_cli/src/identity/v3/os_ep_filter/project/endpoint_group.rs rename to cli-cmd/identity/src/v3/os_ep_filter/project/endpoint_group.rs index d4b50d11c..ab458b5be 100644 --- a/openstack_cli/src/identity/v3/os_ep_filter/project/endpoint_group.rs +++ b/cli-cmd/identity/src/v3/os_ep_filter/project/endpoint_group.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; pub mod get; @@ -39,9 +39,9 @@ pub enum EndpointGroupCommands { impl EndpointGroupCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/identity/v3/os_ep_filter/project/endpoint_group/get.rs b/cli-cmd/identity/src/v3/os_ep_filter/project/endpoint_group/get.rs similarity index 100% rename from openstack_cli/src/identity/v3/os_ep_filter/project/endpoint_group/get.rs rename to cli-cmd/identity/src/v3/os_ep_filter/project/endpoint_group/get.rs diff --git a/openstack_cli/src/identity/v3/os_federation.rs b/cli-cmd/identity/src/v3/os_federation.rs similarity index 93% rename from openstack_cli/src/identity/v3/os_federation.rs rename to cli-cmd/identity/src/v3/os_federation.rs index 28a843bac..e20dc9857 100644 --- a/openstack_cli/src/identity/v3/os_federation.rs +++ b/cli-cmd/identity/src/v3/os_federation.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; pub mod identity_provider; pub mod mapping; @@ -51,9 +51,9 @@ pub enum FederationCommands { impl FederationCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/identity/v3/os_federation/domain/list.rs b/cli-cmd/identity/src/v3/os_federation/domain/list.rs similarity index 100% rename from openstack_cli/src/identity/v3/os_federation/domain/list.rs rename to cli-cmd/identity/src/v3/os_federation/domain/list.rs diff --git a/openstack_cli/src/identity/v3/os_federation/identity_provider.rs b/cli-cmd/identity/src/v3/os_federation/identity_provider.rs similarity index 94% rename from openstack_cli/src/identity/v3/os_federation/identity_provider.rs rename to cli-cmd/identity/src/v3/os_federation/identity_provider.rs index 837a5a35a..603007d33 100644 --- a/openstack_cli/src/identity/v3/os_federation/identity_provider.rs +++ b/cli-cmd/identity/src/v3/os_federation/identity_provider.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; pub mod create; pub mod delete; @@ -51,9 +51,9 @@ pub enum IdentityProviderCommands { impl IdentityProviderCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/identity/v3/os_federation/identity_provider/create.rs b/cli-cmd/identity/src/v3/os_federation/identity_provider/create.rs similarity index 100% rename from openstack_cli/src/identity/v3/os_federation/identity_provider/create.rs rename to cli-cmd/identity/src/v3/os_federation/identity_provider/create.rs diff --git a/openstack_cli/src/identity/v3/os_federation/identity_provider/delete.rs b/cli-cmd/identity/src/v3/os_federation/identity_provider/delete.rs similarity index 100% rename from openstack_cli/src/identity/v3/os_federation/identity_provider/delete.rs rename to cli-cmd/identity/src/v3/os_federation/identity_provider/delete.rs diff --git a/openstack_cli/src/identity/v3/os_federation/identity_provider/list.rs b/cli-cmd/identity/src/v3/os_federation/identity_provider/list.rs similarity index 100% rename from openstack_cli/src/identity/v3/os_federation/identity_provider/list.rs rename to cli-cmd/identity/src/v3/os_federation/identity_provider/list.rs diff --git a/openstack_cli/src/identity/v3/os_federation/identity_provider/protocol.rs b/cli-cmd/identity/src/v3/os_federation/identity_provider/protocol.rs similarity index 95% rename from openstack_cli/src/identity/v3/os_federation/identity_provider/protocol.rs rename to cli-cmd/identity/src/v3/os_federation/identity_provider/protocol.rs index fdb2d1260..0bfd6627c 100644 --- a/openstack_cli/src/identity/v3/os_federation/identity_provider/protocol.rs +++ b/cli-cmd/identity/src/v3/os_federation/identity_provider/protocol.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; pub mod create; pub mod delete; @@ -63,9 +63,9 @@ pub enum ProtocolCommands { impl ProtocolCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/identity/v3/os_federation/identity_provider/protocol/auth/create.rs b/cli-cmd/identity/src/v3/os_federation/identity_provider/protocol/auth/create.rs similarity index 100% rename from openstack_cli/src/identity/v3/os_federation/identity_provider/protocol/auth/create.rs rename to cli-cmd/identity/src/v3/os_federation/identity_provider/protocol/auth/create.rs diff --git a/openstack_cli/src/identity/v3/os_federation/identity_provider/protocol/auth/get.rs b/cli-cmd/identity/src/v3/os_federation/identity_provider/protocol/auth/get.rs similarity index 100% rename from openstack_cli/src/identity/v3/os_federation/identity_provider/protocol/auth/get.rs rename to cli-cmd/identity/src/v3/os_federation/identity_provider/protocol/auth/get.rs diff --git a/openstack_cli/src/identity/v3/os_federation/identity_provider/protocol/create.rs b/cli-cmd/identity/src/v3/os_federation/identity_provider/protocol/create.rs similarity index 100% rename from openstack_cli/src/identity/v3/os_federation/identity_provider/protocol/create.rs rename to cli-cmd/identity/src/v3/os_federation/identity_provider/protocol/create.rs diff --git a/openstack_cli/src/identity/v3/os_federation/identity_provider/protocol/delete.rs b/cli-cmd/identity/src/v3/os_federation/identity_provider/protocol/delete.rs similarity index 100% rename from openstack_cli/src/identity/v3/os_federation/identity_provider/protocol/delete.rs rename to cli-cmd/identity/src/v3/os_federation/identity_provider/protocol/delete.rs diff --git a/openstack_cli/src/identity/v3/os_federation/identity_provider/protocol/list.rs b/cli-cmd/identity/src/v3/os_federation/identity_provider/protocol/list.rs similarity index 100% rename from openstack_cli/src/identity/v3/os_federation/identity_provider/protocol/list.rs rename to cli-cmd/identity/src/v3/os_federation/identity_provider/protocol/list.rs diff --git a/openstack_cli/src/identity/v3/os_federation/identity_provider/protocol/set.rs b/cli-cmd/identity/src/v3/os_federation/identity_provider/protocol/set.rs similarity index 100% rename from openstack_cli/src/identity/v3/os_federation/identity_provider/protocol/set.rs rename to cli-cmd/identity/src/v3/os_federation/identity_provider/protocol/set.rs diff --git a/openstack_cli/src/identity/v3/os_federation/identity_provider/protocol/show.rs b/cli-cmd/identity/src/v3/os_federation/identity_provider/protocol/show.rs similarity index 100% rename from openstack_cli/src/identity/v3/os_federation/identity_provider/protocol/show.rs rename to cli-cmd/identity/src/v3/os_federation/identity_provider/protocol/show.rs diff --git a/openstack_cli/src/identity/v3/os_federation/identity_provider/set.rs b/cli-cmd/identity/src/v3/os_federation/identity_provider/set.rs similarity index 100% rename from openstack_cli/src/identity/v3/os_federation/identity_provider/set.rs rename to cli-cmd/identity/src/v3/os_federation/identity_provider/set.rs diff --git a/openstack_cli/src/identity/v3/os_federation/identity_provider/show.rs b/cli-cmd/identity/src/v3/os_federation/identity_provider/show.rs similarity index 100% rename from openstack_cli/src/identity/v3/os_federation/identity_provider/show.rs rename to cli-cmd/identity/src/v3/os_federation/identity_provider/show.rs diff --git a/openstack_cli/src/identity/v3/os_federation/mapping.rs b/cli-cmd/identity/src/v3/os_federation/mapping.rs similarity index 93% rename from openstack_cli/src/identity/v3/os_federation/mapping.rs rename to cli-cmd/identity/src/v3/os_federation/mapping.rs index 4d736e11e..8374595e8 100644 --- a/openstack_cli/src/identity/v3/os_federation/mapping.rs +++ b/cli-cmd/identity/src/v3/os_federation/mapping.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; pub mod create; pub mod delete; @@ -50,9 +50,9 @@ pub enum MappingCommands { impl MappingCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/identity/v3/os_federation/mapping/create.rs b/cli-cmd/identity/src/v3/os_federation/mapping/create.rs similarity index 100% rename from openstack_cli/src/identity/v3/os_federation/mapping/create.rs rename to cli-cmd/identity/src/v3/os_federation/mapping/create.rs diff --git a/openstack_cli/src/identity/v3/os_federation/mapping/delete.rs b/cli-cmd/identity/src/v3/os_federation/mapping/delete.rs similarity index 100% rename from openstack_cli/src/identity/v3/os_federation/mapping/delete.rs rename to cli-cmd/identity/src/v3/os_federation/mapping/delete.rs diff --git a/openstack_cli/src/identity/v3/os_federation/mapping/list.rs b/cli-cmd/identity/src/v3/os_federation/mapping/list.rs similarity index 100% rename from openstack_cli/src/identity/v3/os_federation/mapping/list.rs rename to cli-cmd/identity/src/v3/os_federation/mapping/list.rs diff --git a/openstack_cli/src/identity/v3/os_federation/mapping/set.rs b/cli-cmd/identity/src/v3/os_federation/mapping/set.rs similarity index 100% rename from openstack_cli/src/identity/v3/os_federation/mapping/set.rs rename to cli-cmd/identity/src/v3/os_federation/mapping/set.rs diff --git a/openstack_cli/src/identity/v3/os_federation/mapping/show.rs b/cli-cmd/identity/src/v3/os_federation/mapping/show.rs similarity index 100% rename from openstack_cli/src/identity/v3/os_federation/mapping/show.rs rename to cli-cmd/identity/src/v3/os_federation/mapping/show.rs diff --git a/openstack_cli/src/identity/v3/os_federation/project/list.rs b/cli-cmd/identity/src/v3/os_federation/project/list.rs similarity index 100% rename from openstack_cli/src/identity/v3/os_federation/project/list.rs rename to cli-cmd/identity/src/v3/os_federation/project/list.rs diff --git a/openstack_cli/src/identity/v3/os_federation/saml2/metadata.rs b/cli-cmd/identity/src/v3/os_federation/saml2/metadata.rs similarity index 91% rename from openstack_cli/src/identity/v3/os_federation/saml2/metadata.rs rename to cli-cmd/identity/src/v3/os_federation/saml2/metadata.rs index 0033c61e0..51b3b0ed8 100644 --- a/openstack_cli/src/identity/v3/os_federation/saml2/metadata.rs +++ b/cli-cmd/identity/src/v3/os_federation/saml2/metadata.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; pub mod get; @@ -40,9 +40,9 @@ pub enum MetadataCommands { impl MetadataCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/identity/v3/os_federation/saml2/metadata/get.rs b/cli-cmd/identity/src/v3/os_federation/saml2/metadata/get.rs similarity index 100% rename from openstack_cli/src/identity/v3/os_federation/saml2/metadata/get.rs rename to cli-cmd/identity/src/v3/os_federation/saml2/metadata/get.rs diff --git a/openstack_cli/src/identity/v3/os_federation/service_provider.rs b/cli-cmd/identity/src/v3/os_federation/service_provider.rs similarity index 93% rename from openstack_cli/src/identity/v3/os_federation/service_provider.rs rename to cli-cmd/identity/src/v3/os_federation/service_provider.rs index 219705272..23b8ac346 100644 --- a/openstack_cli/src/identity/v3/os_federation/service_provider.rs +++ b/cli-cmd/identity/src/v3/os_federation/service_provider.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; pub mod create; pub mod delete; @@ -48,9 +48,9 @@ pub enum ServiceProviderCommands { impl ServiceProviderCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/identity/v3/os_federation/service_provider/create.rs b/cli-cmd/identity/src/v3/os_federation/service_provider/create.rs similarity index 100% rename from openstack_cli/src/identity/v3/os_federation/service_provider/create.rs rename to cli-cmd/identity/src/v3/os_federation/service_provider/create.rs diff --git a/openstack_cli/src/identity/v3/os_federation/service_provider/delete.rs b/cli-cmd/identity/src/v3/os_federation/service_provider/delete.rs similarity index 100% rename from openstack_cli/src/identity/v3/os_federation/service_provider/delete.rs rename to cli-cmd/identity/src/v3/os_federation/service_provider/delete.rs diff --git a/openstack_cli/src/identity/v3/os_federation/service_provider/list.rs b/cli-cmd/identity/src/v3/os_federation/service_provider/list.rs similarity index 100% rename from openstack_cli/src/identity/v3/os_federation/service_provider/list.rs rename to cli-cmd/identity/src/v3/os_federation/service_provider/list.rs diff --git a/openstack_cli/src/identity/v3/os_federation/service_provider/set.rs b/cli-cmd/identity/src/v3/os_federation/service_provider/set.rs similarity index 100% rename from openstack_cli/src/identity/v3/os_federation/service_provider/set.rs rename to cli-cmd/identity/src/v3/os_federation/service_provider/set.rs diff --git a/openstack_cli/src/identity/v3/os_federation/service_provider/show.rs b/cli-cmd/identity/src/v3/os_federation/service_provider/show.rs similarity index 100% rename from openstack_cli/src/identity/v3/os_federation/service_provider/show.rs rename to cli-cmd/identity/src/v3/os_federation/service_provider/show.rs diff --git a/openstack_cli/src/identity/v3/os_inherit/domain/group/role/inherited_to_project/delete.rs b/cli-cmd/identity/src/v3/os_inherit/domain/group/role/inherited_to_project/delete.rs similarity index 100% rename from openstack_cli/src/identity/v3/os_inherit/domain/group/role/inherited_to_project/delete.rs rename to cli-cmd/identity/src/v3/os_inherit/domain/group/role/inherited_to_project/delete.rs diff --git a/openstack_cli/src/identity/v3/os_inherit/domain/group/role/inherited_to_project/get.rs b/cli-cmd/identity/src/v3/os_inherit/domain/group/role/inherited_to_project/get.rs similarity index 100% rename from openstack_cli/src/identity/v3/os_inherit/domain/group/role/inherited_to_project/get.rs rename to cli-cmd/identity/src/v3/os_inherit/domain/group/role/inherited_to_project/get.rs diff --git a/openstack_cli/src/identity/v3/os_inherit/domain/group/role/inherited_to_project/inherited_to_projects.rs b/cli-cmd/identity/src/v3/os_inherit/domain/group/role/inherited_to_project/inherited_to_projects.rs similarity index 100% rename from openstack_cli/src/identity/v3/os_inherit/domain/group/role/inherited_to_project/inherited_to_projects.rs rename to cli-cmd/identity/src/v3/os_inherit/domain/group/role/inherited_to_project/inherited_to_projects.rs diff --git a/openstack_cli/src/identity/v3/os_inherit/domain/user/role/inherited_to_project/delete.rs b/cli-cmd/identity/src/v3/os_inherit/domain/user/role/inherited_to_project/delete.rs similarity index 100% rename from openstack_cli/src/identity/v3/os_inherit/domain/user/role/inherited_to_project/delete.rs rename to cli-cmd/identity/src/v3/os_inherit/domain/user/role/inherited_to_project/delete.rs diff --git a/openstack_cli/src/identity/v3/os_inherit/domain/user/role/inherited_to_project/get.rs b/cli-cmd/identity/src/v3/os_inherit/domain/user/role/inherited_to_project/get.rs similarity index 100% rename from openstack_cli/src/identity/v3/os_inherit/domain/user/role/inherited_to_project/get.rs rename to cli-cmd/identity/src/v3/os_inherit/domain/user/role/inherited_to_project/get.rs diff --git a/openstack_cli/src/identity/v3/os_inherit/domain/user/role/inherited_to_project/inherited_to_projects.rs b/cli-cmd/identity/src/v3/os_inherit/domain/user/role/inherited_to_project/inherited_to_projects.rs similarity index 100% rename from openstack_cli/src/identity/v3/os_inherit/domain/user/role/inherited_to_project/inherited_to_projects.rs rename to cli-cmd/identity/src/v3/os_inherit/domain/user/role/inherited_to_project/inherited_to_projects.rs diff --git a/openstack_cli/src/identity/v3/os_inherit/project/group/role/inherited_to_project/delete.rs b/cli-cmd/identity/src/v3/os_inherit/project/group/role/inherited_to_project/delete.rs similarity index 100% rename from openstack_cli/src/identity/v3/os_inherit/project/group/role/inherited_to_project/delete.rs rename to cli-cmd/identity/src/v3/os_inherit/project/group/role/inherited_to_project/delete.rs diff --git a/openstack_cli/src/identity/v3/os_inherit/project/group/role/inherited_to_project/get.rs b/cli-cmd/identity/src/v3/os_inherit/project/group/role/inherited_to_project/get.rs similarity index 100% rename from openstack_cli/src/identity/v3/os_inherit/project/group/role/inherited_to_project/get.rs rename to cli-cmd/identity/src/v3/os_inherit/project/group/role/inherited_to_project/get.rs diff --git a/openstack_cli/src/identity/v3/os_inherit/project/group/role/inherited_to_project/inherited_to_projects.rs b/cli-cmd/identity/src/v3/os_inherit/project/group/role/inherited_to_project/inherited_to_projects.rs similarity index 100% rename from openstack_cli/src/identity/v3/os_inherit/project/group/role/inherited_to_project/inherited_to_projects.rs rename to cli-cmd/identity/src/v3/os_inherit/project/group/role/inherited_to_project/inherited_to_projects.rs diff --git a/openstack_cli/src/identity/v3/os_inherit/project/user/role/inherited_to_project/delete.rs b/cli-cmd/identity/src/v3/os_inherit/project/user/role/inherited_to_project/delete.rs similarity index 100% rename from openstack_cli/src/identity/v3/os_inherit/project/user/role/inherited_to_project/delete.rs rename to cli-cmd/identity/src/v3/os_inherit/project/user/role/inherited_to_project/delete.rs diff --git a/openstack_cli/src/identity/v3/os_inherit/project/user/role/inherited_to_project/get.rs b/cli-cmd/identity/src/v3/os_inherit/project/user/role/inherited_to_project/get.rs similarity index 100% rename from openstack_cli/src/identity/v3/os_inherit/project/user/role/inherited_to_project/get.rs rename to cli-cmd/identity/src/v3/os_inherit/project/user/role/inherited_to_project/get.rs diff --git a/openstack_cli/src/identity/v3/os_inherit/project/user/role/inherited_to_project/inherited_to_projects.rs b/cli-cmd/identity/src/v3/os_inherit/project/user/role/inherited_to_project/inherited_to_projects.rs similarity index 100% rename from openstack_cli/src/identity/v3/os_inherit/project/user/role/inherited_to_project/inherited_to_projects.rs rename to cli-cmd/identity/src/v3/os_inherit/project/user/role/inherited_to_project/inherited_to_projects.rs diff --git a/openstack_cli/src/identity/v3/os_oauth1/access_token/create.rs b/cli-cmd/identity/src/v3/os_oauth1/access_token/create.rs similarity index 100% rename from openstack_cli/src/identity/v3/os_oauth1/access_token/create.rs rename to cli-cmd/identity/src/v3/os_oauth1/access_token/create.rs diff --git a/openstack_cli/src/identity/v3/os_oauth1/access_token/get.rs b/cli-cmd/identity/src/v3/os_oauth1/access_token/get.rs similarity index 100% rename from openstack_cli/src/identity/v3/os_oauth1/access_token/get.rs rename to cli-cmd/identity/src/v3/os_oauth1/access_token/get.rs diff --git a/openstack_cli/src/identity/v3/os_oauth1/authorize/set.rs b/cli-cmd/identity/src/v3/os_oauth1/authorize/set.rs similarity index 100% rename from openstack_cli/src/identity/v3/os_oauth1/authorize/set.rs rename to cli-cmd/identity/src/v3/os_oauth1/authorize/set.rs diff --git a/openstack_cli/src/identity/v3/os_oauth1/consumer/create.rs b/cli-cmd/identity/src/v3/os_oauth1/consumer/create.rs similarity index 100% rename from openstack_cli/src/identity/v3/os_oauth1/consumer/create.rs rename to cli-cmd/identity/src/v3/os_oauth1/consumer/create.rs diff --git a/openstack_cli/src/identity/v3/os_oauth1/consumer/delete.rs b/cli-cmd/identity/src/v3/os_oauth1/consumer/delete.rs similarity index 100% rename from openstack_cli/src/identity/v3/os_oauth1/consumer/delete.rs rename to cli-cmd/identity/src/v3/os_oauth1/consumer/delete.rs diff --git a/openstack_cli/src/identity/v3/os_oauth1/consumer/list.rs b/cli-cmd/identity/src/v3/os_oauth1/consumer/list.rs similarity index 100% rename from openstack_cli/src/identity/v3/os_oauth1/consumer/list.rs rename to cli-cmd/identity/src/v3/os_oauth1/consumer/list.rs diff --git a/openstack_cli/src/identity/v3/os_oauth1/consumer/set.rs b/cli-cmd/identity/src/v3/os_oauth1/consumer/set.rs similarity index 100% rename from openstack_cli/src/identity/v3/os_oauth1/consumer/set.rs rename to cli-cmd/identity/src/v3/os_oauth1/consumer/set.rs diff --git a/openstack_cli/src/identity/v3/os_oauth1/consumer/show.rs b/cli-cmd/identity/src/v3/os_oauth1/consumer/show.rs similarity index 100% rename from openstack_cli/src/identity/v3/os_oauth1/consumer/show.rs rename to cli-cmd/identity/src/v3/os_oauth1/consumer/show.rs diff --git a/openstack_cli/src/identity/v3/os_oauth1/request_token/create.rs b/cli-cmd/identity/src/v3/os_oauth1/request_token/create.rs similarity index 100% rename from openstack_cli/src/identity/v3/os_oauth1/request_token/create.rs rename to cli-cmd/identity/src/v3/os_oauth1/request_token/create.rs diff --git a/openstack_cli/src/identity/v3/os_oauth1/request_token/get.rs b/cli-cmd/identity/src/v3/os_oauth1/request_token/get.rs similarity index 100% rename from openstack_cli/src/identity/v3/os_oauth1/request_token/get.rs rename to cli-cmd/identity/src/v3/os_oauth1/request_token/get.rs diff --git a/openstack_cli/src/identity/v3/os_oauth2/token/create.rs b/cli-cmd/identity/src/v3/os_oauth2/token/create.rs similarity index 100% rename from openstack_cli/src/identity/v3/os_oauth2/token/create.rs rename to cli-cmd/identity/src/v3/os_oauth2/token/create.rs diff --git a/openstack_cli/src/identity/v3/os_oauth2/token/delete.rs b/cli-cmd/identity/src/v3/os_oauth2/token/delete.rs similarity index 100% rename from openstack_cli/src/identity/v3/os_oauth2/token/delete.rs rename to cli-cmd/identity/src/v3/os_oauth2/token/delete.rs diff --git a/openstack_cli/src/identity/v3/os_oauth2/token/get.rs b/cli-cmd/identity/src/v3/os_oauth2/token/get.rs similarity index 100% rename from openstack_cli/src/identity/v3/os_oauth2/token/get.rs rename to cli-cmd/identity/src/v3/os_oauth2/token/get.rs diff --git a/openstack_cli/src/identity/v3/os_oauth2/token/set.rs b/cli-cmd/identity/src/v3/os_oauth2/token/set.rs similarity index 100% rename from openstack_cli/src/identity/v3/os_oauth2/token/set.rs rename to cli-cmd/identity/src/v3/os_oauth2/token/set.rs diff --git a/openstack_cli/src/identity/v3/os_oauth2/token/token.rs b/cli-cmd/identity/src/v3/os_oauth2/token/token.rs similarity index 100% rename from openstack_cli/src/identity/v3/os_oauth2/token/token.rs rename to cli-cmd/identity/src/v3/os_oauth2/token/token.rs diff --git a/openstack_cli/src/identity/v3/os_revoke/event/get.rs b/cli-cmd/identity/src/v3/os_revoke/event/get.rs similarity index 100% rename from openstack_cli/src/identity/v3/os_revoke/event/get.rs rename to cli-cmd/identity/src/v3/os_revoke/event/get.rs diff --git a/openstack_cli/src/identity/v3/os_simple_cert/ca/get.rs b/cli-cmd/identity/src/v3/os_simple_cert/ca/get.rs similarity index 100% rename from openstack_cli/src/identity/v3/os_simple_cert/ca/get.rs rename to cli-cmd/identity/src/v3/os_simple_cert/ca/get.rs diff --git a/openstack_cli/src/identity/v3/os_simple_cert/certificate/get.rs b/cli-cmd/identity/src/v3/os_simple_cert/certificate/get.rs similarity index 100% rename from openstack_cli/src/identity/v3/os_simple_cert/certificate/get.rs rename to cli-cmd/identity/src/v3/os_simple_cert/certificate/get.rs diff --git a/openstack_cli/src/identity/v3/os_trust/trust/create.rs b/cli-cmd/identity/src/v3/os_trust/trust/create.rs similarity index 100% rename from openstack_cli/src/identity/v3/os_trust/trust/create.rs rename to cli-cmd/identity/src/v3/os_trust/trust/create.rs diff --git a/openstack_cli/src/identity/v3/os_trust/trust/delete.rs b/cli-cmd/identity/src/v3/os_trust/trust/delete.rs similarity index 100% rename from openstack_cli/src/identity/v3/os_trust/trust/delete.rs rename to cli-cmd/identity/src/v3/os_trust/trust/delete.rs diff --git a/openstack_cli/src/identity/v3/os_trust/trust/list.rs b/cli-cmd/identity/src/v3/os_trust/trust/list.rs similarity index 100% rename from openstack_cli/src/identity/v3/os_trust/trust/list.rs rename to cli-cmd/identity/src/v3/os_trust/trust/list.rs diff --git a/openstack_cli/src/identity/v3/os_trust/trust/role/list.rs b/cli-cmd/identity/src/v3/os_trust/trust/role/list.rs similarity index 100% rename from openstack_cli/src/identity/v3/os_trust/trust/role/list.rs rename to cli-cmd/identity/src/v3/os_trust/trust/role/list.rs diff --git a/openstack_cli/src/identity/v3/os_trust/trust/role/show.rs b/cli-cmd/identity/src/v3/os_trust/trust/role/show.rs similarity index 100% rename from openstack_cli/src/identity/v3/os_trust/trust/role/show.rs rename to cli-cmd/identity/src/v3/os_trust/trust/role/show.rs diff --git a/openstack_cli/src/identity/v3/os_trust/trust/show.rs b/cli-cmd/identity/src/v3/os_trust/trust/show.rs similarity index 100% rename from openstack_cli/src/identity/v3/os_trust/trust/show.rs rename to cli-cmd/identity/src/v3/os_trust/trust/show.rs diff --git a/openstack_cli/src/identity/v3/policy/create.rs b/cli-cmd/identity/src/v3/policy/create.rs similarity index 100% rename from openstack_cli/src/identity/v3/policy/create.rs rename to cli-cmd/identity/src/v3/policy/create.rs diff --git a/openstack_cli/src/identity/v3/policy/delete.rs b/cli-cmd/identity/src/v3/policy/delete.rs similarity index 100% rename from openstack_cli/src/identity/v3/policy/delete.rs rename to cli-cmd/identity/src/v3/policy/delete.rs diff --git a/openstack_cli/src/identity/v3/policy/list.rs b/cli-cmd/identity/src/v3/policy/list.rs similarity index 100% rename from openstack_cli/src/identity/v3/policy/list.rs rename to cli-cmd/identity/src/v3/policy/list.rs diff --git a/openstack_cli/src/identity/v3/policy/os_endpoint_policy/endpoint/delete.rs b/cli-cmd/identity/src/v3/policy/os_endpoint_policy/endpoint/delete.rs similarity index 100% rename from openstack_cli/src/identity/v3/policy/os_endpoint_policy/endpoint/delete.rs rename to cli-cmd/identity/src/v3/policy/os_endpoint_policy/endpoint/delete.rs diff --git a/openstack_cli/src/identity/v3/policy/os_endpoint_policy/endpoint/list.rs b/cli-cmd/identity/src/v3/policy/os_endpoint_policy/endpoint/list.rs similarity index 100% rename from openstack_cli/src/identity/v3/policy/os_endpoint_policy/endpoint/list.rs rename to cli-cmd/identity/src/v3/policy/os_endpoint_policy/endpoint/list.rs diff --git a/openstack_cli/src/identity/v3/policy/os_endpoint_policy/endpoint/set.rs b/cli-cmd/identity/src/v3/policy/os_endpoint_policy/endpoint/set.rs similarity index 100% rename from openstack_cli/src/identity/v3/policy/os_endpoint_policy/endpoint/set.rs rename to cli-cmd/identity/src/v3/policy/os_endpoint_policy/endpoint/set.rs diff --git a/openstack_cli/src/identity/v3/policy/os_endpoint_policy/endpoint/show.rs b/cli-cmd/identity/src/v3/policy/os_endpoint_policy/endpoint/show.rs similarity index 100% rename from openstack_cli/src/identity/v3/policy/os_endpoint_policy/endpoint/show.rs rename to cli-cmd/identity/src/v3/policy/os_endpoint_policy/endpoint/show.rs diff --git a/openstack_cli/src/identity/v3/policy/os_endpoint_policy/service/delete.rs b/cli-cmd/identity/src/v3/policy/os_endpoint_policy/service/delete.rs similarity index 100% rename from openstack_cli/src/identity/v3/policy/os_endpoint_policy/service/delete.rs rename to cli-cmd/identity/src/v3/policy/os_endpoint_policy/service/delete.rs diff --git a/openstack_cli/src/identity/v3/policy/os_endpoint_policy/service/region/delete.rs b/cli-cmd/identity/src/v3/policy/os_endpoint_policy/service/region/delete.rs similarity index 100% rename from openstack_cli/src/identity/v3/policy/os_endpoint_policy/service/region/delete.rs rename to cli-cmd/identity/src/v3/policy/os_endpoint_policy/service/region/delete.rs diff --git a/openstack_cli/src/identity/v3/policy/os_endpoint_policy/service/region/set.rs b/cli-cmd/identity/src/v3/policy/os_endpoint_policy/service/region/set.rs similarity index 100% rename from openstack_cli/src/identity/v3/policy/os_endpoint_policy/service/region/set.rs rename to cli-cmd/identity/src/v3/policy/os_endpoint_policy/service/region/set.rs diff --git a/openstack_cli/src/identity/v3/policy/os_endpoint_policy/service/region/show.rs b/cli-cmd/identity/src/v3/policy/os_endpoint_policy/service/region/show.rs similarity index 100% rename from openstack_cli/src/identity/v3/policy/os_endpoint_policy/service/region/show.rs rename to cli-cmd/identity/src/v3/policy/os_endpoint_policy/service/region/show.rs diff --git a/openstack_cli/src/identity/v3/policy/os_endpoint_policy/service/set.rs b/cli-cmd/identity/src/v3/policy/os_endpoint_policy/service/set.rs similarity index 100% rename from openstack_cli/src/identity/v3/policy/os_endpoint_policy/service/set.rs rename to cli-cmd/identity/src/v3/policy/os_endpoint_policy/service/set.rs diff --git a/openstack_cli/src/identity/v3/policy/os_endpoint_policy/service/show.rs b/cli-cmd/identity/src/v3/policy/os_endpoint_policy/service/show.rs similarity index 100% rename from openstack_cli/src/identity/v3/policy/os_endpoint_policy/service/show.rs rename to cli-cmd/identity/src/v3/policy/os_endpoint_policy/service/show.rs diff --git a/openstack_cli/src/identity/v3/policy/set.rs b/cli-cmd/identity/src/v3/policy/set.rs similarity index 100% rename from openstack_cli/src/identity/v3/policy/set.rs rename to cli-cmd/identity/src/v3/policy/set.rs diff --git a/openstack_cli/src/identity/v3/policy/show.rs b/cli-cmd/identity/src/v3/policy/show.rs similarity index 100% rename from openstack_cli/src/identity/v3/policy/show.rs rename to cli-cmd/identity/src/v3/policy/show.rs diff --git a/openstack_cli/src/identity/v3/project.rs b/cli-cmd/identity/src/v3/project.rs similarity index 96% rename from openstack_cli/src/identity/v3/project.rs rename to cli-cmd/identity/src/v3/project.rs index 44c91cfa0..0946e7d21 100644 --- a/openstack_cli/src/identity/v3/project.rs +++ b/cli-cmd/identity/src/v3/project.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; pub mod create; pub mod delete; @@ -84,9 +84,9 @@ pub enum ProjectCommands { impl ProjectCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/identity/v3/project/create.rs b/cli-cmd/identity/src/v3/project/create.rs similarity index 100% rename from openstack_cli/src/identity/v3/project/create.rs rename to cli-cmd/identity/src/v3/project/create.rs diff --git a/openstack_cli/src/identity/v3/project/delete.rs b/cli-cmd/identity/src/v3/project/delete.rs similarity index 100% rename from openstack_cli/src/identity/v3/project/delete.rs rename to cli-cmd/identity/src/v3/project/delete.rs diff --git a/openstack_cli/src/identity/v3/project/group.rs b/cli-cmd/identity/src/v3/project/group.rs similarity index 91% rename from openstack_cli/src/identity/v3/project/group.rs rename to cli-cmd/identity/src/v3/project/group.rs index 6a453e3ce..5360b9fb3 100644 --- a/openstack_cli/src/identity/v3/project/group.rs +++ b/cli-cmd/identity/src/v3/project/group.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; pub mod role; @@ -41,9 +41,9 @@ pub enum GroupCommands { impl GroupCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/identity/v3/project/group/role.rs b/cli-cmd/identity/src/v3/project/group/role.rs similarity index 92% rename from openstack_cli/src/identity/v3/project/group/role.rs rename to cli-cmd/identity/src/v3/project/group/role.rs index bd5cd45af..05d0e2aad 100644 --- a/openstack_cli/src/identity/v3/project/group/role.rs +++ b/cli-cmd/identity/src/v3/project/group/role.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; pub mod delete; pub mod list; @@ -47,9 +47,9 @@ pub enum RoleCommands { impl RoleCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/identity/v3/project/group/role/delete.rs b/cli-cmd/identity/src/v3/project/group/role/delete.rs similarity index 100% rename from openstack_cli/src/identity/v3/project/group/role/delete.rs rename to cli-cmd/identity/src/v3/project/group/role/delete.rs diff --git a/openstack_cli/src/identity/v3/project/group/role/list.rs b/cli-cmd/identity/src/v3/project/group/role/list.rs similarity index 100% rename from openstack_cli/src/identity/v3/project/group/role/list.rs rename to cli-cmd/identity/src/v3/project/group/role/list.rs diff --git a/openstack_cli/src/identity/v3/project/group/role/set.rs b/cli-cmd/identity/src/v3/project/group/role/set.rs similarity index 100% rename from openstack_cli/src/identity/v3/project/group/role/set.rs rename to cli-cmd/identity/src/v3/project/group/role/set.rs diff --git a/openstack_cli/src/identity/v3/project/group/role/show.rs b/cli-cmd/identity/src/v3/project/group/role/show.rs similarity index 100% rename from openstack_cli/src/identity/v3/project/group/role/show.rs rename to cli-cmd/identity/src/v3/project/group/role/show.rs diff --git a/openstack_cli/src/identity/v3/project/list.rs b/cli-cmd/identity/src/v3/project/list.rs similarity index 100% rename from openstack_cli/src/identity/v3/project/list.rs rename to cli-cmd/identity/src/v3/project/list.rs diff --git a/openstack_cli/src/identity/v3/project/set.rs b/cli-cmd/identity/src/v3/project/set.rs similarity index 100% rename from openstack_cli/src/identity/v3/project/set.rs rename to cli-cmd/identity/src/v3/project/set.rs diff --git a/openstack_cli/src/identity/v3/project/show.rs b/cli-cmd/identity/src/v3/project/show.rs similarity index 100% rename from openstack_cli/src/identity/v3/project/show.rs rename to cli-cmd/identity/src/v3/project/show.rs diff --git a/openstack_cli/src/identity/v3/project/tag/delete.rs b/cli-cmd/identity/src/v3/project/tag/delete.rs similarity index 100% rename from openstack_cli/src/identity/v3/project/tag/delete.rs rename to cli-cmd/identity/src/v3/project/tag/delete.rs diff --git a/openstack_cli/src/identity/v3/project/tag/delete_all.rs b/cli-cmd/identity/src/v3/project/tag/delete_all.rs similarity index 100% rename from openstack_cli/src/identity/v3/project/tag/delete_all.rs rename to cli-cmd/identity/src/v3/project/tag/delete_all.rs diff --git a/openstack_cli/src/identity/v3/project/tag/list.rs b/cli-cmd/identity/src/v3/project/tag/list.rs similarity index 100% rename from openstack_cli/src/identity/v3/project/tag/list.rs rename to cli-cmd/identity/src/v3/project/tag/list.rs diff --git a/openstack_cli/src/identity/v3/project/tag/replace.rs b/cli-cmd/identity/src/v3/project/tag/replace.rs similarity index 100% rename from openstack_cli/src/identity/v3/project/tag/replace.rs rename to cli-cmd/identity/src/v3/project/tag/replace.rs diff --git a/openstack_cli/src/identity/v3/project/tag/set.rs b/cli-cmd/identity/src/v3/project/tag/set.rs similarity index 100% rename from openstack_cli/src/identity/v3/project/tag/set.rs rename to cli-cmd/identity/src/v3/project/tag/set.rs diff --git a/openstack_cli/src/identity/v3/project/tag/show.rs b/cli-cmd/identity/src/v3/project/tag/show.rs similarity index 100% rename from openstack_cli/src/identity/v3/project/tag/show.rs rename to cli-cmd/identity/src/v3/project/tag/show.rs diff --git a/openstack_cli/src/identity/v3/project/user.rs b/cli-cmd/identity/src/v3/project/user.rs similarity index 90% rename from openstack_cli/src/identity/v3/project/user.rs rename to cli-cmd/identity/src/v3/project/user.rs index 1f7178533..d847b951d 100644 --- a/openstack_cli/src/identity/v3/project/user.rs +++ b/cli-cmd/identity/src/v3/project/user.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; pub mod role; @@ -41,9 +41,9 @@ pub enum UserCommands { impl UserCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/identity/v3/project/user/role.rs b/cli-cmd/identity/src/v3/project/user/role.rs similarity index 92% rename from openstack_cli/src/identity/v3/project/user/role.rs rename to cli-cmd/identity/src/v3/project/user/role.rs index 8b4a3df41..a746df938 100644 --- a/openstack_cli/src/identity/v3/project/user/role.rs +++ b/cli-cmd/identity/src/v3/project/user/role.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; pub mod delete; pub mod list; @@ -47,9 +47,9 @@ pub enum RoleCommands { impl RoleCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/identity/v3/project/user/role/delete.rs b/cli-cmd/identity/src/v3/project/user/role/delete.rs similarity index 100% rename from openstack_cli/src/identity/v3/project/user/role/delete.rs rename to cli-cmd/identity/src/v3/project/user/role/delete.rs diff --git a/openstack_cli/src/identity/v3/project/user/role/list.rs b/cli-cmd/identity/src/v3/project/user/role/list.rs similarity index 100% rename from openstack_cli/src/identity/v3/project/user/role/list.rs rename to cli-cmd/identity/src/v3/project/user/role/list.rs diff --git a/openstack_cli/src/identity/v3/project/user/role/set.rs b/cli-cmd/identity/src/v3/project/user/role/set.rs similarity index 100% rename from openstack_cli/src/identity/v3/project/user/role/set.rs rename to cli-cmd/identity/src/v3/project/user/role/set.rs diff --git a/openstack_cli/src/identity/v3/project/user/role/show.rs b/cli-cmd/identity/src/v3/project/user/role/show.rs similarity index 100% rename from openstack_cli/src/identity/v3/project/user/role/show.rs rename to cli-cmd/identity/src/v3/project/user/role/show.rs diff --git a/openstack_cli/src/identity/v3/region.rs b/cli-cmd/identity/src/v3/region.rs similarity index 94% rename from openstack_cli/src/identity/v3/region.rs rename to cli-cmd/identity/src/v3/region.rs index f9932cb1d..ce1ca4654 100644 --- a/openstack_cli/src/identity/v3/region.rs +++ b/cli-cmd/identity/src/v3/region.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; pub mod create; pub mod delete; @@ -54,9 +54,9 @@ pub enum RegionCommands { impl RegionCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/identity/v3/region/create.rs b/cli-cmd/identity/src/v3/region/create.rs similarity index 100% rename from openstack_cli/src/identity/v3/region/create.rs rename to cli-cmd/identity/src/v3/region/create.rs diff --git a/openstack_cli/src/identity/v3/region/delete.rs b/cli-cmd/identity/src/v3/region/delete.rs similarity index 100% rename from openstack_cli/src/identity/v3/region/delete.rs rename to cli-cmd/identity/src/v3/region/delete.rs diff --git a/openstack_cli/src/identity/v3/region/list.rs b/cli-cmd/identity/src/v3/region/list.rs similarity index 100% rename from openstack_cli/src/identity/v3/region/list.rs rename to cli-cmd/identity/src/v3/region/list.rs diff --git a/openstack_cli/src/identity/v3/region/set.rs b/cli-cmd/identity/src/v3/region/set.rs similarity index 100% rename from openstack_cli/src/identity/v3/region/set.rs rename to cli-cmd/identity/src/v3/region/set.rs diff --git a/openstack_cli/src/identity/v3/region/show.rs b/cli-cmd/identity/src/v3/region/show.rs similarity index 100% rename from openstack_cli/src/identity/v3/region/show.rs rename to cli-cmd/identity/src/v3/region/show.rs diff --git a/openstack_cli/src/identity/v3/registered_limit.rs b/cli-cmd/identity/src/v3/registered_limit.rs similarity index 94% rename from openstack_cli/src/identity/v3/registered_limit.rs rename to cli-cmd/identity/src/v3/registered_limit.rs index 0624a4728..c0956a37d 100644 --- a/openstack_cli/src/identity/v3/registered_limit.rs +++ b/cli-cmd/identity/src/v3/registered_limit.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; pub mod create; pub mod delete; @@ -52,9 +52,9 @@ pub enum RegisteredLimitCommands { impl RegisteredLimitCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/identity/v3/registered_limit/create.rs b/cli-cmd/identity/src/v3/registered_limit/create.rs similarity index 100% rename from openstack_cli/src/identity/v3/registered_limit/create.rs rename to cli-cmd/identity/src/v3/registered_limit/create.rs diff --git a/openstack_cli/src/identity/v3/registered_limit/delete.rs b/cli-cmd/identity/src/v3/registered_limit/delete.rs similarity index 100% rename from openstack_cli/src/identity/v3/registered_limit/delete.rs rename to cli-cmd/identity/src/v3/registered_limit/delete.rs diff --git a/openstack_cli/src/identity/v3/registered_limit/list.rs b/cli-cmd/identity/src/v3/registered_limit/list.rs similarity index 100% rename from openstack_cli/src/identity/v3/registered_limit/list.rs rename to cli-cmd/identity/src/v3/registered_limit/list.rs diff --git a/openstack_cli/src/identity/v3/registered_limit/set.rs b/cli-cmd/identity/src/v3/registered_limit/set.rs similarity index 100% rename from openstack_cli/src/identity/v3/registered_limit/set.rs rename to cli-cmd/identity/src/v3/registered_limit/set.rs diff --git a/openstack_cli/src/identity/v3/registered_limit/show.rs b/cli-cmd/identity/src/v3/registered_limit/show.rs similarity index 100% rename from openstack_cli/src/identity/v3/registered_limit/show.rs rename to cli-cmd/identity/src/v3/registered_limit/show.rs diff --git a/openstack_cli/src/identity/v3/role.rs b/cli-cmd/identity/src/v3/role.rs similarity index 94% rename from openstack_cli/src/identity/v3/role.rs rename to cli-cmd/identity/src/v3/role.rs index c546644c9..f4183b15b 100644 --- a/openstack_cli/src/identity/v3/role.rs +++ b/cli-cmd/identity/src/v3/role.rs @@ -18,10 +18,10 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; -use crate::identity::v3::role_assignment; -use crate::identity::v3::role_inference; +use crate::v3::role_assignment; +use crate::v3::role_inference; pub mod create; pub mod delete; @@ -66,9 +66,9 @@ pub enum RoleCommands { impl RoleCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/identity/v3/role/create.rs b/cli-cmd/identity/src/v3/role/create.rs similarity index 100% rename from openstack_cli/src/identity/v3/role/create.rs rename to cli-cmd/identity/src/v3/role/create.rs diff --git a/openstack_cli/src/identity/v3/role/delete.rs b/cli-cmd/identity/src/v3/role/delete.rs similarity index 100% rename from openstack_cli/src/identity/v3/role/delete.rs rename to cli-cmd/identity/src/v3/role/delete.rs diff --git a/openstack_cli/src/identity/v3/role/imply.rs b/cli-cmd/identity/src/v3/role/imply.rs similarity index 92% rename from openstack_cli/src/identity/v3/role/imply.rs rename to cli-cmd/identity/src/v3/role/imply.rs index 17b6b1ce9..157d3d790 100644 --- a/openstack_cli/src/identity/v3/role/imply.rs +++ b/cli-cmd/identity/src/v3/role/imply.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; pub mod delete; pub mod list; @@ -45,9 +45,9 @@ pub enum ImplyCommands { impl ImplyCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/identity/v3/role/imply/delete.rs b/cli-cmd/identity/src/v3/role/imply/delete.rs similarity index 100% rename from openstack_cli/src/identity/v3/role/imply/delete.rs rename to cli-cmd/identity/src/v3/role/imply/delete.rs diff --git a/openstack_cli/src/identity/v3/role/imply/list.rs b/cli-cmd/identity/src/v3/role/imply/list.rs similarity index 100% rename from openstack_cli/src/identity/v3/role/imply/list.rs rename to cli-cmd/identity/src/v3/role/imply/list.rs diff --git a/openstack_cli/src/identity/v3/role/imply/set.rs b/cli-cmd/identity/src/v3/role/imply/set.rs similarity index 100% rename from openstack_cli/src/identity/v3/role/imply/set.rs rename to cli-cmd/identity/src/v3/role/imply/set.rs diff --git a/openstack_cli/src/identity/v3/role/imply/show.rs b/cli-cmd/identity/src/v3/role/imply/show.rs similarity index 100% rename from openstack_cli/src/identity/v3/role/imply/show.rs rename to cli-cmd/identity/src/v3/role/imply/show.rs diff --git a/openstack_cli/src/identity/v3/role/list.rs b/cli-cmd/identity/src/v3/role/list.rs similarity index 100% rename from openstack_cli/src/identity/v3/role/list.rs rename to cli-cmd/identity/src/v3/role/list.rs diff --git a/openstack_cli/src/identity/v3/role/set.rs b/cli-cmd/identity/src/v3/role/set.rs similarity index 100% rename from openstack_cli/src/identity/v3/role/set.rs rename to cli-cmd/identity/src/v3/role/set.rs diff --git a/openstack_cli/src/identity/v3/role/show.rs b/cli-cmd/identity/src/v3/role/show.rs similarity index 100% rename from openstack_cli/src/identity/v3/role/show.rs rename to cli-cmd/identity/src/v3/role/show.rs diff --git a/openstack_cli/src/identity/v3/role_assignment.rs b/cli-cmd/identity/src/v3/role_assignment.rs similarity index 90% rename from openstack_cli/src/identity/v3/role_assignment.rs rename to cli-cmd/identity/src/v3/role_assignment.rs index 47e9dab82..30dca3655 100644 --- a/openstack_cli/src/identity/v3/role_assignment.rs +++ b/cli-cmd/identity/src/v3/role_assignment.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; pub mod list; @@ -38,9 +38,9 @@ pub enum RoleAssignmentCommands { impl RoleAssignmentCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/identity/v3/role_assignment/list.rs b/cli-cmd/identity/src/v3/role_assignment/list.rs similarity index 100% rename from openstack_cli/src/identity/v3/role_assignment/list.rs rename to cli-cmd/identity/src/v3/role_assignment/list.rs diff --git a/openstack_cli/src/identity/v3/role_inference.rs b/cli-cmd/identity/src/v3/role_inference.rs similarity index 91% rename from openstack_cli/src/identity/v3/role_inference.rs rename to cli-cmd/identity/src/v3/role_inference.rs index 682f17d2b..5b5631b48 100644 --- a/openstack_cli/src/identity/v3/role_inference.rs +++ b/cli-cmd/identity/src/v3/role_inference.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; pub mod list; @@ -40,9 +40,9 @@ pub enum RoleInferenceCommands { impl RoleInferenceCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/identity/v3/role_inference/list.rs b/cli-cmd/identity/src/v3/role_inference/list.rs similarity index 100% rename from openstack_cli/src/identity/v3/role_inference/list.rs rename to cli-cmd/identity/src/v3/role_inference/list.rs diff --git a/openstack_cli/src/identity/v3/s3token/create.rs b/cli-cmd/identity/src/v3/s3token/create.rs similarity index 100% rename from openstack_cli/src/identity/v3/s3token/create.rs rename to cli-cmd/identity/src/v3/s3token/create.rs diff --git a/openstack_cli/src/identity/v3/s3token/get.rs b/cli-cmd/identity/src/v3/s3token/get.rs similarity index 100% rename from openstack_cli/src/identity/v3/s3token/get.rs rename to cli-cmd/identity/src/v3/s3token/get.rs diff --git a/openstack_cli/src/identity/v3/service.rs b/cli-cmd/identity/src/v3/service.rs similarity index 94% rename from openstack_cli/src/identity/v3/service.rs rename to cli-cmd/identity/src/v3/service.rs index 1b53be483..d76bbd95e 100644 --- a/openstack_cli/src/identity/v3/service.rs +++ b/cli-cmd/identity/src/v3/service.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; pub mod create; pub mod delete; @@ -52,9 +52,9 @@ pub enum ServiceCommands { impl ServiceCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/identity/v3/service/create.rs b/cli-cmd/identity/src/v3/service/create.rs similarity index 100% rename from openstack_cli/src/identity/v3/service/create.rs rename to cli-cmd/identity/src/v3/service/create.rs diff --git a/openstack_cli/src/identity/v3/service/delete.rs b/cli-cmd/identity/src/v3/service/delete.rs similarity index 100% rename from openstack_cli/src/identity/v3/service/delete.rs rename to cli-cmd/identity/src/v3/service/delete.rs diff --git a/openstack_cli/src/identity/v3/service/list.rs b/cli-cmd/identity/src/v3/service/list.rs similarity index 100% rename from openstack_cli/src/identity/v3/service/list.rs rename to cli-cmd/identity/src/v3/service/list.rs diff --git a/openstack_cli/src/identity/v3/service/set.rs b/cli-cmd/identity/src/v3/service/set.rs similarity index 100% rename from openstack_cli/src/identity/v3/service/set.rs rename to cli-cmd/identity/src/v3/service/set.rs diff --git a/openstack_cli/src/identity/v3/service/show.rs b/cli-cmd/identity/src/v3/service/show.rs similarity index 100% rename from openstack_cli/src/identity/v3/service/show.rs rename to cli-cmd/identity/src/v3/service/show.rs diff --git a/openstack_cli/src/identity/v3/system/group/role/delete.rs b/cli-cmd/identity/src/v3/system/group/role/delete.rs similarity index 100% rename from openstack_cli/src/identity/v3/system/group/role/delete.rs rename to cli-cmd/identity/src/v3/system/group/role/delete.rs diff --git a/openstack_cli/src/identity/v3/system/group/role/list.rs b/cli-cmd/identity/src/v3/system/group/role/list.rs similarity index 100% rename from openstack_cli/src/identity/v3/system/group/role/list.rs rename to cli-cmd/identity/src/v3/system/group/role/list.rs diff --git a/openstack_cli/src/identity/v3/system/group/role/set.rs b/cli-cmd/identity/src/v3/system/group/role/set.rs similarity index 100% rename from openstack_cli/src/identity/v3/system/group/role/set.rs rename to cli-cmd/identity/src/v3/system/group/role/set.rs diff --git a/openstack_cli/src/identity/v3/system/group/role/show.rs b/cli-cmd/identity/src/v3/system/group/role/show.rs similarity index 100% rename from openstack_cli/src/identity/v3/system/group/role/show.rs rename to cli-cmd/identity/src/v3/system/group/role/show.rs diff --git a/openstack_cli/src/identity/v3/system/user/role/delete.rs b/cli-cmd/identity/src/v3/system/user/role/delete.rs similarity index 100% rename from openstack_cli/src/identity/v3/system/user/role/delete.rs rename to cli-cmd/identity/src/v3/system/user/role/delete.rs diff --git a/openstack_cli/src/identity/v3/system/user/role/list.rs b/cli-cmd/identity/src/v3/system/user/role/list.rs similarity index 100% rename from openstack_cli/src/identity/v3/system/user/role/list.rs rename to cli-cmd/identity/src/v3/system/user/role/list.rs diff --git a/openstack_cli/src/identity/v3/system/user/role/set.rs b/cli-cmd/identity/src/v3/system/user/role/set.rs similarity index 100% rename from openstack_cli/src/identity/v3/system/user/role/set.rs rename to cli-cmd/identity/src/v3/system/user/role/set.rs diff --git a/openstack_cli/src/identity/v3/system/user/role/show.rs b/cli-cmd/identity/src/v3/system/user/role/show.rs similarity index 100% rename from openstack_cli/src/identity/v3/system/user/role/show.rs rename to cli-cmd/identity/src/v3/system/user/role/show.rs diff --git a/openstack_cli/src/identity/v3/user.rs b/cli-cmd/identity/src/v3/user.rs similarity index 95% rename from openstack_cli/src/identity/v3/user.rs rename to cli-cmd/identity/src/v3/user.rs index 3afbb4c85..388d72243 100644 --- a/openstack_cli/src/identity/v3/user.rs +++ b/cli-cmd/identity/src/v3/user.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; pub mod access_rule; pub mod application_credential; @@ -70,9 +70,9 @@ pub enum UserCommands { impl UserCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/identity/v3/user/access_rule.rs b/cli-cmd/identity/src/v3/user/access_rule.rs similarity index 96% rename from openstack_cli/src/identity/v3/user/access_rule.rs rename to cli-cmd/identity/src/v3/user/access_rule.rs index f24eb2a24..68ab4a28c 100644 --- a/openstack_cli/src/identity/v3/user/access_rule.rs +++ b/cli-cmd/identity/src/v3/user/access_rule.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; pub mod delete; pub mod list; @@ -93,9 +93,9 @@ pub enum AccessRuleCommands { impl AccessRuleCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/identity/v3/user/access_rule/delete.rs b/cli-cmd/identity/src/v3/user/access_rule/delete.rs similarity index 100% rename from openstack_cli/src/identity/v3/user/access_rule/delete.rs rename to cli-cmd/identity/src/v3/user/access_rule/delete.rs diff --git a/openstack_cli/src/identity/v3/user/access_rule/list.rs b/cli-cmd/identity/src/v3/user/access_rule/list.rs similarity index 100% rename from openstack_cli/src/identity/v3/user/access_rule/list.rs rename to cli-cmd/identity/src/v3/user/access_rule/list.rs diff --git a/openstack_cli/src/identity/v3/user/access_rule/show.rs b/cli-cmd/identity/src/v3/user/access_rule/show.rs similarity index 100% rename from openstack_cli/src/identity/v3/user/access_rule/show.rs rename to cli-cmd/identity/src/v3/user/access_rule/show.rs diff --git a/openstack_cli/src/identity/v3/user/application_credential.rs b/cli-cmd/identity/src/v3/user/application_credential.rs similarity index 97% rename from openstack_cli/src/identity/v3/user/application_credential.rs rename to cli-cmd/identity/src/v3/user/application_credential.rs index 5137b6449..1b391776d 100644 --- a/openstack_cli/src/identity/v3/user/application_credential.rs +++ b/cli-cmd/identity/src/v3/user/application_credential.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; pub mod create; pub mod delete; @@ -122,9 +122,9 @@ pub enum ApplicationCredentialCommands { impl ApplicationCredentialCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/identity/v3/user/application_credential/create.rs b/cli-cmd/identity/src/v3/user/application_credential/create.rs similarity index 100% rename from openstack_cli/src/identity/v3/user/application_credential/create.rs rename to cli-cmd/identity/src/v3/user/application_credential/create.rs diff --git a/openstack_cli/src/identity/v3/user/application_credential/delete.rs b/cli-cmd/identity/src/v3/user/application_credential/delete.rs similarity index 100% rename from openstack_cli/src/identity/v3/user/application_credential/delete.rs rename to cli-cmd/identity/src/v3/user/application_credential/delete.rs diff --git a/openstack_cli/src/identity/v3/user/application_credential/list.rs b/cli-cmd/identity/src/v3/user/application_credential/list.rs similarity index 100% rename from openstack_cli/src/identity/v3/user/application_credential/list.rs rename to cli-cmd/identity/src/v3/user/application_credential/list.rs diff --git a/openstack_cli/src/identity/v3/user/application_credential/show.rs b/cli-cmd/identity/src/v3/user/application_credential/show.rs similarity index 100% rename from openstack_cli/src/identity/v3/user/application_credential/show.rs rename to cli-cmd/identity/src/v3/user/application_credential/show.rs diff --git a/openstack_cli/src/identity/v3/user/create.rs b/cli-cmd/identity/src/v3/user/create.rs similarity index 100% rename from openstack_cli/src/identity/v3/user/create.rs rename to cli-cmd/identity/src/v3/user/create.rs diff --git a/openstack_cli/src/identity/v3/user/credential/os_ec2/create.rs b/cli-cmd/identity/src/v3/user/credential/os_ec2/create.rs similarity index 100% rename from openstack_cli/src/identity/v3/user/credential/os_ec2/create.rs rename to cli-cmd/identity/src/v3/user/credential/os_ec2/create.rs diff --git a/openstack_cli/src/identity/v3/user/credential/os_ec2/delete.rs b/cli-cmd/identity/src/v3/user/credential/os_ec2/delete.rs similarity index 100% rename from openstack_cli/src/identity/v3/user/credential/os_ec2/delete.rs rename to cli-cmd/identity/src/v3/user/credential/os_ec2/delete.rs diff --git a/openstack_cli/src/identity/v3/user/credential/os_ec2/list.rs b/cli-cmd/identity/src/v3/user/credential/os_ec2/list.rs similarity index 100% rename from openstack_cli/src/identity/v3/user/credential/os_ec2/list.rs rename to cli-cmd/identity/src/v3/user/credential/os_ec2/list.rs diff --git a/openstack_cli/src/identity/v3/user/credential/os_ec2/show.rs b/cli-cmd/identity/src/v3/user/credential/os_ec2/show.rs similarity index 100% rename from openstack_cli/src/identity/v3/user/credential/os_ec2/show.rs rename to cli-cmd/identity/src/v3/user/credential/os_ec2/show.rs diff --git a/openstack_cli/src/identity/v3/user/delete.rs b/cli-cmd/identity/src/v3/user/delete.rs similarity index 100% rename from openstack_cli/src/identity/v3/user/delete.rs rename to cli-cmd/identity/src/v3/user/delete.rs diff --git a/openstack_cli/src/identity/v3/user/group/list.rs b/cli-cmd/identity/src/v3/user/group/list.rs similarity index 100% rename from openstack_cli/src/identity/v3/user/group/list.rs rename to cli-cmd/identity/src/v3/user/group/list.rs diff --git a/openstack_cli/src/identity/v3/user/list.rs b/cli-cmd/identity/src/v3/user/list.rs similarity index 100% rename from openstack_cli/src/identity/v3/user/list.rs rename to cli-cmd/identity/src/v3/user/list.rs diff --git a/openstack_cli/src/identity/v3/user/os_oauth1/access_token/delete.rs b/cli-cmd/identity/src/v3/user/os_oauth1/access_token/delete.rs similarity index 100% rename from openstack_cli/src/identity/v3/user/os_oauth1/access_token/delete.rs rename to cli-cmd/identity/src/v3/user/os_oauth1/access_token/delete.rs diff --git a/openstack_cli/src/identity/v3/user/os_oauth1/access_token/list.rs b/cli-cmd/identity/src/v3/user/os_oauth1/access_token/list.rs similarity index 100% rename from openstack_cli/src/identity/v3/user/os_oauth1/access_token/list.rs rename to cli-cmd/identity/src/v3/user/os_oauth1/access_token/list.rs diff --git a/openstack_cli/src/identity/v3/user/os_oauth1/access_token/role/list.rs b/cli-cmd/identity/src/v3/user/os_oauth1/access_token/role/list.rs similarity index 100% rename from openstack_cli/src/identity/v3/user/os_oauth1/access_token/role/list.rs rename to cli-cmd/identity/src/v3/user/os_oauth1/access_token/role/list.rs diff --git a/openstack_cli/src/identity/v3/user/os_oauth1/access_token/role/show.rs b/cli-cmd/identity/src/v3/user/os_oauth1/access_token/role/show.rs similarity index 100% rename from openstack_cli/src/identity/v3/user/os_oauth1/access_token/role/show.rs rename to cli-cmd/identity/src/v3/user/os_oauth1/access_token/role/show.rs diff --git a/openstack_cli/src/identity/v3/user/os_oauth1/access_token/show.rs b/cli-cmd/identity/src/v3/user/os_oauth1/access_token/show.rs similarity index 100% rename from openstack_cli/src/identity/v3/user/os_oauth1/access_token/show.rs rename to cli-cmd/identity/src/v3/user/os_oauth1/access_token/show.rs diff --git a/openstack_cli/src/identity/v3/user/password.rs b/cli-cmd/identity/src/v3/user/password.rs similarity index 91% rename from openstack_cli/src/identity/v3/user/password.rs rename to cli-cmd/identity/src/v3/user/password.rs index 153eccb87..8889e8b30 100644 --- a/openstack_cli/src/identity/v3/user/password.rs +++ b/cli-cmd/identity/src/v3/user/password.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; pub mod set; @@ -41,9 +41,9 @@ pub enum PasswordCommands { impl PasswordCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/identity/v3/user/password/set.rs b/cli-cmd/identity/src/v3/user/password/set.rs similarity index 100% rename from openstack_cli/src/identity/v3/user/password/set.rs rename to cli-cmd/identity/src/v3/user/password/set.rs diff --git a/openstack_cli/src/identity/v3/user/project/list.rs b/cli-cmd/identity/src/v3/user/project/list.rs similarity index 100% rename from openstack_cli/src/identity/v3/user/project/list.rs rename to cli-cmd/identity/src/v3/user/project/list.rs diff --git a/openstack_cli/src/identity/v3/user/set.rs b/cli-cmd/identity/src/v3/user/set.rs similarity index 100% rename from openstack_cli/src/identity/v3/user/set.rs rename to cli-cmd/identity/src/v3/user/set.rs diff --git a/openstack_cli/src/identity/v3/user/show.rs b/cli-cmd/identity/src/v3/user/show.rs similarity index 100% rename from openstack_cli/src/identity/v3/user/show.rs rename to cli-cmd/identity/src/v3/user/show.rs diff --git a/openstack_cli/src/identity/v3/version/get.rs b/cli-cmd/identity/src/v3/version/get.rs similarity index 100% rename from openstack_cli/src/identity/v3/version/get.rs rename to cli-cmd/identity/src/v3/version/get.rs diff --git a/openstack_cli/src/identity/v4.rs b/cli-cmd/identity/src/v4.rs similarity index 94% rename from openstack_cli/src/identity/v4.rs rename to cli-cmd/identity/src/v4.rs index 109ad5f1f..14f8ca900 100644 --- a/openstack_cli/src/identity/v4.rs +++ b/cli-cmd/identity/src/v4.rs @@ -17,7 +17,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; pub mod federation; pub mod user; @@ -53,9 +53,9 @@ pub enum IdentityCommands { impl IdentityCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/identity/v4/federation/identity_provider.rs b/cli-cmd/identity/src/v4/federation/identity_provider.rs similarity index 93% rename from openstack_cli/src/identity/v4/federation/identity_provider.rs rename to cli-cmd/identity/src/v4/federation/identity_provider.rs index 9aafcad8b..3ed49479e 100644 --- a/openstack_cli/src/identity/v4/federation/identity_provider.rs +++ b/cli-cmd/identity/src/v4/federation/identity_provider.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; pub mod create; pub mod delete; @@ -47,9 +47,9 @@ pub enum IdentityProviderCommands { impl IdentityProviderCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/identity/v4/federation/identity_provider/create.rs b/cli-cmd/identity/src/v4/federation/identity_provider/create.rs similarity index 100% rename from openstack_cli/src/identity/v4/federation/identity_provider/create.rs rename to cli-cmd/identity/src/v4/federation/identity_provider/create.rs diff --git a/openstack_cli/src/identity/v4/federation/identity_provider/delete.rs b/cli-cmd/identity/src/v4/federation/identity_provider/delete.rs similarity index 100% rename from openstack_cli/src/identity/v4/federation/identity_provider/delete.rs rename to cli-cmd/identity/src/v4/federation/identity_provider/delete.rs diff --git a/openstack_cli/src/identity/v4/federation/identity_provider/list.rs b/cli-cmd/identity/src/v4/federation/identity_provider/list.rs similarity index 100% rename from openstack_cli/src/identity/v4/federation/identity_provider/list.rs rename to cli-cmd/identity/src/v4/federation/identity_provider/list.rs diff --git a/openstack_cli/src/identity/v4/federation/identity_provider/set.rs b/cli-cmd/identity/src/v4/federation/identity_provider/set.rs similarity index 100% rename from openstack_cli/src/identity/v4/federation/identity_provider/set.rs rename to cli-cmd/identity/src/v4/federation/identity_provider/set.rs diff --git a/openstack_cli/src/identity/v4/federation/identity_provider/show.rs b/cli-cmd/identity/src/v4/federation/identity_provider/show.rs similarity index 100% rename from openstack_cli/src/identity/v4/federation/identity_provider/show.rs rename to cli-cmd/identity/src/v4/federation/identity_provider/show.rs diff --git a/openstack_cli/src/identity/v4/federation/mapping.rs b/cli-cmd/identity/src/v4/federation/mapping.rs similarity index 93% rename from openstack_cli/src/identity/v4/federation/mapping.rs rename to cli-cmd/identity/src/v4/federation/mapping.rs index 560a27c02..338563e8e 100644 --- a/openstack_cli/src/identity/v4/federation/mapping.rs +++ b/cli-cmd/identity/src/v4/federation/mapping.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; pub mod create; pub mod delete; @@ -47,9 +47,9 @@ pub enum MappingCommands { impl MappingCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/identity/v4/federation/mapping/create.rs b/cli-cmd/identity/src/v4/federation/mapping/create.rs similarity index 100% rename from openstack_cli/src/identity/v4/federation/mapping/create.rs rename to cli-cmd/identity/src/v4/federation/mapping/create.rs diff --git a/openstack_cli/src/identity/v4/federation/mapping/delete.rs b/cli-cmd/identity/src/v4/federation/mapping/delete.rs similarity index 100% rename from openstack_cli/src/identity/v4/federation/mapping/delete.rs rename to cli-cmd/identity/src/v4/federation/mapping/delete.rs diff --git a/openstack_cli/src/identity/v4/federation/mapping/list.rs b/cli-cmd/identity/src/v4/federation/mapping/list.rs similarity index 100% rename from openstack_cli/src/identity/v4/federation/mapping/list.rs rename to cli-cmd/identity/src/v4/federation/mapping/list.rs diff --git a/openstack_cli/src/identity/v4/federation/mapping/set.rs b/cli-cmd/identity/src/v4/federation/mapping/set.rs similarity index 100% rename from openstack_cli/src/identity/v4/federation/mapping/set.rs rename to cli-cmd/identity/src/v4/federation/mapping/set.rs diff --git a/openstack_cli/src/identity/v4/federation/mapping/show.rs b/cli-cmd/identity/src/v4/federation/mapping/show.rs similarity index 100% rename from openstack_cli/src/identity/v4/federation/mapping/show.rs rename to cli-cmd/identity/src/v4/federation/mapping/show.rs diff --git a/openstack_cli/src/identity/v4/federation/mod.rs b/cli-cmd/identity/src/v4/federation/mod.rs similarity index 91% rename from openstack_cli/src/identity/v4/federation/mod.rs rename to cli-cmd/identity/src/v4/federation/mod.rs index 2240db8c6..54e17fbe3 100644 --- a/openstack_cli/src/identity/v4/federation/mod.rs +++ b/cli-cmd/identity/src/v4/federation/mod.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; pub mod identity_provider; pub mod mapping; @@ -41,9 +41,9 @@ pub enum FederationCommands { impl FederationCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/identity/v4/user/mod.rs b/cli-cmd/identity/src/v4/user/mod.rs similarity index 91% rename from openstack_cli/src/identity/v4/user/mod.rs rename to cli-cmd/identity/src/v4/user/mod.rs index d6522b837..00bcbe7f2 100644 --- a/openstack_cli/src/identity/v4/user/mod.rs +++ b/cli-cmd/identity/src/v4/user/mod.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; #[cfg(feature = "passkey")] pub mod passkey; @@ -41,9 +41,9 @@ pub enum UserCommands { impl UserCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/identity/v4/user/passkey.rs b/cli-cmd/identity/src/v4/user/passkey.rs similarity index 90% rename from openstack_cli/src/identity/v4/user/passkey.rs rename to cli-cmd/identity/src/v4/user/passkey.rs index 0a59138c6..cdd999091 100644 --- a/openstack_cli/src/identity/v4/user/passkey.rs +++ b/cli-cmd/identity/src/v4/user/passkey.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; pub mod register; @@ -39,9 +39,9 @@ pub enum PasskeyCommands { impl PasskeyCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/identity/v4/user/passkey/register.rs b/cli-cmd/identity/src/v4/user/passkey/register.rs similarity index 99% rename from openstack_cli/src/identity/v4/user/passkey/register.rs rename to cli-cmd/identity/src/v4/user/passkey/register.rs index e34c9e4f3..06693f943 100644 --- a/openstack_cli/src/identity/v4/user/passkey/register.rs +++ b/cli-cmd/identity/src/v4/user/passkey/register.rs @@ -27,12 +27,9 @@ use tracing::{error, info, warn}; use webauthn_authenticator_rs::WebauthnAuthenticator; use webauthn_authenticator_rs::prelude::Url; +use openstack_cli_core::output::OutputProcessor; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; use openstack_sdk::AsyncOpenStack; - -use crate::Cli; -use crate::OpenStackCliError; -use crate::output::OutputProcessor; - use openstack_sdk::api::QueryAsync; use openstack_sdk::api::find_by_name; use openstack_sdk::api::identity::v3::user::find as find_user; @@ -449,9 +446,9 @@ fn get_finish_registration_endpoint( impl PasskeyCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, client: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { info!("Create Passkey"); diff --git a/cli-cmd/image/Cargo.toml b/cli-cmd/image/Cargo.toml new file mode 100644 index 000000000..0ff557e8d --- /dev/null +++ b/cli-cmd/image/Cargo.toml @@ -0,0 +1,25 @@ +[package] +name = "openstack-cli-image" +description = "OpenStack CLI Image commands" +version = "0.1.0" +license.workspace = true +edition.workspace = true +authors.workspace = true +rust-version.workspace = true +homepage.workspace = true +repository.workspace = true + +[dependencies] +clap = { workspace = true } +json-patch = { workspace = true } +openstack-cli-core = { version = "0.13", path = "../../cli-core/" } +openstack_sdk = { path="../../openstack_sdk", version = "^0.22", default-features = false, features = ["async", "identity", "image"] } +openstack-sdk-core = { path="../../sdk-core", version = "^0.22" } +openstack_types = { path="../../openstack_types", version = "^0.22" } +eyre = { workspace = true } +http = { workspace = true } +serde_json = {workspace = true} +tracing = { workspace = true} + +[lints] +workspace = true diff --git a/openstack_cli/src/image/mod.rs b/cli-cmd/image/src/lib.rs similarity index 100% rename from openstack_cli/src/image/mod.rs rename to cli-cmd/image/src/lib.rs diff --git a/openstack_cli/src/image/v2.rs b/cli-cmd/image/src/v2.rs similarity index 92% rename from openstack_cli/src/image/v2.rs rename to cli-cmd/image/src/v2.rs index f32350afc..9dc86a92b 100644 --- a/openstack_cli/src/image/v2.rs +++ b/cli-cmd/image/src/v2.rs @@ -16,10 +16,9 @@ use clap::{Parser, Subcommand}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; use openstack_sdk::{AsyncOpenStack, types::ServiceType}; -use crate::{Cli, OpenStackCliError}; - pub mod image; pub mod metadef; pub mod schema; @@ -46,9 +45,9 @@ pub enum ImageCommands { impl ImageCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { session diff --git a/openstack_cli/src/image/v2/cache/delete.rs b/cli-cmd/image/src/v2/cache/delete.rs similarity index 100% rename from openstack_cli/src/image/v2/cache/delete.rs rename to cli-cmd/image/src/v2/cache/delete.rs diff --git a/openstack_cli/src/image/v2/cache/delete_all.rs b/cli-cmd/image/src/v2/cache/delete_all.rs similarity index 100% rename from openstack_cli/src/image/v2/cache/delete_all.rs rename to cli-cmd/image/src/v2/cache/delete_all.rs diff --git a/openstack_cli/src/image/v2/cache/list.rs b/cli-cmd/image/src/v2/cache/list.rs similarity index 100% rename from openstack_cli/src/image/v2/cache/list.rs rename to cli-cmd/image/src/v2/cache/list.rs diff --git a/openstack_cli/src/image/v2/cache/set.rs b/cli-cmd/image/src/v2/cache/set.rs similarity index 100% rename from openstack_cli/src/image/v2/cache/set.rs rename to cli-cmd/image/src/v2/cache/set.rs diff --git a/openstack_cli/src/image/v2/image.rs b/cli-cmd/image/src/v2/image.rs similarity index 95% rename from openstack_cli/src/image/v2/image.rs rename to cli-cmd/image/src/v2/image.rs index 8707c85d6..b50329545 100644 --- a/openstack_cli/src/image/v2/image.rs +++ b/cli-cmd/image/src/v2/image.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; pub mod create; pub mod deactivate; @@ -66,9 +66,9 @@ pub enum ImageCommands { impl ImageCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/image/v2/image/create.rs b/cli-cmd/image/src/v2/image/create.rs similarity index 100% rename from openstack_cli/src/image/v2/image/create.rs rename to cli-cmd/image/src/v2/image/create.rs diff --git a/openstack_cli/src/image/v2/image/deactivate.rs b/cli-cmd/image/src/v2/image/deactivate.rs similarity index 100% rename from openstack_cli/src/image/v2/image/deactivate.rs rename to cli-cmd/image/src/v2/image/deactivate.rs diff --git a/openstack_cli/src/image/v2/image/delete.rs b/cli-cmd/image/src/v2/image/delete.rs similarity index 100% rename from openstack_cli/src/image/v2/image/delete.rs rename to cli-cmd/image/src/v2/image/delete.rs diff --git a/openstack_cli/src/image/v2/image/file/download.rs b/cli-cmd/image/src/v2/image/file/download.rs similarity index 100% rename from openstack_cli/src/image/v2/image/file/download.rs rename to cli-cmd/image/src/v2/image/file/download.rs diff --git a/openstack_cli/src/image/v2/image/file/upload.rs b/cli-cmd/image/src/v2/image/file/upload.rs similarity index 100% rename from openstack_cli/src/image/v2/image/file/upload.rs rename to cli-cmd/image/src/v2/image/file/upload.rs diff --git a/openstack_cli/src/image/v2/image/import/create.rs b/cli-cmd/image/src/v2/image/import/create.rs similarity index 100% rename from openstack_cli/src/image/v2/image/import/create.rs rename to cli-cmd/image/src/v2/image/import/create.rs diff --git a/openstack_cli/src/image/v2/image/list.rs b/cli-cmd/image/src/v2/image/list.rs similarity index 100% rename from openstack_cli/src/image/v2/image/list.rs rename to cli-cmd/image/src/v2/image/list.rs diff --git a/openstack_cli/src/image/v2/image/location/create.rs b/cli-cmd/image/src/v2/image/location/create.rs similarity index 100% rename from openstack_cli/src/image/v2/image/location/create.rs rename to cli-cmd/image/src/v2/image/location/create.rs diff --git a/openstack_cli/src/image/v2/image/location/list.rs b/cli-cmd/image/src/v2/image/location/list.rs similarity index 100% rename from openstack_cli/src/image/v2/image/location/list.rs rename to cli-cmd/image/src/v2/image/location/list.rs diff --git a/openstack_cli/src/image/v2/image/member/create.rs b/cli-cmd/image/src/v2/image/member/create.rs similarity index 100% rename from openstack_cli/src/image/v2/image/member/create.rs rename to cli-cmd/image/src/v2/image/member/create.rs diff --git a/openstack_cli/src/image/v2/image/member/delete.rs b/cli-cmd/image/src/v2/image/member/delete.rs similarity index 100% rename from openstack_cli/src/image/v2/image/member/delete.rs rename to cli-cmd/image/src/v2/image/member/delete.rs diff --git a/openstack_cli/src/image/v2/image/member/list.rs b/cli-cmd/image/src/v2/image/member/list.rs similarity index 100% rename from openstack_cli/src/image/v2/image/member/list.rs rename to cli-cmd/image/src/v2/image/member/list.rs diff --git a/openstack_cli/src/image/v2/image/member/set.rs b/cli-cmd/image/src/v2/image/member/set.rs similarity index 100% rename from openstack_cli/src/image/v2/image/member/set.rs rename to cli-cmd/image/src/v2/image/member/set.rs diff --git a/openstack_cli/src/image/v2/image/member/show.rs b/cli-cmd/image/src/v2/image/member/show.rs similarity index 100% rename from openstack_cli/src/image/v2/image/member/show.rs rename to cli-cmd/image/src/v2/image/member/show.rs diff --git a/openstack_cli/src/image/v2/image/patch.rs b/cli-cmd/image/src/v2/image/patch.rs similarity index 100% rename from openstack_cli/src/image/v2/image/patch.rs rename to cli-cmd/image/src/v2/image/patch.rs diff --git a/openstack_cli/src/image/v2/image/reactivate.rs b/cli-cmd/image/src/v2/image/reactivate.rs similarity index 100% rename from openstack_cli/src/image/v2/image/reactivate.rs rename to cli-cmd/image/src/v2/image/reactivate.rs diff --git a/openstack_cli/src/image/v2/image/show.rs b/cli-cmd/image/src/v2/image/show.rs similarity index 100% rename from openstack_cli/src/image/v2/image/show.rs rename to cli-cmd/image/src/v2/image/show.rs diff --git a/openstack_cli/src/image/v2/image/stage/stage.rs b/cli-cmd/image/src/v2/image/stage/stage.rs similarity index 100% rename from openstack_cli/src/image/v2/image/stage/stage.rs rename to cli-cmd/image/src/v2/image/stage/stage.rs diff --git a/openstack_cli/src/image/v2/image/tag/delete.rs b/cli-cmd/image/src/v2/image/tag/delete.rs similarity index 100% rename from openstack_cli/src/image/v2/image/tag/delete.rs rename to cli-cmd/image/src/v2/image/tag/delete.rs diff --git a/openstack_cli/src/image/v2/image/tag/set.rs b/cli-cmd/image/src/v2/image/tag/set.rs similarity index 100% rename from openstack_cli/src/image/v2/image/tag/set.rs rename to cli-cmd/image/src/v2/image/tag/set.rs diff --git a/openstack_cli/src/image/v2/image/task/list.rs b/cli-cmd/image/src/v2/image/task/list.rs similarity index 100% rename from openstack_cli/src/image/v2/image/task/list.rs rename to cli-cmd/image/src/v2/image/task/list.rs diff --git a/openstack_cli/src/image/v2/info/import/get.rs b/cli-cmd/image/src/v2/info/import/get.rs similarity index 100% rename from openstack_cli/src/image/v2/info/import/get.rs rename to cli-cmd/image/src/v2/info/import/get.rs diff --git a/openstack_cli/src/image/v2/info/store/list.rs b/cli-cmd/image/src/v2/info/store/list.rs similarity index 100% rename from openstack_cli/src/image/v2/info/store/list.rs rename to cli-cmd/image/src/v2/info/store/list.rs diff --git a/openstack_cli/src/image/v2/info/usage/list.rs b/cli-cmd/image/src/v2/info/usage/list.rs similarity index 100% rename from openstack_cli/src/image/v2/info/usage/list.rs rename to cli-cmd/image/src/v2/info/usage/list.rs diff --git a/openstack_cli/src/image/v2/metadef.rs b/cli-cmd/image/src/v2/metadef.rs similarity index 95% rename from openstack_cli/src/image/v2/metadef.rs rename to cli-cmd/image/src/v2/metadef.rs index 733c34f76..aed75a51f 100644 --- a/openstack_cli/src/image/v2/metadef.rs +++ b/cli-cmd/image/src/v2/metadef.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; pub mod namespace; pub mod resource_type; @@ -67,9 +67,9 @@ pub enum MetadefCommands { impl MetadefCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/image/v2/metadef/namespace.rs b/cli-cmd/image/src/v2/metadef/namespace.rs similarity index 95% rename from openstack_cli/src/image/v2/metadef/namespace.rs rename to cli-cmd/image/src/v2/metadef/namespace.rs index bc3e6e578..c0105a39c 100644 --- a/openstack_cli/src/image/v2/metadef/namespace.rs +++ b/cli-cmd/image/src/v2/metadef/namespace.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; pub mod create; pub mod delete; @@ -59,9 +59,9 @@ pub enum NamespaceCommands { impl NamespaceCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/image/v2/metadef/namespace/create.rs b/cli-cmd/image/src/v2/metadef/namespace/create.rs similarity index 100% rename from openstack_cli/src/image/v2/metadef/namespace/create.rs rename to cli-cmd/image/src/v2/metadef/namespace/create.rs diff --git a/openstack_cli/src/image/v2/metadef/namespace/delete.rs b/cli-cmd/image/src/v2/metadef/namespace/delete.rs similarity index 100% rename from openstack_cli/src/image/v2/metadef/namespace/delete.rs rename to cli-cmd/image/src/v2/metadef/namespace/delete.rs diff --git a/openstack_cli/src/image/v2/metadef/namespace/list.rs b/cli-cmd/image/src/v2/metadef/namespace/list.rs similarity index 100% rename from openstack_cli/src/image/v2/metadef/namespace/list.rs rename to cli-cmd/image/src/v2/metadef/namespace/list.rs diff --git a/openstack_cli/src/image/v2/metadef/namespace/object.rs b/cli-cmd/image/src/v2/metadef/namespace/object.rs similarity index 93% rename from openstack_cli/src/image/v2/metadef/namespace/object.rs rename to cli-cmd/image/src/v2/metadef/namespace/object.rs index f90292ac6..14e419662 100644 --- a/openstack_cli/src/image/v2/metadef/namespace/object.rs +++ b/cli-cmd/image/src/v2/metadef/namespace/object.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; mod create; mod delete; @@ -51,9 +51,9 @@ pub enum ObjectCommands { impl ObjectCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/image/v2/metadef/namespace/object/create.rs b/cli-cmd/image/src/v2/metadef/namespace/object/create.rs similarity index 100% rename from openstack_cli/src/image/v2/metadef/namespace/object/create.rs rename to cli-cmd/image/src/v2/metadef/namespace/object/create.rs diff --git a/openstack_cli/src/image/v2/metadef/namespace/object/delete.rs b/cli-cmd/image/src/v2/metadef/namespace/object/delete.rs similarity index 100% rename from openstack_cli/src/image/v2/metadef/namespace/object/delete.rs rename to cli-cmd/image/src/v2/metadef/namespace/object/delete.rs diff --git a/openstack_cli/src/image/v2/metadef/namespace/object/delete_all.rs b/cli-cmd/image/src/v2/metadef/namespace/object/delete_all.rs similarity index 100% rename from openstack_cli/src/image/v2/metadef/namespace/object/delete_all.rs rename to cli-cmd/image/src/v2/metadef/namespace/object/delete_all.rs diff --git a/openstack_cli/src/image/v2/metadef/namespace/object/list.rs b/cli-cmd/image/src/v2/metadef/namespace/object/list.rs similarity index 100% rename from openstack_cli/src/image/v2/metadef/namespace/object/list.rs rename to cli-cmd/image/src/v2/metadef/namespace/object/list.rs diff --git a/openstack_cli/src/image/v2/metadef/namespace/object/set.rs b/cli-cmd/image/src/v2/metadef/namespace/object/set.rs similarity index 100% rename from openstack_cli/src/image/v2/metadef/namespace/object/set.rs rename to cli-cmd/image/src/v2/metadef/namespace/object/set.rs diff --git a/openstack_cli/src/image/v2/metadef/namespace/object/show.rs b/cli-cmd/image/src/v2/metadef/namespace/object/show.rs similarity index 100% rename from openstack_cli/src/image/v2/metadef/namespace/object/show.rs rename to cli-cmd/image/src/v2/metadef/namespace/object/show.rs diff --git a/openstack_cli/src/image/v2/metadef/namespace/property.rs b/cli-cmd/image/src/v2/metadef/namespace/property.rs similarity index 93% rename from openstack_cli/src/image/v2/metadef/namespace/property.rs rename to cli-cmd/image/src/v2/metadef/namespace/property.rs index f535f4032..fff6415cc 100644 --- a/openstack_cli/src/image/v2/metadef/namespace/property.rs +++ b/cli-cmd/image/src/v2/metadef/namespace/property.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; mod create; mod delete; @@ -51,9 +51,9 @@ pub enum PropertyCommands { impl PropertyCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/image/v2/metadef/namespace/property/create.rs b/cli-cmd/image/src/v2/metadef/namespace/property/create.rs similarity index 100% rename from openstack_cli/src/image/v2/metadef/namespace/property/create.rs rename to cli-cmd/image/src/v2/metadef/namespace/property/create.rs diff --git a/openstack_cli/src/image/v2/metadef/namespace/property/delete.rs b/cli-cmd/image/src/v2/metadef/namespace/property/delete.rs similarity index 100% rename from openstack_cli/src/image/v2/metadef/namespace/property/delete.rs rename to cli-cmd/image/src/v2/metadef/namespace/property/delete.rs diff --git a/openstack_cli/src/image/v2/metadef/namespace/property/delete_all.rs b/cli-cmd/image/src/v2/metadef/namespace/property/delete_all.rs similarity index 100% rename from openstack_cli/src/image/v2/metadef/namespace/property/delete_all.rs rename to cli-cmd/image/src/v2/metadef/namespace/property/delete_all.rs diff --git a/openstack_cli/src/image/v2/metadef/namespace/property/list.rs b/cli-cmd/image/src/v2/metadef/namespace/property/list.rs similarity index 100% rename from openstack_cli/src/image/v2/metadef/namespace/property/list.rs rename to cli-cmd/image/src/v2/metadef/namespace/property/list.rs diff --git a/openstack_cli/src/image/v2/metadef/namespace/property/set.rs b/cli-cmd/image/src/v2/metadef/namespace/property/set.rs similarity index 100% rename from openstack_cli/src/image/v2/metadef/namespace/property/set.rs rename to cli-cmd/image/src/v2/metadef/namespace/property/set.rs diff --git a/openstack_cli/src/image/v2/metadef/namespace/property/show.rs b/cli-cmd/image/src/v2/metadef/namespace/property/show.rs similarity index 100% rename from openstack_cli/src/image/v2/metadef/namespace/property/show.rs rename to cli-cmd/image/src/v2/metadef/namespace/property/show.rs diff --git a/openstack_cli/src/image/v2/metadef/namespace/resource_type.rs b/cli-cmd/image/src/v2/metadef/namespace/resource_type.rs similarity index 92% rename from openstack_cli/src/image/v2/metadef/namespace/resource_type.rs rename to cli-cmd/image/src/v2/metadef/namespace/resource_type.rs index 103307159..b7b18c298 100644 --- a/openstack_cli/src/image/v2/metadef/namespace/resource_type.rs +++ b/cli-cmd/image/src/v2/metadef/namespace/resource_type.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; mod create; mod delete; @@ -45,9 +45,9 @@ pub enum ResourceTypeCommands { impl ResourceTypeCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/image/v2/metadef/namespace/resource_type/create.rs b/cli-cmd/image/src/v2/metadef/namespace/resource_type/create.rs similarity index 100% rename from openstack_cli/src/image/v2/metadef/namespace/resource_type/create.rs rename to cli-cmd/image/src/v2/metadef/namespace/resource_type/create.rs diff --git a/openstack_cli/src/image/v2/metadef/namespace/resource_type/delete.rs b/cli-cmd/image/src/v2/metadef/namespace/resource_type/delete.rs similarity index 100% rename from openstack_cli/src/image/v2/metadef/namespace/resource_type/delete.rs rename to cli-cmd/image/src/v2/metadef/namespace/resource_type/delete.rs diff --git a/openstack_cli/src/image/v2/metadef/namespace/resource_type/list.rs b/cli-cmd/image/src/v2/metadef/namespace/resource_type/list.rs similarity index 100% rename from openstack_cli/src/image/v2/metadef/namespace/resource_type/list.rs rename to cli-cmd/image/src/v2/metadef/namespace/resource_type/list.rs diff --git a/openstack_cli/src/image/v2/metadef/namespace/set.rs b/cli-cmd/image/src/v2/metadef/namespace/set.rs similarity index 100% rename from openstack_cli/src/image/v2/metadef/namespace/set.rs rename to cli-cmd/image/src/v2/metadef/namespace/set.rs diff --git a/openstack_cli/src/image/v2/metadef/namespace/show.rs b/cli-cmd/image/src/v2/metadef/namespace/show.rs similarity index 100% rename from openstack_cli/src/image/v2/metadef/namespace/show.rs rename to cli-cmd/image/src/v2/metadef/namespace/show.rs diff --git a/openstack_cli/src/image/v2/metadef/namespace/tag.rs b/cli-cmd/image/src/v2/metadef/namespace/tag.rs similarity index 93% rename from openstack_cli/src/image/v2/metadef/namespace/tag.rs rename to cli-cmd/image/src/v2/metadef/namespace/tag.rs index d3346eced..29c266468 100644 --- a/openstack_cli/src/image/v2/metadef/namespace/tag.rs +++ b/cli-cmd/image/src/v2/metadef/namespace/tag.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; mod create; mod delete; @@ -51,9 +51,9 @@ pub enum TagCommands { impl TagCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/image/v2/metadef/namespace/tag/create.rs b/cli-cmd/image/src/v2/metadef/namespace/tag/create.rs similarity index 100% rename from openstack_cli/src/image/v2/metadef/namespace/tag/create.rs rename to cli-cmd/image/src/v2/metadef/namespace/tag/create.rs diff --git a/openstack_cli/src/image/v2/metadef/namespace/tag/delete.rs b/cli-cmd/image/src/v2/metadef/namespace/tag/delete.rs similarity index 100% rename from openstack_cli/src/image/v2/metadef/namespace/tag/delete.rs rename to cli-cmd/image/src/v2/metadef/namespace/tag/delete.rs diff --git a/openstack_cli/src/image/v2/metadef/namespace/tag/delete_all.rs b/cli-cmd/image/src/v2/metadef/namespace/tag/delete_all.rs similarity index 100% rename from openstack_cli/src/image/v2/metadef/namespace/tag/delete_all.rs rename to cli-cmd/image/src/v2/metadef/namespace/tag/delete_all.rs diff --git a/openstack_cli/src/image/v2/metadef/namespace/tag/list.rs b/cli-cmd/image/src/v2/metadef/namespace/tag/list.rs similarity index 100% rename from openstack_cli/src/image/v2/metadef/namespace/tag/list.rs rename to cli-cmd/image/src/v2/metadef/namespace/tag/list.rs diff --git a/openstack_cli/src/image/v2/metadef/namespace/tag/set.rs b/cli-cmd/image/src/v2/metadef/namespace/tag/set.rs similarity index 100% rename from openstack_cli/src/image/v2/metadef/namespace/tag/set.rs rename to cli-cmd/image/src/v2/metadef/namespace/tag/set.rs diff --git a/openstack_cli/src/image/v2/metadef/namespace/tag/show.rs b/cli-cmd/image/src/v2/metadef/namespace/tag/show.rs similarity index 100% rename from openstack_cli/src/image/v2/metadef/namespace/tag/show.rs rename to cli-cmd/image/src/v2/metadef/namespace/tag/show.rs diff --git a/openstack_cli/src/image/v2/metadef/resource_type.rs b/cli-cmd/image/src/v2/metadef/resource_type.rs similarity index 92% rename from openstack_cli/src/image/v2/metadef/resource_type.rs rename to cli-cmd/image/src/v2/metadef/resource_type.rs index 8aa158a02..212949c88 100644 --- a/openstack_cli/src/image/v2/metadef/resource_type.rs +++ b/cli-cmd/image/src/v2/metadef/resource_type.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; pub mod list; @@ -43,9 +43,9 @@ pub enum ResourceTypeCommands { impl ResourceTypeCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/image/v2/metadef/resource_type/list.rs b/cli-cmd/image/src/v2/metadef/resource_type/list.rs similarity index 100% rename from openstack_cli/src/image/v2/metadef/resource_type/list.rs rename to cli-cmd/image/src/v2/metadef/resource_type/list.rs diff --git a/openstack_cli/src/image/v2/schema.rs b/cli-cmd/image/src/v2/schema.rs similarity index 93% rename from openstack_cli/src/image/v2/schema.rs rename to cli-cmd/image/src/v2/schema.rs index 8af0c0902..63a9e5346 100644 --- a/openstack_cli/src/image/v2/schema.rs +++ b/cli-cmd/image/src/v2/schema.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; pub mod image; pub mod images; @@ -47,9 +47,9 @@ pub enum SchemaCommands { impl SchemaCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/image/v2/schema/image.rs b/cli-cmd/image/src/v2/schema/image.rs similarity index 90% rename from openstack_cli/src/image/v2/schema/image.rs rename to cli-cmd/image/src/v2/schema/image.rs index 56beef26d..be48b5c72 100644 --- a/openstack_cli/src/image/v2/schema/image.rs +++ b/cli-cmd/image/src/v2/schema/image.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; pub mod get; @@ -40,9 +40,9 @@ pub enum ImageCommands { impl ImageCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/image/v2/schema/image/get.rs b/cli-cmd/image/src/v2/schema/image/get.rs similarity index 100% rename from openstack_cli/src/image/v2/schema/image/get.rs rename to cli-cmd/image/src/v2/schema/image/get.rs diff --git a/openstack_cli/src/image/v2/schema/images.rs b/cli-cmd/image/src/v2/schema/images.rs similarity index 90% rename from openstack_cli/src/image/v2/schema/images.rs rename to cli-cmd/image/src/v2/schema/images.rs index 8ed864f49..7cb9161fa 100644 --- a/openstack_cli/src/image/v2/schema/images.rs +++ b/cli-cmd/image/src/v2/schema/images.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; pub mod get; @@ -39,9 +39,9 @@ pub enum ImagesCommands { impl ImagesCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/image/v2/schema/images/get.rs b/cli-cmd/image/src/v2/schema/images/get.rs similarity index 100% rename from openstack_cli/src/image/v2/schema/images/get.rs rename to cli-cmd/image/src/v2/schema/images/get.rs diff --git a/openstack_cli/src/image/v2/schema/member.rs b/cli-cmd/image/src/v2/schema/member.rs similarity index 90% rename from openstack_cli/src/image/v2/schema/member.rs rename to cli-cmd/image/src/v2/schema/member.rs index 35c08d120..2e3fb64e3 100644 --- a/openstack_cli/src/image/v2/schema/member.rs +++ b/cli-cmd/image/src/v2/schema/member.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; pub mod get; @@ -39,9 +39,9 @@ pub enum MemberCommands { impl MemberCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/image/v2/schema/member/get.rs b/cli-cmd/image/src/v2/schema/member/get.rs similarity index 100% rename from openstack_cli/src/image/v2/schema/member/get.rs rename to cli-cmd/image/src/v2/schema/member/get.rs diff --git a/openstack_cli/src/image/v2/schema/members.rs b/cli-cmd/image/src/v2/schema/members.rs similarity index 90% rename from openstack_cli/src/image/v2/schema/members.rs rename to cli-cmd/image/src/v2/schema/members.rs index 30c93cc2a..bb3629f4e 100644 --- a/openstack_cli/src/image/v2/schema/members.rs +++ b/cli-cmd/image/src/v2/schema/members.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; pub mod get; @@ -39,9 +39,9 @@ pub enum MembersCommands { impl MembersCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/image/v2/schema/members/get.rs b/cli-cmd/image/src/v2/schema/members/get.rs similarity index 100% rename from openstack_cli/src/image/v2/schema/members/get.rs rename to cli-cmd/image/src/v2/schema/members/get.rs diff --git a/openstack_cli/src/image/v2/schema/metadef.rs b/cli-cmd/image/src/v2/schema/metadef.rs similarity index 95% rename from openstack_cli/src/image/v2/schema/metadef.rs rename to cli-cmd/image/src/v2/schema/metadef.rs index 168fea866..c56d16806 100644 --- a/openstack_cli/src/image/v2/schema/metadef.rs +++ b/cli-cmd/image/src/v2/schema/metadef.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; pub mod namespace; pub mod namespaces; @@ -58,9 +58,9 @@ pub enum MetadefCommands { impl MetadefCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/image/v2/schema/metadef/namespace.rs b/cli-cmd/image/src/v2/schema/metadef/namespace.rs similarity index 90% rename from openstack_cli/src/image/v2/schema/metadef/namespace.rs rename to cli-cmd/image/src/v2/schema/metadef/namespace.rs index 8352c6787..734773f18 100644 --- a/openstack_cli/src/image/v2/schema/metadef/namespace.rs +++ b/cli-cmd/image/src/v2/schema/metadef/namespace.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; pub mod get; @@ -39,9 +39,9 @@ pub enum NamespaceCommands { impl NamespaceCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/image/v2/schema/metadef/namespace/get.rs b/cli-cmd/image/src/v2/schema/metadef/namespace/get.rs similarity index 100% rename from openstack_cli/src/image/v2/schema/metadef/namespace/get.rs rename to cli-cmd/image/src/v2/schema/metadef/namespace/get.rs diff --git a/openstack_cli/src/image/v2/schema/metadef/namespaces.rs b/cli-cmd/image/src/v2/schema/metadef/namespaces.rs similarity index 90% rename from openstack_cli/src/image/v2/schema/metadef/namespaces.rs rename to cli-cmd/image/src/v2/schema/metadef/namespaces.rs index a5d9673d4..622b5d8ab 100644 --- a/openstack_cli/src/image/v2/schema/metadef/namespaces.rs +++ b/cli-cmd/image/src/v2/schema/metadef/namespaces.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; pub mod get; @@ -39,9 +39,9 @@ pub enum NamespacesCommands { impl NamespacesCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/image/v2/schema/metadef/namespaces/get.rs b/cli-cmd/image/src/v2/schema/metadef/namespaces/get.rs similarity index 100% rename from openstack_cli/src/image/v2/schema/metadef/namespaces/get.rs rename to cli-cmd/image/src/v2/schema/metadef/namespaces/get.rs diff --git a/openstack_cli/src/image/v2/schema/metadef/object.rs b/cli-cmd/image/src/v2/schema/metadef/object.rs similarity index 90% rename from openstack_cli/src/image/v2/schema/metadef/object.rs rename to cli-cmd/image/src/v2/schema/metadef/object.rs index 908e90f2f..78a86d02f 100644 --- a/openstack_cli/src/image/v2/schema/metadef/object.rs +++ b/cli-cmd/image/src/v2/schema/metadef/object.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; pub mod get; @@ -39,9 +39,9 @@ pub enum ObjectCommands { impl ObjectCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/image/v2/schema/metadef/object/get.rs b/cli-cmd/image/src/v2/schema/metadef/object/get.rs similarity index 100% rename from openstack_cli/src/image/v2/schema/metadef/object/get.rs rename to cli-cmd/image/src/v2/schema/metadef/object/get.rs diff --git a/openstack_cli/src/image/v2/schema/metadef/objects.rs b/cli-cmd/image/src/v2/schema/metadef/objects.rs similarity index 90% rename from openstack_cli/src/image/v2/schema/metadef/objects.rs rename to cli-cmd/image/src/v2/schema/metadef/objects.rs index 0f73584bb..80d50ef83 100644 --- a/openstack_cli/src/image/v2/schema/metadef/objects.rs +++ b/cli-cmd/image/src/v2/schema/metadef/objects.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; pub mod get; @@ -39,9 +39,9 @@ pub enum ObjectsCommands { impl ObjectsCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/image/v2/schema/metadef/objects/get.rs b/cli-cmd/image/src/v2/schema/metadef/objects/get.rs similarity index 100% rename from openstack_cli/src/image/v2/schema/metadef/objects/get.rs rename to cli-cmd/image/src/v2/schema/metadef/objects/get.rs diff --git a/openstack_cli/src/image/v2/schema/metadef/properties.rs b/cli-cmd/image/src/v2/schema/metadef/properties.rs similarity index 90% rename from openstack_cli/src/image/v2/schema/metadef/properties.rs rename to cli-cmd/image/src/v2/schema/metadef/properties.rs index 0f61eb944..e417200a0 100644 --- a/openstack_cli/src/image/v2/schema/metadef/properties.rs +++ b/cli-cmd/image/src/v2/schema/metadef/properties.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; pub mod get; @@ -39,9 +39,9 @@ pub enum PropertiesCommands { impl PropertiesCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/image/v2/schema/metadef/properties/get.rs b/cli-cmd/image/src/v2/schema/metadef/properties/get.rs similarity index 100% rename from openstack_cli/src/image/v2/schema/metadef/properties/get.rs rename to cli-cmd/image/src/v2/schema/metadef/properties/get.rs diff --git a/openstack_cli/src/image/v2/schema/metadef/property.rs b/cli-cmd/image/src/v2/schema/metadef/property.rs similarity index 90% rename from openstack_cli/src/image/v2/schema/metadef/property.rs rename to cli-cmd/image/src/v2/schema/metadef/property.rs index 7cdb923ce..bc3af4785 100644 --- a/openstack_cli/src/image/v2/schema/metadef/property.rs +++ b/cli-cmd/image/src/v2/schema/metadef/property.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; pub mod get; @@ -39,9 +39,9 @@ pub enum PropertyCommands { impl PropertyCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/image/v2/schema/metadef/property/get.rs b/cli-cmd/image/src/v2/schema/metadef/property/get.rs similarity index 100% rename from openstack_cli/src/image/v2/schema/metadef/property/get.rs rename to cli-cmd/image/src/v2/schema/metadef/property/get.rs diff --git a/openstack_cli/src/image/v2/schema/metadef/resource_type.rs b/cli-cmd/image/src/v2/schema/metadef/resource_type.rs similarity index 90% rename from openstack_cli/src/image/v2/schema/metadef/resource_type.rs rename to cli-cmd/image/src/v2/schema/metadef/resource_type.rs index e4c81aa30..caff3afbe 100644 --- a/openstack_cli/src/image/v2/schema/metadef/resource_type.rs +++ b/cli-cmd/image/src/v2/schema/metadef/resource_type.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; pub mod get; @@ -39,9 +39,9 @@ pub enum ResourceTypeCommands { impl ResourceTypeCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/image/v2/schema/metadef/resource_type/get.rs b/cli-cmd/image/src/v2/schema/metadef/resource_type/get.rs similarity index 100% rename from openstack_cli/src/image/v2/schema/metadef/resource_type/get.rs rename to cli-cmd/image/src/v2/schema/metadef/resource_type/get.rs diff --git a/openstack_cli/src/image/v2/schema/metadef/resource_types.rs b/cli-cmd/image/src/v2/schema/metadef/resource_types.rs similarity index 90% rename from openstack_cli/src/image/v2/schema/metadef/resource_types.rs rename to cli-cmd/image/src/v2/schema/metadef/resource_types.rs index 2d1fc1165..a4c7305b1 100644 --- a/openstack_cli/src/image/v2/schema/metadef/resource_types.rs +++ b/cli-cmd/image/src/v2/schema/metadef/resource_types.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; pub mod get; @@ -39,9 +39,9 @@ pub enum ResourceTypesCommands { impl ResourceTypesCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/image/v2/schema/metadef/resource_types/get.rs b/cli-cmd/image/src/v2/schema/metadef/resource_types/get.rs similarity index 100% rename from openstack_cli/src/image/v2/schema/metadef/resource_types/get.rs rename to cli-cmd/image/src/v2/schema/metadef/resource_types/get.rs diff --git a/openstack_cli/src/image/v2/schema/metadef/tag.rs b/cli-cmd/image/src/v2/schema/metadef/tag.rs similarity index 90% rename from openstack_cli/src/image/v2/schema/metadef/tag.rs rename to cli-cmd/image/src/v2/schema/metadef/tag.rs index 64d29aca7..a8f825705 100644 --- a/openstack_cli/src/image/v2/schema/metadef/tag.rs +++ b/cli-cmd/image/src/v2/schema/metadef/tag.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; pub mod get; @@ -39,9 +39,9 @@ pub enum TagCommands { impl TagCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/image/v2/schema/metadef/tag/get.rs b/cli-cmd/image/src/v2/schema/metadef/tag/get.rs similarity index 100% rename from openstack_cli/src/image/v2/schema/metadef/tag/get.rs rename to cli-cmd/image/src/v2/schema/metadef/tag/get.rs diff --git a/openstack_cli/src/image/v2/schema/metadef/tags.rs b/cli-cmd/image/src/v2/schema/metadef/tags.rs similarity index 90% rename from openstack_cli/src/image/v2/schema/metadef/tags.rs rename to cli-cmd/image/src/v2/schema/metadef/tags.rs index a85f9d14d..b708c5dc7 100644 --- a/openstack_cli/src/image/v2/schema/metadef/tags.rs +++ b/cli-cmd/image/src/v2/schema/metadef/tags.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; pub mod get; @@ -39,9 +39,9 @@ pub enum TagsCommands { impl TagsCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/image/v2/schema/metadef/tags/get.rs b/cli-cmd/image/src/v2/schema/metadef/tags/get.rs similarity index 100% rename from openstack_cli/src/image/v2/schema/metadef/tags/get.rs rename to cli-cmd/image/src/v2/schema/metadef/tags/get.rs diff --git a/openstack_cli/src/image/v2/schema/task/get.rs b/cli-cmd/image/src/v2/schema/task/get.rs similarity index 100% rename from openstack_cli/src/image/v2/schema/task/get.rs rename to cli-cmd/image/src/v2/schema/task/get.rs diff --git a/openstack_cli/src/image/v2/schema/tasks/get.rs b/cli-cmd/image/src/v2/schema/tasks/get.rs similarity index 100% rename from openstack_cli/src/image/v2/schema/tasks/get.rs rename to cli-cmd/image/src/v2/schema/tasks/get.rs diff --git a/openstack_cli/src/image/v2/store/delete.rs b/cli-cmd/image/src/v2/store/delete.rs similarity index 100% rename from openstack_cli/src/image/v2/store/delete.rs rename to cli-cmd/image/src/v2/store/delete.rs diff --git a/openstack_cli/src/image/v2/task/create.rs b/cli-cmd/image/src/v2/task/create.rs similarity index 100% rename from openstack_cli/src/image/v2/task/create.rs rename to cli-cmd/image/src/v2/task/create.rs diff --git a/openstack_cli/src/image/v2/task/delete.rs b/cli-cmd/image/src/v2/task/delete.rs similarity index 100% rename from openstack_cli/src/image/v2/task/delete.rs rename to cli-cmd/image/src/v2/task/delete.rs diff --git a/openstack_cli/src/image/v2/task/list.rs b/cli-cmd/image/src/v2/task/list.rs similarity index 100% rename from openstack_cli/src/image/v2/task/list.rs rename to cli-cmd/image/src/v2/task/list.rs diff --git a/openstack_cli/src/image/v2/task/show.rs b/cli-cmd/image/src/v2/task/show.rs similarity index 100% rename from openstack_cli/src/image/v2/task/show.rs rename to cli-cmd/image/src/v2/task/show.rs diff --git a/cli-cmd/load-balancer/Cargo.toml b/cli-cmd/load-balancer/Cargo.toml new file mode 100644 index 000000000..edb53aecb --- /dev/null +++ b/cli-cmd/load-balancer/Cargo.toml @@ -0,0 +1,24 @@ +[package] +name = "openstack-cli-load-balancer" +description = "OpenStack CLI Load Balancer commands" +version = "0.1.0" +license.workspace = true +edition.workspace = true +authors.workspace = true +rust-version.workspace = true +homepage.workspace = true +repository.workspace = true + +[dependencies] +clap = { workspace = true } +openstack-cli-core = { version = "0.13", path = "../../cli-core/" } +openstack_sdk = { path="../../openstack_sdk", version = "^0.22", default-features = false, features = ["async", "identity", "load_balancer"] } +openstack-sdk-core = { path="../../sdk-core", version = "^0.22" } +openstack_types = { path="../../openstack_types", version = "^0.22" } +eyre = { workspace = true } +http = { workspace = true } +serde_json = {workspace = true} +tracing = { workspace = true} + +[lints] +workspace = true diff --git a/openstack_cli/src/load_balancer/mod.rs b/cli-cmd/load-balancer/src/lib.rs similarity index 94% rename from openstack_cli/src/load_balancer/mod.rs rename to cli-cmd/load-balancer/src/lib.rs index 0aea28b72..a7807a723 100644 --- a/openstack_cli/src/load_balancer/mod.rs +++ b/cli-cmd/load-balancer/src/lib.rs @@ -12,5 +12,5 @@ // // SPDX-License-Identifier: Apache-2.0 -//! Load Balancer (Octavia) commands +//! Load Balancer commands. pub mod v2; diff --git a/openstack_cli/src/load_balancer/v2.rs b/cli-cmd/load-balancer/src/v2.rs similarity index 96% rename from openstack_cli/src/load_balancer/v2.rs rename to cli-cmd/load-balancer/src/v2.rs index 791f79fa8..1c49dfbb2 100644 --- a/openstack_cli/src/load_balancer/v2.rs +++ b/cli-cmd/load-balancer/src/v2.rs @@ -16,10 +16,9 @@ use clap::{Parser, Subcommand}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; use openstack_sdk::{AsyncOpenStack, types::ServiceType}; -use crate::{Cli, OpenStackCliError}; - pub mod amphorae; pub mod availability_zone; pub mod availability_zone_profile; @@ -63,9 +62,9 @@ pub enum LoadBalancerCommands { impl LoadBalancerCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { session diff --git a/openstack_cli/src/load_balancer/v2/amphorae.rs b/cli-cmd/load-balancer/src/v2/amphorae.rs similarity index 93% rename from openstack_cli/src/load_balancer/v2/amphorae.rs rename to cli-cmd/load-balancer/src/v2/amphorae.rs index bca47fb7e..502252cd5 100644 --- a/openstack_cli/src/load_balancer/v2/amphorae.rs +++ b/cli-cmd/load-balancer/src/v2/amphorae.rs @@ -16,10 +16,9 @@ use clap::{Parser, Subcommand}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; - pub mod config; pub mod delete; pub mod failover; @@ -49,9 +48,9 @@ pub enum AmphoraeCommands { impl AmphoraeCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/load_balancer/v2/amphorae/config.rs b/cli-cmd/load-balancer/src/v2/amphorae/config.rs similarity index 100% rename from openstack_cli/src/load_balancer/v2/amphorae/config.rs rename to cli-cmd/load-balancer/src/v2/amphorae/config.rs diff --git a/openstack_cli/src/load_balancer/v2/amphorae/delete.rs b/cli-cmd/load-balancer/src/v2/amphorae/delete.rs similarity index 100% rename from openstack_cli/src/load_balancer/v2/amphorae/delete.rs rename to cli-cmd/load-balancer/src/v2/amphorae/delete.rs diff --git a/openstack_cli/src/load_balancer/v2/amphorae/failover.rs b/cli-cmd/load-balancer/src/v2/amphorae/failover.rs similarity index 100% rename from openstack_cli/src/load_balancer/v2/amphorae/failover.rs rename to cli-cmd/load-balancer/src/v2/amphorae/failover.rs diff --git a/openstack_cli/src/load_balancer/v2/amphorae/list.rs b/cli-cmd/load-balancer/src/v2/amphorae/list.rs similarity index 100% rename from openstack_cli/src/load_balancer/v2/amphorae/list.rs rename to cli-cmd/load-balancer/src/v2/amphorae/list.rs diff --git a/openstack_cli/src/load_balancer/v2/amphorae/show.rs b/cli-cmd/load-balancer/src/v2/amphorae/show.rs similarity index 100% rename from openstack_cli/src/load_balancer/v2/amphorae/show.rs rename to cli-cmd/load-balancer/src/v2/amphorae/show.rs diff --git a/openstack_cli/src/load_balancer/v2/amphorae/stats.rs b/cli-cmd/load-balancer/src/v2/amphorae/stats.rs similarity index 100% rename from openstack_cli/src/load_balancer/v2/amphorae/stats.rs rename to cli-cmd/load-balancer/src/v2/amphorae/stats.rs diff --git a/openstack_cli/src/load_balancer/v2/availability_zone.rs b/cli-cmd/load-balancer/src/v2/availability_zone.rs similarity index 93% rename from openstack_cli/src/load_balancer/v2/availability_zone.rs rename to cli-cmd/load-balancer/src/v2/availability_zone.rs index 5f6968e4e..0bcec547b 100644 --- a/openstack_cli/src/load_balancer/v2/availability_zone.rs +++ b/cli-cmd/load-balancer/src/v2/availability_zone.rs @@ -16,10 +16,9 @@ use clap::{Parser, Subcommand}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; - pub mod create; pub mod delete; pub mod list; @@ -47,9 +46,9 @@ pub enum AvailabilityZoneCommands { impl AvailabilityZoneCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/load_balancer/v2/availability_zone/create.rs b/cli-cmd/load-balancer/src/v2/availability_zone/create.rs similarity index 100% rename from openstack_cli/src/load_balancer/v2/availability_zone/create.rs rename to cli-cmd/load-balancer/src/v2/availability_zone/create.rs diff --git a/openstack_cli/src/load_balancer/v2/availability_zone/delete.rs b/cli-cmd/load-balancer/src/v2/availability_zone/delete.rs similarity index 100% rename from openstack_cli/src/load_balancer/v2/availability_zone/delete.rs rename to cli-cmd/load-balancer/src/v2/availability_zone/delete.rs diff --git a/openstack_cli/src/load_balancer/v2/availability_zone/list.rs b/cli-cmd/load-balancer/src/v2/availability_zone/list.rs similarity index 100% rename from openstack_cli/src/load_balancer/v2/availability_zone/list.rs rename to cli-cmd/load-balancer/src/v2/availability_zone/list.rs diff --git a/openstack_cli/src/load_balancer/v2/availability_zone/set.rs b/cli-cmd/load-balancer/src/v2/availability_zone/set.rs similarity index 100% rename from openstack_cli/src/load_balancer/v2/availability_zone/set.rs rename to cli-cmd/load-balancer/src/v2/availability_zone/set.rs diff --git a/openstack_cli/src/load_balancer/v2/availability_zone/show.rs b/cli-cmd/load-balancer/src/v2/availability_zone/show.rs similarity index 100% rename from openstack_cli/src/load_balancer/v2/availability_zone/show.rs rename to cli-cmd/load-balancer/src/v2/availability_zone/show.rs diff --git a/openstack_cli/src/load_balancer/v2/availability_zone_profile.rs b/cli-cmd/load-balancer/src/v2/availability_zone_profile.rs similarity index 94% rename from openstack_cli/src/load_balancer/v2/availability_zone_profile.rs rename to cli-cmd/load-balancer/src/v2/availability_zone_profile.rs index f426ecbf2..8fe50e935 100644 --- a/openstack_cli/src/load_balancer/v2/availability_zone_profile.rs +++ b/cli-cmd/load-balancer/src/v2/availability_zone_profile.rs @@ -16,10 +16,9 @@ use clap::{Parser, Subcommand}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; - pub mod create; pub mod delete; pub mod list; @@ -47,9 +46,9 @@ pub enum AvailabilityZoneProfileCommands { impl AvailabilityZoneProfileCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/load_balancer/v2/availability_zone_profile/create.rs b/cli-cmd/load-balancer/src/v2/availability_zone_profile/create.rs similarity index 100% rename from openstack_cli/src/load_balancer/v2/availability_zone_profile/create.rs rename to cli-cmd/load-balancer/src/v2/availability_zone_profile/create.rs diff --git a/openstack_cli/src/load_balancer/v2/availability_zone_profile/delete.rs b/cli-cmd/load-balancer/src/v2/availability_zone_profile/delete.rs similarity index 100% rename from openstack_cli/src/load_balancer/v2/availability_zone_profile/delete.rs rename to cli-cmd/load-balancer/src/v2/availability_zone_profile/delete.rs diff --git a/openstack_cli/src/load_balancer/v2/availability_zone_profile/list.rs b/cli-cmd/load-balancer/src/v2/availability_zone_profile/list.rs similarity index 100% rename from openstack_cli/src/load_balancer/v2/availability_zone_profile/list.rs rename to cli-cmd/load-balancer/src/v2/availability_zone_profile/list.rs diff --git a/openstack_cli/src/load_balancer/v2/availability_zone_profile/set.rs b/cli-cmd/load-balancer/src/v2/availability_zone_profile/set.rs similarity index 100% rename from openstack_cli/src/load_balancer/v2/availability_zone_profile/set.rs rename to cli-cmd/load-balancer/src/v2/availability_zone_profile/set.rs diff --git a/openstack_cli/src/load_balancer/v2/availability_zone_profile/show.rs b/cli-cmd/load-balancer/src/v2/availability_zone_profile/show.rs similarity index 100% rename from openstack_cli/src/load_balancer/v2/availability_zone_profile/show.rs rename to cli-cmd/load-balancer/src/v2/availability_zone_profile/show.rs diff --git a/openstack_cli/src/load_balancer/v2/flavor.rs b/cli-cmd/load-balancer/src/v2/flavor.rs similarity index 93% rename from openstack_cli/src/load_balancer/v2/flavor.rs rename to cli-cmd/load-balancer/src/v2/flavor.rs index a5c03f3ce..fe0ac0653 100644 --- a/openstack_cli/src/load_balancer/v2/flavor.rs +++ b/cli-cmd/load-balancer/src/v2/flavor.rs @@ -16,10 +16,9 @@ use clap::{Parser, Subcommand}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; - pub mod create; pub mod delete; pub mod list; @@ -47,9 +46,9 @@ pub enum FlavorCommands { impl FlavorCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/load_balancer/v2/flavor/create.rs b/cli-cmd/load-balancer/src/v2/flavor/create.rs similarity index 100% rename from openstack_cli/src/load_balancer/v2/flavor/create.rs rename to cli-cmd/load-balancer/src/v2/flavor/create.rs diff --git a/openstack_cli/src/load_balancer/v2/flavor/delete.rs b/cli-cmd/load-balancer/src/v2/flavor/delete.rs similarity index 100% rename from openstack_cli/src/load_balancer/v2/flavor/delete.rs rename to cli-cmd/load-balancer/src/v2/flavor/delete.rs diff --git a/openstack_cli/src/load_balancer/v2/flavor/list.rs b/cli-cmd/load-balancer/src/v2/flavor/list.rs similarity index 100% rename from openstack_cli/src/load_balancer/v2/flavor/list.rs rename to cli-cmd/load-balancer/src/v2/flavor/list.rs diff --git a/openstack_cli/src/load_balancer/v2/flavor/set.rs b/cli-cmd/load-balancer/src/v2/flavor/set.rs similarity index 100% rename from openstack_cli/src/load_balancer/v2/flavor/set.rs rename to cli-cmd/load-balancer/src/v2/flavor/set.rs diff --git a/openstack_cli/src/load_balancer/v2/flavor/show.rs b/cli-cmd/load-balancer/src/v2/flavor/show.rs similarity index 100% rename from openstack_cli/src/load_balancer/v2/flavor/show.rs rename to cli-cmd/load-balancer/src/v2/flavor/show.rs diff --git a/openstack_cli/src/load_balancer/v2/flavor_profile.rs b/cli-cmd/load-balancer/src/v2/flavor_profile.rs similarity index 93% rename from openstack_cli/src/load_balancer/v2/flavor_profile.rs rename to cli-cmd/load-balancer/src/v2/flavor_profile.rs index 4edad2978..ef5a153c1 100644 --- a/openstack_cli/src/load_balancer/v2/flavor_profile.rs +++ b/cli-cmd/load-balancer/src/v2/flavor_profile.rs @@ -16,10 +16,9 @@ use clap::{Parser, Subcommand}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; - pub mod create; pub mod delete; pub mod list; @@ -47,9 +46,9 @@ pub enum FlavorProfileCommands { impl FlavorProfileCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/load_balancer/v2/flavor_profile/create.rs b/cli-cmd/load-balancer/src/v2/flavor_profile/create.rs similarity index 100% rename from openstack_cli/src/load_balancer/v2/flavor_profile/create.rs rename to cli-cmd/load-balancer/src/v2/flavor_profile/create.rs diff --git a/openstack_cli/src/load_balancer/v2/flavor_profile/delete.rs b/cli-cmd/load-balancer/src/v2/flavor_profile/delete.rs similarity index 100% rename from openstack_cli/src/load_balancer/v2/flavor_profile/delete.rs rename to cli-cmd/load-balancer/src/v2/flavor_profile/delete.rs diff --git a/openstack_cli/src/load_balancer/v2/flavor_profile/list.rs b/cli-cmd/load-balancer/src/v2/flavor_profile/list.rs similarity index 100% rename from openstack_cli/src/load_balancer/v2/flavor_profile/list.rs rename to cli-cmd/load-balancer/src/v2/flavor_profile/list.rs diff --git a/openstack_cli/src/load_balancer/v2/flavor_profile/set.rs b/cli-cmd/load-balancer/src/v2/flavor_profile/set.rs similarity index 100% rename from openstack_cli/src/load_balancer/v2/flavor_profile/set.rs rename to cli-cmd/load-balancer/src/v2/flavor_profile/set.rs diff --git a/openstack_cli/src/load_balancer/v2/flavor_profile/show.rs b/cli-cmd/load-balancer/src/v2/flavor_profile/show.rs similarity index 100% rename from openstack_cli/src/load_balancer/v2/flavor_profile/show.rs rename to cli-cmd/load-balancer/src/v2/flavor_profile/show.rs diff --git a/openstack_cli/src/load_balancer/v2/healthmonitor.rs b/cli-cmd/load-balancer/src/v2/healthmonitor.rs similarity index 93% rename from openstack_cli/src/load_balancer/v2/healthmonitor.rs rename to cli-cmd/load-balancer/src/v2/healthmonitor.rs index d37bdf16d..5e2c9d482 100644 --- a/openstack_cli/src/load_balancer/v2/healthmonitor.rs +++ b/cli-cmd/load-balancer/src/v2/healthmonitor.rs @@ -16,10 +16,9 @@ use clap::{Parser, Subcommand}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; - pub mod create; pub mod delete; pub mod list; @@ -47,9 +46,9 @@ pub enum HealthmonitorCommands { impl HealthmonitorCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/load_balancer/v2/healthmonitor/create.rs b/cli-cmd/load-balancer/src/v2/healthmonitor/create.rs similarity index 100% rename from openstack_cli/src/load_balancer/v2/healthmonitor/create.rs rename to cli-cmd/load-balancer/src/v2/healthmonitor/create.rs diff --git a/openstack_cli/src/load_balancer/v2/healthmonitor/delete.rs b/cli-cmd/load-balancer/src/v2/healthmonitor/delete.rs similarity index 100% rename from openstack_cli/src/load_balancer/v2/healthmonitor/delete.rs rename to cli-cmd/load-balancer/src/v2/healthmonitor/delete.rs diff --git a/openstack_cli/src/load_balancer/v2/healthmonitor/list.rs b/cli-cmd/load-balancer/src/v2/healthmonitor/list.rs similarity index 100% rename from openstack_cli/src/load_balancer/v2/healthmonitor/list.rs rename to cli-cmd/load-balancer/src/v2/healthmonitor/list.rs diff --git a/openstack_cli/src/load_balancer/v2/healthmonitor/set.rs b/cli-cmd/load-balancer/src/v2/healthmonitor/set.rs similarity index 100% rename from openstack_cli/src/load_balancer/v2/healthmonitor/set.rs rename to cli-cmd/load-balancer/src/v2/healthmonitor/set.rs diff --git a/openstack_cli/src/load_balancer/v2/healthmonitor/show.rs b/cli-cmd/load-balancer/src/v2/healthmonitor/show.rs similarity index 100% rename from openstack_cli/src/load_balancer/v2/healthmonitor/show.rs rename to cli-cmd/load-balancer/src/v2/healthmonitor/show.rs diff --git a/openstack_cli/src/load_balancer/v2/l7policy.rs b/cli-cmd/load-balancer/src/v2/l7policy.rs similarity index 93% rename from openstack_cli/src/load_balancer/v2/l7policy.rs rename to cli-cmd/load-balancer/src/v2/l7policy.rs index 6d68bde42..9ae080399 100644 --- a/openstack_cli/src/load_balancer/v2/l7policy.rs +++ b/cli-cmd/load-balancer/src/v2/l7policy.rs @@ -16,10 +16,9 @@ use clap::{Parser, Subcommand}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; - pub mod create; pub mod delete; pub mod list; @@ -49,9 +48,9 @@ pub enum L7PolicyCommands { impl L7PolicyCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/load_balancer/v2/l7policy/create.rs b/cli-cmd/load-balancer/src/v2/l7policy/create.rs similarity index 100% rename from openstack_cli/src/load_balancer/v2/l7policy/create.rs rename to cli-cmd/load-balancer/src/v2/l7policy/create.rs diff --git a/openstack_cli/src/load_balancer/v2/l7policy/delete.rs b/cli-cmd/load-balancer/src/v2/l7policy/delete.rs similarity index 100% rename from openstack_cli/src/load_balancer/v2/l7policy/delete.rs rename to cli-cmd/load-balancer/src/v2/l7policy/delete.rs diff --git a/openstack_cli/src/load_balancer/v2/l7policy/list.rs b/cli-cmd/load-balancer/src/v2/l7policy/list.rs similarity index 100% rename from openstack_cli/src/load_balancer/v2/l7policy/list.rs rename to cli-cmd/load-balancer/src/v2/l7policy/list.rs diff --git a/openstack_cli/src/load_balancer/v2/l7policy/rule.rs b/cli-cmd/load-balancer/src/v2/l7policy/rule.rs similarity index 93% rename from openstack_cli/src/load_balancer/v2/l7policy/rule.rs rename to cli-cmd/load-balancer/src/v2/l7policy/rule.rs index f954ece89..af6edcbe9 100644 --- a/openstack_cli/src/load_balancer/v2/l7policy/rule.rs +++ b/cli-cmd/load-balancer/src/v2/l7policy/rule.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; pub mod create; pub mod delete; @@ -47,9 +47,9 @@ pub enum RuleCommands { impl RuleCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/load_balancer/v2/l7policy/rule/create.rs b/cli-cmd/load-balancer/src/v2/l7policy/rule/create.rs similarity index 100% rename from openstack_cli/src/load_balancer/v2/l7policy/rule/create.rs rename to cli-cmd/load-balancer/src/v2/l7policy/rule/create.rs diff --git a/openstack_cli/src/load_balancer/v2/l7policy/rule/delete.rs b/cli-cmd/load-balancer/src/v2/l7policy/rule/delete.rs similarity index 100% rename from openstack_cli/src/load_balancer/v2/l7policy/rule/delete.rs rename to cli-cmd/load-balancer/src/v2/l7policy/rule/delete.rs diff --git a/openstack_cli/src/load_balancer/v2/l7policy/rule/list.rs b/cli-cmd/load-balancer/src/v2/l7policy/rule/list.rs similarity index 100% rename from openstack_cli/src/load_balancer/v2/l7policy/rule/list.rs rename to cli-cmd/load-balancer/src/v2/l7policy/rule/list.rs diff --git a/openstack_cli/src/load_balancer/v2/l7policy/rule/set.rs b/cli-cmd/load-balancer/src/v2/l7policy/rule/set.rs similarity index 100% rename from openstack_cli/src/load_balancer/v2/l7policy/rule/set.rs rename to cli-cmd/load-balancer/src/v2/l7policy/rule/set.rs diff --git a/openstack_cli/src/load_balancer/v2/l7policy/rule/show.rs b/cli-cmd/load-balancer/src/v2/l7policy/rule/show.rs similarity index 100% rename from openstack_cli/src/load_balancer/v2/l7policy/rule/show.rs rename to cli-cmd/load-balancer/src/v2/l7policy/rule/show.rs diff --git a/openstack_cli/src/load_balancer/v2/l7policy/set.rs b/cli-cmd/load-balancer/src/v2/l7policy/set.rs similarity index 100% rename from openstack_cli/src/load_balancer/v2/l7policy/set.rs rename to cli-cmd/load-balancer/src/v2/l7policy/set.rs diff --git a/openstack_cli/src/load_balancer/v2/l7policy/show.rs b/cli-cmd/load-balancer/src/v2/l7policy/show.rs similarity index 100% rename from openstack_cli/src/load_balancer/v2/l7policy/show.rs rename to cli-cmd/load-balancer/src/v2/l7policy/show.rs diff --git a/openstack_cli/src/load_balancer/v2/listener.rs b/cli-cmd/load-balancer/src/v2/listener.rs similarity index 93% rename from openstack_cli/src/load_balancer/v2/listener.rs rename to cli-cmd/load-balancer/src/v2/listener.rs index 1149accb7..02906c43a 100644 --- a/openstack_cli/src/load_balancer/v2/listener.rs +++ b/cli-cmd/load-balancer/src/v2/listener.rs @@ -16,10 +16,9 @@ use clap::{Parser, Subcommand}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; - pub mod create; pub mod delete; pub mod list; @@ -49,9 +48,9 @@ pub enum ListenerCommands { impl ListenerCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/load_balancer/v2/listener/create.rs b/cli-cmd/load-balancer/src/v2/listener/create.rs similarity index 100% rename from openstack_cli/src/load_balancer/v2/listener/create.rs rename to cli-cmd/load-balancer/src/v2/listener/create.rs diff --git a/openstack_cli/src/load_balancer/v2/listener/delete.rs b/cli-cmd/load-balancer/src/v2/listener/delete.rs similarity index 100% rename from openstack_cli/src/load_balancer/v2/listener/delete.rs rename to cli-cmd/load-balancer/src/v2/listener/delete.rs diff --git a/openstack_cli/src/load_balancer/v2/listener/list.rs b/cli-cmd/load-balancer/src/v2/listener/list.rs similarity index 100% rename from openstack_cli/src/load_balancer/v2/listener/list.rs rename to cli-cmd/load-balancer/src/v2/listener/list.rs diff --git a/openstack_cli/src/load_balancer/v2/listener/set.rs b/cli-cmd/load-balancer/src/v2/listener/set.rs similarity index 100% rename from openstack_cli/src/load_balancer/v2/listener/set.rs rename to cli-cmd/load-balancer/src/v2/listener/set.rs diff --git a/openstack_cli/src/load_balancer/v2/listener/show.rs b/cli-cmd/load-balancer/src/v2/listener/show.rs similarity index 100% rename from openstack_cli/src/load_balancer/v2/listener/show.rs rename to cli-cmd/load-balancer/src/v2/listener/show.rs diff --git a/openstack_cli/src/load_balancer/v2/listener/stats.rs b/cli-cmd/load-balancer/src/v2/listener/stats.rs similarity index 100% rename from openstack_cli/src/load_balancer/v2/listener/stats.rs rename to cli-cmd/load-balancer/src/v2/listener/stats.rs diff --git a/openstack_cli/src/load_balancer/v2/loadbalancer.rs b/cli-cmd/load-balancer/src/v2/loadbalancer.rs similarity index 94% rename from openstack_cli/src/load_balancer/v2/loadbalancer.rs rename to cli-cmd/load-balancer/src/v2/loadbalancer.rs index df7345b57..98ea17cac 100644 --- a/openstack_cli/src/load_balancer/v2/loadbalancer.rs +++ b/cli-cmd/load-balancer/src/v2/loadbalancer.rs @@ -16,10 +16,9 @@ use clap::{Parser, Subcommand}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; - pub mod create; pub mod delete; pub mod failover; @@ -53,9 +52,9 @@ pub enum LoadbalancerCommands { impl LoadbalancerCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/load_balancer/v2/loadbalancer/create.rs b/cli-cmd/load-balancer/src/v2/loadbalancer/create.rs similarity index 100% rename from openstack_cli/src/load_balancer/v2/loadbalancer/create.rs rename to cli-cmd/load-balancer/src/v2/loadbalancer/create.rs diff --git a/openstack_cli/src/load_balancer/v2/loadbalancer/delete.rs b/cli-cmd/load-balancer/src/v2/loadbalancer/delete.rs similarity index 100% rename from openstack_cli/src/load_balancer/v2/loadbalancer/delete.rs rename to cli-cmd/load-balancer/src/v2/loadbalancer/delete.rs diff --git a/openstack_cli/src/load_balancer/v2/loadbalancer/failover.rs b/cli-cmd/load-balancer/src/v2/loadbalancer/failover.rs similarity index 100% rename from openstack_cli/src/load_balancer/v2/loadbalancer/failover.rs rename to cli-cmd/load-balancer/src/v2/loadbalancer/failover.rs diff --git a/openstack_cli/src/load_balancer/v2/loadbalancer/list.rs b/cli-cmd/load-balancer/src/v2/loadbalancer/list.rs similarity index 100% rename from openstack_cli/src/load_balancer/v2/loadbalancer/list.rs rename to cli-cmd/load-balancer/src/v2/loadbalancer/list.rs diff --git a/openstack_cli/src/load_balancer/v2/loadbalancer/set.rs b/cli-cmd/load-balancer/src/v2/loadbalancer/set.rs similarity index 100% rename from openstack_cli/src/load_balancer/v2/loadbalancer/set.rs rename to cli-cmd/load-balancer/src/v2/loadbalancer/set.rs diff --git a/openstack_cli/src/load_balancer/v2/loadbalancer/show.rs b/cli-cmd/load-balancer/src/v2/loadbalancer/show.rs similarity index 100% rename from openstack_cli/src/load_balancer/v2/loadbalancer/show.rs rename to cli-cmd/load-balancer/src/v2/loadbalancer/show.rs diff --git a/openstack_cli/src/load_balancer/v2/loadbalancer/stats.rs b/cli-cmd/load-balancer/src/v2/loadbalancer/stats.rs similarity index 100% rename from openstack_cli/src/load_balancer/v2/loadbalancer/stats.rs rename to cli-cmd/load-balancer/src/v2/loadbalancer/stats.rs diff --git a/openstack_cli/src/load_balancer/v2/loadbalancer/status.rs b/cli-cmd/load-balancer/src/v2/loadbalancer/status.rs similarity index 100% rename from openstack_cli/src/load_balancer/v2/loadbalancer/status.rs rename to cli-cmd/load-balancer/src/v2/loadbalancer/status.rs diff --git a/openstack_cli/src/load_balancer/v2/octavia/get.rs b/cli-cmd/load-balancer/src/v2/octavia/get.rs similarity index 100% rename from openstack_cli/src/load_balancer/v2/octavia/get.rs rename to cli-cmd/load-balancer/src/v2/octavia/get.rs diff --git a/openstack_cli/src/load_balancer/v2/pool.rs b/cli-cmd/load-balancer/src/v2/pool.rs similarity index 93% rename from openstack_cli/src/load_balancer/v2/pool.rs rename to cli-cmd/load-balancer/src/v2/pool.rs index 07c695349..3c1cff314 100644 --- a/openstack_cli/src/load_balancer/v2/pool.rs +++ b/cli-cmd/load-balancer/src/v2/pool.rs @@ -16,10 +16,9 @@ use clap::{Parser, Subcommand}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; - pub mod create; pub mod delete; pub mod list; @@ -49,9 +48,9 @@ pub enum PoolCommands { impl PoolCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/load_balancer/v2/pool/create.rs b/cli-cmd/load-balancer/src/v2/pool/create.rs similarity index 100% rename from openstack_cli/src/load_balancer/v2/pool/create.rs rename to cli-cmd/load-balancer/src/v2/pool/create.rs diff --git a/openstack_cli/src/load_balancer/v2/pool/delete.rs b/cli-cmd/load-balancer/src/v2/pool/delete.rs similarity index 100% rename from openstack_cli/src/load_balancer/v2/pool/delete.rs rename to cli-cmd/load-balancer/src/v2/pool/delete.rs diff --git a/openstack_cli/src/load_balancer/v2/pool/list.rs b/cli-cmd/load-balancer/src/v2/pool/list.rs similarity index 100% rename from openstack_cli/src/load_balancer/v2/pool/list.rs rename to cli-cmd/load-balancer/src/v2/pool/list.rs diff --git a/openstack_cli/src/load_balancer/v2/pool/member.rs b/cli-cmd/load-balancer/src/v2/pool/member.rs similarity index 93% rename from openstack_cli/src/load_balancer/v2/pool/member.rs rename to cli-cmd/load-balancer/src/v2/pool/member.rs index dc4f55d17..08544e5ab 100644 --- a/openstack_cli/src/load_balancer/v2/pool/member.rs +++ b/cli-cmd/load-balancer/src/v2/pool/member.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; pub mod create; pub mod delete; @@ -47,9 +47,9 @@ pub enum MemberCommands { impl MemberCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/load_balancer/v2/pool/member/create.rs b/cli-cmd/load-balancer/src/v2/pool/member/create.rs similarity index 100% rename from openstack_cli/src/load_balancer/v2/pool/member/create.rs rename to cli-cmd/load-balancer/src/v2/pool/member/create.rs diff --git a/openstack_cli/src/load_balancer/v2/pool/member/delete.rs b/cli-cmd/load-balancer/src/v2/pool/member/delete.rs similarity index 100% rename from openstack_cli/src/load_balancer/v2/pool/member/delete.rs rename to cli-cmd/load-balancer/src/v2/pool/member/delete.rs diff --git a/openstack_cli/src/load_balancer/v2/pool/member/list.rs b/cli-cmd/load-balancer/src/v2/pool/member/list.rs similarity index 100% rename from openstack_cli/src/load_balancer/v2/pool/member/list.rs rename to cli-cmd/load-balancer/src/v2/pool/member/list.rs diff --git a/openstack_cli/src/load_balancer/v2/pool/member/replace.rs b/cli-cmd/load-balancer/src/v2/pool/member/replace.rs similarity index 100% rename from openstack_cli/src/load_balancer/v2/pool/member/replace.rs rename to cli-cmd/load-balancer/src/v2/pool/member/replace.rs diff --git a/openstack_cli/src/load_balancer/v2/pool/member/set.rs b/cli-cmd/load-balancer/src/v2/pool/member/set.rs similarity index 100% rename from openstack_cli/src/load_balancer/v2/pool/member/set.rs rename to cli-cmd/load-balancer/src/v2/pool/member/set.rs diff --git a/openstack_cli/src/load_balancer/v2/pool/member/show.rs b/cli-cmd/load-balancer/src/v2/pool/member/show.rs similarity index 100% rename from openstack_cli/src/load_balancer/v2/pool/member/show.rs rename to cli-cmd/load-balancer/src/v2/pool/member/show.rs diff --git a/openstack_cli/src/load_balancer/v2/pool/set.rs b/cli-cmd/load-balancer/src/v2/pool/set.rs similarity index 100% rename from openstack_cli/src/load_balancer/v2/pool/set.rs rename to cli-cmd/load-balancer/src/v2/pool/set.rs diff --git a/openstack_cli/src/load_balancer/v2/pool/show.rs b/cli-cmd/load-balancer/src/v2/pool/show.rs similarity index 100% rename from openstack_cli/src/load_balancer/v2/pool/show.rs rename to cli-cmd/load-balancer/src/v2/pool/show.rs diff --git a/openstack_cli/src/load_balancer/v2/provider.rs b/cli-cmd/load-balancer/src/v2/provider.rs similarity index 93% rename from openstack_cli/src/load_balancer/v2/provider.rs rename to cli-cmd/load-balancer/src/v2/provider.rs index f420eb381..bb0bf19d7 100644 --- a/openstack_cli/src/load_balancer/v2/provider.rs +++ b/cli-cmd/load-balancer/src/v2/provider.rs @@ -16,10 +16,9 @@ use clap::{Parser, Subcommand}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; - pub mod availability_zone_capability; pub mod flavor_capability; pub mod list; @@ -45,9 +44,9 @@ pub enum ProviderCommands { impl ProviderCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/load_balancer/v2/provider/availability_zone_capability.rs b/cli-cmd/load-balancer/src/v2/provider/availability_zone_capability.rs similarity index 91% rename from openstack_cli/src/load_balancer/v2/provider/availability_zone_capability.rs rename to cli-cmd/load-balancer/src/v2/provider/availability_zone_capability.rs index a44b0ca33..b30cc5a52 100644 --- a/openstack_cli/src/load_balancer/v2/provider/availability_zone_capability.rs +++ b/cli-cmd/load-balancer/src/v2/provider/availability_zone_capability.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; pub mod list; @@ -39,9 +39,9 @@ pub enum AvailabilityZoneCapabilityCommands { impl AvailabilityZoneCapabilityCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/load_balancer/v2/provider/availability_zone_capability/list.rs b/cli-cmd/load-balancer/src/v2/provider/availability_zone_capability/list.rs similarity index 100% rename from openstack_cli/src/load_balancer/v2/provider/availability_zone_capability/list.rs rename to cli-cmd/load-balancer/src/v2/provider/availability_zone_capability/list.rs diff --git a/openstack_cli/src/load_balancer/v2/provider/flavor_capability.rs b/cli-cmd/load-balancer/src/v2/provider/flavor_capability.rs similarity index 91% rename from openstack_cli/src/load_balancer/v2/provider/flavor_capability.rs rename to cli-cmd/load-balancer/src/v2/provider/flavor_capability.rs index da00bbeee..328137a2e 100644 --- a/openstack_cli/src/load_balancer/v2/provider/flavor_capability.rs +++ b/cli-cmd/load-balancer/src/v2/provider/flavor_capability.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; pub mod list; @@ -39,9 +39,9 @@ pub enum FlavorCapabilityCommands { impl FlavorCapabilityCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/load_balancer/v2/provider/flavor_capability/list.rs b/cli-cmd/load-balancer/src/v2/provider/flavor_capability/list.rs similarity index 100% rename from openstack_cli/src/load_balancer/v2/provider/flavor_capability/list.rs rename to cli-cmd/load-balancer/src/v2/provider/flavor_capability/list.rs diff --git a/openstack_cli/src/load_balancer/v2/provider/list.rs b/cli-cmd/load-balancer/src/v2/provider/list.rs similarity index 100% rename from openstack_cli/src/load_balancer/v2/provider/list.rs rename to cli-cmd/load-balancer/src/v2/provider/list.rs diff --git a/openstack_cli/src/load_balancer/v2/quota.rs b/cli-cmd/load-balancer/src/v2/quota.rs similarity index 92% rename from openstack_cli/src/load_balancer/v2/quota.rs rename to cli-cmd/load-balancer/src/v2/quota.rs index d0d9027d3..efc1332ce 100644 --- a/openstack_cli/src/load_balancer/v2/quota.rs +++ b/cli-cmd/load-balancer/src/v2/quota.rs @@ -16,10 +16,9 @@ use clap::{Parser, Subcommand}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; - pub mod delete; pub mod list; pub mod set; @@ -45,9 +44,9 @@ pub enum QuotaCommands { impl QuotaCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/load_balancer/v2/quota/delete.rs b/cli-cmd/load-balancer/src/v2/quota/delete.rs similarity index 100% rename from openstack_cli/src/load_balancer/v2/quota/delete.rs rename to cli-cmd/load-balancer/src/v2/quota/delete.rs diff --git a/openstack_cli/src/load_balancer/v2/quota/list.rs b/cli-cmd/load-balancer/src/v2/quota/list.rs similarity index 100% rename from openstack_cli/src/load_balancer/v2/quota/list.rs rename to cli-cmd/load-balancer/src/v2/quota/list.rs diff --git a/openstack_cli/src/load_balancer/v2/quota/set.rs b/cli-cmd/load-balancer/src/v2/quota/set.rs similarity index 100% rename from openstack_cli/src/load_balancer/v2/quota/set.rs rename to cli-cmd/load-balancer/src/v2/quota/set.rs diff --git a/openstack_cli/src/load_balancer/v2/quota/show.rs b/cli-cmd/load-balancer/src/v2/quota/show.rs similarity index 100% rename from openstack_cli/src/load_balancer/v2/quota/show.rs rename to cli-cmd/load-balancer/src/v2/quota/show.rs diff --git a/openstack_cli/src/load_balancer/v2/version.rs b/cli-cmd/load-balancer/src/v2/version.rs similarity index 90% rename from openstack_cli/src/load_balancer/v2/version.rs rename to cli-cmd/load-balancer/src/v2/version.rs index 58f97c96d..632a15df9 100644 --- a/openstack_cli/src/load_balancer/v2/version.rs +++ b/cli-cmd/load-balancer/src/v2/version.rs @@ -16,10 +16,9 @@ use clap::{Parser, Subcommand}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; - pub mod get; /// Version (Octavia) commands @@ -39,9 +38,9 @@ pub enum VersionCommands { impl VersionCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/load_balancer/v2/version/get.rs b/cli-cmd/load-balancer/src/v2/version/get.rs similarity index 100% rename from openstack_cli/src/load_balancer/v2/version/get.rs rename to cli-cmd/load-balancer/src/v2/version/get.rs diff --git a/cli-cmd/network/Cargo.toml b/cli-cmd/network/Cargo.toml new file mode 100644 index 000000000..aeb838dfb --- /dev/null +++ b/cli-cmd/network/Cargo.toml @@ -0,0 +1,23 @@ +[package] +name = "openstack-cli-network" +version = "0.1.0" +license.workspace = true +edition.workspace = true +authors.workspace = true +rust-version.workspace = true +homepage.workspace = true +repository.workspace = true + +[dependencies] +clap = { workspace = true } +openstack-cli-core = { version = "0.13", path = "../../cli-core/" } +openstack_sdk = { path="../../openstack_sdk", version = "^0.22", default-features = false, features = ["async", "network"] } +openstack-sdk-core = { path="../../sdk-core", version = "^0.22" } +openstack_types = { path="../../openstack_types", version = "^0.22" } +eyre = { workspace = true } +http = { workspace = true } +serde_json = {workspace = true} +tracing = { workspace = true} + +[lints] +workspace = true diff --git a/openstack_cli/src/network/mod.rs b/cli-cmd/network/src/lib.rs similarity index 99% rename from openstack_cli/src/network/mod.rs rename to cli-cmd/network/src/lib.rs index a9e21a55c..019ab4bfa 100644 --- a/openstack_cli/src/network/mod.rs +++ b/cli-cmd/network/src/lib.rs @@ -13,5 +13,4 @@ // SPDX-License-Identifier: Apache-2.0 //! Networking commands - pub mod v2; diff --git a/openstack_cli/src/network/v2.rs b/cli-cmd/network/src/v2.rs similarity index 97% rename from openstack_cli/src/network/v2.rs rename to cli-cmd/network/src/v2.rs index 298b1d7e6..ffeea7b17 100644 --- a/openstack_cli/src/network/v2.rs +++ b/cli-cmd/network/src/v2.rs @@ -16,10 +16,9 @@ use clap::{Parser, Subcommand}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; use openstack_sdk::{AsyncOpenStack, types::ServiceType}; -use crate::{Cli, OpenStackCliError}; - pub mod address_group; pub mod address_scope; pub mod agent; @@ -94,9 +93,9 @@ pub enum NetworkCommands { impl NetworkCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { session diff --git a/openstack_cli/src/network/v2/address_group.rs b/cli-cmd/network/src/v2/address_group.rs similarity index 94% rename from openstack_cli/src/network/v2/address_group.rs rename to cli-cmd/network/src/v2/address_group.rs index 020e4a264..1064bc152 100644 --- a/openstack_cli/src/network/v2/address_group.rs +++ b/cli-cmd/network/src/v2/address_group.rs @@ -16,10 +16,9 @@ use clap::{Parser, Subcommand}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; - pub mod add_addresses; pub mod create; pub mod delete; @@ -53,9 +52,9 @@ pub enum AddressGroupCommands { impl AddressGroupCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/network/v2/address_group/add_addresses.rs b/cli-cmd/network/src/v2/address_group/add_addresses.rs similarity index 100% rename from openstack_cli/src/network/v2/address_group/add_addresses.rs rename to cli-cmd/network/src/v2/address_group/add_addresses.rs diff --git a/openstack_cli/src/network/v2/address_group/create.rs b/cli-cmd/network/src/v2/address_group/create.rs similarity index 100% rename from openstack_cli/src/network/v2/address_group/create.rs rename to cli-cmd/network/src/v2/address_group/create.rs diff --git a/openstack_cli/src/network/v2/address_group/delete.rs b/cli-cmd/network/src/v2/address_group/delete.rs similarity index 100% rename from openstack_cli/src/network/v2/address_group/delete.rs rename to cli-cmd/network/src/v2/address_group/delete.rs diff --git a/openstack_cli/src/network/v2/address_group/list.rs b/cli-cmd/network/src/v2/address_group/list.rs similarity index 100% rename from openstack_cli/src/network/v2/address_group/list.rs rename to cli-cmd/network/src/v2/address_group/list.rs diff --git a/openstack_cli/src/network/v2/address_group/remove_addresses.rs b/cli-cmd/network/src/v2/address_group/remove_addresses.rs similarity index 100% rename from openstack_cli/src/network/v2/address_group/remove_addresses.rs rename to cli-cmd/network/src/v2/address_group/remove_addresses.rs diff --git a/openstack_cli/src/network/v2/address_group/set.rs b/cli-cmd/network/src/v2/address_group/set.rs similarity index 100% rename from openstack_cli/src/network/v2/address_group/set.rs rename to cli-cmd/network/src/v2/address_group/set.rs diff --git a/openstack_cli/src/network/v2/address_group/show.rs b/cli-cmd/network/src/v2/address_group/show.rs similarity index 100% rename from openstack_cli/src/network/v2/address_group/show.rs rename to cli-cmd/network/src/v2/address_group/show.rs diff --git a/openstack_cli/src/network/v2/address_scope.rs b/cli-cmd/network/src/v2/address_scope.rs similarity index 93% rename from openstack_cli/src/network/v2/address_scope.rs rename to cli-cmd/network/src/v2/address_scope.rs index ac390938d..93e5aca43 100644 --- a/openstack_cli/src/network/v2/address_scope.rs +++ b/cli-cmd/network/src/v2/address_scope.rs @@ -16,10 +16,9 @@ use clap::{Parser, Subcommand}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; - pub mod create; pub mod delete; pub mod list; @@ -49,9 +48,9 @@ pub enum AddressScopeCommands { impl AddressScopeCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/network/v2/address_scope/create.rs b/cli-cmd/network/src/v2/address_scope/create.rs similarity index 100% rename from openstack_cli/src/network/v2/address_scope/create.rs rename to cli-cmd/network/src/v2/address_scope/create.rs diff --git a/openstack_cli/src/network/v2/address_scope/delete.rs b/cli-cmd/network/src/v2/address_scope/delete.rs similarity index 100% rename from openstack_cli/src/network/v2/address_scope/delete.rs rename to cli-cmd/network/src/v2/address_scope/delete.rs diff --git a/openstack_cli/src/network/v2/address_scope/list.rs b/cli-cmd/network/src/v2/address_scope/list.rs similarity index 100% rename from openstack_cli/src/network/v2/address_scope/list.rs rename to cli-cmd/network/src/v2/address_scope/list.rs diff --git a/openstack_cli/src/network/v2/address_scope/set.rs b/cli-cmd/network/src/v2/address_scope/set.rs similarity index 100% rename from openstack_cli/src/network/v2/address_scope/set.rs rename to cli-cmd/network/src/v2/address_scope/set.rs diff --git a/openstack_cli/src/network/v2/address_scope/show.rs b/cli-cmd/network/src/v2/address_scope/show.rs similarity index 100% rename from openstack_cli/src/network/v2/address_scope/show.rs rename to cli-cmd/network/src/v2/address_scope/show.rs diff --git a/openstack_cli/src/network/v2/agent.rs b/cli-cmd/network/src/v2/agent.rs similarity index 94% rename from openstack_cli/src/network/v2/agent.rs rename to cli-cmd/network/src/v2/agent.rs index 41a39762b..9f06eabb2 100644 --- a/openstack_cli/src/network/v2/agent.rs +++ b/cli-cmd/network/src/v2/agent.rs @@ -16,10 +16,9 @@ use clap::{Parser, Subcommand}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; - pub mod create; pub mod delete; pub mod dhcp_network; @@ -53,9 +52,9 @@ pub enum AgentCommands { impl AgentCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/network/v2/agent/create.rs b/cli-cmd/network/src/v2/agent/create.rs similarity index 100% rename from openstack_cli/src/network/v2/agent/create.rs rename to cli-cmd/network/src/v2/agent/create.rs diff --git a/openstack_cli/src/network/v2/agent/delete.rs b/cli-cmd/network/src/v2/agent/delete.rs similarity index 100% rename from openstack_cli/src/network/v2/agent/delete.rs rename to cli-cmd/network/src/v2/agent/delete.rs diff --git a/openstack_cli/src/network/v2/agent/dhcp_network.rs b/cli-cmd/network/src/v2/agent/dhcp_network.rs similarity index 94% rename from openstack_cli/src/network/v2/agent/dhcp_network.rs rename to cli-cmd/network/src/v2/agent/dhcp_network.rs index aecfab50c..cdc87a681 100644 --- a/openstack_cli/src/network/v2/agent/dhcp_network.rs +++ b/cli-cmd/network/src/v2/agent/dhcp_network.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; pub mod create; pub mod delete; @@ -51,9 +51,9 @@ pub enum DhcpNetworkCommands { impl DhcpNetworkCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/network/v2/agent/dhcp_network/create.rs b/cli-cmd/network/src/v2/agent/dhcp_network/create.rs similarity index 100% rename from openstack_cli/src/network/v2/agent/dhcp_network/create.rs rename to cli-cmd/network/src/v2/agent/dhcp_network/create.rs diff --git a/openstack_cli/src/network/v2/agent/dhcp_network/delete.rs b/cli-cmd/network/src/v2/agent/dhcp_network/delete.rs similarity index 100% rename from openstack_cli/src/network/v2/agent/dhcp_network/delete.rs rename to cli-cmd/network/src/v2/agent/dhcp_network/delete.rs diff --git a/openstack_cli/src/network/v2/agent/dhcp_network/list.rs b/cli-cmd/network/src/v2/agent/dhcp_network/list.rs similarity index 100% rename from openstack_cli/src/network/v2/agent/dhcp_network/list.rs rename to cli-cmd/network/src/v2/agent/dhcp_network/list.rs diff --git a/openstack_cli/src/network/v2/agent/dhcp_network/set.rs b/cli-cmd/network/src/v2/agent/dhcp_network/set.rs similarity index 100% rename from openstack_cli/src/network/v2/agent/dhcp_network/set.rs rename to cli-cmd/network/src/v2/agent/dhcp_network/set.rs diff --git a/openstack_cli/src/network/v2/agent/dhcp_network/show.rs b/cli-cmd/network/src/v2/agent/dhcp_network/show.rs similarity index 100% rename from openstack_cli/src/network/v2/agent/dhcp_network/show.rs rename to cli-cmd/network/src/v2/agent/dhcp_network/show.rs diff --git a/openstack_cli/src/network/v2/agent/l3_router.rs b/cli-cmd/network/src/v2/agent/l3_router.rs similarity index 93% rename from openstack_cli/src/network/v2/agent/l3_router.rs rename to cli-cmd/network/src/v2/agent/l3_router.rs index da07db54d..079809b53 100644 --- a/openstack_cli/src/network/v2/agent/l3_router.rs +++ b/cli-cmd/network/src/v2/agent/l3_router.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; pub mod create; pub mod delete; @@ -49,9 +49,9 @@ pub enum L3RouterCommands { impl L3RouterCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/network/v2/agent/l3_router/create.rs b/cli-cmd/network/src/v2/agent/l3_router/create.rs similarity index 100% rename from openstack_cli/src/network/v2/agent/l3_router/create.rs rename to cli-cmd/network/src/v2/agent/l3_router/create.rs diff --git a/openstack_cli/src/network/v2/agent/l3_router/delete.rs b/cli-cmd/network/src/v2/agent/l3_router/delete.rs similarity index 100% rename from openstack_cli/src/network/v2/agent/l3_router/delete.rs rename to cli-cmd/network/src/v2/agent/l3_router/delete.rs diff --git a/openstack_cli/src/network/v2/agent/l3_router/list.rs b/cli-cmd/network/src/v2/agent/l3_router/list.rs similarity index 100% rename from openstack_cli/src/network/v2/agent/l3_router/list.rs rename to cli-cmd/network/src/v2/agent/l3_router/list.rs diff --git a/openstack_cli/src/network/v2/agent/l3_router/set.rs b/cli-cmd/network/src/v2/agent/l3_router/set.rs similarity index 100% rename from openstack_cli/src/network/v2/agent/l3_router/set.rs rename to cli-cmd/network/src/v2/agent/l3_router/set.rs diff --git a/openstack_cli/src/network/v2/agent/l3_router/show.rs b/cli-cmd/network/src/v2/agent/l3_router/show.rs similarity index 100% rename from openstack_cli/src/network/v2/agent/l3_router/show.rs rename to cli-cmd/network/src/v2/agent/l3_router/show.rs diff --git a/openstack_cli/src/network/v2/agent/list.rs b/cli-cmd/network/src/v2/agent/list.rs similarity index 100% rename from openstack_cli/src/network/v2/agent/list.rs rename to cli-cmd/network/src/v2/agent/list.rs diff --git a/openstack_cli/src/network/v2/agent/set.rs b/cli-cmd/network/src/v2/agent/set.rs similarity index 100% rename from openstack_cli/src/network/v2/agent/set.rs rename to cli-cmd/network/src/v2/agent/set.rs diff --git a/openstack_cli/src/network/v2/agent/show.rs b/cli-cmd/network/src/v2/agent/show.rs similarity index 100% rename from openstack_cli/src/network/v2/agent/show.rs rename to cli-cmd/network/src/v2/agent/show.rs diff --git a/openstack_cli/src/network/v2/auto_allocated_topology.rs b/cli-cmd/network/src/v2/auto_allocated_topology.rs similarity index 94% rename from openstack_cli/src/network/v2/auto_allocated_topology.rs rename to cli-cmd/network/src/v2/auto_allocated_topology.rs index 98aa36dcd..38494d811 100644 --- a/openstack_cli/src/network/v2/auto_allocated_topology.rs +++ b/cli-cmd/network/src/v2/auto_allocated_topology.rs @@ -16,10 +16,9 @@ use clap::{Parser, Subcommand}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; - pub mod create; pub mod delete; pub mod list; @@ -50,9 +49,9 @@ pub enum AutoAllocatedTopologyCommands { impl AutoAllocatedTopologyCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/network/v2/auto_allocated_topology/create.rs b/cli-cmd/network/src/v2/auto_allocated_topology/create.rs similarity index 100% rename from openstack_cli/src/network/v2/auto_allocated_topology/create.rs rename to cli-cmd/network/src/v2/auto_allocated_topology/create.rs diff --git a/openstack_cli/src/network/v2/auto_allocated_topology/delete.rs b/cli-cmd/network/src/v2/auto_allocated_topology/delete.rs similarity index 100% rename from openstack_cli/src/network/v2/auto_allocated_topology/delete.rs rename to cli-cmd/network/src/v2/auto_allocated_topology/delete.rs diff --git a/openstack_cli/src/network/v2/auto_allocated_topology/list.rs b/cli-cmd/network/src/v2/auto_allocated_topology/list.rs similarity index 100% rename from openstack_cli/src/network/v2/auto_allocated_topology/list.rs rename to cli-cmd/network/src/v2/auto_allocated_topology/list.rs diff --git a/openstack_cli/src/network/v2/auto_allocated_topology/set.rs b/cli-cmd/network/src/v2/auto_allocated_topology/set.rs similarity index 100% rename from openstack_cli/src/network/v2/auto_allocated_topology/set.rs rename to cli-cmd/network/src/v2/auto_allocated_topology/set.rs diff --git a/openstack_cli/src/network/v2/auto_allocated_topology/show.rs b/cli-cmd/network/src/v2/auto_allocated_topology/show.rs similarity index 100% rename from openstack_cli/src/network/v2/auto_allocated_topology/show.rs rename to cli-cmd/network/src/v2/auto_allocated_topology/show.rs diff --git a/openstack_cli/src/network/v2/availability_zone.rs b/cli-cmd/network/src/v2/availability_zone.rs similarity index 91% rename from openstack_cli/src/network/v2/availability_zone.rs rename to cli-cmd/network/src/v2/availability_zone.rs index 37d413f05..04eda9128 100644 --- a/openstack_cli/src/network/v2/availability_zone.rs +++ b/cli-cmd/network/src/v2/availability_zone.rs @@ -16,10 +16,9 @@ use clap::{Parser, Subcommand}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; - pub mod list; /// Availability Zones commands @@ -39,9 +38,9 @@ pub enum AvailabilityZoneCommands { impl AvailabilityZoneCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/network/v2/availability_zone/list.rs b/cli-cmd/network/src/v2/availability_zone/list.rs similarity index 100% rename from openstack_cli/src/network/v2/availability_zone/list.rs rename to cli-cmd/network/src/v2/availability_zone/list.rs diff --git a/openstack_cli/src/network/v2/default_security_group_rule.rs b/cli-cmd/network/src/v2/default_security_group_rule.rs similarity index 94% rename from openstack_cli/src/network/v2/default_security_group_rule.rs rename to cli-cmd/network/src/v2/default_security_group_rule.rs index d01f268c9..8a2eff733 100644 --- a/openstack_cli/src/network/v2/default_security_group_rule.rs +++ b/cli-cmd/network/src/v2/default_security_group_rule.rs @@ -16,10 +16,9 @@ use clap::{Parser, Subcommand}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; - pub mod create; pub mod delete; pub mod list; @@ -49,9 +48,9 @@ pub enum DefaultSecurityGroupRuleCommands { impl DefaultSecurityGroupRuleCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/network/v2/default_security_group_rule/create.rs b/cli-cmd/network/src/v2/default_security_group_rule/create.rs similarity index 100% rename from openstack_cli/src/network/v2/default_security_group_rule/create.rs rename to cli-cmd/network/src/v2/default_security_group_rule/create.rs diff --git a/openstack_cli/src/network/v2/default_security_group_rule/delete.rs b/cli-cmd/network/src/v2/default_security_group_rule/delete.rs similarity index 100% rename from openstack_cli/src/network/v2/default_security_group_rule/delete.rs rename to cli-cmd/network/src/v2/default_security_group_rule/delete.rs diff --git a/openstack_cli/src/network/v2/default_security_group_rule/list.rs b/cli-cmd/network/src/v2/default_security_group_rule/list.rs similarity index 100% rename from openstack_cli/src/network/v2/default_security_group_rule/list.rs rename to cli-cmd/network/src/v2/default_security_group_rule/list.rs diff --git a/openstack_cli/src/network/v2/default_security_group_rule/set.rs b/cli-cmd/network/src/v2/default_security_group_rule/set.rs similarity index 100% rename from openstack_cli/src/network/v2/default_security_group_rule/set.rs rename to cli-cmd/network/src/v2/default_security_group_rule/set.rs diff --git a/openstack_cli/src/network/v2/default_security_group_rule/show.rs b/cli-cmd/network/src/v2/default_security_group_rule/show.rs similarity index 100% rename from openstack_cli/src/network/v2/default_security_group_rule/show.rs rename to cli-cmd/network/src/v2/default_security_group_rule/show.rs diff --git a/openstack_cli/src/network/v2/extension.rs b/cli-cmd/network/src/v2/extension.rs similarity index 91% rename from openstack_cli/src/network/v2/extension.rs rename to cli-cmd/network/src/v2/extension.rs index 3f5b24cfa..ae8751bda 100644 --- a/openstack_cli/src/network/v2/extension.rs +++ b/cli-cmd/network/src/v2/extension.rs @@ -16,10 +16,9 @@ use clap::{Parser, Subcommand}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; - pub mod list; pub mod show; @@ -41,9 +40,9 @@ pub enum ExtensionCommands { impl ExtensionCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/network/v2/extension/list.rs b/cli-cmd/network/src/v2/extension/list.rs similarity index 100% rename from openstack_cli/src/network/v2/extension/list.rs rename to cli-cmd/network/src/v2/extension/list.rs diff --git a/openstack_cli/src/network/v2/extension/show.rs b/cli-cmd/network/src/v2/extension/show.rs similarity index 100% rename from openstack_cli/src/network/v2/extension/show.rs rename to cli-cmd/network/src/v2/extension/show.rs diff --git a/openstack_cli/src/network/v2/flavor.rs b/cli-cmd/network/src/v2/flavor.rs similarity index 94% rename from openstack_cli/src/network/v2/flavor.rs rename to cli-cmd/network/src/v2/flavor.rs index 7c0240f81..2ede00e1b 100644 --- a/openstack_cli/src/network/v2/flavor.rs +++ b/cli-cmd/network/src/v2/flavor.rs @@ -16,10 +16,9 @@ use clap::{Parser, Subcommand}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; - pub mod create; pub mod delete; pub mod list; @@ -53,9 +52,9 @@ pub enum FlavorCommands { impl FlavorCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/network/v2/flavor/create.rs b/cli-cmd/network/src/v2/flavor/create.rs similarity index 100% rename from openstack_cli/src/network/v2/flavor/create.rs rename to cli-cmd/network/src/v2/flavor/create.rs diff --git a/openstack_cli/src/network/v2/flavor/delete.rs b/cli-cmd/network/src/v2/flavor/delete.rs similarity index 100% rename from openstack_cli/src/network/v2/flavor/delete.rs rename to cli-cmd/network/src/v2/flavor/delete.rs diff --git a/openstack_cli/src/network/v2/flavor/list.rs b/cli-cmd/network/src/v2/flavor/list.rs similarity index 100% rename from openstack_cli/src/network/v2/flavor/list.rs rename to cli-cmd/network/src/v2/flavor/list.rs diff --git a/openstack_cli/src/network/v2/flavor/next_provider/create.rs b/cli-cmd/network/src/v2/flavor/next_provider/create.rs similarity index 100% rename from openstack_cli/src/network/v2/flavor/next_provider/create.rs rename to cli-cmd/network/src/v2/flavor/next_provider/create.rs diff --git a/openstack_cli/src/network/v2/flavor/next_provider/delete.rs b/cli-cmd/network/src/v2/flavor/next_provider/delete.rs similarity index 100% rename from openstack_cli/src/network/v2/flavor/next_provider/delete.rs rename to cli-cmd/network/src/v2/flavor/next_provider/delete.rs diff --git a/openstack_cli/src/network/v2/flavor/next_provider/list.rs b/cli-cmd/network/src/v2/flavor/next_provider/list.rs similarity index 100% rename from openstack_cli/src/network/v2/flavor/next_provider/list.rs rename to cli-cmd/network/src/v2/flavor/next_provider/list.rs diff --git a/openstack_cli/src/network/v2/flavor/next_provider/set.rs b/cli-cmd/network/src/v2/flavor/next_provider/set.rs similarity index 100% rename from openstack_cli/src/network/v2/flavor/next_provider/set.rs rename to cli-cmd/network/src/v2/flavor/next_provider/set.rs diff --git a/openstack_cli/src/network/v2/flavor/next_provider/show.rs b/cli-cmd/network/src/v2/flavor/next_provider/show.rs similarity index 100% rename from openstack_cli/src/network/v2/flavor/next_provider/show.rs rename to cli-cmd/network/src/v2/flavor/next_provider/show.rs diff --git a/openstack_cli/src/network/v2/flavor/service_profile/create.rs b/cli-cmd/network/src/v2/flavor/service_profile/create.rs similarity index 100% rename from openstack_cli/src/network/v2/flavor/service_profile/create.rs rename to cli-cmd/network/src/v2/flavor/service_profile/create.rs diff --git a/openstack_cli/src/network/v2/flavor/service_profile/delete.rs b/cli-cmd/network/src/v2/flavor/service_profile/delete.rs similarity index 100% rename from openstack_cli/src/network/v2/flavor/service_profile/delete.rs rename to cli-cmd/network/src/v2/flavor/service_profile/delete.rs diff --git a/openstack_cli/src/network/v2/flavor/service_profile/list.rs b/cli-cmd/network/src/v2/flavor/service_profile/list.rs similarity index 100% rename from openstack_cli/src/network/v2/flavor/service_profile/list.rs rename to cli-cmd/network/src/v2/flavor/service_profile/list.rs diff --git a/openstack_cli/src/network/v2/flavor/service_profile/set.rs b/cli-cmd/network/src/v2/flavor/service_profile/set.rs similarity index 100% rename from openstack_cli/src/network/v2/flavor/service_profile/set.rs rename to cli-cmd/network/src/v2/flavor/service_profile/set.rs diff --git a/openstack_cli/src/network/v2/flavor/service_profile/show.rs b/cli-cmd/network/src/v2/flavor/service_profile/show.rs similarity index 100% rename from openstack_cli/src/network/v2/flavor/service_profile/show.rs rename to cli-cmd/network/src/v2/flavor/service_profile/show.rs diff --git a/openstack_cli/src/network/v2/flavor/set.rs b/cli-cmd/network/src/v2/flavor/set.rs similarity index 100% rename from openstack_cli/src/network/v2/flavor/set.rs rename to cli-cmd/network/src/v2/flavor/set.rs diff --git a/openstack_cli/src/network/v2/flavor/show.rs b/cli-cmd/network/src/v2/flavor/show.rs similarity index 100% rename from openstack_cli/src/network/v2/flavor/show.rs rename to cli-cmd/network/src/v2/flavor/show.rs diff --git a/openstack_cli/src/network/v2/floatingip.rs b/cli-cmd/network/src/v2/floatingip.rs similarity index 94% rename from openstack_cli/src/network/v2/floatingip.rs rename to cli-cmd/network/src/v2/floatingip.rs index 1d8fc9000..9e3ff3629 100644 --- a/openstack_cli/src/network/v2/floatingip.rs +++ b/cli-cmd/network/src/v2/floatingip.rs @@ -16,10 +16,9 @@ use clap::{Parser, Subcommand}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; - pub mod create; pub mod delete; pub mod list; @@ -51,9 +50,9 @@ pub enum FloatingIPCommands { impl FloatingIPCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/network/v2/floatingip/create.rs b/cli-cmd/network/src/v2/floatingip/create.rs similarity index 100% rename from openstack_cli/src/network/v2/floatingip/create.rs rename to cli-cmd/network/src/v2/floatingip/create.rs diff --git a/openstack_cli/src/network/v2/floatingip/delete.rs b/cli-cmd/network/src/v2/floatingip/delete.rs similarity index 100% rename from openstack_cli/src/network/v2/floatingip/delete.rs rename to cli-cmd/network/src/v2/floatingip/delete.rs diff --git a/openstack_cli/src/network/v2/floatingip/list.rs b/cli-cmd/network/src/v2/floatingip/list.rs similarity index 100% rename from openstack_cli/src/network/v2/floatingip/list.rs rename to cli-cmd/network/src/v2/floatingip/list.rs diff --git a/openstack_cli/src/network/v2/floatingip/port_forwarding.rs b/cli-cmd/network/src/v2/floatingip/port_forwarding.rs similarity index 95% rename from openstack_cli/src/network/v2/floatingip/port_forwarding.rs rename to cli-cmd/network/src/v2/floatingip/port_forwarding.rs index 4e2aaa97b..b88059863 100644 --- a/openstack_cli/src/network/v2/floatingip/port_forwarding.rs +++ b/cli-cmd/network/src/v2/floatingip/port_forwarding.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; pub mod create; pub mod delete; @@ -63,9 +63,9 @@ pub enum PortForwardingCommands { impl PortForwardingCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/network/v2/floatingip/port_forwarding/create.rs b/cli-cmd/network/src/v2/floatingip/port_forwarding/create.rs similarity index 100% rename from openstack_cli/src/network/v2/floatingip/port_forwarding/create.rs rename to cli-cmd/network/src/v2/floatingip/port_forwarding/create.rs diff --git a/openstack_cli/src/network/v2/floatingip/port_forwarding/delete.rs b/cli-cmd/network/src/v2/floatingip/port_forwarding/delete.rs similarity index 100% rename from openstack_cli/src/network/v2/floatingip/port_forwarding/delete.rs rename to cli-cmd/network/src/v2/floatingip/port_forwarding/delete.rs diff --git a/openstack_cli/src/network/v2/floatingip/port_forwarding/list.rs b/cli-cmd/network/src/v2/floatingip/port_forwarding/list.rs similarity index 100% rename from openstack_cli/src/network/v2/floatingip/port_forwarding/list.rs rename to cli-cmd/network/src/v2/floatingip/port_forwarding/list.rs diff --git a/openstack_cli/src/network/v2/floatingip/port_forwarding/set.rs b/cli-cmd/network/src/v2/floatingip/port_forwarding/set.rs similarity index 100% rename from openstack_cli/src/network/v2/floatingip/port_forwarding/set.rs rename to cli-cmd/network/src/v2/floatingip/port_forwarding/set.rs diff --git a/openstack_cli/src/network/v2/floatingip/port_forwarding/show.rs b/cli-cmd/network/src/v2/floatingip/port_forwarding/show.rs similarity index 100% rename from openstack_cli/src/network/v2/floatingip/port_forwarding/show.rs rename to cli-cmd/network/src/v2/floatingip/port_forwarding/show.rs diff --git a/openstack_cli/src/network/v2/floatingip/set.rs b/cli-cmd/network/src/v2/floatingip/set.rs similarity index 100% rename from openstack_cli/src/network/v2/floatingip/set.rs rename to cli-cmd/network/src/v2/floatingip/set.rs diff --git a/openstack_cli/src/network/v2/floatingip/show.rs b/cli-cmd/network/src/v2/floatingip/show.rs similarity index 100% rename from openstack_cli/src/network/v2/floatingip/show.rs rename to cli-cmd/network/src/v2/floatingip/show.rs diff --git a/openstack_cli/src/network/v2/_tag.rs_ b/cli-cmd/network/src/v2/floatingip/tag.rs similarity index 94% rename from openstack_cli/src/network/v2/_tag.rs_ rename to cli-cmd/network/src/v2/floatingip/tag.rs index bb9c6ed24..006b0d1aa 100644 --- a/openstack_cli/src/network/v2/_tag.rs_ +++ b/cli-cmd/network/src/v2/floatingip/tag.rs @@ -22,7 +22,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; pub mod delete; pub mod delete_all; @@ -52,9 +52,9 @@ pub enum TagCommands { impl TagCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/network/v2/floatingip/tag/delete.rs b/cli-cmd/network/src/v2/floatingip/tag/delete.rs similarity index 100% rename from openstack_cli/src/network/v2/floatingip/tag/delete.rs rename to cli-cmd/network/src/v2/floatingip/tag/delete.rs diff --git a/openstack_cli/src/network/v2/floatingip/tag/delete_all.rs b/cli-cmd/network/src/v2/floatingip/tag/delete_all.rs similarity index 100% rename from openstack_cli/src/network/v2/floatingip/tag/delete_all.rs rename to cli-cmd/network/src/v2/floatingip/tag/delete_all.rs diff --git a/openstack_cli/src/network/v2/floatingip/tag/list.rs b/cli-cmd/network/src/v2/floatingip/tag/list.rs similarity index 100% rename from openstack_cli/src/network/v2/floatingip/tag/list.rs rename to cli-cmd/network/src/v2/floatingip/tag/list.rs diff --git a/openstack_cli/src/network/v2/floatingip/tag/replace.rs b/cli-cmd/network/src/v2/floatingip/tag/replace.rs similarity index 100% rename from openstack_cli/src/network/v2/floatingip/tag/replace.rs rename to cli-cmd/network/src/v2/floatingip/tag/replace.rs diff --git a/openstack_cli/src/network/v2/floatingip/tag/set.rs b/cli-cmd/network/src/v2/floatingip/tag/set.rs similarity index 100% rename from openstack_cli/src/network/v2/floatingip/tag/set.rs rename to cli-cmd/network/src/v2/floatingip/tag/set.rs diff --git a/openstack_cli/src/network/v2/floatingip/tag/show.rs b/cli-cmd/network/src/v2/floatingip/tag/show.rs similarity index 100% rename from openstack_cli/src/network/v2/floatingip/tag/show.rs rename to cli-cmd/network/src/v2/floatingip/tag/show.rs diff --git a/openstack_cli/src/network/v2/floatingip_pool.rs b/cli-cmd/network/src/v2/floatingip_pool.rs similarity index 90% rename from openstack_cli/src/network/v2/floatingip_pool.rs rename to cli-cmd/network/src/v2/floatingip_pool.rs index bda19b1f6..a2f9eb688 100644 --- a/openstack_cli/src/network/v2/floatingip_pool.rs +++ b/cli-cmd/network/src/v2/floatingip_pool.rs @@ -16,10 +16,9 @@ use clap::{Parser, Subcommand}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; - pub mod list; /// Floating IP pools @@ -39,9 +38,9 @@ pub enum FloatingIPPoolCommands { impl FloatingIPPoolCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/network/v2/floatingip_pool/create.rs b/cli-cmd/network/src/v2/floatingip_pool/create.rs similarity index 100% rename from openstack_cli/src/network/v2/floatingip_pool/create.rs rename to cli-cmd/network/src/v2/floatingip_pool/create.rs diff --git a/openstack_cli/src/network/v2/floatingip_pool/delete.rs b/cli-cmd/network/src/v2/floatingip_pool/delete.rs similarity index 100% rename from openstack_cli/src/network/v2/floatingip_pool/delete.rs rename to cli-cmd/network/src/v2/floatingip_pool/delete.rs diff --git a/openstack_cli/src/network/v2/floatingip_pool/list.rs b/cli-cmd/network/src/v2/floatingip_pool/list.rs similarity index 100% rename from openstack_cli/src/network/v2/floatingip_pool/list.rs rename to cli-cmd/network/src/v2/floatingip_pool/list.rs diff --git a/openstack_cli/src/network/v2/floatingip_pool/set.rs b/cli-cmd/network/src/v2/floatingip_pool/set.rs similarity index 100% rename from openstack_cli/src/network/v2/floatingip_pool/set.rs rename to cli-cmd/network/src/v2/floatingip_pool/set.rs diff --git a/openstack_cli/src/network/v2/floatingip_pool/show.rs b/cli-cmd/network/src/v2/floatingip_pool/show.rs similarity index 100% rename from openstack_cli/src/network/v2/floatingip_pool/show.rs rename to cli-cmd/network/src/v2/floatingip_pool/show.rs diff --git a/openstack_cli/src/network/v2/local_ip.rs b/cli-cmd/network/src/v2/local_ip.rs similarity index 94% rename from openstack_cli/src/network/v2/local_ip.rs rename to cli-cmd/network/src/v2/local_ip.rs index 6fed4b91f..e29bf8a1e 100644 --- a/openstack_cli/src/network/v2/local_ip.rs +++ b/cli-cmd/network/src/v2/local_ip.rs @@ -16,10 +16,9 @@ use clap::{Parser, Subcommand}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; - pub mod create; pub mod delete; pub mod list; @@ -53,9 +52,9 @@ pub enum LocalIPCommands { impl LocalIPCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/network/v2/local_ip/create.rs b/cli-cmd/network/src/v2/local_ip/create.rs similarity index 100% rename from openstack_cli/src/network/v2/local_ip/create.rs rename to cli-cmd/network/src/v2/local_ip/create.rs diff --git a/openstack_cli/src/network/v2/local_ip/delete.rs b/cli-cmd/network/src/v2/local_ip/delete.rs similarity index 100% rename from openstack_cli/src/network/v2/local_ip/delete.rs rename to cli-cmd/network/src/v2/local_ip/delete.rs diff --git a/openstack_cli/src/network/v2/local_ip/list.rs b/cli-cmd/network/src/v2/local_ip/list.rs similarity index 100% rename from openstack_cli/src/network/v2/local_ip/list.rs rename to cli-cmd/network/src/v2/local_ip/list.rs diff --git a/openstack_cli/src/network/v2/local_ip/port_association.rs b/cli-cmd/network/src/v2/local_ip/port_association.rs similarity index 93% rename from openstack_cli/src/network/v2/local_ip/port_association.rs rename to cli-cmd/network/src/v2/local_ip/port_association.rs index b89df3139..9c644f337 100644 --- a/openstack_cli/src/network/v2/local_ip/port_association.rs +++ b/cli-cmd/network/src/v2/local_ip/port_association.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; pub mod create; pub mod delete; @@ -46,9 +46,9 @@ pub enum PortAssociationCommands { impl PortAssociationCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/network/v2/local_ip/port_association/create.rs b/cli-cmd/network/src/v2/local_ip/port_association/create.rs similarity index 100% rename from openstack_cli/src/network/v2/local_ip/port_association/create.rs rename to cli-cmd/network/src/v2/local_ip/port_association/create.rs diff --git a/openstack_cli/src/network/v2/local_ip/port_association/delete.rs b/cli-cmd/network/src/v2/local_ip/port_association/delete.rs similarity index 100% rename from openstack_cli/src/network/v2/local_ip/port_association/delete.rs rename to cli-cmd/network/src/v2/local_ip/port_association/delete.rs diff --git a/openstack_cli/src/network/v2/local_ip/port_association/list.rs b/cli-cmd/network/src/v2/local_ip/port_association/list.rs similarity index 100% rename from openstack_cli/src/network/v2/local_ip/port_association/list.rs rename to cli-cmd/network/src/v2/local_ip/port_association/list.rs diff --git a/openstack_cli/src/network/v2/local_ip/port_association/set.rs b/cli-cmd/network/src/v2/local_ip/port_association/set.rs similarity index 100% rename from openstack_cli/src/network/v2/local_ip/port_association/set.rs rename to cli-cmd/network/src/v2/local_ip/port_association/set.rs diff --git a/openstack_cli/src/network/v2/local_ip/port_association/show.rs b/cli-cmd/network/src/v2/local_ip/port_association/show.rs similarity index 100% rename from openstack_cli/src/network/v2/local_ip/port_association/show.rs rename to cli-cmd/network/src/v2/local_ip/port_association/show.rs diff --git a/openstack_cli/src/network/v2/local_ip/set.rs b/cli-cmd/network/src/v2/local_ip/set.rs similarity index 100% rename from openstack_cli/src/network/v2/local_ip/set.rs rename to cli-cmd/network/src/v2/local_ip/set.rs diff --git a/openstack_cli/src/network/v2/local_ip/show.rs b/cli-cmd/network/src/v2/local_ip/show.rs similarity index 100% rename from openstack_cli/src/network/v2/local_ip/show.rs rename to cli-cmd/network/src/v2/local_ip/show.rs diff --git a/openstack_cli/src/network/v2/log.rs b/cli-cmd/network/src/v2/log.rs similarity index 92% rename from openstack_cli/src/network/v2/log.rs rename to cli-cmd/network/src/v2/log.rs index ed394d272..0c4a0fe5c 100644 --- a/openstack_cli/src/network/v2/log.rs +++ b/cli-cmd/network/src/v2/log.rs @@ -16,10 +16,9 @@ use clap::{Parser, Subcommand}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; - #[allow(clippy::module_inception)] pub mod log; pub mod loggable_resource; @@ -46,9 +45,9 @@ pub enum LogCommands { impl LogCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/network/v2/log/log.rs b/cli-cmd/network/src/v2/log/log.rs similarity index 93% rename from openstack_cli/src/network/v2/log/log.rs rename to cli-cmd/network/src/v2/log/log.rs index ee49ddde6..4df4c9b49 100644 --- a/openstack_cli/src/network/v2/log/log.rs +++ b/cli-cmd/network/src/v2/log/log.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; pub mod create; pub mod delete; @@ -49,9 +49,9 @@ pub enum LogCommands { impl LogCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/network/v2/log/log/create.rs b/cli-cmd/network/src/v2/log/log/create.rs similarity index 100% rename from openstack_cli/src/network/v2/log/log/create.rs rename to cli-cmd/network/src/v2/log/log/create.rs diff --git a/openstack_cli/src/network/v2/log/log/delete.rs b/cli-cmd/network/src/v2/log/log/delete.rs similarity index 100% rename from openstack_cli/src/network/v2/log/log/delete.rs rename to cli-cmd/network/src/v2/log/log/delete.rs diff --git a/openstack_cli/src/network/v2/log/log/list.rs b/cli-cmd/network/src/v2/log/log/list.rs similarity index 100% rename from openstack_cli/src/network/v2/log/log/list.rs rename to cli-cmd/network/src/v2/log/log/list.rs diff --git a/openstack_cli/src/network/v2/log/log/set.rs b/cli-cmd/network/src/v2/log/log/set.rs similarity index 100% rename from openstack_cli/src/network/v2/log/log/set.rs rename to cli-cmd/network/src/v2/log/log/set.rs diff --git a/openstack_cli/src/network/v2/log/log/show.rs b/cli-cmd/network/src/v2/log/log/show.rs similarity index 100% rename from openstack_cli/src/network/v2/log/log/show.rs rename to cli-cmd/network/src/v2/log/log/show.rs diff --git a/openstack_cli/src/network/v2/log/loggable_resource.rs b/cli-cmd/network/src/v2/log/loggable_resource.rs similarity index 90% rename from openstack_cli/src/network/v2/log/loggable_resource.rs rename to cli-cmd/network/src/v2/log/loggable_resource.rs index 56cfeeb92..61069afb7 100644 --- a/openstack_cli/src/network/v2/log/loggable_resource.rs +++ b/cli-cmd/network/src/v2/log/loggable_resource.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; pub mod list; @@ -39,9 +39,9 @@ pub enum LoggableResourceCommands { impl LoggableResourceCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/network/v2/log/loggable_resource/create.rs b/cli-cmd/network/src/v2/log/loggable_resource/create.rs similarity index 100% rename from openstack_cli/src/network/v2/log/loggable_resource/create.rs rename to cli-cmd/network/src/v2/log/loggable_resource/create.rs diff --git a/openstack_cli/src/network/v2/log/loggable_resource/delete.rs b/cli-cmd/network/src/v2/log/loggable_resource/delete.rs similarity index 100% rename from openstack_cli/src/network/v2/log/loggable_resource/delete.rs rename to cli-cmd/network/src/v2/log/loggable_resource/delete.rs diff --git a/openstack_cli/src/network/v2/log/loggable_resource/list.rs b/cli-cmd/network/src/v2/log/loggable_resource/list.rs similarity index 100% rename from openstack_cli/src/network/v2/log/loggable_resource/list.rs rename to cli-cmd/network/src/v2/log/loggable_resource/list.rs diff --git a/openstack_cli/src/network/v2/log/loggable_resource/set.rs b/cli-cmd/network/src/v2/log/loggable_resource/set.rs similarity index 100% rename from openstack_cli/src/network/v2/log/loggable_resource/set.rs rename to cli-cmd/network/src/v2/log/loggable_resource/set.rs diff --git a/openstack_cli/src/network/v2/log/loggable_resource/show.rs b/cli-cmd/network/src/v2/log/loggable_resource/show.rs similarity index 100% rename from openstack_cli/src/network/v2/log/loggable_resource/show.rs rename to cli-cmd/network/src/v2/log/loggable_resource/show.rs diff --git a/openstack_cli/src/network/v2/metering.rs b/cli-cmd/network/src/v2/metering.rs similarity index 92% rename from openstack_cli/src/network/v2/metering.rs rename to cli-cmd/network/src/v2/metering.rs index 8929dc6e9..9a500c1a1 100644 --- a/openstack_cli/src/network/v2/metering.rs +++ b/cli-cmd/network/src/v2/metering.rs @@ -16,10 +16,9 @@ use clap::{Parser, Subcommand}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; - pub mod metering_label; pub mod metering_label_rule; @@ -45,9 +44,9 @@ pub enum MeteringCommands { impl MeteringCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/network/v2/metering/metering_label.rs b/cli-cmd/network/src/v2/metering/metering_label.rs similarity index 93% rename from openstack_cli/src/network/v2/metering/metering_label.rs rename to cli-cmd/network/src/v2/metering/metering_label.rs index e92f7eea5..75e3cc36b 100644 --- a/openstack_cli/src/network/v2/metering/metering_label.rs +++ b/cli-cmd/network/src/v2/metering/metering_label.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; pub mod create; pub mod delete; @@ -45,9 +45,9 @@ pub enum MeteringLabelCommands { impl MeteringLabelCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/network/v2/metering/metering_label/create.rs b/cli-cmd/network/src/v2/metering/metering_label/create.rs similarity index 100% rename from openstack_cli/src/network/v2/metering/metering_label/create.rs rename to cli-cmd/network/src/v2/metering/metering_label/create.rs diff --git a/openstack_cli/src/network/v2/metering/metering_label/delete.rs b/cli-cmd/network/src/v2/metering/metering_label/delete.rs similarity index 100% rename from openstack_cli/src/network/v2/metering/metering_label/delete.rs rename to cli-cmd/network/src/v2/metering/metering_label/delete.rs diff --git a/openstack_cli/src/network/v2/metering/metering_label/list.rs b/cli-cmd/network/src/v2/metering/metering_label/list.rs similarity index 100% rename from openstack_cli/src/network/v2/metering/metering_label/list.rs rename to cli-cmd/network/src/v2/metering/metering_label/list.rs diff --git a/openstack_cli/src/network/v2/metering/metering_label/set.rs b/cli-cmd/network/src/v2/metering/metering_label/set.rs similarity index 100% rename from openstack_cli/src/network/v2/metering/metering_label/set.rs rename to cli-cmd/network/src/v2/metering/metering_label/set.rs diff --git a/openstack_cli/src/network/v2/metering/metering_label/show.rs b/cli-cmd/network/src/v2/metering/metering_label/show.rs similarity index 100% rename from openstack_cli/src/network/v2/metering/metering_label/show.rs rename to cli-cmd/network/src/v2/metering/metering_label/show.rs diff --git a/openstack_cli/src/network/v2/metering/metering_label_rule.rs b/cli-cmd/network/src/v2/metering/metering_label_rule.rs similarity index 93% rename from openstack_cli/src/network/v2/metering/metering_label_rule.rs rename to cli-cmd/network/src/v2/metering/metering_label_rule.rs index e8dcf3217..9926f5ef4 100644 --- a/openstack_cli/src/network/v2/metering/metering_label_rule.rs +++ b/cli-cmd/network/src/v2/metering/metering_label_rule.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; pub mod create; pub mod delete; @@ -45,9 +45,9 @@ pub enum MeteringLabelRuleCommands { impl MeteringLabelRuleCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/network/v2/metering/metering_label_rule/create.rs b/cli-cmd/network/src/v2/metering/metering_label_rule/create.rs similarity index 100% rename from openstack_cli/src/network/v2/metering/metering_label_rule/create.rs rename to cli-cmd/network/src/v2/metering/metering_label_rule/create.rs diff --git a/openstack_cli/src/network/v2/metering/metering_label_rule/delete.rs b/cli-cmd/network/src/v2/metering/metering_label_rule/delete.rs similarity index 100% rename from openstack_cli/src/network/v2/metering/metering_label_rule/delete.rs rename to cli-cmd/network/src/v2/metering/metering_label_rule/delete.rs diff --git a/openstack_cli/src/network/v2/metering/metering_label_rule/list.rs b/cli-cmd/network/src/v2/metering/metering_label_rule/list.rs similarity index 100% rename from openstack_cli/src/network/v2/metering/metering_label_rule/list.rs rename to cli-cmd/network/src/v2/metering/metering_label_rule/list.rs diff --git a/openstack_cli/src/network/v2/metering/metering_label_rule/set.rs b/cli-cmd/network/src/v2/metering/metering_label_rule/set.rs similarity index 100% rename from openstack_cli/src/network/v2/metering/metering_label_rule/set.rs rename to cli-cmd/network/src/v2/metering/metering_label_rule/set.rs diff --git a/openstack_cli/src/network/v2/metering/metering_label_rule/show.rs b/cli-cmd/network/src/v2/metering/metering_label_rule/show.rs similarity index 100% rename from openstack_cli/src/network/v2/metering/metering_label_rule/show.rs rename to cli-cmd/network/src/v2/metering/metering_label_rule/show.rs diff --git a/openstack_cli/src/network/v2/ndp_proxy.rs b/cli-cmd/network/src/v2/ndp_proxy.rs similarity index 93% rename from openstack_cli/src/network/v2/ndp_proxy.rs rename to cli-cmd/network/src/v2/ndp_proxy.rs index ea6df153b..cc73f4e88 100644 --- a/openstack_cli/src/network/v2/ndp_proxy.rs +++ b/cli-cmd/network/src/v2/ndp_proxy.rs @@ -16,10 +16,9 @@ use clap::{Parser, Subcommand}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; - pub mod create; pub mod delete; pub mod list; @@ -50,9 +49,9 @@ pub enum NdpProxyCommands { impl NdpProxyCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/network/v2/ndp_proxy/create.rs b/cli-cmd/network/src/v2/ndp_proxy/create.rs similarity index 100% rename from openstack_cli/src/network/v2/ndp_proxy/create.rs rename to cli-cmd/network/src/v2/ndp_proxy/create.rs diff --git a/openstack_cli/src/network/v2/ndp_proxy/delete.rs b/cli-cmd/network/src/v2/ndp_proxy/delete.rs similarity index 100% rename from openstack_cli/src/network/v2/ndp_proxy/delete.rs rename to cli-cmd/network/src/v2/ndp_proxy/delete.rs diff --git a/openstack_cli/src/network/v2/ndp_proxy/list.rs b/cli-cmd/network/src/v2/ndp_proxy/list.rs similarity index 100% rename from openstack_cli/src/network/v2/ndp_proxy/list.rs rename to cli-cmd/network/src/v2/ndp_proxy/list.rs diff --git a/openstack_cli/src/network/v2/ndp_proxy/set.rs b/cli-cmd/network/src/v2/ndp_proxy/set.rs similarity index 100% rename from openstack_cli/src/network/v2/ndp_proxy/set.rs rename to cli-cmd/network/src/v2/ndp_proxy/set.rs diff --git a/openstack_cli/src/network/v2/ndp_proxy/show.rs b/cli-cmd/network/src/v2/ndp_proxy/show.rs similarity index 100% rename from openstack_cli/src/network/v2/ndp_proxy/show.rs rename to cli-cmd/network/src/v2/ndp_proxy/show.rs diff --git a/openstack_cli/src/network/v2/network.rs b/cli-cmd/network/src/v2/network.rs similarity index 93% rename from openstack_cli/src/network/v2/network.rs rename to cli-cmd/network/src/v2/network.rs index 49024996f..93de6a262 100644 --- a/openstack_cli/src/network/v2/network.rs +++ b/cli-cmd/network/src/v2/network.rs @@ -16,10 +16,9 @@ use clap::{Parser, Subcommand}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; - pub mod create; pub mod delete; pub mod dhcp_agent; @@ -49,9 +48,9 @@ pub enum NetworkCommands { impl NetworkCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/network/v2/network/create.rs b/cli-cmd/network/src/v2/network/create.rs similarity index 100% rename from openstack_cli/src/network/v2/network/create.rs rename to cli-cmd/network/src/v2/network/create.rs diff --git a/openstack_cli/src/network/v2/network/delete.rs b/cli-cmd/network/src/v2/network/delete.rs similarity index 100% rename from openstack_cli/src/network/v2/network/delete.rs rename to cli-cmd/network/src/v2/network/delete.rs diff --git a/openstack_cli/src/network/v2/network/dhcp_agent.rs b/cli-cmd/network/src/v2/network/dhcp_agent.rs similarity index 91% rename from openstack_cli/src/network/v2/network/dhcp_agent.rs rename to cli-cmd/network/src/v2/network/dhcp_agent.rs index 6c501c85a..0c2b240c0 100644 --- a/openstack_cli/src/network/v2/network/dhcp_agent.rs +++ b/cli-cmd/network/src/v2/network/dhcp_agent.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; pub mod list; @@ -43,9 +43,9 @@ pub enum DhcpAgentCommands { impl DhcpAgentCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/network/v2/network/dhcp_agent/create.rs b/cli-cmd/network/src/v2/network/dhcp_agent/create.rs similarity index 100% rename from openstack_cli/src/network/v2/network/dhcp_agent/create.rs rename to cli-cmd/network/src/v2/network/dhcp_agent/create.rs diff --git a/openstack_cli/src/network/v2/network/dhcp_agent/delete.rs b/cli-cmd/network/src/v2/network/dhcp_agent/delete.rs similarity index 100% rename from openstack_cli/src/network/v2/network/dhcp_agent/delete.rs rename to cli-cmd/network/src/v2/network/dhcp_agent/delete.rs diff --git a/openstack_cli/src/network/v2/network/dhcp_agent/list.rs b/cli-cmd/network/src/v2/network/dhcp_agent/list.rs similarity index 100% rename from openstack_cli/src/network/v2/network/dhcp_agent/list.rs rename to cli-cmd/network/src/v2/network/dhcp_agent/list.rs diff --git a/openstack_cli/src/network/v2/network/dhcp_agent/set.rs b/cli-cmd/network/src/v2/network/dhcp_agent/set.rs similarity index 100% rename from openstack_cli/src/network/v2/network/dhcp_agent/set.rs rename to cli-cmd/network/src/v2/network/dhcp_agent/set.rs diff --git a/openstack_cli/src/network/v2/network/dhcp_agent/show.rs b/cli-cmd/network/src/v2/network/dhcp_agent/show.rs similarity index 100% rename from openstack_cli/src/network/v2/network/dhcp_agent/show.rs rename to cli-cmd/network/src/v2/network/dhcp_agent/show.rs diff --git a/openstack_cli/src/network/v2/network/list.rs b/cli-cmd/network/src/v2/network/list.rs similarity index 100% rename from openstack_cli/src/network/v2/network/list.rs rename to cli-cmd/network/src/v2/network/list.rs diff --git a/openstack_cli/src/network/v2/network/set.rs b/cli-cmd/network/src/v2/network/set.rs similarity index 100% rename from openstack_cli/src/network/v2/network/set.rs rename to cli-cmd/network/src/v2/network/set.rs diff --git a/openstack_cli/src/network/v2/network/show.rs b/cli-cmd/network/src/v2/network/show.rs similarity index 100% rename from openstack_cli/src/network/v2/network/show.rs rename to cli-cmd/network/src/v2/network/show.rs diff --git a/cli-cmd/network/src/v2/network/tag.rs b/cli-cmd/network/src/v2/network/tag.rs new file mode 100644 index 000000000..006b0d1aa --- /dev/null +++ b/cli-cmd/network/src/v2/network/tag.rs @@ -0,0 +1,68 @@ +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// +// SPDX-License-Identifier: Apache-2.0 + +//! Resource Tag module +//! +//! This module is defined once and symlinked into individual resources. This way code is +//! de-duplicated while also ensuring the same command interface is being maintained. +#![allow(clippy::duplicate_mod)] + +use clap::{Parser, Subcommand}; + +use openstack_sdk::AsyncOpenStack; + +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; + +pub mod delete; +pub mod delete_all; +pub mod list; +pub mod set; +pub mod show; + +/// Lists tags, creates, replaces or deletes one or more tags for a +/// resource, checks the existence of a tag for a resource. +#[derive(Parser)] +pub struct TagCommand { + /// subcommand + #[command(subcommand)] + command: TagCommands, +} + +/// Supported subcommands +#[allow(missing_docs)] +#[derive(Subcommand)] +pub enum TagCommands { + Add(set::TagCommand), + Check(show::TagCommand), + Delete(delete::TagCommand), + List(list::TagsCommand), + Purge(delete_all::TagCommand), +} + +impl TagCommand { + /// Perform command action + pub async fn take_action( + &self, + parsed_args: &C, + session: &mut AsyncOpenStack, + ) -> Result<(), OpenStackCliError> { + match &self.command { + TagCommands::Add(cmd) => cmd.take_action(parsed_args, session).await, + TagCommands::Check(cmd) => cmd.take_action(parsed_args, session).await, + TagCommands::Delete(cmd) => cmd.take_action(parsed_args, session).await, + TagCommands::List(cmd) => cmd.take_action(parsed_args, session).await, + TagCommands::Purge(cmd) => cmd.take_action(parsed_args, session).await, + } + } +} diff --git a/openstack_cli/src/network/v2/network/tag/delete.rs b/cli-cmd/network/src/v2/network/tag/delete.rs similarity index 100% rename from openstack_cli/src/network/v2/network/tag/delete.rs rename to cli-cmd/network/src/v2/network/tag/delete.rs diff --git a/openstack_cli/src/network/v2/network/tag/delete_all.rs b/cli-cmd/network/src/v2/network/tag/delete_all.rs similarity index 100% rename from openstack_cli/src/network/v2/network/tag/delete_all.rs rename to cli-cmd/network/src/v2/network/tag/delete_all.rs diff --git a/openstack_cli/src/network/v2/network/tag/list.rs b/cli-cmd/network/src/v2/network/tag/list.rs similarity index 100% rename from openstack_cli/src/network/v2/network/tag/list.rs rename to cli-cmd/network/src/v2/network/tag/list.rs diff --git a/openstack_cli/src/network/v2/network/tag/replace.rs b/cli-cmd/network/src/v2/network/tag/replace.rs similarity index 100% rename from openstack_cli/src/network/v2/network/tag/replace.rs rename to cli-cmd/network/src/v2/network/tag/replace.rs diff --git a/openstack_cli/src/network/v2/network/tag/set.rs b/cli-cmd/network/src/v2/network/tag/set.rs similarity index 100% rename from openstack_cli/src/network/v2/network/tag/set.rs rename to cli-cmd/network/src/v2/network/tag/set.rs diff --git a/openstack_cli/src/network/v2/network/tag/show.rs b/cli-cmd/network/src/v2/network/tag/show.rs similarity index 100% rename from openstack_cli/src/network/v2/network/tag/show.rs rename to cli-cmd/network/src/v2/network/tag/show.rs diff --git a/openstack_cli/src/network/v2/network_ip_availability.rs b/cli-cmd/network/src/v2/network_ip_availability.rs similarity index 93% rename from openstack_cli/src/network/v2/network_ip_availability.rs rename to cli-cmd/network/src/v2/network_ip_availability.rs index 6c7f3fe1e..4c68414ba 100644 --- a/openstack_cli/src/network/v2/network_ip_availability.rs +++ b/cli-cmd/network/src/v2/network_ip_availability.rs @@ -16,10 +16,9 @@ use clap::{Parser, Subcommand}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; - pub mod list; pub mod show; @@ -45,9 +44,9 @@ pub enum NetworkIpAvailabilityCommands { impl NetworkIpAvailabilityCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/network/v2/network_ip_availability/create.rs b/cli-cmd/network/src/v2/network_ip_availability/create.rs similarity index 100% rename from openstack_cli/src/network/v2/network_ip_availability/create.rs rename to cli-cmd/network/src/v2/network_ip_availability/create.rs diff --git a/openstack_cli/src/network/v2/network_ip_availability/delete.rs b/cli-cmd/network/src/v2/network_ip_availability/delete.rs similarity index 100% rename from openstack_cli/src/network/v2/network_ip_availability/delete.rs rename to cli-cmd/network/src/v2/network_ip_availability/delete.rs diff --git a/openstack_cli/src/network/v2/network_ip_availability/list.rs b/cli-cmd/network/src/v2/network_ip_availability/list.rs similarity index 100% rename from openstack_cli/src/network/v2/network_ip_availability/list.rs rename to cli-cmd/network/src/v2/network_ip_availability/list.rs diff --git a/openstack_cli/src/network/v2/network_ip_availability/set.rs b/cli-cmd/network/src/v2/network_ip_availability/set.rs similarity index 100% rename from openstack_cli/src/network/v2/network_ip_availability/set.rs rename to cli-cmd/network/src/v2/network_ip_availability/set.rs diff --git a/openstack_cli/src/network/v2/network_ip_availability/show.rs b/cli-cmd/network/src/v2/network_ip_availability/show.rs similarity index 100% rename from openstack_cli/src/network/v2/network_ip_availability/show.rs rename to cli-cmd/network/src/v2/network_ip_availability/show.rs diff --git a/openstack_cli/src/network/v2/network_segment_range.rs b/cli-cmd/network/src/v2/network_segment_range.rs similarity index 95% rename from openstack_cli/src/network/v2/network_segment_range.rs rename to cli-cmd/network/src/v2/network_segment_range.rs index 20df248b1..82628a1b4 100644 --- a/openstack_cli/src/network/v2/network_segment_range.rs +++ b/cli-cmd/network/src/v2/network_segment_range.rs @@ -16,10 +16,9 @@ use clap::{Parser, Subcommand}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; - pub mod create; pub mod delete; pub mod list; @@ -57,9 +56,9 @@ pub enum NetworkSegmentRangeCommands { impl NetworkSegmentRangeCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/network/v2/network_segment_range/create.rs b/cli-cmd/network/src/v2/network_segment_range/create.rs similarity index 100% rename from openstack_cli/src/network/v2/network_segment_range/create.rs rename to cli-cmd/network/src/v2/network_segment_range/create.rs diff --git a/openstack_cli/src/network/v2/network_segment_range/delete.rs b/cli-cmd/network/src/v2/network_segment_range/delete.rs similarity index 100% rename from openstack_cli/src/network/v2/network_segment_range/delete.rs rename to cli-cmd/network/src/v2/network_segment_range/delete.rs diff --git a/openstack_cli/src/network/v2/network_segment_range/list.rs b/cli-cmd/network/src/v2/network_segment_range/list.rs similarity index 100% rename from openstack_cli/src/network/v2/network_segment_range/list.rs rename to cli-cmd/network/src/v2/network_segment_range/list.rs diff --git a/openstack_cli/src/network/v2/network_segment_range/set.rs b/cli-cmd/network/src/v2/network_segment_range/set.rs similarity index 100% rename from openstack_cli/src/network/v2/network_segment_range/set.rs rename to cli-cmd/network/src/v2/network_segment_range/set.rs diff --git a/openstack_cli/src/network/v2/network_segment_range/show.rs b/cli-cmd/network/src/v2/network_segment_range/show.rs similarity index 100% rename from openstack_cli/src/network/v2/network_segment_range/show.rs rename to cli-cmd/network/src/v2/network_segment_range/show.rs diff --git a/cli-cmd/network/src/v2/network_segment_range/tag.rs b/cli-cmd/network/src/v2/network_segment_range/tag.rs new file mode 100644 index 000000000..006b0d1aa --- /dev/null +++ b/cli-cmd/network/src/v2/network_segment_range/tag.rs @@ -0,0 +1,68 @@ +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// +// SPDX-License-Identifier: Apache-2.0 + +//! Resource Tag module +//! +//! This module is defined once and symlinked into individual resources. This way code is +//! de-duplicated while also ensuring the same command interface is being maintained. +#![allow(clippy::duplicate_mod)] + +use clap::{Parser, Subcommand}; + +use openstack_sdk::AsyncOpenStack; + +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; + +pub mod delete; +pub mod delete_all; +pub mod list; +pub mod set; +pub mod show; + +/// Lists tags, creates, replaces or deletes one or more tags for a +/// resource, checks the existence of a tag for a resource. +#[derive(Parser)] +pub struct TagCommand { + /// subcommand + #[command(subcommand)] + command: TagCommands, +} + +/// Supported subcommands +#[allow(missing_docs)] +#[derive(Subcommand)] +pub enum TagCommands { + Add(set::TagCommand), + Check(show::TagCommand), + Delete(delete::TagCommand), + List(list::TagsCommand), + Purge(delete_all::TagCommand), +} + +impl TagCommand { + /// Perform command action + pub async fn take_action( + &self, + parsed_args: &C, + session: &mut AsyncOpenStack, + ) -> Result<(), OpenStackCliError> { + match &self.command { + TagCommands::Add(cmd) => cmd.take_action(parsed_args, session).await, + TagCommands::Check(cmd) => cmd.take_action(parsed_args, session).await, + TagCommands::Delete(cmd) => cmd.take_action(parsed_args, session).await, + TagCommands::List(cmd) => cmd.take_action(parsed_args, session).await, + TagCommands::Purge(cmd) => cmd.take_action(parsed_args, session).await, + } + } +} diff --git a/openstack_cli/src/network/v2/network_segment_range/tag/delete.rs b/cli-cmd/network/src/v2/network_segment_range/tag/delete.rs similarity index 100% rename from openstack_cli/src/network/v2/network_segment_range/tag/delete.rs rename to cli-cmd/network/src/v2/network_segment_range/tag/delete.rs diff --git a/openstack_cli/src/network/v2/network_segment_range/tag/delete_all.rs b/cli-cmd/network/src/v2/network_segment_range/tag/delete_all.rs similarity index 100% rename from openstack_cli/src/network/v2/network_segment_range/tag/delete_all.rs rename to cli-cmd/network/src/v2/network_segment_range/tag/delete_all.rs diff --git a/openstack_cli/src/network/v2/network_segment_range/tag/list.rs b/cli-cmd/network/src/v2/network_segment_range/tag/list.rs similarity index 100% rename from openstack_cli/src/network/v2/network_segment_range/tag/list.rs rename to cli-cmd/network/src/v2/network_segment_range/tag/list.rs diff --git a/openstack_cli/src/network/v2/network_segment_range/tag/replace.rs b/cli-cmd/network/src/v2/network_segment_range/tag/replace.rs similarity index 100% rename from openstack_cli/src/network/v2/network_segment_range/tag/replace.rs rename to cli-cmd/network/src/v2/network_segment_range/tag/replace.rs diff --git a/openstack_cli/src/network/v2/network_segment_range/tag/set.rs b/cli-cmd/network/src/v2/network_segment_range/tag/set.rs similarity index 100% rename from openstack_cli/src/network/v2/network_segment_range/tag/set.rs rename to cli-cmd/network/src/v2/network_segment_range/tag/set.rs diff --git a/openstack_cli/src/network/v2/network_segment_range/tag/show.rs b/cli-cmd/network/src/v2/network_segment_range/tag/show.rs similarity index 100% rename from openstack_cli/src/network/v2/network_segment_range/tag/show.rs rename to cli-cmd/network/src/v2/network_segment_range/tag/show.rs diff --git a/openstack_cli/src/network/v2/policy/packet_rate_limit_rule/create.rs b/cli-cmd/network/src/v2/policy/packet_rate_limit_rule/create.rs similarity index 100% rename from openstack_cli/src/network/v2/policy/packet_rate_limit_rule/create.rs rename to cli-cmd/network/src/v2/policy/packet_rate_limit_rule/create.rs diff --git a/openstack_cli/src/network/v2/policy/packet_rate_limit_rule/delete.rs b/cli-cmd/network/src/v2/policy/packet_rate_limit_rule/delete.rs similarity index 100% rename from openstack_cli/src/network/v2/policy/packet_rate_limit_rule/delete.rs rename to cli-cmd/network/src/v2/policy/packet_rate_limit_rule/delete.rs diff --git a/openstack_cli/src/network/v2/policy/packet_rate_limit_rule/list.rs b/cli-cmd/network/src/v2/policy/packet_rate_limit_rule/list.rs similarity index 100% rename from openstack_cli/src/network/v2/policy/packet_rate_limit_rule/list.rs rename to cli-cmd/network/src/v2/policy/packet_rate_limit_rule/list.rs diff --git a/openstack_cli/src/network/v2/policy/packet_rate_limit_rule/set.rs b/cli-cmd/network/src/v2/policy/packet_rate_limit_rule/set.rs similarity index 100% rename from openstack_cli/src/network/v2/policy/packet_rate_limit_rule/set.rs rename to cli-cmd/network/src/v2/policy/packet_rate_limit_rule/set.rs diff --git a/openstack_cli/src/network/v2/policy/packet_rate_limit_rule/show.rs b/cli-cmd/network/src/v2/policy/packet_rate_limit_rule/show.rs similarity index 100% rename from openstack_cli/src/network/v2/policy/packet_rate_limit_rule/show.rs rename to cli-cmd/network/src/v2/policy/packet_rate_limit_rule/show.rs diff --git a/openstack_cli/src/network/v2/policy/tag/delete.rs b/cli-cmd/network/src/v2/policy/tag/delete.rs similarity index 100% rename from openstack_cli/src/network/v2/policy/tag/delete.rs rename to cli-cmd/network/src/v2/policy/tag/delete.rs diff --git a/openstack_cli/src/network/v2/policy/tag/delete_all.rs b/cli-cmd/network/src/v2/policy/tag/delete_all.rs similarity index 100% rename from openstack_cli/src/network/v2/policy/tag/delete_all.rs rename to cli-cmd/network/src/v2/policy/tag/delete_all.rs diff --git a/openstack_cli/src/network/v2/policy/tag/list.rs b/cli-cmd/network/src/v2/policy/tag/list.rs similarity index 100% rename from openstack_cli/src/network/v2/policy/tag/list.rs rename to cli-cmd/network/src/v2/policy/tag/list.rs diff --git a/openstack_cli/src/network/v2/policy/tag/replace.rs b/cli-cmd/network/src/v2/policy/tag/replace.rs similarity index 100% rename from openstack_cli/src/network/v2/policy/tag/replace.rs rename to cli-cmd/network/src/v2/policy/tag/replace.rs diff --git a/openstack_cli/src/network/v2/policy/tag/set.rs b/cli-cmd/network/src/v2/policy/tag/set.rs similarity index 100% rename from openstack_cli/src/network/v2/policy/tag/set.rs rename to cli-cmd/network/src/v2/policy/tag/set.rs diff --git a/openstack_cli/src/network/v2/policy/tag/show.rs b/cli-cmd/network/src/v2/policy/tag/show.rs similarity index 100% rename from openstack_cli/src/network/v2/policy/tag/show.rs rename to cli-cmd/network/src/v2/policy/tag/show.rs diff --git a/openstack_cli/src/network/v2/port.rs b/cli-cmd/network/src/v2/port.rs similarity index 93% rename from openstack_cli/src/network/v2/port.rs rename to cli-cmd/network/src/v2/port.rs index 9f80faa4c..00a285bd1 100644 --- a/openstack_cli/src/network/v2/port.rs +++ b/cli-cmd/network/src/v2/port.rs @@ -16,10 +16,9 @@ use clap::{Parser, Subcommand}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; - pub mod binding; pub mod create; pub mod delete; @@ -51,9 +50,9 @@ pub enum PortCommands { impl PortCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/network/v2/port/add_allowed_address_pairs.rs b/cli-cmd/network/src/v2/port/add_allowed_address_pairs.rs similarity index 100% rename from openstack_cli/src/network/v2/port/add_allowed_address_pairs.rs rename to cli-cmd/network/src/v2/port/add_allowed_address_pairs.rs diff --git a/openstack_cli/src/network/v2/port/binding.rs b/cli-cmd/network/src/v2/port/binding.rs similarity index 93% rename from openstack_cli/src/network/v2/port/binding.rs rename to cli-cmd/network/src/v2/port/binding.rs index 65d1ef612..7b3ccb0d3 100644 --- a/openstack_cli/src/network/v2/port/binding.rs +++ b/cli-cmd/network/src/v2/port/binding.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; pub mod activate; pub mod create; @@ -49,9 +49,9 @@ pub enum BindingCommands { impl BindingCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/network/v2/port/binding/activate.rs b/cli-cmd/network/src/v2/port/binding/activate.rs similarity index 100% rename from openstack_cli/src/network/v2/port/binding/activate.rs rename to cli-cmd/network/src/v2/port/binding/activate.rs diff --git a/openstack_cli/src/network/v2/port/binding/create.rs b/cli-cmd/network/src/v2/port/binding/create.rs similarity index 100% rename from openstack_cli/src/network/v2/port/binding/create.rs rename to cli-cmd/network/src/v2/port/binding/create.rs diff --git a/openstack_cli/src/network/v2/port/binding/delete.rs b/cli-cmd/network/src/v2/port/binding/delete.rs similarity index 100% rename from openstack_cli/src/network/v2/port/binding/delete.rs rename to cli-cmd/network/src/v2/port/binding/delete.rs diff --git a/openstack_cli/src/network/v2/port/binding/list.rs b/cli-cmd/network/src/v2/port/binding/list.rs similarity index 100% rename from openstack_cli/src/network/v2/port/binding/list.rs rename to cli-cmd/network/src/v2/port/binding/list.rs diff --git a/openstack_cli/src/network/v2/port/binding/set.rs b/cli-cmd/network/src/v2/port/binding/set.rs similarity index 100% rename from openstack_cli/src/network/v2/port/binding/set.rs rename to cli-cmd/network/src/v2/port/binding/set.rs diff --git a/openstack_cli/src/network/v2/port/binding/show.rs b/cli-cmd/network/src/v2/port/binding/show.rs similarity index 100% rename from openstack_cli/src/network/v2/port/binding/show.rs rename to cli-cmd/network/src/v2/port/binding/show.rs diff --git a/openstack_cli/src/network/v2/port/create.rs b/cli-cmd/network/src/v2/port/create.rs similarity index 100% rename from openstack_cli/src/network/v2/port/create.rs rename to cli-cmd/network/src/v2/port/create.rs diff --git a/openstack_cli/src/network/v2/port/delete.rs b/cli-cmd/network/src/v2/port/delete.rs similarity index 100% rename from openstack_cli/src/network/v2/port/delete.rs rename to cli-cmd/network/src/v2/port/delete.rs diff --git a/openstack_cli/src/network/v2/port/list.rs b/cli-cmd/network/src/v2/port/list.rs similarity index 100% rename from openstack_cli/src/network/v2/port/list.rs rename to cli-cmd/network/src/v2/port/list.rs diff --git a/openstack_cli/src/network/v2/port/set.rs b/cli-cmd/network/src/v2/port/set.rs similarity index 100% rename from openstack_cli/src/network/v2/port/set.rs rename to cli-cmd/network/src/v2/port/set.rs diff --git a/openstack_cli/src/network/v2/port/show.rs b/cli-cmd/network/src/v2/port/show.rs similarity index 100% rename from openstack_cli/src/network/v2/port/show.rs rename to cli-cmd/network/src/v2/port/show.rs diff --git a/cli-cmd/network/src/v2/port/tag.rs b/cli-cmd/network/src/v2/port/tag.rs new file mode 100644 index 000000000..006b0d1aa --- /dev/null +++ b/cli-cmd/network/src/v2/port/tag.rs @@ -0,0 +1,68 @@ +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// +// SPDX-License-Identifier: Apache-2.0 + +//! Resource Tag module +//! +//! This module is defined once and symlinked into individual resources. This way code is +//! de-duplicated while also ensuring the same command interface is being maintained. +#![allow(clippy::duplicate_mod)] + +use clap::{Parser, Subcommand}; + +use openstack_sdk::AsyncOpenStack; + +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; + +pub mod delete; +pub mod delete_all; +pub mod list; +pub mod set; +pub mod show; + +/// Lists tags, creates, replaces or deletes one or more tags for a +/// resource, checks the existence of a tag for a resource. +#[derive(Parser)] +pub struct TagCommand { + /// subcommand + #[command(subcommand)] + command: TagCommands, +} + +/// Supported subcommands +#[allow(missing_docs)] +#[derive(Subcommand)] +pub enum TagCommands { + Add(set::TagCommand), + Check(show::TagCommand), + Delete(delete::TagCommand), + List(list::TagsCommand), + Purge(delete_all::TagCommand), +} + +impl TagCommand { + /// Perform command action + pub async fn take_action( + &self, + parsed_args: &C, + session: &mut AsyncOpenStack, + ) -> Result<(), OpenStackCliError> { + match &self.command { + TagCommands::Add(cmd) => cmd.take_action(parsed_args, session).await, + TagCommands::Check(cmd) => cmd.take_action(parsed_args, session).await, + TagCommands::Delete(cmd) => cmd.take_action(parsed_args, session).await, + TagCommands::List(cmd) => cmd.take_action(parsed_args, session).await, + TagCommands::Purge(cmd) => cmd.take_action(parsed_args, session).await, + } + } +} diff --git a/openstack_cli/src/network/v2/port/tag/delete.rs b/cli-cmd/network/src/v2/port/tag/delete.rs similarity index 100% rename from openstack_cli/src/network/v2/port/tag/delete.rs rename to cli-cmd/network/src/v2/port/tag/delete.rs diff --git a/openstack_cli/src/network/v2/port/tag/delete_all.rs b/cli-cmd/network/src/v2/port/tag/delete_all.rs similarity index 100% rename from openstack_cli/src/network/v2/port/tag/delete_all.rs rename to cli-cmd/network/src/v2/port/tag/delete_all.rs diff --git a/openstack_cli/src/network/v2/port/tag/list.rs b/cli-cmd/network/src/v2/port/tag/list.rs similarity index 100% rename from openstack_cli/src/network/v2/port/tag/list.rs rename to cli-cmd/network/src/v2/port/tag/list.rs diff --git a/openstack_cli/src/network/v2/port/tag/replace.rs b/cli-cmd/network/src/v2/port/tag/replace.rs similarity index 100% rename from openstack_cli/src/network/v2/port/tag/replace.rs rename to cli-cmd/network/src/v2/port/tag/replace.rs diff --git a/openstack_cli/src/network/v2/port/tag/set.rs b/cli-cmd/network/src/v2/port/tag/set.rs similarity index 100% rename from openstack_cli/src/network/v2/port/tag/set.rs rename to cli-cmd/network/src/v2/port/tag/set.rs diff --git a/openstack_cli/src/network/v2/port/tag/show.rs b/cli-cmd/network/src/v2/port/tag/show.rs similarity index 100% rename from openstack_cli/src/network/v2/port/tag/show.rs rename to cli-cmd/network/src/v2/port/tag/show.rs diff --git a/openstack_cli/src/network/v2/qos.rs b/cli-cmd/network/src/v2/qos.rs similarity index 94% rename from openstack_cli/src/network/v2/qos.rs rename to cli-cmd/network/src/v2/qos.rs index 01ab3ec33..cedeeac0a 100644 --- a/openstack_cli/src/network/v2/qos.rs +++ b/cli-cmd/network/src/v2/qos.rs @@ -16,10 +16,9 @@ use clap::{Parser, Subcommand}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; - pub mod alias_bandwidth_limit_rule; pub mod alias_dscp_marking_rule; pub mod alias_minimum_bandwidth_rule; @@ -51,9 +50,9 @@ pub enum QosCommands { impl QosCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/network/v2/qos/alias_bandwidth_limit_rule.rs b/cli-cmd/network/src/v2/qos/alias_bandwidth_limit_rule.rs similarity index 95% rename from openstack_cli/src/network/v2/qos/alias_bandwidth_limit_rule.rs rename to cli-cmd/network/src/v2/qos/alias_bandwidth_limit_rule.rs index 809a2d59b..e9f9a72d2 100644 --- a/openstack_cli/src/network/v2/qos/alias_bandwidth_limit_rule.rs +++ b/cli-cmd/network/src/v2/qos/alias_bandwidth_limit_rule.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; pub mod create; pub mod delete; @@ -52,9 +52,9 @@ pub enum AliasBandwidthLimitRuleCommands { impl AliasBandwidthLimitRuleCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/network/v2/qos/alias_bandwidth_limit_rule/create.rs b/cli-cmd/network/src/v2/qos/alias_bandwidth_limit_rule/create.rs similarity index 100% rename from openstack_cli/src/network/v2/qos/alias_bandwidth_limit_rule/create.rs rename to cli-cmd/network/src/v2/qos/alias_bandwidth_limit_rule/create.rs diff --git a/openstack_cli/src/network/v2/qos/alias_bandwidth_limit_rule/delete.rs b/cli-cmd/network/src/v2/qos/alias_bandwidth_limit_rule/delete.rs similarity index 100% rename from openstack_cli/src/network/v2/qos/alias_bandwidth_limit_rule/delete.rs rename to cli-cmd/network/src/v2/qos/alias_bandwidth_limit_rule/delete.rs diff --git a/openstack_cli/src/network/v2/qos/alias_bandwidth_limit_rule/list.rs b/cli-cmd/network/src/v2/qos/alias_bandwidth_limit_rule/list.rs similarity index 100% rename from openstack_cli/src/network/v2/qos/alias_bandwidth_limit_rule/list.rs rename to cli-cmd/network/src/v2/qos/alias_bandwidth_limit_rule/list.rs diff --git a/openstack_cli/src/network/v2/qos/alias_bandwidth_limit_rule/set.rs b/cli-cmd/network/src/v2/qos/alias_bandwidth_limit_rule/set.rs similarity index 100% rename from openstack_cli/src/network/v2/qos/alias_bandwidth_limit_rule/set.rs rename to cli-cmd/network/src/v2/qos/alias_bandwidth_limit_rule/set.rs diff --git a/openstack_cli/src/network/v2/qos/alias_bandwidth_limit_rule/show.rs b/cli-cmd/network/src/v2/qos/alias_bandwidth_limit_rule/show.rs similarity index 100% rename from openstack_cli/src/network/v2/qos/alias_bandwidth_limit_rule/show.rs rename to cli-cmd/network/src/v2/qos/alias_bandwidth_limit_rule/show.rs diff --git a/openstack_cli/src/network/v2/qos/alias_dscp_marking_rule.rs b/cli-cmd/network/src/v2/qos/alias_dscp_marking_rule.rs similarity index 94% rename from openstack_cli/src/network/v2/qos/alias_dscp_marking_rule.rs rename to cli-cmd/network/src/v2/qos/alias_dscp_marking_rule.rs index 783e18ad4..92095c313 100644 --- a/openstack_cli/src/network/v2/qos/alias_dscp_marking_rule.rs +++ b/cli-cmd/network/src/v2/qos/alias_dscp_marking_rule.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; pub mod create; pub mod delete; @@ -49,9 +49,9 @@ pub enum AliasDscpMarkingRuleCommands { impl AliasDscpMarkingRuleCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/network/v2/qos/alias_dscp_marking_rule/create.rs b/cli-cmd/network/src/v2/qos/alias_dscp_marking_rule/create.rs similarity index 100% rename from openstack_cli/src/network/v2/qos/alias_dscp_marking_rule/create.rs rename to cli-cmd/network/src/v2/qos/alias_dscp_marking_rule/create.rs diff --git a/openstack_cli/src/network/v2/qos/alias_dscp_marking_rule/delete.rs b/cli-cmd/network/src/v2/qos/alias_dscp_marking_rule/delete.rs similarity index 100% rename from openstack_cli/src/network/v2/qos/alias_dscp_marking_rule/delete.rs rename to cli-cmd/network/src/v2/qos/alias_dscp_marking_rule/delete.rs diff --git a/openstack_cli/src/network/v2/qos/alias_dscp_marking_rule/list.rs b/cli-cmd/network/src/v2/qos/alias_dscp_marking_rule/list.rs similarity index 100% rename from openstack_cli/src/network/v2/qos/alias_dscp_marking_rule/list.rs rename to cli-cmd/network/src/v2/qos/alias_dscp_marking_rule/list.rs diff --git a/openstack_cli/src/network/v2/qos/alias_dscp_marking_rule/set.rs b/cli-cmd/network/src/v2/qos/alias_dscp_marking_rule/set.rs similarity index 100% rename from openstack_cli/src/network/v2/qos/alias_dscp_marking_rule/set.rs rename to cli-cmd/network/src/v2/qos/alias_dscp_marking_rule/set.rs diff --git a/openstack_cli/src/network/v2/qos/alias_dscp_marking_rule/show.rs b/cli-cmd/network/src/v2/qos/alias_dscp_marking_rule/show.rs similarity index 100% rename from openstack_cli/src/network/v2/qos/alias_dscp_marking_rule/show.rs rename to cli-cmd/network/src/v2/qos/alias_dscp_marking_rule/show.rs diff --git a/openstack_cli/src/network/v2/qos/alias_minimum_bandwidth_rule.rs b/cli-cmd/network/src/v2/qos/alias_minimum_bandwidth_rule.rs similarity index 94% rename from openstack_cli/src/network/v2/qos/alias_minimum_bandwidth_rule.rs rename to cli-cmd/network/src/v2/qos/alias_minimum_bandwidth_rule.rs index 6b9fc73bb..126930fb2 100644 --- a/openstack_cli/src/network/v2/qos/alias_minimum_bandwidth_rule.rs +++ b/cli-cmd/network/src/v2/qos/alias_minimum_bandwidth_rule.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; pub mod create; pub mod delete; @@ -49,9 +49,9 @@ pub enum AliasMinimumBandwidthRuleCommands { impl AliasMinimumBandwidthRuleCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/network/v2/qos/alias_minimum_bandwidth_rule/create.rs b/cli-cmd/network/src/v2/qos/alias_minimum_bandwidth_rule/create.rs similarity index 100% rename from openstack_cli/src/network/v2/qos/alias_minimum_bandwidth_rule/create.rs rename to cli-cmd/network/src/v2/qos/alias_minimum_bandwidth_rule/create.rs diff --git a/openstack_cli/src/network/v2/qos/alias_minimum_bandwidth_rule/delete.rs b/cli-cmd/network/src/v2/qos/alias_minimum_bandwidth_rule/delete.rs similarity index 100% rename from openstack_cli/src/network/v2/qos/alias_minimum_bandwidth_rule/delete.rs rename to cli-cmd/network/src/v2/qos/alias_minimum_bandwidth_rule/delete.rs diff --git a/openstack_cli/src/network/v2/qos/alias_minimum_bandwidth_rule/list.rs b/cli-cmd/network/src/v2/qos/alias_minimum_bandwidth_rule/list.rs similarity index 100% rename from openstack_cli/src/network/v2/qos/alias_minimum_bandwidth_rule/list.rs rename to cli-cmd/network/src/v2/qos/alias_minimum_bandwidth_rule/list.rs diff --git a/openstack_cli/src/network/v2/qos/alias_minimum_bandwidth_rule/set.rs b/cli-cmd/network/src/v2/qos/alias_minimum_bandwidth_rule/set.rs similarity index 100% rename from openstack_cli/src/network/v2/qos/alias_minimum_bandwidth_rule/set.rs rename to cli-cmd/network/src/v2/qos/alias_minimum_bandwidth_rule/set.rs diff --git a/openstack_cli/src/network/v2/qos/alias_minimum_bandwidth_rule/show.rs b/cli-cmd/network/src/v2/qos/alias_minimum_bandwidth_rule/show.rs similarity index 100% rename from openstack_cli/src/network/v2/qos/alias_minimum_bandwidth_rule/show.rs rename to cli-cmd/network/src/v2/qos/alias_minimum_bandwidth_rule/show.rs diff --git a/openstack_cli/src/network/v2/qos/alias_minimum_packet_rate_rule.rs b/cli-cmd/network/src/v2/qos/alias_minimum_packet_rate_rule.rs similarity index 94% rename from openstack_cli/src/network/v2/qos/alias_minimum_packet_rate_rule.rs rename to cli-cmd/network/src/v2/qos/alias_minimum_packet_rate_rule.rs index 8fcc316d6..115c49dbc 100644 --- a/openstack_cli/src/network/v2/qos/alias_minimum_packet_rate_rule.rs +++ b/cli-cmd/network/src/v2/qos/alias_minimum_packet_rate_rule.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; pub mod create; pub mod delete; @@ -49,9 +49,9 @@ pub enum AliasMinimumPacketRateRuleCommands { impl AliasMinimumPacketRateRuleCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/network/v2/qos/alias_minimum_packet_rate_rule/create.rs b/cli-cmd/network/src/v2/qos/alias_minimum_packet_rate_rule/create.rs similarity index 100% rename from openstack_cli/src/network/v2/qos/alias_minimum_packet_rate_rule/create.rs rename to cli-cmd/network/src/v2/qos/alias_minimum_packet_rate_rule/create.rs diff --git a/openstack_cli/src/network/v2/qos/alias_minimum_packet_rate_rule/delete.rs b/cli-cmd/network/src/v2/qos/alias_minimum_packet_rate_rule/delete.rs similarity index 100% rename from openstack_cli/src/network/v2/qos/alias_minimum_packet_rate_rule/delete.rs rename to cli-cmd/network/src/v2/qos/alias_minimum_packet_rate_rule/delete.rs diff --git a/openstack_cli/src/network/v2/qos/alias_minimum_packet_rate_rule/list.rs b/cli-cmd/network/src/v2/qos/alias_minimum_packet_rate_rule/list.rs similarity index 100% rename from openstack_cli/src/network/v2/qos/alias_minimum_packet_rate_rule/list.rs rename to cli-cmd/network/src/v2/qos/alias_minimum_packet_rate_rule/list.rs diff --git a/openstack_cli/src/network/v2/qos/alias_minimum_packet_rate_rule/set.rs b/cli-cmd/network/src/v2/qos/alias_minimum_packet_rate_rule/set.rs similarity index 100% rename from openstack_cli/src/network/v2/qos/alias_minimum_packet_rate_rule/set.rs rename to cli-cmd/network/src/v2/qos/alias_minimum_packet_rate_rule/set.rs diff --git a/openstack_cli/src/network/v2/qos/alias_minimum_packet_rate_rule/show.rs b/cli-cmd/network/src/v2/qos/alias_minimum_packet_rate_rule/show.rs similarity index 100% rename from openstack_cli/src/network/v2/qos/alias_minimum_packet_rate_rule/show.rs rename to cli-cmd/network/src/v2/qos/alias_minimum_packet_rate_rule/show.rs diff --git a/openstack_cli/src/network/v2/qos/policy.rs b/cli-cmd/network/src/v2/qos/policy.rs similarity index 95% rename from openstack_cli/src/network/v2/qos/policy.rs rename to cli-cmd/network/src/v2/qos/policy.rs index b761474d3..af0df2398 100644 --- a/openstack_cli/src/network/v2/qos/policy.rs +++ b/cli-cmd/network/src/v2/qos/policy.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; pub mod bandwidth_limit_rule; pub mod create; @@ -57,9 +57,9 @@ pub enum PolicyCommands { impl PolicyCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/network/v2/qos/policy/bandwidth_limit_rule.rs b/cli-cmd/network/src/v2/qos/policy/bandwidth_limit_rule.rs similarity index 94% rename from openstack_cli/src/network/v2/qos/policy/bandwidth_limit_rule.rs rename to cli-cmd/network/src/v2/qos/policy/bandwidth_limit_rule.rs index a2f28694e..b33ce2eee 100644 --- a/openstack_cli/src/network/v2/qos/policy/bandwidth_limit_rule.rs +++ b/cli-cmd/network/src/v2/qos/policy/bandwidth_limit_rule.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; pub mod create; pub mod delete; @@ -55,9 +55,9 @@ pub enum BandwidthLimitRuleCommands { impl BandwidthLimitRuleCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/network/v2/qos/policy/bandwidth_limit_rule/create.rs b/cli-cmd/network/src/v2/qos/policy/bandwidth_limit_rule/create.rs similarity index 100% rename from openstack_cli/src/network/v2/qos/policy/bandwidth_limit_rule/create.rs rename to cli-cmd/network/src/v2/qos/policy/bandwidth_limit_rule/create.rs diff --git a/openstack_cli/src/network/v2/qos/policy/bandwidth_limit_rule/delete.rs b/cli-cmd/network/src/v2/qos/policy/bandwidth_limit_rule/delete.rs similarity index 100% rename from openstack_cli/src/network/v2/qos/policy/bandwidth_limit_rule/delete.rs rename to cli-cmd/network/src/v2/qos/policy/bandwidth_limit_rule/delete.rs diff --git a/openstack_cli/src/network/v2/qos/policy/bandwidth_limit_rule/list.rs b/cli-cmd/network/src/v2/qos/policy/bandwidth_limit_rule/list.rs similarity index 100% rename from openstack_cli/src/network/v2/qos/policy/bandwidth_limit_rule/list.rs rename to cli-cmd/network/src/v2/qos/policy/bandwidth_limit_rule/list.rs diff --git a/openstack_cli/src/network/v2/qos/policy/bandwidth_limit_rule/set.rs b/cli-cmd/network/src/v2/qos/policy/bandwidth_limit_rule/set.rs similarity index 100% rename from openstack_cli/src/network/v2/qos/policy/bandwidth_limit_rule/set.rs rename to cli-cmd/network/src/v2/qos/policy/bandwidth_limit_rule/set.rs diff --git a/openstack_cli/src/network/v2/qos/policy/bandwidth_limit_rule/show.rs b/cli-cmd/network/src/v2/qos/policy/bandwidth_limit_rule/show.rs similarity index 100% rename from openstack_cli/src/network/v2/qos/policy/bandwidth_limit_rule/show.rs rename to cli-cmd/network/src/v2/qos/policy/bandwidth_limit_rule/show.rs diff --git a/openstack_cli/src/network/v2/qos/policy/create.rs b/cli-cmd/network/src/v2/qos/policy/create.rs similarity index 100% rename from openstack_cli/src/network/v2/qos/policy/create.rs rename to cli-cmd/network/src/v2/qos/policy/create.rs diff --git a/openstack_cli/src/network/v2/qos/policy/delete.rs b/cli-cmd/network/src/v2/qos/policy/delete.rs similarity index 100% rename from openstack_cli/src/network/v2/qos/policy/delete.rs rename to cli-cmd/network/src/v2/qos/policy/delete.rs diff --git a/openstack_cli/src/network/v2/qos/policy/dscp_marking_rule.rs b/cli-cmd/network/src/v2/qos/policy/dscp_marking_rule.rs similarity index 93% rename from openstack_cli/src/network/v2/qos/policy/dscp_marking_rule.rs rename to cli-cmd/network/src/v2/qos/policy/dscp_marking_rule.rs index 73e83493e..577fc64bd 100644 --- a/openstack_cli/src/network/v2/qos/policy/dscp_marking_rule.rs +++ b/cli-cmd/network/src/v2/qos/policy/dscp_marking_rule.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; pub mod create; pub mod delete; @@ -49,9 +49,9 @@ pub enum DscpMarkingRuleCommands { impl DscpMarkingRuleCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/network/v2/qos/policy/dscp_marking_rule/create.rs b/cli-cmd/network/src/v2/qos/policy/dscp_marking_rule/create.rs similarity index 100% rename from openstack_cli/src/network/v2/qos/policy/dscp_marking_rule/create.rs rename to cli-cmd/network/src/v2/qos/policy/dscp_marking_rule/create.rs diff --git a/openstack_cli/src/network/v2/qos/policy/dscp_marking_rule/delete.rs b/cli-cmd/network/src/v2/qos/policy/dscp_marking_rule/delete.rs similarity index 100% rename from openstack_cli/src/network/v2/qos/policy/dscp_marking_rule/delete.rs rename to cli-cmd/network/src/v2/qos/policy/dscp_marking_rule/delete.rs diff --git a/openstack_cli/src/network/v2/qos/policy/dscp_marking_rule/list.rs b/cli-cmd/network/src/v2/qos/policy/dscp_marking_rule/list.rs similarity index 100% rename from openstack_cli/src/network/v2/qos/policy/dscp_marking_rule/list.rs rename to cli-cmd/network/src/v2/qos/policy/dscp_marking_rule/list.rs diff --git a/openstack_cli/src/network/v2/qos/policy/dscp_marking_rule/set.rs b/cli-cmd/network/src/v2/qos/policy/dscp_marking_rule/set.rs similarity index 100% rename from openstack_cli/src/network/v2/qos/policy/dscp_marking_rule/set.rs rename to cli-cmd/network/src/v2/qos/policy/dscp_marking_rule/set.rs diff --git a/openstack_cli/src/network/v2/qos/policy/dscp_marking_rule/show.rs b/cli-cmd/network/src/v2/qos/policy/dscp_marking_rule/show.rs similarity index 100% rename from openstack_cli/src/network/v2/qos/policy/dscp_marking_rule/show.rs rename to cli-cmd/network/src/v2/qos/policy/dscp_marking_rule/show.rs diff --git a/openstack_cli/src/network/v2/qos/policy/list.rs b/cli-cmd/network/src/v2/qos/policy/list.rs similarity index 100% rename from openstack_cli/src/network/v2/qos/policy/list.rs rename to cli-cmd/network/src/v2/qos/policy/list.rs diff --git a/openstack_cli/src/network/v2/qos/policy/minimum_bandwidth_rule.rs b/cli-cmd/network/src/v2/qos/policy/minimum_bandwidth_rule.rs similarity index 94% rename from openstack_cli/src/network/v2/qos/policy/minimum_bandwidth_rule.rs rename to cli-cmd/network/src/v2/qos/policy/minimum_bandwidth_rule.rs index 1f1a41f07..1611c09e4 100644 --- a/openstack_cli/src/network/v2/qos/policy/minimum_bandwidth_rule.rs +++ b/cli-cmd/network/src/v2/qos/policy/minimum_bandwidth_rule.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; pub mod create; pub mod delete; @@ -49,9 +49,9 @@ pub enum MinimumBandwidthRuleCommands { impl MinimumBandwidthRuleCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/network/v2/qos/policy/minimum_bandwidth_rule/create.rs b/cli-cmd/network/src/v2/qos/policy/minimum_bandwidth_rule/create.rs similarity index 100% rename from openstack_cli/src/network/v2/qos/policy/minimum_bandwidth_rule/create.rs rename to cli-cmd/network/src/v2/qos/policy/minimum_bandwidth_rule/create.rs diff --git a/openstack_cli/src/network/v2/qos/policy/minimum_bandwidth_rule/delete.rs b/cli-cmd/network/src/v2/qos/policy/minimum_bandwidth_rule/delete.rs similarity index 100% rename from openstack_cli/src/network/v2/qos/policy/minimum_bandwidth_rule/delete.rs rename to cli-cmd/network/src/v2/qos/policy/minimum_bandwidth_rule/delete.rs diff --git a/openstack_cli/src/network/v2/qos/policy/minimum_bandwidth_rule/list.rs b/cli-cmd/network/src/v2/qos/policy/minimum_bandwidth_rule/list.rs similarity index 100% rename from openstack_cli/src/network/v2/qos/policy/minimum_bandwidth_rule/list.rs rename to cli-cmd/network/src/v2/qos/policy/minimum_bandwidth_rule/list.rs diff --git a/openstack_cli/src/network/v2/qos/policy/minimum_bandwidth_rule/set.rs b/cli-cmd/network/src/v2/qos/policy/minimum_bandwidth_rule/set.rs similarity index 100% rename from openstack_cli/src/network/v2/qos/policy/minimum_bandwidth_rule/set.rs rename to cli-cmd/network/src/v2/qos/policy/minimum_bandwidth_rule/set.rs diff --git a/openstack_cli/src/network/v2/qos/policy/minimum_bandwidth_rule/show.rs b/cli-cmd/network/src/v2/qos/policy/minimum_bandwidth_rule/show.rs similarity index 100% rename from openstack_cli/src/network/v2/qos/policy/minimum_bandwidth_rule/show.rs rename to cli-cmd/network/src/v2/qos/policy/minimum_bandwidth_rule/show.rs diff --git a/openstack_cli/src/network/v2/qos/policy/minimum_packet_rate_rule.rs b/cli-cmd/network/src/v2/qos/policy/minimum_packet_rate_rule.rs similarity index 94% rename from openstack_cli/src/network/v2/qos/policy/minimum_packet_rate_rule.rs rename to cli-cmd/network/src/v2/qos/policy/minimum_packet_rate_rule.rs index 701f16399..371d7158f 100644 --- a/openstack_cli/src/network/v2/qos/policy/minimum_packet_rate_rule.rs +++ b/cli-cmd/network/src/v2/qos/policy/minimum_packet_rate_rule.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; pub mod create; pub mod delete; @@ -49,9 +49,9 @@ pub enum MinimumPacketRateRuleCommands { impl MinimumPacketRateRuleCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/network/v2/qos/policy/minimum_packet_rate_rule/create.rs b/cli-cmd/network/src/v2/qos/policy/minimum_packet_rate_rule/create.rs similarity index 100% rename from openstack_cli/src/network/v2/qos/policy/minimum_packet_rate_rule/create.rs rename to cli-cmd/network/src/v2/qos/policy/minimum_packet_rate_rule/create.rs diff --git a/openstack_cli/src/network/v2/qos/policy/minimum_packet_rate_rule/delete.rs b/cli-cmd/network/src/v2/qos/policy/minimum_packet_rate_rule/delete.rs similarity index 100% rename from openstack_cli/src/network/v2/qos/policy/minimum_packet_rate_rule/delete.rs rename to cli-cmd/network/src/v2/qos/policy/minimum_packet_rate_rule/delete.rs diff --git a/openstack_cli/src/network/v2/qos/policy/minimum_packet_rate_rule/list.rs b/cli-cmd/network/src/v2/qos/policy/minimum_packet_rate_rule/list.rs similarity index 100% rename from openstack_cli/src/network/v2/qos/policy/minimum_packet_rate_rule/list.rs rename to cli-cmd/network/src/v2/qos/policy/minimum_packet_rate_rule/list.rs diff --git a/openstack_cli/src/network/v2/qos/policy/minimum_packet_rate_rule/set.rs b/cli-cmd/network/src/v2/qos/policy/minimum_packet_rate_rule/set.rs similarity index 100% rename from openstack_cli/src/network/v2/qos/policy/minimum_packet_rate_rule/set.rs rename to cli-cmd/network/src/v2/qos/policy/minimum_packet_rate_rule/set.rs diff --git a/openstack_cli/src/network/v2/qos/policy/minimum_packet_rate_rule/show.rs b/cli-cmd/network/src/v2/qos/policy/minimum_packet_rate_rule/show.rs similarity index 100% rename from openstack_cli/src/network/v2/qos/policy/minimum_packet_rate_rule/show.rs rename to cli-cmd/network/src/v2/qos/policy/minimum_packet_rate_rule/show.rs diff --git a/openstack_cli/src/network/v2/qos/policy/set.rs b/cli-cmd/network/src/v2/qos/policy/set.rs similarity index 100% rename from openstack_cli/src/network/v2/qos/policy/set.rs rename to cli-cmd/network/src/v2/qos/policy/set.rs diff --git a/openstack_cli/src/network/v2/qos/policy/show.rs b/cli-cmd/network/src/v2/qos/policy/show.rs similarity index 100% rename from openstack_cli/src/network/v2/qos/policy/show.rs rename to cli-cmd/network/src/v2/qos/policy/show.rs diff --git a/openstack_cli/src/network/v2/qos/rule_type.rs b/cli-cmd/network/src/v2/qos/rule_type.rs similarity index 93% rename from openstack_cli/src/network/v2/qos/rule_type.rs rename to cli-cmd/network/src/v2/qos/rule_type.rs index 3b9d8f54d..39e509640 100644 --- a/openstack_cli/src/network/v2/qos/rule_type.rs +++ b/cli-cmd/network/src/v2/qos/rule_type.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; pub mod list; pub mod show; @@ -50,9 +50,9 @@ pub enum RuleTypeCommands { impl RuleTypeCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/network/v2/qos/rule_type/create.rs b/cli-cmd/network/src/v2/qos/rule_type/create.rs similarity index 100% rename from openstack_cli/src/network/v2/qos/rule_type/create.rs rename to cli-cmd/network/src/v2/qos/rule_type/create.rs diff --git a/openstack_cli/src/network/v2/qos/rule_type/delete.rs b/cli-cmd/network/src/v2/qos/rule_type/delete.rs similarity index 100% rename from openstack_cli/src/network/v2/qos/rule_type/delete.rs rename to cli-cmd/network/src/v2/qos/rule_type/delete.rs diff --git a/openstack_cli/src/network/v2/qos/rule_type/list.rs b/cli-cmd/network/src/v2/qos/rule_type/list.rs similarity index 100% rename from openstack_cli/src/network/v2/qos/rule_type/list.rs rename to cli-cmd/network/src/v2/qos/rule_type/list.rs diff --git a/openstack_cli/src/network/v2/qos/rule_type/set.rs b/cli-cmd/network/src/v2/qos/rule_type/set.rs similarity index 100% rename from openstack_cli/src/network/v2/qos/rule_type/set.rs rename to cli-cmd/network/src/v2/qos/rule_type/set.rs diff --git a/openstack_cli/src/network/v2/qos/rule_type/show.rs b/cli-cmd/network/src/v2/qos/rule_type/show.rs similarity index 100% rename from openstack_cli/src/network/v2/qos/rule_type/show.rs rename to cli-cmd/network/src/v2/qos/rule_type/show.rs diff --git a/openstack_cli/src/network/v2/quota.rs b/cli-cmd/network/src/v2/quota.rs similarity index 94% rename from openstack_cli/src/network/v2/quota.rs rename to cli-cmd/network/src/v2/quota.rs index 70676d4e1..0c095f186 100644 --- a/openstack_cli/src/network/v2/quota.rs +++ b/cli-cmd/network/src/v2/quota.rs @@ -16,10 +16,9 @@ use clap::{Parser, Subcommand}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; - pub mod defaults; pub mod delete; pub mod details; @@ -54,9 +53,9 @@ pub enum QuotaCommands { impl QuotaCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/network/v2/quota/defaults.rs b/cli-cmd/network/src/v2/quota/defaults.rs similarity index 100% rename from openstack_cli/src/network/v2/quota/defaults.rs rename to cli-cmd/network/src/v2/quota/defaults.rs diff --git a/openstack_cli/src/network/v2/quota/delete.rs b/cli-cmd/network/src/v2/quota/delete.rs similarity index 100% rename from openstack_cli/src/network/v2/quota/delete.rs rename to cli-cmd/network/src/v2/quota/delete.rs diff --git a/openstack_cli/src/network/v2/quota/details.rs b/cli-cmd/network/src/v2/quota/details.rs similarity index 100% rename from openstack_cli/src/network/v2/quota/details.rs rename to cli-cmd/network/src/v2/quota/details.rs diff --git a/openstack_cli/src/network/v2/quota/list.rs b/cli-cmd/network/src/v2/quota/list.rs similarity index 100% rename from openstack_cli/src/network/v2/quota/list.rs rename to cli-cmd/network/src/v2/quota/list.rs diff --git a/openstack_cli/src/network/v2/quota/set.rs b/cli-cmd/network/src/v2/quota/set.rs similarity index 100% rename from openstack_cli/src/network/v2/quota/set.rs rename to cli-cmd/network/src/v2/quota/set.rs diff --git a/openstack_cli/src/network/v2/quota/show.rs b/cli-cmd/network/src/v2/quota/show.rs similarity index 100% rename from openstack_cli/src/network/v2/quota/show.rs rename to cli-cmd/network/src/v2/quota/show.rs diff --git a/openstack_cli/src/network/v2/rbac_policy.rs b/cli-cmd/network/src/v2/rbac_policy.rs similarity index 93% rename from openstack_cli/src/network/v2/rbac_policy.rs rename to cli-cmd/network/src/v2/rbac_policy.rs index 27d60720b..9d84bddbb 100644 --- a/openstack_cli/src/network/v2/rbac_policy.rs +++ b/cli-cmd/network/src/v2/rbac_policy.rs @@ -16,10 +16,9 @@ use clap::{Parser, Subcommand}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; - pub mod create; pub mod delete; pub mod list; @@ -47,9 +46,9 @@ pub enum RbacPolicyCommands { impl RbacPolicyCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/network/v2/rbac_policy/create.rs b/cli-cmd/network/src/v2/rbac_policy/create.rs similarity index 100% rename from openstack_cli/src/network/v2/rbac_policy/create.rs rename to cli-cmd/network/src/v2/rbac_policy/create.rs diff --git a/openstack_cli/src/network/v2/rbac_policy/delete.rs b/cli-cmd/network/src/v2/rbac_policy/delete.rs similarity index 100% rename from openstack_cli/src/network/v2/rbac_policy/delete.rs rename to cli-cmd/network/src/v2/rbac_policy/delete.rs diff --git a/openstack_cli/src/network/v2/rbac_policy/list.rs b/cli-cmd/network/src/v2/rbac_policy/list.rs similarity index 100% rename from openstack_cli/src/network/v2/rbac_policy/list.rs rename to cli-cmd/network/src/v2/rbac_policy/list.rs diff --git a/openstack_cli/src/network/v2/rbac_policy/set.rs b/cli-cmd/network/src/v2/rbac_policy/set.rs similarity index 100% rename from openstack_cli/src/network/v2/rbac_policy/set.rs rename to cli-cmd/network/src/v2/rbac_policy/set.rs diff --git a/openstack_cli/src/network/v2/rbac_policy/show.rs b/cli-cmd/network/src/v2/rbac_policy/show.rs similarity index 100% rename from openstack_cli/src/network/v2/rbac_policy/show.rs rename to cli-cmd/network/src/v2/rbac_policy/show.rs diff --git a/openstack_cli/src/network/v2/router.rs b/cli-cmd/network/src/v2/router.rs similarity index 96% rename from openstack_cli/src/network/v2/router.rs rename to cli-cmd/network/src/v2/router.rs index ed2b4d0bf..1c6826fea 100644 --- a/openstack_cli/src/network/v2/router.rs +++ b/cli-cmd/network/src/v2/router.rs @@ -16,10 +16,9 @@ use clap::{Parser, Subcommand}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; - pub mod add_external_gateways; pub mod add_extraroutes; pub mod add_router_interface; @@ -65,9 +64,9 @@ pub enum RouterCommands { impl RouterCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/network/v2/router/add_external_gateways.rs b/cli-cmd/network/src/v2/router/add_external_gateways.rs similarity index 100% rename from openstack_cli/src/network/v2/router/add_external_gateways.rs rename to cli-cmd/network/src/v2/router/add_external_gateways.rs diff --git a/openstack_cli/src/network/v2/router/add_extraroutes.rs b/cli-cmd/network/src/v2/router/add_extraroutes.rs similarity index 100% rename from openstack_cli/src/network/v2/router/add_extraroutes.rs rename to cli-cmd/network/src/v2/router/add_extraroutes.rs diff --git a/openstack_cli/src/network/v2/router/add_router_interface.rs b/cli-cmd/network/src/v2/router/add_router_interface.rs similarity index 100% rename from openstack_cli/src/network/v2/router/add_router_interface.rs rename to cli-cmd/network/src/v2/router/add_router_interface.rs diff --git a/openstack_cli/src/network/v2/router/conntrack_helper.rs b/cli-cmd/network/src/v2/router/conntrack_helper.rs similarity index 93% rename from openstack_cli/src/network/v2/router/conntrack_helper.rs rename to cli-cmd/network/src/v2/router/conntrack_helper.rs index 0edd9e5bc..327a00510 100644 --- a/openstack_cli/src/network/v2/router/conntrack_helper.rs +++ b/cli-cmd/network/src/v2/router/conntrack_helper.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; pub mod create; pub mod delete; @@ -48,9 +48,9 @@ pub enum ConntrackHelperCommands { impl ConntrackHelperCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/network/v2/router/conntrack_helper/create.rs b/cli-cmd/network/src/v2/router/conntrack_helper/create.rs similarity index 100% rename from openstack_cli/src/network/v2/router/conntrack_helper/create.rs rename to cli-cmd/network/src/v2/router/conntrack_helper/create.rs diff --git a/openstack_cli/src/network/v2/router/conntrack_helper/delete.rs b/cli-cmd/network/src/v2/router/conntrack_helper/delete.rs similarity index 100% rename from openstack_cli/src/network/v2/router/conntrack_helper/delete.rs rename to cli-cmd/network/src/v2/router/conntrack_helper/delete.rs diff --git a/openstack_cli/src/network/v2/router/conntrack_helper/list.rs b/cli-cmd/network/src/v2/router/conntrack_helper/list.rs similarity index 100% rename from openstack_cli/src/network/v2/router/conntrack_helper/list.rs rename to cli-cmd/network/src/v2/router/conntrack_helper/list.rs diff --git a/openstack_cli/src/network/v2/router/conntrack_helper/set.rs b/cli-cmd/network/src/v2/router/conntrack_helper/set.rs similarity index 100% rename from openstack_cli/src/network/v2/router/conntrack_helper/set.rs rename to cli-cmd/network/src/v2/router/conntrack_helper/set.rs diff --git a/openstack_cli/src/network/v2/router/conntrack_helper/show.rs b/cli-cmd/network/src/v2/router/conntrack_helper/show.rs similarity index 100% rename from openstack_cli/src/network/v2/router/conntrack_helper/show.rs rename to cli-cmd/network/src/v2/router/conntrack_helper/show.rs diff --git a/openstack_cli/src/network/v2/router/create.rs b/cli-cmd/network/src/v2/router/create.rs similarity index 100% rename from openstack_cli/src/network/v2/router/create.rs rename to cli-cmd/network/src/v2/router/create.rs diff --git a/openstack_cli/src/network/v2/router/delete.rs b/cli-cmd/network/src/v2/router/delete.rs similarity index 100% rename from openstack_cli/src/network/v2/router/delete.rs rename to cli-cmd/network/src/v2/router/delete.rs diff --git a/openstack_cli/src/network/v2/router/l3_agent.rs b/cli-cmd/network/src/v2/router/l3_agent.rs similarity index 91% rename from openstack_cli/src/network/v2/router/l3_agent.rs rename to cli-cmd/network/src/v2/router/l3_agent.rs index 312f422b0..b3ba09d93 100644 --- a/openstack_cli/src/network/v2/router/l3_agent.rs +++ b/cli-cmd/network/src/v2/router/l3_agent.rs @@ -17,7 +17,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; pub mod list; @@ -41,9 +41,9 @@ pub enum L3AgentCommands { impl L3AgentCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/network/v2/router/l3_agent/create.rs b/cli-cmd/network/src/v2/router/l3_agent/create.rs similarity index 100% rename from openstack_cli/src/network/v2/router/l3_agent/create.rs rename to cli-cmd/network/src/v2/router/l3_agent/create.rs diff --git a/openstack_cli/src/network/v2/router/l3_agent/delete.rs b/cli-cmd/network/src/v2/router/l3_agent/delete.rs similarity index 100% rename from openstack_cli/src/network/v2/router/l3_agent/delete.rs rename to cli-cmd/network/src/v2/router/l3_agent/delete.rs diff --git a/openstack_cli/src/network/v2/router/l3_agent/list.rs b/cli-cmd/network/src/v2/router/l3_agent/list.rs similarity index 100% rename from openstack_cli/src/network/v2/router/l3_agent/list.rs rename to cli-cmd/network/src/v2/router/l3_agent/list.rs diff --git a/openstack_cli/src/network/v2/router/l3_agent/set.rs b/cli-cmd/network/src/v2/router/l3_agent/set.rs similarity index 100% rename from openstack_cli/src/network/v2/router/l3_agent/set.rs rename to cli-cmd/network/src/v2/router/l3_agent/set.rs diff --git a/openstack_cli/src/network/v2/router/l3_agent/show.rs b/cli-cmd/network/src/v2/router/l3_agent/show.rs similarity index 100% rename from openstack_cli/src/network/v2/router/l3_agent/show.rs rename to cli-cmd/network/src/v2/router/l3_agent/show.rs diff --git a/openstack_cli/src/network/v2/router/list.rs b/cli-cmd/network/src/v2/router/list.rs similarity index 100% rename from openstack_cli/src/network/v2/router/list.rs rename to cli-cmd/network/src/v2/router/list.rs diff --git a/openstack_cli/src/network/v2/router/remove_external_gateways.rs b/cli-cmd/network/src/v2/router/remove_external_gateways.rs similarity index 100% rename from openstack_cli/src/network/v2/router/remove_external_gateways.rs rename to cli-cmd/network/src/v2/router/remove_external_gateways.rs diff --git a/openstack_cli/src/network/v2/router/remove_extraroutes.rs b/cli-cmd/network/src/v2/router/remove_extraroutes.rs similarity index 100% rename from openstack_cli/src/network/v2/router/remove_extraroutes.rs rename to cli-cmd/network/src/v2/router/remove_extraroutes.rs diff --git a/openstack_cli/src/network/v2/router/remove_router_interface.rs b/cli-cmd/network/src/v2/router/remove_router_interface.rs similarity index 100% rename from openstack_cli/src/network/v2/router/remove_router_interface.rs rename to cli-cmd/network/src/v2/router/remove_router_interface.rs diff --git a/openstack_cli/src/network/v2/router/set.rs b/cli-cmd/network/src/v2/router/set.rs similarity index 100% rename from openstack_cli/src/network/v2/router/set.rs rename to cli-cmd/network/src/v2/router/set.rs diff --git a/openstack_cli/src/network/v2/router/show.rs b/cli-cmd/network/src/v2/router/show.rs similarity index 100% rename from openstack_cli/src/network/v2/router/show.rs rename to cli-cmd/network/src/v2/router/show.rs diff --git a/cli-cmd/network/src/v2/router/tag.rs b/cli-cmd/network/src/v2/router/tag.rs new file mode 100644 index 000000000..006b0d1aa --- /dev/null +++ b/cli-cmd/network/src/v2/router/tag.rs @@ -0,0 +1,68 @@ +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// +// SPDX-License-Identifier: Apache-2.0 + +//! Resource Tag module +//! +//! This module is defined once and symlinked into individual resources. This way code is +//! de-duplicated while also ensuring the same command interface is being maintained. +#![allow(clippy::duplicate_mod)] + +use clap::{Parser, Subcommand}; + +use openstack_sdk::AsyncOpenStack; + +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; + +pub mod delete; +pub mod delete_all; +pub mod list; +pub mod set; +pub mod show; + +/// Lists tags, creates, replaces or deletes one or more tags for a +/// resource, checks the existence of a tag for a resource. +#[derive(Parser)] +pub struct TagCommand { + /// subcommand + #[command(subcommand)] + command: TagCommands, +} + +/// Supported subcommands +#[allow(missing_docs)] +#[derive(Subcommand)] +pub enum TagCommands { + Add(set::TagCommand), + Check(show::TagCommand), + Delete(delete::TagCommand), + List(list::TagsCommand), + Purge(delete_all::TagCommand), +} + +impl TagCommand { + /// Perform command action + pub async fn take_action( + &self, + parsed_args: &C, + session: &mut AsyncOpenStack, + ) -> Result<(), OpenStackCliError> { + match &self.command { + TagCommands::Add(cmd) => cmd.take_action(parsed_args, session).await, + TagCommands::Check(cmd) => cmd.take_action(parsed_args, session).await, + TagCommands::Delete(cmd) => cmd.take_action(parsed_args, session).await, + TagCommands::List(cmd) => cmd.take_action(parsed_args, session).await, + TagCommands::Purge(cmd) => cmd.take_action(parsed_args, session).await, + } + } +} diff --git a/openstack_cli/src/network/v2/router/tag/delete.rs b/cli-cmd/network/src/v2/router/tag/delete.rs similarity index 100% rename from openstack_cli/src/network/v2/router/tag/delete.rs rename to cli-cmd/network/src/v2/router/tag/delete.rs diff --git a/openstack_cli/src/network/v2/router/tag/delete_all.rs b/cli-cmd/network/src/v2/router/tag/delete_all.rs similarity index 100% rename from openstack_cli/src/network/v2/router/tag/delete_all.rs rename to cli-cmd/network/src/v2/router/tag/delete_all.rs diff --git a/openstack_cli/src/network/v2/router/tag/list.rs b/cli-cmd/network/src/v2/router/tag/list.rs similarity index 100% rename from openstack_cli/src/network/v2/router/tag/list.rs rename to cli-cmd/network/src/v2/router/tag/list.rs diff --git a/openstack_cli/src/network/v2/router/tag/replace.rs b/cli-cmd/network/src/v2/router/tag/replace.rs similarity index 100% rename from openstack_cli/src/network/v2/router/tag/replace.rs rename to cli-cmd/network/src/v2/router/tag/replace.rs diff --git a/openstack_cli/src/network/v2/router/tag/set.rs b/cli-cmd/network/src/v2/router/tag/set.rs similarity index 100% rename from openstack_cli/src/network/v2/router/tag/set.rs rename to cli-cmd/network/src/v2/router/tag/set.rs diff --git a/openstack_cli/src/network/v2/router/tag/show.rs b/cli-cmd/network/src/v2/router/tag/show.rs similarity index 100% rename from openstack_cli/src/network/v2/router/tag/show.rs rename to cli-cmd/network/src/v2/router/tag/show.rs diff --git a/openstack_cli/src/network/v2/router/update_external_gateways.rs b/cli-cmd/network/src/v2/router/update_external_gateways.rs similarity index 100% rename from openstack_cli/src/network/v2/router/update_external_gateways.rs rename to cli-cmd/network/src/v2/router/update_external_gateways.rs diff --git a/openstack_cli/src/network/v2/security_group.rs b/cli-cmd/network/src/v2/security_group.rs similarity index 93% rename from openstack_cli/src/network/v2/security_group.rs rename to cli-cmd/network/src/v2/security_group.rs index 12edb71fb..15335ab16 100644 --- a/openstack_cli/src/network/v2/security_group.rs +++ b/cli-cmd/network/src/v2/security_group.rs @@ -16,10 +16,9 @@ use clap::{Parser, Subcommand}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; - pub mod create; pub mod delete; pub mod list; @@ -49,9 +48,9 @@ pub enum SecurityGroupCommands { impl SecurityGroupCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/network/v2/security_group/create.rs b/cli-cmd/network/src/v2/security_group/create.rs similarity index 100% rename from openstack_cli/src/network/v2/security_group/create.rs rename to cli-cmd/network/src/v2/security_group/create.rs diff --git a/openstack_cli/src/network/v2/security_group/delete.rs b/cli-cmd/network/src/v2/security_group/delete.rs similarity index 100% rename from openstack_cli/src/network/v2/security_group/delete.rs rename to cli-cmd/network/src/v2/security_group/delete.rs diff --git a/openstack_cli/src/network/v2/security_group/list.rs b/cli-cmd/network/src/v2/security_group/list.rs similarity index 100% rename from openstack_cli/src/network/v2/security_group/list.rs rename to cli-cmd/network/src/v2/security_group/list.rs diff --git a/openstack_cli/src/network/v2/security_group/set.rs b/cli-cmd/network/src/v2/security_group/set.rs similarity index 100% rename from openstack_cli/src/network/v2/security_group/set.rs rename to cli-cmd/network/src/v2/security_group/set.rs diff --git a/openstack_cli/src/network/v2/security_group/show.rs b/cli-cmd/network/src/v2/security_group/show.rs similarity index 100% rename from openstack_cli/src/network/v2/security_group/show.rs rename to cli-cmd/network/src/v2/security_group/show.rs diff --git a/cli-cmd/network/src/v2/security_group/tag.rs b/cli-cmd/network/src/v2/security_group/tag.rs new file mode 100644 index 000000000..006b0d1aa --- /dev/null +++ b/cli-cmd/network/src/v2/security_group/tag.rs @@ -0,0 +1,68 @@ +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// +// SPDX-License-Identifier: Apache-2.0 + +//! Resource Tag module +//! +//! This module is defined once and symlinked into individual resources. This way code is +//! de-duplicated while also ensuring the same command interface is being maintained. +#![allow(clippy::duplicate_mod)] + +use clap::{Parser, Subcommand}; + +use openstack_sdk::AsyncOpenStack; + +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; + +pub mod delete; +pub mod delete_all; +pub mod list; +pub mod set; +pub mod show; + +/// Lists tags, creates, replaces or deletes one or more tags for a +/// resource, checks the existence of a tag for a resource. +#[derive(Parser)] +pub struct TagCommand { + /// subcommand + #[command(subcommand)] + command: TagCommands, +} + +/// Supported subcommands +#[allow(missing_docs)] +#[derive(Subcommand)] +pub enum TagCommands { + Add(set::TagCommand), + Check(show::TagCommand), + Delete(delete::TagCommand), + List(list::TagsCommand), + Purge(delete_all::TagCommand), +} + +impl TagCommand { + /// Perform command action + pub async fn take_action( + &self, + parsed_args: &C, + session: &mut AsyncOpenStack, + ) -> Result<(), OpenStackCliError> { + match &self.command { + TagCommands::Add(cmd) => cmd.take_action(parsed_args, session).await, + TagCommands::Check(cmd) => cmd.take_action(parsed_args, session).await, + TagCommands::Delete(cmd) => cmd.take_action(parsed_args, session).await, + TagCommands::List(cmd) => cmd.take_action(parsed_args, session).await, + TagCommands::Purge(cmd) => cmd.take_action(parsed_args, session).await, + } + } +} diff --git a/openstack_cli/src/network/v2/security_group/tag/delete.rs b/cli-cmd/network/src/v2/security_group/tag/delete.rs similarity index 100% rename from openstack_cli/src/network/v2/security_group/tag/delete.rs rename to cli-cmd/network/src/v2/security_group/tag/delete.rs diff --git a/openstack_cli/src/network/v2/security_group/tag/delete_all.rs b/cli-cmd/network/src/v2/security_group/tag/delete_all.rs similarity index 100% rename from openstack_cli/src/network/v2/security_group/tag/delete_all.rs rename to cli-cmd/network/src/v2/security_group/tag/delete_all.rs diff --git a/openstack_cli/src/network/v2/security_group/tag/list.rs b/cli-cmd/network/src/v2/security_group/tag/list.rs similarity index 100% rename from openstack_cli/src/network/v2/security_group/tag/list.rs rename to cli-cmd/network/src/v2/security_group/tag/list.rs diff --git a/openstack_cli/src/network/v2/security_group/tag/replace.rs b/cli-cmd/network/src/v2/security_group/tag/replace.rs similarity index 100% rename from openstack_cli/src/network/v2/security_group/tag/replace.rs rename to cli-cmd/network/src/v2/security_group/tag/replace.rs diff --git a/openstack_cli/src/network/v2/security_group/tag/set.rs b/cli-cmd/network/src/v2/security_group/tag/set.rs similarity index 100% rename from openstack_cli/src/network/v2/security_group/tag/set.rs rename to cli-cmd/network/src/v2/security_group/tag/set.rs diff --git a/openstack_cli/src/network/v2/security_group/tag/show.rs b/cli-cmd/network/src/v2/security_group/tag/show.rs similarity index 100% rename from openstack_cli/src/network/v2/security_group/tag/show.rs rename to cli-cmd/network/src/v2/security_group/tag/show.rs diff --git a/openstack_cli/src/network/v2/security_group_rule.rs b/cli-cmd/network/src/v2/security_group_rule.rs similarity index 93% rename from openstack_cli/src/network/v2/security_group_rule.rs rename to cli-cmd/network/src/v2/security_group_rule.rs index 220e6a568..4c85f38ec 100644 --- a/openstack_cli/src/network/v2/security_group_rule.rs +++ b/cli-cmd/network/src/v2/security_group_rule.rs @@ -16,10 +16,9 @@ use clap::{Parser, Subcommand}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; - pub mod create; pub mod delete; pub mod list; @@ -47,9 +46,9 @@ pub enum SecurityGroupRuleCommands { impl SecurityGroupRuleCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/network/v2/security_group_rule/create.rs b/cli-cmd/network/src/v2/security_group_rule/create.rs similarity index 100% rename from openstack_cli/src/network/v2/security_group_rule/create.rs rename to cli-cmd/network/src/v2/security_group_rule/create.rs diff --git a/openstack_cli/src/network/v2/security_group_rule/delete.rs b/cli-cmd/network/src/v2/security_group_rule/delete.rs similarity index 100% rename from openstack_cli/src/network/v2/security_group_rule/delete.rs rename to cli-cmd/network/src/v2/security_group_rule/delete.rs diff --git a/openstack_cli/src/network/v2/security_group_rule/list.rs b/cli-cmd/network/src/v2/security_group_rule/list.rs similarity index 100% rename from openstack_cli/src/network/v2/security_group_rule/list.rs rename to cli-cmd/network/src/v2/security_group_rule/list.rs diff --git a/openstack_cli/src/network/v2/security_group_rule/set.rs b/cli-cmd/network/src/v2/security_group_rule/set.rs similarity index 100% rename from openstack_cli/src/network/v2/security_group_rule/set.rs rename to cli-cmd/network/src/v2/security_group_rule/set.rs diff --git a/openstack_cli/src/network/v2/security_group_rule/show.rs b/cli-cmd/network/src/v2/security_group_rule/show.rs similarity index 100% rename from openstack_cli/src/network/v2/security_group_rule/show.rs rename to cli-cmd/network/src/v2/security_group_rule/show.rs diff --git a/openstack_cli/src/network/v2/segment.rs b/cli-cmd/network/src/v2/segment.rs similarity index 93% rename from openstack_cli/src/network/v2/segment.rs rename to cli-cmd/network/src/v2/segment.rs index 68ba1916e..b0c85fd03 100644 --- a/openstack_cli/src/network/v2/segment.rs +++ b/cli-cmd/network/src/v2/segment.rs @@ -16,10 +16,9 @@ use clap::{Parser, Subcommand}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; - pub mod create; pub mod delete; pub mod list; @@ -50,9 +49,9 @@ pub enum SegmentCommands { impl SegmentCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/network/v2/segment/create.rs b/cli-cmd/network/src/v2/segment/create.rs similarity index 100% rename from openstack_cli/src/network/v2/segment/create.rs rename to cli-cmd/network/src/v2/segment/create.rs diff --git a/openstack_cli/src/network/v2/segment/delete.rs b/cli-cmd/network/src/v2/segment/delete.rs similarity index 100% rename from openstack_cli/src/network/v2/segment/delete.rs rename to cli-cmd/network/src/v2/segment/delete.rs diff --git a/openstack_cli/src/network/v2/segment/list.rs b/cli-cmd/network/src/v2/segment/list.rs similarity index 100% rename from openstack_cli/src/network/v2/segment/list.rs rename to cli-cmd/network/src/v2/segment/list.rs diff --git a/openstack_cli/src/network/v2/segment/set.rs b/cli-cmd/network/src/v2/segment/set.rs similarity index 100% rename from openstack_cli/src/network/v2/segment/set.rs rename to cli-cmd/network/src/v2/segment/set.rs diff --git a/openstack_cli/src/network/v2/segment/show.rs b/cli-cmd/network/src/v2/segment/show.rs similarity index 100% rename from openstack_cli/src/network/v2/segment/show.rs rename to cli-cmd/network/src/v2/segment/show.rs diff --git a/openstack_cli/src/network/v2/service_profile/create.rs b/cli-cmd/network/src/v2/service_profile/create.rs similarity index 100% rename from openstack_cli/src/network/v2/service_profile/create.rs rename to cli-cmd/network/src/v2/service_profile/create.rs diff --git a/openstack_cli/src/network/v2/service_profile/delete.rs b/cli-cmd/network/src/v2/service_profile/delete.rs similarity index 100% rename from openstack_cli/src/network/v2/service_profile/delete.rs rename to cli-cmd/network/src/v2/service_profile/delete.rs diff --git a/openstack_cli/src/network/v2/service_profile/list.rs b/cli-cmd/network/src/v2/service_profile/list.rs similarity index 100% rename from openstack_cli/src/network/v2/service_profile/list.rs rename to cli-cmd/network/src/v2/service_profile/list.rs diff --git a/openstack_cli/src/network/v2/service_profile/set.rs b/cli-cmd/network/src/v2/service_profile/set.rs similarity index 100% rename from openstack_cli/src/network/v2/service_profile/set.rs rename to cli-cmd/network/src/v2/service_profile/set.rs diff --git a/openstack_cli/src/network/v2/service_profile/show.rs b/cli-cmd/network/src/v2/service_profile/show.rs similarity index 100% rename from openstack_cli/src/network/v2/service_profile/show.rs rename to cli-cmd/network/src/v2/service_profile/show.rs diff --git a/openstack_cli/src/network/v2/service_provider/create.rs b/cli-cmd/network/src/v2/service_provider/create.rs similarity index 100% rename from openstack_cli/src/network/v2/service_provider/create.rs rename to cli-cmd/network/src/v2/service_provider/create.rs diff --git a/openstack_cli/src/network/v2/service_provider/delete.rs b/cli-cmd/network/src/v2/service_provider/delete.rs similarity index 100% rename from openstack_cli/src/network/v2/service_provider/delete.rs rename to cli-cmd/network/src/v2/service_provider/delete.rs diff --git a/openstack_cli/src/network/v2/service_provider/list.rs b/cli-cmd/network/src/v2/service_provider/list.rs similarity index 100% rename from openstack_cli/src/network/v2/service_provider/list.rs rename to cli-cmd/network/src/v2/service_provider/list.rs diff --git a/openstack_cli/src/network/v2/service_provider/set.rs b/cli-cmd/network/src/v2/service_provider/set.rs similarity index 100% rename from openstack_cli/src/network/v2/service_provider/set.rs rename to cli-cmd/network/src/v2/service_provider/set.rs diff --git a/openstack_cli/src/network/v2/service_provider/show.rs b/cli-cmd/network/src/v2/service_provider/show.rs similarity index 100% rename from openstack_cli/src/network/v2/service_provider/show.rs rename to cli-cmd/network/src/v2/service_provider/show.rs diff --git a/openstack_cli/src/network/v2/subnet.rs b/cli-cmd/network/src/v2/subnet.rs similarity index 93% rename from openstack_cli/src/network/v2/subnet.rs rename to cli-cmd/network/src/v2/subnet.rs index 83566a7ea..481466a7b 100644 --- a/openstack_cli/src/network/v2/subnet.rs +++ b/cli-cmd/network/src/v2/subnet.rs @@ -16,10 +16,9 @@ use clap::{Parser, Subcommand}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; - pub mod create; pub mod delete; pub mod list; @@ -49,9 +48,9 @@ pub enum SubnetCommands { impl SubnetCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/network/v2/subnet/create.rs b/cli-cmd/network/src/v2/subnet/create.rs similarity index 100% rename from openstack_cli/src/network/v2/subnet/create.rs rename to cli-cmd/network/src/v2/subnet/create.rs diff --git a/openstack_cli/src/network/v2/subnet/delete.rs b/cli-cmd/network/src/v2/subnet/delete.rs similarity index 100% rename from openstack_cli/src/network/v2/subnet/delete.rs rename to cli-cmd/network/src/v2/subnet/delete.rs diff --git a/openstack_cli/src/network/v2/subnet/list.rs b/cli-cmd/network/src/v2/subnet/list.rs similarity index 100% rename from openstack_cli/src/network/v2/subnet/list.rs rename to cli-cmd/network/src/v2/subnet/list.rs diff --git a/openstack_cli/src/network/v2/subnet/set.rs b/cli-cmd/network/src/v2/subnet/set.rs similarity index 100% rename from openstack_cli/src/network/v2/subnet/set.rs rename to cli-cmd/network/src/v2/subnet/set.rs diff --git a/openstack_cli/src/network/v2/subnet/show.rs b/cli-cmd/network/src/v2/subnet/show.rs similarity index 100% rename from openstack_cli/src/network/v2/subnet/show.rs rename to cli-cmd/network/src/v2/subnet/show.rs diff --git a/cli-cmd/network/src/v2/subnet/tag.rs b/cli-cmd/network/src/v2/subnet/tag.rs new file mode 100644 index 000000000..dfe141aac --- /dev/null +++ b/cli-cmd/network/src/v2/subnet/tag.rs @@ -0,0 +1,67 @@ +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// +// SPDX-License-Identifier: Apache-2.0 + +//! Resource Tag module +//! +//! This module is defined once and symlinked into individual resources. This way code is +//! de-duplicated while also ensuring the same command interface is being maintained. +#![allow(clippy::duplicate_mod)] + +use clap::{Parser, Subcommand}; + +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; +use openstack_sdk::AsyncOpenStack; + +pub mod delete; +pub mod delete_all; +pub mod list; +pub mod set; +pub mod show; + +/// Lists tags, creates, replaces or deletes one or more tags for a +/// resource, checks the existence of a tag for a resource. +#[derive(Parser)] +pub struct TagCommand { + /// subcommand + #[command(subcommand)] + command: TagCommands, +} + +/// Supported subcommands +#[allow(missing_docs)] +#[derive(Subcommand)] +pub enum TagCommands { + Add(set::TagCommand), + Check(show::TagCommand), + Delete(delete::TagCommand), + List(list::TagsCommand), + Purge(delete_all::TagCommand), +} + +impl TagCommand { + /// Perform command action + pub async fn take_action( + &self, + parsed_args: &C, + session: &mut AsyncOpenStack, + ) -> Result<(), OpenStackCliError> { + match &self.command { + TagCommands::Add(cmd) => cmd.take_action(parsed_args, session).await, + TagCommands::Check(cmd) => cmd.take_action(parsed_args, session).await, + TagCommands::Delete(cmd) => cmd.take_action(parsed_args, session).await, + TagCommands::List(cmd) => cmd.take_action(parsed_args, session).await, + TagCommands::Purge(cmd) => cmd.take_action(parsed_args, session).await, + } + } +} diff --git a/openstack_cli/src/network/v2/subnet/tag/delete.rs b/cli-cmd/network/src/v2/subnet/tag/delete.rs similarity index 100% rename from openstack_cli/src/network/v2/subnet/tag/delete.rs rename to cli-cmd/network/src/v2/subnet/tag/delete.rs diff --git a/openstack_cli/src/network/v2/subnet/tag/delete_all.rs b/cli-cmd/network/src/v2/subnet/tag/delete_all.rs similarity index 100% rename from openstack_cli/src/network/v2/subnet/tag/delete_all.rs rename to cli-cmd/network/src/v2/subnet/tag/delete_all.rs diff --git a/openstack_cli/src/network/v2/subnet/tag/list.rs b/cli-cmd/network/src/v2/subnet/tag/list.rs similarity index 100% rename from openstack_cli/src/network/v2/subnet/tag/list.rs rename to cli-cmd/network/src/v2/subnet/tag/list.rs diff --git a/openstack_cli/src/network/v2/subnet/tag/replace.rs b/cli-cmd/network/src/v2/subnet/tag/replace.rs similarity index 100% rename from openstack_cli/src/network/v2/subnet/tag/replace.rs rename to cli-cmd/network/src/v2/subnet/tag/replace.rs diff --git a/openstack_cli/src/network/v2/subnet/tag/set.rs b/cli-cmd/network/src/v2/subnet/tag/set.rs similarity index 100% rename from openstack_cli/src/network/v2/subnet/tag/set.rs rename to cli-cmd/network/src/v2/subnet/tag/set.rs diff --git a/openstack_cli/src/network/v2/subnet/tag/show.rs b/cli-cmd/network/src/v2/subnet/tag/show.rs similarity index 100% rename from openstack_cli/src/network/v2/subnet/tag/show.rs rename to cli-cmd/network/src/v2/subnet/tag/show.rs diff --git a/openstack_cli/src/network/v2/subnetpool.rs b/cli-cmd/network/src/v2/subnetpool.rs similarity index 94% rename from openstack_cli/src/network/v2/subnetpool.rs rename to cli-cmd/network/src/v2/subnetpool.rs index 2b0742427..19ec52944 100644 --- a/openstack_cli/src/network/v2/subnetpool.rs +++ b/cli-cmd/network/src/v2/subnetpool.rs @@ -16,10 +16,9 @@ use clap::{Parser, Subcommand}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; - pub mod add_prefixes; pub mod create; pub mod delete; @@ -53,9 +52,9 @@ pub enum SubnetPoolCommands { impl SubnetPoolCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/network/v2/subnetpool/add_prefixes.rs b/cli-cmd/network/src/v2/subnetpool/add_prefixes.rs similarity index 100% rename from openstack_cli/src/network/v2/subnetpool/add_prefixes.rs rename to cli-cmd/network/src/v2/subnetpool/add_prefixes.rs diff --git a/openstack_cli/src/network/v2/subnetpool/create.rs b/cli-cmd/network/src/v2/subnetpool/create.rs similarity index 100% rename from openstack_cli/src/network/v2/subnetpool/create.rs rename to cli-cmd/network/src/v2/subnetpool/create.rs diff --git a/openstack_cli/src/network/v2/subnetpool/delete.rs b/cli-cmd/network/src/v2/subnetpool/delete.rs similarity index 100% rename from openstack_cli/src/network/v2/subnetpool/delete.rs rename to cli-cmd/network/src/v2/subnetpool/delete.rs diff --git a/openstack_cli/src/network/v2/subnetpool/list.rs b/cli-cmd/network/src/v2/subnetpool/list.rs similarity index 100% rename from openstack_cli/src/network/v2/subnetpool/list.rs rename to cli-cmd/network/src/v2/subnetpool/list.rs diff --git a/openstack_cli/src/network/v2/subnetpool/onboard_network_subnet/onboard_network_subnets.rs b/cli-cmd/network/src/v2/subnetpool/onboard_network_subnet/onboard_network_subnets.rs similarity index 100% rename from openstack_cli/src/network/v2/subnetpool/onboard_network_subnet/onboard_network_subnets.rs rename to cli-cmd/network/src/v2/subnetpool/onboard_network_subnet/onboard_network_subnets.rs diff --git a/openstack_cli/src/network/v2/subnetpool/remove_prefixes.rs b/cli-cmd/network/src/v2/subnetpool/remove_prefixes.rs similarity index 100% rename from openstack_cli/src/network/v2/subnetpool/remove_prefixes.rs rename to cli-cmd/network/src/v2/subnetpool/remove_prefixes.rs diff --git a/openstack_cli/src/network/v2/subnetpool/set.rs b/cli-cmd/network/src/v2/subnetpool/set.rs similarity index 100% rename from openstack_cli/src/network/v2/subnetpool/set.rs rename to cli-cmd/network/src/v2/subnetpool/set.rs diff --git a/openstack_cli/src/network/v2/subnetpool/show.rs b/cli-cmd/network/src/v2/subnetpool/show.rs similarity index 100% rename from openstack_cli/src/network/v2/subnetpool/show.rs rename to cli-cmd/network/src/v2/subnetpool/show.rs diff --git a/cli-cmd/network/src/v2/subnetpool/tag.rs b/cli-cmd/network/src/v2/subnetpool/tag.rs new file mode 100644 index 000000000..006b0d1aa --- /dev/null +++ b/cli-cmd/network/src/v2/subnetpool/tag.rs @@ -0,0 +1,68 @@ +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// +// SPDX-License-Identifier: Apache-2.0 + +//! Resource Tag module +//! +//! This module is defined once and symlinked into individual resources. This way code is +//! de-duplicated while also ensuring the same command interface is being maintained. +#![allow(clippy::duplicate_mod)] + +use clap::{Parser, Subcommand}; + +use openstack_sdk::AsyncOpenStack; + +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; + +pub mod delete; +pub mod delete_all; +pub mod list; +pub mod set; +pub mod show; + +/// Lists tags, creates, replaces or deletes one or more tags for a +/// resource, checks the existence of a tag for a resource. +#[derive(Parser)] +pub struct TagCommand { + /// subcommand + #[command(subcommand)] + command: TagCommands, +} + +/// Supported subcommands +#[allow(missing_docs)] +#[derive(Subcommand)] +pub enum TagCommands { + Add(set::TagCommand), + Check(show::TagCommand), + Delete(delete::TagCommand), + List(list::TagsCommand), + Purge(delete_all::TagCommand), +} + +impl TagCommand { + /// Perform command action + pub async fn take_action( + &self, + parsed_args: &C, + session: &mut AsyncOpenStack, + ) -> Result<(), OpenStackCliError> { + match &self.command { + TagCommands::Add(cmd) => cmd.take_action(parsed_args, session).await, + TagCommands::Check(cmd) => cmd.take_action(parsed_args, session).await, + TagCommands::Delete(cmd) => cmd.take_action(parsed_args, session).await, + TagCommands::List(cmd) => cmd.take_action(parsed_args, session).await, + TagCommands::Purge(cmd) => cmd.take_action(parsed_args, session).await, + } + } +} diff --git a/openstack_cli/src/network/v2/subnetpool/tag/delete.rs b/cli-cmd/network/src/v2/subnetpool/tag/delete.rs similarity index 100% rename from openstack_cli/src/network/v2/subnetpool/tag/delete.rs rename to cli-cmd/network/src/v2/subnetpool/tag/delete.rs diff --git a/openstack_cli/src/network/v2/subnetpool/tag/delete_all.rs b/cli-cmd/network/src/v2/subnetpool/tag/delete_all.rs similarity index 100% rename from openstack_cli/src/network/v2/subnetpool/tag/delete_all.rs rename to cli-cmd/network/src/v2/subnetpool/tag/delete_all.rs diff --git a/openstack_cli/src/network/v2/subnetpool/tag/list.rs b/cli-cmd/network/src/v2/subnetpool/tag/list.rs similarity index 100% rename from openstack_cli/src/network/v2/subnetpool/tag/list.rs rename to cli-cmd/network/src/v2/subnetpool/tag/list.rs diff --git a/openstack_cli/src/network/v2/subnetpool/tag/replace.rs b/cli-cmd/network/src/v2/subnetpool/tag/replace.rs similarity index 100% rename from openstack_cli/src/network/v2/subnetpool/tag/replace.rs rename to cli-cmd/network/src/v2/subnetpool/tag/replace.rs diff --git a/openstack_cli/src/network/v2/subnetpool/tag/set.rs b/cli-cmd/network/src/v2/subnetpool/tag/set.rs similarity index 100% rename from openstack_cli/src/network/v2/subnetpool/tag/set.rs rename to cli-cmd/network/src/v2/subnetpool/tag/set.rs diff --git a/openstack_cli/src/network/v2/subnetpool/tag/show.rs b/cli-cmd/network/src/v2/subnetpool/tag/show.rs similarity index 100% rename from openstack_cli/src/network/v2/subnetpool/tag/show.rs rename to cli-cmd/network/src/v2/subnetpool/tag/show.rs diff --git a/openstack_cli/src/network/v2/trunk/tag/delete.rs b/cli-cmd/network/src/v2/trunk/tag/delete.rs similarity index 100% rename from openstack_cli/src/network/v2/trunk/tag/delete.rs rename to cli-cmd/network/src/v2/trunk/tag/delete.rs diff --git a/openstack_cli/src/network/v2/trunk/tag/delete_all.rs b/cli-cmd/network/src/v2/trunk/tag/delete_all.rs similarity index 100% rename from openstack_cli/src/network/v2/trunk/tag/delete_all.rs rename to cli-cmd/network/src/v2/trunk/tag/delete_all.rs diff --git a/openstack_cli/src/network/v2/trunk/tag/list.rs b/cli-cmd/network/src/v2/trunk/tag/list.rs similarity index 100% rename from openstack_cli/src/network/v2/trunk/tag/list.rs rename to cli-cmd/network/src/v2/trunk/tag/list.rs diff --git a/openstack_cli/src/network/v2/trunk/tag/replace.rs b/cli-cmd/network/src/v2/trunk/tag/replace.rs similarity index 100% rename from openstack_cli/src/network/v2/trunk/tag/replace.rs rename to cli-cmd/network/src/v2/trunk/tag/replace.rs diff --git a/openstack_cli/src/network/v2/trunk/tag/set.rs b/cli-cmd/network/src/v2/trunk/tag/set.rs similarity index 100% rename from openstack_cli/src/network/v2/trunk/tag/set.rs rename to cli-cmd/network/src/v2/trunk/tag/set.rs diff --git a/openstack_cli/src/network/v2/trunk/tag/show.rs b/cli-cmd/network/src/v2/trunk/tag/show.rs similarity index 100% rename from openstack_cli/src/network/v2/trunk/tag/show.rs rename to cli-cmd/network/src/v2/trunk/tag/show.rs diff --git a/openstack_cli/src/network/v2/vpn.rs b/cli-cmd/network/src/v2/vpn.rs similarity index 96% rename from openstack_cli/src/network/v2/vpn.rs rename to cli-cmd/network/src/v2/vpn.rs index efb096fdd..4359a1cd9 100644 --- a/openstack_cli/src/network/v2/vpn.rs +++ b/cli-cmd/network/src/v2/vpn.rs @@ -16,10 +16,9 @@ use clap::{Parser, Subcommand}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; - pub mod endpoint_group; pub mod ikepolicy; pub mod ipsec_site_connection; @@ -89,9 +88,9 @@ pub enum VpnCommands { impl VpnCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/network/v2/vpn/endpoint_group.rs b/cli-cmd/network/src/v2/vpn/endpoint_group.rs similarity index 94% rename from openstack_cli/src/network/v2/vpn/endpoint_group.rs rename to cli-cmd/network/src/v2/vpn/endpoint_group.rs index 4e2d7c1e2..d817c5d79 100644 --- a/openstack_cli/src/network/v2/vpn/endpoint_group.rs +++ b/cli-cmd/network/src/v2/vpn/endpoint_group.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; pub mod create; pub mod delete; @@ -50,9 +50,9 @@ pub enum EndpointGroupCommands { impl EndpointGroupCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/network/v2/vpn/endpoint_group/create.rs b/cli-cmd/network/src/v2/vpn/endpoint_group/create.rs similarity index 100% rename from openstack_cli/src/network/v2/vpn/endpoint_group/create.rs rename to cli-cmd/network/src/v2/vpn/endpoint_group/create.rs diff --git a/openstack_cli/src/network/v2/vpn/endpoint_group/delete.rs b/cli-cmd/network/src/v2/vpn/endpoint_group/delete.rs similarity index 100% rename from openstack_cli/src/network/v2/vpn/endpoint_group/delete.rs rename to cli-cmd/network/src/v2/vpn/endpoint_group/delete.rs diff --git a/openstack_cli/src/network/v2/vpn/endpoint_group/list.rs b/cli-cmd/network/src/v2/vpn/endpoint_group/list.rs similarity index 100% rename from openstack_cli/src/network/v2/vpn/endpoint_group/list.rs rename to cli-cmd/network/src/v2/vpn/endpoint_group/list.rs diff --git a/openstack_cli/src/network/v2/vpn/endpoint_group/set.rs b/cli-cmd/network/src/v2/vpn/endpoint_group/set.rs similarity index 100% rename from openstack_cli/src/network/v2/vpn/endpoint_group/set.rs rename to cli-cmd/network/src/v2/vpn/endpoint_group/set.rs diff --git a/openstack_cli/src/network/v2/vpn/endpoint_group/show.rs b/cli-cmd/network/src/v2/vpn/endpoint_group/show.rs similarity index 100% rename from openstack_cli/src/network/v2/vpn/endpoint_group/show.rs rename to cli-cmd/network/src/v2/vpn/endpoint_group/show.rs diff --git a/openstack_cli/src/network/v2/vpn/ikepolicy.rs b/cli-cmd/network/src/v2/vpn/ikepolicy.rs similarity index 93% rename from openstack_cli/src/network/v2/vpn/ikepolicy.rs rename to cli-cmd/network/src/v2/vpn/ikepolicy.rs index 18b64e2af..628be36ab 100644 --- a/openstack_cli/src/network/v2/vpn/ikepolicy.rs +++ b/cli-cmd/network/src/v2/vpn/ikepolicy.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; pub mod create; pub mod delete; @@ -48,9 +48,9 @@ pub enum IkepolicyCommands { impl IkepolicyCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/network/v2/vpn/ikepolicy/create.rs b/cli-cmd/network/src/v2/vpn/ikepolicy/create.rs similarity index 100% rename from openstack_cli/src/network/v2/vpn/ikepolicy/create.rs rename to cli-cmd/network/src/v2/vpn/ikepolicy/create.rs diff --git a/openstack_cli/src/network/v2/vpn/ikepolicy/delete.rs b/cli-cmd/network/src/v2/vpn/ikepolicy/delete.rs similarity index 100% rename from openstack_cli/src/network/v2/vpn/ikepolicy/delete.rs rename to cli-cmd/network/src/v2/vpn/ikepolicy/delete.rs diff --git a/openstack_cli/src/network/v2/vpn/ikepolicy/list.rs b/cli-cmd/network/src/v2/vpn/ikepolicy/list.rs similarity index 100% rename from openstack_cli/src/network/v2/vpn/ikepolicy/list.rs rename to cli-cmd/network/src/v2/vpn/ikepolicy/list.rs diff --git a/openstack_cli/src/network/v2/vpn/ikepolicy/set.rs b/cli-cmd/network/src/v2/vpn/ikepolicy/set.rs similarity index 100% rename from openstack_cli/src/network/v2/vpn/ikepolicy/set.rs rename to cli-cmd/network/src/v2/vpn/ikepolicy/set.rs diff --git a/openstack_cli/src/network/v2/vpn/ikepolicy/show.rs b/cli-cmd/network/src/v2/vpn/ikepolicy/show.rs similarity index 100% rename from openstack_cli/src/network/v2/vpn/ikepolicy/show.rs rename to cli-cmd/network/src/v2/vpn/ikepolicy/show.rs diff --git a/openstack_cli/src/network/v2/vpn/ipsec_site_connection.rs b/cli-cmd/network/src/v2/vpn/ipsec_site_connection.rs similarity index 94% rename from openstack_cli/src/network/v2/vpn/ipsec_site_connection.rs rename to cli-cmd/network/src/v2/vpn/ipsec_site_connection.rs index 77bd78451..13c84028d 100644 --- a/openstack_cli/src/network/v2/vpn/ipsec_site_connection.rs +++ b/cli-cmd/network/src/v2/vpn/ipsec_site_connection.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; pub mod create; pub mod delete; @@ -48,9 +48,9 @@ pub enum IpsecSiteConnectionCommands { impl IpsecSiteConnectionCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/network/v2/vpn/ipsec_site_connection/create.rs b/cli-cmd/network/src/v2/vpn/ipsec_site_connection/create.rs similarity index 100% rename from openstack_cli/src/network/v2/vpn/ipsec_site_connection/create.rs rename to cli-cmd/network/src/v2/vpn/ipsec_site_connection/create.rs diff --git a/openstack_cli/src/network/v2/vpn/ipsec_site_connection/delete.rs b/cli-cmd/network/src/v2/vpn/ipsec_site_connection/delete.rs similarity index 100% rename from openstack_cli/src/network/v2/vpn/ipsec_site_connection/delete.rs rename to cli-cmd/network/src/v2/vpn/ipsec_site_connection/delete.rs diff --git a/openstack_cli/src/network/v2/vpn/ipsec_site_connection/list.rs b/cli-cmd/network/src/v2/vpn/ipsec_site_connection/list.rs similarity index 100% rename from openstack_cli/src/network/v2/vpn/ipsec_site_connection/list.rs rename to cli-cmd/network/src/v2/vpn/ipsec_site_connection/list.rs diff --git a/openstack_cli/src/network/v2/vpn/ipsec_site_connection/set.rs b/cli-cmd/network/src/v2/vpn/ipsec_site_connection/set.rs similarity index 100% rename from openstack_cli/src/network/v2/vpn/ipsec_site_connection/set.rs rename to cli-cmd/network/src/v2/vpn/ipsec_site_connection/set.rs diff --git a/openstack_cli/src/network/v2/vpn/ipsec_site_connection/show.rs b/cli-cmd/network/src/v2/vpn/ipsec_site_connection/show.rs similarity index 100% rename from openstack_cli/src/network/v2/vpn/ipsec_site_connection/show.rs rename to cli-cmd/network/src/v2/vpn/ipsec_site_connection/show.rs diff --git a/openstack_cli/src/network/v2/vpn/ipsecpolicy.rs b/cli-cmd/network/src/v2/vpn/ipsecpolicy.rs similarity index 93% rename from openstack_cli/src/network/v2/vpn/ipsecpolicy.rs rename to cli-cmd/network/src/v2/vpn/ipsecpolicy.rs index f04dd2e28..d0a301338 100644 --- a/openstack_cli/src/network/v2/vpn/ipsecpolicy.rs +++ b/cli-cmd/network/src/v2/vpn/ipsecpolicy.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; pub mod create; pub mod delete; @@ -48,9 +48,9 @@ pub enum IpsecpolicyCommands { impl IpsecpolicyCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/network/v2/vpn/ipsecpolicy/create.rs b/cli-cmd/network/src/v2/vpn/ipsecpolicy/create.rs similarity index 100% rename from openstack_cli/src/network/v2/vpn/ipsecpolicy/create.rs rename to cli-cmd/network/src/v2/vpn/ipsecpolicy/create.rs diff --git a/openstack_cli/src/network/v2/vpn/ipsecpolicy/delete.rs b/cli-cmd/network/src/v2/vpn/ipsecpolicy/delete.rs similarity index 100% rename from openstack_cli/src/network/v2/vpn/ipsecpolicy/delete.rs rename to cli-cmd/network/src/v2/vpn/ipsecpolicy/delete.rs diff --git a/openstack_cli/src/network/v2/vpn/ipsecpolicy/list.rs b/cli-cmd/network/src/v2/vpn/ipsecpolicy/list.rs similarity index 100% rename from openstack_cli/src/network/v2/vpn/ipsecpolicy/list.rs rename to cli-cmd/network/src/v2/vpn/ipsecpolicy/list.rs diff --git a/openstack_cli/src/network/v2/vpn/ipsecpolicy/set.rs b/cli-cmd/network/src/v2/vpn/ipsecpolicy/set.rs similarity index 100% rename from openstack_cli/src/network/v2/vpn/ipsecpolicy/set.rs rename to cli-cmd/network/src/v2/vpn/ipsecpolicy/set.rs diff --git a/openstack_cli/src/network/v2/vpn/ipsecpolicy/show.rs b/cli-cmd/network/src/v2/vpn/ipsecpolicy/show.rs similarity index 100% rename from openstack_cli/src/network/v2/vpn/ipsecpolicy/show.rs rename to cli-cmd/network/src/v2/vpn/ipsecpolicy/show.rs diff --git a/openstack_cli/src/network/v2/vpn/vpnservice.rs b/cli-cmd/network/src/v2/vpn/vpnservice.rs similarity index 93% rename from openstack_cli/src/network/v2/vpn/vpnservice.rs rename to cli-cmd/network/src/v2/vpn/vpnservice.rs index 77a3f2c9b..aac2cc9ed 100644 --- a/openstack_cli/src/network/v2/vpn/vpnservice.rs +++ b/cli-cmd/network/src/v2/vpn/vpnservice.rs @@ -18,7 +18,7 @@ use clap::{Parser, Subcommand}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; pub mod create; pub mod delete; @@ -47,9 +47,9 @@ pub enum VpnserviceCommands { impl VpnserviceCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/network/v2/vpn/vpnservice/create.rs b/cli-cmd/network/src/v2/vpn/vpnservice/create.rs similarity index 100% rename from openstack_cli/src/network/v2/vpn/vpnservice/create.rs rename to cli-cmd/network/src/v2/vpn/vpnservice/create.rs diff --git a/openstack_cli/src/network/v2/vpn/vpnservice/delete.rs b/cli-cmd/network/src/v2/vpn/vpnservice/delete.rs similarity index 100% rename from openstack_cli/src/network/v2/vpn/vpnservice/delete.rs rename to cli-cmd/network/src/v2/vpn/vpnservice/delete.rs diff --git a/openstack_cli/src/network/v2/vpn/vpnservice/list.rs b/cli-cmd/network/src/v2/vpn/vpnservice/list.rs similarity index 100% rename from openstack_cli/src/network/v2/vpn/vpnservice/list.rs rename to cli-cmd/network/src/v2/vpn/vpnservice/list.rs diff --git a/openstack_cli/src/network/v2/vpn/vpnservice/set.rs b/cli-cmd/network/src/v2/vpn/vpnservice/set.rs similarity index 100% rename from openstack_cli/src/network/v2/vpn/vpnservice/set.rs rename to cli-cmd/network/src/v2/vpn/vpnservice/set.rs diff --git a/openstack_cli/src/network/v2/vpn/vpnservice/show.rs b/cli-cmd/network/src/v2/vpn/vpnservice/show.rs similarity index 100% rename from openstack_cli/src/network/v2/vpn/vpnservice/show.rs rename to cli-cmd/network/src/v2/vpn/vpnservice/show.rs diff --git a/cli-cmd/object-store/Cargo.toml b/cli-cmd/object-store/Cargo.toml new file mode 100644 index 000000000..d33299f77 --- /dev/null +++ b/cli-cmd/object-store/Cargo.toml @@ -0,0 +1,28 @@ +[package] +name = "openstack-cli-object-store" +description = "OpenStack CLI Object Storage commands" +version = "0.1.0" +license.workspace = true +edition.workspace = true +authors.workspace = true +rust-version.workspace = true +homepage.workspace = true +repository.workspace = true + +[dependencies] +bytes.workspace = true +clap = { workspace = true } +openstack-cli-core = { version = "0.13", path = "../../cli-core/" } +openstack_sdk = { path="../../openstack_sdk", version = "^0.22", default-features = false, features = ["async", "object_store"] } +openstack-sdk-core = { path="../../sdk-core", version = "^0.22" } +openstack_types = { path="../../openstack_types", version = "^0.22" } +eyre = { workspace = true } +http = { workspace = true } +regex.workspace = true +serde.workspace = true +serde_json = {workspace = true} +structable.workspace = true +tracing = { workspace = true} + +[lints] +workspace = true diff --git a/openstack_cli/src/object_store/mod.rs b/cli-cmd/object-store/src/lib.rs similarity index 95% rename from openstack_cli/src/object_store/mod.rs rename to cli-cmd/object-store/src/lib.rs index 6e7a9d974..162bd2a59 100644 --- a/openstack_cli/src/object_store/mod.rs +++ b/cli-cmd/object-store/src/lib.rs @@ -12,6 +12,5 @@ // // SPDX-License-Identifier: Apache-2.0 -//! Object store service - +//! Object Store commands pub mod v1; diff --git a/openstack_cli/src/object_store/v1.rs b/cli-cmd/object-store/src/v1.rs similarity index 92% rename from openstack_cli/src/object_store/v1.rs rename to cli-cmd/object-store/src/v1.rs index 9734cdb1d..c33a38367 100644 --- a/openstack_cli/src/object_store/v1.rs +++ b/cli-cmd/object-store/src/v1.rs @@ -16,10 +16,9 @@ use clap::{Parser, Subcommand}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; - pub mod account; pub mod container; pub mod object; @@ -43,9 +42,9 @@ pub enum ObjectStoreCommands { impl ObjectStoreCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/object_store/v1/account.rs b/cli-cmd/object-store/src/v1/account.rs similarity index 91% rename from openstack_cli/src/object_store/v1/account.rs rename to cli-cmd/object-store/src/v1/account.rs index 35b79c83f..ff6bf3e33 100644 --- a/openstack_cli/src/object_store/v1/account.rs +++ b/cli-cmd/object-store/src/v1/account.rs @@ -15,10 +15,9 @@ //! Object Store `account` command with subcommands use clap::{Parser, Subcommand}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; - pub mod set; pub mod show; @@ -39,9 +38,9 @@ pub enum AccountCommands { impl AccountCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/object_store/v1/account/set.rs b/cli-cmd/object-store/src/v1/account/set.rs similarity index 95% rename from openstack_cli/src/object_store/v1/account/set.rs rename to cli-cmd/object-store/src/v1/account/set.rs index f57f7225b..7e761c728 100644 --- a/openstack_cli/src/object_store/v1/account/set.rs +++ b/cli-cmd/object-store/src/v1/account/set.rs @@ -36,22 +36,19 @@ use serde::{Deserialize, Serialize}; use std::collections::HashMap; use tracing::info; -use crate::Cli; -use crate::OpenStackCliError; -use crate::output::OutputProcessor; -use structable::{StructTable, StructTableOptions}; - +use openstack_cli_core::cli::CliArgs; +use openstack_cli_core::common::HashMapStringString; +use openstack_cli_core::common::parse_key_val; +use openstack_cli_core::error::OpenStackCliError; +use openstack_cli_core::output::OutputProcessor; +use openstack_sdk::api::object_store::v1::account::head::Request as GetRequest; +use openstack_sdk::api::object_store::v1::account::set::Request; use openstack_sdk::{ AsyncOpenStack, - api::RestClient, + api::{RawQueryAsync, RestClient}, types::{ApiVersion, ServiceType}, }; - -use crate::common::HashMapStringString; -use crate::common::parse_key_val; -use openstack_sdk::api::RawQueryAsync; -use openstack_sdk::api::object_store::v1::account::head::Request as GetRequest; -use openstack_sdk::api::object_store::v1::account::set::Request; +use structable::{StructTable, StructTableOptions}; /// Creates, updates, or deletes account metadata. /// To create, update, or delete custom metadata, use the X-Account-Meta-{name} @@ -80,9 +77,9 @@ pub struct Account {} impl AccountCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, client: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { info!("Post Account with {:?}", self); diff --git a/openstack_cli/src/object_store/v1/account/show.rs b/cli-cmd/object-store/src/v1/account/show.rs similarity index 93% rename from openstack_cli/src/object_store/v1/account/show.rs rename to cli-cmd/object-store/src/v1/account/show.rs index 3c49a37d5..08201e8a5 100644 --- a/openstack_cli/src/object_store/v1/account/show.rs +++ b/cli-cmd/object-store/src/v1/account/show.rs @@ -18,28 +18,26 @@ //! convert it to a 64-bit unsigned integer if your platform supports that //! primitive type. //! Do not include metadata headers in this request. +use std::collections::HashMap; + use bytes::Bytes; use clap::Args; use eyre::{WrapErr, eyre}; use http::Response; use regex::Regex; -use std::collections::HashMap; use tracing::info; -use crate::Cli; -use crate::OpenStackCliError; -use crate::output::OutputProcessor; - +use openstack_cli_core::cli::CliArgs; +use openstack_cli_core::common::HashMapStringString; +use openstack_cli_core::error::OpenStackCliError; +use openstack_cli_core::output::OutputProcessor; +use openstack_sdk::api::object_store::v1::account::head::Request; use openstack_sdk::{ AsyncOpenStack, - api::RestClient, + api::{RawQueryAsync, RestClient}, types::{ApiVersion, ServiceType}, }; -use crate::common::HashMapStringString; -use openstack_sdk::api::RawQueryAsync; -use openstack_sdk::api::object_store::v1::account::head::Request; - /// Shows metadata for an account. /// Because the storage system can store large amounts of data, take care when /// you represent the total bytes response as an integer; when possible, @@ -51,9 +49,9 @@ pub struct AccountCommand {} impl AccountCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, client: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { info!("Head Account with {:?}", self); diff --git a/openstack_cli/src/object_store/v1/container.rs b/cli-cmd/object-store/src/v1/container.rs similarity index 93% rename from openstack_cli/src/object_store/v1/container.rs rename to cli-cmd/object-store/src/v1/container.rs index 93b965bbf..9561aaf6c 100644 --- a/openstack_cli/src/object_store/v1/container.rs +++ b/cli-cmd/object-store/src/v1/container.rs @@ -15,10 +15,9 @@ //! Object Store `container` command with subcommands use clap::{Parser, Subcommand}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; - pub mod create; pub mod delete; pub mod list; @@ -46,9 +45,9 @@ pub enum ContainerCommands { impl ContainerCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/object_store/v1/container/create.rs b/cli-cmd/object-store/src/v1/container/create.rs similarity index 94% rename from openstack_cli/src/object_store/v1/container/create.rs rename to cli-cmd/object-store/src/v1/container/create.rs index f783d2d69..103a2dbdf 100644 --- a/openstack_cli/src/object_store/v1/container/create.rs +++ b/cli-cmd/object-store/src/v1/container/create.rs @@ -16,29 +16,27 @@ //! You do not need to check whether a container already exists before issuing //! a PUT operation because the operation is idempotent: It creates a container //! or updates an existing container, as appropriate. +use std::collections::HashMap; + use bytes::Bytes; use clap::Args; use eyre::{WrapErr, eyre}; use http::Response; use regex::Regex; -use std::collections::HashMap; use tracing::info; -use crate::Cli; -use crate::OpenStackCliError; -use crate::output::OutputProcessor; - +use openstack_cli_core::cli::CliArgs; +use openstack_cli_core::common::HashMapStringString; +use openstack_cli_core::error::OpenStackCliError; +use openstack_cli_core::output::OutputProcessor; +use openstack_sdk::api::object_store::v1::container::create::Request; +use openstack_sdk::api::object_store::v1::container::head::Request as GetRequest; use openstack_sdk::{ AsyncOpenStack, - api::RestClient, + api::{RawQueryAsync, RestClient}, types::{ApiVersion, ServiceType}, }; -use crate::common::HashMapStringString; -use openstack_sdk::api::RawQueryAsync; -use openstack_sdk::api::object_store::v1::container::create::Request; -use openstack_sdk::api::object_store::v1::container::head::Request as GetRequest; - /// Creates a container. /// You do not need to check whether a container already exists before issuing /// a PUT operation because the operation is idempotent: It creates a container @@ -58,9 +56,9 @@ pub struct ContainerCommand { impl ContainerCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, client: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { info!("Put Container with {:?}", self); diff --git a/openstack_cli/src/object_store/v1/container/delete.rs b/cli-cmd/object-store/src/v1/container/delete.rs similarity index 92% rename from openstack_cli/src/object_store/v1/container/delete.rs rename to cli-cmd/object-store/src/v1/container/delete.rs index a2b491199..bf81c31db 100644 --- a/openstack_cli/src/object_store/v1/container/delete.rs +++ b/cli-cmd/object-store/src/v1/container/delete.rs @@ -22,19 +22,16 @@ use http::Response; use serde::{Deserialize, Serialize}; use tracing::info; -use crate::Cli; -use crate::OpenStackCliError; -use crate::output::OutputProcessor; -use structable::{StructTable, StructTableOptions}; - +use openstack_cli_core::cli::CliArgs; +use openstack_cli_core::error::OpenStackCliError; +use openstack_cli_core::output::OutputProcessor; +use openstack_sdk::api::object_store::v1::container::delete::Request; use openstack_sdk::{ AsyncOpenStack, - api::RestClient, + api::{RawQueryAsync, RestClient}, types::{ApiVersion, ServiceType}, }; - -use openstack_sdk::api::RawQueryAsync; -use openstack_sdk::api::object_store::v1::container::delete::Request; +use structable::{StructTable, StructTableOptions}; /// Deletes an empty container. /// This operation fails unless the container is empty. An empty container has @@ -58,9 +55,9 @@ pub struct Container {} impl ContainerCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, client: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { info!("Delete Container with {:?}", self); diff --git a/openstack_cli/src/object_store/v1/container/list.rs b/cli-cmd/object-store/src/v1/container/list.rs similarity index 96% rename from openstack_cli/src/object_store/v1/container/list.rs rename to cli-cmd/object-store/src/v1/container/list.rs index cc594be0e..c2c09832e 100644 --- a/openstack_cli/src/object_store/v1/container/list.rs +++ b/cli-cmd/object-store/src/v1/container/list.rs @@ -19,20 +19,18 @@ use eyre::eyre; use serde::{Deserialize, Serialize}; use tracing::info; -use crate::Cli; -use crate::OpenStackCliError; -use crate::output::OutputProcessor; -use structable::{StructTable, StructTableOptions}; - +use openstack_cli_core::cli::CliArgs; +use openstack_cli_core::error::OpenStackCliError; +use openstack_cli_core::output::OutputProcessor; +use openstack_sdk::api::QueryAsync; +use openstack_sdk::api::object_store::v1::account::get::Request; +use openstack_sdk::api::{Pagination, paged}; use openstack_sdk::{ AsyncOpenStack, api::RestClient, types::{ApiVersion, ServiceType}, }; - -use openstack_sdk::api::QueryAsync; -use openstack_sdk::api::object_store::v1::account::get::Request; -use openstack_sdk::api::{Pagination, paged}; +use structable::{StructTable, StructTableOptions}; /// Shows details for an account and lists containers, sorted by name, in the /// account. @@ -108,9 +106,9 @@ pub struct Containers { impl ContainersCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, client: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { info!("Get Containers with {:?}", self); diff --git a/openstack_cli/src/object_store/v1/container/prune.rs b/cli-cmd/object-store/src/v1/container/prune.rs similarity index 92% rename from openstack_cli/src/object_store/v1/container/prune.rs rename to cli-cmd/object-store/src/v1/container/prune.rs index 942923342..da986ae16 100644 --- a/openstack_cli/src/object_store/v1/container/prune.rs +++ b/cli-cmd/object-store/src/v1/container/prune.rs @@ -17,18 +17,16 @@ use clap::Args; use eyre::eyre; use tracing::info; -use crate::Cli; -use crate::OpenStackCliError; -use crate::output::OutputProcessor; - +use openstack_cli_core::cli::CliArgs; +use openstack_cli_core::error::OpenStackCliError; +use openstack_cli_core::output::OutputProcessor; +use openstack_sdk::api::object_store::v1::container::prune::PruneAsyncExt; use openstack_sdk::{ AsyncOpenStack, api::RestClient, types::{ApiVersion, ServiceType}, }; -use openstack_sdk::api::object_store::v1::container::prune::PruneAsyncExt; - /// Prune objects in a container. #[derive(Args, Clone, Debug)] pub struct ContainerCommand { @@ -47,9 +45,9 @@ pub struct ContainerCommand { impl ContainerCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, client: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { info!("Prune Container with {:?}", self); diff --git a/openstack_cli/src/object_store/v1/container/set.rs b/cli-cmd/object-store/src/v1/container/set.rs similarity index 95% rename from openstack_cli/src/object_store/v1/container/set.rs rename to cli-cmd/object-store/src/v1/container/set.rs index 0939432b2..01a2d0703 100644 --- a/openstack_cli/src/object_store/v1/container/set.rs +++ b/cli-cmd/object-store/src/v1/container/set.rs @@ -22,22 +22,20 @@ use regex::Regex; use std::collections::HashMap; use tracing::info; -use crate::Cli; -use crate::OpenStackCliError; -use crate::output::OutputProcessor; - +use openstack_cli_core::cli::CliArgs; +use openstack_cli_core::common::HashMapStringString; +use openstack_cli_core::common::parse_key_val; +use openstack_cli_core::error::OpenStackCliError; +use openstack_cli_core::output::OutputProcessor; +use openstack_sdk::api::RawQueryAsync; +use openstack_sdk::api::object_store::v1::container::head::Request as GetRequest; +use openstack_sdk::api::object_store::v1::container::set::Request; use openstack_sdk::{ AsyncOpenStack, api::RestClient, types::{ApiVersion, ServiceType}, }; -use crate::common::HashMapStringString; -use crate::common::parse_key_val; -use openstack_sdk::api::RawQueryAsync; -use openstack_sdk::api::object_store::v1::container::head::Request as GetRequest; -use openstack_sdk::api::object_store::v1::container::set::Request; - /// Creates, updates, or deletes custom metadata for a container. #[derive(Args, Clone, Debug)] pub struct ContainerCommand { @@ -58,9 +56,9 @@ pub struct ContainerCommand { impl ContainerCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, client: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { info!("Post Container with {:?}", self); diff --git a/openstack_cli/src/object_store/v1/container/show.rs b/cli-cmd/object-store/src/v1/container/show.rs similarity index 94% rename from openstack_cli/src/object_store/v1/container/show.rs rename to cli-cmd/object-store/src/v1/container/show.rs index 66026dfb5..6f3cf10b0 100644 --- a/openstack_cli/src/object_store/v1/container/show.rs +++ b/cli-cmd/object-store/src/v1/container/show.rs @@ -14,28 +14,27 @@ //! Shows container metadata, including the number of objects and the total //! bytes of all objects stored in the container. +use std::collections::HashMap; + use bytes::Bytes; use clap::Args; use eyre::{WrapErr, eyre}; use http::Response; use regex::Regex; -use std::collections::HashMap; use tracing::info; -use crate::Cli; -use crate::OpenStackCliError; -use crate::output::OutputProcessor; - +use openstack_cli_core::cli::CliArgs; +use openstack_cli_core::common::HashMapStringString; +use openstack_cli_core::error::OpenStackCliError; +use openstack_cli_core::output::OutputProcessor; +use openstack_sdk::api::RawQueryAsync; +use openstack_sdk::api::object_store::v1::container::head::Request; use openstack_sdk::{ AsyncOpenStack, api::RestClient, types::{ApiVersion, ServiceType}, }; -use crate::common::HashMapStringString; -use openstack_sdk::api::RawQueryAsync; -use openstack_sdk::api::object_store::v1::container::head::Request; - /// Shows container metadata, including the number of objects and the total /// bytes of all objects stored in the container. #[derive(Args, Clone, Debug)] @@ -53,9 +52,9 @@ pub struct ContainerCommand { impl ContainerCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, client: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { info!("Head Container with {:?}", self); diff --git a/openstack_cli/src/object_store/v1/object.rs b/cli-cmd/object-store/src/v1/object.rs similarity index 93% rename from openstack_cli/src/object_store/v1/object.rs rename to cli-cmd/object-store/src/v1/object.rs index 0df90a7cc..c1841eddc 100644 --- a/openstack_cli/src/object_store/v1/object.rs +++ b/cli-cmd/object-store/src/v1/object.rs @@ -15,10 +15,9 @@ //! use clap::{Parser, Subcommand}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; - pub mod delete; pub mod download; pub mod list; @@ -46,9 +45,9 @@ pub enum ObjectCommands { impl ObjectCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/object_store/v1/object/delete.rs b/cli-cmd/object-store/src/v1/object/delete.rs similarity index 95% rename from openstack_cli/src/object_store/v1/object/delete.rs rename to cli-cmd/object-store/src/v1/object/delete.rs index 683c57e50..1dfe6927c 100644 --- a/openstack_cli/src/object_store/v1/object/delete.rs +++ b/cli-cmd/object-store/src/v1/object/delete.rs @@ -29,19 +29,17 @@ use http::Response; use serde::{Deserialize, Serialize}; use tracing::info; -use crate::Cli; -use crate::OpenStackCliError; -use crate::output::OutputProcessor; -use structable::{StructTable, StructTableOptions}; - +use openstack_cli_core::cli::CliArgs; +use openstack_cli_core::error::OpenStackCliError; +use openstack_cli_core::output::OutputProcessor; +use openstack_sdk::api::RawQueryAsync; +use openstack_sdk::api::object_store::v1::object::delete::Request; use openstack_sdk::{ AsyncOpenStack, api::RestClient, types::{ApiVersion, ServiceType}, }; - -use openstack_sdk::api::RawQueryAsync; -use openstack_sdk::api::object_store::v1::object::delete::Request; +use structable::{StructTable, StructTableOptions}; /// Permanently deletes an object from the object store. /// Object deletion occurs immediately at request time. Any subsequent GET, @@ -79,9 +77,9 @@ pub struct Object {} impl ObjectCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, client: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { info!("Delete Object with {:?}", self); diff --git a/openstack_cli/src/object_store/v1/object/download.rs b/cli-cmd/object-store/src/v1/object/download.rs similarity index 95% rename from openstack_cli/src/object_store/v1/object/download.rs rename to cli-cmd/object-store/src/v1/object/download.rs index dec605c47..8b8c5292f 100644 --- a/openstack_cli/src/object_store/v1/object/download.rs +++ b/cli-cmd/object-store/src/v1/object/download.rs @@ -21,20 +21,18 @@ use eyre::eyre; use serde::{Deserialize, Serialize}; use tracing::{info, warn}; -use crate::Cli; -use crate::OpenStackCliError; -use crate::output::OutputProcessor; -use structable::{StructTable, StructTableOptions}; - +use openstack_cli_core::cli::CliArgs; +use openstack_cli_core::common::download_file; +use openstack_cli_core::error::OpenStackCliError; +use openstack_cli_core::output::OutputProcessor; +use openstack_sdk::api::RawQueryAsync; +use openstack_sdk::api::object_store::v1::object::get::Request; use openstack_sdk::{ AsyncOpenStack, api::RestClient, types::{ApiVersion, ServiceType}, }; - -use crate::common::download_file; -use openstack_sdk::api::RawQueryAsync; -use openstack_sdk::api::object_store::v1::object::get::Request; +use structable::{StructTable, StructTableOptions}; /// Downloads the object content and gets the object metadata. /// This operation returns the object metadata in the response headers and the @@ -100,9 +98,9 @@ pub struct Object {} impl ObjectCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, client: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { info!("Get Object with {:?}", self); diff --git a/openstack_cli/src/object_store/v1/object/list.rs b/cli-cmd/object-store/src/v1/object/list.rs similarity index 97% rename from openstack_cli/src/object_store/v1/object/list.rs rename to cli-cmd/object-store/src/v1/object/list.rs index 4d3c3da96..64bfe32b7 100644 --- a/openstack_cli/src/object_store/v1/object/list.rs +++ b/cli-cmd/object-store/src/v1/object/list.rs @@ -24,20 +24,18 @@ use eyre::eyre; use serde::{Deserialize, Serialize}; use tracing::info; -use crate::Cli; -use crate::OpenStackCliError; -use crate::output::OutputProcessor; -use structable::{StructTable, StructTableOptions}; - +use openstack_cli_core::cli::CliArgs; +use openstack_cli_core::error::OpenStackCliError; +use openstack_cli_core::output::OutputProcessor; +use openstack_sdk::api::QueryAsync; +use openstack_sdk::api::object_store::v1::container::get::Request; +use openstack_sdk::api::{Pagination, paged}; use openstack_sdk::{ AsyncOpenStack, api::RestClient, types::{ApiVersion, ServiceType}, }; - -use openstack_sdk::api::QueryAsync; -use openstack_sdk::api::object_store::v1::container::get::Request; -use openstack_sdk::api::{Pagination, paged}; +use structable::{StructTable, StructTableOptions}; /// Shows details for a container and lists objects, sorted by name, in the /// container. @@ -138,9 +136,9 @@ pub struct Object { impl ObjectsCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, client: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { info!("Get Objects with {:?}", self); diff --git a/openstack_cli/src/object_store/v1/object/show.rs b/cli-cmd/object-store/src/v1/object/show.rs similarity index 96% rename from openstack_cli/src/object_store/v1/object/show.rs rename to cli-cmd/object-store/src/v1/object/show.rs index c4a08e502..e81f83285 100644 --- a/openstack_cli/src/object_store/v1/object/show.rs +++ b/cli-cmd/object-store/src/v1/object/show.rs @@ -21,20 +21,18 @@ use regex::Regex; use std::collections::HashMap; use tracing::info; -use crate::Cli; -use crate::OpenStackCliError; -use crate::output::OutputProcessor; - +use openstack_cli_core::cli::CliArgs; +use openstack_cli_core::common::HashMapStringString; +use openstack_cli_core::error::OpenStackCliError; +use openstack_cli_core::output::OutputProcessor; +use openstack_sdk::api::RawQueryAsync; +use openstack_sdk::api::object_store::v1::object::head::Request; use openstack_sdk::{ AsyncOpenStack, api::RestClient, types::{ApiVersion, ServiceType}, }; -use crate::common::HashMapStringString; -use openstack_sdk::api::RawQueryAsync; -use openstack_sdk::api::object_store::v1::object::head::Request; - /// Shows object metadata. #[derive(Args, Clone, Debug)] pub struct ObjectCommand { @@ -89,9 +87,9 @@ pub struct ObjectCommand { impl ObjectCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, client: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { info!("Head Object with {:?}", self); diff --git a/openstack_cli/src/object_store/v1/object/upload.rs b/cli-cmd/object-store/src/v1/object/upload.rs similarity index 96% rename from openstack_cli/src/object_store/v1/object/upload.rs rename to cli-cmd/object-store/src/v1/object/upload.rs index bd23be863..ecaed7580 100644 --- a/openstack_cli/src/object_store/v1/object/upload.rs +++ b/cli-cmd/object-store/src/v1/object/upload.rs @@ -35,20 +35,18 @@ use http::Response; use serde::{Deserialize, Serialize}; use tracing::info; -use crate::Cli; -use crate::OpenStackCliError; -use crate::output::OutputProcessor; -use structable::{StructTable, StructTableOptions}; - +use openstack_cli_core::cli::CliArgs; +use openstack_cli_core::common::build_upload_asyncread; +use openstack_cli_core::error::OpenStackCliError; +use openstack_cli_core::output::OutputProcessor; +use openstack_sdk::api::RawQueryAsync; +use openstack_sdk::api::object_store::v1::object::put::Request; use openstack_sdk::{ AsyncOpenStack, api::RestClient, types::{ApiVersion, ServiceType}, }; - -use crate::common::build_upload_asyncread; -use openstack_sdk::api::RawQueryAsync; -use openstack_sdk::api::object_store::v1::object::put::Request; +use structable::{StructTable, StructTableOptions}; /// Creates an object with data content and metadata, or replaces an existing /// object with data content and metadata. @@ -127,9 +125,9 @@ pub struct Object {} impl ObjectCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, client: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { info!("Put Object with {:?}", self); diff --git a/cli-cmd/placement/Cargo.toml b/cli-cmd/placement/Cargo.toml new file mode 100644 index 000000000..da61f50ba --- /dev/null +++ b/cli-cmd/placement/Cargo.toml @@ -0,0 +1,24 @@ +[package] +name = "openstack-cli-placement" +description = "OpenStack CLI Placement commands" +version = "0.1.0" +license.workspace = true +edition.workspace = true +authors.workspace = true +rust-version.workspace = true +homepage.workspace = true +repository.workspace = true + +[dependencies] +clap = { workspace = true } +openstack-cli-core = { version = "0.13", path = "../../cli-core/" } +openstack_sdk = { path="../../openstack_sdk", version = "^0.22", default-features = false, features = ["async", "identity", "placement"] } +openstack-sdk-core = { path="../../sdk-core", version = "^0.22" } +openstack_types = { path="../../openstack_types", version = "^0.22" } +eyre = { workspace = true } +http = { workspace = true } +serde_json = {workspace = true} +tracing = { workspace = true} + +[lints] +workspace = true diff --git a/openstack_cli/src/placement/mod.rs b/cli-cmd/placement/src/lib.rs similarity index 96% rename from openstack_cli/src/placement/mod.rs rename to cli-cmd/placement/src/lib.rs index 6808d975d..b53782c3f 100644 --- a/openstack_cli/src/placement/mod.rs +++ b/cli-cmd/placement/src/lib.rs @@ -12,6 +12,5 @@ // // SPDX-License-Identifier: Apache-2.0 -//! Placement service - +//! Placement commands. pub mod v1; diff --git a/openstack_cli/src/placement/v1.rs b/cli-cmd/placement/src/v1.rs similarity index 96% rename from openstack_cli/src/placement/v1.rs rename to cli-cmd/placement/src/v1.rs index bf388a28a..91c3fa2e6 100644 --- a/openstack_cli/src/placement/v1.rs +++ b/cli-cmd/placement/src/v1.rs @@ -16,10 +16,9 @@ use clap::{Parser, Subcommand}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; use openstack_sdk::{AsyncOpenStack, types::ServiceType}; -use crate::{Cli, OpenStackCliError}; - pub mod allocation; pub mod allocation_candidate; pub mod reshaper; @@ -68,9 +67,9 @@ pub enum PlacementCommands { impl PlacementCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { session diff --git a/openstack_cli/src/placement/v1/allocation.rs b/cli-cmd/placement/src/v1/allocation.rs similarity index 95% rename from openstack_cli/src/placement/v1/allocation.rs rename to cli-cmd/placement/src/v1/allocation.rs index a03eb88bf..dfda536de 100644 --- a/openstack_cli/src/placement/v1/allocation.rs +++ b/cli-cmd/placement/src/v1/allocation.rs @@ -15,10 +15,9 @@ //! Placement `allocation` command with subcommands use clap::{Parser, Subcommand}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; - pub mod create_113; pub mod create_128; pub mod create_134; @@ -63,9 +62,9 @@ pub enum AllocationCommands { impl AllocationCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/placement/v1/allocation/create_113.rs b/cli-cmd/placement/src/v1/allocation/create_113.rs similarity index 100% rename from openstack_cli/src/placement/v1/allocation/create_113.rs rename to cli-cmd/placement/src/v1/allocation/create_113.rs diff --git a/openstack_cli/src/placement/v1/allocation/create_128.rs b/cli-cmd/placement/src/v1/allocation/create_128.rs similarity index 100% rename from openstack_cli/src/placement/v1/allocation/create_128.rs rename to cli-cmd/placement/src/v1/allocation/create_128.rs diff --git a/openstack_cli/src/placement/v1/allocation/create_134.rs b/cli-cmd/placement/src/v1/allocation/create_134.rs similarity index 100% rename from openstack_cli/src/placement/v1/allocation/create_134.rs rename to cli-cmd/placement/src/v1/allocation/create_134.rs diff --git a/openstack_cli/src/placement/v1/allocation/create_138.rs b/cli-cmd/placement/src/v1/allocation/create_138.rs similarity index 100% rename from openstack_cli/src/placement/v1/allocation/create_138.rs rename to cli-cmd/placement/src/v1/allocation/create_138.rs diff --git a/openstack_cli/src/placement/v1/allocation/delete.rs b/cli-cmd/placement/src/v1/allocation/delete.rs similarity index 100% rename from openstack_cli/src/placement/v1/allocation/delete.rs rename to cli-cmd/placement/src/v1/allocation/delete.rs diff --git a/openstack_cli/src/placement/v1/allocation/set_10.rs b/cli-cmd/placement/src/v1/allocation/set_10.rs similarity index 100% rename from openstack_cli/src/placement/v1/allocation/set_10.rs rename to cli-cmd/placement/src/v1/allocation/set_10.rs diff --git a/openstack_cli/src/placement/v1/allocation/set_112.rs b/cli-cmd/placement/src/v1/allocation/set_112.rs similarity index 100% rename from openstack_cli/src/placement/v1/allocation/set_112.rs rename to cli-cmd/placement/src/v1/allocation/set_112.rs diff --git a/openstack_cli/src/placement/v1/allocation/set_128.rs b/cli-cmd/placement/src/v1/allocation/set_128.rs similarity index 100% rename from openstack_cli/src/placement/v1/allocation/set_128.rs rename to cli-cmd/placement/src/v1/allocation/set_128.rs diff --git a/openstack_cli/src/placement/v1/allocation/set_138.rs b/cli-cmd/placement/src/v1/allocation/set_138.rs similarity index 100% rename from openstack_cli/src/placement/v1/allocation/set_138.rs rename to cli-cmd/placement/src/v1/allocation/set_138.rs diff --git a/openstack_cli/src/placement/v1/allocation/set_18.rs b/cli-cmd/placement/src/v1/allocation/set_18.rs similarity index 100% rename from openstack_cli/src/placement/v1/allocation/set_18.rs rename to cli-cmd/placement/src/v1/allocation/set_18.rs diff --git a/openstack_cli/src/placement/v1/allocation/show.rs b/cli-cmd/placement/src/v1/allocation/show.rs similarity index 100% rename from openstack_cli/src/placement/v1/allocation/show.rs rename to cli-cmd/placement/src/v1/allocation/show.rs diff --git a/openstack_cli/src/placement/v1/allocation_candidate.rs b/cli-cmd/placement/src/v1/allocation_candidate.rs similarity index 91% rename from openstack_cli/src/placement/v1/allocation_candidate.rs rename to cli-cmd/placement/src/v1/allocation_candidate.rs index 7d9f2d8d2..84b433f06 100644 --- a/openstack_cli/src/placement/v1/allocation_candidate.rs +++ b/cli-cmd/placement/src/v1/allocation_candidate.rs @@ -15,10 +15,9 @@ //! Placement `allocation_candidate` command with subcommands use clap::{Parser, Subcommand}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; - pub mod list; /// Allocation candidates @@ -37,9 +36,9 @@ pub enum AllocationCandidateCommands { impl AllocationCandidateCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/placement/v1/allocation_candidate/list.rs b/cli-cmd/placement/src/v1/allocation_candidate/list.rs similarity index 100% rename from openstack_cli/src/placement/v1/allocation_candidate/list.rs rename to cli-cmd/placement/src/v1/allocation_candidate/list.rs diff --git a/openstack_cli/src/placement/v1/reshaper.rs b/cli-cmd/placement/src/v1/reshaper.rs similarity index 91% rename from openstack_cli/src/placement/v1/reshaper.rs rename to cli-cmd/placement/src/v1/reshaper.rs index b9f1b5186..54aeb5d81 100644 --- a/openstack_cli/src/placement/v1/reshaper.rs +++ b/cli-cmd/placement/src/v1/reshaper.rs @@ -15,10 +15,9 @@ //! Placement `reshaper` command with subcommands use clap::{Parser, Subcommand}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; - pub mod create_134; pub mod create_138; @@ -40,9 +39,9 @@ pub enum ReshaperCommands { impl ReshaperCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/placement/v1/reshaper/create_134.rs b/cli-cmd/placement/src/v1/reshaper/create_134.rs similarity index 100% rename from openstack_cli/src/placement/v1/reshaper/create_134.rs rename to cli-cmd/placement/src/v1/reshaper/create_134.rs diff --git a/openstack_cli/src/placement/v1/reshaper/create_138.rs b/cli-cmd/placement/src/v1/reshaper/create_138.rs similarity index 100% rename from openstack_cli/src/placement/v1/reshaper/create_138.rs rename to cli-cmd/placement/src/v1/reshaper/create_138.rs diff --git a/openstack_cli/src/placement/v1/resource_class.rs b/cli-cmd/placement/src/v1/resource_class.rs similarity index 94% rename from openstack_cli/src/placement/v1/resource_class.rs rename to cli-cmd/placement/src/v1/resource_class.rs index d0746dd28..ec54075f1 100644 --- a/openstack_cli/src/placement/v1/resource_class.rs +++ b/cli-cmd/placement/src/v1/resource_class.rs @@ -15,10 +15,9 @@ //! Placement `resource_class` command with subcommands use clap::{Parser, Subcommand}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; - pub mod create; pub mod delete; pub mod list; @@ -50,9 +49,9 @@ pub enum ResourceClassCommands { impl ResourceClassCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/placement/v1/resource_class/create.rs b/cli-cmd/placement/src/v1/resource_class/create.rs similarity index 100% rename from openstack_cli/src/placement/v1/resource_class/create.rs rename to cli-cmd/placement/src/v1/resource_class/create.rs diff --git a/openstack_cli/src/placement/v1/resource_class/delete.rs b/cli-cmd/placement/src/v1/resource_class/delete.rs similarity index 100% rename from openstack_cli/src/placement/v1/resource_class/delete.rs rename to cli-cmd/placement/src/v1/resource_class/delete.rs diff --git a/openstack_cli/src/placement/v1/resource_class/list.rs b/cli-cmd/placement/src/v1/resource_class/list.rs similarity index 100% rename from openstack_cli/src/placement/v1/resource_class/list.rs rename to cli-cmd/placement/src/v1/resource_class/list.rs diff --git a/openstack_cli/src/placement/v1/resource_class/set_17.rs b/cli-cmd/placement/src/v1/resource_class/set_17.rs similarity index 100% rename from openstack_cli/src/placement/v1/resource_class/set_17.rs rename to cli-cmd/placement/src/v1/resource_class/set_17.rs diff --git a/openstack_cli/src/placement/v1/resource_class/show.rs b/cli-cmd/placement/src/v1/resource_class/show.rs similarity index 100% rename from openstack_cli/src/placement/v1/resource_class/show.rs rename to cli-cmd/placement/src/v1/resource_class/show.rs diff --git a/openstack_cli/src/placement/v1/resource_provider.rs b/cli-cmd/placement/src/v1/resource_provider.rs similarity index 96% rename from openstack_cli/src/placement/v1/resource_provider.rs rename to cli-cmd/placement/src/v1/resource_provider.rs index eca742789..d0fd09b13 100644 --- a/openstack_cli/src/placement/v1/resource_provider.rs +++ b/cli-cmd/placement/src/v1/resource_provider.rs @@ -15,10 +15,9 @@ //! Placement `resource_provider` command with subcommands use clap::{Parser, Subcommand}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; - pub mod aggregate; pub mod allocation; pub mod create_10; @@ -65,9 +64,9 @@ pub enum ResourceProviderCommands { impl ResourceProviderCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/placement/v1/resource_provider/aggregate.rs b/cli-cmd/placement/src/v1/resource_provider/aggregate.rs similarity index 96% rename from openstack_cli/src/placement/v1/resource_provider/aggregate.rs rename to cli-cmd/placement/src/v1/resource_provider/aggregate.rs index d49b4faaf..a735bfaec 100644 --- a/openstack_cli/src/placement/v1/resource_provider/aggregate.rs +++ b/cli-cmd/placement/src/v1/resource_provider/aggregate.rs @@ -15,10 +15,9 @@ //! Placement `ResourceProviderAggregate` command with subcommands use clap::{Parser, Subcommand}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; - pub mod list; pub mod set_11; pub mod set_119; @@ -82,9 +81,9 @@ pub enum AggregateCommands { impl AggregateCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/placement/v1/resource_provider/aggregate/list.rs b/cli-cmd/placement/src/v1/resource_provider/aggregate/list.rs similarity index 100% rename from openstack_cli/src/placement/v1/resource_provider/aggregate/list.rs rename to cli-cmd/placement/src/v1/resource_provider/aggregate/list.rs diff --git a/openstack_cli/src/placement/v1/resource_provider/aggregate/set_11.rs b/cli-cmd/placement/src/v1/resource_provider/aggregate/set_11.rs similarity index 100% rename from openstack_cli/src/placement/v1/resource_provider/aggregate/set_11.rs rename to cli-cmd/placement/src/v1/resource_provider/aggregate/set_11.rs diff --git a/openstack_cli/src/placement/v1/resource_provider/aggregate/set_119.rs b/cli-cmd/placement/src/v1/resource_provider/aggregate/set_119.rs similarity index 100% rename from openstack_cli/src/placement/v1/resource_provider/aggregate/set_119.rs rename to cli-cmd/placement/src/v1/resource_provider/aggregate/set_119.rs diff --git a/openstack_cli/src/placement/v1/resource_provider/allocation.rs b/cli-cmd/placement/src/v1/resource_provider/allocation.rs similarity index 90% rename from openstack_cli/src/placement/v1/resource_provider/allocation.rs rename to cli-cmd/placement/src/v1/resource_provider/allocation.rs index f5021a513..36ac8e681 100644 --- a/openstack_cli/src/placement/v1/resource_provider/allocation.rs +++ b/cli-cmd/placement/src/v1/resource_provider/allocation.rs @@ -15,10 +15,9 @@ //! Placement `ResourceProviderAllocation` command with subcommands use clap::{Parser, Subcommand}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; - pub mod list; /// Resource provider allocations @@ -37,9 +36,9 @@ pub enum AllocationCommands { impl AllocationCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/placement/v1/resource_provider/allocation/list.rs b/cli-cmd/placement/src/v1/resource_provider/allocation/list.rs similarity index 100% rename from openstack_cli/src/placement/v1/resource_provider/allocation/list.rs rename to cli-cmd/placement/src/v1/resource_provider/allocation/list.rs diff --git a/openstack_cli/src/placement/v1/resource_provider/create_10.rs b/cli-cmd/placement/src/v1/resource_provider/create_10.rs similarity index 100% rename from openstack_cli/src/placement/v1/resource_provider/create_10.rs rename to cli-cmd/placement/src/v1/resource_provider/create_10.rs diff --git a/openstack_cli/src/placement/v1/resource_provider/create_114.rs b/cli-cmd/placement/src/v1/resource_provider/create_114.rs similarity index 100% rename from openstack_cli/src/placement/v1/resource_provider/create_114.rs rename to cli-cmd/placement/src/v1/resource_provider/create_114.rs diff --git a/openstack_cli/src/placement/v1/resource_provider/delete.rs b/cli-cmd/placement/src/v1/resource_provider/delete.rs similarity index 100% rename from openstack_cli/src/placement/v1/resource_provider/delete.rs rename to cli-cmd/placement/src/v1/resource_provider/delete.rs diff --git a/openstack_cli/src/placement/v1/resource_provider/inventory.rs b/cli-cmd/placement/src/v1/resource_provider/inventory.rs similarity index 94% rename from openstack_cli/src/placement/v1/resource_provider/inventory.rs rename to cli-cmd/placement/src/v1/resource_provider/inventory.rs index 76d8f1485..3c9538252 100644 --- a/openstack_cli/src/placement/v1/resource_provider/inventory.rs +++ b/cli-cmd/placement/src/v1/resource_provider/inventory.rs @@ -15,10 +15,9 @@ //! Placement `ResourceProviderInventory` command with subcommands use clap::{Parser, Subcommand}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; - pub mod create; pub mod delete; pub mod delete_all; @@ -53,9 +52,9 @@ pub enum InventoryCommands { impl InventoryCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/placement/v1/resource_provider/inventory/create.rs b/cli-cmd/placement/src/v1/resource_provider/inventory/create.rs similarity index 100% rename from openstack_cli/src/placement/v1/resource_provider/inventory/create.rs rename to cli-cmd/placement/src/v1/resource_provider/inventory/create.rs diff --git a/openstack_cli/src/placement/v1/resource_provider/inventory/delete.rs b/cli-cmd/placement/src/v1/resource_provider/inventory/delete.rs similarity index 100% rename from openstack_cli/src/placement/v1/resource_provider/inventory/delete.rs rename to cli-cmd/placement/src/v1/resource_provider/inventory/delete.rs diff --git a/openstack_cli/src/placement/v1/resource_provider/inventory/delete_all.rs b/cli-cmd/placement/src/v1/resource_provider/inventory/delete_all.rs similarity index 100% rename from openstack_cli/src/placement/v1/resource_provider/inventory/delete_all.rs rename to cli-cmd/placement/src/v1/resource_provider/inventory/delete_all.rs diff --git a/openstack_cli/src/placement/v1/resource_provider/inventory/list.rs b/cli-cmd/placement/src/v1/resource_provider/inventory/list.rs similarity index 100% rename from openstack_cli/src/placement/v1/resource_provider/inventory/list.rs rename to cli-cmd/placement/src/v1/resource_provider/inventory/list.rs diff --git a/openstack_cli/src/placement/v1/resource_provider/inventory/replace.rs b/cli-cmd/placement/src/v1/resource_provider/inventory/replace.rs similarity index 100% rename from openstack_cli/src/placement/v1/resource_provider/inventory/replace.rs rename to cli-cmd/placement/src/v1/resource_provider/inventory/replace.rs diff --git a/openstack_cli/src/placement/v1/resource_provider/inventory/set.rs b/cli-cmd/placement/src/v1/resource_provider/inventory/set.rs similarity index 100% rename from openstack_cli/src/placement/v1/resource_provider/inventory/set.rs rename to cli-cmd/placement/src/v1/resource_provider/inventory/set.rs diff --git a/openstack_cli/src/placement/v1/resource_provider/inventory/show.rs b/cli-cmd/placement/src/v1/resource_provider/inventory/show.rs similarity index 100% rename from openstack_cli/src/placement/v1/resource_provider/inventory/show.rs rename to cli-cmd/placement/src/v1/resource_provider/inventory/show.rs diff --git a/openstack_cli/src/placement/v1/resource_provider/list.rs b/cli-cmd/placement/src/v1/resource_provider/list.rs similarity index 100% rename from openstack_cli/src/placement/v1/resource_provider/list.rs rename to cli-cmd/placement/src/v1/resource_provider/list.rs diff --git a/openstack_cli/src/placement/v1/resource_provider/set_10.rs b/cli-cmd/placement/src/v1/resource_provider/set_10.rs similarity index 100% rename from openstack_cli/src/placement/v1/resource_provider/set_10.rs rename to cli-cmd/placement/src/v1/resource_provider/set_10.rs diff --git a/openstack_cli/src/placement/v1/resource_provider/set_114.rs b/cli-cmd/placement/src/v1/resource_provider/set_114.rs similarity index 100% rename from openstack_cli/src/placement/v1/resource_provider/set_114.rs rename to cli-cmd/placement/src/v1/resource_provider/set_114.rs diff --git a/openstack_cli/src/placement/v1/resource_provider/show.rs b/cli-cmd/placement/src/v1/resource_provider/show.rs similarity index 100% rename from openstack_cli/src/placement/v1/resource_provider/show.rs rename to cli-cmd/placement/src/v1/resource_provider/show.rs diff --git a/openstack_cli/src/placement/v1/resource_provider/trait.rs b/cli-cmd/placement/src/v1/resource_provider/trait.rs similarity index 92% rename from openstack_cli/src/placement/v1/resource_provider/trait.rs rename to cli-cmd/placement/src/v1/resource_provider/trait.rs index a49d8a710..d84d25f9b 100644 --- a/openstack_cli/src/placement/v1/resource_provider/trait.rs +++ b/cli-cmd/placement/src/v1/resource_provider/trait.rs @@ -15,10 +15,9 @@ //! Placement `ResourceProviderTrait` command with subcommands use clap::{Parser, Subcommand}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; - pub mod delete; pub mod list; pub mod set; @@ -43,9 +42,9 @@ pub enum TraitCommands { impl TraitCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/placement/v1/resource_provider/trait/delete.rs b/cli-cmd/placement/src/v1/resource_provider/trait/delete.rs similarity index 100% rename from openstack_cli/src/placement/v1/resource_provider/trait/delete.rs rename to cli-cmd/placement/src/v1/resource_provider/trait/delete.rs diff --git a/openstack_cli/src/placement/v1/resource_provider/trait/list.rs b/cli-cmd/placement/src/v1/resource_provider/trait/list.rs similarity index 100% rename from openstack_cli/src/placement/v1/resource_provider/trait/list.rs rename to cli-cmd/placement/src/v1/resource_provider/trait/list.rs diff --git a/openstack_cli/src/placement/v1/resource_provider/trait/set.rs b/cli-cmd/placement/src/v1/resource_provider/trait/set.rs similarity index 100% rename from openstack_cli/src/placement/v1/resource_provider/trait/set.rs rename to cli-cmd/placement/src/v1/resource_provider/trait/set.rs diff --git a/openstack_cli/src/placement/v1/resource_provider/usage.rs b/cli-cmd/placement/src/v1/resource_provider/usage.rs similarity index 91% rename from openstack_cli/src/placement/v1/resource_provider/usage.rs rename to cli-cmd/placement/src/v1/resource_provider/usage.rs index c91339e26..ba0655bdb 100644 --- a/openstack_cli/src/placement/v1/resource_provider/usage.rs +++ b/cli-cmd/placement/src/v1/resource_provider/usage.rs @@ -15,10 +15,9 @@ //! Placement `ResourceProviderUsage` command with subcommands use clap::{Parser, Subcommand}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; - pub mod get; /// Resource provider usages @@ -40,9 +39,9 @@ pub enum UsageCommands { impl UsageCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/placement/v1/resource_provider/usage/get.rs b/cli-cmd/placement/src/v1/resource_provider/usage/get.rs similarity index 100% rename from openstack_cli/src/placement/v1/resource_provider/usage/get.rs rename to cli-cmd/placement/src/v1/resource_provider/usage/get.rs diff --git a/openstack_cli/src/placement/v1/trait.rs b/cli-cmd/placement/src/v1/trait.rs similarity index 93% rename from openstack_cli/src/placement/v1/trait.rs rename to cli-cmd/placement/src/v1/trait.rs index 41a1d84b1..65ec4a526 100644 --- a/openstack_cli/src/placement/v1/trait.rs +++ b/cli-cmd/placement/src/v1/trait.rs @@ -15,10 +15,9 @@ //! Placement `trait` command with subcommands use clap::{Parser, Subcommand}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; - pub mod delete; pub mod list; pub mod set; @@ -49,9 +48,9 @@ pub enum TraitCommands { impl TraitCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/placement/v1/trait/delete.rs b/cli-cmd/placement/src/v1/trait/delete.rs similarity index 100% rename from openstack_cli/src/placement/v1/trait/delete.rs rename to cli-cmd/placement/src/v1/trait/delete.rs diff --git a/openstack_cli/src/placement/v1/trait/list.rs b/cli-cmd/placement/src/v1/trait/list.rs similarity index 100% rename from openstack_cli/src/placement/v1/trait/list.rs rename to cli-cmd/placement/src/v1/trait/list.rs diff --git a/openstack_cli/src/placement/v1/trait/set.rs b/cli-cmd/placement/src/v1/trait/set.rs similarity index 100% rename from openstack_cli/src/placement/v1/trait/set.rs rename to cli-cmd/placement/src/v1/trait/set.rs diff --git a/openstack_cli/src/placement/v1/trait/show.rs b/cli-cmd/placement/src/v1/trait/show.rs similarity index 100% rename from openstack_cli/src/placement/v1/trait/show.rs rename to cli-cmd/placement/src/v1/trait/show.rs diff --git a/openstack_cli/src/placement/v1/usage.rs b/cli-cmd/placement/src/v1/usage.rs similarity index 90% rename from openstack_cli/src/placement/v1/usage.rs rename to cli-cmd/placement/src/v1/usage.rs index f4a2a7c9f..b88992292 100644 --- a/openstack_cli/src/placement/v1/usage.rs +++ b/cli-cmd/placement/src/v1/usage.rs @@ -15,10 +15,9 @@ //! Placement `usage` command with subcommands use clap::{Parser, Subcommand}; +use openstack_cli_core::{cli::CliArgs, error::OpenStackCliError}; use openstack_sdk::AsyncOpenStack; -use crate::{Cli, OpenStackCliError}; - pub mod list; /// Usages @@ -39,9 +38,9 @@ pub enum UsageCommands { impl UsageCommand { /// Perform command action - pub async fn take_action( + pub async fn take_action( &self, - parsed_args: &Cli, + parsed_args: &C, session: &mut AsyncOpenStack, ) -> Result<(), OpenStackCliError> { match &self.command { diff --git a/openstack_cli/src/placement/v1/usage/list.rs b/cli-cmd/placement/src/v1/usage/list.rs similarity index 100% rename from openstack_cli/src/placement/v1/usage/list.rs rename to cli-cmd/placement/src/v1/usage/list.rs diff --git a/openstack_cli/src/placement/v1/version/get.rs b/cli-cmd/placement/src/v1/version/get.rs similarity index 100% rename from openstack_cli/src/placement/v1/version/get.rs rename to cli-cmd/placement/src/v1/version/get.rs diff --git a/cli-core/Cargo.toml b/cli-core/Cargo.toml index 6cd72e1e6..b1a9cdf6b 100644 --- a/cli-core/Cargo.toml +++ b/cli-core/Cargo.toml @@ -21,7 +21,6 @@ eyre = { workspace = true } http = { workspace = true } indicatif = "^0.18" itertools = { workspace = true } -#openstack_sdk = { path="../openstack_sdk", version = "^0.22", default-features = false } openstack-sdk-auth-core = { path="../auth-core", version = "^0.22", default-features = false } openstack-sdk-core = { path="../sdk-core", version = "^0.22", default-features = false } owo-colors = { version = "^4.3", features = ["supports-colors"] } @@ -38,10 +37,6 @@ tracing-subscriber = { workspace = true } url = { workspace = true } [dev-dependencies] -#assert_cmd = "^2.2" -#futures.workspace = true -#md5 = "^0.8.0" -#rand = "^0.10" tempfile = { workspace = true } [lints] diff --git a/fuzz/Cargo.toml b/fuzz/Cargo.toml index d51fc2322..3542d3f08 100644 --- a/fuzz/Cargo.toml +++ b/fuzz/Cargo.toml @@ -2,8 +2,8 @@ name = "openstack_sdk-fuzz" version = "0.0.0" publish = false -edition = "2021" -license = "Apache-2.0" +edition.workspace = true +license.workspace = true autobins = false autoexamples = false autotests = false diff --git a/openstack_cli/Cargo.toml b/openstack_cli/Cargo.toml index be0725e7f..a6fb9cc70 100644 --- a/openstack_cli/Cargo.toml +++ b/openstack_cli/Cargo.toml @@ -35,18 +35,18 @@ default = [ "object_store", "placement", ] -block_storage = ["openstack_sdk/block_storage"] -compute = ["openstack_sdk/compute"] -container_infra = ["openstack_sdk/container_infra"] -dns = ["openstack_sdk/dns"] -identity = ["openstack_sdk/identity"] +block_storage = [] +compute = [] +container_infra = [] +dns = [] +identity = [] image = ["openstack_sdk/image"] -load_balancer = ["openstack_sdk/load_balancer"] -network = ["openstack_sdk/network"] -object_store = ["openstack_sdk/object_store"] -placement = ["openstack_sdk/placement"] -keystone_ng = ["openstack_sdk/keystone_ng", "openstack_types/keystone_ng"] -passkey = ["keystone_ng", "openstack_sdk/passkey", "dep:webauthn-authenticator-rs", "dep:webauthn-rs-proto"] +load_balancer = [] +network = [] +object_store = [] +placement = [] +keystone_ng = ["openstack-cli-identity/keystone_ng"] +passkey = ["openstack-cli-identity/passkey"] _test_admin = [] _test_net_auto-allocated-topology = [] @@ -59,40 +59,40 @@ _test_net_network-segment-range = [] _test_net_vpn = [] [dependencies] -base64 = { workspace = true } -bytes = { workspace = true } -chrono = { workspace= true } clap = { workspace = true, features = ["color", "derive", "env"] } clap_complete = { workspace = true } color-eyre = { workspace = true } dialoguer = { workspace = true, features=["fuzzy-select"] } eyre = { workspace = true } -http = { workspace = true } -json-patch = { workspace = true } +openstack-cli-api = { path="../cli-cmd/api", version = "^0.1" } +openstack-cli-auth = { path="../cli-cmd/auth", version = "^0.1" } +openstack-cli-block-storage = { path="../cli-cmd/block-storage/", version = "^0.1" } +openstack-cli-catalog = { path="../cli-cmd/catalog/", version = "^0.1" } +openstack-cli-compute = { path="../cli-cmd/compute/", version = "^0.1" } +openstack-cli-container-infrastructure-management = { path="../cli-cmd/container-infrastructure-management/", version = "^0.1" } openstack-cli-core = { path="../cli-core", version = "^0.13" } -openstack_sdk = { path="../openstack_sdk", version = "^0.22", default-features = false, features = ["async", "identity"] } -openstack_types = { path="../openstack_types", version = "^0.22" } -regex = { workspace = true } -reqwest = { workspace = true } -secrecy.workspace = true -serde = { workspace = true } -serde_json = {workspace = true} +openstack-cli-dns = { path="../cli-cmd/dns/", version = "^0.1" } +openstack-cli-identity = { path="../cli-cmd/identity/", version = "^0.1" } +openstack-cli-image = { path="../cli-cmd/image/", version = "^0.1" } +openstack-cli-load-balancer = { path="../cli-cmd/load-balancer/", version = "^0.1" } +openstack-cli-network = { path="../cli-cmd/network/", version = "^0.1" } +openstack-cli-object-store = { path="../cli-cmd/object-store/", version = "^0.1" } +openstack-cli-placement = { path="../cli-cmd/placement/", version = "^0.1" } +openstack_sdk = { path="../openstack_sdk", version = "^0.22", default-features = false, features = ["async"] } strip-ansi-escapes = { workspace = true } -structable = { workspace = true } -tokio = { workspace = true, features = ["macros", "net", "sync", "rt-multi-thread"]} -thiserror = { workspace = true } +tokio = { workspace = true } tracing = { workspace = true} tracing-subscriber = { workspace = true } -url = { workspace = true } -webauthn-authenticator-rs = { workspace = true, optional = true } -webauthn-rs-proto = { workspace = true, optional = true } [dev-dependencies] assert_cmd = "^2.2" futures.workspace = true +http.workspace = true md5 = "^0.8.0" rand = "^0.10" -tempfile = { workspace = true } +reqwest.workspace = true +serde_json.workspace = true +tempfile.workspace = true [[test]] name = "functional" diff --git a/openstack_cli/src/cli.rs b/openstack_cli/src/cli.rs index c242626fc..c6b06d5ea 100644 --- a/openstack_cli/src/cli.rs +++ b/openstack_cli/src/cli.rs @@ -15,27 +15,10 @@ use clap::Parser; use openstack_cli_core::cli::{CliArgs, CompletionCommand, GlobalOpts, parse_config, styles}; +use openstack_cli_core::config::Config; +use openstack_cli_core::error::OpenStackCliError; use openstack_sdk::AsyncOpenStack; -use crate::error::OpenStackCliError; - -use crate::api; -use crate::auth; -use crate::block_storage::v3 as block_storage; -use crate::catalog; -use crate::compute::v2 as compute; -use crate::config::Config; -use crate::container_infrastructure_management::v1 as container_infra; -use crate::dns::v2 as dns; -use crate::identity::v3 as identity; -#[cfg(feature = "keystone_ng")] -use crate::identity::v4 as identity_v4; -use crate::image::v2 as image; -use crate::load_balancer::v2 as load_balancer; -use crate::network::v2 as network; -use crate::object_store::v1 as object_store; -use crate::placement::v1 as placement; - /// OpenStack command line interface. /// /// ## Configuration @@ -129,22 +112,24 @@ impl CliArgs for Cli { #[allow(missing_docs)] #[derive(Parser)] pub enum TopLevelCommands { - Api(api::ApiCommand), - Auth(auth::AuthCommand), - BlockStorage(block_storage::BlockStorageCommand), - Catalog(catalog::CatalogCommand), - Compute(compute::ComputeCommand), + Api(openstack_cli_api::ApiCommand), + Auth(openstack_cli_auth::AuthCommand), + BlockStorage(openstack_cli_block_storage::v3::BlockStorageCommand), + Catalog(openstack_cli_catalog::CatalogCommand), + Compute(openstack_cli_compute::v2::ComputeCommand), #[command(aliases = ["container-infrastructure-management", "container"])] - ContainerInfrastructure(container_infra::ContainerInfrastructureCommand), - Dns(dns::DnsCommand), - Identity(identity::IdentityCommand), + ContainerInfrastructure( + openstack_cli_container_infrastructure_management::v1::ContainerInfrastructureCommand, + ), + Dns(openstack_cli_dns::v2::DnsCommand), + Identity(openstack_cli_identity::v3::IdentityCommand), #[cfg(feature = "keystone_ng")] - Identity4(identity_v4::IdentityCommand), - Image(image::ImageCommand), - LoadBalancer(load_balancer::LoadBalancerCommand), - Network(network::NetworkCommand), - ObjectStore(object_store::ObjectStoreCommand), - Placement(placement::PlacementCommand), + Identity4(openstack_cli_identity::v4::IdentityCommand), + Image(openstack_cli_image::v2::ImageCommand), + LoadBalancer(openstack_cli_load_balancer::v2::LoadBalancerCommand), + Network(openstack_cli_network::v2::NetworkCommand), + ObjectStore(openstack_cli_object_store::v1::ObjectStoreCommand), + Placement(openstack_cli_placement::v1::PlacementCommand), Completion(CompletionCommand), } diff --git a/openstack_cli/src/common.rs b/openstack_cli/src/common.rs deleted file mode 100644 index 93b9eb860..000000000 --- a/openstack_cli/src/common.rs +++ /dev/null @@ -1,16 +0,0 @@ -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -// -// SPDX-License-Identifier: Apache-2.0 - -//! Common helpers. -pub use openstack_cli_core::common::*; diff --git a/openstack_cli/src/container_infrastructure_management/mod.rs b/openstack_cli/src/container_infrastructure_management/mod.rs deleted file mode 100644 index a1650f573..000000000 --- a/openstack_cli/src/container_infrastructure_management/mod.rs +++ /dev/null @@ -1,16 +0,0 @@ -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -// -// SPDX-License-Identifier: Apache-2.0 - -//! Container Infrastructure Management (Magnum) service commands -pub mod v1; diff --git a/openstack_cli/src/lib.rs b/openstack_cli/src/lib.rs index cd3e9e924..23cb68487 100644 --- a/openstack_cli/src/lib.rs +++ b/openstack_cli/src/lib.rs @@ -32,6 +32,7 @@ use tracing::warn; use tracing_subscriber::filter::LevelFilter; use tracing_subscriber::{Layer, prelude::*}; +use openstack_cli_auth as auth; use openstack_cli_core::error::OpenStackCliError; use openstack_cli_core::{ build_http_requests_timing_table, @@ -44,25 +45,8 @@ use openstack_sdk::{ types::identity::v3::Project, }; -pub mod api; -pub mod auth; -pub mod block_storage; -pub mod catalog; -mod common; -pub mod compute; -pub mod config; -pub mod container_infrastructure_management; -pub mod dns; -pub mod identity; -pub mod image; -pub mod load_balancer; -pub mod network; -pub mod object_store; -pub mod placement; - pub mod cli; pub mod error; -pub mod output; pub use cli::Cli; use cli::TopLevelCommands; diff --git a/openstack_cli/src/network/v2/floatingip/tag.rs b/openstack_cli/src/network/v2/floatingip/tag.rs deleted file mode 120000 index 3db9ab9ab..000000000 --- a/openstack_cli/src/network/v2/floatingip/tag.rs +++ /dev/null @@ -1 +0,0 @@ -../_tag.rs_ \ No newline at end of file diff --git a/openstack_cli/src/network/v2/network/tag.rs b/openstack_cli/src/network/v2/network/tag.rs deleted file mode 120000 index 3db9ab9ab..000000000 --- a/openstack_cli/src/network/v2/network/tag.rs +++ /dev/null @@ -1 +0,0 @@ -../_tag.rs_ \ No newline at end of file diff --git a/openstack_cli/src/network/v2/network_segment_range/tag.rs b/openstack_cli/src/network/v2/network_segment_range/tag.rs deleted file mode 120000 index 3db9ab9ab..000000000 --- a/openstack_cli/src/network/v2/network_segment_range/tag.rs +++ /dev/null @@ -1 +0,0 @@ -../_tag.rs_ \ No newline at end of file diff --git a/openstack_cli/src/network/v2/port/tag.rs b/openstack_cli/src/network/v2/port/tag.rs deleted file mode 120000 index 3db9ab9ab..000000000 --- a/openstack_cli/src/network/v2/port/tag.rs +++ /dev/null @@ -1 +0,0 @@ -../_tag.rs_ \ No newline at end of file diff --git a/openstack_cli/src/network/v2/router/tag.rs b/openstack_cli/src/network/v2/router/tag.rs deleted file mode 120000 index 3db9ab9ab..000000000 --- a/openstack_cli/src/network/v2/router/tag.rs +++ /dev/null @@ -1 +0,0 @@ -../_tag.rs_ \ No newline at end of file diff --git a/openstack_cli/src/network/v2/security_group/tag.rs b/openstack_cli/src/network/v2/security_group/tag.rs deleted file mode 120000 index 3db9ab9ab..000000000 --- a/openstack_cli/src/network/v2/security_group/tag.rs +++ /dev/null @@ -1 +0,0 @@ -../_tag.rs_ \ No newline at end of file diff --git a/openstack_cli/src/network/v2/subnet/tag.rs b/openstack_cli/src/network/v2/subnet/tag.rs deleted file mode 120000 index 3db9ab9ab..000000000 --- a/openstack_cli/src/network/v2/subnet/tag.rs +++ /dev/null @@ -1 +0,0 @@ -../_tag.rs_ \ No newline at end of file diff --git a/openstack_cli/src/network/v2/subnetpool/tag.rs b/openstack_cli/src/network/v2/subnetpool/tag.rs deleted file mode 120000 index 3db9ab9ab..000000000 --- a/openstack_cli/src/network/v2/subnetpool/tag.rs +++ /dev/null @@ -1 +0,0 @@ -../_tag.rs_ \ No newline at end of file diff --git a/xtask/Cargo.toml b/xtask/Cargo.toml index 0da420cad..3ce6922fe 100644 --- a/xtask/Cargo.toml +++ b/xtask/Cargo.toml @@ -1,9 +1,9 @@ [package] name = "xtask" version = "0.1.0" -edition = "2021" +edition.workspace = true publish = false -license = "Apache-2.0" +license.workspace = true [dependencies] clap = { workspace = true } diff --git a/xtask/src/bin/osc-cli-md.rs b/xtask/src/bin/osc-cli-md.rs index 87ca99291..37b556ae8 100644 --- a/xtask/src/bin/osc-cli-md.rs +++ b/xtask/src/bin/osc-cli-md.rs @@ -20,7 +20,7 @@ use clap::{Arg, ArgMatches, Command, CommandFactory}; use mdbook::book::Book; use mdbook::errors::Error; use mdbook::preprocess::{CmdPreprocessor, Preprocessor, PreprocessorContext}; -use mdbook::{book::Chapter, BookItem}; +use mdbook::{BookItem, book::Chapter}; use openstack_cli::Cli; use regex::{Error as RegexError, Regex}; use semver::{Version, VersionReq};