From f696aee81d8b20ffdaa11c786c7e55cd7aa9cbb8 Mon Sep 17 00:00:00 2001
From: Frode Nordahl <frode.nordahl@canonical.com>
Date: Tue, 5 Mar 2024 11:15:23 +0100
Subject: [PATCH] Parse external-gateway argument in separate helper

This is to prepare for subsequent patches that will add support
for managing multiple gateways.

Related-Bug: #2002687
Change-Id: Ic088dca0b7cd83bd7568d775b4e70285ce72411d
Signed-off-by: Frode Nordahl <frode.nordahl@canonical.com>
---
 openstackclient/network/v2/router.py | 62 ++++++++++++++++------------
 1 file changed, 36 insertions(+), 26 deletions(-)

diff --git a/openstackclient/network/v2/router.py b/openstackclient/network/v2/router.py
index fdb7102bb..b44301533 100644
--- a/openstackclient/network/v2/router.py
+++ b/openstackclient/network/v2/router.py
@@ -85,6 +85,39 @@ def _get_columns(item):
     )
 
 
+def _get_external_gateway_attrs(client_manager, parsed_args):
+    attrs = {}
+
+    if parsed_args.external_gateway:
+        gateway_info = {}
+        n_client = client_manager.network
+        network = n_client.find_network(
+            parsed_args.external_gateway, ignore_missing=False
+        )
+        gateway_info['network_id'] = network.id
+        if parsed_args.disable_snat:
+            gateway_info['enable_snat'] = False
+        if parsed_args.enable_snat:
+            gateway_info['enable_snat'] = True
+        if parsed_args.fixed_ip:
+            ips = []
+            for ip_spec in parsed_args.fixed_ip:
+                if ip_spec.get('subnet', False):
+                    subnet_name_id = ip_spec.pop('subnet')
+                    if subnet_name_id:
+                        subnet = n_client.find_subnet(
+                            subnet_name_id, ignore_missing=False
+                        )
+                        ip_spec['subnet_id'] = subnet.id
+                if ip_spec.get('ip-address', False):
+                    ip_spec['ip_address'] = ip_spec.pop('ip-address')
+                ips.append(ip_spec)
+            gateway_info['external_fixed_ips'] = ips
+        attrs['external_gateway_info'] = gateway_info
+
+    return attrs
+
+
 def _get_attrs(client_manager, parsed_args):
     attrs = {}
     if parsed_args.name is not None:
@@ -113,32 +146,9 @@ def _get_attrs(client_manager, parsed_args):
             parsed_args.project_domain,
         ).id
         attrs['project_id'] = project_id
-    if parsed_args.external_gateway:
-        gateway_info = {}
-        n_client = client_manager.network
-        network = n_client.find_network(
-            parsed_args.external_gateway, ignore_missing=False
-        )
-        gateway_info['network_id'] = network.id
-        if parsed_args.disable_snat:
-            gateway_info['enable_snat'] = False
-        if parsed_args.enable_snat:
-            gateway_info['enable_snat'] = True
-        if parsed_args.fixed_ip:
-            ips = []
-            for ip_spec in parsed_args.fixed_ip:
-                if ip_spec.get('subnet', False):
-                    subnet_name_id = ip_spec.pop('subnet')
-                    if subnet_name_id:
-                        subnet = n_client.find_subnet(
-                            subnet_name_id, ignore_missing=False
-                        )
-                        ip_spec['subnet_id'] = subnet.id
-                if ip_spec.get('ip-address', False):
-                    ip_spec['ip_address'] = ip_spec.pop('ip-address')
-                ips.append(ip_spec)
-            gateway_info['external_fixed_ips'] = ips
-        attrs['external_gateway_info'] = gateway_info
+
+    attrs.update(_get_external_gateway_attrs(client_manager, parsed_args))
+
     # "router set" command doesn't support setting flavor_id.
     if 'flavor_id' in parsed_args and parsed_args.flavor_id is not None:
         attrs['flavor_id'] = parsed_args.flavor_id