openstack
/
deb-ceilometer
Code Issues Proposed changes

Replace isotime() with utcnow() and isoformat() 

Change-Id: Ia213e7c7436504ae39e743ccac8703fc6cf88770
This commit is contained in:
Jie Li 2015-07-27 10:56:34 +08:00
parent c01d1f523e
commit 2733630bee
13 changed files with 30 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ceilometer/compute/pollsters/net.py
View File

@ -60,7 +60,7 @@ class _Base(pollsters.BaseComputePollster):
user_id=instance.user_id,
project_id=instance.tenant_id,
resource_id=rid,
timestamp=timeutils.isotime(),
timestamp=timeutils.utcnow().isoformat(),
resource_metadata=resource_metadata
)

2
ceilometer/compute/pollsters/util.py
View File

@ -84,7 +84,7 @@ def make_sample_from_instance(instance, name, type, unit, volume,
user_id=instance.user_id,
project_id=instance.tenant_id,
resource_id=resource_id or instance.id,
timestamp=timeutils.isotime(),
timestamp=timeutils.utcnow().isoformat(),
resource_metadata=resource_metadata,
)

2
ceilometer/hardware/pollsters/util.py
View File

@ -56,7 +56,7 @@ def make_sample_from_host(host_url, name, sample_type, unit, volume,
user_id=user_id or extra.get('user_id'),
project_id=project_id or extra.get('project_id'),
resource_id=res_id,
timestamp=timeutils.isotime(),
timestamp=timeutils.utcnow().isoformat(),
resource_metadata=resource_metadata,
source='hardware',
)

4
ceilometer/image/glance.py
View File

@ -111,7 +111,7 @@ class ImagePollster(_Base):
user_id=None,
project_id=image.owner,
resource_id=image.id,
timestamp=timeutils.isotime(),
timestamp=timeutils.utcnow().isoformat(),
resource_metadata=self.extract_image_metadata(image),
)
@ -128,6 +128,6 @@ class ImageSizePollster(_Base):
user_id=None,
project_id=image.owner,
resource_id=image.id,
timestamp=timeutils.isotime(),
timestamp=timeutils.utcnow().isoformat(),
resource_metadata=self.extract_image_metadata(image),
)

4
ceilometer/network/services/lbaas.py
View File

@ -223,7 +223,7 @@ class _LBStatsPollster(base.BaseServicesPollster):
user_id=None,
project_id=pool['tenant_id'],
resource_id=pool['id'],
timestamp=timeutils.isotime(),
timestamp=timeutils.utcnow().isoformat(),
resource_metadata=resource_metadata,
)
@ -325,6 +325,6 @@ def make_sample_from_pool(pool, name, type, unit, volume,
user_id=None,
project_id=pool['tenant_id'],
resource_id=pool['id'],
timestamp=timeutils.isotime(),
timestamp=timeutils.utcnow().isoformat(),
resource_metadata=resource_metadata,
)

2
ceilometer/network/statistics/opendaylight/driver.py
View File

@ -162,7 +162,7 @@ class OpenDayLightDriver(driver.Driver):
container_data['inactive_hosts'] = (
cs.host_tracker.get_inactive_hosts(container_name))
container_data['timestamp'] = timeutils.isotime()
container_data['timestamp'] = timeutils.utcnow().isoformat()
data[container_name] = container_data
except Exception:

12
ceilometer/objectstore/rgw.py
View File

@ -116,7 +116,7 @@ class ContainersObjectsPollster(_Base):
user_id=None,
project_id=tenant,
resource_id=tenant + '/' + it.name,
timestamp=timeutils.isotime(),
timestamp=timeutils.utcnow().isoformat(),
resource_metadata=None,
)
@ -136,7 +136,7 @@ class ContainersSizePollster(_Base):
user_id=None,
project_id=tenant,
resource_id=tenant + '/' + it.name,
timestamp=timeutils.isotime(),
timestamp=timeutils.utcnow().isoformat(),
resource_metadata=None,
)
@ -155,7 +155,7 @@ class ObjectsSizePollster(_Base):
user_id=None,
project_id=tenant,
resource_id=tenant,
timestamp=timeutils.isotime(),
timestamp=timeutils.utcnow().isoformat(),
resource_metadata=None,
)
@ -174,7 +174,7 @@ class ObjectsPollster(_Base):
user_id=None,
project_id=tenant,
resource_id=tenant,
timestamp=timeutils.isotime(),
timestamp=timeutils.utcnow().isoformat(),
resource_metadata=None,
)
@ -191,7 +191,7 @@ class ObjectsContainersPollster(_Base):
user_id=None,
project_id=tenant,
resource_id=tenant,
timestamp=timeutils.isotime(),
timestamp=timeutils.utcnow().isoformat(),
resource_metadata=None,
)
@ -211,6 +211,6 @@ class UsagePollster(_Base):
user_id=None,
project_id=tenant,
resource_id=tenant,
timestamp=timeutils.isotime(),
timestamp=timeutils.utcnow().isoformat(),
resource_metadata=None,
)

10
ceilometer/objectstore/swift.py
View File

@ -114,7 +114,7 @@ class ObjectsPollster(_Base):
user_id=None,
project_id=tenant,
resource_id=tenant,
timestamp=timeutils.isotime(),
timestamp=timeutils.utcnow().isoformat(),
resource_metadata=None,
)
@ -133,7 +133,7 @@ class ObjectsSizePollster(_Base):
user_id=None,
project_id=tenant,
resource_id=tenant,
timestamp=timeutils.isotime(),
timestamp=timeutils.utcnow().isoformat(),
resource_metadata=None,
)
@ -152,7 +152,7 @@ class ObjectsContainersPollster(_Base):
user_id=None,
project_id=tenant,
resource_id=tenant,
timestamp=timeutils.isotime(),
timestamp=timeutils.utcnow().isoformat(),
resource_metadata=None,
)
@ -176,7 +176,7 @@ class ContainersObjectsPollster(_Base):
user_id=None,
project_id=tenant,
resource_id=tenant + '/' + container['name'],
timestamp=timeutils.isotime(),
timestamp=timeutils.utcnow().isoformat(),
resource_metadata=None,
)
@ -200,6 +200,6 @@ class ContainersSizePollster(_Base):
user_id=None,
project_id=tenant,
resource_id=tenant + '/' + container['name'],
timestamp=timeutils.isotime(),
timestamp=timeutils.utcnow().isoformat(),
resource_metadata=None,
)

10
ceilometer/tests/api/v2/test_acl_scenarios.py
View File

@ -41,9 +41,10 @@ class FakeMemcache(object):
if (key == "tokens/%s" % VALID_TOKEN or
key == "tokens/%s" % self.TOKEN_HASH):
dt = timeutils.utcnow() + datetime.timedelta(minutes=5)
dt_isoformat = dt.isoformat()
return json.dumps(({'access': {
'token': {'id': VALID_TOKEN,
'expires': timeutils.isotime(dt)},
'expires': dt_isoformat},
'user': {
'id': 'user_id1',
'name': 'user_name1',
@ -52,13 +53,14 @@ class FakeMemcache(object):
'roles': [
{'name': 'admin'},
]},
}}, timeutils.isotime(dt)))
}}, dt_isoformat))
if (key == "tokens/%s" % VALID_TOKEN2 or
key == "tokens/%s" % self.TOKEN2_HASH):
dt = timeutils.utcnow() + datetime.timedelta(minutes=5)
dt_isoformat = dt.isoformat()
return json.dumps(({'access': {
'token': {'id': VALID_TOKEN2,
'expires': timeutils.isotime(dt)},
'expires': dt_isoformat},
'user': {
'id': 'user_id2',
'name': 'user-good',
@ -67,7 +69,7 @@ class FakeMemcache(object):
'roles': [
{'name': 'Member'},
]},
}}, timeutils.isotime(dt)))
}}, dt_isoformat))
@staticmethod
def set(key, value, **kwargs):

10
ceilometer/tests/api/v2/test_list_resources_scenarios.py
View File

@ -18,7 +18,6 @@
import datetime
import json
from oslo_utils import timeutils
import six
from ceilometer.publisher import utils
@ -34,17 +33,12 @@ class TestListResources(v2.FunctionalTest,
data = self.get_json('/resources')
self.assertEqual([], data)
@staticmethod
def _isotime(timestamp):
# drop TZ specifier
return six.text_type(timeutils.isotime(timestamp))[:-1]
def _verify_resource_timestamps(self, res, first, last):
# Bounds need not be tight (see ceilometer bug #1288372)
self.assertIn('first_sample_timestamp', res)
self.assertTrue(self._isotime(first) >= res['first_sample_timestamp'])
self.assertTrue(first.isoformat() >= res['first_sample_timestamp'])
self.assertIn('last_sample_timestamp', res)
self.assertTrue(self._isotime(last) <= res['last_sample_timestamp'])
self.assertTrue(last.isoformat() <= res['last_sample_timestamp'])
def test_instance_no_metadata(self):
timestamp = datetime.datetime(2012, 7, 2, 10, 40)

2
ceilometer/tests/database/test_notifications.py
View File

@ -21,7 +21,7 @@ from oslotest import base
from ceilometer.database import notifications
from ceilometer import sample
NOW = timeutils.isotime()
NOW = timeutils.utcnow().isoformat()
TENANT_ID = u'76538754af6548f5b53cf9af2d35d582'
USER_ID = u'b70ece400e4e45c187168c40fa42ff7a'

2
ceilometer/tests/dns/test_notifications.py
View File

@ -21,7 +21,7 @@ from oslotest import base
from ceilometer.dns import notifications
from ceilometer import sample
NOW = timeutils.isotime()
NOW = timeutils.utcnow().isoformat()
TENANT_ID = u'76538754af6548f5b53cf9af2d35d582'
USER_ID = u'b70ece400e4e45c187168c40fa42ff7a'

2
ceilometer/tests/network/statistics/test_statistics.py
View File

@ -98,7 +98,7 @@ class TestBaseGetSamples(base.BaseTestCase):
@staticmethod
def _make_timestamps(count):
now = timeutils.utcnow()
return [timeutils.isotime(now + datetime.timedelta(seconds=i))
return [(now + datetime.timedelta(seconds=i)).isoformat()
for i in range(count)]
def _get_samples(self, *resources):