openstack/aodh
Code Issues Proposed changes

Change counter to sample in objectstore tests

Browse Source 
This changes counter to sample vocable in objectstore tests

Parts of the blueprint remove-counter

Change-Id: I1a33855471558b311b8ea0069729e8dc3a6b5253
This commit is contained in:
Mehdi Abaakouk 2013-08-20 18:22:34 +02:00
parent 50e952b06c
commit efc491b94d
2 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/objectstore/test_swift.py
View File

@ -130,7 +130,7 @@ class TestSwiftPollster(base.TestCase):
samples = list(self.pollster.get_samples(self.manager, {}))
self.assertEqual(len(samples), 2)
def test_get_counter_names(self):
def test_get_meter_names(self):
self.stubs.Set(self.factory, '_iter_accounts',
self.fake_iter_accounts)
samples = list(self.pollster.get_samples(self.manager, {}))

66
tests/objectstore/test_swift_middleware.py
View File

@ -47,10 +47,10 @@ class TestSwiftMiddleware(base.TestCase):
class _faux_pipeline(object):
def __init__(self, pipeline_manager):
self.pipeline_manager = pipeline_manager
self.counters = []
self.samples = []
def publish_samples(self, ctxt, counters):
self.counters.extend(counters)
def publish_samples(self, ctxt, samples):
self.samples.extend(samples)
def flush(self, context):
pass
@ -80,16 +80,16 @@ class TestSwiftMiddleware(base.TestCase):
environ={'REQUEST_METHOD': 'GET'})
resp = app(req.environ, self.start_response)
self.assertEqual(list(resp), ["This string is 28 bytes long"])
counters = self.pipeline_manager.pipelines[0].counters
self.assertEqual(len(counters), 2)
data = counters[0]
samples = self.pipeline_manager.pipelines[0].samples
self.assertEqual(len(samples), 2)
data = samples[0]
self.assertEqual(data.volume, 28)
self.assertEqual(data.resource_metadata['version'], '1.0')
self.assertEqual(data.resource_metadata['container'], 'container')
self.assertEqual(data.resource_metadata['object'], 'obj')
# test the # of request and the request method
data = counters[1]
data = samples[1]
self.assertEqual(data.name, 'storage.api.request')
self.assertEqual(data.volume, 1)
self.assertEqual(data.resource_metadata['method'], 'get')
@ -101,16 +101,16 @@ class TestSwiftMiddleware(base.TestCase):
'wsgi.input':
StringIO.StringIO('some stuff')})
list(app(req.environ, self.start_response))
counters = self.pipeline_manager.pipelines[0].counters
self.assertEqual(len(counters), 2)
data = counters[0]
samples = self.pipeline_manager.pipelines[0].samples
self.assertEqual(len(samples), 2)
data = samples[0]
self.assertEqual(data.volume, 10)
self.assertEqual(data.resource_metadata['version'], '1.0')
self.assertEqual(data.resource_metadata['container'], 'container')
self.assertEqual(data.resource_metadata['object'], 'obj')
# test the # of request and the request method
data = counters[1]
data = samples[1]
self.assertEqual(data.name, 'storage.api.request')
self.assertEqual(data.volume, 1)
self.assertEqual(data.resource_metadata['method'], 'put')
@ -122,16 +122,16 @@ class TestSwiftMiddleware(base.TestCase):
'wsgi.input':
StringIO.StringIO('some other stuff')})
list(app(req.environ, self.start_response))
counters = self.pipeline_manager.pipelines[0].counters
self.assertEqual(len(counters), 2)
data = counters[0]
samples = self.pipeline_manager.pipelines[0].samples
self.assertEqual(len(samples), 2)
data = samples[0]
self.assertEqual(data.volume, 16)
self.assertEqual(data.resource_metadata['version'], '1.0')
self.assertEqual(data.resource_metadata['container'], 'container')
self.assertEqual(data.resource_metadata['object'], 'obj')
# test the # of request and the request method
data = counters[1]
data = samples[1]
self.assertEqual(data.name, 'storage.api.request')
self.assertEqual(data.volume, 1)
self.assertEqual(data.resource_metadata['method'], 'post')
@ -141,9 +141,9 @@ class TestSwiftMiddleware(base.TestCase):
req = Request.blank('/1.0/account/container/obj',
environ={'REQUEST_METHOD': 'HEAD'})
list(app(req.environ, self.start_response))
counters = self.pipeline_manager.pipelines[0].counters
self.assertEqual(len(counters), 1)
data = counters[0]
samples = self.pipeline_manager.pipelines[0].samples
self.assertEqual(len(samples), 1)
data = samples[0]
self.assertEqual(data.resource_metadata['version'], '1.0')
self.assertEqual(data.resource_metadata['container'], 'container')
self.assertEqual(data.resource_metadata['object'], 'obj')
@ -158,10 +158,10 @@ class TestSwiftMiddleware(base.TestCase):
req = Request.blank('/1.0/account/container/obj',
environ={'REQUEST_METHOD': 'BOGUS'})
list(app(req.environ, self.start_response))
counters = self.pipeline_manager.pipelines[0].counters
samples = self.pipeline_manager.pipelines[0].samples
self.assertEqual(len(counters), 1)
data = counters[0]
self.assertEqual(len(samples), 1)
data = samples[0]
self.assertEqual(data.resource_metadata['version'], '1.0')
self.assertEqual(data.resource_metadata['container'], 'container')
self.assertEqual(data.resource_metadata['object'], 'obj')
@ -175,9 +175,9 @@ class TestSwiftMiddleware(base.TestCase):
req = Request.blank('/1.0/account/container',
environ={'REQUEST_METHOD': 'GET'})
list(app(req.environ, self.start_response))
counters = self.pipeline_manager.pipelines[0].counters
self.assertEqual(len(counters), 2)
data = counters[0]
samples = self.pipeline_manager.pipelines[0].samples
self.assertEqual(len(samples), 2)
data = samples[0]
self.assertEqual(data.volume, 28)
self.assertEqual(data.resource_metadata['version'], '1.0')
self.assertEqual(data.resource_metadata['container'], 'container')
@ -188,9 +188,9 @@ class TestSwiftMiddleware(base.TestCase):
req = Request.blank('/1.0/account/container',
environ={'REQUEST_METHOD': 'GET'})
list(app(req.environ, self.start_response))
counters = self.pipeline_manager.pipelines[0].counters
self.assertEqual(len(counters), 2)
data = counters[0]
samples = self.pipeline_manager.pipelines[0].samples
self.assertEqual(len(samples), 2)
data = samples[0]
http_headers = [k for k in data.resource_metadata.keys()
if k.startswith('http_header_')]
self.assertEqual(len(http_headers), 0)
@ -209,9 +209,9 @@ class TestSwiftMiddleware(base.TestCase):
'X_VAR2': 'value2'
})
list(app(req.environ, self.start_response))
counters = self.pipeline_manager.pipelines[0].counters
self.assertEqual(len(counters), 2)
data = counters[0]
samples = self.pipeline_manager.pipelines[0].samples
self.assertEqual(len(samples), 2)
data = samples[0]
http_headers = [k for k in data.resource_metadata.keys()
if k.startswith('http_header_')]
self.assertEqual(len(http_headers), 2)
@ -231,9 +231,9 @@ class TestSwiftMiddleware(base.TestCase):
req = Request.blank('/1.0/account/container',
environ={'REQUEST_METHOD': 'GET'})
list(app(req.environ, self.start_response))
counters = self.pipeline_manager.pipelines[0].counters
self.assertEqual(len(counters), 2)
data = counters[0]
samples = self.pipeline_manager.pipelines[0].samples
self.assertEqual(len(samples), 2)
data = samples[0]
http_headers = [k for k in data.resource_metadata.keys()
if k.startswith('http_header_')]
self.assertEqual(len(http_headers), 0)