Merge ~newell-jensen/maas:2.2-lp1700802 into maas:2.2

Proposed by Newell Jensen on 2017-07-14
Status: Merged
Approved by: Newell Jensen on 2017-07-14
Approved revision: a9c312a79ae9fc521dbb40618183ddaa9bfe34f7
Merge reported by: MAAS Lander
Merged at revision: not available
Proposed branch: ~newell-jensen/maas:2.2-lp1700802
Merge into: maas:2.2
Diff against target: 48 lines (+19/-8)
1 file modified
src/maasserver/node_constraint_filter_forms.py (+19/-8)
Reviewer Review Type Date Requested Status
Newell Jensen Approve on 2017-07-14
Review via email: mp+327473@code.launchpad.net

Commit message

Backport from master -- LP: #1700802 -- Add missing networking constraint names.

To post a comment you must log in.
Newell Jensen (newell-jensen) wrote :

Self approved backport.

review: Approve

Update scan failed

At least one of the branches involved have failed to scan. You can manually schedule a rescan if required.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/src/maasserver/node_constraint_filter_forms.py b/src/maasserver/node_constraint_filter_forms.py
2index b509d5a..8107238 100644
3--- a/src/maasserver/node_constraint_filter_forms.py
4+++ b/src/maasserver/node_constraint_filter_forms.py
5@@ -1,4 +1,4 @@
6-# Copyright 2013-2016 Canonical Ltd. This software is licensed under the
7+# Copyright 2013-2017 Canonical Ltd. This software is licensed under the
8 # GNU Affero General Public License version 3 (see the file LICENSE).
9
10 __all__ = [
11@@ -88,19 +88,30 @@ def storage_validator(value):
12 raise ValidationError('Malformed storage constraint, "%s".' % value)
13
14 NETWORKING_CONSTRAINT_NAMES = {
15- 'space',
16- 'not_space',
17+ 'id',
18+ 'not_id',
19+ 'fabric',
20+ 'not_fabric',
21 'fabric_class',
22 'not_fabric_class',
23+ 'ip',
24+ 'not_ip',
25+ 'mode',
26+ 'name',
27+ 'not_name',
28+ 'hostname',
29+ 'not_hostname',
30+ 'subnet',
31+ 'not_subnet',
32+ 'space',
33+ 'not_space',
34 'subnet_cidr',
35 'not_subnet_cidr',
36+ 'type',
37+ 'vlan',
38+ 'not_vlan',
39 'vid',
40 'not_vid',
41- 'fabric',
42- 'not_fabric',
43- 'subnet',
44- 'not_subnet',
45- 'mode',
46 'tag',
47 'not_tag',
48 }

Subscribers

People subscribed via source and target branches

to all changes: