Fixed require_user_auth_conf and require_user_auth_keys names.

services/webapp/code/rosetta/base_app/computing_managers.py

@@ -164,7 +164,7 @@ class RemoteComputingManager(ComputingManager):
         user = task.computing.get_conf_param('user')
 
         # Get user keys
-        if task.computing.require_user_auth_keys:
+        if task.computing.require_user_keys:
             user_keys = Keys.objects.get(user=task.user, default=True)
         else:
             raise NotImplementedError('Remote tasks not requiring keys are not yet supported')
@@ -237,7 +237,7 @@ class RemoteComputingManager(ComputingManager):
     def _stop_task(self, task, **kwargs):
 
         # Get user keys
-        if task.computing.require_user_auth_keys:
+        if task.computing.require_user_keys:
             user_keys = Keys.objects.get(user=task.user, default=True)
         else:
             raise NotImplementedError('Remote tasks not requiring keys are not yet supported')
@@ -264,7 +264,7 @@ class RemoteComputingManager(ComputingManager):
         host = task.computing.get_conf_param('host')
 
         # Get id_rsa
-        if task.computing.require_user_auth_keys:
+        if task.computing.require_user_keys:
             user_keys = Keys.objects.get(user=task.user, default=True)
             id_rsa_file = user_keys.private_key_file
         else:
@@ -291,7 +291,7 @@ class SlurmComputingManager(ComputingManager):
         user = task.computing.get_conf_param('user')
         
         # Get user keys
-        if task.computing.require_user_auth_keys:
+        if task.computing.require_user_keys:
             user_keys = Keys.objects.get(user=task.user, default=True)
         else:
             raise NotImplementedError('Remote tasks not requiring keys are not yet supported')
@@ -390,7 +390,7 @@ class SlurmComputingManager(ComputingManager):
     def _stop_task(self, task, **kwargs):
         
         # Get user keys
-        if task.computing.require_user_auth_keys:
+        if task.computing.require_user_keys:
             user_keys = Keys.objects.get(user=task.user, default=True)
         else:
             raise NotImplementedError('Remote tasks not requiring keys are not yet supported')
@@ -414,7 +414,7 @@ class SlurmComputingManager(ComputingManager):
     def _get_task_log(self, task, **kwargs):
         
         # Get user keys
-        if task.computing.require_user_auth_keys:
+        if task.computing.require_user_keys:
             user_keys = Keys.objects.get(user=task.user, default=True)
         else:
             raise NotImplementedError('Remote tasks not requiring keys are not yet supported')

services/webapp/code/rosetta/base_app/management/commands/base_app_populate.py

@@ -113,8 +113,8 @@ class Command(BaseCommand):
                                      name = 'Local',
                                      type = 'local',
                                      require_sys_conf  = False,
-                                     require_user_auth_conf = False,
-                                     require_user_auth_keys = False)
+                                     require_user_conf = False,
+                                     require_user_keys = False)
 
 
             #==============================
@@ -124,8 +124,8 @@ class Command(BaseCommand):
                                                              name = 'Demo remote',
                                                              type = 'remote',
                                                              require_sys_conf  = True,
-                                                             require_user_auth_conf = True,
-                                                             require_user_auth_keys = True)
+                                                             require_user_conf = True,
+                                                             require_user_keys = True)
     
             ComputingSysConf.objects.create(computing = demo_remote_auth_computing,
                                             data      = {'host': 'slurmclusterworker-one'})
@@ -142,8 +142,8 @@ class Command(BaseCommand):
                                                             name = 'Demo Slurm',
                                                             type = 'slurm',
                                                             require_sys_conf  = True,
-                                                            require_user_auth_conf = True,
-                                                            require_user_auth_keys = True)
+                                                            require_user_conf = True,
+                                                            require_user_keys = True)
     
             # Create demo slurm sys computing conf
             ComputingSysConf.objects.create(computing = demo_slurm_computing,

services/webapp/code/rosetta/base_app/models.py

@@ -112,8 +112,8 @@ class Computing(models.Model):
     type = models.CharField('Computing Type', max_length=255, blank=False, null=False)
 
     require_sys_conf  = models.BooleanField(default=False)
-    require_user_auth_conf = models.BooleanField(default=False)
-    require_user_auth_keys = models.BooleanField(default=False)
+    require_user_conf = models.BooleanField(default=False)
+    require_user_keys = models.BooleanField(default=False)
 
 
     def __str__(self):