diff --git a/etc/moniker/policy.json b/etc/moniker/policy.json index fcd706677..0fec71a4e 100644 --- a/etc/moniker/policy.json +++ b/etc/moniker/policy.json @@ -34,7 +34,7 @@ "use_blacklisted_domain": "rule:admin", "diagnostics_ping": "rule:admin", - "diagnostics_sync_all": "rule:admin", + "diagnostics_sync_domains": "rule:admin", "diagnostics_sync_domain": "rule:admin", "diagnostics_sync_record": "rule:admin" } diff --git a/moniker/api/v1/sync.py b/moniker/api/v1/sync.py index f273249a6..68e953f47 100644 --- a/moniker/api/v1/sync.py +++ b/moniker/api/v1/sync.py @@ -23,12 +23,12 @@ LOG = logging.getLogger(__name__) blueprint = flask.Blueprint('sync', __name__) -@blueprint.route('/sync', methods=['POST']) -def sync_all(): +@blueprint.route('/domains/sync', methods=['POST']) +def sync_domains(): context = flask.request.environ.get('context') try: - central_api.sync_all(context) + central_api.sync_domains(context) except exceptions.Forbidden: return flask.Response(status=401) except rpc_common.Timeout: diff --git a/moniker/central/api.py b/moniker/central/api.py index f5b90217d..1eef01aa3 100644 --- a/moniker/central/api.py +++ b/moniker/central/api.py @@ -267,9 +267,9 @@ def delete_record(context, domain_id, record_id): return RPC.call(context, msg) -def sync_all(context): +def sync_domains(context): msg = { - 'method': 'sync_all', + 'method': 'sync_domains', 'args': {}, } diff --git a/moniker/central/service.py b/moniker/central/service.py index a9f9b2040..a1c9a54ee 100644 --- a/moniker/central/service.py +++ b/moniker/central/service.py @@ -596,8 +596,8 @@ class Service(rpc_service.Service): return self.storage_conn.delete_record(context, record_id) # Diagnostics Methods - def sync_all(self, context): - policy.check('diagnostics_sync_all', context) + def sync_domains(self, context): + policy.check('diagnostics_sync_domains', context) domains = self.storage_conn.get_domains(context) results = {} diff --git a/moniker/manage/sync.py b/moniker/manage/sync.py index 81834a0d0..f3fb22e7c 100644 --- a/moniker/manage/sync.py +++ b/moniker/manage/sync.py @@ -20,11 +20,11 @@ from moniker.central import api as central_api LOG = logging.getLogger(__name__) -class SyncAllCommand(base.Command): - """ Sync Everything """ +class SyncDomainsCommand(base.Command): + """ Sync All Domains """ def execute(self, parsed_args): - return central_api.sync_all(self.context) + return central_api.sync_domains(self.context) class SyncDomainCommand(base.Command): diff --git a/moniker/storage/impl_sqlalchemy/migrate_repo/versions/012_add_serial_col.py b/moniker/storage/impl_sqlalchemy/migrate_repo/versions/012_add_serial_col.py index 62934fdba..427538562 100644 --- a/moniker/storage/impl_sqlalchemy/migrate_repo/versions/012_add_serial_col.py +++ b/moniker/storage/impl_sqlalchemy/migrate_repo/versions/012_add_serial_col.py @@ -34,8 +34,8 @@ def upgrade(migrate_engine): domain_count = domains_table.count().execute().first()[0] if domain_count > 0: - LOG.warn('A sync-all is now required in order for the API provided, ' - 'and backend provided serial numbers to align') + LOG.warn('A sync-domains is now required in order for the API ' + 'provided, and backend provided serial numbers to align') def downgrade(migrate_engine): diff --git a/setup.py b/setup.py index 43c00d681..8ecdcc934 100755 --- a/setup.py +++ b/setup.py @@ -97,7 +97,7 @@ setup( tsigkey-update = moniker.manage.tsigkeys:UpdateTsigKeyCommand tsigkey-delete = moniker.manage.tsigkeys:DeleteTsigKeyCommand - sync-all = moniker.manage.sync:SyncAllCommand + sync-domains = moniker.manage.sync:SyncDomainsCommand sync-domain = moniker.manage.sync:SyncDomainCommand sync-record = moniker.manage.sync:SyncRecordCommand """),