Refactor(eos_designs): Refactor eos_designs structured_config code ip_access_list #4972

MaheshGSLAB · 2025-02-04T06:03:35Z

Change Summary

Refactor eos_designs structured_config code ip_access_list

Related Issue(s)

Fixes #

Component(s) name

arista.avd.eos_designs

Proposed changes

Refactor eos_designs structured_config code ip_access_list

How to test

Run Molecule

Checklist

User Checklist

N/A

Repository Checklist

My code has been rebased from devel before I start
I have read the CONTRIBUTING document.
My change requires a change to the documentation and documentation have been updated accordingly.
I have updated molecule CI testing accordingly. (check the box if not applicable)

…r ip_access_lists

github-actions · 2025-02-04T06:03:47Z

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-4972
# Activate the virtual environment
source test-avd-pr-4972/bin/activate
# Install all requirements including PyAVD
pip install "pyavd[ansible] @ git+https://github.com/MaheshGSLAB/ansible-avd.git@ip-access-list#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/MaheshGSLAB/ansible-avd.git#/ansible_collections/arista/avd/,ip-access-list --force
# Optional: Install AVD examples
cd test-avd-pr-4972
ansible-playbook arista.avd.install_examples

for more information, see https://pre-commit.ci

python-avd/pyavd/_eos_designs/structured_config/underlay/ip_access_lists.py

python-avd/pyavd/_eos_designs/structured_config/network_services/vlan_interfaces.py

python-avd/pyavd/_eos_designs/structured_config/underlay/utils.py

github-actions · 2025-02-12T10:34:57Z

This pull request has conflicts, please resolve those before we can evaluate the pull request.

Shivani-gslab

LGTM

github-actions · 2025-02-21T05:57:27Z

Conflicts have been resolved. A maintainer will review the pull request shortly.

ClausHolbechArista · 2025-02-24T06:34:30Z

python-avd/pyavd/_eos_designs/structured_config/network_services/ip_access_lists.py


-        return natural_sort(ip_access_lists, "name") or None
+        self.structured_config.ip_access_lists = EosCliConfigGen.IpAccessLists(natural_sort(self.structured_config.ip_access_lists, sort_key="name"))


Please don't do this. Reading back structured config and reordering it will be very inefficient. It is ok if we reorder structured config a bit as long as the eos config and docs are the same.

ClausHolbechArista · 2025-02-24T06:38:19Z

...ble_collections/arista/avd/examples/cv-pathfinder/intended/structured_configs/site3-wan1.yml

+  - source: any
+    destination: 100.64.30.2
+    sequence: 10
    action: permit
    protocol: udp


Something is wrong with this reordering. We The order of these outputs are controlled by the order of the fields in the classes, so we should not see this, if we output the correct class. Can you check that you don't have any type errors that could explain this?

updated as you suggested(reference from underlay port-channel refactoring)

github-actions · 2025-02-24T13:59:09Z

This pull request has conflicts, please resolve those before we can evaluate the pull request.

github-actions · 2025-02-25T11:31:44Z

Conflicts have been resolved. A maintainer will review the pull request shortly.

github-actions · 2025-02-25T13:21:14Z

This pull request has conflicts, please resolve those before we can evaluate the pull request.

github-actions · 2025-02-25T13:32:01Z

Conflicts have been resolved. A maintainer will review the pull request shortly.

Shivani-gslab · 2025-02-27T06:08:44Z

python-avd/pyavd/_eos_designs/structured_config/network_services/ip_access_lists.py

+        elif internet_exit_policy_type == "direct":
+            self._acl_internet_exit_direct()
+
+    @structured_config_contributor


Please move this method to the top

Shivani-gslab · 2025-02-27T06:14:18Z

python-avd/pyavd/_eos_designs/structured_config/network_services/ip_access_lists.py

