openstack
/
ceilometer
Code Issues Proposed changes

simplify test data generation 

Change-Id: I611ce1974b62719030b5ff41e694eade5fda8abc
This commit is contained in:
gord chung 2017-11-30 15:50:56 -05:00
parent 8f7694d7a5
commit 5f98f16c54
2 changed files with 20 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
ceilometer/tests/unit/polling/agentbase.py
View File

@ -31,21 +31,21 @@ from ceilometer import service
from ceilometer.tests import base from ceilometer.tests import base
default_test_data = sample.Sample( def default_test_data(name='test'):
name='test', return sample.Sample(
type=sample.TYPE_CUMULATIVE, name=name,
unit='', type=sample.TYPE_CUMULATIVE,
volume=1, unit='',
user_id='test', volume=1,
project_id='test', user_id='test',
resource_id='test_run_tasks', project_id='test',
timestamp=datetime.datetime.utcnow().isoformat(), resource_id='test_run_tasks',
resource_metadata={'name': 'Pollster'}, timestamp=datetime.datetime.utcnow().isoformat(),
) resource_metadata={'name': 'Pollster'})
class TestPollster(plugin_base.PollsterBase): class TestPollster(plugin_base.PollsterBase):
test_data = default_test_data test_data = default_test_data()
discovery = None discovery = None
@property @property
@ -62,7 +62,7 @@ class TestPollster(plugin_base.PollsterBase):
class BatchTestPollster(TestPollster): class BatchTestPollster(TestPollster):
test_data = default_test_data test_data = default_test_data()
discovery = None discovery = None
@property @property
@ -107,54 +107,27 @@ class BaseAgentManagerTestCase(base.BaseTestCase):
class Pollster(TestPollster): class Pollster(TestPollster):
samples = [] samples = []
resources = [] resources = []
test_data = default_test_data test_data = default_test_data()
class BatchPollster(BatchTestPollster): class BatchPollster(BatchTestPollster):
samples = [] samples = []
resources = [] resources = []
test_data = default_test_data test_data = default_test_data()
class PollsterAnother(TestPollster): class PollsterAnother(TestPollster):
samples = [] samples = []
resources = [] resources = []
test_data = sample.Sample( test_data = default_test_data('testanother')
name='testanother',
type=default_test_data.type,
unit=default_test_data.unit,
volume=default_test_data.volume,
user_id=default_test_data.user_id,
project_id=default_test_data.project_id,
resource_id=default_test_data.resource_id,
timestamp=default_test_data.timestamp,
resource_metadata=default_test_data.resource_metadata)
class PollsterException(TestPollsterException): class PollsterException(TestPollsterException):
samples = [] samples = []
resources = [] resources = []
test_data = sample.Sample( test_data = default_test_data('testexception')
name='testexception',
type=default_test_data.type,
unit=default_test_data.unit,
volume=default_test_data.volume,
user_id=default_test_data.user_id,
project_id=default_test_data.project_id,
resource_id=default_test_data.resource_id,
timestamp=default_test_data.timestamp,
resource_metadata=default_test_data.resource_metadata)
class PollsterExceptionAnother(TestPollsterException): class PollsterExceptionAnother(TestPollsterException):
samples = [] samples = []
resources = [] resources = []
test_data = sample.Sample( test_data = default_test_data('testexceptionanother')
name='testexceptionanother',
type=default_test_data.type,
unit=default_test_data.unit,
volume=default_test_data.volume,
user_id=default_test_data.user_id,
project_id=default_test_data.project_id,
resource_id=default_test_data.resource_id,
timestamp=default_test_data.timestamp,
resource_metadata=default_test_data.resource_metadata)
class Discovery(TestDiscovery): class Discovery(TestDiscovery):
params = [] params = []

23
ceilometer/tests/unit/polling/test_manager.py
View File

@ -23,7 +23,6 @@ from ceilometer.compute import discovery as nova_discover
from ceilometer.hardware import discovery from ceilometer.hardware import discovery
from ceilometer.polling import manager from ceilometer.polling import manager
from ceilometer.polling import plugin_base from ceilometer.polling import plugin_base
from ceilometer import sample
from ceilometer import service from ceilometer import service
from ceilometer.tests.unit.polling import agentbase from ceilometer.tests.unit.polling import agentbase
@ -167,30 +166,12 @@ class TestRunTasks(agentbase.BaseAgentManagerTestCase):
class PollsterKeystone(TestPollsterKeystone): class PollsterKeystone(TestPollsterKeystone):
samples = [] samples = []
resources = [] resources = []
test_data = sample.Sample( test_data = agentbase.default_test_data('testkeystone')
name='testkeystone',
type=agentbase.default_test_data.type,
unit=agentbase.default_test_data.unit,
volume=agentbase.default_test_data.volume,
user_id=agentbase.default_test_data.user_id,
project_id=agentbase.default_test_data.project_id,
resource_id=agentbase.default_test_data.resource_id,
timestamp=agentbase.default_test_data.timestamp,
resource_metadata=agentbase.default_test_data.resource_metadata)
class PollsterPollingException(TestPollsterPollingException): class PollsterPollingException(TestPollsterPollingException):
samples = [] samples = []
resources = [] resources = []
test_data = sample.Sample( test_data = agentbase.default_test_data('testpollingexception')
name='testpollingexception',
type=agentbase.default_test_data.type,
unit=agentbase.default_test_data.unit,
volume=agentbase.default_test_data.volume,
user_id=agentbase.default_test_data.user_id,
project_id=agentbase.default_test_data.project_id,
resource_id=agentbase.default_test_data.resource_id,
timestamp=agentbase.default_test_data.timestamp,
resource_metadata=agentbase.default_test_data.resource_metadata)
def create_manager(self): def create_manager(self):
return manager.AgentManager(0, self.CONF) return manager.AgentManager(0, self.CONF)