Merge lp:~julian-edwards/maas/ui-fixes into lp:~maas-committers/maas/trunk

[Julian Edwards]

In the cluster interface edit page, 1. Have consistent capitalisation of "IP", 2. introduce help text for all the fields.

[Jeroen T. Vermeulen (jtv)]

Thanks for fixing this. I believe there's a MAC field that gets displayed as Mac as well... I might just do that next when I have time to fill.

The router_ip help string says “IP of this network's router given to DHCP clients” — should that be _to be_ given to DHCP clients?

Does it need saying that the static and dynamic ranges must be disjoint?

review: Approve

[Julian Edwards (julian-edwards)]

Thanks for reviewing.

On 18/06/14 17:48, Jeroen T. Vermeulen wrote:
> Review: Approve
>
> Thanks for fixing this. I believe there's a MAC field that gets displayed as Mac as well... I might just do that next when I have time to fill.
>
> The router_ip help string says “IP of this network's router given to DHCP clients” — should that be _to be_ given to DHCP clients?

I think that's more wordy and essentially makes no difference to the
reader's understanding of what will happen.

>
> Does it need saying that the static and dynamic ranges must be disjoint?
>

Well if they are not disjoint the user will quickly find out about that :)

But you raise an interesting point that I was pondering over anyway -
where do we put general help text for the whole form? We don't have a
good way of doing this AFAIK.

=== modified file 'src/maasserver/models/nodegroupinterface.py'
--- src/maasserver/models/nodegroupinterface.py	2014-06-11 04:38:41 +0000
+++ src/maasserver/models/nodegroupinterface.py	2014-06-18 07:18:43 +0000
@@ -54,7 +54,8 @@
     # Static IP of the interface.
     ip = GenericIPAddressField(
         null=False, editable=True,
-        help_text="Static IP Address of the interface")
+        help_text="Static IP Address of the interface",
+        verbose_name="IP")
 
     # The `NodeGroup` this interface belongs to.
     nodegroup = ForeignKey(
@@ -69,25 +70,36 @@
         blank=True, editable=True, max_length=255, default='',
         help_text="Name of this interface (e.g. 'em1').")
     subnet_mask = GenericIPAddressField(
-        editable=True, unique=False, blank=True, null=True, default=None)
+        editable=True, unique=False, blank=True, null=True, default=None,
+        help_text="e.g. 255.255.255.0")
     broadcast_ip = GenericIPAddressField(
-        editable=True, unique=False, blank=True, null=True, default=None)
+        editable=True, unique=False, blank=True, null=True, default=None,
+        verbose_name="Broadcast IP",
+        help_text="e.g. 192.168.1.255")
     router_ip = GenericIPAddressField(
-        editable=True, unique=False, blank=True, null=True, default=None)
+        editable=True, unique=False, blank=True, null=True, default=None,
+        verbose_name="Router IP",
+        help_text="IP of this network's router given to DHCP clients")
     ip_range_low = GenericIPAddressField(
         editable=True, unique=False, blank=True, null=True, default=None,
-        help_text="Lowest IP number of the range for dynamic IPs.")
+        verbose_name="DHCP dynamic IP range low value",
+        help_text="Lowest IP number of the range for dynamic IPs, used for "
+                  "enlistment, commissioning and unknown devices.")
     ip_range_high = GenericIPAddressField(
         editable=True, unique=False, blank=True, null=True, default=None,
-        help_text="Highest IP number of the range for dynamic IPs.")
+        verbose_name="DHCP dynamic IP range high value",
+        help_text="Highest IP number of the range for dynamic IPs, used for "
+                  "enlistment, commissioning and unknown devices.")
     static_ip_range_low = GenericIPAddressField(
         editable=True, unique=False, blank=True, null=True, default=None,
-        help_text="Lowest IP number of the range for static IPs, must be same"
-                  " network as dynamic range.")
+        verbose_name="Static IP range low value",
+        help_text="Lowest IP number of the range for IPs given to allocated "
+                  "nodes, must be in same network as dynamic range.")
     static_ip_range_high = GenericIPAddressField(
         editable=True, unique=False, blank=True, null=True, default=None,
-        help_text="Highest IP number of the range for static IPs, must be same"
-                  " network as dynamic range.")
+        verbose_name="Static IP range high value",
+        help_text="Highest IP number of the range for IPs given to allocated "
+                  "nodes, must be in same network as dynamic range.")
 
     # Foreign DHCP server address, if any, that was detected on this
     # interface.