Adding a few features

openstack_lease_it/config/config.ini

@@ -29,4 +29,11 @@ password = secret
 email_header = admin@example.com
 subject=Cloud@VD notification
 link=https://lease-it.lal.in2p3.fr
-default_domain=default.example.com
+default_domain=default.example.com
+
+[project-01]
+exclude = True
+
+[user_id_2]
+exclude = True
+duration = 120

openstack_lease_it/lease_it/backend/OpenstackConnection.py

@@ -2,6 +2,7 @@
 """
 This module manage interaction between application and
 OpenStack cloud infrastructure
+
 """
 import math
 
@@ -20,6 +21,8 @@
 from lease_it.datastore import InstancesAccess, LEASE_DURATION
 from lease_it.backend.Exceptions import PermissionDenied
 
+from lease_it.models import Instances
+
 # Define nova client version as a constant
 NOVA_VERSION = 2
 
@@ -62,7 +65,9 @@ def _instances(self):
         List of instances actually launched
         :return: dict()
         """
-        response = cache.get('instances')
+        response = None
+        if not eval(GLOBAL_CONFIG['RESET_CACHE']):
+            response = cache.get('instances')
         if not response:
             response = dict()
             nova = nvclient.Client(NOVA_VERSION, session=self.session)
@@ -104,7 +109,9 @@ def _flavors(self):
         List of flavors and their details
         """
         # We retrieve information from memcached
-        response = cache.get('flavors')
+        response = None
+        if not eval(GLOBAL_CONFIG['RESET_CACHE']):
+            response = cache.get('flavors')
         if not response:
             response = dict()
             nova = nvclient.Client(NOVA_VERSION, session=self.session)
@@ -124,7 +131,9 @@ def _domains(self):
         List all domains available
         :return: dict()
         """
-        response = cache.get('domains')
+        response = None
+        if not eval(GLOBAL_CONFIG['RESET_CACHE']):
+            response = cache.get('domains')
         if not response:
             response = dict()
             keystone = ksclient.Client(session=self.session)
@@ -146,7 +155,9 @@ def _users(self):
         so we return a None object
         :return: dict()
         """
-        response = cache.get('users')
+        response = None
+        if not eval(GLOBAL_CONFIG['RESET_CACHE']):
+            response = cache.get('users')
         if not response:
             response = dict()
             keystone = ksclient.Client(session=self.session)
@@ -288,44 +299,93 @@ def lease_instance(request, instance_id):
                 not request.user.is_superuser:
             raise PermissionDenied(request.user.id, instance_id)
         InstancesAccess.lease(data_instances[instance_id])
+        InstancesAccess.heartbeat(data_instances[instance_id])
         return data_instances[instance_id]
 
+    def delete(self, instances_to_delete):
+        """
+        Deletes the VM with the id given in parameter
+
+        :param instances_to_delete: list of instances to delete
+        :return: void
+        """
+        if eval(GLOBAL_CONFIG['OS_DELETE']):
+            nova = nvclient.Client(NOVA_VERSION, session=self.session)
+            instance_list = nova.servers.list(search_opts={'all_tenants': 'true'})
+            for instance in instance_list:
+                for to_delete in instances_to_delete:
+                    if instance.id == to_delete['id']:
+                        instance.delete()
+        else:
+            print("Deleted the instances from Openstack")
+        cache.delete('instances')
+
     def spy_instances(self):
         """
         spy_instances is started by instance_spy module and check all running VM + notify user
-        if a VM is close to its lease time
+        if a VM is close to its lease time + update lease duration according to the lease duration settings
 
         :return: dict()
         """
         now = date.today()
         data_instances = InstancesAccess.show(self._instances())
+        users = self._users()
+        projects = self.projects()
         response = {
             'delete': list(),  # List of instance we must delete
             'notify': list()  # List of instance we must notify user to renew the lease
         }
         for instance in data_instances:
-            # We mark the VM as showed
+            # We mark the VM as shown
             InstancesAccess.heartbeat(data_instances[instance])
+            user_name = users[data_instances[instance]['user_id']]['name']
+            instance_name = data_instances[instance]['name']
+            project_name = projects[data_instances[instance]['project_id']]['name']
             leased_at = data_instances[instance]['leased_at']
             lease_end = data_instances[instance]['lease_end']
