Merge ~andreserl/maas:lp1783913 into maas:master

[Andres Rodriguez]

LP: #1783913 - Improve log messages for over commit failures.

[Lee Trager (ltrager)]

LGTM!

review: Approve

[Newell Jensen (newell-jensen)]

Looks good but I would change the semi-colon to a colon personally.

review: Approve

[MAAS Lander (maas-lander)]

LANDING
-b lp1783913 lp:~andreserl/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED BUILD
LOG: http://maas-ci-jenkins.internal:8080/job/maas/job/branch-tester/4014/consoleText

adbd2a2... by Andres Rodriguez on 2018-09-28

Fix lint

diff --git a/src/maasserver/forms/pods.py b/src/maasserver/forms/pods.py
index f0a0eb4..1b945e5 100644
--- a/src/maasserver/forms/pods.py
+++ b/src/maasserver/forms/pods.py
@@ -532,7 +532,9 @@ class ComposeMachineForm(forms.Form):
                 requested_cores=self.get_value_for('cores'),
                 requested_memory=self.get_value_for('memory'))
             if over_commit_message:
-                raise PodProblem(over_commit_message)
+                raise PodProblem(
+                    "Unable to compose KVM instance in '%s'. %s" % (
+                        self.pod.name, over_commit_message))
 
             # Update the default storage pool.
             if self.pod.default_storage_pool is not None:
diff --git a/src/maasserver/forms/tests/test_pods.py b/src/maasserver/forms/tests/test_pods.py
index db824cf..0ba8616 100644
--- a/src/maasserver/forms/tests/test_pods.py
+++ b/src/maasserver/forms/tests/test_pods.py
@@ -1604,9 +1604,11 @@ class TestComposeMachineForm(MAASTransactionServerTestCase):
         self.assertTrue(form.is_valid())
         error = self.assertRaises(PodProblem, form.compose)
         self.assertEqual(
+            "Unable to compose KVM instance in '%s'. "
             "CPU over commit ratio is %s and there are %s "
-            "available resources. " %
-            (pod.cpu_over_commit_ratio, pod.cores), str(error))
+            "available resources; %s requested." % (
+                pod.name, pod.cpu_over_commit_ratio, pod.cores, 1),
+            str(error))
 
     def test__compose_check_over_commit_ratios_raises_error_for_memory(self):
         request = MagicMock()
@@ -1623,9 +1625,11 @@ class TestComposeMachineForm(MAASTransactionServerTestCase):
         self.assertTrue(form.is_valid())
         error = self.assertRaises(PodProblem, form.compose)
         self.assertEqual(
+            "Unable to compose KVM instance in '%s'. "
             "Memory over commit ratio is %s and there are %s "
-            "available resources." %
-            (pod.memory_over_commit_ratio, pod.memory), str(error))
+            "available resources; %s requested." % (
+                pod.name, pod.memory_over_commit_ratio, pod.memory, 1024),
+            str(error))
 
     def test__compose_handles_timeout_error(self):
         request = MagicMock()
diff --git a/src/maasserver/models/bmc.py b/src/maasserver/models/bmc.py
index 00bad58..e4548a4 100644
--- a/src/maasserver/models/bmc.py
+++ b/src/maasserver/models/bmc.py
@@ -563,14 +563,15 @@ class Pod(BMC):
         if (over_commit_cores - potential_cores) < 0:
             message = (
                 "CPU over commit ratio is %s and there are %s "
-                "available resources. " % (
-                    self.cpu_over_commit_ratio, (self.cores - used_cores)))
+                "available resources; %s requested." % (
+                    self.cpu_over_commit_ratio, (self.cores - used_cores),
+                    requested_cores))
         if (over_commit_memory - potential_memory) < 0:
             message += (
                 "Memory over commit ratio is %s and there are %s "
-                "available resources." % (
+                "available resources; %s requested." % (
                     self.memory_over_commit_ratio,
-                    (self.memory - used_memory)))
+                    (self.memory - used_memory), requested_memory))
         return message
 
     def _find_existing_machine(self, discovered_machine, mac_machine_map):