Rename to coldfront_plugin_cloud

Author: knikolla

.github/workflows/test-py39-functional.yaml

@@ -45,4 +45,4 @@ jobs:
           export OPENSTACK_PUBLIC_NETWORK_ID=$(microstack.openstack network show external -f value -c id)
           export OS_AUTH_URL="https://localhost:5000"
 
-          coldfront test coldfront_plugin_openstack.tests.functional.openstack
+          coldfront test coldfront_plugin_cloud.tests.functional.openstack

Vagrantfile

@@ -1,5 +1,5 @@
 Vagrant.configure("2") do |config|
-    config.vm.synced_folder ".", "/home/vagrant/coldfront-plugin-openstack/"
+    config.vm.synced_folder ".", "/home/vagrant/coldfront-plugin-cloud/"
     config.vm.network :private_network
 
     config.vm.define "openstack" do |openstack|
@@ -14,7 +14,7 @@ Vagrant.configure("2") do |config|
         openstack.vm.provision "shell", privileged: false, inline: <<-SHELL
             set -xe
 
-            cd ~/coldfront-plugin-openstack
+            cd ~/coldfront-plugin-cloud
             ./ci/devstack.sh
             ./ci/setup.sh
             ./ci/run_functional_tests.sh
@@ -33,7 +33,7 @@ Vagrant.configure("2") do |config|
         openshift.vm.provision "shell", privileged: false, inline: <<-SHELL
             set -xe
 
-            cd ~/coldfront-plugin-openstack
+            cd ~/coldfront-plugin-cloud
             ./ci/microshift.sh
             ./ci/setup.sh
             ./ci/run_functional_tests_openshift.sh

ci/microshift.sh

@@ -20,7 +20,7 @@ sudo docker run -d --rm --name microshift --privileged \
 
 sudo docker run -d --name registry --network host registry:2
 
-# https://github.com/nerc-project/coldfront-plugin-openstack/issues/50
+# https://github.com/nerc-project/coldfront-plugin-cloud/issues/50
 sleep 30
 
 curl -O "https://mirror.openshift.com/pub/openshift-v4/$(uname -m)/clients/ocp/stable/openshift-client-linux.tar.gz"

ci/run_functional_tests_openshift.sh

@@ -14,4 +14,4 @@ export DJANGO_SETTINGS_MODULE="local_settings"
 export FUNCTIONAL_TESTS="True"
 export OS_AUTH_URL="https://onboarding-onboarding.cluster.local"
 
-coldfront test coldfront_plugin_openstack.tests.functional.openshift
+coldfront test coldfront_plugin_cloud.tests.functional.openshift

ci/run_functional_tests_openstack.sh

@@ -27,6 +27,6 @@ export KEYCLOAK_USER="admin"
 export KEYCLOAK_PASS="nomoresecret"
 export KEYCLOAK_REALM="master"
 
-coldfront test coldfront_plugin_openstack.tests.functional.openstack
+coldfront test coldfront_plugin_cloud.tests.functional.openstack
 
 openstack application credential delete $OPENSTACK_DEVSTACK_APPLICATION_CREDENTIAL_ID

ci/run_unit_tests.sh

@@ -6,4 +6,4 @@ fi
 
 export DJANGO_SETTINGS_MODULE="local_settings"
 
-coldfront test coldfront_plugin_openstack.tests.unit
+coldfront test coldfront_plugin_cloud.tests.unit

setup.cfg

@@ -1,5 +1,5 @@
 [metadata]
-name = coldfront_plugin_openstack
+name = coldfront_plugin_cloud
 version = 0.1.0
 author = Kristi Nikolla
 author_email = [email protected]

src/coldfront_plugin_cloud/__init__.py

@@ -0,0 +1 @@
+default_app_config = 'coldfront_plugin_cloud.apps.OpenStackConfig'

src/coldfront_plugin_openstack/apps.py src/coldfront_plugin_cloud/apps.py

@@ -2,7 +2,7 @@
 
 
 class OpenStackConfig(AppConfig):
-    name = 'coldfront_plugin_openstack'
+    name = 'coldfront_plugin_cloud'
 
     def ready(self):
-        import coldfront_plugin_openstack.signals
+        import coldfront_plugin_cloud.signals

