openstack/designate
Code Issues Proposed changes

Merge "Bug 1206849: Add more logging to the API Layer"

Browse Source
This commit is contained in:
Jenkins 2013-08-14 09:53:26 +00:00 committed by Gerrit Code Review
commit 646106dca0
3 changed files with 41 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
designate/api/middleware.py
View File

@ -35,7 +35,7 @@ class MaintenanceMiddleware(wsgi.Middleware):
def __init__(self, application): def __init__(self, application):
super(MaintenanceMiddleware, self).__init__(application) super(MaintenanceMiddleware, self).__init__(application)
LOG.info('Starting designate maintaince middleware') LOG.info('Starting designate maintenance middleware')
self.enabled = cfg.CONF['service:api'].maintenance_mode self.enabled = cfg.CONF['service:api'].maintenance_mode
self.role = cfg.CONF['service:api'].maintenance_mode_role self.role = cfg.CONF['service:api'].maintenance_mode_role
@ -64,6 +64,7 @@ def auth_pipeline_factory(loader, global_conf, **local_conf):
""" """
pipeline = local_conf[cfg.CONF['service:api'].auth_strategy] pipeline = local_conf[cfg.CONF['service:api'].auth_strategy]
pipeline = pipeline.split() pipeline = pipeline.split()
LOG.info('Getting auth pipeline: %s' % pipeline[:-1])
filters = [loader.get_filter(n) for n in pipeline[:-1]] filters = [loader.get_filter(n) for n in pipeline[:-1]]
app = loader.get_app(pipeline[-1]) app = loader.get_app(pipeline[-1])
filters.reverse() filters.reverse()

37
designate/central/rpcapi.py
View File

