Merge pull request #34 from stat-kwon/master

Refactor cost spec because of changing cost-analysis service

Author: stat-kwon

src/cloudforet/cost_analysis/error/cost.py

@@ -1,5 +1,5 @@
 from spaceone.core.error import *
 
 
-class ERROR_EMPTY_BILLED_AT(ERROR_UNKNOWN):
-    _message = 'Must have billed_at field or year, month and day fields.: {result}'
+class ERROR_EMPTY_BILLED_DATE(ERROR_UNKNOWN):
+    _message = 'Must have billed_date field or year, month fields.: {result}'

src/cloudforet/cost_analysis/info/cost_info.py

@@ -13,20 +13,17 @@ def CostInfo(cost_data):
     try:
         info = {
             'cost': cost_data['cost'],
-            'currency': cost_data['currency'],
-            'usage_quantity': cost_data['usage_quantity'],
+            'usage_quantity': cost_data.get('usage_quantity'),
+            'usage_type': cost_data.get('usage_type'),
+            'usage_unit': cost_data.get('usage_unit'),
             'provider': cost_data['provider'],
             'region_code': cost_data['region_code'],
-            'category': cost_data.get('category'),
             'product': cost_data['product'],
-            'account': cost_data['account'],
-            'usage_type': cost_data.get('usage_type'),
-            'resource_group': cost_data.get('resource_group'),
             'resource': cost_data.get('resource'),
             'tags': change_struct_type(cost_data['tags']) if 'tags' in cost_data else None,
             'additional_info': change_struct_type(
                 cost_data['additional_info']) if 'additional_info' in cost_data else None,
-            'billed_at': utils.datetime_to_iso8601(cost_data['billed_at'])
+            'billed_date': cost_data['billed_date']
         }
 
         return cost_pb2.CostInfo(**info)

src/cloudforet/cost_analysis/manager/cost_manager.py

@@ -12,7 +12,6 @@
     'currency',
     'year',
     'month',
-    'day'
 ]
 
 
@@ -52,19 +51,19 @@ def _make_cost_data(self, results):
 
             self._check_required_fields(result)
 
+            result['additional_info']['Account'] = result.get('account')
+
             try:
                 data = {
                     'cost': result['cost'],
-                    'currency': result['currency'],
                     'usage_quantity': result.get('usage_quantity', 0),
+                    'usage_type': result.get('usage_type'),
+                    'usage_unit': result.get('usage_unit'),
                     'provider': result.get('provider'),
                     'region_code': result.get('region_code'),
                     'product': result.get('product'),
-                    'account': str(result.get('account')),
-                    'usage_type': result.get('usage_type'),
                     'resource': result.get('resource', ''),
-                    'resource_group': result.get('resource_group', ''),
-                    'billed_at': self._create_billed_at_format(result['year'], result['month'], result['day']),
+                    'billed_date': f'{result["year"]}-{result["month"]}',
                     'additional_info': result.get('additional_info', {}),
                     'tags': result.get('tags', {})
                 }
@@ -111,24 +110,23 @@ def _change_result_by_field_mapper(self, result):
                     del result[actual_additional_field]
                 result[origin_field] = additional_info
 
-            if 'billed_at' in origin_field:
-                if self._check_billed_at(result):
-                    result['billed_at'] = self._apply_parse_date(result[origin_field])
+            if 'billed_date' in origin_field:
+                if self._check_billed_date(result):
+                    result['billed_date'] = self._apply_parse_date(result[origin_field])
                     result['year'] = result[origin_field].year
                     result['month'] = result[origin_field].month
-                    result['day'] = result[origin_field].day
 
         return result
 
     @staticmethod
-    def _check_billed_at(result):
-        if result['billed_at']:
+    def _check_billed_date(result):
+        if result['billed_date']:
             return True
-        elif result.get('year') and result.get('month') and result.get('day'):
+        elif result.get('year') and result.get('month'):
             return False
         else:
             _LOGGER.error(f'[_is_not_empty_billed_at] billed_at is empty: {result}')
-            raise ERROR_EMPTY_BILLED_AT(result=result)
+            raise ERROR_EMPTY_BILLED_DATE(result=result)
 
     @staticmethod
     def _apply_parse_date(date):
@@ -172,7 +170,7 @@ def _check_required_fields(result):
                 raise ERROR_REQUIRED_PARAMETER(key=field)
 
     @staticmethod
-    def _create_billed_at_format(year, month, day):
-        date = f'{year}-{month}-{day}'
-        billed_at_format = '%Y-%m-%d'
+    def _create_billed_date_format(year, month):
+        date = f'{year}-{month}'
+        billed_at_format = '%Y-%m'
         return datetime.strptime(date, billed_at_format)

src/cloudforet/cost_analysis/manager/job_manager.py

@@ -27,7 +27,7 @@ def get_tasks(self, options, secret_data, schema, start, last_synchronized_at):
 
             tasks.append({'task_options': task_options})
             changed.append({
-                'start': '1900-01-01T00:00:00Z'
+                'start': '1900-01-01'
             })
 
         _LOGGER.debug(f'[get_tasks] tasks: {tasks}')

src/cloudforet/cost_analysis/model/cost_model.py

@@ -6,15 +6,13 @@
 
 class Cost(Model):
     cost = FloatType(required=True)
-    currency = StringType(default='USD')
     usage_quantity = FloatType(required=True)
+    usage_type = StringType()
+    usage_unit = StringType(default=None)
     provider = StringType(required=True)
     region_code = StringType()
     product = StringType()
-    account = StringType(required=True)
-    usage_type = StringType()
     resource = StringType()
-    resource_group = StringType()
-    billed_at = DateTimeType(required=True)
+    billed_date = StringType(required=True, max_length=7)
     additional_info = DictType(StringType, default={})
     tags = DictType(StringType, default={})

src/cloudforet/cost_analysis/model/data_source_model.py

@@ -35,3 +35,4 @@ class DataSourceRule(Model):
 
 class PluginMetadata(Model):
     data_source_rules = ListType(ModelType(DataSourceRule), default=[])
+    currency = StringType(required=True, default='USD')

src/cloudforet/cost_analysis/model/job_model.py

@@ -14,8 +14,8 @@ class Task(Model):
 
 
 class Changed(Model):
-    start = DateTimeType(required=True)
-    end = DateTimeType(default=None)
+    start = StringType(required=True, max_length=7)
+    end = StringType(default=None, max_length=7)
 
 
 class Tasks(Model):

src/cloudforet/cost_analysis/service/job_service.py

@@ -17,7 +17,7 @@ def __init__(self, *args, **kwargs):
 
     @transaction
     @check_required(['options', 'secret_data'])
-    @change_timestamp_value(['start', 'last_synchronized_at'], timestamp_format='iso8601')
+    @change_timestamp_value(['last_synchronized_at'], timestamp_format='iso8601')
     def get_tasks(self, params):
         """Get Job Tasks