magnum-ui 14.0.0__py3-none-any.whl → 15.0.0.0rc1__py3-none-any.whl

magnum_ui/locale/en_GB/LC_MESSAGES/djangojs.po

@@ -6,15 +6,16 @@
 # Andi Chandler <andi@gowling.com>, 2020. #zanata
 # Andi Chandler <andi@gowling.com>, 2022. #zanata
 # Andi Chandler <andi@gowling.com>, 2023. #zanata
+# Andi Chandler <andi@gowling.com>, 2024. #zanata
 msgid ""
 msgstr ""
 "Project-Id-Version: magnum-ui VERSION\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/openstack-i18n/\n"
-"POT-Creation-Date: 2023-08-31 08:14+0000\n"
+"POT-Creation-Date: 2024-06-06 07:30+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2023-09-09 10:44+0000\n"
+"PO-Revision-Date: 2024-04-18 12:35+0000\n"
 "Last-Translator: Andi Chandler <andi@gowling.com>\n"
 "Language-Team: English (United Kingdom)\n"
 "Language: en_GB\n"
@@ -155,9 +156,6 @@ msgstr "Choose a Flavour for the Master Node"
 msgid "Choose a Flavor for the Node"
 msgstr "Choose a Flavour for the Node"
 
-msgid "Choose a Flavor for the Worker Node"
-msgstr "Choose a Flavour for the Worker Node"
-
 msgid "Choose a Keypair"
 msgstr "Choose a Keypair"
 
@@ -185,9 +183,15 @@ msgstr "Choose an Availability Zone"
 msgid "Choose an Image"
 msgstr "Choose an Image"
 
+msgid "Choose an existing Subnet"
+msgstr "Choose an existing Subnet"
+
 msgid "Choose an existing network"
 msgstr "Choose an existing network"
 
+msgid "Choose an existing subnet"
+msgstr "Choose an existing Subnet"
+
 msgid "Choose an ingress controller"
 msgstr "Choose an ingress controller"
 
@@ -413,9 +417,6 @@ msgstr "Flavour"
 msgid "Flavor ID"
 msgstr "Flavour ID"
 
-msgid "Flavor of Master Nodes"
-msgstr "Flavour of Master Nodes"
-
 msgid "Flavor of Worker Nodes"
 msgstr "Flavour of Worker Nodes"
 
@@ -452,15 +453,6 @@ msgstr "I do want to override Template and Workflow Labels"
 msgid "ID"
 msgstr "ID"
 
-msgid ""
-"If Kubernetes is unable to schedule a Pod due to insuficient CPU or memory "
-"in the cluster, a worker node will be added, as long as the maximum number "
-"of worker nodes has not been reached."
-msgstr ""
-"If Kubernetes is unable to schedule a Pod due to insufficient CPU or memory "
-"in the cluster, a worker node will be added, as long as the maximum number "
-"of worker nodes has not been reached."
-
 msgid ""
 "If enabled, the minimum and maximum number of worker nodes must be specified."
 msgstr ""
@@ -586,9 +578,6 @@ msgstr "Master LB"
 msgid "Master LB Enabled"
 msgstr "Master LB Enabled"
 
-msgid "Master Nodes"
-msgstr "Master Nodes"
-
 msgid "Maximum Batch Size"
 msgstr "Maximum Batch Size"
 
@@ -646,9 +635,6 @@ msgstr "Nodes"
 msgid "None"
 msgstr "None"
 
-msgid "Number of Master Nodes"
-msgstr "Number of Master Nodes"
-
 msgid "Number of Worker Nodes"
 msgstr "Number of Worker Nodes"
 
@@ -751,17 +737,6 @@ msgstr "Sign Certificate To Cluster: {$ ctrl.model.cluster_name $}"
 msgid "Size"
 msgstr "Size"
 
-msgid ""
-"Specify additional kube_labels to apply to the cluster or override labels "
-"set by the cluster template. Overriding labels set by the cluster template "
-"may result in your cluster being misconfigured, unstable or unable to be "
-"created."
-msgstr ""
-"Specify additional kube_labels to apply to the cluster or override labels "
-"set by the cluster template. Overriding labels set by the cluster template "
-"may result in your cluster being misconfigured, unstable or unable to be "
-"created."
-
 msgid "Specify the Container Orchestration Engine to use."
 msgstr "Specify the Container Orchestration Engine to use."
 
@@ -860,15 +835,9 @@ msgstr ""
 "The nova flavour id to use when launching the master node of the cluster. "
 "Default: m1.small"
 
