Respective change aligned with the changes in D333.
Details
Details
Diff Detail
Diff Detail
- Repository
- rRSAPI resultsdb_api
- Lint
Automatic diff as part of commit; lint not applicable. - Unit
Automatic diff as part of commit; unit tests not applicable.
Differential D334
Authored by jskladan on Apr 8 2015, 1:03 PM.
Revision Contents
Revision Contents
| Path | Packages | |||
|---|---|---|---|---|
| M | resultsdb_api.py (4 lines) |
| Commit | Tree | Parents | Author | Summary | Date |
|---|---|---|---|---|---|
| 34768bae70a9 | 998f362acd2f | f8ab32b891a9 | Josef Skladanka | Allow for configuring the `return_data` option in `update_job()` call (Show More…) | Apr 8 2015, 12:56 PM |
Diff 911
Diff 911
resultsdb_api.py
| Show First 20 Lines • Show All 67 Lines • ▼ Show 20 Line(s) | 66 | def create_job(self, ref_url, status = None, name = None, uuid = None): | |||
|---|---|---|---|---|---|
| 68 | 68 | | |||
| 69 | url = "%s/jobs" % self.url | 69 | url = "%s/jobs" % self.url | ||
| 70 | headers = {'Content-type': 'application/json', 'Accept': 'text/plain'} | 70 | headers = {'Content-type': 'application/json', 'Accept': 'text/plain'} | ||
| 71 | r = requests.post(url, data=json.dumps(data), headers = headers) | 71 | r = requests.post(url, data=json.dumps(data), headers = headers) | ||
| 72 | self.__raise_on_error(r) | 72 | self.__raise_on_error(r) | ||
| 73 | 73 | | |||
| 74 | return r.json() | 74 | return r.json() | ||
| 75 | 75 | | |||
| 76 | def update_job(self, id = None, href = None, status = None): | 76 | def update_job(self, id = None, href = None, status = None, return_data = False): | ||
| 77 | """ | 77 | """ | ||
| 78 | id or href required, href has preference if both are set | 78 | id or href required, href has preference if both are set | ||
| 79 | """ | 79 | """ | ||
| 80 | url = None | 80 | url = None | ||
| 81 | if id: | 81 | if id: | ||
| 82 | url = "%s/jobs/%s" % (self.url, id) | 82 | url = "%s/jobs/%s" % (self.url, id) | ||
| 83 | if href: | 83 | if href: | ||
| 84 | url = href | 84 | url = href | ||
| 85 | if not url: | 85 | if not url: | ||
| 86 | raise TypeError("%s() requires either id or href parameter" % _fname()) | 86 | raise TypeError("%s() requires either id or href parameter" % _fname()) | ||
| 87 | 87 | | |||
| 88 | data = dict(status = status) | 88 | data = dict(status = status, return_data = return_data) | ||
| 89 | 89 | | |||
| 90 | headers = {'Content-type': 'application/json', 'Accept': 'text/plain'} | 90 | headers = {'Content-type': 'application/json', 'Accept': 'text/plain'} | ||
| 91 | r = requests.put(url, data=json.dumps(data), headers = headers) | 91 | r = requests.put(url, data=json.dumps(data), headers = headers) | ||
| 92 | self.__raise_on_error(r) | 92 | self.__raise_on_error(r) | ||
| 93 | 93 | | |||
| 94 | return r.json() | 94 | return r.json() | ||
| 95 | 95 | | |||
| 96 | 96 | | |||
| ▲ Show 20 Lines • Show All 122 Lines • Show Last 20 Lines | |||||