openstack/python-ironicclient
Code Issues Proposed changes

Switch functional tests to the fake-hardware hardware type

Browse Source 
The OSC plugin tests are also refactored to use one driver_name variable.

Change-Id: I5cc6976b306d866c0d84706581ddf235e05dc322
This commit is contained in:
Dmitry Tantsur
2018-06-11 15:34:26 +02:00
parent 177162019b
commit db277272a0
7 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ironicclient/tests/functional/base.py
View File

@@ -231,7 +231,7 @@ class FunctionalTestBase(base.ClientTestBase):
self.fail('Ironic node {0} has not been deleted!' self.fail('Ironic node {0} has not been deleted!'
.format(node_id)) .format(node_id))
def create_node(self, driver='fake', params=''): def create_node(self, driver='fake-hardware', params=''):
node = self.ironic('node-create', node = self.ironic('node-create',
params='--driver {0} {1}'.format(driver, params)) params='--driver {0} {1}'.format(driver, params))

4
ironicclient/tests/functional/osc/v1/base.py
View File

@@ -20,6 +20,8 @@ from ironicclient.tests.functional import base
class TestCase(base.FunctionalTestBase): class TestCase(base.FunctionalTestBase):
driver_name = 'fake-hardware'
def openstack(self, *args, **kwargs): def openstack(self, *args, **kwargs):
return self._ironic(cmd='openstack', *args, **kwargs) return self._ironic(cmd='openstack', *args, **kwargs)
@@ -51,7 +53,7 @@ class TestCase(base.FunctionalTestBase):
for key, value in expected.items(): for key, value in expected.items():
self.assertEqual(value, actual[key]) self.assertEqual(value, actual[key])
def node_create(self, driver='fake', name=None, params=''): def node_create(self, driver=driver_name, name=None, params=''):
"""Create baremetal node and add cleanup. """Create baremetal node and add cleanup.
:param String driver: Driver for a new node :param String driver: Driver for a new node

2
ironicclient/tests/functional/osc/v1/test_baremetal_driver_basic.py
View File

@@ -18,8 +18,6 @@ from ironicclient.tests.functional.osc.v1 import base
class BaremetalDriverTests(base.TestCase): class BaremetalDriverTests(base.TestCase):
"""Functional tests for baremetal driver commands.""" """Functional tests for baremetal driver commands."""
driver_name = 'fake'
def test_show(self): def test_show(self):
"""Show specified driver. """Show specified driver.

4
ironicclient/tests/functional/osc/v1/test_baremetal_node_basic.py
View File

@@ -42,7 +42,7 @@ class BaremetalNodeTests(base.TestCase):
params='--uuid {0}'.format(uuid)) params='--uuid {0}'.format(uuid))
self.assertEqual(node_info['uuid'], uuid) self.assertEqual(node_info['uuid'], uuid)
self.assertEqual(node_info['name'], name) self.assertEqual(node_info['name'], name)
self.assertEqual(node_info['driver'], 'fake') self.assertEqual(node_info['driver'], self.driver_name)
self.assertEqual(node_info['maintenance'], False) self.assertEqual(node_info['maintenance'], False)
self.assertEqual(node_info['provision_state'], 'enroll') self.assertEqual(node_info['provision_state'], 'enroll')
node_list = self.node_list() node_list = self.node_list()
@@ -59,7 +59,7 @@ class BaremetalNodeTests(base.TestCase):
""" """
node_info = self.node_create( node_info = self.node_create(
params='--os-baremetal-api-version 1.5') params='--os-baremetal-api-version 1.5')
self.assertEqual(node_info['driver'], 'fake') self.assertEqual(node_info['driver'], self.driver_name)
self.assertEqual(node_info['maintenance'], False) self.assertEqual(node_info['maintenance'], False)
self.assertEqual(node_info['provision_state'], 'available') self.assertEqual(node_info['provision_state'], 'available')

2
ironicclient/tests/functional/osc/v1/test_baremetal_node_create_negative.py
View File

@@ -42,7 +42,7 @@ class BaremetalNodeCreateNegativeTests(base.TestCase):
('--resource-class', '', 'expected one argument')) ('--resource-class', '', 'expected one argument'))
@ddt.unpack @ddt.unpack
def test_baremetal_node_create(self, argument, value, ex_text): def test_baremetal_node_create(self, argument, value, ex_text):
base_cmd = 'baremetal node create --driver fake' base_cmd = 'baremetal node create --driver %s' % self.driver_name
command = self.construct_cmd(base_cmd, argument, value) command = self.construct_cmd(base_cmd, argument, value)
six.assertRaisesRegex(self, exceptions.CommandFailed, ex_text, six.assertRaisesRegex(self, exceptions.CommandFailed, ex_text,
self.openstack, command) self.openstack, command)

2
ironicclient/tests/functional/test_driver.py
View File

@@ -50,7 +50,7 @@ class DriverSanityTestIronicClient(base.FunctionalTestBase):
1) get list of drivers 1) get list of drivers
2) check that list of drivers is not empty 2) check that list of drivers is not empty
""" """
driver = 'fake' driver = 'fake-hardware'
available_drivers = self.get_drivers_names() available_drivers = self.get_drivers_names()
self.assertGreater(len(available_drivers), 0) self.assertGreater(len(available_drivers), 0)
self.assertIn(driver, available_drivers) self.assertIn(driver, available_drivers)

7
ironicclient/tests/functional/test_json_response.py
View File

@@ -150,9 +150,10 @@ class TestNodeJsonResponse(base.FunctionalTestBase):
} }
} }
node_name = 'nodejson' node_name = 'nodejson'
response = self.ironic('node-create', flags='--json', response = self.ironic(
params='-d fake -n {0}'.format(node_name), 'node-create', flags='--json',
parse=False) params='-d fake-hardware -n {0}'.format(node_name),
parse=False)
self.addCleanup(self.delete_node, node_name) self.addCleanup(self.delete_node, node_name)
_validate_json(response, schema) _validate_json(response, schema)