From 193085cf56d9c27b6341a677c8f92358fa99f79f Mon Sep 17 00:00:00 2001 From: Kiall Mac Innes Date: Sun, 9 Jun 2013 21:00:32 +0100 Subject: [PATCH] Rename Moniker -> Designate Change-Id: I4b9c7b277a524058408d5c551bb51531e9a3949c --- .gitignore | 6 +- MANIFEST.in | 12 +-- README.md | 8 +- bin/{moniker-agent => designate-agent} | 14 +-- bin/{moniker-api => designate-api} | 14 +-- bin/{moniker-central => designate-central} | 14 +-- bin/{moniker-manage => designate-manage} | 8 +- bin/{moniker-rootwrap => designate-rootwrap} | 12 +-- bin/{moniker-sink => designate-sink} | 14 +-- ...blime-project => designate.sublime-project | 0 {moniker => designate}/__init__.py | 8 +- {moniker => designate}/agent/__init__.py | 2 +- {moniker => designate}/agent/rpcapi.py | 6 +- {moniker => designate}/agent/service.py | 10 +- {moniker => designate}/api/__init__.py | 6 +- {moniker => designate}/api/auth.py | 24 ++--- {moniker => designate}/api/service.py | 12 +-- {moniker => designate}/api/v1/__init__.py | 22 ++-- {moniker => designate}/api/v1/domains.py | 6 +- .../api/v1/extensions/__init__.py | 0 .../api/v1/extensions/diagnostics.py | 4 +- .../api/v1/extensions/reports.py | 4 +- .../api/v1/extensions/sync.py | 4 +- {moniker => designate}/api/v1/limits.py | 6 +- {moniker => designate}/api/v1/records.py | 6 +- {moniker => designate}/api/v1/servers.py | 6 +- {moniker => designate}/api/v1/tsigkeys.py | 6 +- {moniker => designate}/api/versions.py | 2 +- {moniker => designate}/backend/__init__.py | 4 +- {moniker => designate}/backend/base.py | 12 +-- {moniker => designate}/backend/impl_bind9.py | 8 +- .../backend/impl_dnsmasq.py | 8 +- {moniker => designate}/backend/impl_fake.py | 4 +- .../backend/impl_mysqlbind9.py | 26 ++--- .../backend/impl_powerdns/__init__.py | 32 +++--- .../backend/impl_powerdns/migrate_repo/README | 4 + .../impl_powerdns/migrate_repo/__init__.py | 0 .../impl_powerdns/migrate_repo/manage.py | 0 .../impl_powerdns/migrate_repo/migrate.cfg | 2 +- .../versions/001_add_initial_schema.py | 0 .../versions/002_add_moniker_id_cols.py | 26 ++--- .../003_correct_master_column_length.py | 0 .../004_correct_content_column_length.py | 0 .../migrate_repo/versions/__init__.py | 0 .../backend/impl_powerdns/models.py | 10 +- {moniker => designate}/backend/impl_rpc.py | 4 +- {moniker => designate}/central/__init__.py | 2 +- {moniker => designate}/central/rpcapi.py | 6 +- {moniker => designate}/central/service.py | 18 ++-- {moniker => designate}/context.py | 14 +-- {moniker => designate}/debug.py | 0 {moniker => designate}/exceptions.py | 0 {moniker => designate}/manage/__init__.py | 10 +- {moniker => designate}/manage/base.py | 6 +- {moniker => designate}/manage/database.py | 8 +- {moniker => designate}/manage/powerdns.py | 8 +- .../notification_handler/__init__.py | 0 .../notification_handler/base.py | 18 ++-- .../notification_handler/nova.py | 6 +- .../notification_handler/quantum.py | 6 +- {moniker => designate}/openstack/__init__.py | 0 .../openstack/common/__init__.py | 0 .../openstack/common/cfg.py | 4 +- .../openstack/common/context.py | 0 .../openstack/common/eventlet_backdoor.py | 2 +- .../openstack/common/exception.py | 2 +- .../openstack/common/excutils.py | 2 +- .../openstack/common/gettextutils.py | 2 +- .../openstack/common/importutils.py | 0 .../openstack/common/iniparser.py | 0 .../openstack/common/jsonutils.py | 2 +- .../openstack/common/local.py | 0 .../openstack/common/log.py | 12 +-- .../openstack/common/loopingcall.py | 6 +- .../openstack/common/network_utils.py | 0 .../openstack/common/notifier/__init__.py | 0 .../openstack/common/notifier/api.py | 14 +-- .../openstack/common/notifier/log_notifier.py | 8 +- .../common/notifier/no_op_notifier.py | 0 .../common/notifier/rabbit_notifier.py | 6 +- .../openstack/common/notifier/rpc_notifier.py | 10 +- .../common/notifier/rpc_notifier2.py | 10 +- .../common/notifier/test_notifier.py | 0 .../openstack/common/periodic_task.py | 8 +- .../openstack/common/policy.py | 4 +- .../openstack/common/processutils.py | 4 +- .../openstack/common/rootwrap/__init__.py | 0 .../openstack/common/rootwrap/filters.py | 0 .../openstack/common/rootwrap/wrapper.py | 2 +- .../openstack/common/rpc/__init__.py | 6 +- .../openstack/common/rpc/amqp.py | 10 +- .../openstack/common/rpc/common.py | 20 ++-- .../openstack/common/rpc/dispatcher.py | 2 +- .../openstack/common/rpc/impl_fake.py | 2 +- .../openstack/common/rpc/impl_kombu.py | 10 +- .../openstack/common/rpc/impl_qpid.py | 14 +-- .../openstack/common/rpc/impl_zmq.py | 14 +-- .../openstack/common/rpc/matchmaker.py | 6 +- .../openstack/common/rpc/proxy.py | 2 +- .../openstack/common/rpc/service.py | 10 +- .../openstack/common/service.py | 14 +-- .../openstack/common/threadgroup.py | 4 +- .../openstack/common/timeutils.py | 0 .../openstack/common/uuidutils.py | 0 .../openstack/common/wsgi.py | 10 +- {moniker => designate}/plugin.py | 2 +- {moniker => designate}/policy.py | 10 +- {moniker => designate}/quota/__init__.py | 6 +- {moniker => designate}/quota/base.py | 8 +- {moniker => designate}/quota/impl_config.py | 4 +- {moniker => designate}/quota/impl_storage.py | 6 +- .../resources/schemas/v1/domain.json | 0 .../resources/schemas/v1/domains.json | 0 .../resources/schemas/v1/fault.json | 0 .../resources/schemas/v1/limits.json | 0 .../resources/schemas/v1/record.json | 0 .../resources/schemas/v1/records.json | 0 .../resources/schemas/v1/server.json | 0 .../resources/schemas/v1/servers.json | 0 .../resources/schemas/v1/tsigkey.json | 0 .../resources/schemas/v1/tsigkeys.json | 0 .../resources/templates/bind9-config.jinja2 | 0 .../resources/templates/bind9-zone.jinja2 | 0 .../resources/templates/dnsmasq-zone.jinja2 | 0 .../templates/mysql-bind9-config.jinja2 | 0 {moniker => designate}/schema.py | 6 +- {moniker => designate}/sink/__init__.py | 2 +- {moniker => designate}/sink/service.py | 12 +-- {moniker => designate}/sqlalchemy/__init__.py | 0 .../sqlalchemy/expressions.py | 0 {moniker => designate}/sqlalchemy/models.py | 2 +- {moniker => designate}/sqlalchemy/session.py | 8 +- {moniker => designate}/sqlalchemy/types.py | 0 {moniker => designate}/storage/__init__.py | 6 +- {moniker => designate}/storage/base.py | 4 +- .../storage/impl_sqlalchemy/__init__.py | 16 +-- .../impl_sqlalchemy/migrate_repo/README | 4 + .../impl_sqlalchemy/migrate_repo/__init__.py | 0 .../impl_sqlalchemy/migrate_repo/manage.py | 0 .../impl_sqlalchemy/migrate_repo/migrate.cfg | 2 +- .../impl_sqlalchemy/migrate_repo/utils.py | 2 +- .../versions/001_add_moniker_schema.py | 14 +-- .../002_add_managed_col_for_records.py | 2 +- .../versions/003_add_delete_on_cascade.py | 0 .../004_changed_managed_cols_for_records.py | 0 .../versions/005_records_allow_null_ttl.py | 0 .../versions/006_support_ptr_records.py | 0 .../versions/007_add_parent_domain_id_col.py | 2 +- .../versions/008_support_spf_records.py | 0 .../versions/009_add_tsigkeys_table.py | 6 +- .../versions/010_drop_server_ip_cols.py | 2 +- .../versions/011_support_sshfp_records.py | 0 .../versions/012_add_serial_col.py | 4 +- .../versions/013_expand_email_column.py | 0 .../versions/014_add_quotas_table.py | 6 +- .../migrate_repo/versions/__init__.py | 0 .../storage/impl_sqlalchemy/models.py | 10 +- {moniker => designate}/tests/__init__.py | 38 +++---- .../nova/compute.instance.create.end.json | 2 +- .../nova/compute.instance.create.start.json | 2 +- .../nova/compute.instance.delete.start.json | 2 +- .../nova/compute.instance.shutdown.end.json | 2 +- .../nova/compute.instance.shutdown.start.json | 2 +- .../nova/network.floating_ip.allocate.json | 2 +- .../nova/network.floating_ip.associate.json | 2 +- .../nova/network.floating_ip.deallocate.json | 2 +- .../network.floating_ip.disassociate.json | 2 +- .../nova/scheduler.run_instance.end.json | 2 +- .../scheduler.run_instance.scheduled.json | 2 +- .../nova/scheduler.run_instance.start.json | 2 +- .../floatingip.update.end_associate.json | 0 .../floatingip.update.end_disassociate.json | 0 .../quantum/port.create.end.json | 0 .../quantum/port.create.start.josn | 0 .../quantum/port.delete.end.json | 0 .../quantum/port.delete.start.json | 0 .../tests/test_agent/__init__.py | 2 +- .../tests/test_agent/test_service.py | 2 +- .../tests/test_api/__init__.py | 6 +- .../tests/test_api/test_auth.py | 7 +- .../tests/test_api/test_service.py | 2 +- .../tests/test_api/test_v1/__init__.py | 8 +- .../tests/test_api/test_v1/test_domains.py | 10 +- .../tests/test_api/test_v1/test_records.py | 8 +- .../tests/test_api/test_v1/test_servers.py | 10 +- .../tests/test_backend/__init__.py | 8 +- .../tests/test_backend/test_bind9.py | 4 +- .../tests/test_backend/test_dnsmasq.py | 4 +- .../tests/test_backend/test_fake.py | 4 +- .../tests/test_backend/test_mysqlbind9.py | 4 +- .../tests/test_backend/test_powerdns.py | 4 +- .../tests/test_central/__init__.py | 2 +- .../tests/test_central/test_service.py | 6 +- {moniker => designate}/tests/test_context.py | 10 +- .../test_notification_handler/__init__.py | 4 +- .../test_notification_handler/test_nova.py | 7 +- .../test_notification_handler/test_quantum.py | 7 +- .../tests/test_quota/__init__.py | 10 +- .../tests/test_quota/test_config.py | 4 +- .../tests/test_quota/test_storage.py | 4 +- {moniker => designate}/tests/test_schema.py | 6 +- .../tests/test_sink/__init__.py | 2 +- .../tests/test_sink/test_service.py | 4 +- .../tests/test_storage/__init__.py | 8 +- .../tests/test_storage/test_sqlalchemy.py | 4 +- {moniker => designate}/tests/test_utils.py | 6 +- {moniker => designate}/utils.py | 24 ++--- {moniker => designate}/version.py | 2 +- {moniker => designate}/wsgi.py | 2 +- doc/source/conf.py | 20 ++-- doc/source/configuration.rst | 10 +- doc/source/glossary.rst | 2 +- doc/source/index.rst | 4 +- doc/source/install.rst | 38 +++---- doc/source/rest/general.rst | 6 +- .../api-paste.ini.sample | 12 +-- .../designate.conf.sample} | 14 +-- etc/{moniker => designate}/policy.json | 0 .../rootwrap.conf.sample} | 4 +- .../rootwrap.d/bind9.filters | 2 +- .../backend/impl_powerdns/migrate_repo/README | 4 - .../impl_sqlalchemy/migrate_repo/README | 4 - openstack-common.conf | 2 +- setup.cfg | 102 +++++++++--------- tools/install_venv.py | 10 +- tools/moniker-keystone-setup | 14 +-- 226 files changed, 677 insertions(+), 674 deletions(-) rename bin/{moniker-agent => designate-agent} (73%) rename bin/{moniker-api => designate-api} (74%) rename bin/{moniker-central => designate-central} (73%) rename bin/{moniker-manage => designate-manage} (85%) rename bin/{moniker-rootwrap => designate-rootwrap} (90%) rename bin/{moniker-sink => designate-sink} (74%) rename moniker.sublime-project => designate.sublime-project (100%) rename {moniker => designate}/__init__.py (85%) rename {moniker => designate}/agent/__init__.py (95%) rename {moniker => designate}/agent/rpcapi.py (96%) rename {moniker => designate}/agent/service.py (83%) rename {moniker => designate}/api/__init__.py (88%) rename {moniker => designate}/api/auth.py (76%) rename {moniker => designate}/api/service.py (87%) rename {moniker => designate}/api/v1/__init__.py (89%) rename {moniker => designate}/api/v1/domains.py (95%) rename {moniker => designate}/api/v1/extensions/__init__.py (100%) rename {moniker => designate}/api/v1/extensions/diagnostics.py (92%) rename {moniker => designate}/api/v1/extensions/reports.py (95%) rename {moniker => designate}/api/v1/extensions/sync.py (93%) rename {moniker => designate}/api/v1/limits.py (90%) rename {moniker => designate}/api/v1/records.py (95%) rename {moniker => designate}/api/v1/servers.py (95%) rename {moniker => designate}/api/v1/tsigkeys.py (95%) rename {moniker => designate}/api/versions.py (95%) rename {moniker => designate}/backend/__init__.py (91%) rename {moniker => designate}/backend/base.py (93%) rename {moniker => designate}/backend/impl_bind9.py (97%) rename {moniker => designate}/backend/impl_dnsmasq.py (96%) rename {moniker => designate}/backend/impl_fake.py (97%) rename {moniker => designate}/backend/impl_mysqlbind9.py (95%) rename {moniker => designate}/backend/impl_powerdns/__init__.py (93%) create mode 100644 designate/backend/impl_powerdns/migrate_repo/README rename {moniker => designate}/backend/impl_powerdns/migrate_repo/__init__.py (100%) rename {moniker => designate}/backend/impl_powerdns/migrate_repo/manage.py (100%) rename {moniker => designate}/backend/impl_powerdns/migrate_repo/migrate.cfg (97%) rename {moniker => designate}/backend/impl_powerdns/migrate_repo/versions/001_add_initial_schema.py (100%) rename {moniker => designate}/backend/impl_powerdns/migrate_repo/versions/002_add_moniker_id_cols.py (63%) rename {moniker => designate}/backend/impl_powerdns/migrate_repo/versions/003_correct_master_column_length.py (100%) rename {moniker => designate}/backend/impl_powerdns/migrate_repo/versions/004_correct_content_column_length.py (100%) rename {moniker => designate}/backend/impl_powerdns/migrate_repo/versions/__init__.py (100%) rename {moniker => designate}/backend/impl_powerdns/models.py (90%) rename {moniker => designate}/backend/impl_rpc.py (95%) rename {moniker => designate}/central/__init__.py (99%) rename {moniker => designate}/central/rpcapi.py (98%) rename {moniker => designate}/central/service.py (98%) rename {moniker => designate}/context.py (90%) rename {moniker => designate}/debug.py (100%) rename {moniker => designate}/exceptions.py (100%) rename {moniker => designate}/manage/__init__.py (76%) rename {moniker => designate}/manage/base.py (91%) rename {moniker => designate}/manage/database.py (93%) rename {moniker => designate}/manage/powerdns.py (91%) rename {moniker => designate}/notification_handler/__init__.py (100%) rename {moniker => designate}/notification_handler/base.py (91%) rename {moniker => designate}/notification_handler/nova.py (92%) rename {moniker => designate}/notification_handler/quantum.py (93%) rename {moniker => designate}/openstack/__init__.py (100%) rename {moniker => designate}/openstack/common/__init__.py (100%) rename {moniker => designate}/openstack/common/cfg.py (99%) rename {moniker => designate}/openstack/common/context.py (100%) rename {moniker => designate}/openstack/common/eventlet_backdoor.py (98%) rename {moniker => designate}/openstack/common/exception.py (98%) rename {moniker => designate}/openstack/common/excutils.py (96%) rename {moniker => designate}/openstack/common/gettextutils.py (93%) rename {moniker => designate}/openstack/common/importutils.py (100%) rename {moniker => designate}/openstack/common/iniparser.py (100%) rename {moniker => designate}/openstack/common/jsonutils.py (99%) rename {moniker => designate}/openstack/common/local.py (100%) rename {moniker => designate}/openstack/common/log.py (98%) rename {moniker => designate}/openstack/common/loopingcall.py (96%) rename {moniker => designate}/openstack/common/network_utils.py (100%) rename {moniker => designate}/openstack/common/notifier/__init__.py (100%) rename {moniker => designate}/openstack/common/notifier/api.py (94%) rename {moniker => designate}/openstack/common/notifier/log_notifier.py (84%) rename {moniker => designate}/openstack/common/notifier/no_op_notifier.py (100%) rename {moniker => designate}/openstack/common/notifier/rabbit_notifier.py (84%) rename {moniker => designate}/openstack/common/notifier/rpc_notifier.py (85%) rename {moniker => designate}/openstack/common/notifier/rpc_notifier2.py (86%) rename {moniker => designate}/openstack/common/notifier/test_notifier.py (100%) rename {moniker => designate}/openstack/common/periodic_task.py (97%) rename {moniker => designate}/openstack/common/policy.py (99%) rename {moniker => designate}/openstack/common/processutils.py (98%) rename {moniker => designate}/openstack/common/rootwrap/__init__.py (100%) rename {moniker => designate}/openstack/common/rootwrap/filters.py (100%) rename {moniker => designate}/openstack/common/rootwrap/wrapper.py (98%) rename {moniker => designate}/openstack/common/rpc/__init__.py (98%) rename {moniker => designate}/openstack/common/rpc/amqp.py (98%) rename {moniker => designate}/openstack/common/rpc/common.py (97%) rename {moniker => designate}/openstack/common/rpc/dispatcher.py (98%) rename {moniker => designate}/openstack/common/rpc/impl_fake.py (98%) rename {moniker => designate}/openstack/common/rpc/impl_kombu.py (99%) rename {moniker => designate}/openstack/common/rpc/impl_qpid.py (98%) rename {moniker => designate}/openstack/common/rpc/impl_zmq.py (98%) rename {moniker => designate}/openstack/common/rpc/matchmaker.py (98%) rename {moniker => designate}/openstack/common/rpc/proxy.py (99%) rename {moniker => designate}/openstack/common/rpc/service.py (90%) rename {moniker => designate}/openstack/common/service.py (96%) rename {moniker => designate}/openstack/common/threadgroup.py (97%) rename {moniker => designate}/openstack/common/timeutils.py (100%) rename {moniker => designate}/openstack/common/uuidutils.py (100%) rename {moniker => designate}/openstack/common/wsgi.py (99%) rename {moniker => designate}/plugin.py (97%) rename {moniker => designate}/policy.py (90%) rename {moniker => designate}/quota/__init__.py (89%) rename {moniker => designate}/quota/base.py (91%) rename {moniker => designate}/quota/impl_config.py (91%) rename {moniker => designate}/quota/impl_storage.py (90%) rename {moniker => designate}/resources/schemas/v1/domain.json (100%) rename {moniker => designate}/resources/schemas/v1/domains.json (100%) rename {moniker => designate}/resources/schemas/v1/fault.json (100%) rename {moniker => designate}/resources/schemas/v1/limits.json (100%) rename {moniker => designate}/resources/schemas/v1/record.json (100%) rename {moniker => designate}/resources/schemas/v1/records.json (100%) rename {moniker => designate}/resources/schemas/v1/server.json (100%) rename {moniker => designate}/resources/schemas/v1/servers.json (100%) rename {moniker => designate}/resources/schemas/v1/tsigkey.json (100%) rename {moniker => designate}/resources/schemas/v1/tsigkeys.json (100%) rename {moniker => designate}/resources/templates/bind9-config.jinja2 (100%) rename {moniker => designate}/resources/templates/bind9-zone.jinja2 (100%) rename {moniker => designate}/resources/templates/dnsmasq-zone.jinja2 (100%) rename {moniker => designate}/resources/templates/mysql-bind9-config.jinja2 (100%) rename {moniker => designate}/schema.py (98%) rename {moniker => designate}/sink/__init__.py (96%) rename {moniker => designate}/sink/service.py (92%) rename {moniker => designate}/sqlalchemy/__init__.py (100%) rename {moniker => designate}/sqlalchemy/expressions.py (100%) rename {moniker => designate}/sqlalchemy/models.py (98%) rename {moniker => designate}/sqlalchemy/session.py (97%) rename {moniker => designate}/sqlalchemy/types.py (100%) rename {moniker => designate}/storage/__init__.py (89%) rename {moniker => designate}/storage/base.py (99%) rename {moniker => designate}/storage/impl_sqlalchemy/__init__.py (97%) create mode 100644 designate/storage/impl_sqlalchemy/migrate_repo/README rename {moniker => designate}/storage/impl_sqlalchemy/migrate_repo/__init__.py (100%) rename {moniker => designate}/storage/impl_sqlalchemy/migrate_repo/manage.py (100%) rename {moniker => designate}/storage/impl_sqlalchemy/migrate_repo/migrate.cfg (98%) rename {moniker => designate}/storage/impl_sqlalchemy/migrate_repo/utils.py (96%) rename {moniker => designate}/storage/impl_sqlalchemy/migrate_repo/versions/001_add_moniker_schema.py (89%) rename {moniker => designate}/storage/impl_sqlalchemy/migrate_repo/versions/002_add_managed_col_for_records.py (97%) rename {moniker => designate}/storage/impl_sqlalchemy/migrate_repo/versions/003_add_delete_on_cascade.py (100%) rename {moniker => designate}/storage/impl_sqlalchemy/migrate_repo/versions/004_changed_managed_cols_for_records.py (100%) rename {moniker => designate}/storage/impl_sqlalchemy/migrate_repo/versions/005_records_allow_null_ttl.py (100%) rename {moniker => designate}/storage/impl_sqlalchemy/migrate_repo/versions/006_support_ptr_records.py (100%) rename {moniker => designate}/storage/impl_sqlalchemy/migrate_repo/versions/007_add_parent_domain_id_col.py (97%) rename {moniker => designate}/storage/impl_sqlalchemy/migrate_repo/versions/008_support_spf_records.py (100%) rename {moniker => designate}/storage/impl_sqlalchemy/migrate_repo/versions/009_add_tsigkeys_table.py (91%) rename {moniker => designate}/storage/impl_sqlalchemy/migrate_repo/versions/010_drop_server_ip_cols.py (96%) rename {moniker => designate}/storage/impl_sqlalchemy/migrate_repo/versions/011_support_sshfp_records.py (100%) rename {moniker => designate}/storage/impl_sqlalchemy/migrate_repo/versions/012_add_serial_col.py (93%) rename {moniker => designate}/storage/impl_sqlalchemy/migrate_repo/versions/013_expand_email_column.py (100%) rename {moniker => designate}/storage/impl_sqlalchemy/migrate_repo/versions/014_add_quotas_table.py (90%) rename {moniker => designate}/storage/impl_sqlalchemy/migrate_repo/versions/__init__.py (100%) rename {moniker => designate}/storage/impl_sqlalchemy/models.py (93%) rename {moniker => designate}/tests/__init__.py (87%) rename {moniker => designate}/tests/sample_notifications/nova/compute.instance.create.end.json (99%) rename {moniker => designate}/tests/sample_notifications/nova/compute.instance.create.start.json (99%) rename {moniker => designate}/tests/sample_notifications/nova/compute.instance.delete.start.json (99%) rename {moniker => designate}/tests/sample_notifications/nova/compute.instance.shutdown.end.json (99%) rename {moniker => designate}/tests/sample_notifications/nova/compute.instance.shutdown.start.json (99%) rename {moniker => designate}/tests/sample_notifications/nova/network.floating_ip.allocate.json (99%) rename {moniker => designate}/tests/sample_notifications/nova/network.floating_ip.associate.json (99%) rename {moniker => designate}/tests/sample_notifications/nova/network.floating_ip.deallocate.json (99%) rename {moniker => designate}/tests/sample_notifications/nova/network.floating_ip.disassociate.json (99%) rename {moniker => designate}/tests/sample_notifications/nova/scheduler.run_instance.end.json (99%) rename {moniker => designate}/tests/sample_notifications/nova/scheduler.run_instance.scheduled.json (99%) rename {moniker => designate}/tests/sample_notifications/nova/scheduler.run_instance.start.json (99%) rename {moniker => designate}/tests/sample_notifications/quantum/floatingip.update.end_associate.json (100%) rename {moniker => designate}/tests/sample_notifications/quantum/floatingip.update.end_disassociate.json (100%) rename {moniker => designate}/tests/sample_notifications/quantum/port.create.end.json (100%) rename {moniker => designate}/tests/sample_notifications/quantum/port.create.start.josn (100%) rename {moniker => designate}/tests/sample_notifications/quantum/port.delete.end.json (100%) rename {moniker => designate}/tests/sample_notifications/quantum/port.delete.start.json (100%) rename {moniker => designate}/tests/test_agent/__init__.py (95%) rename {moniker => designate}/tests/test_agent/test_service.py (94%) rename {moniker => designate}/tests/test_api/__init__.py (94%) rename {moniker => designate}/tests/test_api/test_auth.py (94%) rename {moniker => designate}/tests/test_api/test_service.py (95%) rename {moniker => designate}/tests/test_api/test_v1/__init__.py (89%) rename {moniker => designate}/tests/test_api/test_v1/test_domains.py (97%) rename {moniker => designate}/tests/test_api/test_v1/test_records.py (97%) rename {moniker => designate}/tests/test_api/test_v1/test_servers.py (95%) rename {moniker => designate}/tests/test_backend/__init__.py (86%) rename {moniker => designate}/tests/test_backend/test_bind9.py (88%) rename {moniker => designate}/tests/test_backend/test_dnsmasq.py (88%) rename {moniker => designate}/tests/test_backend/test_fake.py (88%) rename {moniker => designate}/tests/test_backend/test_mysqlbind9.py (88%) rename {moniker => designate}/tests/test_backend/test_powerdns.py (88%) rename {moniker => designate}/tests/test_central/__init__.py (94%) rename {moniker => designate}/tests/test_central/test_service.py (99%) rename {moniker => designate}/tests/test_context.py (83%) rename {moniker => designate}/tests/test_notification_handler/__init__.py (95%) rename {moniker => designate}/tests/test_notification_handler/test_nova.py (93%) rename {moniker => designate}/tests/test_notification_handler/test_quantum.py (92%) rename {moniker => designate}/tests/test_quota/__init__.py (94%) rename {moniker => designate}/tests/test_quota/test_config.py (89%) rename {moniker => designate}/tests/test_quota/test_storage.py (89%) rename {moniker => designate}/tests/test_schema.py (98%) rename {moniker => designate}/tests/test_sink/__init__.py (94%) rename {moniker => designate}/tests/test_sink/test_service.py (90%) rename {moniker => designate}/tests/test_storage/__init__.py (99%) rename {moniker => designate}/tests/test_storage/test_sqlalchemy.py (89%) rename {moniker => designate}/tests/test_utils.py (96%) rename {moniker => designate}/utils.py (87%) rename {moniker => designate}/version.py (92%) rename {moniker => designate}/wsgi.py (95%) rename etc/{moniker => designate}/api-paste.ini.sample (66%) rename etc/{moniker/moniker.conf.sample => designate/designate.conf.sample} (90%) rename etc/{moniker => designate}/policy.json (100%) rename etc/{moniker/rootwrap.conf => designate/rootwrap.conf.sample} (88%) rename etc/{moniker => designate}/rootwrap.d/bind9.filters (76%) delete mode 100644 moniker/backend/impl_powerdns/migrate_repo/README delete mode 100644 moniker/storage/impl_sqlalchemy/migrate_repo/README diff --git a/.gitignore b/.gitignore index e1492f665..6a8e40361 100644 --- a/.gitignore +++ b/.gitignore @@ -12,13 +12,13 @@ venv *.sublime-workspace *.sqlite var/* -etc/moniker/*.conf -etc/moniker/*.ini +etc/designate/*.conf +etc/designate/*.ini AUTHORS ChangeLog doc/source/api/* doc/build/* dist -moniker/versioninfo +designate/versioninfo *.orig /bind9 diff --git a/MANIFEST.in b/MANIFEST.in index 6550c842a..b0af4a6ee 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,12 +1,12 @@ include AUTHORS include ChangeLog -include moniker/versioninfo +include designate/versioninfo include *.txt *.ini *.cfg *.rst *.md -include etc/moniker/*.sample -include etc/moniker/policy.json -include moniker/storage/impl_sqlalchemy/migrate_repo/migrate.cfg -include moniker/backend/impl_powerdns/migrate_repo/migrate.cfg -recursive-include moniker/resources * +include etc/designate/*.sample +include etc/designate/policy.json +include designate/storage/impl_sqlalchemy/migrate_repo/migrate.cfg +include designate/backend/impl_powerdns/migrate_repo/migrate.cfg +recursive-include designate/resources * recursive-include tools * exclude .gitignore diff --git a/README.md b/README.md index ca884da7a..88ee6ae02 100644 --- a/README.md +++ b/README.md @@ -1,13 +1,13 @@ # Introduction -Moniker is an OpenStack inspired DNSaaS. +Designate is an OpenStack inspired DNSaaS. -Docs: http://moniker.rtfd.org and some below for now. -Bugs / Blueprints: http://launchpad.net/moniker +Docs: http://designate.rtfd.org and some below for now. +Bugs / Blueprints: http://launchpad.net/designate IRC: #openstack-dns -Installation: http://moniker.readthedocs.org/en/latest/install.html +Installation: http://designate.readthedocs.org/en/latest/install.html # TODOs: diff --git a/bin/moniker-agent b/bin/designate-agent similarity index 73% rename from bin/moniker-agent rename to bin/designate-agent index 99d8dd636..82c0290ba 100755 --- a/bin/moniker-agent +++ b/bin/designate-agent @@ -16,17 +16,17 @@ # under the License. import sys import eventlet -from moniker.openstack.common import cfg -from moniker.openstack.common import log as logging -from moniker.openstack.common import service -from moniker import utils -from moniker.agent import service as agent_service +from designate.openstack.common import cfg +from designate.openstack.common import log as logging +from designate.openstack.common import service +from designate import utils +from designate.agent import service as agent_service eventlet.monkey_patch() -utils.read_config('moniker', sys.argv) +utils.read_config('designate', sys.argv) -logging.setup('moniker') +logging.setup('designate') launcher = service.launch(agent_service.Service(), cfg.CONF['service:agent'].workers) diff --git a/bin/moniker-api b/bin/designate-api similarity index 74% rename from bin/moniker-api rename to bin/designate-api index 7a4547650..664dd2d91 100755 --- a/bin/moniker-api +++ b/bin/designate-api @@ -16,17 +16,17 @@ # under the License. import sys import eventlet -from moniker.openstack.common import cfg -from moniker.openstack.common import log as logging -from moniker.openstack.common import service -from moniker import utils -from moniker.api import service as api_service +from designate.openstack.common import cfg +from designate.openstack.common import log as logging +from designate.openstack.common import service +from designate import utils +from designate.api import service as api_service eventlet.monkey_patch() -utils.read_config('moniker', sys.argv) +utils.read_config('designate', sys.argv) -logging.setup('moniker') +logging.setup('designate') launcher = service.launch(api_service.Service(), cfg.CONF['service:api'].workers) diff --git a/bin/moniker-central b/bin/designate-central similarity index 73% rename from bin/moniker-central rename to bin/designate-central index 61bac865b..c6febbecd 100755 --- a/bin/moniker-central +++ b/bin/designate-central @@ -16,17 +16,17 @@ # under the License. import sys import eventlet -from moniker.openstack.common import cfg -from moniker.openstack.common import log as logging -from moniker.openstack.common import service -from moniker import utils -from moniker.central import service as central_service +from designate.openstack.common import cfg +from designate.openstack.common import log as logging +from designate.openstack.common import service +from designate import utils +from designate.central import service as central_service eventlet.monkey_patch() -utils.read_config('moniker', sys.argv) +utils.read_config('designate', sys.argv) -logging.setup('moniker') +logging.setup('designate') launcher = service.launch(central_service.Service(), cfg.CONF['service:central'].workers) diff --git a/bin/moniker-manage b/bin/designate-manage similarity index 85% rename from bin/moniker-manage rename to bin/designate-manage index abaea132a..0e41d4195 100755 --- a/bin/moniker-manage +++ b/bin/designate-manage @@ -15,11 +15,11 @@ # License for the specific language governing permissions and limitations # under the License. import sys -from moniker import utils -from moniker.manage import MonikerShell +from designate import utils +from designate.manage import DesignateShell # TODO: Sypport passing --config-file and --config-dir to read_config -utils.read_config('moniker', []) +utils.read_config('designate', []) -shell = MonikerShell() +shell = DesignateShell() sys.exit(shell.run(sys.argv[1:])) diff --git a/bin/moniker-rootwrap b/bin/designate-rootwrap similarity index 90% rename from bin/moniker-rootwrap rename to bin/designate-rootwrap index a9eef278f..a37ce6f2f 100755 --- a/bin/moniker-rootwrap +++ b/bin/designate-rootwrap @@ -20,11 +20,11 @@ Filters which commands a service is allowed to run as another user. - To use this with moniker, you should set the following in moniker.conf: - rootwrap_config=/etc/moniker/rootwrap.conf + To use this with designate, you should set the following in designate.conf: + rootwrap_config=/etc/designate/rootwrap.conf - You also need to let the moniker user run moniker-rootwrap as root in sudoers: - moniker ALL = (root) NOPASSWD: /usr/bin/moniker-rootwrap /etc/moniker/rootwrap.conf * + You also need to let the designate user run designate-rootwrap as root in sudoers: + designate ALL = (root) NOPASSWD: /usr/bin/designate-rootwrap /etc/designate/rootwrap.conf * Service packaging should deploy .filters files only on nodes where they are needed, to avoid allowing more than is necessary. @@ -70,10 +70,10 @@ if __name__ == '__main__': # Add ../ to sys.path to allow running from branch possible_topdir = os.path.normpath(os.path.join(os.path.abspath(execname), os.pardir, os.pardir)) - if os.path.exists(os.path.join(possible_topdir, "moniker", "__init__.py")): + if os.path.exists(os.path.join(possible_topdir, "designate", "__init__.py")): sys.path.insert(0, possible_topdir) - from moniker.openstack.common.rootwrap import wrapper + from designate.openstack.common.rootwrap import wrapper # Load configuration try: diff --git a/bin/moniker-sink b/bin/designate-sink similarity index 74% rename from bin/moniker-sink rename to bin/designate-sink index 1a87fc7db..24ac0a7cd 100755 --- a/bin/moniker-sink +++ b/bin/designate-sink @@ -16,17 +16,17 @@ # under the License. import sys import eventlet -from moniker.openstack.common import cfg -from moniker.openstack.common import log as logging -from moniker.openstack.common import service -from moniker import utils -from moniker.sink import service as sink_service +from designate.openstack.common import cfg +from designate.openstack.common import log as logging +from designate.openstack.common import service +from designate import utils +from designate.sink import service as sink_service eventlet.monkey_patch() -utils.read_config('moniker', sys.argv) +utils.read_config('designate', sys.argv) -logging.setup('moniker') +logging.setup('designate') launcher = service.launch(sink_service.Service(), cfg.CONF['service:sink'].workers) diff --git a/moniker.sublime-project b/designate.sublime-project similarity index 100% rename from moniker.sublime-project rename to designate.sublime-project diff --git a/moniker/__init__.py b/designate/__init__.py similarity index 85% rename from moniker/__init__.py rename to designate/__init__.py index a763b05f0..18ac98448 100644 --- a/moniker/__init__.py +++ b/designate/__init__.py @@ -15,8 +15,8 @@ # under the License. import os import socket -from moniker.openstack.common import cfg -from moniker.openstack.common import rpc +from designate.openstack.common import cfg +from designate.openstack.common import rpc cfg.CONF.register_opts([ cfg.StrOpt('host', default=socket.gethostname(), @@ -26,11 +26,11 @@ cfg.CONF.register_opts([ '../')), help='Directory where the nova python module is installed'), cfg.StrOpt('state-path', default='$pybasedir', - help='Top-level directory for maintaining moniker\'s state'), + help='Top-level directory for maintaining designate\'s state'), cfg.StrOpt('central-topic', default='central', help='Central Topic'), cfg.StrOpt('agent-topic', default='agent', help='Agent Topic'), ]) -rpc.set_defaults(control_exchange='moniker') +rpc.set_defaults(control_exchange='designate') diff --git a/moniker/agent/__init__.py b/designate/agent/__init__.py similarity index 95% rename from moniker/agent/__init__.py rename to designate/agent/__init__.py index b75536b99..38f5894cc 100644 --- a/moniker/agent/__init__.py +++ b/designate/agent/__init__.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. -from moniker.openstack.common import cfg +from designate.openstack.common import cfg cfg.CONF.register_group(cfg.OptGroup( name='service:agent', title="Configuration for Agent Service" diff --git a/moniker/agent/rpcapi.py b/designate/agent/rpcapi.py similarity index 96% rename from moniker/agent/rpcapi.py rename to designate/agent/rpcapi.py index 8359de6ec..3bae741ab 100644 --- a/moniker/agent/rpcapi.py +++ b/designate/agent/rpcapi.py @@ -13,9 +13,9 @@ # 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 moniker.openstack.common import cfg -from moniker.openstack.common import log as logging -from moniker.openstack.common.rpc import proxy as rpc_proxy +from designate.openstack.common import cfg +from designate.openstack.common import log as logging +from designate.openstack.common.rpc import proxy as rpc_proxy LOG = logging.getLogger(__name__) diff --git a/moniker/agent/service.py b/designate/agent/service.py similarity index 83% rename from moniker/agent/service.py rename to designate/agent/service.py index 660448ae4..e6e809115 100644 --- a/moniker/agent/service.py +++ b/designate/agent/service.py @@ -13,11 +13,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. -from moniker.openstack.common import cfg -from moniker.openstack.common import log as logging -from moniker.openstack.common.rpc import service as rpc_service -from moniker import backend -from moniker.central import rpcapi as central_rpcapi +from designate.openstack.common import cfg +from designate.openstack.common import log as logging +from designate.openstack.common.rpc import service as rpc_service +from designate import backend +from designate.central import rpcapi as central_rpcapi LOG = logging.getLogger(__name__) central_api = central_rpcapi.CentralAPI() diff --git a/moniker/api/__init__.py b/designate/api/__init__.py similarity index 88% rename from moniker/api/__init__.py rename to designate/api/__init__.py index e6300429c..754a0eb11 100644 --- a/moniker/api/__init__.py +++ b/designate/api/__init__.py @@ -14,8 +14,8 @@ # License for the specific language governing permissions and limitations # under the License. import flask -from moniker.openstack.common import cfg -from moniker.openstack.common import jsonutils as json +from designate.openstack.common import cfg +from designate.openstack.common import jsonutils as json cfg.CONF.register_group(cfg.OptGroup( name='service:api', title="Configuration for API Service" @@ -29,7 +29,7 @@ cfg.CONF.register_opts([ cfg.IntOpt('api_port', default=9001, help='API Port Number'), cfg.StrOpt('api_paste_config', default='api-paste.ini', - help='File name for the paste.deploy config for moniker-api'), + help='File name for the paste.deploy config for designate-api'), cfg.StrOpt('auth_strategy', default='noauth', help='The strategy to use for auth. Supports noauth or ' 'keystone'), diff --git a/moniker/api/auth.py b/designate/api/auth.py similarity index 76% rename from moniker/api/auth.py rename to designate/api/auth.py index 98d17f430..c3fcbbf14 100644 --- a/moniker/api/auth.py +++ b/designate/api/auth.py @@ -13,12 +13,12 @@ # 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 moniker.openstack.common import cfg -from moniker.openstack.common import local -from moniker.openstack.common import log as logging -from moniker.openstack.common import uuidutils -from moniker import wsgi -from moniker.context import MonikerContext +from designate.openstack.common import cfg +from designate.openstack.common import local +from designate.openstack.common import log as logging +from designate.openstack.common import uuidutils +from designate import wsgi +from designate.context import DesignateContext LOG = logging.getLogger(__name__) @@ -45,16 +45,16 @@ class KeystoneContextMiddleware(wsgi.Middleware): roles = headers.get('X-Roles').split(',') - context = MonikerContext(auth_tok=headers.get('X-Auth-Token'), - user=headers.get('X-User-ID'), - tenant=headers.get('X-Tenant-ID'), - roles=roles) + context = DesignateContext(auth_tok=headers.get('X-Auth-Token'), + user=headers.get('X-User-ID'), + tenant=headers.get('X-Tenant-ID'), + roles=roles) # Store the context where oslo-log exepcts to find it. local.store.context = context # Attempt to sudo, if requested. - sudo_tenant_id = headers.get('X-Moniker-Sudo-Tenant-ID', None) + sudo_tenant_id = headers.get('X-Designate-Sudo-Tenant-ID', None) if sudo_tenant_id and (uuidutils.is_uuid_like(sudo_tenant_id) or sudo_tenant_id.isdigit()): @@ -68,7 +68,7 @@ class NoAuthContextMiddleware(wsgi.Middleware): def process_request(self, request): # NOTE(kiall): This makes the assumption that disabling authentication # means you wish to allow full access to everyone. - context = MonikerContext(is_admin=True) + context = DesignateContext(is_admin=True) # Store the context where oslo-log exepcts to find it. local.store.context = context diff --git a/moniker/api/service.py b/designate/api/service.py similarity index 87% rename from moniker/api/service.py rename to designate/api/service.py index 3be762156..daa61c60f 100644 --- a/moniker/api/service.py +++ b/designate/api/service.py @@ -14,12 +14,12 @@ # License for the specific language governing permissions and limitations # under the License. from paste import deploy -from moniker.openstack.common import log as logging -from moniker.openstack.common import wsgi -from moniker.openstack.common import cfg -from moniker import exceptions -from moniker import utils -from moniker import policy +from designate.openstack.common import log as logging +from designate.openstack.common import wsgi +from designate.openstack.common import cfg +from designate import exceptions +from designate import utils +from designate import policy LOG = logging.getLogger(__name__) diff --git a/moniker/api/v1/__init__.py b/designate/api/v1/__init__.py similarity index 89% rename from moniker/api/v1/__init__.py rename to designate/api/v1/__init__.py index 67c0fb972..0d487db1e 100644 --- a/moniker/api/v1/__init__.py +++ b/designate/api/v1/__init__.py @@ -20,13 +20,13 @@ from stevedore import named from werkzeug import exceptions as wexceptions from werkzeug.routing import BaseConverter from werkzeug.routing import ValidationError -from moniker.openstack.common import cfg -from moniker.openstack.common import jsonutils as json -from moniker.openstack.common import log as logging -from moniker.openstack.common import uuidutils -from moniker.openstack.common.rpc import common as rpc_common -from moniker import exceptions -from moniker import wsgi +from designate.openstack.common import cfg +from designate.openstack.common import jsonutils as json +from designate.openstack.common import log as logging +from designate.openstack.common import uuidutils +from designate.openstack.common.rpc import common as rpc_common +from designate import exceptions +from designate import wsgi LOG = logging.getLogger(__name__) @@ -37,7 +37,7 @@ cfg.CONF.register_opts([ def factory(global_config, **local_conf): - app = flask.Flask('moniker.api.v1') + app = flask.Flask('designate.api.v1') app.config.update( PROPAGATE_EXCEPTIONS=True ) @@ -70,14 +70,14 @@ def factory(global_config, **local_conf): app.register_blueprint(ext.plugin) # Add all in-built APIs - mgr = extension.ExtensionManager('moniker.api.v1') + mgr = extension.ExtensionManager('designate.api.v1') mgr.map(_register_blueprint) # Add any (enabled) optional extensions extensions = cfg.CONF['service:api'].enabled_extensions_v1 if len(extensions) > 0: - extmgr = named.NamedExtensionManager('moniker.api.v1.extensions', + extmgr = named.NamedExtensionManager('designate.api.v1.extensions', names=extensions) extmgr.map(_register_blueprint) @@ -103,7 +103,7 @@ class FaultWrapperMiddleware(wsgi.Middleware): try: return request.get_response(self.application) except exceptions.Base, e: - # Handle Moniker Exceptions + # Handle Designate Exceptions status = e.error_code if hasattr(e, 'error_code') else 500 # Start building up a response diff --git a/moniker/api/v1/domains.py b/designate/api/v1/domains.py similarity index 95% rename from moniker/api/v1/domains.py rename to designate/api/v1/domains.py index 1c3a5ec99..a798af502 100644 --- a/moniker/api/v1/domains.py +++ b/designate/api/v1/domains.py @@ -14,9 +14,9 @@ # License for the specific language governing permissions and limitations # under the License. import flask -from moniker.openstack.common import log as logging -from moniker import schema -from moniker.central import rpcapi as central_rpcapi +from designate.openstack.common import log as logging +from designate import schema +from designate.central import rpcapi as central_rpcapi LOG = logging.getLogger(__name__) central_api = central_rpcapi.CentralAPI() diff --git a/moniker/api/v1/extensions/__init__.py b/designate/api/v1/extensions/__init__.py similarity index 100% rename from moniker/api/v1/extensions/__init__.py rename to designate/api/v1/extensions/__init__.py diff --git a/moniker/api/v1/extensions/diagnostics.py b/designate/api/v1/extensions/diagnostics.py similarity index 92% rename from moniker/api/v1/extensions/diagnostics.py rename to designate/api/v1/extensions/diagnostics.py index e5b338e0d..c33fb067f 100644 --- a/moniker/api/v1/extensions/diagnostics.py +++ b/designate/api/v1/extensions/diagnostics.py @@ -14,8 +14,8 @@ # License for the specific language governing permissions and limitations # under the License. import flask -from moniker.openstack.common import log as logging -from moniker.openstack.common import rpc +from designate.openstack.common import log as logging +from designate.openstack.common import rpc LOG = logging.getLogger(__name__) blueprint = flask.Blueprint('diagnostics', __name__) diff --git a/moniker/api/v1/extensions/reports.py b/designate/api/v1/extensions/reports.py similarity index 95% rename from moniker/api/v1/extensions/reports.py rename to designate/api/v1/extensions/reports.py index 728a4eaf9..c5adcf386 100644 --- a/moniker/api/v1/extensions/reports.py +++ b/designate/api/v1/extensions/reports.py @@ -14,8 +14,8 @@ # License for the specific language governing permissions and limitations # under the License. import flask -from moniker.openstack.common import log as logging -from moniker.central import rpcapi as central_rpcapi +from designate.openstack.common import log as logging +from designate.central import rpcapi as central_rpcapi LOG = logging.getLogger(__name__) central_api = central_rpcapi.CentralAPI() diff --git a/moniker/api/v1/extensions/sync.py b/designate/api/v1/extensions/sync.py similarity index 93% rename from moniker/api/v1/extensions/sync.py rename to designate/api/v1/extensions/sync.py index 7d20c19d5..fc6a4c656 100644 --- a/moniker/api/v1/extensions/sync.py +++ b/designate/api/v1/extensions/sync.py @@ -14,8 +14,8 @@ # License for the specific language governing permissions and limitations # under the License. import flask -from moniker.openstack.common import log as logging -from moniker.central import rpcapi as central_rpcapi +from designate.openstack.common import log as logging +from designate.central import rpcapi as central_rpcapi LOG = logging.getLogger(__name__) central_api = central_rpcapi.CentralAPI() diff --git a/moniker/api/v1/limits.py b/designate/api/v1/limits.py similarity index 90% rename from moniker/api/v1/limits.py rename to designate/api/v1/limits.py index 652696f3d..2750d2aec 100644 --- a/moniker/api/v1/limits.py +++ b/designate/api/v1/limits.py @@ -14,9 +14,9 @@ # License for the specific language governing permissions and limitations # under the License. import flask -from moniker.openstack.common import log as logging -from moniker import schema -from moniker.central import rpcapi as central_rpcapi +from designate.openstack.common import log as logging +from designate import schema +from designate.central import rpcapi as central_rpcapi LOG = logging.getLogger(__name__) central_api = central_rpcapi.CentralAPI() diff --git a/moniker/api/v1/records.py b/designate/api/v1/records.py similarity index 95% rename from moniker/api/v1/records.py rename to designate/api/v1/records.py index 6e98a33b3..f82a521a2 100644 --- a/moniker/api/v1/records.py +++ b/designate/api/v1/records.py @@ -14,9 +14,9 @@ # License for the specific language governing permissions and limitations # under the License. import flask -from moniker.openstack.common import log as logging -from moniker import schema -from moniker.central import rpcapi as central_rpcapi +from designate.openstack.common import log as logging +from designate import schema +from designate.central import rpcapi as central_rpcapi LOG = logging.getLogger(__name__) central_api = central_rpcapi.CentralAPI() diff --git a/moniker/api/v1/servers.py b/designate/api/v1/servers.py similarity index 95% rename from moniker/api/v1/servers.py rename to designate/api/v1/servers.py index 231677862..24a75f8e9 100644 --- a/moniker/api/v1/servers.py +++ b/designate/api/v1/servers.py @@ -14,9 +14,9 @@ # License for the specific language governing permissions and limitations # under the License. import flask -from moniker.openstack.common import log as logging -from moniker import schema -from moniker.central import rpcapi as central_rpcapi +from designate.openstack.common import log as logging +from designate import schema +from designate.central import rpcapi as central_rpcapi LOG = logging.getLogger(__name__) central_api = central_rpcapi.CentralAPI() diff --git a/moniker/api/v1/tsigkeys.py b/designate/api/v1/tsigkeys.py similarity index 95% rename from moniker/api/v1/tsigkeys.py rename to designate/api/v1/tsigkeys.py index 59649aadb..036501293 100644 --- a/moniker/api/v1/tsigkeys.py +++ b/designate/api/v1/tsigkeys.py @@ -14,9 +14,9 @@ # License for the specific language governing permissions and limitations # under the License. import flask -from moniker.openstack.common import log as logging -from moniker import schema -from moniker.central import rpcapi as central_rpcapi +from designate.openstack.common import log as logging +from designate import schema +from designate.central import rpcapi as central_rpcapi LOG = logging.getLogger(__name__) central_api = central_rpcapi.CentralAPI() diff --git a/moniker/api/versions.py b/designate/api/versions.py similarity index 95% rename from moniker/api/versions.py rename to designate/api/versions.py index a98d4cd6e..b608678d0 100644 --- a/moniker/api/versions.py +++ b/designate/api/versions.py @@ -17,7 +17,7 @@ import flask def factory(global_config, **local_conf): - app = flask.Flask('moniker.api.versions') + app = flask.Flask('designate.api.versions') @app.route('/', methods=['GET']) def version_list(): diff --git a/moniker/backend/__init__.py b/designate/backend/__init__.py similarity index 91% rename from moniker/backend/__init__.py rename to designate/backend/__init__.py index 329a6d931..c6260d09e 100644 --- a/moniker/backend/__init__.py +++ b/designate/backend/__init__.py @@ -13,8 +13,8 @@ # 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 moniker.openstack.common import log as logging -from moniker.plugin import Plugin +from designate.openstack.common import log as logging +from designate.plugin import Plugin LOG = logging.getLogger(__name__) diff --git a/moniker/backend/base.py b/designate/backend/base.py similarity index 93% rename from moniker/backend/base.py rename to designate/backend/base.py index 25b67e8c9..a28371c1e 100644 --- a/moniker/backend/base.py +++ b/designate/backend/base.py @@ -14,10 +14,10 @@ # License for the specific language governing permissions and limitations # under the License. import abc -from moniker.openstack.common import log as logging -from moniker import exceptions -from moniker.context import MonikerContext -from moniker.plugin import Plugin +from designate.openstack.common import log as logging +from designate import exceptions +from designate.context import DesignateContext +from designate.plugin import Plugin LOG = logging.getLogger(__name__) @@ -26,12 +26,12 @@ LOG = logging.getLogger(__name__) class Backend(Plugin): """ Base class for backend implementations """ __plugin_type__ = 'backend' - __plugin_ns__ = 'moniker.backend' + __plugin_ns__ = 'designate.backend' def __init__(self, central_service): super(Backend, self).__init__() self.central_service = central_service - self.admin_context = MonikerContext.get_admin_context() + self.admin_context = DesignateContext.get_admin_context() def create_tsigkey(self, context, tsigkey): """ Create a TSIG Key """ diff --git a/moniker/backend/impl_bind9.py b/designate/backend/impl_bind9.py similarity index 97% rename from moniker/backend/impl_bind9.py rename to designate/backend/impl_bind9.py index 193262157..e8b7a4ac6 100644 --- a/moniker/backend/impl_bind9.py +++ b/designate/backend/impl_bind9.py @@ -14,10 +14,10 @@ # License for the specific language governing permissions and limitations # under the License. import os -from moniker.openstack.common import cfg -from moniker.openstack.common import log as logging -from moniker import utils -from moniker.backend import base +from designate.openstack.common import cfg +from designate.openstack.common import log as logging +from designate import utils +from designate.backend import base LOG = logging.getLogger(__name__) diff --git a/moniker/backend/impl_dnsmasq.py b/designate/backend/impl_dnsmasq.py similarity index 96% rename from moniker/backend/impl_dnsmasq.py rename to designate/backend/impl_dnsmasq.py index 3d18990dd..08f58d631 100644 --- a/moniker/backend/impl_dnsmasq.py +++ b/designate/backend/impl_dnsmasq.py @@ -16,10 +16,10 @@ import os import glob import shutil -from moniker.openstack.common import cfg -from moniker.openstack.common import log as logging -from moniker import utils -from moniker.backend import base +from designate.openstack.common import cfg +from designate.openstack.common import log as logging +from designate import utils +from designate.backend import base LOG = logging.getLogger(__name__) diff --git a/moniker/backend/impl_fake.py b/designate/backend/impl_fake.py similarity index 97% rename from moniker/backend/impl_fake.py rename to designate/backend/impl_fake.py index c336d2024..9b4db56bb 100644 --- a/moniker/backend/impl_fake.py +++ b/designate/backend/impl_fake.py @@ -13,8 +13,8 @@ # 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 moniker.openstack.common import log as logging -from moniker.backend import base +from designate.openstack.common import log as logging +from designate.backend import base LOG = logging.getLogger(__name__) diff --git a/moniker/backend/impl_mysqlbind9.py b/designate/backend/impl_mysqlbind9.py similarity index 95% rename from moniker/backend/impl_mysqlbind9.py rename to designate/backend/impl_mysqlbind9.py index a0fbbf4be..96a1531c4 100644 --- a/moniker/backend/impl_mysqlbind9.py +++ b/designate/backend/impl_mysqlbind9.py @@ -16,14 +16,14 @@ # License for the specific language governing permissions and limitations # under the License. import os -from moniker.openstack.common import cfg -from moniker.openstack.common import log as logging -from moniker import utils -from moniker.backend import base +from designate.openstack.common import cfg +from designate.openstack.common import log as logging +from designate import utils +from designate.backend import base from sqlalchemy.ext.sqlsoup import SqlSoup from sqlalchemy.engine.url import _parse_rfc1738_args -from moniker.sqlalchemy.session import get_engine -from moniker.sqlalchemy.session import SQLOPTS +from designate.sqlalchemy.session import get_engine +from designate.sqlalchemy.session import SQLOPTS LOG = logging.getLogger(__name__) @@ -90,11 +90,11 @@ class MySQLBind9Backend(base.Backend): domain['minimum']) # use the domain id for records that don't have a match - # in moniker's records table + # in designate's records table table.insert( tenant_id=domain['tenant_id'], domain_id=domain['id'], - moniker_rec_id=domain['id'], + designate_rec_id=domain['id'], name=domain['name'], ttl=domain['ttl'], type='SOA', @@ -108,12 +108,12 @@ class MySQLBind9Backend(base.Backend): table = self.get_dns_table() # use the domain id for records that don't have a match - # in moniker's records table + # in designate's records table for server in servers: table.insert( tenant_id=domain['tenant_id'], domain_id=domain['id'], - moniker_rec_id=domain['id'], + designate_rec_id=domain['id'], name=domain['name'], ttl=domain['ttl'], type='NS', @@ -129,7 +129,7 @@ class MySQLBind9Backend(base.Backend): table.insert( tenant_id=tenant_id, domain_id=domain_id, - moniker_rec_id=record['id'], + designate_rec_id=record['id'], name=record['name'], ttl=record['ttl'], type=record['type'], @@ -164,7 +164,7 @@ class MySQLBind9Backend(base.Backend): q = table.filter_by( tenant_id=tenant_id, domain_id=record['domain_id'], - moniker_rec_id=record['id']) + designate_rec_id=record['id']) q.update({'ttl': record['ttl'], 'type': record['type'], @@ -221,7 +221,7 @@ class MySQLBind9Backend(base.Backend): q = table.filter_by( tenant_id=tenant_id, domain_id=record['domain_id'], - moniker_rec_id=record['id']) + designate_rec_id=record['id']) q.delete() diff --git a/moniker/backend/impl_powerdns/__init__.py b/designate/backend/impl_powerdns/__init__.py similarity index 93% rename from moniker/backend/impl_powerdns/__init__.py rename to designate/backend/impl_powerdns/__init__.py index 51ce53c1f..e146701f7 100644 --- a/moniker/backend/impl_powerdns/__init__.py +++ b/designate/backend/impl_powerdns/__init__.py @@ -19,14 +19,14 @@ import base64 from sqlalchemy.sql import select from sqlalchemy.sql.expression import null from sqlalchemy.orm import exc as sqlalchemy_exceptions -from moniker.openstack.common import cfg -from moniker.openstack.common import log as logging -from moniker import exceptions -from moniker.backend import base -from moniker.backend.impl_powerdns import models -from moniker.sqlalchemy.session import get_session -from moniker.sqlalchemy.session import SQLOPTS -from moniker.sqlalchemy.expressions import InsertFromSelect +from designate.openstack.common import cfg +from designate.openstack.common import log as logging +from designate import exceptions +from designate.backend import base +from designate.backend.impl_powerdns import models +from designate.sqlalchemy.session import get_session +from designate.sqlalchemy.session import SQLOPTS +from designate.sqlalchemy.expressions import InsertFromSelect LOG = logging.getLogger(__name__) TSIG_SUPPORTED_ALGORITHMS = ['hmac-md5'] @@ -60,7 +60,7 @@ class PowerDNSBackend(base.Backend): tsigkey_m = models.TsigKey() tsigkey_m.update({ - 'moniker_id': tsigkey['id'], + 'designate_id': tsigkey['id'], 'name': tsigkey['name'], 'algorithm': tsigkey['algorithm'], 'secret': base64.b64encode(tsigkey['secret']) @@ -120,7 +120,7 @@ class PowerDNSBackend(base.Backend): domain_m = models.Domain() domain_m.update({ - 'moniker_id': domain['id'], + 'designate_id': domain['id'], 'name': domain['name'].rstrip('.'), 'master': servers[0]['name'].rstrip('.'), 'type': cfg.CONF['backend:powerdns'].domain_type, @@ -131,7 +131,7 @@ class PowerDNSBackend(base.Backend): for server in servers: record_m = models.Record() record_m.update({ - 'moniker_id': server['id'], + 'designate_id': server['id'], 'domain_id': domain_m.id, 'name': domain['name'].rstrip('.'), 'type': 'NS', @@ -154,7 +154,7 @@ class PowerDNSBackend(base.Backend): # before the NS records are in place. record_m = models.Record() record_m.update({ - 'moniker_id': domain['id'], + 'designate_id': domain['id'], 'domain_id': domain_m.id, 'name': domain['name'].rstrip('.'), 'type': 'SOA', @@ -186,7 +186,7 @@ class PowerDNSBackend(base.Backend): record_m = models.Record() record_m.update({ - 'moniker_id': record['id'], + 'designate_id': record['id'], 'domain_id': domain_m.id, 'name': record['name'].rstrip('.'), 'type': record['type'], @@ -287,7 +287,7 @@ class PowerDNSBackend(base.Backend): query = self.session.query(models.TsigKey) try: - tsigkey = query.filter_by(moniker_id=tsigkey_id).one() + tsigkey = query.filter_by(designate_id=tsigkey_id).one() except sqlalchemy_exceptions.NoResultFound: raise exceptions.TsigKeyNotFound('No tsigkey found') except sqlalchemy_exceptions.MultipleResultsFound: @@ -299,7 +299,7 @@ class PowerDNSBackend(base.Backend): query = self.session.query(models.Domain) try: - domain = query.filter_by(moniker_id=domain_id).one() + domain = query.filter_by(designate_id=domain_id).one() except sqlalchemy_exceptions.NoResultFound: raise exceptions.DomainNotFound('No domain found') except sqlalchemy_exceptions.MultipleResultsFound: @@ -311,7 +311,7 @@ class PowerDNSBackend(base.Backend): query = self.session.query(models.Record) if record_id: - query = query.filter_by(moniker_id=record_id) + query = query.filter_by(designate_id=record_id) if type: query = query.filter_by(type=type) diff --git a/designate/backend/impl_powerdns/migrate_repo/README b/designate/backend/impl_powerdns/migrate_repo/README new file mode 100644 index 000000000..2f979fcb0 --- /dev/null +++ b/designate/backend/impl_powerdns/migrate_repo/README @@ -0,0 +1,4 @@ +This is a database migration repository for the project Designate. + +More information at +http://code.google.com/p/sqlalchemy-migrate/ diff --git a/moniker/backend/impl_powerdns/migrate_repo/__init__.py b/designate/backend/impl_powerdns/migrate_repo/__init__.py similarity index 100% rename from moniker/backend/impl_powerdns/migrate_repo/__init__.py rename to designate/backend/impl_powerdns/migrate_repo/__init__.py diff --git a/moniker/backend/impl_powerdns/migrate_repo/manage.py b/designate/backend/impl_powerdns/migrate_repo/manage.py similarity index 100% rename from moniker/backend/impl_powerdns/migrate_repo/manage.py rename to designate/backend/impl_powerdns/migrate_repo/manage.py diff --git a/moniker/backend/impl_powerdns/migrate_repo/migrate.cfg b/designate/backend/impl_powerdns/migrate_repo/migrate.cfg similarity index 97% rename from moniker/backend/impl_powerdns/migrate_repo/migrate.cfg rename to designate/backend/impl_powerdns/migrate_repo/migrate.cfg index d46c00e46..34f056f94 100644 --- a/moniker/backend/impl_powerdns/migrate_repo/migrate.cfg +++ b/designate/backend/impl_powerdns/migrate_repo/migrate.cfg @@ -1,7 +1,7 @@ [db_settings] # Used to identify which repository this database is versioned under. # You can use the name of your project. -repository_id=MonikerPowerDNS +repository_id=DesignatePowerDNS # The name of the database table used to track the schema version. # This name shouldn't already be used by your project. diff --git a/moniker/backend/impl_powerdns/migrate_repo/versions/001_add_initial_schema.py b/designate/backend/impl_powerdns/migrate_repo/versions/001_add_initial_schema.py similarity index 100% rename from moniker/backend/impl_powerdns/migrate_repo/versions/001_add_initial_schema.py rename to designate/backend/impl_powerdns/migrate_repo/versions/001_add_initial_schema.py diff --git a/moniker/backend/impl_powerdns/migrate_repo/versions/002_add_moniker_id_cols.py b/designate/backend/impl_powerdns/migrate_repo/versions/002_add_moniker_id_cols.py similarity index 63% rename from moniker/backend/impl_powerdns/migrate_repo/versions/002_add_moniker_id_cols.py rename to designate/backend/impl_powerdns/migrate_repo/versions/002_add_moniker_id_cols.py index 5065529e3..4c72fc651 100644 --- a/moniker/backend/impl_powerdns/migrate_repo/versions/002_add_moniker_id_cols.py +++ b/designate/backend/impl_powerdns/migrate_repo/versions/002_add_moniker_id_cols.py @@ -14,7 +14,7 @@ # License for the specific language governing permissions and limitations # under the License. from sqlalchemy import MetaData, Table, Column -from moniker.sqlalchemy.types import UUID +from designate.sqlalchemy.types import UUID meta = MetaData() @@ -26,14 +26,14 @@ def upgrade(migrate_engine): domains_table = Table('domains', meta, autoload=True) records_table = Table('records', meta, autoload=True) - tsigkeys_moniker_id = Column('moniker_id', UUID()) - tsigkeys_moniker_id.create(tsigkeys_table) + tsigkeys_designate_id = Column('designate_id', UUID()) + tsigkeys_designate_id.create(tsigkeys_table) - domains_moniker_id = Column('moniker_id', UUID()) - domains_moniker_id.create(domains_table) + domains_designate_id = Column('designate_id', UUID()) + domains_designate_id.create(domains_table) - records_moniker_id = Column('moniker_id', UUID()) - records_moniker_id.create(records_table) + records_designate_id = Column('designate_id', UUID()) + records_designate_id.create(records_table) def downgrade(migrate_engine): @@ -43,11 +43,11 @@ def downgrade(migrate_engine): domains_table = Table('domains', meta, autoload=True) records_table = Table('records', meta, autoload=True) - tsigkeys_moniker_id = Column('moniker_id', UUID()) - tsigkeys_moniker_id.drop(tsigkeys_table) + tsigkeys_designate_id = Column('designate_id', UUID()) + tsigkeys_designate_id.drop(tsigkeys_table) - domains_moniker_id = Column('moniker_id', UUID()) - domains_moniker_id.drop(domains_table) + domains_designate_id = Column('designate_id', UUID()) + domains_designate_id.drop(domains_table) - records_moniker_id = Column('moniker_id', UUID()) - records_moniker_id.drop(records_table) + records_designate_id = Column('designate_id', UUID()) + records_designate_id.drop(records_table) diff --git a/moniker/backend/impl_powerdns/migrate_repo/versions/003_correct_master_column_length.py b/designate/backend/impl_powerdns/migrate_repo/versions/003_correct_master_column_length.py similarity index 100% rename from moniker/backend/impl_powerdns/migrate_repo/versions/003_correct_master_column_length.py rename to designate/backend/impl_powerdns/migrate_repo/versions/003_correct_master_column_length.py diff --git a/moniker/backend/impl_powerdns/migrate_repo/versions/004_correct_content_column_length.py b/designate/backend/impl_powerdns/migrate_repo/versions/004_correct_content_column_length.py similarity index 100% rename from moniker/backend/impl_powerdns/migrate_repo/versions/004_correct_content_column_length.py rename to designate/backend/impl_powerdns/migrate_repo/versions/004_correct_content_column_length.py diff --git a/moniker/backend/impl_powerdns/migrate_repo/versions/__init__.py b/designate/backend/impl_powerdns/migrate_repo/versions/__init__.py similarity index 100% rename from moniker/backend/impl_powerdns/migrate_repo/versions/__init__.py rename to designate/backend/impl_powerdns/migrate_repo/versions/__init__.py diff --git a/moniker/backend/impl_powerdns/models.py b/designate/backend/impl_powerdns/models.py similarity index 90% rename from moniker/backend/impl_powerdns/models.py rename to designate/backend/impl_powerdns/models.py index 87f533aa9..00bac6bd4 100644 --- a/moniker/backend/impl_powerdns/models.py +++ b/designate/backend/impl_powerdns/models.py @@ -17,8 +17,8 @@ # under the License. from sqlalchemy import Column, String, Text, Integer, Boolean from sqlalchemy.ext.declarative import declarative_base -from moniker.sqlalchemy.models import Base as CommonBase -from moniker.sqlalchemy.types import UUID +from designate.sqlalchemy.models import Base as CommonBase +from designate.sqlalchemy.types import UUID class Base(CommonBase): @@ -31,7 +31,7 @@ Base = declarative_base(cls=Base) class TsigKey(Base): __tablename__ = 'tsigkeys' - moniker_id = Column(UUID, nullable=False) + designate_id = Column(UUID, nullable=False) name = Column(String(255), default=None, nullable=True) algorithm = Column(String(255), default=None, nullable=True) @@ -49,7 +49,7 @@ class DomainMetadata(Base): class Domain(Base): __tablename__ = 'domains' - moniker_id = Column(UUID, nullable=False) + designate_id = Column(UUID, nullable=False) name = Column(String(255), nullable=False, unique=True) master = Column(String(255), nullable=True) @@ -62,7 +62,7 @@ class Domain(Base): class Record(Base): __tablename__ = 'records' - moniker_id = Column(UUID, nullable=False) + designate_id = Column(UUID, nullable=False) domain_id = Column(Integer, default=None, nullable=True) name = Column(String(255), default=None, nullable=True) diff --git a/moniker/backend/impl_rpc.py b/designate/backend/impl_rpc.py similarity index 95% rename from moniker/backend/impl_rpc.py rename to designate/backend/impl_rpc.py index 28cd00985..b02190f6b 100644 --- a/moniker/backend/impl_rpc.py +++ b/designate/backend/impl_rpc.py @@ -13,8 +13,8 @@ # 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 moniker.backend import base -from moniker.agent import rpcapi as agent_rpcapi +from designate.backend import base +from designate.agent import rpcapi as agent_rpcapi agent_api = agent_rpcapi.AgentAPI() diff --git a/moniker/central/__init__.py b/designate/central/__init__.py similarity index 99% rename from moniker/central/__init__.py rename to designate/central/__init__.py index 52fb06b5a..1f8c58e30 100644 --- a/moniker/central/__init__.py +++ b/designate/central/__init__.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. -from moniker.openstack.common import cfg +from designate.openstack.common import cfg # NOTE(kiall): See http://data.iana.org/TLD/tlds-alpha-by-domain.txt # Version 2013031800. diff --git a/moniker/central/rpcapi.py b/designate/central/rpcapi.py similarity index 98% rename from moniker/central/rpcapi.py rename to designate/central/rpcapi.py index 13edeb430..d2f70c0a3 100644 --- a/moniker/central/rpcapi.py +++ b/designate/central/rpcapi.py @@ -13,9 +13,9 @@ # 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 moniker.openstack.common import cfg -from moniker.openstack.common import log as logging -from moniker.openstack.common.rpc import proxy as rpc_proxy +from designate.openstack.common import cfg +from designate.openstack.common import log as logging +from designate.openstack.common.rpc import proxy as rpc_proxy LOG = logging.getLogger(__name__) diff --git a/moniker/central/service.py b/designate/central/service.py similarity index 98% rename from moniker/central/service.py rename to designate/central/service.py index cb359058f..11798c7d3 100644 --- a/moniker/central/service.py +++ b/designate/central/service.py @@ -14,15 +14,15 @@ # License for the specific language governing permissions and limitations # under the License. import re -from moniker.openstack.common import cfg -from moniker.openstack.common import log as logging -from moniker.openstack.common.rpc import service as rpc_service -from moniker import exceptions -from moniker import policy -from moniker import storage -from moniker import quota -from moniker import utils -from moniker import backend +from designate.openstack.common import cfg +from designate.openstack.common import log as logging +from designate.openstack.common.rpc import service as rpc_service +from designate import exceptions +from designate import policy +from designate import storage +from designate import quota +from designate import utils +from designate import backend LOG = logging.getLogger(__name__) diff --git a/moniker/context.py b/designate/context.py similarity index 90% rename from moniker/context.py rename to designate/context.py index 716559306..c6c147bc9 100644 --- a/moniker/context.py +++ b/designate/context.py @@ -14,18 +14,18 @@ # License for the specific language governing permissions and limitations # under the License. import itertools -from moniker.openstack.common import context -from moniker.openstack.common import log as logging -from moniker import policy +from designate.openstack.common import context +from designate.openstack.common import log as logging +from designate import policy LOG = logging.getLogger(__name__) -class MonikerContext(context.RequestContext): +class DesignateContext(context.RequestContext): def __init__(self, auth_tok=None, user=None, tenant=None, is_admin=False, read_only=False, show_deleted=False, request_id=None, roles=[]): - super(MonikerContext, self).__init__( + super(DesignateContext, self).__init__( auth_tok=auth_tok, user=user, tenant=tenant, @@ -58,7 +58,7 @@ class MonikerContext(context.RequestContext): % (self.user_id, tenant_id)) def to_dict(self): - d = super(MonikerContext, self).to_dict() + d = super(DesignateContext, self).to_dict() d.update({ 'user_id': self.user_id, @@ -106,7 +106,7 @@ class MonikerContext(context.RequestContext): @classmethod def get_context_from_function_and_args(cls, function, args, kwargs): """ - Find an arg of type MonikerContext and return it. + Find an arg of type DesignateContext and return it. This is useful in a couple of decorators where we don't know much about the function we're wrapping. diff --git a/moniker/debug.py b/designate/debug.py similarity index 100% rename from moniker/debug.py rename to designate/debug.py diff --git a/moniker/exceptions.py b/designate/exceptions.py similarity index 100% rename from moniker/exceptions.py rename to designate/exceptions.py diff --git a/moniker/manage/__init__.py b/designate/manage/__init__.py similarity index 76% rename from moniker/manage/__init__.py rename to designate/manage/__init__.py index fcc259367..41d4ba727 100644 --- a/moniker/manage/__init__.py +++ b/designate/manage/__init__.py @@ -15,15 +15,15 @@ # under the License. from cliff.app import App from cliff.commandmanager import CommandManager -from moniker.version import version_info as version +from designate.version import version_info as version -class MonikerShell(App): +class DesignateShell(App): CONSOLE_MESSAGE_FORMAT = '%(levelname)s: %(message)s' def __init__(self): - super(MonikerShell, self).__init__( - description='Moniker Server Side Management CLI', + super(DesignateShell, self).__init__( + description='Designate Server Side Management CLI', version=version.version_string(), - command_manager=CommandManager('moniker.manage') + command_manager=CommandManager('designate.manage') ) diff --git a/moniker/manage/base.py b/designate/manage/base.py similarity index 91% rename from moniker/manage/base.py rename to designate/manage/base.py index f8565b05d..6c8aed8d1 100644 --- a/moniker/manage/base.py +++ b/designate/manage/base.py @@ -15,15 +15,15 @@ # under the License. import abc from cliff.command import Command as CliffCommand -from moniker.context import MonikerContext +from designate.context import DesignateContext class Command(CliffCommand): __metaclass__ = abc.ABCMeta def run(self, parsed_args): - self.context = MonikerContext.get_admin_context( - request_id="moniker-manage") + self.context = DesignateContext.get_admin_context( + request_id="designate-manage") return super(Command, self).run(parsed_args) diff --git a/moniker/manage/database.py b/designate/manage/database.py similarity index 93% rename from moniker/manage/database.py rename to designate/manage/database.py index d6c5bf849..d8dedfa14 100644 --- a/moniker/manage/database.py +++ b/designate/manage/database.py @@ -17,15 +17,15 @@ import os from migrate.exceptions import (DatabaseAlreadyControlledError, DatabaseNotControlledError) from migrate.versioning import api as versioning_api -from moniker.openstack.common import log as logging -from moniker.openstack.common import cfg -from moniker.manage import base +from designate.openstack.common import log as logging +from designate.openstack.common import cfg +from designate.manage import base LOG = logging.getLogger(__name__) REPOSITORY = os.path.abspath(os.path.join(os.path.dirname(__file__), '..', 'storage', 'impl_sqlalchemy', 'migrate_repo')) -cfg.CONF.import_opt('database_connection', 'moniker.storage.impl_sqlalchemy', +cfg.CONF.import_opt('database_connection', 'designate.storage.impl_sqlalchemy', group='storage:sqlalchemy') diff --git a/moniker/manage/powerdns.py b/designate/manage/powerdns.py similarity index 91% rename from moniker/manage/powerdns.py rename to designate/manage/powerdns.py index 92a2c6aee..f631b65ac 100644 --- a/moniker/manage/powerdns.py +++ b/designate/manage/powerdns.py @@ -16,15 +16,15 @@ import os from migrate.exceptions import DatabaseAlreadyControlledError from migrate.versioning import api as versioning_api -from moniker.openstack.common import log as logging -from moniker.openstack.common import cfg -from moniker.manage import base +from designate.openstack.common import log as logging +from designate.openstack.common import cfg +from designate.manage import base LOG = logging.getLogger(__name__) REPOSITORY = os.path.abspath(os.path.join(os.path.dirname(__file__), '..', 'backend', 'impl_powerdns', 'migrate_repo')) -cfg.CONF.import_opt('database_connection', 'moniker.backend.impl_powerdns', +cfg.CONF.import_opt('database_connection', 'designate.backend.impl_powerdns', group='backend:powerdns') diff --git a/moniker/notification_handler/__init__.py b/designate/notification_handler/__init__.py similarity index 100% rename from moniker/notification_handler/__init__.py rename to designate/notification_handler/__init__.py diff --git a/moniker/notification_handler/base.py b/designate/notification_handler/base.py similarity index 91% rename from moniker/notification_handler/base.py rename to designate/notification_handler/base.py index 73bf416b3..8c359a54b 100644 --- a/moniker/notification_handler/base.py +++ b/designate/notification_handler/base.py @@ -15,11 +15,11 @@ # License for the specific language governing permissions and limitations # under the License. import abc -from moniker.openstack.common import cfg -from moniker.openstack.common import log as logging -from moniker.central import rpcapi as central_rpcapi -from moniker.context import MonikerContext -from moniker.plugin import Plugin +from designate.openstack.common import cfg +from designate.openstack.common import log as logging +from designate.central import rpcapi as central_rpcapi +from designate.context import DesignateContext +from designate.plugin import Plugin LOG = logging.getLogger(__name__) @@ -45,7 +45,7 @@ def get_ip_data(addr_dict): class Handler(Plugin): """ Base class for notification handlers """ - __plugin_ns__ = 'moniker.notification.handler' + __plugin_ns__ = 'designate.notification.handler' __plugin_type__ = 'handler' @abc.abstractmethod @@ -69,7 +69,7 @@ class Handler(Plugin): """ Return the domain for this context """ - context = MonikerContext.get_admin_context() + context = DesignateContext.get_admin_context() return central_api.get_domain(context, domain_id) @@ -98,7 +98,7 @@ class BaseAddressHandler(Handler): data = extra.copy() data['domain'] = domain['name'] - context = MonikerContext.get_admin_context() + context = DesignateContext.get_admin_context() for addr in addresses: record_data = data.copy() @@ -125,7 +125,7 @@ class BaseAddressHandler(Handler): :param criterion: Criterion to search and destroy records """ - context = MonikerContext.get_admin_context() + context = DesignateContext.get_admin_context() if managed: criterion.update({ diff --git a/moniker/notification_handler/nova.py b/designate/notification_handler/nova.py similarity index 92% rename from moniker/notification_handler/nova.py rename to designate/notification_handler/nova.py index 7790d2038..d655197b8 100644 --- a/moniker/notification_handler/nova.py +++ b/designate/notification_handler/nova.py @@ -13,9 +13,9 @@ # 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 moniker.openstack.common import cfg -from moniker.openstack.common import log as logging -from moniker.notification_handler.base import BaseAddressHandler +from designate.openstack.common import cfg +from designate.openstack.common import log as logging +from designate.notification_handler.base import BaseAddressHandler LOG = logging.getLogger(__name__) diff --git a/moniker/notification_handler/quantum.py b/designate/notification_handler/quantum.py similarity index 93% rename from moniker/notification_handler/quantum.py rename to designate/notification_handler/quantum.py index 8d924fc32..f97eaf0f2 100644 --- a/moniker/notification_handler/quantum.py +++ b/designate/notification_handler/quantum.py @@ -13,9 +13,9 @@ # 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 moniker.openstack.common import cfg -from moniker.openstack.common import log as logging -from moniker.notification_handler.base import BaseAddressHandler +from designate.openstack.common import cfg +from designate.openstack.common import log as logging +from designate.notification_handler.base import BaseAddressHandler LOG = logging.getLogger(__name__) diff --git a/moniker/openstack/__init__.py b/designate/openstack/__init__.py similarity index 100% rename from moniker/openstack/__init__.py rename to designate/openstack/__init__.py diff --git a/moniker/openstack/common/__init__.py b/designate/openstack/common/__init__.py similarity index 100% rename from moniker/openstack/common/__init__.py rename to designate/openstack/common/__init__.py diff --git a/moniker/openstack/common/cfg.py b/designate/openstack/common/cfg.py similarity index 99% rename from moniker/openstack/common/cfg.py rename to designate/openstack/common/cfg.py index 3e47c8874..03495204d 100644 --- a/moniker/openstack/common/cfg.py +++ b/designate/openstack/common/cfg.py @@ -220,7 +220,7 @@ log files:: This module also contains a global instance of the ConfigOpts class in order to support a common usage pattern in OpenStack:: - from moniker.openstack.common import cfg + from designate.openstack.common import cfg opts = [ cfg.StrOpt('bind_host', default='0.0.0.0'), @@ -268,7 +268,7 @@ import os import string import sys -from moniker.openstack.common import iniparser +from designate.openstack.common import iniparser class Error(Exception): diff --git a/moniker/openstack/common/context.py b/designate/openstack/common/context.py similarity index 100% rename from moniker/openstack/common/context.py rename to designate/openstack/common/context.py diff --git a/moniker/openstack/common/eventlet_backdoor.py b/designate/openstack/common/eventlet_backdoor.py similarity index 98% rename from moniker/openstack/common/eventlet_backdoor.py rename to designate/openstack/common/eventlet_backdoor.py index c7b1b958d..239d0098d 100644 --- a/moniker/openstack/common/eventlet_backdoor.py +++ b/designate/openstack/common/eventlet_backdoor.py @@ -25,7 +25,7 @@ import eventlet import eventlet.backdoor import greenlet -from moniker.openstack.common import cfg +from designate.openstack.common import cfg eventlet_backdoor_opts = [ cfg.IntOpt('backdoor_port', diff --git a/moniker/openstack/common/exception.py b/designate/openstack/common/exception.py similarity index 98% rename from moniker/openstack/common/exception.py rename to designate/openstack/common/exception.py index 6b5c27828..e6f2c33e1 100644 --- a/moniker/openstack/common/exception.py +++ b/designate/openstack/common/exception.py @@ -21,7 +21,7 @@ Exceptions common to OpenStack projects import logging -from moniker.openstack.common.gettextutils import _ +from designate.openstack.common.gettextutils import _ class Error(Exception): diff --git a/moniker/openstack/common/excutils.py b/designate/openstack/common/excutils.py similarity index 96% rename from moniker/openstack/common/excutils.py rename to designate/openstack/common/excutils.py index 4fb0387ee..a936246b7 100644 --- a/moniker/openstack/common/excutils.py +++ b/designate/openstack/common/excutils.py @@ -24,7 +24,7 @@ import logging import sys import traceback -from moniker.openstack.common.gettextutils import _ +from designate.openstack.common.gettextutils import _ @contextlib.contextmanager diff --git a/moniker/openstack/common/gettextutils.py b/designate/openstack/common/gettextutils.py similarity index 93% rename from moniker/openstack/common/gettextutils.py rename to designate/openstack/common/gettextutils.py index 1aaf39689..b8c61c507 100644 --- a/moniker/openstack/common/gettextutils.py +++ b/designate/openstack/common/gettextutils.py @@ -20,7 +20,7 @@ gettext for openstack-common modules. Usual usage in an openstack.common module: - from moniker.openstack.common.gettextutils import _ + from designate.openstack.common.gettextutils import _ """ import gettext diff --git a/moniker/openstack/common/importutils.py b/designate/openstack/common/importutils.py similarity index 100% rename from moniker/openstack/common/importutils.py rename to designate/openstack/common/importutils.py diff --git a/moniker/openstack/common/iniparser.py b/designate/openstack/common/iniparser.py similarity index 100% rename from moniker/openstack/common/iniparser.py rename to designate/openstack/common/iniparser.py diff --git a/moniker/openstack/common/jsonutils.py b/designate/openstack/common/jsonutils.py similarity index 99% rename from moniker/openstack/common/jsonutils.py rename to designate/openstack/common/jsonutils.py index 542e45257..701f85c87 100644 --- a/moniker/openstack/common/jsonutils.py +++ b/designate/openstack/common/jsonutils.py @@ -39,7 +39,7 @@ import itertools import json import xmlrpclib -from moniker.openstack.common import timeutils +from designate.openstack.common import timeutils def to_primitive(value, convert_instances=False, level=0): diff --git a/moniker/openstack/common/local.py b/designate/openstack/common/local.py similarity index 100% rename from moniker/openstack/common/local.py rename to designate/openstack/common/local.py diff --git a/moniker/openstack/common/log.py b/designate/openstack/common/log.py similarity index 98% rename from moniker/openstack/common/log.py rename to designate/openstack/common/log.py index 3c2466833..07c6be329 100644 --- a/moniker/openstack/common/log.py +++ b/designate/openstack/common/log.py @@ -40,11 +40,11 @@ import stat import sys import traceback -from moniker.openstack.common import cfg -from moniker.openstack.common.gettextutils import _ -from moniker.openstack.common import jsonutils -from moniker.openstack.common import local -from moniker.openstack.common import notifier +from designate.openstack.common import cfg +from designate.openstack.common.gettextutils import _ +from designate.openstack.common import jsonutils +from designate.openstack.common import local +from designate.openstack.common import notifier _DEFAULT_LOG_FORMAT = "%(asctime)s %(levelname)8s [%(name)s] %(message)s" @@ -304,7 +304,7 @@ class JSONFormatter(logging.Formatter): class PublishErrorsHandler(logging.Handler): def emit(self, record): - if ('moniker.openstack.common.notifier.log_notifier' in + if ('designate.openstack.common.notifier.log_notifier' in CONF.notification_driver): return notifier.api.notify(None, 'error.publisher', diff --git a/moniker/openstack/common/loopingcall.py b/designate/openstack/common/loopingcall.py similarity index 96% rename from moniker/openstack/common/loopingcall.py rename to designate/openstack/common/loopingcall.py index 13a9e3d81..54f18e509 100644 --- a/moniker/openstack/common/loopingcall.py +++ b/designate/openstack/common/loopingcall.py @@ -22,9 +22,9 @@ import sys from eventlet import event from eventlet import greenthread -from moniker.openstack.common.gettextutils import _ -from moniker.openstack.common import log as logging -from moniker.openstack.common import timeutils +from designate.openstack.common.gettextutils import _ +from designate.openstack.common import log as logging +from designate.openstack.common import timeutils LOG = logging.getLogger(__name__) diff --git a/moniker/openstack/common/network_utils.py b/designate/openstack/common/network_utils.py similarity index 100% rename from moniker/openstack/common/network_utils.py rename to designate/openstack/common/network_utils.py diff --git a/moniker/openstack/common/notifier/__init__.py b/designate/openstack/common/notifier/__init__.py similarity index 100% rename from moniker/openstack/common/notifier/__init__.py rename to designate/openstack/common/notifier/__init__.py diff --git a/moniker/openstack/common/notifier/api.py b/designate/openstack/common/notifier/api.py similarity index 94% rename from moniker/openstack/common/notifier/api.py rename to designate/openstack/common/notifier/api.py index 8d0e8ff41..55dc6016d 100644 --- a/moniker/openstack/common/notifier/api.py +++ b/designate/openstack/common/notifier/api.py @@ -15,13 +15,13 @@ import uuid -from moniker.openstack.common import cfg -from moniker.openstack.common import context -from moniker.openstack.common.gettextutils import _ -from moniker.openstack.common import importutils -from moniker.openstack.common import jsonutils -from moniker.openstack.common import log as logging -from moniker.openstack.common import timeutils +from designate.openstack.common import cfg +from designate.openstack.common import context +from designate.openstack.common.gettextutils import _ +from designate.openstack.common import importutils +from designate.openstack.common import jsonutils +from designate.openstack.common import log as logging +from designate.openstack.common import timeutils LOG = logging.getLogger(__name__) diff --git a/moniker/openstack/common/notifier/log_notifier.py b/designate/openstack/common/notifier/log_notifier.py similarity index 84% rename from moniker/openstack/common/notifier/log_notifier.py rename to designate/openstack/common/notifier/log_notifier.py index f9ff77531..4439f2a65 100644 --- a/moniker/openstack/common/notifier/log_notifier.py +++ b/designate/openstack/common/notifier/log_notifier.py @@ -14,9 +14,9 @@ # under the License. -from moniker.openstack.common import cfg -from moniker.openstack.common import jsonutils -from moniker.openstack.common import log as logging +from designate.openstack.common import cfg +from designate.openstack.common import jsonutils +from designate.openstack.common import log as logging CONF = cfg.CONF @@ -30,6 +30,6 @@ def notify(_context, message): CONF.default_notification_level) priority = priority.lower() logger = logging.getLogger( - 'moniker.openstack.common.notification.%s' % + 'designate.openstack.common.notification.%s' % message['event_type']) getattr(logger, priority)(jsonutils.dumps(message)) diff --git a/moniker/openstack/common/notifier/no_op_notifier.py b/designate/openstack/common/notifier/no_op_notifier.py similarity index 100% rename from moniker/openstack/common/notifier/no_op_notifier.py rename to designate/openstack/common/notifier/no_op_notifier.py diff --git a/moniker/openstack/common/notifier/rabbit_notifier.py b/designate/openstack/common/notifier/rabbit_notifier.py similarity index 84% rename from moniker/openstack/common/notifier/rabbit_notifier.py rename to designate/openstack/common/notifier/rabbit_notifier.py index 137e55452..761a317df 100644 --- a/moniker/openstack/common/notifier/rabbit_notifier.py +++ b/designate/openstack/common/notifier/rabbit_notifier.py @@ -14,9 +14,9 @@ # under the License. -from moniker.openstack.common.gettextutils import _ -from moniker.openstack.common import log as logging -from moniker.openstack.common.notifier import rpc_notifier +from designate.openstack.common.gettextutils import _ +from designate.openstack.common import log as logging +from designate.openstack.common.notifier import rpc_notifier LOG = logging.getLogger(__name__) diff --git a/moniker/openstack/common/notifier/rpc_notifier.py b/designate/openstack/common/notifier/rpc_notifier.py similarity index 85% rename from moniker/openstack/common/notifier/rpc_notifier.py rename to designate/openstack/common/notifier/rpc_notifier.py index d26ecb2d1..22f37b354 100644 --- a/moniker/openstack/common/notifier/rpc_notifier.py +++ b/designate/openstack/common/notifier/rpc_notifier.py @@ -14,11 +14,11 @@ # under the License. -from moniker.openstack.common import cfg -from moniker.openstack.common import context as req_context -from moniker.openstack.common.gettextutils import _ -from moniker.openstack.common import log as logging -from moniker.openstack.common import rpc +from designate.openstack.common import cfg +from designate.openstack.common import context as req_context +from designate.openstack.common.gettextutils import _ +from designate.openstack.common import log as logging +from designate.openstack.common import rpc LOG = logging.getLogger(__name__) diff --git a/moniker/openstack/common/notifier/rpc_notifier2.py b/designate/openstack/common/notifier/rpc_notifier2.py similarity index 86% rename from moniker/openstack/common/notifier/rpc_notifier2.py rename to designate/openstack/common/notifier/rpc_notifier2.py index 22454847c..90d1d0d74 100644 --- a/moniker/openstack/common/notifier/rpc_notifier2.py +++ b/designate/openstack/common/notifier/rpc_notifier2.py @@ -15,11 +15,11 @@ '''messaging based notification driver, with message envelopes''' -from moniker.openstack.common import cfg -from moniker.openstack.common import context as req_context -from moniker.openstack.common.gettextutils import _ -from moniker.openstack.common import log as logging -from moniker.openstack.common import rpc +from designate.openstack.common import cfg +from designate.openstack.common import context as req_context +from designate.openstack.common.gettextutils import _ +from designate.openstack.common import log as logging +from designate.openstack.common import rpc LOG = logging.getLogger(__name__) diff --git a/moniker/openstack/common/notifier/test_notifier.py b/designate/openstack/common/notifier/test_notifier.py similarity index 100% rename from moniker/openstack/common/notifier/test_notifier.py rename to designate/openstack/common/notifier/test_notifier.py diff --git a/moniker/openstack/common/periodic_task.py b/designate/openstack/common/periodic_task.py similarity index 97% rename from moniker/openstack/common/periodic_task.py rename to designate/openstack/common/periodic_task.py index 73ccac71b..d7c112ecf 100644 --- a/moniker/openstack/common/periodic_task.py +++ b/designate/openstack/common/periodic_task.py @@ -16,10 +16,10 @@ import datetime import time -from moniker.openstack.common.gettextutils import _ -from moniker.openstack.common import cfg -from moniker.openstack.common import log as logging -from moniker.openstack.common import timeutils +from designate.openstack.common.gettextutils import _ +from designate.openstack.common import cfg +from designate.openstack.common import log as logging +from designate.openstack.common import timeutils periodic_opts = [ diff --git a/moniker/openstack/common/policy.py b/designate/openstack/common/policy.py similarity index 99% rename from moniker/openstack/common/policy.py rename to designate/openstack/common/policy.py index dd3388882..0eff06bf8 100644 --- a/moniker/openstack/common/policy.py +++ b/designate/openstack/common/policy.py @@ -63,8 +63,8 @@ import urllib import urllib2 -from moniker.openstack.common.gettextutils import _ -from moniker.openstack.common import jsonutils +from designate.openstack.common.gettextutils import _ +from designate.openstack.common import jsonutils LOG = logging.getLogger(__name__) diff --git a/moniker/openstack/common/processutils.py b/designate/openstack/common/processutils.py similarity index 98% rename from moniker/openstack/common/processutils.py rename to designate/openstack/common/processutils.py index e35b6ae2a..44255d13c 100644 --- a/moniker/openstack/common/processutils.py +++ b/designate/openstack/common/processutils.py @@ -27,8 +27,8 @@ import signal from eventlet.green import subprocess from eventlet import greenthread -from moniker.openstack.common.gettextutils import _ -from moniker.openstack.common import log as logging +from designate.openstack.common.gettextutils import _ +from designate.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/moniker/openstack/common/rootwrap/__init__.py b/designate/openstack/common/rootwrap/__init__.py similarity index 100% rename from moniker/openstack/common/rootwrap/__init__.py rename to designate/openstack/common/rootwrap/__init__.py diff --git a/moniker/openstack/common/rootwrap/filters.py b/designate/openstack/common/rootwrap/filters.py similarity index 100% rename from moniker/openstack/common/rootwrap/filters.py rename to designate/openstack/common/rootwrap/filters.py diff --git a/moniker/openstack/common/rootwrap/wrapper.py b/designate/openstack/common/rootwrap/wrapper.py similarity index 98% rename from moniker/openstack/common/rootwrap/wrapper.py rename to designate/openstack/common/rootwrap/wrapper.py index 9a49246d3..969b893ae 100644 --- a/moniker/openstack/common/rootwrap/wrapper.py +++ b/designate/openstack/common/rootwrap/wrapper.py @@ -22,7 +22,7 @@ import logging.handlers import os import string -from moniker.openstack.common.rootwrap import filters +from designate.openstack.common.rootwrap import filters class NoFilterMatched(Exception): diff --git a/moniker/openstack/common/rpc/__init__.py b/designate/openstack/common/rpc/__init__.py similarity index 98% rename from moniker/openstack/common/rpc/__init__.py rename to designate/openstack/common/rpc/__init__.py index 631e314b6..00938af68 100644 --- a/moniker/openstack/common/rpc/__init__.py +++ b/designate/openstack/common/rpc/__init__.py @@ -25,8 +25,8 @@ For some wrappers that add message versioning to rpc, see: rpc.proxy """ -from moniker.openstack.common import cfg -from moniker.openstack.common import importutils +from designate.openstack.common import cfg +from designate.openstack.common import importutils rpc_opts = [ @@ -47,7 +47,7 @@ rpc_opts = [ help='Seconds to wait before a cast expires (TTL). ' 'Only supported by impl_zmq.'), cfg.ListOpt('allowed_rpc_exception_modules', - default=['moniker.openstack.common.exception', + default=['designate.openstack.common.exception', 'nova.exception', 'cinder.exception', 'exceptions', diff --git a/moniker/openstack/common/rpc/amqp.py b/designate/openstack/common/rpc/amqp.py similarity index 98% rename from moniker/openstack/common/rpc/amqp.py rename to designate/openstack/common/rpc/amqp.py index 2f1b19102..c52c7c251 100644 --- a/moniker/openstack/common/rpc/amqp.py +++ b/designate/openstack/common/rpc/amqp.py @@ -33,11 +33,11 @@ from eventlet import greenpool from eventlet import pools from eventlet import semaphore -from moniker.openstack.common import excutils -from moniker.openstack.common.gettextutils import _ -from moniker.openstack.common import local -from moniker.openstack.common import log as logging -from moniker.openstack.common.rpc import common as rpc_common +from designate.openstack.common import excutils +from designate.openstack.common.gettextutils import _ +from designate.openstack.common import local +from designate.openstack.common import log as logging +from designate.openstack.common.rpc import common as rpc_common LOG = logging.getLogger(__name__) diff --git a/moniker/openstack/common/rpc/common.py b/designate/openstack/common/rpc/common.py similarity index 97% rename from moniker/openstack/common/rpc/common.py rename to designate/openstack/common/rpc/common.py index 3a1b16437..2095c7a06 100644 --- a/moniker/openstack/common/rpc/common.py +++ b/designate/openstack/common/rpc/common.py @@ -21,12 +21,12 @@ import copy import sys import traceback -from moniker.openstack.common import cfg -from moniker.openstack.common.gettextutils import _ -from moniker.openstack.common import importutils -from moniker.openstack.common import jsonutils -from moniker.openstack.common import local -from moniker.openstack.common import log as logging +from designate.openstack.common import cfg +from designate.openstack.common.gettextutils import _ +from designate.openstack.common import importutils +from designate.openstack.common import jsonutils +from designate.openstack.common import local +from designate.openstack.common import log as logging CONF = cfg.CONF @@ -48,8 +48,8 @@ deserialize_msg(). The current message format (version 2.0) is very simple. It is: { - 'moniker.version': , - 'moniker.message': + 'designate.version': , + 'designate.message': } Message format version '1.0' is just considered to be the messages we sent @@ -65,8 +65,8 @@ to the messaging libraries as a dict. ''' _RPC_ENVELOPE_VERSION = '2.0' -_VERSION_KEY = 'moniker.version' -_MESSAGE_KEY = 'moniker.message' +_VERSION_KEY = 'designate.version' +_MESSAGE_KEY = 'designate.message' # TODO(russellb) Turn this on after Grizzly. diff --git a/moniker/openstack/common/rpc/dispatcher.py b/designate/openstack/common/rpc/dispatcher.py similarity index 98% rename from moniker/openstack/common/rpc/dispatcher.py rename to designate/openstack/common/rpc/dispatcher.py index 448038480..29135f945 100644 --- a/moniker/openstack/common/rpc/dispatcher.py +++ b/designate/openstack/common/rpc/dispatcher.py @@ -83,7 +83,7 @@ On the client side, the same changes should be made as in example 1. The minimum version that supports the new parameter should be specified. """ -from moniker.openstack.common.rpc import common as rpc_common +from designate.openstack.common.rpc import common as rpc_common class RpcDispatcher(object): diff --git a/moniker/openstack/common/rpc/impl_fake.py b/designate/openstack/common/rpc/impl_fake.py similarity index 98% rename from moniker/openstack/common/rpc/impl_fake.py rename to designate/openstack/common/rpc/impl_fake.py index cdcb832a5..1d244a1e0 100644 --- a/moniker/openstack/common/rpc/impl_fake.py +++ b/designate/openstack/common/rpc/impl_fake.py @@ -27,7 +27,7 @@ import time import eventlet -from moniker.openstack.common.rpc import common as rpc_common +from designate.openstack.common.rpc import common as rpc_common CONSUMERS = {} diff --git a/moniker/openstack/common/rpc/impl_kombu.py b/designate/openstack/common/rpc/impl_kombu.py similarity index 99% rename from moniker/openstack/common/rpc/impl_kombu.py rename to designate/openstack/common/rpc/impl_kombu.py index 5056efb2f..7c43b4ef8 100644 --- a/moniker/openstack/common/rpc/impl_kombu.py +++ b/designate/openstack/common/rpc/impl_kombu.py @@ -29,11 +29,11 @@ import kombu.connection import kombu.entity import kombu.messaging -from moniker.openstack.common import cfg -from moniker.openstack.common.gettextutils import _ -from moniker.openstack.common import network_utils -from moniker.openstack.common.rpc import amqp as rpc_amqp -from moniker.openstack.common.rpc import common as rpc_common +from designate.openstack.common import cfg +from designate.openstack.common.gettextutils import _ +from designate.openstack.common import network_utils +from designate.openstack.common.rpc import amqp as rpc_amqp +from designate.openstack.common.rpc import common as rpc_common kombu_opts = [ cfg.StrOpt('kombu_ssl_version', diff --git a/moniker/openstack/common/rpc/impl_qpid.py b/designate/openstack/common/rpc/impl_qpid.py similarity index 98% rename from moniker/openstack/common/rpc/impl_qpid.py rename to designate/openstack/common/rpc/impl_qpid.py index 84dfa73e5..eb3869c19 100644 --- a/moniker/openstack/common/rpc/impl_qpid.py +++ b/designate/openstack/common/rpc/impl_qpid.py @@ -23,13 +23,13 @@ import uuid import eventlet import greenlet -from moniker.openstack.common import cfg -from moniker.openstack.common.gettextutils import _ -from moniker.openstack.common import importutils -from moniker.openstack.common import jsonutils -from moniker.openstack.common import log as logging -from moniker.openstack.common.rpc import amqp as rpc_amqp -from moniker.openstack.common.rpc import common as rpc_common +from designate.openstack.common import cfg +from designate.openstack.common.gettextutils import _ +from designate.openstack.common import importutils +from designate.openstack.common import jsonutils +from designate.openstack.common import log as logging +from designate.openstack.common.rpc import amqp as rpc_amqp +from designate.openstack.common.rpc import common as rpc_common qpid_messaging = importutils.try_import("qpid.messaging") qpid_exceptions = importutils.try_import("qpid.messaging.exceptions") diff --git a/moniker/openstack/common/rpc/impl_zmq.py b/designate/openstack/common/rpc/impl_zmq.py similarity index 98% rename from moniker/openstack/common/rpc/impl_zmq.py rename to designate/openstack/common/rpc/impl_zmq.py index 59859d2ab..ecc45fc1e 100644 --- a/moniker/openstack/common/rpc/impl_zmq.py +++ b/designate/openstack/common/rpc/impl_zmq.py @@ -25,12 +25,12 @@ import uuid import eventlet import greenlet -from moniker.openstack.common import cfg -from moniker.openstack.common.gettextutils import _ -from moniker.openstack.common import importutils -from moniker.openstack.common import jsonutils -from moniker.openstack.common import processutils as utils -from moniker.openstack.common.rpc import common as rpc_common +from designate.openstack.common import cfg +from designate.openstack.common.gettextutils import _ +from designate.openstack.common import importutils +from designate.openstack.common import jsonutils +from designate.openstack.common import processutils as utils +from designate.openstack.common.rpc import common as rpc_common zmq = importutils.try_import('eventlet.green.zmq') @@ -51,7 +51,7 @@ zmq_opts = [ # The module.Class to use for matchmaking. cfg.StrOpt( 'rpc_zmq_matchmaker', - default=('moniker.openstack.common.rpc.' + default=('designate.openstack.common.rpc.' 'matchmaker.MatchMakerLocalhost'), help='MatchMaker driver', ), diff --git a/moniker/openstack/common/rpc/matchmaker.py b/designate/openstack/common/rpc/matchmaker.py similarity index 98% rename from moniker/openstack/common/rpc/matchmaker.py rename to designate/openstack/common/rpc/matchmaker.py index 6beba3dde..8faaae351 100644 --- a/moniker/openstack/common/rpc/matchmaker.py +++ b/designate/openstack/common/rpc/matchmaker.py @@ -22,9 +22,9 @@ import contextlib import itertools import json -from moniker.openstack.common import cfg -from moniker.openstack.common.gettextutils import _ -from moniker.openstack.common import log as logging +from designate.openstack.common import cfg +from designate.openstack.common.gettextutils import _ +from designate.openstack.common import log as logging matchmaker_opts = [ diff --git a/moniker/openstack/common/rpc/proxy.py b/designate/openstack/common/rpc/proxy.py similarity index 99% rename from moniker/openstack/common/rpc/proxy.py rename to designate/openstack/common/rpc/proxy.py index 83e17ceac..6d187dd32 100644 --- a/moniker/openstack/common/rpc/proxy.py +++ b/designate/openstack/common/rpc/proxy.py @@ -22,7 +22,7 @@ For more information about rpc API version numbers, see: """ -from moniker.openstack.common import rpc +from designate.openstack.common import rpc class RpcProxy(object): diff --git a/moniker/openstack/common/rpc/service.py b/designate/openstack/common/rpc/service.py similarity index 90% rename from moniker/openstack/common/rpc/service.py rename to designate/openstack/common/rpc/service.py index 4bfe39e98..a85a31663 100644 --- a/moniker/openstack/common/rpc/service.py +++ b/designate/openstack/common/rpc/service.py @@ -17,11 +17,11 @@ # License for the specific language governing permissions and limitations # under the License. -from moniker.openstack.common.gettextutils import _ -from moniker.openstack.common import log as logging -from moniker.openstack.common import rpc -from moniker.openstack.common.rpc import dispatcher as rpc_dispatcher -from moniker.openstack.common import service +from designate.openstack.common.gettextutils import _ +from designate.openstack.common import log as logging +from designate.openstack.common import rpc +from designate.openstack.common.rpc import dispatcher as rpc_dispatcher +from designate.openstack.common import service LOG = logging.getLogger(__name__) diff --git a/moniker/openstack/common/service.py b/designate/openstack/common/service.py similarity index 96% rename from moniker/openstack/common/service.py rename to designate/openstack/common/service.py index bd711df43..5ee719593 100644 --- a/moniker/openstack/common/service.py +++ b/designate/openstack/common/service.py @@ -29,15 +29,15 @@ import time import eventlet import logging as std_logging -from moniker.openstack.common import cfg -from moniker.openstack.common import eventlet_backdoor -from moniker.openstack.common.gettextutils import _ -from moniker.openstack.common import importutils -from moniker.openstack.common import log as logging -from moniker.openstack.common import threadgroup +from designate.openstack.common import cfg +from designate.openstack.common import eventlet_backdoor +from designate.openstack.common.gettextutils import _ +from designate.openstack.common import importutils +from designate.openstack.common import log as logging +from designate.openstack.common import threadgroup -rpc = importutils.try_import('moniker.openstack.common.rpc') +rpc = importutils.try_import('designate.openstack.common.rpc') CONF = cfg.CONF LOG = logging.getLogger(__name__) diff --git a/moniker/openstack/common/threadgroup.py b/designate/openstack/common/threadgroup.py similarity index 97% rename from moniker/openstack/common/threadgroup.py rename to designate/openstack/common/threadgroup.py index 25a402270..e337db1bf 100644 --- a/moniker/openstack/common/threadgroup.py +++ b/designate/openstack/common/threadgroup.py @@ -18,8 +18,8 @@ from eventlet import greenlet from eventlet import greenpool from eventlet import greenthread -from moniker.openstack.common import log as logging -from moniker.openstack.common import loopingcall +from designate.openstack.common import log as logging +from designate.openstack.common import loopingcall LOG = logging.getLogger(__name__) diff --git a/moniker/openstack/common/timeutils.py b/designate/openstack/common/timeutils.py similarity index 100% rename from moniker/openstack/common/timeutils.py rename to designate/openstack/common/timeutils.py diff --git a/moniker/openstack/common/uuidutils.py b/designate/openstack/common/uuidutils.py similarity index 100% rename from moniker/openstack/common/uuidutils.py rename to designate/openstack/common/uuidutils.py diff --git a/moniker/openstack/common/wsgi.py b/designate/openstack/common/wsgi.py similarity index 99% rename from moniker/openstack/common/wsgi.py rename to designate/openstack/common/wsgi.py index 45687ebde..ec6472abf 100644 --- a/moniker/openstack/common/wsgi.py +++ b/designate/openstack/common/wsgi.py @@ -31,11 +31,11 @@ import webob.exc from xml.dom import minidom from xml.parsers import expat -from moniker.openstack.common import exception -from moniker.openstack.common.gettextutils import _ -from moniker.openstack.common import jsonutils -from moniker.openstack.common import log as logging -from moniker.openstack.common import service +from designate.openstack.common import exception +from designate.openstack.common.gettextutils import _ +from designate.openstack.common import jsonutils +from designate.openstack.common import log as logging +from designate.openstack.common import service LOG = logging.getLogger(__name__) diff --git a/moniker/plugin.py b/designate/plugin.py similarity index 97% rename from moniker/plugin.py rename to designate/plugin.py index 7e4583643..7ca573ca1 100644 --- a/moniker/plugin.py +++ b/designate/plugin.py @@ -15,7 +15,7 @@ # under the License. import abc from stevedore import driver -from moniker.openstack.common import log as logging +from designate.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/moniker/policy.py b/designate/policy.py similarity index 90% rename from moniker/policy.py rename to designate/policy.py index fa525452b..b3edb3147 100644 --- a/moniker/policy.py +++ b/designate/policy.py @@ -13,11 +13,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. -from moniker.openstack.common import cfg -from moniker.openstack.common import log as logging -from moniker.openstack.common import policy -from moniker import utils -from moniker import exceptions +from designate.openstack.common import cfg +from designate.openstack.common import log as logging +from designate.openstack.common import policy +from designate import utils +from designate import exceptions LOG = logging.getLogger(__name__) diff --git a/moniker/quota/__init__.py b/designate/quota/__init__.py similarity index 89% rename from moniker/quota/__init__.py rename to designate/quota/__init__.py index ddda7c99c..59fdd348f 100644 --- a/moniker/quota/__init__.py +++ b/designate/quota/__init__.py @@ -13,9 +13,9 @@ # 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 moniker.openstack.common import cfg -from moniker.openstack.common import log as logging -from moniker.quota.base import Quota +from designate.openstack.common import cfg +from designate.openstack.common import log as logging +from designate.quota.base import Quota LOG = logging.getLogger(__name__) diff --git a/moniker/quota/base.py b/designate/quota/base.py similarity index 91% rename from moniker/quota/base.py rename to designate/quota/base.py index 2758050e6..4e410347d 100644 --- a/moniker/quota/base.py +++ b/designate/quota/base.py @@ -14,15 +14,15 @@ # License for the specific language governing permissions and limitations # under the License. import abc -from moniker.openstack.common import cfg -from moniker import exceptions -from moniker.plugin import Plugin +from designate.openstack.common import cfg +from designate import exceptions +from designate.plugin import Plugin class Quota(Plugin): """ Base class for quota plugins """ __metaclass__ = abc.ABCMeta - __plugin_ns__ = 'moniker.quota' + __plugin_ns__ = 'designate.quota' __plugin_type__ = 'quota' def get_tenant_quotas(self, context, tenant_id): diff --git a/moniker/quota/impl_config.py b/designate/quota/impl_config.py similarity index 91% rename from moniker/quota/impl_config.py rename to designate/quota/impl_config.py index cd4e1e542..ff339b6d2 100644 --- a/moniker/quota/impl_config.py +++ b/designate/quota/impl_config.py @@ -13,8 +13,8 @@ # 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 moniker.openstack.common import log as logging -from moniker.quota.base import Quota +from designate.openstack.common import log as logging +from designate.quota.base import Quota LOG = logging.getLogger(__name__) diff --git a/moniker/quota/impl_storage.py b/designate/quota/impl_storage.py similarity index 90% rename from moniker/quota/impl_storage.py rename to designate/quota/impl_storage.py index fcb3c4d3b..7260cc1e8 100644 --- a/moniker/quota/impl_storage.py +++ b/designate/quota/impl_storage.py @@ -13,9 +13,9 @@ # 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 moniker.openstack.common import log as logging -from moniker.quota.base import Quota -from moniker import storage +from designate.openstack.common import log as logging +from designate.quota.base import Quota +from designate import storage LOG = logging.getLogger(__name__) diff --git a/moniker/resources/schemas/v1/domain.json b/designate/resources/schemas/v1/domain.json similarity index 100% rename from moniker/resources/schemas/v1/domain.json rename to designate/resources/schemas/v1/domain.json diff --git a/moniker/resources/schemas/v1/domains.json b/designate/resources/schemas/v1/domains.json similarity index 100% rename from moniker/resources/schemas/v1/domains.json rename to designate/resources/schemas/v1/domains.json diff --git a/moniker/resources/schemas/v1/fault.json b/designate/resources/schemas/v1/fault.json similarity index 100% rename from moniker/resources/schemas/v1/fault.json rename to designate/resources/schemas/v1/fault.json diff --git a/moniker/resources/schemas/v1/limits.json b/designate/resources/schemas/v1/limits.json similarity index 100% rename from moniker/resources/schemas/v1/limits.json rename to designate/resources/schemas/v1/limits.json diff --git a/moniker/resources/schemas/v1/record.json b/designate/resources/schemas/v1/record.json similarity index 100% rename from moniker/resources/schemas/v1/record.json rename to designate/resources/schemas/v1/record.json diff --git a/moniker/resources/schemas/v1/records.json b/designate/resources/schemas/v1/records.json similarity index 100% rename from moniker/resources/schemas/v1/records.json rename to designate/resources/schemas/v1/records.json diff --git a/moniker/resources/schemas/v1/server.json b/designate/resources/schemas/v1/server.json similarity index 100% rename from moniker/resources/schemas/v1/server.json rename to designate/resources/schemas/v1/server.json diff --git a/moniker/resources/schemas/v1/servers.json b/designate/resources/schemas/v1/servers.json similarity index 100% rename from moniker/resources/schemas/v1/servers.json rename to designate/resources/schemas/v1/servers.json diff --git a/moniker/resources/schemas/v1/tsigkey.json b/designate/resources/schemas/v1/tsigkey.json similarity index 100% rename from moniker/resources/schemas/v1/tsigkey.json rename to designate/resources/schemas/v1/tsigkey.json diff --git a/moniker/resources/schemas/v1/tsigkeys.json b/designate/resources/schemas/v1/tsigkeys.json similarity index 100% rename from moniker/resources/schemas/v1/tsigkeys.json rename to designate/resources/schemas/v1/tsigkeys.json diff --git a/moniker/resources/templates/bind9-config.jinja2 b/designate/resources/templates/bind9-config.jinja2 similarity index 100% rename from moniker/resources/templates/bind9-config.jinja2 rename to designate/resources/templates/bind9-config.jinja2 diff --git a/moniker/resources/templates/bind9-zone.jinja2 b/designate/resources/templates/bind9-zone.jinja2 similarity index 100% rename from moniker/resources/templates/bind9-zone.jinja2 rename to designate/resources/templates/bind9-zone.jinja2 diff --git a/moniker/resources/templates/dnsmasq-zone.jinja2 b/designate/resources/templates/dnsmasq-zone.jinja2 similarity index 100% rename from moniker/resources/templates/dnsmasq-zone.jinja2 rename to designate/resources/templates/dnsmasq-zone.jinja2 diff --git a/moniker/resources/templates/mysql-bind9-config.jinja2 b/designate/resources/templates/mysql-bind9-config.jinja2 similarity index 100% rename from moniker/resources/templates/mysql-bind9-config.jinja2 rename to designate/resources/templates/mysql-bind9-config.jinja2 diff --git a/moniker/schema.py b/designate/schema.py similarity index 98% rename from moniker/schema.py rename to designate/schema.py index abacbb6de..70d0f01e6 100644 --- a/moniker/schema.py +++ b/designate/schema.py @@ -20,9 +20,9 @@ import iso8601 import urllib import urlparse from datetime import datetime -from moniker.openstack.common import log as logging -from moniker import exceptions -from moniker import utils +from designate.openstack.common import log as logging +from designate import exceptions +from designate import utils LOG = logging.getLogger(__name__) diff --git a/moniker/sink/__init__.py b/designate/sink/__init__.py similarity index 96% rename from moniker/sink/__init__.py rename to designate/sink/__init__.py index 016d4ef48..4ab92c091 100644 --- a/moniker/sink/__init__.py +++ b/designate/sink/__init__.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. -from moniker.openstack.common import cfg +from designate.openstack.common import cfg cfg.CONF.register_group(cfg.OptGroup( name='service:sink', title="Configuration for Sink Service" diff --git a/moniker/sink/service.py b/designate/sink/service.py similarity index 92% rename from moniker/sink/service.py rename to designate/sink/service.py index acca435b1..fd7f9a31c 100644 --- a/moniker/sink/service.py +++ b/designate/sink/service.py @@ -13,15 +13,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. -from moniker.openstack.common import cfg -from moniker.openstack.common import log as logging -from moniker.openstack.common import rpc -from moniker.openstack.common import service +from designate.openstack.common import cfg +from designate.openstack.common import log as logging +from designate.openstack.common import rpc +from designate.openstack.common import service from stevedore.named import NamedExtensionManager LOG = logging.getLogger(__name__) -HANDLER_NAMESPACE = 'moniker.notification.handler' +HANDLER_NAMESPACE = 'designate.notification.handler' class Service(service.Service): @@ -78,7 +78,7 @@ class Service(service.Service): exchange, topics = handler.get_exchange_topics() for topic in topics: - queue_name = "moniker.notifications.%s.%s.%s" % ( + queue_name = "designate.notifications.%s.%s.%s" % ( handler.get_canonical_name(), exchange, topic) self.rpc_conn.declare_topic_consumer( diff --git a/moniker/sqlalchemy/__init__.py b/designate/sqlalchemy/__init__.py similarity index 100% rename from moniker/sqlalchemy/__init__.py rename to designate/sqlalchemy/__init__.py diff --git a/moniker/sqlalchemy/expressions.py b/designate/sqlalchemy/expressions.py similarity index 100% rename from moniker/sqlalchemy/expressions.py rename to designate/sqlalchemy/expressions.py diff --git a/moniker/sqlalchemy/models.py b/designate/sqlalchemy/models.py similarity index 98% rename from moniker/sqlalchemy/models.py rename to designate/sqlalchemy/models.py index 8cb95a36e..0bd9a2d0c 100644 --- a/moniker/sqlalchemy/models.py +++ b/designate/sqlalchemy/models.py @@ -15,7 +15,7 @@ # under the License. from sqlalchemy.exc import IntegrityError from sqlalchemy.orm import object_mapper -from moniker import exceptions +from designate import exceptions class Base(object): diff --git a/moniker/sqlalchemy/session.py b/designate/sqlalchemy/session.py similarity index 97% rename from moniker/sqlalchemy/session.py rename to designate/sqlalchemy/session.py index 28f671de5..17c8f6f6b 100644 --- a/moniker/sqlalchemy/session.py +++ b/designate/sqlalchemy/session.py @@ -24,9 +24,9 @@ from sqlalchemy.exc import DisconnectionError, OperationalError import sqlalchemy.orm from sqlalchemy.pool import NullPool, StaticPool -from moniker.openstack.common import cfg -from moniker.openstack.common import log as logging -from moniker.openstack.common.gettextutils import _ +from designate.openstack.common import cfg +from designate.openstack.common import log as logging +from designate.openstack.common.gettextutils import _ LOG = logging.getLogger(__name__) @@ -36,7 +36,7 @@ _ENGINES = {} SQLOPTS = [ cfg.StrOpt('database_connection', - default='sqlite:///$state_path/moniker.sqlite', + default='sqlite:///$state_path/designate.sqlite', help='The database driver to use'), cfg.IntOpt('connection_debug', default=0, help='Verbosity of SQL debugging information. 0=None,' diff --git a/moniker/sqlalchemy/types.py b/designate/sqlalchemy/types.py similarity index 100% rename from moniker/sqlalchemy/types.py rename to designate/sqlalchemy/types.py diff --git a/moniker/storage/__init__.py b/designate/storage/__init__.py similarity index 89% rename from moniker/storage/__init__.py rename to designate/storage/__init__.py index 86713bc2e..cacd20a8c 100644 --- a/moniker/storage/__init__.py +++ b/designate/storage/__init__.py @@ -13,9 +13,9 @@ # 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 moniker.openstack.common import cfg -from moniker.openstack.common import log as logging -from moniker.storage.base import Storage +from designate.openstack.common import cfg +from designate.openstack.common import log as logging +from designate.storage.base import Storage LOG = logging.getLogger(__name__) diff --git a/moniker/storage/base.py b/designate/storage/base.py similarity index 99% rename from moniker/storage/base.py rename to designate/storage/base.py index 7e325d977..1b4c19ee2 100644 --- a/moniker/storage/base.py +++ b/designate/storage/base.py @@ -14,13 +14,13 @@ # License for the specific language governing permissions and limitations # under the License. import abc -from moniker.plugin import Plugin +from designate.plugin import Plugin class Storage(Plugin): """ Base class for storage plugins """ __metaclass__ = abc.ABCMeta - __plugin_ns__ = 'moniker.storage' + __plugin_ns__ = 'designate.storage' __plugin_type__ = 'storage' @abc.abstractmethod diff --git a/moniker/storage/impl_sqlalchemy/__init__.py b/designate/storage/impl_sqlalchemy/__init__.py similarity index 97% rename from moniker/storage/impl_sqlalchemy/__init__.py rename to designate/storage/impl_sqlalchemy/__init__.py index 405184492..a2e5bcb64 100644 --- a/moniker/storage/impl_sqlalchemy/__init__.py +++ b/designate/storage/impl_sqlalchemy/__init__.py @@ -16,14 +16,14 @@ import time from sqlalchemy.orm import exc from sqlalchemy import distinct, func -from moniker.openstack.common import cfg -from moniker.openstack.common import log as logging -from moniker import exceptions -from moniker.storage import base -from moniker.storage.impl_sqlalchemy import models -from moniker.sqlalchemy.session import get_session -from moniker.sqlalchemy.session import get_engine -from moniker.sqlalchemy.session import SQLOPTS +from designate.openstack.common import cfg +from designate.openstack.common import log as logging +from designate import exceptions +from designate.storage import base +from designate.storage.impl_sqlalchemy import models +from designate.sqlalchemy.session import get_session +from designate.sqlalchemy.session import get_engine +from designate.sqlalchemy.session import SQLOPTS LOG = logging.getLogger(__name__) diff --git a/designate/storage/impl_sqlalchemy/migrate_repo/README b/designate/storage/impl_sqlalchemy/migrate_repo/README new file mode 100644 index 000000000..2f979fcb0 --- /dev/null +++ b/designate/storage/impl_sqlalchemy/migrate_repo/README @@ -0,0 +1,4 @@ +This is a database migration repository for the project Designate. + +More information at +http://code.google.com/p/sqlalchemy-migrate/ diff --git a/moniker/storage/impl_sqlalchemy/migrate_repo/__init__.py b/designate/storage/impl_sqlalchemy/migrate_repo/__init__.py similarity index 100% rename from moniker/storage/impl_sqlalchemy/migrate_repo/__init__.py rename to designate/storage/impl_sqlalchemy/migrate_repo/__init__.py diff --git a/moniker/storage/impl_sqlalchemy/migrate_repo/manage.py b/designate/storage/impl_sqlalchemy/migrate_repo/manage.py similarity index 100% rename from moniker/storage/impl_sqlalchemy/migrate_repo/manage.py rename to designate/storage/impl_sqlalchemy/migrate_repo/manage.py diff --git a/moniker/storage/impl_sqlalchemy/migrate_repo/migrate.cfg b/designate/storage/impl_sqlalchemy/migrate_repo/migrate.cfg similarity index 98% rename from moniker/storage/impl_sqlalchemy/migrate_repo/migrate.cfg rename to designate/storage/impl_sqlalchemy/migrate_repo/migrate.cfg index ad19f6741..98d4dff30 100644 --- a/moniker/storage/impl_sqlalchemy/migrate_repo/migrate.cfg +++ b/designate/storage/impl_sqlalchemy/migrate_repo/migrate.cfg @@ -1,7 +1,7 @@ [db_settings] # Used to identify which repository this database is versioned under. # You can use the name of your project. -repository_id=Moniker +repository_id=Designate # The name of the database table used to track the schema version. # This name shouldn't already be used by your project. diff --git a/moniker/storage/impl_sqlalchemy/migrate_repo/utils.py b/designate/storage/impl_sqlalchemy/migrate_repo/utils.py similarity index 96% rename from moniker/storage/impl_sqlalchemy/migrate_repo/utils.py rename to designate/storage/impl_sqlalchemy/migrate_repo/utils.py index 0b7725749..ce1a7b96c 100644 --- a/moniker/storage/impl_sqlalchemy/migrate_repo/utils.py +++ b/designate/storage/impl_sqlalchemy/migrate_repo/utils.py @@ -21,7 +21,7 @@ Various conveniences used for migration scripts """ from sqlalchemy.schema import Table as SqlaTable -from moniker.openstack.common import log as logging +from designate.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/moniker/storage/impl_sqlalchemy/migrate_repo/versions/001_add_moniker_schema.py b/designate/storage/impl_sqlalchemy/migrate_repo/versions/001_add_moniker_schema.py similarity index 89% rename from moniker/storage/impl_sqlalchemy/migrate_repo/versions/001_add_moniker_schema.py rename to designate/storage/impl_sqlalchemy/migrate_repo/versions/001_add_moniker_schema.py index 4c541571e..5c9f6413f 100644 --- a/moniker/storage/impl_sqlalchemy/migrate_repo/versions/001_add_moniker_schema.py +++ b/designate/storage/impl_sqlalchemy/migrate_repo/versions/001_add_moniker_schema.py @@ -18,13 +18,13 @@ # under the License. from sqlalchemy import ForeignKey, Enum, Integer, String, DateTime, Text from sqlalchemy.schema import Column, MetaData -from moniker.openstack.common import timeutils -from moniker.openstack.common.uuidutils import generate_uuid -from moniker.storage.impl_sqlalchemy.migrate_repo.utils import Table -from moniker.storage.impl_sqlalchemy.migrate_repo.utils import create_tables -from moniker.storage.impl_sqlalchemy.migrate_repo.utils import drop_tables -from moniker.sqlalchemy.types import Inet -from moniker.sqlalchemy.types import UUID +from designate.openstack.common import timeutils +from designate.openstack.common.uuidutils import generate_uuid +from designate.storage.impl_sqlalchemy.migrate_repo.utils import Table +from designate.storage.impl_sqlalchemy.migrate_repo.utils import create_tables +from designate.storage.impl_sqlalchemy.migrate_repo.utils import drop_tables +from designate.sqlalchemy.types import Inet +from designate.sqlalchemy.types import UUID meta = MetaData() diff --git a/moniker/storage/impl_sqlalchemy/migrate_repo/versions/002_add_managed_col_for_records.py b/designate/storage/impl_sqlalchemy/migrate_repo/versions/002_add_managed_col_for_records.py similarity index 97% rename from moniker/storage/impl_sqlalchemy/migrate_repo/versions/002_add_managed_col_for_records.py rename to designate/storage/impl_sqlalchemy/migrate_repo/versions/002_add_managed_col_for_records.py index 8beabe694..581dfc879 100644 --- a/moniker/storage/impl_sqlalchemy/migrate_repo/versions/002_add_managed_col_for_records.py +++ b/designate/storage/impl_sqlalchemy/migrate_repo/versions/002_add_managed_col_for_records.py @@ -14,7 +14,7 @@ # License for the specific language governing permissions and limitations # under the License. from sqlalchemy import MetaData, Table, Column, Boolean, Unicode -from moniker.sqlalchemy.types import UUID +from designate.sqlalchemy.types import UUID meta = MetaData() diff --git a/moniker/storage/impl_sqlalchemy/migrate_repo/versions/003_add_delete_on_cascade.py b/designate/storage/impl_sqlalchemy/migrate_repo/versions/003_add_delete_on_cascade.py similarity index 100% rename from moniker/storage/impl_sqlalchemy/migrate_repo/versions/003_add_delete_on_cascade.py rename to designate/storage/impl_sqlalchemy/migrate_repo/versions/003_add_delete_on_cascade.py diff --git a/moniker/storage/impl_sqlalchemy/migrate_repo/versions/004_changed_managed_cols_for_records.py b/designate/storage/impl_sqlalchemy/migrate_repo/versions/004_changed_managed_cols_for_records.py similarity index 100% rename from moniker/storage/impl_sqlalchemy/migrate_repo/versions/004_changed_managed_cols_for_records.py rename to designate/storage/impl_sqlalchemy/migrate_repo/versions/004_changed_managed_cols_for_records.py diff --git a/moniker/storage/impl_sqlalchemy/migrate_repo/versions/005_records_allow_null_ttl.py b/designate/storage/impl_sqlalchemy/migrate_repo/versions/005_records_allow_null_ttl.py similarity index 100% rename from moniker/storage/impl_sqlalchemy/migrate_repo/versions/005_records_allow_null_ttl.py rename to designate/storage/impl_sqlalchemy/migrate_repo/versions/005_records_allow_null_ttl.py diff --git a/moniker/storage/impl_sqlalchemy/migrate_repo/versions/006_support_ptr_records.py b/designate/storage/impl_sqlalchemy/migrate_repo/versions/006_support_ptr_records.py similarity index 100% rename from moniker/storage/impl_sqlalchemy/migrate_repo/versions/006_support_ptr_records.py rename to designate/storage/impl_sqlalchemy/migrate_repo/versions/006_support_ptr_records.py diff --git a/moniker/storage/impl_sqlalchemy/migrate_repo/versions/007_add_parent_domain_id_col.py b/designate/storage/impl_sqlalchemy/migrate_repo/versions/007_add_parent_domain_id_col.py similarity index 97% rename from moniker/storage/impl_sqlalchemy/migrate_repo/versions/007_add_parent_domain_id_col.py rename to designate/storage/impl_sqlalchemy/migrate_repo/versions/007_add_parent_domain_id_col.py index 447ffbf4b..122701b81 100644 --- a/moniker/storage/impl_sqlalchemy/migrate_repo/versions/007_add_parent_domain_id_col.py +++ b/designate/storage/impl_sqlalchemy/migrate_repo/versions/007_add_parent_domain_id_col.py @@ -14,7 +14,7 @@ # License for the specific language governing permissions and limitations # under the License. from sqlalchemy import MetaData, Table, Column, ForeignKey -from moniker.sqlalchemy.types import UUID +from designate.sqlalchemy.types import UUID meta = MetaData() diff --git a/moniker/storage/impl_sqlalchemy/migrate_repo/versions/008_support_spf_records.py b/designate/storage/impl_sqlalchemy/migrate_repo/versions/008_support_spf_records.py similarity index 100% rename from moniker/storage/impl_sqlalchemy/migrate_repo/versions/008_support_spf_records.py rename to designate/storage/impl_sqlalchemy/migrate_repo/versions/008_support_spf_records.py diff --git a/moniker/storage/impl_sqlalchemy/migrate_repo/versions/009_add_tsigkeys_table.py b/designate/storage/impl_sqlalchemy/migrate_repo/versions/009_add_tsigkeys_table.py similarity index 91% rename from moniker/storage/impl_sqlalchemy/migrate_repo/versions/009_add_tsigkeys_table.py rename to designate/storage/impl_sqlalchemy/migrate_repo/versions/009_add_tsigkeys_table.py index 532289f89..cdef7c737 100644 --- a/moniker/storage/impl_sqlalchemy/migrate_repo/versions/009_add_tsigkeys_table.py +++ b/designate/storage/impl_sqlalchemy/migrate_repo/versions/009_add_tsigkeys_table.py @@ -15,9 +15,9 @@ # under the License. from sqlalchemy import Enum, Integer, String, DateTime from sqlalchemy.schema import Table, Column, MetaData -from moniker.openstack.common import timeutils -from moniker.openstack.common.uuidutils import generate_uuid -from moniker.sqlalchemy.types import UUID +from designate.openstack.common import timeutils +from designate.openstack.common.uuidutils import generate_uuid +from designate.sqlalchemy.types import UUID meta = MetaData() diff --git a/moniker/storage/impl_sqlalchemy/migrate_repo/versions/010_drop_server_ip_cols.py b/designate/storage/impl_sqlalchemy/migrate_repo/versions/010_drop_server_ip_cols.py similarity index 96% rename from moniker/storage/impl_sqlalchemy/migrate_repo/versions/010_drop_server_ip_cols.py rename to designate/storage/impl_sqlalchemy/migrate_repo/versions/010_drop_server_ip_cols.py index 8486d317b..82b40ae11 100644 --- a/moniker/storage/impl_sqlalchemy/migrate_repo/versions/010_drop_server_ip_cols.py +++ b/designate/storage/impl_sqlalchemy/migrate_repo/versions/010_drop_server_ip_cols.py @@ -14,7 +14,7 @@ # License for the specific language governing permissions and limitations # under the License. from sqlalchemy import MetaData, Table, Column -from moniker.sqlalchemy.types import Inet +from designate.sqlalchemy.types import Inet meta = MetaData() diff --git a/moniker/storage/impl_sqlalchemy/migrate_repo/versions/011_support_sshfp_records.py b/designate/storage/impl_sqlalchemy/migrate_repo/versions/011_support_sshfp_records.py similarity index 100% rename from moniker/storage/impl_sqlalchemy/migrate_repo/versions/011_support_sshfp_records.py rename to designate/storage/impl_sqlalchemy/migrate_repo/versions/011_support_sshfp_records.py diff --git a/moniker/storage/impl_sqlalchemy/migrate_repo/versions/012_add_serial_col.py b/designate/storage/impl_sqlalchemy/migrate_repo/versions/012_add_serial_col.py similarity index 93% rename from moniker/storage/impl_sqlalchemy/migrate_repo/versions/012_add_serial_col.py rename to designate/storage/impl_sqlalchemy/migrate_repo/versions/012_add_serial_col.py index 427538562..d4a5bd7f3 100644 --- a/moniker/storage/impl_sqlalchemy/migrate_repo/versions/012_add_serial_col.py +++ b/designate/storage/impl_sqlalchemy/migrate_repo/versions/012_add_serial_col.py @@ -13,8 +13,8 @@ # 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 moniker.openstack.common import timeutils -from moniker.openstack.common import log as logging +from designate.openstack.common import timeutils +from designate.openstack.common import log as logging from sqlalchemy import MetaData, Table, Column, Integer LOG = logging.getLogger(__name__) diff --git a/moniker/storage/impl_sqlalchemy/migrate_repo/versions/013_expand_email_column.py b/designate/storage/impl_sqlalchemy/migrate_repo/versions/013_expand_email_column.py similarity index 100% rename from moniker/storage/impl_sqlalchemy/migrate_repo/versions/013_expand_email_column.py rename to designate/storage/impl_sqlalchemy/migrate_repo/versions/013_expand_email_column.py diff --git a/moniker/storage/impl_sqlalchemy/migrate_repo/versions/014_add_quotas_table.py b/designate/storage/impl_sqlalchemy/migrate_repo/versions/014_add_quotas_table.py similarity index 90% rename from moniker/storage/impl_sqlalchemy/migrate_repo/versions/014_add_quotas_table.py rename to designate/storage/impl_sqlalchemy/migrate_repo/versions/014_add_quotas_table.py index 6f20c34ab..bb7b810dd 100644 --- a/moniker/storage/impl_sqlalchemy/migrate_repo/versions/014_add_quotas_table.py +++ b/designate/storage/impl_sqlalchemy/migrate_repo/versions/014_add_quotas_table.py @@ -15,9 +15,9 @@ # under the License. from sqlalchemy import Integer, String, DateTime, UniqueConstraint from sqlalchemy.schema import Table, Column, MetaData -from moniker.openstack.common import timeutils -from moniker.openstack.common.uuidutils import generate_uuid -from moniker.sqlalchemy.types import UUID +from designate.openstack.common import timeutils +from designate.openstack.common.uuidutils import generate_uuid +from designate.sqlalchemy.types import UUID meta = MetaData() diff --git a/moniker/storage/impl_sqlalchemy/migrate_repo/versions/__init__.py b/designate/storage/impl_sqlalchemy/migrate_repo/versions/__init__.py similarity index 100% rename from moniker/storage/impl_sqlalchemy/migrate_repo/versions/__init__.py rename to designate/storage/impl_sqlalchemy/migrate_repo/versions/__init__.py diff --git a/moniker/storage/impl_sqlalchemy/models.py b/designate/storage/impl_sqlalchemy/models.py similarity index 93% rename from moniker/storage/impl_sqlalchemy/models.py rename to designate/storage/impl_sqlalchemy/models.py index 0094e4652..b287c536e 100644 --- a/moniker/storage/impl_sqlalchemy/models.py +++ b/designate/storage/impl_sqlalchemy/models.py @@ -19,11 +19,11 @@ from sqlalchemy import (Column, DateTime, String, Text, Integer, ForeignKey, Enum, Boolean, Unicode, UniqueConstraint) from sqlalchemy.orm import relationship, backref from sqlalchemy.ext.hybrid import hybrid_property -from moniker.openstack.common import log as logging -from moniker.openstack.common import timeutils -from moniker.openstack.common.uuidutils import generate_uuid -from moniker.sqlalchemy.types import UUID -from moniker.sqlalchemy.models import Base as CommonBase +from designate.openstack.common import log as logging +from designate.openstack.common import timeutils +from designate.openstack.common.uuidutils import generate_uuid +from designate.sqlalchemy.types import UUID +from designate.sqlalchemy.models import Base as CommonBase from sqlalchemy.ext.declarative import declarative_base LOG = logging.getLogger(__name__) diff --git a/moniker/tests/__init__.py b/designate/tests/__init__.py similarity index 87% rename from moniker/tests/__init__.py rename to designate/tests/__init__.py index 581e24777..a6e8c1ef4 100644 --- a/moniker/tests/__init__.py +++ b/designate/tests/__init__.py @@ -16,27 +16,27 @@ import copy import unittest2 import mox -from moniker.openstack.common import cfg -from moniker.openstack.common import log as logging -from moniker.openstack.common.notifier import test_notifier -from moniker.openstack.common import policy -from moniker.context import MonikerContext -from moniker import storage -from moniker import exceptions -from moniker.agent import service as agent_service -from moniker.api import service as api_service -from moniker.central import service as central_service -from moniker.sink import service as sink_service +from designate.openstack.common import cfg +from designate.openstack.common import log as logging +from designate.openstack.common.notifier import test_notifier +from designate.openstack.common import policy +from designate.context import DesignateContext +from designate import storage +from designate import exceptions +from designate.agent import service as agent_service +from designate.api import service as api_service +from designate.central import service as central_service +from designate.sink import service as sink_service LOG = logging.getLogger(__name__) -cfg.CONF.import_opt('storage_driver', 'moniker.central', +cfg.CONF.import_opt('storage_driver', 'designate.central', group='service:central') -cfg.CONF.import_opt('backend_driver', 'moniker.agent', +cfg.CONF.import_opt('backend_driver', 'designate.agent', group='service:agent') -cfg.CONF.import_opt('auth_strategy', 'moniker.api', +cfg.CONF.import_opt('auth_strategy', 'designate.api', group='service:api') -cfg.CONF.import_opt('database_connection', 'moniker.storage.impl_sqlalchemy', +cfg.CONF.import_opt('database_connection', 'designate.storage.impl_sqlalchemy', group='storage:sqlalchemy') @@ -92,9 +92,9 @@ class TestCase(unittest2.TestCase): self.config( notification_driver=[ - 'moniker.openstack.common.notifier.test_notifier', + 'designate.openstack.common.notifier.test_notifier', ], - rpc_backend='moniker.openstack.common.rpc.impl_fake', + rpc_backend='designate.openstack.common.rpc.impl_fake', ) self.config( @@ -172,10 +172,10 @@ class TestCase(unittest2.TestCase): # Context Methods def get_context(self, **kwargs): - return MonikerContext(**kwargs) + return DesignateContext(**kwargs) def get_admin_context(self): - return MonikerContext.get_admin_context() + return DesignateContext.get_admin_context() # Fixture methods def get_quota_fixture(self, fixture=0, values={}): diff --git a/moniker/tests/sample_notifications/nova/compute.instance.create.end.json b/designate/tests/sample_notifications/nova/compute.instance.create.end.json similarity index 99% rename from moniker/tests/sample_notifications/nova/compute.instance.create.end.json rename to designate/tests/sample_notifications/nova/compute.instance.create.end.json index f94d57087..03abd490a 100644 --- a/moniker/tests/sample_notifications/nova/compute.instance.create.end.json +++ b/designate/tests/sample_notifications/nova/compute.instance.create.end.json @@ -70,7 +70,7 @@ "id": "6dc68974176140c5b1eacd4329e94ae2" }], "type": "dns", - "name": "moniker" + "name": "designate" }, { "endpoints_links": [], "endpoints": [{ diff --git a/moniker/tests/sample_notifications/nova/compute.instance.create.start.json b/designate/tests/sample_notifications/nova/compute.instance.create.start.json similarity index 99% rename from moniker/tests/sample_notifications/nova/compute.instance.create.start.json rename to designate/tests/sample_notifications/nova/compute.instance.create.start.json index addb75a19..0e4afa641 100644 --- a/moniker/tests/sample_notifications/nova/compute.instance.create.start.json +++ b/designate/tests/sample_notifications/nova/compute.instance.create.start.json @@ -70,7 +70,7 @@ "id": "6dc68974176140c5b1eacd4329e94ae2" }], "type": "dns", - "name": "moniker" + "name": "designate" }, { "endpoints_links": [], "endpoints": [{ diff --git a/moniker/tests/sample_notifications/nova/compute.instance.delete.start.json b/designate/tests/sample_notifications/nova/compute.instance.delete.start.json similarity index 99% rename from moniker/tests/sample_notifications/nova/compute.instance.delete.start.json rename to designate/tests/sample_notifications/nova/compute.instance.delete.start.json index 594871621..cdd79f9f8 100644 --- a/moniker/tests/sample_notifications/nova/compute.instance.delete.start.json +++ b/designate/tests/sample_notifications/nova/compute.instance.delete.start.json @@ -70,7 +70,7 @@ "id": "6dc68974176140c5b1eacd4329e94ae2" }], "type": "dns", - "name": "moniker" + "name": "designate" }, { "endpoints_links": [], "endpoints": [{ diff --git a/moniker/tests/sample_notifications/nova/compute.instance.shutdown.end.json b/designate/tests/sample_notifications/nova/compute.instance.shutdown.end.json similarity index 99% rename from moniker/tests/sample_notifications/nova/compute.instance.shutdown.end.json rename to designate/tests/sample_notifications/nova/compute.instance.shutdown.end.json index 92727a5f1..45fff1afb 100644 --- a/moniker/tests/sample_notifications/nova/compute.instance.shutdown.end.json +++ b/designate/tests/sample_notifications/nova/compute.instance.shutdown.end.json @@ -70,7 +70,7 @@ }], "endpoints_links": [], "type": "dns", - "name": "moniker" + "name": "designate" }, { "endpoints": [{ "adminURL": "http://identity:35357/v2.0", diff --git a/moniker/tests/sample_notifications/nova/compute.instance.shutdown.start.json b/designate/tests/sample_notifications/nova/compute.instance.shutdown.start.json similarity index 99% rename from moniker/tests/sample_notifications/nova/compute.instance.shutdown.start.json rename to designate/tests/sample_notifications/nova/compute.instance.shutdown.start.json index 889d36f7b..c20281df0 100644 --- a/moniker/tests/sample_notifications/nova/compute.instance.shutdown.start.json +++ b/designate/tests/sample_notifications/nova/compute.instance.shutdown.start.json @@ -70,7 +70,7 @@ }], "endpoints_links": [], "type": "dns", - "name": "moniker" + "name": "designate" }, { "endpoints": [{ "adminURL": "http://identity:35357/v2.0", diff --git a/moniker/tests/sample_notifications/nova/network.floating_ip.allocate.json b/designate/tests/sample_notifications/nova/network.floating_ip.allocate.json similarity index 99% rename from moniker/tests/sample_notifications/nova/network.floating_ip.allocate.json rename to designate/tests/sample_notifications/nova/network.floating_ip.allocate.json index 2db8fe026..668840e95 100644 --- a/moniker/tests/sample_notifications/nova/network.floating_ip.allocate.json +++ b/designate/tests/sample_notifications/nova/network.floating_ip.allocate.json @@ -70,7 +70,7 @@ "id": "6dc68974176140c5b1eacd4329e94ae2" }], "type": "dns", - "name": "moniker" + "name": "designate" }, { "endpoints_links": [], "endpoints": [{ diff --git a/moniker/tests/sample_notifications/nova/network.floating_ip.associate.json b/designate/tests/sample_notifications/nova/network.floating_ip.associate.json similarity index 99% rename from moniker/tests/sample_notifications/nova/network.floating_ip.associate.json rename to designate/tests/sample_notifications/nova/network.floating_ip.associate.json index 1baf8ae9c..065ae6f52 100644 --- a/moniker/tests/sample_notifications/nova/network.floating_ip.associate.json +++ b/designate/tests/sample_notifications/nova/network.floating_ip.associate.json @@ -70,7 +70,7 @@ "id": "6dc68974176140c5b1eacd4329e94ae2" }], "type": "dns", - "name": "moniker" + "name": "designate" }, { "endpoints_links": [], "endpoints": [{ diff --git a/moniker/tests/sample_notifications/nova/network.floating_ip.deallocate.json b/designate/tests/sample_notifications/nova/network.floating_ip.deallocate.json similarity index 99% rename from moniker/tests/sample_notifications/nova/network.floating_ip.deallocate.json rename to designate/tests/sample_notifications/nova/network.floating_ip.deallocate.json index 9d886e616..669f902b1 100644 --- a/moniker/tests/sample_notifications/nova/network.floating_ip.deallocate.json +++ b/designate/tests/sample_notifications/nova/network.floating_ip.deallocate.json @@ -70,7 +70,7 @@ "id": "6dc68974176140c5b1eacd4329e94ae2" }], "type": "dns", - "name": "moniker" + "name": "designate" }, { "endpoints_links": [], "endpoints": [{ diff --git a/moniker/tests/sample_notifications/nova/network.floating_ip.disassociate.json b/designate/tests/sample_notifications/nova/network.floating_ip.disassociate.json similarity index 99% rename from moniker/tests/sample_notifications/nova/network.floating_ip.disassociate.json rename to designate/tests/sample_notifications/nova/network.floating_ip.disassociate.json index d2dd0c033..54414fca6 100644 --- a/moniker/tests/sample_notifications/nova/network.floating_ip.disassociate.json +++ b/designate/tests/sample_notifications/nova/network.floating_ip.disassociate.json @@ -70,7 +70,7 @@ "id": "6dc68974176140c5b1eacd4329e94ae2" }], "type": "dns", - "name": "moniker" + "name": "designate" }, { "endpoints_links": [], "endpoints": [{ diff --git a/moniker/tests/sample_notifications/nova/scheduler.run_instance.end.json b/designate/tests/sample_notifications/nova/scheduler.run_instance.end.json similarity index 99% rename from moniker/tests/sample_notifications/nova/scheduler.run_instance.end.json rename to designate/tests/sample_notifications/nova/scheduler.run_instance.end.json index fcb151d79..8959ed3b9 100644 --- a/moniker/tests/sample_notifications/nova/scheduler.run_instance.end.json +++ b/designate/tests/sample_notifications/nova/scheduler.run_instance.end.json @@ -70,7 +70,7 @@ "id": "6dc68974176140c5b1eacd4329e94ae2" }], "type": "dns", - "name": "moniker" + "name": "designate" }, { "endpoints_links": [], "endpoints": [{ diff --git a/moniker/tests/sample_notifications/nova/scheduler.run_instance.scheduled.json b/designate/tests/sample_notifications/nova/scheduler.run_instance.scheduled.json similarity index 99% rename from moniker/tests/sample_notifications/nova/scheduler.run_instance.scheduled.json rename to designate/tests/sample_notifications/nova/scheduler.run_instance.scheduled.json index d5337dd39..5de7f9870 100644 --- a/moniker/tests/sample_notifications/nova/scheduler.run_instance.scheduled.json +++ b/designate/tests/sample_notifications/nova/scheduler.run_instance.scheduled.json @@ -70,7 +70,7 @@ }], "endpoints_links": [], "type": "dns", - "name": "moniker" + "name": "designate" }, { "endpoints": [{ "adminURL": "http://identity:35357/v2.0", diff --git a/moniker/tests/sample_notifications/nova/scheduler.run_instance.start.json b/designate/tests/sample_notifications/nova/scheduler.run_instance.start.json similarity index 99% rename from moniker/tests/sample_notifications/nova/scheduler.run_instance.start.json rename to designate/tests/sample_notifications/nova/scheduler.run_instance.start.json index bd3ff1178..213a20685 100644 --- a/moniker/tests/sample_notifications/nova/scheduler.run_instance.start.json +++ b/designate/tests/sample_notifications/nova/scheduler.run_instance.start.json @@ -70,7 +70,7 @@ "id": "6dc68974176140c5b1eacd4329e94ae2" }], "type": "dns", - "name": "moniker" + "name": "designate" }, { "endpoints_links": [], "endpoints": [{ diff --git a/moniker/tests/sample_notifications/quantum/floatingip.update.end_associate.json b/designate/tests/sample_notifications/quantum/floatingip.update.end_associate.json similarity index 100% rename from moniker/tests/sample_notifications/quantum/floatingip.update.end_associate.json rename to designate/tests/sample_notifications/quantum/floatingip.update.end_associate.json diff --git a/moniker/tests/sample_notifications/quantum/floatingip.update.end_disassociate.json b/designate/tests/sample_notifications/quantum/floatingip.update.end_disassociate.json similarity index 100% rename from moniker/tests/sample_notifications/quantum/floatingip.update.end_disassociate.json rename to designate/tests/sample_notifications/quantum/floatingip.update.end_disassociate.json diff --git a/moniker/tests/sample_notifications/quantum/port.create.end.json b/designate/tests/sample_notifications/quantum/port.create.end.json similarity index 100% rename from moniker/tests/sample_notifications/quantum/port.create.end.json rename to designate/tests/sample_notifications/quantum/port.create.end.json diff --git a/moniker/tests/sample_notifications/quantum/port.create.start.josn b/designate/tests/sample_notifications/quantum/port.create.start.josn similarity index 100% rename from moniker/tests/sample_notifications/quantum/port.create.start.josn rename to designate/tests/sample_notifications/quantum/port.create.start.josn diff --git a/moniker/tests/sample_notifications/quantum/port.delete.end.json b/designate/tests/sample_notifications/quantum/port.delete.end.json similarity index 100% rename from moniker/tests/sample_notifications/quantum/port.delete.end.json rename to designate/tests/sample_notifications/quantum/port.delete.end.json diff --git a/moniker/tests/sample_notifications/quantum/port.delete.start.json b/designate/tests/sample_notifications/quantum/port.delete.start.json similarity index 100% rename from moniker/tests/sample_notifications/quantum/port.delete.start.json rename to designate/tests/sample_notifications/quantum/port.delete.start.json diff --git a/moniker/tests/test_agent/__init__.py b/designate/tests/test_agent/__init__.py similarity index 95% rename from moniker/tests/test_agent/__init__.py rename to designate/tests/test_agent/__init__.py index 455509cd5..705debf1e 100644 --- a/moniker/tests/test_agent/__init__.py +++ b/designate/tests/test_agent/__init__.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. -from moniker.tests import TestCase +from designate.tests import TestCase class AgentTestCase(TestCase): diff --git a/moniker/tests/test_agent/test_service.py b/designate/tests/test_agent/test_service.py similarity index 94% rename from moniker/tests/test_agent/test_service.py rename to designate/tests/test_agent/test_service.py index 453f17ec9..1a19b8baa 100644 --- a/moniker/tests/test_agent/test_service.py +++ b/designate/tests/test_agent/test_service.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. -from moniker.tests.test_agent import AgentTestCase +from designate.tests.test_agent import AgentTestCase class AgentServiceTest(AgentTestCase): diff --git a/moniker/tests/test_api/__init__.py b/designate/tests/test_api/__init__.py similarity index 94% rename from moniker/tests/test_api/__init__.py rename to designate/tests/test_api/__init__.py index 7af8f85b2..eeb73628b 100644 --- a/moniker/tests/test_api/__init__.py +++ b/designate/tests/test_api/__init__.py @@ -13,9 +13,9 @@ # 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 moniker.openstack.common import log as logging -from moniker.openstack.common import jsonutils as json -from moniker.tests import TestCase +from designate.openstack.common import log as logging +from designate.openstack.common import jsonutils as json +from designate.tests import TestCase LOG = logging.getLogger(__name__) diff --git a/moniker/tests/test_api/test_auth.py b/designate/tests/test_api/test_auth.py similarity index 94% rename from moniker/tests/test_api/test_auth.py rename to designate/tests/test_api/test_auth.py index 4b2ca560d..5bbd8d4f5 100644 --- a/moniker/tests/test_api/test_auth.py +++ b/designate/tests/test_api/test_auth.py @@ -13,8 +13,8 @@ # 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 moniker.tests.test_api import ApiTestCase -from moniker.api import auth +from designate.tests.test_api import ApiTestCase +from designate.api import auth class FakeRequest(object): @@ -65,7 +65,8 @@ class KeystoneContextMiddlewareTest(ApiTestCase): 'X-User-ID': 'UserID', 'X-Tenant-ID': 'TenantID', 'X-Roles': 'admin,Member', - 'X-Moniker-Sudo-Tenant-ID': '5a993bf8-d521-420a-81e1-192d9cc3d5a0' + 'X-Designate-Sudo-Tenant-ID': + '5a993bf8-d521-420a-81e1-192d9cc3d5a0' } # Process the request diff --git a/moniker/tests/test_api/test_service.py b/designate/tests/test_api/test_service.py similarity index 95% rename from moniker/tests/test_api/test_service.py rename to designate/tests/test_api/test_service.py index 365bed0ab..6e2ceb5d3 100644 --- a/moniker/tests/test_api/test_service.py +++ b/designate/tests/test_api/test_service.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. -from moniker.tests.test_api import ApiTestCase +from designate.tests.test_api import ApiTestCase class ApiServiceTest(ApiTestCase): diff --git a/moniker/tests/test_api/test_v1/__init__.py b/designate/tests/test_api/test_v1/__init__.py similarity index 89% rename from moniker/tests/test_api/test_v1/__init__.py rename to designate/tests/test_api/test_v1/__init__.py index c818f8f66..47b1be046 100644 --- a/moniker/tests/test_api/test_v1/__init__.py +++ b/designate/tests/test_api/test_v1/__init__.py @@ -13,10 +13,10 @@ # 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 moniker.openstack.common import log as logging -from moniker.api import v1 as api_v1 -from moniker.api import auth -from moniker.tests.test_api import ApiTestCase +from designate.openstack.common import log as logging +from designate.api import v1 as api_v1 +from designate.api import auth +from designate.tests.test_api import ApiTestCase LOG = logging.getLogger(__name__) diff --git a/moniker/tests/test_api/test_v1/test_domains.py b/designate/tests/test_api/test_v1/test_domains.py similarity index 97% rename from moniker/tests/test_api/test_v1/test_domains.py rename to designate/tests/test_api/test_v1/test_domains.py index 60c01fa66..4e4c7f45e 100644 --- a/moniker/tests/test_api/test_v1/test_domains.py +++ b/designate/tests/test_api/test_v1/test_domains.py @@ -14,11 +14,11 @@ # License for the specific language governing permissions and limitations # under the License. from mock import patch -from moniker.openstack.common import log as logging -from moniker.openstack.common.rpc import common as rpc_common -from moniker import exceptions -from moniker.central import service as central_service -from moniker.tests.test_api.test_v1 import ApiV1Test +from designate.openstack.common import log as logging +from designate.openstack.common.rpc import common as rpc_common +from designate import exceptions +from designate.central import service as central_service +from designate.tests.test_api.test_v1 import ApiV1Test LOG = logging.getLogger(__name__) diff --git a/moniker/tests/test_api/test_v1/test_records.py b/designate/tests/test_api/test_v1/test_records.py similarity index 97% rename from moniker/tests/test_api/test_v1/test_records.py rename to designate/tests/test_api/test_v1/test_records.py index 1c33d84bf..ba064f982 100644 --- a/moniker/tests/test_api/test_v1/test_records.py +++ b/designate/tests/test_api/test_v1/test_records.py @@ -14,10 +14,10 @@ # License for the specific language governing permissions and limitations # under the License. from mock import patch -from moniker.openstack.common import log as logging -from moniker.openstack.common.rpc import common as rpc_common -from moniker.central import service as central_service -from moniker.tests.test_api.test_v1 import ApiV1Test +from designate.openstack.common import log as logging +from designate.openstack.common.rpc import common as rpc_common +from designate.central import service as central_service +from designate.tests.test_api.test_v1 import ApiV1Test LOG = logging.getLogger(__name__) diff --git a/moniker/tests/test_api/test_v1/test_servers.py b/designate/tests/test_api/test_v1/test_servers.py similarity index 95% rename from moniker/tests/test_api/test_v1/test_servers.py rename to designate/tests/test_api/test_v1/test_servers.py index 597474825..ccbbfea0b 100644 --- a/moniker/tests/test_api/test_v1/test_servers.py +++ b/designate/tests/test_api/test_v1/test_servers.py @@ -14,11 +14,11 @@ # License for the specific language governing permissions and limitations # under the License. from mock import patch -from moniker.openstack.common import log as logging -from moniker.openstack.common.rpc import common as rpc_common -from moniker import exceptions -from moniker.central import service as central_service -from moniker.tests.test_api.test_v1 import ApiV1Test +from designate.openstack.common import log as logging +from designate.openstack.common.rpc import common as rpc_common +from designate import exceptions +from designate.central import service as central_service +from designate.tests.test_api.test_v1 import ApiV1Test LOG = logging.getLogger(__name__) diff --git a/moniker/tests/test_backend/__init__.py b/designate/tests/test_backend/__init__.py similarity index 86% rename from moniker/tests/test_backend/__init__.py rename to designate/tests/test_backend/__init__.py index 2d99d2710..7bf7cc0d4 100644 --- a/moniker/tests/test_backend/__init__.py +++ b/designate/tests/test_backend/__init__.py @@ -13,10 +13,10 @@ # 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 moniker.openstack.common import cfg -from moniker.openstack.common import log as logging -from moniker.tests import TestCase -from moniker import backend +from designate.openstack.common import cfg +from designate.openstack.common import log as logging +from designate.tests import TestCase +from designate import backend LOG = logging.getLogger(__name__) diff --git a/moniker/tests/test_backend/test_bind9.py b/designate/tests/test_backend/test_bind9.py similarity index 88% rename from moniker/tests/test_backend/test_bind9.py rename to designate/tests/test_backend/test_bind9.py index c27319586..8da31b9af 100644 --- a/moniker/tests/test_backend/test_bind9.py +++ b/designate/tests/test_backend/test_bind9.py @@ -13,8 +13,8 @@ # 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 moniker.openstack.common import log as logging -from moniker.tests.test_backend import BackendTestCase +from designate.openstack.common import log as logging +from designate.tests.test_backend import BackendTestCase LOG = logging.getLogger(__name__) diff --git a/moniker/tests/test_backend/test_dnsmasq.py b/designate/tests/test_backend/test_dnsmasq.py similarity index 88% rename from moniker/tests/test_backend/test_dnsmasq.py rename to designate/tests/test_backend/test_dnsmasq.py index d31f9ed5f..786a21d13 100644 --- a/moniker/tests/test_backend/test_dnsmasq.py +++ b/designate/tests/test_backend/test_dnsmasq.py @@ -13,8 +13,8 @@ # 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 moniker.openstack.common import log as logging -from moniker.tests.test_backend import BackendTestCase +from designate.openstack.common import log as logging +from designate.tests.test_backend import BackendTestCase LOG = logging.getLogger(__name__) diff --git a/moniker/tests/test_backend/test_fake.py b/designate/tests/test_backend/test_fake.py similarity index 88% rename from moniker/tests/test_backend/test_fake.py rename to designate/tests/test_backend/test_fake.py index ff4d89e20..63ad1a605 100644 --- a/moniker/tests/test_backend/test_fake.py +++ b/designate/tests/test_backend/test_fake.py @@ -13,8 +13,8 @@ # 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 moniker.openstack.common import log as logging -from moniker.tests.test_backend import BackendTestCase +from designate.openstack.common import log as logging +from designate.tests.test_backend import BackendTestCase LOG = logging.getLogger(__name__) diff --git a/moniker/tests/test_backend/test_mysqlbind9.py b/designate/tests/test_backend/test_mysqlbind9.py similarity index 88% rename from moniker/tests/test_backend/test_mysqlbind9.py rename to designate/tests/test_backend/test_mysqlbind9.py index f6ea44435..9c254a273 100644 --- a/moniker/tests/test_backend/test_mysqlbind9.py +++ b/designate/tests/test_backend/test_mysqlbind9.py @@ -13,8 +13,8 @@ # 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 moniker.openstack.common import log as logging -from moniker.tests.test_backend import BackendTestCase +from designate.openstack.common import log as logging +from designate.tests.test_backend import BackendTestCase LOG = logging.getLogger(__name__) diff --git a/moniker/tests/test_backend/test_powerdns.py b/designate/tests/test_backend/test_powerdns.py similarity index 88% rename from moniker/tests/test_backend/test_powerdns.py rename to designate/tests/test_backend/test_powerdns.py index 3d0345db0..b34a13b53 100644 --- a/moniker/tests/test_backend/test_powerdns.py +++ b/designate/tests/test_backend/test_powerdns.py @@ -13,8 +13,8 @@ # 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 moniker.openstack.common import log as logging -from moniker.tests.test_backend import BackendTestCase +from designate.openstack.common import log as logging +from designate.tests.test_backend import BackendTestCase LOG = logging.getLogger(__name__) diff --git a/moniker/tests/test_central/__init__.py b/designate/tests/test_central/__init__.py similarity index 94% rename from moniker/tests/test_central/__init__.py rename to designate/tests/test_central/__init__.py index 2d4646160..c61c7e081 100644 --- a/moniker/tests/test_central/__init__.py +++ b/designate/tests/test_central/__init__.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. -from moniker.tests import TestCase +from designate.tests import TestCase class CentralTestCase(TestCase): diff --git a/moniker/tests/test_central/test_service.py b/designate/tests/test_central/test_service.py similarity index 99% rename from moniker/tests/test_central/test_service.py rename to designate/tests/test_central/test_service.py index 2f5d913c1..ef622d884 100644 --- a/moniker/tests/test_central/test_service.py +++ b/designate/tests/test_central/test_service.py @@ -15,9 +15,9 @@ # under the License. import random # from mock import patch -from moniker.openstack.common import log as logging -from moniker.tests.test_central import CentralTestCase -from moniker import exceptions +from designate.openstack.common import log as logging +from designate.tests.test_central import CentralTestCase +from designate import exceptions LOG = logging.getLogger(__name__) diff --git a/moniker/tests/test_context.py b/designate/tests/test_context.py similarity index 83% rename from moniker/tests/test_context.py rename to designate/tests/test_context.py index 7c428b4e1..5ed85680d 100644 --- a/moniker/tests/test_context.py +++ b/designate/tests/test_context.py @@ -13,16 +13,16 @@ # 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 moniker.tests import TestCase -from moniker import context +from designate.tests import TestCase +from designate import context -class TestMonikerContext(TestCase): +class TestDesignateContext(TestCase): def test_sudo(self): # Set the policy to accept the authz self.policy({'use_sudo': '@'}) - ctxt = context.MonikerContext(tenant='original') + ctxt = context.DesignateContext(tenant='original') ctxt.sudo('effective') self.assertEqual('effective', ctxt.tenant_id) @@ -32,7 +32,7 @@ class TestMonikerContext(TestCase): # Set the policy to deny the authz self.policy({'use_sudo': '!'}) - ctxt = context.MonikerContext(tenant='original') + ctxt = context.DesignateContext(tenant='original') ctxt.sudo('effective') self.assertEqual('original', ctxt.tenant_id) diff --git a/moniker/tests/test_notification_handler/__init__.py b/designate/tests/test_notification_handler/__init__.py similarity index 95% rename from moniker/tests/test_notification_handler/__init__.py rename to designate/tests/test_notification_handler/__init__.py index b8906baa0..265be55f5 100644 --- a/moniker/tests/test_notification_handler/__init__.py +++ b/designate/tests/test_notification_handler/__init__.py @@ -15,8 +15,8 @@ # under the License. import json import os -from moniker.notification_handler.base import Handler -from moniker.tests import TestCase +from designate.notification_handler.base import Handler +from designate.tests import TestCase FIXTURES_PATH = os.path.abspath(os.path.join(os.path.dirname(__file__), '..', diff --git a/moniker/tests/test_notification_handler/test_nova.py b/designate/tests/test_notification_handler/test_nova.py similarity index 93% rename from moniker/tests/test_notification_handler/test_nova.py rename to designate/tests/test_notification_handler/test_nova.py index c1f19a1ea..44402c121 100644 --- a/moniker/tests/test_notification_handler/test_nova.py +++ b/designate/tests/test_notification_handler/test_nova.py @@ -13,9 +13,10 @@ # 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 moniker.openstack.common import log as logging -from moniker.notification_handler.nova import NovaFixedHandler -from moniker.tests.test_notification_handler import NotificationHandlerTestCase +from designate.openstack.common import log as logging +from designate.notification_handler.nova import NovaFixedHandler +from designate.tests.test_notification_handler import \ + NotificationHandlerTestCase LOG = logging.getLogger(__name__) diff --git a/moniker/tests/test_notification_handler/test_quantum.py b/designate/tests/test_notification_handler/test_quantum.py similarity index 92% rename from moniker/tests/test_notification_handler/test_quantum.py rename to designate/tests/test_notification_handler/test_quantum.py index 7fe1ae957..6ccd40898 100644 --- a/moniker/tests/test_notification_handler/test_quantum.py +++ b/designate/tests/test_notification_handler/test_quantum.py @@ -13,9 +13,10 @@ # 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 moniker.openstack.common import log as logging -from moniker.notification_handler.quantum import QuantumFloatingHandler -from moniker.tests.test_notification_handler import NotificationHandlerTestCase +from designate.openstack.common import log as logging +from designate.notification_handler.quantum import QuantumFloatingHandler +from designate.tests.test_notification_handler import \ + NotificationHandlerTestCase LOG = logging.getLogger(__name__) diff --git a/moniker/tests/test_quota/__init__.py b/designate/tests/test_quota/__init__.py similarity index 94% rename from moniker/tests/test_quota/__init__.py rename to designate/tests/test_quota/__init__.py index 7656eb0d5..780040ded 100644 --- a/moniker/tests/test_quota/__init__.py +++ b/designate/tests/test_quota/__init__.py @@ -13,11 +13,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. -from moniker.openstack.common import cfg -from moniker.openstack.common import log as logging -from moniker.tests import TestCase -from moniker import quota -from moniker import exceptions +from designate.openstack.common import cfg +from designate.openstack.common import log as logging +from designate.tests import TestCase +from designate import quota +from designate import exceptions LOG = logging.getLogger(__name__) diff --git a/moniker/tests/test_quota/test_config.py b/designate/tests/test_quota/test_config.py similarity index 89% rename from moniker/tests/test_quota/test_config.py rename to designate/tests/test_quota/test_config.py index dbb79ac01..65e73d72b 100644 --- a/moniker/tests/test_quota/test_config.py +++ b/designate/tests/test_quota/test_config.py @@ -13,8 +13,8 @@ # 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 moniker.openstack.common import log as logging -from moniker.tests.test_quota import QuotaTestCase +from designate.openstack.common import log as logging +from designate.tests.test_quota import QuotaTestCase LOG = logging.getLogger(__name__) diff --git a/moniker/tests/test_quota/test_storage.py b/designate/tests/test_quota/test_storage.py similarity index 89% rename from moniker/tests/test_quota/test_storage.py rename to designate/tests/test_quota/test_storage.py index 722f35beb..0bea25307 100644 --- a/moniker/tests/test_quota/test_storage.py +++ b/designate/tests/test_quota/test_storage.py @@ -13,8 +13,8 @@ # 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 moniker.openstack.common import log as logging -from moniker.tests.test_quota import QuotaTestCase +from designate.openstack.common import log as logging +from designate.tests.test_quota import QuotaTestCase LOG = logging.getLogger(__name__) diff --git a/moniker/tests/test_schema.py b/designate/tests/test_schema.py similarity index 98% rename from moniker/tests/test_schema.py rename to designate/tests/test_schema.py index 624387c57..62e97c1d9 100644 --- a/moniker/tests/test_schema.py +++ b/designate/tests/test_schema.py @@ -15,9 +15,9 @@ # under the License. import jsonschema from datetime import datetime -from moniker.openstack.common import log as logging -from moniker.tests import TestCase -from moniker import schema +from designate.openstack.common import log as logging +from designate.tests import TestCase +from designate import schema LOG = logging.getLogger(__name__) diff --git a/moniker/tests/test_sink/__init__.py b/designate/tests/test_sink/__init__.py similarity index 94% rename from moniker/tests/test_sink/__init__.py rename to designate/tests/test_sink/__init__.py index f305ea292..303c62955 100644 --- a/moniker/tests/test_sink/__init__.py +++ b/designate/tests/test_sink/__init__.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. -from moniker.tests import TestCase +from designate.tests import TestCase class SinkTestCase(TestCase): diff --git a/moniker/tests/test_sink/test_service.py b/designate/tests/test_sink/test_service.py similarity index 90% rename from moniker/tests/test_sink/test_service.py rename to designate/tests/test_sink/test_service.py index 439c58d0e..1370a7fb0 100644 --- a/moniker/tests/test_sink/test_service.py +++ b/designate/tests/test_sink/test_service.py @@ -13,8 +13,8 @@ # 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 moniker.openstack.common import log as logging -from moniker.tests.test_sink import SinkTestCase +from designate.openstack.common import log as logging +from designate.tests.test_sink import SinkTestCase LOG = logging.getLogger(__name__) diff --git a/moniker/tests/test_storage/__init__.py b/designate/tests/test_storage/__init__.py similarity index 99% rename from moniker/tests/test_storage/__init__.py rename to designate/tests/test_storage/__init__.py index e4a862b9d..bd1862a53 100644 --- a/moniker/tests/test_storage/__init__.py +++ b/designate/tests/test_storage/__init__.py @@ -13,10 +13,10 @@ # 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 moniker.openstack.common import log as logging -from moniker.tests import TestCase -from moniker import storage -from moniker import exceptions +from designate.openstack.common import log as logging +from designate.tests import TestCase +from designate import storage +from designate import exceptions LOG = logging.getLogger(__name__) diff --git a/moniker/tests/test_storage/test_sqlalchemy.py b/designate/tests/test_storage/test_sqlalchemy.py similarity index 89% rename from moniker/tests/test_storage/test_sqlalchemy.py rename to designate/tests/test_storage/test_sqlalchemy.py index 2ad60f326..1810bc696 100644 --- a/moniker/tests/test_storage/test_sqlalchemy.py +++ b/designate/tests/test_storage/test_sqlalchemy.py @@ -13,8 +13,8 @@ # 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 moniker.openstack.common import log as logging -from moniker.tests.test_storage import StorageTestCase +from designate.openstack.common import log as logging +from designate.tests.test_storage import StorageTestCase LOG = logging.getLogger(__name__) diff --git a/moniker/tests/test_utils.py b/designate/tests/test_utils.py similarity index 96% rename from moniker/tests/test_utils.py rename to designate/tests/test_utils.py index b3a731399..1efbf244c 100644 --- a/moniker/tests/test_utils.py +++ b/designate/tests/test_utils.py @@ -16,9 +16,9 @@ import os import tempfile from jinja2 import Template -from moniker.tests import TestCase -from moniker import exceptions -from moniker import utils +from designate.tests import TestCase +from designate import exceptions +from designate import utils class TestUtils(TestCase): diff --git a/moniker/utils.py b/designate/utils.py similarity index 87% rename from moniker/utils.py rename to designate/utils.py index 098f15970..e9dfd8d9d 100644 --- a/moniker/utils.py +++ b/designate/utils.py @@ -17,19 +17,19 @@ import os import pkg_resources import json from jinja2 import Template -from moniker.openstack.common import log as logging -from moniker.openstack.common import cfg -from moniker.openstack.common import processutils -from moniker.openstack.common import timeutils -from moniker.openstack.common.notifier import api as notifier_api -from moniker import exceptions +from designate.openstack.common import log as logging +from designate.openstack.common import cfg +from designate.openstack.common import processutils +from designate.openstack.common import timeutils +from designate.openstack.common.notifier import api as notifier_api +from designate import exceptions LOG = logging.getLogger(__name__) cfg.CONF.register_opts([ cfg.StrOpt('root-helper', - default='sudo moniker-rootwrap /etc/moniker/rootwrap.conf') + default='sudo designate-rootwrap /etc/designate/rootwrap.conf') ]) @@ -51,10 +51,10 @@ def find_config(config_path): """ possible_locations = [ config_path, - os.path.join(cfg.CONF.state_path, "etc", "moniker", config_path), + os.path.join(cfg.CONF.state_path, "etc", "designate", config_path), os.path.join(cfg.CONF.state_path, "etc", config_path), os.path.join(cfg.CONF.state_path, config_path), - "/etc/moniker/%s" % config_path, + "/etc/designate/%s" % config_path, ] found_locations = [] @@ -71,7 +71,7 @@ def find_config(config_path): def read_config(prog, argv): config_files = find_config('%s.conf' % prog) - cfg.CONF(argv[1:], project='moniker', prog=prog, + cfg.CONF(argv[1:], project='designate', prog=prog, default_config_files=config_files) @@ -81,11 +81,11 @@ def resource_string(*args): resource_path = os.path.join('resources', *args) - if not pkg_resources.resource_exists('moniker', resource_path): + if not pkg_resources.resource_exists('designate', resource_path): raise exceptions.ResourceNotFound('Could not find the requested ' 'resource: %s' % resource_path) - return pkg_resources.resource_string('moniker', resource_path) + return pkg_resources.resource_string('designate', resource_path) def load_schema(version, name): diff --git a/moniker/version.py b/designate/version.py similarity index 92% rename from moniker/version.py rename to designate/version.py index 4888e0cfc..a965b5024 100644 --- a/moniker/version.py +++ b/designate/version.py @@ -15,4 +15,4 @@ # under the License. import pbr.version -version_info = pbr.version.VersionInfo('moniker') +version_info = pbr.version.VersionInfo('designate') diff --git a/moniker/wsgi.py b/designate/wsgi.py similarity index 95% rename from moniker/wsgi.py rename to designate/wsgi.py index 94856d49d..803f20895 100644 --- a/moniker/wsgi.py +++ b/designate/wsgi.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. -from moniker.openstack.common import wsgi +from designate.openstack.common import wsgi class Middleware(wsgi.Middleware): diff --git a/doc/source/conf.py b/doc/source/conf.py index f2ae1dae5..21d609bee 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# moniker documentation build configuration file, created by +# designate documentation build configuration file, created by # sphinx-quickstart on Wed Oct 31 18:58:17 2012. # # This file is execfile()d with the current directory set to its containing dir. @@ -40,7 +40,7 @@ source_suffix = '.rst' master_doc = 'index' # General information about the project. -project = u'moniker' +project = u'designate' copyright = u'2012, Managed I.T.' # The version info for the project you're documenting, acts as replacement for @@ -48,10 +48,10 @@ copyright = u'2012, Managed I.T.' # built documents. # # The short X.Y version. -from moniker.version import version_info as moniker_version -version = moniker_version.canonical_version_string() +from designate.version import version_info as designate_version +version = designate_version.canonical_version_string() # The full version, including alpha/beta/rc tags. -release = moniker_version.version_string_with_vcs() +release = designate_version.version_string_with_vcs() # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. @@ -165,7 +165,7 @@ html_static_path = ['_static'] #html_file_suffix = None # Output file base name for HTML help builder. -htmlhelp_basename = 'monikerdoc' +htmlhelp_basename = 'designatedoc' # -- Options for LaTeX output -------------------------------------------------- @@ -184,7 +184,7 @@ latex_elements = { # Grouping the document tree into LaTeX files. List of tuples # (source start file, target name, title, author, documentclass [howto/manual]). latex_documents = [ - ('index', 'moniker.tex', u'Moniker Documentation', + ('index', 'designate.tex', u'Designate Documentation', u'Managed I.T.', 'manual'), ] @@ -214,7 +214,7 @@ latex_documents = [ # One entry per manual page. List of tuples # (source start file, name, description, authors, manual section). man_pages = [ -# ('index', 'moniker', u'Moniker Documentation', +# ('index', 'designate', u'Designate Documentation', # [u'Managed I.T.'], 1) ] @@ -228,8 +228,8 @@ man_pages = [ # (source start file, target name, title, author, # dir menu entry, description, category) texinfo_documents = [ - ('index', 'moniker', u'Moniker Documentation', - u'Managed I.T.', 'moniker', 'One line description of project.', + ('index', 'designate', u'Designate Documentation', + u'Managed I.T.', 'designate', 'One line description of project.', 'Miscellaneous'), ] diff --git a/doc/source/configuration.rst b/doc/source/configuration.rst index 20b662ce4..831905374 100644 --- a/doc/source/configuration.rst +++ b/doc/source/configuration.rst @@ -20,7 +20,7 @@ Configuration Options ======================= -Moniker specific +Designate specific ================ =============================== ==================================== ============================================================== @@ -28,7 +28,7 @@ Parameter Default Note =============================== ==================================== ============================================================== api_host 0.0.0.0 API listen host api_port 0.0.0.0 API listen port -control_exchange moniker The MQ Control exchange +control_exchange designate The MQ Control exchange agent_topic agent The topic that the Agent(s) should use central_topic central The topic that the Central should use os-username glance Username to use for openstack service access @@ -36,7 +36,7 @@ os-password admin Password os-tenant-id Tenant ID to use for openstack service access os-tenant-name admin Tenant name to use for openstack service access os-auth-url http://localhost:5000/v2.0 Auth URL to use for openstack service access -database_connection sqlite:///$pystatepath/moniker.db Database connection string +database_connection sqlite:///$pystatepath/designate.db Database connection string =============================== ==================================== ============================================================== Storage - SQL Alchemy @@ -127,9 +127,9 @@ verbose False Print more ve debug False Print debugging output state_path currentdir Top-level directory for maintaining nova state sqlite_db nova.sqlite file name for sqlite -matchmaker_ringfile /etc/moniker/matchmaker_ring.json Matchmaker ring file (JSON) +matchmaker_ringfile /etc/designate/matchmaker_ring.json Matchmaker ring file (JSON) rpc_zmq_bind_address '*' ZeroMQ bind address -rpc_zmq_matchmaker moniker.openstack.common.rpc. MatchMaker drivers +rpc_zmq_matchmaker designate.openstack.common.rpc. MatchMaker drivers matchmaker.MatchMakerLocalhost rpc_zmq_port 9501 ZeroMQ receiver listening port rpc_zmq_port_pub 9502 ZeroMQ fanout publisher port diff --git a/doc/source/glossary.rst b/doc/source/glossary.rst index a047c6d6a..7d4600286 100644 --- a/doc/source/glossary.rst +++ b/doc/source/glossary.rst @@ -29,7 +29,7 @@ Glossary information persistantly in a backend storage using a configurable driver like SQLAlchemy or other. api - HTTP REST API service for Moniker + HTTP REST API service for Designate mq A message queue, typically something like RabbitMQ or ZeroMQ storage diff --git a/doc/source/index.rst b/doc/source/index.rst index cd12ee4c6..24b6263f8 100644 --- a/doc/source/index.rst +++ b/doc/source/index.rst @@ -1,9 +1,9 @@ -.. moniker documentation master file, created by +.. designate documentation master file, created by sphinx-quickstart on Wed Oct 31 18:58:17 2012. You can adapt this file completely to your liking, but it should at least contain the root `toctree` directive. -Welcome to moniker's documentation! +Welcome to designate's documentation! =================================== Contents: diff --git a/doc/source/install.rst b/doc/source/install.rst index c0f74439e..bacf9774a 100644 --- a/doc/source/install.rst +++ b/doc/source/install.rst @@ -19,11 +19,11 @@ Install ======================== -Moniker is comprised of three components for more info on these please +Designate is comprised of three components for more info on these please see :doc:`architecture`. .. note:: - Moniker makes extensive use of the messaging bus, but has not + Designate makes extensive use of the messaging bus, but has not yet been tested with ZeroMQ. We recommend using RabbitMQ for now. @@ -48,10 +48,10 @@ Common Steps $ apt-get install rabbitmq-server bind9 $ apt-get build-dep python-lxml -2. Clone the Moniker repo off of Stackforge:: +2. Clone the Designate repo off of Stackforge:: - $ git clone https://github.com/stackforge/moniker.git - $ cd moniker + $ git clone https://github.com/stackforge/designate.git + $ cd designate 3. Setup virtualenv:: @@ -61,9 +61,9 @@ Common Steps $ virtualenv --no-site-packages .venv $ . .venv/bin/activate -4. Install Moniker and it's dependencies:: +4. Install Designate and it's dependencies:: - $ cd moniker + $ cd designate $ pip install -rtools/setup-requires -rtools/pip-requires -rtools/pip-options $ python setup.py develop @@ -83,12 +83,12 @@ Common Steps $ sudo service bind9 restart -7. If you intend to run Moniker as a non-root user, then permissions and other +7. If you intend to run Designate as a non-root user, then permissions and other things needs to be fixed up:: $ MUSER=username - $ echo "$MUSER ALL=(ALL) NOPASSWD:ALL" | sudo tee -a /etc/sudoers.d/90-moniker-$MUSER - $ sudo chmod 0440 /etc/sudoers.d/90-moniker-$MUSER + $ echo "$MUSER ALL=(ALL) NOPASSWD:ALL" | sudo tee -a /etc/sudoers.d/90-designate-$MUSER + $ sudo chmod 0440 /etc/sudoers.d/90-designate-$MUSER Note on running processes @@ -111,18 +111,18 @@ Installing the Central Change the wanted configuration settings to match your environment, the file is in the `etc` folder:: - $ vi moniker-central.conf + $ vi designate-central.conf Refer to :doc:`configuration` details on configuring the service. 3. Initialize and sync the :term:`central`:: - $ moniker-manage database-init - $ moniker-manage database-sync + $ designate-manage database-init + $ designate-manage database-sync 4. Start the central service:: - $ moniker-central + $ designate-central Installing the Agent @@ -138,13 +138,13 @@ Installing the Agent Change the wanted configuration settings to match your environment, the file is in the `etc` folder:: - $ vi moniker-agent.conf + $ vi designate-agent.conf Refer to :doc:`configuration` details on configuring the service. 3. Start the agent service:: - $ moniker-agent + $ designate-agent Installing the API @@ -164,11 +164,11 @@ Installing the API Change the wanted configuration settings to match your environment, the file is in the `etc` folder:: - $ vi moniker-api.conf - $ vi moniker-api-paste.ini + $ vi designate-api.conf + $ vi designate-api-paste.ini Refer to :doc:`configuration` details on configuring the service. 3. Start the API service:: - $ moniker-api + $ designate-api diff --git a/doc/source/rest/general.rst b/doc/source/rest/general.rst index 642890250..7612c095e 100644 --- a/doc/source/rest/general.rst +++ b/doc/source/rest/general.rst @@ -4,11 +4,11 @@ General Administrative Access --------------------- -Administrative users can "sudo" into another tenant by providing an additional HTTP header: 'X-Moniker-Sudo-Tenant-ID' +Administrative users can "sudo" into another tenant by providing an additional HTTP header: 'X-Designate-Sudo-Tenant-ID' .. http:get:: /url - Example HTTP Request using the X-Moniker-Sudo-Tenant-ID header + Example HTTP Request using the X-Designate-Sudo-Tenant-ID header **Example request**: @@ -17,4 +17,4 @@ Administrative users can "sudo" into another tenant by providing an additional H GET /domains/09494b72b65b42979efb187f65a0553e HTTP/1.1 Host: example.com Accept: application/json - X-Moniker-Sudo-Tenant-ID: 12345 + X-Designate-Sudo-Tenant-ID: 12345 diff --git a/etc/moniker/api-paste.ini.sample b/etc/designate/api-paste.ini.sample similarity index 66% rename from etc/moniker/api-paste.ini.sample rename to etc/designate/api-paste.ini.sample index d43880c9f..6b05067eb 100644 --- a/etc/moniker/api-paste.ini.sample +++ b/etc/designate/api-paste.ini.sample @@ -4,24 +4,24 @@ use = egg:Paste#urlmap /v1: osapi_dns_v1 [app:osapi_dns_app_versions] -paste.app_factory = moniker.api.versions:factory +paste.app_factory = designate.api.versions:factory [composite:osapi_dns_v1] -use = call:moniker.api.auth:pipeline_factory +use = call:designate.api.auth:pipeline_factory noauth = noauthcontext faultwrapper_v1 osapi_dns_app_v1 keystone = authtoken keystonecontext faultwrapper_v1 osapi_dns_app_v1 [app:osapi_dns_app_v1] -paste.app_factory = moniker.api.v1:factory +paste.app_factory = designate.api.v1:factory [filter:faultwrapper_v1] -paste.filter_factory = moniker.api.v1:FaultWrapperMiddleware.factory +paste.filter_factory = designate.api.v1:FaultWrapperMiddleware.factory [filter:noauthcontext] -paste.filter_factory = moniker.api.auth:NoAuthContextMiddleware.factory +paste.filter_factory = designate.api.auth:NoAuthContextMiddleware.factory [filter:keystonecontext] -paste.filter_factory = moniker.api.auth:KeystoneContextMiddleware.factory +paste.filter_factory = designate.api.auth:KeystoneContextMiddleware.factory [filter:authtoken] paste.filter_factory = keystoneclient.middleware.auth_token:filter_factory diff --git a/etc/moniker/moniker.conf.sample b/etc/designate/designate.conf.sample similarity index 90% rename from etc/moniker/moniker.conf.sample rename to etc/designate/designate.conf.sample index e09f0e05f..c9d216c56 100644 --- a/etc/moniker/moniker.conf.sample +++ b/etc/designate/designate.conf.sample @@ -8,22 +8,22 @@ verbose = True # Show debugging output in logs (sets DEBUG log level output) debug = False -# Top-level directory for maintaining moniker's state -#state_path = /var/lib/moniker +# Top-level directory for maintaining designate's state +#state_path = /var/lib/designate # Log directory -#logdir = /var/log/moniker +#logdir = /var/log/designate # Driver used for issuing notifications -#notification_driver = moniker.openstack.common.notifier.rabbit_notifier +#notification_driver = designate.openstack.common.notifier.rabbit_notifier -# Use "sudo moniker-rootwrap /etc/moniker/rootwrap.conf" to use the real +# Use "sudo designate-rootwrap /etc/designate/rootwrap.conf" to use the real # root filter facility. # Change to "sudo" to skip the filtering and just run the comand directly root_helper = sudo # There has to be a better way to set these defaults -allowed_rpc_exception_modules = moniker.exceptions, moniker.openstack.common.exception +allowed_rpc_exception_modules = designate.exceptions, designate.openstack.common.exception default_log_levels = amqplib=WARN, sqlalchemy=WARN, boto=WARN, suds=INFO, keystone=INFO, eventlet.wsgi.server=WARN, stevedore=WARN, keystoneclient.middleware.auth_token=INFO ######################## @@ -88,7 +88,7 @@ default_log_levels = amqplib=WARN, sqlalchemy=WARN, boto=WARN, suds=INFO, keysto [storage:sqlalchemy] # Database connection string - to configure options for a given implementation # like sqlalchemy or other see below -#database_connection = sqlite:///$state_path/moniker.sqlite +#database_connection = sqlite:///$state_path/designate.sqlite #connection_debug = 100 #connection_trace = False #sqlite_synchronous = True diff --git a/etc/moniker/policy.json b/etc/designate/policy.json similarity index 100% rename from etc/moniker/policy.json rename to etc/designate/policy.json diff --git a/etc/moniker/rootwrap.conf b/etc/designate/rootwrap.conf.sample similarity index 88% rename from etc/moniker/rootwrap.conf rename to etc/designate/rootwrap.conf.sample index 8717ffb7f..79bfb4096 100644 --- a/etc/moniker/rootwrap.conf +++ b/etc/designate/rootwrap.conf.sample @@ -1,10 +1,10 @@ -# Configuration for moniker-rootwrap +# Configuration for designate-rootwrap # This file should be owned by (and only-writeable by) the root user [DEFAULT] # List of directories to load filter definitions from (separated by ','). # These directories MUST all be only writeable by root ! -filters_path=/etc/moniker/rootwrap.d,/usr/share/moniker/rootwrap +filters_path=/etc/designate/rootwrap.d,/usr/share/designate/rootwrap # List of directories to search executables in, in case filters do not # explicitely specify a full path (separated by ',') diff --git a/etc/moniker/rootwrap.d/bind9.filters b/etc/designate/rootwrap.d/bind9.filters similarity index 76% rename from etc/moniker/rootwrap.d/bind9.filters rename to etc/designate/rootwrap.d/bind9.filters index 582e244eb..df8786ba9 100644 --- a/etc/moniker/rootwrap.d/bind9.filters +++ b/etc/designate/rootwrap.d/bind9.filters @@ -1,4 +1,4 @@ -# moniker-rootwrap command filters for nodes on which moniker is +# designate-rootwrap command filters for nodes on which designate is # expected to control network # # This file should be owned by (and only-writeable by) the root user diff --git a/moniker/backend/impl_powerdns/migrate_repo/README b/moniker/backend/impl_powerdns/migrate_repo/README deleted file mode 100644 index e7d508890..000000000 --- a/moniker/backend/impl_powerdns/migrate_repo/README +++ /dev/null @@ -1,4 +0,0 @@ -This is a database migration repository for the project Moniker. - -More information at -http://code.google.com/p/sqlalchemy-migrate/ diff --git a/moniker/storage/impl_sqlalchemy/migrate_repo/README b/moniker/storage/impl_sqlalchemy/migrate_repo/README deleted file mode 100644 index e7d508890..000000000 --- a/moniker/storage/impl_sqlalchemy/migrate_repo/README +++ /dev/null @@ -1,4 +0,0 @@ -This is a database migration repository for the project Moniker. - -More information at -http://code.google.com/p/sqlalchemy-migrate/ diff --git a/openstack-common.conf b/openstack-common.conf index 34d3c389d..cae4db3de 100644 --- a/openstack-common.conf +++ b/openstack-common.conf @@ -27,4 +27,4 @@ module=uuidutils module=wsgi # The base module to hold the copy of openstack.common -base=moniker +base=designate diff --git a/setup.cfg b/setup.cfg index 4e8630280..ed978f635 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,12 +1,12 @@ [metadata] -name = moniker +name = designate version = 2013.1 summary = DNS as a Service description-file = README.md author = Kiall Mac Innes author-email = kiall@managedit.ie -home-page = https://launchpad.net/moniker +home-page = https://launchpad.net/designate classifier = Environment :: OpenStack Environment :: No Input/Output (Daemon) @@ -26,59 +26,59 @@ setup-hooks = [files] packages = - moniker + designate scripts = - bin/moniker-agent - bin/moniker-api - bin/moniker-central - bin/moniker-manage - bin/moniker-rootwrap - bin/moniker-sink + bin/designate-agent + bin/designate-api + bin/designate-central + bin/designate-manage + bin/designate-rootwrap + bin/designate-sink [entry_points] -moniker.v1.controllers = - reports = moniker.v1.reports:ReportsController - diagnostics = moniker.v1.diagnostics:DiagnosticsController - domains = moniker.v1.domains:DomainsController - records = moniker.v1.records:RecordsController - servers = moniker.v1.servers:ServersController +designate.v1.controllers = + reports = designate.v1.reports:ReportsController + diagnostics = designate.v1.diagnostics:DiagnosticsController + domains = designate.v1.domains:DomainsController + records = designate.v1.records:RecordsController + servers = designate.v1.servers:ServersController -moniker.api.v1 = - domains = moniker.api.v1.domains:blueprint - limits = moniker.api.v1.limits:blueprint - records = moniker.api.v1.records:blueprint - servers = moniker.api.v1.servers:blueprint - tsigkeys = moniker.api.v1.tsigkeys:blueprint +designate.api.v1 = + domains = designate.api.v1.domains:blueprint + limits = designate.api.v1.limits:blueprint + records = designate.api.v1.records:blueprint + servers = designate.api.v1.servers:blueprint + tsigkeys = designate.api.v1.tsigkeys:blueprint -moniker.api.v1.extensions = - diagnostics = moniker.api.v1.extensions.diagnostics:blueprint - sync = moniker.api.v1.extensions.sync:blueprint - reports = moniker.api.v1.extensions.reports:blueprint +designate.api.v1.extensions = + diagnostics = designate.api.v1.extensions.diagnostics:blueprint + sync = designate.api.v1.extensions.sync:blueprint + reports = designate.api.v1.extensions.reports:blueprint -moniker.storage = - sqlalchemy = moniker.storage.impl_sqlalchemy:SQLAlchemyStorage +designate.storage = + sqlalchemy = designate.storage.impl_sqlalchemy:SQLAlchemyStorage -moniker.notification.handler = - nova_fixed = moniker.notification_handler.nova:NovaFixedHandler - quantum_floatingip = moniker.notification_handler.quantum:QuantumFloatingHandler +designate.notification.handler = + nova_fixed = designate.notification_handler.nova:NovaFixedHandler + quantum_floatingip = designate.notification_handler.quantum:QuantumFloatingHandler -moniker.backend = - bind9 = moniker.backend.impl_bind9:Bind9Backend - mysqlbind9 = moniker.backend.impl_mysqlbind9:MySQLBind9Backend - powerdns = moniker.backend.impl_powerdns:PowerDNSBackend - rpc = moniker.backend.impl_rpc:RPCBackend - dnsmasq = moniker.backend.impl_dnsmasq:DnsmasqBackend - fake = moniker.backend.impl_fake:FakeBackend +designate.backend = + bind9 = designate.backend.impl_bind9:Bind9Backend + mysqlbind9 = designate.backend.impl_mysqlbind9:MySQLBind9Backend + powerdns = designate.backend.impl_powerdns:PowerDNSBackend + rpc = designate.backend.impl_rpc:RPCBackend + dnsmasq = designate.backend.impl_dnsmasq:DnsmasqBackend + fake = designate.backend.impl_fake:FakeBackend -moniker.quota = - storage = moniker.quota.impl_storage:StorageQuota - config = moniker.quota.impl_config:ConfigQuota +designate.quota = + storage = designate.quota.impl_storage:StorageQuota + config = designate.quota.impl_config:ConfigQuota -moniker.manage = - database-init = moniker.manage.database:InitCommand - database-sync = moniker.manage.database:SyncCommand - powerdns database-init = moniker.manage.powerdns:DatabaseInitCommand - powerdns database-sync = moniker.manage.powerdns:DatabaseSyncCommand +designate.manage = + database-init = designate.manage.database:InitCommand + database-sync = designate.manage.database:SyncCommand + powerdns database-init = designate.manage.powerdns:DatabaseInitCommand + powerdns database-sync = designate.manage.powerdns:DatabaseSyncCommand [build_sphinx] all_files = 1 @@ -91,15 +91,15 @@ tag_date = 0 tag_svn_revision = 0 [compile_catalog] -directory = moniker/locale -domain = moniker +directory = designate/locale +domain = designate [update_catalog] -domain = moniker -output_dir = moniker/locale -input_file = moniker/locale/moniker.pot +domain = designate +output_dir = designate/locale +input_file = designate/locale/designate.pot [extract_messages] keywords = _ gettext ngettext l_ lazy_gettext mapping_file = babel.cfg -output_file = moniker/locale/moniker.pot +output_file = designate/locale/designate.pot diff --git a/tools/install_venv.py b/tools/install_venv.py index 16c4f7444..0bdfd65f1 100644 --- a/tools/install_venv.py +++ b/tools/install_venv.py @@ -21,7 +21,7 @@ # under the License. """ -Installation script for Moniker's development virtualenv +Installation script for Designate's development virtualenv """ import os @@ -33,12 +33,12 @@ import install_venv_common as install_venv def print_help(): help = """ - Moniker development environment setup is complete. + Designate development environment setup is complete. - Moniker development uses virtualenv to track and manage Python dependencies + Designate development uses virtualenv to track and manage Python dependencies while in development and testing. - To activate the Moniker virtualenv for the extent of your current shell + To activate the Designate virtualenv for the extent of your current shell session you can run: $ source .venv/bin/activate @@ -59,7 +59,7 @@ def main(argv): pip_requires = os.path.join(root, 'requirements.txt') test_requires = os.path.join(root, 'test-requirements.txt') py_version = "python%s.%s" % (sys.version_info[0], sys.version_info[1]) - project = 'moniker' + project = 'designate' install = install_venv.InstallVenv(root, venv, pip_requires, test_requires, py_version, project) options = install.parse_args(argv) diff --git a/tools/moniker-keystone-setup b/tools/moniker-keystone-setup index 860160782..e6a062481 100644 --- a/tools/moniker-keystone-setup +++ b/tools/moniker-keystone-setup @@ -60,7 +60,7 @@ get_user() { get_id keystone user-create --name=$username \ --pass="$SERVICE_PASSWORD" \ --tenant_id $SERVICE_TENANT \ - --email=moniker@example.com + --email=designate@example.com fi } @@ -188,11 +188,11 @@ echo SERVICE_TENANT $SERVICE_TENANT echo SERVICE_PASSWORD $SERVICE_PASSWORD echo SERVICE_TOKEN $SERVICE_TOKEN -MONIKER_USERNAME="moniker" -MONIKER_USERID=$(get_user $MONIKER_USERNAME) -add_role $MONIKER_USERID $SERVICE_TENANT $ADMIN_ROLE $MONIKER_USERNAME +DESIGNATE_USERNAME="designate" +DESIGNATE_USERID=$(get_user $DESIGNATE_USERNAME) +add_role $DESIGNATE_USERID $SERVICE_TENANT $ADMIN_ROLE $DESIGNATE_USERNAME -MONIKER_SERVICE=$(get_service moniker dns \ - "Moniker DNSaaS") +DESIGNATE_SERVICE=$(get_service designate dns \ + "Designate DNSaaS") API_URL=${API_URL:-http://localhost:9001/v1} -add_endpoint $MONIKER_SERVICE $API_URL +add_endpoint $DESIGNATE_SERVICE $API_URL