Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Code refactoring - module_utils/elbv2 #2050

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open

Code refactoring - module_utils/elbv2 #2050

wants to merge 6 commits into from
+1,461 −1,132

Conversation

abikouo
Copy link
Contributor

@abikouo abikouo commented Apr 10, 2024

SUMMARY

closes #1981

ISSUE TYPE
  • Feature Pull Request

@softwarefactory-project-zuul softwarefactory-project-zuul
Copy link
Contributor

Build failed.
https://ansible.softwarefactory-project.io/zuul/buildset/fc41bea02ba74eecacec3088688696a7

✔️ ansible-galaxy-importer SUCCESS in 3m 51s
✔️ build-ansible-collection SUCCESS in 21m 46s
✔️ ansible-test-splitter SUCCESS in 10m 45s
❌ integration-amazon.aws-1 FAILURE in 15m 26s
✔️ integration-community.aws-1 SUCCESS in 22m 40s
Skipped 42 jobs

@abikouo abikouo force-pushed the refactor_elbv2 branch 2 times, most recently from 9eaf4b2 to 13be34e Compare April 17, 2024 13:16
@softwarefactory-project-zuul softwarefactory-project-zuul
Copy link
Contributor

Build failed.
https://ansible.softwarefactory-project.io/zuul/buildset/d1a4a1afd7ca4d6d8d708906b438846e

✔️ ansible-galaxy-importer SUCCESS in 5m 01s
✔️ build-ansible-collection SUCCESS in 16m 26s
✔️ ansible-test-splitter SUCCESS in 6m 02s
❌ integration-amazon.aws-1 FAILURE in 21m 11s
✔️ integration-community.aws-1 SUCCESS in 19m 54s
Skipped 42 jobs

@abikouo
Copy link
Contributor Author

abikouo commented Apr 17, 2024

recheck

@softwarefactory-project-zuul softwarefactory-project-zuul
Copy link
Contributor

Build failed.
https://ansible.softwarefactory-project.io/zuul/buildset/fa6678a6e77a4a36a8829f1da4518b84

✔️ ansible-galaxy-importer SUCCESS in 5m 39s
✔️ build-ansible-collection SUCCESS in 14m 36s
✔️ ansible-test-splitter SUCCESS in 6m 22s
❌ integration-amazon.aws-1 FAILURE in 12m 22s
✔️ integration-community.aws-1 SUCCESS in 19m 45s
Skipped 42 jobs

@softwarefactory-project-zuul softwarefactory-project-zuul
Copy link
Contributor

Build succeeded.
https://ansible.softwarefactory-project.io/zuul/buildset/86cc5c0b76324f71b88dcd28c3605c50

✔️ ansible-galaxy-importer SUCCESS in 6m 08s
✔️ build-ansible-collection SUCCESS in 14m 35s
✔️ ansible-test-splitter SUCCESS in 7m 03s
✔️ integration-amazon.aws-1 SUCCESS in 12m 46s
✔️ integration-community.aws-1 SUCCESS in 19m 12s
Skipped 42 jobs

hakbailey
hakbailey reviewed Apr 23, 2024
View reviewed changes
plugins/module_utils/elbv2.py Outdated Show resolved Hide resolved
plugins/module_utils/elbv2.py Outdated Show resolved Hide resolved
hakbailey
hakbailey reviewed May 3, 2024
View reviewed changes
Copy link
Contributor

@hakbailey hakbailey left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this is a great step towards making these modules easier to understand! I made a few comments inline and I think there is probably more we can do to clarify the rules comparison in the future, but in general this looks good to me.

plugins/module_utils/elbv2.py Show resolved Hide resolved
plugins/module_utils/elbv2.py Outdated Show resolved Hide resolved
@abikouo abikouo requested a review from hakbailey May 14, 2024 15:44
@softwarefactory-project-zuul softwarefactory-project-zuul
Copy link
Contributor

Build succeeded.
https://ansible.softwarefactory-project.io/zuul/buildset/7235107f045d4283b0329f051f9f24cc

✔️ ansible-galaxy-importer SUCCESS in 5m 14s
✔️ build-ansible-collection SUCCESS in 15m 11s
✔️ ansible-test-splitter SUCCESS in 6m 18s
✔️ integration-amazon.aws-1 SUCCESS in 29m 07s
✔️ integration-amazon.aws-2 SUCCESS in 12m 14s
✔️ integration-community.aws-1 SUCCESS in 21m 45s
Skipped 41 jobs