-msgid "The number of master nodes for the cluster"
-msgstr "The number of master nodes for the cluster"
-
 msgid "The number of worker nodes for the cluster"
 msgstr "The number of worker nodes for the cluster"
 
-msgid "The selected Cluster Template does not support multiple master nodes."
-msgstr "The selected Cluster Template does not support multiple master nodes."
-
 msgid "The size in GB for Docker Volume. Default: 25"
 msgstr "The size in GB for Docker Volume. Default: 25"
 
@@ -1012,6 +981,9 @@ msgstr "Updated At"
 msgid "Use an Existing Network"
 msgstr "Use an Existing Network"
 
+msgid "Use an Existing Subnet"
+msgstr "Use an existing Subnet"
+
 msgid "Used {$ ctrl.stats.clusters $} of {$ ctrl.quota.clusters $}"
 msgstr "Used {$ ctrl.stats.clusters $} of {$ ctrl.quota.clusters $}"
 

magnum_ui/locale/ru/LC_MESSAGES/djangojs.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: magnum-ui VERSION\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/openstack-i18n/\n"
-"POT-Creation-Date: 2022-09-01 09:56+0000\n"
+"POT-Creation-Date: 2024-06-06 07:30+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -138,9 +138,6 @@ msgstr "Выберите тип инстанса для мастер узла"
 msgid "Choose a Flavor for the Node"
 msgstr "Выберите тип инстанса для узла."
 
-msgid "Choose a Flavor for the Worker Node"
-msgstr "Выберите тип инстанса для рабочего узла"
-
 msgid "Choose a Keypair"
 msgstr "Выберите ключевую пару"
 
@@ -402,9 +399,6 @@ msgstr "Тип инстанса"
 msgid "Flavor ID"
 msgstr "ID типа инстанса"
 
-msgid "Flavor of Master Nodes"
-msgstr "Тип главных узлов"
-
 msgid "Flavor of Worker Nodes"
 msgstr "Тип рабочих нод"
 
@@ -522,9 +516,6 @@ msgstr "Главный балансировщик нагрузки"
 msgid "Master LB Enabled"
 msgstr "Главный Балансировщик Нагрузки Разрешен "
 
-msgid "Master Nodes"
-msgstr "Главные узлы"
-
 msgid "Maximum Batch Size"
 msgstr "Максимальный размер пакета"
 
@@ -582,9 +573,6 @@ msgstr "Узлы"
 msgid "None"
 msgstr "Нет"
 
-msgid "Number of Master Nodes"
-msgstr "Количество главных узлов"
-
 msgid "Number of Worker Nodes"
 msgstr "Количество рабочих узлов"
 
@@ -747,15 +735,9 @@ msgstr ""
 "ID типа инстанса nova для использования при запуске мастер узла кластера. По "
 "умолчанию: m1.small"
 
-msgid "The number of master nodes for the cluster"
-msgstr "Количество главных узлов для кластера"
-
 msgid "The number of worker nodes for the cluster"
 msgstr "Количество рабочих узлов для кластера"
 
-msgid "The selected Cluster Template does not support multiple master nodes."
-msgstr "Выбранный Темплейт кластера не поддерживает несколько главных узлов"
-
 msgid "The size in GB for Docker Volume. Default: 25"
 msgstr "Размер диска Docker в ГБ. По умолчанию: 25"
 

magnum_ui/static/dashboard/container-infra/cluster-templates/actions.module.spec.js

@@ -49,9 +49,7 @@
       return list.filter(matchesId).length === 1;
 
       function matchesId(action) {
-        if (action.id === value) {
-          return true;
-        }
+        return action.id === value;
       }
     }
 

magnum_ui/static/dashboard/container-infra/cluster-templates/cluster-templates.module.js

