magnum-ui 14.0.0.0rc1__py3-none-any.whl → 15.0.0.0rc1__py3-none-any.whl

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

@@ -0,0 +1,56 @@
+/**
+ * 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';
+
+  describe('horizon.dashboard.container-infra.clusters.utils', function() {
+
+    var service, $scope, mockDirective, actionsDirectiveLinkFn, attrs;
+
+    ///////////////////
+
+    beforeEach(module('horizon.app.core'));
+    beforeEach(module('horizon.framework'));
+    beforeEach(module('horizon.dashboard.container-infra.clusters'));
+
+    beforeEach(inject(function($injector, _$rootScope_) {
+      $scope = _$rootScope_.$new();
+      service = $injector.get(
+        'horizon.dashboard.container-infra.clusters.utils');
+
+      mockDirective = {link:{apply:function() {}}};
+      actionsDirectiveLinkFn = service.getActionsDirectiveLinkFn(mockDirective);
+      attrs = {
+        type: 'row',
+        item: 'item',
+        allowed: 'allowed'
+      };
+    }));
+
+    it('should not amend the <actions> directive because the action type is ' +
+      'not \'row\'', function() {
+      attrs.type = 'main';
+      actionsDirectiveLinkFn($scope, angular.element(""), attrs);
+    });
+
+    it('should attempt to amend the <actions> directive without critical failure', function() {
+      $scope.allowed = [];
+      actionsDirectiveLinkFn($scope, angular.element(""), attrs);
+    });
+
+  });
+})();

magnum_ui/static/dashboard/container-infra/clusters/config/config.service.js

@@ -54,7 +54,7 @@
     function perform(selected) {
       // get config
       return magnum.getClusterConfig(selected.id).then(function(response) {
-        if ( response.data.key !== undefined ) {
+        if (typeof response.data.key !== "undefined") {
           textDownload.downloadTextFile(response.data.key, selected.name + "_key.pem");
           textDownload.downloadTextFile(response.data.ca, selected.name + "_ca.pem");
           textDownload.downloadTextFile(response.data.cert, selected.name + "_cert.pem");

magnum_ui/static/dashboard/container-infra/clusters/delete/delete.service.js

@@ -40,12 +40,14 @@
    * @name clusters.delete.service
    * @param {Object} $location
    * @param {Object} $q
+   * @param {Object} $rootScope
    * @param {Object} magnum
    * @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/clusters/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/clusters/details/drawer.controller.spec.js

@@ -26,7 +26,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/clusters/details/drawer.html

@@ -25,13 +25,13 @@
       <dd><a ng-href="ngdetails/OS::Magnum::ClusterTemplate/{$ item.cluster_template_id $}">{$ item.cluster_template_id $}</a></dd>
     </dl>
     <dl class="col-md-6">
-      <dt translate>API Address</dt>
+      <dt translate>Kubernetes API Address</dt>
       <dd>{$ item.api_address $}</dd>
     </dl>
   </div>
   <div class="row">
     <dl class="col-md-6">
-      <dt translate>Master Addresses</dt>
+      <dt translate>Control Plane Addresses</dt>
       <dd ng-if="drawerCtrl.objLen(item.master_addresses) === 0" translate>None</dd>
       <dd ng-repeat="addr in item.master_addresses">{$ addr $}</dd>
     </dl>
@@ -41,4 +41,14 @@
       <dd ng-repeat="addr in item.node_addresses">{$ addr $}</dd>
     </dl>
   </div>
+  <div class="row">
+    <dl class="col-md-6">
+      <dt translate>Health Status Reason</dt>
+      <pre>{$ item.health_status_reason | json $}</pre>
+    </dl>
+    <dl class="col-md-6">
+      <dt translate>Status Reason</dt>
+      <dd>{$ item.status_reason $}</dd>
+    </dl>
+  </div>
 </div>

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

@@ -45,7 +45,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/clusters/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/clusters/workflow/advanced.help.html

@@ -1,5 +1,5 @@
 <h1 class="h4" translate>Additional Labels</h1>
 
-<p translate>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.</p>
+<p translate>Specify additional 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.</p>
 
-<p translate>The key=value pair string is case insensitive and will be converted to lower case.</p>
+<p translate>The key=value pair string is case insensitive and will be converted to lower case.</p>

magnum_ui/static/dashboard/container-infra/clusters/workflow/cluster-template.controller.spec.js

@@ -142,7 +142,7 @@
       templateResponse.flavor_id = 'ABC';
 
       var model = $scope.model;
-      model.cluster_template_id = '99'; // Triggers bussines logic revalidation
+      model.cluster_template_id = '99'; // Triggers business logic revalidation
       $scope.$apply();
 
       expect(model.keypair).toBe(1);
@@ -168,7 +168,7 @@
       templateResponse.node_count = 1;
       templateResponse.flavor_id = 'ABC';
 
-      model.cluster_template_id = '99'; // Triggers bussines logic revalidation
+      model.cluster_template_id = '99'; // Triggers business logic revalidation
       $scope.$apply();
 
       expect(model.keypair).toBe(99);
@@ -182,12 +182,12 @@
       'response contains negative `master_lb_enabled` flag', function() {
       $scope.model.master_count = 99;
       templateResponse.master_lb_enabled = false;
-      $scope.model.cluster_template_id = '99'; // Triggers bussines logic revalidation
+      $scope.model.cluster_template_id = '99'; // Triggers business logic revalidation
       $scope.$apply();
       expect($scope.model.master_count).toBe(1);
 
       $scope.model.master_count = MODEL_DEFAULTS.master_count;
-      $scope.model.cluster_template_id = '999'; // Triggers bussines logic revalidation
+      $scope.model.cluster_template_id = '999'; // Triggers business logic revalidation
       $scope.$apply();
       expect($scope.model.master_count).toBe(1);
     });
@@ -196,7 +196,7 @@
       'template response', function() {
       templateResponse.labels = null;
       $scope.model.labels = MODEL_DEFAULTS.labels;
-      $scope.model.cluster_template_id = '99'; // Triggers bussines logic revalidation
+      $scope.model.cluster_template_id = '99'; // Triggers business logic revalidation
       $scope.$apply();
 
       expect($scope.model.labels).toEqual(MODEL_DEFAULTS.labels);
@@ -229,13 +229,13 @@
 
     it('should not fail if the cluster template response is empty', function() {
       templateResponse = {};
-      $scope.model.cluster_template_id = '99'; // Triggers bussines logic revalidation
+      $scope.model.cluster_template_id = '99'; // Triggers business logic revalidation
       $scope.$apply();
     });
 
     it('should not fail if the cluster template\'s labels are empty', function() {
       templateResponse = {labels:{}};
-      $scope.model.cluster_template_id = '99'; // Triggers bussines logic revalidation
+      $scope.model.cluster_template_id = '99'; // Triggers business logic revalidation
       $scope.$apply();
     });
 
@@ -250,7 +250,7 @@
 
       templateResponse.labels.ingress_controller = 'c2';
 
-      $scope.model.cluster_template_id = '99'; // Triggers bussines logic revalidation
+      $scope.model.cluster_template_id = '99'; // Triggers business logic revalidation
       $scope.$apply();
 
       expect($scope.model.ingress_controller.labels.ingress_controller).toBe('c2');

magnum_ui/static/dashboard/container-infra/clusters/workflow/size.help.html

@@ -1,6 +1,11 @@
+<h1 class="h4" translate>Control Plane size</h1>
+
+<p translate>Only uneven number of control plane nodes are supported. This provides the best balance of fault tolerance and cost for etcd.</p>
+
+
 <h1 class="h4" translate>Auto Scaling</h1>
 
 <p translate>If enabled, the minimum and maximum number of worker nodes must be specified.</p>
 <p translate>Auto scaling requires the use of CPU and memory limits on the resource definition of Pods.</p>
-<p translate>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.</p>
+<p translate>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.</p>
 <p translate>If the aggregate resource limits of all existing Pods is lower than 50% of the cluster capacity, a worker node will be removed, as long as the minimum number of worker nodes has not been reached.</p>

magnum_ui/static/dashboard/container-infra/clusters/workflow/workflow.service.js

@@ -44,6 +44,9 @@
   // comma-separated key=value with optional space after comma
   var REGEXP_KEY_VALUE = /^(\w+=[^,]+,?\s?)+$/;
 
+  // Object name, must start with alphabetical character.
+  var REGEXP_CLUSTER_NAME = /^[a-zA-Z][a-zA-Z0-9_\-\.]*$/;
+
   function ClusterWorkflow($q, basePath, gettext, magnum, neutron, nova) {
     var workflow = {
       init: init
@@ -59,9 +62,9 @@
         name: gettext('Choose an Availability Zone')}];
       var keypairsTitleMap = [{value: '', name: gettext('Choose a Keypair')}];
       var masterFlavorTitleMap = [{value: '',
-        name: gettext('Choose a Flavor for the Master Node')}];
+        name: gettext('Choose a Flavor for the Control Plane nodes')}];
       var workerFlavorTitleMap = [{value: '',
-        name: gettext('Choose a Flavor for the Worker Node')}];
+        name: gettext('Choose a Flavor for the Worker nodes')}];
       var networkTitleMap = [{value: '', name: gettext('Choose an existing network')}];
       var subnetTitleMap = [{value: '', name: fixedSubnetsInitial}];
       var ingressTitleMap = [{value: '', name: gettext('Choose an ingress controller')}];
@@ -86,7 +89,8 @@
 
           'master_count': {
             type: 'number',
-            minimum: 1
+            minimum: 1,
+            maximum: 7,
           },
           'master_flavor_id': { type: 'string' },
           'node_count': {
@@ -101,7 +105,7 @@
           },
           'max_node_count': { type: 'number' },
 
-          'master_lb_enabled': {type: 'boolean'},
+          'master_lb_enabled': { type: 'boolean' },
           'create_network': { type: 'boolean' },
           'fixed_network': { type: 'string' },
           'fixed_subnet': { type: 'string' },
@@ -117,9 +121,17 @@
 
       var formMasterCount = {
         key: 'master_count',
-        title: gettext('Number of Master Nodes'),
-        placeholder: gettext('The number of master nodes for the cluster'),
-        required: true
+        title: gettext('Number of Control Plane nodes'),
+        placeholder: gettext('The number of Control Plane nodes for the cluster'),
+        required: true,
+        validationMessage: {
+          'mustBeUnevenNumber': 'Supported control plane sizes are 1, 3, 5 or 7.'
+        },
+        $validators: {
+          mustBeUnevenNumber: function(value) {
+            return value % 2 !== 0;
+          }
+        }
       };
 
       // Disable the Master Count field, if only a single master is allowed
@@ -151,7 +163,18 @@
                       key: 'name',
                       title: gettext('Cluster Name'),
                       placeholder: gettext('Name of the cluster'),
-                      required: true
+                      required: true,
+                      help: "Text",
+                      validationMessage: {
+                        'invalidFormat': 'Cluster name must begin with an alphabetical ' +
+                                         'character and only contain alphanumeric, underscore, ' +
+                                         'dash and fullstop characters.'
+                      },
+                      $validators: {
+                        invalidFormat: function(value) {
+                          return REGEXP_CLUSTER_NAME.test(value);
+                        }
+                      }
                     },
                     {
                       key: 'cluster_template_id',
@@ -203,7 +226,7 @@
                   items: [
                     {
                       type: 'fieldset',
-                      title: gettext('Master Nodes'),
+                      title: gettext('Control Plane Nodes'),
                       items: [
                         formMasterCount,
                         // Info message explaining why only single master node is enabled
@@ -211,14 +234,27 @@
                           type: 'template',
                           template: '<div class="alert alert-info">' +
                             '<span class="fa fa-info-circle"></span> ' +
-                            gettext('The selected Cluster Template does not support ' +
-                            'multiple master nodes.') +
+                            gettext('The selected options do not support ' +
+                            'multiple control plane nodes. A Kubernetes ' +
+                            'API Load Balancer is required, and can be ' +
+                            'enabled in the Network tab.') +
                             '</div>',
                           condition: 'model.isSingleMasterNode == true'
                         },
+                        // Info message explaining why we allow only uneven numbers of
+                        // control plane nodes.
+                        {
+                          type: 'template',
+                          template: '<div class="alert alert-info">' +
+                            '<span class="fa fa-info-circle"></span> ' +
+                            gettext('Only an uneven number of control plane nodes are allowed. ' +
+                              'This provides the best balance of fault tolerance and cost.') +
+                            '</div>',
+                          condition: 'false'
+                        },
                         {
                           key: 'master_flavor_id',
-                          title: gettext('Flavor of Master Nodes'),
+                          title: gettext('Flavor of Control Plane Nodes'),
                           type: 'select',
                           titleMap: masterFlavorTitleMap,
                           required: true
@@ -304,7 +340,6 @@
                         }
                       ]
                     }
-
                   ]
                 }
               ]
@@ -314,7 +349,7 @@
               help: basePath + 'clusters/workflow/network.help.html',
               type: 'section',
               htmlClass: 'row',
-              required: true,
+              required: false,
               items: [
                 {
                   type: 'section',
@@ -333,10 +368,11 @@
                           key: 'create_network',
                           title: gettext('Create New Network'),
                           onChange: function(isNewNetwork) {
-                            if (isNewNetwork) {
-                              model.fixed_network = MODEL_DEFAULTS.fixed_network;
-                              model.fixed_subnet = MODEL_DEFAULTS.fixed_subnet;
-                            }
+                            // Reset relevant field selections
+                            model.fixed_network = MODEL_DEFAULTS.fixed_network;
+                            model.fixed_subnet = MODEL_DEFAULTS.fixed_subnet;
+                            // Network tab has required fields based on this checkbox.
+                            form[0].tabs[2].required = !isNewNetwork;
                           }
                         },
                         {
@@ -598,7 +634,7 @@
 
       function changeFixedNetwork(model) {
         if (model.fixed_network) {
-          subnetTitleMap = [{value:"", name: gettext("Choose an existing Subnet")}];
+          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) {
@@ -607,10 +643,11 @@
             }
           });
         } else {
-          fixedSubnets = [{value:"", name: fixedSubnetsInitial}];
-          model.fixed_subnet = "";
+          fixedSubnets = [{value: "", name: fixedSubnetsInitial}];
         }
+        // NOTE(dalees): This hardcoded index could be improved by referencing an object instead.
         form[0].tabs[2].items[0].items[0].items[3].titleMap = subnetTitleMap;
+        model.fixed_subnet = MODEL_DEFAULTS.fixed_subnet;
       }
 
       function onGetIngressControllers(response) {

magnum_ui/static/dashboard/container-infra/magnum.service.js

@@ -130,7 +130,7 @@
       });
     }
 
-    // FIXME(shu-mutou): Unused for batch-delete in Horizon framework in Feb, 2016.
+    // NOTE(shu-mutou): Unused for batch-delete in Horizon framework in Feb, 2016.
     function deleteClusters(ids) {
       return apiService.delete('/api/container_infra/clusters/', ids)
         .catch(function onError() {
@@ -179,7 +179,7 @@
       });
     }
 
-    // FIXME(shu-mutou): Unused for batch-delete in Horizon framework in Feb, 2016.
+    // NOTE(shu-mutou): Unused for batch-delete in Horizon framework in Feb, 2016.
     function deleteClusterTemplates(ids) {
       return apiService.delete('/api/container_infra/cluster_templates/', ids)
         .catch(function onError() {

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

@@ -32,9 +32,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/quotas/delete/delete.service.js

@@ -40,12 +40,14 @@
    * @name quotas.delete.service
    * @param {Object} $location
    * @param {Object} $q
+   * @param {Object} $rootScope
    * @param {Object} magnum
    * @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/utils.service.js

@@ -37,36 +37,39 @@
       var v1parts = v1.split('.');
       var v2parts = v2.split('.');
 
+      // Step 1: Validation
       function isValidPart(x) {
         return (lexicographical ? /^\d+[A-Za-z]*$/ : /^\d+$/).test(x);
       }
-
       if (!v1parts.every(isValidPart) || !v2parts.every(isValidPart)) {
         return NaN;
       }
 
-      if (zeroExtend) {
-        while (v1parts.length < v2parts.length) { v1parts.push("0"); }
-        while (v2parts.length < v1parts.length) { v2parts.push("0"); }
-      }
-
-      if (!lexicographical) {
-        v1parts = v1parts.map(Number);
-        v2parts = v2parts.map(Number);
+      // Step 2: Normalise
+      function normaliseParts(parts) {
+        if (zeroExtend) {
+          while (parts.length < parts.length) { parts.push("0"); }
+        }
+        if (!lexicographical) {
+          parts = parts.map(Number);
+        }
+        return parts;
       }
+      v1parts = normaliseParts(v1parts);
+      v2parts = normaliseParts(v2parts);
 
+      // Step 3: Comparison
       for (var i = 0; i < v1parts.length; ++i) {
         if (v2parts.length === i) { return 1; }
 
         if (v1parts[i] === v2parts[i]) {
           continue;
-        } else if (v1parts[i] > v2parts[i]) {
+        }
+        if (v1parts[i] > v2parts[i]) {
           return 1;
-        } else {
-          return -1;
         }
+        return -1;
       }
-
       if (v1parts.length !== v2parts.length) { return -1; }
 
       return 0;

{magnum_ui-14.0.0.0rc1.dist-info → magnum_ui-15.0.0.0rc1.dist-info}/AUTHORS

@@ -10,6 +10,7 @@ Bradley Jones <jones.bradley@me.com>
 Cao Xuan Hoang <hoangcx@vn.fujitsu.com>
 Charles Short <zulcss@gmail.com>
 Corey Bryant <corey.bryant@canonical.com>
+Dale Smith <dale@catalystcloud.nz>
 Doug Hellmann <doug@doughellmann.com>
 Erik Olof Gunnar Andersson <eandersson@blizzard.com>
 Feilong Wang <flwang@catalyst.net.nz>

{magnum_ui-14.0.0.0rc1.dist-info → magnum_ui-15.0.0.0rc1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: magnum-ui
-Version: 14.0.0.0rc1
+Version: 15.0.0.0rc1
 Summary: Magnum User Interface
 Home-page: https://docs.openstack.org/developer/magnum-ui/
 Author: OpenStack