+            lease_duration = LEASE_DURATION
+            # If the instance benefits from a special lease (from its user_name, instance_id or project_id),
+            # we update the lease_duration (used to determine whether to delete it or not)
+            # and the instance's lease duration
+            # Special lease are ordered in the following priority order :
+            # instance_id > instance_name > user_name > project_id > project_name
+            if data_instances[instance]['id'] in GLOBAL_CONFIG['SPECIAL_LEASE_DURATION']:
+                lease_duration = GLOBAL_CONFIG['SPECIAL_LEASE_DURATION'][data_instances[instance]['id']]
+            elif instance_name in GLOBAL_CONFIG['SPECIAL_LEASE_DURATION']:
+                lease_duration = GLOBAL_CONFIG['SPECIAL_LEASE_DURATION'][instance_name]
+            elif user_name in GLOBAL_CONFIG['SPECIAL_LEASE_DURATION']:
+                lease_duration = GLOBAL_CONFIG['SPECIAL_LEASE_DURATION'][user_name]
+            elif data_instances[instance]['project_id'] in GLOBAL_CONFIG['SPECIAL_LEASE_DURATION']:
+                lease_duration = GLOBAL_CONFIG['SPECIAL_LEASE_DURATION'][data_instances[instance]['project_id']]
+            elif project_name in GLOBAL_CONFIG['SPECIAL_LEASE_DURATION']:
+                lease_duration = GLOBAL_CONFIG['SPECIAL_LEASE_DURATION'][project_name]
+
+            model = Instances.objects.get(id=data_instances[instance]['id'])
+            model.lease_duration = lease_duration
+            model.save()
+
             # If it's a new instance, we put lease value as today
             # it's not necessary to lease on model as heartbeat should have create and
             # lease the virtual machine
             if leased_at is None:
-                lease_end = now + relativedelta(days=+LEASE_DURATION)
-            first_notification_date = lease_end - relativedelta(days=+LEASE_DURATION/3)
-            second_notification_date = lease_end - relativedelta(days=+LEASE_DURATION/6)
+                lease_end = now + relativedelta(days=+lease_duration)
+            first_notification_date = lease_end - relativedelta(days=+lease_duration/3)
+            second_notification_date = lease_end - relativedelta(days=+lease_duration/6)
             LOGGER_INSTANCES.info(
                 "Instance: %s will be notify %s and %s",
                 data_instances[instance]['id'],
                 first_notification_date,
-                second_notification_date
+                second_notification_date,
             )
-            # If lease as expire we tag it as delete
-            if lease_end < now:
+            # If lease has expired and it's not in the excluded projects, we tag it as delete
+            if lease_end < now and project_name not in GLOBAL_CONFIG["EXCLUDE"] and \
+                    user_name not in GLOBAL_CONFIG["EXCLUDE"] and \
+                    instance_name not in GLOBAL_CONFIG["EXCLUDE"]:
                 response['delete'].append(data_instances[instance])
             elif first_notification_date == now or \
                     second_notification_date == now or \
                     lease_end < now - relativedelta(days=-6):
                 response['notify'].append(data_instances[instance])
+        cache.delete("instances")
         return response
+

openstack_lease_it/lease_it/backend/TestConnection.py

@@ -13,6 +13,7 @@
     - _users()
     - _projects()
 """
+
 from django.utils.dateparse import parse_datetime
 from django.core.cache import cache
 
@@ -21,10 +22,13 @@
 from lease_it.backend.Exceptions import PermissionDenied
 
 
+from openstack_lease_it.settings import GLOBAL_CONFIG
+
+
 class TestConnection(OpenstackConnection):
     """
-    This class is only used for developement. This will
-    return false value formated as expected by views.
+    This class is only used for development. This will
+    return plausible values formatted as expected by views.
     """
     def __init__(self):
         self.session = None
@@ -36,26 +40,28 @@ def _instances(self):
 
         :return: dict()
         """