hakbailey
hakbailey reviewed May 16, 2024
View reviewed changes
Copy link
Contributor

@hakbailey hakbailey left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just a few more minor comments.

plugins/module_utils/elb_utils.py Show resolved Hide resolved
plugins/module_utils/elb_utils.py Show resolved Hide resolved
plugins/module_utils/elb_utils.py Outdated Show resolved Hide resolved
tests/unit/module_utils/elbv2/test_elbv2.py Outdated Show resolved Hide resolved
@softwarefactory-project-zuul softwarefactory-project-zuul
Copy link
Contributor

Build succeeded.
https://ansible.softwarefactory-project.io/zuul/buildset/003204e1cd81466d8cce80aa95276d70

✔️ ansible-galaxy-importer SUCCESS in 5m 56s
✔️ build-ansible-collection SUCCESS in 15m 24s
✔️ ansible-test-splitter SUCCESS in 5m 38s
✔️ integration-amazon.aws-1 SUCCESS in 28m 14s
✔️ integration-amazon.aws-2 SUCCESS in 10m 49s
✔️ integration-community.aws-1 SUCCESS in 20m 14s
Skipped 41 jobs

@abikouo abikouo requested a review from hakbailey May 21, 2024 09:25
alinabuzachis
alinabuzachis reviewed May 23, 2024
View reviewed changes
plugins/module_utils/elbv2.py
self.fail_json(msg="Modifying subnets and elastic IPs is not supported for Network Load Balancer")


def _compare_listener(current_listener: Dict[str, Any], new_listener: Dict[str, Any]) -> Optional[Dict[str, Any]]:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would probably suggest to split this function into several ones.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This function has several lines, but overall what is done inside is small enough to remain in this function

plugins/module_utils/elbv2.py


