Merge "Test cases for iLO driver in standalone ironic"
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/baremetal_standalone_manager.py b/ironic_tempest_plugin/tests/scenario/baremetal_standalone_manager.py
index 3605c28..4f8bfe8 100644
--- a/ironic_tempest_plugin/tests/scenario/baremetal_standalone_manager.py
+++ b/ironic_tempest_plugin/tests/scenario/baremetal_standalone_manager.py
@@ -607,6 +607,9 @@
'op': 'remove'}]
self.update_node(self.node['uuid'], patch=patch)
+ def remove_raid_configuration(self):
+ self.baremetal_client.set_node_raid_config(self.node['uuid'], {})
+
def rescue_unrescue(self):
rescue_password = uuidutils.generate_uuid()
self.rescue_node(self.node['uuid'], rescue_password)
diff --git a/ironic_tempest_plugin/tests/scenario/ironic_standalone/test_cleaning.py b/ironic_tempest_plugin/tests/scenario/ironic_standalone/test_cleaning.py
index ef74e01..b1ddecc 100644
--- a/ironic_tempest_plugin/tests/scenario/ironic_standalone/test_cleaning.py
+++ b/ironic_tempest_plugin/tests/scenario/ironic_standalone/test_cleaning.py
@@ -110,6 +110,11 @@
# remove the root device hint, so it is best for us to go ahead
# and remove it before exiting the test.
self.remove_root_device_hint()
+ # Removes RAID configuration
+ # TODO(TheJulia): We _should_ tear the raid configuration down
+ # however bouncing neutron ports with known DHCP reload bugs
+ # is not a super great idea for tempest tests.
+ self.remove_raid_configuration()
class SoftwareRaidDirect(bsm.BaremetalStandaloneScenarioTest):
@@ -146,3 +151,8 @@
# remove the root device hint, so it is best for us to go ahead
# and remove it before exiting the test.
self.remove_root_device_hint()
+ # Removes RAID configuration
+ # TODO(TheJulia): We _should_ tear the raid configuration down
+ # however bouncing neutron ports with known DHCP reload bugs
+ # is not a super great idea for tempest tests.
+ self.remove_raid_configuration()
diff --git a/ironic_tempest_plugin/tests/scenario/test_baremetal_basic_ops.py b/ironic_tempest_plugin/tests/scenario/test_baremetal_basic_ops.py
index 4fa73ee..7912788 100644
--- a/ironic_tempest_plugin/tests/scenario/test_baremetal_basic_ops.py
+++ b/ironic_tempest_plugin/tests/scenario/test_baremetal_basic_ops.py
@@ -133,16 +133,7 @@
def validate_ports(self):
node_uuid = self.node['uuid']
- vifs = []
- # TODO(vsaienko) switch to get_node_vifs() when all stable releases
- # supports Ironic API 1.28
- if self._is_version_supported('1.28'):
- vifs = self.get_node_vifs(node_uuid)
- else:
- for port in self.get_ports(self.node['uuid']):
- vif = port['extra'].get('vif_port_id')
- if vif:
- vifs.append({'id': vif})
+ vifs = self.get_node_vifs(node_uuid)
ir_ports = self.get_ports(node_uuid)
ir_ports_addresses = [x['address'] for x in ir_ports]
diff --git a/releasenotes/notes/drop-py-2-7-c81e7ff14950791b.yaml b/releasenotes/notes/drop-py-2-7-c81e7ff14950791b.yaml
new file mode 100644
index 0000000..c9401c4
--- /dev/null
+++ b/releasenotes/notes/drop-py-2-7-c81e7ff14950791b.yaml
@@ -0,0 +1,6 @@
+---
+upgrade:
+ - |
+ Python 2.7 support has been dropped. Last release of ironic-tempest-plugin
+ to support py2.7 is OpenStack Train. The minimum version of Python now
+ supported by ironic-tempest-plugin is Python 3.6.
diff --git a/setup.cfg b/setup.cfg
index 53ca735..241739d 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -13,10 +13,9 @@
License :: OSI Approved :: Apache Software License
Operating System :: POSIX :: Linux
Programming Language :: Python
- Programming Language :: Python :: 2
- Programming Language :: Python :: 2.7
Programming Language :: Python :: 3
- Programming Language :: Python :: 3.5
+ Programming Language :: Python :: 3.6
+ Programming Language :: Python :: 3.7
[files]
packages =
diff --git a/test-requirements.txt b/test-requirements.txt
index fb97fc6..9292937 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -4,8 +4,7 @@
hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0
-sphinx!=1.6.6,!=1.6.7,>=1.6.2,<2.0.0;python_version=='2.7' # BSD
-sphinx!=1.6.6,!=1.6.7,>=1.6.2;python_version>='3.4' # BSD
+sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD
openstackdocstheme>=1.20.0 # Apache-2.0
reno>=2.5.0 # Apache-2.0
diff --git a/tox.ini b/tox.ini
index 410337a..60be8ec 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,10 +1,11 @@
[tox]
minversion = 3.1.0
-envlist = py3,py27,pep8
+envlist = py3,pep8
skipsdist = True
ignore_basepython_conflict=true
[testenv]
+basepython = python3
usedevelop = True
install_command = pip install {opts} {packages}
setenv =
@@ -15,29 +16,23 @@
commands = python setup.py test --slowest --testr-args='{posargs}'
[testenv:pep8]
-basepython = python3
commands = flake8 {posargs}
[testenv:venv]
-basepython = python3
commands = {posargs}
[testenv:cover]
-basepython = python3
commands = python setup.py test --coverage --testr-args='{posargs}'
[testenv:docs]
-basepython = python3
commands = python setup.py build_sphinx
[testenv:pdf-docs]
-basepython = python3
whitelist_externals = make
commands = sphinx-build -b latex doc/source doc/build/pdf
make -C doc/build/pdf
[testenv:debug]
-basepython = python3
commands = oslo_debug_helper {posargs}
[flake8]
diff --git a/zuul.d/stable-jobs.yaml b/zuul.d/stable-jobs.yaml
index 759239a..ec95d55 100644
--- a/zuul.d/stable-jobs.yaml
+++ b/zuul.d/stable-jobs.yaml
@@ -4,7 +4,7 @@
override-checkout: stable/train
vars:
devstack_localrc:
- USE_PYTHON3: False
+ USE_PYTHON3: True
- job:
name: ironic-standalone-stein
@@ -12,7 +12,7 @@
override-checkout: stable/stein
vars:
devstack_localrc:
- USE_PYTHON3: False
+ USE_PYTHON3: True
- job:
name: ironic-tempest-functional-python3-train
@@ -31,7 +31,7 @@
override-checkout: stable/train
vars:
devstack_localrc:
- USE_PYTHON3: False
+ USE_PYTHON3: True
- job:
name: ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode-stein
@@ -39,7 +39,7 @@
override-checkout: stable/stein
vars:
devstack_localrc:
- USE_PYTHON3: False
+ USE_PYTHON3: True
- job:
name: ironic-inspector-tempest-train
@@ -49,7 +49,7 @@
devstack_localrc:
FIXED_NETWORK_SIZE: 4096
EBTABLES_RACE_FIX: True
- USE_PYTHON3: False
+ USE_PYTHON3: True
- job:
name: ironic-inspector-tempest-stein
@@ -59,7 +59,7 @@
devstack_localrc:
FIXED_NETWORK_SIZE: 4096
EBTABLES_RACE_FIX: True
- USE_PYTHON3: False
+ USE_PYTHON3: True
- job:
name: ironic-inspector-tempest-discovery-train
@@ -67,7 +67,7 @@
override-checkout: stable/train
vars:
devstack_localrc:
- USE_PYTHON3: False
+ USE_PYTHON3: True
- job:
name: ironic-inspector-tempest-discovery-stein
@@ -75,4 +75,4 @@
override-checkout: stable/stein
vars:
devstack_localrc:
- USE_PYTHON3: False
+ USE_PYTHON3: True