From 0d80a81119c847c83ef87b635a7ee180d6bb6689 Mon Sep 17 00:00:00 2001
From: Gaige B Paulsen <gaige@cluetrust.com>
Date: Fri, 7 Feb 2025 14:15:47 -0500
Subject: T7010: fix: integration tests add unit tests (#386)

fix: integration tests add unit tests
---
 .../network/vyos/config/lag_interfaces/lag_interfaces.py | 10 ++++------
 .../network/vyos/facts/lag_interfaces/lag_interfaces.py  | 16 ++++++++++++----
 2 files changed, 16 insertions(+), 10 deletions(-)

(limited to 'plugins')

diff --git a/plugins/module_utils/network/vyos/config/lag_interfaces/lag_interfaces.py b/plugins/module_utils/network/vyos/config/lag_interfaces/lag_interfaces.py
index 835615b..6890fe0 100644
--- a/plugins/module_utils/network/vyos/config/lag_interfaces/lag_interfaces.py
+++ b/plugins/module_utils/network/vyos/config/lag_interfaces/lag_interfaces.py
@@ -300,10 +300,9 @@ class Lag_interfaces(ConfigBase):
             for key in diff_members:
                 commands.append(
                     self._compute_command(
-                        key["member"],
-                        "bond-group",
                         want["name"],
-                        type="ethernet",
+                        "member interface",
+                        key["member"],
                     ),
                 )
         return commands
@@ -337,11 +336,10 @@ class Lag_interfaces(ConfigBase):
         for member in have["members"]:
             commands.append(
                 self._compute_command(
-                    member["member"],
-                    "bond-group",
                     have["name"],
+                    "member interface",
+                    member["member"],
                     remove=True,
-                    type="ethernet",
                 ),
             )
         return commands
diff --git a/plugins/module_utils/network/vyos/facts/lag_interfaces/lag_interfaces.py b/plugins/module_utils/network/vyos/facts/lag_interfaces/lag_interfaces.py
index 78638bb..8e1c862 100644
--- a/plugins/module_utils/network/vyos/facts/lag_interfaces/lag_interfaces.py
+++ b/plugins/module_utils/network/vyos/facts/lag_interfaces/lag_interfaces.py
@@ -41,6 +41,14 @@ class Lag_interfacesFacts(object):
 
         self.generated_spec = utils.generate_dict(facts_argument_spec)
 
+    def get_config(self, connection):
+        """Get the configuration from the device
+        :param connection: the device connection
+        :rtype: string
+        :returns: The configuration
+        """
+        return connection.get_config()
+
     def populate_facts(self, connection, ansible_facts, data=None):
         """Populate the facts for lag_interfaces
         :param module: the module instance
@@ -50,7 +58,7 @@ class Lag_interfacesFacts(object):
         :returns: facts
         """
         if not data:
-            data = connection.get_config()
+            data = self.get_config(connection)
 
         objs = []
         lag_names = findall(r"^set interfaces bonding (\S+)", data, M)
@@ -62,13 +70,13 @@ class Lag_interfacesFacts(object):
                 members = []
                 member = {}
 
-                group_regex = r".*eth.* '%s'" % lag
+                group_regex = r"%s member interface .*eth.*" % lag
                 g_cfg = findall(group_regex, data, M)
                 for item in g_cfg:
-                    output = search("^set interfaces ethernet (\\S+)", item, M)
+                    output = search("member interface '(\\S+)'", item, M)
                     if output:
                         member["member"] = output.group(1).strip("'")
-                        members.append(member)
+                        members.append(deepcopy(member))
                 obj["name"] = lag.strip("'")
                 if members:
                     obj["members"] = members
-- 
cgit v1.2.3