diff --git a/.coveragerc b/.coveragerc index 964f6679c..db73becea 100644 --- a/.coveragerc +++ b/.coveragerc @@ -1,7 +1,7 @@ [run] branch = True -source = ceilometer -omit = ceilometer/tests/*, ceilometer/openstack/common/* +source = aodh +omit = aodh/tests/*, aodh/openstack/common/* [report] ignore-errors = True diff --git a/.gitignore b/.gitignore index 3380312f3..fb5700397 100644 --- a/.gitignore +++ b/.gitignore @@ -11,7 +11,7 @@ cover/* dist/* doc/build/* doc/source/sourcecode -etc/ceilometer/ceilometer.conf +etc/aodh/aodh.conf subunit.log tools/lintstack.head.py tools/pylint_exceptions diff --git a/.gitreview b/.gitreview index ac45950f6..5f58c7108 100644 --- a/.gitreview +++ b/.gitreview @@ -1,4 +1,4 @@ [gerrit] host=review.openstack.org port=29418 -project=openstack/ceilometer.git +project=openstack/aodh.git diff --git a/.testr.conf b/.testr.conf index 4b4a9d655..13631a010 100644 --- a/.testr.conf +++ b/.testr.conf @@ -2,7 +2,7 @@ test_command=OS_STDOUT_CAPTURE=${OS_STDOUT_CAPTURE:-1} \ OS_STDERR_CAPTURE=${OS_STDERR_CAPTURE:-1} \ OS_TEST_TIMEOUT=${OS_TEST_TIMEOUT:-600} \ - ${PYTHON:-python} -m subunit.run discover ${OS_TEST_PATH:-./ceilometer/tests} -t . $LISTOPT $IDOPTION + ${PYTHON:-python} -m subunit.run discover ${OS_TEST_PATH:-./aodh/tests} -t . $LISTOPT $IDOPTION test_id_option=--load-list $IDFILE test_list_option=--list # NOTE(chdent): Only used/matches on gabbi-related tests. diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index d42f99d40..ba4c83f63 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -13,4 +13,4 @@ Pull requests submitted through GitHub will be ignored. Bugs should be filed on Launchpad, not GitHub: - https://bugs.launchpad.net/ceilometer + https://bugs.launchpad.net/aodh diff --git a/HACKING.rst b/HACKING.rst index 72668ae7e..f0a73d2f8 100644 --- a/HACKING.rst +++ b/HACKING.rst @@ -1,11 +1,11 @@ -Ceilometer Style Commandments -============================= +Aodh Style Commandments +======================= - Step 1: Read the OpenStack Style Commandments http://docs.openstack.org/developer/hacking/ - Step 2: Read on -Ceilometer Specific Commandments --------------------------------- +Aodh Specific Commandments +-------------------------- - [C300] Check for oslo library imports use the non-namespaced packages diff --git a/MAINTAINERS b/MAINTAINERS index f3a25898e..f62289c4c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1,10 +1,10 @@ = Generalist Code Reviewers = -The current members of ceilometer-core are listed here: +The current members of aodh-core are listed here: - https://launchpad.net/~ceilometer-drivers/+members#active + https://launchpad.net/~aodh-drivers/+members#active -This group can +2 and approve patches in Ceilometer. However, they may +This group can +2 and approve patches in aodh. However, they may choose to seek feedback from the appropriate specialist maintainer before approving a patch if it is in any way controversial or risky. @@ -31,7 +31,7 @@ Each has an entry with the following keys: Maintained: Has an active maintainer Orphan: No current maintainer, feel free to step up! Obsolete: Replaced by newer code, or a dead end, or out-dated - F: Wildcard patterns, relative to ceilometer/ + F: Wildcard patterns, relative to aodh/ == alarms == diff --git a/README.rst b/README.rst index b6505ea63..6bda1e015 100644 --- a/README.rst +++ b/README.rst @@ -1,6 +1,6 @@ -ceilometer -========== +aodh +==== See the ReleaseNotes document and the project home for more info. - http://launchpad.net/ceilometer + http://launchpad.net/aodh diff --git a/ReleaseNotes b/ReleaseNotes index a068018f4..4475952d1 100644 --- a/ReleaseNotes +++ b/ReleaseNotes @@ -1,11 +1,11 @@ Release notes are maintained in rst format in doc/source/releasenotes/ they can be read online at - http://docs.openstack.org/developer/ceilometer/releasenotes/index.html + http://docs.openstack.org/developer/aodh/releasenotes/index.html Documentation for the project can be found at: - http://docs.openstack.org/developer/ceilometer/ + http://docs.openstack.org/developer/aodh/ The project home is at: - http://launchpad.net/ceilometer + http://launchpad.net/aodh diff --git a/ceilometer/__init__.py b/aodh/__init__.py similarity index 100% rename from ceilometer/__init__.py rename to aodh/__init__.py diff --git a/ceilometer/alarm/__init__.py b/aodh/alarm/__init__.py similarity index 87% rename from ceilometer/alarm/__init__.py rename to aodh/alarm/__init__.py index bbccacb24..ae1e36cfc 100644 --- a/ceilometer/alarm/__init__.py +++ b/aodh/alarm/__init__.py @@ -18,8 +18,8 @@ from stevedore import extension -EVALUATOR_EXTENSIONS_NAMESPACE = "ceilometer.alarm.evaluator" -NOTIFIER_EXTENSIONS_NAMESPACE = "ceilometer.alarm.notifier" +EVALUATOR_EXTENSIONS_NAMESPACE = "aodh.alarm.evaluator" +NOTIFIER_EXTENSIONS_NAMESPACE = "aodh.alarm.notifier" NOTIFIERS = extension.ExtensionManager(NOTIFIER_EXTENSIONS_NAMESPACE, invoke_on_load=True) diff --git a/ceilometer/alarm/evaluator/__init__.py b/aodh/alarm/evaluator/__init__.py similarity index 96% rename from ceilometer/alarm/evaluator/__init__.py rename to aodh/alarm/evaluator/__init__.py index 013202654..77311936e 100644 --- a/ceilometer/alarm/evaluator/__init__.py +++ b/aodh/alarm/evaluator/__init__.py @@ -27,7 +27,7 @@ from oslo_utils import timeutils import pytz import six -from ceilometer.i18n import _ +from aodh.i18n import _ LOG = log.getLogger(__name__) @@ -36,8 +36,8 @@ UNKNOWN = 'insufficient data' OK = 'ok' ALARM = 'alarm' -cfg.CONF.import_opt('http_timeout', 'ceilometer.service') -cfg.CONF.import_group('service_credentials', 'ceilometer.service') +cfg.CONF.import_opt('http_timeout', 'aodh.service') +cfg.CONF.import_group('service_credentials', 'aodh.service') @six.add_metaclass(abc.ABCMeta) diff --git a/ceilometer/alarm/evaluator/combination.py b/aodh/alarm/evaluator/combination.py similarity index 98% rename from ceilometer/alarm/evaluator/combination.py rename to aodh/alarm/evaluator/combination.py index faadb1bc3..9de94a6d7 100644 --- a/ceilometer/alarm/evaluator/combination.py +++ b/aodh/alarm/evaluator/combination.py @@ -19,8 +19,8 @@ from oslo_log import log from six import moves -from ceilometer.alarm import evaluator -from ceilometer.i18n import _ +from aodh.alarm import evaluator +from aodh.i18n import _ LOG = log.getLogger(__name__) diff --git a/ceilometer/alarm/evaluator/gnocchi.py b/aodh/alarm/evaluator/gnocchi.py similarity index 98% rename from ceilometer/alarm/evaluator/gnocchi.py rename to aodh/alarm/evaluator/gnocchi.py index 54c9963de..982798f1b 100644 --- a/ceilometer/alarm/evaluator/gnocchi.py +++ b/aodh/alarm/evaluator/gnocchi.py @@ -23,9 +23,9 @@ from oslo_utils import timeutils import requests import six.moves -from ceilometer.alarm import evaluator -from ceilometer.i18n import _ -from ceilometer import keystone_client +from aodh.alarm import evaluator +from aodh.i18n import _ +from aodh import keystone_client LOG = log.getLogger(__name__) @@ -45,7 +45,7 @@ OPTS = [ ] cfg.CONF.register_opts(OPTS, group="alarms") -cfg.CONF.import_opt('http_timeout', 'ceilometer.service') +cfg.CONF.import_opt('http_timeout', 'aodh.service') class GnocchiThresholdEvaluator(evaluator.Evaluator): diff --git a/ceilometer/alarm/evaluator/threshold.py b/aodh/alarm/evaluator/threshold.py similarity index 98% rename from ceilometer/alarm/evaluator/threshold.py rename to aodh/alarm/evaluator/threshold.py index a49195f62..7443124ba 100644 --- a/ceilometer/alarm/evaluator/threshold.py +++ b/aodh/alarm/evaluator/threshold.py @@ -19,9 +19,9 @@ import operator from oslo_log import log from oslo_utils import timeutils -from ceilometer.alarm import evaluator -from ceilometer.alarm.evaluator import utils -from ceilometer.i18n import _, _LW +from aodh.alarm import evaluator +from aodh.alarm.evaluator import utils +from aodh.i18n import _, _LW LOG = log.getLogger(__name__) diff --git a/ceilometer/alarm/evaluator/utils.py b/aodh/alarm/evaluator/utils.py similarity index 100% rename from ceilometer/alarm/evaluator/utils.py rename to aodh/alarm/evaluator/utils.py diff --git a/ceilometer/alarm/notifier/__init__.py b/aodh/alarm/notifier/__init__.py similarity index 100% rename from ceilometer/alarm/notifier/__init__.py rename to aodh/alarm/notifier/__init__.py diff --git a/ceilometer/alarm/notifier/log.py b/aodh/alarm/notifier/log.py similarity index 95% rename from ceilometer/alarm/notifier/log.py rename to aodh/alarm/notifier/log.py index e5545e7d1..37e02940a 100644 --- a/ceilometer/alarm/notifier/log.py +++ b/aodh/alarm/notifier/log.py @@ -16,8 +16,8 @@ from oslo_log import log -from ceilometer.alarm import notifier -from ceilometer.i18n import _ +from aodh.alarm import notifier +from aodh.i18n import _ LOG = log.getLogger(__name__) diff --git a/ceilometer/alarm/notifier/rest.py b/aodh/alarm/notifier/rest.py similarity index 96% rename from ceilometer/alarm/notifier/rest.py rename to aodh/alarm/notifier/rest.py index 6cd004bcf..31c0be0fc 100644 --- a/ceilometer/alarm/notifier/rest.py +++ b/aodh/alarm/notifier/rest.py @@ -22,8 +22,8 @@ from oslo_serialization import jsonutils import requests import six.moves.urllib.parse as urlparse -from ceilometer.alarm import notifier -from ceilometer.i18n import _ +from aodh.alarm import notifier +from aodh.i18n import _ LOG = log.getLogger(__name__) @@ -80,7 +80,7 @@ class RestAlarmNotifier(notifier.AlarmNotifier): if action.scheme == 'https': default_verify = int(cfg.CONF.alarm.rest_notifier_ssl_verify) options = urlparse.parse_qs(action.query) - verify = bool(int(options.get('ceilometer-alarm-ssl-verify', + verify = bool(int(options.get('aodh-alarm-ssl-verify', [default_verify])[-1])) kwargs['verify'] = verify diff --git a/ceilometer/alarm/notifier/test.py b/aodh/alarm/notifier/test.py similarity index 96% rename from ceilometer/alarm/notifier/test.py rename to aodh/alarm/notifier/test.py index a7d74eb14..643aa638f 100644 --- a/ceilometer/alarm/notifier/test.py +++ b/aodh/alarm/notifier/test.py @@ -14,7 +14,7 @@ # under the License. """Test alarm notifier.""" -from ceilometer.alarm import notifier +from aodh.alarm import notifier class TestAlarmNotifier(notifier.AlarmNotifier): diff --git a/ceilometer/alarm/notifier/trust.py b/aodh/alarm/notifier/trust.py similarity index 90% rename from ceilometer/alarm/notifier/trust.py rename to aodh/alarm/notifier/trust.py index b71eedf2b..303fa74fd 100644 --- a/ceilometer/alarm/notifier/trust.py +++ b/aodh/alarm/notifier/trust.py @@ -18,18 +18,18 @@ from keystoneclient.v3 import client as keystone_client from oslo_config import cfg from six.moves.urllib import parse -from ceilometer.alarm.notifier import rest +from aodh.alarm.notifier import rest -cfg.CONF.import_opt('http_timeout', 'ceilometer.service') -cfg.CONF.import_group('service_credentials', 'ceilometer.service') +cfg.CONF.import_opt('http_timeout', 'aodh.service') +cfg.CONF.import_group('service_credentials', 'aodh.service') class TrustRestAlarmNotifier(rest.RestAlarmNotifier): """Notifier supporting keystone trust authentication. This alarm notifier is intended to be used to call an endpoint using - keystone authentication. It uses the ceilometer service user to + keystone authentication. It uses the aodh service user to authenticate using the trust ID provided. The URL must be in the form trust+http://trust-id@host/action. diff --git a/ceilometer/alarm/rpc.py b/aodh/alarm/rpc.py similarity index 92% rename from ceilometer/alarm/rpc.py rename to aodh/alarm/rpc.py index 99b826517..6c35e0854 100644 --- a/ceilometer/alarm/rpc.py +++ b/aodh/alarm/rpc.py @@ -20,14 +20,14 @@ from oslo_context import context from oslo_log import log import six -from ceilometer.alarm.storage import models -from ceilometer.i18n import _ -from ceilometer import messaging +from aodh.alarm.storage import models +from aodh.i18n import _ +from aodh import messaging OPTS = [ cfg.StrOpt('notifier_rpc_topic', default='alarm_notifier', - help='The topic that ceilometer uses for alarm notifier ' + help='The topic that aodh uses for alarm notifier ' 'messages.'), ] diff --git a/ceilometer/alarm/service.py b/aodh/alarm/service.py similarity index 94% rename from ceilometer/alarm/service.py rename to aodh/alarm/service.py index 318fded3e..2a442b47a 100644 --- a/ceilometer/alarm/service.py +++ b/aodh/alarm/service.py @@ -27,11 +27,11 @@ from oslo_utils import netutils import six from stevedore import extension -from ceilometer import alarm as ceilometer_alarm -from ceilometer.alarm import rpc as rpc_alarm -from ceilometer import coordination as coordination -from ceilometer.i18n import _ -from ceilometer import messaging +from aodh import alarm as aodh_alarm +from aodh.alarm import rpc as rpc_alarm +from aodh import coordination as coordination +from aodh.i18n import _ +from aodh import messaging OPTS = [ @@ -45,8 +45,8 @@ OPTS = [ ] cfg.CONF.register_opts(OPTS, group='alarm') -cfg.CONF.import_opt('http_timeout', 'ceilometer.service') -cfg.CONF.import_group('service_credentials', 'ceilometer.service') +cfg.CONF.import_opt('http_timeout', 'aodh.service') +cfg.CONF.import_group('service_credentials', 'aodh.service') LOG = log.getLogger(__name__) @@ -61,7 +61,7 @@ class AlarmService(object): def _load_evaluators(self): self.evaluators = extension.ExtensionManager( - namespace=ceilometer_alarm.EVALUATOR_EXTENSIONS_NAMESPACE, + namespace=aodh_alarm.EVALUATOR_EXTENSIONS_NAMESPACE, invoke_on_load=True, invoke_args=(rpc_alarm.RPCAlarmNotifier(),) ) @@ -181,7 +181,7 @@ class AlarmNotifierService(os_service.Service): return try: - notifier = ceilometer_alarm.NOTIFIERS[action.scheme].obj + notifier = aodh_alarm.NOTIFIERS[action.scheme].obj except KeyError: scheme = action.scheme LOG.error( diff --git a/ceilometer/alarm/storage/__init__.py b/aodh/alarm/storage/__init__.py similarity index 100% rename from ceilometer/alarm/storage/__init__.py rename to aodh/alarm/storage/__init__.py diff --git a/ceilometer/alarm/storage/base.py b/aodh/alarm/storage/base.py similarity index 86% rename from ceilometer/alarm/storage/base.py rename to aodh/alarm/storage/base.py index e331f2573..7dc3af9aa 100644 --- a/ceilometer/alarm/storage/base.py +++ b/aodh/alarm/storage/base.py @@ -14,7 +14,7 @@ # under the License. """Base classes for storage engines """ -import ceilometer +import aodh class Connection(object): @@ -55,7 +55,7 @@ class Connection(object): :param alarm_type: Optional alarm type. :parmr severity: Optional alarm severity """ - raise ceilometer.NotImplementedError('Alarms not implemented') + raise aodh.NotImplementedError('Alarms not implemented') @staticmethod def create_alarm(alarm): @@ -63,17 +63,17 @@ class Connection(object): :param alarm: The alarm to create. """ - raise ceilometer.NotImplementedError('Alarms not implemented') + raise aodh.NotImplementedError('Alarms not implemented') @staticmethod def update_alarm(alarm): """Update alarm.""" - raise ceilometer.NotImplementedError('Alarms not implemented') + raise aodh.NotImplementedError('Alarms not implemented') @staticmethod def delete_alarm(alarm_id): """Delete an alarm.""" - raise ceilometer.NotImplementedError('Alarms not implemented') + raise aodh.NotImplementedError('Alarms not implemented') @staticmethod def get_alarm_changes(alarm_id, on_behalf_of, @@ -105,12 +105,12 @@ class Connection(object): :param end_timestamp: Optional modified timestamp end range :param end_timestamp_op: Optional timestamp end range operation """ - raise ceilometer.NotImplementedError('Alarm history not implemented') + raise aodh.NotImplementedError('Alarm history not implemented') @staticmethod def record_alarm_change(alarm_change): """Record alarm change event.""" - raise ceilometer.NotImplementedError('Alarm history not implemented') + raise aodh.NotImplementedError('Alarm history not implemented') @staticmethod def clear(): @@ -125,8 +125,8 @@ class Connection(object): :param limit: Maximum number of results to return. """ - raise ceilometer.NotImplementedError('Complex query for alarms ' - 'is not implemented.') + raise aodh.NotImplementedError('Complex query for alarms ' + 'is not implemented.') @staticmethod def query_alarm_history(filter_expr=None, orderby=None, limit=None): @@ -137,8 +137,8 @@ class Connection(object): :param limit: Maximum number of results to return. """ - raise ceilometer.NotImplementedError('Complex query for alarms ' - 'history is not implemented.') + raise aodh.NotImplementedError('Complex query for alarms ' + 'history is not implemented.') @classmethod def get_capabilities(cls): @@ -162,5 +162,5 @@ class Connection(object): :param alarm_history_ttl: Number of seconds to keep alarm history records for. """ - raise ceilometer.NotImplementedError('Clearing alarm history ' - 'not implemented') + raise aodh.NotImplementedError('Clearing alarm history ' + 'not implemented') diff --git a/ceilometer/alarm/storage/impl_db2.py b/aodh/alarm/storage/impl_db2.py similarity index 93% rename from ceilometer/alarm/storage/impl_db2.py rename to aodh/alarm/storage/impl_db2.py index 291dafd28..8e57e7eea 100644 --- a/ceilometer/alarm/storage/impl_db2.py +++ b/aodh/alarm/storage/impl_db2.py @@ -21,15 +21,15 @@ from __future__ import division from oslo_log import log import pymongo -from ceilometer.alarm.storage import pymongo_base -from ceilometer import storage -from ceilometer.storage.mongo import utils as pymongo_utils +from aodh.alarm.storage import pymongo_base +from aodh import storage +from aodh.storage.mongo import utils as pymongo_utils LOG = log.getLogger(__name__) class Connection(pymongo_base.Connection): - """The db2 alarm storage for Ceilometer.""" + """The db2 alarm storage for aodh.""" CONNECTION_POOL = pymongo_utils.ConnectionPool() diff --git a/ceilometer/alarm/storage/impl_hbase.py b/aodh/alarm/storage/impl_hbase.py similarity index 94% rename from ceilometer/alarm/storage/impl_hbase.py rename to aodh/alarm/storage/impl_hbase.py index e891826ef..8194f4f73 100644 --- a/ceilometer/alarm/storage/impl_hbase.py +++ b/aodh/alarm/storage/impl_hbase.py @@ -16,14 +16,14 @@ import operator from oslo_log import log -import ceilometer -from ceilometer.alarm.storage import base -from ceilometer.alarm.storage import models -from ceilometer.i18n import _ -from ceilometer.storage.hbase import base as hbase_base -from ceilometer.storage.hbase import migration as hbase_migration -from ceilometer.storage.hbase import utils as hbase_utils -from ceilometer import utils +import aodh +from aodh.alarm.storage import base +from aodh.alarm.storage import models +from aodh.i18n import _ +from aodh.storage.hbase import base as hbase_base +from aodh.storage.hbase import migration as hbase_migration +from aodh.storage.hbase import utils as hbase_utils +from aodh import utils LOG = log.getLogger(__name__) @@ -124,7 +124,7 @@ class Connection(hbase_base.Connection, base.Connection): alarm_type=None, severity=None): if meter: - raise ceilometer.NotImplementedError( + raise aodh.NotImplementedError( 'Filter by meter not implemented') q = hbase_utils.make_query(alarm_id=alarm_id, name=name, diff --git a/ceilometer/alarm/storage/impl_log.py b/aodh/alarm/storage/impl_log.py similarity index 95% rename from ceilometer/alarm/storage/impl_log.py rename to aodh/alarm/storage/impl_log.py index d480bc41a..06eb60315 100644 --- a/ceilometer/alarm/storage/impl_log.py +++ b/aodh/alarm/storage/impl_log.py @@ -17,8 +17,8 @@ from oslo_log import log -from ceilometer.alarm.storage import base -from ceilometer.i18n import _LI +from aodh.alarm.storage import base +from aodh.i18n import _LI LOG = log.getLogger(__name__) diff --git a/ceilometer/alarm/storage/impl_mongodb.py b/aodh/alarm/storage/impl_mongodb.py similarity index 94% rename from ceilometer/alarm/storage/impl_mongodb.py rename to aodh/alarm/storage/impl_mongodb.py index 31c03f95a..4d14286db 100644 --- a/ceilometer/alarm/storage/impl_mongodb.py +++ b/aodh/alarm/storage/impl_mongodb.py @@ -24,11 +24,11 @@ from oslo_config import cfg from oslo_log import log import pymongo -from ceilometer.alarm.storage import pymongo_base -from ceilometer import storage -from ceilometer.storage.mongo import utils as pymongo_utils +from aodh.alarm.storage import pymongo_base +from aodh import storage +from aodh.storage.mongo import utils as pymongo_utils -cfg.CONF.import_opt('alarm_history_time_to_live', 'ceilometer.alarm.storage', +cfg.CONF.import_opt('alarm_history_time_to_live', 'aodh.alarm.storage', group="database") LOG = log.getLogger(__name__) diff --git a/ceilometer/alarm/storage/impl_sqlalchemy.py b/aodh/alarm/storage/impl_sqlalchemy.py similarity index 97% rename from ceilometer/alarm/storage/impl_sqlalchemy.py rename to aodh/alarm/storage/impl_sqlalchemy.py index 97d12dfc0..61ea766fa 100644 --- a/ceilometer/alarm/storage/impl_sqlalchemy.py +++ b/aodh/alarm/storage/impl_sqlalchemy.py @@ -21,12 +21,12 @@ from oslo_log import log from oslo_utils import timeutils from sqlalchemy import desc -from ceilometer.alarm.storage import base -from ceilometer.alarm.storage import models as alarm_api_models -from ceilometer.i18n import _LI -from ceilometer.storage.sqlalchemy import models -from ceilometer.storage.sqlalchemy import utils as sql_utils -from ceilometer import utils +from aodh.alarm.storage import base +from aodh.alarm.storage import models as alarm_api_models +from aodh.i18n import _LI +from aodh.storage.sqlalchemy import models +from aodh.storage.sqlalchemy import utils as sql_utils +from aodh import utils LOG = log.getLogger(__name__) diff --git a/ceilometer/alarm/storage/models.py b/aodh/alarm/storage/models.py similarity index 98% rename from ceilometer/alarm/storage/models.py rename to aodh/alarm/storage/models.py index 6865c190c..567b41491 100644 --- a/ceilometer/alarm/storage/models.py +++ b/aodh/alarm/storage/models.py @@ -17,8 +17,8 @@ import datetime -from ceilometer.i18n import _ -from ceilometer.storage import base +from aodh.i18n import _ +from aodh.storage import base class Alarm(base.Model): diff --git a/ceilometer/alarm/storage/pymongo_base.py b/aodh/alarm/storage/pymongo_base.py similarity index 98% rename from ceilometer/alarm/storage/pymongo_base.py rename to aodh/alarm/storage/pymongo_base.py index c5955c826..1a4a460fa 100644 --- a/ceilometer/alarm/storage/pymongo_base.py +++ b/aodh/alarm/storage/pymongo_base.py @@ -21,10 +21,10 @@ from oslo_log import log import pymongo -from ceilometer.alarm.storage import base -from ceilometer.alarm.storage import models -from ceilometer.storage.mongo import utils as pymongo_utils -from ceilometer import utils +from aodh.alarm.storage import base +from aodh.alarm.storage import models +from aodh.storage.mongo import utils as pymongo_utils +from aodh import utils LOG = log.getLogger(__name__) diff --git a/ceilometer/api/__init__.py b/aodh/api/__init__.py similarity index 83% rename from ceilometer/api/__init__.py rename to aodh/api/__init__.py index a3265747f..4df8329f0 100644 --- a/ceilometer/api/__init__.py +++ b/aodh/api/__init__.py @@ -21,16 +21,16 @@ OPTS = [ default=8777, deprecated_name='metering_api_port', deprecated_group='DEFAULT', - help='The port for the ceilometer API server.', + help='The port for the aodh API server.', ), cfg.StrOpt('host', default='0.0.0.0', - help='The listen IP for the ceilometer API server.', + help='The listen IP for the aodh API server.', ), ] CONF = cfg.CONF opt_group = cfg.OptGroup(name='api', - title='Options for the ceilometer-api service') + title='Options for the aodh-api service') CONF.register_group(opt_group) CONF.register_opts(OPTS, opt_group) diff --git a/ceilometer/api/app.py b/aodh/api/app.py similarity index 93% rename from ceilometer/api/app.py rename to aodh/api/app.py index cb3a187a1..ef3467045 100644 --- a/ceilometer/api/app.py +++ b/aodh/api/app.py @@ -22,13 +22,13 @@ from paste import deploy import pecan from werkzeug import serving -from ceilometer.api import config as api_config -from ceilometer.api import hooks -from ceilometer.api import middleware -from ceilometer.i18n import _ -from ceilometer.i18n import _LW -from ceilometer import service -from ceilometer import storage +from aodh.api import config as api_config +from aodh.api import hooks +from aodh.api import middleware +from aodh.i18n import _ +from aodh.i18n import _LW +from aodh import service +from aodh import storage LOG = log.getLogger(__name__) @@ -41,7 +41,7 @@ OPTS = [ help="Configuration file for WSGI definition of API." ), cfg.IntOpt('api_workers', default=1, - help='Number of workers for Ceilometer API server.'), + help='Number of workers for aodh API server.'), ] API_OPTS = [ diff --git a/ceilometer/api/app.wsgi b/aodh/api/app.wsgi similarity index 93% rename from ceilometer/api/app.wsgi rename to aodh/api/app.wsgi index a5a4856ec..0bc4e566e 100644 --- a/ceilometer/api/app.wsgi +++ b/aodh/api/app.wsgi @@ -17,8 +17,8 @@ See http://pecan.readthedocs.org/en/latest/deployment.html for details. """ -from ceilometer import service -from ceilometer.api import app +from aodh import service +from aodh.api import app # Initialize the oslo configuration library and logging service.prepare_service([]) diff --git a/ceilometer/api/config.py b/aodh/api/config.py similarity index 89% rename from ceilometer/api/config.py rename to aodh/api/config.py index ab7356391..50836cec1 100644 --- a/ceilometer/api/config.py +++ b/aodh/api/config.py @@ -18,8 +18,8 @@ server = { # Pecan Application Configurations app = { - 'root': 'ceilometer.api.controllers.root.RootController', - 'modules': ['ceilometer.api'], + 'root': 'aodh.api.controllers.root.RootController', + 'modules': ['aodh.api'], } # Custom Configurations must be in Python dictionary format:: diff --git a/ceilometer/api/controllers/__init__.py b/aodh/api/controllers/__init__.py similarity index 100% rename from ceilometer/api/controllers/__init__.py rename to aodh/api/controllers/__init__.py diff --git a/ceilometer/api/controllers/root.py b/aodh/api/controllers/root.py similarity index 97% rename from ceilometer/api/controllers/root.py rename to aodh/api/controllers/root.py index 4f22862aa..033140e63 100644 --- a/ceilometer/api/controllers/root.py +++ b/aodh/api/controllers/root.py @@ -15,7 +15,7 @@ import pecan -from ceilometer.api.controllers.v2 import root as v2 +from aodh.api.controllers.v2 import root as v2 MEDIA_TYPE_JSON = 'application/vnd.openstack.telemetry-%s+json' MEDIA_TYPE_XML = 'application/vnd.openstack.telemetry-%s+xml' diff --git a/ceilometer/api/controllers/v2/__init__.py b/aodh/api/controllers/v2/__init__.py similarity index 100% rename from ceilometer/api/controllers/v2/__init__.py rename to aodh/api/controllers/v2/__init__.py diff --git a/ceilometer/api/controllers/v2/alarm_rules/__init__.py b/aodh/api/controllers/v2/alarm_rules/__init__.py similarity index 100% rename from ceilometer/api/controllers/v2/alarm_rules/__init__.py rename to aodh/api/controllers/v2/alarm_rules/__init__.py diff --git a/ceilometer/api/controllers/v2/alarm_rules/combination.py b/aodh/api/controllers/v2/alarm_rules/combination.py similarity index 95% rename from ceilometer/api/controllers/v2/alarm_rules/combination.py rename to aodh/api/controllers/v2/alarm_rules/combination.py index ffa5844f6..48847eef6 100644 --- a/ceilometer/api/controllers/v2/alarm_rules/combination.py +++ b/aodh/api/controllers/v2/alarm_rules/combination.py @@ -15,9 +15,9 @@ import pecan import wsme from wsme import types as wtypes -from ceilometer.api.controllers.v2 import base -from ceilometer.api.controllers.v2 import utils as v2_utils -from ceilometer.i18n import _ +from aodh.api.controllers.v2 import base +from aodh.api.controllers.v2 import utils as v2_utils +from aodh.i18n import _ class AlarmCombinationRule(base.AlarmRule): diff --git a/ceilometer/api/controllers/v2/alarm_rules/gnocchi.py b/aodh/api/controllers/v2/alarm_rules/gnocchi.py similarity index 97% rename from ceilometer/api/controllers/v2/alarm_rules/gnocchi.py rename to aodh/api/controllers/v2/alarm_rules/gnocchi.py index 423dea2e5..81ee32836 100644 --- a/ceilometer/api/controllers/v2/alarm_rules/gnocchi.py +++ b/aodh/api/controllers/v2/alarm_rules/gnocchi.py @@ -19,12 +19,12 @@ import requests import wsme from wsme import types as wtypes -from ceilometer.api.controllers.v2 import base -from ceilometer.api.controllers.v2 import utils as v2_utils -from ceilometer import keystone_client +from aodh.api.controllers.v2 import base +from aodh.api.controllers.v2 import utils as v2_utils +from aodh import keystone_client -cfg.CONF.import_opt('gnocchi_url', 'ceilometer.alarm.evaluator.gnocchi', +cfg.CONF.import_opt('gnocchi_url', 'aodh.alarm.evaluator.gnocchi', group="alarms") diff --git a/ceilometer/api/controllers/v2/alarm_rules/threshold.py b/aodh/api/controllers/v2/alarm_rules/threshold.py similarity index 96% rename from ceilometer/api/controllers/v2/alarm_rules/threshold.py rename to aodh/api/controllers/v2/alarm_rules/threshold.py index 0445c73d2..2419e0165 100644 --- a/ceilometer/api/controllers/v2/alarm_rules/threshold.py +++ b/aodh/api/controllers/v2/alarm_rules/threshold.py @@ -14,10 +14,10 @@ import wsme from wsme import types as wtypes -from ceilometer.api.controllers.v2 import base -from ceilometer.api.controllers.v2 import utils as v2_utils -from ceilometer.i18n import _ -from ceilometer import storage +from aodh.api.controllers.v2 import base +from aodh.api.controllers.v2 import utils as v2_utils +from aodh.i18n import _ +from aodh import storage class AlarmThresholdRule(base.AlarmRule): diff --git a/ceilometer/api/controllers/v2/alarms.py b/aodh/api/controllers/v2/alarms.py similarity index 97% rename from ceilometer/api/controllers/v2/alarms.py rename to aodh/api/controllers/v2/alarms.py index 5408a6946..7c11c24a7 100644 --- a/ceilometer/api/controllers/v2/alarms.py +++ b/aodh/api/controllers/v2/alarms.py @@ -37,16 +37,16 @@ import wsme from wsme import types as wtypes import wsmeext.pecan as wsme_pecan -import ceilometer -from ceilometer import alarm as ceilometer_alarm -from ceilometer.alarm.storage import models as alarm_models -from ceilometer.api.controllers.v2.alarm_rules import combination -from ceilometer.api.controllers.v2 import base -from ceilometer.api.controllers.v2 import utils as v2_utils -from ceilometer.api import rbac -from ceilometer.i18n import _ -from ceilometer import messaging -from ceilometer import utils +import aodh +from aodh import alarm as aodh_alarm +from aodh.alarm.storage import models as alarm_models +from aodh.api.controllers.v2.alarm_rules import combination +from aodh.api.controllers.v2 import base +from aodh.api.controllers.v2 import utils as v2_utils +from aodh.api import rbac +from aodh.i18n import _ +from aodh import messaging +from aodh import utils LOG = log.getLogger(__name__) @@ -180,7 +180,7 @@ class AlarmTimeConstraint(base.Base): timezone='Europe/Ljubljana') -ALARMS_RULES = extension.ExtensionManager("ceilometer.alarm.rule") +ALARMS_RULES = extension.ExtensionManager("aodh.alarm.rule") LOG.debug("alarm rules plugin loaded: %s" % ",".join(ALARMS_RULES.names())) @@ -309,7 +309,7 @@ class Alarm(base.Base): @staticmethod def check_alarm_actions(alarm): - actions_schema = ceilometer_alarm.NOTIFIER_SCHEMAS + actions_schema = aodh_alarm.NOTIFIER_SCHEMAS max_actions = cfg.CONF.alarm.alarm_max_actions for state in state_kind: actions_name = state.replace(" ", "_") + '_actions' @@ -429,7 +429,7 @@ def _send_notification(event, payload): notification = event.replace(" ", "_") notification = "alarm.%s" % notification transport = messaging.get_transport() - notifier = messaging.get_notifier(transport, publisher_id="ceilometer.api") + notifier = messaging.get_notifier(transport, publisher_id="aodh.api") # FIXME(sileht): perhaps we need to copy some infos from the # pecan request headers like nova does notifier.info(context.RequestContext(), notification, payload) @@ -476,7 +476,7 @@ class AlarmController(rest.RestController): try: self.conn.record_alarm_change(payload) - except ceilometer.NotImplementedError: + except aodh.NotImplementedError: pass # Revert to the pre-json'ed details ... @@ -645,7 +645,7 @@ class AlarmsController(rest.RestController): try: conn.record_alarm_change(payload) - except ceilometer.NotImplementedError: + except aodh.NotImplementedError: pass # Revert to the pre-json'ed details ... diff --git a/ceilometer/api/controllers/v2/base.py b/aodh/api/controllers/v2/base.py similarity index 99% rename from ceilometer/api/controllers/v2/base.py rename to aodh/api/controllers/v2/base.py index 18aa19f3a..70d8a6603 100644 --- a/ceilometer/api/controllers/v2/base.py +++ b/aodh/api/controllers/v2/base.py @@ -30,7 +30,7 @@ import six import wsme from wsme import types as wtypes -from ceilometer.i18n import _ +from aodh.i18n import _ operation_kind = ('lt', 'le', 'eq', 'ne', 'ge', 'gt') diff --git a/ceilometer/api/controllers/v2/capabilities.py b/aodh/api/controllers/v2/capabilities.py similarity index 97% rename from ceilometer/api/controllers/v2/capabilities.py rename to aodh/api/controllers/v2/capabilities.py index a7dbcb258..8ede23026 100644 --- a/ceilometer/api/controllers/v2/capabilities.py +++ b/aodh/api/controllers/v2/capabilities.py @@ -23,8 +23,8 @@ from pecan import rest from wsme import types as wtypes import wsmeext.pecan as wsme_pecan -from ceilometer.api.controllers.v2 import base -from ceilometer import utils +from aodh.api.controllers.v2 import base +from aodh import utils def _flatten_capabilities(capabilities): diff --git a/ceilometer/api/controllers/v2/query.py b/aodh/api/controllers/v2/query.py similarity index 98% rename from ceilometer/api/controllers/v2/query.py rename to aodh/api/controllers/v2/query.py index 54939cce3..5f31a72a8 100644 --- a/ceilometer/api/controllers/v2/query.py +++ b/aodh/api/controllers/v2/query.py @@ -28,12 +28,12 @@ from pecan import rest from wsme import types as wtypes import wsmeext.pecan as wsme_pecan -from ceilometer.alarm.storage import models as alarm_models -from ceilometer.api.controllers.v2 import alarms -from ceilometer.api.controllers.v2 import base -from ceilometer.api import rbac -from ceilometer.i18n import _ -from ceilometer import utils +from aodh.alarm.storage import models as alarm_models +from aodh.api.controllers.v2 import alarms +from aodh.api.controllers.v2 import base +from aodh.api import rbac +from aodh.i18n import _ +from aodh import utils LOG = log.getLogger(__name__) diff --git a/ceilometer/api/controllers/v2/root.py b/aodh/api/controllers/v2/root.py similarity index 87% rename from ceilometer/api/controllers/v2/root.py rename to aodh/api/controllers/v2/root.py index 17d0c4eca..a6f94cb28 100644 --- a/ceilometer/api/controllers/v2/root.py +++ b/aodh/api/controllers/v2/root.py @@ -18,9 +18,9 @@ # License for the specific language governing permissions and limitations # under the License. -from ceilometer.api.controllers.v2 import alarms -from ceilometer.api.controllers.v2 import capabilities -from ceilometer.api.controllers.v2 import query +from aodh.api.controllers.v2 import alarms +from aodh.api.controllers.v2 import capabilities +from aodh.api.controllers.v2 import query class V2Controller(object): diff --git a/ceilometer/api/controllers/v2/utils.py b/aodh/api/controllers/v2/utils.py similarity index 99% rename from ceilometer/api/controllers/v2/utils.py rename to aodh/api/controllers/v2/utils.py index 2790999e6..15178c10a 100644 --- a/ceilometer/api/controllers/v2/utils.py +++ b/aodh/api/controllers/v2/utils.py @@ -26,8 +26,8 @@ from oslo_utils import timeutils import pecan import wsme -from ceilometer.api.controllers.v2 import base -from ceilometer.api import rbac +from aodh.api.controllers.v2 import base +from aodh.api import rbac def get_auth_project(on_behalf_of=None): diff --git a/ceilometer/api/hooks.py b/aodh/api/hooks.py similarity index 100% rename from ceilometer/api/hooks.py rename to aodh/api/hooks.py diff --git a/ceilometer/api/middleware.py b/aodh/api/middleware.py similarity index 98% rename from ceilometer/api/middleware.py rename to aodh/api/middleware.py index d4f15ad25..7bd8cfd9c 100644 --- a/ceilometer/api/middleware.py +++ b/aodh/api/middleware.py @@ -26,9 +26,9 @@ from oslo_log import log import six import webob -from ceilometer.api import hooks -from ceilometer import i18n -from ceilometer.i18n import _ +from aodh.api import hooks +from aodh import i18n +from aodh.i18n import _ LOG = log.getLogger(__name__) diff --git a/ceilometer/api/rbac.py b/aodh/api/rbac.py similarity index 100% rename from ceilometer/api/rbac.py rename to aodh/api/rbac.py diff --git a/ceilometer/cmd/__init__.py b/aodh/cmd/__init__.py similarity index 100% rename from ceilometer/cmd/__init__.py rename to aodh/cmd/__init__.py diff --git a/ceilometer/cmd/api.py b/aodh/cmd/api.py similarity index 91% rename from ceilometer/cmd/api.py rename to aodh/cmd/api.py index cdcdb46ad..0b2f7e625 100644 --- a/ceilometer/cmd/api.py +++ b/aodh/cmd/api.py @@ -14,8 +14,8 @@ # License for the specific language governing permissions and limitations # under the License. -from ceilometer.api import app -from ceilometer import service +from aodh.api import app +from aodh import service def main(): diff --git a/ceilometer/cmd/eventlet/__init__.py b/aodh/cmd/eventlet/__init__.py similarity index 100% rename from ceilometer/cmd/eventlet/__init__.py rename to aodh/cmd/eventlet/__init__.py diff --git a/ceilometer/cmd/eventlet/alarm.py b/aodh/cmd/eventlet/alarm.py similarity index 91% rename from ceilometer/cmd/eventlet/alarm.py rename to aodh/cmd/eventlet/alarm.py index b3df8b00b..64528eb25 100644 --- a/ceilometer/cmd/eventlet/alarm.py +++ b/aodh/cmd/eventlet/alarm.py @@ -17,8 +17,8 @@ from oslo_config import cfg from oslo_service import service as os_service -from ceilometer.alarm import service as alarm_service -from ceilometer import service +from aodh.alarm import service as alarm_service +from aodh import service CONF = cfg.CONF diff --git a/ceilometer/cmd/eventlet/storage.py b/aodh/cmd/eventlet/storage.py similarity index 93% rename from ceilometer/cmd/eventlet/storage.py rename to aodh/cmd/eventlet/storage.py index 3af09c45b..18ad47b47 100644 --- a/ceilometer/cmd/eventlet/storage.py +++ b/aodh/cmd/eventlet/storage.py @@ -18,9 +18,9 @@ import logging from oslo_config import cfg -from ceilometer.i18n import _LI -from ceilometer import service -from ceilometer import storage +from aodh.i18n import _LI +from aodh import service +from aodh import storage LOG = logging.getLogger(__name__) diff --git a/ceilometer/coordination.py b/aodh/coordination.py similarity index 98% rename from ceilometer/coordination.py rename to aodh/coordination.py index f5ef7a7d1..1b55e79bf 100644 --- a/ceilometer/coordination.py +++ b/aodh/coordination.py @@ -19,8 +19,8 @@ from oslo_config import cfg from oslo_log import log import tooz.coordination -from ceilometer.i18n import _LE, _LI -from ceilometer import utils +from aodh.i18n import _LE, _LI +from aodh import utils LOG = log.getLogger(__name__) diff --git a/ceilometer/hacking/__init__.py b/aodh/hacking/__init__.py similarity index 100% rename from ceilometer/hacking/__init__.py rename to aodh/hacking/__init__.py diff --git a/ceilometer/hacking/checks.py b/aodh/hacking/checks.py similarity index 89% rename from ceilometer/hacking/checks.py rename to aodh/hacking/checks.py index ce52a7c8d..9430e6a5c 100644 --- a/ceilometer/hacking/checks.py +++ b/aodh/hacking/checks.py @@ -15,14 +15,14 @@ """ Guidelines for writing new hacking checks - - Use only for Ceilometer specific tests. OpenStack general tests + - Use only for aodh specific tests. OpenStack general tests should be submitted to the common 'hacking' module. - Pick numbers in the range C3xx. Find the current test with the highest allocated number and then pick the next value. - Keep the test method code in the source file ordered based on the C3xx value. - List the new rule in the top level HACKING.rst file - - Add test cases for each new rule to ceilometer/tests/test_hacking.py + - Add test cases for each new rule to aodh/tests/test_hacking.py """ @@ -37,7 +37,7 @@ oslo_namespace_imports = re.compile( def check_oslo_namespace_imports(logical_line, physical_line, filename): # ignore openstack.common since they are not maintained by us - if 'ceilometer/openstack/common/' in filename: + if 'aodh/openstack/common/' in filename: return if re.match(oslo_namespace_imports, logical_line): diff --git a/ceilometer/i18n.py b/aodh/i18n.py similarity index 98% rename from ceilometer/i18n.py rename to aodh/i18n.py index d0a7d2548..b9b5de975 100644 --- a/ceilometer/i18n.py +++ b/aodh/i18n.py @@ -20,7 +20,7 @@ See http://docs.openstack.org/developer/oslo.i18n/usage.html import oslo_i18n -DOMAIN = 'ceilometer' +DOMAIN = 'aodh' _translators = oslo_i18n.TranslatorFactory(domain=DOMAIN) diff --git a/ceilometer/keystone_client.py b/aodh/keystone_client.py similarity index 90% rename from ceilometer/keystone_client.py rename to aodh/keystone_client.py index 239539a7e..1928bc306 100644 --- a/ceilometer/keystone_client.py +++ b/aodh/keystone_client.py @@ -17,8 +17,8 @@ from keystoneclient.v2_0 import client as ksclient from oslo_config import cfg -cfg.CONF.import_group('service_credentials', 'ceilometer.service') -cfg.CONF.import_opt('http_timeout', 'ceilometer.service') +cfg.CONF.import_group('service_credentials', 'aodh.service') +cfg.CONF.import_opt('http_timeout', 'aodh.service') def get_client(): diff --git a/ceilometer/messaging.py b/aodh/messaging.py similarity index 97% rename from ceilometer/messaging.py rename to aodh/messaging.py index a05cceb20..4cead5d51 100644 --- a/ceilometer/messaging.py +++ b/aodh/messaging.py @@ -52,7 +52,7 @@ class JsonPayloadSerializer(oslo_messaging.NoOpSerializer): def setup(): - oslo_messaging.set_transport_defaults('ceilometer') + oslo_messaging.set_transport_defaults('aodh') def get_transport(url=None, optional=False, cache=True): @@ -86,7 +86,7 @@ def cleanup(): def get_rpc_server(transport, topic, endpoint): """Return a configured oslo_messaging rpc server.""" - cfg.CONF.import_opt('host', 'ceilometer.service') + cfg.CONF.import_opt('host', 'aodh.service') target = oslo_messaging.Target(server=cfg.CONF.host, topic=topic) serializer = RequestContextSerializer(JsonPayloadSerializer()) return oslo_messaging.get_rpc_server(transport, target, diff --git a/ceilometer/openstack/__init__.py b/aodh/openstack/__init__.py similarity index 100% rename from ceilometer/openstack/__init__.py rename to aodh/openstack/__init__.py diff --git a/ceilometer/openstack/common/__init__.py b/aodh/openstack/common/__init__.py similarity index 100% rename from ceilometer/openstack/common/__init__.py rename to aodh/openstack/common/__init__.py diff --git a/ceilometer/openstack/common/_i18n.py b/aodh/openstack/common/_i18n.py similarity index 96% rename from ceilometer/openstack/common/_i18n.py rename to aodh/openstack/common/_i18n.py index 09b1152bc..67fe99c86 100644 --- a/ceilometer/openstack/common/_i18n.py +++ b/aodh/openstack/common/_i18n.py @@ -24,7 +24,7 @@ try: # repository. It is OK to have more than one translation function # using the same domain, since there will still only be one message # catalog. - _translators = oslo_i18n.TranslatorFactory(domain='ceilometer') + _translators = oslo_i18n.TranslatorFactory(domain='aodh') # The primary translation function using the well-known name "_" _ = _translators.primary diff --git a/ceilometer/openstack/common/fileutils.py b/aodh/openstack/common/fileutils.py similarity index 100% rename from ceilometer/openstack/common/fileutils.py rename to aodh/openstack/common/fileutils.py diff --git a/aodh/opts.py b/aodh/opts.py new file mode 100644 index 000000000..209f81f3b --- /dev/null +++ b/aodh/opts.py @@ -0,0 +1,45 @@ +# Copyright 2014 eNovance +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. +import itertools + +import aodh.alarm.notifier.rest +import aodh.alarm.rpc +import aodh.alarm.service +import aodh.api +import aodh.api.app +import aodh.api.controllers.v2.alarms +import aodh.coordination +import aodh.service +import aodh.storage + + +def list_opts(): + return [ + ('DEFAULT', + itertools.chain(aodh.api.app.OPTS, + aodh.service.OPTS, + aodh.storage.OLD_OPTS,)), + ('alarm', + itertools.chain(aodh.alarm.notifier.rest.OPTS, + aodh.alarm.service.OPTS, + aodh.alarm.rpc.OPTS, + aodh.alarm.evaluator.gnocchi.OPTS, + aodh.api.controllers.v2.alarms.ALARM_API_OPTS)), + ('api', + itertools.chain(aodh.api.OPTS, + aodh.api.app.API_OPTS,)), + ('coordination', aodh.coordination.OPTS), + ('database', aodh.storage.OPTS), + ('service_credentials', aodh.service.CLI_OPTS), + ] diff --git a/ceilometer/service.py b/aodh/service.py similarity index 93% rename from ceilometer/service.py rename to aodh/service.py index e92f69113..300f47eda 100644 --- a/ceilometer/service.py +++ b/aodh/service.py @@ -22,9 +22,9 @@ from oslo_config import cfg import oslo_i18n from oslo_log import log -from ceilometer.i18n import _ -from ceilometer import messaging -from ceilometer import utils +from aodh.i18n import _ +from aodh import messaging +from aodh import utils OPTS = [ @@ -47,7 +47,7 @@ cfg.CONF.register_opts(OPTS) CLI_OPTS = [ cfg.StrOpt('os-username', deprecated_group="DEFAULT", - default=os.environ.get('OS_USERNAME', 'ceilometer'), + default=os.environ.get('OS_USERNAME', 'aodh'), help='User name to use for OpenStack service access.'), cfg.StrOpt('os-password', deprecated_group="DEFAULT", @@ -111,6 +111,6 @@ def prepare_service(argv=None): log.set_defaults(default_log_levels=log_levels) if argv is None: argv = sys.argv - cfg.CONF(argv[1:], project='ceilometer', validate_default_values=True) - log.setup(cfg.CONF, 'ceilometer') + cfg.CONF(argv[1:], project='aodh', validate_default_values=True) + log.setup(cfg.CONF, 'aodh') messaging.setup() diff --git a/ceilometer/storage/__init__.py b/aodh/storage/__init__.py similarity index 98% rename from ceilometer/storage/__init__.py rename to aodh/storage/__init__.py index 6d4f30b48..82db5b8e1 100644 --- a/ceilometer/storage/__init__.py +++ b/aodh/storage/__init__.py @@ -22,7 +22,7 @@ import retrying import six.moves.urllib.parse as urlparse from stevedore import driver -from ceilometer import utils +from aodh import utils LOG = log.getLogger(__name__) @@ -98,7 +98,7 @@ def get_connection_from_config(conf, purpose='alarm'): if conf.database_connection: conf.set_override('connection', conf.database_connection, group='database') - namespace = 'ceilometer.%s.storage' % purpose + namespace = 'aodh.%s.storage' % purpose url = (getattr(conf.database, '%s_connection' % purpose) or conf.database.connection) return get_connection(url, namespace) diff --git a/ceilometer/storage/base.py b/aodh/storage/base.py similarity index 100% rename from ceilometer/storage/base.py rename to aodh/storage/base.py diff --git a/ceilometer/storage/hbase/__init__.py b/aodh/storage/hbase/__init__.py similarity index 100% rename from ceilometer/storage/hbase/__init__.py rename to aodh/storage/hbase/__init__.py diff --git a/ceilometer/storage/hbase/base.py b/aodh/storage/hbase/base.py similarity index 95% rename from ceilometer/storage/hbase/base.py rename to aodh/storage/hbase/base.py index 94eaacecf..0186b8bd5 100644 --- a/ceilometer/storage/hbase/base.py +++ b/aodh/storage/hbase/base.py @@ -18,8 +18,8 @@ from oslo_log import log from oslo_utils import netutils from six.moves.urllib import parse as urlparse -from ceilometer.i18n import _ -from ceilometer.storage.hbase import inmemory as hbase_inmemory +from aodh.i18n import _ +from aodh.storage.hbase import inmemory as hbase_inmemory LOG = log.getLogger(__name__) @@ -34,7 +34,7 @@ class Connection(object): opts = self._parse_connection_url(url) if opts['host'] == '__test__': - url = os.environ.get('CEILOMETER_TEST_HBASE_URL') + url = os.environ.get('AODH_TEST_HBASE_URL') if url: # Reparse URL, but from the env variable now opts = self._parse_connection_url(url) diff --git a/ceilometer/storage/hbase/inmemory.py b/aodh/storage/hbase/inmemory.py similarity index 97% rename from ceilometer/storage/hbase/inmemory.py rename to aodh/storage/hbase/inmemory.py index 767143d4e..214a70e04 100644 --- a/ceilometer/storage/hbase/inmemory.py +++ b/aodh/storage/hbase/inmemory.py @@ -20,8 +20,8 @@ import re from oslo_log import log import six -import ceilometer -from ceilometer.i18n import _ +import aodh +from aodh.i18n import _ LOG = log.getLogger(__name__) @@ -113,7 +113,7 @@ class MTable(object): # in case of multiple filters rows = m(fargs, rows) else: - raise ceilometer.NotImplementedError( + raise aodh.NotImplementedError( "%s filter is not implemented, " "you may want to add it!") for k in sorted(rows)[:limit]: @@ -198,7 +198,7 @@ class MTable(object): if g == row: r[row] = data else: - raise ceilometer.NotImplementedError( + raise aodh.NotImplementedError( "In-memory " "RowFilter doesn't support " "the %s operation yet" % op) @@ -235,7 +235,7 @@ class MTable(object): (is_regex and re.search(value, key))): r_data[key] = data[key] else: - raise ceilometer.NotImplementedError( + raise aodh.NotImplementedError( "In-memory QualifierFilter " "doesn't support the %s " "operation yet" % op) diff --git a/ceilometer/storage/hbase/migration.py b/aodh/storage/hbase/migration.py similarity index 96% rename from ceilometer/storage/hbase/migration.py rename to aodh/storage/hbase/migration.py index 1dd4511af..97525c5fe 100644 --- a/ceilometer/storage/hbase/migration.py +++ b/aodh/storage/hbase/migration.py @@ -14,7 +14,7 @@ """ -from ceilometer.storage.hbase import utils as hbase_utils +from aodh.storage.hbase import utils as hbase_utils def migrate_alarm_history_table(conn, table): diff --git a/ceilometer/storage/hbase/utils.py b/aodh/storage/hbase/utils.py similarity index 99% rename from ceilometer/storage/hbase/utils.py rename to aodh/storage/hbase/utils.py index 4cdf90ff4..9061aaf73 100644 --- a/ceilometer/storage/hbase/utils.py +++ b/aodh/storage/hbase/utils.py @@ -21,8 +21,8 @@ from happybase.hbase import ttypes from oslo_log import log import six -from ceilometer.i18n import _ -from ceilometer import utils +from aodh.i18n import _ +from aodh import utils LOG = log.getLogger(__name__) diff --git a/ceilometer/storage/mongo/__init__.py b/aodh/storage/mongo/__init__.py similarity index 100% rename from ceilometer/storage/mongo/__init__.py rename to aodh/storage/mongo/__init__.py diff --git a/ceilometer/storage/mongo/utils.py b/aodh/storage/mongo/utils.py similarity index 99% rename from ceilometer/storage/mongo/utils.py rename to aodh/storage/mongo/utils.py index 499d94414..82a37652d 100644 --- a/ceilometer/storage/mongo/utils.py +++ b/aodh/storage/mongo/utils.py @@ -26,7 +26,7 @@ from oslo_log import log from oslo_utils import netutils import pymongo -from ceilometer.i18n import _ +from aodh.i18n import _ LOG = log.getLogger(__name__) diff --git a/ceilometer/storage/sqlalchemy/__init__.py b/aodh/storage/sqlalchemy/__init__.py similarity index 100% rename from ceilometer/storage/sqlalchemy/__init__.py rename to aodh/storage/sqlalchemy/__init__.py diff --git a/ceilometer/storage/sqlalchemy/migration.py b/aodh/storage/sqlalchemy/migration.py similarity index 100% rename from ceilometer/storage/sqlalchemy/migration.py rename to aodh/storage/sqlalchemy/migration.py diff --git a/ceilometer/storage/sqlalchemy/models.py b/aodh/storage/sqlalchemy/models.py similarity index 95% rename from ceilometer/storage/sqlalchemy/models.py rename to aodh/storage/sqlalchemy/models.py index a3315252c..e09c23694 100644 --- a/ceilometer/storage/sqlalchemy/models.py +++ b/aodh/storage/sqlalchemy/models.py @@ -11,7 +11,7 @@ # under the License. """ -SQLAlchemy models for Ceilometer data. +SQLAlchemy models for aodh data. """ import json @@ -22,7 +22,7 @@ from sqlalchemy.dialects.mysql import DECIMAL from sqlalchemy.ext.declarative import declarative_base from sqlalchemy.types import TypeDecorator -from ceilometer import utils +from aodh import utils class JSONEncodedDict(TypeDecorator): @@ -72,8 +72,8 @@ class PreciseTimestamp(TypeDecorator): return value -class CeilometerBase(object): - """Base class for Ceilometer Models.""" +class AodhBase(object): + """Base class for Aodh Models.""" __table_args__ = {'mysql_charset': "utf8", 'mysql_engine': "InnoDB"} __table_initialized__ = False @@ -90,7 +90,7 @@ class CeilometerBase(object): setattr(self, k, v) -Base = declarative_base(cls=CeilometerBase) +Base = declarative_base(cls=AodhBase) class Alarm(Base): diff --git a/ceilometer/storage/sqlalchemy/utils.py b/aodh/storage/sqlalchemy/utils.py similarity index 100% rename from ceilometer/storage/sqlalchemy/utils.py rename to aodh/storage/sqlalchemy/utils.py diff --git a/ceilometer/tests/__init__.py b/aodh/tests/__init__.py similarity index 100% rename from ceilometer/tests/__init__.py rename to aodh/tests/__init__.py diff --git a/ceilometer/tests/alarm/__init__.py b/aodh/tests/alarm/__init__.py similarity index 100% rename from ceilometer/tests/alarm/__init__.py rename to aodh/tests/alarm/__init__.py diff --git a/ceilometer/tests/alarm/evaluator/__init__.py b/aodh/tests/alarm/evaluator/__init__.py similarity index 100% rename from ceilometer/tests/alarm/evaluator/__init__.py rename to aodh/tests/alarm/evaluator/__init__.py diff --git a/ceilometer/tests/alarm/evaluator/base.py b/aodh/tests/alarm/evaluator/base.py similarity index 96% rename from ceilometer/tests/alarm/evaluator/base.py rename to aodh/tests/alarm/evaluator/base.py index 6ba36727b..4a9a6ff38 100644 --- a/ceilometer/tests/alarm/evaluator/base.py +++ b/aodh/tests/alarm/evaluator/base.py @@ -12,7 +12,7 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. -"""Base class for tests in ceilometer/alarm/evaluator/ +"""Base class for tests in aodh/alarm/evaluator/ """ import mock from oslotest import base diff --git a/ceilometer/tests/alarm/evaluator/test_base.py b/aodh/tests/alarm/evaluator/test_base.py similarity index 98% rename from ceilometer/tests/alarm/evaluator/test_base.py rename to aodh/tests/alarm/evaluator/test_base.py index fd7258764..29b87d2ad 100644 --- a/ceilometer/tests/alarm/evaluator/test_base.py +++ b/aodh/tests/alarm/evaluator/test_base.py @@ -12,7 +12,7 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. -"""class for tests in ceilometer/alarm/evaluator/__init__.py +"""class for tests in aodh/alarm/evaluator/__init__.py """ import datetime @@ -20,7 +20,7 @@ import mock from oslo_utils import timeutils from oslotest import base -from ceilometer.alarm import evaluator +from aodh.alarm import evaluator class TestEvaluatorBaseClass(base.BaseTestCase): diff --git a/ceilometer/tests/alarm/evaluator/test_combination.py b/aodh/tests/alarm/evaluator/test_combination.py similarity index 98% rename from ceilometer/tests/alarm/evaluator/test_combination.py rename to aodh/tests/alarm/evaluator/test_combination.py index 4b4bcac04..607a9a03d 100644 --- a/ceilometer/tests/alarm/evaluator/test_combination.py +++ b/aodh/tests/alarm/evaluator/test_combination.py @@ -15,7 +15,7 @@ # License for the specific language governing permissions and limitations # under the License. -"""Tests for ceilometer/alarm/evaluator/combination.py +"""Tests for aodh/alarm/evaluator/combination.py """ import datetime @@ -27,10 +27,10 @@ import mock from oslo_utils import timeutils import pytz -from ceilometer.alarm.evaluator import combination -from ceilometer.alarm.storage import models -from ceilometer.tests.alarm.evaluator import base -from ceilometer.tests import constants +from aodh.alarm.evaluator import combination +from aodh.alarm.storage import models +from aodh.tests.alarm.evaluator import base +from aodh.tests import constants class TestEvaluate(base.TestEvaluatorBase): diff --git a/ceilometer/tests/alarm/evaluator/test_gnocchi.py b/aodh/tests/alarm/evaluator/test_gnocchi.py similarity index 98% rename from ceilometer/tests/alarm/evaluator/test_gnocchi.py rename to aodh/tests/alarm/evaluator/test_gnocchi.py index 5cefbc184..ed84b3831 100644 --- a/ceilometer/tests/alarm/evaluator/test_gnocchi.py +++ b/aodh/tests/alarm/evaluator/test_gnocchi.py @@ -25,10 +25,10 @@ import pytz import six from six import moves -from ceilometer.alarm.evaluator import gnocchi -from ceilometer.alarm.storage import models -from ceilometer.tests.alarm.evaluator import base -from ceilometer.tests import constants +from aodh.alarm.evaluator import gnocchi +from aodh.alarm.storage import models +from aodh.tests.alarm.evaluator import base +from aodh.tests import constants class FakeResponse(object): @@ -56,7 +56,7 @@ class TestGnocchiThresholdEvaluate(base.TestEvaluatorBase): self.useFixture(mockpatch.Patch('ceilometerclient.client.get_client', return_value=self.api_client)) self.requests = self.useFixture(mockpatch.Patch( - 'ceilometer.alarm.evaluator.gnocchi.requests')).mock + 'aodh.alarm.evaluator.gnocchi.requests')).mock def prepare_alarms(self): self.alarms = [ @@ -412,7 +412,7 @@ class TestGnocchiThresholdEvaluate(base.TestEvaluatorBase): self.assertEqual(expected, self.notifier.notify.call_args_list) @unittest.skipIf(six.PY3, - "the ceilometer base class is not python 3 ready") + "the aodh base class is not python 3 ready") @mock.patch.object(timeutils, 'utcnow') def test_no_state_change_outside_time_constraint(self, mock_utcnow): self._set_all_alarms('ok') diff --git a/ceilometer/tests/alarm/evaluator/test_threshold.py b/aodh/tests/alarm/evaluator/test_threshold.py similarity index 99% rename from ceilometer/tests/alarm/evaluator/test_threshold.py rename to aodh/tests/alarm/evaluator/test_threshold.py index 7e33b0748..91298419d 100644 --- a/ceilometer/tests/alarm/evaluator/test_threshold.py +++ b/aodh/tests/alarm/evaluator/test_threshold.py @@ -12,7 +12,7 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. -"""Tests for ceilometer/alarm/evaluator/threshold.py +"""Tests for aodh/alarm/evaluator/threshold.py """ import datetime import uuid @@ -25,10 +25,10 @@ from oslo_utils import timeutils import pytz from six import moves -from ceilometer.alarm.evaluator import threshold -from ceilometer.alarm.storage import models -from ceilometer.tests.alarm.evaluator import base -from ceilometer.tests import constants +from aodh.alarm.evaluator import threshold +from aodh.alarm.storage import models +from aodh.tests.alarm.evaluator import base +from aodh.tests import constants class TestEvaluate(base.TestEvaluatorBase): diff --git a/ceilometer/tests/alarm/test_alarm_svc.py b/aodh/tests/alarm/test_alarm_svc.py similarity index 97% rename from ceilometer/tests/alarm/test_alarm_svc.py rename to aodh/tests/alarm/test_alarm_svc.py index 256ab89d1..912daf99c 100644 --- a/ceilometer/tests/alarm/test_alarm_svc.py +++ b/aodh/tests/alarm/test_alarm_svc.py @@ -12,14 +12,14 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. -"""Tests for ceilometer.alarm.service.SingletonAlarmService. +"""Tests for aodh.alarm.service.SingletonAlarmService. """ import mock from oslo_config import fixture as fixture_config from stevedore import extension -from ceilometer.alarm import service -from ceilometer.tests import base as tests_base +from aodh.alarm import service +from aodh.tests import base as tests_base class TestAlarmEvaluationService(tests_base.BaseTestCase): diff --git a/ceilometer/tests/alarm/test_notifier.py b/aodh/tests/alarm/test_notifier.py similarity index 95% rename from ceilometer/tests/alarm/test_notifier.py rename to aodh/tests/alarm/test_notifier.py index d23a8990a..d3830fc07 100644 --- a/ceilometer/tests/alarm/test_notifier.py +++ b/aodh/tests/alarm/test_notifier.py @@ -21,9 +21,9 @@ from oslotest import mockpatch import requests import six.moves.urllib.parse as urlparse -from ceilometer import alarm as ceilometer_alarm -from ceilometer.alarm import service -from ceilometer.tests import base as tests_base +from aodh import alarm as aodh_alarm +from aodh.alarm import service +from aodh.tests import base as tests_base DATA_JSON = jsonutils.loads( @@ -71,7 +71,7 @@ class TestAlarmNotifier(tests_base.BaseTestCase): 'reason_data': {'fire': 'everywhere'} } self.service.notify_alarm(context.get_admin_context(), data) - notifications = ceilometer_alarm.NOTIFIERS['test'].obj.notifications + notifications = aodh_alarm.NOTIFIERS['test'].obj.notifications self.assertEqual(1, len(notifications)) self.assertEqual((urlparse.urlsplit(data['actions'][0]), data['alarm_id'], @@ -180,7 +180,7 @@ class TestAlarmNotifier(tests_base.BaseTestCase): self.assertEqual(DATA_JSON, jsonutils.loads(kwargs['data'])) def test_notify_alarm_rest_action_with_ssl_verify_disable(self): - action = 'https://host/action?ceilometer-alarm-ssl-verify=0' + action = 'https://host/action?aodh-alarm-ssl-verify=0' with mock.patch('eventlet.spawn_n', self._fake_spawn_n): with mock.patch.object(requests.Session, 'post') as poster: @@ -194,7 +194,7 @@ class TestAlarmNotifier(tests_base.BaseTestCase): self.assertEqual(DATA_JSON, jsonutils.loads(kwargs['data'])) def test_notify_alarm_rest_action_with_ssl_verify_enable_by_user(self): - action = 'https://host/action?ceilometer-alarm-ssl-verify=1' + action = 'https://host/action?aodh-alarm-ssl-verify=1' self.CONF.set_override("rest_notifier_ssl_verify", False, group='alarm') @@ -218,7 +218,7 @@ class TestAlarmNotifier(tests_base.BaseTestCase): with mock.patch('oslo_utils.netutils.urlsplit', self._fake_urlsplit): LOG = mock.MagicMock() - with mock.patch('ceilometer.alarm.service.LOG', LOG): + with mock.patch('aodh.alarm.service.LOG', LOG): self.service.notify_alarm( context.get_admin_context(), { @@ -230,7 +230,7 @@ class TestAlarmNotifier(tests_base.BaseTestCase): def test_notify_alarm_invalid_action(self): LOG = mock.MagicMock() - with mock.patch('ceilometer.alarm.service.LOG', LOG): + with mock.patch('aodh.alarm.service.LOG', LOG): self.service.notify_alarm( context.get_admin_context(), { diff --git a/ceilometer/tests/alarm/test_rpc.py b/aodh/tests/alarm/test_rpc.py similarity index 97% rename from ceilometer/tests/alarm/test_rpc.py rename to aodh/tests/alarm/test_rpc.py index f5027211e..867863c16 100644 --- a/ceilometer/tests/alarm/test_rpc.py +++ b/aodh/tests/alarm/test_rpc.py @@ -21,10 +21,10 @@ from ceilometerclient.v2 import alarms from oslo_config import fixture as fixture_config import six -from ceilometer.alarm import rpc as rpc_alarm -from ceilometer.alarm.storage import models -from ceilometer import messaging -from ceilometer.tests import base as tests_base +from aodh.alarm import rpc as rpc_alarm +from aodh.alarm.storage import models +from aodh import messaging +from aodh.tests import base as tests_base class FakeNotifier(object): diff --git a/ceilometer/tests/api/__init__.py b/aodh/tests/api/__init__.py similarity index 96% rename from ceilometer/tests/api/__init__.py rename to aodh/tests/api/__init__.py index 037cd390d..4b062fcc5 100644 --- a/ceilometer/tests/api/__init__.py +++ b/aodh/tests/api/__init__.py @@ -21,7 +21,7 @@ from oslo_policy import opts import pecan import pecan.testing -from ceilometer.tests import db as db_test_base +from aodh.tests import db as db_test_base OPT_GROUP_NAME = 'keystone_authtoken' cfg.CONF.import_group(OPT_GROUP_NAME, "keystonemiddleware.auth_token") @@ -45,15 +45,15 @@ class FunctionalTest(db_test_base.TestBase): self.CONF.set_override("auth_version", "v2.0", group=OPT_GROUP_NAME) self.CONF.set_override("policy_file", - self.path_get('etc/ceilometer/policy.json'), + self.path_get('etc/aodh/policy.json'), group='oslo_policy') self.app = self._make_app() def _make_app(self, enable_acl=False): self.config = { 'app': { - 'root': 'ceilometer.api.controllers.root.RootController', - 'modules': ['ceilometer.api'], + 'root': 'aodh.api.controllers.root.RootController', + 'modules': ['aodh.api'], 'enable_acl': enable_acl, }, 'wsme': { diff --git a/ceilometer/tests/api/test_app.py b/aodh/tests/api/test_app.py similarity index 94% rename from ceilometer/tests/api/test_app.py rename to aodh/tests/api/test_app.py index b11320417..a2d64e501 100644 --- a/ceilometer/tests/api/test_app.py +++ b/aodh/tests/api/test_app.py @@ -20,8 +20,8 @@ from oslo_config import cfg from oslo_config import fixture as fixture_config from oslo_log import log -from ceilometer.api import app -from ceilometer.tests import base +from aodh.api import app +from aodh.tests import base class TestApp(base.BaseTestCase): @@ -37,7 +37,7 @@ class TestApp(base.BaseTestCase): ff.return_value = None self.assertRaises(cfg.ConfigFilesNotFoundError, app.load_app) - @mock.patch('ceilometer.storage.get_connection_from_config', + @mock.patch('aodh.storage.get_connection_from_config', mock.MagicMock()) @mock.patch('pecan.make_app') def test_pecan_debug(self, mocked): diff --git a/ceilometer/tests/api/test_versions.py b/aodh/tests/api/test_versions.py similarity index 97% rename from ceilometer/tests/api/test_versions.py rename to aodh/tests/api/test_versions.py index 1bc21f25e..b76f72988 100644 --- a/ceilometer/tests/api/test_versions.py +++ b/aodh/tests/api/test_versions.py @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -from ceilometer.tests import api +from aodh.tests import api V2_MEDIA_TYPES = [ { diff --git a/ceilometer/tests/api/v2/__init__.py b/aodh/tests/api/v2/__init__.py similarity index 95% rename from ceilometer/tests/api/v2/__init__.py rename to aodh/tests/api/v2/__init__.py index 478febc0a..71bd7354e 100644 --- a/ceilometer/tests/api/v2/__init__.py +++ b/aodh/tests/api/v2/__init__.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from ceilometer.tests import api +from aodh.tests import api class FunctionalTest(api.FunctionalTest): diff --git a/ceilometer/tests/api/v2/test_acl_scenarios.py b/aodh/tests/api/v2/test_acl_scenarios.py similarity index 94% rename from ceilometer/tests/api/v2/test_acl_scenarios.py rename to aodh/tests/api/v2/test_acl_scenarios.py index c650e6bba..940c8460f 100644 --- a/ceilometer/tests/api/v2/test_acl_scenarios.py +++ b/aodh/tests/api/v2/test_acl_scenarios.py @@ -21,10 +21,10 @@ import json from oslo_utils import timeutils import webtest -from ceilometer.api import app -from ceilometer.tests import api as acl -from ceilometer.tests.api import v2 -from ceilometer.tests import db as tests_db +from aodh.api import app +from aodh.tests import api as acl +from aodh.tests.api import v2 +from aodh.tests import db as tests_db VALID_TOKEN = '4562138218392831' VALID_TOKEN2 = '4562138218392832' @@ -90,7 +90,7 @@ class TestAPIACL(v2.FunctionalTest, def _make_app(self): self.CONF.set_override("cache", "fake.cache", group=acl.OPT_GROUP_NAME) - file_name = self.path_get('etc/ceilometer/api_paste.ini') + file_name = self.path_get('etc/aodh/api_paste.ini') self.CONF.set_override("api_paste_config", file_name) return webtest.TestApp(app.load_app()) diff --git a/ceilometer/tests/api/v2/test_alarm_scenarios.py b/aodh/tests/api/v2/test_alarm_scenarios.py similarity index 99% rename from ceilometer/tests/api/v2/test_alarm_scenarios.py rename to aodh/tests/api/v2/test_alarm_scenarios.py index 6cd33fdec..d011b1179 100644 --- a/ceilometer/tests/api/v2/test_alarm_scenarios.py +++ b/aodh/tests/api/v2/test_alarm_scenarios.py @@ -25,11 +25,11 @@ import six from six import moves import six.moves.urllib.parse as urlparse -from ceilometer.alarm.storage import models -from ceilometer import messaging -from ceilometer.tests.api import v2 -from ceilometer.tests import constants -from ceilometer.tests import db as tests_db +from aodh.alarm.storage import models +from aodh import messaging +from aodh.tests.api import v2 +from aodh.tests import constants +from aodh.tests import db as tests_db class TestListEmptyAlarms(v2.FunctionalTest, @@ -2496,7 +2496,7 @@ class TestAlarms(v2.FunctionalTest, 'user_identity': '- - - - -', 'request_id': mock.ANY, 'user_domain': None}, - 'ceilometer.api', 'alarm.creation', + 'aodh.api', 'alarm.creation', PayloadMatcher(), mock.ANY) def test_alarm_sends_notification(self): @@ -2513,7 +2513,7 @@ class TestAlarms(v2.FunctionalTest, self.delete('/alarms/%s' % del_alarm_id, headers=self.auth_headers, status=204) get_notifier.assert_called_once_with(mock.ANY, - publisher_id='ceilometer.api') + publisher_id='aodh.api') calls = notifier.info.call_args_list self.assertEqual(1, len(calls)) args, _ = calls[0] @@ -2524,7 +2524,7 @@ class TestAlarms(v2.FunctionalTest, 'project_id', 'timestamp', 'type', 'user_id']).issubset(payload.keys())) - @mock.patch('ceilometer.keystone_client.get_client') + @mock.patch('aodh.keystone_client.get_client') def test_post_gnocchi_resources_alarm(self, __): json = { 'enabled': False, @@ -2593,7 +2593,7 @@ class TestAlarms(v2.FunctionalTest, self.assertEqual(1, len(alarms)) self._verify_alarm(json, alarms[0]) - @mock.patch('ceilometer.keystone_client.get_client') + @mock.patch('aodh.keystone_client.get_client') def test_post_gnocchi_metrics_alarm(self, __): json = { 'enabled': False, @@ -2626,7 +2626,7 @@ class TestAlarms(v2.FunctionalTest, self.assertEqual(1, len(alarms)) self._verify_alarm(json, alarms[0]) - @mock.patch('ceilometer.keystone_client.get_client') + @mock.patch('aodh.keystone_client.get_client') def test_post_gnocchi_aggregation_alarm_project_constraint(self, __): self.CONF.set_override('gnocchi_url', 'http://localhost:8041', group='alarms') diff --git a/ceilometer/tests/api/v2/test_app.py b/aodh/tests/api/v2/test_app.py similarity index 98% rename from ceilometer/tests/api/v2/test_app.py rename to aodh/tests/api/v2/test_app.py index cad39accc..86a012679 100644 --- a/ceilometer/tests/api/v2/test_app.py +++ b/aodh/tests/api/v2/test_app.py @@ -13,7 +13,7 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. -"""Test basic ceilometer-api app +"""Test basic aodh-api app """ import json @@ -21,8 +21,8 @@ import mock import six import wsme -from ceilometer import i18n -from ceilometer.tests.api import v2 +from aodh import i18n +from aodh.tests.api import v2 class TestApiMiddleware(v2.FunctionalTest): @@ -159,7 +159,7 @@ class TestApiMiddleware(v2.FunctionalTest): json.loads(body)['error_message'] ['faultstring']) - with mock.patch('ceilometer.api.controllers.' + with mock.patch('aodh.api.controllers.' 'v2.base.AlarmNotFound') as CustomErrorClass: CustomErrorClass.return_value = wsme.exc.ClientSideError( "untranslated_error", status_code=404) diff --git a/ceilometer/tests/api/v2/test_capabilities.py b/aodh/tests/api/v2/test_capabilities.py similarity index 93% rename from ceilometer/tests/api/v2/test_capabilities.py rename to aodh/tests/api/v2/test_capabilities.py index 537f63d8d..2da573de3 100644 --- a/ceilometer/tests/api/v2/test_capabilities.py +++ b/aodh/tests/api/v2/test_capabilities.py @@ -17,8 +17,8 @@ import testscenarios -from ceilometer.tests.api import v2 as tests_api -from ceilometer.tests import db as tests_db +from aodh.tests.api import v2 as tests_api +from aodh.tests import db as tests_db load_tests = testscenarios.load_tests_apply_scenarios diff --git a/ceilometer/tests/api/v2/test_complex_query.py b/aodh/tests/api/v2/test_complex_query.py similarity index 98% rename from ceilometer/tests/api/v2/test_complex_query.py rename to aodh/tests/api/v2/test_complex_query.py index 05cc61db0..40971763b 100644 --- a/ceilometer/tests/api/v2/test_complex_query.py +++ b/aodh/tests/api/v2/test_complex_query.py @@ -24,8 +24,8 @@ import mock from oslotest import base import wsme -from ceilometer.alarm.storage import models as alarm_models -from ceilometer.api.controllers.v2 import query +from aodh.alarm.storage import models as alarm_models +from aodh.api.controllers.v2 import query class FakeComplexQuery(query.ValidatedComplexQuery): diff --git a/ceilometer/tests/api/v2/test_complex_query_scenarios.py b/aodh/tests/api/v2/test_complex_query_scenarios.py similarity index 99% rename from ceilometer/tests/api/v2/test_complex_query_scenarios.py rename to aodh/tests/api/v2/test_complex_query_scenarios.py index 7fdff56ad..c078ea374 100644 --- a/ceilometer/tests/api/v2/test_complex_query_scenarios.py +++ b/aodh/tests/api/v2/test_complex_query_scenarios.py @@ -22,9 +22,9 @@ import datetime from oslo_utils import timeutils -from ceilometer.alarm.storage import models -from ceilometer.tests.api import v2 as tests_api -from ceilometer.tests import db as tests_db +from aodh.alarm.storage import models +from aodh.tests.api import v2 as tests_api +from aodh.tests import db as tests_db admin_header = {"X-Roles": "admin", diff --git a/ceilometer/tests/api/v2/test_query.py b/aodh/tests/api/v2/test_query.py similarity index 98% rename from ceilometer/tests/api/v2/test_query.py rename to aodh/tests/api/v2/test_query.py index 997a0f481..0aae249b8 100644 --- a/ceilometer/tests/api/v2/test_query.py +++ b/aodh/tests/api/v2/test_query.py @@ -23,11 +23,11 @@ from oslotest import base from oslotest import mockpatch import wsme -from ceilometer.alarm.storage import base as alarm_storage_base -from ceilometer.api.controllers.v2 import base as v2_base -from ceilometer.api.controllers.v2 import utils -from ceilometer import storage -from ceilometer.tests import base as tests_base +from aodh.alarm.storage import base as alarm_storage_base +from aodh.api.controllers.v2 import base as v2_base +from aodh.api.controllers.v2 import utils +from aodh import storage +from aodh.tests import base as tests_base class TestQuery(base.BaseTestCase): diff --git a/ceilometer/tests/api/v2/test_wsme_custom_type.py b/aodh/tests/api/v2/test_wsme_custom_type.py similarity index 94% rename from ceilometer/tests/api/v2/test_wsme_custom_type.py rename to aodh/tests/api/v2/test_wsme_custom_type.py index 1a3adc3f3..5e5fe4c29 100644 --- a/ceilometer/tests/api/v2/test_wsme_custom_type.py +++ b/aodh/tests/api/v2/test_wsme_custom_type.py @@ -15,7 +15,7 @@ from oslotest import base import wsme -from ceilometer.api.controllers.v2 import base as v2_base +from aodh.api.controllers.v2 import base as v2_base class TestWsmeCustomType(base.BaseTestCase): diff --git a/ceilometer/tests/base.py b/aodh/tests/base.py similarity index 95% rename from ceilometer/tests/base.py rename to aodh/tests/base.py index 8f5cd66ab..9716e2648 100644 --- a/ceilometer/tests/base.py +++ b/aodh/tests/base.py @@ -27,8 +27,8 @@ import six from testtools import testcase import webtest -import ceilometer -from ceilometer import messaging +import aodh +from aodh import messaging class BaseTestCase(base.BaseTestCase): @@ -36,7 +36,7 @@ class BaseTestCase(base.BaseTestCase): self.useFixture(oslo_messaging.conffixture.ConfFixture(conf)) conf.set_override("notification_driver", "messaging") if not exchange: - exchange = 'ceilometer' + exchange = 'aodh' conf.set_override("control_exchange", exchange) # NOTE(sileht): oslo.messaging fake driver uses time.sleep @@ -48,7 +48,7 @@ class BaseTestCase(base.BaseTestCase): # between each tests self.transport = messaging.get_transport("fake://", cache=False) self.useFixture(mockpatch.Patch( - 'ceilometer.messaging.get_transport', + 'aodh.messaging.get_transport', return_value=self.transport)) def assertTimestampEqual(self, first, second, msg=None): @@ -95,7 +95,7 @@ def _skip_decorator(func): def skip_if_not_implemented(*args, **kwargs): try: return func(*args, **kwargs) - except ceilometer.NotImplementedError as e: + except aodh.NotImplementedError as e: raise testcase.TestSkipped(six.text_type(e)) except webtest.app.AppError as e: if 'not implemented' in six.text_type(e): diff --git a/ceilometer/tests/constants.py b/aodh/tests/constants.py similarity index 100% rename from ceilometer/tests/constants.py rename to aodh/tests/constants.py diff --git a/ceilometer/tests/db.py b/aodh/tests/db.py similarity index 89% rename from ceilometer/tests/db.py rename to aodh/tests/db.py index 0700c1114..c0ac012d0 100644 --- a/ceilometer/tests/db.py +++ b/aodh/tests/db.py @@ -29,10 +29,10 @@ import sqlalchemy import testscenarios.testcase from testtools import testcase -from ceilometer import storage -from ceilometer.tests import base as test_base +from aodh import storage +from aodh.tests import base as test_base try: - from ceilometer.tests import mocks + from aodh.tests import mocks except ImportError: mocks = None # happybase module is not Python 3 compatible yet @@ -50,7 +50,7 @@ class MongoDbManager(fixtures.Fixture): message='.*you must provide a username and password.*') try: self.alarm_connection = storage.get_connection( - self.url, 'ceilometer.alarm.storage') + self.url, 'aodh.alarm.storage') except storage.StorageBadVersion as e: raise testcase.TestSkipped(six.text_type(e)) @@ -66,7 +66,7 @@ class SQLManager(fixtures.Fixture): def setUp(self): super(SQLManager, self).setUp() self.alarm_connection = storage.get_connection( - self.url, 'ceilometer.alarm.storage') + self.url, 'aodh.alarm.storage') @property def url(self): @@ -77,7 +77,7 @@ class PgSQLManager(SQLManager): def __init__(self, url): self._url = url - self._db_name = 'ceilometer_%s' % uuid.uuid4().hex + self._db_name = 'aodh_%s' % uuid.uuid4().hex self._engine = sqlalchemy.create_engine(self._url) self._conn = self._engine.connect() self._conn.connection.set_isolation_level(0) @@ -90,7 +90,7 @@ class MySQLManager(SQLManager): def __init__(self, url): self._url = url - self._db_name = 'ceilometer_%s' % uuid.uuid4().hex + self._db_name = 'aodh_%s' % uuid.uuid4().hex self._engine = sqlalchemy.create_engine( self._url.replace('template1', '')) self._conn = self._engine.connect() @@ -104,7 +104,7 @@ class HBaseManager(fixtures.Fixture): def setUp(self): super(HBaseManager, self).setUp() self.alarm_connection = storage.get_connection( - self.url, 'ceilometer.alarm.storage') + self.url, 'aodh.alarm.storage') # Unique prefix for each test to keep data is distinguished because # all test data is stored in one table data_prefix = str(uuid.uuid4().hex) @@ -129,7 +129,7 @@ class HBaseManager(fixtures.Fixture): def url(self): return '%s?table_prefix=%s' % ( self._url, - os.getenv("CEILOMETER_TEST_HBASE_TABLE_PREFIX", "test") + os.getenv("AODH_TEST_HBASE_TABLE_PREFIX", "test") ) @@ -141,7 +141,7 @@ class SQLiteManager(fixtures.Fixture): def setUp(self): super(SQLiteManager, self).setUp() self.alarm_connection = storage.get_connection( - self.url, 'ceilometer.alarm.storage') + self.url, 'aodh.alarm.storage') class TestBase(testscenarios.testcase.WithScenarios, test_base.BaseTestCase): @@ -170,7 +170,7 @@ class TestBase(testscenarios.testcase.WithScenarios, test_base.BaseTestCase): 'Test is not applicable for %s' % engine) self.CONF = self.useFixture(fixture_config.Config()).conf - self.CONF([], project='ceilometer', validate_default_values=True) + self.CONF([], project='aodh', validate_default_values=True) try: self.db_manager = self._get_driver_manager(engine)(self.db_url) @@ -181,7 +181,7 @@ class TestBase(testscenarios.testcase.WithScenarios, test_base.BaseTestCase): self.alarm_conn = self.db_manager.alarm_connection self.alarm_conn.upgrade() - self.useFixture(mockpatch.Patch('ceilometer.storage.get_connection', + self.useFixture(mockpatch.Patch('aodh.storage.get_connection', side_effect=self._get_connection)) def tearDown(self): @@ -228,10 +228,10 @@ class MixinTestsWithBackendScenarios(object): ] for db in ('MONGODB', 'MYSQL', 'PGSQL', 'HBASE', 'DB2', 'ES'): - if os.environ.get('CEILOMETER_TEST_%s_URL' % db): + if os.environ.get('AODH_TEST_%s_URL' % db): scenarios.append( (db.lower(), {'db_url': os.environ.get( - 'CEILOMETER_TEST_%s_URL' % db)})) + 'AODH_TEST_%s_URL' % db)})) scenarios_db = [db for db, _ in scenarios] @@ -243,6 +243,6 @@ class MixinTestsWithBackendScenarios(object): # Insert default value for db2 test if 'mongodb' in scenarios_db and 'db2' not in scenarios_db: scenarios.append( - ('db2', {'db_url': os.environ.get('CEILOMETER_TEST_MONGODB_URL', + ('db2', {'db_url': os.environ.get('AODH_TEST_MONGODB_URL', '').replace('mongodb://', 'db2://')})) diff --git a/ceilometer/tests/functional/__init__.py b/aodh/tests/functional/__init__.py similarity index 100% rename from ceilometer/tests/functional/__init__.py rename to aodh/tests/functional/__init__.py diff --git a/ceilometer/tests/functional/hooks/post_test_hook.sh b/aodh/tests/functional/hooks/post_test_hook.sh similarity index 85% rename from ceilometer/tests/functional/hooks/post_test_hook.sh rename to aodh/tests/functional/hooks/post_test_hook.sh index dce23bd56..28ce7b004 100644 --- a/ceilometer/tests/functional/hooks/post_test_hook.sh +++ b/aodh/tests/functional/hooks/post_test_hook.sh @@ -26,19 +26,19 @@ function generate_testr_results { fi } -export CEILOMETER_DIR="$BASE/new/ceilometer" +export AODH_DIR="$BASE/new/aodh" -# Go to the ceilometer dir -cd $CEILOMETER_DIR +# Go to the aodh dir +cd $AODH_DIR -sudo chown -R jenkins:stack $CEILOMETER_DIR +sudo chown -R jenkins:stack $AODH_DIR # Run tests -echo "Running ceilometer functional test suite" +echo "Running aodh functional test suite" set +e # NOTE(ityaptin) Expected a script param which contains a backend name -CEILOMETER_TEST_BACKEND="$1" sudo -E -H -u jenkins tox -efunctional +AODH_TEST_BACKEND="$1" sudo -E -H -u jenkins tox -efunctional EXIT_CODE=$? set -e diff --git a/ceilometer/tests/functional/test_empty.py b/aodh/tests/functional/test_empty.py similarity index 100% rename from ceilometer/tests/functional/test_empty.py rename to aodh/tests/functional/test_empty.py diff --git a/ceilometer/tests/gabbi/__init__.py b/aodh/tests/gabbi/__init__.py similarity index 100% rename from ceilometer/tests/gabbi/__init__.py rename to aodh/tests/gabbi/__init__.py diff --git a/ceilometer/tests/gabbi/fixtures.py b/aodh/tests/gabbi/fixtures.py similarity index 90% rename from ceilometer/tests/gabbi/fixtures.py rename to aodh/tests/gabbi/fixtures.py index a9f8a6f36..fcafb90f3 100644 --- a/ceilometer/tests/gabbi/fixtures.py +++ b/aodh/tests/gabbi/fixtures.py @@ -23,8 +23,8 @@ from gabbi import fixture from oslo_config import fixture as fixture_config from oslo_policy import opts -from ceilometer import service -from ceilometer import storage +from aodh import service +from aodh import storage # TODO(chdent): For now only MongoDB is supported, because of easy @@ -45,7 +45,7 @@ class ConfigFixture(fixture.GabbiFixture): db_url = None for engine in ENGINES: try: - db_url = os.environ['CEILOMETER_TEST_%s_URL' % engine] + db_url = os.environ['AODH_TEST_%s_URL' % engine] except KeyError: pass if db_url is None: @@ -56,7 +56,7 @@ class ConfigFixture(fixture.GabbiFixture): self.conf = conf opts.set_defaults(self.conf) conf.set_override('policy_file', - os.path.abspath('etc/ceilometer/policy.json'), + os.path.abspath('etc/aodh/policy.json'), group='oslo_policy') database_name = '%s-%s' % (db_url, str(uuid.uuid4())) diff --git a/ceilometer/tests/gabbi/gabbits/alarms.yaml b/aodh/tests/gabbi/gabbits/alarms.yaml similarity index 100% rename from ceilometer/tests/gabbi/gabbits/alarms.yaml rename to aodh/tests/gabbi/gabbits/alarms.yaml diff --git a/ceilometer/tests/gabbi/gabbits/basic.yaml b/aodh/tests/gabbi/gabbits/basic.yaml similarity index 100% rename from ceilometer/tests/gabbi/gabbits/basic.yaml rename to aodh/tests/gabbi/gabbits/basic.yaml diff --git a/ceilometer/tests/gabbi/gabbits/capabilities.yaml b/aodh/tests/gabbi/gabbits/capabilities.yaml similarity index 100% rename from ceilometer/tests/gabbi/gabbits/capabilities.yaml rename to aodh/tests/gabbi/gabbits/capabilities.yaml diff --git a/ceilometer/tests/gabbi/test_gabbi.py b/aodh/tests/gabbi/test_gabbi.py similarity index 87% rename from ceilometer/tests/gabbi/test_gabbi.py rename to aodh/tests/gabbi/test_gabbi.py index e4c256a8f..2bf1a59a8 100644 --- a/ceilometer/tests/gabbi/test_gabbi.py +++ b/aodh/tests/gabbi/test_gabbi.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -"""A test module to exercise the Ceilometer API with gabbi +"""A test module to exercise the aodh API with gabbi For the sake of exploratory development. """ @@ -22,8 +22,8 @@ import os from gabbi import driver -from ceilometer.api import app -from ceilometer.tests.gabbi import fixtures as fixture_module +from aodh.api import app +from aodh.tests.gabbi import fixtures as fixture_module TESTS_DIR = 'gabbits' diff --git a/ceilometer/tests/mocks.py b/aodh/tests/mocks.py similarity index 96% rename from ceilometer/tests/mocks.py rename to aodh/tests/mocks.py index f44682a44..48f11fad8 100644 --- a/ceilometer/tests/mocks.py +++ b/aodh/tests/mocks.py @@ -1,4 +1,4 @@ -# + # Licensed under the Apache License, Version 2.0 (the "License"); you may # not use this file except in compliance with the License. You may obtain # a copy of the License at @@ -23,8 +23,8 @@ class MockHBaseTable(happybase.Table): # in this test. It allows to divide data from different tests self.data_prefix = data_prefix # We create happybase Table with prefix from - # CEILOMETER_TEST_HBASE_TABLE_PREFIX - prefix = os.getenv("CEILOMETER_TEST_HBASE_TABLE_PREFIX", 'test') + # AODH_TEST_HBASE_TABLE_PREFIX + prefix = os.getenv("AODH_TEST_HBASE_TABLE_PREFIX", 'test') super(MockHBaseTable, self).__init__( "%s_%s" % (prefix, name), connection) diff --git a/ceilometer/tests/storage/__init__.py b/aodh/tests/storage/__init__.py similarity index 100% rename from ceilometer/tests/storage/__init__.py rename to aodh/tests/storage/__init__.py diff --git a/ceilometer/tests/storage/sqlalchemy/__init__.py b/aodh/tests/storage/sqlalchemy/__init__.py similarity index 100% rename from ceilometer/tests/storage/sqlalchemy/__init__.py rename to aodh/tests/storage/sqlalchemy/__init__.py diff --git a/ceilometer/tests/storage/sqlalchemy/test_models.py b/aodh/tests/storage/sqlalchemy/test_models.py similarity index 97% rename from ceilometer/tests/storage/sqlalchemy/test_models.py rename to aodh/tests/storage/sqlalchemy/test_models.py index 18cbd7686..2a60750be 100644 --- a/ceilometer/tests/storage/sqlalchemy/test_models.py +++ b/aodh/tests/storage/sqlalchemy/test_models.py @@ -21,8 +21,8 @@ import sqlalchemy from sqlalchemy.dialects.mysql import DECIMAL from sqlalchemy.types import NUMERIC -from ceilometer.storage.sqlalchemy import models -from ceilometer import utils +from aodh.storage.sqlalchemy import models +from aodh import utils class PreciseTimestampTest(base.BaseTestCase): diff --git a/ceilometer/tests/storage/test_get_connection.py b/aodh/tests/storage/test_get_connection.py similarity index 90% rename from ceilometer/tests/storage/test_get_connection.py rename to aodh/tests/storage/test_get_connection.py index 3f93b6d18..e87f74c7c 100644 --- a/ceilometer/tests/storage/test_get_connection.py +++ b/aodh/tests/storage/test_get_connection.py @@ -12,15 +12,15 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. -"""Tests for ceilometer/storage/ +"""Tests for aodh/storage/ """ import mock from oslo_config import fixture as fixture_config from oslotest import base import retrying -from ceilometer.alarm.storage import impl_log -from ceilometer import storage +from aodh.alarm.storage import impl_log +from aodh import storage import six @@ -28,13 +28,13 @@ import six class EngineTest(base.BaseTestCase): def test_get_connection(self): engine = storage.get_connection('log://localhost', - 'ceilometer.alarm.storage') + 'aodh.alarm.storage') self.assertIsInstance(engine, impl_log.Connection) def test_get_connection_no_such_engine(self): try: storage.get_connection('no-such-engine://localhost', - 'ceilometer.metering.storage') + 'aodh.metering.storage') except RuntimeError as err: self.assertIn('no-such-engine', six.text_type(err)) diff --git a/ceilometer/tests/storage/test_impl_db2.py b/aodh/tests/storage/test_impl_db2.py similarity index 86% rename from ceilometer/tests/storage/test_impl_db2.py rename to aodh/tests/storage/test_impl_db2.py index c57376cb6..129ff63ea 100644 --- a/ceilometer/tests/storage/test_impl_db2.py +++ b/aodh/tests/storage/test_impl_db2.py @@ -14,17 +14,17 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. -"""Tests for ceilometer/storage/impl_db2.py +"""Tests for aodh/storage/impl_db2.py .. note:: In order to run the tests against another MongoDB server set the - environment variable CEILOMETER_TEST_DB2_URL to point to a DB2 + environment variable aodh_TEST_DB2_URL to point to a DB2 server before running the tests. """ -from ceilometer.alarm.storage import impl_db2 -from ceilometer.tests import base as test_base +from aodh.alarm.storage import impl_db2 +from aodh.tests import base as test_base class CapabilitiesTest(test_base.BaseTestCase): diff --git a/ceilometer/tests/storage/test_impl_hbase.py b/aodh/tests/storage/test_impl_hbase.py similarity index 89% rename from ceilometer/tests/storage/test_impl_hbase.py rename to aodh/tests/storage/test_impl_hbase.py index 1d1f2be91..0046309fc 100644 --- a/ceilometer/tests/storage/test_impl_hbase.py +++ b/aodh/tests/storage/test_impl_hbase.py @@ -12,11 +12,11 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. -"""Tests for ceilometer/storage/impl_hbase.py +"""Tests for aodh/storage/impl_hbase.py .. note:: In order to run the tests against real HBase server set the environment - variable CEILOMETER_TEST_HBASE_URL to point to that HBase instance before + variable aodh_TEST_HBASE_URL to point to that HBase instance before running the tests. Make sure the Thrift server is running on that server. """ @@ -28,9 +28,9 @@ except ImportError: import testtools.testcase raise testtools.testcase.TestSkipped("happybase is needed") -from ceilometer.alarm.storage import impl_hbase -from ceilometer.tests import base as test_base -from ceilometer.tests import db as tests_db +from aodh.alarm.storage import impl_hbase +from aodh.tests import base as test_base +from aodh.tests import db as tests_db class ConnectionTest(tests_db.TestBase, diff --git a/ceilometer/tests/storage/test_impl_log.py b/aodh/tests/storage/test_impl_log.py similarity index 89% rename from ceilometer/tests/storage/test_impl_log.py rename to aodh/tests/storage/test_impl_log.py index b5c1e6d94..7ce7eae30 100644 --- a/ceilometer/tests/storage/test_impl_log.py +++ b/aodh/tests/storage/test_impl_log.py @@ -12,11 +12,11 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. -"""Tests for ceilometer/storage/impl_log.py +"""Tests for aodh/storage/impl_log.py """ from oslotest import base -from ceilometer.alarm.storage import impl_log +from aodh.alarm.storage import impl_log class ConnectionTest(base.BaseTestCase): diff --git a/ceilometer/tests/storage/test_impl_mongodb.py b/aodh/tests/storage/test_impl_mongodb.py similarity index 92% rename from ceilometer/tests/storage/test_impl_mongodb.py rename to aodh/tests/storage/test_impl_mongodb.py index cf757e3fb..8dc61de94 100644 --- a/ceilometer/tests/storage/test_impl_mongodb.py +++ b/aodh/tests/storage/test_impl_mongodb.py @@ -12,18 +12,18 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. -"""Tests for ceilometer/storage/impl_mongodb.py +"""Tests for aodh/storage/impl_mongodb.py .. note:: In order to run the tests against another MongoDB server set the - environment variable CEILOMETER_TEST_MONGODB_URL to point to a MongoDB + environment variable aodh_TEST_MONGODB_URL to point to a MongoDB server before running the tests. """ -from ceilometer.alarm.storage import impl_mongodb as impl_mongodb -from ceilometer.tests import base as test_base -from ceilometer.tests import db as tests_db +from aodh.alarm.storage import impl_mongodb as impl_mongodb +from aodh.tests import base as test_base +from aodh.tests import db as tests_db @tests_db.run_with('mongodb') diff --git a/ceilometer/tests/storage/test_impl_sqlalchemy.py b/aodh/tests/storage/test_impl_sqlalchemy.py similarity index 82% rename from ceilometer/tests/storage/test_impl_sqlalchemy.py rename to aodh/tests/storage/test_impl_sqlalchemy.py index ff9ad68c8..427297be5 100644 --- a/ceilometer/tests/storage/test_impl_sqlalchemy.py +++ b/aodh/tests/storage/test_impl_sqlalchemy.py @@ -9,17 +9,17 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. -"""Tests for ceilometer/storage/impl_sqlalchemy.py +"""Tests for aodh/storage/impl_sqlalchemy.py .. note:: In order to run the tests against real SQL server set the environment - variable CEILOMETER_TEST_SQL_URL to point to a SQL server before running + variable aodh_TEST_SQL_URL to point to a SQL server before running the tests. """ -from ceilometer.alarm.storage import impl_sqlalchemy as impl_sqla_alarm -from ceilometer.tests import base as test_base +from aodh.alarm.storage import impl_sqlalchemy as impl_sqla_alarm +from aodh.tests import base as test_base class CapabilitiesTest(test_base.BaseTestCase): diff --git a/ceilometer/tests/storage/test_storage_scenarios.py b/aodh/tests/storage/test_storage_scenarios.py similarity index 99% rename from ceilometer/tests/storage/test_storage_scenarios.py rename to aodh/tests/storage/test_storage_scenarios.py index 1015ac8e2..501f5d0dc 100644 --- a/ceilometer/tests/storage/test_storage_scenarios.py +++ b/aodh/tests/storage/test_storage_scenarios.py @@ -20,9 +20,9 @@ import datetime import mock from oslo_utils import timeutils -from ceilometer.alarm.storage import models as alarm_models -from ceilometer.tests import constants -from ceilometer.tests import db as tests_db +from aodh.alarm.storage import models as alarm_models +from aodh.tests import constants +from aodh.tests import db as tests_db class DBTestBase(tests_db.TestBase): diff --git a/ceilometer/tests/test_bin.py b/aodh/tests/test_bin.py similarity index 86% rename from ceilometer/tests/test_bin.py rename to aodh/tests/test_bin.py index ca257bcee..ca20f0bc2 100644 --- a/ceilometer/tests/test_bin.py +++ b/aodh/tests/test_bin.py @@ -24,8 +24,8 @@ import time import httplib2 import six -from ceilometer.openstack.common import fileutils -from ceilometer.tests import base +from aodh.openstack.common import fileutils +from aodh.tests import base class BinTestCase(base.BaseTestCase): @@ -38,7 +38,7 @@ class BinTestCase(base.BaseTestCase): if six.PY3: content = content.encode('utf-8') self.tempfile = fileutils.write_to_tempfile(content=content, - prefix='ceilometer', + prefix='aodh', suffix='.conf') def tearDown(self): @@ -46,12 +46,12 @@ class BinTestCase(base.BaseTestCase): os.remove(self.tempfile) def test_dbsync_run(self): - subp = subprocess.Popen(['ceilometer-dbsync', + subp = subprocess.Popen(['aodh-dbsync', "--config-file=%s" % self.tempfile]) self.assertEqual(0, subp.wait()) def test_run_expirer_ttl_disabled(self): - subp = subprocess.Popen(['ceilometer-expirer', + subp = subprocess.Popen(['aodh-expirer', '-d', "--config-file=%s" % self.tempfile], stderr=subprocess.PIPE) @@ -69,9 +69,9 @@ class BinTestCase(base.BaseTestCase): if six.PY3: content = content.encode('utf-8') self.tempfile = fileutils.write_to_tempfile(content=content, - prefix='ceilometer', + prefix='aodh', suffix='.conf') - subp = subprocess.Popen(['ceilometer-expirer', + subp = subprocess.Popen(['aodh-expirer', '-d', "--config-file=%s" % self.tempfile], stderr=subprocess.PIPE) @@ -91,18 +91,18 @@ class BinApiTestCase(base.BaseTestCase): content = ("[pipeline:main]\n" "pipeline = api-server\n" "[app:api-server]\n" - "paste.app_factory = ceilometer.api.app:app_factory\n") + "paste.app_factory = aodh.api.app:app_factory\n") if six.PY3: content = content.encode('utf-8') self.paste = fileutils.write_to_tempfile(content=content, prefix='api_paste', suffix='.ini') - # create ceilometer.conf file + # create aodh.conf file self.api_port = random.randint(10000, 11000) self.http = httplib2.Http(proxy_info=None) - self.pipeline_cfg_file = self.path_get('etc/ceilometer/pipeline.yaml') - self.policy_file = self.path_get('etc/ceilometer/policy.json') + self.pipeline_cfg_file = self.path_get('etc/aodh/pipeline.yaml') + self.policy_file = self.path_get('etc/aodh/policy.json') def tearDown(self): super(BinApiTestCase, self).tearDown() @@ -131,14 +131,14 @@ class BinApiTestCase(base.BaseTestCase): content = content.encode('utf-8') self.tempfile = fileutils.write_to_tempfile(content=content, - prefix='ceilometer', + prefix='aodh', suffix='.conf') if err_pipe: - return subprocess.Popen(['ceilometer-api', + return subprocess.Popen(['aodh-api', "--config-file=%s" % self.tempfile], stderr=subprocess.PIPE) else: - return subprocess.Popen(['ceilometer-api', + return subprocess.Popen(['aodh-api', "--config-file=%s" % self.tempfile]) def test_v2(self): diff --git a/ceilometer/tests/test_coordination.py b/aodh/tests/test_coordination.py similarity index 98% rename from ceilometer/tests/test_coordination.py rename to aodh/tests/test_coordination.py index 06158d63a..20220a752 100644 --- a/ceilometer/tests/test_coordination.py +++ b/aodh/tests/test_coordination.py @@ -19,9 +19,9 @@ import mock from oslo_config import fixture as fixture_config import tooz.coordination -from ceilometer import coordination -from ceilometer.tests import base -from ceilometer import utils +from aodh import coordination +from aodh.tests import base +from aodh import utils class MockToozCoordinator(object): diff --git a/ceilometer/tests/test_hacking.py b/aodh/tests/test_hacking.py similarity index 94% rename from ceilometer/tests/test_hacking.py rename to aodh/tests/test_hacking.py index cda4c5986..5335ddfab 100644 --- a/ceilometer/tests/test_hacking.py +++ b/aodh/tests/test_hacking.py @@ -18,13 +18,13 @@ import mock import pep8 from testtools import testcase -from ceilometer.hacking import checks +from aodh.hacking import checks class HackingTestCase(testcase.TestCase): - """Test cases for ceilometer specific hacking rules. + """Test cases for aodh specific hacking rules. - This class tests the hacking checks in ceilometer.hacking.checks by + This class tests the hacking checks in aodh.hacking.checks by passing strings to the check methods like the pep8/flake8 parser would. The parser loops over each line in the file and then passes the parameters to the check method. The parameter names in the check method dictate what @@ -86,4 +86,4 @@ class HackingTestCase(testcase.TestCase): expected_errors=[(1, 0, "C300")]) self._assert_has_errors( code, checks.check_oslo_namespace_imports, - filename="ceilometer/openstack/common/xyz.py") + filename="aodh/openstack/common/xyz.py") diff --git a/ceilometer/tests/test_messaging.py b/aodh/tests/test_messaging.py similarity index 98% rename from ceilometer/tests/test_messaging.py rename to aodh/tests/test_messaging.py index 785957626..b3ee5c78e 100644 --- a/ceilometer/tests/test_messaging.py +++ b/aodh/tests/test_messaging.py @@ -16,7 +16,7 @@ from oslo_config import fixture as fixture_config import oslo_messaging.conffixture from oslotest import base -from ceilometer import messaging +from aodh import messaging class MessagingTests(base.BaseTestCase): diff --git a/ceilometer/tests/test_utils.py b/aodh/tests/test_utils.py similarity index 98% rename from ceilometer/tests/test_utils.py rename to aodh/tests/test_utils.py index 8420bc9e0..c4322b450 100644 --- a/ceilometer/tests/test_utils.py +++ b/aodh/tests/test_utils.py @@ -13,14 +13,14 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. -"""Tests for ceilometer/utils.py +"""Tests for aodh/utils.py """ import datetime import decimal from oslotest import base -from ceilometer import utils +from aodh import utils class TestUtils(base.BaseTestCase): diff --git a/ceilometer/utils.py b/aodh/utils.py similarity index 100% rename from ceilometer/utils.py rename to aodh/utils.py diff --git a/ceilometer/opts.py b/ceilometer/opts.py deleted file mode 100644 index a74a9fd15..000000000 --- a/ceilometer/opts.py +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 2014 eNovance -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. -import itertools - -import ceilometer.alarm.notifier.rest -import ceilometer.alarm.rpc -import ceilometer.alarm.service -import ceilometer.api -import ceilometer.api.app -import ceilometer.api.controllers.v2.alarms -import ceilometer.coordination -import ceilometer.service -import ceilometer.storage - - -def list_opts(): - return [ - ('DEFAULT', - itertools.chain(ceilometer.api.app.OPTS, - ceilometer.service.OPTS, - ceilometer.storage.OLD_OPTS,)), - ('alarm', - itertools.chain(ceilometer.alarm.notifier.rest.OPTS, - ceilometer.alarm.service.OPTS, - ceilometer.alarm.rpc.OPTS, - ceilometer.alarm.evaluator.gnocchi.OPTS, - ceilometer.api.controllers.v2.alarms.ALARM_API_OPTS)), - ('api', - itertools.chain(ceilometer.api.OPTS, - ceilometer.api.app.API_OPTS,)), - ('coordination', ceilometer.coordination.OPTS), - ('database', ceilometer.storage.OPTS), - ('service_credentials', ceilometer.service.CLI_OPTS), - ] diff --git a/ceilometer/storage/sqlalchemy/migrate_repo/versions/043_reduce_uuid_data_types.py b/ceilometer/storage/sqlalchemy/migrate_repo/versions/043_reduce_uuid_data_types.py deleted file mode 100644 index 75638418a..000000000 --- a/ceilometer/storage/sqlalchemy/migrate_repo/versions/043_reduce_uuid_data_types.py +++ /dev/null @@ -1,37 +0,0 @@ -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -from sqlalchemy import MetaData -from sqlalchemy import String -from sqlalchemy import Table - - -def upgrade(migrate_engine): - meta = MetaData(bind=migrate_engine) - resource = Table('resource', meta, autoload=True) - resource.c.user_id.alter(type=String(128)) - resource.c.project_id.alter(type=String(128)) - resource.c.resource_id.alter(type=String(128)) - resource.c.source_id.alter(type=String(128)) - sample = Table('sample', meta, autoload=True) - sample.c.message_signature.alter(type=String(64)) - sample.c.message_id.alter(type=String(128)) - alarm = Table('alarm', meta, autoload=True) - alarm.c.alarm_id.alter(type=String(128)) - alarm.c.user_id.alter(type=String(128)) - alarm.c.project_id.alter(type=String(128)) - alarm_history = Table('alarm_history', meta, autoload=True) - alarm_history.c.alarm_id.alter(type=String(128)) - alarm_history.c.user_id.alter(type=String(128)) - alarm_history.c.project_id.alter(type=String(128)) - alarm_history.c.event_id.alter(type=String(128)) - alarm_history.c.on_behalf_of.alter(type=String(128)) diff --git a/doc/source/architecture.rst b/doc/source/architecture.rst index 703f3d650..9be6e572d 100644 --- a/doc/source/architecture.rst +++ b/doc/source/architecture.rst @@ -15,7 +15,7 @@ High-Level Architecture ======================= -Each of Ceilometer's services are designed to scale horizontally. Additional +Each of Aodh's services are designed to scale horizontally. Additional workers and nodes can be added depending on the expected load. It provides daemons to evaluate and notify based on defined alarming rules. @@ -25,13 +25,13 @@ Evaluating the data Alarming Service ---------------- -The alarming component of Ceilometer, first delivered in the Havana +The alarming component of Aodh, first delivered in the Havana version, allows you to set alarms based on threshold evaluation for a collection of samples. An alarm can be set on a single meter, or on a combination. For example, you may want to trigger an alarm when the memory consumption reaches 70% on a given instance if the instance has been up for more than 10 min. To setup an alarm, you will call -:ref:`Ceilometer's API server ` specifying the alarm conditions and +:ref:`Aodh's API server ` specifying the alarm conditions and an action to take. Of course, if you are not administrator of the cloud itself, you can only set diff --git a/doc/source/conf.py b/doc/source/conf.py index 511647d44..2ea30c4c4 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -1,5 +1,5 @@ # -# Ceilometer documentation build configuration file, created by +# Aodh documentation build configuration file, created by # sphinx-quickstart on Thu Oct 27 11:38:59 2011. # # This file is execfile()d with the current directory set to its @@ -48,10 +48,9 @@ def write_autodoc_index(): return modlist RSTDIR = os.path.abspath(os.path.join(BASE_DIR, "sourcecode")) - SRCS = {'ceilometer': ROOT} + SRCS = {'aodh': ROOT} - EXCLUDED_MODULES = ('ceilometer.tests', - 'ceilometer.storage.sqlalchemy.migrate_repo') + EXCLUDED_MODULES = ('aodh.tests') CURRENT_SOURCES = {} if not(os.path.exists(RSTDIR)): @@ -171,7 +170,7 @@ source_suffix = '.rst' master_doc = 'index' # General information about the project. -project = u'Ceilometer' +project = u'Aodh' copyright = u'2012-2015, OpenStack Foundation' # The language for content autogenerated by Sphinx. Refer to documentation @@ -295,7 +294,7 @@ html_last_updated_fmt = os.popen(git_cmd).read() #html_file_suffix = None # Output file base name for HTML help builder. -htmlhelp_basename = 'Ceilometerdoc' +htmlhelp_basename = 'Aodhdoc' # -- Options for LaTeX output ------------------------------------------------- @@ -315,7 +314,7 @@ latex_elements = { # (source start file, target name, title, author, documentclass # [howto/manual]). latex_documents = [ - ('index', 'Ceilometer.tex', u'Ceilometer Documentation', + ('index', 'Aodh.tex', u'Aodh Documentation', u'OpenStack Foundation', 'manual'), ] @@ -345,7 +344,7 @@ latex_documents = [ # One entry per manual page. List of tuples # (source start file, name, description, authors, manual section). man_pages = [ - ('index', 'ceilometer', u'Ceilometer Documentation', + ('index', 'aodh', u'Aodh Documentation', [u'OpenStack'], 1) ] @@ -359,8 +358,8 @@ man_pages = [ # (source start file, target name, title, author, # dir menu entry, description, category) texinfo_documents = [ - ('index', 'Ceilometer', u'Ceilometer Documentation', u'OpenStack', - 'Ceilometer', 'One line description of project.', 'Miscellaneous'), + ('index', 'Aodh', u'Aodh Documentation', u'OpenStack', + 'Aodh', 'One line description of project.', 'Miscellaneous'), ] # Documents to append as an appendix to all manuals. @@ -376,7 +375,7 @@ texinfo_documents = [ # -- Options for Epub output -------------------------------------------------- # Bibliographic Dublin Core info. -epub_title = u'Ceilometer' +epub_title = u'Aodh' epub_author = u'OpenStack' epub_publisher = u'OpenStack' epub_copyright = u'2012-2015, OpenStack' diff --git a/doc/source/configuration.rst b/doc/source/configuration.rst index 33b9e8554..686bd9c2d 100644 --- a/doc/source/configuration.rst +++ b/doc/source/configuration.rst @@ -17,7 +17,7 @@ Configuration Options ======================= -For the list and description of configuration options that can be set for Ceilometer in +For the list and description of configuration options that can be set for Aodh in order to set up the services please see the `Telemetry section `_ in the OpenStack Manuals Configuration Reference. @@ -56,7 +56,7 @@ To find out more about supported storage backends please take a look on the .. note:: If you are changing the configuration on the fly to use HBase, as a storage - backend, you will need to restart the Ceilometer services that use the + backend, you will need to restart the Aodh services that use the database to allow the changes to take affect, i.e. the collector and API services. diff --git a/doc/source/contributing.rst b/doc/source/contributing.rst index d41001252..5f4c343d4 100644 --- a/doc/source/contributing.rst +++ b/doc/source/contributing.rst @@ -13,12 +13,12 @@ .. _contributing: -============================ - Contributing to Ceilometer -============================ +====================== + Contributing to Aodh +====================== -Ceilometer follows the same workflow as other OpenStack projects. To start -contributing to Ceilometer, please follow the workflow found here_. +Aodh follows the same workflow as other OpenStack projects. To start +contributing to Aodh, please follow the workflow found here_. .. _here: https://wiki.openstack.org/wiki/Gerrit_Workflow @@ -26,8 +26,7 @@ contributing to Ceilometer, please follow the workflow found here_. Project Hosting Details ======================= -:Bug tracker: http://launchpad.net/ceilometer -:Mailing list: http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-dev (prefix subjects with ``[Ceilometer]`` for faster responses) -:Wiki: http://wiki.openstack.org/wiki/Ceilometer -:Code Hosting: https://git.openstack.org/cgit/openstack/ceilometer/ -:Code Review: https://review.openstack.org/#/q/status:open+project:openstack/ceilometer,n,z +:Bug tracker: http://launchpad.net/aodh +:Mailing list: http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-dev (prefix subjects with ``[Aodh]`` for faster responses) +:Code Hosting: https://git.openstack.org/cgit/openstack/aodh/ +:Code Review: https://review.openstack.org/#/q/status:open+project:openstack/aodh,n,z diff --git a/doc/source/glossary.rst b/doc/source/glossary.rst index 0bba98fa5..de3d43e07 100644 --- a/doc/source/glossary.rst +++ b/doc/source/glossary.rst @@ -24,7 +24,7 @@ An action triggered whenever a meter reaches a certain threshold. API server - HTTP REST API service for ceilometer. + HTTP REST API service for Aodh. ceilometer From Wikipedia [#]_: diff --git a/doc/source/index.rst b/doc/source/index.rst index a361a6011..fabaf0353 100644 --- a/doc/source/index.rst +++ b/doc/source/index.rst @@ -13,17 +13,17 @@ License for the specific language governing permissions and limitations under the License. -================================================== -Welcome to the Ceilometer developer documentation! -================================================== +============================================ +Welcome to the Aodh developer documentation! +============================================ What is the purpose of the project and vision for it? ===================================================== * Provide alarms and notifications based on metrics. -This documentation offers information on how Ceilometer works and how to -contribute to the project. +This documentation offers information on how Aodh works and how to contribute +to the project. Overview ======== diff --git a/doc/source/install/development.rst b/doc/source/install/development.rst index b1abc3b2d..67f3a8385 100644 --- a/doc/source/install/development.rst +++ b/doc/source/install/development.rst @@ -36,18 +36,18 @@ Configuring devstack `_ or `devstack configuration `_. -3. The ceilometer services are not enabled by default, so they must be +3. The aodh services are not enabled by default, so they must be enabled in ``local.conf`` before running ``stack.sh``. This example ``local.conf`` file shows all of the settings required for - ceilometer:: + aodh:: [[local|localrc]] - # Enable the ceilometer alarming services - enable_service ceilometer-alarm-evaluator,ceilometer-alarm-notifier + # Enable the aodh alarming services + enable_service aodh-alarm-evaluator,aodh-alarm-notifier - The first group of daemons are necessary for core ceilometer functionality: + The first group of daemons are necessary for core aodh functionality: polling, event listening, and data collection. .. _devstack: http://www.devstack.org/ diff --git a/doc/source/install/index.rst b/doc/source/install/index.rst index 35fb70754..77ed7ebe8 100644 --- a/doc/source/install/index.rst +++ b/doc/source/install/index.rst @@ -15,9 +15,9 @@ .. _install: -======================= - Installing Ceilometer -======================= +================= + Installing Aodh +================= .. toctree:: :maxdepth: 2 diff --git a/doc/source/install/manual.rst b/doc/source/install/manual.rst index a9b15c9f8..838ee1a3f 100644 --- a/doc/source/install/manual.rst +++ b/doc/source/install/manual.rst @@ -26,7 +26,7 @@ Storage Backend Installation This step is a prerequisite for the collector, notification agent and API services. You may use one of the listed database backends below to store -Ceilometer data. +Aodh data. .. note:: Please notice, MongoDB (and some other backends like DB2 and HBase) @@ -38,17 +38,17 @@ Ceilometer data. MongoDB ------- - The recommended Ceilometer storage backend is `MongoDB`. Follow the + The recommended Aodh storage backend is `MongoDB`. Follow the instructions to install the MongoDB_ package for your operating system, then start the service. The required minimum version of MongoDB is 2.4. To use MongoDB as the storage backend, change the 'database' section in - ceilometer.conf as follows:: + aodh.conf as follows:: [database] - connection = mongodb://username:password@host:27017/ceilometer + connection = mongodb://username:password@host:27017/aodh - If MongoDB is configured in replica set mode, add param in ceilometer.conf + If MongoDB is configured in replica set mode, add param in aodh.conf to use MongoReplicaSetClient:: [database] @@ -60,16 +60,16 @@ SQLalchemy-supported DBs You may alternatively use `MySQL` (or any other SQLAlchemy-supported DB like `PostgreSQL`). - In case of SQL-based database backends, you need to create a `ceilometer` + In case of SQL-based database backends, you need to create a `aodh` database first and then initialise it by running:: - ceilometer-dbsync + aodh-dbsync To use MySQL as the storage backend, change the 'database' section in - ceilometer.conf as follows:: + aodh.conf as follows:: [database] - connection = mysql+pymysql://username:password@host/ceilometer?charset=utf8 + connection = mysql+pymysql://username:password@host/aodh?charset=utf8 HBase ----- @@ -99,7 +99,7 @@ HBase family for each one. To use HBase as the storage backend, change the 'database' section in - ceilometer.conf as follows:: + aodh.conf as follows:: [database] connection = hbase://hbase-thrift-host:9090 @@ -110,10 +110,10 @@ DB2 DB2 installation should follow fresh IBM DB2 NoSQL installation docs. To use DB2 as the storage backend, change the 'database' section in - ceilometer.conf as follows:: + aodh.conf as follows:: [database] - connection = db2://username:password@host:27017/ceilometer + connection = db2://username:password@host:27017/aodh .. _HappyBase: http://happybase.readthedocs.org/en/latest/index.html# diff --git a/doc/source/install/mod_wsgi.rst b/doc/source/install/mod_wsgi.rst index 744e66261..b3dd79ed4 100644 --- a/doc/source/install/mod_wsgi.rst +++ b/doc/source/install/mod_wsgi.rst @@ -17,23 +17,23 @@ Installing the API behind mod_wsgi =================================== -Ceilometer comes with a few example files for configuring the API +Aodh comes with a few example files for configuring the API service to run behind Apache with ``mod_wsgi``. app.wsgi ======== -The file ``ceilometer/api/app.wsgi`` sets up the V2 API WSGI -application. The file is installed with the rest of the ceilometer +The file ``aodh/api/app.wsgi`` sets up the V2 API WSGI +application. The file is installed with the rest of the Aodh application code, and should not need to be modified. -etc/apache2/ceilometer -====================== +etc/apache2/aodh +================ -The ``etc/apache2/ceilometer`` file contains example settings that -work with a copy of ceilometer installed via devstack. +The ``etc/apache2/aodh`` file contains example settings that +work with a copy of Aodh installed via devstack. -.. literalinclude:: ../../../etc/apache2/ceilometer +.. literalinclude:: ../../../etc/apache2/aodh 1. On deb-based systems copy or symlink the file to ``/etc/apache2/sites-available``. For rpm-based systems the file will go in @@ -41,11 +41,11 @@ work with a copy of ceilometer installed via devstack. 2. Modify the ``WSGIDaemonProcess`` directive to set the ``user`` and ``group`` values to a appropriate user on your server. In many - installations ``ceilometer`` will be correct. + installations ``aodh`` will be correct. -3. Enable the ceilometer site. On deb-based systems:: +3. Enable the Aodh site. On deb-based systems:: - $ a2ensite ceilometer + $ a2ensite aodh $ service apache2 reload On rpm-based systems:: @@ -56,11 +56,11 @@ work with a copy of ceilometer installed via devstack. Limitation ========== -As Ceilometer is using Pecan and Pecan's DebugMiddleware doesn't support +As Aodh is using Pecan and Pecan's DebugMiddleware doesn't support multiple processes, there is no way to set debug mode in the multiprocessing case. To allow multiple processes the DebugMiddleware may be turned off by setting ``pecan_debug`` to ``False`` in the ``api`` section of -``ceilometer.conf``. +``aodh.conf``. For other WSGI setup you can refer to the `pecan deployment`_ documentation. .. _`pecan deployment`: http://pecan.readthedocs.org/en/latest/deployment.html#deployment diff --git a/doc/source/testing.rst b/doc/source/testing.rst index a87cd38c2..de7ccf0b9 100644 --- a/doc/source/testing.rst +++ b/doc/source/testing.rst @@ -17,7 +17,7 @@ Running the Tests ================= -Ceilometer includes an extensive set of automated unit tests which are +Aodh includes an extensive set of automated unit tests which are run through tox_. 1. Install ``tox``:: @@ -37,11 +37,11 @@ run through tox_. 3. Install the test dependencies:: - $ sudo pip install -r /opt/stack/ceilometer/test-requirements.txt + $ sudo pip install -r /opt/stack/aodh/test-requirements.txt 4. Run the unit and code-style tests:: - $ cd /opt/stack/ceilometer + $ cd /opt/stack/aodh $ tox -e py27,pep8 As tox is a wrapper around testr, it also accepts the same flags as testr. @@ -57,20 +57,20 @@ run through tox_. environment. Here's an example, passing the name of a test since you'll normally only want to run the test that hits your breakpoint:: - $ tox -e debug ceilometer.tests.test_bin + $ tox -e debug aodh.tests.test_bin For reference, the ``debug`` tox environment implements the instructions here: https://wiki.openstack.org/wiki/Testr#Debugging_.28pdb.29_Tests 5. There is a growing suite of tests which use a tool called `gabbi`_ to - test and validate the behavior of the Ceilometer API. These tests are run + test and validate the behavior of the Aodh API. These tests are run when using the usual ``py27`` tox target but if desired they can be run by themselves:: $ tox -e gabbi The YAML files used to drive the gabbi tests can be found in - ``ceilometer/tests/gabbi/gabbits``. If you are adding to or adjusting the + ``aodh/tests/gabbi/gabbits``. If you are adding to or adjusting the API you should consider adding tests here. .. _gabbi: https://gabbi.readthedocs.org/ diff --git a/doc/source/webapi/v2.rst b/doc/source/webapi/v2.rst index 3dc799451..b64b26bf2 100644 --- a/doc/source/webapi/v2.rst +++ b/doc/source/webapi/v2.rst @@ -14,10 +14,10 @@ returns a flattened dictionary of properties with associated boolean values - a 'False' or absent value means that the corresponding feature is not available in the backend. -.. rest-controller:: ceilometer.api.controllers.v2.capabilities:CapabilitiesController +.. rest-controller:: aodh.api.controllers.v2.capabilities:CapabilitiesController :webprefix: /v2/capabilities -.. autotype:: ceilometer.api.controllers.v2.capabilities.Capabilities +.. autotype:: aodh.api.controllers.v2.capabilities.Capabilities :members: .. _alarms-api: @@ -25,40 +25,40 @@ available in the backend. Alarms ====== -.. rest-controller:: ceilometer.api.controllers.v2.alarms:AlarmsController +.. rest-controller:: aodh.api.controllers.v2.alarms:AlarmsController :webprefix: /v2/alarms -.. rest-controller:: ceilometer.api.controllers.v2.alarms:AlarmController +.. rest-controller:: aodh.api.controllers.v2.alarms:AlarmController :webprefix: /v2/alarms -.. autotype:: ceilometer.api.controllers.v2.alarms.Alarm +.. autotype:: aodh.api.controllers.v2.alarms.Alarm :members: -.. autotype:: ceilometer.api.controllers.v2.alarm_rules.threshold.AlarmThresholdRule +.. autotype:: aodh.api.controllers.v2.alarm_rules.threshold.AlarmThresholdRule :members: -.. autotype:: ceilometer.api.controllers.v2.alarm_rules.combination.AlarmCombinationRule +.. autotype:: aodh.api.controllers.v2.alarm_rules.combination.AlarmCombinationRule :members: -.. autotype:: ceilometer.api.controllers.v2.alarm_rules.gnocchi.MetricOfResourceRule +.. autotype:: aodh.api.controllers.v2.alarm_rules.gnocchi.MetricOfResourceRule :members: -.. autotype:: ceilometer.api.controllers.v2.alarm_rules.gnocchi.AggregationMetricByResourcesLookupRule +.. autotype:: aodh.api.controllers.v2.alarm_rules.gnocchi.AggregationMetricByResourcesLookupRule :members: -.. autotype:: ceilometer.api.controllers.v2.alarm_rules.gnocchi.AggregationMetricsByIdLookupRule +.. autotype:: aodh.api.controllers.v2.alarm_rules.gnocchi.AggregationMetricsByIdLookupRule :members: -.. autotype:: ceilometer.api.controllers.v2.alarms.AlarmTimeConstraint +.. autotype:: aodh.api.controllers.v2.alarms.AlarmTimeConstraint :members: -.. autotype:: ceilometer.api.controllers.v2.alarms.AlarmChange +.. autotype:: aodh.api.controllers.v2.alarms.AlarmChange :members: Filtering Queries ================= -Ceilometer's REST API currently supports two types of queries. The Simple +Aodh's REST API currently supports two types of queries. The Simple Query functionality provides simple filtering on several fields of the *Sample* type. Complex Query provides the possibility to specify queries with logical and comparison operators on the fields of *Sample*. @@ -85,7 +85,7 @@ type (for example, if you apply a filter on a query for statistics, you won't target *duration_start* field of *Statistics*, but *timestamp* field of *Sample*). -.. autotype:: ceilometer.api.controllers.v2.base.Query +.. autotype:: aodh.api.controllers.v2.base.Query :members: Complex Query @@ -114,11 +114,11 @@ The number of the returned items can be bounded using the *limit* option. The *filter*, *orderby* and *limit* are all optional fields in a query. -.. rest-controller:: ceilometer.api.controllers.v2.query:QueryAlarmsController +.. rest-controller:: aodh.api.controllers.v2.query:QueryAlarmsController :webprefix: /v2/query/alarms -.. rest-controller:: ceilometer.api.controllers.v2.query:QueryAlarmHistoryController +.. rest-controller:: aodh.api.controllers.v2.query:QueryAlarmHistoryController :webprefix: /v2/query/alarms/history -.. autotype:: ceilometer.api.controllers.v2.query.ComplexQuery +.. autotype:: aodh.api.controllers.v2.query.ComplexQuery :members: diff --git a/etc/aodh/README-aodh.conf.txt b/etc/aodh/README-aodh.conf.txt new file mode 100644 index 000000000..7d7a03623 --- /dev/null +++ b/etc/aodh/README-aodh.conf.txt @@ -0,0 +1,4 @@ +To generate the sample aodh.conf file, run the following +command from the top-level aodh directory: + +tox -egenconfig diff --git a/etc/ceilometer/api_paste.ini b/etc/aodh/api_paste.ini similarity index 73% rename from etc/ceilometer/api_paste.ini rename to etc/aodh/api_paste.ini index 95d50c56d..e24721e8a 100644 --- a/etc/ceilometer/api_paste.ini +++ b/etc/aodh/api_paste.ini @@ -1,6 +1,6 @@ -# Ceilometer API WSGI Pipeline +# aodh API WSGI Pipeline # Define the filters that make up the pipeline for processing WSGI requests -# Note: This pipeline is PasteDeploy's term rather than Ceilometer's pipeline +# Note: This pipeline is PasteDeploy's term rather than aodh's pipeline # used for processing samples # Remove authtoken from the pipeline if you don't want to use keystone authentication @@ -8,7 +8,7 @@ pipeline = request_id authtoken api-server [app:api-server] -paste.app_factory = ceilometer.api.app:app_factory +paste.app_factory = aodh.api.app:app_factory [filter:authtoken] paste.filter_factory = keystonemiddleware.auth_token:filter_factory diff --git a/etc/ceilometer/policy.json b/etc/aodh/policy.json similarity index 100% rename from etc/ceilometer/policy.json rename to etc/aodh/policy.json diff --git a/etc/ceilometer/policy.json.sample b/etc/aodh/policy.json.sample similarity index 100% rename from etc/ceilometer/policy.json.sample rename to etc/aodh/policy.json.sample diff --git a/etc/apache2/ceilometer b/etc/apache2/aodh similarity index 77% rename from etc/apache2/ceilometer rename to etc/apache2/aodh index 261acc3ec..d2409ece2 100644 --- a/etc/apache2/ceilometer +++ b/etc/apache2/aodh @@ -13,7 +13,7 @@ # under the License. # This is an example Apache2 configuration file for using the -# ceilometer API through mod_wsgi. +# aodh API through mod_wsgi. # Note: If you are using a Debian-based system then the paths # "/var/log/httpd" and "/var/run/httpd" will use "apache2" instead @@ -25,15 +25,15 @@ Listen 8777 - WSGIDaemonProcess ceilometer-api processes=2 threads=10 user=SOMEUSER display-name=%{GROUP} - WSGIProcessGroup ceilometer-api - WSGIScriptAlias / /var/www/ceilometer/app + WSGIDaemonProcess aodh-api processes=2 threads=10 user=SOMEUSER display-name=%{GROUP} + WSGIProcessGroup aodh-api + WSGIScriptAlias / /var/www/aodh/app WSGIApplicationGroup %{GLOBAL} = 2.4> ErrorLogFormat "%{cu}t %M" - ErrorLog /var/log/httpd/ceilometer_error.log - CustomLog /var/log/httpd/ceilometer_access.log combined + ErrorLog /var/log/httpd/aodh_error.log + CustomLog /var/log/httpd/aodh_access.log combined WSGISocketPrefix /var/run/httpd diff --git a/etc/ceilometer/README-ceilometer.conf.txt b/etc/ceilometer/README-ceilometer.conf.txt deleted file mode 100644 index db6d857ee..000000000 --- a/etc/ceilometer/README-ceilometer.conf.txt +++ /dev/null @@ -1,4 +0,0 @@ -To generate the sample ceilometer.conf file, run the following -command from the top-level ceilometer directory: - -tox -egenconfig \ No newline at end of file diff --git a/functions.sh b/functions.sh index 633d30f84..4b6f5e704 100644 --- a/functions.sh +++ b/functions.sh @@ -1,6 +1,6 @@ function clean_exit(){ local error_code="$?" - if test -n "$CEILOMETER_TEST_HBASE_URL" + if test -n "$AODH_TEST_HBASE_URL" then python tools/test_hbase_table_utils.py --clear fi diff --git a/openstack-common.conf b/openstack-common.conf index 56b4a26ea..979405950 100644 --- a/openstack-common.conf +++ b/openstack-common.conf @@ -4,4 +4,4 @@ module=fileutils # The base module to hold the copy of openstack.common -base=ceilometer +base=aodh diff --git a/rally-jobs/README.rst b/rally-jobs/README.rst index 5531b764d..533c6cf1d 100644 --- a/rally-jobs/README.rst +++ b/rally-jobs/README.rst @@ -14,7 +14,7 @@ Structure are able to use absolute paths in rally tasks. Files will be located in ~/.rally/extra/* -* ceilometer is a task that is run in gates against Ceilometer +* aodh is a task that is run in gates against aodh Useful links diff --git a/rally-jobs/plugins/plugin_sample.py b/rally-jobs/plugins/plugin_sample.py index e69eee396..159421738 100644 --- a/rally-jobs/plugins/plugin_sample.py +++ b/rally-jobs/plugins/plugin_sample.py @@ -10,10 +10,10 @@ # License for the specific language governing permissions and limitations # under the License. -""" Sample of plugin for Ceilometer. +""" Sample of plugin for Aodh. -For more Ceilometer related benchmarks take a look here: -github.com/stackforge/rally/blob/master/rally/benchmark/scenarios/ceilometer/ +For more Aodh related benchmarks take a look here: +github.com/stackforge/rally/blob/master/rally/benchmark/scenarios/aodh/ About plugins: https://rally.readthedocs.org/en/latest/plugins.html @@ -23,5 +23,5 @@ Rally concepts https://wiki.openstack.org/wiki/Rally/Concepts from rally.benchmark.scenarios import base -class CeilometerPlugin(base.Scenario): +class AodhPlugin(base.Scenario): pass diff --git a/run-functional-tests.sh b/run-functional-tests.sh index 0ebc57377..1cccfe861 100644 --- a/run-functional-tests.sh +++ b/run-functional-tests.sh @@ -3,10 +3,10 @@ set -e # Use a mongodb backend by default -if [ -z $CEILOMETER_TEST_BACKEND ]; then - CEILOMETER_TEST_BACKEND="mongodb" +if [ -z $AODH_TEST_BACKEND ]; then + AODH_TEST_BACKEND="mongodb" fi -echo $CEILOMETER_TEST_BACKEND -for backend in $CEILOMETER_TEST_BACKEND; do +echo $AODH_TEST_BACKEND +for backend in $AODH_TEST_BACKEND; do ./setup-test-env-${backend}.sh ./tools/pretty_tox.sh $* done diff --git a/setup-test-env-mongodb.sh b/setup-test-env-mongodb.sh index 547168a38..6700ec722 100755 --- a/setup-test-env-mongodb.sh +++ b/setup-test-env-mongodb.sh @@ -21,10 +21,10 @@ mongod --maxConns 32 --nojournal --noprealloc --smallfiles --quiet --noauth --po wait_for_line "waiting for connections on port ${MONGO_PORT}" ${MONGO_DATA}/out # Read the fifo for ever otherwise mongod would block cat ${MONGO_DATA}/out > /dev/null & -export CEILOMETER_TEST_MONGODB_URL="mongodb://localhost:${MONGO_PORT}/ceilometer" -if test -n "$CEILOMETER_TEST_HBASE_URL" +export AODH_TEST_MONGODB_URL="mongodb://localhost:${MONGO_PORT}/AODH" +if test -n "$AODH_TEST_HBASE_URL" then - export CEILOMETER_TEST_HBASE_TABLE_PREFIX=$(hexdump -n 16 -v -e '/1 "%02X"' /dev/urandom) + export AODH_TEST_HBASE_TABLE_PREFIX=$(hexdump -n 16 -v -e '/1 "%02X"' /dev/urandom) python tools/test_hbase_table_utils.py --upgrade fi diff --git a/setup-test-env-mysql.sh b/setup-test-env-mysql.sh index de1ab5ba9..ed505d9f7 100755 --- a/setup-test-env-mysql.sh +++ b/setup-test-env-mysql.sh @@ -16,13 +16,13 @@ export PATH=$PATH:/usr/libexec check_for_cmd mysqld # Start MySQL process for tests -MYSQL_DATA=`mktemp -d /tmp/CEILO-MYSQL-XXXXX` +MYSQL_DATA=`mktemp -d /tmp/AODH-MYSQL-XXXXX` trap "clean_exit ${MYSQL_DATA}" EXIT mkfifo ${MYSQL_DATA}/out mysqld --datadir=${MYSQL_DATA} --pid-file=${MYSQL_DATA}/mysql.pid --socket=${MYSQL_DATA}/mysql.socket --skip-networking --skip-grant-tables &> ${MYSQL_DATA}/out & # Wait for MySQL to start listening to connections wait_for_line "mysqld: ready for connections." ${MYSQL_DATA}/out -export CEILOMETER_TEST_MYSQL_URL="mysql+pymysql://root@localhost/template1?unix_socket=${MYSQL_DATA}/mysql.socket&charset=utf8" +export AODH_TEST_MYSQL_URL="mysql+pymysql://root@localhost/template1?unix_socket=${MYSQL_DATA}/mysql.socket&charset=utf8" # Yield execution to venv command $* diff --git a/setup-test-env-postgresql.sh b/setup-test-env-postgresql.sh index 002fd9f44..34ef1f2eb 100755 --- a/setup-test-env-postgresql.sh +++ b/setup-test-env-postgresql.sh @@ -21,14 +21,14 @@ function clean_exit_pgsql(){ check_for_cmd pg_config # Start PostgreSQL process for tests -PGSQL_DATA=`mktemp -d /tmp/CEILO-PGSQL-XXXXX` +PGSQL_DATA=`mktemp -d /tmp/AODH-PGSQL-XXXXX` PGSQL_PATH=`pg_config --bindir` PGSQL_PORT=9823 ${PGSQL_PATH}/initdb -E UTF8 ${PGSQL_DATA} trap "clean_exit_pgsql ${PGSQL_PATH} ${PGSQL_DATA} ${PGSQL_PORT}" EXIT LANGUAGE=C ${PGSQL_PATH}/pg_ctl -w -D ${PGSQL_DATA} -o "-N 100 -F -k ${PGSQL_DATA} -p ${PGSQL_PORT}" start -export CEILOMETER_TEST_PGSQL_URL="postgresql:///?host=${PGSQL_DATA}&port=${PGSQL_PORT}&dbname=template1" +export AODH_TEST_PGSQL_URL="postgresql:///?host=${PGSQL_DATA}&port=${PGSQL_PORT}&dbname=template1" # Yield execution to venv command $* diff --git a/setup.cfg b/setup.cfg index 01a57ba11..058995f01 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,5 +1,5 @@ [metadata] -name = ceilometer +name = aodh summary = OpenStack Telemetry Alarming description-file = README.rst @@ -23,49 +23,49 @@ setup-hooks = [files] packages = - ceilometer + aodh [entry_points] -ceilometer.alarm.storage = - log = ceilometer.alarm.storage.impl_log:Connection - mongodb = ceilometer.alarm.storage.impl_mongodb:Connection - mysql = ceilometer.alarm.storage.impl_sqlalchemy:Connection - postgresql = ceilometer.alarm.storage.impl_sqlalchemy:Connection - sqlite = ceilometer.alarm.storage.impl_sqlalchemy:Connection - hbase = ceilometer.alarm.storage.impl_hbase:Connection - db2 = ceilometer.alarm.storage.impl_db2:Connection +aodh.alarm.storage = + log = aodh.alarm.storage.impl_log:Connection + mongodb = aodh.alarm.storage.impl_mongodb:Connection + mysql = aodh.alarm.storage.impl_sqlalchemy:Connection + postgresql = aodh.alarm.storage.impl_sqlalchemy:Connection + sqlite = aodh.alarm.storage.impl_sqlalchemy:Connection + hbase = aodh.alarm.storage.impl_hbase:Connection + db2 = aodh.alarm.storage.impl_db2:Connection -ceilometer.alarm.rule = - threshold = ceilometer.api.controllers.v2.alarm_rules.threshold:AlarmThresholdRule - combination = ceilometer.api.controllers.v2.alarm_rules.combination:AlarmCombinationRule - gnocchi_resources_threshold = ceilometer.api.controllers.v2.alarm_rules.gnocchi:MetricOfResourceRule - gnocchi_aggregation_by_metrics_threshold = ceilometer.api.controllers.v2.alarm_rules.gnocchi:AggregationMetricsByIdLookupRule - gnocchi_aggregation_by_resources_threshold = ceilometer.api.controllers.v2.alarm_rules.gnocchi:AggregationMetricByResourcesLookupRule +aodh.alarm.rule = + threshold = aodh.api.controllers.v2.alarm_rules.threshold:AlarmThresholdRule + combination = aodh.api.controllers.v2.alarm_rules.combination:AlarmCombinationRule + gnocchi_resources_threshold = aodh.api.controllers.v2.alarm_rules.gnocchi:MetricOfResourceRule + gnocchi_aggregation_by_metrics_threshold = aodh.api.controllers.v2.alarm_rules.gnocchi:AggregationMetricsByIdLookupRule + gnocchi_aggregation_by_resources_threshold = aodh.api.controllers.v2.alarm_rules.gnocchi:AggregationMetricByResourcesLookupRule -ceilometer.alarm.evaluator = - threshold = ceilometer.alarm.evaluator.threshold:ThresholdEvaluator - combination = ceilometer.alarm.evaluator.combination:CombinationEvaluator - gnocchi_resources_threshold = ceilometer.alarm.evaluator.gnocchi:GnocchiThresholdEvaluator - gnocchi_aggregation_by_metrics_threshold = ceilometer.alarm.evaluator.gnocchi:GnocchiThresholdEvaluator - gnocchi_aggregation_by_resources_threshold = ceilometer.alarm.evaluator.gnocchi:GnocchiThresholdEvaluator +aodh.alarm.evaluator = + threshold = aodh.alarm.evaluator.threshold:ThresholdEvaluator + combination = aodh.alarm.evaluator.combination:CombinationEvaluator + gnocchi_resources_threshold = aodh.alarm.evaluator.gnocchi:GnocchiThresholdEvaluator + gnocchi_aggregation_by_metrics_threshold = aodh.alarm.evaluator.gnocchi:GnocchiThresholdEvaluator + gnocchi_aggregation_by_resources_threshold = aodh.alarm.evaluator.gnocchi:GnocchiThresholdEvaluator -ceilometer.alarm.notifier = - log = ceilometer.alarm.notifier.log:LogAlarmNotifier - test = ceilometer.alarm.notifier.test:TestAlarmNotifier - http = ceilometer.alarm.notifier.rest:RestAlarmNotifier - https = ceilometer.alarm.notifier.rest:RestAlarmNotifier - trust+http = ceilometer.alarm.notifier.trust:TrustRestAlarmNotifier - trust+https = ceilometer.alarm.notifier.trust:TrustRestAlarmNotifier +aodh.alarm.notifier = + log = aodh.alarm.notifier.log:LogAlarmNotifier + test = aodh.alarm.notifier.test:TestAlarmNotifier + http = aodh.alarm.notifier.rest:RestAlarmNotifier + https = aodh.alarm.notifier.rest:RestAlarmNotifier + trust+http = aodh.alarm.notifier.trust:TrustRestAlarmNotifier + trust+https = aodh.alarm.notifier.trust:TrustRestAlarmNotifier console_scripts = - ceilometer-api = ceilometer.cmd.api:main - ceilometer-dbsync = ceilometer.cmd.eventlet.storage:dbsync - ceilometer-expirer = ceilometer.cmd.eventlet.storage:expirer - ceilometer-alarm-evaluator = ceilometer.cmd.eventlet.alarm:evaluator - ceilometer-alarm-notifier = ceilometer.cmd.eventlet.alarm:notifier + aodh-api = aodh.cmd.api:main + aodh-dbsync = aodh.cmd.eventlet.storage:dbsync + aodh-expirer = aodh.cmd.eventlet.storage:expirer + aodh-alarm-evaluator = aodh.cmd.eventlet.alarm:evaluator + aodh-alarm-notifier = aodh.cmd.eventlet.alarm:notifier oslo.config.opts = - ceilometer = ceilometer.opts:list_opts + aodh = aodh.opts:list_opts [build_sphinx] all_files = 1 @@ -78,13 +78,13 @@ warnerrors = true [extract_messages] keywords = _ gettext ngettext l_ lazy_gettext mapping_file = babel.cfg -output_file = ceilometer/locale/ceilometer.pot +output_file = aodh/locale/aodh.pot [compile_catalog] -directory = ceilometer/locale -domain = ceilometer +directory = aodh/locale +domain = aodh [update_catalog] -domain = ceilometer -output_dir = ceilometer/locale -input_file = ceilometer/locale/ceilometer.pot +domain = aodh +output_dir = aodh/locale +input_file = aodh/locale/aodh.pot diff --git a/tools/test_hbase_table_utils.py b/tools/test_hbase_table_utils.py index e833866a3..a17c2bd04 100644 --- a/tools/test_hbase_table_utils.py +++ b/tools/test_hbase_table_utils.py @@ -15,16 +15,16 @@ import sys from oslo_config import cfg -from ceilometer import storage +from aodh import storage def main(argv): - cfg.CONF([], project='ceilometer') - if os.getenv("CEILOMETER_TEST_HBASE_URL"): + cfg.CONF([], project='aodh') + if os.getenv("AODH_TEST_HBASE_URL"): url = ("%s?table_prefix=%s" % - (os.getenv("CEILOMETER_TEST_HBASE_URL"), - os.getenv("CEILOMETER_TEST_HBASE_TABLE_PREFIX", "test"))) - alarm_conn = storage.get_connection(url, 'ceilometer.alarm.storage') + (os.getenv("AODH_TEST_HBASE_URL"), + os.getenv("AODH_TEST_HBASE_TABLE_PREFIX", "test"))) + alarm_conn = storage.get_connection(url, 'AODH.alarm.storage') for arg in argv: if arg == "--upgrade": alarm_conn.upgrade() diff --git a/tox.ini b/tox.ini index 0023171b4..1f7c7ca20 100644 --- a/tox.ini +++ b/tox.ini @@ -15,7 +15,7 @@ commands = whitelist_externals = bash # TODO(ityaptin): With separation tests to unit and functional folders we need -# set environment variable OS_TEST_PATH=./ceilometer/tests/functional +# set environment variable OS_TEST_PATH=./aodh/tests/functional # in "py-" jobs [testenv:py-mongodb] @@ -33,7 +33,7 @@ commands = [testenv:functional] setenv = VIRTUAL_ENV={envdir} EVENTLET_NO_GREENDNS=yes - OS_TEST_PATH=ceilometer/tests/functional/ + OS_TEST_PATH=aodh/tests/functional/ commands = bash -x {toxinidir}/run-functional-tests.sh "{posargs}" @@ -41,17 +41,17 @@ commands = deps = -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements-py3.txt commands = python -m testtools.run \ - ceilometer.tests.api.v2.test_alarm_scenarios.TestAlarms.test_alarms_query_with_timestamp \ - ceilometer.tests.api.v2.test_alarm_scenarios.TestAlarms.test_get_alarm_history_constrained_by_alarm_id_failed \ - ceilometer.tests.api.v2.test_app \ - ceilometer.tests.api.v2.test_query \ - ceilometer.tests.storage.test_get_connection \ - ceilometer.tests.storage.test_impl_sqlalchemy \ - ceilometer.tests.test_bin \ - ceilometer.tests.test_coordination \ - ceilometer.tests.test_hacking \ - ceilometer.tests.test_messaging \ - ceilometer.tests.test_utils + aodh.tests.api.v2.test_alarm_scenarios.TestAlarms.test_alarms_query_with_timestamp \ + aodh.tests.api.v2.test_alarm_scenarios.TestAlarms.test_get_alarm_history_constrained_by_alarm_id_failed \ + aodh.tests.api.v2.test_app \ + aodh.tests.api.v2.test_query \ + aodh.tests.storage.test_get_connection \ + aodh.tests.storage.test_impl_sqlalchemy \ + aodh.tests.test_bin \ + aodh.tests.test_coordination \ + aodh.tests.test_hacking \ + aodh.tests.test_messaging \ + aodh.tests.test_utils # NOTE(chdent): The gabbi tests are also run under the primary tox @@ -59,7 +59,7 @@ commands = python -m testtools.run \ # gabbi tests without needing to discovery across the entire body of # tests. [testenv:gabbi] -setenv = OS_TEST_PATH=ceilometer/tests/gabbi +setenv = OS_TEST_PATH=aodh/tests/gabbi commands = bash -x {toxinidir}/setup-test-env-mongodb.sh \ python setup.py testr --testr-args="{posargs}" @@ -71,12 +71,12 @@ commands = bash -x {toxinidir}/setup-test-env-mongodb.sh python setup.py testr - commands = flake8 # Check that .po and .pot files are valid: - bash -c "find ceilometer -type f -regex '.*\.pot?' -print0|xargs -0 -n 1 msgfmt --check-format -o /dev/null" + bash -c "find aodh -type f -regex '.*\.pot?' -print0|xargs -0 -n 1 msgfmt --check-format -o /dev/null" [testenv:genconfig] commands = - oslo-config-generator --output-file etc/ceilometer/ceilometer.conf \ - --namespace ceilometer \ + oslo-config-generator --output-file etc/aodh/aodh.conf \ + --namespace aodh \ --namespace oslo.db \ --namespace oslo.log \ --namespace oslo.messaging \ @@ -103,10 +103,10 @@ commands = bash -x {toxinidir}/setup-test-env-postgresql.sh oslo_debug_helper {p [flake8] ignore = -exclude=.venv,.git,.tox,dist,doc,./ceilometer/openstack/common,*lib/python*,*egg,build +exclude=.venv,.git,.tox,dist,doc,./aodh/openstack/common,*lib/python*,*egg,build show-source = True [hacking] import_exceptions = - ceilometer.i18n -local-check-factory = ceilometer.hacking.checks.factory + aodh.i18n +local-check-factory = aodh.hacking.checks.factory