1
=== modified file 'src/maasserver/api/machines.py'
2
--- src/maasserver/api/machines.py	2017-03-09 16:14:58 +0000
3
+++ src/maasserver/api/machines.py	2017-03-21 19:15:32 +0000
4
@@ -1335,8 +1335,10 @@
5
1335
                    memory = int(memory)
1335
                    memory = int(memory)
6
1336
                architecture = None
1336
                architecture = None
7
1337
                architectures = form.cleaned_data.get('arch')
1337
                architectures = form.cleaned_data.get('arch')
10
1338
                if architectures is not None and len(architectures) == 1:
1338
                if architectures is not None:
11
1339
                    architecture = architectures[0]
1339
                    architecture = (
12
1340
                        None if len(architectures) == 0
13
1341
                        else min(architectures))
14
1340
                data = {
1342
                data = {
15
1341
                    "cores": cores,
1343
                    "cores": cores,
16
1342
                    "memory": memory,
1344
                    "memory": memory,
17
1343
1345
18
=== modified file 'src/maasserver/api/tests/test_machines.py'
19
--- src/maasserver/api/tests/test_machines.py	2017-03-09 18:53:37 +0000
20
+++ src/maasserver/api/tests/test_machines.py	2017-03-21 19:15:32 +0000
21
@@ -637,6 +637,40 @@
22
637
        self.assertEqual(machine.system_id, parsed_result['system_id'])
637
        self.assertEqual(machine.system_id, parsed_result['system_id'])
23
638
        self.assertThat(mock_compose, MockCalledOnceWith())
638
        self.assertThat(mock_compose, MockCalledOnceWith())
24
639
639
25
640
    def test_POST_allocate_returns_a_composed_machine_wildcard_arch(self):
26
641
        # The "allocate" operation returns a composed machine.
27
642
        available_status = NODE_STATUS.READY
28
643
        architectures = [
29
644
            "amd64/generic", "i386/generic",
30
645
            "armhf/generic", "arm64/generic"
31
646
        ]
32
647
        pod = factory.make_Pod(architectures=architectures)
33
648
        pod.hints.cores = random.randint(8, 16)
34
649
        pod.hints.memory = random.randint(4096, 8192)
35
650
        pod.hints.save()
36
651
        machine = factory.make_Node(
37
652
            status=available_status, owner=None, with_boot_disk=True)
38
653
        mock_list_all_usable_architectures = self.patch(
39
654
            forms_module, 'list_all_usable_architectures')
40
655
        mock_list_all_usable_architectures.return_value = sorted(
41
656
            pod.architectures)
42
657
        mock_filter_nodes = self.patch(AcquireNodeForm, 'filter_nodes')
43
658
        mock_filter_nodes.return_value = [], {}, {}
44
659
        mock_compose = self.patch(ComposeMachineForPodsForm, 'compose')
45
660
        mock_compose.return_value = machine
46
661
        response = self.client.post(
47
662
            reverse('machines_handler'), {
48
663
                'op': 'allocate',
49
664
                'cpu_count': pod.hints.cores,
50
665
                'mem': pod.hints.memory,
51
666
                'arch': 'amd64'
52
667
                })
53
668
        self.assertEqual(http.client.OK, response.status_code)
54
669
        parsed_result = json.loads(
55
670
            response.content.decode(settings.DEFAULT_CHARSET))
56
671
        self.assertEqual(machine.system_id, parsed_result['system_id'])
57
672
        self.assertThat(mock_compose, MockCalledOnceWith())
58
673
59
640
    def test_POST_allocate_allocates_machine(self):
674
    def test_POST_allocate_allocates_machine(self):
60
641
        # The "allocate" operation allocates the machine it returns.
675
        # The "allocate" operation allocates the machine it returns.
61
642
        available_status = NODE_STATUS.READY
676
        available_status = NODE_STATUS.READY
Reviewer	Date Requested	Status
Gavin Panella (community)		Approve on 2017-03-21
LaMont Jones (community)	2017-03-21	Approve on 2017-03-21
Review via email: mp+320545@code.launchpad.net