Merge "Update the README file to use tox -e all"
diff --git a/octavia_tempest_plugin/config.py b/octavia_tempest_plugin/config.py
index c40293c..9e259d3 100644
--- a/octavia_tempest_plugin/config.py
+++ b/octavia_tempest_plugin/config.py
@@ -244,7 +244,11 @@
help='Does the load-balancer service API policies enforce '
'the new keystone default roles? This configuration '
'value should be same as octavia.conf: '
- '[oslo_policy].enforce_new_defaults option.'),
+ '[oslo_policy].enforce_new_defaults option.',
+ deprecated_for_removal=True,
+ deprecated_reason='Consolidated into the RBAC_test_type '
+ 'setting.',
+ deprecated_since='bobcat'),
]
lb_feature_enabled_group = cfg.OptGroup(name='loadbalancer-feature-enabled',
diff --git a/octavia_tempest_plugin/tests/RBAC_tests.py b/octavia_tempest_plugin/tests/RBAC_tests.py
index d31d506..8dae024 100644
--- a/octavia_tempest_plugin/tests/RBAC_tests.py
+++ b/octavia_tempest_plugin/tests/RBAC_tests.py
@@ -155,15 +155,14 @@
"""
allowed_list = copy.deepcopy(expected_allowed)
- # os_admin is a special case as it is valid with the old defaults,
- # but will not be with the new defaults and/or token scoping.
- # The old keystone role "admin" becomes project scoped "admin"
- # instead of being a global admin.
- # To keep the tests simple, handle that edge case here.
- # TODO(johnsom) Once token scope is default, remove this.
- if ('os_system_admin' in expected_allowed and
- not CONF.load_balancer.enforce_new_defaults and
- not CONF.enforce_scope.octavia):
+ # The legacy admin behavior changed during the sRBAC development,
+ # os_admin is still a valid admin [0]
+ # [0] https://governance.openstack.org/tc/goals/selected/
+ # consistent-and-secure-rbac.html
+ # #legacy-admin-continues-to-work-as-it-is
+ # TODO(gthiemonge) we may have to revisit it in the future if the
+ # legacy admin scope changes.
+ if 'os_system_admin' in expected_allowed:
allowed_list.append('os_admin')
# #### Test that disallowed credentials cannot access the API.
@@ -244,15 +243,14 @@
"""
allowed_list = copy.deepcopy(expected_allowed)
- # os_admin is a special case as it is valid with the old defaults,
- # but will not be with the new defaults and/or token scoping.
- # The old keystone role "admin" becomes project scoped "admin"
- # instead of being a global admin.
- # To keep the tests simple, handle that edge case here.
- # TODO(johnsom) Once token scope is default, remove this.
- if ('os_system_admin' in expected_allowed and
- not CONF.load_balancer.enforce_new_defaults and
- not CONF.enforce_scope.octavia):
+ # The legacy admin behavior changed during the sRBAC development,
+ # os_admin is still a valid admin [0]
+ # [0] https://governance.openstack.org/tc/goals/selected/
+ # consistent-and-secure-rbac.html
+ # #legacy-admin-continues-to-work-as-it-is
+ # TODO(gthiemonge) we may have to revisit it in the future if the
+ # legacy admin scope changes.
+ if 'os_system_admin' in expected_allowed:
allowed_list.append('os_admin')
# #### Test that disallowed credentials cannot access the API.
@@ -371,15 +369,14 @@
"""
allowed_list = copy.deepcopy(expected_allowed)
- # os_admin is a special case as it is valid with the old defaults,
- # but will not be with the new defaults and/or token scoping.
- # The old keystone role "admin" becomes project scoped "admin"
- # instead of being a global admin.
- # To keep the tests simple, handle that edge case here.
- # TODO(johnsom) Once token scope is default, remove this.
- if ('os_system_admin' in expected_allowed and
- not CONF.load_balancer.enforce_new_defaults and
- not CONF.enforce_scope.octavia):
+ # The legacy admin behavior changed during the sRBAC development,
+ # os_admin is still a valid admin [0]
+ # [0] https://governance.openstack.org/tc/goals/selected/
+ # consistent-and-secure-rbac.html
+ # #legacy-admin-continues-to-work-as-it-is
+ # TODO(gthiemonge) we may have to revisit it in the future if the
+ # legacy admin scope changes.
+ if 'os_system_admin' in expected_allowed:
allowed_list.append('os_admin')
for cred in allowed_list:
@@ -439,15 +436,14 @@
"""
allowed_list = copy.deepcopy(expected_allowed)
- # os_admin is a special case as it is valid with the old defaults,
- # but will not be with the new defaults and/or token scoping.
- # The old keystone role "admin" becomes project scoped "admin"
- # instead of being a global admin.
- # To keep the tests simple, handle that edge case here.
- # TODO(johnsom) Once token scope is default, remove this.
- if ('os_system_admin' in expected_allowed and
- not CONF.load_balancer.enforce_new_defaults and
- not CONF.enforce_scope.octavia):
+ # The legacy admin behavior changed during the sRBAC development,
+ # os_admin is still a valid admin [0]
+ # [0] https://governance.openstack.org/tc/goals/selected/
+ # consistent-and-secure-rbac.html
+ # #legacy-admin-continues-to-work-as-it-is
+ # TODO(gthiemonge) we may have to revisit it in the future if the
+ # legacy admin scope changes.
+ if 'os_system_admin' in expected_allowed:
allowed_list.append('os_admin')
for cred in allowed_list:
diff --git a/octavia_tempest_plugin/tests/api/v2/test_amphora.py b/octavia_tempest_plugin/tests/api/v2/test_amphora.py
index 180e4f3..8d591cc 100644
--- a/octavia_tempest_plugin/tests/api/v2/test_amphora.py
+++ b/octavia_tempest_plugin/tests/api/v2/test_amphora.py
@@ -94,7 +94,7 @@
if CONF.load_balancer.RBAC_test_type == const.OWNERADMIN:
expected_allowed = ['os_admin', 'os_roles_lb_admin']
if CONF.load_balancer.RBAC_test_type == const.KEYSTONE_DEFAULT_ROLES:
- expected_allowed = ['os_system_admin', 'os_roles_lb_admin']
+ expected_allowed = ['os_admin', 'os_roles_lb_admin']
if CONF.load_balancer.RBAC_test_type == const.ADVANCED:
expected_allowed = ['os_system_admin', 'os_roles_lb_admin']
if expected_allowed:
@@ -182,7 +182,7 @@
if CONF.load_balancer.RBAC_test_type == const.OWNERADMIN:
expected_allowed = ['os_admin', 'os_roles_lb_admin']
if CONF.load_balancer.RBAC_test_type == const.KEYSTONE_DEFAULT_ROLES:
- expected_allowed = ['os_system_admin', 'os_roles_lb_admin']
+ expected_allowed = ['os_admin', 'os_roles_lb_admin']
if CONF.load_balancer.RBAC_test_type == const.ADVANCED:
expected_allowed = ['os_system_admin', 'os_roles_lb_admin']
if expected_allowed:
@@ -217,7 +217,7 @@
if CONF.load_balancer.RBAC_test_type == const.OWNERADMIN:
expected_allowed = ['os_admin', 'os_roles_lb_admin']
if CONF.load_balancer.RBAC_test_type == const.KEYSTONE_DEFAULT_ROLES:
- expected_allowed = ['os_system_admin', 'os_roles_lb_admin']
+ expected_allowed = ['os_admin', 'os_roles_lb_admin']
if CONF.load_balancer.RBAC_test_type == const.ADVANCED:
expected_allowed = ['os_system_admin', 'os_roles_lb_admin']
if expected_allowed:
diff --git a/octavia_tempest_plugin/tests/api/v2/test_availability_zone.py b/octavia_tempest_plugin/tests/api/v2/test_availability_zone.py
index fa7b6a4..fe80084 100644
--- a/octavia_tempest_plugin/tests/api/v2/test_availability_zone.py
+++ b/octavia_tempest_plugin/tests/api/v2/test_availability_zone.py
@@ -109,7 +109,7 @@
if CONF.load_balancer.RBAC_test_type == const.OWNERADMIN:
expected_allowed = ['os_admin', 'os_roles_lb_admin']
if CONF.load_balancer.RBAC_test_type == const.KEYSTONE_DEFAULT_ROLES:
- expected_allowed = ['os_system_admin', 'os_roles_lb_admin']
+ expected_allowed = ['os_admin', 'os_roles_lb_admin']
if CONF.load_balancer.RBAC_test_type == const.ADVANCED:
expected_allowed = ['os_system_admin', 'os_roles_lb_admin']
if expected_allowed:
@@ -232,7 +232,7 @@
'os_admin', 'os_primary', 'os_roles_lb_admin',
'os_roles_lb_member', 'os_roles_lb_member2']
if CONF.load_balancer.RBAC_test_type == const.KEYSTONE_DEFAULT_ROLES:
- expected_allowed = ['os_admin', 'os_primary', 'os_system_admin',
+ expected_allowed = ['os_admin', 'os_primary', 'os_roles_lb_admin',
'os_system_reader', 'os_roles_lb_observer',
'os_roles_lb_global_observer',
'os_roles_lb_member', 'os_roles_lb_member2']
@@ -385,7 +385,7 @@
'os_admin', 'os_primary', 'os_roles_lb_admin',
'os_roles_lb_member', 'os_roles_lb_member2']
if CONF.load_balancer.RBAC_test_type == const.KEYSTONE_DEFAULT_ROLES:
- expected_allowed = ['os_admin', 'os_primary', 'os_system_admin',
+ expected_allowed = ['os_admin', 'os_primary', 'os_roles_lb_admin',
'os_system_reader', 'os_roles_lb_observer',
'os_roles_lb_global_observer',
'os_roles_lb_member', 'os_roles_lb_member2']
@@ -458,7 +458,7 @@
if CONF.load_balancer.RBAC_test_type == const.OWNERADMIN:
expected_allowed = ['os_admin', 'os_roles_lb_admin']
if CONF.load_balancer.RBAC_test_type == const.KEYSTONE_DEFAULT_ROLES:
- expected_allowed = ['os_system_admin', 'os_roles_lb_admin']
+ expected_allowed = ['os_admin', 'os_roles_lb_admin']
if CONF.load_balancer.RBAC_test_type == const.ADVANCED:
expected_allowed = ['os_system_admin', 'os_roles_lb_admin']
if expected_allowed:
@@ -535,7 +535,7 @@
if CONF.load_balancer.RBAC_test_type == const.OWNERADMIN:
expected_allowed = ['os_admin', 'os_roles_lb_admin']
if CONF.load_balancer.RBAC_test_type == const.KEYSTONE_DEFAULT_ROLES:
- expected_allowed = ['os_system_admin', 'os_roles_lb_admin']
+ expected_allowed = ['os_admin', 'os_roles_lb_admin']
if CONF.load_balancer.RBAC_test_type == const.ADVANCED:
expected_allowed = ['os_system_admin', 'os_roles_lb_admin']
if expected_allowed:
diff --git a/octavia_tempest_plugin/tests/api/v2/test_availability_zone_capabilities.py b/octavia_tempest_plugin/tests/api/v2/test_availability_zone_capabilities.py
index d3833f6..6f67d8f 100644
--- a/octavia_tempest_plugin/tests/api/v2/test_availability_zone_capabilities.py
+++ b/octavia_tempest_plugin/tests/api/v2/test_availability_zone_capabilities.py
@@ -48,7 +48,7 @@
if CONF.load_balancer.RBAC_test_type == const.OWNERADMIN:
expected_allowed = ['os_admin', 'os_roles_lb_admin']
if CONF.load_balancer.RBAC_test_type == const.KEYSTONE_DEFAULT_ROLES:
- expected_allowed = ['os_system_admin', 'os_roles_lb_admin']
+ expected_allowed = ['os_admin', 'os_roles_lb_admin']
if CONF.load_balancer.RBAC_test_type == const.ADVANCED:
expected_allowed = ['os_system_admin', 'os_roles_lb_admin']
if expected_allowed:
diff --git a/octavia_tempest_plugin/tests/api/v2/test_availability_zone_profile.py b/octavia_tempest_plugin/tests/api/v2/test_availability_zone_profile.py
index 456a01e..6984420 100644
--- a/octavia_tempest_plugin/tests/api/v2/test_availability_zone_profile.py
+++ b/octavia_tempest_plugin/tests/api/v2/test_availability_zone_profile.py
@@ -80,7 +80,7 @@
if CONF.load_balancer.RBAC_test_type == const.OWNERADMIN:
expected_allowed = ['os_admin', 'os_roles_lb_admin']
if CONF.load_balancer.RBAC_test_type == const.KEYSTONE_DEFAULT_ROLES:
- expected_allowed = ['os_system_admin', 'os_roles_lb_admin']
+ expected_allowed = ['os_admin', 'os_roles_lb_admin']
if CONF.load_balancer.RBAC_test_type == const.ADVANCED:
expected_allowed = ['os_system_admin', 'os_roles_lb_admin']
if expected_allowed:
@@ -235,7 +235,7 @@
if CONF.load_balancer.RBAC_test_type == const.OWNERADMIN:
expected_allowed = ['os_admin', 'os_roles_lb_admin']
if CONF.load_balancer.RBAC_test_type == const.KEYSTONE_DEFAULT_ROLES:
- expected_allowed = ['os_system_admin', 'os_roles_lb_admin']
+ expected_allowed = ['os_admin', 'os_roles_lb_admin']
if CONF.load_balancer.RBAC_test_type == const.ADVANCED:
expected_allowed = ['os_system_admin', 'os_roles_lb_admin']
if expected_allowed:
@@ -396,7 +396,7 @@
if CONF.load_balancer.RBAC_test_type == const.OWNERADMIN:
expected_allowed = ['os_admin', 'os_roles_lb_admin']
if CONF.load_balancer.RBAC_test_type == const.KEYSTONE_DEFAULT_ROLES:
- expected_allowed = ['os_system_admin', 'os_roles_lb_admin']
+ expected_allowed = ['os_admin', 'os_roles_lb_admin']
if CONF.load_balancer.RBAC_test_type == const.ADVANCED:
expected_allowed = ['os_system_admin', 'os_roles_lb_admin']
if expected_allowed:
@@ -498,7 +498,7 @@
if CONF.load_balancer.RBAC_test_type == const.OWNERADMIN:
expected_allowed = ['os_admin', 'os_roles_lb_admin']
if CONF.load_balancer.RBAC_test_type == const.KEYSTONE_DEFAULT_ROLES:
- expected_allowed = ['os_system_admin', 'os_roles_lb_admin']
+ expected_allowed = ['os_admin', 'os_roles_lb_admin']
if CONF.load_balancer.RBAC_test_type == const.ADVANCED:
expected_allowed = ['os_system_admin', 'os_roles_lb_admin']
if expected_allowed:
@@ -580,7 +580,7 @@
if CONF.load_balancer.RBAC_test_type == const.OWNERADMIN:
expected_allowed = ['os_admin', 'os_roles_lb_admin']
if CONF.load_balancer.RBAC_test_type == const.KEYSTONE_DEFAULT_ROLES:
- expected_allowed = ['os_system_admin', 'os_roles_lb_admin']
+ expected_allowed = ['os_admin', 'os_roles_lb_admin']
if CONF.load_balancer.RBAC_test_type == const.ADVANCED:
expected_allowed = ['os_system_admin', 'os_roles_lb_admin']
if expected_allowed:
diff --git a/octavia_tempest_plugin/tests/api/v2/test_flavor.py b/octavia_tempest_plugin/tests/api/v2/test_flavor.py
index b5b4254..565ff99 100644
--- a/octavia_tempest_plugin/tests/api/v2/test_flavor.py
+++ b/octavia_tempest_plugin/tests/api/v2/test_flavor.py
@@ -92,7 +92,7 @@
if CONF.load_balancer.RBAC_test_type == const.OWNERADMIN:
expected_allowed = ['os_admin', 'os_roles_lb_admin']
if CONF.load_balancer.RBAC_test_type == const.KEYSTONE_DEFAULT_ROLES:
- expected_allowed = ['os_system_admin', 'os_roles_lb_admin']
+ expected_allowed = ['os_admin', 'os_roles_lb_admin']
if CONF.load_balancer.RBAC_test_type == const.ADVANCED:
expected_allowed = ['os_system_admin', 'os_roles_lb_admin']
if expected_allowed:
@@ -198,7 +198,7 @@
'os_admin', 'os_primary', 'os_roles_lb_admin',
'os_roles_lb_member', 'os_roles_lb_member2']
if CONF.load_balancer.RBAC_test_type == const.KEYSTONE_DEFAULT_ROLES:
- expected_allowed = ['os_admin', 'os_primary', 'os_system_admin',
+ expected_allowed = ['os_admin', 'os_primary', 'os_roles_lb_admin',
'os_system_reader', 'os_roles_lb_observer',
'os_roles_lb_global_observer',
'os_roles_lb_member', 'os_roles_lb_member2']
@@ -326,7 +326,7 @@
'os_admin', 'os_primary', 'os_roles_lb_admin',
'os_roles_lb_member', 'os_roles_lb_member2']
if CONF.load_balancer.RBAC_test_type == const.KEYSTONE_DEFAULT_ROLES:
- expected_allowed = ['os_admin', 'os_primary', 'os_system_admin',
+ expected_allowed = ['os_admin', 'os_primary', 'os_roles_lb_admin',
'os_system_reader', 'os_roles_lb_observer',
'os_roles_lb_global_observer',
'os_roles_lb_member', 'os_roles_lb_member2']
@@ -394,7 +394,7 @@
if CONF.load_balancer.RBAC_test_type == const.OWNERADMIN:
expected_allowed = ['os_admin', 'os_roles_lb_admin']
if CONF.load_balancer.RBAC_test_type == const.KEYSTONE_DEFAULT_ROLES:
- expected_allowed = ['os_system_admin', 'os_roles_lb_admin']
+ expected_allowed = ['os_admin', 'os_roles_lb_admin']
if CONF.load_balancer.RBAC_test_type == const.ADVANCED:
expected_allowed = ['os_system_admin', 'os_roles_lb_admin']
if expected_allowed:
@@ -458,7 +458,7 @@
if CONF.load_balancer.RBAC_test_type == const.OWNERADMIN:
expected_allowed = ['os_admin', 'os_roles_lb_admin']
if CONF.load_balancer.RBAC_test_type == const.KEYSTONE_DEFAULT_ROLES:
- expected_allowed = ['os_system_admin', 'os_roles_lb_admin']
+ expected_allowed = ['os_admin', 'os_roles_lb_admin']
if CONF.load_balancer.RBAC_test_type == const.ADVANCED:
expected_allowed = ['os_system_admin', 'os_roles_lb_admin']
if expected_allowed:
diff --git a/octavia_tempest_plugin/tests/api/v2/test_flavor_capabilities.py b/octavia_tempest_plugin/tests/api/v2/test_flavor_capabilities.py
index 884f656..285df19 100644
--- a/octavia_tempest_plugin/tests/api/v2/test_flavor_capabilities.py
+++ b/octavia_tempest_plugin/tests/api/v2/test_flavor_capabilities.py
@@ -46,7 +46,7 @@
if CONF.load_balancer.RBAC_test_type == const.OWNERADMIN:
expected_allowed = ['os_admin', 'os_roles_lb_admin']
if CONF.load_balancer.RBAC_test_type == const.KEYSTONE_DEFAULT_ROLES:
- expected_allowed = ['os_system_admin', 'os_roles_lb_admin']
+ expected_allowed = ['os_admin', 'os_roles_lb_admin']
if CONF.load_balancer.RBAC_test_type == const.ADVANCED:
expected_allowed = ['os_system_admin', 'os_roles_lb_admin']
if expected_allowed:
diff --git a/octavia_tempest_plugin/tests/api/v2/test_flavor_profile.py b/octavia_tempest_plugin/tests/api/v2/test_flavor_profile.py
index 39f3338..48ade67 100644
--- a/octavia_tempest_plugin/tests/api/v2/test_flavor_profile.py
+++ b/octavia_tempest_plugin/tests/api/v2/test_flavor_profile.py
@@ -64,7 +64,7 @@
if CONF.load_balancer.RBAC_test_type == const.OWNERADMIN:
expected_allowed = ['os_admin', 'os_roles_lb_admin']
if CONF.load_balancer.RBAC_test_type == const.KEYSTONE_DEFAULT_ROLES:
- expected_allowed = ['os_system_admin', 'os_roles_lb_admin']
+ expected_allowed = ['os_admin', 'os_roles_lb_admin']
if CONF.load_balancer.RBAC_test_type == const.ADVANCED:
expected_allowed = ['os_system_admin', 'os_roles_lb_admin']
if expected_allowed:
@@ -184,7 +184,7 @@
if CONF.load_balancer.RBAC_test_type == const.OWNERADMIN:
expected_allowed = ['os_admin', 'os_roles_lb_admin']
if CONF.load_balancer.RBAC_test_type == const.KEYSTONE_DEFAULT_ROLES:
- expected_allowed = ['os_system_admin', 'os_roles_lb_admin']
+ expected_allowed = ['os_admin', 'os_roles_lb_admin']
if CONF.load_balancer.RBAC_test_type == const.ADVANCED:
expected_allowed = ['os_system_admin', 'os_roles_lb_admin']
if expected_allowed:
@@ -313,7 +313,7 @@
if CONF.load_balancer.RBAC_test_type == const.OWNERADMIN:
expected_allowed = ['os_admin', 'os_roles_lb_admin']
if CONF.load_balancer.RBAC_test_type == const.KEYSTONE_DEFAULT_ROLES:
- expected_allowed = ['os_system_admin', 'os_roles_lb_admin']
+ expected_allowed = ['os_admin', 'os_roles_lb_admin']
if CONF.load_balancer.RBAC_test_type == const.ADVANCED:
expected_allowed = ['os_system_admin', 'os_roles_lb_admin']
if expected_allowed:
@@ -391,7 +391,7 @@
if CONF.load_balancer.RBAC_test_type == const.OWNERADMIN:
expected_allowed = ['os_admin', 'os_roles_lb_admin']
if CONF.load_balancer.RBAC_test_type == const.KEYSTONE_DEFAULT_ROLES:
- expected_allowed = ['os_system_admin', 'os_roles_lb_admin']
+ expected_allowed = ['os_admin', 'os_roles_lb_admin']
if CONF.load_balancer.RBAC_test_type == const.ADVANCED:
expected_allowed = ['os_system_admin', 'os_roles_lb_admin']
if expected_allowed:
@@ -458,7 +458,7 @@
if CONF.load_balancer.RBAC_test_type == const.OWNERADMIN:
expected_allowed = ['os_admin', 'os_roles_lb_admin']
if CONF.load_balancer.RBAC_test_type == const.KEYSTONE_DEFAULT_ROLES:
- expected_allowed = ['os_system_admin', 'os_roles_lb_admin']
+ expected_allowed = ['os_admin', 'os_roles_lb_admin']
if CONF.load_balancer.RBAC_test_type == const.ADVANCED:
expected_allowed = ['os_system_admin', 'os_roles_lb_admin']
if expected_allowed:
diff --git a/octavia_tempest_plugin/tests/api/v2/test_healthmonitor.py b/octavia_tempest_plugin/tests/api/v2/test_healthmonitor.py
index a305ead..64368aa 100644
--- a/octavia_tempest_plugin/tests/api/v2/test_healthmonitor.py
+++ b/octavia_tempest_plugin/tests/api/v2/test_healthmonitor.py
@@ -282,7 +282,8 @@
expected_allowed = ['os_admin', 'os_roles_lb_admin',
'os_roles_lb_member']
if CONF.load_balancer.RBAC_test_type == const.KEYSTONE_DEFAULT_ROLES:
- expected_allowed = ['os_system_admin', 'os_roles_lb_member']
+ expected_allowed = ['os_admin', 'os_roles_lb_admin',
+ 'os_roles_lb_member']
if CONF.load_balancer.RBAC_test_type == const.ADVANCED:
expected_allowed = ['os_system_admin', 'os_roles_lb_admin',
'os_roles_lb_member']
@@ -724,8 +725,8 @@
if CONF.load_balancer.RBAC_test_type == const.OWNERADMIN:
expected_allowed = ['os_primary', 'os_roles_lb_member2']
if CONF.load_balancer.RBAC_test_type == const.KEYSTONE_DEFAULT_ROLES:
- expected_allowed = ['os_admin', 'os_primary',
- 'os_roles_lb_member2', 'os_roles_lb_observer',
+ expected_allowed = ['os_primary', 'os_roles_lb_member2',
+ 'os_roles_lb_observer',
'os_roles_lb_global_observer']
if CONF.load_balancer.RBAC_test_type == const.ADVANCED:
expected_allowed = ['os_roles_lb_observer', 'os_roles_lb_member2']
@@ -739,8 +740,8 @@
if CONF.load_balancer.RBAC_test_type == const.OWNERADMIN:
expected_allowed = ['os_admin', 'os_roles_lb_member']
if CONF.load_balancer.RBAC_test_type == const.KEYSTONE_DEFAULT_ROLES:
- expected_allowed = ['os_system_admin', 'os_system_reader',
- 'os_roles_lb_member']
+ expected_allowed = ['os_admin', 'os_roles_lb_admin',
+ 'os_system_reader', 'os_roles_lb_member']
if CONF.load_balancer.RBAC_test_type == const.ADVANCED:
expected_allowed = ['os_system_admin', 'os_system_reader',
'os_roles_lb_admin', 'os_roles_lb_member',
@@ -763,7 +764,7 @@
# a superscope of "project_reader". This means it can read
# objects in the "admin" credential's project.
if CONF.load_balancer.RBAC_test_type == const.KEYSTONE_DEFAULT_ROLES:
- expected_allowed = ['os_admin', 'os_primary', 'os_system_admin',
+ expected_allowed = ['os_admin', 'os_primary', 'os_roles_lb_admin',
'os_system_reader', 'os_roles_lb_observer',
'os_roles_lb_global_observer',
'os_roles_lb_member', 'os_roles_lb_member2']
@@ -1193,8 +1194,8 @@
expected_allowed = ['os_admin', 'os_roles_lb_admin',
'os_roles_lb_member']
if CONF.load_balancer.RBAC_test_type == const.KEYSTONE_DEFAULT_ROLES:
- expected_allowed = ['os_system_admin', 'os_system_reader',
- 'os_roles_lb_member']
+ expected_allowed = ['os_admin', 'os_roles_lb_admin',
+ 'os_system_reader', 'os_roles_lb_member']
if CONF.load_balancer.RBAC_test_type == const.ADVANCED:
expected_allowed = ['os_system_admin', 'os_system_reader',
'os_roles_lb_admin',
@@ -1475,7 +1476,8 @@
expected_allowed = ['os_admin', 'os_roles_lb_admin',
'os_roles_lb_member']
if CONF.load_balancer.RBAC_test_type == const.KEYSTONE_DEFAULT_ROLES:
- expected_allowed = ['os_system_admin', 'os_roles_lb_member']
+ expected_allowed = ['os_admin', 'os_roles_lb_admin',
+ 'os_roles_lb_member']
if CONF.load_balancer.RBAC_test_type == const.ADVANCED:
expected_allowed = ['os_system_admin', 'os_roles_lb_admin',
'os_roles_lb_member']
@@ -1778,7 +1780,8 @@
expected_allowed = ['os_admin', 'os_roles_lb_admin',
'os_roles_lb_member']
if CONF.load_balancer.RBAC_test_type == const.KEYSTONE_DEFAULT_ROLES:
- expected_allowed = ['os_system_admin', 'os_roles_lb_member']
+ expected_allowed = ['os_admin', 'os_roles_lb_admin',
+ 'os_roles_lb_member']
if CONF.load_balancer.RBAC_test_type == const.ADVANCED:
expected_allowed = ['os_system_admin', 'os_roles_lb_admin',
'os_roles_lb_member']
diff --git a/octavia_tempest_plugin/tests/api/v2/test_l7policy.py b/octavia_tempest_plugin/tests/api/v2/test_l7policy.py
index e7ed5a6..5a19def 100644
--- a/octavia_tempest_plugin/tests/api/v2/test_l7policy.py
+++ b/octavia_tempest_plugin/tests/api/v2/test_l7policy.py
@@ -139,7 +139,8 @@
expected_allowed = ['os_admin', 'os_roles_lb_admin',
'os_roles_lb_member']
if CONF.load_balancer.RBAC_test_type == const.KEYSTONE_DEFAULT_ROLES:
- expected_allowed = ['os_system_admin', 'os_roles_lb_member']
+ expected_allowed = ['os_admin', 'os_roles_lb_admin',
+ 'os_roles_lb_member']
if CONF.load_balancer.RBAC_test_type == const.ADVANCED:
expected_allowed = ['os_system_admin', 'os_roles_lb_admin',
'os_roles_lb_member']
@@ -365,8 +366,8 @@
if CONF.load_balancer.RBAC_test_type == const.OWNERADMIN:
expected_allowed = ['os_primary', 'os_roles_lb_member2']
if CONF.load_balancer.RBAC_test_type == const.KEYSTONE_DEFAULT_ROLES:
- expected_allowed = ['os_admin', 'os_primary',
- 'os_roles_lb_member2', 'os_roles_lb_observer',
+ expected_allowed = ['os_primary', 'os_roles_lb_member2',
+ 'os_roles_lb_observer',
'os_roles_lb_global_observer']
if CONF.load_balancer.RBAC_test_type == const.ADVANCED:
expected_allowed = ['os_roles_lb_observer', 'os_roles_lb_member2']
@@ -380,8 +381,8 @@
if CONF.load_balancer.RBAC_test_type == const.OWNERADMIN:
expected_allowed = ['os_admin', 'os_roles_lb_member']
if CONF.load_balancer.RBAC_test_type == const.KEYSTONE_DEFAULT_ROLES:
- expected_allowed = ['os_system_admin', 'os_system_reader',
- 'os_roles_lb_member']
+ expected_allowed = ['os_admin', 'os_roles_lb_admin',
+ 'os_system_reader', 'os_roles_lb_member']
if CONF.load_balancer.RBAC_test_type == const.ADVANCED:
expected_allowed = ['os_system_admin', 'os_system_reader',
'os_roles_lb_admin', 'os_roles_lb_member',
@@ -406,7 +407,7 @@
# a superscope of "project_reader". This means it can read
# objects in the "admin" credential's project.
if CONF.load_balancer.RBAC_test_type == const.KEYSTONE_DEFAULT_ROLES:
- expected_allowed = ['os_admin', 'os_primary', 'os_system_admin',
+ expected_allowed = ['os_admin', 'os_primary', 'os_roles_lb_admin',
'os_system_reader', 'os_roles_lb_observer',
'os_roles_lb_global_observer',
'os_roles_lb_member', 'os_roles_lb_member2']
@@ -652,8 +653,8 @@
expected_allowed = ['os_admin', 'os_roles_lb_admin',
'os_roles_lb_member']
if CONF.load_balancer.RBAC_test_type == const.KEYSTONE_DEFAULT_ROLES:
- expected_allowed = ['os_system_admin', 'os_system_reader',
- 'os_roles_lb_member']
+ expected_allowed = ['os_admin', 'os_roles_lb_admin',
+ 'os_system_reader', 'os_roles_lb_member']
if CONF.load_balancer.RBAC_test_type == const.ADVANCED:
expected_allowed = ['os_system_admin', 'os_system_reader',
'os_roles_lb_admin',
@@ -761,7 +762,8 @@
expected_allowed = ['os_admin', 'os_roles_lb_admin',
'os_roles_lb_member']
if CONF.load_balancer.RBAC_test_type == const.KEYSTONE_DEFAULT_ROLES:
- expected_allowed = ['os_system_admin', 'os_roles_lb_member']
+ expected_allowed = ['os_admin', 'os_roles_lb_admin',
+ 'os_roles_lb_member']
if CONF.load_balancer.RBAC_test_type == const.ADVANCED:
expected_allowed = ['os_system_admin', 'os_roles_lb_admin',
'os_roles_lb_member']
@@ -872,7 +874,8 @@
expected_allowed = ['os_admin', 'os_roles_lb_admin',
'os_roles_lb_member']
if CONF.load_balancer.RBAC_test_type == const.KEYSTONE_DEFAULT_ROLES:
- expected_allowed = ['os_system_admin', 'os_roles_lb_member']
+ expected_allowed = ['os_admin', 'os_roles_lb_admin',
+ 'os_roles_lb_member']
if CONF.load_balancer.RBAC_test_type == const.ADVANCED:
expected_allowed = ['os_system_admin', 'os_roles_lb_admin',
'os_roles_lb_member']
diff --git a/octavia_tempest_plugin/tests/api/v2/test_l7rule.py b/octavia_tempest_plugin/tests/api/v2/test_l7rule.py
index 5cb85c4..c0eb1d2 100644
--- a/octavia_tempest_plugin/tests/api/v2/test_l7rule.py
+++ b/octavia_tempest_plugin/tests/api/v2/test_l7rule.py
@@ -147,7 +147,8 @@
expected_allowed = ['os_admin', 'os_roles_lb_admin',
'os_roles_lb_member']
if CONF.load_balancer.RBAC_test_type == const.KEYSTONE_DEFAULT_ROLES:
- expected_allowed = ['os_system_admin', 'os_roles_lb_member']
+ expected_allowed = ['os_admin', 'os_roles_lb_admin',
+ 'os_roles_lb_member']
if CONF.load_balancer.RBAC_test_type == const.ADVANCED:
expected_allowed = ['os_system_admin', 'os_roles_lb_admin',
'os_roles_lb_member']
@@ -357,8 +358,8 @@
if CONF.load_balancer.RBAC_test_type == const.OWNERADMIN:
expected_allowed = ['os_admin', 'os_roles_lb_member']
if CONF.load_balancer.RBAC_test_type == const.KEYSTONE_DEFAULT_ROLES:
- expected_allowed = ['os_system_admin', 'os_system_reader',
- 'os_roles_lb_member']
+ expected_allowed = ['os_admin', 'os_roles_lb_admin',
+ 'os_system_reader', 'os_roles_lb_member']
if CONF.load_balancer.RBAC_test_type == const.ADVANCED:
expected_allowed = ['os_system_admin', 'os_system_reader',
'os_roles_lb_admin', 'os_roles_lb_member',
@@ -380,7 +381,7 @@
# a superscope of "project_reader". This means it can read
# objects in the "admin" credential's project.
if CONF.load_balancer.RBAC_test_type == const.KEYSTONE_DEFAULT_ROLES:
- expected_allowed = ['os_admin', 'os_system_admin',
+ expected_allowed = ['os_admin', 'os_roles_lb_admin',
'os_system_reader', 'os_roles_lb_member']
if CONF.load_balancer.RBAC_test_type == const.ADVANCED:
expected_allowed = ['os_system_admin', 'os_system_reader',
@@ -566,8 +567,8 @@
expected_allowed = ['os_admin', 'os_roles_lb_admin',
'os_roles_lb_member']
if CONF.load_balancer.RBAC_test_type == const.KEYSTONE_DEFAULT_ROLES:
- expected_allowed = ['os_system_admin', 'os_system_reader',
- 'os_roles_lb_member']
+ expected_allowed = ['os_admin', 'os_roles_lb_admin',
+ 'os_system_reader', 'os_roles_lb_member']
if CONF.load_balancer.RBAC_test_type == const.ADVANCED:
expected_allowed = ['os_system_admin', 'os_system_reader',
'os_roles_lb_admin',
@@ -654,7 +655,8 @@
expected_allowed = ['os_admin', 'os_roles_lb_admin',
'os_roles_lb_member']
if CONF.load_balancer.RBAC_test_type == const.KEYSTONE_DEFAULT_ROLES:
- expected_allowed = ['os_system_admin', 'os_roles_lb_member']
+ expected_allowed = ['os_admin', 'os_roles_lb_admin',
+ 'os_roles_lb_member']
if CONF.load_balancer.RBAC_test_type == const.ADVANCED:
expected_allowed = ['os_system_admin', 'os_roles_lb_admin',
'os_roles_lb_member']
@@ -756,7 +758,8 @@
expected_allowed = ['os_admin', 'os_roles_lb_admin',
'os_roles_lb_member']
if CONF.load_balancer.RBAC_test_type == const.KEYSTONE_DEFAULT_ROLES:
- expected_allowed = ['os_system_admin', 'os_roles_lb_member']
+ expected_allowed = ['os_admin', 'os_roles_lb_admin',
+ 'os_roles_lb_member']
if CONF.load_balancer.RBAC_test_type == const.ADVANCED:
expected_allowed = ['os_system_admin', 'os_roles_lb_admin',
'os_roles_lb_member']
diff --git a/octavia_tempest_plugin/tests/api/v2/test_listener.py b/octavia_tempest_plugin/tests/api/v2/test_listener.py
index 625bcf7..7382bf5 100644
--- a/octavia_tempest_plugin/tests/api/v2/test_listener.py
+++ b/octavia_tempest_plugin/tests/api/v2/test_listener.py
@@ -165,7 +165,8 @@
expected_allowed = ['os_admin', 'os_roles_lb_admin',
'os_roles_lb_member']
if CONF.load_balancer.RBAC_test_type == const.KEYSTONE_DEFAULT_ROLES:
- expected_allowed = ['os_system_admin', 'os_roles_lb_member']
+ expected_allowed = ['os_admin', 'os_roles_lb_admin',
+ 'os_roles_lb_member']
if CONF.load_balancer.RBAC_test_type == const.ADVANCED:
expected_allowed = ['os_system_admin', 'os_roles_lb_admin',
'os_roles_lb_member']
@@ -564,8 +565,8 @@
if CONF.load_balancer.RBAC_test_type == const.OWNERADMIN:
expected_allowed = ['os_primary', 'os_roles_lb_member2']
if CONF.load_balancer.RBAC_test_type == const.KEYSTONE_DEFAULT_ROLES:
- expected_allowed = ['os_admin', 'os_primary',
- 'os_roles_lb_member2', 'os_roles_lb_observer',
+ expected_allowed = ['os_primary', 'os_roles_lb_member2',
+ 'os_roles_lb_observer',
'os_roles_lb_global_observer']
if CONF.load_balancer.RBAC_test_type == const.ADVANCED:
expected_allowed = ['os_roles_lb_observer', 'os_roles_lb_member2']
@@ -579,8 +580,8 @@
if CONF.load_balancer.RBAC_test_type == const.OWNERADMIN:
expected_allowed = ['os_admin', 'os_roles_lb_member']
if CONF.load_balancer.RBAC_test_type == const.KEYSTONE_DEFAULT_ROLES:
- expected_allowed = ['os_system_admin', 'os_system_reader',
- 'os_roles_lb_member']
+ expected_allowed = ['os_admin', 'os_roles_lb_admin',
+ 'os_system_reader', 'os_roles_lb_member']
if CONF.load_balancer.RBAC_test_type == const.ADVANCED:
expected_allowed = ['os_system_admin', 'os_system_reader',
'os_roles_lb_admin', 'os_roles_lb_member',
@@ -604,7 +605,7 @@
# a superscope of "project_reader". This means it can read
# objects in the "admin" credential's project.
if CONF.load_balancer.RBAC_test_type == const.KEYSTONE_DEFAULT_ROLES:
- expected_allowed = ['os_admin', 'os_primary', 'os_system_admin',
+ expected_allowed = ['os_admin', 'os_primary', 'os_roles_lb_admin',
'os_system_reader', 'os_roles_lb_observer',
'os_roles_lb_global_observer',
'os_roles_lb_member', 'os_roles_lb_member2']
@@ -887,8 +888,8 @@
expected_allowed = ['os_admin', 'os_roles_lb_admin',
'os_roles_lb_member']
if CONF.load_balancer.RBAC_test_type == const.KEYSTONE_DEFAULT_ROLES:
- expected_allowed = ['os_system_admin', 'os_system_reader',
- 'os_roles_lb_member']
+ expected_allowed = ['os_admin', 'os_roles_lb_admin',
+ 'os_system_reader', 'os_roles_lb_member']
if CONF.load_balancer.RBAC_test_type == const.ADVANCED:
expected_allowed = ['os_system_admin', 'os_system_reader',
'os_roles_lb_admin',
@@ -1036,7 +1037,8 @@
expected_allowed = ['os_admin', 'os_roles_lb_admin',
'os_roles_lb_member']
if CONF.load_balancer.RBAC_test_type == const.KEYSTONE_DEFAULT_ROLES:
- expected_allowed = ['os_system_admin', 'os_roles_lb_member']
+ expected_allowed = ['os_admin', 'os_roles_lb_admin',
+ 'os_roles_lb_member']
if CONF.load_balancer.RBAC_test_type == const.ADVANCED:
expected_allowed = ['os_system_admin', 'os_roles_lb_admin',
'os_roles_lb_member']
@@ -1215,7 +1217,8 @@
expected_allowed = ['os_admin', 'os_roles_lb_admin',
'os_roles_lb_member']
if CONF.load_balancer.RBAC_test_type == const.KEYSTONE_DEFAULT_ROLES:
- expected_allowed = ['os_system_admin', 'os_roles_lb_member']
+ expected_allowed = ['os_admin', 'os_roles_lb_admin',
+ 'os_roles_lb_member']
if CONF.load_balancer.RBAC_test_type == const.ADVANCED:
expected_allowed = ['os_system_admin', 'os_roles_lb_admin',
'os_roles_lb_member']
diff --git a/octavia_tempest_plugin/tests/api/v2/test_load_balancer.py b/octavia_tempest_plugin/tests/api/v2/test_load_balancer.py
index 7ade642..9035260 100644
--- a/octavia_tempest_plugin/tests/api/v2/test_load_balancer.py
+++ b/octavia_tempest_plugin/tests/api/v2/test_load_balancer.py
@@ -89,7 +89,7 @@
expected_allowed = ['os_admin', 'os_primary', 'os_roles_lb_admin',
'os_roles_lb_member', 'os_roles_lb_member2']
if CONF.load_balancer.RBAC_test_type == const.KEYSTONE_DEFAULT_ROLES:
- expected_allowed = ['os_system_admin',
+ expected_allowed = ['os_admin', 'os_roles_lb_admin',
'os_roles_lb_member', 'os_roles_lb_member2']
if CONF.load_balancer.RBAC_test_type == const.ADVANCED:
expected_allowed = ['os_system_admin', 'os_roles_lb_admin',
@@ -193,7 +193,8 @@
expected_allowed = ['os_admin', 'os_roles_lb_admin',
'os_roles_lb_member']
if CONF.load_balancer.RBAC_test_type == const.KEYSTONE_DEFAULT_ROLES:
- expected_allowed = ['os_system_admin', 'os_roles_lb_member']
+ expected_allowed = ['os_admin', 'os_roles_lb_admin',
+ 'os_roles_lb_member']
if CONF.load_balancer.RBAC_test_type == const.ADVANCED:
expected_allowed = ['os_system_admin', 'os_roles_lb_admin',
'os_roles_lb_member']
@@ -242,7 +243,8 @@
expected_allowed = ['os_admin', 'os_roles_lb_admin',
'os_roles_lb_member']
if CONF.load_balancer.RBAC_test_type == const.KEYSTONE_DEFAULT_ROLES:
- expected_allowed = ['os_system_admin', 'os_roles_lb_member']
+ expected_allowed = ['os_admin', 'os_roles_lb_admin',
+ 'os_roles_lb_member']
if CONF.load_balancer.RBAC_test_type == const.ADVANCED:
expected_allowed = ['os_system_admin', 'os_roles_lb_admin',
'os_roles_lb_member']
@@ -418,8 +420,8 @@
if CONF.load_balancer.RBAC_test_type == const.OWNERADMIN:
expected_allowed = ['os_primary', 'os_roles_lb_member2']
if CONF.load_balancer.RBAC_test_type == const.KEYSTONE_DEFAULT_ROLES:
- expected_allowed = ['os_admin', 'os_primary',
- 'os_roles_lb_member2', 'os_roles_lb_observer',
+ expected_allowed = ['os_primary', 'os_roles_lb_member2',
+ 'os_roles_lb_observer',
'os_roles_lb_global_observer']
if CONF.load_balancer.RBAC_test_type == const.ADVANCED:
expected_allowed = ['os_roles_lb_observer', 'os_roles_lb_member2']
@@ -433,8 +435,8 @@
if CONF.load_balancer.RBAC_test_type == const.OWNERADMIN:
expected_allowed = ['os_admin', 'os_roles_lb_member']
if CONF.load_balancer.RBAC_test_type == const.KEYSTONE_DEFAULT_ROLES:
- expected_allowed = ['os_system_admin', 'os_system_reader',
- 'os_roles_lb_member']
+ expected_allowed = ['os_admin', 'os_roles_lb_admin',
+ 'os_system_reader', 'os_roles_lb_member']
if CONF.load_balancer.RBAC_test_type == const.ADVANCED:
expected_allowed = ['os_system_admin', 'os_system_reader',
'os_roles_lb_admin', 'os_roles_lb_member',
@@ -457,7 +459,7 @@
# a superscope of "project_reader". This means it can read
# objects in the "admin" credential's project.
if CONF.load_balancer.RBAC_test_type == const.KEYSTONE_DEFAULT_ROLES:
- expected_allowed = ['os_admin', 'os_primary', 'os_system_admin',
+ expected_allowed = ['os_admin', 'os_primary', 'os_roles_lb_admin',
'os_system_reader', 'os_roles_lb_observer',
'os_roles_lb_global_observer',
'os_roles_lb_member', 'os_roles_lb_member2']
@@ -635,8 +637,8 @@
expected_allowed = ['os_admin', 'os_roles_lb_admin',
'os_roles_lb_member']
if CONF.load_balancer.RBAC_test_type == const.KEYSTONE_DEFAULT_ROLES:
- expected_allowed = ['os_system_admin', 'os_system_reader',
- 'os_roles_lb_member']
+ expected_allowed = ['os_admin', 'os_roles_lb_admin',
+ 'os_system_reader', 'os_roles_lb_member']
if CONF.load_balancer.RBAC_test_type == const.ADVANCED:
expected_allowed = ['os_system_admin', 'os_system_reader',
'os_roles_lb_admin',
@@ -739,7 +741,8 @@
expected_allowed = ['os_admin', 'os_roles_lb_admin',
'os_roles_lb_member']
if CONF.load_balancer.RBAC_test_type == const.KEYSTONE_DEFAULT_ROLES:
- expected_allowed = ['os_system_admin', 'os_roles_lb_member']
+ expected_allowed = ['os_admin', 'os_roles_lb_admin',
+ 'os_roles_lb_member']
if CONF.load_balancer.RBAC_test_type == const.ADVANCED:
expected_allowed = ['os_system_admin', 'os_roles_lb_admin',
'os_roles_lb_member']
@@ -831,8 +834,8 @@
expected_allowed = ['os_admin', 'os_roles_lb_admin',
'os_roles_lb_member']
if CONF.load_balancer.RBAC_test_type == const.KEYSTONE_DEFAULT_ROLES:
- expected_allowed = ['os_system_admin', 'os_system_reader',
- 'os_roles_lb_member']
+ expected_allowed = ['os_admin', 'os_roles_lb_admin',
+ 'os_system_reader', 'os_roles_lb_member']
if CONF.load_balancer.RBAC_test_type == const.ADVANCED:
expected_allowed = ['os_system_admin', 'os_system_reader',
'os_roles_lb_admin',
@@ -902,8 +905,8 @@
expected_allowed = ['os_admin', 'os_roles_lb_admin',
'os_roles_lb_member']
if CONF.load_balancer.RBAC_test_type == const.KEYSTONE_DEFAULT_ROLES:
- expected_allowed = ['os_system_admin', 'os_system_reader',
- 'os_roles_lb_member']
+ expected_allowed = ['os_admin', 'os_roles_lb_admin',
+ 'os_system_reader', 'os_roles_lb_member']
if CONF.load_balancer.RBAC_test_type == const.ADVANCED:
expected_allowed = ['os_system_admin', 'os_system_reader',
'os_roles_lb_admin',
@@ -978,7 +981,7 @@
if CONF.load_balancer.RBAC_test_type == const.OWNERADMIN:
expected_allowed = ['os_admin', 'os_roles_lb_admin']
if CONF.load_balancer.RBAC_test_type == const.KEYSTONE_DEFAULT_ROLES:
- expected_allowed = ['os_system_admin', 'os_roles_lb_admin']
+ expected_allowed = ['os_admin', 'os_roles_lb_admin']
if CONF.load_balancer.RBAC_test_type == const.ADVANCED:
expected_allowed = ['os_system_admin', 'os_roles_lb_admin']
if expected_allowed:
diff --git a/octavia_tempest_plugin/tests/api/v2/test_member.py b/octavia_tempest_plugin/tests/api/v2/test_member.py
index fee2893..305aa39 100644
--- a/octavia_tempest_plugin/tests/api/v2/test_member.py
+++ b/octavia_tempest_plugin/tests/api/v2/test_member.py
@@ -902,7 +902,8 @@
expected_allowed = ['os_admin', 'os_roles_lb_admin',
'os_roles_lb_member']
if CONF.load_balancer.RBAC_test_type == const.KEYSTONE_DEFAULT_ROLES:
- expected_allowed = ['os_system_admin', 'os_roles_lb_member']
+ expected_allowed = ['os_admin', 'os_roles_lb_admin',
+ 'os_roles_lb_member']
if CONF.load_balancer.RBAC_test_type == const.ADVANCED:
expected_allowed = ['os_system_admin', 'os_roles_lb_admin',
'os_roles_lb_member']
@@ -1233,8 +1234,8 @@
if CONF.load_balancer.RBAC_test_type == const.OWNERADMIN:
expected_allowed = ['os_admin', 'os_roles_lb_member']
if CONF.load_balancer.RBAC_test_type == const.KEYSTONE_DEFAULT_ROLES:
- expected_allowed = ['os_system_admin', 'os_system_reader',
- 'os_roles_lb_member']
+ expected_allowed = ['os_admin', 'os_roles_lb_admin',
+ 'os_system_reader', 'os_roles_lb_member']
if CONF.load_balancer.RBAC_test_type == const.ADVANCED:
expected_allowed = ['os_system_admin', 'os_system_reader',
'os_roles_lb_admin', 'os_roles_lb_member',
@@ -1255,7 +1256,7 @@
# a superscope of "project_reader". This means it can read
# objects in the "admin" credential's project.
if CONF.load_balancer.RBAC_test_type == const.KEYSTONE_DEFAULT_ROLES:
- expected_allowed = ['os_admin', 'os_system_admin',
+ expected_allowed = ['os_admin', 'os_roles_lb_admin',
'os_system_reader', 'os_roles_lb_member']
if CONF.load_balancer.RBAC_test_type == const.ADVANCED:
expected_allowed = ['os_system_admin', 'os_system_reader',
@@ -1798,8 +1799,8 @@
expected_allowed = ['os_admin', 'os_roles_lb_admin',
'os_roles_lb_member']
if CONF.load_balancer.RBAC_test_type == const.KEYSTONE_DEFAULT_ROLES:
- expected_allowed = ['os_system_admin', 'os_system_reader',
- 'os_roles_lb_member']
+ expected_allowed = ['os_admin', 'os_roles_lb_admin',
+ 'os_system_reader', 'os_roles_lb_member']
if CONF.load_balancer.RBAC_test_type == const.ADVANCED:
expected_allowed = ['os_system_admin', 'os_system_reader',
'os_roles_lb_admin',
@@ -2255,7 +2256,8 @@
expected_allowed = ['os_admin', 'os_roles_lb_admin',
'os_roles_lb_member']
if CONF.load_balancer.RBAC_test_type == const.KEYSTONE_DEFAULT_ROLES:
- expected_allowed = ['os_system_admin', 'os_roles_lb_member']
+ expected_allowed = ['os_admin', 'os_roles_lb_admin',
+ 'os_roles_lb_member']
if CONF.load_balancer.RBAC_test_type == const.ADVANCED:
expected_allowed = ['os_system_admin', 'os_roles_lb_admin',
'os_roles_lb_member']
@@ -2713,7 +2715,8 @@
expected_allowed = ['os_admin', 'os_roles_lb_admin',
'os_roles_lb_member']
if CONF.load_balancer.RBAC_test_type == const.KEYSTONE_DEFAULT_ROLES:
- expected_allowed = ['os_system_admin', 'os_roles_lb_member']
+ expected_allowed = ['os_admin', 'os_roles_lb_admin',
+ 'os_roles_lb_member']
if CONF.load_balancer.RBAC_test_type == const.ADVANCED:
expected_allowed = ['os_system_admin', 'os_roles_lb_admin',
'os_roles_lb_member']
@@ -2958,7 +2961,8 @@
expected_allowed = ['os_admin', 'os_roles_lb_admin',
'os_roles_lb_member']
if CONF.load_balancer.RBAC_test_type == const.KEYSTONE_DEFAULT_ROLES:
- expected_allowed = ['os_system_admin', 'os_roles_lb_member']
+ expected_allowed = ['os_admin', 'os_roles_lb_admin',
+ 'os_roles_lb_member']
if CONF.load_balancer.RBAC_test_type == const.ADVANCED:
expected_allowed = ['os_system_admin', 'os_roles_lb_admin',
'os_roles_lb_member']
diff --git a/octavia_tempest_plugin/tests/api/v2/test_pool.py b/octavia_tempest_plugin/tests/api/v2/test_pool.py
index ba31a8e..db86ebe 100644
--- a/octavia_tempest_plugin/tests/api/v2/test_pool.py
+++ b/octavia_tempest_plugin/tests/api/v2/test_pool.py
@@ -408,7 +408,8 @@
expected_allowed = ['os_admin', 'os_roles_lb_admin',
'os_roles_lb_member']
if CONF.load_balancer.RBAC_test_type == const.KEYSTONE_DEFAULT_ROLES:
- expected_allowed = ['os_system_admin', 'os_roles_lb_member']
+ expected_allowed = ['os_admin', 'os_roles_lb_admin',
+ 'os_roles_lb_member']
if CONF.load_balancer.RBAC_test_type == const.ADVANCED:
expected_allowed = ['os_system_admin', 'os_roles_lb_admin',
'os_roles_lb_member']
@@ -434,6 +435,11 @@
message = e.resp_body.get('faultstring', message)
raise testtools.TestCase.skipException(message)
+ self.addCleanup(
+ self.mem_pool_client.cleanup_pool,
+ pool[const.ID],
+ lb_client=self.mem_lb_client, lb_id=self.lb_id)
+
waiters.wait_for_status(
self.mem_lb_client.show_loadbalancer, self.lb_id,
const.PROVISIONING_STATUS, const.ACTIVE,
@@ -584,7 +590,6 @@
def _test_pool_list(self, pool_protocol, algorithm):
"""Tests pool list API and field filtering.
- * Create a clean loadbalancer.
* Create three pools.
* Validates that other accounts cannot list the pools.
* List the pools using the default sort order.
@@ -605,14 +610,7 @@
'Skipping this test as load balancing algorithm '
'SOURCE_IP_PORT requires API version 2.13 or newer.')
- lb_name = data_utils.rand_name("lb_member_lb2_pool-list")
- lb = self.mem_lb_client.create_loadbalancer(
- name=lb_name, provider=CONF.load_balancer.provider,
- vip_network_id=self.lb_member_vip_net[const.ID])
- lb_id = lb[const.ID]
- self.addCleanup(
- self.mem_lb_client.cleanup_loadbalancer,
- lb_id)
+ lb_id = self.lb_id
waiters.wait_for_status(self.mem_lb_client.show_loadbalancer,
lb_id,
@@ -755,8 +753,8 @@
if CONF.load_balancer.RBAC_test_type == const.OWNERADMIN:
expected_allowed = ['os_primary', 'os_roles_lb_member2']
if CONF.load_balancer.RBAC_test_type == const.KEYSTONE_DEFAULT_ROLES:
- expected_allowed = ['os_admin', 'os_primary',
- 'os_roles_lb_member2', 'os_roles_lb_observer',
+ expected_allowed = ['os_primary', 'os_roles_lb_member2',
+ 'os_roles_lb_observer',
'os_roles_lb_global_observer']
if CONF.load_balancer.RBAC_test_type == const.ADVANCED:
expected_allowed = ['os_roles_lb_observer', 'os_roles_lb_member2']
@@ -770,8 +768,8 @@
if CONF.load_balancer.RBAC_test_type == const.OWNERADMIN:
expected_allowed = ['os_admin', 'os_roles_lb_member']
if CONF.load_balancer.RBAC_test_type == const.KEYSTONE_DEFAULT_ROLES:
- expected_allowed = ['os_system_admin', 'os_system_reader',
- 'os_roles_lb_member']
+ expected_allowed = ['os_admin', 'os_roles_lb_admin',
+ 'os_system_reader', 'os_roles_lb_member']
if CONF.load_balancer.RBAC_test_type == const.ADVANCED:
expected_allowed = ['os_system_admin', 'os_system_reader',
'os_roles_lb_admin', 'os_roles_lb_member',
@@ -794,7 +792,7 @@
# a superscope of "project_reader". This means it can read
# objects in the "admin" credential's project.
if CONF.load_balancer.RBAC_test_type == const.KEYSTONE_DEFAULT_ROLES:
- expected_allowed = ['os_admin', 'os_primary', 'os_system_admin',
+ expected_allowed = ['os_admin', 'os_primary', 'os_roles_lb_admin',
'os_system_reader', 'os_roles_lb_observer',
'os_roles_lb_global_observer',
'os_roles_lb_member', 'os_roles_lb_member2']
@@ -1080,6 +1078,11 @@
message = e.resp_body.get('faultstring', message)
raise testtools.TestCase.skipException(message)
+ self.addCleanup(
+ self.mem_pool_client.cleanup_pool,
+ pool[const.ID],
+ lb_client=self.mem_lb_client, lb_id=self.lb_id)
+
waiters.wait_for_status(
self.mem_lb_client.show_loadbalancer, self.lb_id,
const.PROVISIONING_STATUS, const.ACTIVE,
@@ -1129,8 +1132,8 @@
expected_allowed = ['os_admin', 'os_roles_lb_admin',
'os_roles_lb_member']
if CONF.load_balancer.RBAC_test_type == const.KEYSTONE_DEFAULT_ROLES:
- expected_allowed = ['os_system_admin', 'os_system_reader',
- 'os_roles_lb_member']
+ expected_allowed = ['os_admin', 'os_roles_lb_admin',
+ 'os_system_reader', 'os_roles_lb_member']
if CONF.load_balancer.RBAC_test_type == const.ADVANCED:
expected_allowed = ['os_system_admin', 'os_system_reader',
'os_roles_lb_admin',
@@ -1315,6 +1318,11 @@
message = e.resp_body.get('faultstring', message)
raise testtools.TestCase.skipException(message)
+ self.addCleanup(
+ self.mem_pool_client.cleanup_pool,
+ pool[const.ID],
+ lb_client=self.mem_lb_client, lb_id=self.lb_id)
+
waiters.wait_for_status(
self.mem_lb_client.show_loadbalancer, self.lb_id,
const.PROVISIONING_STATUS, const.ACTIVE,
@@ -1364,7 +1372,8 @@
expected_allowed = ['os_admin', 'os_roles_lb_admin',
'os_roles_lb_member']
if CONF.load_balancer.RBAC_test_type == const.KEYSTONE_DEFAULT_ROLES:
- expected_allowed = ['os_system_admin', 'os_roles_lb_member']
+ expected_allowed = ['os_admin', 'os_roles_lb_admin',
+ 'os_roles_lb_member']
if CONF.load_balancer.RBAC_test_type == const.ADVANCED:
expected_allowed = ['os_system_admin', 'os_roles_lb_admin',
'os_roles_lb_member']
@@ -1647,6 +1656,11 @@
message = e.resp_body.get('faultstring', message)
raise testtools.TestCase.skipException(message)
+ self.addCleanup(
+ self.mem_pool_client.cleanup_pool,
+ pool[const.ID],
+ lb_client=self.mem_lb_client, lb_id=self.lb_id)
+
waiters.wait_for_status(
self.mem_lb_client.show_loadbalancer,
self.lb_id, const.PROVISIONING_STATUS,
@@ -1661,7 +1675,8 @@
expected_allowed = ['os_admin', 'os_roles_lb_admin',
'os_roles_lb_member']
if CONF.load_balancer.RBAC_test_type == const.KEYSTONE_DEFAULT_ROLES:
- expected_allowed = ['os_system_admin', 'os_roles_lb_member']
+ expected_allowed = ['os_admin', 'os_roles_lb_admin',
+ 'os_roles_lb_member']
if CONF.load_balancer.RBAC_test_type == const.ADVANCED:
expected_allowed = ['os_system_admin', 'os_roles_lb_admin',
'os_roles_lb_member']
diff --git a/octavia_tempest_plugin/tests/api/v2/test_provider.py b/octavia_tempest_plugin/tests/api/v2/test_provider.py
index 9a9dd28..e47ae8e 100644
--- a/octavia_tempest_plugin/tests/api/v2/test_provider.py
+++ b/octavia_tempest_plugin/tests/api/v2/test_provider.py
@@ -49,7 +49,7 @@
'os_admin', 'os_primary', 'os_roles_lb_admin',
'os_roles_lb_member', 'os_roles_lb_member2']
if CONF.load_balancer.RBAC_test_type == const.KEYSTONE_DEFAULT_ROLES:
- expected_allowed = ['os_admin', 'os_primary', 'os_system_admin',
+ expected_allowed = ['os_admin', 'os_primary', 'os_roles_lb_admin',
'os_system_reader', 'os_roles_lb_observer',
'os_roles_lb_global_observer',
'os_roles_lb_member', 'os_roles_lb_member2']
diff --git a/octavia_tempest_plugin/tests/barbican_scenario/v2/test_tls_barbican.py b/octavia_tempest_plugin/tests/barbican_scenario/v2/test_tls_barbican.py
index a983e13..0c23cd7 100644
--- a/octavia_tempest_plugin/tests/barbican_scenario/v2/test_tls_barbican.py
+++ b/octavia_tempest_plugin/tests/barbican_scenario/v2/test_tls_barbican.py
@@ -1471,7 +1471,7 @@
if self.lb_member_1_subnet:
member1_kwargs[const.SUBNET_ID] = self.lb_member_1_subnet[const.ID]
- self.mem_member_client.create_member(**member1_kwargs)
+ member1 = self.mem_member_client.create_member(**member1_kwargs)
waiters.wait_for_status(
self.mem_lb_client.show_loadbalancer, self.lb_id,
const.PROVISIONING_STATUS, const.ACTIVE,
@@ -1491,7 +1491,7 @@
if self.lb_member_2_subnet:
member2_kwargs[const.SUBNET_ID] = self.lb_member_2_subnet[const.ID]
- self.mem_member_client.create_member(**member2_kwargs)
+ member2 = self.mem_member_client.create_member(**member2_kwargs)
waiters.wait_for_status(
self.mem_lb_client.show_loadbalancer, self.lb_id,
const.PROVISIONING_STATUS, const.ACTIVE,
@@ -1538,9 +1538,179 @@
CONF.load_balancer.check_interval,
CONF.load_balancer.check_timeout)
+ # Make sure the health monitor has brought the members up after the
+ # the pool update.
+ waiters.wait_for_status(
+ self.mem_member_client.show_member, member1[const.ID],
+ const.OPERATING_STATUS, const.ONLINE,
+ CONF.load_balancer.check_interval,
+ CONF.load_balancer.check_timeout, error_ok=True, pool_id=pool_id)
+ waiters.wait_for_status(
+ self.mem_member_client.show_member, member2[const.ID],
+ const.OPERATING_STATUS, const.ONLINE,
+ CONF.load_balancer.check_interval,
+ CONF.load_balancer.check_timeout, error_ok=True, pool_id=pool_id)
+
self.check_members_balanced(self.lb_vip_address, protocol=const.HTTP,
protocol_port=85)
+ @decorators.idempotent_id('d3e4c5fe-1726-49e4-b0b0-7a5a47749fc9')
+ def test_basic_h2_listener_http_listener_pool_reencryption(self):
+ """Test both h2 and HTTP traffic on the same load balancer.
+
+ In this test we deploy the following Octavia resources:
+ HTTPS_TERMINATED listener with h2 alpn protocols
+ HTTP listener
+ HTTP pool with both h2 alpn protocols and backend re-encryption
+
+ we send both h2 and http traffic from a client to the load balancer vip
+ and we make sure h2 traffic was negotiated when it was sent on 443 port
+ :raises self.skipException: ALPN support for pools not available prior
+ to v2.24.
+ """
+ if not self.mem_listener_client.is_version_supported(
+ self.api_version, '2.24'):
+ raise self.skipException('ALPN protocols are only available on '
+ 'pools in Octavia API version 2.24 or'
+ ' newer.')
+ pool_name = data_utils.rand_name("lb_member_pool1-tls-alpn")
+ pool_kwargs = {
+ const.NAME: pool_name,
+ const.PROTOCOL: const.HTTP,
+ const.LB_ALGORITHM: self.lb_algorithm,
+ const.LOADBALANCER_ID: self.lb_id,
+ const.TLS_ENABLED: True,
+ const.ALPN_PROTOCOLS: ['h2', 'http/1.1'],
+ }
+
+ pool = self.mem_pool_client.create_pool(**pool_kwargs)
+ pool_id = pool[const.ID]
+
+ self.addCleanup(
+ self.mem_pool_client.cleanup_pool,
+ pool_id,
+ lb_client=self.mem_lb_client, lb_id=self.lb_id)
+
+ waiters.wait_for_status(self.mem_lb_client.show_loadbalancer,
+ self.lb_id, const.PROVISIONING_STATUS,
+ const.ACTIVE,
+ CONF.load_balancer.build_interval,
+ CONF.load_balancer.build_timeout)
+
+ # Set up Member 1 for Webserver 1
+ member1_name = data_utils.rand_name("lb_member_member1-tls-reencrypt")
+ member1_kwargs = {
+ const.POOL_ID: pool_id,
+ const.NAME: member1_name,
+ const.ADMIN_STATE_UP: True,
+ const.ADDRESS: self.webserver1_ip,
+ const.PROTOCOL_PORT: 443,
+ }
+ if self.lb_member_1_subnet:
+ member1_kwargs[const.SUBNET_ID] = self.lb_member_1_subnet[const.ID]
+
+ member1 = self.mem_member_client.create_member(**member1_kwargs)
+
+ self.addCleanup(
+ self.mem_member_client.cleanup_member,
+ member1[const.ID], pool_id=pool_id,
+ lb_client=self.mem_lb_client,
+ lb_id=self.lb_id)
+
+ waiters.wait_for_status(
+ self.mem_lb_client.show_loadbalancer, self.lb_id,
+ const.PROVISIONING_STATUS, const.ACTIVE,
+ CONF.load_balancer.check_interval,
+ CONF.load_balancer.check_timeout)
+
+ # Set up Member 2 for Webserver 2
+ member2_name = data_utils.rand_name("lb_member_member2-tls-reencrypt")
+ member2_kwargs = {
+ const.POOL_ID: pool_id,
+ const.NAME: member2_name,
+ const.ADMIN_STATE_UP: True,
+ const.ADDRESS: self.webserver2_ip,
+ const.PROTOCOL_PORT: 443,
+ }
+ if self.lb_member_2_subnet:
+ member2_kwargs[const.SUBNET_ID] = self.lb_member_2_subnet[const.ID]
+
+ member2 = self.mem_member_client.create_member(**member2_kwargs)
+
+ self.addCleanup(
+ self.mem_member_client.cleanup_member,
+ member2[const.ID], pool_id=pool_id,
+ lb_client=self.mem_lb_client,
+ lb_id=self.lb_id)
+
+ waiters.wait_for_status(
+ self.mem_lb_client.show_loadbalancer, self.lb_id,
+ const.PROVISIONING_STATUS, const.ACTIVE,
+ CONF.load_balancer.check_interval,
+ CONF.load_balancer.check_timeout)
+
+ listener_name = data_utils.rand_name(
+ "lb_member_listener1-tls-terminated-alpn")
+ listener_kwargs = {
+ const.NAME: listener_name,
+ const.PROTOCOL: const.TERMINATED_HTTPS,
+ const.PROTOCOL_PORT: '443',
+ const.LOADBALANCER_ID: self.lb_id,
+ const.DEFAULT_POOL_ID: pool_id,
+ const.DEFAULT_TLS_CONTAINER_REF: self.server_secret_ref,
+ const.ALPN_PROTOCOLS: ['h2', 'http/1.1']
+ }
+ listener = self.mem_listener_client.create_listener(**listener_kwargs)
+
+ self.addCleanup(
+ self.mem_listener_client.cleanup_listener,
+ listener[const.ID],
+ lb_client=self.mem_lb_client,
+ lb_id=self.lb_id)
+
+ waiters.wait_for_status(self.mem_lb_client.show_loadbalancer,
+ self.lb_id, const.PROVISIONING_STATUS,
+ const.ACTIVE,
+ CONF.load_balancer.build_interval,
+ CONF.load_balancer.build_timeout)
+
+ listener_name = data_utils.rand_name(
+ "lb_member_listener1-http")
+ listener_kwargs = {
+ const.NAME: listener_name,
+ const.PROTOCOL: const.HTTP,
+ const.PROTOCOL_PORT: 80,
+ const.LOADBALANCER_ID: self.lb_id,
+ const.DEFAULT_POOL_ID: pool_id,
+ }
+ listener = self.mem_listener_client.create_listener(**listener_kwargs)
+ self.listener_id = listener[const.ID]
+ self.addCleanup(
+ self.mem_listener_client.cleanup_listener,
+ self.listener_id,
+ lb_client=self.mem_lb_client, lb_id=self.lb_id)
+
+ waiters.wait_for_status(self.mem_lb_client.show_loadbalancer,
+ self.lb_id, const.PROVISIONING_STATUS,
+ const.ACTIVE,
+ CONF.load_balancer.build_interval,
+ CONF.load_balancer.build_timeout)
+
+ context = ssl.SSLContext(ssl.PROTOCOL_TLS)
+ context.set_alpn_protocols(['h2', 'http/1.1'])
+ s = socket.socket()
+ ssl_sock = context.wrap_socket(s)
+ ssl_sock.connect((self.lb_vip_address, 443))
+ selected_proto = ssl_sock.selected_alpn_protocol()
+ self.assertEqual('h2', selected_proto)
+
+ # Test HTTPS listener load balancing.
+ self.check_members_balanced(self.lb_vip_address, protocol=const.HTTPS,
+ HTTPS_verify=False, protocol_port=443)
+
+ # Test HTTP listener load balancing.
+ self.check_members_balanced(self.lb_vip_address)
+
@decorators.idempotent_id('7d9dcae6-3e2c-4eae-9bfb-1ef0d00aa530')
@testtools.skipUnless(
CONF.loadbalancer_feature_enabled.prometheus_listener_enabled,
diff --git a/octavia_tempest_plugin/tests/test_base.py b/octavia_tempest_plugin/tests/test_base.py
index 70d51ba..e1daec1 100644
--- a/octavia_tempest_plugin/tests/test_base.py
+++ b/octavia_tempest_plugin/tests/test_base.py
@@ -56,9 +56,10 @@
'admin', 'primary', ['lb_admin', CONF.load_balancer.admin_role],
['lb_member', CONF.load_balancer.member_role],
['lb_member2', CONF.load_balancer.member_role]]
- elif CONF.load_balancer.enforce_new_defaults:
+ elif CONF.load_balancer.RBAC_test_type == const.KEYSTONE_DEFAULT_ROLES:
credentials = [
- 'admin', 'primary', ['lb_admin', CONF.load_balancer.admin_role],
+ 'admin', 'primary',
+ ['lb_admin', CONF.load_balancer.admin_role, 'admin'],
['lb_observer', CONF.load_balancer.observer_role, 'reader'],
['lb_global_observer', CONF.load_balancer.global_observer_role,
'reader'],
diff --git a/octavia_tempest_plugin/tests/validators.py b/octavia_tempest_plugin/tests/validators.py
index 5afe28a..34e8148 100644
--- a/octavia_tempest_plugin/tests/validators.py
+++ b/octavia_tempest_plugin/tests/validators.py
@@ -412,7 +412,7 @@
return
except Exception:
LOG.warning('Server is not passing initial traffic. Waiting.')
- time.sleep(1)
+ time.sleep(request_interval)
LOG.debug('Loadbalancer wait for load balancer response totals: %s',
response_counts)
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index bd90bea..0b5b401 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -19,6 +19,16 @@
- controller
- nodeset:
+ name: octavia-single-node-ubuntu-jammy
+ nodes:
+ - name: controller
+ label: nested-virt-ubuntu-jammy
+ groups:
+ - name: tempest
+ nodes:
+ - controller
+
+- nodeset:
name: octavia-single-node-centos-7
nodes:
- name: controller
@@ -62,9 +72,9 @@
name: octavia-two-node
nodes:
- name: controller
- label: nested-virt-ubuntu-focal
+ label: nested-virt-ubuntu-jammy
- name: controller2
- label: nested-virt-ubuntu-focal
+ label: nested-virt-ubuntu-jammy
groups:
- name: controller
nodes:
@@ -209,7 +219,7 @@
- job:
name: octavia-dsvm-live-base
parent: octavia-dsvm-base
- nodeset: octavia-single-node-ubuntu-focal
+ nodeset: octavia-single-node-ubuntu-jammy
timeout: 9000
required-projects:
- openstack/diskimage-builder
@@ -245,7 +255,7 @@
- job:
name: octavia-dsvm-live-base-ipv6-only
parent: octavia-dsvm-base-ipv6-only
- nodeset: octavia-single-node-ubuntu-focal
+ nodeset: octavia-single-node-ubuntu-jammy
timeout: 9000
required-projects:
- openstack/diskimage-builder
@@ -506,21 +516,23 @@
- ^octavia_tempest_plugin/tests/(?!api/|\w+\.py).*
- job:
- name: octavia-v2-dsvm-noop-api-scoped-tokens
+ name: octavia-v2-dsvm-noop-api-keystone-default-roles
parent: octavia-v2-dsvm-noop-api
vars:
+ devstack_localrc:
+ OCTAVIA_USE_KEYSTONE_DEFAULT_ROLES: True
devstack_local_conf:
post-config:
$OCTAVIA_CONF:
oslo_policy:
- enforce_scope: True
+ enforce_scope: False
enforce_new_defaults: True
test-config:
"$TEMPEST_CONFIG":
enforce_scope:
- octavia: True
+ octavia: False
load_balancer:
- enforce_new_defaults: True
+ RBAC_test_type: keystone_default_roles
- job:
name: octavia-v2-dsvm-noop-py2-api
@@ -530,22 +542,25 @@
USE_PYTHON3: False
- job:
+ name: octavia-v2-dsvm-noop-api-stable-2023-1
+ parent: octavia-v2-dsvm-noop-api
+ nodeset: octavia-single-node-ubuntu-jammy
+ override-checkout: stable/2023.1
+
+- job:
+ name: octavia-v2-dsvm-noop-api-stable-zed
+ parent: octavia-v2-dsvm-noop-api
+ nodeset: octavia-single-node-ubuntu-focal
+ override-checkout: stable/zed
+
+- job:
name: octavia-v2-dsvm-noop-api-stable-yoga
parent: octavia-v2-dsvm-noop-api
+ nodeset: octavia-single-node-ubuntu-focal
override-checkout: stable/yoga
- job:
- name: octavia-v2-dsvm-noop-api-stable-xena
- parent: octavia-v2-dsvm-noop-api
- override-checkout: stable/xena
-
-- job:
- name: octavia-v2-dsvm-noop-api-stable-wallaby
- parent: octavia-v2-dsvm-noop-api
- override-checkout: stable/wallaby
-
-- job:
- name: octavia-v2-dsvm-scenario
+ name: octavia-v2-dsvm-scenario-base
parent: octavia-dsvm-live-base
vars:
devstack_local_conf:
@@ -569,6 +584,38 @@
- ^octavia_tempest_plugin/tests/(?!scenario/|\w+\.py).*
- job:
+ name: octavia-v2-dsvm-scenario
+ parent: octavia-v2-dsvm-scenario-base
+ branches:
+ regex: ^(stable/(train|ussuri|victoria|wallaby|xena|yoga|zed))
+ negate: true
+ nodeset: octavia-single-node-ubuntu-jammy
+
+- job:
+ name: octavia-v2-dsvm-scenario
+ parent: octavia-v2-dsvm-scenario-base
+ branches: ^(stable/(victoria|wallaby|xena|yoga|zed))
+ nodeset: octavia-single-node-ubuntu-focal
+
+- job:
+ name: octavia-v2-dsvm-scenario
+ parent: octavia-v2-dsvm-scenario-base
+ branches: ^(stable/(train|ussuri))
+ nodeset: octavia-single-node-ubuntu-bionic
+
+- job:
+ name: octavia-v2-dsvm-scenario-traffic-ops
+ parent: octavia-v2-dsvm-scenario
+ vars:
+ tempest_test_regex: ^octavia_tempest_plugin.tests.scenario.v2.*traffic_ops
+
+- job:
+ name: octavia-v2-dsvm-scenario-non-traffic-ops
+ parent: octavia-v2-dsvm-scenario
+ vars:
+ tempest_test_regex: ^octavia_tempest_plugin.tests.scenario.v2.(?!.*traffic_ops)
+
+- job:
name: octavia-v2-dsvm-scenario-ipv6-only
parent: octavia-dsvm-live-base-ipv6-only
vars:
@@ -599,19 +646,58 @@
override-checkout: 2.30.0
- job:
+ name: octavia-v2-dsvm-scenario-stable-2023-1
+ parent: octavia-v2-dsvm-scenario
+ nodeset: octavia-single-node-ubuntu-jammy
+ override-checkout: stable/2023.1
+
+- job:
+ name: octavia-v2-dsvm-scenario-traffic-ops-stable-2023-1
+ parent: octavia-v2-dsvm-scenario-stable-2023-1
+ vars:
+ tempest_test_regex: ^octavia_tempest_plugin.tests.scenario.v2.*traffic_ops
+
+- job:
+ name: octavia-v2-dsvm-scenario-non-traffic-ops-stable-2023-1
+ parent: octavia-v2-dsvm-scenario-stable-2023-1
+ vars:
+ tempest_test_regex: ^octavia_tempest_plugin.tests.scenario.v2.(?!.*traffic_ops)
+
+- job:
+ name: octavia-v2-dsvm-scenario-stable-zed
+ parent: octavia-v2-dsvm-scenario
+ nodeset: octavia-single-node-ubuntu-focal
+ override-checkout: stable/zed
+
+- job:
+ name: octavia-v2-dsvm-scenario-traffic-ops-stable-zed
+ parent: octavia-v2-dsvm-scenario-stable-zed
+ vars:
+ tempest_test_regex: ^octavia_tempest_plugin.tests.scenario.v2.*traffic_ops
+
+- job:
+ name: octavia-v2-dsvm-scenario-non-traffic-ops-stable-zed
+ parent: octavia-v2-dsvm-scenario-stable-zed
+ vars:
+ tempest_test_regex: ^octavia_tempest_plugin.tests.scenario.v2.(?!.*traffic_ops)
+
+- job:
name: octavia-v2-dsvm-scenario-stable-yoga
parent: octavia-v2-dsvm-scenario
+ nodeset: octavia-single-node-ubuntu-focal
override-checkout: stable/yoga
- job:
- name: octavia-v2-dsvm-scenario-stable-xena
- parent: octavia-v2-dsvm-scenario
- override-checkout: stable/xena
+ name: octavia-v2-dsvm-scenario-traffic-ops-stable-yoga
+ parent: octavia-v2-dsvm-scenario-stable-yoga
+ vars:
+ tempest_test_regex: ^octavia_tempest_plugin.tests.scenario.v2.*traffic_ops
- job:
- name: octavia-v2-dsvm-scenario-stable-wallaby
- parent: octavia-v2-dsvm-scenario
- override-checkout: stable/wallaby
+ name: octavia-v2-dsvm-scenario-non-traffic-ops-stable-yoga
+ parent: octavia-v2-dsvm-scenario-stable-yoga
+ vars:
+ tempest_test_regex: ^octavia_tempest_plugin.tests.scenario.v2.(?!.*traffic_ops)
# Legacy jobs for the transition to the act-stdby two node jobs
- job:
@@ -723,23 +809,34 @@
ssh_key_type: ecdsa
- job:
- name: octavia-v2-dsvm-scenario-ubuntu-focal
+ name: octavia-v2-dsvm-scenario-centos-9-stream-traffic-ops
+ parent: octavia-v2-dsvm-scenario-centos-9-stream
+ vars:
+ tempest_test_regex: ^octavia_tempest_plugin.tests.scenario.v2.*traffic_ops
+
+- job:
+ name: octavia-v2-dsvm-scenario-centos-9-stream-non-traffic-ops
+ parent: octavia-v2-dsvm-scenario-centos-9-stream
+ vars:
+ tempest_test_regex: ^octavia_tempest_plugin.tests.scenario.v2.(?!.*traffic_ops)
+
+- job:
+ name: octavia-v2-dsvm-scenario-ubuntu-jammy
parent: octavia-v2-dsvm-scenario
vars:
devstack_localrc:
OCTAVIA_AMP_BASE_OS: ubuntu
- OCTAVIA_AMP_DISTRIBUTION_RELEASE_ID: focal
+ OCTAVIA_AMP_DISTRIBUTION_RELEASE_ID: jammy
- job:
- name: octavia-v2-dsvm-tls-barbican
+ name: octavia-v2-dsvm-tls-barbican-base
parent: octavia-v2-dsvm-scenario
- branches: ^(?!stable/(train|ussuri)).*$
required-projects:
- openstack/barbican
- openstack/diskimage-builder
- openstack/python-barbicanclient
- openstack/barbican-tempest-plugin
- vars: &octavia-v2-dsvm-tls-barbican-vars
+ vars:
tempest_test_regex: ^octavia_tempest_plugin.tests.barbican_scenario.v2
devstack_services:
barbican: true
@@ -758,42 +855,49 @@
- job:
name: octavia-v2-dsvm-tls-barbican
- parent: octavia-v2-dsvm-scenario
- branches: ^(stable/(train|ussuri)).*$
+ parent: octavia-v2-dsvm-tls-barbican-base
+ branches:
+ regex: ^(stable/(train|ussuri|victoria|wallaby|xena|yoga|zed))
+ negate: true
+ nodeset: octavia-single-node-ubuntu-jammy
+
+- job:
+ name: octavia-v2-dsvm-tls-barbican
+ parent: octavia-v2-dsvm-tls-barbican-base
+ branches: ^(stable/(victoria|wallaby|xena|yoga|zed))
+ nodeset: octavia-single-node-ubuntu-focal
+
+- job:
+ name: octavia-v2-dsvm-tls-barbican
+ parent: octavia-v2-dsvm-tls-barbican-base
+ branches: ^(stable/(train|ussuri))
+ nodeset: octavia-single-node-ubuntu-bionic
required-projects:
- openstack/barbican
- openstack/diskimage-builder
- openstack/python-barbicanclient
- name: openstack/barbican-tempest-plugin
override-checkout: 1.6.0
- vars: *octavia-v2-dsvm-tls-barbican-vars
+
+- job:
+ name: octavia-v2-dsvm-tls-barbican-stable-2023-1
+ parent: octavia-v2-dsvm-tls-barbican
+ nodeset: octavia-single-node-ubuntu-jammy
+ override-checkout: stable/2023.1
+
+- job:
+ name: octavia-v2-dsvm-tls-barbican-stable-zed
+ parent: octavia-v2-dsvm-tls-barbican
+ nodeset: octavia-single-node-ubuntu-focal
+ override-checkout: stable/zed
- job:
name: octavia-v2-dsvm-tls-barbican-stable-yoga
parent: octavia-v2-dsvm-tls-barbican
+ nodeset: octavia-single-node-ubuntu-focal
override-checkout: stable/yoga
-- job:
- name: octavia-v2-dsvm-tls-barbican-stable-xena
- parent: octavia-v2-dsvm-tls-barbican
- override-checkout: stable/xena
-
-- job:
- name: octavia-v2-dsvm-tls-barbican-stable-wallaby
- parent: octavia-v2-dsvm-tls-barbican
- override-checkout: stable/wallaby
-
-- job:
- name: octavia-v2-dsvm-tls-barbican-stable-victoria
- parent: octavia-v2-dsvm-tls-barbican
- override-checkout: stable/victoria
-
-- job:
- name: octavia-v2-dsvm-tls-barbican-stable-ussuri
- parent: octavia-v2-dsvm-tls-barbican
- nodeset: octavia-single-node-ubuntu-bionic
- override-checkout: stable/ussuri
-
+# Still used by barbican
- job:
name: octavia-v2-dsvm-tls-barbican-stable-train
parent: octavia-v2-dsvm-tls-barbican
@@ -828,6 +932,7 @@
- job:
name: octavia-v2-dsvm-spare-pool-stable-wallaby
parent: octavia-v2-dsvm-spare-pool
+ nodeset: octavia-single-node-ubuntu-focal
override-checkout: stable/wallaby
- job:
@@ -943,7 +1048,7 @@
amphora_ssh_user: centos
- job:
- name: octavia-v2-act-stdby-dsvm-scenario
+ name: octavia-v2-act-stdby-dsvm-scenario-base
parent: octavia-dsvm-live-base
vars:
devstack_local_conf:
@@ -960,18 +1065,53 @@
tox_envlist: all
- job:
+ name: octavia-v2-act-stdby-dsvm-scenario
+ parent: octavia-v2-act-stdby-dsvm-scenario-base
+ branches:
+ regex: ^(stable/(train|ussuri|victoria|wallaby|xena|yoga|zed))
+ negate: true
+ nodeset: octavia-single-node-ubuntu-jammy
+
+- job:
+ name: octavia-v2-act-stdby-dsvm-scenario
+ parent: octavia-v2-act-stdby-dsvm-scenario-base
+ branches: ^(stable/(victoria|wallaby|xena|yoga|zed))
+ nodeset: octavia-single-node-ubuntu-focal
+
+- job:
+ name: octavia-v2-act-stdby-dsvm-scenario
+ parent: octavia-v2-act-stdby-dsvm-scenario-base
+ branches: ^(stable/(train|ussuri))
+ nodeset: octavia-single-node-ubuntu-bionic
+
+- job:
+ name: octavia-v2-act-stdby-dsvm-scenario-stable-2023-1
+ parent: octavia-v2-act-stdby-dsvm-scenario
+ nodeset: octavia-single-node-ubuntu-jammy
+ override-checkout: stable/2023.1
+
+- job:
+ name: octavia-v2-act-stdby-dsvm-scenario-stable-zed
+ parent: octavia-v2-act-stdby-dsvm-scenario
+ nodeset: octavia-single-node-ubuntu-focal
+ override-checkout: stable/zed
+
+- job:
name: octavia-v2-act-stdby-dsvm-scenario-stable-yoga
parent: octavia-v2-act-stdby-dsvm-scenario
+ nodeset: octavia-single-node-ubuntu-focal
override-checkout: stable/yoga
- job:
name: octavia-v2-act-stdby-dsvm-scenario-stable-xena
parent: octavia-v2-act-stdby-dsvm-scenario
+ nodeset: octavia-single-node-ubuntu-focal
override-checkout: stable/xena
- job:
name: octavia-v2-act-stdby-dsvm-scenario-stable-wallaby
parent: octavia-v2-act-stdby-dsvm-scenario
+ nodeset: octavia-single-node-ubuntu-focal
override-checkout: stable/wallaby
######### Third party jobs ##########
diff --git a/zuul.d/projects.yaml b/zuul.d/projects.yaml
index 116da49..ebccc0f 100644
--- a/zuul.d/projects.yaml
+++ b/zuul.d/projects.yaml
@@ -9,36 +9,38 @@
check:
jobs:
- octavia-v2-dsvm-noop-api
+ - octavia-v2-dsvm-noop-api-stable-2023-1
+ - octavia-v2-dsvm-noop-api-stable-zed
- octavia-v2-dsvm-noop-api-stable-yoga
- - octavia-v2-dsvm-noop-api-stable-xena
- - octavia-v2-dsvm-noop-api-stable-wallaby
- - octavia-v2-dsvm-noop-api-scoped-tokens
- - octavia-v2-dsvm-scenario
- - octavia-v2-dsvm-scenario-stable-yoga
- - octavia-v2-dsvm-scenario-stable-xena
- - octavia-v2-dsvm-scenario-stable-wallaby
+ - octavia-v2-dsvm-noop-api-keystone-default-roles
+ - octavia-v2-dsvm-scenario-traffic-ops
+ - octavia-v2-dsvm-scenario-non-traffic-ops
+ - octavia-v2-dsvm-scenario-traffic-ops-stable-2023-1
+ - octavia-v2-dsvm-scenario-non-traffic-ops-stable-2023-1
+ - octavia-v2-dsvm-scenario-traffic-ops-stable-zed
+ - octavia-v2-dsvm-scenario-non-traffic-ops-stable-zed
+ - octavia-v2-dsvm-scenario-traffic-ops-stable-yoga
+ - octavia-v2-dsvm-scenario-non-traffic-ops-stable-yoga
- octavia-v2-dsvm-tls-barbican
+ - octavia-v2-dsvm-tls-barbican-stable-2023-1
+ - octavia-v2-dsvm-tls-barbican-stable-zed
- octavia-v2-dsvm-tls-barbican-stable-yoga
- - octavia-v2-dsvm-tls-barbican-stable-xena
- - octavia-v2-dsvm-tls-barbican-stable-wallaby
- octavia-v2-dsvm-scenario-ipv6-only:
voting: false
- - octavia-v2-dsvm-scenario-centos-8-stream:
+ - octavia-v2-dsvm-scenario-centos-9-stream-traffic-ops:
voting: false
- - octavia-v2-dsvm-scenario-centos-9-stream:
+ - octavia-v2-dsvm-scenario-centos-9-stream-non-traffic-ops:
voting: false
- octavia-v2-act-stdby-dsvm-scenario-two-node:
voting: false
- octavia-v2-act-stdby-dsvm-scenario:
voting: false
+ - octavia-v2-act-stdby-dsvm-scenario-stable-2023-1:
+ voting: false
+ - octavia-v2-act-stdby-dsvm-scenario-stable-zed:
+ voting: false
- octavia-v2-act-stdby-dsvm-scenario-stable-yoga:
voting: false
- - octavia-v2-act-stdby-dsvm-scenario-stable-xena:
- voting: false
- - octavia-v2-act-stdby-dsvm-scenario-stable-wallaby:
- voting: false
- - octavia-v2-dsvm-spare-pool-stable-wallaby:
- voting: false
- octavia-v2-dsvm-cinder-amphora:
voting: false
# Third party provider jobs
@@ -51,15 +53,19 @@
fail-fast: true
jobs:
- octavia-v2-dsvm-noop-api
+ - octavia-v2-dsvm-noop-api-stable-2023-1
+ - octavia-v2-dsvm-noop-api-stable-zed
- octavia-v2-dsvm-noop-api-stable-yoga
- - octavia-v2-dsvm-noop-api-stable-xena
- - octavia-v2-dsvm-noop-api-stable-wallaby
- - octavia-v2-dsvm-noop-api-scoped-tokens
- - octavia-v2-dsvm-scenario
- - octavia-v2-dsvm-scenario-stable-yoga
- - octavia-v2-dsvm-scenario-stable-xena
- - octavia-v2-dsvm-scenario-stable-wallaby
+ - octavia-v2-dsvm-noop-api-keystone-default-roles
+ - octavia-v2-dsvm-scenario-traffic-ops
+ - octavia-v2-dsvm-scenario-non-traffic-ops
+ - octavia-v2-dsvm-scenario-traffic-ops-stable-2023-1
+ - octavia-v2-dsvm-scenario-non-traffic-ops-stable-2023-1
+ - octavia-v2-dsvm-scenario-traffic-ops-stable-zed
+ - octavia-v2-dsvm-scenario-non-traffic-ops-stable-zed
+ - octavia-v2-dsvm-scenario-traffic-ops-stable-yoga
+ - octavia-v2-dsvm-scenario-non-traffic-ops-stable-yoga
- octavia-v2-dsvm-tls-barbican
+ - octavia-v2-dsvm-tls-barbican-stable-2023-1
+ - octavia-v2-dsvm-tls-barbican-stable-zed
- octavia-v2-dsvm-tls-barbican-stable-yoga
- - octavia-v2-dsvm-tls-barbican-stable-xena
- - octavia-v2-dsvm-tls-barbican-stable-wallaby