@@ -86,41 +63,33 @@ def _acl_internet_exit_user_defined(
        acl = self.shared_utils.get_ipv4_acl(acl_name, "random", interface_ip="random", peer_ip="random")
        if acl.name == acl_name:
            # ACL doesn't need replacement
-            return [acl._as_dict()]
+            return acl


There is a type error

Suggested change

return acl

return acl._cast_as(EosCliConfigGen.IpAccessListsItem)

Update the return type in line 54 as well

I think, this change fixes the ordering as well.

sonarqubecloud · 2025-02-27T08:09:53Z

Quality Gate failed

Failed conditions
72.1% Coverage on New Code (required ≥ 80%)

See analysis details on SonarQube Cloud

MaheshGSLAB added 3 commits February 3, 2025 05:50

Refactor(eos_designs): Refactor eos_designs structured_config code fo…

71e5763

…r ip_access_lists

Merge branch 'devel' into ip-access-list

1ac9a3f

updated the logic

3d17a23

MaheshGSLAB self-assigned this Feb 4, 2025

pre-commit-ci bot and others added 6 commits February 4, 2025 06:06

[pre-commit.ci] auto fixes from pre-commit.com hooks

1a99067

for more information, see https://pre-commit.ci

replace append_new with append

9344997

Merge branch 'devel' into ip-access-list

1a009d7

Merge branch 'devel' into ip-access-list

3f363de

Added network services ip_access_lists

101daac

fix the exact duplicate item issue

1624017

github-actions bot added the state: CI Updated CI scenario have been updated in the PR label Feb 10, 2025

MaheshGSLAB and others added 3 commits February 10, 2025 16:58

Merge branch 'devel' into ip-access-list

eccbc14

[pre-commit.ci] auto fixes from pre-commit.com hooks

b7251cc

for more information, see https://pre-commit.ci

added natural sort

5603424

Vibhu-gslab marked this pull request as ready for review February 11, 2025 11:03

Vibhu-gslab requested review from a team as code owners February 11, 2025 11:03

Merge branch 'devel' into ip-access-list

9181511

Vibhu-gslab self-requested a review February 11, 2025 11:03

Merge branch 'devel' into ip-access-list

440bc64

Shivani-gslab reviewed Feb 12, 2025

View reviewed changes

python-avd/pyavd/_eos_designs/structured_config/underlay/ip_access_lists.py Outdated Show resolved Hide resolved

Shivani-gslab requested changes Feb 12, 2025

View reviewed changes

optimized the code

e3255b9

MaheshGSLAB requested a review from Shivani-gslab February 12, 2025 08:06

used seprator as ..

8091c01

github-actions bot added the state: conflict PR with conflict label Feb 12, 2025

Shivani-gslab approved these changes Feb 13, 2025

View reviewed changes

Merge branch 'devel' into ip-access-list

1a55bec

Merge branch 'devel' into ip-access-list

a36672e

github-actions bot removed the state: conflict PR with conflict label Feb 21, 2025

run cv-pathfinder molecule

5d18ee6

MaheshGSLAB marked this pull request as ready for review February 21, 2025 10:30

Merge branch 'devel' into ip-access-list

87b4ff3

MaheshGSLAB requested a review from ClausHolbechArista February 24, 2025 04:51

ClausHolbechArista reviewed Feb 24, 2025

View reviewed changes

MaheshGSLAB marked this pull request as draft February 24, 2025 12:38

MaheshGSLAB changed the title ~~Refactor(eos_designs): Refactor eos_designs structured_config code ip_access_list~~ Refactor(eos_designs): Refactor eos_designs structured_config code ip_access_list(Hold) Feb 24, 2025

github-actions bot added the state: conflict PR with conflict label Feb 24, 2025

Merge branch 'devel' into ip-access-list

bebb455

github-actions bot removed the state: conflict PR with conflict label Feb 25, 2025

updated the logic to render ip_access_list in network services

726e6f9

github-actions bot added the state: conflict PR with conflict label Feb 25, 2025

Merge branch 'devel' into ip-access-list

e41b879

github-actions bot removed the state: conflict PR with conflict label Feb 25, 2025

MaheshGSLAB changed the title ~~Refactor(eos_designs): Refactor eos_designs structured_config code ip_access_list(Hold)~~ Refactor(eos_designs): Refactor eos_designs structured_config code ip_access_list Feb 25, 2025

MaheshGSLAB marked this pull request as ready for review February 25, 2025 13:33

updated negative unit test

40db13f

MaheshGSLAB requested review from ClausHolbechArista and Shivani-gslab February 25, 2025 13:40

Shivani-gslab requested changes Feb 27, 2025

View reviewed changes

fix the type error and return type

5ce98c8

MaheshGSLAB requested a review from Shivani-gslab February 27, 2025 08:04

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Refactor(eos_designs): Refactor eos_designs structured_config code ip_access_list #4972

Refactor(eos_designs): Refactor eos_designs structured_config code ip_access_list #4972

MaheshGSLAB commented Feb 4, 2025

github-actions bot commented Feb 4, 2025

github-actions bot commented Feb 12, 2025

Shivani-gslab left a comment

github-actions bot commented Feb 21, 2025

ClausHolbechArista Feb 24, 2025

MaheshGSLAB Feb 25, 2025

ClausHolbechArista Feb 24, 2025

MaheshGSLAB Feb 25, 2025

github-actions bot commented Feb 24, 2025

github-actions bot commented Feb 25, 2025

github-actions bot commented Feb 25, 2025

github-actions bot commented Feb 25, 2025

Shivani-gslab Feb 27, 2025

Shivani-gslab Feb 27, 2025

Shivani-gslab Feb 27, 2025

MaheshGSLAB Feb 27, 2025

sonarqubecloud bot commented Feb 27, 2025


		return natural_sort(ip_access_lists, "name") or None
		self.structured_config.ip_access_lists = EosCliConfigGen.IpAccessLists(natural_sort(self.structured_config.ip_access_lists, sort_key="name"))

	return acl
	return acl._cast_as(EosCliConfigGen.IpAccessListsItem)

Refactor(eos_designs): Refactor eos_designs structured_config code ip_access_list #4972

Are you sure you want to change the base?

Refactor(eos_designs): Refactor eos_designs structured_config code ip_access_list #4972

Conversation

MaheshGSLAB commented Feb 4, 2025

Change Summary

Related Issue(s)

Component(s) name

Proposed changes

How to test

Checklist

User Checklist

Repository Checklist

github-actions bot commented Feb 4, 2025

github-actions bot commented Feb 12, 2025

Shivani-gslab left a comment

Choose a reason for hiding this comment

github-actions bot commented Feb 21, 2025

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

github-actions bot commented Feb 24, 2025

github-actions bot commented Feb 25, 2025

github-actions bot commented Feb 25, 2025

github-actions bot commented Feb 25, 2025

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

sonarqubecloud bot commented Feb 27, 2025

Quality Gate failed