openstack/nova
Code Issues Proposed changes

Merge "Change NotFound to InstanceNotFound in server_diagnostics.py"

Browse Source
This commit is contained in:
Jenkins 2014-04-03 02:18:18 +00:00 committed by Gerrit Code Review
commit 97e11c5288
2 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nova/api/openstack/compute/contrib/server_diagnostics.py
View File

@ -20,7 +20,6 @@ from nova.api.openstack import wsgi
from nova.api.openstack import xmlutil
from nova import compute
from nova import exception
from nova.openstack.common.gettextutils import _
authorize = extensions.extension_authorizer('compute', 'server_diagnostics')
@ -44,9 +43,8 @@ class ServerDiagnosticsController(object):
compute_api = compute.API()
try:
instance = compute_api.get(context, server_id, want_objects=True)
except exception.NotFound():
msg = _("Instance not found")
raise webob.exc.HTTPNotFound(explanation=msg)
except exception.InstanceNotFound as e:
raise webob.exc.HTTPNotFound(explanation=e.format_message())
return compute_api.get_diagnostics(context, instance)

23
nova/tests/api/openstack/compute/contrib/test_server_diagnostics.py
View File

@ -12,13 +12,14 @@
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
from lxml import etree
import mock
from nova.api.openstack import compute
from nova.api.openstack.compute.contrib import server_diagnostics
from nova.api.openstack import wsgi
from nova.compute import api as compute_api
from nova import exception
from nova.openstack.common import jsonutils
from nova import test
from nova.tests.api.openstack import fakes
@ -45,18 +46,30 @@ class ServerDiagnosticsTest(test.NoDBTestCase):
osapi_compute_extension=[
'nova.api.openstack.compute.contrib.select_extensions'],
osapi_compute_ext_list=['Server_diagnostics'])
self.stubs.Set(compute_api.API, 'get_diagnostics',
fake_get_diagnostics)
self.stubs.Set(compute_api.API, 'get', fake_instance_get)
self.router = compute.APIRouter(init_only=('servers', 'diagnostics'))
@mock.patch.object(compute_api.API, 'get_diagnostics',
fake_get_diagnostics)
@mock.patch.object(compute_api.API, 'get',
fake_instance_get)
def test_get_diagnostics(self):
req = fakes.HTTPRequest.blank('/fake/servers/%s/diagnostics' % UUID)
req = fakes.HTTPRequest.blank(
'/fake/servers/%s/diagnostics' % UUID)
res = req.get_response(self.router)
output = jsonutils.loads(res.body)
self.assertEqual(output, {'data': 'Some diagnostic info'})
@mock.patch.object(compute_api.API, 'get_diagnostics',
fake_get_diagnostics)
@mock.patch.object(compute_api.API, 'get',
side_effect=exception.InstanceNotFound(instance_id=UUID))
def test_get_diagnostics_with_non_existed_instance(self, mock_get):
req = fakes.HTTPRequest.blank(
'/fake/servers/%s/diagnostics' % UUID)
res = req.get_response(self.router)
self.assertEqual(res.status_int, 404)
class TestServerDiagnosticsXMLSerializer(test.NoDBTestCase):
namespace = wsgi.XMLNS_V11