Switch functional tests to the fake-hardware hardware type

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

Change-Id: I5cc6976b306d866c0d84706581ddf235e05dc322

7 files changed, 12 insertions, 11 deletions

diff --git a/ironicclient/tests/functional/base.py b/ironicclient/tests/functional/base.py
index 7d0a693..1d734ca 100644
--- a/ironicclient/tests/functional/base.py
+++ b/ironicclient/tests/functional/base.py
@@ -231,7 +231,7 @@ class FunctionalTestBase(base.ClientTestBase):
                 self.fail('Ironic node {0} has not been deleted!'
                           .format(node_id))
 
-    def create_node(self, driver='fake', params=''):
+    def create_node(self, driver='fake-hardware', params=''):
         node = self.ironic('node-create',
                            params='--driver {0} {1}'.format(driver, params))
 
diff --git a/ironicclient/tests/functional/osc/v1/base.py b/ironicclient/tests/functional/osc/v1/base.py
index 4caa443..2ab69cb 100644
--- a/ironicclient/tests/functional/osc/v1/base.py
+++ b/ironicclient/tests/functional/osc/v1/base.py
@@ -20,6 +20,8 @@ from ironicclient.tests.functional import base
 
 class TestCase(base.FunctionalTestBase):
 
+    driver_name = 'fake-hardware'
+
     def openstack(self, *args, **kwargs):
         return self._ironic(cmd='openstack', *args, **kwargs)
 
@@ -51,7 +53,7 @@ class TestCase(base.FunctionalTestBase):
         for key, value in expected.items():
             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.
 
         :param String driver: Driver for a new node
diff --git a/ironicclient/tests/functional/osc/v1/test_baremetal_driver_basic.py b/ironicclient/tests/functional/osc/v1/test_baremetal_driver_basic.py
index 90b95be..051088c 100644
--- a/ironicclient/tests/functional/osc/v1/test_baremetal_driver_basic.py
+++ b/ironicclient/tests/functional/osc/v1/test_baremetal_driver_basic.py
@@ -18,8 +18,6 @@ from ironicclient.tests.functional.osc.v1 import base
 class BaremetalDriverTests(base.TestCase):
     """Functional tests for baremetal driver commands."""
 
-    driver_name = 'fake'
-
     def test_show(self):
         """Show specified driver.
 
diff --git a/ironicclient/tests/functional/osc/v1/test_baremetal_node_basic.py b/ironicclient/tests/functional/osc/v1/test_baremetal_node_basic.py
index 2d1be7c..809c757 100644
--- a/ironicclient/tests/functional/osc/v1/test_baremetal_node_basic.py
+++ b/ironicclient/tests/functional/osc/v1/test_baremetal_node_basic.py
@@ -42,7 +42,7 @@ class BaremetalNodeTests(base.TestCase):
                                      params='--uuid {0}'.format(uuid))
         self.assertEqual(node_info['uuid'], uuid)
         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['provision_state'], 'enroll')
         node_list = self.node_list()
@@ -59,7 +59,7 @@ class BaremetalNodeTests(base.TestCase):
         """
         node_info = self.node_create(
             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['provision_state'], 'available')
 
diff --git a/ironicclient/tests/functional/osc/v1/test_baremetal_node_create_negative.py b/ironicclient/tests/functional/osc/v1/test_baremetal_node_create_negative.py
index 05a7803..eec76db 100644
--- a/ironicclient/tests/functional/osc/v1/test_baremetal_node_create_negative.py
+++ b/ironicclient/tests/functional/osc/v1/test_baremetal_node_create_negative.py
@@ -42,7 +42,7 @@ class BaremetalNodeCreateNegativeTests(base.TestCase):
         ('--resource-class', '', 'expected one argument'))
     @ddt.unpack
     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)
         six.assertRaisesRegex(self, exceptions.CommandFailed, ex_text,
                               self.openstack, command)
diff --git a/ironicclient/tests/functional/test_driver.py b/ironicclient/tests/functional/test_driver.py
index ebd1b31..7d9ad66 100644
--- a/ironicclient/tests/functional/test_driver.py
+++ b/ironicclient/tests/functional/test_driver.py
@@ -50,7 +50,7 @@ class DriverSanityTestIronicClient(base.FunctionalTestBase):
         1) get list of drivers
         2) check that list of drivers is not empty
         """
-        driver = 'fake'
+        driver = 'fake-hardware'
         available_drivers = self.get_drivers_names()
         self.assertGreater(len(available_drivers), 0)
         self.assertIn(driver, available_drivers)
diff --git a/ironicclient/tests/functional/test_json_response.py b/ironicclient/tests/functional/test_json_response.py
index 887b693..73ecc12 100644
--- a/ironicclient/tests/functional/test_json_response.py
+++ b/ironicclient/tests/functional/test_json_response.py
@@ -150,9 +150,10 @@ class TestNodeJsonResponse(base.FunctionalTestBase):
             }
         }
         node_name = 'nodejson'
-        response = self.ironic('node-create', flags='--json',
-                               params='-d fake -n {0}'.format(node_name),
-                               parse=False)
+        response = self.ironic(
+            'node-create', flags='--json',
+            params='-d fake-hardware -n {0}'.format(node_name),
+            parse=False)
         self.addCleanup(self.delete_node, node_name)
         _validate_json(response, schema)