openstack/deb-ceilometer
Code Issues Proposed changes

Update pep8 to 1.3.3

Browse Source 
This is needed to update openstack.common

Change-Id: I8410f978f38b3893b71239f97f785086ca5faffe
Signed-off-by: Julien Danjou <julien@danjou.info>
This commit is contained in:
Julien Danjou 2013-01-08 17:47:18 +01:00
parent edd9332323
commit 51c8a8e55c
71 changed files with 331 additions and 352 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ceilometer/api/__init__.py
View File

@ -32,5 +32,5 @@ API_SERVICE_OPTS = [
default=8777, default=8777,
help='The port for the ceilometer API server', help='The port for the ceilometer API server',
), ),
] ]
cfg.CONF.register_opts(API_SERVICE_OPTS) cfg.CONF.register_opts(API_SERVICE_OPTS)

7
ceilometer/api/controllers/v2.py
View File

@ -284,7 +284,7 @@ class MeterController(RestController):
_custom_actions = { _custom_actions = {
'duration': ['GET'], 'duration': ['GET'],
} }
def __init__(self, meter_id): def __init__(self, meter_id):
request.context['meter_id'] = meter_id request.context['meter_id'] = meter_id
@ -304,7 +304,7 @@ class MeterController(RestController):
resource=request.context.get('resource_id'), resource=request.context.get('resource_id'),
meter=self._id, meter=self._id,
source=request.context.get('source_id'), source=request.context.get('source_id'),
) )
return [Event(**e) return [Event(**e)
for e in request.storage_conn.get_raw_events(f) for e in request.storage_conn.get_raw_events(f)
] ]
@ -445,7 +445,8 @@ class ResourcesController(RestController):
project=request.context.get('project_id'), project=request.context.get('project_id'),
start_timestamp=start_timestamp, start_timestamp=start_timestamp,
end_timestamp=end_timestamp, end_timestamp=end_timestamp,
)] )
]
return resources return resources

21
ceilometer/api/v1/blueprint.py
View File

@ -105,7 +105,7 @@ def request_wants_html():
def _get_metaquery(args): def _get_metaquery(args):
return dict((k, v) return dict((k, v)
for (k, v) in args.iteritems() for (k, v) in args.iteritems()
if k.startswith('metadata.')) if k.startswith('metadata.'))
def check_authorized_project(project): def check_authorized_project(project):
@ -204,7 +204,7 @@ def _list_resources(source=None, user=None, project=None):
start_timestamp=q_ts['start_timestamp'], start_timestamp=q_ts['start_timestamp'],
end_timestamp=q_ts['end_timestamp'], end_timestamp=q_ts['end_timestamp'],
metaquery=_get_metaquery(rq.args), metaquery=_get_metaquery(rq.args),
) )
return flask.jsonify(resources=list(resources)) return flask.jsonify(resources=list(resources))
@ -371,14 +371,15 @@ def _list_events(meter,
"""Return a list of raw metering events. """Return a list of raw metering events.
""" """
q_ts = _get_query_timestamps(flask.request.args) q_ts = _get_query_timestamps(flask.request.args)
f = storage.EventFilter(user=user, f = storage.EventFilter(
project=project, user=user,
source=source, project=project,
meter=meter, source=source,
resource=resource, meter=meter,
start=q_ts['start_timestamp'], resource=resource,
end=q_ts['end_timestamp'], start=q_ts['start_timestamp'],
metaquery=_get_metaquery(flask.request.args), end=q_ts['end_timestamp'],
metaquery=_get_metaquery(flask.request.args),
) )
events = list(flask.request.storage_conn.get_raw_events(f)) events = list(flask.request.storage_conn.get_raw_events(f))
jsonified = flask.jsonify(events=events) jsonified = flask.jsonify(events=events)

4
ceilometer/central/manager.py
View File

@ -26,7 +26,7 @@ OPTS = [
default=[], default=[],
help='list of central pollsters to disable', help='list of central pollsters to disable',
), ),
] ]
cfg.CONF.register_opts(OPTS) cfg.CONF.register_opts(OPTS)
@ -42,7 +42,7 @@ class AgentManager(object):
self.ext_manager = extension_manager.ActivatedExtensionManager( self.ext_manager = extension_manager.ActivatedExtensionManager(
namespace=PLUGIN_NAMESPACE, namespace=PLUGIN_NAMESPACE,
disabled_names=cfg.CONF.disabled_central_pollsters, disabled_names=cfg.CONF.disabled_central_pollsters,
) )
@staticmethod @staticmethod
def publish_counters_from_one_pollster(ext, manager, context): def publish_counters_from_one_pollster(ext, manager, context):

2
ceilometer/collector/meter.py
View File

@ -33,7 +33,7 @@ METER_OPTS = [
default='openstack', default='openstack',
help='Source for counters emited on this instance', help='Source for counters emited on this instance',
), ),
] ]
def register_opts(config): def register_opts(config):

8
ceilometer/collector/service.py
View File

@ -35,7 +35,7 @@ OPTS = [
default=[], default=[],
help='list of listener plugins to disable', help='list of listener plugins to disable',
), ),
] ]
cfg.CONF.register_opts(OPTS) cfg.CONF.register_opts(OPTS)
@ -59,7 +59,7 @@ class CollectorService(service.PeriodicService):
self.ext_manager = extension_manager.ActivatedExtensionManager( self.ext_manager = extension_manager.ActivatedExtensionManager(
namespace=self.COLLECTOR_NAMESPACE, namespace=self.COLLECTOR_NAMESPACE,
disabled_names=cfg.CONF.disabled_notification_listeners, disabled_names=cfg.CONF.disabled_notification_listeners,
) )
if not list(self.ext_manager): if not list(self.ext_manager):
LOG.warning('Failed to load any notification handlers for %s', LOG.warning('Failed to load any notification handlers for %s',
@ -73,7 +73,7 @@ class CollectorService(service.PeriodicService):
cfg.CONF.metering_topic, cfg.CONF.metering_topic,
rpc_dispatcher.RpcDispatcher([self]), rpc_dispatcher.RpcDispatcher([self]),
'ceilometer.collector.' + cfg.CONF.metering_topic, 'ceilometer.collector.' + cfg.CONF.metering_topic,
) )
def _setup_subscription(self, ext, *args, **kwds): def _setup_subscription(self, ext, *args, **kwds):
handler = ext.obj handler = ext.obj
@ -90,7 +90,7 @@ class CollectorService(service.PeriodicService):
topic=topic, topic=topic,
exchange_name=exchange_topic.exchange, exchange_name=exchange_topic.exchange,
callback=self.process_notification, callback=self.process_notification,
) )
def process_notification(self, notification): def process_notification(self, notification):
"""Make a notification processed by an handler.""" """Make a notification processed by an handler."""

7
ceilometer/compute/instance.py
View File

@ -33,8 +33,7 @@ INSTANCE_PROPERTIES = [
'ephemeral_gb', 'ephemeral_gb',
'memory_mb', 'memory_mb',
'root_gb', 'root_gb',
'vcpus', 'vcpus']
]
def get_metadata_from_object(instance): def get_metadata_from_object(instance):
@ -48,8 +47,8 @@ def get_metadata_from_object(instance):
# Image properties # Image properties
'image_ref': (instance.image['id'] if instance.image else None), 'image_ref': (instance.image['id'] if instance.image else None),
'image_ref_url': (instance.image['links'][0]['href'] 'image_ref_url': (instance.image['links'][0]['href']
if instance.image else None), if instance.image else None),
} }
for name in INSTANCE_PROPERTIES: for name in INSTANCE_PROPERTIES:
metadata[name] = getattr(instance, name, u'') metadata[name] = getattr(instance, name, u'')

7
ceilometer/compute/manager.py
View File

@ -33,9 +33,8 @@ OPTS = [
), ),
cfg.StrOpt('hypervisor_inspector', cfg.StrOpt('hypervisor_inspector',
default='libvirt', default='libvirt',
help='Inspector to use for inspecting the hypervisor layer', help='Inspector to use for inspecting the hypervisor layer'),
), ]
]
cfg.CONF.register_opts(OPTS) cfg.CONF.register_opts(OPTS)
@ -63,7 +62,7 @@ class AgentManager(object):
self.ext_manager = extension_manager.ActivatedExtensionManager( self.ext_manager = extension_manager.ActivatedExtensionManager(
namespace=PLUGIN_NAMESPACE, namespace=PLUGIN_NAMESPACE,
disabled_names=cfg.CONF.disabled_compute_pollsters, disabled_names=cfg.CONF.disabled_compute_pollsters,
) )
self._inspector = get_hypervisor_inspector() self._inspector = get_hypervisor_inspector()
return return

25
ceilometer/compute/notifications.py
View File

@ -50,8 +50,7 @@ class _Base(plugin.NotificationBase):
'compute.instance.exists', 'compute.instance.exists',
'compute.instance.delete.start', 'compute.instance.delete.start',
'compute.instance.finish_resize.end', 'compute.instance.finish_resize.end',
'compute.instance.resize.revert.end', 'compute.instance.resize.revert.end']
]
@staticmethod @staticmethod
def get_exchange_topics(conf): def get_exchange_topics(conf):
@ -80,7 +79,7 @@ class Instance(_Base):
resource_metadata=self.notification_to_metadata( resource_metadata=self.notification_to_metadata(
message), message),
), ),
] ]
class Memory(_Base): class Memory(_Base):
@ -96,9 +95,8 @@ class Memory(_Base):
resource_id=message['payload']['instance_id'], resource_id=message['payload']['instance_id'],
timestamp=message['timestamp'], timestamp=message['timestamp'],
resource_metadata=self.notification_to_metadata( resource_metadata=self.notification_to_metadata(
message), message)),
), ]
]
class VCpus(_Base): class VCpus(_Base):
@ -114,9 +112,8 @@ class VCpus(_Base):
resource_id=message['payload']['instance_id'], resource_id=message['payload']['instance_id'],
timestamp=message['timestamp'], timestamp=message['timestamp'],
resource_metadata=self.notification_to_metadata( resource_metadata=self.notification_to_metadata(
message), message)),
), ]
]
class RootDiskSize(_Base): class RootDiskSize(_Base):
@ -132,9 +129,8 @@ class RootDiskSize(_Base):
resource_id=message['payload']['instance_id'], resource_id=message['payload']['instance_id'],
timestamp=message['timestamp'], timestamp=message['timestamp'],
resource_metadata=self.notification_to_metadata( resource_metadata=self.notification_to_metadata(
message), message)),
), ]
]
class EphemeralDiskSize(_Base): class EphemeralDiskSize(_Base):
@ -150,9 +146,8 @@ class EphemeralDiskSize(_Base):
resource_id=message['payload']['instance_id'], resource_id=message['payload']['instance_id'],
timestamp=message['timestamp'], timestamp=message['timestamp'],
resource_metadata=self.notification_to_metadata( resource_metadata=self.notification_to_metadata(
message), message)),
), ]
]
class InstanceFlavor(_Base): class InstanceFlavor(_Base):

4
ceilometer/compute/nova_notifier.py
View File

@ -60,4 +60,6 @@ def notify(context, message):
instance_id = message['payload']['instance_id'] instance_id = message['payload']['instance_id']
LOG.debug('polling final stats for %r', instance_id) LOG.debug('polling final stats for %r', instance_id)
_agent_manager.poll_instance(context, _agent_manager.poll_instance(context,
instance_info_source.instance_get_by_uuid(context, instance_id)) instance_info_source.instance_get_by_uuid(
context,
instance_id))

12
ceilometer/compute/pollsters.py
View File

