Merge "Update 'Maintained' stable branch jobs on master gate"
diff --git a/.zuul.yaml b/.zuul.yaml
index a93ef41..3ce426c 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -65,15 +65,6 @@
enforce_scope: True
test-config:
$TEMPEST_CONFIG:
- # FIXME(redrobot): Tempest errors out when you try to create a
- # system-scope admin because of a neutron client issue where a
- # tenant_id is required.
- # To work around that issue we disable create_isolate_networks
- # here, and we also skip a lot of tests that require that feature.
- # We should be able to re-enable this once Tempest is fixed.
- # See: https://review.opendev.org/c/openstack/tempest/+/781553
- auth:
- create_isolated_networks: False
barbican_rbac_scope_verification:
enforce_scope: True
diff --git a/barbican_tempest_plugin/tests/scenario/manager.py b/barbican_tempest_plugin/tests/scenario/manager.py
index 8daf090..e9476f2 100644
--- a/barbican_tempest_plugin/tests/scenario/manager.py
+++ b/barbican_tempest_plugin/tests/scenario/manager.py
@@ -82,31 +82,6 @@
#
# The create_[resource] functions only return body and discard the
# resp part which is not used in scenario tests
-
- def _create_port(self, network_id, client=None, namestart='port-quotatest',
- **kwargs):
- if not client:
- client = self.ports_client
- name = data_utils.rand_name(namestart)
- result = client.create_port(
- name=name,
- network_id=network_id,
- **kwargs)
- self.assertIsNotNone(result, 'Unable to allocate port')
- port = result['port']
- self.addCleanup(test_utils.call_and_ignore_notfound_exc,
- client.delete_port, port['id'])
- return port
-
- def create_keypair(self, client=None):
- if not client:
- client = self.keypairs_client
- name = data_utils.rand_name(self.__class__.__name__)
- # We don't need to create a keypair by pubkey in scenario
- body = client.create_keypair(name=name)
- self.addCleanup(client.delete_keypair, name)
- return body['keypair']
-
def create_server(self, name=None, image_id=None, flavor=None,
validatable=False, wait_until='ACTIVE',
clients=None, **kwargs):
@@ -179,9 +154,9 @@
for net in networks:
net_id = net.get('uuid', net.get('id'))
if 'port' not in net:
- port = self._create_port(network_id=net_id,
- client=clients.ports_client,
- **create_port_body)
+ port = self.create_port(network_id=net_id,
+ client=clients.ports_client,
+ **create_port_body)
ports.append({'port': port['id']})
else:
ports.append({'port': net['port']})
@@ -295,7 +270,7 @@
available_stores = []
try:
available_stores = self.image_client.info_stores()['stores']
- except exceptions.NotFound:
+ except lib_exc.NotFound:
pass
available_import_methods = self.image_client.info_import()[
'import-methods']['value']