Skip to content

Correct EBS quotas_name #577

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
davidYichengWei wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Correct EBS quotas_name #577

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b80028b
issue 567 - Fixed incorrect EBS quotas_name
davidYichengWei Dec 3, 2022
64aaffb
issue #567 - Added test for checking ebs limit for fixed limits
P1atyphy11a Dec 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions awslimitchecker/services/ebs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ def _get_limits_ebs(self):
self.critical_threshold,
limit_type='AWS::EC2::Volume',
limit_subtype='io1',
quotas_name='Storage for Provisioned IOPS SSD (io1) volumes',
quotas_name='Storage for Provisioned IOPS SSD (io1) volumes, in tib',
quotas_unit='GiB',
quotas_unit_converter=convert_TiB_to_GiB
)
Expand All @@ -255,7 +255,7 @@ def _get_limits_ebs(self):
self.critical_threshold,
limit_type='AWS::EC2::Volume',
limit_subtype='io2',
quotas_name='Storage for Provisioned IOPS SSD (io2) volumes',
quotas_name='Storage for Provisioned IOPS SSD (io2) volumes, in tib',
quotas_unit='GiB',
quotas_unit_converter=convert_TiB_to_GiB
)
Expand All @@ -268,7 +268,7 @@ def _get_limits_ebs(self):
limit_type='AWS::EC2::Volume',
limit_subtype='gp2',
ta_limit_name='General Purpose SSD (gp2) volume storage (GiB)',
quotas_name='Storage for General Purpose SSD (gp2) volumes',
quotas_name='Storage for General Purpose SSD (gp2) volumes, in tib',
quotas_unit='GiB',
quotas_unit_converter=convert_TiB_to_GiB
)
Expand All @@ -281,7 +281,7 @@ def _get_limits_ebs(self):
limit_type='AWS::EC2::Volume',
limit_subtype='gp3',
ta_limit_name='General Purpose SSD (gp3) volume storage (GiB)',
quotas_name='Storage for General Purpose SSD (gp3) volumes',
quotas_name='Storage for General Purpose SSD (gp3) volumes, in tib',
quotas_unit='GiB',
quotas_unit_converter=convert_TiB_to_GiB
)
Expand All @@ -294,7 +294,7 @@ def _get_limits_ebs(self):
limit_type='AWS::EC2::Volume',
limit_subtype='standard',
ta_limit_name='Magnetic (standard) volume storage (GiB)',
quotas_name='Storage for Magnetic (standard) volumes',
quotas_name='Storage for Magnetic (standard) volumes, in tib',
quotas_unit='GiB',
quotas_unit_converter=convert_TiB_to_GiB
)
Expand All @@ -306,7 +306,7 @@ def _get_limits_ebs(self):
self.critical_threshold,
limit_type='AWS::EC2::Volume',
limit_subtype='st1',
quotas_name='Storage for Throughput Optimized HDD (st1) volumes',
quotas_name='Storage for Throughput Optimized HDD (st1) volumes, in tib',
quotas_unit='GiB',
quotas_unit_converter=convert_TiB_to_GiB
)
Expand All @@ -318,7 +318,7 @@ def _get_limits_ebs(self):
self.critical_threshold,
limit_type='AWS::EC2::Volume',
limit_subtype='sc1',
quotas_name='Storage for Cold HDD (sc1) volumes',
quotas_name='Storage for Cold HDD (sc1) volumes, in tib',
quotas_unit='GiB',
quotas_unit_converter=convert_TiB_to_GiB
)
Expand Down
13 changes: 13 additions & 0 deletions awslimitchecker/tests/services/test_ebs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
from awslimitchecker.services.ebs import _EbsService, convert_TiB_to_GiB
from awslimitchecker.limit import AwsLimit
from awslimitchecker.tests.services import result_fixtures
from awslimitchecker import AwsLimitChecker

# https://code.google.com/p/mock/issues/detail?id=249
# py>=3.4 should use unittest.mock not the mock package on pypi
Expand Down Expand Up @@ -256,3 +257,15 @@ def test_required_iam_permissions(self):
"ec2:DescribeVolumes",
"ec2:DescribeSnapshots"
]

def find_quota_ebs(self):
cls = AwsLimitChecker("us-east-1")
limits = cls.get_limits(["EBS"])
assert limits["EBS"]["Cold (HDD) volume storage (GiB)"].quotas_limit != None
assert limits["EBS"]["Throughput Optimized (HDD) volume storage (GiB)"].quotas_limit != None
assert limits["EBS"]["Provisioned IOPS SSD (io1) storage (GiB)"].quotas_limit != None
assert limits["EBS"]["Provisioned IOPS SSD (io2) storage (GiB)"].quotas_limit != None
assert limits["EBS"]["General Purpose (SSD gp2) volume storage (GiB)"].quotas_limit != None
assert limits["EBS"]["General Purpose (SSD gp3) volume storage (GiB)"].quotas_limit != None
assert limits["EBS"]["Magnetic volume storage (GiB)"].quotas_limit != None