Merge ~adam-collard/maas:factory-no-nodedevice-by-default into maas:master

[Adam Collard]

Don't create node_devices by default in make_Node()

[Alberto Donato (ack)]

+1 with a nit inline

review: Approve

[MAAS Lander (maas-lander)]

UNIT TESTS
-b factory-no-nodedevice-by-default lp:~adam-collard/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci.internal:8080/job/maas/job/branch-tester/10486/console
COMMIT: 09da182222b9f107e1747031fcd800b79aa7b59b

review: Needs Fixing

[Adam Collard (adam-collard)]

jenkins: !test

[MAAS Lander (maas-lander)]

UNIT TESTS
-b factory-no-nodedevice-by-default lp:~adam-collard/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci.internal:8080/job/maas/job/branch-tester/10501/console
COMMIT: 09da182222b9f107e1747031fcd800b79aa7b59b

review: Needs Fixing

[Adam Collard (adam-collard)]

jenkins: !test

[MAAS Lander (maas-lander)]

UNIT TESTS
-b factory-no-nodedevice-by-default lp:~adam-collard/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 09da182222b9f107e1747031fcd800b79aa7b59b

review: Approve

Unmerged commits

e7f4e53... by Adam Collard on 2021-07-09

Don't create node_devices by default in make_Node()

diff --git a/src/maasserver/testing/factory.py b/src/maasserver/testing/factory.py
index 3fd7bf2..d4eeceb 100644
--- a/src/maasserver/testing/factory.py
+++ b/src/maasserver/testing/factory.py
@@ -335,7 +335,7 @@ class Factory(maastesting.factory.Factory):
     # Ports for use with make_RegionControllerProcessEndpoint. Note that the
     # simpler cycle(range(...)) is not used because it gradually consumes all
     # memory.
-    _rcpe_ports = chain.from_iterable(repeat(range(2 ** 16)))
+    _rcpe_ports = chain.from_iterable(repeat(range(2**16)))
 
     def make_RegionControllerProcessEndpoint(
         self, process=None, address=None, port=None
@@ -395,6 +395,7 @@ class Factory(maastesting.factory.Factory):
         bmc=None,
         ephemeral_deploy=False,
         enable_hw_sync=False,
+        with_node_devices=False,
         **kwargs,
     ):
         """Make a :class:`Node`.
@@ -568,8 +569,9 @@ class Factory(maastesting.factory.Factory):
             Node.objects.filter(id=node.id).update(updated=updated)
         if created is not None:
             Node.objects.filter(id=node.id).update(created=created)
-        for _ in range(0, random.randint(10, 20)):
-            self.make_NodeDevice(node=node)
+        if with_node_devices:
+            for _ in range(random.randint(10, 20)):
+                self.make_NodeDevice(node=node)
         return reload_object(node)
 
     def make_Machine(self, *args, **kwargs):
@@ -3284,7 +3286,7 @@ class Factory(maastesting.factory.Factory):
         if path is None:
             path = "/var/lib/%s" % name
         if storage is None:
-            storage = random.randint(10 * 1024 ** 3, 100 * 1024 ** 3)
+            storage = random.randint(10 * 1024**3, 100 * 1024**3)
         return PodStoragePool.objects.create(
             pod=pod,
             name=name,
@@ -3447,9 +3449,9 @@ class Factory(maastesting.factory.Factory):
         if commissioning_driver is None:
             commissioning_driver = self.make_name("commissioning_driver")
         if bus_number is None:
-            bus_number = random.randint(0, 2 ** 16)
+            bus_number = random.randint(0, 2**16)
         if device_number is None:
-            device_number = random.randint(0, 2 ** 16)
+            device_number = random.randint(0, 2**16)
         if pci_address is None and bus == NODE_DEVICE_BUS.PCIE:
             pci_domain = factory.make_hex_string(size=4)
             pci_function_number = random.randint(0, 9)