@ -46,7 +46,7 @@ def make_counter_from_instance(instance, name, type, unit, volume):
resource_id=instance.id, resource_id=instance.id,
timestamp=timeutils.isotime(), timestamp=timeutils.isotime(),
resource_metadata=compute_instance.get_metadata_from_object(instance), resource_metadata=compute_instance.get_metadata_from_object(instance),
) )
class InstancePollster(plugin.ComputePollster): class InstancePollster(plugin.ComputePollster):
@ -56,15 +56,13 @@ class InstancePollster(plugin.ComputePollster):
name='instance', name='instance',
type=counter.TYPE_GAUGE, type=counter.TYPE_GAUGE,
unit='instance', unit='instance',
volume=1, volume=1)
)
yield make_counter_from_instance(instance, yield make_counter_from_instance(instance,
name='instance:%s' % name='instance:%s' %
instance.flavor['name'], instance.flavor['name'],
type=counter.TYPE_GAUGE, type=counter.TYPE_GAUGE,
unit='instance', unit='instance',
volume=1, volume=1)
)
class DiskIOPollster(plugin.ComputePollster): class DiskIOPollster(plugin.ComputePollster):
@ -194,8 +192,8 @@ class NetPollster(plugin.ComputePollster):
metadata = copy.copy(vnic_data) metadata = copy.copy(vnic_data)
resource_metadata = dict(zip(metadata._fields, metadata)) resource_metadata = dict(zip(metadata._fields, metadata))
resource_metadata['instance_id'] = instance.id resource_metadata['instance_id'] = instance.id
resource_metadata['instance_type'] = instance.flavor['id'] if \ resource_metadata['instance_type'] = \
instance.flavor else None, instance.flavor['id'] if instance.flavor else None,
return counter.Counter( return counter.Counter(
name=name, name=name,

9
ceilometer/compute/virt/libvirt/inspector.py
View File

@ -36,7 +36,7 @@ libvirt_opts = [
default='', default='',
help='Override the default libvirt URI ' help='Override the default libvirt URI '
'(which is dependent on libvirt_type)'), '(which is dependent on libvirt_type)'),
] ]
CONF = cfg.CONF CONF = cfg.CONF
CONF.register_opts(libvirt_opts) CONF.register_opts(libvirt_opts)
@ -126,9 +126,10 @@ class LibvirtInspector(virt_inspector.Inspector):
def inspect_disks(self, instance_name): def inspect_disks(self, instance_name):
domain = self._lookup_by_name(instance_name) domain = self._lookup_by_name(instance_name)
tree = etree.fromstring(domain.XMLDesc(0)) tree = etree.fromstring(domain.XMLDesc(0))
for device in filter(bool, for device in filter(
[target.get("dev") bool,
for target in tree.findall('devices/disk/target')]): [target.get("dev")
for target in tree.findall('devices/disk/target')]):
disk = virt_inspector.Disk(device=device) disk = virt_inspector.Disk(device=device)
block_stats = domain.blockStats(device) block_stats = domain.blockStats(device)
stats = virt_inspector.DiskStats(read_requests=block_stats[0], stats = virt_inspector.DiskStats(read_requests=block_stats[0],

6
ceilometer/extension_manager.py
View File

@ -38,14 +38,14 @@ def should_use_extension(namespace, ext, disabled_names):
LOG.debug( LOG.debug(
'%s extension %r disabled through configuration setting', '%s extension %r disabled through configuration setting',
namespace, ext.name, namespace, ext.name,
) )
return False return False
if not ext.obj.is_enabled(): if not ext.obj.is_enabled():
LOG.debug( LOG.debug(
'%s extension %r reported that it is disabled', '%s extension %r reported that it is disabled',
namespace, namespace,
ext.name, ext.name,
) )
return False return False
LOG.debug('using %s extension %r', namespace, ext.name) LOG.debug('using %s extension %r', namespace, ext.name)
return True return True
@ -68,4 +68,4 @@ class ActivatedExtensionManager(enabled.EnabledExtensionManager):
invoke_on_load=invoke_on_load, invoke_on_load=invoke_on_load,
invoke_args=invoke_args, invoke_args=invoke_args,
invoke_kwds=invoke_kwds, invoke_kwds=invoke_kwds,
) )

36
ceilometer/image/glance.py
View File

@ -61,24 +61,24 @@ class _Base(plugin.PollsterBase):
@staticmethod @staticmethod
def extract_image_metadata(image): def extract_image_metadata(image):
return dict((k, getattr(image, k)) return dict((k, getattr(image, k))
for k in [ for k in
"status", [
"is_public", "status",
"name", "is_public",
"deleted", "name",
"container_format", "deleted",
"created_at", "container_format",
"disk_format", "created_at",
"updated_at", "disk_format",
"properties", "updated_at",
"min_disk", "properties",
"protected", "min_disk",
"checksum", "protected",
"deleted_at", "checksum",
"min_ram", "deleted_at",
"size", "min_ram",
] "size",
) ])
class ImagePollster(_Base): class ImagePollster(_Base):

2
ceilometer/network/floatingip.py
View File

@ -47,4 +47,4 @@ class FloatingIPPollster(plugin.CentralPollster):
'host': ip.host, 'host': ip.host,
'pool': ip.pool, 'pool': ip.pool,
'auto_assigned': ip.auto_assigned 'auto_assigned': ip.auto_assigned
}) })

4
ceilometer/nova_client.py
View File

@ -61,8 +61,8 @@ class Client(object):
"""Returns list of instances on particular host""" """Returns list of instances on particular host"""
search_opts = {'host': hostname, 'all_tenants': True} search_opts = {'host': hostname, 'all_tenants': True}
return self._with_flavor(self.nova_client.servers.list( return self._with_flavor(self.nova_client.servers.list(
detailed=True, detailed=True,
search_opts=search_opts)) search_opts=search_opts))
@logged @logged
def floating_ip_get_all(self): def floating_ip_get_all(self):

4
ceilometer/objectstore/swift.py
View File

@ -36,8 +36,8 @@ LOG = log.getLogger(__name__)
OPTS = [ OPTS = [
cfg.StrOpt('reseller_prefix', cfg.StrOpt('reseller_prefix',
default='AUTH_', default='AUTH_',
help="Swift reseller prefix. Must be on par with "\ help="Swift reseller prefix. Must be on par with "
"reseller_prefix in proxy-server.conf."), "reseller_prefix in proxy-server.conf."),
] ]
cfg.CONF.register_opts(OPTS) cfg.CONF.register_opts(OPTS)

5
ceilometer/objectstore/swift_middleware.py
View File

@ -104,7 +104,8 @@ class CeilometerMiddleware(object):
"version": version, "version": version,
"container": container, "container": container,
"object": obj, "object": obj,
}), },
),
cfg.CONF.metering_topic, cfg.CONF.metering_topic,
cfg.CONF.metering_secret, cfg.CONF.metering_secret,
cfg.CONF.counter_source) cfg.CONF.counter_source)
@ -126,7 +127,7 @@ class CeilometerMiddleware(object):
"version": version, "version": version,
"container": container, "container": container,
"object": obj, "object": obj,
}), }),
cfg.CONF.metering_topic, cfg.CONF.metering_topic,
cfg.CONF.metering_secret, cfg.CONF.metering_secret,
cfg.CONF.counter_source) cfg.CONF.counter_source)

2
ceilometer/openstack/common/iniparser.py
View File

@ -54,7 +54,7 @@ class BaseParser(object):
value = value.strip() value = value.strip()
if ((value and value[0] == value[-1]) and if ((value and value[0] == value[-1]) and
(value[0] == "\"" or value[0] == "'")): (value[0] == "\"" or value[0] == "'")):
value = value[1:-1] value = value[1:-1]
return key.strip(), [value] return key.strip(), [value]

4
ceilometer/openstack/common/log.py
View File

@ -258,7 +258,7 @@ class JSONFormatter(logging.Formatter):
class PublishErrorsHandler(logging.Handler): class PublishErrorsHandler(logging.Handler):
def emit(self, record): def emit(self, record):
if ('ceilometer.openstack.common.notifier.log_notifier' in if ('ceilometer.openstack.common.notifier.log_notifier' in
CONF.notification_driver): CONF.notification_driver):
return return
notifier.api.notify(None, 'error.publisher', notifier.api.notify(None, 'error.publisher',
'error_notification', 'error_notification',
@ -418,7 +418,7 @@ class LegacyFormatter(logging.Formatter):
self._fmt = CONF.logging_default_format_string self._fmt = CONF.logging_default_format_string
if (record.levelno == logging.DEBUG and if (record.levelno == logging.DEBUG and
CONF.logging_debug_format_suffix): CONF.logging_debug_format_suffix):
self._fmt += " " + CONF.logging_debug_format_suffix self._fmt += " " + CONF.logging_debug_format_suffix
# Cache this on the record, Logger will respect our formated copy # Cache this on the record, Logger will respect our formated copy

2
ceilometer/policy.py
View File

@ -31,7 +31,7 @@ OPTS = [
cfg.StrOpt('policy_default_rule', cfg.StrOpt('policy_default_rule',
default='default', default='default',
help='Rule checked when requested rule is not found'), help='Rule checked when requested rule is not found'),
] ]
cfg.CONF.register_opts(OPTS) cfg.CONF.register_opts(OPTS)

4
ceilometer/publish.py
View File

@ -33,7 +33,7 @@ PUBLISH_OPTS = [
cfg.StrOpt('control_exchange', cfg.StrOpt('control_exchange',
default='ceilometer', default='ceilometer',
help='AMQP exchange to connect to if using RabbitMQ or Qpid'), help='AMQP exchange to connect to if using RabbitMQ or Qpid'),
] ]
def register_opts(config): def register_opts(config):
@ -59,7 +59,7 @@ def publish_counter(context, counter, topic, secret, source):
secret, secret,
source), source),
}, },
} }
LOG.debug('PUBLISH: %s', str(msg)) LOG.debug('PUBLISH: %s', str(msg))
rpc.cast(context, topic, msg) rpc.cast(context, topic, msg)
rpc.cast(context, topic + '.' + counter.name, msg) rpc.cast(context, topic + '.' + counter.name, msg)

4
ceilometer/service.py
View File

@ -66,8 +66,8 @@ class PeriodicService(rpc_service.Service):
super(PeriodicService, self).start() super(PeriodicService, self).start()
admin_context = context.RequestContext('admin', 'admin', is_admin=True) admin_context = context.RequestContext('admin', 'admin', is_admin=True)
self.tg.add_timer(cfg.CONF.periodic_interval, self.tg.add_timer(cfg.CONF.periodic_interval,
self.manager.periodic_tasks, self.manager.periodic_tasks,
context=admin_context) context=admin_context)
def _sanitize_cmd_line(argv): def _sanitize_cmd_line(argv):

2
ceilometer/storage/__init__.py
View File

@ -36,7 +36,7 @@ STORAGE_OPTS = [
default='mongodb://localhost:27017/ceilometer', default='mongodb://localhost:27017/ceilometer',
help='Database connection string', help='Database connection string',
), ),
] ]
cfg.CONF.register_opts(STORAGE_OPTS) cfg.CONF.register_opts(STORAGE_OPTS)

25
ceilometer/storage/impl_mongodb.py
View File

@ -193,17 +193,16 @@ class Connection(base.Connection):
# including both. # including both.
for primary in ['user_id', 'project_id']: for primary in ['user_id', 'project_id']:
self.db.resource.ensure_index([ self.db.resource.ensure_index([
(primary, pymongo.ASCENDING), (primary, pymongo.ASCENDING),
('source', pymongo.ASCENDING), ('source', pymongo.ASCENDING),
], name='resource_idx') ], name='resource_idx')
self.db.meter.ensure_index([ self.db.meter.ensure_index([
('resource_id', pymongo.ASCENDING), ('resource_id', pymongo.ASCENDING),
(primary, pymongo.ASCENDING), (primary, pymongo.ASCENDING),
('counter_name', pymongo.ASCENDING), ('counter_name', pymongo.ASCENDING),
('timestamp', pymongo.ASCENDING), ('timestamp', pymongo.ASCENDING),
('source', pymongo.ASCENDING), ('source', pymongo.ASCENDING),
], name='meter_idx') ], name='meter_idx')
return
def upgrade(self, version=None): def upgrade(self, version=None):
pass pass
@ -249,14 +248,14 @@ class Connection(base.Connection):
}, },
}, },
upsert=True, upsert=True,
) )
self.db.project.update( self.db.project.update(
{'_id': data['project_id']}, {'_id': data['project_id']},
{'$addToSet': {'source': data['source'], {'$addToSet': {'source': data['source'],
}, },
}, },
upsert=True, upsert=True,
) )
# Record the updated resource metadata # Record the updated resource metadata
received_timestamp = datetime.datetime.utcnow() received_timestamp = datetime.datetime.utcnow()
@ -278,7 +277,7 @@ class Connection(base.Connection):
}, },
}, },
upsert=True, upsert=True,
) )
# Record the raw data for the event. Use a copy so we do not # Record the raw data for the event. Use a copy so we do not
# modify a data structure owned by our caller (the driver adds # modify a data structure owned by our caller (the driver adds

4
ceilometer/storage/impl_sqlalchemy.py
View File

@ -252,7 +252,7 @@ class Connection(base.Connection):
if project is not None: if project is not None:
query = query.filter(Resource.project_id == project) query = query.filter(Resource.project_id == project)
query = query.options( query = query.options(
sqlalchemy_session.sqlalchemy.orm.joinedload('meters')) sqlalchemy_session.sqlalchemy.orm.joinedload('meters'))
if metaquery is not None: if metaquery is not None:
raise NotImplementedError('metaquery not implemented') raise NotImplementedError('metaquery not implemented')
@ -298,7 +298,7 @@ class Connection(base.Connection):
if project is not None: if project is not None:
query = query.filter(Resource.project_id == project) query = query.filter(Resource.project_id == project)
query = query.options( query = query.options(
sqlalchemy_session.sqlalchemy.orm.joinedload('meters')) sqlalchemy_session.sqlalchemy.orm.joinedload('meters'))
if len(metaquery) > 0: if len(metaquery) > 0:
raise NotImplementedError('metaquery not implemented') raise NotImplementedError('metaquery not implemented')

4
ceilometer/storage/sqlalchemy/migrate_repo/versions/003_set_utf8_charset.py
View File

