From d2d7f5626d58026b64bc6daa6a47acc9b8befd52 Mon Sep 17 00:00:00 2001 From: Sammy Date: Wed, 25 Oct 2023 18:38:14 +0300 Subject: [PATCH 1/6] Fix for #1886 --- plugins/modules/vmware_portgroup_info.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/modules/vmware_portgroup_info.py b/plugins/modules/vmware_portgroup_info.py index b94be38db..08d7d51e2 100644 --- a/plugins/modules/vmware_portgroup_info.py +++ b/plugins/modules/vmware_portgroup_info.py @@ -162,7 +162,7 @@ def normalize_pg_info(portgroup_obj, policy_info): else: pg_info_dict['failover_active'] = spec.policy.nicTeaming.nicOrder.activeNic pg_info_dict['failover_standby'] = spec.policy.nicTeaming.nicOrder.standbyNic - if spec.policy.nicTeaming.failureCriteria is None: + if spec.policy.nicTeaming.failureCriteria is None or spec.policy.nicTeaming.failureCriteria.checkBeacon is None: pg_info_dict['failure_detection'] = "No override" else: if spec.policy.nicTeaming.failureCriteria.checkBeacon: From d32b0ab3d966736964d8b96a870be8a777f06484 Mon Sep 17 00:00:00 2001 From: "Sammy [Andrei Marinache]" <103534407+andrei-marinache@users.noreply.github.com> Date: Wed, 25 Oct 2023 22:29:12 +0300 Subject: [PATCH 2/6] Add changelogs fragment --- changelogs/fragments/1895_ | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 changelogs/fragments/1895_ diff --git a/changelogs/fragments/1895_ b/changelogs/fragments/1895_ new file mode 100644 index 000000000..a1ef0947f --- /dev/null +++ b/changelogs/fragments/1895_ @@ -0,0 +1,3 @@ +bugfixes: + - vmware_portgroup_info: fix issue when failure_detection is reported as + 'link_status_only' insted of 'No override' From 7821efac847a69b106ba4a94bfffd8909c469cc2 Mon Sep 17 00:00:00 2001 From: "Sammy [Andrei Marinache]" <103534407+andrei-marinache@users.noreply.github.com> Date: Wed, 25 Oct 2023 22:30:05 +0300 Subject: [PATCH 3/6] Rename 1895_ to 1886_fix_vmware_portgroup_info --- changelogs/fragments/{1895_ => 1886_fix_vmware_portgroup_info} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename changelogs/fragments/{1895_ => 1886_fix_vmware_portgroup_info} (100%) diff --git a/changelogs/fragments/1895_ b/changelogs/fragments/1886_fix_vmware_portgroup_info similarity index 100% rename from changelogs/fragments/1895_ rename to changelogs/fragments/1886_fix_vmware_portgroup_info From d0fca12271b2a6891a54d23b4ddaf55822503d0e Mon Sep 17 00:00:00 2001 From: "Sammy [Andrei Marinache]" <103534407+andrei-marinache@users.noreply.github.com> Date: Wed, 25 Oct 2023 22:30:26 +0300 Subject: [PATCH 4/6] Rename 1886_fix_vmware_portgroup_info to 1886_fix_vmware_portgroup_info.yml --- ...x_vmware_portgroup_info => 1886_fix_vmware_portgroup_info.yml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename changelogs/fragments/{1886_fix_vmware_portgroup_info => 1886_fix_vmware_portgroup_info.yml} (100%) diff --git a/changelogs/fragments/1886_fix_vmware_portgroup_info b/changelogs/fragments/1886_fix_vmware_portgroup_info.yml similarity index 100% rename from changelogs/fragments/1886_fix_vmware_portgroup_info rename to changelogs/fragments/1886_fix_vmware_portgroup_info.yml From 69638e073219d6da0bef195463b2d581df2f38f7 Mon Sep 17 00:00:00 2001 From: "Sammy [Andrei Marinache]" <103534407+andrei-marinache@users.noreply.github.com> Date: Wed, 25 Oct 2023 22:50:39 +0300 Subject: [PATCH 5/6] Update changelogs fragment --- changelogs/fragments/1886_fix_vmware_portgroup_info.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/changelogs/fragments/1886_fix_vmware_portgroup_info.yml b/changelogs/fragments/1886_fix_vmware_portgroup_info.yml index a1ef0947f..8c0c82651 100644 --- a/changelogs/fragments/1886_fix_vmware_portgroup_info.yml +++ b/changelogs/fragments/1886_fix_vmware_portgroup_info.yml @@ -1,3 +1,2 @@ bugfixes: - - vmware_portgroup_info: fix issue when failure_detection is reported as - 'link_status_only' insted of 'No override' + - vmware_portgroup_info: fix issue when failure_detection is reported as 'link_status_only' instad of 'No override' From 89beb8b0f0e09340f4173e206954b310b8f24bee Mon Sep 17 00:00:00 2001 From: "Sammy [Andrei Marinache]" <103534407+andrei-marinache@users.noreply.github.com> Date: Wed, 25 Oct 2023 23:07:20 +0300 Subject: [PATCH 6/6] Updated changelog fragment --- changelogs/fragments/1886_fix_vmware_portgroup_info.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelogs/fragments/1886_fix_vmware_portgroup_info.yml b/changelogs/fragments/1886_fix_vmware_portgroup_info.yml index 8c0c82651..7151aff4c 100644 --- a/changelogs/fragments/1886_fix_vmware_portgroup_info.yml +++ b/changelogs/fragments/1886_fix_vmware_portgroup_info.yml @@ -1,2 +1,2 @@ bugfixes: - - vmware_portgroup_info: fix issue when failure_detection is reported as 'link_status_only' instad of 'No override' + - vmware_portgroup_info - fix issue when failure_detection is reported as 'link_status_only' instad of 'No override'