@@ -56,7 +56,7 @@
   /**
    * @ngdoc constant
    * @name distros
-   * @return [distros] available image distros
+   * @returns {String[]} List of available image distros
    * @description A list available image distros for magnum
   */
   function distros() {

magnum_ui/static/dashboard/container-infra/cluster-templates/delete/delete.service.js

@@ -40,12 +40,14 @@
    * @name delete.service
    * @param {Object} $location
    * @param {Object} $q
+   * @param {Object} $rootScope
    * @param {Object} magnum service
    * @param {Object} policy
    * @param {Object} actionResult
    * @param {Object} gettext
    * @param {Object} $qExtensions
    * @param {Object} deleteModal
+   * @param {Object} tableEvents
    * @param {Object} toast
    * @param {Object} resourceType
    * @param {Object} events
@@ -143,6 +145,7 @@
       if (result.result.failed.length === 0 && result.result.deleted.length > 0 &&
           currentPath !== indexPath) {
         $location.path(indexPath);
+        return null;
       } else {
         $rootScope.$broadcast(tableEvents.CLEAR_SELECTIONS);
         return result.result;

magnum_ui/static/dashboard/container-infra/cluster-templates/details/drawer.controller.js

@@ -36,7 +36,7 @@
 
     function objLen(obj) {
       var length = 0;
-      if (typeof obj === 'object') {
+      if (obj && typeof obj === 'object') {
         length = Object.keys(obj).length;
       }
       return length;

magnum_ui/static/dashboard/container-infra/cluster-templates/details/drawer.controller.spec.js

@@ -27,7 +27,9 @@
     }));
 
     it('objLen returns number of attributes of object', inject(function() {
-      expect(ctrl.objLen(undefined)).toBe(0);
+      expect(ctrl.objLen()).toBe(0);
+      expect(ctrl.objLen(null)).toBe(0);
+      expect(ctrl.objLen({})).toBe(0);
       expect(ctrl.objLen({a: 0})).toBe(1);
     }));
   });

magnum_ui/static/dashboard/container-infra/cluster-templates/details/overview.controller.js

@@ -49,7 +49,7 @@
 
     function objLen(obj) {
       var length = 0;
-      if (typeof obj === 'object') {
+      if (obj && typeof obj === 'object') {
         length = Object.keys(obj).length;
       }
       return length;

magnum_ui/static/dashboard/container-infra/cluster-templates/details/overview.controller.spec.js

@@ -42,7 +42,9 @@
     }));
 
     it('objLen returns number of attributes of object', inject(function() {
-      expect(ctrl.objLen(undefined)).toBe(0);
+      expect(ctrl.objLen()).toBe(0);
+      expect(ctrl.objLen(null)).toBe(0);
+      expect(ctrl.objLen({})).toBe(0);
       expect(ctrl.objLen({a: 0})).toBe(1);
     }));
   });

magnum_ui/static/dashboard/container-infra/cluster-templates/update/update.service.js

@@ -63,56 +63,42 @@
       // load current data
       magnum.getClusterTemplate(selected.id).then(onLoad);
       function onLoad(response) {
-        config.model.name = response.data.name
-          ? response.data.name : "";
-        config.model.coe = response.data.coe
-          ? response.data.coe : "";
-        config.model.server_type = response.data.server_type
-          ? response.data.server_type : "";
-        config.model.public = response.data.public
-          ? response.data.public : false;
-        config.model.hidden = response.data.hidden
-          ? response.data.hidden : false;
-        config.model.registry_enabled = response.data.registry_enabled
-          ? response.data.registry_enabled : false;
-        config.model.tls_disabled = response.data.tls_disabled
-          ? response.data.tls_disabled : false;
-        config.model.image_id = response.data.image_id
-          ? response.data.image_id : "";
-        config.model.flavor_id = response.data.flavor_id
-          ? response.data.flavor_id : "";
-        config.model.master_flavor_id = response.data.master_flavor_id
-          ? response.data.master_flavor_id : "";
-        config.model.docker_volume_size = response.data.docker_volume_size
-          ? response.data.docker_volume_size : "";
-        config.model.docker_storage_driver = response.data.docker_storage_driver
-          ? response.data.docker_storage_driver : "";
-        config.model.keypair_id = response.data.keypair_id
-          ? response.data.keypair_id : "";
-        config.model.network_driver = response.data.network_driver
-          ? response.data.network_driver : "";
-        config.model.volume_driver = response.data.volume_driver
-          ? response.data.volume_driver : "";
-        config.model.insecure_registry = response.data.insecure_registry
-          ? response.data.insecure_registry : "";
-        config.model.http_proxy = response.data.http_proxy
-          ? response.data.http_proxy : "";
-        config.model.https_proxy = response.data.https_proxy
-          ? response.data.https_proxy : "";
-        config.model.no_proxy = response.data.no_proxy
-          ? response.data.no_proxy : "";
-        config.model.external_network_id = response.data.external_network_id
-          ? response.data.external_network_id : "";
-        config.model.fixed_network = response.data.fixed_network
-          ? response.data.fixed_network : "";
-        config.model.fixed_subnet = response.data.fixed_subnet
-          ? response.data.fixed_subnet : "";
-        config.model.dns_nameserver = response.data.dns_nameserver
-          ? response.data.dns_nameserver : "";
-        config.model.master_lb_enabled = response.data.master_lb_enabled
-          ? response.data.master_lb_enabled : false;
-        config.model.floating_ip_enabled = response.data.floating_ip_enabled
-          ? response.data.floating_ip_enabled : false;
+
+        function setModelFromResponse(key, defaultValue) {
+          if (response.data[key]) {
+            config.model[key] = response.data[key];
+          } else {
+            config.model[key] = defaultValue;
+          }
+
+        }
+
+        setModelFromResponse('name', "");
+        setModelFromResponse('coe', "");
+        setModelFromResponse('server_type', "");
+        setModelFromResponse('public', false);
+        setModelFromResponse('hidden', false);
+        setModelFromResponse('registry_enabled', false);
+        setModelFromResponse('tls_disabled', false);
+        setModelFromResponse('image_id', "");
+        setModelFromResponse('flavor_id', "");
+        setModelFromResponse('master_flavor_id', "");
+        setModelFromResponse('docker_volume_size', "");
+        setModelFromResponse('docker_storage_driver', "");
+        setModelFromResponse('keypair_id', "");
+        setModelFromResponse('network_driver', "");
+        setModelFromResponse('volume_driver', "");
+        setModelFromResponse('insecure_registry', "");
+        setModelFromResponse('http_proxy', "");
+        setModelFromResponse('https_proxy', "");
+        setModelFromResponse('no_proxy', "");
+        setModelFromResponse('external_network_id', "");
+        setModelFromResponse('fixed_network', "");
+        setModelFromResponse('fixed_subnet', "");
+        setModelFromResponse('dns_nameserver', "");
+        setModelFromResponse('master_lb_enabled', false);
+        setModelFromResponse('floating_ip_enabled', false);
+
         var labels = "";
         for (var key in response.data.labels) {
           if (response.data.labels.hasOwnProperty(key)) {

magnum_ui/static/dashboard/container-infra/clusters/actions.module.spec.js

@@ -69,9 +69,7 @@
       return list.filter(matchesId).length === 1;
 
       function matchesId(action) {
-        if (action.id === value) {
-          return true;
-        }
+        return action.id === value;
       }
     }
 

magnum_ui/static/dashboard/container-infra/clusters/clusters.module.js

@@ -32,6 +32,7 @@
       'horizon.dashboard.container-infra.clusters.actions',
       'horizon.dashboard.container-infra.clusters.details'
     ])
