Skip to content

Commit aff2d9c

Browse files
priteaupriteau
authored
Merge pull request #54 from stackhpc/upstream/master-2025-06-09
Synchronise master with upstream
2 parents 8969d5b + 2fb6ba9 commit aff2d9c

17 files changed

+1695
-1818
lines changed

‎diskimage-create/diskimage-create.sh‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -496,6 +496,9 @@ fi
496496
# Disable SSHD if requested
497497
if [ "$AMP_DISABLE_SSHD" -eq 1 ]; then
498498
AMP_element_sequence="$AMP_element_sequence remove-sshd"
499+
export DIB_OCTAVIA_AMP_USE_SSH=${DIB_OCTAVIA_AMP_USE_SSH:-False}
500+
else
501+
export DIB_OCTAVIA_AMP_USE_SSH=${DIB_OCTAVIA_AMP_USE_SSH:-True}
499502
fi
500503

501504
# Enable FIPS if requested

‎elements/amphora-agent/package-installs.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ open-vm-tools:
7474
arch: amd64
7575
openssh-client:
7676
openssh-server:
77+
when: DIB_OCTAVIA_AMP_USE_SSH = True
7778
pollinate:
7879
ppc64-diag:
7980
arch: ppc64le, ppc64el

‎octavia/tests/functional/api/v2/test_amphora.py‎

Lines changed: 133 additions & 145 deletions
Large diffs are not rendered by default.

‎octavia/tests/functional/api/v2/test_availability_zone_profiles.py‎

Lines changed: 88 additions & 104 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
from oslo_utils import uuidutils
2121

2222
from octavia.common import constants
23-
import octavia.common.context
2423
from octavia.tests.functional.api.v2 import base
2524

2625

