Merge ~ltrager/maas:lp1877126 into maas:master

[Lee Trager]

LP: #1877126 - Set the default composed machine memory amount to 2048M.

[MAAS Lander (maas-lander)]

UNIT TESTS
-b lp1877126 lp:~ltrager/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: ab6b5dfe5afafb7e8cf11b9d2d8312437e4c5ab6

review: Approve

0e06d77... by Lee Trager on 2020-05-13

Add storage

[MAAS Lander (maas-lander)]

UNIT TESTS
-b lp1877126 lp:~ltrager/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 0e06d77a1b2f0096ee22067b5d55055c069e8f40

review: Approve

[Björn Tillenius (bjornt)]

+1

review: Approve

diff --git a/src/maasserver/clusterrpc/driver_parameters.py b/src/maasserver/clusterrpc/driver_parameters.py
index 830a06f..3c2175e 100644
--- a/src/maasserver/clusterrpc/driver_parameters.py
+++ b/src/maasserver/clusterrpc/driver_parameters.py
@@ -1,4 +1,4 @@
-# Copyright 2012-2018 Canonical Ltd.  This software is licensed under the
+# Copyright 2012-2020 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """
@@ -140,6 +140,20 @@ def add_power_driver_parameters(
     }
     if queryable is not None:
         params["queryable"] = queryable
+    # Add default values if the BMC is also a Pod.
+    if driver_type == "pod":
+        # Avoid circular dependencies
+        from maasserver.forms.pods import (
+            DEFAULT_COMPOSED_CORES,
+            DEFAULT_COMPOSED_MEMORY,
+            DEFAULT_COMPOSED_STORAGE,
+        )
+
+        params["defaults"] = {
+            "cores": DEFAULT_COMPOSED_CORES,
+            "memory": DEFAULT_COMPOSED_MEMORY,
+            "storage": DEFAULT_COMPOSED_STORAGE,
+        }
     parameters_set.append(params)
 
 
diff --git a/src/maasserver/forms/pods.py b/src/maasserver/forms/pods.py
index 97c59e0..03a62e3 100644
--- a/src/maasserver/forms/pods.py
+++ b/src/maasserver/forms/pods.py
@@ -3,7 +3,12 @@
 
 """Pod forms."""
 
-__all__ = ["PodForm"]
+__all__ = [
+    "DEFAULT_COMPOSED_CORES",
+    "DEFAULT_COMPOSED_MEMORY",
+    "DEFAULT_COMPOSED_STORAGE",
+    "PodForm",
+]
 
 from functools import partial
 from urllib.parse import urlparse
@@ -83,6 +88,13 @@ from provisioningserver.utils.twisted import asynchronous
 log = LegacyLogger()
 
 
+DEFAULT_COMPOSED_CORES = 1
+# Size is in MB
+DEFAULT_COMPOSED_MEMORY = 2048
+# Size is in GB
+DEFAULT_COMPOSED_STORAGE = 8
+
+
 def make_unique_hostname():
     """Returns a unique machine hostname."""
     while True:
@@ -502,11 +514,14 @@ class ComposeMachineForm(forms.Form):
         self.fields["cores"] = IntegerField(
             min_value=1, max_value=self.pod.hints.cores, required=False
         )
-        self.initial["cores"] = 1
+        self.initial["cores"] = DEFAULT_COMPOSED_CORES
+        # LP:1877126 - Focal requires 2048M of memory to deploy, older
+        # versions of Ubuntu only need 1024M. The default is 2048M so all
+        # versions of Ubuntu work but users may use 1024M.
         self.fields["memory"] = IntegerField(
             min_value=1024, max_value=self.pod.hints.memory, required=False
         )