+    .decorator('actionsDirective', actionsDirectiveDecorator)
     .constant('horizon.dashboard.container-infra.clusters.events', events())
     .constant('horizon.dashboard.container-infra.clusters.resourceType', 'OS::Magnum::Cluster')
     .run(run)
@@ -77,13 +78,13 @@
       label: gettext('Health Status')
     })
     .setProperty('master_count', {
-      label: gettext('Master Count')
+      label: gettext('Control Plane Count')
     })
     .setProperty('node_count', {
       label: gettext('Node Count')
     })
-    .setProperty('keypair', {
-      label: gettext('Keypair')
+    .setProperty('coe_version', {
+      label: gettext('Kubernetes Version')
     })
     .setListFunction(clustersService.getClustersPromise)
     .tableColumns
@@ -115,7 +116,7 @@
       priority: 2
     })
     .append({
-      id: 'keypair',
+      id: 'coe_version',
       priority: 2
     });
 
@@ -159,7 +160,7 @@
       'singleton': true
     })
     .append({
-      'label': gettext('Master Count'),
+      'label': gettext('Control Plane Count'),
       'name': 'master_count',
       'singleton': true
     })
@@ -169,8 +170,8 @@
       'singleton': true
     })
     .append({
-      'label': gettext('Keypair'),
-      'name': 'keypair',
+      'label': gettext('Kubernetes Version'),
+      'name': 'coe_version',
       'singleton': true
     });
   }
@@ -196,4 +197,27 @@
       templateUrl: path + 'panel.html'
     });
   }
+
+  actionsDirectiveDecorator.$inject = [
+    '$delegate',
+    'horizon.dashboard.container-infra.clusters.utils'
+  ];
+
+  /**
+   * @param {Object} $delegate
+   * @param {Object} clustersUtils
+   * @description Extends behaviour of `horizon.framework.widgets.action-list.directive:actions`
+   * with business logic in clusters.getActionsDirectiveLinkFn();
+   * @return {Object} Returns the ammended directive.
+   */
+  function actionsDirectiveDecorator($delegate, clustersUtils) {
+    var directive = $delegate[0];
+
+    // Angular's `link` is wrapped inside the compile function
+    directive.compile = function() {
+      return clustersUtils.getActionsDirectiveLinkFn(directive);
+    };
+
+    return $delegate;
+  }
 })();

magnum_ui/static/dashboard/container-infra/clusters/clusters.scss

@@ -42,4 +42,14 @@
       color: $gray-lighter;
     }
   }