@ -40,130 +40,154 @@ class CentralAPI(rpc_proxy.RpcProxy):
# Misc Methods # Misc Methods
def get_absolute_limits(self, context): def get_absolute_limits(self, context):
LOG.info("get_absolute_limits: Calling central's get_absolute_limits.")
msg = self.make_msg('get_absolute_limits') msg = self.make_msg('get_absolute_limits')
return self.call(context, msg) return self.call(context, msg)
# Quota Methods # Quota Methods
def get_quotas(self, context, tenant_id): def get_quotas(self, context, tenant_id):
LOG.info("get_quotas: Calling central's get_quotas.")
msg = self.make_msg('get_quotas', tenant_id=tenant_id) msg = self.make_msg('get_quotas', tenant_id=tenant_id)
return self.call(context, msg, version='2.1') return self.call(context, msg, version='2.1')
def get_quota(self, context, tenant_id, resource): def get_quota(self, context, tenant_id, resource):
LOG.info("get_quota: Calling central's get_quota.")
msg = self.make_msg('get_quota', tenant_id=tenant_id, msg = self.make_msg('get_quota', tenant_id=tenant_id,
resource=resource) resource=resource)
return self.call(context, msg, version='2.1') return self.call(context, msg, version='2.1')
def set_quota(self, context, tenant_id, resource, hard_limit): def set_quota(self, context, tenant_id, resource, hard_limit):
LOG.info("set_quota: Calling central's set_quota.")
msg = self.make_msg('set_quota', tenant_id=tenant_id, msg = self.make_msg('set_quota', tenant_id=tenant_id,
resource=resource, hard_limit=hard_limit) resource=resource, hard_limit=hard_limit)
return self.call(context, msg, version='2.1') return self.call(context, msg, version='2.1')
def reset_quotas(self, context, tenant_id): def reset_quotas(self, context, tenant_id):
LOG.info("reset_quotas: Calling central's reset_quotas.")
msg = self.make_msg('reset_quotas', tenant_id=tenant_id) msg = self.make_msg('reset_quotas', tenant_id=tenant_id)
return self.call(context, msg, version='2.1') return self.call(context, msg, version='2.1')
# Server Methods # Server Methods
def create_server(self, context, values): def create_server(self, context, values):
LOG.info("create_server: Calling central's create_server.")
msg = self.make_msg('create_server', values=values) msg = self.make_msg('create_server', values=values)
return self.call(context, msg) return self.call(context, msg)
def find_servers(self, context, criterion=None): def find_servers(self, context, criterion=None):
LOG.info("find_servers: Calling central's find_servers.")
msg = self.make_msg('find_servers', criterion=criterion) msg = self.make_msg('find_servers', criterion=criterion)
return self.call(context, msg) return self.call(context, msg)
def get_server(self, context, server_id): def get_server(self, context, server_id):
LOG.info("get_server: Calling central's get_server.")
msg = self.make_msg('get_server', server_id=server_id) msg = self.make_msg('get_server', server_id=server_id)
return self.call(context, msg) return self.call(context, msg)
def update_server(self, context, server_id, values): def update_server(self, context, server_id, values):
LOG.info("update_server: Calling central's update_server.")
msg = self.make_msg('update_server', server_id=server_id, msg = self.make_msg('update_server', server_id=server_id,
values=values) values=values)
return self.call(context, msg) return self.call(context, msg)
def delete_server(self, context, server_id): def delete_server(self, context, server_id):
LOG.info("delete_server: Calling central's delete_server.")
msg = self.make_msg('delete_server', server_id=server_id) msg = self.make_msg('delete_server', server_id=server_id)
return self.call(context, msg) return self.call(context, msg)
# TSIG Key Methods # TSIG Key Methods
def create_tsigkey(self, context, values): def create_tsigkey(self, context, values):
LOG.info("create_tsigkey: Calling central's create_tsigkey.")
msg = self.make_msg('create_tsigkey', values=values) msg = self.make_msg('create_tsigkey', values=values)
return self.call(context, msg) return self.call(context, msg)
def find_tsigkeys(self, context, criterion=None): def find_tsigkeys(self, context, criterion=None):
LOG.info("find_tsigkeys: Calling central's find_tsigkeys.")
msg = self.make_msg('find_tsigkeys', criterion=criterion) msg = self.make_msg('find_tsigkeys', criterion=criterion)
return self.call(context, msg) return self.call(context, msg)
def get_tsigkey(self, context, tsigkey_id): def get_tsigkey(self, context, tsigkey_id):
LOG.info("get_tsigkey: Calling central's get_tsigkey.")
msg = self.make_msg('get_tsigkey', tsigkey_id=tsigkey_id) msg = self.make_msg('get_tsigkey', tsigkey_id=tsigkey_id)
return self.call(context, msg) return self.call(context, msg)
def update_tsigkey(self, context, tsigkey_id, values): def update_tsigkey(self, context, tsigkey_id, values):
LOG.info("update_tsigkey: Calling central's update_tsigkey.")
msg = self.make_msg('update_tsigkey', tsigkey_id=tsigkey_id, msg = self.make_msg('update_tsigkey', tsigkey_id=tsigkey_id,
values=values) values=values)
return self.call(context, msg) return self.call(context, msg)
def delete_tsigkey(self, context, tsigkey_id): def delete_tsigkey(self, context, tsigkey_id):
LOG.info("delete_tsigkey: Calling central's delete_tsigkey.")
msg = self.make_msg('delete_tsigkey', tsigkey_id=tsigkey_id) msg = self.make_msg('delete_tsigkey', tsigkey_id=tsigkey_id)
return self.call(context, msg) return self.call(context, msg)
# Tenant Methods # Tenant Methods
def find_tenants(self, context): def find_tenants(self, context):
LOG.info("find_tenants: Calling central's find_tenants.")
msg = self.make_msg('find_tenants') msg = self.make_msg('find_tenants')
return self.call(context, msg) return self.call(context, msg)
def get_tenant(self, context, tenant_id): def get_tenant(self, context, tenant_id):
LOG.info("get_tenant: Calling central's get_tenant.")
msg = self.make_msg('get_tenant', tenant_id=tenant_id) msg = self.make_msg('get_tenant', tenant_id=tenant_id)
return self.call(context, msg) return self.call(context, msg)
def count_tenants(self, context): def count_tenants(self, context):
LOG.info("count_tenants: Calling central's count_tenants.")
msg = self.make_msg('count_tenants') msg = self.make_msg('count_tenants')
return self.call(context, msg) return self.call(context, msg)
# Domain Methods # Domain Methods
def create_domain(self, context, values): def create_domain(self, context, values):
LOG.info("create_domain: Calling central's create_domain.")
msg = self.make_msg('create_domain', values=values) msg = self.make_msg('create_domain', values=values)
return self.call(context, msg) return self.call(context, msg)
def get_domain(self, context, domain_id): def get_domain(self, context, domain_id):
LOG.info("get_domain: Calling central's get_domain.")
msg = self.make_msg('get_domain', domain_id=domain_id) msg = self.make_msg('get_domain', domain_id=domain_id)
return self.call(context, msg) return self.call(context, msg)
def get_domain_servers(self, context, domain_id): def get_domain_servers(self, context, domain_id):
LOG.info("get_domain_servers: Calling central's get_domain_servers.")
msg = self.make_msg('get_domain_servers', domain_id=domain_id) msg = self.make_msg('get_domain_servers', domain_id=domain_id)
return self.call(context, msg) return self.call(context, msg)
def find_domains(self, context, criterion=None): def find_domains(self, context, criterion=None):
LOG.info("find_domains: Calling central's find_domains.")
msg = self.make_msg('find_domains', criterion=criterion) msg = self.make_msg('find_domains', criterion=criterion)
return self.call(context, msg) return self.call(context, msg)
def find_domain(self, context, criterion): def find_domain(self, context, criterion):
LOG.info("find_domain: Calling central's find_domain.")
msg = self.make_msg('find_domain', criterion=criterion) msg = self.make_msg('find_domain', criterion=criterion)
return self.call(context, msg) return self.call(context, msg)
def update_domain(self, context, domain_id, values, increment_serial=True): def update_domain(self, context, domain_id, values, increment_serial=True):
LOG.info("update_domain: Calling central's update_domain.")
msg = self.make_msg('update_domain', msg = self.make_msg('update_domain',
domain_id=domain_id, domain_id=domain_id,
values=values, values=values,
@ -172,22 +196,26 @@ class CentralAPI(rpc_proxy.RpcProxy):
return self.call(context, msg) return self.call(context, msg)
def delete_domain(self, context, domain_id): def delete_domain(self, context, domain_id):
LOG.info("delete_domain: Calling central's delete_domain.")
msg = self.make_msg('delete_domain', domain_id=domain_id) msg = self.make_msg('delete_domain', domain_id=domain_id)
return self.call(context, msg) return self.call(context, msg)
def count_domains(self, context, criterion=None): def count_domains(self, context, criterion=None):
LOG.info("count_domains: Calling central's count_domains.")
msg = self.make_msg('count_domains', criterion=criterion) msg = self.make_msg('count_domains', criterion=criterion)
return self.call(context, msg) return self.call(context, msg)
def touch_domain(self, context, domain_id): def touch_domain(self, context, domain_id):
LOG.info("touch_domain: Calling central's touch_domain.")
msg = self.make_msg('touch_domain', domain_id=domain_id) msg = self.make_msg('touch_domain', domain_id=domain_id)
return self.call(context, msg) return self.call(context, msg)
# Record Methods # Record Methods
def create_record(self, context, domain_id, values, increment_serial=True): def create_record(self, context, domain_id, values, increment_serial=True):
LOG.info("create_record: Calling central's create_record.")
msg = self.make_msg('create_record', msg = self.make_msg('create_record',
domain_id=domain_id, domain_id=domain_id,
values=values, values=values,
@ -196,6 +224,7 @@ class CentralAPI(rpc_proxy.RpcProxy):
return self.call(context, msg) return self.call(context, msg)
def get_record(self, context, domain_id, record_id): def get_record(self, context, domain_id, record_id):
LOG.info("get_record: Calling central's get_record.")
msg = self.make_msg('get_record', msg = self.make_msg('get_record',
domain_id=domain_id, domain_id=domain_id,
record_id=record_id) record_id=record_id)
@ -203,6 +232,7 @@ class CentralAPI(rpc_proxy.RpcProxy):
return self.call(context, msg) return self.call(context, msg)
def find_records(self, context, domain_id, criterion=None): def find_records(self, context, domain_id, criterion=None):
LOG.info("find_records: Calling central's find_records.")
msg = self.make_msg('find_records', msg = self.make_msg('find_records',
domain_id=domain_id, domain_id=domain_id,
criterion=criterion) criterion=criterion)
@ -210,6 +240,7 @@ class CentralAPI(rpc_proxy.RpcProxy):
return self.call(context, msg) return self.call(context, msg)
def find_record(self, context, domain_id, criterion=None): def find_record(self, context, domain_id, criterion=None):
LOG.info("find_record: Calling central's find_record.")
msg = self.make_msg('find_record', msg = self.make_msg('find_record',
domain_id=domain_id, domain_id=domain_id,
criterion=criterion) criterion=criterion)
@ -218,6 +249,7 @@ class CentralAPI(rpc_proxy.RpcProxy):
def update_record(self, context, domain_id, record_id, values, def update_record(self, context, domain_id, record_id, values,
increment_serial=True): increment_serial=True):
LOG.info("update_record: Calling central's update_record.")
msg = self.make_msg('update_record', msg = self.make_msg('update_record',
domain_id=domain_id, domain_id=domain_id,
record_id=record_id, record_id=record_id,
@ -228,6 +260,7 @@ class CentralAPI(rpc_proxy.RpcProxy):
def delete_record(self, context, domain_id, record_id, def delete_record(self, context, domain_id, record_id,
increment_serial=True): increment_serial=True):
LOG.info("delete_record: Calling central's delete_record.")
msg = self.make_msg('delete_record', msg = self.make_msg('delete_record',
domain_id=domain_id, domain_id=domain_id,
record_id=record_id, record_id=record_id,
@ -236,22 +269,26 @@ class CentralAPI(rpc_proxy.RpcProxy):
return self.call(context, msg) return self.call(context, msg)
def count_records(self, context, criterion=None): def count_records(self, context, criterion=None):
LOG.info("count_records: Calling central's count_records.")
msg = self.make_msg('count_records', criterion=criterion) msg = self.make_msg('count_records', criterion=criterion)
return self.call(context, msg) return self.call(context, msg)
# Sync Methods # Sync Methods
def sync_domains(self, context): def sync_domains(self, context):
LOG.info("sync_domains: Calling central's sync_domains.")
msg = self.make_msg('sync_domains') msg = self.make_msg('sync_domains')
return self.call(context, msg) return self.call(context, msg)
def sync_domain(self, context, domain_id): def sync_domain(self, context, domain_id):
LOG.info("sync_domain: Calling central's sync_domains.")
msg = self.make_msg('sync_domains', domain_id=domain_id) msg = self.make_msg('sync_domains', domain_id=domain_id)
return self.call(context, msg) return self.call(context, msg)
def sync_record(self, context, domain_id, record_id): def sync_record(self, context, domain_id, record_id):
LOG.info("sync_record: Calling central's sync_domains.")
msg = self.make_msg('sync_domains', msg = self.make_msg('sync_domains',
domain_id=domain_id, domain_id=domain_id,
record_id=record_id) record_id=record_id)

2
designate/schema/__init__.py
View File

@ -51,6 +51,7 @@ class Schema(object):
return self.raw_schema return self.raw_schema
def validate(self, obj): def validate(self, obj):
LOG.debug('Validating values: %r' % obj)
errors = [] errors = []
for error in self.validator.iter_errors(obj): for error in self.validator.iter_errors(obj):
@ -61,6 +62,7 @@ class Schema(object):
}) })
if len(errors) > 0: if len(errors) > 0:
LOG.debug('Errors in validation: %r', errors)
raise exceptions.InvalidObject("Provided object does not match " raise exceptions.InvalidObject("Provided object does not match "
"schema", errors=errors) "schema", errors=errors)