@ -21,7 +21,7 @@ def upgrade(migrate_engine):
if migrate_engine.name == "mysql": if migrate_engine.name == "mysql":
tables = ['meter', 'user', 'resource', 'project', 'source', tables = ['meter', 'user', 'resource', 'project', 'source',
'sourceassoc'] 'sourceassoc']
sql = "SET foreign_key_checks = 0;" sql = "SET foreign_key_checks = 0;"
for table in tables: for table in tables:
@ -36,7 +36,7 @@ def downgrade(migrate_engine):
# Operations to reverse the above upgrade go here. # Operations to reverse the above upgrade go here.
if migrate_engine.name == "mysql": if migrate_engine.name == "mysql":
tables = ['meter', 'user', 'resource', 'project', 'source', tables = ['meter', 'user', 'resource', 'project', 'source',
'sourceassoc'] 'sourceassoc']
sql = "SET foreign_key_checks = 0;" sql = "SET foreign_key_checks = 0;"
for table in tables: for table in tables:

4
ceilometer/storage/sqlalchemy/migration.py
View File

@ -46,8 +46,8 @@ def patched_with_engine(f, *a, **kw):
# TODO(jkoelker) When migrate 0.7.3 is released and nova depends # TODO(jkoelker) When migrate 0.7.3 is released and nova depends
# on that version or higher, this can be removed # on that version or higher, this can be removed
MIN_PKG_VERSION = dist_version.StrictVersion('0.7.3') MIN_PKG_VERSION = dist_version.StrictVersion('0.7.3')
if (not hasattr(migrate, '__version__') or if (not hasattr(migrate, '__version__')
dist_version.StrictVersion(migrate.__version__) < MIN_PKG_VERSION): or dist_version.StrictVersion(migrate.__version__) < MIN_PKG_VERSION):
migrate_util.with_engine = patched_with_engine migrate_util.with_engine = patched_with_engine

18
ceilometer/storage/sqlalchemy/models.py
View File

@ -33,7 +33,7 @@ sql_opts = [
cfg.StrOpt('mysql_engine', cfg.StrOpt('mysql_engine',
default='InnoDB', default='InnoDB',
help='MySQL engine') help='MySQL engine')
] ]
cfg.CONF.register_opts(sql_opts) cfg.CONF.register_opts(sql_opts)
@ -78,12 +78,16 @@ Base = declarative_base(cls=CeilometerBase)
sourceassoc = Table('sourceassoc', Base.metadata, sourceassoc = Table('sourceassoc', Base.metadata,
Column('meter_id', Integer, ForeignKey("meter.id")), Column('meter_id', Integer,
Column('project_id', String(255), ForeignKey("project.id")), ForeignKey("meter.id")),
Column('resource_id', String(255), ForeignKey("resource.id")), Column('project_id', String(255),
Column('user_id', String(255), ForeignKey("user.id")), ForeignKey("project.id")),
Column('source_id', String(255), ForeignKey("source.id")) Column('resource_id', String(255),
) ForeignKey("resource.id")),
Column('user_id', String(255),
ForeignKey("user.id")),
Column('source_id', String(255),
ForeignKey("source.id")))
class Source(Base): class Source(Base):

12
ceilometer/storage/sqlalchemy/session.py
View File

@ -41,8 +41,8 @@ sql_opts = [
help='Verbosity of SQL debugging information. 0=None, ' help='Verbosity of SQL debugging information. 0=None, '
'100=Everything'), '100=Everything'),
cfg.BoolOpt('sql_connection_trace', cfg.BoolOpt('sql_connection_trace',
default=False, default=False,
help='Add python stack traces to SQL as comment strings'), help='Add python stack traces to SQL as comment strings'),
cfg.BoolOpt('sqlite_synchronous', cfg.BoolOpt('sqlite_synchronous',
default=True, default=True,
help='If passed, use synchronous mode for sqlite'), help='If passed, use synchronous mode for sqlite'),
@ -56,7 +56,7 @@ sql_opts = [
cfg.IntOpt('sql_retry_interval', cfg.IntOpt('sql_retry_interval',
default=10, default=10,
help='interval between retries of opening a sql connection'), help='interval between retries of opening a sql connection'),
] ]
cfg.CONF.register_opts(sql_opts) cfg.CONF.register_opts(sql_opts)
@ -121,7 +121,7 @@ def get_engine():
global _ENGINE global _ENGINE
if _ENGINE is None: if _ENGINE is None:
connection_dict = sqlalchemy.engine.url.make_url( connection_dict = sqlalchemy.engine.url.make_url(
cfg.CONF.database_connection) cfg.CONF.database_connection)
engine_args = { engine_args = {
"pool_recycle": cfg.CONF.sql_idle_timeout, "pool_recycle": cfg.CONF.sql_idle_timeout,
@ -178,8 +178,8 @@ def get_engine():
_ENGINE.connect() _ENGINE.connect()
break break
except OperationalError, e: except OperationalError, e:
if (remaining != 'infinite' and remaining == 0) or \ if (remaining != 'infinite' and remaining == 0) \
not is_db_connection_error(e.args[0]): or not is_db_connection_error(e.args[0]):
raise raise
return _ENGINE return _ENGINE

14
ceilometer/tests/api.py
View File

@ -103,7 +103,7 @@ class FunctionalTest(unittest.TestCase):
'modules': ['ceilometer.api'], 'modules': ['ceilometer.api'],
'static_root': '%s/public' % root_dir, 'static_root': '%s/public' % root_dir,
'template_path': '%s/ceilometer/api/templates' % root_dir, 'template_path': '%s/ceilometer/api/templates' % root_dir,
}, },
'logging': { 'logging': {
'loggers': { 'loggers': {
@ -112,22 +112,22 @@ class FunctionalTest(unittest.TestCase):
'ceilometer': {'level': 'DEBUG', 'ceilometer': {'level': 'DEBUG',
'handlers': ['console'], 'handlers': ['console'],
}, },
}, },
'handlers': { 'handlers': {
'console': { 'console': {
'level': 'DEBUG', 'level': 'DEBUG',
'class': 'logging.StreamHandler', 'class': 'logging.StreamHandler',
'formatter': 'simple' 'formatter': 'simple'
} }
}, },
'formatters': { 'formatters': {
'simple': { 'simple': {
'format': ('%(asctime)s %(levelname)-5.5s [%(name)s]' 'format': ('%(asctime)s %(levelname)-5.5s [%(name)s]'
'[%(threadName)s] %(message)s') '[%(threadName)s] %(message)s')
} }
},
}, },
} },
}
self.mox = mox.Mox() self.mox = mox.Mox()
self.stubs = stubout.StubOutForTesting() self.stubs = stubout.StubOutForTesting()

3
ceilometer/volume/notifications.py
View File

@ -61,8 +61,7 @@ class _Base(plugin.NotificationBase):
def get_event_types(): def get_event_types():
return ['volume.exists', return ['volume.exists',
'volume.create.end', 'volume.create.end',
'volume.delete.start', 'volume.delete.start']
]
class Volume(_Base): class Volume(_Base):

2
setup.py
View File

@ -136,4 +136,4 @@ setuptools.setup(
[paste.filter_factory] [paste.filter_factory]
swift=ceilometer.objectstore.swift_middleware:filter_factory swift=ceilometer.objectstore.swift_middleware:filter_factory
"""), """),
) )

12
tests/api/v1/test_compute_duration_by_resource.py
View File

@ -36,17 +36,17 @@ class TestComputeDurationByResource(tests_api.TestBase):
# Create events relative to the range and pretend # Create events relative to the range and pretend
# that the intervening events exist. # that the intervening events exist.
self.early1 = datetime.datetime(2012, 8, 27, 7, 0) self.early1 = datetime.datetime(2012, 8, 27, 7, 0)
self.early2 = datetime.datetime(2012, 8, 27, 17, 0) self.early2 = datetime.datetime(2012, 8, 27, 17, 0)
self.start = datetime.datetime(2012, 8, 28, 0, 0) self.start = datetime.datetime(2012, 8, 28, 0, 0)
self.middle1 = datetime.datetime(2012, 8, 28, 8, 0) self.middle1 = datetime.datetime(2012, 8, 28, 8, 0)
self.middle2 = datetime.datetime(2012, 8, 28, 18, 0) self.middle2 = datetime.datetime(2012, 8, 28, 18, 0)
self.end = datetime.datetime(2012, 8, 28, 23, 59) self.end = datetime.datetime(2012, 8, 28, 23, 59)
self.late1 = datetime.datetime(2012, 8, 29, 9, 0) self.late1 = datetime.datetime(2012, 8, 29, 9, 0)
self.late2 = datetime.datetime(2012, 8, 29, 19, 0) self.late2 = datetime.datetime(2012, 8, 29, 19, 0)
def _set_interval(self, start, end): def _set_interval(self, start, end):
@ -62,7 +62,7 @@ class TestComputeDurationByResource(tests_api.TestBase):
start_timestamp=self.start.isoformat(), start_timestamp=self.start.isoformat(),
end_timestamp=self.end.isoformat(), end_timestamp=self.end.isoformat(),
search_offset=10, # this value doesn't matter, db call is mocked search_offset=10, # this value doesn't matter, db call is mocked
) )
def test_before_range(self): def test_before_range(self):
self._set_interval(self.early1, self.early2) self._set_interval(self.early1, self.early2)
@ -118,7 +118,7 @@ class TestComputeDurationByResource(tests_api.TestBase):
'/resources/resource-id/meters/instance:m1.tiny/duration', '/resources/resource-id/meters/instance:m1.tiny/duration',
start_timestamp=self.late1.isoformat(), start_timestamp=self.late1.isoformat(),
search_offset=10, # this value doesn't matter, db call is mocked search_offset=10, # this value doesn't matter, db call is mocked
) )
self._assert_times_match(data['start_timestamp'], self.late1) self._assert_times_match(data['start_timestamp'], self.late1)
self._assert_times_match(data['end_timestamp'], self.late2) self._assert_times_match(data['end_timestamp'], self.late2)
@ -130,6 +130,6 @@ class TestComputeDurationByResource(tests_api.TestBase):
'/resources/resource-id/meters/instance:m1.tiny/duration', '/resources/resource-id/meters/instance:m1.tiny/duration',
end_timestamp=self.early2.isoformat(), end_timestamp=self.early2.isoformat(),
search_offset=10, # this value doesn't matter, db call is mocked search_offset=10, # this value doesn't matter, db call is mocked
) )
self._assert_times_match(data['start_timestamp'], self.early1) self._assert_times_match(data['start_timestamp'], self.early1)
self._assert_times_match(data['end_timestamp'], self.early2) self._assert_times_match(data['end_timestamp'], self.early2)

23
tests/api/v1/test_list_events.py
View File

