openstack
/
monasca-api
Code Issues Proposed changes

Merge "Fix LOG.warn to LOG.warning"

This commit is contained in:
Jenkins 2016-10-24 19:32:34 +00:00 committed by Gerrit Code Review
parent 62f2380731 5a3d4f5180
commit 3431072de7
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
monasca_api/v2/reference/alarm_definitions.py
View File

@ -231,14 +231,14 @@ class AlarmDefinitions(alarm_definitions_api_v2.AlarmDefinitionsV2API,
limit=0)
if definitions:
if not expected_id:
LOG.warn("Found existing definition for {} with tenant_id {}".format(name, tenant_id))
LOG.warning("Found existing definition for {} with tenant_id {}".format(name, tenant_id))
raise exceptions.AlreadyExistsException("An alarm definition with the name {} already exists"
.format(name))
found_definition_id = definitions[0]['id']
if found_definition_id != expected_id:
LOG.warn("Found existing alarm definition for {} with tenant_id {} with unexpected id {}"
.format(name, tenant_id, found_definition_id))
LOG.warning("Found existing alarm definition for {} with tenant_id {} with unexpected id {}"
.format(name, tenant_id, found_definition_id))
raise exceptions.AlreadyExistsException(
"An alarm definition with the name {} already exists with id {}"
.format(name, found_definition_id))

10
monasca_api/v2/reference/notifications.py
View File

@ -63,14 +63,14 @@ class Notifications(notifications_api_v2.NotificationsV2API):
if notification:
if not expected_id:
LOG.warn("Found existing notification method for {} with tenant_id {}".format(name, tenant_id))
LOG.warning("Found existing notification method for {} with tenant_id {}".format(name, tenant_id))
raise exceptions.AlreadyExistsException(
"A notification method with the name {} already exists".format(name))
found_notification_id = notification['id']
if found_notification_id != expected_id:
LOG.warn("Found existing notification method for {} with tenant_id {} with unexpected id {}"
.format(name, tenant_id, found_notification_id))
LOG.warning("Found existing notification method for {} with tenant_id {} with unexpected id {}"
.format(name, tenant_id, found_notification_id))
raise exceptions.AlreadyExistsException(
"A notification method with name {} already exists with id {}"
.format(name, found_notification_id))
@ -80,8 +80,8 @@ class Notifications(notifications_api_v2.NotificationsV2API):
exists = nmt.upper() in notification_methods
if not exists:
LOG.warn("Found no notification method type {} . Did you install/enable the plugin for that type?"
.format(nmt))
LOG.warning("Found no notification method type {} . Did you install/enable the plugin for that type?"
.format(nmt))
raise falcon.HTTPBadRequest('Bad Request', "Not a valid notification method type {} ".format(nmt))
@resource.resource_try_catch_block