From 03bc8532ad167bff53e08b100a068573274a9d04 Mon Sep 17 00:00:00 2001
From: oxedions <oxedions@gmail.com>
Date: Thu, 3 Apr 2025 15:49:56 +0200
Subject: [PATCH 1/3] Feat: Add infiniband mac address support in nmcli module

---
 plugins/modules/nmcli.py | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/plugins/modules/nmcli.py b/plugins/modules/nmcli.py
index 3c895e76ec..67061b2d66 100644
--- a/plugins/modules/nmcli.py
+++ b/plugins/modules/nmcli.py
@@ -429,6 +429,10 @@ options:
       - MAC address of the connection.
       - Note this requires a recent kernel feature, originally introduced in 3.15 upstream kernel.
     type: str
+  infiniband_mac:
+    description:
+      - MAC address of the Infiniband IPoIB devices.
+    type: str
   slavepriority:
     description:
       - This is only used with 'bridge-slave' - [<0-63>] - STP priority of this slave.
@@ -1737,6 +1741,7 @@ class Nmcli(object):
         self.hairpin = module.params['hairpin']
         self.path_cost = module.params['path_cost']
         self.mac = module.params['mac']
+        self.infiniband_mac = module.params['infiniband_mac']
         self.runner = module.params['runner']
         self.runner_hwaddr_policy = module.params['runner_hwaddr_policy']
         self.runner_fast_rate = module.params['runner_fast_rate']
@@ -2034,6 +2039,10 @@ class Nmcli(object):
             options.update({
                 'infiniband.transport-mode': self.transport_mode,
             })
+            if self.infiniband_mac:
+                options.update({
+                    'infiniband.mac-address': self.infiniband_mac,
+                })
         elif self.type == 'vrf':
             options.update({
                 'table': self.table,
@@ -2708,9 +2717,12 @@ def main():
                               tap=dict(type='bool'))),
             wireguard=dict(type='dict'),
             vpn=dict(type='dict'),
-            transport_mode=dict(type='str', choices=['datagram', 'connected']),
             sriov=dict(type='dict'),
             table=dict(type='int'),
+            # infiniband specific vars
+            transport_mode=dict(type='str', choices=['datagram', 'connected']),
+            infiniband_mac=dict(type='str'),
+
         ),
         mutually_exclusive=[['never_default4', 'gw4'],
                             ['routes4_extended', 'routes4'],

From dc6b6678142d3b8ddd496fd1c3c4294db3f8a33d Mon Sep 17 00:00:00 2001
From: oxedions <oxedions@gmail.com>
Date: Thu, 3 Apr 2025 16:02:26 +0200
Subject: [PATCH 2/3] Add changelog fragment

---
 changelogs/fragments/9962-nmcli-add-infiniband-mac-support.yml | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 changelogs/fragments/9962-nmcli-add-infiniband-mac-support.yml

diff --git a/changelogs/fragments/9962-nmcli-add-infiniband-mac-support.yml b/changelogs/fragments/9962-nmcli-add-infiniband-mac-support.yml
new file mode 100644
index 0000000000..d25ecba329
--- /dev/null
+++ b/changelogs/fragments/9962-nmcli-add-infiniband-mac-support.yml
@@ -0,0 +1,2 @@
+minor_changes:
+  - nmcli - Add support for infiniband mac setting when type is infiniband (https://github.com/ansible-collections/community.general/pull/9962).

From 4c99093186f803d5d85bb502b99790887758f7bf Mon Sep 17 00:00:00 2001
From: oxedions <oxedions@gmail.com>
Date: Fri, 4 Apr 2025 09:41:27 +0200
Subject: [PATCH 3/3] Tentative to fix the error

---
 plugins/modules/nmcli.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/plugins/modules/nmcli.py b/plugins/modules/nmcli.py
index 67061b2d66..a80c579705 100644
--- a/plugins/modules/nmcli.py
+++ b/plugins/modules/nmcli.py
@@ -99,6 +99,10 @@ options:
     type: str
     choices: [datagram, connected]
     version_added: 5.8.0
+  infiniband_mac:
+    description:
+      - MAC address of the Infiniband IPoIB devices.
+    type: str
   slave_type:
     description:
       - Type of the device of this slave's master connection (for example V(bond)).
@@ -429,10 +433,6 @@ options:
       - MAC address of the connection.
       - Note this requires a recent kernel feature, originally introduced in 3.15 upstream kernel.
     type: str
-  infiniband_mac:
-    description:
-      - MAC address of the Infiniband IPoIB devices.
-    type: str
   slavepriority:
     description:
       - This is only used with 'bridge-slave' - [<0-63>] - STP priority of this slave.
@@ -1741,7 +1741,6 @@ class Nmcli(object):
         self.hairpin = module.params['hairpin']
         self.path_cost = module.params['path_cost']
         self.mac = module.params['mac']
-        self.infiniband_mac = module.params['infiniband_mac']
         self.runner = module.params['runner']
         self.runner_hwaddr_policy = module.params['runner_hwaddr_policy']
         self.runner_fast_rate = module.params['runner_fast_rate']
@@ -1769,6 +1768,7 @@ class Nmcli(object):
         self.wireguard = module.params['wireguard']
         self.vpn = module.params['vpn']
         self.transport_mode = module.params['transport_mode']
+        self.infiniband_mac = module.params['infiniband_mac']
         self.sriov = module.params['sriov']
 
         if self.method4: