Merge "Use utils.parse_strtime rather than datetime.strptime"

2 files changed, 16 insertions, 18 deletions

diff --git a/nova/api/openstack/compute/contrib/simple_tenant_usage.py b/nova/api/openstack/compute/contrib/simple_tenant_usage.py
index 763133f6c..eb8f86cc8 100644
--- a/nova/api/openstack/compute/contrib/simple_tenant_usage.py
+++ b/nova/api/openstack/compute/contrib/simple_tenant_usage.py
@@ -24,6 +24,7 @@ from nova.api.openstack import xmlutil
 from nova.compute import api
 from nova import exception
 from nova import flags
+from nova import utils
 
 
 FLAGS = flags.FLAGS
@@ -72,13 +73,13 @@ class SimpleTenantUsageController(object):
         terminated_at = instance['terminated_at']
         if terminated_at is not None:
             if not isinstance(terminated_at, datetime.datetime):
-                terminated_at = datetime.datetime.strptime(terminated_at,
-                                                  "%Y-%m-%d %H:%M:%S.%f")
+                terminated_at = utils.parse_strtime(terminated_at,
+                                                    "%Y-%m-%d %H:%M:%S.%f")
 
         if launched_at is not None:
             if not isinstance(launched_at, datetime.datetime):
-                launched_at = datetime.datetime.strptime(launched_at,
-                                                "%Y-%m-%d %H:%M:%S.%f")
+                launched_at = utils.parse_strtime(launched_at,
+                                                  "%Y-%m-%d %H:%M:%S.%f")
 
         if terminated_at and terminated_at < period_start:
             return 0
@@ -186,25 +187,23 @@ class SimpleTenantUsageController(object):
         return rval.values()
 
     def _parse_datetime(self, dtstr):
-        if isinstance(dtstr, datetime.datetime):
+        if not dtstr:
+            return utils.utcnow()
+        elif isinstance(dtstr, datetime.datetime):
             return dtstr
         try:
-            return datetime.datetime.strptime(dtstr, "%Y-%m-%dT%H:%M:%S")
+            return utils.parse_strtime(dtstr, "%Y-%m-%dT%H:%M:%S")
         except Exception:
             try:
-                return datetime.datetime.strptime(dtstr,
-                        "%Y-%m-%dT%H:%M:%S.%f")
+                return utils.parse_strtime(dtstr, "%Y-%m-%dT%H:%M:%S.%f")
             except Exception:
-                return datetime.datetime.strptime(dtstr,
-                        "%Y-%m-%d %H:%M:%S.%f")
+                return utils.parse_strtime(dtstr, "%Y-%m-%d %H:%M:%S.%f")
 
     def _get_datetime_range(self, req):
         qs = req.environ.get('QUERY_STRING', '')
         env = urlparse.parse_qs(qs)
-        period_start = self._parse_datetime(env.get('start',
-                [datetime.datetime.utcnow().isoformat()])[0])
-        period_stop = self._parse_datetime(env.get('end',
-                [datetime.datetime.utcnow().isoformat()])[0])
+        period_start = self._parse_datetime(env.get('start', [None])[0])
+        period_stop = self._parse_datetime(env.get('end', [None])[0])
 
         detailed = bool(env.get('detailed', False))
         return (period_start, period_stop, detailed)
diff --git a/nova/api/openstack/compute/versions.py b/nova/api/openstack/compute/versions.py
index b964d87fe..f190dca03 100644
--- a/nova/api/openstack/compute/versions.py
+++ b/nova/api/openstack/compute/versions.py
@@ -15,13 +15,12 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import datetime
-
 from lxml import etree
 
 from nova.api.openstack.compute.views import versions as views_versions
 from nova.api.openstack import wsgi
 from nova.api.openstack import xmlutil
+from nova import utils
 
 
 LINKS = {
@@ -125,8 +124,8 @@ class AtomSerializer(wsgi.XMLDictSerializer):
     def _get_most_recent_update(self, versions):
         recent = None
         for version in versions:
-            updated = datetime.datetime.strptime(version['updated'],
-                                        '%Y-%m-%dT%H:%M:%SZ')
+            updated = utils.parse_strtime(version['updated'],
+                                          '%Y-%m-%dT%H:%M:%SZ')
             if not recent:
                 recent = updated
             elif updated > recent: