Move to new models

console/views.py

@@ -3,7 +3,7 @@
 from django.http import HttpResponseRedirect
 from django.template import RequestContext
 from libvirt import libvirtError
-from instance.models import Host, Instance
+from instances.models import Instance
 
 def console(request, host_id, vname):
     """

create/fixtures/initial_data.json

@@ -0,0 +1,62 @@
+[
+  {
+    "model": "create.Flavor",
+    "pk": 1,
+    "fields": {
+      "label": "micro",
+      "vcpu": "1",
+      "memory":  "512",
+      "disk":  "20"
+    }
+  },
+  {
+    "model": "create.Flavor",
+    "pk": 2,
+    "fields": {
+      "label": "mini",
+      "vcpu": "2",
+      "memory":  "1024",
+      "disk":  "30"
+    }
+  },
+  {
+    "model": "create.Flavor",
+    "pk": 3,
+    "fields": {
+      "label": "small",
+      "vcpu": "2",
+      "memory":  "2048",
+      "disk":  "40"
+    }
+  },
+  {
+    "model": "create.Flavor",
+    "pk": 4,
+    "fields": {
+      "label": "medium",
+      "vcpu": "2",
+      "memory":  "4096",
+      "disk":  "60"
+    }
+  },
+  {
+    "model": "create.Flavor",
+    "pk": 5,
+    "fields": {
+      "label": "large",
+      "vcpu": "4",
+      "memory":  "8192",
+      "disk":  "80"
+    }
+  },
+  {
+    "model": "create.Flavor",
+    "pk": 6,
+    "fields": {
+      "label": "xlarge",
+      "vcpu": "8",
+      "memory":  "16384",
+      "disk":  "160"
+    }
+  }
+]

create/forms.py

@@ -1,7 +1,9 @@
+import re
+
 from django import forms
-from instance.models import Flavor
 from django.utils.translation import ugettext_lazy as _
-import re
+
+from create.models import Flavor
 
 
 class FlavorAddForm(forms.Form):

create/models.py

@@ -2,10 +2,10 @@
 
 
 class Flavor(models.Model):
-    name = models.CharField(max_length=12)
+    label = models.CharField(max_length=12)
+    memory = models.IntegerField()
     vcpu = models.IntegerField()
-    ram = models.IntegerField()
-    hdd = models.IntegerField()
+    disk = models.IntegerField()
 
     def __unicode__(self):
         return self.name

create/views.py

@@ -8,9 +8,9 @@
 from django.template import RequestContext
 from django.utils.translation import ugettext_lazy as _
 
-from servers.models import Host
+from servers.models import Compute
 from create.models import Flavor
-from instance.models import Instance
+from instances.models import Instance
 
 from create.forms import FlavorAddForm, NewVMForm
 

instance/models.py → instances/models.py

@@ -1,11 +1,13 @@
 from django.db import models
-from servers.models import Host
+from servers.models import Compute
 
 
 class Instance(models.Model):
-    host = models.ForeignKey(Host)
+    compute = models.ForeignKey(Compute)
     name = models.CharField(max_length=12)
     uuid = models.CharField(max_length=12)
+    display_name = models.CharField(max_length=50)
+    display_description = models.CharField(max_length=255)
 
     def __unicode__(self):
         return self.name

instance/views.py → instances/views.py

@@ -2,10 +2,13 @@
 from django.http import HttpResponseRedirect, HttpResponse
 from django.template import RequestContext
 from django.utils.translation import ugettext_lazy as _
-from instance.models import Host, Instance
+from django.utils import simplejson
+
+from instances.models import Instance
+from servers.models import Compute
+
 from libvirt import libvirtError, VIR_DOMAIN_XML_SECURE
 from webvirtmgr.settings import TIME_JS_REFRESH
-from django.utils import simplejson
 
 
 def diskusage(request, host_id, vname):

network/views.py → networks/views.py

@@ -2,8 +2,10 @@
 from django.http import HttpResponseRedirect
 from django.template import RequestContext
 from django.utils.translation import ugettext_lazy as _
-from instance.models import Host
-from network.forms import AddNetPool
+
+from servers.models import Compute
+from networks.forms import AddNetPool
+
 from libvirt import libvirtError
 
 

overview/views.py

@@ -5,7 +5,7 @@
 from django.template import RequestContext
 from django.utils.translation import ugettext_lazy as _
 
-from instance.models import Host
+from instances.models import Compute
 from webvirtmgr.settings import TIME_JS_REFRESH
 
 

serverlog/models.py

@@ -0,0 +1,9 @@
+from django.db import models
+
+
+class InstanceLog(models.Model):
+    message = models.TextField()
+    date = models.DateTimeField(auto_now_add=True)
+
+    def __unicode__(self):
+        return self.message

serverlog/views.py

@@ -0,0 +1 @@
+# Create your views here.

servers/forms.py

@@ -3,10 +3,10 @@
 from django import forms
 from django.utils.translation import ugettext_lazy as _
 
-from instance.models import Host
+from instances.models import Compute
 
 
-class HostAddTcpForm(forms.Form):
+class ComputeAddTcpForm(forms.Form):
     name = forms.CharField(error_messages={'required': _('No hostname has been entered')},
                            max_length=20)
     hostname = forms.CharField(error_messages={'required': _('No IP / Domain name has been entered')},
@@ -24,8 +24,8 @@ def clean_name(self):
         elif len(name) > 20:
             raise forms.ValidationError(_('The host name must not exceed 20 characters'))
         try:
-            Host.objects.get(name=name)
-        except Host.DoesNotExist:
+            Compute.objects.get(name=name)
+        except Compute.DoesNotExist:
             return name
         raise forms.ValidationError(_('This host is already connected'))
 
@@ -38,13 +38,13 @@ def clean_hostname(self):
         elif wrong_ip:
             raise forms.ValidationError(_('Wrong IP address'))
         try:
-            Host.objects.get(hostname=hostname)
-        except Host.DoesNotExist:
+            Compute.objects.get(hostname=hostname)
+        except Compute.DoesNotExist:
             return hostname
         raise forms.ValidationError(_('This host is already connected'))
 
 
-class HostAddSshForm(forms.Form):
+class ComputeAddSshForm(forms.Form):
     name = forms.CharField(error_messages={'required': _('No hostname has been entered')},
                            max_length=20)
     hostname = forms.CharField(error_messages={'required': _('No IP / Domain name has been entered')},
@@ -74,7 +74,7 @@ def clean_hostname(self):
         elif wrong_ip:
             raise forms.ValidationError(_('Wrong IP address'))
         try:
-            Host.objects.get(hostname=hostname)
-        except Host.DoesNotExist:
+            Compute.objects.get(hostname=hostname)
+        except Compute.DoesNotExist:
             return hostname
         raise forms.ValidationError(_('This host is already connected'))

servers/models.py

@@ -1,7 +1,7 @@
 from django.db import models
 
 
-class Host(models.Model):
+class Compute(models.Model):
     name = models.CharField(max_length=20)
     hostname = models.CharField(max_length=20)
     login = models.CharField(max_length=20)