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

[Newell Jensen]

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

[Newell Jensen (newell-jensen)]

Self approved backport.

review: Approve

[MAAS Lander (maas-lander)]

LANDING
-b 2.2-lp1700802 lp:~newell-jensen/maas into -b 2.2 lp:~maas-committers/maas

STATUS: FAILED BUILD
LOG: http://maas-ci-jenkins.internal:8080/job/maas/job/branch-tester/108/console

diff --git a/src/maasserver/node_constraint_filter_forms.py b/src/maasserver/node_constraint_filter_forms.py
index b509d5a..8107238 100644
--- a/src/maasserver/node_constraint_filter_forms.py
+++ b/src/maasserver/node_constraint_filter_forms.py
@@ -1,4 +1,4 @@
-# Copyright 2013-2016 Canonical Ltd.  This software is licensed under the
+# Copyright 2013-2017 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 __all__ = [
@@ -88,19 +88,30 @@ def storage_validator(value):
         raise ValidationError('Malformed storage constraint, "%s".' % value)
 
 NETWORKING_CONSTRAINT_NAMES = {
-    'space',
-    'not_space',
+    'id',
+    'not_id',
+    'fabric',
+    'not_fabric',
     'fabric_class',
     'not_fabric_class',
+    'ip',
+    'not_ip',
+    'mode',
+    'name',
+    'not_name',
+    'hostname',
+    'not_hostname',
+    'subnet',
+    'not_subnet',
+    'space',
+    'not_space',
     'subnet_cidr',
     'not_subnet_cidr',
+    'type',
+    'vlan',
+    'not_vlan',
     'vid',
     'not_vid',
-    'fabric',
-    'not_fabric',
-    'subnet',
-    'not_subnet',
-    'mode',
     'tag',
     'not_tag',
 }