Merge pull request #122 from ifosch/pre-0.1.4

Make code style to pass

Author: ifosch

accloudtant/aws/prices.py

@@ -26,9 +26,12 @@
 class Prices(object):
     def __init__(self):
         with warnings.catch_warnings(record=True) as price_warnings:
-            curr_url = 'https://aws.amazon.com/ec2/pricing/on-demand/'
-            curr_ri_url = 'https://aws.amazon.com/ec2/pricing/reserved-instances/pricing/'
-            prev_url = 'https://aws.amazon.com/ec2/previous-generation/'
+            base_url = 'https://aws.amazon.com/ec2/'
+            curr_url = '{}pricing/on-demand/'.format(base_url)
+            curr_ri_url = '{}pricing/reserved-instances/pricing/'.format(
+                base_url
+            )
+            prev_url = '{}previous-generation/'.format(base_url)
             self.prices = process_ec2(curr_url)
             prices_curr_ri = process_ec2(curr_ri_url)
             prices_prev = process_ec2(prev_url)
@@ -41,13 +44,40 @@ def __init__(self):
             for warning in price_warnings:
                 self.output += "\n{}".format(warning.message)
 
-    def update_ri_prices(self, prices_curr_ri, kind):
+    def update_ri_prices(self, prices_ri, kind):
+        empty_ri = {
+            'yrTerm1Standard': {
+                'noUpfront': {
+                    'effectiveHourly': None,
+                },
+                'partialUpfront': {
+                    'effectiveHourly': None,
+                },
+                'allUpfront': {
+                    'effectiveHourly': None,
+                },
+            },
+            'yrTerm3Standard': {
+                'noUpfront': {
+                    'effectiveHourly': None,
+                },
+                'partialUpfront': {
+                    'effectiveHourly': None,
+                },
+                'allUpfront': {
+                    'effectiveHourly': None,
+                },
+            },
+        }
         for region in self.prices[kind]:
-            if region in prices_curr_ri[kind]:
-                for instance_type in self.prices[kind][region]:
-                    if instance_type in prices_curr_ri[kind][region]:
-                        if 'ri' in prices_curr_ri[kind][region][instance_type]:
-                            self.prices[kind][region][instance_type]['ri'] = prices_curr_ri[kind][region][instance_type]['ri']
+            for instance_type in self.prices[kind][region]:
+                local_prices = self.prices[kind][region][instance_type]
+                ri_type = prices_ri[kind][region].get(
+                    instance_type,
+                    {'ri': empty_ri},
+                )
+                if 'ri' in ri_type:
+                    local_prices['ri'] = ri_type['ri']
 
     def update_previous_generation_prices(self, prices_prev, kind):
         for region in self.prices[kind]:
@@ -351,6 +381,7 @@ def process_not_implemented(data, js_name, instances=None):
         generic['name']))
     return instances
 
+
 SECTION_NAMES = {
     'linux-od.min.js': {
         'name': 'On Demand - Linux',

accloudtant/aws/reports.py

@@ -22,6 +22,7 @@
 from accloudtant.aws.prices import Prices
 import sys
 
+
 class Reports(object):
     def __init__(self, output_format, logger=None):
         if logger is None:
@@ -30,7 +31,7 @@ def __init__(self, output_format, logger=None):
             self.logger.addHandler(StreamHandler(sys.stdout))
         else:
             self.logger = logger
-        self.output_format=output_format
+        self.output_format = output_format
         ec2 = boto3.resource('ec2')
         ec2_client = boto3.client('ec2')
         self.counters = {
@@ -77,12 +78,16 @@ def find_reserved_instance(self):
             if instance.state == 'stopped':
                 instance.current = 0.0
             try:
-                instance_all_upfront = instance_size['ri']['yrTerm3Standard']['allUpfront']
+                ri_price = instance_size['ri']['yrTerm3Standard']['allUpfront']
+                instance_all_upfront = ri_price
             except KeyError:
                 instance_all_upfront = {
                     'effectiveHourly': 0.0,
                 }
-            instance.best = float(instance_all_upfront['effectiveHourly'])
+            if instance_all_upfront['effectiveHourly'] is None:
+                instance.best = 'N/A'
+            else:
+                instance.best = float(instance_all_upfront['effectiveHourly'])
             for reserved in self.reserved_instances:
                 if instance.match_reserved_instance(reserved):
                     instance.reserved = 'Yes'

tests/aws/test_reports.py

@@ -20,6 +20,7 @@
 def get_future_date(years=1):
     return datetime.datetime.now() + datetime.timedelta(years)
 
+
 def test_reports_table(capsys, monkeypatch, ec2_resource, ec2_client,
                        process_ec2):
     instances = {
@@ -654,8 +655,14 @@ def test_reports_table(capsys, monkeypatch, ec2_resource, ec2_client,
                 assert(instance.best == mock['best'])
     assert(out == expected)
 
-def test_reports_csv(capsys, monkeypatch, ec2_resource, ec2_client,
-                       process_ec2):
+
+def test_reports_csv(
+        capsys,
+        monkeypatch,
+        ec2_resource,
+        ec2_client,
+        process_ec2,
+):
     instances = {
         'instances': [{
             'id': 'i-912a4392',
@@ -1287,4 +1294,3 @@ def test_reports_csv(capsys, monkeypatch, ec2_resource, ec2_client,
                 assert(instance.current == mock['current'])
                 assert(instance.best == mock['best'])
     assert(out == expected)
-