@ -46,8 +46,7 @@ class TestListEvents(tests_api.TestBase):
'resource-id', 'resource-id',
timestamp=datetime.datetime(2012, 7, 2, 10, 40), timestamp=datetime.datetime(2012, 7, 2, 10, 40),
resource_metadata={'display_name': 'test-server', resource_metadata={'display_name': 'test-server',
'tag': 'self.counter', 'tag': 'self.counter'}
}
), ),
counter.Counter( counter.Counter(
'instance', 'instance',
@ -59,8 +58,7 @@ class TestListEvents(tests_api.TestBase):
'resource-id', 'resource-id',
timestamp=datetime.datetime(2012, 7, 2, 10, 41), timestamp=datetime.datetime(2012, 7, 2, 10, 41),
resource_metadata={'display_name': 'test-server', resource_metadata={'display_name': 'test-server',
'tag': 'self.counter', 'tag': 'self.counter'}
}
), ),
counter.Counter( counter.Counter(
'instance', 'instance',
@ -72,8 +70,7 @@ class TestListEvents(tests_api.TestBase):
'resource-id-alternate', 'resource-id-alternate',
timestamp=datetime.datetime(2012, 7, 2, 10, 42), timestamp=datetime.datetime(2012, 7, 2, 10, 42),
resource_metadata={'display_name': 'test-server', resource_metadata={'display_name': 'test-server',
'tag': 'self.counter2', 'tag': 'self.counter2'}
}
), ),
]: ]:
msg = meter.meter_message_from_counter(cnt, msg = meter.meter_message_from_counter(cnt,
@ -116,14 +113,14 @@ class TestListEvents(tests_api.TestBase):
def test_by_resource_non_admin(self): def test_by_resource_non_admin(self):
data = self.get('/resources/resource-id-alternate/meters/instance', data = self.get('/resources/resource-id-alternate/meters/instance',
headers={"X-Roles": "Member", headers={"X-Roles": "Member",
"X-Tenant-Id": "project2"}) "X-Tenant-Id": "project2"})
self.assertEquals(1, len(data['events'])) self.assertEquals(1, len(data['events']))
def test_by_resource_some_tenant(self): def test_by_resource_some_tenant(self):
data = self.get('/resources/resource-id/meters/instance', data = self.get('/resources/resource-id/meters/instance',
headers={"X-Roles": "Member", headers={"X-Roles": "Member",
"X-Tenant-Id": "project2"}) "X-Tenant-Id": "project2"})
self.assertEquals(0, len(data['events'])) self.assertEquals(0, len(data['events']))
def test_empty_source(self): def test_empty_source(self):
@ -168,7 +165,7 @@ class TestListEvents(tests_api.TestBase):
def test_by_user_with_timestamps(self): def test_by_user_with_timestamps(self):
data = self.get('/users/user-id/meters/instance', data = self.get('/users/user-id/meters/instance',
start_timestamp=datetime.datetime(2012, 7, 2, 10, 41), start_timestamp=datetime.datetime(2012, 7, 2, 10, 41),
end_timestamp=datetime.datetime(2012, 7, 2, 10, 42)) end_timestamp=datetime.datetime(2012, 7, 2, 10, 42))
self.assertEquals(1, len(data['events'])) self.assertEquals(1, len(data['events']))
def test_metaquery1(self): def test_metaquery1(self):
@ -203,6 +200,6 @@ class TestListEvents(tests_api.TestBase):
def test_metaquery3_with_project(self): def test_metaquery3_with_project(self):
q = '/sources/source1/meters/instance' q = '/sources/source1/meters/instance'
data = self.get('%s?metadata.display_name=test-server' % q, data = self.get('%s?metadata.display_name=test-server' % q,
headers={"X-Roles": "Member", headers={"X-Roles": "Member",
"X-Tenant-Id": "project2"}) "X-Tenant-Id": "project2"})
self.assertEquals(1, len(data['events'])) self.assertEquals(1, len(data['events']))

15
tests/api/v1/test_list_meters.py
View File

@ -54,8 +54,7 @@ class TestListMeters(tests_api.TestBase):
'resource-id', 'resource-id',
timestamp=datetime.datetime(2012, 7, 2, 10, 40), timestamp=datetime.datetime(2012, 7, 2, 10, 40),
resource_metadata={'display_name': 'test-server', resource_metadata={'display_name': 'test-server',
'tag': 'self.counter', 'tag': 'self.counter'}),
}),
counter.Counter( counter.Counter(
'meter.test', 'meter.test',
'cumulative', 'cumulative',
@ -66,8 +65,7 @@ class TestListMeters(tests_api.TestBase):
'resource-id', 'resource-id',
timestamp=datetime.datetime(2012, 7, 2, 11, 40), timestamp=datetime.datetime(2012, 7, 2, 11, 40),
resource_metadata={'display_name': 'test-server', resource_metadata={'display_name': 'test-server',
'tag': 'self.counter', 'tag': 'self.counter'}),
}),
counter.Counter( counter.Counter(
'meter.mine', 'meter.mine',
'gauge', 'gauge',
@ -78,8 +76,7 @@ class TestListMeters(tests_api.TestBase):
'resource-id2', 'resource-id2',
timestamp=datetime.datetime(2012, 7, 2, 10, 41), timestamp=datetime.datetime(2012, 7, 2, 10, 41),
resource_metadata={'display_name': 'test-server', resource_metadata={'display_name': 'test-server',
'tag': 'two.counter', 'tag': 'two.counter'}),
}),
counter.Counter( counter.Counter(
'meter.test', 'meter.test',
'cumulative', 'cumulative',
@ -90,8 +87,7 @@ class TestListMeters(tests_api.TestBase):
'resource-id3', 'resource-id3',
timestamp=datetime.datetime(2012, 7, 2, 10, 42), timestamp=datetime.datetime(2012, 7, 2, 10, 42),
resource_metadata={'display_name': 'test-server', resource_metadata={'display_name': 'test-server',
'tag': 'three.counter', 'tag': 'three.counter'}),
}),
counter.Counter( counter.Counter(
'meter.mine', 'meter.mine',
'gauge', 'gauge',
@ -102,8 +98,7 @@ class TestListMeters(tests_api.TestBase):
'resource-id4', 'resource-id4',
timestamp=datetime.datetime(2012, 7, 2, 10, 43), timestamp=datetime.datetime(2012, 7, 2, 10, 43),
resource_metadata={'display_name': 'test-server', resource_metadata={'display_name': 'test-server',
'tag': 'four.counter', 'tag': 'four.counter'})]:
})]:
msg = meter.meter_message_from_counter(cnt, msg = meter.meter_message_from_counter(cnt,
cfg.CONF.metering_secret, cfg.CONF.metering_secret,
'test_list_resources') 'test_list_resources')

10
tests/api/v1/test_list_projects.py
View File

@ -52,9 +52,8 @@ class TestListProjects(tests_api.TestBase):
'resource-id', 'resource-id',
timestamp=datetime.datetime(2012, 7, 2, 10, 40), timestamp=datetime.datetime(2012, 7, 2, 10, 40),
resource_metadata={'display_name': 'test-server', resource_metadata={'display_name': 'test-server',
'tag': 'self.counter', 'tag': 'self.counter'}
} )
)
msg = meter.meter_message_from_counter(counter1, msg = meter.meter_message_from_counter(counter1,
cfg.CONF.metering_secret, cfg.CONF.metering_secret,
'test_list_projects', 'test_list_projects',
@ -71,9 +70,8 @@ class TestListProjects(tests_api.TestBase):
'resource-id-alternate', 'resource-id-alternate',
timestamp=datetime.datetime(2012, 7, 2, 10, 41), timestamp=datetime.datetime(2012, 7, 2, 10, 41),
resource_metadata={'display_name': 'test-server', resource_metadata={'display_name': 'test-server',
'tag': 'self.counter2', 'tag': 'self.counter2'}
} )
)
msg2 = meter.meter_message_from_counter(counter2, msg2 = meter.meter_message_from_counter(counter2,
cfg.CONF.metering_secret, cfg.CONF.metering_secret,
'test_list_users', 'test_list_users',

16
tests/api/v1/test_list_resources.py
View File

@ -54,8 +54,8 @@ class TestListResources(tests_api.TestBase):
'resource-id', 'resource-id',
timestamp=datetime.datetime(2012, 7, 2, 10, 40), timestamp=datetime.datetime(2012, 7, 2, 10, 40),
resource_metadata={'display_name': 'test-server', resource_metadata={'display_name': 'test-server',
'tag': 'self.counter', 'tag': 'self.counter'},
}), ),
counter.Counter( counter.Counter(
'instance', 'instance',
'cumulative', 'cumulative',
@ -66,8 +66,8 @@ class TestListResources(tests_api.TestBase):
'resource-id-alternate', 'resource-id-alternate',
timestamp=datetime.datetime(2012, 7, 2, 10, 41), timestamp=datetime.datetime(2012, 7, 2, 10, 41),
resource_metadata={'display_name': 'test-server', resource_metadata={'display_name': 'test-server',
'tag': 'self.counter2', 'tag': 'self.counter2'},
}), ),
counter.Counter( counter.Counter(
'instance', 'instance',
'cumulative', 'cumulative',
@ -78,8 +78,8 @@ class TestListResources(tests_api.TestBase):
'resource-id2', 'resource-id2',
timestamp=datetime.datetime(2012, 7, 2, 10, 42), timestamp=datetime.datetime(2012, 7, 2, 10, 42),
resource_metadata={'display_name': 'test-server', resource_metadata={'display_name': 'test-server',
'tag': 'self.counter3', 'tag': 'self.counter3'},
}), ),
counter.Counter( counter.Counter(
'instance', 'instance',
'cumulative', 'cumulative',
@ -90,8 +90,8 @@ class TestListResources(tests_api.TestBase):
'resource-id', 'resource-id',
timestamp=datetime.datetime(2012, 7, 2, 10, 43), timestamp=datetime.datetime(2012, 7, 2, 10, 43),
resource_metadata={'display_name': 'test-server', resource_metadata={'display_name': 'test-server',
'tag': 'self.counter4', 'tag': 'self.counter4'}
})]: )]:
msg = meter.meter_message_from_counter(cnt, msg = meter.meter_message_from_counter(cnt,
cfg.CONF.metering_secret, cfg.CONF.metering_secret,
'test_list_resources') 'test_list_resources')

4
tests/api/v1/test_list_users.py
View File

@ -55,7 +55,7 @@ class TestListUsers(tests_api.TestBase):
resource_metadata={'display_name': 'test-server', resource_metadata={'display_name': 'test-server',
'tag': 'self.counter', 'tag': 'self.counter',
} }
) )
msg = meter.meter_message_from_counter(counter1, msg = meter.meter_message_from_counter(counter1,
cfg.CONF.metering_secret, cfg.CONF.metering_secret,
'test_list_users', 'test_list_users',
@ -74,7 +74,7 @@ class TestListUsers(tests_api.TestBase):
resource_metadata={'display_name': 'test-server', resource_metadata={'display_name': 'test-server',
'tag': 'self.counter2', 'tag': 'self.counter2',
} }
) )
msg2 = meter.meter_message_from_counter(counter2, msg2 = meter.meter_message_from_counter(counter2,
cfg.CONF.metering_secret, cfg.CONF.metering_secret,
'not-test', 'not-test',

2
tests/api/v1/test_max_project_volume.py
View File

@ -49,7 +49,7 @@ class TestMaxProjectVolume(tests_api.TestBase):
resource_metadata={'display_name': 'test-volume', resource_metadata={'display_name': 'test-volume',
'tag': 'self.counter', 'tag': 'self.counter',
} }
) )
self.counters.append(c) self.counters.append(c)
msg = meter.meter_message_from_counter(c, msg = meter.meter_message_from_counter(c,
cfg.CONF.metering_secret, cfg.CONF.metering_secret,

2
tests/api/v1/test_max_resource_volume.py
View File

@ -48,7 +48,7 @@ class TestMaxResourceVolume(tests_api.TestBase):
resource_metadata={'display_name': 'test-volume', resource_metadata={'display_name': 'test-volume',
'tag': 'self.counter', 'tag': 'self.counter',
} }
) )
self.counters.append(c) self.counters.append(c)
msg = meter.meter_message_from_counter(c, msg = meter.meter_message_from_counter(c,
cfg.CONF.metering_secret, cfg.CONF.metering_secret,

2
tests/api/v1/test_sum_project_volume.py
View File

@ -49,7 +49,7 @@ class TestSumProjectVolume(tests_api.TestBase):
resource_metadata={'display_name': 'test-volume', resource_metadata={'display_name': 'test-volume',
'tag': 'self.counter', 'tag': 'self.counter',
} }
) )
self.counters.append(c) self.counters.append(c)
msg = meter.meter_message_from_counter(c, msg = meter.meter_message_from_counter(c,
cfg.CONF.metering_secret, cfg.CONF.metering_secret,

2
tests/api/v1/test_sum_resource_volume.py
View File

@ -49,7 +49,7 @@ class TestSumResourceVolume(tests_api.TestBase):
resource_metadata={'display_name': 'test-volume', resource_metadata={'display_name': 'test-volume',
'tag': 'self.counter', 'tag': 'self.counter',
} }
) )
self.counters.append(c) self.counters.append(c)
msg = meter.meter_message_from_counter(c, msg = meter.meter_message_from_counter(c,
cfg.CONF.metering_secret, cfg.CONF.metering_secret,

18
tests/api/v2/test_acl.py
View File

@ -51,10 +51,11 @@ class TestAPIACL(FunctionalTest):
response = self.get_json('/sources', response = self.get_json('/sources',
expect_errors=True, expect_errors=True,
headers={ headers={
"X-Roles": "Member", "X-Roles": "Member",
"X-Tenant-Name": "admin", "X-Tenant-Name": "admin",
"X-Tenant-Id": "bc23a9d531064583ace8f67dad60f6bb", "X-Tenant-Id":
}) "bc23a9d531064583ace8f67dad60f6bb",
})
self.assertEqual(response.status_int, 401) self.assertEqual(response.status_int, 401)
# FIXME(dhellmann): This test is not properly looking at the tenant # FIXME(dhellmann): This test is not properly looking at the tenant
@ -76,8 +77,9 @@ class TestAPIACL(FunctionalTest):
response = self.get_json('/sources', response = self.get_json('/sources',
expect_errors=True, expect_errors=True,
headers={ headers={
"X-Roles": "admin", "X-Roles": "admin",
"X-Tenant-Name": "admin", "X-Tenant-Name": "admin",
"X-Tenant-Id": "bc23a9d531064583ace8f67dad60f6bb", "X-Tenant-Id":
}) "bc23a9d531064583ace8f67dad60f6bb",
})
self.assertEqual(response.status_int, 200) self.assertEqual(response.status_int, 200)

6
tests/api/v2/test_compute_duration_by_resource.py
View File

@ -36,17 +36,17 @@ class TestComputeDurationByResource(FunctionalTest):
# Create events relative to the range and pretend # Create events relative to the range and pretend
# that the intervening events exist. # that the intervening events exist.
self.early1 = datetime.datetime(2012, 8, 27, 7, 0) self.early1 = datetime.datetime(2012, 8, 27, 7, 0)
self.early2 = datetime.datetime(2012, 8, 27, 17, 0) self.early2 = datetime.datetime(2012, 8, 27, 17, 0)
self.start = datetime.datetime(2012, 8, 28, 0, 0) self.start = datetime.datetime(2012, 8, 28, 0, 0)
self.middle1 = datetime.datetime(2012, 8, 28, 8, 0) self.middle1 = datetime.datetime(2012, 8, 28, 8, 0)
self.middle2 = datetime.datetime(2012, 8, 28, 18, 0) self.middle2 = datetime.datetime(2012, 8, 28, 18, 0)
self.end = datetime.datetime(2012, 8, 28, 23, 59) self.end = datetime.datetime(2012, 8, 28, 23, 59)
self.late1 = datetime.datetime(2012, 8, 29, 9, 0) self.late1 = datetime.datetime(2012, 8, 29, 9, 0)
self.late2 = datetime.datetime(2012, 8, 29, 19, 0) self.late2 = datetime.datetime(2012, 8, 29, 19, 0)
def _stub_interval_func(self, func): def _stub_interval_func(self, func):

8
tests/api/v2/test_date_range.py
View File

@ -46,7 +46,7 @@ class DateRangeTest(unittest.TestCase):
'query_start': datetime.datetime(2012, 9, 20, 12, 13, 14), 'query_start': datetime.datetime(2012, 9, 20, 12, 13, 14),
'query_end': None, 'query_end': None,
'search_offset': 0, 'search_offset': 0,
} }
assert result == expected assert result == expected
@ -59,7 +59,7 @@ class DateRangeTest(unittest.TestCase):
'query_end': datetime.datetime(2012, 9, 20, 12, 13, 14), 'query_end': datetime.datetime(2012, 9, 20, 12, 13, 14),
'query_start': None, 'query_start': None,
'search_offset': 0, 'search_offset': 0,
} }
assert result == expected assert result == expected
@ -68,13 +68,13 @@ class DateRangeTest(unittest.TestCase):
end=datetime.datetime(2012, 9, 20, 13, 24, 25), end=datetime.datetime(2012, 9, 20, 13, 24, 25),
start=datetime.datetime(2012, 9, 20, 12, 13, 14), start=datetime.datetime(2012, 9, 20, 12, 13, 14),
search_offset=20, search_offset=20,
).to_dict() ).to_dict()
expected = { expected = {
'query_end': datetime.datetime(2012, 9, 20, 13, 44, 25), 'query_end': datetime.datetime(2012, 9, 20, 13, 44, 25),
'query_start': datetime.datetime(2012, 9, 20, 11, 53, 14), 'query_start': datetime.datetime(2012, 9, 20, 11, 53, 14),
'end_timestamp': datetime.datetime(2012, 9, 20, 13, 24, 25), 'end_timestamp': datetime.datetime(2012, 9, 20, 13, 24, 25),
'start_timestamp': datetime.datetime(2012, 9, 20, 12, 13, 14), 'start_timestamp': datetime.datetime(2012, 9, 20, 12, 13, 14),
'search_offset': 20, 'search_offset': 20,
} }
assert result == expected assert result == expected

