From 9cae8eccbd6a6dd124433ff8b98307610d61218c Mon Sep 17 00:00:00 2001 From: zhufl Date: Tue, 18 Oct 2016 15:00:24 +0800 Subject: [PATCH] Remove unnecessary name definition There already exists rand name in create function, so the name definition before the create function is unnecessary. This is to remove the redundant name definition for code clean. Change-Id: Icdac63c6ac241f8ba2c65bcff4cafcc2354db4d8 --- .../api/compute/floating_ips/test_floating_ips_actions.py | 4 +--- tempest/api/compute/servers/test_server_group.py | 7 +++---- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/tempest/api/compute/floating_ips/test_floating_ips_actions.py b/tempest/api/compute/floating_ips/test_floating_ips_actions.py index 3508ba9e26..fdf1e93d6f 100644 --- a/tempest/api/compute/floating_ips/test_floating_ips_actions.py +++ b/tempest/api/compute/floating_ips/test_floating_ips_actions.py @@ -14,7 +14,6 @@ # under the License. from tempest.api.compute.floating_ips import base -from tempest.common.utils import data_utils from tempest.common import waiters from tempest import config from tempest.lib.common.utils import test_utils @@ -112,8 +111,7 @@ class FloatingIPsTestJSON(base.BaseFloatingIPsTest): # positive test:Association of an already associated floating IP # to specific server should change the association of the Floating IP # Create server so as to use for Multiple association - new_name = data_utils.rand_name('floating_server') - body = self.create_test_server(name=new_name) + body = self.create_test_server() waiters.wait_for_server_status(self.servers_client, body['id'], 'ACTIVE') self.new_server_id = body['id'] diff --git a/tempest/api/compute/servers/test_server_group.py b/tempest/api/compute/servers/test_server_group.py index e32f6b02eb..bc49e7b033 100644 --- a/tempest/api/compute/servers/test_server_group.py +++ b/tempest/api/compute/servers/test_server_group.py @@ -19,12 +19,13 @@ from tempest import test class ServerGroupTestJSON(base.BaseV2ComputeTest): - """These tests check for the server-group APIs + """These tests check for the server-group APIs. They create/delete server-groups with different policies. policies = affinity/anti-affinity It also adds the tests for list and get details of server-groups """ + @classmethod def skip_checks(cls): super(ServerGroupTestJSON, cls).skip_checks() @@ -40,12 +41,10 @@ class ServerGroupTestJSON(base.BaseV2ComputeTest): @classmethod def resource_setup(cls): super(ServerGroupTestJSON, cls).resource_setup() - server_group_name = data_utils.rand_name('server-group') cls.policy = ['affinity'] cls.created_server_group = cls.create_test_server_group( - server_group_name, - cls.policy) + policy=cls.policy) def _create_server_group(self, name, policy): # create the test server-group with given policy