def _group_rules(
current_rules: List[Dict[str, Any]], rules: List[Dict[str, Any]]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What would you think about splitting this one too?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same here, this is a small function

@abikouo abikouo added the mergeit Merge the PR (SoftwareFactory) label Jun 10, 2024
@softwarefactory-project-zuul softwarefactory-project-zuul
Copy link
Contributor

Build failed (gate pipeline). For information on how to proceed, see
http://docs.openstack.org/infra/manual/developers.html#automated-testing

https://ansible.softwarefactory-project.io/zuul/buildset/4c8b2eb7c5ef4e818b704f7a5e3c0364

⚠️ ansible-galaxy-importer SKIPPED Skipped due to failed job build-ansible-collection
❌ build-ansible-collection FAILURE in 16m 32s
❌ ansible-test-splitter RETRY_LIMIT in 6m 27s
⚠️ integration-amazon.aws-1 SKIPPED Skipped due to failed job build-ansible-collection
⚠️ integration-amazon.aws-2 SKIPPED Skipped due to failed job build-ansible-collection
⚠️ integration-amazon.aws-3 SKIPPED Skipped due to failed job build-ansible-collection
⚠️ integration-amazon.aws-4 SKIPPED Skipped due to failed job build-ansible-collection
⚠️ integration-amazon.aws-5 SKIPPED Skipped due to failed job build-ansible-collection
⚠️ integration-amazon.aws-6 SKIPPED Skipped due to failed job build-ansible-collection
⚠️ integration-amazon.aws-7 SKIPPED Skipped due to failed job build-ansible-collection
⚠️ integration-amazon.aws-8 SKIPPED Skipped due to failed job build-ansible-collection
⚠️ integration-amazon.aws-9 SKIPPED Skipped due to failed job build-ansible-collection
⚠️ integration-amazon.aws-10 SKIPPED Skipped due to failed job build-ansible-collection
⚠️ integration-amazon.aws-11 SKIPPED Skipped due to failed job build-ansible-collection
⚠️ integration-amazon.aws-12 SKIPPED Skipped due to failed job build-ansible-collection
⚠️ integration-amazon.aws-13 SKIPPED Skipped due to failed job build-ansible-collection
⚠️ integration-amazon.aws-14 SKIPPED Skipped due to failed job build-ansible-collection
⚠️ integration-amazon.aws-15 SKIPPED Skipped due to failed job build-ansible-collection
⚠️ integration-amazon.aws-16 SKIPPED Skipped due to failed job build-ansible-collection
⚠️ integration-amazon.aws-17 SKIPPED Skipped due to failed job build-ansible-collection
⚠️ integration-amazon.aws-18 SKIPPED Skipped due to failed job build-ansible-collection
⚠️ integration-amazon.aws-19 SKIPPED Skipped due to failed job build-ansible-collection
⚠️ integration-amazon.aws-20 SKIPPED Skipped due to failed job build-ansible-collection
⚠️ integration-amazon.aws-21 SKIPPED Skipped due to failed job build-ansible-collection
⚠️ integration-amazon.aws-22 SKIPPED Skipped due to failed job build-ansible-collection
⚠️ integration-community.aws-1 SKIPPED Skipped due to failed job build-ansible-collection
⚠️ integration-community.aws-2 SKIPPED Skipped due to failed job build-ansible-collection
⚠️ integration-community.aws-3 SKIPPED Skipped due to failed job build-ansible-collection
⚠️ integration-community.aws-4 SKIPPED Skipped due to failed job build-ansible-collection
⚠️ integration-community.aws-5 SKIPPED Skipped due to failed job build-ansible-collection
⚠️ integration-community.aws-6 SKIPPED Skipped due to failed job build-ansible-collection
⚠️ integration-community.aws-7 SKIPPED Skipped due to failed job build-ansible-collection
⚠️ integration-community.aws-8 SKIPPED Skipped due to failed job build-ansible-collection
⚠️ integration-community.aws-9 SKIPPED Skipped due to failed job build-ansible-collection
⚠️ integration-community.aws-10 SKIPPED Skipped due to failed job build-ansible-collection
⚠️ integration-community.aws-11 SKIPPED Skipped due to failed job build-ansible-collection
⚠️ integration-community.aws-12 SKIPPED Skipped due to failed job build-ansible-collection
⚠️ integration-community.aws-13 SKIPPED Skipped due to failed job build-ansible-collection
⚠️ integration-community.aws-14 SKIPPED Skipped due to failed job build-ansible-collection
⚠️ integration-community.aws-15 SKIPPED Skipped due to failed job build-ansible-collection
⚠️ integration-community.aws-16 SKIPPED Skipped due to failed job build-ansible-collection
⚠️ integration-community.aws-17 SKIPPED Skipped due to failed job build-ansible-collection
⚠️ integration-community.aws-18 SKIPPED Skipped due to failed job build-ansible-collection
⚠️ integration-community.aws-19 SKIPPED Skipped due to failed job build-ansible-collection
⚠️ integration-community.aws-20 SKIPPED Skipped due to failed job build-ansible-collection
⚠️ integration-community.aws-21 SKIPPED Skipped due to failed job build-ansible-collection
⚠️ integration-community.aws-22 SKIPPED Skipped due to failed job build-ansible-collection

@abikouo
Copy link
Contributor Author

abikouo commented Jun 11, 2024

recheck

@abikouo
Copy link
Contributor Author

abikouo commented Jun 11, 2024

regate

@softwarefactory-project-zuul softwarefactory-project-zuul
Copy link
Contributor

Build failed (gate pipeline). For information on how to proceed, see
http://docs.openstack.org/infra/manual/developers.html#automated-testing

https://ansible.softwarefactory-project.io/zuul/buildset/142c35415688497db7a77854308a9acb

✔️ ansible-galaxy-importer SUCCESS in 5m 23s
✔️ build-ansible-collection SUCCESS in 24m 21s
✔️ ansible-test-splitter SUCCESS in 10m 26s
❌ integration-amazon.aws-1 RETRY_LIMIT in 1m 43s
✔️ integration-amazon.aws-2 SUCCESS in 10m 43s
✔️ integration-community.aws-1 SUCCESS in 19m 19s
Skipped 41 jobs

@abikouo abikouo closed this Jun 11, 2024
@abikouo abikouo reopened this Jun 11, 2024
@abikouo
Copy link
Contributor Author

abikouo commented Jun 11, 2024

regate

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@hakbailey hakbailey hakbailey approved these changes

@alinabuzachis alinabuzachis Awaiting requested review from alinabuzachis

Assignees
No one assigned
Labels
mergeit Merge the PR (SoftwareFactory)
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Refactor module_utils/elbv2 listeners and rules comparison
3 participants
@abikouo @hakbailey @alinabuzachis