Merge "Remove check for API version in validate_scheduling"
diff --git a/doc/source/usage.rst b/doc/source/usage.rst
index 27b5ebe..ecb7218 100644
--- a/doc/source/usage.rst
+++ b/doc/source/usage.rst
@@ -9,14 +9,14 @@
.. code-block:: ini
- [service_enabled]
+ [service_available]
ironic = True
If introspection tests are needed, also enable support for ironic-inspector:
.. code-block:: ini
- [service_enabled]
+ [service_available]
ironic_inspector = True
See the following example configurations for more details:
diff --git a/ironic_tempest_plugin/config.py b/ironic_tempest_plugin/config.py
index 5fc9333..95b29b3 100644
--- a/ironic_tempest_plugin/config.py
+++ b/ironic_tempest_plugin/config.py
@@ -52,9 +52,8 @@
cfg.StrOpt('catalog_type',
default='baremetal',
help="Catalog type of the baremetal provisioning service"),
- # TODO(dtantsur): change to fake-hardware when Ocata is no longer supported
cfg.StrOpt('driver',
- default='fake',
+ default='fake-hardware',
help="Driver name to use for API tests"),
cfg.StrOpt('endpoint_type',
default='publicURL',
diff --git a/ironic_tempest_plugin/tests/scenario/ironic_standalone/test_basic_ops.py b/ironic_tempest_plugin/tests/scenario/ironic_standalone/test_basic_ops.py
index 0f91b01..ea6f62d 100644
--- a/ironic_tempest_plugin/tests/scenario/ironic_standalone/test_basic_ops.py
+++ b/ironic_tempest_plugin/tests/scenario/ironic_standalone/test_basic_ops.py
@@ -324,3 +324,54 @@
@utils.services('image', 'network')
def test_ip_access_to_server(self):
self.boot_and_verify_node()
+
+
+class BaremetalIloIPxeWholediskHttpLink(
+ bsm.BaremetalStandaloneScenarioTest):
+
+ api_microversion = '1.31' # to set the deploy_interface
+ driver = 'ilo'
+ deploy_interface = 'direct'
+ boot_interface = 'ilo-ipxe'
+ image_ref = CONF.baremetal.whole_disk_image_url
+ image_checksum = CONF.baremetal.whole_disk_image_checksum
+ wholedisk_image = True
+
+ @decorators.idempotent_id('d926c683-1a32-edbc-07dc-95cd74eefecb')
+ @utils.services('network')
+ def test_ip_access_to_server(self):
+ self.boot_and_verify_node()
+
+
+class BaremetalRedfishDirectWholediskHttpLink(
+ bsm.BaremetalStandaloneScenarioTest):
+
+ api_microversion = '1.31' # to set the deploy_interface
+ driver = 'redfish'
+ deploy_interface = 'direct'
+ boot_interface = 'redfish-virtual-media'
+ image_ref = CONF.baremetal.whole_disk_image_url
+ image_checksum = CONF.baremetal.whole_disk_image_checksum
+ wholedisk_image = True
+
+ @decorators.idempotent_id('113acd0a-9872-4631-b3ee-54da7e3bb262')
+ @utils.services('network')
+ def test_ip_access_to_server(self):
+ self.boot_and_verify_node()
+
+
+class BaremetalRedfishIPxeWholediskHttpLink(
+ bsm.BaremetalStandaloneScenarioTest):
+
+ api_microversion = '1.31' # to set the deploy_interface
+ driver = 'redfish'
+ deploy_interface = 'direct'
+ boot_interface = 'ipxe'
+ image_ref = CONF.baremetal.whole_disk_image_url
+ image_checksum = CONF.baremetal.whole_disk_image_checksum
+ wholedisk_image = True
+
+ @decorators.idempotent_id('113acd0a-9872-4631-b3ee-54da7e3bb262')
+ @utils.services('network')
+ def test_ip_access_to_server(self):
+ self.boot_and_verify_node()