fixes #35 - change EBS limit names and units to match Trusted Advisor

jantman · Jul 1, 2015 · 9ba2478 · 9ba2478
1 parent 4b0e025
commit 9ba2478
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 24 deletions.
diff --git a/awslimitchecker/services/ebs.py b/awslimitchecker/services/ebs.py
@@ -98,19 +98,19 @@ def _find_usage_ebs(self):
             piops,
             aws_type='AWS::EC2::Volume'
         )
-        self.limits['Provisioned IOPS (SSD) volume storage '
-                    '(TiB)']._add_current_usage(
-                        piops_gb / 1000.0,
+        self.limits['Provisioned IOPS (SSD) storage '
+                    '(GiB)']._add_current_usage(
+                        piops_gb,
                         aws_type='AWS::EC2::Volume'
                     )
         self.limits['General Purpose (SSD) volume storage '
-                    '(TiB)']._add_current_usage(
-                        gp_gb / 1000.0,
+                    '(GiB)']._add_current_usage(
+                        gp_gb,
                         aws_type='AWS::EC2::Volume'
                     )
         self.limits['Magnetic volume storage '
-                    '(TiB)']._add_current_usage(
-                        mag_gb / 1000.0,
+                    '(GiB)']._add_current_usage(
+                        mag_gb,
                         aws_type='AWS::EC2::Volume'
                     )
         self.limits['Active volumes']._add_current_usage(
@@ -160,26 +160,26 @@ def _get_limits_ebs(self):
             limit_type='AWS::EC2::Volume',
             limit_subtype='io1',
         )
-        limits['Provisioned IOPS (SSD) volume storage (TiB)'] = AwsLimit(
-            'Provisioned IOPS (SSD) volume storage (TiB)',
+        limits['Provisioned IOPS (SSD) storage (GiB)'] = AwsLimit(
+            'Provisioned IOPS (SSD) storage (GiB)',
             self,
             20,
             self.warning_threshold,
             self.critical_threshold,
             limit_type='AWS::EC2::Volume',
             limit_subtype='io1',
         )
-        limits['General Purpose (SSD) volume storage (TiB)'] = AwsLimit(
-            'General Purpose (SSD) volume storage (TiB)',
+        limits['General Purpose (SSD) volume storage (GiB)'] = AwsLimit(
+            'General Purpose (SSD) volume storage (GiB)',
             self,
             20,
             self.warning_threshold,
             self.critical_threshold,
             limit_type='AWS::EC2::Volume',
             limit_subtype='gp2',
         )
-        limits['Magnetic volume storage (TiB)'] = AwsLimit(
-            'Magnetic volume storage (TiB)',
+        limits['Magnetic volume storage (GiB)'] = AwsLimit(
+            'Magnetic volume storage (GiB)',
             self,
             20,
             self.warning_threshold,

diff --git a/awslimitchecker/tests/services/test_ebs.py b/awslimitchecker/tests/services/test_ebs.py
@@ -109,13 +109,13 @@ def test_get_limits(self):
         piops = limits['Provisioned IOPS']
         assert piops.limit_type == 'AWS::EC2::Volume'
         assert piops.limit_subtype == 'io1'
-        piops_tb = limits['Provisioned IOPS (SSD) volume storage (TiB)']
+        piops_tb = limits['Provisioned IOPS (SSD) storage (GiB)']
         assert piops_tb.limit_type == 'AWS::EC2::Volume'
         assert piops_tb.limit_subtype == 'io1'
-        gp_tb = limits['General Purpose (SSD) volume storage (TiB)']
+        gp_tb = limits['General Purpose (SSD) volume storage (GiB)']
         assert gp_tb.limit_type == 'AWS::EC2::Volume'
         assert gp_tb.limit_subtype == 'gp2'
-        mag_tb = limits['Magnetic volume storage (TiB)']
+        mag_tb = limits['Magnetic volume storage (GiB)']
         assert mag_tb.limit_type == 'AWS::EC2::Volume'
         assert mag_tb.limit_subtype == 'standard'
         act_snaps = limits['Active snapshots']
@@ -208,18 +208,18 @@ def test_find_usage_ebs(self):
         assert len(cls.limits['Provisioned IOPS'].get_current_usage()) == 1
         assert cls.limits['Provisioned IOPS'
                           ''].get_current_usage()[0].get_value() == 1000
-        assert len(cls.limits['Provisioned IOPS (SSD) volume storage '
-                              '(TiB)'].get_current_usage()) == 1
-        assert cls.limits['Provisioned IOPS (SSD) volume storage '
-                          '(TiB)'].get_current_usage()[0].get_value() == 0.5
+        assert len(cls.limits['Provisioned IOPS (SSD) storage '
+                              '(GiB)'].get_current_usage()) == 1
+        assert cls.limits['Provisioned IOPS (SSD) storage '
+                          '(GiB)'].get_current_usage()[0].get_value() == 500
         assert len(cls.limits['General Purpose (SSD) volume storage '
-                              '(TiB)'].get_current_usage()) == 1
+                              '(GiB)'].get_current_usage()) == 1
         assert cls.limits['General Purpose (SSD) volume storage '
-                          '(TiB)'].get_current_usage()[0].get_value() == 0.045
+                          '(GiB)'].get_current_usage()[0].get_value() == 45
         assert len(cls.limits['Magnetic volume storage '
-                              '(TiB)'].get_current_usage()) == 1
+                              '(GiB)'].get_current_usage()) == 1
         assert cls.limits['Magnetic volume storage '
-                          '(TiB)'].get_current_usage()[0].get_value() == 0.508
+                          '(GiB)'].get_current_usage()[0].get_value() == 508
         assert len(cls.limits['Active volumes'].get_current_usage()) == 1
         assert cls.limits['Active volumes'
                           ''].get_current_usage()[0].get_value() == 7