4
tests/api/v2/test_list_events.py
View File

@ -48,7 +48,7 @@ class TestListEvents(FunctionalTest):
'ignored_dict': {'key': 'value'}, 'ignored_dict': {'key': 'value'},
'ignored_list': ['not-returned'], 'ignored_list': ['not-returned'],
} }
) )
msg = meter.meter_message_from_counter(self.counter1, msg = meter.meter_message_from_counter(self.counter1,
cfg.CONF.metering_secret, cfg.CONF.metering_secret,
'test_source', 'test_source',
@ -67,7 +67,7 @@ class TestListEvents(FunctionalTest):
resource_metadata={'display_name': 'test-server', resource_metadata={'display_name': 'test-server',
'tag': 'self.counter2', 'tag': 'self.counter2',
} }
) )
msg2 = meter.meter_message_from_counter(self.counter2, msg2 = meter.meter_message_from_counter(self.counter2,
cfg.CONF.metering_secret, cfg.CONF.metering_secret,
'source2', 'source2',

15
tests/api/v2/test_list_meters.py
View File

@ -53,8 +53,7 @@ class TestListMeters(FunctionalTest):
'resource-id', 'resource-id',
timestamp=datetime.datetime(2012, 7, 2, 10, 40), timestamp=datetime.datetime(2012, 7, 2, 10, 40),
resource_metadata={'display_name': 'test-server', resource_metadata={'display_name': 'test-server',
'tag': 'self.counter', 'tag': 'self.counter'}),
}),
counter.Counter( counter.Counter(
'meter.test', 'meter.test',
'cumulative', 'cumulative',
@ -65,8 +64,7 @@ class TestListMeters(FunctionalTest):
'resource-id', 'resource-id',
timestamp=datetime.datetime(2012, 7, 2, 11, 40), timestamp=datetime.datetime(2012, 7, 2, 11, 40),
resource_metadata={'display_name': 'test-server', resource_metadata={'display_name': 'test-server',
'tag': 'self.counter', 'tag': 'self.counter'}),
}),
counter.Counter( counter.Counter(
'meter.mine', 'meter.mine',
'gauge', 'gauge',
@ -77,8 +75,7 @@ class TestListMeters(FunctionalTest):
'resource-id2', 'resource-id2',
timestamp=datetime.datetime(2012, 7, 2, 10, 41), timestamp=datetime.datetime(2012, 7, 2, 10, 41),
resource_metadata={'display_name': 'test-server', resource_metadata={'display_name': 'test-server',
'tag': 'self.counter2', 'tag': 'self.counter2'}),
}),
counter.Counter( counter.Counter(
'meter.test', 'meter.test',
'cumulative', 'cumulative',
@ -89,8 +86,7 @@ class TestListMeters(FunctionalTest):
'resource-id3', 'resource-id3',
timestamp=datetime.datetime(2012, 7, 2, 10, 42), timestamp=datetime.datetime(2012, 7, 2, 10, 42),
resource_metadata={'display_name': 'test-server', resource_metadata={'display_name': 'test-server',
'tag': 'self.counter3', 'tag': 'self.counter3'}),
}),
counter.Counter( counter.Counter(
'meter.mine', 'meter.mine',
'gauge', 'gauge',
@ -101,8 +97,7 @@ class TestListMeters(FunctionalTest):
'resource-id4', 'resource-id4',
timestamp=datetime.datetime(2012, 7, 2, 10, 43), timestamp=datetime.datetime(2012, 7, 2, 10, 43),
resource_metadata={'display_name': 'test-server', resource_metadata={'display_name': 'test-server',
'tag': 'self.counter4', 'tag': 'self.counter4'})]:
})]:
msg = meter.meter_message_from_counter(cnt, msg = meter.meter_message_from_counter(cnt,
cfg.CONF.metering_secret, cfg.CONF.metering_secret,
'test_source') 'test_source')

8
tests/api/v2/test_list_projects.py
View File

@ -50,7 +50,7 @@ class TestListProjects(FunctionalTest):
resource_metadata={'display_name': 'test-server', resource_metadata={'display_name': 'test-server',
'tag': 'self.counter', 'tag': 'self.counter',
} }
) )
msg = meter.meter_message_from_counter(counter1, msg = meter.meter_message_from_counter(counter1,
cfg.CONF.metering_secret, cfg.CONF.metering_secret,
'test_source', 'test_source',
@ -69,7 +69,7 @@ class TestListProjects(FunctionalTest):
resource_metadata={'display_name': 'test-server', resource_metadata={'display_name': 'test-server',
'tag': 'self.counter2', 'tag': 'self.counter2',
} }
) )
msg2 = meter.meter_message_from_counter(counter2, msg2 = meter.meter_message_from_counter(counter2,
cfg.CONF.metering_secret, cfg.CONF.metering_secret,
'test_source', 'test_source',
@ -92,7 +92,7 @@ class TestListProjects(FunctionalTest):
resource_metadata={'display_name': 'test-server', resource_metadata={'display_name': 'test-server',
'tag': 'self.counter', 'tag': 'self.counter',
} }
) )
msg = meter.meter_message_from_counter(counter1, msg = meter.meter_message_from_counter(counter1,
cfg.CONF.metering_secret, cfg.CONF.metering_secret,
'test_source', 'test_source',
@ -111,7 +111,7 @@ class TestListProjects(FunctionalTest):
resource_metadata={'display_name': 'test-server', resource_metadata={'display_name': 'test-server',
'tag': 'self.counter2', 'tag': 'self.counter2',
} }
) )
msg2 = meter.meter_message_from_counter(counter2, msg2 = meter.meter_message_from_counter(counter2,
cfg.CONF.metering_secret, cfg.CONF.metering_secret,
'not-test', 'not-test',

18
tests/api/v2/test_list_resources.py
View File

@ -51,7 +51,7 @@ class TestListResources(FunctionalTest):
resource_metadata={'display_name': 'test-server', resource_metadata={'display_name': 'test-server',
'tag': 'self.counter', 'tag': 'self.counter',
} }
) )
msg = meter.meter_message_from_counter(counter1, msg = meter.meter_message_from_counter(counter1,
cfg.CONF.metering_secret, cfg.CONF.metering_secret,
'test', 'test',
@ -70,7 +70,7 @@ class TestListResources(FunctionalTest):
resource_metadata={'display_name': 'test-server', resource_metadata={'display_name': 'test-server',
'tag': 'self.counter2', 'tag': 'self.counter2',
} }
) )
msg2 = meter.meter_message_from_counter(counter2, msg2 = meter.meter_message_from_counter(counter2,
cfg.CONF.metering_secret, cfg.CONF.metering_secret,
'test', 'test',
@ -93,7 +93,7 @@ class TestListResources(FunctionalTest):
resource_metadata={'display_name': 'test-server', resource_metadata={'display_name': 'test-server',
'tag': 'self.counter', 'tag': 'self.counter',
} }
) )
msg = meter.meter_message_from_counter(counter1, msg = meter.meter_message_from_counter(counter1,
cfg.CONF.metering_secret, cfg.CONF.metering_secret,
'test_list_resources', 'test_list_resources',
@ -112,7 +112,7 @@ class TestListResources(FunctionalTest):
resource_metadata={'display_name': 'test-server', resource_metadata={'display_name': 'test-server',
'tag': 'self.counter2', 'tag': 'self.counter2',
} }
) )
msg2 = meter.meter_message_from_counter(counter2, msg2 = meter.meter_message_from_counter(counter2,
cfg.CONF.metering_secret, cfg.CONF.metering_secret,
'not-test', 'not-test',
@ -136,7 +136,7 @@ class TestListResources(FunctionalTest):
resource_metadata={'display_name': 'test-server', resource_metadata={'display_name': 'test-server',
'tag': 'self.counter', 'tag': 'self.counter',
} }
) )
msg = meter.meter_message_from_counter(counter1, msg = meter.meter_message_from_counter(counter1,
cfg.CONF.metering_secret, cfg.CONF.metering_secret,
'test_list_resources', 'test_list_resources',
@ -155,7 +155,7 @@ class TestListResources(FunctionalTest):
resource_metadata={'display_name': 'test-server', resource_metadata={'display_name': 'test-server',
'tag': 'self.counter2', 'tag': 'self.counter2',
} }
) )
msg2 = meter.meter_message_from_counter(counter2, msg2 = meter.meter_message_from_counter(counter2,
cfg.CONF.metering_secret, cfg.CONF.metering_secret,
'not-test', 'not-test',
@ -179,7 +179,7 @@ class TestListResources(FunctionalTest):
resource_metadata={'display_name': 'test-server', resource_metadata={'display_name': 'test-server',
'tag': 'self.counter', 'tag': 'self.counter',
} }
) )
msg = meter.meter_message_from_counter(counter1, msg = meter.meter_message_from_counter(counter1,
cfg.CONF.metering_secret, cfg.CONF.metering_secret,
'test_list_resources', 'test_list_resources',
@ -198,7 +198,7 @@ class TestListResources(FunctionalTest):
resource_metadata={'display_name': 'test-server', resource_metadata={'display_name': 'test-server',
'tag': 'self.counter2', 'tag': 'self.counter2',
} }
) )
msg2 = meter.meter_message_from_counter(counter2, msg2 = meter.meter_message_from_counter(counter2,
cfg.CONF.metering_secret, cfg.CONF.metering_secret,
'not-test', 'not-test',
@ -224,7 +224,7 @@ class TestListResources(FunctionalTest):
'ignored_dict': {'key': 'value'}, 'ignored_dict': {'key': 'value'},
'ignored_list': ['not-returned'], 'ignored_list': ['not-returned'],
} }
) )
msg = meter.meter_message_from_counter(counter1, msg = meter.meter_message_from_counter(counter1,
cfg.CONF.metering_secret, cfg.CONF.metering_secret,
'test', 'test',

11
tests/api/v2/test_list_users.py
View File

@ -50,9 +50,8 @@ class TestListUsers(FunctionalTest):
'resource-id', 'resource-id',
timestamp=datetime.datetime(2012, 7, 2, 10, 40), timestamp=datetime.datetime(2012, 7, 2, 10, 40),
resource_metadata={'display_name': 'test-server', resource_metadata={'display_name': 'test-server',
'tag': 'self.counter', 'tag': 'self.counter'}
} )
)
msg = meter.meter_message_from_counter(counter1, msg = meter.meter_message_from_counter(counter1,
cfg.CONF.metering_secret, cfg.CONF.metering_secret,
'test_list_users', 'test_list_users',
@ -71,7 +70,7 @@ class TestListUsers(FunctionalTest):
resource_metadata={'display_name': 'test-server', resource_metadata={'display_name': 'test-server',
'tag': 'self.counter2', 'tag': 'self.counter2',
} }
) )
msg2 = meter.meter_message_from_counter(counter2, msg2 = meter.meter_message_from_counter(counter2,
cfg.CONF.metering_secret, cfg.CONF.metering_secret,
'test_list_users', 'test_list_users',
@ -94,7 +93,7 @@ class TestListUsers(FunctionalTest):
resource_metadata={'display_name': 'test-server', resource_metadata={'display_name': 'test-server',
'tag': 'self.counter', 'tag': 'self.counter',
} }
) )
msg = meter.meter_message_from_counter(counter1, msg = meter.meter_message_from_counter(counter1,
cfg.CONF.metering_secret, cfg.CONF.metering_secret,
'test_list_users', 'test_list_users',
@ -113,7 +112,7 @@ class TestListUsers(FunctionalTest):
resource_metadata={'display_name': 'test-server', resource_metadata={'display_name': 'test-server',
'tag': 'self.counter2', 'tag': 'self.counter2',
} }
) )
msg2 = meter.meter_message_from_counter(counter2, msg2 = meter.meter_message_from_counter(counter2,
cfg.CONF.metering_secret, cfg.CONF.metering_secret,
'not-test', 'not-test',

2
tests/api/v2/test_max_project_volume.py
View File

@ -51,7 +51,7 @@ class TestMaxProjectVolume(FunctionalTest):
resource_metadata={'display_name': 'test-volume', resource_metadata={'display_name': 'test-volume',
'tag': 'self.counter', 'tag': 'self.counter',
} }
) )
self.counters.append(c) self.counters.append(c)
msg = meter.meter_message_from_counter(c, msg = meter.meter_message_from_counter(c,
cfg.CONF.metering_secret, cfg.CONF.metering_secret,

2
tests/api/v2/test_max_resource_volume.py
View File

@ -50,7 +50,7 @@ class TestMaxResourceVolume(FunctionalTest):
resource_metadata={'display_name': 'test-volume', resource_metadata={'display_name': 'test-volume',
'tag': 'self.counter', 'tag': 'self.counter',
} }
) )
self.counters.append(c) self.counters.append(c)
msg = meter.meter_message_from_counter(c, msg = meter.meter_message_from_counter(c,
cfg.CONF.metering_secret, cfg.CONF.metering_secret,

2
tests/api/v2/test_sum_project_volume.py
View File

@ -50,7 +50,7 @@ class TestSumProjectVolume(FunctionalTest):
resource_metadata={'display_name': 'test-volume', resource_metadata={'display_name': 'test-volume',
'tag': 'self.counter', 'tag': 'self.counter',
} }
) )
self.counters.append(c) self.counters.append(c)
msg = meter.meter_message_from_counter(c, msg = meter.meter_message_from_counter(c,
cfg.CONF.metering_secret, cfg.CONF.metering_secret,

2
tests/api/v2/test_sum_resource_volume.py
View File

@ -50,7 +50,7 @@ class TestSumResourceVolume(FunctionalTest):
resource_metadata={'display_name': 'test-volume', resource_metadata={'display_name': 'test-volume',
'tag': 'self.counter', 'tag': 'self.counter',
} }
) )
self.counters.append(c) self.counters.append(c)
msg = meter.meter_message_from_counter(c, msg = meter.meter_message_from_counter(c,
cfg.CONF.metering_secret, cfg.CONF.metering_secret,

8
tests/collector/test_manager.py
View File

@ -80,7 +80,7 @@ TEST_NOTICE = {
u'priority': u'INFO', u'priority': u'INFO',
u'publisher_id': u'compute.vagrant-precise', u'publisher_id': u'compute.vagrant-precise',
u'timestamp': u'2012-05-08 20:23:48.028195', u'timestamp': u'2012-05-08 20:23:48.028195',
} }
class TestCollectorService(tests_base.TestCase): class TestCollectorService(tests_base.TestCase):
@ -107,7 +107,7 @@ class TestCollectorService(tests_base.TestCase):
msg['message_signature'] = meter.compute_signature( msg['message_signature'] = meter.compute_signature(
msg, msg,
cfg.CONF.metering_secret, cfg.CONF.metering_secret,
) )
self.srv.storage_conn = self.mox.CreateMock(base.Connection) self.srv.storage_conn = self.mox.CreateMock(base.Connection)
self.srv.storage_conn.record_metering_data(msg) self.srv.storage_conn.record_metering_data(msg)
@ -146,7 +146,7 @@ class TestCollectorService(tests_base.TestCase):
msg['message_signature'] = meter.compute_signature( msg['message_signature'] = meter.compute_signature(
msg, msg,
cfg.CONF.metering_secret, cfg.CONF.metering_secret,
) )
expected = {} expected = {}
expected.update(msg) expected.update(msg)
@ -168,7 +168,7 @@ class TestCollectorService(tests_base.TestCase):
msg['message_signature'] = meter.compute_signature( msg['message_signature'] = meter.compute_signature(
msg, msg,
cfg.CONF.metering_secret, cfg.CONF.metering_secret,
) )
expected = {} expected = {}
expected.update(msg) expected.update(msg)

2
tests/collector/test_meter.py
View File

@ -145,7 +145,7 @@ TEST_NOTICE = {
u'priority': u'INFO', u'priority': u'INFO',
u'publisher_id': u'compute.vagrant-precise', u'publisher_id': u'compute.vagrant-precise',
u'timestamp': u'2012-05-08 20:23:48.028195', u'timestamp': u'2012-05-08 20:23:48.028195',
} }
def test_meter_message_from_counter_signed(): def test_meter_message_from_counter_signed():

