Changeset 13019 for trunk

Timestamp:

05/25/11 16:19:08 (13 years ago)

Author:

sil

Message:

• Changed unique-constraint of Interface.hwaddress; now unique_together with Interface.network
• Added exception handling to print obj.unicode() instead of obj.label

Location:

trunk/sara_cmt

Files:

• cmt.py (modified) (1 diff)
• sara_cmt/cluster/models.py (modified) (1 diff)

trunk/sara_cmt/cmt.py

@@ -188 +188 @@
 
     if objects:
-        logger.info('Found %s entities matching query: %s'
-            % (len(objects), ', '.join([_object.label for _object in objects])))
+        # Temporary try-except. See subtrac.sara.nl/osd/interne-services/ticket/164
+        try:
+            logger.info('Found %s entities matching query: %s'
+                % (len(objects), ', '.join([_object.label for _object in objects])))
+        except AttributeError:
+            logger.info('Found %s entities matching query: %s'
+                % (len(objects), ', '.join([_object.__unicode__() for _object in objects])))
         confirmed = not parser.values.INTERACTIVE or \
             raw_input('Are you sure? [Yn] ')

trunk/sara_cmt/sara_cmt/cluster/models.py

@@ -161 +161 @@
                                  help_text="6 Octets, optionally delimited by \
                                  a space ' ', a hyphen '-', or a colon ':'.",
-                                 unique=True, validators=[hwaddress_validator])
+                                 validators=[hwaddress_validator])
     ip        = models.IPAddressField(blank=True)
 
     class Meta:
-        unique_together = ('network', 'ip')
+        unique_together = (('network', 'ip'), ('network', 'hwaddress'))
         ordering = ('host__cluster__name', 'host__rack__label', 'host__first_slot')