gtema · gtema · Oct 12, 2025 · Oct 9, 2025
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/deny.toml b/deny.toml
@@ -94,6 +94,7 @@ ignore = [
 allow = [
     "MIT",
     "Apache-2.0",
+    "CC0-1.0",
     "CDLA-Permissive-2.0",
     "Unicode-DFS-2016",
     "BSD-3-Clause",

diff --git a/openstack_sdk/src/api/network/v2/security_group_rule/create.rs b/openstack_sdk/src/api/network/v2/security_group_rule/create.rs
@@ -30,15 +30,15 @@ use serde::Deserialize;
 use serde::Serialize;
 use std::borrow::Cow;
 
-#[derive(Debug, Deserialize, Clone, Serialize)]
+#[derive(Debug, Deserialize, Clone, Eq, PartialEq, Serialize)]
 pub enum Direction {
     #[serde(rename = "egress")]
     Egress,
     #[serde(rename = "ingress")]
     Ingress,
 }
 
-#[derive(Debug, Deserialize, Clone, Serialize)]
+#[derive(Debug, Deserialize, Clone, Eq, PartialEq, Serialize)]
 pub enum Ethertype {
     #[serde(rename = "IPv4")]
     Ipv4,

diff --git a/openstack_tui/.config/config.yaml b/openstack_tui/.config/config.yaml
@@ -240,6 +240,9 @@ mode_keybindings:
         SetNetworkSecurityGroupRuleListFilters: {}
       description: All
       type: Filter
+    "ctrl-n":
+      action: CreateNetworkSecurityGroupRule
+      description: Create
     "ctrl-d":
       action: DeleteNetworkSecurityGroupRule
       description: Delete

diff --git a/openstack_tui/Cargo.toml b/openstack_tui/Cargo.toml
@@ -24,10 +24,13 @@ chrono = { workspace= true }
 clap = { workspace = true, features = ["cargo", "derive", "env", "wrap_help", "unicode", "string", "unstable-styles"] }
 color-eyre = { workspace = true }
 config = { workspace = true, features = ["json", "json5", "yaml"] }
-crossterm = { version = "^0.29", features = ["serde", "event-stream"] }
+# edtui MUST use the same version as ratatui otherwise the Into does not work
+crossterm = { version = "0.28.1", features = ["serde", "event-stream"] }
 derive_builder = { workspace = true }
 derive_deref = "^1.1"
 dirs = { workspace = true }
+edit = "0.1.5"
+#edtui = { version = "0.9" }
 eyre = { workspace = true }
 futures = { workspace = true }
 itertools = { workspace = true }
@@ -37,7 +40,7 @@ open.workspace = true
 openstack_sdk = { path = "../openstack_sdk", version = "^0.22", default-features = false, features = ["async", "block_storage", "compute", "dns", "identity", "image", "load_balancer", "network"] }
 openstack_types = { path = "../openstack_types", version = "^0.22" }
 pretty_assertions = "^1.4"
-ratatui = { version = "^0.29", features = ["serde", "macros"] }
+ratatui = { version = "^0.29", features = ["serde", "macros", "crossterm"] }
 secrecy = "0.10.3"
 serde = { workspace = true  }
 serde_json = { workspace = true }

diff --git a/openstack_tui/src/action.rs b/openstack_tui/src/action.rs
@@ -92,6 +92,16 @@ pub enum Action {
     /// Close confirmation prompt
     ConfirmAccepted(cloud_types::ApiRequest),
 
+    /// Edit. Open the default editor to get the user input for the operation.
+    Edit {
+        template: String,
+        original_action: Box<Action>,
+    },
+    EditResult {
+        result: serde_json::Value,
+        original_action: Box<Action>,
+    },
+
     // Block Storage (Cinder)
     /// Delete volume
     DeleteBlockStorageVolume,
@@ -183,6 +193,9 @@ pub enum Action {
     SetNetworkSecurityGroupListFilters(cloud_types::NetworkSecurityGroupList),
     /// Switch to NetworkSecurityGroupRules
     ShowNetworkSecurityGroupRules,
+    /// Create the security group rule.
+    CreateNetworkSecurityGroupRule,
+    //CreateNetworkSecurityGroupRuleData(serde_json::Value),
     /// Delete the security group rule.
     DeleteNetworkSecurityGroupRule,
     /// Switch to routers view

diff --git a/openstack_tui/src/app.rs b/openstack_tui/src/app.rs
@@ -55,9 +55,12 @@ use crate::{
             pools::LoadBalancerPools,
         },
         network::{
-            networks::NetworkNetworks, routers::NetworkRouters,
+            networks::NetworkNetworks,
+            routers::NetworkRouters,
+            //security_group_rule_create::CreateSecurityGroupRuleComponent,
             security_group_rules::NetworkSecurityGroupRules,
-            security_groups::NetworkSecurityGroups, subnets::NetworkSubnets,
+            security_groups::NetworkSecurityGroups,
+            subnets::NetworkSubnets,
         },
         project_select_popup::ProjectSelect,
         resource_select_popup::ApiRequestSelect,
@@ -76,6 +79,7 @@ enum Popup {
     SelectApiRequest,
     SwitchCloud,
     SwitchProject,
+    //CreateNetworkSecurityGroupRule,
     Confirm,
 }
 
@@ -439,6 +443,21 @@ impl App {
                     self.active_popup = Some(Popup::AuthHelper);
                     self.render(tui)?;
                 }
+                Action::Edit {
+                    ref template,
+                    ref original_action,
+                } => {
+                    tui.exit()?;
+                    let edited = edit::edit(template)?;
+                    tracing::debug!("after editing: '{}'", edited);
+                    tui.enter()?;
+                    tui.terminal.clear()?;
+                    self.action_tx.send(Action::EditResult {
+                        result: serde_json::from_value(serde_yaml::from_str(&edited)?)?,
+                        original_action: original_action.clone(),
+                    })?;
+                    self.render(tui)?;
+                }
                 Action::AuthHelperCompleted => {
                     self.active_popup = None;
                     self.render(tui)?;

diff --git a/openstack_tui/src/cloud_worker/network/v2/security_group_rule/list.rs b/openstack_tui/src/cloud_worker/network/v2/security_group_rule/list.rs
@@ -144,66 +144,66 @@ impl TryFrom<&NetworkSecurityGroupRuleList> for RequestBuilder<'_> {
     type Error = Report;
     fn try_from(value: &NetworkSecurityGroupRuleList) -> Result<Self, Self::Error> {
         let mut ep_builder = Self::default();
-        if let Some(val) = &value.limit {
-            ep_builder.limit(*val);
-        }
-        if let Some(val) = &value.marker {
-            ep_builder.marker(val.clone());
-        }
-        if let Some(val) = &value.page_reverse {
-            ep_builder.page_reverse(*val);
+        if let Some(val) = &value.id {
+            ep_builder.id(val.clone());
         }
-        if let Some(val) = &value.belongs_to_default_sg {
-            ep_builder.belongs_to_default_sg(*val);
+        if let Some(val) = &value.security_group_id {
+            ep_builder.security_group_id(val.clone());
         }
-        if let Some(val) = &value.description {
-            ep_builder.description(val.clone());
+        if let Some(val) = &value.remote_group_id {
+            ep_builder.remote_group_id(val.clone());
         }
         if let Some(val) = &value.direction {
             ep_builder.direction(val.clone());
         }
-        if let Some(val) = &value.ethertype {
-            ep_builder.ethertype(val.clone());
-        }
-        if let Some(val) = &value.id {
-            ep_builder.id(val.clone());
-        }
-        if let Some(val) = &value.normalized_cidr {
-            ep_builder.normalized_cidr(val.clone());
-        }
-        if let Some(val) = &value.port_range_max {
-            ep_builder.port_range_max(*val);
+        if let Some(val) = &value.protocol {
+            ep_builder.protocol(val.clone());
         }
         if let Some(val) = &value.port_range_min {
             ep_builder.port_range_min(*val);
         }
-        if let Some(val) = &value.protocol {
-            ep_builder.protocol(val.clone());
-        }
-        if let Some(val) = &value.remote_address_group_id {
-            ep_builder.remote_address_group_id(val.clone());
+        if let Some(val) = &value.port_range_max {
+            ep_builder.port_range_max(*val);
         }
-        if let Some(val) = &value.remote_group_id {
-            ep_builder.remote_group_id(val.clone());
+        if let Some(val) = &value.ethertype {
+            ep_builder.ethertype(val.clone());
         }
         if let Some(val) = &value.remote_ip_prefix {
             ep_builder.remote_ip_prefix(val.clone());
         }
+        if let Some(val) = &value.tenant_id {
+            ep_builder.tenant_id(val.clone());
+        }
         if let Some(val) = &value.revision_number {
             ep_builder.revision_number(val.clone());
         }
-        if let Some(val) = &value.security_group_id {
-            ep_builder.security_group_id(val.clone());
+        if let Some(val) = &value.description {
+            ep_builder.description(val.clone());
         }
-        if let Some(val) = &value.tenant_id {
-            ep_builder.tenant_id(val.clone());
+        if let Some(val) = &value.normalized_cidr {
+            ep_builder.normalized_cidr(val.clone());
         }
-        if let Some(val) = &value.sort_dir {
-            ep_builder.sort_dir(val.iter().cloned());
+        if let Some(val) = &value.remote_address_group_id {
+            ep_builder.remote_address_group_id(val.clone());
+        }
+        if let Some(val) = &value.belongs_to_default_sg {
+            ep_builder.belongs_to_default_sg(*val);
         }
         if let Some(val) = &value.sort_key {
             ep_builder.sort_key(val.iter().cloned());
         }
+        if let Some(val) = &value.sort_dir {
+            ep_builder.sort_dir(val.iter().cloned());
+        }
+        if let Some(val) = &value.limit {
+            ep_builder.limit(*val);
+        }
+        if let Some(val) = &value.marker {
+            ep_builder.marker(val.clone());
+        }
+        if let Some(val) = &value.page_reverse {
+            ep_builder.page_reverse(*val);
+        }
 
         Ok(ep_builder)
     }