feat: Add port set and binding commands (#1231)

Author: gtema

openstack_cli/src/network/v2/port.rs

@@ -20,9 +20,11 @@ use openstack_sdk::AsyncOpenStack;
 
 use crate::{Cli, OpenStackCliError};
 
+pub mod binding;
 pub mod create;
 pub mod delete;
 pub mod list;
+pub mod set;
 pub mod show;
 pub mod tag;
 
@@ -38,9 +40,11 @@ pub struct PortCommand {
 #[allow(missing_docs)]
 #[derive(Subcommand)]
 pub enum PortCommands {
+    Binding(Box<binding::BindingCommand>),
     Create(Box<create::PortCommand>),
     Delete(delete::PortCommand),
     List(Box<list::PortsCommand>),
+    Set(Box<set::PortCommand>),
     Show(Box<show::PortCommand>),
     Tag(Box<tag::TagCommand>),
 }
@@ -53,9 +57,11 @@ impl PortCommand {
         session: &mut AsyncOpenStack,
     ) -> Result<(), OpenStackCliError> {
         match &self.command {
+            PortCommands::Binding(cmd) => cmd.take_action(parsed_args, session).await,
             PortCommands::Create(cmd) => cmd.take_action(parsed_args, session).await,
             PortCommands::Delete(cmd) => cmd.take_action(parsed_args, session).await,
             PortCommands::List(cmd) => cmd.take_action(parsed_args, session).await,
+            PortCommands::Set(cmd) => cmd.take_action(parsed_args, session).await,
             PortCommands::Show(cmd) => cmd.take_action(parsed_args, session).await,
             PortCommands::Tag(cmd) => cmd.take_action(parsed_args, session).await,
         }

openstack_cli/src/network/v2/port/binding.rs

@@ -0,0 +1,66 @@
+// 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
+
+//! Binding binding commands
+
+use clap::{Parser, Subcommand};
+
+use openstack_sdk::AsyncOpenStack;
+
+use crate::{Cli, OpenStackCliError};
+
+pub mod activate;
+pub mod create;
+pub mod delete;
+pub mod list;
+//pub mod set;
+//pub mod show;
+
+/// Binding commands
+#[derive(Parser)]
+pub struct BindingCommand {
+    /// subcommand
+    #[command(subcommand)]
+    command: BindingCommands,
+}
+
+/// Supported subcommands
+#[allow(missing_docs)]
+#[derive(Subcommand)]
+pub enum BindingCommands {
+    Activate(Box<activate::BindingCommand>),
+    Create(Box<create::BindingCommand>),
+    Delete(delete::BindingCommand),
+    List(Box<list::BindingsCommand>),
+    // Set(Box<set::BindingCommand>),
+    // Show(Box<show::BindingCommand>),
+}
+
+impl BindingCommand {
+    /// Perform command action
+    pub async fn take_action(
+        &self,
+        parsed_args: &Cli,
+        session: &mut AsyncOpenStack,
+    ) -> Result<(), OpenStackCliError> {
+        match &self.command {
+            BindingCommands::Activate(cmd) => cmd.take_action(parsed_args, session).await,
+            BindingCommands::Create(cmd) => cmd.take_action(parsed_args, session).await,
+            BindingCommands::Delete(cmd) => cmd.take_action(parsed_args, session).await,
+            BindingCommands::List(cmd) => cmd.take_action(parsed_args, session).await,
+            // BindingCommands::Set(cmd) => cmd.take_action(parsed_args, session).await,
+            // BindingCommands::Show(cmd) => cmd.take_action(parsed_args, session).await,
+        }
+    }
+}

openstack_cli/src/network/v2/port/set.rs

@@ -30,14 +30,12 @@ use crate::output::OutputProcessor;
 
 use crate::common::parse_key_val;
 use clap::ValueEnum;
-use eyre::WrapErr;
 use openstack_sdk::api::QueryAsync;
 use openstack_sdk::api::find;
 use openstack_sdk::api::network::v2::port::find;
 use openstack_sdk::api::network::v2::port::set;
 use openstack_types::network::v2::port::response::set::PortResponse;
 use serde_json::Value;
-use std::collections::BTreeMap;
 
 /// Updates a port.
 ///
@@ -370,7 +368,7 @@ impl PortCommand {
                         v.as_object()
                             .expect("Is a valid Json object")
                             .into_iter()
-                            .map(|(k, v)| (k.into(), v.clone().into()))
+                            .map(|(k, v)| (k.into(), v.clone()))
                             .collect::<BTreeMap<_, Value>>()
                     })
                     .collect::<Vec<_>>(),

openstack_cli/tests/network/v2/port/binding/mod.rs

@@ -16,8 +16,8 @@ mod activate_autogen;
 mod create_autogen;
 mod delete_autogen;
 mod list_autogen;
-mod set_autogen;
-mod show_autogen;
+// mod set_autogen;
+// mod show_autogen;
 
 use assert_cmd::prelude::*;
 use std::process::Command;
@@ -26,7 +26,7 @@ use std::process::Command;
 fn help() -> Result<(), Box<dyn std::error::Error>> {
     let mut cmd = Command::cargo_bin("osc")?;
 
-    cmd.arg("network").arg("port")..arg("binding").arg("--help");
+    cmd.args(["network", "port", "binding", "--help"]);
     cmd.assert().success();
 
     Ok(())

openstack_cli/tests/network/v2/port/mod.rs

@@ -13,12 +13,12 @@
 // SPDX-License-Identifier: Apache-2.0
 
 // mod add_allowed_address_pairs_autogen;
-// mod binding;
+mod binding;
 mod create_autogen;
 mod delete_autogen;
 mod list;
 mod list_autogen;
-// mod set_autogen;
+mod set_autogen;
 mod show_autogen;
 mod tag;
 
@@ -29,7 +29,7 @@ use std::process::Command;
 fn help() -> Result<(), Box<dyn std::error::Error>> {
     let mut cmd = Command::cargo_bin("osc")?;
 
-    cmd.arg("network").arg("port").arg("--help");
+    cmd.args(["network", "port", "--help"]);
     cmd.assert().success();
 
     Ok(())