From 4a4d34752eabaf238570a6198d8605efc0bff3a3 Mon Sep 17 00:00:00 2001 From: Milson Munakami Date: Thu, 23 May 2024 12:39:56 -0400 Subject: [PATCH 1/4] renamed the attributes with GiB and MiB removing GB and MB --- src/coldfront_plugin_cloud/attributes.py | 12 ++++++------ .../commands/register_cloud_attributes.py | 18 ++++++++++++++++++ 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/src/coldfront_plugin_cloud/attributes.py b/src/coldfront_plugin_cloud/attributes.py index c2044f1d..14fc7f69 100644 --- a/src/coldfront_plugin_cloud/attributes.py +++ b/src/coldfront_plugin_cloud/attributes.py @@ -68,24 +68,24 @@ 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_GB = 'OpenStack Volume Quota (GiB)' QUOTA_FLOATING_IPS = 'OpenStack Floating IP Quota' -QUOTA_OBJECT_GB = 'OpenStack Swift Quota in Gigabytes' +QUOTA_OBJECT_GB = 'OpenStack Swift Quota (GiB)' QUOTA_GPU = 'OpenStack GPU Quota' ########################################################### # 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 2ea7cf12..9f6b9d6b 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 Compute RAM Quota', { + 'name': 'OpenStack Compute RAM Quota (MiB)' + }), + ('OpenStack Volume GB Quota', { + 'name': 'OpenStack Volume Quota (GiB)' + }), + ('OpenStack Swift Quota in Gigabytes', { + 'name': 'OpenStack Swift 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 = [ From 9e2c625d7308254679d376001df86d45195a655f Mon Sep 17 00:00:00 2001 From: Milson Munakami Date: Thu, 23 May 2024 15:00:10 -0400 Subject: [PATCH 2/4] Revert the OpenStack swift attribute change --- src/coldfront_plugin_cloud/attributes.py | 2 +- .../management/commands/register_cloud_attributes.py | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/coldfront_plugin_cloud/attributes.py b/src/coldfront_plugin_cloud/attributes.py index 14fc7f69..e62ba20d 100644 --- a/src/coldfront_plugin_cloud/attributes.py +++ b/src/coldfront_plugin_cloud/attributes.py @@ -76,7 +76,7 @@ class CloudAllocationAttribute: QUOTA_FLOATING_IPS = 'OpenStack Floating IP Quota' -QUOTA_OBJECT_GB = 'OpenStack Swift Quota (GiB)' +QUOTA_OBJECT_GB = 'OpenStack Swift Quota in Gigabytes' QUOTA_GPU = 'OpenStack GPU 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 9f6b9d6b..5a1ccf5f 100644 --- a/src/coldfront_plugin_cloud/management/commands/register_cloud_attributes.py +++ b/src/coldfront_plugin_cloud/management/commands/register_cloud_attributes.py @@ -31,9 +31,6 @@ ('OpenStack Volume GB Quota', { 'name': 'OpenStack Volume Quota (GiB)' }), - ('OpenStack Swift Quota in Gigabytes', { - 'name': 'OpenStack Swift Quota (GiB)' - }), ('OpenShift Limit on RAM Quota (MB)', { 'name': 'OpenShift Limit on RAM Quota (MiB)' }), From 26b9890500204fc01112d5a1ecb91b8f4dd4b7ae Mon Sep 17 00:00:00 2001 From: Milson Munakami Date: Thu, 23 May 2024 17:32:41 -0400 Subject: [PATCH 3/4] OpenStack Volume Quota --> OpenStack Number of Volumes Quota --- .../management/commands/register_cloud_attributes.py | 3 +++ 1 file changed, 3 insertions(+) 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 5a1ccf5f..5ed78d40 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,9 @@ ('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)' }), From 62213509b8df51a44c8023c82242b32e533555ef Mon Sep 17 00:00:00 2001 From: Milson Munakami Date: Fri, 24 May 2024 09:01:27 -0400 Subject: [PATCH 4/4] OpenStack Number of Volumes Quota --- src/coldfront_plugin_cloud/attributes.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/coldfront_plugin_cloud/attributes.py b/src/coldfront_plugin_cloud/attributes.py index e62ba20d..0c146905 100644 --- a/src/coldfront_plugin_cloud/attributes.py +++ b/src/coldfront_plugin_cloud/attributes.py @@ -71,7 +71,7 @@ class CloudAllocationAttribute: QUOTA_RAM = 'OpenStack Compute RAM Quota (MiB)' QUOTA_VCPU = 'OpenStack Compute vCPU Quota' -QUOTA_VOLUMES = 'OpenStack Volume Quota' +QUOTA_VOLUMES = 'OpenStack Number of Volumes Quota' QUOTA_VOLUMES_GB = 'OpenStack Volume Quota (GiB)' QUOTA_FLOATING_IPS = 'OpenStack Floating IP Quota'