[IMP] clouder_metric: Fixes per PR

* Update license to AGPL
* Add model `_description`
* Clean up lint issues

Author: Ted Salmon

clouder_metric/README.md

@@ -1,5 +1,5 @@
-.. image:: https://img.shields.io/badge/licence-LGPL--3-blue.svg
-   :target: http://www.gnu.org/licenses/lgpl-3.0-standalone.html
+.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg
+   :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
    :alt: License: AGPL-3
 
 ==============
@@ -19,7 +19,7 @@ Bug Tracker
 ===========
 
 Bugs are tracked on `GitHub Issues
-<https://github.com/clouder/clouder/issues>`_.
+<https://github.com/clouder-community/clouder>`_.
 
 Contributors
 ------------

clouder_metric/__init__.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
 # Copyright 2016 LasLabs Inc.
-# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl).
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 from . import models

clouder_metric/__manifest__.py

@@ -1,14 +1,14 @@
 # -*- coding: utf-8 -*-
 # Copyright 2016 LasLabs Inc.
-# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl).
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 {
     "name": "Clouder - Metrics",
     "summary": "Provides Usage Metric Interface for Clouder",
     "version": "10.0.1.0.0",
     "category": "Clouder",
     "website": "https://github.com/clouder-community/clouder",
     "author": "LasLabs",
-    "license": "LGPL-3",
+    "license": "AGPL-3",
     "application": False,
     "installable": True,
     "depends": [

clouder_metric/models/__init__.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # Copyright 2016 LasLabs Inc.
-# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl).
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 from . import clouder_metric_type
 from . import clouder_metric_interface

clouder_metric/models/clouder_metric_interface.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # Copyright 2016 LasLabs Inc.
-# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl).
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 from odoo import api, fields, models
 
@@ -12,6 +12,7 @@ class ClouderMetricInterface(models.Model):
     """
 
     _name = 'clouder.metric.interface'
+    _description = 'Clouder Metric Interfaces'
     _inherits = {'clouder.metric.type': 'type_id'}
 
     type_id = fields.Many2one(
@@ -65,5 +66,5 @@ def metric_id(self):
     @api.multi
     def name_get(self):
         return [
-            (r.id, '%s - %s' % (r.type_id.name, r.metric_ref)) for r in self
+            (r.id, '%s - %s' % (r.type_id.name, r.metric_id.id)) for r in self
         ]

clouder_metric/models/clouder_metric_type.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # Copyright 2016 LasLabs Inc.
-# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl).
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 from odoo import _, api, fields, models
 from odoo.tools import safe_eval
@@ -11,6 +11,7 @@ class ClouderMetricType(models.Model):
     """ It provides context for usage metric types """
 
     _name = 'clouder.metric.type'
+    _description = 'Clouder Metric Types'
 
     name = fields.Char()
     code = fields.Char()
@@ -38,19 +39,21 @@ def _default_query_code(self):
         return _("# Python code. \n"
                  "Use `value = my_value` to specify the final calculated "
                  " metric value. This is required. \n"
-                 "Optionally use ``uom == product_uom_record`` to change the "
+                 "Optionally use ``uom = product_uom_record`` to change the "
                  "units that the metric is being measured in. \n"
+                 "You should also add `date_start` and `date_end`, which "
+                 "are `datetime` values to signify the date of occurrence of "
+                 "the metric value in question. \n"
                  "# You can use the following variables: \n"
-                 "#  - self: browse_record of the current ID Category "
-                 "browse_record. \n"
+                 "#  - self: browse_record of the current ID Category \n"
                  "#  - interface: browse_record of the Metrics Interface. \n"
                  "#  - metric_model: Name of the metric model type. \n")
 
     @api.model
     def _get_metric_models(self):
         """ Returns a selection of available metric models
         Returns:
-            (list): Additional metric models
+            list: Additional metric models
         """
         return [
             ('clouder.base', 'Base'),
@@ -63,7 +66,7 @@ def _get_query_code_context(self, interface):
         Args:
             interface (clouder.metric.interface): The interface to use
         Returns:
-            (dict): Dict with the context for the given iface and model
+            dict: Dict with the context for the given iface and model
         """
         self.ensure_one()
         return {
@@ -106,6 +109,6 @@ def save_metric_value(self, metric_interfaces):
                     'value': eval_context['value'],
                     'date_start': eval_context.get('date_start'),
                     'date_end': eval_context.get('date_end'),
-                    'uom_id': uom.id
+                    'uom_id': uom.id,
                 })],
             })

clouder_metric/models/clouder_metric_value.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # Copyright 2016 LasLabs Inc.
-# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl).
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 from odoo import fields, models
 
@@ -9,6 +9,7 @@ class ClouderMetricValue(models.Model):
     """ It provides a record of metric values used in billing. """
 
     _name = 'clouder.metric.value'
+    _description = 'Clouder Metric Values'
 
     interface_id = fields.Many2one(
         string='Interface',

clouder_metric/tests/__init__.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # Copyright 2017 LasLabs Inc.
-# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl).
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 from . import test_clouder_metric_interface
 from . import test_clouder_metric_type

clouder_metric/tests/common.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # Copyright 2017 LasLabs Inc.
-# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl).
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 from odoo.tests.common import TransactionCase
 

clouder_metric/tests/test_clouder_metric_interface.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # Copyright 2017 LasLabs Inc.
-# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl).
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 from .common import TestCommon
 
@@ -17,6 +17,3 @@ def test_name_get(self):
             (self.metric_interface.id, 'Test Metric - 7')
         ]
         self.assertEqual(exp, self.metric_interface.name_get())
-
-    def test_save_metric_value(self):
-        """ It should verify """

clouder_metric/tests/test_clouder_metric_type.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # Copyright 2017 LasLabs Inc.
-# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl).
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 from odoo.exceptions import UserError, ValidationError