Drop validation resources dependency from CONF
Validation resources is going to be a stable interface in lib, so
the first step is to remove dependencies from configuration items.
Validation resources are directly used by Tempest only, so the
change in interface should not cause any issue with plugins.
Change-Id: I9ad52d9985139ce373f927c838fcaa8812ea9d17
diff --git a/tempest/test.py b/tempest/test.py
index 3c1b5d0..18a51d7 100644
--- a/tempest/test.py
+++ b/tempest/test.py
@@ -378,9 +378,18 @@
@classmethod
def resource_setup(cls):
"""Class level resource setup for test cases."""
+ if (CONF.validation.ip_version_for_ssh not in (4, 6) and
+ CONF.service_available.neutron):
+ msg = "Invalid IP version %s in ip_version_for_ssh. Use 4 or 6"
+ raise lib_exc.InvalidConfiguration(
+ msg % CONF.validation.ip_version_for_ssh)
if hasattr(cls, "os_primary"):
cls.validation_resources = vresources.create_validation_resources(
- cls.os_primary, cls.validation_resources)
+ cls.os_primary, cls.validation_resources,
+ use_neutron=CONF.service_available.neutron,
+ ethertype='IPv' + str(CONF.validation.ip_version_for_ssh),
+ floating_network_id=CONF.network.public_network_id,
+ floating_network_name=CONF.network.floating_network_name)
else:
LOG.warning("Client manager not found, validation resources not"
" created")