Code Review
/
yardstick.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Bug Fix: Move heat_timeout variable higher"
[yardstick.git]
/
api
/
__init__.py
diff --git
a/api/__init__.py
b/api/__init__.py
index
dda12aa
..
3235022
100644
(file)
--- a/
api/__init__.py
+++ b/
api/__init__.py
@@
-34,18
+34,18
@@
class ApiResource(Resource):
except KeyError:
pass
except KeyError:
pass
-
LOG.debug('Input args is: action: %s, args: %s', action, args
)
+
args.update({k: v for k, v in request.form.items()}
)
return action, args
def _get_args(self):
args = common_utils.translate_to_str(request.args)
return action, args
def _get_args(self):
args = common_utils.translate_to_str(request.args)
- LOG.debug('Input args is: args: %s', args)
return args
return args
- def _dispatch_post(self):
+ def _dispatch_post(self
, **kwargs
):
action, args = self._post_args()
action, args = self._post_args()
+ args.update(kwargs)
return self._dispatch(args, action)
def _dispatch(self, args, action):
return self._dispatch(args, action)
def _dispatch(self, args, action):
@@
-57,9
+57,9
@@
class ApiResource(Resource):
class Url(object):
class Url(object):
- def __init__(self, url,
endpoin
t):
+ def __init__(self, url,
targe
t):
super(Url, self).__init__()
self.url = url
super(Url, self).__init__()
self.url = url
- self.
endpoint = endpoin
t
+ self.
target = targe
t
common_utils.import_modules_from_package("api.resources")
common_utils.import_modules_from_package("api.resources")