Add initial support for different Image formats

Initial support for choosing between different Image formats:

 * New field in Image model (migration needed)
 * New lvm Image in fixtures
 * Minor fixes

db/fixtures/images.json

@@ -51,6 +51,19 @@
             "format": "dump"
         }
     },
+    {
+        "model": "db.Image",
+        "pk": 7,
+        "fields": {
+            "name": "Debian base LVM",
+            "owner": 1,
+            "created": "2011-02-06 00:00:00",
+            "updated": "2011-02-06 00:00:00",
+            "state": "ACTIVE",
+            "backend_id": "debian_base",
+            "format": "lvm"
+        }
+    },
     {
         "model": "db.ImageMetadata",
         "pk": 1,
@@ -194,5 +207,41 @@
             "meta_value": "4000",
             "image": 6
         }
+    },
+    {
+        "model": "db.ImageMetadata",
+        "pk": 17,
+        "fields": {
+            "meta_key": "OS",
+            "meta_value": "debian",
+            "image": 7
+        }
+    },
+    {
+        "model": "db.ImageMetadata",
+        "pk": 18,
+        "fields": {
+            "meta_key": "kernel",
+            "meta_value": "2.6.32",
+            "image": 7
+        }
+    },
+    {
+        "model": "db.ImageMetadata",
+        "pk": 19,
+        "fields": {
+            "meta_key": "description",
+            "meta_value": "This is the same as -Debian base- but stored in a LVM format",
+            "image": 7
+        }
+    },
+    {
+        "model": "db.ImageMetadata",
+        "pk": 20,
+        "fields": {
+            "meta_key": "size",
+            "meta_value": "2000",
+            "image": 7
+        }
     }
 ]

db/migrations/0005_auto__chg_field_image_format__chg_field_image_backend_id.py

+# encoding: utf-8
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        
+        # Changing field 'Image.format'
+        db.alter_column('db_image', 'format', self.gf('django.db.models.fields.CharField')(max_length=30))
+
+        # Changing field 'Image.backend_id'
+        db.alter_column('db_image', 'backend_id', self.gf('django.db.models.fields.CharField')(max_length=50))
+
+
+    def backwards(self, orm):
+        
+        # Changing field 'Image.format'
+        db.alter_column('db_image', 'format', self.gf('django.db.models.fields.TextField')())
+
+        # Changing field 'Image.backend_id'
+        db.alter_column('db_image', 'backend_id', self.gf('django.db.models.fields.TextField')())
+
+
+    models = {
+        'db.debit': {
+            'Meta': {'object_name': 'Debit'},
+            'description': ('django.db.models.fields.TextField', [], {}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['db.SynnefoUser']"}),
+            'vm': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['db.VirtualMachine']"}),
+            'when': ('django.db.models.fields.DateTimeField', [], {})
+        },
+        'db.disk': {
+            'Meta': {'object_name': 'Disk'},
+            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['db.SynnefoUser']", 'null': 'True', 'blank': 'True'}),
+            'size': ('django.db.models.fields.PositiveIntegerField', [], {}),
+            'updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'vm': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['db.VirtualMachine']", 'null': 'True', 'blank': 'True'})
+        },
+        'db.flavor': {
+            'Meta': {'unique_together': "(('cpu', 'ram', 'disk'),)", 'object_name': 'Flavor'},
+            'cpu': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'disk': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'ram': ('django.db.models.fields.IntegerField', [], {'default': '0'})
+        },
+        'db.flavorcost': {
+            'Meta': {'object_name': 'FlavorCost'},
+            'cost_active': ('django.db.models.fields.PositiveIntegerField', [], {}),
+            'cost_inactive': ('django.db.models.fields.PositiveIntegerField', [], {}),
+            'effective_from': ('django.db.models.fields.DateTimeField', [], {}),
+            'flavor': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['db.Flavor']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
+        },
+        'db.image': {
+            'Meta': {'object_name': 'Image'},
+            'backend_id': ('django.db.models.fields.CharField', [], {'default': "'debian_base'", 'max_length': '50'}),
+            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'format': ('django.db.models.fields.CharField', [], {'default': "'dump'", 'max_length': '30'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['db.SynnefoUser']", 'null': 'True', 'blank': 'True'}),
+            'sourcevm': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['db.VirtualMachine']", 'null': 'True'}),
+            'state': ('django.db.models.fields.CharField', [], {'max_length': '30'}),
+            'updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'})
+        },
+        'db.imagemetadata': {
+            'Meta': {'object_name': 'ImageMetadata'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'image': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['db.Image']"}),
+            'meta_key': ('django.db.models.fields.CharField', [], {'max_length': '50'}),
+            'meta_value': ('django.db.models.fields.CharField', [], {'max_length': '500'})
+        },
+        'db.limit': {
+            'Meta': {'object_name': 'Limit'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '30'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['db.SynnefoUser']"}),
+            'value': ('django.db.models.fields.IntegerField', [], {})
+        },
+        'db.network': {
+            'Meta': {'object_name': 'Network'},
+            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'machines': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['db.VirtualMachine']", 'symmetrical': 'False'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['db.SynnefoUser']"}),
+            'updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'})
+        },
+        'db.synnefouser': {
+            'Meta': {'object_name': 'SynnefoUser'},
+            'auth_token': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True'}),
+            'auth_token_created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'credit': ('django.db.models.fields.IntegerField', [], {}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '255'}),
+            'realname': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '255'}),
+            'type': ('django.db.models.fields.CharField', [], {'max_length': '30'}),
+            'uniq': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}),
+            'updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'})
+        },
+        'db.virtualmachine': {
+            'Meta': {'object_name': 'VirtualMachine'},
+            'action': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True'}),
+            'backendjobid': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True'}),
+            'backendjobstatus': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True'}),
+            'backendlogmsg': ('django.db.models.fields.TextField', [], {'null': 'True'}),
+            'backendopcode': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True'}),
+            'charged': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2011, 5, 25, 11, 25, 3, 203711)'}),
+            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'deleted': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'flavor': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['db.Flavor']"}),
+            'hostid': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'ipfour': ('django.db.models.fields.IPAddressField', [], {'max_length': '15'}),
+            'ipsix': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'operstate': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True'}),
+            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['db.SynnefoUser']"}),
+            'sourceimage': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['db.Image']"}),
+            'suspended': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'})
+        },
+        'db.virtualmachinegroup': {
+            'Meta': {'ordering': "['name']", 'object_name': 'VirtualMachineGroup'},
+            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'machines': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['db.VirtualMachine']", 'symmetrical': 'False'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['db.SynnefoUser']"}),
+            'updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'})
+        },
+        'db.virtualmachinemetadata': {
+            'Meta': {'object_name': 'VirtualMachineMetadata'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'meta_key': ('django.db.models.fields.CharField', [], {'max_length': '50'}),
+            'meta_value': ('django.db.models.fields.CharField', [], {'max_length': '500'}),
+            'vm': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['db.VirtualMachine']"})
+        }
+    }
+
+    complete_apps = ['db']

db/models.py

@@ -64,14 +64,20 @@ class Image(models.Model):
         ('DELETED', 'Deleted')
     )
 
+    # The list of supported Image formats
+    FORMATS = (
+        ('dump', 'ext2 dump'),
+        ('lvm', 'lvm snapshot')
+    )
+
     name = models.CharField('Image name', max_length=255)
     state = models.CharField('Current Image State', choices=IMAGE_STATES, max_length=30)
     owner = models.ForeignKey(SynnefoUser, blank=True, null=True)
     created = models.DateTimeField('Time of creation', auto_now_add=True)
     updated = models.DateTimeField('Time of last update', auto_now=True)
     sourcevm = models.ForeignKey("VirtualMachine", null=True)
-    backend_id = models.TextField(default='debian_base')
-    format = models.TextField(default='dump')
+    backend_id = models.CharField(max_length=50, default='debian_base')
+    format = models.CharField(choices=FORMATS, max_length=30, default='dump')
 
     class Meta:
         verbose_name = u'Image'

logic/backend.py

@@ -107,7 +107,7 @@ def create_instance(vm, flavor, image, password):
         pnode=rapi.GetNodes()[0],       #TODO: verify if this is necessary
         dry_run=settings.TEST,
         beparams=dict(auto_balance=True, vcpus=flavor.cpu, memory=flavor.ram),
-        osparams=dict(img_id=image.backend_id, img_passwd=password))
+        osparams=dict(img_id=image.backend_id, img_passwd=password, img_format=image.format))
 
 def delete_instance(vm):
     start_action(vm, 'DESTROY')