Merge "Add volume_size_extend opt for volume tests"
diff --git a/tempest/lib/common/dynamic_creds.py b/tempest/lib/common/dynamic_creds.py
index d86522a..3b17af2 100644
--- a/tempest/lib/common/dynamic_creds.py
+++ b/tempest/lib/common/dynamic_creds.py
@@ -407,13 +407,23 @@
# Maintained until tests are ported
LOG.info("Acquired dynamic creds:\n"
" credentials: %s", credentials)
- if (self.neutron_available and self.create_networks):
- network, subnet, router = self._create_network_resources(
- credentials.tenant_id)
- credentials.set_resources(network=network, subnet=subnet,
- router=router)
- LOG.info("Created isolated network resources for:\n"
- " credentials: %s", credentials)
+ # NOTE(gmann): For 'domain' and 'system' scoped token, there is no
+ # project_id so we are skipping the network creation for both
+ # scope. How these scoped token can create the network, Nova
+ # server or other project mapped resources is one of the open
+ # question and discussed a lot in Xena cycle PTG. Once we sort
+ # out that then if needed we can update the network creation here.
+ if (not scope or scope == 'project'):
+ if (self.neutron_available and self.create_networks):
+ network, subnet, router = self._create_network_resources(
+ credentials.tenant_id)
+ credentials.set_resources(network=network, subnet=subnet,
+ router=router)
+ LOG.info("Created isolated network resources for:\n"
+ " credentials: %s", credentials)
+ else:
+ LOG.info("Network resources are not created for scope: %s",
+ scope)
return credentials
# TODO(gmann): Remove this method in favor of get_project_member_creds()
diff --git a/tempest/tests/lib/cmd/test_check_uuid.py b/tempest/tests/lib/cmd/test_check_uuid.py
index 5d63dec..a621a75 100644
--- a/tempest/tests/lib/cmd/test_check_uuid.py
+++ b/tempest/tests/lib/cmd/test_check_uuid.py
@@ -19,7 +19,6 @@
from unittest import mock
from tempest.lib.cmd import check_uuid
-from tempest.lib import decorators
from tempest.tests import base
@@ -50,7 +49,6 @@
with open(tests_file, "r") as f:
self.assertTrue(TestCLInterface.CODE == f.read())
- @decorators.skip_because(bug='1918316')
def test_fix_argument_yes(self):
temp_dir = tempfile.mkdtemp(prefix='check-uuid-yes', dir=".")
self.addCleanup(shutil.rmtree, temp_dir, ignore_errors=True)