Revert "Skip the cases effected by sqlalchemy version update"

This reverts commit 210b12f887.

Reason for revert: cyborg code bug has fixed, https://review.opendev.org/c/openstack/cyborg/+/796676

Change-Id: Ifbd85d8fc8754de4a11a0d2707c991bc5e39cc85
This commit is contained in:
Wenping Song 2021-06-28 03:28:46 +00:00 committed by songwenping
parent 210b12f887
commit 5ff08e88c5
4 changed files with 55 additions and 54 deletions

View File

@ -20,14 +20,14 @@ class TestDeployables(base.BaseAPITest):
credentials = ['admin']
# def test_list_deployabcles(self):
# response = self.os_admin.cyborg_client.list_deployables()
# self.assertEqual('deployables', list(response.keys())[0])
#
# deployables_uuid = response['deployables'][0]['uuid']
# response = self.os_admin.cyborg_client.get_deployables(
# deployables_uuid)
# self.assertEqual(deployables_uuid, response['uuid'])
def test_list_deployabcles(self):
response = self.os_admin.cyborg_client.list_deployables()
self.assertEqual('deployables', list(response.keys())[0])
deployables_uuid = response['deployables'][0]['uuid']
response = self.os_admin.cyborg_client.get_deployables(
deployables_uuid)
self.assertEqual(deployables_uuid, response['uuid'])
@classmethod
def resource_cleanup(cls):

View File

@ -20,14 +20,14 @@ class TestDevice(base.BaseAPITest):
credentials = ['admin']
# def test_list_get_device(self):
# response = self.os_admin.cyborg_client.list_devices()
# self.assertEqual('devices', list(response.keys())[0])
#
# device_uuid = response['devices'][0]['uuid']
# response = self.os_admin.cyborg_client.get_device(
# device_uuid)
# self.assertEqual(device_uuid, response['uuid'])
def test_list_get_device(self):
response = self.os_admin.cyborg_client.list_devices()
self.assertEqual('devices', list(response.keys())[0])
device_uuid = response['devices'][0]['uuid']
response = self.os_admin.cyborg_client.get_device(
device_uuid)
self.assertEqual(device_uuid, response['uuid'])
@classmethod
def resource_cleanup(cls):

View File

@ -41,24 +41,26 @@ class DeviceProfileNegativeTest(base.BaseAPITest):
self.os_admin.cyborg_client.delete_device_profile_by_uuid,
non_existent_id)
# @test.attr(type=['negative', 'gate'])
# def test_create_device_profile_server_fault(self):
# # create device profile name same
# dp = [{
# "name": "fpga_same_test",
# "groups": [
# {
# "resources:FPGA": "1",
# "trait:CUSTOM_FAKE_DEVICE": "required"
# }]
# }]
# # create a device profile with named "fpga_same_test"
# response = self.os_admin.cyborg_client.create_device_profile(dp)
# self.assertEqual(dp[0]['name'], response['name'])
# self.addCleanup(self.os_admin.cyborg_client.delete_device_profile,
# dp[0]['name'])
#
# # create a same device profile with the same name "fpga_same_test"
# self.assertRaises(lib_exc.ServerFault,
# self.os_admin.cyborg_client.create_device_profile,
# dp)
@test.attr(type=['negative', 'gate'])
def test_create_device_profile_server_fault(self):
# create device profile name same
dp = [{
"name": "fpga_same_test",
"groups": [
{
"resources:FPGA": "1",
"trait:CUSTOM_FAKE_DEVICE": "required"
}]
}]
# create a device profile with named "fpga_same_test"
response = self.os_admin.cyborg_client.create_device_profile(dp)
self.assertEqual(dp[0]['name'], response['name'])
self.addCleanup(self.os_admin.cyborg_client.delete_device_profile,
dp[0]['name'])
dp[0]['name'] = 'new-fpga'
dp[0]['uuid'] = response['uuid']
# create a same device profile with the same uuid
self.assertRaises(lib_exc.ServerFault,
self.os_admin.cyborg_client.create_device_profile,
dp)

View File

@ -14,11 +14,11 @@
# under the License.
from tempest.common import utils
# from tempest.common import waiters
from tempest.common import waiters
from tempest import config
from tempest.lib import decorators
# from cyborg_tempest_plugin.services import cyborg_data
from cyborg_tempest_plugin.services import cyborg_data
from cyborg_tempest_plugin.tests.scenario import manager
CONF = config.CONF
@ -45,19 +45,18 @@ class TestServerBasicOps(manager.ScenarioTest):
@utils.services('compute', 'network')
def test_server_basic_ops(self):
"""Test for booting a VM with attached accelerator"""
pass
# keypair = self.create_keypair()
# security_group = self._create_security_group()
keypair = self.create_keypair()
security_group = self._create_security_group()
# flavor = self.create_flavor()
# response = self.create_device_profile(
# cyborg_data.SCENARIO_DEVICE_PROFILE_DATA)
# device_profile_name = response["name"]
# accl_flavor = self.create_accel_flavor(device_profile_name)
# self.instance = self.create_server(
# key_name=keypair['name'],
# security_groups=[{'name': security_group['name']}],
# name="cyborg-tempest-test-server",
# flavor=accl_flavor)
# self.servers_client.delete_server(self.instance['id'])
# waiters.wait_for_server_termination(
# self.servers_client, self.instance['id'], ignore_error=False)
response = self.create_device_profile(
cyborg_data.SCENARIO_DEVICE_PROFILE_DATA)
device_profile_name = response["name"]
accl_flavor = self.create_accel_flavor(device_profile_name)
self.instance = self.create_server(
key_name=keypair['name'],
security_groups=[{'name': security_group['name']}],
name="cyborg-tempest-test-server",
flavor=accl_flavor)
self.servers_client.delete_server(self.instance['id'])
waiters.wait_for_server_termination(
self.servers_client, self.instance['id'], ignore_error=False)