Clarify the units of ram and disk

api/tests.py

@@ -354,8 +354,8 @@ def create_flavors(n=1):
     for i in range(n):
         Flavor.objects.create(
             cpu=randint(1, 4),
-            ram=randint(1, 8) * 1024**3,
-            disk=randint(1, 20) * 1024**3)
+            ram=randint(1, 8) * 512,
+            disk=randint(1, 40))
 
 def create_images(n=1):
     users = SynnefoUser.objects.all()

db/models.py

@@ -97,8 +97,8 @@ class Limit(models.Model):
 
 class Flavor(models.Model):
     cpu = models.IntegerField('Number of CPUs', default=0)
-    ram = models.IntegerField('Size of RAM', default=0)
-    disk = models.IntegerField('Size of Disk space', default=0)
+    ram = models.IntegerField('Size of RAM', default=0)             # Size in MiB
+    disk = models.IntegerField('Size of Disk space', default=0)     # Size in GiB
     
     class Meta:
         verbose_name = u'Virtual machine flavor'