Revision 627ad739
| b/lib/rapi/baserlib.py | ||
|---|---|---|
| 232 | 232 |
""" |
| 233 | 233 |
self.items = items |
| 234 | 234 |
self.queryargs = queryargs |
| 235 |
self.req = req |
|
| 235 |
self._req = req |
|
| 236 |
|
|
| 237 |
request_body = property(fget=lambda self: self._req.private.body_data) |
|
| 236 | 238 |
|
| 237 | 239 |
def _checkIntVariable(self, name, default=0): |
| 238 | 240 |
"""Return the parsed value of an int argument. |
| ... | ... | |
| 273 | 275 |
|
| 274 | 276 |
""" |
| 275 | 277 |
try: |
| 276 |
return self.req.private.body_data[name]
|
|
| 278 |
return self.request_body[name]
|
|
| 277 | 279 |
except KeyError: |
| 278 | 280 |
if args: |
| 279 | 281 |
return args[0] |
| b/lib/rapi/rlib2.py | ||
|---|---|---|
| 256 | 256 |
@return: a job id |
| 257 | 257 |
|
| 258 | 258 |
""" |
| 259 |
if not isinstance(self.req.private.body_data, basestring):
|
|
| 259 |
if not isinstance(self.request_body, basestring):
|
|
| 260 | 260 |
raise http.HttpBadRequest("Invalid body contents, not a string")
|
| 261 | 261 |
|
| 262 | 262 |
node_name = self.items[0] |
| 263 |
role = self.req.private.body_data
|
|
| 263 |
role = self.request_body
|
|
| 264 | 264 |
|
| 265 | 265 |
if role == _NR_REGULAR: |
| 266 | 266 |
candidate = False |
| ... | ... | |
| 431 | 431 |
@return: a job id |
| 432 | 432 |
|
| 433 | 433 |
""" |
| 434 |
if not isinstance(self.req.private.body_data, dict):
|
|
| 434 |
if not isinstance(self.request_body, dict):
|
|
| 435 | 435 |
raise http.HttpBadRequest("Invalid body contents, not a dictionary")
|
| 436 | 436 |
|
| 437 |
beparams = baserlib.MakeParamsDict(self.req.private.body_data,
|
|
| 437 |
beparams = baserlib.MakeParamsDict(self.request_body,
|
|
| 438 | 438 |
constants.BES_PARAMETERS) |
| 439 |
hvparams = baserlib.MakeParamsDict(self.req.private.body_data,
|
|
| 439 |
hvparams = baserlib.MakeParamsDict(self.request_body,
|
|
| 440 | 440 |
constants.HVS_PARAMETERS) |
| 441 | 441 |
fn = self.getBodyParameter |
| 442 | 442 |
|
Also available in: Unified diff