Revision b65a3b04
| b/snf-cyclades-app/synnefo/db/models.py | ||
|---|---|---|
| 65 | 65 |
@property |
| 66 | 66 |
def name(self): |
| 67 | 67 |
"""Returns flavor name (generated)""" |
| 68 |
return u'C%dR%dD%d' % (self.cpu, self.ram, self.disk) |
|
| 68 |
return u'C%dR%dD%d%s' % (self.cpu, self.ram, self.disk, |
|
| 69 |
self.disk_template) |
|
| 69 | 70 |
|
| 70 | 71 |
def __unicode__(self): |
| 71 | 72 |
return str(self.id) |
| b/snf-cyclades-app/synnefo/db/tests.py | ||
|---|---|---|
| 48 | 48 |
class FlavorTest(TestCase): |
| 49 | 49 |
def test_flavor_name(self): |
| 50 | 50 |
"""Test a flavor object name method.""" |
| 51 |
flavor = mfact.FlavorFactory(cpu=1, ram=1024, disk=40) |
|
| 52 |
self.assertEqual(flavor.name, "C1R1024D40", "flavor.name is not" |
|
| 53 |
" generated correctly. Name is %s instead of C1R1055D40" % |
|
| 51 |
flavor = mfact.FlavorFactory(cpu=1, ram=1024, disk=40, |
|
| 52 |
disk_template="temp") |
|
| 53 |
self.assertEqual(flavor.name, "C1R1024D40temp", "flavor.name is not" |
|
| 54 |
" generated correctly. Name is %s instead of C1R1024D40temp" % |
|
| 54 | 55 |
flavor.name) |
| 55 | 56 |
|
| 56 | 57 |
|
Also available in: Unified diff