Revision 7c714455 snf-cyclades-app/synnefo/db/models.py

b/snf-cyclades-app/synnefo/db/models.py
374 374
        get_latest_by = 'created'
375 375

  
376 376
    def __unicode__(self):
377
        return "<vm: %s>" % str(self.id)
377
        return u"<vm:%s@backend:%s>" % (self.id, self.backend_id)
378 378

  
379 379
    # Error classes
380 380
    class InvalidBackendIdError(Exception):
......
687 687
    ipv6 = models.CharField(max_length=100, null=True)
688 688
    firewall_profile = models.CharField(choices=FIREWALL_PROFILES,
689 689
                                        max_length=30, null=True)
690
    dirty = models.BooleanField(default=False)
691 690
    state = models.CharField(max_length=32, null=False, default="ACTIVE",
692 691
                             choices=STATES)
693 692

  
693
    @property
694
    def backend_uuid(self):
695
        """Return the backend id by prepending backend-prefix."""
696
        return "%snic-%s" % (settings.BACKEND_PREFIX_ID, str(self.id))
697

  
694 698
    def __unicode__(self):
695 699
        return "<%s:vm:%s network:%s ipv4:%s ipv6:%s>" % \
696
            (self.index, self.machine_id, self.network_id, self.ipv4,
700
            (self.id, self.machine_id, self.network_id, self.ipv4,
697 701
             self.ipv6)
698 702

  
699 703
    @property

Also available in: Unified diff