MAAS

Merge lp:~jtv/maas/circular-import-nodegroup-clusterrpc into lp:~maas-committers/maas/trunk

  1. circular-import-nodegroup-clusterrpc
  2. Merge into trunk
Proposed by Jeroen T. Vermeulen
Status: Merged
Approved by: Jeroen T. Vermeulen
Approved revision: no longer in the source branch.
Merged at revision: 3114
Proposed branch: lp:~jtv/maas/circular-import-nodegroup-clusterrpc
Merge into: lp:~maas-committers/maas/trunk
Diff against target: 21 lines (+3/-1)
1 file modified
src/maasserver/clusterrpc/boot_images.py (+3/-1)
To merge this branch: bzr merge lp:~jtv/maas/circular-import-nodegroup-clusterrpc
Reviewer Review Type Date Requested Status
Jeroen T. Vermeulen (community) Approve
Review via email: mp+236280@code.launchpad.net

Commit message

Fix an import cycle.

Description of the change

I came across this one while trying to see if the Selenium tests are OK now.

Jeroen

To post a comment you must log in.
Revision history for this message
Jeroen T. Vermeulen (jtv) wrote :

Self-approving.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/maasserver/clusterrpc/boot_images.py'
2--- src/maasserver/clusterrpc/boot_images.py 2014-09-27 03:51:31 +0000
3+++ src/maasserver/clusterrpc/boot_images.py 2014-09-29 05:44:53 +0000
4@@ -18,7 +18,6 @@
5 "is_import_boot_images_running",
6 ]
7
8-from maasserver.models import BootResource
9 from maasserver.rpc import getClientFor
10 from provisioningserver.rpc.cluster import (
11 IsImportBootImagesRunning,
12@@ -76,6 +75,9 @@
13 :raises crochet.TimeoutError: If a response has not been received within
14 30 seconds.
15 """
16+ # Avoid circular imports when running the Node view tests in isolation.
17+ from maasserver.models import BootResource
18+
19 images = get_boot_images(nodegroup)
20 images = [
21 image