move sftocf plugin to separate repo (#451)

* remove sftocf plugin from coldfront repo, reference separate plugin instead

* update sftocf refs

* remove unneeded var

* add sftocf to installation reqs

Author: claire-peters

coldfront/config/plugins/sftocf.py

@@ -29,7 +29,6 @@
     'PLUGIN_API': 'plugins/api.py',
     'PLUGIN_LDAP': 'plugins/ldap_fasrc.py',
     'PLUGIN_LFS': 'plugins/lfs.py',
-    'PLUGIN_SFTOCF': 'plugins/sftocf.py',
     'PLUGIN_FASRC': 'plugins/fasrc.py',
     'PLUGIN_FASRC_MONITORING': 'plugins/fasrc_monitoring.py',
     'PLUGIN_ISILON': 'plugins/isilon.py',

coldfront/config/settings.py

@@ -28,7 +28,7 @@ def handle(self, *args, **options):
             'fasrc': [
                 'id_import_allocations', 'import_quotas', 'pull_resource_data', 'run_ifx_updates'
             ],
-            'sftocf': ['import_allocation_filepaths', 'pull_sf_push_cf', 'update_zones'],
+            # 'sftocf': ['import_allocation_filepaths', 'pull_sf_push_cf', 'update_zones'],
             # 'lfs': ['pull_lfs_filesystem_stats'],
             'ldap': ['update_group_membership_ldap', 'id_add_projects'],
             'slurm': ['slurm_sync', 'slurm_manage_resources'],

coldfront/core/utils/management/commands/add_scheduled_tasks.py

@@ -22,7 +22,7 @@
 from coldfront.core.allocation.utils import check_l3_tag
 from coldfront.core.utils.fasrc import update_csv, select_one_project_allocation, save_json
 from coldfront.core.resource.models import Resource
-from coldfront.plugins.sftocf.utils import StarFishRedash, RedashDataPipeline
+from sftocf.utils import StarFishRedash, RedashDataPipeline
 from coldfront.plugins.fasrc.utils import (
     AllTheThingsConn,
     match_entries_with_projects,

coldfront/plugins/fasrc/management/commands/id_import_new_allocations.py

@@ -3,9 +3,7 @@
 
 from coldfront.core.resource.models import Resource, ResourceAttributeType
 from coldfront.core.resource.signals import update_volume_information
-from coldfront.plugins.sftocf.utils import (
-    StarFishServer, StarFishRedash, STARFISH_SERVER
-)
+from sftocf.utils import StarFishServer, StarFishRedash
 
 
 logger = logging.getLogger(__name__)
@@ -34,7 +32,7 @@ def add_arguments(self, parser):
     def handle(self, *args, **options):
         source = options['source']
         if source == 'rest_api':
-            sf = StarFishServer(STARFISH_SERVER)
+            sf = StarFishServer()
             volumes = sf.get_volume_attributes()
             for vol in volumes:
                 vol['capacity_tb'] = vol['total_capacity']/(1024**4)
@@ -55,7 +53,7 @@ def handle(self, *args, **options):
 
 
         elif source == 'redash':
-            sf = StarFishRedash(STARFISH_SERVER)
+            sf = StarFishRedash()
             volumes = sf.get_vol_stats()
             volumes = [
                 {

coldfront/plugins/fasrc/management/commands/pull_resource_data.py

@@ -12,16 +12,15 @@
 from django.views.generic.base import TemplateView
 from django.contrib.auth.mixins import LoginRequiredMixin, UserPassesTestMixin
 
-from coldfront.config.env import ENV
 from coldfront.core.project.models import Project
 from coldfront.core.allocation.models import Allocation
 from coldfront.core.utils.common import import_from_settings
 
 PENDING_ACTIVE_ALLOCATION_STATUSES = import_from_settings(
     'PENDING_ACTIVE_ALLOCATION_STATUSES', ['Active', 'New', 'Updated', 'Ready for Review'])
 
-if ENV.bool('PLUGIN_SFTOCF', default=False):
-    from coldfront.plugins.sftocf.utils import STARFISH_SERVER, StarFishServer
+if 'sftocf' in import_from_settings('INSTALLED_APPS', []):
+    from sftocf.utils import StarFishServer
 
 
 
@@ -39,9 +38,9 @@ def test_func(self):
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
         scan_data_processed = None
-        if ENV.bool('PLUGIN_SFTOCF', default=False):
+        if 'sftocf' in import_from_settings('INSTALLED_APPS', []):
             try:
-                sf = StarFishServer(STARFISH_SERVER)
+                sf = StarFishServer()
                 scan_data = sf.get_most_recent_scans()
                 scan_data_processed = [
                             {'volume': s['volume'],

coldfront/plugins/fasrc_monitoring/views.py

@@ -18,8 +18,8 @@
 )
 from coldfront.plugins.ldap.utils import LDAPConn
 
-if 'coldfront.plugins.sftocf' in import_from_settings('INSTALLED_APPS', []):
-    from coldfront.plugins.sftocf.signals import (
+if 'sftocf' in import_from_settings('INSTALLED_APPS', []):
+    from sftocf.signals import (
         starfish_add_aduser,
         starfish_remove_aduser,
         starfish_add_adgroup,
@@ -136,7 +136,7 @@ def remove_member_from_group(sender, **kwargs):
     ldap_conn = LDAPConn()
     ldap_conn.remove_member_from_group(kwargs['user_name'], kwargs['group_name'])
 
-if 'coldfront.plugins.sftocf' in import_from_settings('INSTALLED_APPS', []):
+if 'sftocf' in import_from_settings('INSTALLED_APPS', []):
     @receiver(starfish_add_aduser)
     def starfish_add_user(sender, **kwargs):
         ldap_conn = LDAPConn()