src/coldfront_plugin_openstack/attributes.py src/coldfront_plugin_cloud/attributes.py

@@ -4,7 +4,7 @@
 from coldfront.core.allocation import models as allocation_models
 from coldfront.core.resource import models as resource_models
 
-from coldfront_plugin_openstack import attributes
+from coldfront_plugin_cloud import attributes
 
 
 class ResourceAllocator(abc.ABC):

src/coldfront_plugin_openstack/base.py src/coldfront_plugin_cloud/base.py

@@ -1,7 +1,7 @@
 from coldfront.config.base import INSTALLED_APPS
 from coldfront.config.env import ENV
 
-if 'coldfront_plugin_openstack' not in INSTALLED_APPS:
+if 'coldfront_plugin_cloud' not in INSTALLED_APPS:
     INSTALLED_APPS += [
-        'coldfront_plugin_openstack',
+        'coldfront_plugin_cloud',
     ]

src/coldfront_plugin_openstack/config.py src/coldfront_plugin_cloud/config.py

@@ -6,7 +6,7 @@
                                             ResourceAttributeType,
                                             ResourceType)
 
-from coldfront_plugin_openstack import attributes
+from coldfront_plugin_cloud import attributes
 
 
 class Command(BaseCommand):

src/coldfront_plugin_openstack/management/__init__.py src/coldfront_plugin_cloud/management/__init__.py

@@ -6,7 +6,7 @@
                                             ResourceAttributeType,
                                             ResourceType)
 
-from coldfront_plugin_openstack import attributes
+from coldfront_plugin_cloud import attributes
 
 
 class Command(BaseCommand):

src/coldfront_plugin_openstack/management/commands/__init__.py src/coldfront_plugin_cloud/management/commands/__init__.py

@@ -1,8 +1,8 @@
 import logging
 import sys
 
-from coldfront_plugin_openstack import attributes
-from coldfront_plugin_openstack import openstack
+from coldfront_plugin_cloud import attributes
+from coldfront_plugin_cloud import openstack
 
 from novaclient import client as novaclient
 from django.core.management.base import BaseCommand

src/coldfront_plugin_openstack/management/commands/add_openshift_resource.py src/coldfront_plugin_cloud/management/commands/add_openshift_resource.py

@@ -5,7 +5,7 @@
 from coldfront.core.allocation import models as allocation_models
 from coldfront.core.resource import models as resource_models
 
-from coldfront_plugin_openstack import attributes
+from coldfront_plugin_cloud import attributes
 
 logger = logging.getLogger(__name__)
 

src/coldfront_plugin_openstack/management/commands/add_openstack_resource.py src/coldfront_plugin_cloud/management/commands/add_openstack_resource.py

@@ -1,7 +1,7 @@
 import logging
 
