diff --git a/src/coldfront_plugin_cloud/attributes.py b/src/coldfront_plugin_cloud/attributes.py index c2044f1..0c14690 100644 --- a/src/coldfront_plugin_cloud/attributes.py +++ b/src/coldfront_plugin_cloud/attributes.py @@ -68,11 +68,11 @@ class CloudAllocationAttribute: ########################################################### # OpenStack Quota Attributes QUOTA_INSTANCES = 'OpenStack Compute Instance Quota' -QUOTA_RAM = 'OpenStack Compute RAM Quota' +QUOTA_RAM = 'OpenStack Compute RAM Quota (MiB)' QUOTA_VCPU = 'OpenStack Compute vCPU Quota' -QUOTA_VOLUMES = 'OpenStack Volume Quota' -QUOTA_VOLUMES_GB = 'OpenStack Volume GB Quota' +QUOTA_VOLUMES = 'OpenStack Number of Volumes Quota' +QUOTA_VOLUMES_GB = 'OpenStack Volume Quota (GiB)' QUOTA_FLOATING_IPS = 'OpenStack Floating IP Quota' @@ -83,9 +83,9 @@ class CloudAllocationAttribute: ########################################################### # OpenShift Quota Attributes QUOTA_LIMITS_CPU = 'OpenShift Limit on CPU Quota' -QUOTA_LIMITS_MEMORY = 'OpenShift Limit on RAM Quota (MB)' -QUOTA_LIMITS_EPHEMERAL_STORAGE_GB = 'OpenShift Limit on Ephemeral Storage Quota (GB)' -QUOTA_REQUESTS_STORAGE = 'OpenShift Request on Storage Quota (GB)' +QUOTA_LIMITS_MEMORY = 'OpenShift Limit on RAM Quota (MiB)' +QUOTA_LIMITS_EPHEMERAL_STORAGE_GB = 'OpenShift Limit on Ephemeral Storage Quota (GiB)' +QUOTA_REQUESTS_STORAGE = 'OpenShift Request on Storage Quota (GiB)' QUOTA_REQUESTS_GPU = 'OpenShift Request on GPU Quota' QUOTA_PVC = 'OpenShift Persistent Volume Claims Quota' diff --git a/src/coldfront_plugin_cloud/management/commands/register_cloud_attributes.py b/src/coldfront_plugin_cloud/management/commands/register_cloud_attributes.py index 2ea7cf1..5ed78d4 100644 --- a/src/coldfront_plugin_cloud/management/commands/register_cloud_attributes.py +++ b/src/coldfront_plugin_cloud/management/commands/register_cloud_attributes.py @@ -25,6 +25,24 @@ ('OpenShift Limit on RAM Quota', { 'name': 'OpenShift Limit on RAM Quota (MB)' }), + ('OpenStack Volume Quota', { + 'name': 'OpenStack Number of Volumes Quota' + }), + ('OpenStack Compute RAM Quota', { + 'name': 'OpenStack Compute RAM Quota (MiB)' + }), + ('OpenStack Volume GB Quota', { + 'name': 'OpenStack Volume Quota (GiB)' + }), + ('OpenShift Limit on RAM Quota (MB)', { + 'name': 'OpenShift Limit on RAM Quota (MiB)' + }), + ('OpenShift Limit on Ephemeral Storage Quota (GB)', { + 'name': 'OpenShift Limit on Ephemeral Storage Quota (GiB)' + }), + ('OpenShift Request on Storage Quota (GB)', { + 'name': 'OpenShift Request on Storage Quota (GiB)' + }), ] RESOURCE_ATTRIBUTE_MIGRATIONS = [