merged master

datacenterlight/locale/de/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-17 01:31+0530\n"
+"POT-Creation-Date: 2017-09-16 14:09+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,6 +18,10 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#, python-format
+msgid "Your New VM %(vm_name)s at Data Center Light"
+msgstr "Deine neue VM %(vm_name)s bei Data Center Light"
+
 msgid "Enter name"
 msgstr "Name"
 
@@ -184,7 +188,7 @@ msgid "All Rights Reserved"
 msgstr "Alle Rechte vorbehalten"
 
 msgid "Toggle navigation"
-msgstr "umschalten"
+msgstr "Umschalten"
 
 msgid "Why Data Center Light?"
 msgstr "Warum Data Center Light?"
@@ -193,7 +197,7 @@ msgid "Login"
 msgstr "Anmelden"
 
 msgid "Dashboard"
-msgstr "Dashboard"
+msgstr ""
 
 msgid "Finally, an affordable VM hosting in Switzerland!"
 msgstr "Endlich: bezahlbares VM Hosting in der Schweiz"

datacenterlight/tasks.py

@@ -1,15 +1,22 @@
-from dynamicweb.celery import app
+from datetime import datetime
+
+from celery.exceptions import MaxRetriesExceededError
 from celery.utils.log import get_task_logger
+from celery import current_task
 from django.conf import settings
+from django.core.mail import EmailMessage
+from django.utils import translation
+from django.utils.translation import ugettext_lazy as _
+
+from dynamicweb.celery import app
+from hosting.models import HostingOrder, HostingBill
+from membership.models import StripeCustomer, CustomUser
 from opennebula_api.models import OpenNebulaManager
 from opennebula_api.serializers import VirtualMachineSerializer
-from hosting.models import HostingOrder, HostingBill
+from utils.hosting_utils import get_all_public_keys
 from utils.forms import UserBillingAddressForm
-from datetime import datetime
-from membership.models import StripeCustomer
-from django.core.mail import EmailMessage
+from utils.mailer import BaseEmail
 from utils.models import BillingAddress
-from celery.exceptions import MaxRetriesExceededError
 
 logger = get_task_logger(__name__)
 
@@ -45,25 +52,36 @@ def create_vm_task(self, vm_template_id, user, specs, template,
                    stripe_customer_id, billing_address_data,
                    billing_address_id,
                    charge, cc_details):
+    logger.debug("Running create_vm_task on {}".format(current_task.request.hostname))
     vm_id = None
     try:
         final_price = specs.get('price')
         billing_address = BillingAddress.objects.filter(
             id=billing_address_id).first()
         customer = StripeCustomer.objects.filter(id=stripe_customer_id).first()
-        # Create OpenNebulaManager
-        manager = OpenNebulaManager(email=settings.OPENNEBULA_USERNAME,
-                                    password=settings.OPENNEBULA_PASSWORD)
 
-        # Create a vm using oneadmin, also specify the name
+        if 'pass' in user:
+            on_user = user.get('email')
+            on_pass = user.get('pass')
+            logger.debug("Using user {user} to create VM".format(user=on_user))
+            vm_name = None
+        else:
+            on_user = settings.OPENNEBULA_USERNAME
+            on_pass = settings.OPENNEBULA_PASSWORD
+            logger.debug("Using OpenNebula admin user to create VM")
+            vm_name = "{email}-{template_name}-{date}".format(
+                email=user.get('email'),
+                template_name=template.get('name'),
+                date=int(datetime.now().strftime("%s")))
+
+        # Create OpenNebulaManager
+        manager = OpenNebulaManager(email=on_user, password=on_pass)
+
         vm_id = manager.create_vm(
             template_id=vm_template_id,
             specs=specs,
             ssh_key=settings.ONEADMIN_USER_SSH_PUBLIC_KEY,
-            vm_name="{email}-{template_name}-{date}".format(
-                email=user.get('email'),
-                template_name=template.get('name'),
-                date=int(datetime.now().strftime("%s")))
+            vm_name=vm_name
         )
 
         if vm_id is None:
@@ -122,6 +140,54 @@ def create_vm_task(self, vm_template_id, user, specs, template,
         }
         email = EmailMessage(**email_data)
         email.send()
+
+        if 'pass' in user:
+            lang = 'en-us' 
+            if user.get('language') is not None:
+                logger.debug("Language is set to {}".format(user.get('language')))
+                lang = user.get('language')
+            translation.activate(lang)
+            # Send notification to the user as soon as VM has been booked
+            context = {
+                'vm': vm,
+                'order': order,
+                'base_url': "{0}://{1}".format(user.get('request_scheme'),
+                                               user.get('request_host')),
+                'page_header': _(
+                    'Your New VM %(vm_name)s at Data Center Light') % {
+                                   'vm_name': vm.get('name')}
+            }
+            email_data = {
+                'subject': context.get('page_header'),
+                'to': user.get('email'),
+                'context': context,
+                'template_name': 'new_booked_vm',
+                'template_path': 'hosting/emails/',
+                'from_address': settings.DCL_SUPPORT_FROM_ADDRESS,
+            }
+            email = BaseEmail(**email_data)
+            email.send()
+
+            # try to see if we have the IP and that if the ssh keys can
+            # be configured
+            new_host = manager.get_primary_ipv4(vm_id)
+            logger.debug("New VM ID is {vm_id}".format(vm_id=vm_id))
+            if new_host is not None:
+                custom_user = CustomUser.objects.get(email=user.get('email'))
+                if custom_user is not None:
+                    public_keys = get_all_public_keys(custom_user)
+                    keys = [{'value': key, 'state': True} for key in
+                            public_keys]
+                    if len(keys) > 0:
+                        logger.debug(
+                            "Calling configure on {host} for {num_keys} keys".format(
+                                host=new_host, num_keys=len(keys)))
+                        # Let's delay the task by 75 seconds to be sure
+                        # that we run the cdist configure after the host
+                        # is up
+                        manager.manage_public_key(keys,
+                                                  hosts=[new_host],
+                                                  countdown=75)
     except Exception as e:
         logger.error(str(e))
         try:
@@ -134,8 +200,8 @@ def create_vm_task(self, vm_template_id, user, specs, template,
             email_data = {
                 'subject': '{} CELERY TASK ERROR: {}'.format(settings.DCL_TEXT,
                                                              msg_text),
-                'from_email': settings.DCL_SUPPORT_FROM_ADDRESS,
-                'to': ['info@ungleich.ch'],
+                'from_email': current_task.request.hostname,
+                'to': settings.DCL_ERROR_EMAILS_TO_LIST,
                 'body': ',\n'.join(str(i) for i in self.request.args)
             }
             email = EmailMessage(**email_data)

datacenterlight/tests.py

@@ -115,8 +115,8 @@ class CeleryTaskTestCase(TestCase):
                 'response_object').stripe_plan_id}])
         stripe_subscription_obj = subscription_result.get('response_object')
         # Check if the subscription was approved and is active
-        if stripe_subscription_obj is None or \
-                        stripe_subscription_obj.status != 'active':
+        if stripe_subscription_obj is None \
+                or stripe_subscription_obj.status != 'active':
             msg = subscription_result.get('error')
             raise Exception("Creating subscription failed: {}".format(msg))