one: remove occi code from models.py

fixes #122

cloud/settings.py

@@ -194,6 +194,11 @@ AUTH_PROFILE_MODULE = 'school.Person'
 
 
 import djcelery
 import djcelery
 djcelery.setup_loader()
 djcelery.setup_loader()
+
+CELERY_CACHE_BACKEND = "default"
+CELERY_RESULT_BACKEND = "amqp"
+CELERY_TASK_RESULT_EXPIRES = 3600
+
 BROKER_URL = 'amqp://nyuszi:teszt@localhost:5672/django'
 BROKER_URL = 'amqp://nyuszi:teszt@localhost:5672/django'
 CELERY_ROUTES = {
 CELERY_ROUTES = {
     'firewall.tasks.ReloadTask': {'queue': 'local'},
     'firewall.tasks.ReloadTask': {'queue': 'local'},
@@ -203,7 +208,14 @@ CELERY_ROUTES = {
     'firewall.tasks.reload_blacklist_task': {'queue': 'firewall'},
     'firewall.tasks.reload_blacklist_task': {'queue': 'firewall'},
     'firewall.tasks.Periodic': {'queue': 'local'},
     'firewall.tasks.Periodic': {'queue': 'local'},
     'one.tasks.SendMailTask': {'queue': 'local'},
     'one.tasks.SendMailTask': {'queue': 'local'},
-    'one.tasks.UpdateInstanceStateTask': {'queue': 'local'}
+    'one.tasks.UpdateInstanceStateTask': {'queue': 'local'},
+    'one.tasks.UpdateDiskTask': {'queue': 'opennebula'},
+    'one.tasks.UpdateNetworkTask': {'queue': 'opennebula'},
+    'one.tasks.ChangeInstanceStateTask': {'queue': 'opennebula'},
+    'one.tasks.SaveAsTask': {'queue': 'opennebula'},
+    'one.tasks.CreateInstanceTask': {'queue': 'opennebula'},
+    'one.tasks.DeleteInstanceTask': {'queue': 'opennebula'},
+
 }
 }
 
 
 CACHES = {
 CACHES = {

miscellaneous/celery/opennebula_celery.py

+#!/usr/bin/env python
+
+import subprocess
+from celery import Celery, task
+import time, re
+import socket
+import sys
+import tempfile, os, stat, re, base64, struct, logging          
+from celery.contrib import rdb
+
+
+BROKER_URL = 'amqp://nyuszi:teszt@localhost:5672/django'
+try:
+    from local_settings import *
+except:
+    pass
+celery = Celery('tasks', broker=BROKER_URL, backend=BROKER_URL)
+celery.conf.update(
+    CELERY_TASK_RESULT_EXPIRES=3600,
+)
+
+def update_vm(one_id, template):
+    out = ""
+    with tempfile.NamedTemporaryFile(delete=False) as f:
+        os.chmod(f.name, stat.S_IRUSR|stat.S_IWUSR|stat.S_IRGRP|stat.S_IROTH)
+        tpl = u'''
+            <COMPUTE>
+            <ID>%(id)d</ID>
+                %(template)s
+            </COMPUTE>''' % {
+                    "id": one_id,
+                    "template": template
+        }
+        f.write(tpl)
+        f.close()
+        proc = subprocess.Popen(["/opt/occi.sh", "compute", "update",
+            f.name], stdout=subprocess.PIPE)
+        try:
+            (out, err) = proc.communicate()
+        except:
+            pass
+        os.unlink(f.name)
+
+
+@task(name="one.tasks.CreateInstanceTask")
+def t(name, instance_type, disk_id, network_id, ctx):
+    out = ''
+    f2 = tempfile.NamedTemporaryFile(delete=False)
+    f2.close()
+    with tempfile.NamedTemporaryFile(delete=False) as f:
+        os.chmod(f.name, stat.S_IRUSR|stat.S_IWUSR|stat.S_IRGRP|stat.S_IROTH)
+        tpl = u"""
+                <COMPUTE>
+                    <NAME>%(name)s</NAME>
+                    <INSTANCE_TYPE href="http://www.opennebula.org/instance_type/%(instance)s"/>
+                    <DISK>
+                        <STORAGE href="http://www.opennebula.org/storage/%(disk)d"/>
+                    </DISK>
+                    <NIC>
+                        <NETWORK href="http://www.opennebula.org/network/%(net)d"/>
+                    </NIC>
+                    <CONTEXT>
+                        %(context)s
+                    </CONTEXT>
+                </COMPUTE>""" % {
+                        "name": name,
+                        "instance": instance_type,
+                        "disk": disk_id,
+                        "net": network_id,
+                        "context": ctx,
+                }
+        f.write(tpl)
+        f.close()
+        proc = subprocess.Popen(["/opt/occi.sh compute creatE %s > %s" %
+                ( f.name, f2.name )], shell=True)
+        try:
+            proc.communicate()
+        except:
+            pass
+        with open(f2.name, 'r') as f3:
+            out = f3.read()
+        os.unlink(f.name)
+        os.unlink(f2.name)
+
+    from xml.dom.minidom import parse, parseString
+    try:
+        x = parseString(out)
+        return { 
+            'one_id': int(x.getElementsByTagName("ID")[0].childNodes[0].nodeValue),
+            'interfaces': [
+                {
+                    'ip': x.getElementsByTagName("IP")[0].childNodes[0].nodeValue,
+                    'mac': x.getElementsByTagName("MAC")[0].childNodes[0].nodeValue,
+                },
+            ],
+        }
+    except:
+        pass
+
+@task(name="one.tasks.ChangeInstanceStateTask")
+def t(one_id, new_state):
+    update_vm(one_id, '<STATE>%s</STATE>' % (new_state, ))
+
+@task(name="one.tasks.SaveAsTask")
+def t(one_id, new_img):
+    update_vm(one_id, '<DISK id="0"><SAVE_AS name="%s"/></DISK>' % new_img)
+
+@task(name="one.tasks.UpdateDiskTask")
+def t():
+    f = tempfile.NamedTemporaryFile(delete=False)                          
+    f.close()
+    out=''
+    proc = subprocess.Popen(["/opt/occi.sh storage list > %s" % f.name],
+            shell=True)
+    try:
+        (out, err) = proc.communicate()
+    except:
+        pass
+    from xml.dom.minidom import parse, parseString
+    try:
+        with open(f.name, 'r') as f2:
+            out = f2.read()
+        x = parseString(out)
+        return [ {
+                'id': int(d.getAttributeNode('href').nodeValue.split('/')[-1]),
+                'name': d.getAttributeNode('name').nodeValue,
+            } for d in x.getElementsByTagName("STORAGE")
+        ]
+    except:
+        pass
+    os.unlink(f)
+
+@task(name="one.tasks.UpdateNetworkTask")
+def t():
+    f = tempfile.NamedTemporaryFile(delete=False)                          
+    f.close()
+    out=''
+    proc = subprocess.Popen(["/opt/occi.sh network list > %s" % f.name],
+            shell=True)
+    try:
+        (out, err) = proc.communicate()
+    except:
+        pass
+    from xml.dom.minidom import parse, parseString
+    try:
+        with open(f.name, 'r') as f2:
+            out = f2.read()
+        x = parseString(out)
+        return [ {
+                'id': int(d.getAttributeNode('href').nodeValue.split('/')[-1]),
+                'name': d.getAttributeNode('name').nodeValue,
+            } for d in x.getElementsByTagName("NETWORK")
+        ]
+    except:
+        pass
+    os.unlink(f)
+
+@task(name="one.tasks.DeleteInstanceTask")
+def t(one_id):
+    proc = subprocess.Popen(["/opt/occi.sh", "compute", "delete",
+            "%d" % one_id], stdout=subprocess.PIPE)
+    try:
+        (out, err) = proc.communicate()
+    except:
+        pass
+
+def update_state(one_id):
+    """Get and update VM state from OpenNebula."""
+    proc = subprocess.Popen(["/opt/occi.sh", "compute", "show",
+            "%d" % one_id], stdout=subprocess.PIPE)
+    (out, err) = proc.communicate()
+    state = 'UNKNOWN'
+    try:
+        from xml.dom.minidom import parse, parseString
+        x = parseString(out)
+        state = x.getElementsByTagName("STATE")[0].childNodes[0].nodeValue
+    except:
+        state = 'UNKNOWN'
+
+    print state
+    celery.send_task('one.tasks.UpdateInstanceStateTask', [one_id, state],
+            queue='local')
+
+if __name__ == "__main__":
+    update_state(int(sys.argv[1]))
+

miscellaneous/celery/update_state.py

-#!/usr/bin/env python
-
-from celery import Celery, task
-import subprocess
-import time, re
-import socket
-import sys
-
-BROKER_URL = 'amqp://nyuszi:teszt@localhost:5672/django'
-try:
-    from local_settings import *
-except:
-    pass
-CELERY_CREATE_MISSING_QUEUES=True
-celery = Celery('tasks', broker=BROKER_URL)
-
-
-def main(argv):
-    celery.send_task('one.tasks.UpdateInstanceStateTask', [ int(sys.argv[1]),
-        ], queue='local')
-
-if __name__ == "__main__":
-    main(sys.argv)

one/tasks.py

@@ -16,14 +16,44 @@ class SendMailTask(Task):
 
 
 
 
 class UpdateInstanceStateTask(Task):
 class UpdateInstanceStateTask(Task):
-    def run(self, one_id):
+    def run(self, one_id, new_state):
         print one_id
         print one_id
         try:
         try:
             inst = Instance.objects.get(one_id=one_id)
             inst = Instance.objects.get(one_id=one_id)
         except:
         except:
             print 'nincs ilyen'
             print 'nincs ilyen'
             return
             return
-        inst.update_state()
+        inst.state = new_state
         inst.waiting = False
         inst.waiting = False
         inst.save()
         inst.save()
+        if inst.template.state == 'SAVING':
+            inst.check_if_is_save_as_done()
         print inst.state
         print inst.state
+
+# ezek csak azert vannak felveve, hogy szepen meg lehessen hivni oket
+# ezeket a fejgepen futo celery futtatja
+
+class CreateInstanceTask(Task):
+    def run(self, name, instance_type, disk_id, network_id, ctx):
+        pass
+
+class DeleteInstanceTask(Task):
+    def run(self, one_id):
+        pass
+
+class ChangeInstanceStateTask(Task):
+    def run(self, one_id, new_state):
+        pass
+
+class SaveAsTask(Task):
+    def run(self, one_id, new_img):
+        pass
+
+class UpdateDiskTask(Task):
+    def run(self):
+        pass
+
+class UpdateNetworkTask(Task):
+    def run(self):
+        pass
+

one/views.py

@@ -16,7 +16,7 @@ from django.template import RequestContext
 from django.template.loader import render_to_string
 from django.template.loader import render_to_string
 from django.utils.decorators import method_decorator
 from django.utils.decorators import method_decorator
 from django.utils.translation import get_language as lang
 from django.utils.translation import get_language as lang
-from django.utils.translation import ugettext_lazy as _, ungettext_lazy
+from django.utils.translation import ugettext_lazy as _
 from django.views.decorators.http import *
 from django.views.decorators.http import *
 from django.views.generic import *
 from django.views.generic import *
 from firewall.tasks import *
 from firewall.tasks import *
@@ -300,7 +300,7 @@ def _check_quota(request, template, share):
 @login_required
 @login_required
 def vm_new(request, template=None, share=None, redir=True):
 def vm_new(request, template=None, share=None, redir=True):
     base = None
     base = None
-    extra = None
+    extra = ''
     if template:
     if template:
         base = get_object_or_404(Template, pk=template)
         base = get_object_or_404(Template, pk=template)
     else:
     else:
@@ -460,7 +460,7 @@ class VmDeleteView(View):
             inst = get_object_or_404(Instance, id=iid, owner=request.user)
             inst = get_object_or_404(Instance, id=iid, owner=request.user)
             if inst.template.state != 'READY' and inst.template.owner == request.user:
             if inst.template.state != 'READY' and inst.template.owner == request.user:
                 inst.template.delete()
                 inst.template.delete()
-            inst.delete()
+            inst.one_delete()
             messages.success(request, _('Virtual machine is successfully deleted.'))
             messages.success(request, _('Virtual machine is successfully deleted.'))
         except:
         except:
             messages.error(request, _('Failed to delete virtual machine.'))
             messages.error(request, _('Failed to delete virtual machine.'))
@@ -484,21 +484,12 @@ def vm_unshare(request, id, *args, **kwargs):
     if not g.owners.filter(user=request.user).exists():
     if not g.owners.filter(user=request.user).exists():
         raise PermissionDenied()
         raise PermissionDenied()
     try:
     try:
-        n = s.get_running()
-        m = s.get_running_or_stopped()
-        if n > 0:
-            messages.error(request, ungettext_lazy('There is a machine running of this share.',
-                    'There are %(n)d machines running of this share.', n) %
-                    {'n' : n})
-        elif m > 0:
-            messages.error(request, ungettext_lazy('There is a suspended machine of this share.', 
-                'There are %(m)d suspended machines of this share.', m) % 
-                {'m' : m})
+        if s.get_running_or_stopped() > 0:
+            messages.error(request, _('There are machines running of this share.'))
         else:
         else:
             s.delete()
             s.delete()
             messages.success(request, _('Share is successfully removed.'))
             messages.success(request, _('Share is successfully removed.'))
-    except Exception as e:
-        print e
+    except:
         messages.error(request, _('Failed to remove share.'))
         messages.error(request, _('Failed to remove share.'))
     return redirect(g)
     return redirect(g)