Code refactoring - module_utils/elbv2 #2050

abikouo · 2024-04-10T12:50:34Z

SUMMARY

closes #1981

ISSUE TYPE

Feature Pull Request

softwarefactory-project-zuul · 2024-04-10T18:12:54Z

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

softwarefactory-project-zuul · 2024-04-17T14:27:36Z

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 · 2024-04-17T15:12:47Z

recheck

softwarefactory-project-zuul · 2024-04-17T15:48:47Z

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 · 2024-04-17T17:12:39Z

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

plugins/module_utils/elbv2.py

hakbailey

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

softwarefactory-project-zuul · 2024-05-14T16:27:25Z

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

Just a few more minor comments.

plugins/module_utils/elb_utils.py

tests/unit/module_utils/elbv2/test_elbv2.py

softwarefactory-project-zuul · 2024-05-17T19:05:45Z

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

alinabuzachis · 2024-05-23T10:16:54Z

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]]:


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

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

alinabuzachis · 2024-05-23T10:25:06Z

plugins/module_utils/elbv2.py

+
+
+def _group_rules(
+    current_rules: List[Dict[str, Any]], rules: List[Dict[str, Any]]


What would you think about splitting this one too?

same here, this is a small function

softwarefactory-project-zuul · 2024-06-10T14:42:13Z

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 · 2024-06-11T05:56:11Z

recheck

abikouo · 2024-06-11T05:56:15Z

regate

softwarefactory-project-zuul · 2024-06-11T06:41:47Z

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 · 2024-06-11T07:49:23Z

regate

softwarefactory-project-zuul · 2024-06-11T09:18:52Z

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/56e4f06da9b64aacb9ba97df7282f8e0

✔️ ansible-galaxy-importer SUCCESS in 5m 41s
✔️ build-ansible-collection SUCCESS in 17m 56s
✔️ ansible-test-splitter SUCCESS in 6m 01s
✔️ integration-amazon.aws-1 SUCCESS in 32m 58s
✔️ integration-amazon.aws-2 SUCCESS in 11m 09s
✔️ integration-community.aws-1 SUCCESS in 22m 46s
✔️ integration-community.aws-2 SUCCESS in 36m 21s
✔️ integration-community.aws-3 SUCCESS in 7m 11s
✔️ integration-community.aws-4 SUCCESS in 29m 08s
✔️ integration-community.aws-5 SUCCESS in 16m 52s
✔️ integration-community.aws-6 SUCCESS in 30m 41s
✔️ integration-community.aws-7 SUCCESS in 16m 32s
✔️ integration-community.aws-8 SUCCESS in 25m 00s
❌ integration-community.aws-9 RETRY_LIMIT in 1m 44s
✔️ integration-community.aws-10 SUCCESS in 18m 09s
❌ integration-community.aws-11 RETRY_LIMIT in 1m 42s
✔️ integration-community.aws-12 SUCCESS in 21m 35s
✔️ integration-community.aws-13 SUCCESS in 30m 59s
❌ integration-community.aws-14 RETRY_LIMIT in 1m 43s
✔️ integration-community.aws-15 SUCCESS in 33m 37s
✔️ integration-community.aws-16 SUCCESS in 35m 06s
✔️ integration-community.aws-17 SUCCESS in 16m 00s
✔️ integration-community.aws-18 SUCCESS in 19m 42s
✔️ integration-community.aws-19 SUCCESS in 12m 15s
✔️ integration-community.aws-20 SUCCESS in 7m 42s
Skipped 22 jobs

softwarefactory-project-zuul · 2024-06-11T09:53:19Z

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

⚠️ ansible-galaxy-importer SKIPPED Skipped due to failed job build-ansible-collection
❌ build-ansible-collection RETRY_LIMIT in 5s
❌ ansible-test-splitter RETRY_LIMIT in 7m 35s
⚠️ 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 · 2024-06-11T10:02:27Z

recheck

softwarefactory-project-zuul · 2024-06-11T10:58:39Z

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

✔️ ansible-galaxy-importer SUCCESS in 5m 48s
✔️ build-ansible-collection SUCCESS in 19m 26s
✔️ ansible-test-splitter SUCCESS in 8m 09s
✔️ integration-amazon.aws-1 SUCCESS in 30m 27s
✔️ integration-amazon.aws-2 SUCCESS in 10m 33s
✔️ integration-community.aws-1 SUCCESS in 19m 14s
Skipped 41 jobs

softwarefactory-project-zuul · 2024-06-11T11:55:24Z

Build succeeded (gate pipeline).
https://ansible.softwarefactory-project.io/zuul/buildset/39446b11064240e9b5f5267327ccf5a4

✔️ ansible-galaxy-importer SUCCESS in 4m 01s
✔️ build-ansible-collection SUCCESS in 16m 38s
✔️ ansible-test-splitter SUCCESS in 7m 24s
✔️ integration-amazon.aws-1 SUCCESS in 27m 27s
✔️ integration-amazon.aws-2 SUCCESS in 9m 58s
✔️ integration-community.aws-1 SUCCESS in 19m 48s
Skipped 41 jobs

Code refactoring - module_utils/elbv2 SUMMARY closes ansible-collections#1981 ISSUE TYPE Feature Pull Request Reviewed-by: Helen Bailey <[email protected]> Reviewed-by: Bikouo Aubin Reviewed-by: Alina Buzachis

abikouo force-pushed the refactor_elbv2 branch 2 times, most recently from 9eaf4b2 to 13be34e Compare April 17, 2024 13:16

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 reviewed May 3, 2024

View reviewed changes

plugins/module_utils/elbv2.py Show resolved Hide resolved

plugins/module_utils/elbv2.py Outdated Show resolved Hide resolved

abikouo force-pushed the refactor_elbv2 branch from ba477ce to fa51753 Compare May 14, 2024 15:32

abikouo requested a review from hakbailey May 14, 2024 15:44

hakbailey reviewed May 16, 2024

View reviewed changes

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

abikouo requested a review from hakbailey May 21, 2024 09:25

alinabuzachis reviewed May 23, 2024

View reviewed changes

abikouo requested a review from alinabuzachis May 31, 2024 15:20

hakbailey approved these changes Jun 5, 2024

View reviewed changes

abikouo force-pushed the refactor_elbv2 branch from abd3ae7 to 264337d Compare June 10, 2024 14:19

abikouo added the mergeit Merge the PR (SoftwareFactory) label Jun 10, 2024

abikouo closed this Jun 11, 2024

abikouo reopened this Jun 11, 2024

abikouo added 2 commits June 11, 2024 11:28

Code refactoring - module_utils/elbv2

5ae431f

fix sanity tests

e4c7d51

abikouo added 4 commits June 11, 2024 11:28

Fix delete rule mechanism

e786f96

Code review updates

2c127b4

Fix black issues

006b863

code review updates

4f1837d

abikouo force-pushed the refactor_elbv2 branch from 264337d to 4f1837d Compare June 11, 2024 09:28

softwarefactory-project-zuul bot merged commit 993cbd1 into ansible-collections:main Jun 11, 2024
37 of 39 checks passed

ichekaldin mentioned this pull request Nov 5, 2024

elb_application_lb - Module fails if listener default action is anything other than Forward #2376

Closed

1 task

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Code refactoring - module_utils/elbv2 #2050

Code refactoring - module_utils/elbv2 #2050

abikouo commented Apr 10, 2024

softwarefactory-project-zuul bot commented Apr 10, 2024

softwarefactory-project-zuul bot commented Apr 17, 2024

abikouo commented Apr 17, 2024

softwarefactory-project-zuul bot commented Apr 17, 2024

softwarefactory-project-zuul bot commented Apr 17, 2024

hakbailey left a comment

softwarefactory-project-zuul bot commented May 14, 2024

hakbailey left a comment

softwarefactory-project-zuul bot commented May 17, 2024

alinabuzachis May 23, 2024

abikouo May 31, 2024

alinabuzachis May 23, 2024

abikouo May 31, 2024

softwarefactory-project-zuul bot commented Jun 10, 2024

abikouo commented Jun 11, 2024

abikouo commented Jun 11, 2024

softwarefactory-project-zuul bot commented Jun 11, 2024

abikouo commented Jun 11, 2024

softwarefactory-project-zuul bot commented Jun 11, 2024

softwarefactory-project-zuul bot commented Jun 11, 2024

abikouo commented Jun 11, 2024

softwarefactory-project-zuul bot commented Jun 11, 2024

softwarefactory-project-zuul bot commented Jun 11, 2024

		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]]:



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