41
tests/compute/test_instance.py
View File

@ -50,25 +50,24 @@ class TestLocationMetadata(unittest.TestCase):
# Mimics an instance returned from nova api call # Mimics an instance returned from nova api call
self.INSTANCE_PROPERTIES = {'name': 'display name', self.INSTANCE_PROPERTIES = {'name': 'display name',
'OS-EXT-SRV-ATTR:instance_name': 'instance-000001', 'OS-EXT-SRV-ATTR:instance_name':
'reservation_id': 'reservation id', 'instance-000001',
'architecture': 'x86_64', 'reservation_id': 'reservation id',
'availability_zone': 'zone1', 'architecture': 'x86_64',
'kernel_id': 'kernel id', 'availability_zone': 'zone1',
'os_type': 'linux', 'kernel_id': 'kernel id',
'ramdisk_id': 'ramdisk id', 'os_type': 'linux',
'disk_gb': 10, 'ramdisk_id': 'ramdisk id',
'ephemeral_gb': 7, 'disk_gb': 10,
'memory_mb': 2048, 'ephemeral_gb': 7,
'root_gb': 3, 'memory_mb': 2048,
'vcpus': 1, 'root_gb': 3,
'image': {'id': 1, 'vcpus': 1,
'links': [{"rel": "bookmark", 'image': {'id': 1,
'href': 2}], 'links': [{"rel": "bookmark",
}, 'href': 2}]},
'flavor': {'id': 1}, 'flavor': {'id': 1},
'hostId': '1234-5678', 'hostId': '1234-5678'}
}
self.instance = FauxInstance(**self.INSTANCE_PROPERTIES) self.instance = FauxInstance(**self.INSTANCE_PROPERTIES)
self.instance.host = 'made-up-hostname' self.instance.host = 'made-up-hostname'
@ -101,5 +100,5 @@ class TestLocationMetadata(unittest.TestCase):
self.INSTANCE_PROPERTIES['image'] = '' self.INSTANCE_PROPERTIES['image'] = ''
self.instance = FauxInstance(**self.INSTANCE_PROPERTIES) self.instance = FauxInstance(**self.INSTANCE_PROPERTIES)
md = instance.get_metadata_from_object(self.instance) md = instance.get_metadata_from_object(self.instance)
assert md['image_ref'] == None self.assertEqual(md['image_ref'], None)
assert md['image_ref_url'] == None self.assertEqual(md['image_ref_url'], None)

8
tests/compute/test_manager.py
View File

@ -51,9 +51,8 @@ class TestRunTasks(base.TestCase):
project_id='test', project_id='test',
resource_id='test_run_tasks', resource_id='test_run_tasks',
timestamp=datetime.datetime.utcnow().isoformat(), timestamp=datetime.datetime.utcnow().isoformat(),
resource_metadata={'name': 'Pollster', resource_metadata={'name': 'Pollster'},
}, )
)
def get_counters(self, manager, instance): def get_counters(self, manager, instance):
self.counters.append((manager, instance)) self.counters.append((manager, instance))
@ -98,5 +97,4 @@ class TestRunTasks(base.TestCase):
assert list(actual[0]) == [self.Pollster.test_data, assert list(actual[0]) == [self.Pollster.test_data,
cfg.CONF.metering_topic, cfg.CONF.metering_topic,
cfg.CONF.metering_secret, cfg.CONF.metering_secret,
cfg.CONF.counter_source, cfg.CONF.counter_source]
]

33
tests/compute/test_notifications.py
View File

@ -71,7 +71,7 @@ INSTANCE_CREATE_END = {
u'priority': u'INFO', u'priority': u'INFO',
u'publisher_id': u'compute.vagrant-precise', u'publisher_id': u'compute.vagrant-precise',
u'timestamp': u'2012-05-08 20:23:48.028195', u'timestamp': u'2012-05-08 20:23:48.028195',
} }
INSTANCE_DELETE_START = { INSTANCE_DELETE_START = {
u'_context_auth_token': u'3d8b13de1b7d499587dfc69b77dc09c2', u'_context_auth_token': u'3d8b13de1b7d499587dfc69b77dc09c2',
@ -115,7 +115,7 @@ INSTANCE_DELETE_START = {
u'priority': u'INFO', u'priority': u'INFO',
u'publisher_id': u'compute.vagrant-precise', u'publisher_id': u'compute.vagrant-precise',
u'timestamp': u'2012-05-08 20:24:14.824743', u'timestamp': u'2012-05-08 20:24:14.824743',
} }
INSTANCE_EXISTS = { INSTANCE_EXISTS = {
u'_context_auth_token': None, u'_context_auth_token': None,
@ -162,7 +162,7 @@ INSTANCE_EXISTS = {
u'priority': u'INFO', u'priority': u'INFO',
u'publisher_id': u'compute.vagrant-precise', u'publisher_id': u'compute.vagrant-precise',
u'timestamp': u'2012-05-08 16:03:44.122481', u'timestamp': u'2012-05-08 16:03:44.122481',
} }
INSTANCE_FINISH_RESIZE_END = { INSTANCE_FINISH_RESIZE_END = {
u'_context_roles': [u'admin'], u'_context_roles': [u'admin'],
@ -208,7 +208,7 @@ INSTANCE_FINISH_RESIZE_END = {
u'host': u'ip-10-147-132-184.ec2.internal', u'host': u'ip-10-147-132-184.ec2.internal',
u'display_name': u's1', u'display_name': u's1',
u'image_ref_url': u'http://10.147.132.184:9292/images/' u'image_ref_url': u'http://10.147.132.184:9292/images/'
'a130b9d9-e00e-436e-9782-836ccef06e8a', 'a130b9d9-e00e-436e-9782-836ccef06e8a',
u'root_gb': 20, u'root_gb': 20,
u'tenant_id': u'cea4b25edb484e5392727181b7721d29', u'tenant_id': u'cea4b25edb484e5392727181b7721d29',
u'created_at': u'2013-01-04T11:21:48.000000', u'created_at': u'2013-01-04T11:21:48.000000',
@ -216,17 +216,16 @@ INSTANCE_FINISH_RESIZE_END = {
u'instance_type': u'm1.small', u'instance_type': u'm1.small',
u'vcpus': 1, u'vcpus': 1,
u'image_meta': {u'kernel_id': u'image_meta': {u'kernel_id':
u'571478e0-d5e7-4c2e-95a5-2bc79443c28a', u'571478e0-d5e7-4c2e-95a5-2bc79443c28a',
u'ramdisk_id': u'ramdisk_id':
u'5f23128e-5525-46d8-bc66-9c30cd87141a', u'5f23128e-5525-46d8-bc66-9c30cd87141a',
u'base_image_ref': u'base_image_ref':
u'a130b9d9-e00e-436e-9782-836ccef06e8a' u'a130b9d9-e00e-436e-9782-836ccef06e8a'},
},
u'architecture': None, u'architecture': None,
u'os_type': None u'os_type': None
}, },
u'priority': u'INFO' u'priority': u'INFO'
} }
INSTANCE_RESIZE_REVERT_END = { INSTANCE_RESIZE_REVERT_END = {
u'_context_roles': [u'admin'], u'_context_roles': [u'admin'],
@ -266,7 +265,7 @@ INSTANCE_RESIZE_REVERT_END = {
u'host': u'ip-10-147-132-184.ec2.internal', u'host': u'ip-10-147-132-184.ec2.internal',
u'display_name': u's1', u'display_name': u's1',
u'image_ref_url': u'http://10.147.132.184:9292/images/' u'image_ref_url': u'http://10.147.132.184:9292/images/'
'a130b9d9-e00e-436e-9782-836ccef06e8a', 'a130b9d9-e00e-436e-9782-836ccef06e8a',
u'root_gb': 0, u'root_gb': 0,
u'tenant_id': u'cea4b25edb484e5392727181b7721d29', u'tenant_id': u'cea4b25edb484e5392727181b7721d29',
u'created_at': u'2013-01-04T11:21:48.000000', u'created_at': u'2013-01-04T11:21:48.000000',
@ -274,23 +273,23 @@ INSTANCE_RESIZE_REVERT_END = {
u'instance_type': u'm1.tiny', u'instance_type': u'm1.tiny',
u'vcpus': 1, u'vcpus': 1,
u'image_meta': {u'kernel_id': u'image_meta': {u'kernel_id':
u'571478e0-d5e7-4c2e-95a5-2bc79443c28a', u'571478e0-d5e7-4c2e-95a5-2bc79443c28a',
u'ramdisk_id': u'ramdisk_id':
u'5f23128e-5525-46d8-bc66-9c30cd87141a', u'5f23128e-5525-46d8-bc66-9c30cd87141a',
u'base_image_ref': u'base_image_ref':
u'a130b9d9-e00e-436e-9782-836ccef06e8a' u'a130b9d9-e00e-436e-9782-836ccef06e8a'},
},
u'architecture': None, u'architecture': None,
u'os_type': None u'os_type': None
}, },
u'priority': u'INFO' u'priority': u'INFO'
} }
class TestNotifications(unittest.TestCase): class TestNotifications(unittest.TestCase):
def test_process_notification(self): def test_process_notification(self):
info = notifications.Instance.process_notification( info = notifications.Instance.process_notification(
INSTANCE_CREATE_END)[0] INSTANCE_CREATE_END
)[0]
for name, actual, expected in [ for name, actual, expected in [
('counter_name', info.name, 'instance'), ('counter_name', info.name, 'instance'),
@ -306,7 +305,7 @@ class TestNotifications(unittest.TestCase):
INSTANCE_CREATE_END['payload']['instance_type_id']), INSTANCE_CREATE_END['payload']['instance_type_id']),
('host', info.resource_metadata['host'], ('host', info.resource_metadata['host'],
INSTANCE_CREATE_END['publisher_id']), INSTANCE_CREATE_END['publisher_id']),
]: ]:
yield compare, name, actual, expected yield compare, name, actual, expected
@staticmethod @staticmethod