-        self.initial["memory"] = 1024
+        self.initial["memory"] = DEFAULT_COMPOSED_MEMORY
         self.fields["architecture"] = ChoiceField(
             choices=[(arch, arch) for arch in self.pod.architectures],
             required=False,
@@ -548,7 +563,7 @@ class ComposeMachineForm(forms.Form):
         self.fields["storage"] = CharField(
             validators=[storage_validator], required=False
         )
-        self.initial["storage"] = "root:8(local)"
+        self.initial["storage"] = f"root:{DEFAULT_COMPOSED_STORAGE}(local)"
         self.fields["interfaces"] = LabeledConstraintMapField(
             validators=[interfaces_validator],
             label="Interface constraints",
@@ -766,7 +781,7 @@ class ComposeMachineForm(forms.Form):
                 power_type,
                 power_paramaters,
                 requested_machine,
-                **kwargs
+                **kwargs,
             )
             return requested_machine, result
 
diff --git a/src/maasserver/forms/tests/test_pods.py b/src/maasserver/forms/tests/test_pods.py
index 8b8fcce..10828ad 100644
--- a/src/maasserver/forms/tests/test_pods.py
+++ b/src/maasserver/forms/tests/test_pods.py
@@ -36,6 +36,9 @@ from maasserver.forms import pods as pods_module
 from maasserver.forms.pods import (
     ComposeMachineForm,
     ComposeMachineForPodsForm,
+    DEFAULT_COMPOSED_CORES,
+    DEFAULT_COMPOSED_MEMORY,
+    DEFAULT_COMPOSED_STORAGE,
     get_known_host_interfaces,
     PodForm,
 )
@@ -900,8 +903,8 @@ class TestComposeMachineForm(MAASTransactionServerTestCase):
         composed_machine = DiscoveredMachine(
             hostname=factory.make_name("hostname"),
             architecture=pod.architectures[0],
-            cores=1,
-            memory=1024,
+            cores=DEFAULT_COMPOSED_CORES,
+            memory=DEFAULT_COMPOSED_MEMORY,
             cpu_speed=300,
             block_devices=[],
             interfaces=[],
@@ -1034,14 +1037,18 @@ class TestComposeMachineForm(MAASTransactionServerTestCase):
                 IsInstance(RequestedMachine),
                 MatchesStructure(
                     architecture=Equals(pod.architectures[0]),
-                    cores=Equals(1),
-                    memory=Equals(1024),
+                    cores=Equals(DEFAULT_COMPOSED_CORES),
+                    memory=Equals(DEFAULT_COMPOSED_MEMORY),
                     cpu_speed=Is(None),
                     block_devices=MatchesListwise(
                         [
                             MatchesAll(
                                 IsInstance(RequestedMachineBlockDevice),
-                                MatchesStructure(size=Equals(8 * (1000 ** 3))),
+                                MatchesStructure(
+                                    size=Equals(
+                                        DEFAULT_COMPOSED_STORAGE * (1000 ** 3)
+                                    )
+                                ),
                             )
                         ]
                     ),
@@ -1959,8 +1966,8 @@ class TestComposeMachineForm(MAASTransactionServerTestCase):
             MatchesAll(
                 IsInstance(Machine),
                 MatchesStructure(
-                    cpu_count=Equals(1),
-                    memory=Equals(1024),
+                    cpu_count=Equals(DEFAULT_COMPOSED_CORES),
+                    memory=Equals(DEFAULT_COMPOSED_MEMORY),
                     cpu_speed=Equals(300),
                 ),
             ),
@@ -2069,8 +2076,8 @@ class TestComposeMachineForm(MAASTransactionServerTestCase):
             MatchesAll(
                 IsInstance(Machine),
                 MatchesStructure(
-                    cpu_count=Equals(1),
-                    memory=Equals(1024),
+                    cpu_count=Equals(DEFAULT_COMPOSED_CORES),
+                    memory=Equals(DEFAULT_COMPOSED_MEMORY),
                     cpu_speed=Equals(300),
                 ),
             ),
@@ -2106,8 +2113,8 @@ class TestComposeMachineForm(MAASTransactionServerTestCase):
             MatchesAll(
                 IsInstance(Machine),
                 MatchesStructure(
-                    cpu_count=Equals(1),
-                    memory=Equals(1024),
+                    cpu_count=Equals(DEFAULT_COMPOSED_CORES),
+                    memory=Equals(DEFAULT_COMPOSED_MEMORY),
                     cpu_speed=Equals(300),
                 ),
             ),
@@ -2249,7 +2256,12 @@ class TestComposeMachineForm(MAASTransactionServerTestCase):
             "Unable to compose KVM instance in '%s'. "
             "Memory overcommit ratio is %s and there are %s "
             "available resources; %s requested."
-            % (pod.name, pod.memory_over_commit_ratio, pod.memory, 1024),
+            % (
+                pod.name,
+                pod.memory_over_commit_ratio,
+                pod.memory,
+                DEFAULT_COMPOSED_MEMORY,
+            ),
             str(error),
         )
 
@@ -2323,8 +2335,8 @@ class TestComposeMachineForm(MAASTransactionServerTestCase):
             MatchesAll(
                 IsInstance(Machine),
                 MatchesStructure(
-                    cpu_count=Equals(1),
-                    memory=Equals(1024),
+                    cpu_count=Equals(DEFAULT_COMPOSED_CORES),
+                    memory=Equals(DEFAULT_COMPOSED_MEMORY),
                     cpu_speed=Equals(300),
                 ),
             ),