x/deb-python-tempest-lib
Code Issues Proposed changes

Rename get_server_group to show_server_group

Browse Source 
[GET /resources] methods should be "list_<resource name>s"
or "show_<resource name>", so this patch applies the rule
to server_group client.

This patch makes tempest-lib sync for the commit of Tempest
I75307176c2f032301da6227249070c42af54dd6e, but get_server_group has
been released in tempest-lib 1.0.0 already.
So it is difficult to remove it directly for backwards compatibility
and this patch adds warning message for clarifying deprecated method.

Partially implements blueprint consistent-service-method-names

Change-Id: I9e321aaf4791e8ff11e3aa114b41eb612db481ca
This commit is contained in:
Ken'ichi Ohmichi
2015-11-17 10:41:53 +00:00
parent a6d6933ebf
commit 54d25c9615
3 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tempest_lib/api_schema/response/compute/v2_1/servers.py
View File

@@ -351,7 +351,7 @@ common_server_group = {
'required': ['id', 'name', 'policies', 'members', 'metadata']
}
create_get_server_group = {
create_show_server_group = {
'status_code': [200],
'response_body': {
'type': 'object',

13
tempest_lib/services/compute/server_groups_client.py
View File

@@ -14,6 +14,7 @@
# License for the specific language governing permissions and limitations
# under the License.
from oslo_log import log as logging
from oslo_serialization import jsonutils as json
from tempest_lib.api_schema.response.compute.v2_1 import servers as schema
@@ -21,6 +22,7 @@ from tempest_lib.common import rest_client
class ServerGroupsClient(rest_client.RestClient):
LOG = logging.getLogger(__name__)
def create_server_group(self, **kwargs):
"""Create the server group
@@ -33,7 +35,7 @@ class ServerGroupsClient(rest_client.RestClient):
resp, body = self.post('os-server-groups', post_body)
body = json.loads(body)
self.validate_response(schema.create_get_server_group, resp, body)
self.validate_response(schema.create_show_server_group, resp, body)
return rest_client.ResponseBody(resp, body)
def delete_server_group(self, server_group_id):
@@ -49,9 +51,14 @@ class ServerGroupsClient(rest_client.RestClient):
self.validate_response(schema.list_server_groups, resp, body)
return rest_client.ResponseBody(resp, body)
def get_server_group(self, server_group_id):
def show_server_group(self, server_group_id):
"""Get the details of given server_group."""
resp, body = self.get("os-server-groups/%s" % server_group_id)
body = json.loads(body)
self.validate_response(schema.create_get_server_group, resp, body)
self.validate_response(schema.create_show_server_group, resp, body)
return rest_client.ResponseBody(resp, body)
def get_server_group(self, server_group_id):
self.LOG.warning("%s method was deprecated and renamed to %s" %
("get_server_group", "show_server_group"))
return self.show_server_group(server_group_id)

12
tempest_lib/tests/services/compute/test_server_groups_client.py
View File

@@ -69,16 +69,16 @@ class TestServerGroupsClient(base.BaseComputeServiceTest):
def test_list_server_groups_byte_body(self):
self._test_list_server_groups(bytes_body=True)
def _test_get_server_group(self, bytes_body=False):
def _test_show_server_group(self, bytes_body=False):
expected = {"server_group": TestServerGroupsClient.server_group}
self.check_service_client_function(
self.client.get_server_group,
self.client.show_server_group,
'tempest_lib.common.rest_client.RestClient.get',
expected, bytes_body,
server_group_id='5bbcc3c4-1da2-4437-a48a-66f15b1b13f9')
def test_get_server_group_str_body(self):
self._test_get_server_group(bytes_body=False)
def test_show_server_group_str_body(self):
self._test_show_server_group(bytes_body=False)
def test_get_server_group_byte_body(self):
self._test_get_server_group(bytes_body=True)
def test_show_server_group_byte_body(self):
self._test_show_server_group(bytes_body=True)