Merge "Add quantum_available config option"
diff --git a/etc/tempest.conf.sample b/etc/tempest.conf.sample
index a70a7ab..02bfdcb 100644
--- a/etc/tempest.conf.sample
+++ b/etc/tempest.conf.sample
@@ -193,6 +193,9 @@
# for each tenant to have their own router.
public_router_id = {$PUBLIC_ROUTER_ID}
+# Whether or not quantum is expected to be available
+quantum_available = false
+
[volume]
# This section contains the configuration options used when executing tests
# against the OpenStack Block Storage API service
diff --git a/tempest/config.py b/tempest/config.py
index 856be16..2f4ce6a 100644
--- a/tempest/config.py
+++ b/tempest/config.py
@@ -280,6 +280,9 @@
default="",
help="Id of the public router that provides external "
"connectivity"),
+ cfg.BoolOpt('quantum_available',
+ default=False,
+ help="Whether or not quantum is expected to be available"),
]
diff --git a/tempest/tests/network/base.py b/tempest/tests/network/base.py
index 4cc8b29..1b09513 100644
--- a/tempest/tests/network/base.py
+++ b/tempest/tests/network/base.py
@@ -18,7 +18,6 @@
from tempest import clients
from tempest.common.utils.data_utils import rand_name
-from tempest import exceptions
import tempest.test
@@ -27,15 +26,9 @@
@classmethod
def setUpClass(cls):
os = clients.Manager()
- client = os.network_client
- # Validate that there is even an endpoint configured
- # for networks, and mark the attr for skipping if not
- try:
- client.list_networks()
- except exceptions.EndpointNotFound:
- skip_msg = "No OpenStack Network API endpoint"
- raise cls.skipException(skip_msg)
+ if not os.config.network.quantum_available:
+ raise cls.skipException("Quantum support is required")
@classmethod
def tearDownClass(cls):