Remove useless NotFound exception catching for v2/v2.1 fping

There is useless NotFound exception catching around "_get_instance_ips",
but deep into the code, there isn't any code will raise that exception.
This patch removes those useless code.

Change-Id: Ib980ad6e2932f90c93a2144e5b8711abd468b9be
This commit is contained in:
He Jie Xu
2015-01-30 15:41:32 +08:00
parent 83c9d3e55e
commit db5af317f2
2 changed files with 9 additions and 20 deletions

View File

@@ -23,7 +23,6 @@ from webob import exc
from nova.api.openstack import common
from nova.api.openstack import extensions
from nova import compute
from nova import exception
from nova.i18n import _
from nova import utils
@@ -127,12 +126,7 @@ class FpingController(object):
authorize(context)
self.check_fping()
instance = common.get_instance(self.compute_api, context, id)
try:
ips = [str(ip) for ip in self._get_instance_ips(context, instance)]
except exception.NotFound:
raise exc.HTTPNotFound()
ips = [str(ip) for ip in self._get_instance_ips(context, instance)]
alive_ips = self.fping(ips)
return {
"server": {

View File

@@ -24,7 +24,6 @@ from nova.api.openstack import common
from nova.api.openstack import extensions
from nova.api.openstack import wsgi
from nova import compute
from nova import exception
from nova.i18n import _
from nova import utils
@@ -127,19 +126,15 @@ class FpingController(wsgi.Controller):
authorize(context)
self.check_fping()
instance = common.get_instance(self.compute_api, context, id)
try:
ips = [str(ip) for ip in self._get_instance_ips(context, instance)]
alive_ips = self.fping(ips)
return {
"server": {
"id": instance["uuid"],
"project_id": instance["project_id"],
"alive": bool(set(ips) & alive_ips),
}
ips = [str(ip) for ip in self._get_instance_ips(context, instance)]
alive_ips = self.fping(ips)
return {
"server": {
"id": instance["uuid"],
"project_id": instance["project_id"],
"alive": bool(set(ips) & alive_ips),
}
except exception.NotFound as e:
raise exc.HTTPNotFound(explanation=e.format_message())
}
class Fping(extensions.V3APIExtensionBase):