Merge "Remove unnecessary name definition"

This commit is contained in:
Jenkins 2016-10-19 03:11:17 +00:00 committed by Gerrit Code Review
commit f09f635a26
2 changed files with 4 additions and 7 deletions

View File

@ -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']

View File

@ -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