@@ -110,26 +109,23 @@ def test_create_authorized(self):
110109
auth_strategy = self.conf.conf.api_settings.get('auth_strategy')
111110
self.conf.config(group='api_settings', auth_strategy=constants.TESTING)
112111
project_id = uuidutils.generate_uuid()
113-
with mock.patch.object(octavia.common.context.RequestContext,
114-
'project_id',
115-
project_id):
116-
override_credentials = {
117-
'service_user_id': None,
118-
'user_domain_id': None,
119-
'is_admin_project': True,
120-
'service_project_domain_id': None,
121-
'service_project_id': None,
122-
'roles': ['load-balancer_member'],
123-
'user_id': None,
124-
'is_admin': True,
125-
'service_user_domain_id': None,
126-
'project_domain_id': None,
127-
'service_roles': [],
128-
'project_id': project_id}
129-
with mock.patch(
130-
"oslo_context.context.RequestContext.to_policy_values",
131-
return_value=override_credentials):
132-
response = self.post(self.AZPS_PATH, body)
112+
override_credentials = {
113+
'service_user_id': None,
114+
'user_domain_id': None,
115+
'is_admin_project': True,
116+
'service_project_domain_id': None,
117+
'service_project_id': None,
118+
'roles': ['load-balancer_member'],
119+
'user_id': None,
120+
'is_admin': True,
121+
'service_user_domain_id': None,
122+
'project_domain_id': None,
123+
'service_roles': [],
124+
'project_id': project_id}
125+
with mock.patch(
126+
"oslo_context.context.RequestContext.to_policy_values",
127+
return_value=override_credentials):
128+
response = self.post(self.AZPS_PATH, body)
133129
self.conf.config(group='api_settings', auth_strategy=auth_strategy)
134130
api_azp = response.json.get(self.root_tag)
135131
self._assert_request_matches_response(az_json, api_azp)
@@ -204,28 +200,25 @@ def test_get_authorized(self):
204200
auth_strategy = self.conf.conf.api_settings.get('auth_strategy')
205201
self.conf.config(group='api_settings', auth_strategy=constants.TESTING)
206202
project_id = uuidutils.generate_uuid()
207-
with mock.patch.object(octavia.common.context.RequestContext,
208-
'project_id',
209-
project_id):
210-
override_credentials = {
211-
'service_user_id': None,
212-
'user_domain_id': None,
213-
'is_admin_project': True,
214-
'service_project_domain_id': None,
215-
'service_project_id': None,
216-
'roles': ['load-balancer_member'],
217-
'user_id': None,
218-
'is_admin': True,
219-
'service_user_domain_id': None,
220-
'project_domain_id': None,
221-
'service_roles': [],
222-
'project_id': project_id}
223-
with mock.patch(
224-
"oslo_context.context.RequestContext.to_policy_values",
225-
return_value=override_credentials):
226-
response = self.get(
227-
self.AZP_PATH.format(
228-
azp_id=azp.get('id'))).json.get(self.root_tag)
203+
override_credentials = {
204+
'service_user_id': None,
205+
'user_domain_id': None,
206+
'is_admin_project': True,
207+
'service_project_domain_id': None,
208+
'service_project_id': None,
209+
'roles': ['load-balancer_member'],
210+
'user_id': None,
211+
'is_admin': True,
212+
'service_user_domain_id': None,
213+
'project_domain_id': None,
214+
'service_roles': [],
215+
'project_id': project_id}
216+
with mock.patch(
217+
"oslo_context.context.RequestContext.to_policy_values",
218+
return_value=override_credentials):
219+
response = self.get(
220+
self.AZP_PATH.format(
221+
azp_id=azp.get('id'))).json.get(self.root_tag)
229222
self.conf.config(group='api_settings', auth_strategy=auth_strategy)
230223
self.assertEqual('name', response.get('name'))
231224
self.assertEqual(azp.get('id'), response.get('id'))
@@ -289,26 +282,23 @@ def test_get_all_authorized(self):
289282
auth_strategy = self.conf.conf.api_settings.get('auth_strategy')
290283
self.conf.config(group='api_settings', auth_strategy=constants.TESTING)
291284
project_id = uuidutils.generate_uuid()
292-
with mock.patch.object(octavia.common.context.RequestContext,
293-
'project_id',
294-
project_id):
295-
override_credentials = {
296-
'service_user_id': None,
297-
'user_domain_id': None,
298-
'is_admin_project': True,
299-
'service_project_domain_id': None,
300-
'service_project_id': None,
301-
'roles': ['load-balancer_member'],
302-
'user_id': None,
303-
'is_admin': True,
304-
'service_user_domain_id': None,
305-
'project_domain_id': None,
306-
'service_roles': [],
307-
'project_id': project_id}
308-
with mock.patch(
309-
"oslo_context.context.RequestContext.to_policy_values",
310-
return_value=override_credentials):
311-
response = self.get(self.AZPS_PATH)
285+
override_credentials = {
286+
'service_user_id': None,
287+
'user_domain_id': None,
288+
'is_admin_project': True,
289+
'service_project_domain_id': None,
290+
'service_project_id': None,
291+
'roles': ['load-balancer_member'],
292+
'user_id': None,
293+
'is_admin': True,
294+
'service_user_domain_id': None,
295+
'project_domain_id': None,
296+
'service_roles': [],
297+
'project_id': project_id}
298+
with mock.patch(
299+
"oslo_context.context.RequestContext.to_policy_values",
300+
return_value=override_credentials):
301+
response = self.get(self.AZPS_PATH)
312302
self.conf.config(group='api_settings', auth_strategy=auth_strategy)
313303
api_list = response.json.get(self.root_tag_list)
314304
self.assertEqual(2, len(api_list))
@@ -407,27 +397,24 @@ def test_update_authorized(self):
407397
auth_strategy = self.conf.conf.api_settings.get('auth_strategy')
408398
self.conf.config(group='api_settings', auth_strategy=constants.TESTING)
409399
project_id = uuidutils.generate_uuid()
410-
with mock.patch.object(octavia.common.context.RequestContext,
411-
'project_id',
412-
project_id):
413-
override_credentials = {
414-
'service_user_id': None,
415-
'user_domain_id': None,
416-
'is_admin_project': True,
417-
'service_project_domain_id': None,
418-
'service_project_id': None,
419-
'roles': ['load-balancer_member'],
420-
'user_id': None,
421-
'is_admin': True,
422-
'service_user_domain_id': None,
423-
'project_domain_id': None,
424-
'service_roles': [],
425-
'project_id': project_id}
426-
with mock.patch(
427-
"oslo_context.context.RequestContext.to_policy_values",
428-
return_value=override_credentials):
429-
response = self.put(self.AZP_PATH.format(azp_id=azp.get('id')),
430-
body)
400+
override_credentials = {
401+
'service_user_id': None,
402+
'user_domain_id': None,
403+
'is_admin_project': True,
404+
'service_project_domain_id': None,
405+
'service_project_id': None,
406+
'roles': ['load-balancer_member'],
407+
'user_id': None,
408+
'is_admin': True,
409+
'service_user_domain_id': None,
410+
'project_domain_id': None,
411+
'service_roles': [],
412+
'project_id': project_id}
413+
with mock.patch(
414+
"oslo_context.context.RequestContext.to_policy_values",
415+
return_value=override_credentials):
416+
response = self.put(self.AZP_PATH.format(azp_id=azp.get('id')),
417+
body)
431418
self.conf.config(group='api_settings', auth_strategy=auth_strategy)
432419
response = self.get(
433420
self.AZP_PATH.format(azp_id=azp.get('id'))).json.get(self.root_tag)
@@ -536,26 +523,23 @@ def test_delete_authorized(self):
536523
auth_strategy = self.conf.conf.api_settings.get('auth_strategy')
537524
self.conf.config(group='api_settings', auth_strategy=constants.TESTING)
538525
project_id = uuidutils.generate_uuid()
539-
with mock.patch.object(octavia.common.context.RequestContext,
540-
'project_id',
541-
project_id):
542-
override_credentials = {
543-
'service_user_id': None,
544-
'user_domain_id': None,
545-
'is_admin_project': True,
546-
'service_project_domain_id': None,
547-
'service_project_id': None,
548-
'roles': ['load-balancer_member'],
549-
'user_id': None,
550-
'is_admin': True,
551-
'service_user_domain_id': None,
552-
'project_domain_id': None,
553-
'service_roles': [],
554-
'project_id': project_id}
555-
with mock.patch(
556-
"oslo_context.context.RequestContext.to_policy_values",
557-
return_value=override_credentials):
558-
self.delete(self.AZP_PATH.format(azp_id=azp.get('id')))
526+
override_credentials = {
527+
'service_user_id': None,
528+
'user_domain_id': None,
529+
'is_admin_project': True,
530+
'service_project_domain_id': None,
531+
'service_project_id': None,
532+
'roles': ['load-balancer_member'],
533+
'user_id': None,
534+
'is_admin': True,
535+
'service_user_domain_id': None,
536+
'project_domain_id': None,
537+
'service_roles': [],
538+
'project_id': project_id}
539+
with mock.patch(
540+
"oslo_context.context.RequestContext.to_policy_values",
541+
return_value=override_credentials):
542+
self.delete(self.AZP_PATH.format(azp_id=azp.get('id')))
559543
self.conf.config(group='api_settings', auth_strategy=auth_strategy)
560544
response = self.get(self.AZP_PATH.format(
561545
azp_id=azp.get('id')), status=404)

0 commit comments

Comments
 (0)