Merge ~ya-bo-ng/maas:qa-hot-fixes into maas:master

Proposed by Anthony Dillon
Status: Merged
Approved by: Anthony Dillon
Approved revision: 9f2952b64a78d4c0c77a046f9c66708e917842ef
Merge reported by: MAAS Lander
Merged at revision: not available
Proposed branch: ~ya-bo-ng/maas:qa-hot-fixes
Merge into: maas:master
Diff against target: 43 lines (+12/-9)
2 files modified
src/maasserver/static/js/angular/controllers/pod_details.js (+1/-1)
src/maasserver/static/partials/pod-details.html (+11/-8)
Reviewer Review Type Date Requested Status
Andres Rodriguez (community) Approve
Kit Randel (community) Approve
MAAS Lander Approve
Review via email: mp+356222@code.launchpad.net

Commit message

Limit the available cores and RAM value to one decimal place and Improve the messaging styling when configuring a pod.

Description of the change

QA:
- Overcommit a pod by 1.8 and the sum should look ok in the summary panel.
- When changing the overcommit value see that the message has a loading icon and is positioned well.

To post a comment you must log in.
Revision history for this message
MAAS Lander (maas-lander) wrote :

UNIT TESTS
-b qa-hot-fixes lp:~ya-bo-ng/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 9f2952b64a78d4c0c77a046f9c66708e917842ef

review: Approve
Revision history for this message
Kit Randel (blr) :
review: Approve
Revision history for this message
Andres Rodriguez (andreserl) wrote :

lgtm!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/src/maasserver/static/js/angular/controllers/pod_details.js b/src/maasserver/static/js/angular/controllers/pod_details.js
index 4a8f5d9..ad16349 100644
--- a/src/maasserver/static/js/angular/controllers/pod_details.js
+++ b/src/maasserver/static/js/angular/controllers/pod_details.js
@@ -306,7 +306,7 @@ angular.module('MAAS').controller('PodDetailsController', [
306 // Calculate the available cores with overcommit applied306 // Calculate the available cores with overcommit applied
307 $scope.availableWithOvercommit = function(307 $scope.availableWithOvercommit = function(
308 total, used, overcommitRatio) {308 total, used, overcommitRatio) {
309 return (total * overcommitRatio) - used;309 return ((total * overcommitRatio) - used).toPrecision(2);
310 };310 };
311311
312 // Called before the compose params is sent over the websocket.312 // Called before the compose params is sent over the websocket.
diff --git a/src/maasserver/static/partials/pod-details.html b/src/maasserver/static/partials/pod-details.html
index 64e0d21..3779e0a 100644
--- a/src/maasserver/static/partials/pod-details.html
+++ b/src/maasserver/static/partials/pod-details.html
@@ -615,14 +615,17 @@ Lower allocations may fail.</span>
615 <div class="col-6">615 <div class="col-6">
616 <maas-pod-parameters hide-type="true"></maas-pod-parameters>616 <maas-pod-parameters hide-type="true"></maas-pod-parameters>
617 </div>617 </div>
618 <div class="row">618 <div class="p-strip">
619 <div class="col-12 u-align--right" data-ng-if="editing">619 <div class="row">
620 <p maas-obj-hide-saving><maas-obj-errors></maas-obj-errors></p>620 <div class="col-8" data-ng-if="editing">
621 <p maas-obj-show-saving><maas-obj-saving>Trying to connect and discover pod</maas-obj-saving></p>621 <p maas-obj-hide-saving><maas-obj-errors></maas-obj-errors></p>
622 <button class="p-button--base"622 <p maas-obj-show-saving><maas-obj-saving><i class="p-icon--spinner u-animation--spin">Loading:</i> Trying to connect and discover pod</maas-obj-saving></p>
623 data-ng-click="exitEditPodConfiguration()">Cancel</button>623 </div>
624 <button class="p-button--positive" maas-obj-save>Save changes</button>624 <div class="col-4 u-align--right" data-ng-if="editing">
625 </div>625 <button class="p-button--base" data-ng-click="exitEditPodConfiguration()">Cancel</button>
626 <button class="p-button--positive" maas-obj-save>Save changes</button>
627 </div>
628 </div>
626 </div>629 </div>
627 </maas-obj-form>630 </maas-obj-form>
628 </div>631 </div>

Subscribers

People subscribed via source and target branches