diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-05-17 13:39:39 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-05-17 13:39:39 +0000 |
| commit | 15a8a9cedde2db29c18de5625f0990b3fa8ca94c (patch) | |
| tree | 981d602dd193ae496b92d289cb89c861284843a0 | |
| parent | a95b1d4c4d7da102fc09e7cde0ca23656df94f42 (diff) | |
| parent | e114c66400c52e7fb049f46aa87a49b99e279b9c (diff) | |
| download | ironic-15a8a9cedde2db29c18de5625f0990b3fa8ca94c.tar.gz | |
Merge "Fix usage of rest_client expected_success() in tests" into stable/mitaka
| -rw-r--r-- | ironic_tempest_plugin/services/baremetal/base.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ironic_tempest_plugin/services/baremetal/base.py b/ironic_tempest_plugin/services/baremetal/base.py index 5b6dea8fb..edb9ecbc7 100644 --- a/ironic_tempest_plugin/services/baremetal/base.py +++ b/ironic_tempest_plugin/services/baremetal/base.py @@ -110,7 +110,7 @@ class BaremetalClient(rest_client.RestClient): uri += "?%s" % urllib.urlencode(kwargs) resp, body = self.get(uri) - self.expected_success(200, resp['status']) + self.expected_success(200, resp.status) return resp, self.deserialize(body) @@ -126,7 +126,7 @@ class BaremetalClient(rest_client.RestClient): else: uri = self._get_uri(resource, uuid=uuid, permanent=permanent) resp, body = self.get(uri) - self.expected_success(200, resp['status']) + self.expected_success(200, resp.status) return resp, self.deserialize(body) @@ -144,7 +144,7 @@ class BaremetalClient(rest_client.RestClient): uri = self._get_uri(resource) resp, body = self.post(uri, body=body) - self.expected_success(201, resp['status']) + self.expected_success(201, resp.status) return resp, self.deserialize(body) @@ -159,7 +159,7 @@ class BaremetalClient(rest_client.RestClient): uri = self._get_uri(resource, uuid) resp, body = self.delete(uri) - self.expected_success(204, resp['status']) + self.expected_success(204, resp.status) return resp, body def _patch_request(self, resource, uuid, patch_object): @@ -175,7 +175,7 @@ class BaremetalClient(rest_client.RestClient): patch_body = json.dumps(patch_object) resp, body = self.patch(uri, body=patch_body) - self.expected_success(200, resp['status']) + self.expected_success(200, resp.status) return resp, self.deserialize(body) @handle_errors @@ -200,5 +200,5 @@ class BaremetalClient(rest_client.RestClient): put_body = json.dumps(put_object) resp, body = self.put(uri, body=put_body) - self.expected_success(202, resp['status']) + self.expected_success([202, 204], resp.status) return resp, body |