Merge "Add a skip check to make sure that vlan is actually in available_type_drivers"
diff --git a/neutron/tests/tempest/api/test_trunk.py b/neutron/tests/tempest/api/test_trunk.py
index 647e3dd..2617eba 100644
--- a/neutron/tests/tempest/api/test_trunk.py
+++ b/neutron/tests/tempest/api/test_trunk.py
@@ -231,6 +231,9 @@
if not test.is_extension_enabled(ext, 'network'):
msg = "%s extension not enabled." % ext
raise cls.skipException(msg)
+ if ("vlan" not in
+ config.CONF.neutron_plugin_options.available_type_drivers):
+ raise cls.skipException("VLAN type_driver is not enabled")
if not config.CONF.neutron_plugin_options.provider_vlans:
raise cls.skipException("No provider VLAN networks available")