+}
+
+.dropdown-menu > li.disabled {
+  cursor: not-allowed;
+}
+
+// prevents click propagation to ng-click
+.split-button.disabled,
+.dropdown-menu > li.disabled > a {
+  pointer-events: none;
 }

magnum_ui/static/dashboard/container-infra/clusters/clusters.utils.js

@@ -0,0 +1,134 @@
+/**
+ * Copyright 2017 NEC Corporation
+ *
+ * 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.
+ */
+
+(function() {
+  'use strict';
+
+  /**
+   * @ngdoc overview
+   * @name horizon.dashboard.container-infra.clusters.utils
+   * @description Service utilities for Clusters module.
+   */
+  angular
+    .module('horizon.dashboard.container-infra.clusters')
+    .factory('horizon.dashboard.container-infra.clusters.utils',
+    clustersUtilsService);
+
+  clustersUtilsService.$inject = [
+    '$parse',
+    'horizon.framework.util.q.extensions',
+    '$timeout'
+  ];
+
+  function clustersUtilsService($parse, $qExtensions, $timeout) {
+
+    var service = {
+      getActionsDirectiveLinkFn: getActionsDirectiveLinkFn
+    };
+
+    return service;
+
+    //////////////
+
+    /**
+     * Extends <actions> directive by conditionally enabling/disabling selected actions in the
+     * cluster item's dropdown menu. This allows to block actions that are unavailable in certain
+     * cluster states.
+     * @param {Object} directive Extended directive
+     * @returns {function} Directive's Link function
+     */
+    function getActionsDirectiveLinkFn(directive) {
+      // List of Cluster statuses that will enable the 'conditional action'
+      var ALLOWED_STATUSES_LIST = [
+        'DELETE_COMPLETE',
+        'CREATE_COMPLETE',
+        'UPDATE_COMPLETE',
+        'ROLLBACK_COMPLETE',
+        'SNAPSHOT_COMPLETE',
+        'CHECK_COMPLETE',
+        'ADOPT_COMPLETE'
+      ];
+
+      // List of actions disabled/enabled based on the allowed statuses
+      var CONDITIONAL_ACTIONS_LIST = [
+        'resizeClusterAction',
+        'rollingUpgradeClusterAction'
+      ];
+
+      // Important: If the <actions> directive template structure changes,
+      // this selector might need to be updated.
+      var ELEMENT_ACTIONS_SELECTOR = '.split-button,.dropdown-menu>li';
+      var DISABLED_CLASS_NAME = 'disabled';
+
+      var actionsDirectiveLinkFn = function(scope, element, attrs) {
+        // Call the original `link` method to keep the default behaviour
+        directive.link.apply(this, arguments);
+        var listType = attrs.type;
+
+        // Only do this for actions in the table's row
+        if (listType !== 'row') { return; }
+
+        var item = $parse(attrs.item)(scope);
+        var allowedActions;
+
+        var actionsParam = $parse(attrs.allowed)(scope);
+        if (angular.isFunction(actionsParam)) {
+          allowedActions = actionsParam();
+        } else {
+          allowedActions = actionsParam;
+        }
+
+        allowedActions.forEach(function(allowedAction) {
+          allowedAction.promise = allowedAction.service.allowed(item);
+        });
+
+        $qExtensions.allSettled(allowedActions).then(disableConditionalRowActions);
+
+        function disableConditionalRowActions(permittedActions) {
+          if (permittedActions.pass.length < 1) { return; }
+
+          // Gets evaluated AFTER DOM finishes rendering
+          $timeout(applyActionAvailability, 0);
+
+          function applyActionAvailability() {
+            var actionElementsList = element[0].querySelectorAll(ELEMENT_ACTIONS_SELECTOR);
+            permittedActions.pass.forEach(function(action, actionIndex) {
+              if (isConditionalAction(action.context.id)) {
+                var actionElement = angular.element(actionElementsList[actionIndex]);
+                // If the status is not allowed - add disabling class
+                if (isAllowedStatus(item.status)) {
+                  actionElement.removeClass(DISABLED_CLASS_NAME);
+                } else {
+                  actionElement.addClass(DISABLED_CLASS_NAME);
+                }
+              }
+            });
+          }
+        }
+      };
+
+      function isAllowedStatus(statusId) {
+        return ALLOWED_STATUSES_LIST.indexOf(statusId) > -1;
+      }
+
+      function isConditionalAction(actionId) {
+        return CONDITIONAL_ACTIONS_LIST.indexOf(actionId) > -1;
+      }
+
+      return actionsDirectiveLinkFn;
+    }
+  }
+})();