diff options
| -rw-r--r-- | glanceclient/v2/images.py | 10 | ||||
| -rw-r--r-- | test-requirements.txt | 6 |
2 files changed, 9 insertions, 7 deletions
diff --git a/glanceclient/v2/images.py b/glanceclient/v2/images.py index e0ad247..29abc30 100644 --- a/glanceclient/v2/images.py +++ b/glanceclient/v2/images.py @@ -240,16 +240,18 @@ class Controller(object): return body, resp @utils.add_req_id_to_object() - def stage(self, image_id, image_data): + def stage(self, image_id, image_data, image_size=None): """Upload the data to image staging. :param image_id: ID of the image to upload data for. :param image_data: File-like object supplying the data to upload. + :param image_size: Unused - present for backwards compatibility """ url = '/v2/images/%s/stage' % image_id - return self.upload(image_id, - image_data, - u_url=url) + resp, body = self.upload(image_id, + image_data, + u_url=url) + return body, resp @utils.add_req_id_to_object() def image_import(self, image_id, method='glance-direct'): diff --git a/test-requirements.txt b/test-requirements.txt index 97134ed..b1ac89b 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -4,15 +4,15 @@ hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0 coverage!=4.4,>=4.0 # Apache-2.0 -mock>=2.0 # BSD +mock>=2.0.0 # BSD ordereddict # MIT os-client-config>=1.28.0 # Apache-2.0 openstackdocstheme>=1.16.0 # Apache-2.0 -reno!=2.3.1,>=1.8.0 # Apache-2.0 +reno>=2.5.0 # Apache-2.0 sphinx>=1.6.2 # BSD testrepository>=0.0.18 # Apache-2.0/BSD testtools>=1.4.0 # MIT testscenarios>=0.4 # Apache-2.0/BSD fixtures>=3.0.0 # Apache-2.0/BSD -requests-mock>=1.1 # Apache-2.0 +requests-mock>=1.1.0 # Apache-2.0 tempest>=16.1.0 # Apache-2.0 |