-        response = cache.get('instances')
+        response = None
+        if not eval(GLOBAL_CONFIG['RESET_CACHE']):
+            response = cache.get('instances')
         if not response:
             response = {
                 'instance-01': {
                         'user_id': 1,
                         'project_id': 'project-01',
                         'id': 'instance-01',
                         'name': 'instance-name-01',
-                        'created_at': parse_datetime('2017-04-29T17:40:26Z').date()
+                        'created_at': parse_datetime('2016-04-29T17:40:26Z').date()
                     },
                 'instance-02': {
                     'user_id': 1,
-                    'project_id': 'project-01',
+                    'project_id': 'project-02',
                     'id': 'instance-02',
                     'name': 'instance-name-02',
                     'created_at': parse_datetime('2017-10-29T17:40:26Z').date()
                 },
                 'instance-03': {
                     'user_id': 2,
-                    'project_id': 'project-01',
+                    'project_id': 'project-02',
                     'id': 'instance-03',
                     'name': 'instance-name-03',
                     'created_at': parse_datetime('2016-04-29T17:40:26Z').date()
@@ -85,7 +91,9 @@ def _flavors(self):
 
         :return: dict()
         """
-        response = cache.get('flavors')
+        response = None
+        if not eval(GLOBAL_CONFIG['RESET_CACHE']):
+            response = cache.get('flavors')
         if not response:
             response = {
                 'flavor.01': {
@@ -138,7 +146,9 @@ def _domains(self):
 
         :return: dict()
         """
-        response = cache.get('domains')
+        response = None
+        if not eval(GLOBAL_CONFIG['RESET_CACHE']):
+            response = cache.get('domains')
         if not response:
             response = {
                 'domain-01': {
@@ -160,7 +170,9 @@ def _users(self):
 
         :return: dict()
         """
-        response = cache.get('users')
+        response = None
+        if not eval(GLOBAL_CONFIG['RESET_CACHE']):
+            response = cache.get('users')
         if not response:
             response = {
                 1: {
@@ -186,4 +198,12 @@ def _projects(self):
 
         :return: dict()
         """
-        return dict()
+        return dict()
+
+    def delete(self, instance_id):
+        """
+        Notifies in the terminal the instance that tried to be deleted, as it can't because it's a test connection
+
+        :return: void
+        """
+        print("Deleted the instance " + instance_id + " from Openstack")

openstack_lease_it/lease_it/backend/__init__.py

@@ -1,6 +1,6 @@
 # pylint: skip-file
 # -*- coding: utf-8 -*-
 
-from OpenstackConnection import *
-from TestConnection import *
-from Exceptions import *
+from lease_it.backend.OpenstackConnection import *
+from lease_it.backend.TestConnection import *
+from lease_it.backend.Exceptions import *

openstack_lease_it/lease_it/client/run.py

@@ -5,10 +5,14 @@
 """
 import os
 from collections import defaultdict
-from lease_it.notification.MailNotification import MailNotification
+
 
 os.environ['DJANGO_SETTINGS_MODULE'] = "openstack_lease_it.settings"
 
+from lease_it.notification.MailNotification import MailNotification
+from lease_it.datastore.ModelAccess import InstancesAccess
+
+
 from lease_it import backend  # pylint: disable=wrong-import-position
 from openstack_lease_it.settings import GLOBAL_CONFIG  # pylint: disable=wrong-import-position
 
@@ -30,6 +34,9 @@ def instance_spy():
         notification[notification_type] = defaultdict(list)
         for instance in instances[notification_type]:
             notification[notification_type][instance['user_id']].append(instance)
+            if notification_type == "delete":
+                InstancesAccess.delete(instance['id'])
+    BACKEND.delete(instances['delete'])
     notify = MailNotification(users)
     notify.send(notification)
 

openstack_lease_it/lease_it/datastore/ModelAccess.py

@@ -2,7 +2,6 @@
 """
 ModelAccess module is a interface between Django model and view
 """
-
 from dateutil.relativedelta import relativedelta
 
 from django.utils import timezone
@@ -13,17 +12,16 @@
 from lease_it.datastore.Exceptions import StillRunning
 
 from openstack_lease_it.settings import LOGGER_INSTANCES
+from openstack_lease_it.settings import GLOBAL_CONFIG
 
 # Default lease duration in day
 LEASE_DURATION = 90
-# Number of day we keep instance in database
-HEARTBEAT_TIMEOUT = 7
 
 
 class InstancesAccess(object):  # pylint: disable=too-few-public-methods
     """
     ModelAccess is a class will abstract model access for application. It
-    will get / save / ... informations in a format expected by views
+    will get / save / ... information in a format expected by views
     """
     @staticmethod
     def get(instance):
@@ -42,6 +40,12 @@ def get(instance):
             model.leased_at = timezone.now()
             model.heartbeat_at = timezone.now()
             model.lease_duration = LEASE_DURATION
+            if instance['id'] in GLOBAL_CONFIG['SPECIAL_LEASE_DURATION']:
+                model.lease_duration = GLOBAL_CONFIG['SPECIAL_LEASE_DURATION'][instance['id']]
+            elif instance['name'] in GLOBAL_CONFIG['SPECIAL_LEASE_DURATION']:
+                model.lease_duration = GLOBAL_CONFIG['SPECIAL_LEASE_DURATION'][instance['name']]
+            # The different lease durations according to users and projects
+            # will be adapted once spy_instance has run once
         return model
 
     @staticmethod
@@ -133,8 +137,10 @@ def delete(instance_id):
         """
         try:
             model = Instances.objects.get(id=instance_id)  # pylint: disable=no-member
-            if model.heartbeat_at + relativedelta(days=+HEARTBEAT_TIMEOUT) > timezone.now().date():
-                raise StillRunning(model.id, model.heartbeat_at)
+            # To let the users delete their own instances, we have to disable the StillRunning error
+            #if model.leased_at + relativedelta(days=+model.lease_duration) >\
+            #        timezone.now().date():
+            #    raise StillRunning(model.id, model.heartbeat_at)
             model.delete()
         except ObjectDoesNotExist:
             LOGGER_INSTANCES.info('Instance %s does not exist', instance_id)

openstack_lease_it/lease_it/datastore/__init__.py

@@ -1,4 +1,4 @@
 # pylint: skip-file
 # -*- coding: utf-8 -*-
 
-from ModelAccess import *
+from lease_it.datastore.ModelAccess import *