Skip to content
Snippets Groups Projects
Commit e79acd05 authored by Stefano Alberto Russo's avatar Stefano Alberto Russo
Browse files

Removed the computing resource validation as it turned out to be unnecessary. Cleanup.

parent 463bac9c
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
services/webapp/code/rosetta/base_app/models.py
+ 38
− 58
View file @ e79acd05
...@@ -31,30 +31,36 @@ class TaskStatuses(object): ...@@ -31,30 +31,36 @@ class TaskStatuses(object):
exited = 'exited' exited = 'exited'
#========================= #=========================
# Profile # Profile
#========================= #=========================
class Profile(models.Model): class Profile(models.Model):
uuid = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False) uuid = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False)
user = models.OneToOneField(User, on_delete=models.CASCADE) user = models.OneToOneField(User, on_delete=models.CASCADE)
timezone = models.CharField('User Timezone', max_length=36, default='UTC') timezone = models.CharField('User Timezone', max_length=36, default='UTC')
authtoken = models.CharField('User auth token', max_length=36, blank=True, null=True) authtoken = models.CharField('User auth token', max_length=36, blank=True, null=True)
def save(self, *args, **kwargs): def save(self, *args, **kwargs):
if not self.authtoken: if not self.authtoken:
self.authtoken = str(uuid.uuid4()) self.authtoken = str(uuid.uuid4())
super(Profile, self).save(*args, **kwargs) super(Profile, self).save(*args, **kwargs)
def __unicode__(self): def __unicode__(self):
return str('Profile of user "{}"'.format(self.user.username)) return str('Profile of user "{}"'.format(self.user.username))
#========================= #=========================
# Login Token # Login Token
#========================= #=========================
class LoginToken(models.Model): class LoginToken(models.Model):
uuid = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False) uuid = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False)
user = models.OneToOneField(User, on_delete=models.CASCADE) user = models.OneToOneField(User, on_delete=models.CASCADE)
token = models.CharField('Login token', max_length=36) token = models.CharField('Login token', max_length=36)
...@@ -79,24 +85,21 @@ class Container(models.Model): ...@@ -79,24 +85,21 @@ class Container(models.Model):
require_user = models.BooleanField(default=False) require_user = models.BooleanField(default=False)
require_pass = models.BooleanField(default=False) require_pass = models.BooleanField(default=False)
def __str__(self): def __str__(self):
return str('Container of type "{}" with image "{}" with service ports "{}" from registry "{}" of user "{}"'.format(self.type, self.image, self.service_ports, self.registry, self.user)) return str('Container of type "{}" with image "{}" with service ports "{}" from registry "{}" of user "{}"'.format(self.type, self.image, self.service_ports, self.registry, self.user))
@property @property
def id(self): def id(self):
return str(self.uuid).split('-')[0] return str(self.uuid).split('-')[0]
#@property
#def name(self):
# return self.image.split(':')[0].replace('_',' ').replace('-', ' ').replace('/', ' ').title()
#========================= #=========================
# Computing resources # Computing resources
#========================= #=========================
# TODO: this must be an abstract class. Or maybe not? Maybe Add ComputingConfiguration/Handler with the relevant fields and methods?
# ...so that can be used as foreign key in the tasks as well? Examples: ComputingConfiguration ComputingType ComputingHandler
class Computing(models.Model): class Computing(models.Model):
uuid = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False) uuid = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False)
...@@ -122,49 +125,13 @@ class Computing(models.Model): ...@@ -122,49 +125,13 @@ class Computing(models.Model):
def id(self): def id(self):
return str(self.uuid).split('-')[0] return str(self.uuid).split('-')[0]
# Validate conf
def validate_conf_data(self, sys_conf_data=None, user_conf_data=None):
if self.type == 'local':
pass
elif self.type == 'remote':
# Check that we have all the data for a remote computing resource
# Look for host:
host_found = False
if sys_conf_data and 'host' in sys_conf_data and sys_conf_data['host']: host_found=True
if user_conf_data and 'host' in user_conf_data and user_conf_data['host']: host_found=True
if not host_found:
raise ConfigurationError('Missing host in conf')
# Look for user:
user_found = False
if sys_conf_data and 'user' in sys_conf_data and sys_conf_data['user']: user_found=True
if user_conf_data and 'user' in user_conf_data and user_conf_data['user']: user_found=True
if not user_found:
raise ConfigurationError('Missing user in conf')
# Look for password/identity:
password_found = False
identity_found = False
if sys_conf_data and 'password' in sys_conf_data and sys_conf_data['password']: password_found=True
if user_conf_data and 'password' in user_conf_data and user_conf_data['password']: password_found=True
if sys_conf_data and 'identity' in sys_conf_data and sys_conf_data['identity']: identity_found=True
if user_conf_data and 'identity' in user_conf_data and user_conf_data['identity']: identity_found=True
if not password_found and not identity_found:
raise ConfigurationError('Missing password or identity in conf')
elif self.type == 'slurm':
raise NotImplementedError('Not yet implemented for Slurm')
else:
raise ConsistencyError('Unknown computing type "{}"'.format(self.type))
@property @property
def sys_conf_data(self): def sys_conf_data(self):
try:
return ComputingSysConf.objects.get(computing=self).data return ComputingSysConf.objects.get(computing=self).data
except ComputingSysConf.DoesNotExist:
return None
@property @property
def user_conf_data(self): def user_conf_data(self):
...@@ -173,6 +140,7 @@ class Computing(models.Model): ...@@ -173,6 +140,7 @@ class Computing(models.Model):
except AttributeError: except AttributeError:
raise AttributeError('User conf data is not yet attached, please attach it before accessing.') raise AttributeError('User conf data is not yet attached, please attach it before accessing.')
def attach_user_conf_data(self, user): def attach_user_conf_data(self, user):
if self.user and self.user != user: if self.user and self.user != user:
raise Exception('Cannot attach a conf data for another user (my user="{}", another user="{}"'.format(self.user, user)) raise Exception('Cannot attach a conf data for another user (my user="{}", another user="{}"'.format(self.user, user))
...@@ -181,17 +149,6 @@ class Computing(models.Model): ...@@ -181,17 +149,6 @@ class Computing(models.Model):
except ComputingUserConf.DoesNotExist: except ComputingUserConf.DoesNotExist:
self._user_conf_data = None self._user_conf_data = None
# Get id_rsa file
#@property
#def id_rsa_file(self):
# try:
# id_rsa_file = self.user_conf_data['id_rsa']
# except (TypeError, KeyError, AttributeError):
# try:
# id_rsa_file = self.sys_conf_data['id_rsa']
# except:
# id_rsa_file = None
# return id_rsa_file
def get_conf_param(self, param): def get_conf_param(self, param):
try: try:
...@@ -200,6 +157,7 @@ class Computing(models.Model): ...@@ -200,6 +157,7 @@ class Computing(models.Model):
param_value = self.user_conf_data[param] param_value = self.user_conf_data[param]
return param_value return param_value
@property @property
def manager(self): def manager(self):
from . import computing_managers from . import computing_managers
...@@ -207,35 +165,44 @@ class Computing(models.Model): ...@@ -207,35 +165,44 @@ class Computing(models.Model):
return ComputingManager() return ComputingManager()
class ComputingSysConf(models.Model): class ComputingSysConf(models.Model):
uuid = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False) uuid = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False)
computing = models.ForeignKey(Computing, related_name='+', on_delete=models.CASCADE) computing = models.ForeignKey(Computing, related_name='+', on_delete=models.CASCADE)
data = JSONField(blank=True, null=True) data = JSONField(blank=True, null=True)
@property @property
def id(self): def id(self):
return str(self.uuid).split('-')[0] return str(self.uuid).split('-')[0]
def __str__(self): def __str__(self):
return str('Computing sys conf for {} with id "{}"'.format(self.computing, self.id)) return str('Computing sys conf for {} with id "{}"'.format(self.computing, self.id))
class ComputingUserConf(models.Model): class ComputingUserConf(models.Model):
uuid = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False) uuid = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False)
user = models.ForeignKey(User, related_name='+', on_delete=models.CASCADE, null=True) user = models.ForeignKey(User, related_name='+', on_delete=models.CASCADE, null=True)
computing = models.ForeignKey(Computing, related_name='+', on_delete=models.CASCADE) computing = models.ForeignKey(Computing, related_name='+', on_delete=models.CASCADE)
data = JSONField(blank=True, null=True) data = JSONField(blank=True, null=True)
@property @property
def id(self): def id(self):
return str('Computing sys conf for {} with id "{}" of user "{}"'.format(self.computing, self.id, self.user)) return str('Computing sys conf for {} with id "{}" of user "{}"'.format(self.computing, self.id, self.user))
#========================= #=========================
# Tasks # Tasks
#========================= #=========================
class Task(models.Model): class Task(models.Model):
uuid = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False) uuid = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False)
user = models.ForeignKey(User, related_name='+', on_delete=models.CASCADE) user = models.ForeignKey(User, related_name='+', on_delete=models.CASCADE)
tid = models.CharField('Task ID', max_length=64, blank=False, null=False) tid = models.CharField('Task ID', max_length=64, blank=False, null=False)
...@@ -256,6 +223,7 @@ class Task(models.Model): ...@@ -256,6 +223,7 @@ class Task(models.Model):
auth_pass = models.CharField('Task auth pass', max_length=36, blank=True, null=True) auth_pass = models.CharField('Task auth pass', max_length=36, blank=True, null=True)
access_method = models.CharField('Task access method', max_length=36, blank=True, null=True) access_method = models.CharField('Task access method', max_length=36, blank=True, null=True)
def save(self, *args, **kwargs): def save(self, *args, **kwargs):
try: try:
...@@ -298,9 +266,11 @@ class Task(models.Model): ...@@ -298,9 +266,11 @@ class Task(models.Model):
return str(self.uuid).split('-')[0] return str(self.uuid).split('-')[0]
#========================= #=========================
# Keys # Keys
#========================= #=========================
class Keys(models.Model): class Keys(models.Model):
uuid = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False) uuid = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False)
...@@ -315,6 +285,16 @@ class Keys(models.Model): ...@@ -315,6 +285,16 @@ class Keys(models.Model):
def __str__(self): def __str__(self):
return str('Keys with id "{}" of user "{}"'.format(self.id, self.user)) return str('Keys with id "{}" of user "{}"'.format(self.id, self.user))
@property @property
def id(self): def id(self):
return str(self.uuid).split('-')[0] return str(self.uuid).split('-')[0]
services/webapp/code/rosetta/base_app/tests/test_models.py
+ 0
− 18
View file @ e79acd05
...@@ -26,22 +26,4 @@ class Modeltest(BaseAPITestCase): ...@@ -26,22 +26,4 @@ class Modeltest(BaseAPITestCase):
self.assertEqual(ComputingSysConf.objects.all()[0].data, {'myvar':42}) self.assertEqual(ComputingSysConf.objects.all()[0].data, {'myvar':42})
# Will raise, no host or user or pass/identity
with self.assertRaises(Exception):
computing.validate_conf_data(sys_conf_data=computingSysConf.data)
# Complete conf
computingSysConf_1 = ComputingSysConf.objects.create(computing=computing, data={'host':'localhost', 'user':'testuser', 'password':'testpass'})
# Will not raise
computing.validate_conf_data(sys_conf_data=computingSysConf_1.data)
# Complete conf
#computingSysConf_1 = ComputingSysConf.objects.create(computing=computing, data={'host':'localhost', 'user':'testuser', 'password':'testpass'})
# Will not raise
#computing.validate_conf_data(sys_conf_data=computingSysConf_1.data)
services/webapp/code/rosetta/base_app/views.py
+ 1
− 1
View file @ e79acd05
...@@ -662,13 +662,13 @@ def computings(request): ...@@ -662,13 +662,13 @@ def computings(request):
data['name'] = request.POST.get('name',None) data['name'] = request.POST.get('name',None)
data['computings'] = list(Computing.objects.filter(user=None)) + list(Computing.objects.filter(user=request.user)) data['computings'] = list(Computing.objects.filter(user=None)) + list(Computing.objects.filter(user=request.user))
# Attach user conf in any # Attach user conf in any
for computing in data['computings']: for computing in data['computings']:
computing.attach_user_conf_data(request.user) computing.attach_user_conf_data(request.user)
return render(request, 'computings.html', {'data': data}) return render(request, 'computings.html', {'data': data})
#========================= #=========================
# Add Compute view # Add Compute view
#========================= #=========================
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment