Refactor(eos_designs): Refactor eos_designs structured_config code for monitor_sessions #4937
+23
−36
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
…r monitor_sessions
|
Review docs on Read the Docs To test this pull request: # Create virtual environment for this testing below the current directory
python -m venv test-avd-pr-4937
# Activate the virtual environment
source test-avd-pr-4937/bin/activate
# Install all requirements including PyAVD
pip install "pyavd[ansible] @ git+https://github.com/Shivani-gslab/avd.git@monitor_session_refactor#subdirectory=python-avd" --force
# Point Ansible collections path to the Python virtual environment
export ANSIBLE_COLLECTIONS_PATH=$VIRTUAL_ENV/ansible_collections
# Install Ansible collection
ansible-galaxy collection install git+https://github.com/Shivani-gslab/avd.git#/ansible_collections/arista/avd/,monitor_session_refactor --force
# Optional: Install AVD examples
cd test-avd-pr-4937
ansible-playbook arista.avd.install_examples |
for more information, see https://pre-commit.ci
ClausHolbechArista
requested changes
Jan 28, 2025
| } | ||
| monitor_session = EosCliConfigGen.MonitorSessionsItem( | ||
| name=session_name, | ||
| sources=[], |
There was a problem hiding this comment.
Not needed since it will be autocreated when needed.
Suggested change
| sources=[], |
Comment on lines
+64
to
+68
| source.access_group = EosCliConfigGen.MonitorSessionsItem.SourcesItem.AccessGroup( | ||
| type=session.source_settings.access_group.type, | ||
| name=session.source_settings.access_group.name, | ||
| priority=session.source_settings.access_group.priority, | ||
| ) |
There was a problem hiding this comment.
This the properties have the same name and type you can do:
Suggested change
| source.access_group = EosCliConfigGen.MonitorSessionsItem.SourcesItem.AccessGroup( | |
| type=session.source_settings.access_group.type, | |
| name=session.source_settings.access_group.name, | |
| priority=session.source_settings.access_group.priority, | |
| ) | |
| source.access_group = session.source_settings.access_group._cast_as(EosCliConfigGen.MonitorSessionsItem.SourcesItem.AccessGroup) |
| ) | ||
| if session.source_settings.access_group.name is not None: |
There was a problem hiding this comment.
Suggested change
| if session.source_settings.access_group.name is not None: | |
| if session.source_settings.access_group.name: |
| name=session.source_settings.access_group.name, | ||
| priority=session.source_settings.access_group.priority, | ||
| ) | ||
| monitor_session.sources.extend(source) |
There was a problem hiding this comment.
Suggested change
| monitor_session.sources.extend(source) | |
| monitor_session.sources.append(source) |
| @cached_property | ||
| def monitor_sessions(self: AvdStructuredConfigConnectedEndpoints) -> list | None: | ||
| @structured_config_contributor | ||
| def monitor_sessions(self: AvdStructuredConfigConnectedEndpoints) -> None: |
There was a problem hiding this comment.
Check if it makes sense to populate the self._monitor_session_configs with the EosCliConfigGen models directly instead of having to convert all of them here. Only if it makes sense and we can save something.
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
|
Conflicts have been resolved. A maintainer will review the pull request shortly. |
|
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.
Change Summary
Related Issue(s)
Fixes #
Component(s) name
arista.avd.<role-name>Proposed changes
How to test
Checklist
User Checklist
Repository Checklist