10
tests/compute/test_nova_notifier.py
View File

@ -67,7 +67,7 @@ class TestNovaNotifier(base.TestCase):
timestamp=datetime.datetime.utcnow().isoformat(), timestamp=datetime.datetime.utcnow().isoformat(),
resource_metadata={'name': 'Pollster', resource_metadata={'name': 'Pollster',
}, },
) )
def get_counters(self, manager, instance): def get_counters(self, manager, instance):
self.counters.append((manager, instance)) self.counters.append((manager, instance))
@ -111,7 +111,7 @@ class TestNovaNotifier(base.TestCase):
"vcpus": 1, "vcpus": 1,
"host": "fakehost", "host": "fakehost",
"availability_zone": "availability_zone":
"1e3ce043029547f1a61c1996d1a531a4", "1e3ce043029547f1a61c1996d1a531a4",
"created_at": '2012-05-08 20:23:41', "created_at": '2012-05-08 20:23:41',
"os_type": "linux", "os_type": "linux",
"kernel_id": "kernelid", "kernel_id": "kernelid",
@ -140,7 +140,7 @@ class TestNovaNotifier(base.TestCase):
None, None,
self.Pollster(), self.Pollster(),
), ),
]) ])
nova_notifier.initialize_manager(agent_manager) nova_notifier.initialize_manager(agent_manager)
def tearDown(self): def tearDown(self):
@ -157,9 +157,9 @@ class TestNovaNotifier(base.TestCase):
# call this method directly, but not safe to mock it # call this method directly, but not safe to mock it
# because mock.patch() fails to find the original. # because mock.patch() fails to find the original.
self.stubs.Set(db, 'instance_get_by_uuid', self.stubs.Set(db, 'instance_get_by_uuid',
self.fake_db_instance_get) self.fake_db_instance_get)
self.compute.terminate_instance(self.context, self.compute.terminate_instance(self.context,
instance=self.instance) instance=self.instance)
else: else:
# Under Grizzly, Nova has moved to no-db access on the # Under Grizzly, Nova has moved to no-db access on the
# compute node. The compute manager uses RPC to talk to # compute node. The compute manager uses RPC to talk to

40
tests/compute/test_pollsters.py
View File

@ -69,11 +69,11 @@ class TestDiskIOPollster(TestPollsterBase):
def test_get_counters(self): def test_get_counters(self):
disks = [ disks = [
(virt_inspector.Disk(device='vda'), (virt_inspector.Disk(device='vda'),
virt_inspector.DiskStats(read_bytes=1L, read_requests=2L, virt_inspector.DiskStats(read_bytes=1L, read_requests=2L,
write_bytes=3L, write_requests=4L, write_bytes=3L, write_requests=4L,
errors=-1L)) errors=-1L))
] ]
self.inspector.inspect_disks(self.instance.name).AndReturn(disks) self.inspector.inspect_disks(self.instance.name).AndReturn(disks)
self.mox.ReplayAll() self.mox.ReplayAll()
@ -100,22 +100,24 @@ class TestNetPollster(TestPollsterBase):
super(TestNetPollster, self).setUp() super(TestNetPollster, self).setUp()
def test_get_counters(self): def test_get_counters(self):
vnic0 = virt_inspector.Interface(name='vnet0', vnic0 = virt_inspector.Interface(
fref='fa163e71ec6e', name='vnet0',
mac='fa:16:3e:71:ec:6d', fref='fa163e71ec6e',
parameters=dict(ip='10.0.0.2', mac='fa:16:3e:71:ec:6d',
projmask='255.255.255.0', parameters=dict(ip='10.0.0.2',
projnet='proj1', projmask='255.255.255.0',
dhcp_server='10.0.0.1')) projnet='proj1',
dhcp_server='10.0.0.1'))
stats0 = virt_inspector.InterfaceStats(rx_bytes=1L, rx_packets=2L, stats0 = virt_inspector.InterfaceStats(rx_bytes=1L, rx_packets=2L,
tx_bytes=3L, tx_packets=4L) tx_bytes=3L, tx_packets=4L)
vnic1 = virt_inspector.Interface(name='vnet1', vnic1 = virt_inspector.Interface(
fref='fa163e71ec6f', name='vnet1',
mac='fa:16:3e:71:ec:6e', fref='fa163e71ec6f',
parameters=dict(ip='192.168.0.3', mac='fa:16:3e:71:ec:6e',
projmask='255.255.255.0', parameters=dict(ip='192.168.0.3',
projnet='proj2', projmask='255.255.255.0',
dhcp_server='10.0.0.2')) projnet='proj2',
dhcp_server='10.0.0.2'))
stats1 = virt_inspector.InterfaceStats(rx_bytes=5L, rx_packets=6L, stats1 = virt_inspector.InterfaceStats(rx_bytes=5L, rx_packets=6L,
tx_bytes=7L, tx_packets=8L) tx_bytes=7L, tx_packets=8L)
vnics = [(vnic0, stats0), (vnic1, stats1)] vnics = [(vnic0, stats0), (vnic1, stats1)]

2
tests/compute/virt/libvirt/test_inspector.py
View File

@ -37,7 +37,7 @@ class TestLibvirtInspection(test_base.TestCase):
self.inspector.connection.getCapabilities() self.inspector.connection.getCapabilities()
self.domain = self.mox.CreateMockAnything() self.domain = self.mox.CreateMockAnything()
self.inspector.connection.lookupByName(self.instance_name).AndReturn( self.inspector.connection.lookupByName(self.instance_name).AndReturn(
self.domain) self.domain)
def test_inspect_cpus(self): def test_inspect_cpus(self):
self.domain.info().AndReturn((0L, 0L, 0L, 2L, 999999L)) self.domain.info().AndReturn((0L, 0L, 0L, 2L, 999999L))

2
tests/image/test_glance.py
View File

@ -110,4 +110,4 @@ class TestImagePollster(base.TestCase):
for image in IMAGE_LIST: for image in IMAGE_LIST:
self.assert_( self.assert_(
any(map(lambda counter: counter.volume == image.size, any(map(lambda counter: counter.volume == image.size,
counters))) counters)))

6
tests/objectstore/test_swift_middleware.py
View File

@ -30,8 +30,10 @@ class FakeApp(object):
self.body = body self.body = body
def __call__(self, env, start_response): def __call__(self, env, start_response):
start_response('200 OK', [('Content-Type', 'text/plain'), start_response('200 OK', [
('Content-Length', str(sum(map(len, self.body))))]) ('Content-Type', 'text/plain'),
('Content-Length', str(sum(map(len, self.body))))
])
while env['wsgi.input'].read(5): while env['wsgi.input'].read(5):
pass pass
return self.body return self.body

31
tests/storage/test_impl_mongodb.py
View File

