Merge lp:~jameinel/maas/space-from-name into lp:~maas-committers/maas/trunk

[John A Meinel]

This is a couple of steps to make the API a bit nicer for humans to interact with. It allows looking up spaces and subnets by name instead of by ID, and allows forms to be filled in also with the name.

I'd like to get some feedback if this is actually interesting, or if it is too much of an API break (I didn't see a way to have Forms allow *either* an ID or a name, but "to_field_name" works to select what you want.)

The other issue is that space names are not currently Unique, which seems very strange to me. Certainly Juju isn't going to handle that well "juju deploy --constraints spaces=foo" is going to select "1 of the spaces named foo" ?

If you're interested in something like this, I'm interested in pushing it a bit further, and I'm happy to add tests, etc, but I'd want to know I was going in an acceptable direction.

[MAAS Lander (maas-lander)]

Transitioned to Git.

lp:maas has now moved from Bzr to Git.
Please propose your branches with Launchpad using Git.

git clone https://git.launchpad.net/maas

Unmerged revisions

4458. By John A Meinel on 2015-11-04

allow friendlier names to be passed to the API instead of requiring them to be ids

=== modified file 'src/maasserver/forms_subnet.py'
--- src/maasserver/forms_subnet.py	2015-09-15 15:51:00 +0000
+++ src/maasserver/forms_subnet.py	2015-11-04 10:14:07 +0000
@@ -39,7 +39,8 @@
         min_value=0, max_value=4095, required=False)
 
     space = forms.ModelChoiceField(
-        queryset=Space.objects.all(), required=False)
+        queryset=Space.objects.all(), required=False,
+        to_field_name="name")
 
     class Meta:
         model = Subnet

=== modified file 'src/maasserver/models/space.py'
--- src/maasserver/models/space.py	2015-10-21 19:35:30 +0000
+++ src/maasserver/models/space.py	2015-11-04 10:14:07 +0000
@@ -81,7 +81,12 @@
            docs.djangoproject.com/en/dev/topics/http/views/
            #the-http404-exception
         """
-        space = get_object_or_404(self.model, id=id)
+        try:
+            int_id = int(id)
+            space = get_object_or_404(self.model, id=int_id)
+        except ValueError as e:
+            # The id passed is not a valid integer, so assume it is a name
+            space = get_object_or_404(self.model, name=id)
         if user.has_perm(perm, space):
             return space
         else:
@@ -103,7 +108,7 @@
     objects = SpaceManager()
 
     name = CharField(
-        max_length=256, editable=True, null=True, blank=True, unique=False,
+        max_length=256, editable=True, null=True, blank=True, unique=True,
         validators=[validate_space_name])
 
     def __unicode__(self):