Merge ~freyes/ubuntu/+source/magnum-ui:bug/2038663-antelope into ~ubuntu-openstack-dev/ubuntu/+source/magnum-ui:stable/2023.1

[Felipe Reyes]

diff --git a/debian/changelog b/debian/changelog
index a36b3bf..5d00ef4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,13 @@
-magnum-ui (12.0.0-0ubuntu1.1) UNRELEASED; urgency=medium
+magnum-ui (12.0.0-0ubuntu1~cloud1) UNRELEASED; urgency=medium
 
+  [ Corey Bryant ]
   * d/gbp.conf: Create stable/2023.1 branch.
 
- -- Corey Bryant <[e-mail]>  Thu, 04 May 2023 10:05:30 +0200
+  [ Felipe Reyes ]
+  * d/p/lp2038663.patch: Add option to override the fixed subnet when creating
+    a new cluster (LP: #2038663).
+
+ -- Felipe Reyes <[e-mail]>  Mon, 05 Aug 2024 11:08:08 -0400
 
 magnum-ui (12.0.0-0ubuntu1) lunar; urgency=medium
 
diff --git a/debian/patches/lp2038663.patch b/debian/patches/lp2038663.patch
new file mode 100644
index 0000000..116455a
--- /dev/null
+++ b/debian/patches/lp2038663.patch
@@ -0,0 +1,122 @@
+From 6f6c3db282fe2f0e08ad69c557eb153858b0164a Mon Sep 17 00:00:00 2001
+From: Felipe Reyes <[e-mail]>
+Date: Tue, 10 Oct 2023 18:33:27 -0300
+Subject: [PATCH] Add dropdown list to select fixed subnet
+
+When creating a cluster and the user decides to reuse an existing
+network, it must also choose a subnet, otherwise the resulting
+configuration may be invalid when trying to allocate a port.
+
+Closes-Bug: #2038663
+Related-Bug: #2038109
+Change-Id: I08943f10418385a39eecc7b4117d162854d2d010
+---
+ .../clusters/create/create.service.js         |  1 +
+ .../clusters/workflow/workflow.service.js     | 39 ++++++++++++++++++-
+ 2 files changed, 39 insertions(+), 1 deletion(-)
+
+--- a/magnum_ui/static/dashboard/container-infra/clusters/create/create.service.js
++++ b/magnum_ui/static/dashboard/container-infra/clusters/create/create.service.js
+@@ -112,6 +112,7 @@
+ 
+       if (!model.create_network) {
+         addFieldToRequestObjectIfSet('fixed_network','fixed_network');
++        addFieldToRequestObjectIfSet('fixed_subnet','fixed_subnet');
+       }
+       // Labels processing order (the following overrides previous):
+       // Cluster Templates -> Create Form -> User-defined in 'labels' textarea
+--- a/magnum_ui/static/dashboard/container-infra/clusters/workflow/workflow.service.js
++++ b/magnum_ui/static/dashboard/container-infra/clusters/workflow/workflow.service.js
+@@ -52,6 +52,7 @@
+     function init(title, $scope) {
+       var schema, form;
+ 
++      var fixedSubnetsInitial = gettext('Choose an existing subnet');
+       // Default <option>s; will be shown in selector as a placeholder
+       var templateTitleMap = [{value: '', name: gettext('Choose a Cluster Template') }];
+       var availabilityZoneTitleMap = [{value: '',
+@@ -62,6 +63,7 @@
+       var workerFlavorTitleMap = [{value: '',
+         name: gettext('Choose a Flavor for the Worker Node')}];
+       var networkTitleMap = [{value: '', name: gettext('Choose an existing network')}];
++      var subnetTitleMap = [{value: '', name: fixedSubnetsInitial}];
+       var ingressTitleMap = [{value: '', name: gettext('Choose an ingress controller')}];
+ 
+       var addonsTitleMap = [];
+@@ -102,6 +104,7 @@
+           'master_lb_enabled': {type: 'boolean'},
+           'create_network': { type: 'boolean' },
+           'fixed_network': { type: 'string' },
++          'fixed_subnet': { type: 'string' },
+           'floating_ip_enabled': { type: 'boolean' },
+           'ingress_controller': { type: 'object' },
+ 
+@@ -332,6 +335,7 @@
+                           onChange: function(isNewNetwork) {
+                             if (isNewNetwork) {
+                               model.fixed_network = MODEL_DEFAULTS.fixed_network;
++                              model.fixed_subnet = MODEL_DEFAULTS.fixed_subnet;
+                             }
+                           }
+                         },
+@@ -341,6 +345,17 @@
+                           title: gettext('Use an Existing Network'),
+                           titleMap: networkTitleMap,
+                           condition: 'model.create_network === false',
++                          required: true,
++                          onChange: function () {
++                            changeFixedNetwork(model);
++                          }
++                        },
++                        {
++                          key: 'fixed_subnet',
++                          type: 'select',
++                          title: gettext('Use an Existing Subnet'),
++                          titleMap: subnetTitleMap,
++                          condition: 'model.create_network === false',
+                           required: true
+                         }
+                       ]
+@@ -486,6 +501,7 @@
+           master_lb_enabled: false,
+           create_network: true,
+           fixed_network: '',
++          fixed_subnet: '',
+           floating_ip_enabled: false,
+           ingress_controller: '',
+ 
+@@ -570,12 +586,33 @@
+ 
+       function onGetNetworks(response) {
+         angular.forEach(response.data.items, function(network) {
+-          networkTitleMap.push({value: network.id, name: network.name + ' (' + network.id + ')'});
++          networkTitleMap.push({
++            value: network.id,
++            name: network.name + ' (' + network.id + ')',
++            subnets: network.subnets
++          });
+         });
+ 
+         setSingleItemAsDefault(response.data.items, 'fixed_network', 'id');
+       }
+ 
++      function changeFixedNetwork(model) {
++        if (model.fixed_network) {
++          subnetTitleMap = [{value:"", name: gettext("Choose an existing Subnet")}];
++          angular.forEach(networkTitleMap, function(network) {
++            if (network.value === model.fixed_network) {
++              angular.forEach(network.subnets, function(subnet) {
++                subnetTitleMap.push({value: subnet.id, name: subnet.name});
++              });
++            }
++          });
++        } else {
++          fixedSubnets = [{value:"", name: fixedSubnetsInitial}];
++          model.fixed_subnet = "";
++        }
++        form[0].tabs[2].items[0].items[0].items[3].titleMap = subnetTitleMap;
++      }
++
+       function onGetIngressControllers(response) {
+         angular.forEach(response.data.controllers, function(ingressController) {
+           ingressTitleMap.push({value: ingressController, name: ingressController.name});
diff --git a/debian/patches/series b/debian/patches/series
index e04ba14..a6c48b3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 skip-tests.patch
 install-all-files.patch
+lp2038663.patch