Revision e2ae9123
b/lib/rapi/RESTHTTPServer.py | ||
---|---|---|
25 | 25 |
from ganeti import errors |
26 | 26 |
from ganeti import rpc |
27 | 27 |
from ganeti.rapi import connector |
28 |
from ganeti.rapi import httperror |
|
29 | 28 |
|
30 | 29 |
|
31 | 30 |
class RESTRequestHandler(http.HTTPRequestHandler): |
... | ... | |
35 | 34 |
def setup(self): |
36 | 35 |
super(RESTRequestHandler, self).setup() |
37 | 36 |
self._resmap = connector.Mapper() |
38 |
|
|
37 |
|
|
39 | 38 |
def HandleRequest(self): |
40 | 39 |
""" Handels a request. |
41 | 40 |
|
... | ... | |
47 | 46 |
try: |
48 | 47 |
fn = getattr(handler, command) |
49 | 48 |
except AttributeError, err: |
50 |
raise httperror.HTTPBadRequest()
|
|
49 |
raise http.HTTPBadRequest() |
|
51 | 50 |
|
52 | 51 |
try: |
53 | 52 |
result = fn() |
... | ... | |
55 | 54 |
except errors.OpPrereqError, err: |
56 | 55 |
# TODO: "Not found" is not always the correct error. Ganeti's core must |
57 | 56 |
# differentiate between different error types. |
58 |
raise httperror.HTTPNotFound(message=str(err))
|
|
59 |
|
|
57 |
raise http.HTTPNotFound(message=str(err)) |
|
58 |
|
|
60 | 59 |
return result |
61 | 60 |
|
62 | 61 |
|
Also available in: Unified diff