From 7d2b3a0627d12af6d90546a85a5781782a4acd27 Mon Sep 17 00:00:00 2001
From: Fernando Ojeda <fernando.ojeda@jalasoft.com>
Date: Fri, 15 Nov 2019 14:23:34 -0400
Subject: [PATCH 1/3] Fix cdn detail usage.

---
 SoftLayer/managers/cdn.py   | 14 +++++++++++---
 tests/managers/cdn_tests.py | 10 ++--------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/SoftLayer/managers/cdn.py b/SoftLayer/managers/cdn.py
index 95a32f870..e4c827de1 100644
--- a/SoftLayer/managers/cdn.py
+++ b/SoftLayer/managers/cdn.py
@@ -21,6 +21,8 @@ class CDNManager(utils.IdentifierMixin, object):
 
     def __init__(self, client):
         self.client = client
+        self._start_date = None
+        self._end_date = None
         self.cdn_configuration = self.client['Network_CdnMarketplace_Configuration_Mapping']
         self.cdn_path = self.client['SoftLayer_Network_CdnMarketplace_Configuration_Mapping_Path']
         self.cdn_metrics = self.client['Network_CdnMarketplace_Metrics']
@@ -151,10 +153,16 @@ def get_usage_metrics(self, unique_id, history=30, frequency="aggregate"):
         _start = utils.days_to_datetime(history)
         _end = utils.days_to_datetime(0)
 
-        _start_date = utils.timestamp(_start)
-        _end_date = utils.timestamp(_end)
+        self._start_date = utils.timestamp(_start)
+        self._end_date = utils.timestamp(_end)
 
-        usage = self.cdn_metrics.getMappingUsageMetrics(unique_id, _start_date, _end_date, frequency)
+        usage = self.cdn_metrics.getMappingUsageMetrics(unique_id, self._start_date, self._end_date, frequency)
 
         # The method getMappingUsageMetrics() returns an array but there is only 1 object
         return usage[0]
+
+    def get_start_data(self):
+        return self._start_date
+
+    def get_end_date(self):
+        return self._end_date
diff --git a/tests/managers/cdn_tests.py b/tests/managers/cdn_tests.py
index 41a675c6d..f063c95fc 100644
--- a/tests/managers/cdn_tests.py
+++ b/tests/managers/cdn_tests.py
@@ -31,15 +31,9 @@ def test_detail_cdn(self):
     def test_detail_usage_metric(self):
         self.cdn_client.get_usage_metrics(12345, history=30, frequency="aggregate")
 
-        _start = utils.days_to_datetime(30)
-        _end = utils.days_to_datetime(0)
-
-        _start_date = utils.timestamp(_start)
-        _end_date = utils.timestamp(_end)
-
         args = (12345,
-                _start_date,
-                _end_date,
+                self.cdn_client.get_start_data(),
+                self.cdn_client.get_end_date(),
                 "aggregate")
         self.assert_called_with('SoftLayer_Network_CdnMarketplace_Metrics',
                                 'getMappingUsageMetrics',

From 8099efc9fef9481c0bd767e2607d0bf6a6d667bb Mon Sep 17 00:00:00 2001
From: Fernando Ojeda <fernando.ojeda@jalasoft.com>
Date: Fri, 15 Nov 2019 14:45:46 -0400
Subject: [PATCH 2/3] Fix analysis tox.

---
 SoftLayer/managers/cdn.py   | 6 ++++--
 tests/managers/cdn_tests.py | 5 ++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/SoftLayer/managers/cdn.py b/SoftLayer/managers/cdn.py
index e4c827de1..2614d2676 100644
--- a/SoftLayer/managers/cdn.py
+++ b/SoftLayer/managers/cdn.py
@@ -161,8 +161,10 @@ def get_usage_metrics(self, unique_id, history=30, frequency="aggregate"):
         # The method getMappingUsageMetrics() returns an array but there is only 1 object
         return usage[0]
 
-    def get_start_data(self):
+    @property
+    def start_data(self):
         return self._start_date
 
-    def get_end_date(self):
+    @property
+    def end_date(self):
         return self._end_date
diff --git a/tests/managers/cdn_tests.py b/tests/managers/cdn_tests.py
index f063c95fc..31c3c4fa0 100644
--- a/tests/managers/cdn_tests.py
+++ b/tests/managers/cdn_tests.py
@@ -7,7 +7,6 @@
 
 from SoftLayer.managers import cdn
 from SoftLayer import testing
-from SoftLayer import utils
 
 
 class CDNTests(testing.TestCase):
@@ -32,8 +31,8 @@ def test_detail_usage_metric(self):
         self.cdn_client.get_usage_metrics(12345, history=30, frequency="aggregate")
 
         args = (12345,
-                self.cdn_client.get_start_data(),
-                self.cdn_client.get_end_date(),
+                self.cdn_client.start_data,
+                self.cdn_client.end_date,
                 "aggregate")
         self.assert_called_with('SoftLayer_Network_CdnMarketplace_Metrics',
                                 'getMappingUsageMetrics',

From 141cd2357136d0864e6c71ee355e4a0a9d33c7e9 Mon Sep 17 00:00:00 2001
From: Fernando Ojeda <fernando.ojeda@jalasoft.com>
Date: Fri, 15 Nov 2019 14:55:30 -0400
Subject: [PATCH 3/3] Fix analysis tox.

---
 SoftLayer/managers/cdn.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/SoftLayer/managers/cdn.py b/SoftLayer/managers/cdn.py
index 2614d2676..2ead8c1fc 100644
--- a/SoftLayer/managers/cdn.py
+++ b/SoftLayer/managers/cdn.py
@@ -163,8 +163,10 @@ def get_usage_metrics(self, unique_id, history=30, frequency="aggregate"):
 
     @property
     def start_data(self):
+        """Retrieve the cdn usage metric start date."""
         return self._start_date
 
     @property
     def end_date(self):
+        """Retrieve the cdn usage metric end date."""
         return self._end_date