@ -82,7 +82,7 @@ class MongoDBEngineTestBase(unittest.TestCase):
resource_metadata={'display_name': 'test-server', resource_metadata={'display_name': 'test-server',
'tag': 'self.counter', 'tag': 'self.counter',
} }
) )
self.msg = meter.meter_message_from_counter(self.counter, self.msg = meter.meter_message_from_counter(self.counter,
'not-so-secret', 'not-so-secret',
'test-1') 'test-1')
@ -100,7 +100,7 @@ class MongoDBEngineTestBase(unittest.TestCase):
resource_metadata={'display_name': 'test-server', resource_metadata={'display_name': 'test-server',
'tag': 'self.counter2', 'tag': 'self.counter2',
} }
) )
self.msg2 = meter.meter_message_from_counter(self.counter2, self.msg2 = meter.meter_message_from_counter(self.counter2,
'not-so-secret', 'not-so-secret',
'test-2') 'test-2')
@ -118,7 +118,7 @@ class MongoDBEngineTestBase(unittest.TestCase):
resource_metadata={'display_name': 'test-server', resource_metadata={'display_name': 'test-server',
'tag': 'self.counter3', 'tag': 'self.counter3',
} }
) )
self.msg3 = meter.meter_message_from_counter(self.counter3, self.msg3 = meter.meter_message_from_counter(self.counter3,
'not-so-secret', 'not-so-secret',
'test-3') 'test-3')
@ -137,7 +137,7 @@ class MongoDBEngineTestBase(unittest.TestCase):
resource_metadata={'display_name': 'test-server', resource_metadata={'display_name': 'test-server',
'tag': 'counter-%s' % i, 'tag': 'counter-%s' % i,
} }
) )
msg = meter.meter_message_from_counter(c, 'not-so-secret', 'test') msg = meter.meter_message_from_counter(c, 'not-so-secret', 'test')
self.conn.record_metering_data(msg) self.conn.record_metering_data(msg)
@ -264,8 +264,7 @@ class ResourceTest(MongoDBEngineTestBase):
start_ts = datetime.datetime(2012, 7, 2, 10, 42) start_ts = datetime.datetime(2012, 7, 2, 10, 42)
end_ts = datetime.datetime(2012, 7, 2, 10, 43) end_ts = datetime.datetime(2012, 7, 2, 10, 43)
resources = list(self.conn.get_resources(start_timestamp=start_ts, resources = list(self.conn.get_resources(start_timestamp=start_ts,
end_timestamp=end_ts) end_timestamp=end_ts))
)
resource_ids = [r['resource_id'] for r in resources] resource_ids = [r['resource_id'] for r in resources]
expected = set(['resource-id-2']) expected = set(['resource-id-2'])
assert set(resource_ids) == expected assert set(resource_ids) == expected
@ -334,7 +333,7 @@ class MeterTest(MongoDBEngineTestBase):
f = storage.EventFilter( f = storage.EventFilter(
user='user-id', user='user-id',
start=datetime.datetime(2012, 7, 2, 10, 41), start=datetime.datetime(2012, 7, 2, 10, 41),
) )
results = list(self.conn.get_raw_events(f)) results = list(self.conn.get_raw_events(f))
length = len(results) length = len(results)
assert length == 1 assert length == 1
@ -344,7 +343,7 @@ class MeterTest(MongoDBEngineTestBase):
f = storage.EventFilter( f = storage.EventFilter(
user='user-id', user='user-id',
end=datetime.datetime(2012, 7, 2, 10, 41), end=datetime.datetime(2012, 7, 2, 10, 41),
) )
results = list(self.conn.get_raw_events(f)) results = list(self.conn.get_raw_events(f))
length = len(results) length = len(results)
assert length == 1 assert length == 1
@ -354,7 +353,7 @@ class MeterTest(MongoDBEngineTestBase):
f = storage.EventFilter( f = storage.EventFilter(
start=datetime.datetime(2012, 7, 2, 10, 42), start=datetime.datetime(2012, 7, 2, 10, 42),
end=datetime.datetime(2012, 7, 2, 10, 43), end=datetime.datetime(2012, 7, 2, 10, 43),
) )
results = list(self.conn.get_raw_events(f)) results = list(self.conn.get_raw_events(f))
length = len(results) length = len(results)
assert length == 1 assert length == 1
@ -364,7 +363,7 @@ class MeterTest(MongoDBEngineTestBase):
f = storage.EventFilter( f = storage.EventFilter(
user='user-id', user='user-id',
meter='no-such-meter', meter='no-such-meter',
) )
results = list(self.conn.get_raw_events(f)) results = list(self.conn.get_raw_events(f))
assert not results assert not results
@ -372,7 +371,7 @@ class MeterTest(MongoDBEngineTestBase):
f = storage.EventFilter( f = storage.EventFilter(
user='user-id', user='user-id',
meter='instance', meter='instance',
) )
results = list(self.conn.get_raw_events(f)) results = list(self.conn.get_raw_events(f))
assert results assert results
@ -393,7 +392,7 @@ class SumTest(MongoDBEngineTestBase):
f = storage.EventFilter( f = storage.EventFilter(
user='user-id', user='user-id',
meter='instance', meter='instance',
) )
results = list(self.conn.get_volume_sum(f)) results = list(self.conn.get_volume_sum(f))
assert results assert results
counts = dict((r['resource_id'], r['value']) counts = dict((r['resource_id'], r['value'])
@ -407,7 +406,7 @@ class SumTest(MongoDBEngineTestBase):
f = storage.EventFilter( f = storage.EventFilter(
project='project-id', project='project-id',
meter='instance', meter='instance',
) )
results = list(self.conn.get_volume_sum(f)) results = list(self.conn.get_volume_sum(f))
assert results assert results
counts = dict((r['resource_id'], r['value']) counts = dict((r['resource_id'], r['value'])
@ -422,7 +421,7 @@ class SumTest(MongoDBEngineTestBase):
user='user-id', user='user-id',
meter='instance', meter='instance',
resource='resource-id', resource='resource-id',
) )
results = list(self.conn.get_volume_sum(f)) results = list(self.conn.get_volume_sum(f))
assert results assert results
counts = dict((r['resource_id'], r['value']) counts = dict((r['resource_id'], r['value'])
@ -457,7 +456,7 @@ class TestGetEventInterval(MongoDBEngineTestBase):
meter='instance', meter='instance',
start=self.start, start=self.start,
end=self.end, end=self.end,
) )
def _make_events(self, *timestamps): def _make_events(self, *timestamps):
for t in timestamps: for t in timestamps:
@ -472,7 +471,7 @@ class TestGetEventInterval(MongoDBEngineTestBase):
timestamp=t, timestamp=t,
resource_metadata={'display_name': 'test-server', resource_metadata={'display_name': 'test-server',
} }
) )
msg = meter.meter_message_from_counter(counter=c, msg = meter.meter_message_from_counter(counter=c,
secret='not-so-secret', secret='not-so-secret',
source='test', source='test',

38
tests/storage/test_impl_sqlalchemy.py
View File

@ -106,7 +106,7 @@ class SQLAlchemyEngineTestBase(SQLAlchemyEngineSubBase):
resource_metadata={'display_name': 'test-server', resource_metadata={'display_name': 'test-server',
'tag': 'self.counter', 'tag': 'self.counter',
} }
) )
self.msg1 = meter.meter_message_from_counter(self.counter, self.msg1 = meter.meter_message_from_counter(self.counter,
cfg.CONF.metering_secret, cfg.CONF.metering_secret,
'test-1', 'test-1',
@ -125,7 +125,7 @@ class SQLAlchemyEngineTestBase(SQLAlchemyEngineSubBase):
resource_metadata={'display_name': 'test-server', resource_metadata={'display_name': 'test-server',
'tag': 'self.counter2', 'tag': 'self.counter2',
} }
) )
self.msg2 = meter.meter_message_from_counter(self.counter2, self.msg2 = meter.meter_message_from_counter(self.counter2,
cfg.CONF.metering_secret, cfg.CONF.metering_secret,
'test-2', 'test-2',
@ -144,7 +144,7 @@ class SQLAlchemyEngineTestBase(SQLAlchemyEngineSubBase):
resource_metadata={'display_name': 'test-server', resource_metadata={'display_name': 'test-server',
'tag': 'self.counter3', 'tag': 'self.counter3',
} }
) )
self.msg3 = meter.meter_message_from_counter(self.counter3, self.msg3 = meter.meter_message_from_counter(self.counter3,
cfg.CONF.metering_secret, cfg.CONF.metering_secret,
'test-3', 'test-3',
@ -162,9 +162,8 @@ class SQLAlchemyEngineTestBase(SQLAlchemyEngineSubBase):
resource_id='resource-id-%s' % i, resource_id='resource-id-%s' % i,
timestamp=datetime.datetime(2012, 7, 2, 10, 40 + i), timestamp=datetime.datetime(2012, 7, 2, 10, 40 + i),
resource_metadata={'display_name': 'test-server', resource_metadata={'display_name': 'test-server',
'tag': 'counter-%s' % i, 'tag': 'counter-%s' % i},
} )
)
msg = meter.meter_message_from_counter(c, cfg.CONF.metering_secret, msg = meter.meter_message_from_counter(c, cfg.CONF.metering_secret,
'test') 'test')
self.conn.record_metering_data(msg) self.conn.record_metering_data(msg)
@ -230,8 +229,8 @@ class ResourceTest(SQLAlchemyEngineTestBase):
def test_new_resource_meter(self): def test_new_resource_meter(self):
resource = self.session.query(Resource).filter_by(id='resource-id').\ resource = self.session.query(Resource).filter_by(id='resource-id').\
filter(Meter.counter_name == 'instance').\ filter(Meter.counter_name == 'instance').\
filter(Meter.counter_type == 'cumulative').first() filter(Meter.counter_type == 'cumulative').first()
assert len(set(resource.meters)) == 1 assert len(set(resource.meters)) == 1
foo = map(lambda x: [x.counter_name, x.counter_type], resource.meters) foo = map(lambda x: [x.counter_name, x.counter_type], resource.meters)
assert ['instance', 'cumulative'] in foo assert ['instance', 'cumulative'] in foo
@ -278,8 +277,7 @@ class ResourceTest(SQLAlchemyEngineTestBase):
start_ts = datetime.datetime(2012, 7, 2, 10, 42) start_ts = datetime.datetime(2012, 7, 2, 10, 42)
end_ts = datetime.datetime(2012, 7, 2, 10, 43) end_ts = datetime.datetime(2012, 7, 2, 10, 43)
resources = list(self.conn.get_resources(start_timestamp=start_ts, resources = list(self.conn.get_resources(start_timestamp=start_ts,
end_timestamp=end_ts) end_timestamp=end_ts))
)
resource_ids = [r['resource_id'] for r in resources] resource_ids = [r['resource_id'] for r in resources]
assert set(resource_ids) == set(['resource-id-2']) assert set(resource_ids) == set(['resource-id-2'])
@ -396,7 +394,7 @@ class MeterTest(SQLAlchemyEngineTestBase):
f = storage.EventFilter( f = storage.EventFilter(
user='user-id', user='user-id',
start=datetime.datetime(2012, 7, 2, 10, 41), start=datetime.datetime(2012, 7, 2, 10, 41),
) )
results = list(self.conn.get_raw_events(f)) results = list(self.conn.get_raw_events(f))
assert len(results) == 1 assert len(results) == 1
assert results[0]['timestamp'] == datetime.datetime(2012, 7, 2, 10, 41) assert results[0]['timestamp'] == datetime.datetime(2012, 7, 2, 10, 41)
@ -405,7 +403,7 @@ class MeterTest(SQLAlchemyEngineTestBase):
f = storage.EventFilter( f = storage.EventFilter(
user='user-id', user='user-id',
end=datetime.datetime(2012, 7, 2, 10, 41), end=datetime.datetime(2012, 7, 2, 10, 41),
) )
results = list(self.conn.get_raw_events(f)) results = list(self.conn.get_raw_events(f))
length = len(results) length = len(results)
assert length == 1 assert length == 1
@ -415,7 +413,7 @@ class MeterTest(SQLAlchemyEngineTestBase):
f = storage.EventFilter( f = storage.EventFilter(
start=datetime.datetime(2012, 7, 2, 10, 42), start=datetime.datetime(2012, 7, 2, 10, 42),
end=datetime.datetime(2012, 7, 2, 10, 43), end=datetime.datetime(2012, 7, 2, 10, 43),
) )
results = list(self.conn.get_raw_events(f)) results = list(self.conn.get_raw_events(f))
length = len(results) length = len(results)
assert length == 1 assert length == 1
@ -463,7 +461,7 @@ class TestGetEventInterval(SQLAlchemyEngineTestBase):
meter='instance', meter='instance',
start=self.start, start=self.start,
end=self.end, end=self.end,
) )
def _make_events(self, *timestamps): def _make_events(self, *timestamps):
for t in timestamps: for t in timestamps:
@ -478,7 +476,7 @@ class TestGetEventInterval(SQLAlchemyEngineTestBase):
timestamp=t, timestamp=t,
resource_metadata={'display_name': 'test-server', resource_metadata={'display_name': 'test-server',
} }
) )
msg = meter.meter_message_from_counter(c, cfg.CONF.metering_secret, msg = meter.meter_message_from_counter(c, cfg.CONF.metering_secret,
'test') 'test')
self.conn.record_metering_data(msg) self.conn.record_metering_data(msg)
@ -542,7 +540,7 @@ class SumTest(SQLAlchemyEngineTestBase):
f = storage.EventFilter( f = storage.EventFilter(
user='user-id', user='user-id',
meter='instance', meter='instance',
) )
results = list(self.conn.get_volume_sum(f)) results = list(self.conn.get_volume_sum(f))
counts = dict((r['resource_id'], r['value']) counts = dict((r['resource_id'], r['value'])
for r in results) for r in results)
@ -555,7 +553,7 @@ class SumTest(SQLAlchemyEngineTestBase):
f = storage.EventFilter( f = storage.EventFilter(
project='project-id', project='project-id',
meter='instance', meter='instance',
) )
results = list(self.conn.get_volume_sum(f)) results = list(self.conn.get_volume_sum(f))
assert results assert results
counts = dict((r['resource_id'], r['value']) counts = dict((r['resource_id'], r['value'])
@ -570,7 +568,7 @@ class SumTest(SQLAlchemyEngineTestBase):
user='user-id', user='user-id',
meter='instance', meter='instance',
resource='resource-id', resource='resource-id',
) )
results = list(self.conn.get_volume_sum(f)) results = list(self.conn.get_volume_sum(f))
assert results assert results
counts = dict((r['resource_id'], r['value']) counts = dict((r['resource_id'], r['value'])
@ -598,7 +596,7 @@ class MaxProjectTest(SQLAlchemyEngineSubBase):
resource_metadata={'display_name': 'test-volume', resource_metadata={'display_name': 'test-volume',
'tag': 'self.counter', 'tag': 'self.counter',
} }
) )
self.counters.append(c) self.counters.append(c)
msg = meter.meter_message_from_counter(c, msg = meter.meter_message_from_counter(c,
cfg.CONF.metering_secret, cfg.CONF.metering_secret,
@ -677,7 +675,7 @@ class MaxResourceTest(SQLAlchemyEngineSubBase):
resource_metadata={'display_name': 'test-volume', resource_metadata={'display_name': 'test-volume',
'tag': 'self.counter', 'tag': 'self.counter',
} }
) )
self.counters.append(c) self.counters.append(c)
msg = meter.meter_message_from_counter(c, msg = meter.meter_message_from_counter(c,
cfg.CONF.metering_secret, cfg.CONF.metering_secret,

5
tests/test_publish.py
View File

@ -38,9 +38,8 @@ class TestPublish(base.TestCase):
project_id='test', project_id='test',
resource_id='test_run_tasks', resource_id='test_run_tasks',
timestamp=datetime.datetime.utcnow().isoformat(), timestamp=datetime.datetime.utcnow().isoformat(),
resource_metadata={'name': 'TestPublish', resource_metadata={'name': 'TestPublish'},
}, )
)
def faux_notify(self, context, topic, msg): def faux_notify(self, context, topic, msg):
self.notifications.append((topic, msg)) self.notifications.append((topic, msg))

1
tools/test-requires
View File

@ -1,6 +1,5 @@
nose nose
coverage coverage
pep8>=1.0
mock mock
mox mox
Babel>=0.9.6 Babel>=0.9.6

1
tools/test-requires-folsom
View File

@ -1,7 +1,6 @@
http://tarballs.openstack.org/nova/nova-stable-folsom.tar.gz http://tarballs.openstack.org/nova/nova-stable-folsom.tar.gz
nose nose
coverage coverage
pep8>=1.0
mock mock
mox mox
# NOTE(dhellmann): Ming is necessary to provide the Mongo-in-memory # NOTE(dhellmann): Ming is necessary to provide the Mongo-in-memory

2
tox.ini
View File

@ -20,7 +20,7 @@ setenv=CEILOMETER_TEST_LIVE=1
commands = {toxinidir}/run_tests.sh --no-path-adjustment --with-coverage --cover-erase --cover-package=ceilometer --cover-inclusive [] commands = {toxinidir}/run_tests.sh --no-path-adjustment --with-coverage --cover-erase --cover-package=ceilometer --cover-inclusive []
[testenv:pep8] [testenv:pep8]
deps = pep8==1.1 deps = pep8==1.3.3
commands = pep8 --repeat --show-source ceilometer setup.py bin/ceilometer-agent-central bin/ceilometer-agent-compute bin/ceilometer-collector bin/ceilometer-api tests commands = pep8 --repeat --show-source ceilometer setup.py bin/ceilometer-agent-central bin/ceilometer-agent-compute bin/ceilometer-collector bin/ceilometer-api tests
[testenv:venv] [testenv:venv]