Code refactoring - module_utils/elbv2 #2050

Code refactoring - module_utils/elbv2 #2050

Conversation

abikouo commented Apr 10, 2024

SUMMARY

ISSUE TYPE

softwarefactory-project-zuul bot commented Apr 10, 2024

softwarefactory-project-zuul bot commented Apr 17, 2024

abikouo commented Apr 17, 2024

softwarefactory-project-zuul bot commented Apr 17, 2024

softwarefactory-project-zuul bot commented Apr 17, 2024

hakbailey left a comment

Choose a reason for hiding this comment

softwarefactory-project-zuul bot commented May 14, 2024

hakbailey left a comment

Choose a reason for hiding this comment

softwarefactory-project-zuul bot commented May 17, 2024

alinabuzachis May 23, 2024

Choose a reason for hiding this comment

abikouo May 31, 2024

Choose a reason for hiding this comment

alinabuzachis May 23, 2024

Choose a reason for hiding this comment

abikouo May 31, 2024

Choose a reason for hiding this comment

softwarefactory-project-zuul bot commented Jun 10, 2024

abikouo commented Jun 11, 2024

abikouo commented Jun 11, 2024

softwarefactory-project-zuul bot commented Jun 11, 2024

abikouo commented Jun 11, 2024

softwarefactory-project-zuul bot commented Jun 11, 2024

softwarefactory-project-zuul bot commented Jun 11, 2024

abikouo commented Jun 11, 2024

softwarefactory-project-zuul bot commented Jun 11, 2024

softwarefactory-project-zuul bot commented Jun 11, 2024