openstack/deb-ceilometer
Code Issues Proposed changes

Merge "Fix Python 3 issue in opendaylight client"

Browse Source
This commit is contained in:
Jenkins 2015-08-01 14:16:44 +00:00 committed by Gerrit Code Review
commit 8f933f149a
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ceilometer/alarm/evaluator/gnocchi.py
View File

@ -109,7 +109,7 @@ class GnocchiThresholdEvaluator(evaluator.Evaluator):
except Exception:
LOG.exception(_('alarm stats retrieval failed'))
return []
if int(r.status_code / 100) != 2:
if r.status_code // 100 != 2:
LOG.exception(_('alarm stats retrieval failed: %s') % r.text)
return []
else:

8
ceilometer/dispatcher/gnocchi.py
View File

@ -409,7 +409,7 @@ class GnocchiDispatcher(dispatcher.Base):
'resource_id': resource_id,
'status_code': r.status_code})
raise NoSuchMetric
elif int(r.status_code / 100) != 2:
elif r.status_code // 100 != 2:
raise UnexpectedWorkflowError(
_("Fail to post measure on metric %(metric_name)s of "
"resource %(resource_id)s with status: "
@ -431,7 +431,7 @@ class GnocchiDispatcher(dispatcher.Base):
LOG.debug("Resource %s already exists", resource['id'])
raise ResourceAlreadyExists
elif int(r.status_code / 100) != 2:
elif r.status_code // 100 != 2:
raise UnexpectedWorkflowError(
_("Resource %(resource_id)s creation failed with "
"status: %(status_code)d: %(msg)s") %
@ -449,7 +449,7 @@ class GnocchiDispatcher(dispatcher.Base):
headers=self._get_headers(),
data=json.dumps(resource_extra))
if int(r.status_code / 100) != 2:
if r.status_code // 100 != 2:
raise UnexpectedWorkflowError(
_("Resource %(resource_id)s update failed with "
"status: %(status_code)d: %(msg)s") %
@ -472,7 +472,7 @@ class GnocchiDispatcher(dispatcher.Base):
metric_name, resource_id)
raise MetricAlreadyExists
elif int(r.status_code / 100) != 2:
elif r.status_code // 100 != 2:
raise UnexpectedWorkflowError(
_("Fail to create metric %(metric_name)s of "
"resource %(resource_id)s with status: "

2
ceilometer/network/statistics/opendaylight/client.py
View File

@ -227,7 +227,7 @@ class Client(object):
resp = requests.get(url, **self._req_params)
if CONF.debug:
self._log_res(resp)
if resp.status_code / 100 != 2:
if resp.status_code // 100 != 2:
raise OpenDaylightRESTAPIFailed(
_('OpenDaylitght API returned %(status)s %(reason)s') %
{'status': resp.status_code, 'reason': resp.reason})