openstack/ironic
Code Issues Proposed changes

Merge "Trivial: Change hardcoded values in tempest plugin"

Browse Source
This commit is contained in:
Jenkins 2017-02-28 17:13:05 +00:00 committed by Gerrit Code Review
commit 64eb96d7ca
2 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ironic_tempest_plugin/services/baremetal/base.py
View File

@ -13,6 +13,7 @@
import functools import functools
from oslo_serialization import jsonutils as json from oslo_serialization import jsonutils as json
from six.moves import http_client
from six.moves.urllib import parse as urllib from six.moves.urllib import parse as urllib
from tempest.lib.common import api_version_utils from tempest.lib.common import api_version_utils
from tempest.lib.common import rest_client from tempest.lib.common import rest_client
@ -133,7 +134,7 @@ class BaremetalClient(rest_client.RestClient):
resp, body = self.get(uri, headers=headers, resp, body = self.get(uri, headers=headers,
extra_headers=extra_headers) extra_headers=extra_headers)
self.expected_success(200, resp.status) self.expected_success(http_client.OK, resp.status)
return resp, self.deserialize(body) return resp, self.deserialize(body)
@ -149,7 +150,7 @@ class BaremetalClient(rest_client.RestClient):
else: else:
uri = self._get_uri(resource, uuid=uuid, permanent=permanent) uri = self._get_uri(resource, uuid=uuid, permanent=permanent)
resp, body = self.get(uri) resp, body = self.get(uri)
self.expected_success(200, resp.status) self.expected_success(http_client.OK, resp.status)
return resp, self.deserialize(body) return resp, self.deserialize(body)
@ -167,7 +168,7 @@ class BaremetalClient(rest_client.RestClient):
uri = self._get_uri(resource) uri = self._get_uri(resource)
resp, body = self.post(uri, body=body) resp, body = self.post(uri, body=body)
self.expected_success(201, resp.status) self.expected_success(http_client.CREATED, resp.status)
return resp, self.deserialize(body) return resp, self.deserialize(body)
@ -186,7 +187,7 @@ class BaremetalClient(rest_client.RestClient):
uri = self._get_uri(resource) uri = self._get_uri(resource)
resp, body = self.post(uri, body=body) resp, body = self.post(uri, body=body)
self.expected_success(204, resp.status) self.expected_success(http_client.NO_CONTENT, resp.status)
return resp return resp
@ -201,7 +202,7 @@ class BaremetalClient(rest_client.RestClient):
uri = self._get_uri(resource, uuid) uri = self._get_uri(resource, uuid)
resp, body = self.delete(uri) resp, body = self.delete(uri)
self.expected_success(204, resp.status) self.expected_success(http_client.NO_CONTENT, resp.status)
return resp, body return resp, body
def _patch_request(self, resource, uuid, patch_object): def _patch_request(self, resource, uuid, patch_object):
@ -217,7 +218,7 @@ class BaremetalClient(rest_client.RestClient):
patch_body = json.dumps(patch_object) patch_body = json.dumps(patch_object)
resp, body = self.patch(uri, body=patch_body) resp, body = self.patch(uri, body=patch_body)
self.expected_success(200, resp.status) self.expected_success(http_client.OK, resp.status)
return resp, self.deserialize(body) return resp, self.deserialize(body)
@handle_errors @handle_errors
@ -242,5 +243,6 @@ class BaremetalClient(rest_client.RestClient):
put_body = json.dumps(put_object) put_body = json.dumps(put_object)
resp, body = self.put(uri, body=put_body) resp, body = self.put(uri, body=put_body)
self.expected_success([202, 204], resp.status) self.expected_success([http_client.ACCEPTED, http_client.NO_CONTENT],
resp.status)
return resp, body return resp, body

14
ironic_tempest_plugin/services/baremetal/v1/json/baremetal_client.py
View File

@ -10,6 +10,8 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from six.moves import http_client
from ironic_tempest_plugin.services.baremetal import base from ironic_tempest_plugin.services.baremetal import base
@ -318,7 +320,7 @@ class BaremetalClient(base.BaremetalClient):
request = {'boot_device': boot_device, 'persistent': persistent} request = {'boot_device': boot_device, 'persistent': persistent}
resp, body = self._put_request('nodes/%s/management/boot_device' % resp, body = self._put_request('nodes/%s/management/boot_device' %
node_uuid, request) node_uuid, request)
self.expected_success(204, resp.status) self.expected_success(http_client.NO_CONTENT, resp.status)
return body return body
@base.handle_errors @base.handle_errors
@ -330,7 +332,7 @@ class BaremetalClient(base.BaremetalClient):
""" """
path = 'nodes/%s/management/boot_device' % node_uuid path = 'nodes/%s/management/boot_device' % node_uuid
resp, body = self._list_request(path) resp, body = self._list_request(path)
self.expected_success(200, resp.status) self.expected_success(http_client.OK, resp.status)
return body return body
@base.handle_errors @base.handle_errors
@ -342,7 +344,7 @@ class BaremetalClient(base.BaremetalClient):
""" """
path = 'nodes/%s/management/boot_device/supported' % node_uuid path = 'nodes/%s/management/boot_device/supported' % node_uuid
resp, body = self._list_request(path) resp, body = self._list_request(path)
self.expected_success(200, resp.status) self.expected_success(http_client.OK, resp.status)
return body return body
@base.handle_errors @base.handle_errors
@ -354,7 +356,7 @@ class BaremetalClient(base.BaremetalClient):
""" """
resp, body = self._show_request('nodes/states/console', node_uuid) resp, body = self._show_request('nodes/states/console', node_uuid)
self.expected_success(200, resp.status) self.expected_success(http_client.OK, resp.status)
return resp, body return resp, body
@base.handle_errors @base.handle_errors
@ -370,7 +372,7 @@ class BaremetalClient(base.BaremetalClient):
enabled = {'enabled': enabled} enabled = {'enabled': enabled}
resp, body = self._put_request('nodes/%s/states/console' % node_uuid, resp, body = self._put_request('nodes/%s/states/console' % node_uuid,
enabled) enabled)
self.expected_success(202, resp.status) self.expected_success(http_client.ACCEPTED, resp.status)
return resp, body return resp, body
@base.handle_errors @base.handle_errors
@ -410,5 +412,5 @@ class BaremetalClient(base.BaremetalClient):
:param vif_id: An ID representing the VIF :param vif_id: An ID representing the VIF
""" """
resp, body = self._delete_request('nodes/%s/vifs' % node_uuid, vif_id) resp, body = self._delete_request('nodes/%s/vifs' % node_uuid, vif_id)
self.expected_success(204, resp.status) self.expected_success(http_client.NO_CONTENT, resp.status)
return resp, body return resp, body