-from coldfront_plugin_openstack import attributes
-from coldfront_plugin_openstack import openstack
+from coldfront_plugin_cloud import attributes
+from coldfront_plugin_cloud import openstack
 
 from django.core.management.base import BaseCommand
 from coldfront.core.resource.models import (Resource,

src/coldfront_plugin_openstack/management/commands/count_gpu_usage.py src/coldfront_plugin_cloud/management/commands/count_gpu_usage.py

@@ -8,7 +8,7 @@
 import uuid
 from simplejson.errors import JSONDecodeError
 
-from coldfront_plugin_openstack import attributes, base, utils
+from coldfront_plugin_cloud import attributes, base, utils
 
 QUOTA_KEY_MAPPING = {
     attributes.QUOTA_LIMITS_CPU: lambda x: {":limits.cpu": f"{x * 1000}m"},

src/coldfront_plugin_openstack/management/commands/register_cloud_attributes.py src/coldfront_plugin_cloud/management/commands/register_cloud_attributes.py

@@ -12,7 +12,7 @@
 from neutronclient.v2_0 import client as neutronclient
 from novaclient import client as novaclient
 
-from coldfront_plugin_openstack import attributes, base, utils
+from coldfront_plugin_cloud import attributes, base, utils
 
 logger = logging.getLogger(__name__)
 

src/coldfront_plugin_openstack/management/commands/validate_allocations.py src/coldfront_plugin_cloud/management/commands/validate_allocations.py

@@ -3,10 +3,10 @@
 from django.dispatch import receiver
 from django_q.tasks import async_task
 
-from coldfront_plugin_openstack.tasks import (activate_allocation,
-                                              add_user_to_allocation,
-                                              disable_allocation,
-                                              remove_user_from_allocation)
+from coldfront_plugin_cloud.tasks import (activate_allocation,
+                                          add_user_to_allocation,
+                                          disable_allocation,
+                                          remove_user_from_allocation)
 from coldfront.core.allocation.signals import (allocation_activate,
                                                allocation_activate_user,
                                                allocation_disable,

src/coldfront_plugin_openstack/openshift.py src/coldfront_plugin_cloud/openshift.py

@@ -6,11 +6,11 @@
 from coldfront.core.allocation.models import (Allocation,
                                               AllocationUser)
 
-from coldfront_plugin_openstack import (attributes,
-                                        base,
-                                        openstack,
-                                        openshift,
-                                        utils)
+from coldfront_plugin_cloud import (attributes,
+                                    base,
+                                    openstack,
+                                    openshift,
+                                    utils)
 
 logger = logging.getLogger(__name__)
 

src/coldfront_plugin_openstack/openstack.py src/coldfront_plugin_cloud/openstack.py

@@ -22,7 +22,7 @@
                                             ResourceAttributeType)
 from django.core.management import call_command
 
-from coldfront_plugin_openstack import attributes
+from coldfront_plugin_cloud import attributes
 
 
 class TestBase(TestCase):

src/coldfront_plugin_openstack/signals.py src/coldfront_plugin_cloud/signals.py

@@ -2,8 +2,8 @@
 import time
 import unittest
 
-from coldfront_plugin_openstack import attributes, openshift, tasks, utils
-from coldfront_plugin_openstack.tests import base
+from coldfront_plugin_cloud import attributes, openshift, tasks, utils
+from coldfront_plugin_cloud.tests import base
 
 
 @unittest.skipUnless(os.getenv('FUNCTIONAL_TESTS'), 'Functional tests not enabled.')

src/coldfront_plugin_openstack/tasks.py src/coldfront_plugin_cloud/tasks.py

@@ -1,8 +1,8 @@
 import os
 import unittest
 
-from coldfront_plugin_openstack import attributes, openstack, tasks, utils
-from coldfront_plugin_openstack.tests import base
+from coldfront_plugin_cloud import attributes, openstack, tasks, utils
+from coldfront_plugin_cloud.tests import base
 
 from django.core.management import call_command
 from keystoneclient.v3 import client

src/coldfront_plugin_openstack/tests/__init__.py src/coldfront_plugin_cloud/tests/__init__.py

@@ -2,7 +2,7 @@
 from os import devnull
 import sys
 
-from coldfront_plugin_openstack.tests import base
+from coldfront_plugin_cloud.tests import base
 from coldfront.core.resource import models as resource_models
 from coldfront.core.allocation import models as allocation_models
 
@@ -19,15 +19,15 @@ def setUp(self) -> None:
         sys.stdout = backup
 
     @mock.patch(
-        'coldfront_plugin_openstack.management.commands.register_cloud_attributes.RESOURCE_ATTRIBUTE_MIGRATIONS',
+        'coldfront_plugin_cloud.management.commands.register_cloud_attributes.RESOURCE_ATTRIBUTE_MIGRATIONS',
         [
             ('Before Migration', 'After First Migration'),
             ('After First Migration', 'After Migration'),
             ('Not Present', 'Still not present'),
         ]
     )
     @mock.patch(
-        'coldfront_plugin_openstack.management.commands.register_cloud_attributes.ALLOCATION_ATTRIBUTE_MIGRATIONS',
+        'coldfront_plugin_cloud.management.commands.register_cloud_attributes.ALLOCATION_ATTRIBUTE_MIGRATIONS',
         [
             ('Before Migration', {
                 'name': 'After First Migration'

src/coldfront_plugin_openstack/tests/base.py src/coldfront_plugin_cloud/tests/base.py

@@ -3,6 +3,6 @@
 from coldfront.config.settings import *
 from django.conf import settings
 
-plugin_openstack = pkgutil.get_loader('coldfront_plugin_openstack.config')
+plugin_openstack = pkgutil.get_loader('coldfront_plugin_cloud.config')
 
 include(plugin_openstack.get_filename())