Register DEFAULT group on agent start and [Caracal] Update github workflow & Fix unit tests #76
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
From upstream commit 4d3a2747 fixing bug (#1968606), registration of the group DEFAULT does not happen automatically anymore. If not loaded, agent fails with 'oslo_config.cfg.NoSuchOptError: no such option api_extensions_path in group [DEFAULT]'
sven-rosenzweig
force-pushed
the
load_default_config
branch
9 times, most recently
from
c3ac460
to
7b3376f
Compare
sven-rosenzweig
changed the title
sven-rosenzweig
force-pushed
the
load_default_config
branch
2 times, most recently
from
16aabd5
to
c98ddee
Compare
sebageek
reviewed
Nov 19, 2024
Comment on lines
-26
to
+27
| with ctx.session.begin(subtransactions=True): | ||
| with db_api.CONTEXT_WRITER.using(ctx): |
There was a problem hiding this comment.
So I see you're replacing the ctx-session.begin with the proper Neutron-way of using db_api - is this only a problem in the tests or do we need now with caracal to do that outside the tests as well?
quoth:~/repos/networking-aci/networking_aci$ git curr
stable/2024.1-m3
quoth:~/repos/networking-aci/networking_aci$ git grep session.begin
plugins/ml2/drivers/mech_aci/allocations_manager.py: with session.begin(subtransactions=True):
plugins/ml2/drivers/mech_aci/allocations_manager.py: with db_api.exc_to_retry(sa.exc.IntegrityError), session.begin(subtransactions=True):
plugins/ml2/drivers/mech_aci/allocations_manager.py: with session.begin(subtransactions=True):
plugins/ml2/drivers/mech_aci/allocations_manager.py: with session.begin(subtransactions=True):
plugins/ml2/drivers/mech_aci/allocations_manager.py: with db_api.exc_to_retry(sa.exc.IntegrityError), session.begin(subtransactions=True):
plugins/ml2/drivers/mech_aci/allocations_manager.py: with session.begin(subtransactions=True):
plugins/ml2/drivers/mech_aci/common.py: with context.session.begin(subtransactions=True):
plugins/ml2/drivers/mech_aci/common.py: with context.session.begin(subtransactions=True):
tests/unit/plugins/ml2/drivers/mech_aci/test_driver.py: with ctx.session.begin(subtransactions=True):
tests/unit/plugins/ml2/drivers/mech_aci/test_driver.py: with ctx.session.begin():
39f8f3f
to
c41538f
Compare
Update python version to 3.10 and set the base branch in the github workflowto Caracal(2024.1-m3). Fix Unit Tests: With later versions of pecan, WebTest is not a dependency of it anymore, so in order to continue using this, an additional import in test-requirements is required. Remove autoconfig loading, which breaks stestr test execution. Cli options can be loaded only once (without clearing them), which causes our tests to fail as required default configuration cli options can not be registered, as an default configuration has already been loaded. As part of the secure RBAC community goal, the "enforce_new_defaults" and "enforce_scope" setting is True by default. Avoiding PolicyNotAuthorized erros during test execution certain actions simply need to be executed as admin.
sven-rosenzweig
force-pushed
the
load_default_config
branch
3 times, most recently
from
66f6e82
to
64e5755
Compare
sebageek
reviewed
Nov 22, 2024
Comment on lines
106
to
113
| @db_api.CONTEXT_READER | ||
| def set_hostgroup_mode(self, context, hostgroup_name, hostgroup_mode): | ||
| with context.session.begin(subtransactions=True): | ||
| with db_api.CONTEXT_WRITER.using(context): | ||
| query = context.session.query(HostgroupModeModel).filter(HostgroupModeModel.hostgroup == hostgroup_name) | ||
| hg = query.first() | ||
| if not hg: | ||
| return False | ||
| hg.mode = hostgroup_mode | ||
| return True |
There was a problem hiding this comment.
This has to be a writer. I wonder why we don't do an explicit add of the updated object. Does that still work with the new db_api?
There was a problem hiding this comment.
Agree with you on that. A simple test shows that this method works as intended.
sven-rosenzweig
force-pushed
the
load_default_config
branch
from
64e5755
to
9b52212
Compare
As per blueprint [1], the existing use of oslo_db session handling (e.g., context.session.begin()) introduces potential issues. Notably, unit tests failed during the Caracal release, though no definitive deployment impact has been identified yet. To future-proof the code and align with recommended practices, we are migrating to the enginefacade pattern now. This involves replacing: with context.session.begin(): context.session.add(obj) with 'db_api.CONTEXT_WRITER.using(context)' [1] https://blueprints.launchpad.net/neutron/+spec/enginefacade-switch [2] Oslo db spec: http://specs.openstack.org/openstack/oslo-specs/specs/kilo/make-enginefacade-a-facade.html
sven-rosenzweig
force-pushed
the
load_default_config
branch
from
9b52212
to
9d9f5b9
Compare
sebageek
approved these changes
Nov 22, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Register DEFAULT group on agent start
From upstream commit 4d3a2747 fixing bug (#1968606), registration of the
group DEFAULT does not happen automatically anymore.
If not loaded, agent fails with 'oslo_config.cfg.NoSuchOptError:
no such option api_extensions_path in group [DEFAULT]'
[Caracal] Update github workflow & Fix unit tests
Update python version to 3.10 and set the base branch in the github
workflowto Caracal(2024.1-m3).
Fix Unit Tests:
With later versions of pecan, WebTest is not a dependency of it anymore,
so in order to continue using this, an additional import in
test-requirements is required.
Remove autoconfig loading, which breaks stestr execution.
Cli options can be loaded only once (without
clearing them), which causes our tests to fail as required default
configuration cli options can not be registered, as an default configuration
has already been loaded.
As part of the secure RBAC community goal, the "enforce_new_defaults" and
"enforce_scope" setting is True by default. Avoiding PolicyNotAuthorized erros
during test execution certain actions simply need to be executed as admin.