diff --git a/plugins/module_utils/network/vyos/argspec/facts/facts.py b/plugins/module_utils/network/vyos/argspec/facts/facts.py
index 31b1aa9..1dd1510 100644
--- a/plugins/module_utils/network/vyos/argspec/facts/facts.py
+++ b/plugins/module_utils/network/vyos/argspec/facts/facts.py
@@ -1,34 +1,36 @@
 # Copyright 2019 Red Hat
 # GNU General Public License v3.0+
 # (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 """
 The arg spec for the vyos facts module.
 """
 from __future__ import absolute_import, division, print_function
 
 __metaclass__ = type
 
 
 class FactsArgs(object):  # pylint: disable=R0903
     """ The arg spec for the vyos facts module
     """
 
     def __init__(self, **kwargs):
         pass
 
     choices = [
         "all",
         "interfaces",
         "!interfaces",
         "l3_interfaces",
         "!l3_interfaces",
         "lag_interfaces",
         "!lag_interfaces",
         "lldp_global",
         "!lldp_global",
+        "lldp_interfaces",
+        "!lldp_interfaces",
     ]
 
     argument_spec = {
         "gather_subset": dict(default=["!config"], type="list"),
         "gather_network_resources": dict(choices=choices, type="list"),
     }
diff --git a/plugins/module_utils/network/vyos/argspec/lldp_interfaces/__init__.py b/plugins/module_utils/network/vyos/argspec/lldp_interfaces/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/plugins/module_utils/network/vyos/argspec/lldp_interfaces/lldp_interfaces.py b/plugins/module_utils/network/vyos/argspec/lldp_interfaces/lldp_interfaces.py
new file mode 100644
index 0000000..2976fc0
--- /dev/null
+++ b/plugins/module_utils/network/vyos/argspec/lldp_interfaces/lldp_interfaces.py
@@ -0,0 +1,89 @@
+#
+# -*- coding: utf-8 -*-
+# Copyright 2019 Red Hat
+# GNU General Public License v3.0+
+# (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
+
+#############################################
+#                WARNING                    #
+#############################################
+#
+# This file is auto generated by the resource
+#   module builder playbook.
+#
+# Do not edit this file manually.
+#
+# Changes to this file will be over written
+#   by the resource module builder.
+#
+# Changes should be made in the model used to
+#   generate this file or in the resource module
+#   builder template.
+#
+#############################################
+"""
+The arg spec for the vyos_lldp_interfaces module
+"""
+
+from __future__ import absolute_import, division, print_function
+
+__metaclass__ = type
+
+
+class Lldp_interfacesArgs(object):  # pylint: disable=R0903
+    """The arg spec for the vyos_lldp_interfaces module
+    """
+
+    def __init__(self, **kwargs):
+        pass
+
+    argument_spec = {
+        "config": {
+            "elements": "dict",
+            "options": {
+                "enable": {"default": True, "type": "bool"},
+                "location": {
+                    "options": {
+                        "civic_based": {
+                            "options": {
+                                "ca_info": {
+                                    "elements": "dict",
+                                    "options": {
+                                        "ca_type": {"type": "int"},
+                                        "ca_value": {"type": "str"},
+                                    },
+                                    "type": "list",
+                                },
+                                "country_code": {
+                                    "required": True,
+                                    "type": "str",
+                                },
+                            },
+                            "type": "dict",
+                        },
+                        "coordinate_based": {
+                            "options": {
+                                "altitude": {"type": "int"},
+                                "datum": {
+                                    "choices": ["WGS84", "NAD83", "MLLW"],
+                                    "type": "str",
+                                },
+                                "latitude": {"required": True, "type": "str"},
+                                "longitude": {"required": True, "type": "str"},
+                            },
+                            "type": "dict",
+                        },
+                        "elin": {"type": "str"},
+                    },
+                    "type": "dict",
+                },
+                "name": {"required": True, "type": "str"},
+            },
+            "type": "list",
+        },
+        "state": {
+            "choices": ["merged", "replaced", "overridden", "deleted"],
+            "default": "merged",
+            "type": "str",
+        },
+    }  # pylint: disable=C0301
diff --git a/plugins/module_utils/network/vyos/config/lldp_interfaces/__init__.py b/plugins/module_utils/network/vyos/config/lldp_interfaces/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/plugins/module_utils/network/vyos/config/lldp_interfaces/lldp_interfaces.py b/plugins/module_utils/network/vyos/config/lldp_interfaces/lldp_interfaces.py
new file mode 100644
index 0000000..a22c27e
--- /dev/null
+++ b/plugins/module_utils/network/vyos/config/lldp_interfaces/lldp_interfaces.py
@@ -0,0 +1,422 @@
+#
+# -*- coding: utf-8 -*-
+# Copyright 2019 Red Hat
+# GNU General Public License v3.0+
+# (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
+"""
+The vyos_lldp_interfaces class
+It is in this file where the current configuration (as dict)
+is compared to the provided configuration (as dict) and the command set
+necessary to bring the current configuration to it's desired end-state is
+created
+"""
+
+from __future__ import absolute_import, division, print_function
+
+__metaclass__ = type
+
+
+from ansible.module_utils.network.common.cfg.base import ConfigBase
+from ansible_collections.vyos.vyos.plugins.module_utils.network.vyos.facts.facts import (
+    Facts,
+)
+from ansible.module_utils.network.common.utils import to_list, dict_diff
+from ansible.module_utils.six import iteritems
+from ansible.module_utils.network.vyos.utils.utils import (
+    search_obj_in_list,
+    search_dict_tv_in_list,
+    key_value_in_dict,
+    is_dict_element_present,
+)
+
+
+class Lldp_interfaces(ConfigBase):
+    """
+    The vyos_lldp_interfaces class
+    """
+
+    gather_subset = ["!all", "!min"]
+
+    gather_network_resources = ["lldp_interfaces"]
+
+    params = ["enable", "location", "name"]
+
+    def __init__(self, module):
+        super(Lldp_interfaces, self).__init__(module)
+
+    def get_lldp_interfaces_facts(self):
+        """ Get the 'facts' (the current configuration)
+
+        :rtype: A dictionary
+        :returns: The current configuration as a dictionary
+        """
+        facts, _warnings = Facts(self._module).get_facts(
+            self.gather_subset, self.gather_network_resources
+        )
+        lldp_interfaces_facts = facts["ansible_network_resources"].get(
+            "lldp_interfaces"
+        )
+        if not lldp_interfaces_facts:
+            return []
+        return lldp_interfaces_facts
+
+    def execute_module(self):
+        """ Execute the module
+
+        :rtype: A dictionary
+        :returns: The result from module execution
+        """
+        result = {"changed": False}
+        commands = list()
+        warnings = list()
+        existing_lldp_interfaces_facts = self.get_lldp_interfaces_facts()
+        commands.extend(self.set_config(existing_lldp_interfaces_facts))
+        if commands:
+            if self._module.check_mode:
+                resp = self._connection.edit_config(commands, commit=False)
+            else:
+                resp = self._connection.edit_config(commands)
+            result["changed"] = True
+
+        result["commands"] = commands
+
+        if self._module._diff:
+            result["diff"] = resp["diff"] if result["changed"] else None
+
+        changed_lldp_interfaces_facts = self.get_lldp_interfaces_facts()
+        result["before"] = existing_lldp_interfaces_facts
+        if result["changed"]:
+            result["after"] = changed_lldp_interfaces_facts
+
+        result["warnings"] = warnings
+        return result
+
+    def set_config(self, existing_lldp_interfaces_facts):
+        """ Collect the configuration from the args passed to the module,
+            collect the current configuration (as a dict from facts)
+
+        :rtype: A list
+        :returns: the commands necessary to migrate the current configuration
+                  to the desired configuration
+        """
+        want = self._module.params["config"]
+        have = existing_lldp_interfaces_facts
+        resp = self.set_state(want, have)
+        return to_list(resp)
+
+    def set_state(self, want, have):
+        """ Select the appropriate function based on the state provided
+
+        :param want: the desired configuration as a dictionary
+        :param have: the current configuration as a dictionary
+        :rtype: A list
+        :returns: the commands necessary to migrate the current configuration
+                  to the desired configuration
+        """
+        commands = []
+        state = self._module.params["state"]
+        if state == "overridden":
+            commands.extend(self._state_overridden(want=want, have=have))
+        elif state == "deleted":
+            if want:
+                for item in want:
+                    name = item["name"]
+                    have_item = search_obj_in_list(name, have)
+                    commands.extend(
+                        self._state_deleted(want=None, have=have_item)
+                    )
+            else:
+                for have_item in have:
+                    commands.extend(
+                        self._state_deleted(want=None, have=have_item)
+                    )
+        else:
+            for want_item in want:
+                name = want_item["name"]
+                have_item = search_obj_in_list(name, have)
+                if state == "merged":
+                    commands.extend(
+                        self._state_merged(want=want_item, have=have_item)
+                    )
+                else:
+                    commands.extend(
+                        self._state_replaced(want=want_item, have=have_item)
+                    )
+        return commands
+
+    def _state_replaced(self, want, have):
+        """ The command generator when state is replaced
+
+        :rtype: A list
+        :returns: the commands necessary to migrate the current configuration
+                  to the desired configuration
+        """
+        commands = []
+        if have:
+            commands.extend(self._state_deleted(want, have))
+        commands.extend(self._state_merged(want, have))
+        return commands
+
+    def _state_overridden(self, want, have):
+        """ The command generator when state is overridden
+
+        :rtype: A list
+        :returns: the commands necessary to migrate the current configuration
+                  to the desired configuration
+        """
+        commands = []
+        for have_item in have:
+            lldp_name = have_item["name"]
+            lldp_in_want = search_obj_in_list(lldp_name, want)
+            if not lldp_in_want:
+                commands.append(
+                    self._compute_command(have_item["name"], remove=True)
+                )
+
+        for want_item in want:
+            name = want_item["name"]
+            lldp_in_have = search_obj_in_list(name, have)
+            commands.extend(self._state_replaced(want_item, lldp_in_have))
+        return commands
+
+    def _state_merged(self, want, have):
+        """ The command generator when state is merged
+
+        :rtype: A list
+        :returns: the commands necessary to merge the provided into
+                  the current configuration
+        """
+        commands = []
+        if have:
+            commands.extend(self._render_updates(want, have))
+        else:
+            commands.extend(self._render_set_commands(want))
+        return commands
+
+    def _state_deleted(self, want, have):
+        """ The command generator when state is deleted
+
+        :rtype: A list
+        :returns: the commands necessary to remove the current configuration
+                  of the provided objects
+        """
+        commands = []
+        if want:
+            params = Lldp_interfaces.params
+            for attrib in params:
+                if attrib == "location":
+                    commands.extend(
+                        self._update_location(have["name"], want, have)
+                    )
+
+        elif have:
+            commands.append(self._compute_command(have["name"], remove=True))
+        return commands
+
+    def _render_updates(self, want, have):
+        commands = []
+        lldp_name = have["name"]
+        commands.extend(self._configure_status(lldp_name, want, have))
+        commands.extend(self._add_location(lldp_name, want, have))
+
+        return commands
+
+    def _render_set_commands(self, want):
+        commands = []
+        have = {}
+        lldp_name = want["name"]
+        params = Lldp_interfaces.params
+
+        commands.extend(self._add_location(lldp_name, want, have))
+        for attrib in params:
+            value = want[attrib]
+            if value:
+                if attrib == "location":
+                    commands.extend(self._add_location(lldp_name, want, have))
+                elif attrib == "enable":
+                    if not value:
+                        commands.append(
+                            self._compute_command(lldp_name, value="disable")
+                        )
+                else:
+                    commands.append(self._compute_command(lldp_name))
+
+        return commands
+
+    def _configure_status(self, name, want_item, have_item):
+        commands = []
+        if is_dict_element_present(have_item, "enable"):
+            temp_have_item = False
+        else:
+            temp_have_item = True
+        if want_item["enable"] != temp_have_item:
+            if want_item["enable"]:
+                commands.append(
+                    self._compute_command(name, value="disable", remove=True)
+                )
+            else:
+                commands.append(self._compute_command(name, value="disable"))
+        return commands
+
+    def _add_location(self, name, want_item, have_item):
+        commands = []
+        have_dict = {}
+        have_ca = {}
+        set_cmd = name + " location "
+        want_location_type = want_item.get("location") or {}
+        have_location_type = have_item.get("location") or {}
+
+        if want_location_type["coordinate_based"]:
+            want_dict = want_location_type.get("coordinate_based") or {}
+            if is_dict_element_present(have_location_type, "coordinate_based"):
+                have_dict = have_location_type.get("coordinate_based") or {}
+            location_type = "coordinate-based"
+            updates = dict_diff(have_dict, want_dict)
+            for key, value in iteritems(updates):
+                if value:
+                    commands.append(
+                        self._compute_command(
+                            set_cmd + location_type, key, str(value)
+                        )
+                    )
+
+        elif want_location_type["civic_based"]:
+            location_type = "civic-based"
+            want_dict = want_location_type.get("civic_based") or {}
+            want_ca = want_dict.get("ca_info") or []
+            if is_dict_element_present(have_location_type, "civic_based"):
+                have_dict = have_location_type.get("civic_based") or {}
+                have_ca = have_dict.get("ca_info") or []
+                if want_dict["country_code"] != have_dict["country_code"]:
+                    commands.append(
+                        self._compute_command(
+                            set_cmd + location_type,
+                            "country-code",
+                            str(want_dict["country_code"]),
+                        )
+                    )
+            else:
+                commands.append(
+                    self._compute_command(
+                        set_cmd + location_type,
+                        "country-code",
+                        str(want_dict["country_code"]),
+                    )
+                )
+            commands.extend(self._add_civic_address(name, want_ca, have_ca))
+
+        elif want_location_type["elin"]:
+            location_type = "elin"
+            if is_dict_element_present(have_location_type, "elin"):
+                if want_location_type.get("elin") != have_location_type.get(
+                    "elin"
+                ):
+                    commands.append(
+                        self._compute_command(
+                            set_cmd + location_type,
+                            value=str(want_location_type["elin"]),
+                        )
+                    )
+            else:
+                commands.append(
+                    self._compute_command(
+                        set_cmd + location_type,
+                        value=str(want_location_type["elin"]),
+                    )
+                )
+        return commands
+
+    def _update_location(self, name, want_item, have_item):
+        commands = []
+        del_cmd = name + " location"
+        want_location_type = want_item.get("location") or {}
+        have_location_type = have_item.get("location") or {}
+
+        if want_location_type["coordinate_based"]:
+            want_dict = want_location_type.get("coordinate_based") or {}
+            if is_dict_element_present(have_location_type, "coordinate_based"):
+                have_dict = have_location_type.get("coordinate_based") or {}
+                location_type = "coordinate-based"
+                for key, value in iteritems(have_dict):
+                    only_in_have = key_value_in_dict(key, value, want_dict)
+                    if not only_in_have:
+                        commands.append(
+                            self._compute_command(
+                                del_cmd + location_type, key, str(value), True
+                            )
+                        )
+            else:
+                commands.append(self._compute_command(del_cmd, remove=True))
+
+        elif want_location_type["civic_based"]:
+            want_dict = want_location_type.get("civic_based") or {}
+            want_ca = want_dict.get("ca_info") or []
+            if is_dict_element_present(have_location_type, "civic_based"):
+                have_dict = have_location_type.get("civic_based") or {}
+                have_ca = have_dict.get("ca_info")
+                commands.extend(
+                    self._update_civic_address(name, want_ca, have_ca)
+                )
+            else:
+                commands.append(self._compute_command(del_cmd, remove=True))
+
+        else:
+            if is_dict_element_present(have_location_type, "elin"):
+                if want_location_type.get("elin") != have_location_type.get(
+                    "elin"
+                ):
+                    commands.append(
+                        self._compute_command(del_cmd, remove=True)
+                    )
+            else:
+                commands.append(self._compute_command(del_cmd, remove=True))
+        return commands
+
+    def _add_civic_address(self, name, want, have):
+        commands = []
+        for item in want:
+            ca_type = item["ca_type"]
+            ca_value = item["ca_value"]
+            obj_in_have = search_dict_tv_in_list(
+                ca_type, ca_value, have, "ca_type", "ca_value"
+            )
+            if not obj_in_have:
+                commands.append(
+                    self._compute_command(
+                        key=name + " location civic-based ca-type",
+                        attrib=str(ca_type) + " ca-value",
+                        value=ca_value,
+                    )
+                )
+        return commands
+
+    def _update_civic_address(self, name, want, have):
+        commands = []
+        for item in have:
+            ca_type = item["ca_type"]
+            ca_value = item["ca_value"]
+            in_want = search_dict_tv_in_list(
+                ca_type, ca_value, want, "ca_type", "ca_value"
+            )
+            if not in_want:
+                commands.append(
+                    self._compute_command(
+                        name,
+                        "location civic-based ca-type",
+                        str(ca_type),
+                        remove=True,
+                    )
+                )
+        return commands
+
+    def _compute_command(self, key, attrib=None, value=None, remove=False):
+        if remove:
+            cmd = "delete service lldp interface "
+        else:
+            cmd = "set service lldp interface "
+        cmd += key
+        if attrib:
+            cmd += " " + attrib
+        if value:
+            cmd += " '" + value + "'"
+        return cmd
diff --git a/plugins/module_utils/network/vyos/facts/facts.py b/plugins/module_utils/network/vyos/facts/facts.py
index fb05f2a..d4aec70 100644
--- a/plugins/module_utils/network/vyos/facts/facts.py
+++ b/plugins/module_utils/network/vyos/facts/facts.py
@@ -1,80 +1,83 @@
 # Copyright 2019 Red Hat
 # GNU General Public License v3.0+
 # (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 """
 The facts class for vyos
 this file validates each subset of facts and selectively
 calls the appropriate facts gathering function
 """
 from __future__ import absolute_import, division, print_function
 
 __metaclass__ = type
 from ansible_collections.vyos.vyos.plugins.module_utils.network.vyos.argspec.facts.facts import (
     FactsArgs,
 )
 from ansible.module_utils.network.common.facts.facts import FactsBase
 from ansible_collections.vyos.vyos.plugins.module_utils.network.vyos.facts.interfaces.interfaces import (
     InterfacesFacts,
 )
 from ansible_collections.vyos.vyos.plugins.module_utils.network.vyos.facts.l3_interfaces.l3_interfaces import (
     L3_interfacesFacts,
 )
 from ansible_collections.vyos.vyos.plugins.module_utils.network.vyos.facts.lag_interfaces.lag_interfaces import (
     Lag_interfacesFacts,
 )
 from ansible_collections.vyos.vyos.plugins.module_utils.network.vyos.facts.lldp_global.lldp_global import (
     Lldp_globalFacts,
 )
+from ansible_collections.vyos.vyos.plugins.module_utils.network.vyos.facts.lldp_interfaces.lldp_interfaces import (
+    Lldp_interfacesFacts,
+)
 from ansible_collections.vyos.vyos.plugins.module_utils.network.vyos.facts.legacy.base import (
     Default,
     Neighbors,
     Config,
 )
 
 
 FACT_LEGACY_SUBSETS = dict(default=Default, neighbors=Neighbors, config=Config)
 FACT_RESOURCE_SUBSETS = dict(
     interfaces=InterfacesFacts,
     l3_interfaces=L3_interfacesFacts,
     lag_interfaces=Lag_interfacesFacts,
     lldp_global=Lldp_globalFacts,
+    lldp_interfaces=Lldp_interfacesFacts,
 )
 
 
 class Facts(FactsBase):
     """ The fact class for vyos
     """
 
     VALID_LEGACY_GATHER_SUBSETS = frozenset(FACT_LEGACY_SUBSETS.keys())
     VALID_RESOURCE_SUBSETS = frozenset(FACT_RESOURCE_SUBSETS.keys())
 
     def __init__(self, module):
         super(Facts, self).__init__(module)
 
     def get_facts(
         self, legacy_facts_type=None, resource_facts_type=None, data=None
     ):
         """ Collect the facts for vyos
-
         :param legacy_facts_type: List of legacy facts types
         :param resource_facts_type: List of resource fact types
         :param data: previously collected conf
         :rtype: dict
         :return: the facts gathered
         """
         netres_choices = FactsArgs.argument_spec[
             "gather_network_resources"
         ].get("choices", [])
         if self.VALID_RESOURCE_SUBSETS:
             self.get_network_resources_facts(
                 netres_choices,
                 FACT_RESOURCE_SUBSETS,
                 resource_facts_type,
                 data,
             )
         if self.VALID_LEGACY_GATHER_SUBSETS:
             self.get_network_legacy_facts(
                 FACT_LEGACY_SUBSETS, legacy_facts_type
             )
 
         return self.ansible_facts, self._warnings
diff --git a/plugins/module_utils/network/vyos/facts/lldp_interfaces/__init__.py b/plugins/module_utils/network/vyos/facts/lldp_interfaces/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/plugins/module_utils/network/vyos/facts/lldp_interfaces/lldp_interfaces.py b/plugins/module_utils/network/vyos/facts/lldp_interfaces/lldp_interfaces.py
new file mode 100644
index 0000000..72629ed
--- /dev/null
+++ b/plugins/module_utils/network/vyos/facts/lldp_interfaces/lldp_interfaces.py
@@ -0,0 +1,153 @@
+#
+# -*- coding: utf-8 -*-
+# Copyright 2019 Red Hat
+# GNU General Public License v3.0+
+# (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
+"""
+The vyos lldp_interfaces fact class
+It is in this file the configuration is collected from the device
+for a given resource, parsed, and the facts tree is populated
+based on the configuration.
+"""
+
+from __future__ import absolute_import, division, print_function
+
+__metaclass__ = type
+
+
+from re import findall, search, M
+from copy import deepcopy
+
+from ansible.module_utils.network.common import utils
+from ansible_collections.vyos.vyos.plugins.module_utils.network.vyos.argspec.lldp_interfaces.lldp_interfaces import (
+    Lldp_interfacesArgs,
+)
+
+
+class Lldp_interfacesFacts(object):
+    """ The vyos lldp_interfaces fact class
+    """
+
+    def __init__(self, module, subspec="config", options="options"):
+        self._module = module
+        self.argument_spec = Lldp_interfacesArgs.argument_spec
+        spec = deepcopy(self.argument_spec)
+        if subspec:
+            if options:
+                facts_argument_spec = spec[subspec][options]
+            else:
+                facts_argument_spec = spec[subspec]
+        else:
+            facts_argument_spec = spec
+
+        self.generated_spec = utils.generate_dict(facts_argument_spec)
+
+    def populate_facts(self, connection, ansible_facts, data=None):
+        """ Populate the facts for lldp_interfaces
+        :param connection: the device connection
+        :param ansible_facts: Facts dictionary
+        :param data: previously collected conf
+        :rtype: dictionary
+        :returns: facts
+        """
+        if not data:
+            data = connection.get_config()
+
+        objs = []
+        lldp_names = findall(r"^set service lldp interface (\S+)", data, M)
+        if lldp_names:
+            for lldp in set(lldp_names):
+                lldp_regex = r" %s .+$" % lldp
+                cfg = findall(lldp_regex, data, M)
+                obj = self.render_config(cfg)
+                obj["name"] = lldp.strip("'")
+                if obj:
+                    objs.append(obj)
+        facts = {}
+        if objs:
+            facts["lldp_interfaces"] = objs
+            ansible_facts["ansible_network_resources"].update(facts)
+
+        ansible_facts["ansible_network_resources"].update(facts)
+        return ansible_facts
+
+    def render_config(self, conf):
+        """
+        Render config as dictionary structure and delete keys
+          from spec for null values
+
+        :param spec: The facts tree, generated from the argspec
+        :param conf: The configuration
+        :rtype: dictionary
+        :returns: The generated config
+        """
+        config = {}
+        location = {}
+
+        civic_conf = "\n".join(filter(lambda x: ("civic-based" in x), conf))
+        elin_conf = "\n".join(filter(lambda x: ("elin" in x), conf))
+        coordinate_conf = "\n".join(
+            filter(lambda x: ("coordinate-based" in x), conf)
+        )
+        disable = "\n".join(filter(lambda x: ("disable" in x), conf))
+
+        coordinate_based_conf = self.parse_attribs(
+            ["altitude", "datum", "longitude", "latitude"], coordinate_conf
+        )
+        elin_based_conf = self.parse_lldp_elin_based(elin_conf)
+        civic_based_conf = self.parse_lldp_civic_based(civic_conf)
+        if disable:
+            config["enable"] = False
+        if coordinate_conf:
+            location["coordinate_based"] = coordinate_based_conf
+            config["location"] = location
+        elif civic_based_conf:
+            location["civic_based"] = civic_based_conf
+            config["location"] = location
+        elif elin_conf:
+            location["elin"] = elin_based_conf
+            config["location"] = location
+
+        return utils.remove_empties(config)
+
+    def parse_attribs(self, attribs, conf):
+        config = {}
+        for item in attribs:
+            value = utils.parse_conf_arg(conf, item)
+            if value:
+                value = value.strip("'")
+                if item == "altitude":
+                    value = int(value)
+                config[item] = value
+            else:
+                config[item] = None
+        return utils.remove_empties(config)
+
+    def parse_lldp_civic_based(self, conf):
+        civic_based = None
+        if conf:
+            civic_info_list = []
+            civic_add_list = findall(r"^.*civic-based ca-type (.+)", conf, M)
+            if civic_add_list:
+                for civic_add in civic_add_list:
+                    ca = civic_add.split(" ")
+                    c_add = {}
+                    c_add["ca_type"] = int(ca[0].strip("'"))
+                    c_add["ca_value"] = ca[2].strip("'")
+                    civic_info_list.append(c_add)
+
+                country_code = search(
+                    r"^.*civic-based country-code (.+)", conf, M
+                )
+                civic_based = {}
+                civic_based["ca_info"] = civic_info_list
+                civic_based["country_code"] = country_code.group(1).strip("'")
+        return civic_based
+
+    def parse_lldp_elin_based(self, conf):
+        elin_based = None
+        if conf:
+            e_num = search(r"^.* elin (.+)", conf, M)
+            elin_based = e_num.group(1).strip("'")
+
+        return elin_based
diff --git a/plugins/module_utils/network/vyos/utils/utils.py b/plugins/module_utils/network/vyos/utils/utils.py
index 1968ccc..6504bcd 100644
--- a/plugins/module_utils/network/vyos/utils/utils.py
+++ b/plugins/module_utils/network/vyos/utils/utils.py
@@ -1,128 +1,180 @@
 # -*- coding: utf-8 -*-
 # Copyright 2019 Red Hat
 # GNU General Public License v3.0+
 # (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 # utils
 from __future__ import absolute_import, division, print_function
 
 __metaclass__ = type
+from ansible.module_utils.six import iteritems
 
 
 def search_obj_in_list(name, lst, key="name"):
     for item in lst:
         if item[key] == name:
             return item
     return None
 
 
 def get_interface_type(interface):
     """Gets the type of interface
     """
     if interface.startswith("eth"):
         return "ethernet"
     elif interface.startswith("bond"):
         return "bonding"
     elif interface.startswith("vti"):
         return "vti"
     elif interface.startswith("lo"):
         return "loopback"
 
 
 def dict_delete(base, comparable):
     """
     This function generates a dict containing key, value pairs for keys
     that are present in the `base` dict but not present in the `comparable`
     dict.
 
     :param base: dict object to base the diff on
     :param comparable: dict object to compare against base
     :returns: new dict object with key, value pairs that needs to be deleted.
 
     """
     to_delete = dict()
 
     for key in base:
         if isinstance(base[key], dict):
             sub_diff = dict_delete(base[key], comparable.get(key, {}))
             if sub_diff:
                 to_delete[key] = sub_diff
         else:
             if key not in comparable:
                 to_delete[key] = base[key]
 
     return to_delete
 
 
 def diff_list_of_dicts(want, have):
     diff = []
 
     set_w = set(tuple(d.items()) for d in want)
     set_h = set(tuple(d.items()) for d in have)
     difference = set_w.difference(set_h)
 
     for element in difference:
         diff.append(dict((x, y) for x, y in element))
 
     return diff
 
 
 def get_lst_diff_for_dicts(want, have, lst):
     """
     This function generates a list containing values
     that are only in want and not in list in have dict
     :param want: dict object to want
     :param have: dict object to have
     :param lst: list the diff on
     :return: new list object with values which are only in want.
     """
     if not have:
         diff = want.get(lst) or []
 
     else:
         want_elements = want.get(lst) or {}
         have_elements = have.get(lst) or {}
         diff = list_diff_want_only(want_elements, have_elements)
     return diff
 
 
 def list_diff_have_only(want_list, have_list):
     """
     This function generated the list containing values
     that are only in have list.
     :param want_list:
     :param have_list:
     :return: new list with values which are only in have list
     """
     if have_list and not want_list:
         diff = have_list
     elif not have_list:
         diff = None
     else:
         diff = [
             i
             for i in have_list + want_list
             if i in have_list and i not in want_list
         ]
     return diff
 
 
 def list_diff_want_only(want_list, have_list):
     """
     This function generated the list containing values
     that are only in want list.
     :param want_list:
     :param have_list:
     :return: new list with values which are only in want list
     """
     if have_list and not want_list:
         diff = None
     elif not have_list:
         diff = want_list
     else:
         diff = [
             i
             for i in have_list + want_list
             if i in want_list and i not in have_list
         ]
     return diff
+
+
+def search_dict_tv_in_list(d_val1, d_val2, lst, key1, key2):
+    """
+    This function return the dict object if it exist in list.
+    :param d_val1:
+    :param d_val2:
+    :param lst:
+    :param key1:
+    :param key2:
+    :return:
+    """
+    obj = next(
+        (
+            item
+            for item in lst
+            if item[key1] == d_val1 and item[key2] == d_val2
+        ),
+        None,
+    )
+    if obj:
+        return obj
+    else:
+        return None
+
+
+def key_value_in_dict(have_key, have_value, want_dict):
+    """
+    This function checks whether the key and values exist in dict
+    :param have_key:
+    :param have_value:
+    :param want_dict:
+    :return:
+    """
+    for key, value in iteritems(want_dict):
+        if key == have_key and value == have_value:
+            return True
+    return False
+
+
+def is_dict_element_present(dict, key):
+    """
+    This function checks whether the key is present in dict.
+    :param dict:
+    :param key:
+    :return:
+    """
+    for item in dict:
+        if item == key:
+            return True
+    return False
diff --git a/plugins/modules/vyos_lldp_interface.py b/plugins/modules/_vyos_lldp_interface.py
similarity index 97%
copy from plugins/modules/vyos_lldp_interface.py
copy to plugins/modules/_vyos_lldp_interface.py
index 494fac4..6705d57 100644
--- a/plugins/modules/vyos_lldp_interface.py
+++ b/plugins/modules/_vyos_lldp_interface.py
@@ -1,250 +1,260 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
 
 # (c) 2017, Ansible by Red Hat, inc
 #
 # This file is part of Ansible by Red Hat
 #
 # Ansible is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
 # Ansible is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
 #
 
+
 ANSIBLE_METADATA = {
     "metadata_version": "1.1",
-    "status": ["preview"],
+    "status": ["deprecated"],
     "supported_by": "network",
 }
 
 
 DOCUMENTATION = """
 ---
 module: vyos_lldp_interface
 version_added: "2.4"
 author: "Ricardo Carrillo Cruz (@rcarrillocruz)"
 short_description: Manage LLDP interfaces configuration on VyOS network devices
 description:
   - This module provides declarative management of LLDP interfaces
     configuration on VyOS network devices.
+deprecated:
+  removed_in: '2.13'
+  alternative: vyos_lldp_interfaces
+  why: Updated modules released with more functionality.
 notes:
   - Tested against VYOS 1.1.7
 options:
   name:
     description:
       - Name of the interface LLDP should be configured on.
+    type: str
   aggregate:
     description: List of interfaces LLDP should be configured on.
+    type: list
   state:
     description:
       - State of the LLDP configuration.
     default: present
     choices: ['present', 'absent', 'enabled', 'disabled']
+    type: str
 extends_documentation_fragment: vyos
 """
 
 EXAMPLES = """
 - name: Enable LLDP on eth1
   net_lldp_interface:
     state: present
 
 - name: Enable LLDP on specific interfaces
   net_lldp_interface:
     interfaces:
       - eth1
       - eth2
     state: present
 
 - name: Disable LLDP globally
   net_lldp_interface:
     state: disabled
 
 - name: Create aggregate of LLDP interface configurations
   vyos_lldp_interface:
     aggregate:
     - name: eth1
     - name: eth2
     state: present
 
 - name: Delete aggregate of LLDP interface configurations
   vyos_lldp_interface:
     aggregate:
     - name: eth1
     - name: eth2
     state: absent
 """
 
 RETURN = """
 commands:
   description: The list of configuration mode commands to send to the device
   returned: always, except for the platforms that use Netconf transport to manage the device.
   type: list
   sample:
     - set service lldp eth1
     - set service lldp eth2 disable
 """
+
+
 from copy import deepcopy
 
 from ansible.module_utils.basic import AnsibleModule
 from ansible.module_utils.network.common.utils import remove_default_spec
 from ansible_collections.vyos.vyos.plugins.module_utils.network.vyos.vyos import (
     get_config,
     load_config,
 )
 from ansible_collections.vyos.vyos.plugins.module_utils.network.vyos.vyos import (
     vyos_argument_spec,
 )
 
 
 def search_obj_in_list(name, lst):
     for o in lst:
         if o["name"] == name:
             return o
 
     return None
 
 
 def map_obj_to_commands(updates, module):
     commands = list()
     want, have = updates
 
     for w in want:
         name = w["name"]
         state = w["state"]
 
         obj_in_have = search_obj_in_list(name, have)
 
         if state == "absent" and obj_in_have:
             commands.append("delete service lldp interface " + name)
         elif state in ("present", "enabled"):
             if not obj_in_have:
                 commands.append("set service lldp interface " + name)
             elif (
                 obj_in_have
                 and obj_in_have["state"] == "disabled"
                 and state == "enabled"
             ):
                 commands.append(
                     "delete service lldp interface " + name + " disable"
                 )
         elif state == "disabled":
             if not obj_in_have:
                 commands.append("set service lldp interface " + name)
                 commands.append(
                     "set service lldp interface " + name + " disable"
                 )
             elif obj_in_have and obj_in_have["state"] != "disabled":
                 commands.append(
                     "set service lldp interface " + name + " disable"
                 )
 
     return commands
 
 
 def map_config_to_obj(module):
     obj = []
     config = get_config(module).splitlines()
 
     output = [c for c in config if c.startswith("set service lldp interface")]
 
     for i in output:
         splitted_line = i.split()
 
         if len(splitted_line) > 5:
             new_obj = {"name": splitted_line[4]}
 
             if splitted_line[5] == "'disable'":
                 new_obj["state"] = "disabled"
         else:
             new_obj = {"name": splitted_line[4][1:-1]}
             new_obj["state"] = "present"
 
         obj.append(new_obj)
 
     return obj
 
 
 def map_params_to_obj(module):
     obj = []
 
     aggregate = module.params.get("aggregate")
     if aggregate:
         for item in aggregate:
             for key in item:
                 if item.get(key) is None:
                     item[key] = module.params[key]
 
             obj.append(item.copy())
     else:
         obj.append(
             {"name": module.params["name"], "state": module.params["state"]}
         )
 
     return obj
 
 
 def main():
     """ main entry point for module execution
     """
     element_spec = dict(
         name=dict(),
         state=dict(
             default="present",
             choices=["present", "absent", "enabled", "disabled"],
         ),
     )
 
     aggregate_spec = deepcopy(element_spec)
     aggregate_spec["name"] = dict(required=True)
 
     # remove default in aggregate spec, to handle common arguments
     remove_default_spec(aggregate_spec)
 
     argument_spec = dict(
         aggregate=dict(type="list", elements="dict", options=aggregate_spec)
     )
 
     argument_spec.update(element_spec)
     argument_spec.update(vyos_argument_spec)
 
     required_one_of = [["name", "aggregate"]]
     mutually_exclusive = [["name", "aggregate"]]
 
     module = AnsibleModule(
         argument_spec=argument_spec,
         required_one_of=required_one_of,
         mutually_exclusive=mutually_exclusive,
         supports_check_mode=True,
     )
 
     warnings = list()
 
     result = {"changed": False}
 
     if warnings:
         result["warnings"] = warnings
 
     want = map_params_to_obj(module)
     have = map_config_to_obj(module)
 
     commands = map_obj_to_commands((want, have), module)
     result["commands"] = commands
 
     if commands:
         commit = not module.check_mode
         load_config(module, commands, commit=commit)
         result["changed"] = True
 
     module.exit_json(**result)
 
 
 if __name__ == "__main__":
     main()
diff --git a/plugins/modules/vyos_banner.py b/plugins/modules/vyos_banner.py
index 39801b5..81a985d 100644
--- a/plugins/modules/vyos_banner.py
+++ b/plugins/modules/vyos_banner.py
@@ -1,196 +1,197 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
 
 # (c) 2017, Ansible by Red Hat, inc
 #
 # This file is part of Ansible by Red Hat
 #
 # Ansible is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
 # Ansible is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 ANSIBLE_METADATA = {
     "metadata_version": "1.1",
     "status": ["preview"],
     "supported_by": "network",
 }
 
 DOCUMENTATION = """
 ---
 module: vyos_banner
 version_added: "2.4"
 author: "Trishna Guha (@trishnaguha)"
 short_description: Manage multiline banners on VyOS devices
 description:
   - This will configure both pre-login and post-login banners on remote
     devices running VyOS. It allows playbooks to add or remote
     banner text from the active running configuration.
 notes:
-  - Tested against VYOS 1.1.7
+  - Tested against VyOS 1.1.8 (helium).
+  - This module works with connection C(network_cli). See L(the VyOS OS Platform Options,../network/user_guide/platform_vyos.html).
 options:
   banner:
     description:
       - Specifies which banner that should be
         configured on the remote device.
     required: true
     choices: ['pre-login', 'post-login']
   text:
     description:
       - The banner text that should be
         present in the remote device running configuration. This argument
         accepts a multiline string, with no empty lines. Requires I(state=present).
   state:
     description:
       - Specifies whether or not the configuration is present in the current
         devices active running configuration.
     default: present
     choices: ['present', 'absent']
 extends_documentation_fragment: vyos
 """
 
 EXAMPLES = """
 - name: configure the pre-login banner
   vyos_banner:
     banner: pre-login
     text: |
       this is my pre-login banner
       that contains a multiline
       string
     state: present
 - name: remove the post-login banner
   vyos_banner:
     banner: post-login
     state: absent
 """
 
 RETURN = """
 commands:
   description: The list of configuration mode commands to send to the device
   returned: always
   type: list
   sample:
     - banner pre-login
     - this is my pre-login banner
     - that contains a multiline
     - string
 """
 
 import re
 
 from ansible.module_utils.basic import AnsibleModule
 from ansible_collections.vyos.vyos.plugins.module_utils.network.vyos.vyos import (
     get_config,
     load_config,
 )
 from ansible_collections.vyos.vyos.plugins.module_utils.network.vyos.vyos import (
     vyos_argument_spec,
 )
 
 
 def spec_to_commands(updates, module):
     commands = list()
     want, have = updates
     state = module.params["state"]
 
     if state == "absent":
         if have.get("state") != "absent" or (
             have.get("state") != "absent"
             and "text" in have.keys()
             and have["text"]
         ):
             commands.append(
                 "delete system login banner %s" % module.params["banner"]
             )
 
     elif state == "present":
         if want["text"] and want["text"].encode().decode(
             "unicode_escape"
         ) != have.get("text"):
             banner_cmd = (
                 "set system login banner %s " % module.params["banner"]
             )
             banner_cmd += want["text"].strip()
             commands.append(banner_cmd)
 
     return commands
 
 
 def config_to_dict(module):
     data = get_config(module)
     output = None
     obj = {"banner": module.params["banner"], "state": "absent"}
 
     for line in data.split("\n"):
         if line.startswith("set system login banner %s" % obj["banner"]):
             match = re.findall(r"%s (.*)" % obj["banner"], line, re.M)
             output = match
     if output:
         obj["text"] = output[0].encode().decode("unicode_escape")
         obj["state"] = "present"
 
     return obj
 
 
 def map_params_to_obj(module):
     text = module.params["text"]
     if text:
         text = "%r" % (str(text).strip())
 
     return {
         "banner": module.params["banner"],
         "text": text,
         "state": module.params["state"],
     }
 
 
 def main():
     """ main entry point for module execution
     """
     argument_spec = dict(
         banner=dict(required=True, choices=["pre-login", "post-login"]),
         text=dict(),
         state=dict(default="present", choices=["present", "absent"]),
     )
 
     argument_spec.update(vyos_argument_spec)
 
     required_if = [("state", "present", ("text",))]
 
     module = AnsibleModule(
         argument_spec=argument_spec,
         required_if=required_if,
         supports_check_mode=True,
     )
 
     warnings = list()
 
     result = {"changed": False}
     if warnings:
         result["warnings"] = warnings
 
     want = map_params_to_obj(module)
     have = config_to_dict(module)
 
     commands = spec_to_commands((want, have), module)
     result["commands"] = commands
 
     if commands:
         commit = not module.check_mode
         load_config(module, commands, commit=commit)
         result["changed"] = True
 
     module.exit_json(**result)
 
 
 if __name__ == "__main__":
     main()
diff --git a/plugins/modules/vyos_command.py b/plugins/modules/vyos_command.py
index 892e853..6da7352 100644
--- a/plugins/modules/vyos_command.py
+++ b/plugins/modules/vyos_command.py
@@ -1,228 +1,229 @@
 #!/usr/bin/python
 #
 # This file is part of Ansible
 #
 # Ansible is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
 # Ansible is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 ANSIBLE_METADATA = {
     "metadata_version": "1.1",
     "status": ["preview"],
     "supported_by": "network",
 }
 
 
 DOCUMENTATION = """
 ---
 module: vyos_command
 version_added: "2.2"
 author: "Nathaniel Case (@Qalthos)"
 short_description: Run one or more commands on VyOS devices
 description:
   - The command module allows running one or more commands on remote
     devices running VyOS.  This module can also be introspected
     to validate key parameters before returning successfully.  If the
     conditional statements are not met in the wait period, the task
     fails.
   - Certain C(show) commands in VyOS produce many lines of output and
     use a custom pager that can cause this module to hang.  If the
     value of the environment variable C(ANSIBLE_VYOS_TERMINAL_LENGTH)
     is not set, the default number of 10000 is used.
 extends_documentation_fragment: vyos
 options:
   commands:
     description:
       - The ordered set of commands to execute on the remote device
         running VyOS.  The output from the command execution is
         returned to the playbook.  If the I(wait_for) argument is
         provided, the module is not returned until the condition is
         satisfied or the number of retries has been exceeded.
     required: true
   wait_for:
     description:
       - Specifies what to evaluate from the output of the command
         and what conditionals to apply.  This argument will cause
         the task to wait for a particular conditional to be true
         before moving forward.  If the conditional is not true
         by the configured I(retries), the task fails. See examples.
     aliases: ['waitfor']
   match:
     description:
       - The I(match) argument is used in conjunction with the
         I(wait_for) argument to specify the match policy. Valid
         values are C(all) or C(any).  If the value is set to C(all)
         then all conditionals in the wait_for must be satisfied.  If
         the value is set to C(any) then only one of the values must be
         satisfied.
     default: all
     choices: ['any', 'all']
   retries:
     description:
       - Specifies the number of retries a command should be tried
         before it is considered failed. The command is run on the
         target device every retry and evaluated against the I(wait_for)
         conditionals.
     default: 10
   interval:
     description:
       - Configures the interval in seconds to wait between I(retries)
         of the command. If the command does not pass the specified
         conditions, the interval indicates how long to wait before
         trying the command again.
     default: 1
 
 notes:
-  - Tested against VYOS 1.1.7
+  - Tested against VyOS 1.1.8 (helium).
   - Running C(show system boot-messages all) will cause the module to hang since
     VyOS is using a custom pager setting to display the output of that command.
   - If a command sent to the device requires answering a prompt, it is possible
     to pass a dict containing I(command), I(answer) and I(prompt). See examples.
+  - This module works with connection C(network_cli). See L(the VyOS OS Platform Options,../network/user_guide/platform_vyos.html).
 """
 
 EXAMPLES = """
 tasks:
   - name: show configuration on ethernet devices eth0 and eth1
     vyos_command:
       commands:
         - show interfaces ethernet {{ item }}
     with_items:
       - eth0
       - eth1
 
   - name: run multiple commands and check if version output contains specific version string
     vyos_command:
       commands:
         - show version
         - show hardware cpu
       wait_for:
         - "result[0] contains 'VyOS 1.1.7'"
 
   - name: run command that requires answering a prompt
     vyos_command:
       commands:
         - command: 'rollback 1'
           prompt: 'Proceed with reboot? [confirm][y]'
           answer: y
 """
 
 RETURN = """
 stdout:
   description: The set of responses from the commands
   returned: always apart from low level errors (such as action plugin)
   type: list
   sample: ['...', '...']
 stdout_lines:
   description: The value of stdout split into a list
   returned: always
   type: list
   sample: [['...', '...'], ['...'], ['...']]
 failed_conditions:
   description: The list of conditionals that have failed
   returned: failed
   type: list
   sample: ['...', '...']
 warnings:
   description: The list of warnings (if any) generated by module based on arguments
   returned: always
   type: list
   sample: ['...', '...']
 """
 import time
 
 from ansible.module_utils._text import to_text
 from ansible.module_utils.basic import AnsibleModule
 from ansible.module_utils.network.common.parsing import Conditional
 from ansible.module_utils.network.common.utils import (
     transform_commands,
     to_lines,
 )
 from ansible_collections.vyos.vyos.plugins.module_utils.network.vyos.vyos import (
     run_commands,
 )
 from ansible_collections.vyos.vyos.plugins.module_utils.network.vyos.vyos import (
     vyos_argument_spec,
 )
 
 
 def parse_commands(module, warnings):
     commands = transform_commands(module)
 
     if module.check_mode:
         for item in list(commands):
             if not item["command"].startswith("show"):
                 warnings.append(
                     "Only show commands are supported when using check mode, not "
                     "executing %s" % item["command"]
                 )
                 commands.remove(item)
 
     return commands
 
 
 def main():
     spec = dict(
         commands=dict(type="list", required=True),
         wait_for=dict(type="list", aliases=["waitfor"]),
         match=dict(default="all", choices=["all", "any"]),
         retries=dict(default=10, type="int"),
         interval=dict(default=1, type="int"),
     )
 
     spec.update(vyos_argument_spec)
 
     module = AnsibleModule(argument_spec=spec, supports_check_mode=True)
 
     warnings = list()
     result = {"changed": False, "warnings": warnings}
     commands = parse_commands(module, warnings)
     wait_for = module.params["wait_for"] or list()
 
     try:
         conditionals = [Conditional(c) for c in wait_for]
     except AttributeError as exc:
         module.fail_json(msg=to_text(exc))
 
     retries = module.params["retries"]
     interval = module.params["interval"]
     match = module.params["match"]
 
     for _ in range(retries):
         responses = run_commands(module, commands)
 
         for item in list(conditionals):
             if item(responses):
                 if match == "any":
                     conditionals = list()
                     break
                 conditionals.remove(item)
 
         if not conditionals:
             break
 
         time.sleep(interval)
 
     if conditionals:
         failed_conditions = [item.raw for item in conditionals]
         msg = "One or more conditional statements have not been satisfied"
         module.fail_json(msg=msg, failed_conditions=failed_conditions)
 
     result.update(
         {"stdout": responses, "stdout_lines": list(to_lines(responses))}
     )
 
     module.exit_json(**result)
 
 
 if __name__ == "__main__":
     main()
diff --git a/plugins/modules/vyos_config.py b/plugins/modules/vyos_config.py
index 9ffc654..7c9f3ab 100644
--- a/plugins/modules/vyos_config.py
+++ b/plugins/modules/vyos_config.py
@@ -1,352 +1,351 @@
 #!/usr/bin/python
 #
 # This file is part of Ansible
 #
 # Ansible is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
 # Ansible is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 ANSIBLE_METADATA = {
     "metadata_version": "1.1",
     "status": ["preview"],
     "supported_by": "network",
 }
 
 
 DOCUMENTATION = """
 ---
 module: vyos_config
 version_added: "2.2"
 author: "Nathaniel Case (@Qalthos)"
 short_description: Manage VyOS configuration on remote device
 description:
   - This module provides configuration file management of VyOS
     devices. It provides arguments for managing both the
     configuration file and state of the active configuration. All
     configuration statements are based on `set` and `delete` commands
     in the device configuration.
 extends_documentation_fragment: vyos
 notes:
-  - Tested against VYOS 1.1.7
-  - Abbreviated commands are NOT idempotent, see
-    L(Network FAQ,../network/user_guide/faq.html#why-do-the-config-modules-always-return-changed-true-with-abbreviated-commands).
+  - Tested against VyOS 1.1.8 (helium).
+  - This module works with connection C(network_cli). See L(the VyOS OS Platform Options,../network/user_guide/platform_vyos.html).
 options:
   lines:
     description:
       - The ordered set of configuration lines to be managed and
         compared with the existing configuration on the remote
         device.
   src:
     description:
       - The C(src) argument specifies the path to the source config
         file to load.  The source config file can either be in
         bracket format or set format.  The source file can include
         Jinja2 template variables.
   match:
     description:
       - The C(match) argument controls the method used to match
         against the current active configuration.  By default, the
         desired config is matched against the active config and the
         deltas are loaded.  If the C(match) argument is set to C(none)
         the active configuration is ignored and the configuration is
         always loaded.
     default: line
     choices: ['line', 'none']
   backup:
     description:
       - The C(backup) argument will backup the current devices active
         configuration to the Ansible control host prior to making any
         changes. If the C(backup_options) value is not given, the
         backup file will be located in the backup folder in the playbook
         root directory or role root directory, if playbook is part of an
         ansible role. If the directory does not exist, it is created.
     type: bool
     default: 'no'
   comment:
     description:
       - Allows a commit description to be specified to be included
         when the configuration is committed.  If the configuration is
         not changed or committed, this argument is ignored.
     default: 'configured by vyos_config'
   config:
     description:
       - The C(config) argument specifies the base configuration to use
         to compare against the desired configuration.  If this value
         is not specified, the module will automatically retrieve the
         current active configuration from the remote device.
   save:
     description:
       - The C(save) argument controls whether or not changes made
         to the active configuration are saved to disk.  This is
         independent of committing the config.  When set to True, the
         active configuration is saved.
     type: bool
     default: 'no'
   backup_options:
     description:
       - This is a dict object containing configurable options related to backup file path.
         The value of this option is read only when C(backup) is set to I(yes), if C(backup) is set
         to I(no) this option will be silently ignored.
     suboptions:
       filename:
         description:
           - The filename to be used to store the backup configuration. If the the filename
             is not given it will be generated based on the hostname, current time and date
             in format defined by <hostname>_config.<current-date>@<current-time>
       dir_path:
         description:
           - This option provides the path ending with directory name in which the backup
             configuration file will be stored. If the directory does not exist it will be first
             created and the filename is either the value of C(filename) or default filename
             as described in C(filename) options description. If the path value is not given
             in that case a I(backup) directory will be created in the current working directory
             and backup configuration will be copied in C(filename) within I(backup) directory.
         type: path
     type: dict
     version_added: "2.8"
 """
 
 EXAMPLES = """
 - name: configure the remote device
   vyos_config:
     lines:
       - set system host-name {{ inventory_hostname }}
       - set service lldp
       - delete service dhcp-server
 
 - name: backup and load from file
   vyos_config:
     src: vyos.cfg
     backup: yes
 
 - name: render a Jinja2 template onto the VyOS router
   vyos_config:
     src: vyos_template.j2
 
 - name: for idempotency, use full-form commands
   vyos_config:
     lines:
       # - set int eth eth2 description 'OUTSIDE'
       - set interface ethernet eth2 description 'OUTSIDE'
 
 - name: configurable backup path
   vyos_config:
     backup: yes
     backup_options:
       filename: backup.cfg
       dir_path: /home/user
 """
 
 RETURN = """
 commands:
   description: The list of configuration commands sent to the device
   returned: always
   type: list
   sample: ['...', '...']
 filtered:
   description: The list of configuration commands removed to avoid a load failure
   returned: always
   type: list
   sample: ['...', '...']
 backup_path:
   description: The full path to the backup file
   returned: when backup is yes
   type: str
   sample: /playbooks/ansible/backup/vyos_config.2016-07-16@22:28:34
 filename:
   description: The name of the backup file
   returned: when backup is yes and filename is not specified in backup options
   type: str
   sample: vyos_config.2016-07-16@22:28:34
 shortname:
   description: The full path to the backup file excluding the timestamp
   returned: when backup is yes and filename is not specified in backup options
   type: str
   sample: /playbooks/ansible/backup/vyos_config
 date:
   description: The date extracted from the backup file name
   returned: when backup is yes
   type: str
   sample: "2016-07-16"
 time:
   description: The time extracted from the backup file name
   returned: when backup is yes
   type: str
   sample: "22:28:34"
 """
 import re
 
 from ansible.module_utils._text import to_text
 from ansible.module_utils.basic import AnsibleModule
 from ansible.module_utils.connection import ConnectionError
 from ansible_collections.vyos.vyos.plugins.module_utils.network.vyos.vyos import (
     load_config,
     get_config,
     run_commands,
 )
 from ansible_collections.vyos.vyos.plugins.module_utils.network.vyos.vyos import (
     vyos_argument_spec,
     get_connection,
 )
 
 
 DEFAULT_COMMENT = "configured by vyos_config"
 
 CONFIG_FILTERS = [
     re.compile(r"set system login user \S+ authentication encrypted-password")
 ]
 
 
 def get_candidate(module):
     contents = module.params["src"] or module.params["lines"]
 
     if module.params["src"]:
         contents = format_commands(contents.splitlines())
 
     contents = "\n".join(contents)
     return contents
 
 
 def format_commands(commands):
     return [line for line in commands if len(line.strip()) > 0]
 
 
 def diff_config(commands, config):
     config = [str(c).replace("'", "") for c in config.splitlines()]
 
     updates = list()
     visited = set()
 
     for line in commands:
         item = str(line).replace("'", "")
 
         if not item.startswith("set") and not item.startswith("delete"):
             raise ValueError("line must start with either `set` or `delete`")
 
         elif item.startswith("set") and item not in config:
             updates.append(line)
 
         elif item.startswith("delete"):
             if not config:
                 updates.append(line)
             else:
                 item = re.sub(r"delete", "set", item)
                 for entry in config:
                     if entry.startswith(item) and line not in visited:
                         updates.append(line)
                         visited.add(line)
 
     return list(updates)
 
 
 def sanitize_config(config, result):
     result["filtered"] = list()
     index_to_filter = list()
     for regex in CONFIG_FILTERS:
         for index, line in enumerate(list(config)):
             if regex.search(line):
                 result["filtered"].append(line)
                 index_to_filter.append(index)
     # Delete all filtered configs
     for filter_index in sorted(index_to_filter, reverse=True):
         del config[filter_index]
 
 
 def run(module, result):
     # get the current active config from the node or passed in via
     # the config param
     config = module.params["config"] or get_config(module)
 
     # create the candidate config object from the arguments
     candidate = get_candidate(module)
 
     # create loadable config that includes only the configuration updates
     connection = get_connection(module)
     try:
         response = connection.get_diff(
             candidate=candidate,
             running=config,
             diff_match=module.params["match"],
         )
     except ConnectionError as exc:
         module.fail_json(msg=to_text(exc, errors="surrogate_then_replace"))
 
     commands = response.get("config_diff")
     sanitize_config(commands, result)
 
     result["commands"] = commands
 
     commit = not module.check_mode
     comment = module.params["comment"]
 
     diff = None
     if commands:
         diff = load_config(module, commands, commit=commit, comment=comment)
 
         if result.get("filtered"):
             result["warnings"].append(
                 "Some configuration commands were "
                 "removed, please see the filtered key"
             )
 
         result["changed"] = True
 
     if module._diff:
         result["diff"] = {"prepared": diff}
 
 
 def main():
     backup_spec = dict(filename=dict(), dir_path=dict(type="path"))
     argument_spec = dict(
         src=dict(type="path"),
         lines=dict(type="list"),
         match=dict(default="line", choices=["line", "none"]),
         comment=dict(default=DEFAULT_COMMENT),
         config=dict(),
         backup=dict(type="bool", default=False),
         backup_options=dict(type="dict", options=backup_spec),
         save=dict(type="bool", default=False),
     )
 
     argument_spec.update(vyos_argument_spec)
 
     mutually_exclusive = [("lines", "src")]
 
     module = AnsibleModule(
         argument_spec=argument_spec,
         mutually_exclusive=mutually_exclusive,
         supports_check_mode=True,
     )
 
     warnings = list()
 
     result = dict(changed=False, warnings=warnings)
 
     if module.params["backup"]:
         result["__backup__"] = get_config(module=module)
 
     if any((module.params["src"], module.params["lines"])):
         run(module, result)
 
     if module.params["save"]:
         diff = run_commands(module, commands=["configure", "compare saved"])[1]
         if diff != "[edit]":
             run_commands(module, commands=["save"])
             result["changed"] = True
         run_commands(module, commands=["exit"])
 
     module.exit_json(**result)
 
 
 if __name__ == "__main__":
     main()
diff --git a/plugins/modules/vyos_facts.py b/plugins/modules/vyos_facts.py
index 561b149..40010b1 100644
--- a/plugins/modules/vyos_facts.py
+++ b/plugins/modules/vyos_facts.py
@@ -1,180 +1,182 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
 # Copyright 2019 Red Hat
 # GNU General Public License v3.0+
 # (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 """
 The module file for vyos_facts
 """
 
 
 ANSIBLE_METADATA = {
     "metadata_version": "1.1",
     "status": [u"preview"],
     "supported_by": "network",
 }
 
 
 DOCUMENTATION = """
 ---
 module: vyos_facts
 version_added: 2.2
 short_description: Get facts about vyos devices.
 description:
   - Collects facts from network devices running the vyos operating
     system. This module places the facts gathered in the fact tree keyed by the
     respective resource name.  The facts module will always collect a
     base set of facts from the device and can enable or disable
     collection of additional facts.
 author:
   - Nathaniel Case (@qalthos)
   - Nilashish Chakraborty (@Nilashishc)
   - Rohit Thakur (@rohitthakur2590)
 extends_documentation_fragment: vyos
 notes:
-  - Tested against VyOS 1.1.8
+  - Tested against VyOS 1.1.8 (helium).
+  - This module works with connection C(network_cli). See L(the VyOS OS Platform Options,../network/user_guide/platform_vyos.html).
 options:
   gather_subset:
     description:
       - When supplied, this argument will restrict the facts collected
         to a given subset.  Possible values for this argument include
         all, default, config, and neighbors. Can specify a list of
         values to include a larger subset. Values can also be used
         with an initial C(M(!)) to specify that a specific subset should
         not be collected.
     required: false
     default: "!config"
   gather_network_resources:
     description:
       - When supplied, this argument will restrict the facts collected
         to a given subset. Possible values for this argument include
         all and the resources like interfaces.
         Can specify a list of values to include a larger subset. Values
         can also be used with an initial C(M(!)) to specify that a
         specific subset should not be collected.
     required: false
     version_added: "2.9"
-    choices: ['all', 'interfaces', '!interfaces', 'l3_interfaces', '!l3_interfaces', 'lag_interfaces', '!lag_interfaces', 'lldp_global', '!lldp_global']
+    choices: ['all', 'interfaces', '!interfaces', 'l3_interfaces', '!l3_interfaces','lag_interfaces', '!lag_interfaces',
+             'lldp_global', '!lldp_global','lldp_interfaces', '!lldp_interfaces']
 """
 
 EXAMPLES = """
 # Gather all facts
 - vyos_facts:
     gather_subset: all
     gather_network_resources: all
 
 # collect only the config and default facts
 - vyos_facts:
     gather_subset: config
 
 # collect everything exception the config
 - vyos_facts:
     gather_subset: "!config"
 
 # Collect only the interfaces facts
 - vyos_facts:
     gather_subset:
       - '!all'
       - '!min'
     gather_network_resources:
       - interfaces
 
 # Do not collect interfaces facts
 - vyos_facts:
     gather_network_resources:
       - "!interfaces"
 
 # Collect interfaces and minimal default facts
 - vyos_facts:
     gather_subset: min
     gather_network_resources: interfaces
 """
 
 RETURN = """
 ansible_net_config:
   description: The running-config from the device
   returned: when config is configured
   type: str
 ansible_net_commits:
   description: The set of available configuration revisions
   returned: when present
   type: list
 ansible_net_hostname:
   description: The configured system hostname
   returned: always
   type: str
 ansible_net_model:
   description: The device model string
   returned: always
   type: str
 ansible_net_serialnum:
   description: The serial number of the device
   returned: always
   type: str
 ansible_net_version:
   description: The version of the software running
   returned: always
   type: str
 ansible_net_neighbors:
   description: The set of LLDP neighbors
   returned: when interface is configured
   type: list
 ansible_net_gather_subset:
   description: The list of subsets gathered by the module
   returned: always
   type: list
 ansible_net_api:
   description: The name of the transport
   returned: always
   type: str
 ansible_net_python_version:
   description: The Python version Ansible controller is using
   returned: always
   type: str
 ansible_net_gather_network_resources:
   description: The list of fact resource subsets collected from the device
   returned: always
   type: list
 """
 
 from ansible.module_utils.basic import AnsibleModule
 from ansible_collections.vyos.vyos.plugins.module_utils.network.vyos.argspec.facts.facts import (
     FactsArgs,
 )
 from ansible_collections.vyos.vyos.plugins.module_utils.network.vyos.facts.facts import (
     Facts,
 )
 from ansible_collections.vyos.vyos.plugins.module_utils.network.vyos.vyos import (
     vyos_argument_spec,
 )
 
 
 def main():
     """
     Main entry point for module execution
 
     :returns: ansible_facts
     """
     argument_spec = FactsArgs.argument_spec
 
     argument_spec.update(vyos_argument_spec)
 
     module = AnsibleModule(
         argument_spec=argument_spec, supports_check_mode=True
     )
 
     warnings = [
         "default value for `gather_subset` "
         "will be changed to `min` from `!config` v2.11 onwards"
     ]
 
     result = Facts(module).get_facts()
 
     ansible_facts, additional_warnings = result
     warnings.extend(additional_warnings)
 
     module.exit_json(ansible_facts=ansible_facts, warnings=warnings)
 
 
 if __name__ == "__main__":
     main()
diff --git a/plugins/modules/vyos_interfaces.py b/plugins/modules/vyos_interfaces.py
index bc179ed..9ea0699 100644
--- a/plugins/modules/vyos_interfaces.py
+++ b/plugins/modules/vyos_interfaces.py
@@ -1,882 +1,885 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
 # Copyright 2019 Red Hat
 # GNU General Public License v3.0+
 # (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 #############################################
 #                WARNING                    #
 #############################################
 #
 # This file is auto generated by the resource
 #   module builder playbook.
 #
 # Do not edit this file manually.
 #
 # Changes to this file will be over written
 #   by the resource module builder.
 #
 # Changes should be made in the model used to
 #   generate this file or in the resource module
 #   builder template.
 #
 #############################################
 
 """
 The module file for vyos_interfaces
 """
 
 from __future__ import absolute_import, division, print_function
 
 __metaclass__ = type
 
 ANSIBLE_METADATA = {
     "metadata_version": "1.1",
     "status": ["preview"],
     "supported_by": "network",
 }
 
 DOCUMENTATION = """
 ---
 module: vyos_interfaces
 version_added: 2.9
 short_description: Manages interface attributes of VyOS network devices.
 description:
   - This module manages the interface attributes on VyOS network devices.
   - This module supports managing base attributes of Ethernet, Bonding,
     VXLAN, Loopback and Virtual Tunnel Interfaces.
+notes:
+  - Tested against VyOS 1.1.8 (helium).
+  - This module works with connection C(network_cli). See L(the VyOS OS Platform Options,../network/user_guide/platform_vyos.html).
 author: Nilashish Chakraborty (@nilashishc)
 options:
   config:
     description: The provided interfaces configuration.
     type: list
     suboptions:
       name:
         description:
         - Full name of the interface, e.g. eth0, eth1, bond0, vti1, vxlan2.
         type: str
         required: True
       description:
         description:
           - Interface description.
         type: str
       duplex:
         description:
           - Interface duplex mode.
           - Applicable for Ethernet interfaces only.
         choices: ['full', 'half', 'auto']
         type: str
       enabled:
         default: True
         description:
           - Administrative state of the interface.
           - Set the value to C(true) to administratively enable
             the interface or C(false) to disable it.
         type: bool
       mtu:
         description:
           - MTU for a specific interface. Refer to vendor documentation for valid values.
           - Applicable for Ethernet, Bonding, VXLAN and Virtual Tunnel interfaces.
         type: int
       speed:
         description:
           - Interface link speed.
           - Applicable for Ethernet interfaces only.
         type: str
         choices: ['auto', '10', '100', '1000', '2500', '10000']
       vifs:
         description:
           - Virtual sub-interfaces related configuration.
           - 802.1Q VLAN interfaces are represented as virtual sub-interfaces in VyOS.
         type: list
         suboptions:
           vlan_id:
             description:
               - Identifier for the virtual sub-interface.
             type: int
           description:
             description:
               - Virtual sub-interface description.
             type: str
           enabled:
             description:
               - Administrative state of the virtual sub-interface.
               - Set the value to C(true) to administratively enable
                 the interface or C(false) to disable it.
             type: bool
             default: True
           mtu:
             description:
               - MTU for the virtual sub-interface.
               - Refer to vendor documentation for valid values.
             type: int
   state:
     description:
       - The state the configuration should be left in.
     type: str
     choices:
     - merged
     - replaced
     - overridden
     - deleted
     default: merged
 """
 EXAMPLES = """
 # Using merged
 #
 # -------------
 # Before state:
 # -------------
 #
 # vyos@vyos:~$ show configuration commands | grep interfaces
 # set interfaces ethernet eth0 address 'dhcp'
 # set interfaces ethernet eth0 address 'dhcpv6'
 # set interfaces ethernet eth0 duplex 'auto'
 # set interfaces ethernet eth0 hw-id '08:00:27:30:f0:22'
 # set interfaces ethernet eth0 smp-affinity 'auto'
 # set interfaces ethernet eth0 speed 'auto'
 # set interfaces ethernet eth1 hw-id '08:00:27:ea:0f:b9'
 # set interfaces ethernet eth1 smp-affinity 'auto'
 # set interfaces ethernet eth2 hw-id '08:00:27:c2:98:23'
 # set interfaces ethernet eth2 smp-affinity 'auto'
 # set interfaces ethernet eth3 hw-id '08:00:27:43:70:8c'
 # set interfaces loopback lo
 
 - name: Merge provided configuration with device configuration
   vyos_interfaces:
     config:
       - name: eth2
         description: 'Configured by Ansible'
         enabled: True
         vifs:
           - vlan_id: 200
             description: "VIF 200 - ETH2"
 
       - name: eth3
         description: 'Configured by Ansible'
         mtu: 1500
 
       - name: bond1
         description: 'Bond - 1'
         mtu: 1200
 
       - name: vti2
         description: 'VTI - 2'
         enabled: false
     state: merged
 #
 #
 # -------------------------
 # Module Execution Result
 # -------------------------
 #
 # "before": [
 #      	{
 #            "enabled": true,
 #            "name": "lo"
 #      	},
 #       {
 #            "enabled": true,
 #            "name": "eth3"
 #        },
 #        {
 #            "enabled": true,
 #            "name": "eth2"
 #        },
 #        {
 #            "enabled": true,
 #            "name": "eth1"
 #        },
 #        {
 #            "duplex": "auto",
 #            "enabled": true,
 #            "name": "eth0",
 #            "speed": "auto"
 #        }
 #    ]
 #
 # "commands": [
 #        "set interfaces ethernet eth2 description 'Configured by Ansible'",
 #        "set interfaces ethernet eth2 vif 200",
 #        "set interfaces ethernet eth2 vif 200 description 'VIF 200 - ETH2'",
 #        "set interfaces ethernet eth3 description 'Configured by Ansible'",
 #        "set interfaces ethernet eth3 mtu '1500'",
 #        "set interfaces bonding bond1",
 #        "set interfaces bonding bond1 description 'Bond - 1'",
 #        "set interfaces bonding bond1 mtu '1200'",
 #        "set interfaces vti vti2",
 #        "set interfaces vti vti2 description 'VTI - 2'",
 #        "set interfaces vti vti2 disable"
 #    ]
 #
 # "after": [
 #        {
 #            "description": "Bond - 1",
 #            "enabled": true,
 #            "mtu": 1200,
 #            "name": "bond1"
 #        },
 #        {
 #            "enabled": true,
 #            "name": "lo"
 #        },
 #        {
 #            "description": "VTI - 2",
 #            "enabled": false,
 #            "name": "vti2"
 #        },
 #        {
 #            "description": "Configured by Ansible",
 #            "enabled": true,
 #            "mtu": 1500,
 #            "name": "eth3"
 #        },
 #        {
 #            "description": "Configured by Ansible",
 #            "enabled": true,
 #            "name": "eth2",
 #            "vifs": [
 #                {
 #                    "description": "VIF 200 - ETH2",
 #                    "enabled": true,
 #                    "vlan_id": "200"
 #                }
 #            ]
 #        },
 #        {
 #            "enabled": true,
 #            "name": "eth1"
 #        },
 #        {
 #            "duplex": "auto",
 #            "enabled": true,
 #            "name": "eth0",
 #            "speed": "auto"
 #        }
 #    ]
 #
 #
 # -------------
 # After state:
 # -------------
 #
 # vyos@vyos:~$ show configuration commands | grep interfaces
 # set interfaces bonding bond1 description 'Bond - 1'
 # set interfaces bonding bond1 mtu '1200'
 # set interfaces ethernet eth0 address 'dhcp'
 # set interfaces ethernet eth0 address 'dhcpv6'
 # set interfaces ethernet eth0 duplex 'auto'
 # set interfaces ethernet eth0 hw-id '08:00:27:30:f0:22'
 # set interfaces ethernet eth0 smp-affinity 'auto'
 # set interfaces ethernet eth0 speed 'auto'
 # set interfaces ethernet eth1 hw-id '08:00:27:ea:0f:b9'
 # set interfaces ethernet eth1 smp-affinity 'auto'
 # set interfaces ethernet eth2 description 'Configured by Ansible'
 # set interfaces ethernet eth2 hw-id '08:00:27:c2:98:23'
 # set interfaces ethernet eth2 smp-affinity 'auto'
 # set interfaces ethernet eth2 vif 200 description 'VIF 200 - ETH2'
 # set interfaces ethernet eth3 description 'Configured by Ansible'
 # set interfaces ethernet eth3 hw-id '08:00:27:43:70:8c'
 # set interfaces ethernet eth3 mtu '1500'
 # set interfaces loopback lo
 # set interfaces vti vti2 description 'VTI - 2'
 # set interfaces vti vti2 disable
 #
 
 
 # Using replaced
 #
 # -------------
 # Before state:
 # -------------
 #
 # vyos:~$ show configuration commands | grep eth
 # set interfaces bonding bond1 description 'Bond - 1'
 # set interfaces bonding bond1 mtu '1400'
 # set interfaces ethernet eth0 address 'dhcp'
 # set interfaces ethernet eth0 description 'Management Interface for the Appliance'
 # set interfaces ethernet eth0 duplex 'auto'
 # set interfaces ethernet eth0 hw-id '08:00:27:f3:6c:b5'
 # set interfaces ethernet eth0 smp_affinity 'auto'
 # set interfaces ethernet eth0 speed 'auto'
 # set interfaces ethernet eth1 description 'Configured by Ansible Eng Team'
 # set interfaces ethernet eth1 duplex 'full'
 # set interfaces ethernet eth1 hw-id '08:00:27:ad:ef:65'
 # set interfaces ethernet eth1 smp_affinity 'auto'
 # set interfaces ethernet eth1 speed '100'
 # set interfaces ethernet eth2 description 'Configured by Ansible'
 # set interfaces ethernet eth2 duplex 'full'
 # set interfaces ethernet eth2 hw-id '08:00:27:ab:4e:79'
 # set interfaces ethernet eth2 mtu '500'
 # set interfaces ethernet eth2 smp_affinity 'auto'
 # set interfaces ethernet eth2 speed '100'
 # set interfaces ethernet eth2 vif 200 description 'Configured by Ansible'
 # set interfaces ethernet eth3 description 'Configured by Ansible'
 # set interfaces ethernet eth3 duplex 'full'
 # set interfaces ethernet eth3 hw-id '08:00:27:17:3c:85'
 # set interfaces ethernet eth3 mtu '1500'
 # set interfaces ethernet eth3 smp_affinity 'auto'
 # set interfaces ethernet eth3 speed '100'
 # set interfaces loopback lo
 #
 #
 - name: Replace device configurations of listed interfaces with provided configurations
   vyos_interfaces:
     config:
       - name: eth2
         description: "Replaced by Ansible"
 
       - name: eth3
         description: "Replaced by Ansible"
 
       - name: eth1
         description: "Replaced by Ansible"
     state: replaced
 #
 #
 # -----------------------
 # Module Execution Result
 # -----------------------
 #
 # "before": [
 #        {
 #            "description": "Bond - 1",
 #            "enabled": true,
 #            "mtu": 1400,
 #            "name": "bond1"
 #        },
 #        {
 #            "enabled": true,
 #            "name": "lo"
 #        },
 #        {
 #            "description": "Configured by Ansible",
 #            "duplex": "full",
 #            "enabled": true,
 #            "mtu": 1500,
 #            "name": "eth3",
 #            "speed": "100"
 #        },
 #        {
 #            "description": "Configured by Ansible",
 #            "duplex": "full",
 #            "enabled": true,
 #            "mtu": 500,
 #            "name": "eth2",
 #            "speed": "100",
 #            "vifs": [
 #                {
 #                    "description": "VIF 200 - ETH2",
 #                    "enabled": true,
 #                    "vlan_id": "200"
 #                }
 #            ]
 #        },
 #        {
 #            "description": "Configured by Ansible Eng Team",
 #            "duplex": "full",
 #            "enabled": true,
 #            "name": "eth1",
 #            "speed": "100"
 #        },
 #        {
 #            "description": "Management Interface for the Appliance",
 #            "duplex": "auto",
 #            "enabled": true,
 #            "name": "eth0",
 #            "speed": "auto"
 #        }
 #    ]
 #
 # "commands": [
 #        "delete interfaces ethernet eth2 speed",
 #        "delete interfaces ethernet eth2 duplex",
 #        "delete interfaces ethernet eth2 mtu",
 #        "delete interfaces ethernet eth2 vif 200 description",
 #        "set interfaces ethernet eth2 description 'Replaced by Ansible'",
 #        "delete interfaces ethernet eth3 speed",
 #        "delete interfaces ethernet eth3 duplex",
 #        "delete interfaces ethernet eth3 mtu",
 #        "set interfaces ethernet eth3 description 'Replaced by Ansible'",
 #        "delete interfaces ethernet eth1 speed",
 #        "delete interfaces ethernet eth1 duplex",
 #        "set interfaces ethernet eth1 description 'Replaced by Ansible'"
 #    ]
 #
 # "after": [
 #        {
 #            "description": "Bond - 1",
 #            "enabled": true,
 #            "mtu": 1400,
 #            "name": "bond1"
 #        },
 #        {
 #            "enabled": true,
 #            "name": "lo"
 #        },
 #        {
 #            "description": "Replaced by Ansible",
 #            "enabled": true,
 #            "name": "eth3"
 #        },
 #        {
 #            "description": "Replaced by Ansible",
 #            "enabled": true,
 #            "name": "eth2",
 #            "vifs": [
 #                {
 #                    "enabled": true,
 #                    "vlan_id": "200"
 #                }
 #            ]
 #        },
 #        {
 #            "description": "Replaced by Ansible",
 #            "enabled": true,
 #            "name": "eth1"
 #        },
 #        {
 #            "description": "Management Interface for the Appliance",
 #            "duplex": "auto",
 #            "enabled": true,
 #            "name": "eth0",
 #            "speed": "auto"
 #        }
 #    ]
 #
 #
 # -------------
 # After state:
 # -------------
 #
 # vyos@vyos:~$ show configuration commands | grep interfaces
 # set interfaces bonding bond1 description 'Bond - 1'
 # set interfaces bonding bond1 mtu '1400'
 # set interfaces ethernet eth0 address 'dhcp'
 # set interfaces ethernet eth0 address 'dhcpv6'
 # set interfaces ethernet eth0 description 'Management Interface for the Appliance'
 # set interfaces ethernet eth0 duplex 'auto'
 # set interfaces ethernet eth0 hw-id '08:00:27:30:f0:22'
 # set interfaces ethernet eth0 smp-affinity 'auto'
 # set interfaces ethernet eth0 speed 'auto'
 # set interfaces ethernet eth1 description 'Replaced by Ansible'
 # set interfaces ethernet eth1 hw-id '08:00:27:ea:0f:b9'
 # set interfaces ethernet eth1 smp-affinity 'auto'
 # set interfaces ethernet eth2 description 'Replaced by Ansible'
 # set interfaces ethernet eth2 hw-id '08:00:27:c2:98:23'
 # set interfaces ethernet eth2 smp-affinity 'auto'
 # set interfaces ethernet eth2 vif 200
 # set interfaces ethernet eth3 description 'Replaced by Ansible'
 # set interfaces ethernet eth3 hw-id '08:00:27:43:70:8c'
 # set interfaces loopback lo
 #
 #
 # Using overridden
 #
 #
 # --------------
 # Before state
 # --------------
 #
 # vyos@vyos:~$ show configuration commands | grep interfaces
 # set interfaces ethernet eth0 address 'dhcp'
 # set interfaces ethernet eth0 address 'dhcpv6'
 # set interfaces ethernet eth0 description 'Ethernet Interface - 0'
 # set interfaces ethernet eth0 duplex 'auto'
 # set interfaces ethernet eth0 hw-id '08:00:27:30:f0:22'
 # set interfaces ethernet eth0 mtu '1200'
 # set interfaces ethernet eth0 smp-affinity 'auto'
 # set interfaces ethernet eth0 speed 'auto'
 # set interfaces ethernet eth1 description 'Configured by Ansible Eng Team'
 # set interfaces ethernet eth1 hw-id '08:00:27:ea:0f:b9'
 # set interfaces ethernet eth1 mtu '100'
 # set interfaces ethernet eth1 smp-affinity 'auto'
 # set interfaces ethernet eth1 vif 100 description 'VIF 100 - ETH1'
 # set interfaces ethernet eth1 vif 100 disable
 # set interfaces ethernet eth2 description 'Configured by Ansible Team (Admin Down)'
 # set interfaces ethernet eth2 disable
 # set interfaces ethernet eth2 hw-id '08:00:27:c2:98:23'
 # set interfaces ethernet eth2 mtu '600'
 # set interfaces ethernet eth2 smp-affinity 'auto'
 # set interfaces ethernet eth3 description 'Configured by Ansible Network'
 # set interfaces ethernet eth3 hw-id '08:00:27:43:70:8c'
 # set interfaces loopback lo
 # set interfaces vti vti1 description 'Virtual Tunnel Interface - 1'
 # set interfaces vti vti1 mtu '68'
 #
 #
 - name: Overrides all device configuration with provided configuration
   vyos_interfaces:
     config:
       - name: eth0
         description: Outbound Interface For The Appliance
         speed: auto
         duplex: auto
 
       - name: eth2
         speed: auto
         duplex: auto
 
       - name: eth3
         mtu: 1200
     state: overridden
 #
 #
 # ------------------------
 # Module Execution Result
 # ------------------------
 #
 # "before": [
 #        {
 #            "enabled": true,
 #            "name": "lo"
 #        },
 #        {
 #            "description": "Virtual Tunnel Interface - 1",
 #            "enabled": true,
 #            "mtu": 68,
 #            "name": "vti1"
 #        },
 #        {
 #            "description": "Configured by Ansible Network",
 #            "enabled": true,
 #            "name": "eth3"
 #        },
 #        {
 #            "description": "Configured by Ansible Team (Admin Down)",
 #            "enabled": false,
 #            "mtu": 600,
 #            "name": "eth2"
 #        },
 #        {
 #            "description": "Configured by Ansible Eng Team",
 #            "enabled": true,
 #            "mtu": 100,
 #            "name": "eth1",
 #            "vifs": [
 #                {
 #                    "description": "VIF 100 - ETH1",
 #                    "enabled": false,
 #                    "vlan_id": "100"
 #                }
 #            ]
 #        },
 #        {
 #            "description": "Ethernet Interface - 0",
 #            "duplex": "auto",
 #            "enabled": true,
 #            "mtu": 1200,
 #            "name": "eth0",
 #            "speed": "auto"
 #        }
 #    ]
 #
 # "commands": [
 #        "delete interfaces vti vti1 description",
 #        "delete interfaces vti vti1 mtu",
 #        "delete interfaces ethernet eth1 description",
 #        "delete interfaces ethernet eth1 mtu",
 #        "delete interfaces ethernet eth1 vif 100 description",
 #        "delete interfaces ethernet eth1 vif 100 disable",
 #        "delete interfaces ethernet eth0 mtu",
 #        "set interfaces ethernet eth0 description 'Outbound Interface For The Appliance'",
 #        "delete interfaces ethernet eth2 description",
 #        "delete interfaces ethernet eth2 mtu",
 #        "set interfaces ethernet eth2 duplex 'auto'",
 #        "delete interfaces ethernet eth2 disable",
 #        "set interfaces ethernet eth2 speed 'auto'",
 #        "delete interfaces ethernet eth3 description",
 #        "set interfaces ethernet eth3 mtu '1200'"
 #    ],
 #
 # "after": [
 #        {
 #            "enabled": true,
 #            "name": "lo"
 #        },
 #        {
 #            "enabled": true,
 #            "name": "vti1"
 #        },
 #        {
 #            "enabled": true,
 #            "mtu": 1200,
 #            "name": "eth3"
 #        },
 #        {
 #            "duplex": "auto",
 #            "enabled": true,
 #            "name": "eth2",
 #            "speed": "auto"
 #        },
 #        {
 #            "enabled": true,
 #            "name": "eth1",
 #            "vifs": [
 #                {
 #                    "enabled": true,
 #                    "vlan_id": "100"
 #                }
 #            ]
 #        },
 #        {
 #            "description": "Outbound Interface For The Appliance",
 #            "duplex": "auto",
 #            "enabled": true,
 #            "name": "eth0",
 #            "speed": "auto"
 #        }
 #    ]
 #
 #
 # ------------
 # After state
 # ------------
 #
 # vyos@vyos:~$ show configuration commands | grep interfaces
 # set interfaces ethernet eth0 address 'dhcp'
 # set interfaces ethernet eth0 address 'dhcpv6'
 # set interfaces ethernet eth0 description 'Outbound Interface For The Appliance'
 # set interfaces ethernet eth0 duplex 'auto'
 # set interfaces ethernet eth0 hw-id '08:00:27:30:f0:22'
 # set interfaces ethernet eth0 smp-affinity 'auto'
 # set interfaces ethernet eth0 speed 'auto'
 # set interfaces ethernet eth1 hw-id '08:00:27:ea:0f:b9'
 # set interfaces ethernet eth1 smp-affinity 'auto'
 # set interfaces ethernet eth1 vif 100
 # set interfaces ethernet eth2 duplex 'auto'
 # set interfaces ethernet eth2 hw-id '08:00:27:c2:98:23'
 # set interfaces ethernet eth2 smp-affinity 'auto'
 # set interfaces ethernet eth2 speed 'auto'
 # set interfaces ethernet eth3 hw-id '08:00:27:43:70:8c'
 # set interfaces ethernet eth3 mtu '1200'
 # set interfaces loopback lo
 # set interfaces vti vti1
 #
 #
 # Using deleted
 #
 #
 # -------------
 # Before state
 # -------------
 #
 # vyos@vyos:~$ show configuration commands | grep interfaces
 # set interfaces bonding bond0 mtu '1300'
 # set interfaces bonding bond1 description 'LAG - 1'
 # set interfaces ethernet eth0 address 'dhcp'
 # set interfaces ethernet eth0 address 'dhcpv6'
 # set interfaces ethernet eth0 description 'Outbound Interface for this appliance'
 # set interfaces ethernet eth0 duplex 'auto'
 # set interfaces ethernet eth0 hw-id '08:00:27:30:f0:22'
 # set interfaces ethernet eth0 smp-affinity 'auto'
 # set interfaces ethernet eth0 speed 'auto'
 # set interfaces ethernet eth1 description 'Configured by Ansible Network'
 # set interfaces ethernet eth1 duplex 'full'
 # set interfaces ethernet eth1 hw-id '08:00:27:ea:0f:b9'
 # set interfaces ethernet eth1 smp-affinity 'auto'
 # set interfaces ethernet eth1 speed '100'
 # set interfaces ethernet eth2 description 'Configured by Ansible'
 # set interfaces ethernet eth2 disable
 # set interfaces ethernet eth2 duplex 'full'
 # set interfaces ethernet eth2 hw-id '08:00:27:c2:98:23'
 # set interfaces ethernet eth2 mtu '600'
 # set interfaces ethernet eth2 smp-affinity 'auto'
 # set interfaces ethernet eth2 speed '100'
 # set interfaces ethernet eth3 description 'Configured by Ansible Network'
 # set interfaces ethernet eth3 duplex 'full'
 # set interfaces ethernet eth3 hw-id '08:00:27:43:70:8c'
 # set interfaces ethernet eth3 speed '100'
 # set interfaces loopback lo
 #
 #
 - name: Delete attributes of given interfaces (Note - This won't delete the interfaces themselves)
   vyos_interfaces:
     config:
       - name: bond1
 
       - name: eth1
 
       - name: eth2
 
       - name: eth3
     state: deleted
 #
 #
 # ------------------------
 # Module Execution Results
 # ------------------------
 #
 # "before": [
 #        {
 #            "enabled": true,
 #            "mtu": 1300,
 #            "name": "bond0"
 #        },
 #        {
 #            "description": "LAG - 1",
 #            "enabled": true,
 #            "name": "bond1"
 #        },
 #        {
 #            "enabled": true,
 #            "name": "lo"
 #        },
 #        {
 #            "description": "Configured by Ansible Network",
 #            "duplex": "full",
 #            "enabled": true,
 #            "name": "eth3",
 #            "speed": "100"
 #        },
 #        {
 #            "description": "Configured by Ansible",
 #            "duplex": "full",
 #            "enabled": false,
 #            "mtu": 600,
 #            "name": "eth2",
 #            "speed": "100"
 #        },
 #        {
 #            "description": "Configured by Ansible Network",
 #            "duplex": "full",
 #            "enabled": true,
 #            "name": "eth1",
 #            "speed": "100"
 #        },
 #        {
 #            "description": "Outbound Interface for this appliance",
 #            "duplex": "auto",
 #            "enabled": true,
 #            "name": "eth0",
 #            "speed": "auto"
 #        }
 #    ]
 #
 # "commands": [
 #        "delete interfaces bonding bond1 description",
 #        "delete interfaces ethernet eth1 speed",
 #        "delete interfaces ethernet eth1 duplex",
 #        "delete interfaces ethernet eth1 description",
 #        "delete interfaces ethernet eth2 speed",
 #        "delete interfaces ethernet eth2 disable",
 #        "delete interfaces ethernet eth2 duplex",
 #        "delete interfaces ethernet eth2 disable",
 #        "delete interfaces ethernet eth2 description",
 #        "delete interfaces ethernet eth2 disable",
 #        "delete interfaces ethernet eth2 mtu",
 #        "delete interfaces ethernet eth2 disable",
 #        "delete interfaces ethernet eth3 speed",
 #        "delete interfaces ethernet eth3 duplex",
 #        "delete interfaces ethernet eth3 description"
 #    ]
 #
 # "after": [
 #        {
 #            "enabled": true,
 #            "mtu": 1300,
 #            "name": "bond0"
 #        },
 #        {
 #            "enabled": true,
 #            "name": "bond1"
 #        },
 #        {
 #            "enabled": true,
 #            "name": "lo"
 #        },
 #        {
 #            "enabled": true,
 #            "name": "eth3"
 #        },
 #        {
 #            "enabled": true,
 #            "name": "eth2"
 #        },
 #        {
 #            "enabled": true,
 #            "name": "eth1"
 #        },
 #        {
 #            "description": "Outbound Interface for this appliance",
 #            "duplex": "auto",
 #            "enabled": true,
 #            "name": "eth0",
 #            "speed": "auto"
 #        }
 #    ]
 #
 #
 # ------------
 # After state
 # ------------
 #
 # vyos@vyos:~$ show configuration commands | grep interfaces
 # set interfaces bonding bond0 mtu '1300'
 # set interfaces bonding bond1
 # set interfaces ethernet eth0 address 'dhcp'
 # set interfaces ethernet eth0 address 'dhcpv6'
 # set interfaces ethernet eth0 description 'Outbound Interface for this appliance'
 # set interfaces ethernet eth0 duplex 'auto'
 # set interfaces ethernet eth0 hw-id '08:00:27:30:f0:22'
 # set interfaces ethernet eth0 smp-affinity 'auto'
 # set interfaces ethernet eth0 speed 'auto'
 # set interfaces ethernet eth1 hw-id '08:00:27:ea:0f:b9'
 # set interfaces ethernet eth1 smp-affinity 'auto'
 # set interfaces ethernet eth2 hw-id '08:00:27:c2:98:23'
 # set interfaces ethernet eth2 smp-affinity 'auto'
 # set interfaces ethernet eth3 hw-id '08:00:27:43:70:8c'
 # set interfaces loopback lo
 #
 #
 """
 RETURN = """
 before:
   description: The configuration prior to the model invocation.
   returned: always
   sample: >
     The configuration returned will always be in the same format
      of the parameters above.
   type: list
 after:
   description: The resulting configuration model invocation.
   returned: when changed
   sample: >
     The configuration returned will always be in the same format
      of the parameters above.
   type: list
 commands:
   description: The set of commands pushed to the remote device.
   returned: always
   type: list
   sample:
     - 'set interfaces ethernet eth1 mtu 1200'
     - 'set interfaces ethernet eth2 vif 100 description VIF 100'
 """
 
 
 from ansible.module_utils.basic import AnsibleModule
 from ansible_collections.vyos.vyos.plugins.module_utils.network.vyos.argspec.interfaces.interfaces import (
     InterfacesArgs,
 )
 from ansible_collections.vyos.vyos.plugins.module_utils.network.vyos.config.interfaces.interfaces import (
     Interfaces,
 )
 
 
 def main():
     """
     Main entry point for module execution
 
     :returns: the result form module invocation
     """
     module = AnsibleModule(
         argument_spec=InterfacesArgs.argument_spec, supports_check_mode=True
     )
 
     result = Interfaces(module).execute_module()
     module.exit_json(**result)
 
 
 if __name__ == "__main__":
     main()
diff --git a/plugins/modules/vyos_l3_interfaces.py b/plugins/modules/vyos_l3_interfaces.py
index 25a57d3..e79d5d5 100644
--- a/plugins/modules/vyos_l3_interfaces.py
+++ b/plugins/modules/vyos_l3_interfaces.py
@@ -1,378 +1,381 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
 # Copyright 2019 Red Hat
 # GNU General Public License v3.0+
 # (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 #############################################
 #                WARNING                    #
 #############################################
 #
 # This file is auto generated by the resource
 #   module builder playbook.
 #
 # Do not edit this file manually.
 #
 # Changes to this file will be over written
 #   by the resource module builder.
 #
 # Changes should be made in the model used to
 #   generate this file or in the resource module
 #   builder template.
 #
 #############################################
 
 """
 The module file for vyos_l3_interfaces
 """
 
 from __future__ import absolute_import, division, print_function
 
 __metaclass__ = type
 
 ANSIBLE_METADATA = {
     "metadata_version": "1.1",
     "status": ["preview"],
     "supported_by": "network",
 }
 
 DOCUMENTATION = """
 ---
 module: vyos_l3_interfaces
 version_added: 2.9
 short_description: Manages L3 interface attributes of VyOS network devices.
 description: This module manages the L3 interface attributes on VyOS network devices.
+notes:
+  - Tested against VyOS 1.1.8 (helium).
+  - This module works with connection C(network_cli). See L(the VyOS OS Platform Options,../network/user_guide/platform_vyos.html).
 author: Nilashish Chakraborty (@NilashishC)
 options:
   config:
     description: The provided L3 interfaces configuration.
     type: list
     elements: dict
     suboptions:
       name:
         description:
           - Full name of the interface, e.g. eth0, eth1.
         type: str
         required: True
       ipv4:
         description:
           - List of IPv4 addresses of the interface.
         type: list
         elements: dict
         suboptions:
           address:
             description:
               - IPv4 address of the interface.
             type: str
       ipv6:
         description:
           - List of IPv6 addresses of the interface.
         type: list
         elements: dict
         suboptions:
           address:
             description:
               - IPv6 address of the interface.
             type: str
       vifs:
         description:
           - Virtual sub-interfaces L3 configurations.
         elements: dict
         type: list
         suboptions:
           vlan_id:
             description:
               - Identifier for the virtual sub-interface.
             type: int
           ipv4:
             description:
               - List of IPv4 addresses of the virtual interface.
             type: list
             elements: dict
             suboptions:
               address:
                 description:
                   - IPv4 address of the virtual interface.
                 type: str
           ipv6:
             description:
               - List of IPv6 addresses of the virual interface.
             type: list
             elements: dict
             suboptions:
               address:
                 description:
                   - IPv6 address of the virtual interface.
                 type: str
   state:
     description:
       - The state the configuration should be left in.
     type: str
     choices:
     - merged
     - replaced
     - overridden
     - deleted
     default: merged
 
 """
 EXAMPLES = """
 # Using merged
 #
 # Before state:
 # -------------
 #
 # vyos:~$ show configuration commands | grep -e eth[2,3]
 # set interfaces ethernet eth2 hw-id '08:00:27:c2:98:23'
 # set interfaces ethernet eth3 hw-id '08:00:27:43:70:8c'
 # set interfaces ethernet eth3 vif 101
 # set interfaces ethernet eth3 vif 102
 
 - name: Merge provided configuration with device configuration
   vyos_l3_interfaces:
     config:
       - name: eth2
         ipv4:
           - address: 192.0.2.10/28
           - address: 198.51.100.40/27
         ipv6:
           - address: 2001:db8:100::2/32
           - address: 2001:db8:400::10/32
 
       - name: eth3
         ipv4:
           - address: 203.0.113.65/26
         vifs:
           - vlan_id: 101
             ipv4:
               - address: 192.0.2.71/28
               - address: 198.51.100.131/25
           - vlan_id: 102
             ipv6:
               - address: 2001:db8:1000::5/38
               - address: 2001:db8:1400::3/38
     state: merged
 
 # After state:
 # -------------
 #
 # vyos:~$ show configuration commands | grep -e eth[2,3]
 # set interfaces ethernet eth2 address '192.0.2.10/28'
 # set interfaces ethernet eth2 address '198.51.100.40/27'
 # set interfaces ethernet eth2 address '2001:db8:100::2/32'
 # set interfaces ethernet eth2 address '2001:db8:400::10/32'
 # set interfaces ethernet eth2 hw-id '08:00:27:c2:98:23'
 # set interfaces ethernet eth3 address '203.0.113.65/26'
 # set interfaces ethernet eth3 hw-id '08:00:27:43:70:8c'
 # set interfaces ethernet eth3 vif 101 address '192.0.2.71/28'
 # set interfaces ethernet eth3 vif 101 address '198.51.100.131/25'
 # set interfaces ethernet eth3 vif 102 address '2001:db8:1000::5/38'
 # set interfaces ethernet eth3 vif 102 address '2001:db8:1400::3/38'
 # set interfaces ethernet eth3 vif 102 address '2001:db8:4000::2/34'
 
 
 # Using replaced
 #
 # Before state:
 # -------------
 #
 # vyos:~$ show configuration commands | grep eth
 # set interfaces ethernet eth0 address 'dhcp'
 # set interfaces ethernet eth0 duplex 'auto'
 # set interfaces ethernet eth0 hw-id '08:00:27:30:f0:22'
 # set interfaces ethernet eth0 smp-affinity 'auto'
 # set interfaces ethernet eth0 speed 'auto'
 # set interfaces ethernet eth1 hw-id '08:00:27:EA:0F:B9'
 # set interfaces ethernet eth1 address '192.0.2.14/24'
 # set interfaces ethernet eth2 address '192.0.2.10/24'
 # set interfaces ethernet eth2 address '192.0.2.11/24'
 # set interfaces ethernet eth2 address '2001:db8::10/32'
 # set interfaces ethernet eth2 address '2001:db8::11/32'
 # set interfaces ethernet eth2 hw-id '08:00:27:c2:98:23'
 # set interfaces ethernet eth3 address '198.51.100.10/24'
 # set interfaces ethernet eth3 hw-id '08:00:27:43:70:8c'
 # set interfaces ethernet eth3 vif 101 address '198.51.100.130/25'
 # set interfaces ethernet eth3 vif 101 address '198.51.100.131/25'
 # set interfaces ethernet eth3 vif 102 address '2001:db8:4000::3/34'
 # set interfaces ethernet eth3 vif 102 address '2001:db8:4000::2/34'
 #
 - name: Replace device configurations of listed interfaces with provided configurations
   vyos_l3_interfaces:
     config:
       - name: eth2
         ipv4:
           - address: 192.0.2.10/24
 
       - name: eth3
         ipv6:
           - address: 2001:db8::11/32
     state: replaced
 
 # After state:
 # -------------
 #
 # vyos:~$ show configuration commands | grep eth
 # set interfaces ethernet eth0 address 'dhcp'
 # set interfaces ethernet eth0 duplex 'auto'
 # set interfaces ethernet eth0 hw-id '08:00:27:30:f0:22'
 # set interfaces ethernet eth0 smp-affinity 'auto'
 # set interfaces ethernet eth0 speed 'auto'
 # set interfaces ethernet eth1 hw-id '08:00:27:EA:0F:B9'
 # set interfaces ethernet eth1 address '192.0.2.14/24'
 # set interfaces ethernet eth2 address '192.0.2.10/24'
 # set interfaces ethernet eth2 hw-id '08:00:27:c2:98:23'
 # set interfaces ethernet eth3 hw-id '08:00:27:43:70:8c'
 # set interfaces ethernet eth3 address '2001:db8::11/32'
 # set interfaces ethernet eth3 vif 101
 # set interfaces ethernet eth3 vif 102
 
 
 # Using overridden
 #
 # Before state
 # --------------
 #
 # vyos@vyos-appliance:~$ show configuration commands | grep eth
 # set interfaces ethernet eth0 address 'dhcp'
 # set interfaces ethernet eth0 duplex 'auto'
 # set interfaces ethernet eth0 hw-id '08:00:27:30:f0:22'
 # set interfaces ethernet eth0 smp-affinity 'auto'
 # set interfaces ethernet eth0 speed 'auto'
 # set interfaces ethernet eth1 hw-id '08:00:27:EA:0F:B9'
 # set interfaces ethernet eth1 address '192.0.2.14/24'
 # set interfaces ethernet eth2 address '192.0.2.10/24'
 # set interfaces ethernet eth2 address '192.0.2.11/24'
 # set interfaces ethernet eth2 address '2001:db8::10/32'
 # set interfaces ethernet eth2 address '2001:db8::11/32'
 # set interfaces ethernet eth2 hw-id '08:00:27:c2:98:23'
 # set interfaces ethernet eth3 address '198.51.100.10/24'
 # set interfaces ethernet eth3 hw-id '08:00:27:43:70:8c'
 # set interfaces ethernet eth3 vif 101 address '198.51.100.130/25'
 # set interfaces ethernet eth3 vif 101 address '198.51.100.131/25'
 # set interfaces ethernet eth3 vif 102 address '2001:db8:4000::3/34'
 # set interfaces ethernet eth3 vif 102 address '2001:db8:4000::2/34'
 
 - name: Overrides all device configuration with provided configuration
   vyos_l3_interfaces:
     config:
       - name: eth0
         ipv4:
           - address: dhcp
         ipv6:
           - address: dhcpv6
     state: overridden
 
 # After state
 # ------------
 #
 # vyos@vyos-appliance:~$ show configuration commands | grep eth
 # set interfaces ethernet eth0 address 'dhcp'
 # set interfaces ethernet eth0 address 'dhcpv6'
 # set interfaces ethernet eth0 duplex 'auto'
 # set interfaces ethernet eth0 hw-id '08:00:27:30:f0:22'
 # set interfaces ethernet eth0 smp-affinity 'auto'
 # set interfaces ethernet eth0 speed 'auto'
 # set interfaces ethernet eth1 hw-id '08:00:27:EA:0F:B9'
 # set interfaces ethernet eth2 hw-id '08:00:27:c2:98:23'
 # set interfaces ethernet eth3 hw-id '08:00:27:43:70:8c'
 # set interfaces ethernet eth3 vif 101
 # set interfaces ethernet eth3 vif 102
 
 
 # Using deleted
 #
 # Before state
 # -------------
 # vyos@vyos-appliance:~$ show configuration commands | grep eth
 # set interfaces ethernet eth0 address 'dhcp'
 # set interfaces ethernet eth0 duplex 'auto'
 # set interfaces ethernet eth0 hw-id '08:00:27:30:f0:22'
 # set interfaces ethernet eth0 smp-affinity 'auto'
 # set interfaces ethernet eth0 speed 'auto'
 # set interfaces ethernet eth1 hw-id '08:00:27:EA:0F:B9'
 # set interfaces ethernet eth1 address '192.0.2.14/24'
 # set interfaces ethernet eth2 address '192.0.2.10/24'
 # set interfaces ethernet eth2 address '192.0.2.11/24'
 # set interfaces ethernet eth2 address '2001:db8::10/32'
 # set interfaces ethernet eth2 address '2001:db8::11/32'
 # set interfaces ethernet eth2 hw-id '08:00:27:c2:98:23'
 # set interfaces ethernet eth3 address '198.51.100.10/24'
 # set interfaces ethernet eth3 hw-id '08:00:27:43:70:8c'
 # set interfaces ethernet eth3 vif 101 address '198.51.100.130/25'
 # set interfaces ethernet eth3 vif 101 address '198.51.100.131/25'
 # set interfaces ethernet eth3 vif 102 address '2001:db8:4000::3/34'
 # set interfaces ethernet eth3 vif 102 address '2001:db8:4000::2/34'
 
 - name: Delete L3 attributes of given interfaces (Note - This won't delete the interface itself)
   vyos_l3_interfaces:
     config:
       - name: eth1
       - name: eth2
       - name: eth3
     state: deleted
 
 # After state
 # ------------
 # vyos@vyos-appliance:~$ show configuration commands | grep eth
 # set interfaces ethernet eth0 address 'dhcp'
 # set interfaces ethernet eth0 duplex 'auto'
 # set interfaces ethernet eth0 hw-id '08:00:27:f3:6c:b5'
 # set interfaces ethernet eth0 smp_affinity 'auto'
 # set interfaces ethernet eth0 speed 'auto'
 # set interfaces ethernet eth1 hw-id '08:00:27:ad:ef:65'
 # set interfaces ethernet eth1 smp_affinity 'auto'
 # set interfaces ethernet eth2 hw-id '08:00:27:ab:4e:79'
 # set interfaces ethernet eth2 smp_affinity 'auto'
 # set interfaces ethernet eth3 hw-id '08:00:27:17:3c:85'
 # set interfaces ethernet eth3 smp_affinity 'auto'
 
 
 """
 RETURN = """
 before:
   description: The configuration prior to the model invocation.
   returned: always
   type: list
   sample: >
     The configuration returned will always be in the same format
      of the parameters above.
 after:
   description: The resulting configuration model invocation.
   returned: when changed
   type: list
   sample: >
     The configuration returned will always be in the same format
      of the parameters above.
 commands:
   description: The set of commands pushed to the remote device.
   returned: always
   type: list
   sample: ['set interfaces ethernet eth1 192.0.2.14/2', 'set interfaces ethernet eth3 vif 101 address 198.51.100.130/25']
 """
 
 
 from ansible.module_utils.basic import AnsibleModule
 from ansible_collections.vyos.vyos.plugins.module_utils.network.vyos.argspec.l3_interfaces.l3_interfaces import (
     L3_interfacesArgs,
 )
 from ansible_collections.vyos.vyos.plugins.module_utils.network.vyos.config.l3_interfaces.l3_interfaces import (
     L3_interfaces,
 )
 
 
 def main():
     """
     Main entry point for module execution
 
     :returns: the result form module invocation
     """
     module = AnsibleModule(
         argument_spec=L3_interfacesArgs.argument_spec, supports_check_mode=True
     )
 
     result = L3_interfaces(module).execute_module()
     module.exit_json(**result)
 
 
 if __name__ == "__main__":
     main()
diff --git a/plugins/modules/vyos_lag_interfaces.py b/plugins/modules/vyos_lag_interfaces.py
index 9707f2e..d9b007a 100644
--- a/plugins/modules/vyos_lag_interfaces.py
+++ b/plugins/modules/vyos_lag_interfaces.py
@@ -1,570 +1,570 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
 # Copyright 2019 Red Hat
 # GNU General Public License v3.0+
 # (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 #############################################
 #                WARNING                    #
 #############################################
 #
 # This file is auto generated by the resource
 #   module builder playbook.
 #
 # Do not edit this file manually.
 #
 # Changes to this file will be over written
 #   by the resource module builder.
 #
 # Changes should be made in the model used to
 #   generate this file or in the resource module
 #   builder template.
 #
 #############################################
 
 """
 The module file for vyos_lag_interfaces
 """
 
 from __future__ import absolute_import, division, print_function
 
 __metaclass__ = type
 
 ANSIBLE_METADATA = {
     "metadata_version": "1.1",
     "status": ["preview"],
     "supported_by": "network",
 }
 
 DOCUMENTATION = """
 ---
 module: vyos_lag_interfaces
 version_added: 2.9
 short_description: Manages attributes of link aggregation groups on VyOS network devices.
 description: This module manages attributes of link aggregation groups on VyOS network devices.
 notes:
   - Tested against VyOS 1.1.8 (helium).
-  - This module works with connection C(network_cli).
+  - This module works with connection C(network_cli). See L(the VyOS OS Platform Options,../network/user_guide/platform_vyos.html).
 author: Rohit Thakur (@rohitthakur2590)
 options:
   config:
     description: A list of link aggregation group configurations.
     type: list
     suboptions:
       name:
         description:
           - Name of the link aggregation group (LAG) or bond.
         type: str
         required: True
       mode:
         description:
           - LAG or bond mode.
         type: str
         choices:
           - 802.3ad
           - active-backup
           - broadcast
           - round-robin
           - transmit-load-balance
           - adaptive-load-balance
           - xor-hash
       members:
         description:
           - List of member interfaces for the LAG (bond).
         type: list
         suboptions:
           member:
             description:
               - Name of the member interface.
             type: str
       primary:
         description:
           - Primary device interfaces for the LAG (bond).
         type: str
       hash_policy:
         description:
           - LAG or bonding transmit hash policy.
         type: str
         choices:
           - layer2
           - layer2+3
           - layer3+4
       arp_monitor:
         description:
           - ARP Link monitoring parameters.
         type: dict
         suboptions:
           interval:
             description:
               - ARP link monitoring frequency in milliseconds.
             type: int
           target:
             description:
               -  IP address to use for ARP monitoring.
             type: list
   state:
     description:
       - The state the configuration should be left in.
     type: str
     choices:
     - merged
     - replaced
     - overridden
     - deleted
     default: merged
 
 """
 EXAMPLES = """
 # Using merged
 #
 # Before state:
 # -------------
 #
 # vyos@vyos:~$ show configuration  commands | grep bond
 # set interfaces bonding bond2
 # set interfaces bonding bond3
 #
 - name: Merge provided configuration with device configuration
   vyos_lag_interfaces:
     config:
       - name: bond2
         mode: active-backup
         members:
          - member: eth2
          - member: eth1
         hash_policy: layer2
         primary: eth2
 
       - name: 'bond3'
         mode: 'active-backup'
         hash_policy: 'layer2+3'
         members:
          - member: eth3
         primary: 'eth3'
     state: merged
 #
 #
 # -------------------------
 # Module Execution Result
 # -------------------------
 #
 #    "before": [
 #        {
 #            "name": "bond2"
 #        },
 #        {
 #            "name": "bond3"
 #        }
 #    ],
 #
 # "commands": [
 #        "set interfaces bonding bond2 hash-policy 'layer2'",
 #        "set interfaces bonding bond2 mode 'active-backup'",
 #        "set interfaces ethernet eth2 bond-group bond2",
 #        "set interfaces ethernet eth1 bond-group bond2",
 #        "set interfaces bonding bond2 primary 'eth2'",
 #        "set interfaces bonding bond3 hash-policy 'layer2+3'",
 #        "set interfaces bonding bond3 mode 'active-backup'",
 #        "set interfaces ethernet eth3 bond-group bond3",
 #        "set interfaces bonding bond3 primary 'eth3'"
 #    ]
 #
 #     "after": [
 #        {
 #            "hash_policy": "layer2",
 #            "members": [
 #                {
 #                    "member": "eth1"
 #                },
 #                {
 #                    "member": "eth2"
 #                }
 #            ],
 #            "mode": "active-backup",
 #            "name": "bond2",
 #            "primary": "eth2"
 #        },
 #        {
 #            "hash_policy": "layer2+3",
 #            "members": [
 #                {
 #                    "member": "eth3"
 #                }
 #            ],
 #            "mode": "active-backup",
 #            "name": "bond3",
 #            "primary": "eth3"
 #        }
 #    ]
 #
 # After state:
 # -------------
 #
 # vyos@vyos:~$ show configuration  commands | grep bond
 # set interfaces bonding bond2 hash-policy 'layer2'
 # set interfaces bonding bond2 mode 'active-backup'
 # set interfaces bonding bond2 primary 'eth2'
 # set interfaces bonding bond3 hash-policy 'layer2+3'
 # set interfaces bonding bond3 mode 'active-backup'
 # set interfaces bonding bond3 primary 'eth3'
 # set interfaces ethernet eth1 bond-group 'bond2'
 # set interfaces ethernet eth2 bond-group 'bond2'
 # set interfaces ethernet eth3 bond-group 'bond3'
 
 
 # Using replaced
 #
 # Before state:
 # -------------
 #
 # vyos@vyos:~$ show configuration  commands | grep bond
 # set interfaces bonding bond2 hash-policy 'layer2'
 # set interfaces bonding bond2 mode 'active-backup'
 # set interfaces bonding bond2 primary 'eth2'
 # set interfaces bonding bond3 hash-policy 'layer2+3'
 # set interfaces bonding bond3 mode 'active-backup'
 # set interfaces bonding bond3 primary 'eth3'
 # set interfaces ethernet eth1 bond-group 'bond2'
 # set interfaces ethernet eth2 bond-group 'bond2'
 # set interfaces ethernet eth3 bond-group 'bond3'
 #
 - name: Replace device configurations of listed LAGs with provided configurations
   vyos_lag_interfaces:
     config:
       - name: bond3
         mode: '802.3ad'
         hash_policy: 'layer2'
         members:
          - member: eth3
     state: replaced
 #
 #
 # -------------------------
 # Module Execution Result
 # -------------------------
 #
 #    "before": [
 #        {
 #            "hash_policy": "layer2",
 #            "members": [
 #                {
 #                    "member": "eth1"
 #                },
 #                {
 #                    "member": "eth2"
 #                }
 #            ],
 #            "mode": "active-backup",
 #            "name": "bond2",
 #            "primary": "eth2"
 #        },
 #        {
 #            "hash_policy": "layer2+3",
 #            "members": [
 #                {
 #                    "member": "eth3"
 #                }
 #            ],
 #            "mode": "active-backup",
 #            "name": "bond3",
 #            "primary": "eth3"
 #        }
 #    ],
 #
 # "commands": [
 #        "delete interfaces bonding bond3 primary",
 #        "set interfaces bonding bond3 hash-policy 'layer2'",
 #        "set interfaces bonding bond3 mode '802.3ad'"
 #    ],
 #
 # "after": [
 #        {
 #            "hash_policy": "layer2",
 #            "members": [
 #                {
 #                    "member": "eth1"
 #                },
 #                {
 #                    "member": "eth2"
 #                }
 #            ],
 #            "mode": "active-backup",
 #            "name": "bond2",
 #            "primary": "eth2"
 #        },
 #        {
 #            "hash_policy": "layer2",
 #            "members": [
 #                {
 #                    "member": "eth3"
 #                }
 #            ],
 #            "mode": "802.3ad",
 #            "name": "bond3"
 #        }
 #    ],
 #
 # After state:
 # -------------
 #
 # vyos@vyos:~$ show configuration  commands | grep bond
 # set interfaces bonding bond2 hash-policy 'layer2'
 # set interfaces bonding bond2 mode 'active-backup'
 # set interfaces bonding bond2 primary 'eth2'
 # set interfaces bonding bond3 hash-policy 'layer2'
 # set interfaces bonding bond3 mode '802.3ad'
 # set interfaces ethernet eth1 bond-group 'bond2'
 # set interfaces ethernet eth2 bond-group 'bond2'
 # set interfaces ethernet eth3 bond-group 'bond3'
 
 
 # Using overridden
 #
 # Before state
 # --------------
 #
 # vyos@vyos:~$ show configuration  commands | grep bond
 # set interfaces bonding bond2 hash-policy 'layer2'
 # set interfaces bonding bond2 mode 'active-backup'
 # set interfaces bonding bond2 primary 'eth2'
 # set interfaces bonding bond3 hash-policy 'layer2'
 # set interfaces bonding bond3 mode '802.3ad'
 # set interfaces ethernet eth1 bond-group 'bond2'
 # set interfaces ethernet eth2 bond-group 'bond2'
 # set interfaces ethernet eth3 bond-group 'bond3'
 #
 - name: Overrides all device configuration with provided configuration
   vyos_lag_interfaces:
     config:
       - name: bond3
         mode: active-backup
         members:
          - member: eth1
          - member: eth2
          - member: eth3
         primary: eth3
         hash_policy: layer2
     state: overridden
 #
 #
 # -------------------------
 # Module Execution Result
 # -------------------------
 #
 #    "before": [
 #        {
 #            "hash_policy": "layer2",
 #            "members": [
 #                {
 #                    "member": "eth1"
 #                },
 #                {
 #                    "member": "eth2"
 #                }
 #            ],
 #            "mode": "active-backup",
 #            "name": "bond2",
 #            "primary": "eth2"
 #        },
 #        {
 #            "hash_policy": "layer2",
 #            "members": [
 #                {
 #                    "member": "eth3"
 #                }
 #            ],
 #            "mode": "802.3ad",
 #            "name": "bond3"
 #        }
 #    ],
 #
 #    "commands": [
 #        "delete interfaces bonding bond2 hash-policy",
 #        "delete interfaces ethernet eth1 bond-group bond2",
 #        "delete interfaces ethernet eth2 bond-group bond2",
 #        "delete interfaces bonding bond2 mode",
 #        "delete interfaces bonding bond2 primary",
 #        "set interfaces bonding bond3 mode 'active-backup'",
 #        "set interfaces ethernet eth1 bond-group bond3",
 #        "set interfaces ethernet eth2 bond-group bond3",
 #        "set interfaces bonding bond3 primary 'eth3'"
 #    ],
 #
 # "after": [
 #        {
 #            "name": "bond2"
 #        },
 #        {
 #            "hash_policy": "layer2",
 #            "members": [
 #                {
 #                    "member": "eth1"
 #                },
 #                {
 #                    "member": "eth2"
 #                },
 #                {
 #                    "member": "eth3"
 #                }
 #            ],
 #            "mode": "active-backup",
 #            "name": "bond3",
 #            "primary": "eth3"
 #        }
 #    ],
 #
 #
 # After state
 # ------------
 #
 # vyos@vyos:~$ show configuration  commands | grep bond
 # set interfaces bonding bond2
 # set interfaces bonding bond3 hash-policy 'layer2'
 # set interfaces bonding bond3 mode 'active-backup'
 # set interfaces bonding bond3 primary 'eth3'
 # set interfaces ethernet eth1 bond-group 'bond3'
 # set interfaces ethernet eth2 bond-group 'bond3'
 # set interfaces ethernet eth3 bond-group 'bond3'
 
 
 # Using deleted
 #
 # Before state
 # -------------
 #
 # vyos@vyos:~$ show configuration  commands | grep bond
 # set interfaces bonding bond2 hash-policy 'layer2'
 # set interfaces bonding bond2 mode 'active-backup'
 # set interfaces bonding bond2 primary 'eth2'
 # set interfaces bonding bond3 hash-policy 'layer2+3'
 # set interfaces bonding bond3 mode 'active-backup'
 # set interfaces bonding bond3 primary 'eth3'
 # set interfaces ethernet eth1 bond-group 'bond2'
 # set interfaces ethernet eth2 bond-group 'bond2'
 # set interfaces ethernet eth3 bond-group 'bond3'
 #
 - name: Delete LAG attributes of given interfaces (Note This won't delete the interface itself)
   vyos_lag_interfaces:
     config:
       - name: bond2
       - name: bond3
     state: deleted
 #
 #
 # ------------------------
 # Module Execution Results
 # ------------------------
 #
 # "before": [
 #        {
 #            "hash_policy": "layer2",
 #            "members": [
 #                {
 #                    "member": "eth1"
 #                },
 #                {
 #                    "member": "eth2"
 #                }
 #            ],
 #            "mode": "active-backup",
 #            "name": "bond2",
 #            "primary": "eth2"
 #        },
 #        {
 #            "hash_policy": "layer2+3",
 #            "members": [
 #                {
 #                    "member": "eth3"
 #                }
 #            ],
 #            "mode": "active-backup",
 #            "name": "bond3",
 #            "primary": "eth3"
 #        }
 #    ],
 # "commands": [
 #        "delete interfaces bonding bond2 hash-policy",
 #        "delete interfaces ethernet eth1 bond-group bond2",
 #        "delete interfaces ethernet eth2 bond-group bond2",
 #        "delete interfaces bonding bond2 mode",
 #        "delete interfaces bonding bond2 primary",
 #        "delete interfaces bonding bond3 hash-policy",
 #        "delete interfaces ethernet eth3 bond-group bond3",
 #        "delete interfaces bonding bond3 mode",
 #        "delete interfaces bonding bond3 primary"
 #    ],
 #
 # "after": [
 #        {
 #            "name": "bond2"
 #        },
 #        {
 #            "name": "bond3"
 #        }
 #    ],
 #
 # After state
 # ------------
 # vyos@vyos:~$ show configuration  commands | grep bond
 # set interfaces bonding bond2
 # set interfaces bonding bond3
 
 
 """
 RETURN = """
 before:
   description: The configuration prior to the model invocation.
   returned: always
   type: list
   sample: >
     The configuration returned will always be in the same format
      of the parameters above.
 after:
   description: The resulting configuration model invocation.
   returned: when changed
   type: list
   sample: >
     The configuration returned will always be in the same format
      of the parameters above.
 commands:
   description: The set of commands pushed to the remote device.
   returned: always
   type: list
   sample:
     - 'set interfaces bonding bond2'
     - 'set interfaces bonding bond2 hash-policy layer2'
 """
 
 
 from ansible.module_utils.basic import AnsibleModule
 from ansible_collections.vyos.vyos.plugins.module_utils.network.vyos.argspec.lag_interfaces.lag_interfaces import (
     Lag_interfacesArgs,
 )
 from ansible_collections.vyos.vyos.plugins.module_utils.network.vyos.config.lag_interfaces.lag_interfaces import (
     Lag_interfaces,
 )
 
 
 def main():
     """
     Main entry point for module execution
 
     :returns: the result form module invocation
     """
     required_if = [
         ("state", "merged", ("config",)),
         ("state", "replaced", ("config",)),
         ("state", "overridden", ("config",)),
     ]
     module = AnsibleModule(
         argument_spec=Lag_interfacesArgs.argument_spec,
         required_if=required_if,
         supports_check_mode=True,
     )
 
     result = Lag_interfaces(module).execute_module()
     module.exit_json(**result)
 
 
 if __name__ == "__main__":
     main()
diff --git a/plugins/modules/vyos_lldp_global.py b/plugins/modules/vyos_lldp_global.py
index 3783dcb..d080e82 100644
--- a/plugins/modules/vyos_lldp_global.py
+++ b/plugins/modules/vyos_lldp_global.py
@@ -1,333 +1,333 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
 # Copyright 2019 Red Hat
 # GNU General Public License v3.0+
 # (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 #############################################
 #                WARNING                    #
 #############################################
 #
 # This file is auto generated by the resource
 #   module builder playbook.
 #
 # Do not edit this file manually.
 #
 # Changes to this file will be over written
 #   by the resource module builder.
 #
 # Changes should be made in the model used to
 #   generate this file or in the resource module
 #   builder template.
 #
 #############################################
 
 """
 The module file for vyos_lldp_global
 """
 
 from __future__ import absolute_import, division, print_function
 
 __metaclass__ = type
 
 ANSIBLE_METADATA = {
     "metadata_version": "1.1",
     "status": ["preview"],
     "supported_by": "network",
 }
 
 DOCUMENTATION = """
 ---
 module: vyos_lldp_global
 version_added: 2.9
 short_description: Manage link layer discovery protocol (LLDP) attributes on VyOS devices..
 description: This module manages link layer discovery protocol (LLDP) attributes on VyOS devices.
 notes:
   - Tested against VyOS 1.1.8 (helium).
-  - This module works with connection C(network_cli).
+  - This module works with connection C(network_cli). See L(the VyOS OS Platform Options,../network/user_guide/platform_vyos.html).
 author:
    - Rohit Thakur (@rohitthakur2590)
 options:
   config:
     description: The provided link layer discovery protocol (LLDP) configuration.
     type: dict
     suboptions:
       enable:
         description:
           - This argument is a boolean value to enable or disable LLDP.
         type: bool
       address:
         description:
           - This argument defines management-address.
         type: str
       snmp:
         description:
           - This argument enable the SNMP queries to LLDP database.
         type: str
       legacy_protocols:
         description:
           - List of the supported legacy protocols.
         type: list
         choices:
           - cdp
           - edp
           - fdp
           - sonmp
   state:
     description:
       - The state the configuration should be left in.
     type: str
     choices:
     - merged
     - replaced
     - deleted
     default: merged
 """
 EXAMPLES = """
 # Using merged
 #
 # Before state:
 # -------------
 #
 # vyos@vyos:~$ show configuration commands|grep lldp
 # vyos@vyos:~$
 #
 - name: Merge provided configuration with device configuration
   vyos_lldp_global:
     config:
       legacy_protocols:
         - 'fdp'
         - 'cdp'
       snmp: 'enable'
       address: 192.0.2.11
     state: merged
 #
 #
 # ------------------------
 # Module Execution Results
 # ------------------------
 #
 # "before": []
 #
 # "commands": [
 #        "set service lldp legacy-protocols fdp",
 #        "set service lldp legacy-protocols cdp",
 #        "set service lldp snmp enable",
 #        "set service lldp management-address '192.0.2.11'"
 #    ]
 #
 # "after": [
 #        {
 #            "snmp": "enable"
 #        },
 #        {
 #            "address": "192.0.2.11"
 #        },
 #        {
 #            "legacy_protocols": [
 #                "cdp",
 #                "fdp"
 #            ]
 #        }
 #        {
 #            "enable": true
 #        }
 #    ]
 #
 # After state:
 # -------------
 #
 # set service lldp legacy-protocols cdp
 # set service lldp legacy-protocols fdp
 # set service lldp management-address '192.0.2.11'
 # set service lldp snmp enable
 
 
 # Using replaced
 #
 # Before state:
 # -------------
 #
 # vyos@vyos:~$ show configuration commands | grep lldp
 # set service lldp legacy-protocols cdp
 # set service lldp legacy-protocols fdp
 # set service lldp management-address '192.0.2.11'
 # set service lldp snmp enable
 #
 - name: Replace device configurations with provided configurations
   vyos_lldp_global:
     config:
       legacy_protocols:
         - 'edp'
         - 'sonmp'
         - 'cdp'
       address: 192.0.2.14
     state: replaced
 #
 #
 # ------------------------
 # Module Execution Results
 # ------------------------
 #
 #
 # "before": [
 #        {
 #            "snmp": "enable"
 #        },
 #        {
 #            "address": "192.0.2.11"
 #        },
 #        {
 #            "legacy_protocols": [
 #                "cdp",
 #                "fdp"
 #            ]
 #        }
 #        {
 #            "enable": true
 #        }
 #    ]
 # "commands": [
 #        "delete service lldp snmp",
 #        "delete service lldp legacy-protocols fdp",
 #        "set service lldp management-address '192.0.2.14'",
 #        "set service lldp legacy-protocols edp",
 #        "set service lldp legacy-protocols sonmp"
 #    ]
 #
 # "after": [
 #        {
 #            "address": "192.0.2.14"
 #        },
 #        {
 #            "legacy_protocols": [
 #                "cdp",
 #                "edp",
 #                "sonmp"
 #            ]
 #        }
 #        {
 #            "enable": true
 #        }
 #    ]
 #
 # After state:
 # -------------
 #
 # vyos@vyos:~$ show configuration commands|grep lldp
 # set service lldp legacy-protocols cdp
 # set service lldp legacy-protocols edp
 # set service lldp legacy-protocols sonmp
 # set service lldp management-address '192.0.2.14'
 
 
 # Using deleted
 #
 # Before state
 # -------------
 # vyos@vyos:~$ show configuration commands|grep lldp
 # set service lldp legacy-protocols cdp
 # set service lldp legacy-protocols edp
 # set service lldp legacy-protocols sonmp
 # set service lldp management-address '192.0.2.14'
 #
 - name: Delete attributes of given lldp service (This won't delete the LLDP service itself)
   vyos_lldp_global:
     config:
     state: deleted
 #
 #
 # ------------------------
 # Module Execution Results
 # ------------------------
 #
 # "before": [
 #        {
 #            "address": "192.0.2.14"
 #        },
 #        {
 #            "legacy_protocols": [
 #                "cdp",
 #                "edp",
 #                "sonmp"
 #            ]
 #        }
 #        {
 #            "enable": true
 #        }
 #    ]
 #
 #  "commands": [
 #       "delete service lldp management-address",
 #        "delete service lldp legacy-protocols"
 #    ]
 #
 # "after": [
 #        {
 #            "enable": true
 #        }
 #          ]
 #
 # After state
 # ------------
 # vyos@vyos:~$ show configuration commands | grep lldp
 # set service lldp
 
 
 """
 RETURN = """
 before:
   description: The configuration prior to the model invocation.
   returned: always
   type: list
   sample: >
     The configuration returned will always be in the same format
      of the parameters above.
 after:
   description: The resulting configuration model invocation.
   returned: when changed
   type: list
   sample: >
     The configuration returned will always be in the same format
      of the parameters above.
 commands:
   description: The set of commands pushed to the remote device.
   returned: always
   type: list
   sample:
     - set service lldp legacy-protocols sonmp
     - set service lldp management-address '192.0.2.14'
 """
 
 
 from ansible.module_utils.basic import AnsibleModule
 from ansible_collections.vyos.vyos.plugins.module_utils.network.vyos.argspec.lldp_global.lldp_global import (
     Lldp_globalArgs,
 )
 from ansible_collections.vyos.vyos.plugins.module_utils.network.vyos.config.lldp_global.lldp_global import (
     Lldp_global,
 )
 
 
 def main():
     """
     Main entry point for module execution
 
     :returns: the result form module invocation
     """
     required_if = [
         ("state", "merged", ("config",)),
         ("state", "replaced", ("config",)),
     ]
     module = AnsibleModule(
         argument_spec=Lldp_globalArgs.argument_spec,
         required_if=required_if,
         supports_check_mode=True,
     )
 
     result = Lldp_global(module).execute_module()
     module.exit_json(**result)
 
 
 if __name__ == "__main__":
     main()
diff --git a/plugins/modules/vyos_lldp_interface.py b/plugins/modules/vyos_lldp_interface.py
deleted file mode 100644
index 494fac4..0000000
--- a/plugins/modules/vyos_lldp_interface.py
+++ /dev/null
@@ -1,250 +0,0 @@
-#!/usr/bin/python
-# -*- coding: utf-8 -*-
-
-# (c) 2017, Ansible by Red Hat, inc
-#
-# This file is part of Ansible by Red Hat
-#
-# Ansible is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# Ansible is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
-#
-
-ANSIBLE_METADATA = {
-    "metadata_version": "1.1",
-    "status": ["preview"],
-    "supported_by": "network",
-}
-
-
-DOCUMENTATION = """
----
-module: vyos_lldp_interface
-version_added: "2.4"
-author: "Ricardo Carrillo Cruz (@rcarrillocruz)"
-short_description: Manage LLDP interfaces configuration on VyOS network devices
-description:
-  - This module provides declarative management of LLDP interfaces
-    configuration on VyOS network devices.
-notes:
-  - Tested against VYOS 1.1.7
-options:
-  name:
-    description:
-      - Name of the interface LLDP should be configured on.
-  aggregate:
-    description: List of interfaces LLDP should be configured on.
-  state:
-    description:
-      - State of the LLDP configuration.
-    default: present
-    choices: ['present', 'absent', 'enabled', 'disabled']
-extends_documentation_fragment: vyos
-"""
-
-EXAMPLES = """
-- name: Enable LLDP on eth1
-  net_lldp_interface:
-    state: present
-
-- name: Enable LLDP on specific interfaces
-  net_lldp_interface:
-    interfaces:
-      - eth1
-      - eth2
-    state: present
-
-- name: Disable LLDP globally
-  net_lldp_interface:
-    state: disabled
-
-- name: Create aggregate of LLDP interface configurations
-  vyos_lldp_interface:
-    aggregate:
-    - name: eth1
-    - name: eth2
-    state: present
-
-- name: Delete aggregate of LLDP interface configurations
-  vyos_lldp_interface:
-    aggregate:
-    - name: eth1
-    - name: eth2
-    state: absent
-"""
-
-RETURN = """
-commands:
-  description: The list of configuration mode commands to send to the device
-  returned: always, except for the platforms that use Netconf transport to manage the device.
-  type: list
-  sample:
-    - set service lldp eth1
-    - set service lldp eth2 disable
-"""
-from copy import deepcopy
-
-from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.network.common.utils import remove_default_spec
-from ansible_collections.vyos.vyos.plugins.module_utils.network.vyos.vyos import (
-    get_config,
-    load_config,
-)
-from ansible_collections.vyos.vyos.plugins.module_utils.network.vyos.vyos import (
-    vyos_argument_spec,
-)
-
-
-def search_obj_in_list(name, lst):
-    for o in lst:
-        if o["name"] == name:
-            return o
-
-    return None
-
-
-def map_obj_to_commands(updates, module):
-    commands = list()
-    want, have = updates
-
-    for w in want:
-        name = w["name"]
-        state = w["state"]
-
-        obj_in_have = search_obj_in_list(name, have)
-
-        if state == "absent" and obj_in_have:
-            commands.append("delete service lldp interface " + name)
-        elif state in ("present", "enabled"):
-            if not obj_in_have:
-                commands.append("set service lldp interface " + name)
-            elif (
-                obj_in_have
-                and obj_in_have["state"] == "disabled"
-                and state == "enabled"
-            ):
-                commands.append(
-                    "delete service lldp interface " + name + " disable"
-                )
-        elif state == "disabled":
-            if not obj_in_have:
-                commands.append("set service lldp interface " + name)
-                commands.append(
-                    "set service lldp interface " + name + " disable"
-                )
-            elif obj_in_have and obj_in_have["state"] != "disabled":
-                commands.append(
-                    "set service lldp interface " + name + " disable"
-                )
-
-    return commands
-
-
-def map_config_to_obj(module):
-    obj = []
-    config = get_config(module).splitlines()
-
-    output = [c for c in config if c.startswith("set service lldp interface")]
-
-    for i in output:
-        splitted_line = i.split()
-
-        if len(splitted_line) > 5:
-            new_obj = {"name": splitted_line[4]}
-
-            if splitted_line[5] == "'disable'":
-                new_obj["state"] = "disabled"
-        else:
-            new_obj = {"name": splitted_line[4][1:-1]}
-            new_obj["state"] = "present"
-
-        obj.append(new_obj)
-
-    return obj
-
-
-def map_params_to_obj(module):
-    obj = []
-
-    aggregate = module.params.get("aggregate")
-    if aggregate:
-        for item in aggregate:
-            for key in item:
-                if item.get(key) is None:
-                    item[key] = module.params[key]
-
-            obj.append(item.copy())
-    else:
-        obj.append(
-            {"name": module.params["name"], "state": module.params["state"]}
-        )
-
-    return obj
-
-
-def main():
-    """ main entry point for module execution
-    """
-    element_spec = dict(
-        name=dict(),
-        state=dict(
-            default="present",
-            choices=["present", "absent", "enabled", "disabled"],
-        ),
-    )
-
-    aggregate_spec = deepcopy(element_spec)
-    aggregate_spec["name"] = dict(required=True)
-
-    # remove default in aggregate spec, to handle common arguments
-    remove_default_spec(aggregate_spec)
-
-    argument_spec = dict(
-        aggregate=dict(type="list", elements="dict", options=aggregate_spec)
-    )
-
-    argument_spec.update(element_spec)
-    argument_spec.update(vyos_argument_spec)
-
-    required_one_of = [["name", "aggregate"]]
-    mutually_exclusive = [["name", "aggregate"]]
-
-    module = AnsibleModule(
-        argument_spec=argument_spec,
-        required_one_of=required_one_of,
-        mutually_exclusive=mutually_exclusive,
-        supports_check_mode=True,
-    )
-
-    warnings = list()
-
-    result = {"changed": False}
-
-    if warnings:
-        result["warnings"] = warnings
-
-    want = map_params_to_obj(module)
-    have = map_config_to_obj(module)
-
-    commands = map_obj_to_commands((want, have), module)
-    result["commands"] = commands
-
-    if commands:
-        commit = not module.check_mode
-        load_config(module, commands, commit=commit)
-        result["changed"] = True
-
-    module.exit_json(**result)
-
-
-if __name__ == "__main__":
-    main()
diff --git a/plugins/modules/vyos_lldp_interface.py b/plugins/modules/vyos_lldp_interface.py
new file mode 120000
index 0000000..7847a58
--- /dev/null
+++ b/plugins/modules/vyos_lldp_interface.py
@@ -0,0 +1 @@
+_vyos_lldp_interface.py
\ No newline at end of file
diff --git a/plugins/modules/vyos_lldp_interfaces.py b/plugins/modules/vyos_lldp_interfaces.py
new file mode 100644
index 0000000..7fe6d23
--- /dev/null
+++ b/plugins/modules/vyos_lldp_interfaces.py
@@ -0,0 +1,517 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+# Copyright 2019 Red Hat
+# GNU General Public License v3.0+
+# (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
+
+#############################################
+#                WARNING                    #
+#############################################
+#
+# This file is auto generated by the resource
+#   module builder playbook.
+#
+# Do not edit this file manually.
+#
+# Changes to this file will be over written
+#   by the resource module builder.
+#
+# Changes should be made in the model used to
+#   generate this file or in the resource module
+#   builder template.
+#
+#############################################
+
+"""
+The module file for vyos_lldp_interfaces
+"""
+
+from __future__ import absolute_import, division, print_function
+
+__metaclass__ = type
+
+ANSIBLE_METADATA = {
+    "metadata_version": "1.1",
+    "status": ["preview"],
+    "supported_by": "network",
+}
+
+DOCUMENTATION = """
+---
+module: vyos_lldp_interfaces
+version_added: 2.9
+short_description: Manages attributes of lldp interfaces on VyOS devices.
+description: This module manages attributes of lldp interfaces on VyOS network devices.
+notes:
+  - Tested against VyOS 1.1.8 (helium).
+  - This module works with connection C(network_cli). See L(the VyOS OS Platform Options,../network/user_guide/platform_vyos.html).
+author:
+   - Rohit Thakur (@rohitthakur2590)
+options:
+  config:
+    description: A list of lldp interfaces configurations.
+    type: list
+    suboptions:
+      name:
+        description:
+          - Name of the  lldp interface.
+        type: str
+        required: True
+      enable:
+        description:
+          - to disable lldp on the interface.
+        type: bool
+        default: True
+      location:
+        description:
+          - LLDP-MED location data.
+        type: dict
+        suboptions:
+          civic_based:
+            description:
+              - Civic-based location data.
+            type: dict
+            suboptions:
+              ca_info:
+                 description: LLDP-MED address info
+                 type: list
+                 suboptions:
+                   ca_type:
+                     description: LLDP-MED Civic Address type.
+                     type: int
+                     required: True
+                   ca_value:
+                     description: LLDP-MED Civic Address value.
+                     type: str
+                     required: True
+              country_code:
+                description: Country Code
+                type: str
+                required: True
+          coordinate_based:
+            description:
+              - Coordinate-based location.
+            type: dict
+            suboptions:
+              altitude:
+                description: Altitude in meters.
+                type: int
+              datum:
+                description: Coordinate datum type.
+                type: str
+                choices:
+                  - WGS84
+                  - NAD83
+                  - MLLW
+              latitude:
+                description: Latitude.
+                type: str
+                required: True
+              longitude:
+                description: Longitude.
+                type: str
+                required: True
+          elin:
+            description: Emergency Call Service ELIN number (between 10-25 numbers).
+            type: str
+  state:
+    description:
+      - The state the configuration should be left in.
+    type: str
+    choices:
+    - merged
+    - replaced
+    - overridden
+    - deleted
+    default: merged
+
+"""
+EXAMPLES = """
+# Using merged
+#
+# Before state:
+# -------------
+#
+# vyos@vyos:~$ show configuration  commands | grep lldp
+#
+- name: Merge provided configuration with device configuration
+  vyos_lldp_interfaces:
+    config:
+      - name: 'eth1'
+        location:
+          civic_based:
+            country_code: 'US'
+            ca_info:
+              - ca_type: 0
+                ca_value: 'ENGLISH'
+
+      - name: 'eth2'
+        location:
+          coordinate_based:
+           altitude: 2200
+           datum: 'WGS84'
+           longitude: '222.267255W'
+           latitude: '33.524449N'
+    state: merged
+#
+#
+# -------------------------
+# Module Execution Result
+# -------------------------
+#
+# before": []
+#
+#    "commands": [
+#        "set service lldp interface eth1 location civic-based country-code 'US'",
+#        "set service lldp interface eth1 location civic-based ca-type 0 ca-value 'ENGLISH'",
+#        "set service lldp interface eth1",
+#        "set service lldp interface eth2 location coordinate-based latitude '33.524449N'",
+#        "set service lldp interface eth2 location coordinate-based altitude '2200'",
+#        "set service lldp interface eth2 location coordinate-based datum 'WGS84'",
+#        "set service lldp interface eth2 location coordinate-based longitude '222.267255W'",
+#        "set service lldp interface eth2 location coordinate-based latitude '33.524449N'",
+#        "set service lldp interface eth2 location coordinate-based altitude '2200'",
+#        "set service lldp interface eth2 location coordinate-based datum 'WGS84'",
+#        "set service lldp interface eth2 location coordinate-based longitude '222.267255W'",
+#        "set service lldp interface eth2"
+#
+# "after": [
+#        {
+#            "location": {
+#                "coordinate_based": {
+#                    "altitude": 2200,
+#                    "datum": "WGS84",
+#                    "latitude": "33.524449N",
+#                    "longitude": "222.267255W"
+#                }
+#            },
+#            "name": "eth2"
+#        },
+#        {
+#            "location": {
+#                "civic_based": {
+#                    "ca_info": [
+#                        {
+#                            "ca_type": 0,
+#                            "ca_value": "ENGLISH"
+#                        }
+#                    ],
+#                    "country_code": "US"
+#                }
+#            },
+#            "name": "eth1"
+#        }
+#    ],
+#
+# After state:
+# -------------
+#
+# vyos@vyos:~$ show configuration commands | grep lldp
+# set service lldp interface eth1 location civic-based ca-type 0 ca-value 'ENGLISH'
+# set service lldp interface eth1 location civic-based country-code 'US'
+# set service lldp interface eth2 location coordinate-based altitude '2200'
+# set service lldp interface eth2 location coordinate-based datum 'WGS84'
+# set service lldp interface eth2 location coordinate-based latitude '33.524449N'
+# set service lldp interface eth2 location coordinate-based longitude '222.267255W'
+
+
+# Using replaced
+#
+# Before state:
+# -------------
+#
+# vyos@vyos:~$ show configuration commands | grep lldp
+# set service lldp interface eth1 location civic-based ca-type 0 ca-value 'ENGLISH'
+# set service lldp interface eth1 location civic-based country-code 'US'
+# set service lldp interface eth2 location coordinate-based altitude '2200'
+# set service lldp interface eth2 location coordinate-based datum 'WGS84'
+# set service lldp interface eth2 location coordinate-based latitude '33.524449N'
+# set service lldp interface eth2 location coordinate-based longitude '222.267255W'
+#
+- name: Replace device configurations of listed LLDP interfaces with provided configurations
+  vyos_lldp_interfaces:
+    config:
+      - name: 'eth2'
+        location:
+          civic_based:
+            country_code: 'US'
+            ca_info:
+              - ca_type: 0
+                ca_value: 'ENGLISH'
+
+      - name: 'eth1'
+        location:
+          coordinate_based:
+           altitude: 2200
+           datum: 'WGS84'
+           longitude: '222.267255W'
+           latitude: '33.524449N'
+    state: replaced
+#
+#
+# -------------------------
+# Module Execution Result
+# -------------------------
+#
+#    "before": [
+#        {
+#            "location": {
+#                "coordinate_based": {
+#                    "altitude": 2200,
+#                    "datum": "WGS84",
+#                    "latitude": "33.524449N",
+#                    "longitude": "222.267255W"
+#                }
+#            },
+#            "name": "eth2"
+#        },
+#        {
+#            "location": {
+#                "civic_based": {
+#                    "ca_info": [
+#                        {
+#                            "ca_type": 0,
+#                            "ca_value": "ENGLISH"
+#                        }
+#                    ],
+#                    "country_code": "US"
+#                }
+#            },
+#            "name": "eth1"
+#        }
+#    ]
+#
+#    "commands": [
+#        "delete service lldp interface eth2 location",
+#        "set service lldp interface eth2 'disable'",
+#        "set service lldp interface eth2 location civic-based country-code 'US'",
+#        "set service lldp interface eth2 location civic-based ca-type 0 ca-value 'ENGLISH'",
+#        "delete service lldp interface eth1 location",
+#        "set service lldp interface eth1 'disable'",
+#        "set service lldp interface eth1 location coordinate-based latitude '33.524449N'",
+#        "set service lldp interface eth1 location coordinate-based altitude '2200'",
+#        "set service lldp interface eth1 location coordinate-based datum 'WGS84'",
+#        "set service lldp interface eth1 location coordinate-based longitude '222.267255W'"
+#    ]
+#
+#    "after": [
+#        {
+#            "location": {
+#                "civic_based": {
+#                    "ca_info": [
+#                        {
+#                            "ca_type": 0,
+#                            "ca_value": "ENGLISH"
+#                        }
+#                    ],
+#                    "country_code": "US"
+#                }
+#            },
+#            "name": "eth2"
+#        },
+#        {
+#            "location": {
+#                "coordinate_based": {
+#                    "altitude": 2200,
+#                    "datum": "WGS84",
+#                    "latitude": "33.524449N",
+#                    "longitude": "222.267255W"
+#                }
+#            },
+#            "name": "eth1"
+#        }
+#    ]
+#
+# After state:
+# -------------
+#
+# vyos@vyos:~$ show configuration commands | grep lldp
+# set service lldp interface eth1 'disable'
+# set service lldp interface eth1 location coordinate-based altitude '2200'
+# set service lldp interface eth1 location coordinate-based datum 'WGS84'
+# set service lldp interface eth1 location coordinate-based latitude '33.524449N'
+# set service lldp interface eth1 location coordinate-based longitude '222.267255W'
+# set service lldp interface eth2 'disable'
+# set service lldp interface eth2 location civic-based ca-type 0 ca-value 'ENGLISH'
+# set service lldp interface eth2 location civic-based country-code 'US'
+
+
+# Using overridden
+#
+# Before state
+# --------------
+#
+# vyos@vyos:~$ show configuration commands | grep lldp
+# set service lldp interface eth1 'disable'
+# set service lldp interface eth1 location coordinate-based altitude '2200'
+# set service lldp interface eth1 location coordinate-based datum 'WGS84'
+# set service lldp interface eth1 location coordinate-based latitude '33.524449N'
+# set service lldp interface eth1 location coordinate-based longitude '222.267255W'
+# set service lldp interface eth2 'disable'
+# set service lldp interface eth2 location civic-based ca-type 0 ca-value 'ENGLISH'
+# set service lldp interface eth2 location civic-based country-code 'US'
+#
+- name: Overrides all device configuration with provided configuration
+  vyos_lag_interfaces:
+    config:
+     - name: 'eth2'
+       location:
+         elin: 0000000911
+
+    state: overridden
+#
+#
+# -------------------------
+# Module Execution Result
+# -------------------------
+#
+# "before": [
+#        {
+#            "enable": false,
+#            "location": {
+#                "civic_based": {
+#                    "ca_info": [
+#                        {
+#                            "ca_type": 0,
+#                            "ca_value": "ENGLISH"
+#                        }
+#                    ],
+#                    "country_code": "US"
+#                }
+#            },
+#            "name": "eth2"
+#        },
+#        {
+#            "enable": false,
+#            "location": {
+#                "coordinate_based": {
+#                    "altitude": 2200,
+#                    "datum": "WGS84",
+#                    "latitude": "33.524449N",
+#                    "longitude": "222.267255W"
+#                }
+#            },
+#            "name": "eth1"
+#        }
+#    ]
+#
+#    "commands": [
+#        "delete service lldp interface eth2 location",
+#        "delete service lldp interface eth2 disable",
+#        "set service lldp interface eth2 location elin 0000000911"
+#
+#
+#    "after": [
+#        {
+#            "location": {
+#                "elin": 0000000911
+#            },
+#            "name": "eth2"
+#        }
+#    ]
+#
+#
+# After state
+# ------------
+#
+# vyos@vyos# run show configuration commands | grep lldp
+# set service lldp interface eth2 location elin '0000000911'
+
+
+# Using deleted
+#
+# Before state
+# -------------
+#
+# vyos@vyos# run show configuration commands | grep lldp
+# set service lldp interface eth2 location elin '0000000911'
+#
+- name: Delete lldp  interface attributes of given interfaces.
+  vyos_lag_interfaces:
+    config:
+     - name: 'eth2'
+    state: deleted
+#
+#
+# ------------------------
+# Module Execution Results
+# ------------------------
+#
+    "before": [
+        {
+            "location": {
+                "elin": 0000000911
+            },
+            "name": "eth2"
+        }
+    ]
+# "commands": [
+#    "commands": [
+#        "delete service lldp interface eth2"
+#    ]
+#
+# "after": []
+# After state
+# ------------
+# vyos@vyos# run show configuration commands | grep lldp
+# set service 'lldp'
+
+
+"""
+RETURN = """
+before:
+  description: The configuration prior to the model invocation.
+  returned: always
+  type: list
+  sample: >
+    The configuration returned will always be in the same format
+     of the parameters above.
+after:
+  description: The resulting configuration model invocation.
+  returned: when changed
+  type: list
+  sample: >
+    The configuration returned will always be in the same format
+     of the parameters above.
+commands:
+  description: The set of commands pushed to the remote device.
+  returned: always
+  type: list
+  sample:
+    - "set service lldp interface eth2 'disable'"
+    - "delete service lldp interface eth1 location"
+"""
+
+
+from ansible.module_utils.basic import AnsibleModule
+from ansible_collections.vyos.vyos.plugins.module_utils.network.vyos.argspec.lldp_interfaces.lldp_interfaces import (
+    Lldp_interfacesArgs,
+)
+from ansible_collections.vyos.vyos.plugins.module_utils.network.vyos.config.lldp_interfaces.lldp_interfaces import (
+    Lldp_interfaces,
+)
+
+
+def main():
+    """
+    Main entry point for module execution
+
+    :returns: the result form module invocation
+    """
+    required_if = [
+        ("state", "merged", ("config",)),
+        ("state", "replaced", ("config",)),
+        ("state", "overridden", ("config",)),
+    ]
+    module = AnsibleModule(
+        argument_spec=Lldp_interfacesArgs.argument_spec,
+        required_if=required_if,
+        supports_check_mode=True,
+    )
+
+    result = Lldp_interfaces(module).execute_module()
+    module.exit_json(**result)
+
+
+if __name__ == "__main__":
+    main()
diff --git a/plugins/modules/vyos_logging.py b/plugins/modules/vyos_logging.py
index 8eb5777..6c2f9f7 100644
--- a/plugins/modules/vyos_logging.py
+++ b/plugins/modules/vyos_logging.py
@@ -1,294 +1,295 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
 
 # (c) 2017, Ansible by Red Hat, inc
 #
 # This file is part of Ansible by Red Hat
 #
 # Ansible is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
 # Ansible is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 ANSIBLE_METADATA = {
     "metadata_version": "1.1",
     "status": ["preview"],
     "supported_by": "network",
 }
 
 DOCUMENTATION = """
 ---
 module: vyos_logging
 version_added: "2.4"
 author: "Trishna Guha (@trishnaguha)"
 short_description: Manage logging on network devices
 description:
   - This module provides declarative management of logging
     on Vyatta Vyos devices.
 notes:
-  - Tested against VYOS 1.1.7
+  - Tested against VyOS 1.1.8 (helium).
+  - This module works with connection C(network_cli). See L(the VyOS OS Platform Options,../network/user_guide/platform_vyos.html).
 options:
   dest:
     description:
       - Destination of the logs.
     choices: ['console', 'file', 'global', 'host', 'user']
   name:
     description:
       - If value of C(dest) is I(file) it indicates file-name,
         for I(user) it indicates username and for I(host) indicates
         the host name to be notified.
   facility:
     description:
       - Set logging facility.
   level:
     description:
       - Set logging severity levels.
   aggregate:
     description: List of logging definitions.
   state:
     description:
       - State of the logging configuration.
     default: present
     choices: ['present', 'absent']
 extends_documentation_fragment: vyos
 """
 
 EXAMPLES = """
 - name: configure console logging
   vyos_logging:
     dest: console
     facility: all
     level: crit
 
 - name: remove console logging configuration
   vyos_logging:
     dest: console
     state: absent
 
 - name: configure file logging
   vyos_logging:
     dest: file
     name: test
     facility: local3
     level: err
 
 - name: Add logging aggregate
   vyos_logging:
     aggregate:
       - { dest: file, name: test1, facility: all, level: info }
       - { dest: file, name: test2, facility: news, level: debug }
     state: present
 
 - name: Remove logging aggregate
   vyos_logging:
     aggregate:
       - { dest: console, facility: all, level: info }
       - { dest: console, facility: daemon, level: warning }
       - { dest: file, name: test2, facility: news, level: debug }
     state: absent
 """
 
 RETURN = """
 commands:
   description: The list of configuration mode commands to send to the device
   returned: always
   type: list
   sample:
     - set system syslog global facility all level notice
 """
 
 import re
 
 from copy import deepcopy
 
 from ansible.module_utils.basic import AnsibleModule
 from ansible.module_utils.network.common.utils import remove_default_spec
 from ansible_collections.vyos.vyos.plugins.module_utils.network.vyos.vyos import (
     get_config,
     load_config,
 )
 from ansible_collections.vyos.vyos.plugins.module_utils.network.vyos.vyos import (
     vyos_argument_spec,
 )
 
 
 def spec_to_commands(updates, module):
     commands = list()
     want, have = updates
 
     for w in want:
         dest = w["dest"]
         name = w["name"]
         facility = w["facility"]
         level = w["level"]
         state = w["state"]
         del w["state"]
 
         if state == "absent" and w in have:
             if w["name"]:
                 commands.append(
                     "delete system syslog {0} {1} facility {2} level {3}".format(
                         dest, name, facility, level
                     )
                 )
             else:
                 commands.append(
                     "delete system syslog {0} facility {1} level {2}".format(
                         dest, facility, level
                     )
                 )
         elif state == "present" and w not in have:
             if w["name"]:
                 commands.append(
                     "set system syslog {0} {1} facility {2} level {3}".format(
                         dest, name, facility, level
                     )
                 )
             else:
                 commands.append(
                     "set system syslog {0} facility {1} level {2}".format(
                         dest, facility, level
                     )
                 )
 
     return commands
 
 
 def config_to_dict(module):
     data = get_config(module)
     obj = []
 
     for line in data.split("\n"):
         if line.startswith("set system syslog"):
             match = re.search(r"set system syslog (\S+)", line, re.M)
             dest = match.group(1)
             if dest == "host":
                 match = re.search(r"host (\S+)", line, re.M)
                 name = match.group(1)
             elif dest == "file":
                 match = re.search(r"file (\S+)", line, re.M)
                 name = match.group(1)
             elif dest == "user":
                 match = re.search(r"user (\S+)", line, re.M)
                 name = match.group(1)
             else:
                 name = None
 
             if "facility" in line:
                 match = re.search(r"facility (\S+)", line, re.M)
                 facility = match.group(1)
             if "level" in line:
                 match = re.search(r"level (\S+)", line, re.M)
                 level = match.group(1).strip("'")
 
                 obj.append(
                     {
                         "dest": dest,
                         "name": name,
                         "facility": facility,
                         "level": level,
                     }
                 )
 
     return obj
 
 
 def map_params_to_obj(module, required_if=None):
     obj = []
 
     aggregate = module.params.get("aggregate")
     if aggregate:
         for item in aggregate:
             for key in item:
                 if item.get(key) is None:
                     item[key] = module.params[key]
 
             module._check_required_if(required_if, item)
             obj.append(item.copy())
 
     else:
         if module.params["dest"] not in ("host", "file", "user"):
             module.params["name"] = None
 
         obj.append(
             {
                 "dest": module.params["dest"],
                 "name": module.params["name"],
                 "facility": module.params["facility"],
                 "level": module.params["level"],
                 "state": module.params["state"],
             }
         )
 
     return obj
 
 
 def main():
     """ main entry point for module execution
     """
     element_spec = dict(
         dest=dict(
             type="str", choices=["console", "file", "global", "host", "user"]
         ),
         name=dict(type="str"),
         facility=dict(type="str"),
         level=dict(type="str"),
         state=dict(default="present", choices=["present", "absent"]),
     )
 
     aggregate_spec = deepcopy(element_spec)
 
     # remove default in aggregate spec, to handle common arguments
     remove_default_spec(aggregate_spec)
 
     argument_spec = dict(
         aggregate=dict(type="list", elements="dict", options=aggregate_spec)
     )
 
     argument_spec.update(element_spec)
 
     argument_spec.update(vyos_argument_spec)
     required_if = [
         ("dest", "host", ["name", "facility", "level"]),
         ("dest", "file", ["name", "facility", "level"]),
         ("dest", "user", ["name", "facility", "level"]),
         ("dest", "console", ["facility", "level"]),
         ("dest", "global", ["facility", "level"]),
     ]
 
     module = AnsibleModule(
         argument_spec=argument_spec,
         required_if=required_if,
         supports_check_mode=True,
     )
 
     warnings = list()
 
     result = {"changed": False}
     if warnings:
         result["warnings"] = warnings
     want = map_params_to_obj(module, required_if=required_if)
     have = config_to_dict(module)
 
     commands = spec_to_commands((want, have), module)
     result["commands"] = commands
 
     if commands:
         commit = not module.check_mode
         load_config(module, commands, commit=commit)
         result["changed"] = True
 
     module.exit_json(**result)
 
 
 if __name__ == "__main__":
     main()
diff --git a/plugins/modules/vyos_ping.py b/plugins/modules/vyos_ping.py
index 4b21927..8271049 100644
--- a/plugins/modules/vyos_ping.py
+++ b/plugins/modules/vyos_ping.py
@@ -1,260 +1,262 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
 
 # (c) 2017, Ansible by Red Hat, inc
 #
 # This file is part of Ansible by Red Hat
 #
 # Ansible is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
 # Ansible is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 from __future__ import absolute_import, division, print_function
 
 __metaclass__ = type
 
 ANSIBLE_METADATA = {
     "metadata_version": "1.1",
     "status": ["preview"],
     "supported_by": "community",
 }
 
 DOCUMENTATION = """
 ---
 module: vyos_ping
 short_description: Tests reachability using ping from VyOS network devices
 description:
   - Tests reachability using ping from a VyOS device to a remote destination.
   - Tested against VyOS 1.1.8 (helium)
   - For a general purpose network module, see the M(net_ping) module.
   - For Windows targets, use the M(win_ping) module instead.
   - For targets running Python, use the M(ping) module instead.
 author:
   - Nilashish Chakraborty (@NilashishC)
 version_added: '2.8'
 options:
   dest:
     description:
       - The IP Address or hostname (resolvable by the device) of the remote node.
     required: true
   count:
     description:
       - Number of packets to send to check reachability.
     type: int
     default: 5
   source:
     description:
       - The source interface or IP Address to use while sending the ping packet(s).
   ttl:
     description:
       - The time-to-live value for the ICMP packet(s).
     type: int
   size:
     description:
       - Determines the size (in bytes) of the ping packet(s).
     type: int
   interval:
     description:
       - Determines the interval (in seconds) between consecutive pings.
     type: int
   state:
     description:
       - Determines if the expected result is success or fail.
     choices: [ absent, present ]
     default: present
 notes:
+  - Tested against VyOS 1.1.8 (helium).
   - For a general purpose network module, see the M(net_ping) module.
   - For Windows targets, use the M(win_ping) module instead.
   - For targets running Python, use the M(ping) module instead.
+  - This module works with connection C(network_cli). See L(the VyOS OS Platform Options,../network/user_guide/platform_vyos.html).
 extends_documentation_fragment: vyos
 """
 
 EXAMPLES = """
 - name: Test reachability to 10.10.10.10
   vyos_ping:
     dest: 10.10.10.10
 
 - name: Test reachability to 10.20.20.20 using source and ttl set
   vyos_ping:
     dest: 10.20.20.20
     source: eth0
     ttl: 128
 
 - name: Test unreachability to 10.30.30.30 using interval
   vyos_ping:
     dest: 10.30.30.30
     interval: 3
     state: absent
 
 - name: Test reachability to 10.40.40.40 setting count and source
   vyos_ping:
     dest: 10.40.40.40
     source: eth1
     count: 20
     size: 512
 """
 
 RETURN = """
 commands:
   description: List of commands sent.
   returned: always
   type: list
   sample: ["ping 10.8.38.44 count 10 interface eth0 ttl 128"]
 packet_loss:
   description: Percentage of packets lost.
   returned: always
   type: str
   sample: "0%"
 packets_rx:
   description: Packets successfully received.
   returned: always
   type: int
   sample: 20
 packets_tx:
   description: Packets successfully transmitted.
   returned: always
   type: int
   sample: 20
 rtt:
   description: The round trip time (RTT) stats.
   returned: when ping succeeds
   type: dict
   sample: {"avg": 2, "max": 8, "min": 1, "mdev": 24}
 """
 
 from ansible.module_utils.basic import AnsibleModule
 from ansible_collections.vyos.vyos.plugins.module_utils.network.vyos.vyos import (
     run_commands,
 )
 from ansible_collections.vyos.vyos.plugins.module_utils.network.vyos.vyos import (
     vyos_argument_spec,
 )
 import re
 
 
 def main():
     """ main entry point for module execution
     """
     argument_spec = dict(
         count=dict(type="int", default=5),
         dest=dict(type="str", required=True),
         source=dict(type="str"),
         ttl=dict(type="int"),
         size=dict(type="int"),
         interval=dict(type="int"),
         state=dict(
             type="str", choices=["absent", "present"], default="present"
         ),
     )
 
     argument_spec.update(vyos_argument_spec)
 
     module = AnsibleModule(argument_spec=argument_spec)
 
     count = module.params["count"]
     dest = module.params["dest"]
     source = module.params["source"]
     size = module.params["size"]
     ttl = module.params["ttl"]
     interval = module.params["interval"]
 
     warnings = list()
 
     results = {}
     if warnings:
         results["warnings"] = warnings
 
     results["commands"] = [
         build_ping(dest, count, size, interval, source, ttl)
     ]
 
     ping_results = run_commands(module, commands=results["commands"])
     ping_results_list = ping_results[0].split("\n")
 
     rtt_info, rate_info = None, None
     for line in ping_results_list:
         if line.startswith("rtt"):
             rtt_info = line
         if line.startswith("%s packets transmitted" % count):
             rate_info = line
 
     if rtt_info:
         rtt = parse_rtt(rtt_info)
         for k, v in rtt.items():
             if rtt[k] is not None:
                 rtt[k] = int(v)
         results["rtt"] = rtt
 
     pkt_loss, rx, tx = parse_rate(rate_info)
     results["packet_loss"] = str(pkt_loss) + "%"
     results["packets_rx"] = int(rx)
     results["packets_tx"] = int(tx)
 
     validate_results(module, pkt_loss, results)
 
     module.exit_json(**results)
 
 
 def build_ping(dest, count, size=None, interval=None, source=None, ttl=None):
     cmd = "ping {0} count {1}".format(dest, str(count))
 
     if source:
         cmd += " interface {0}".format(source)
 
     if ttl:
         cmd += " ttl {0}".format(str(ttl))
 
     if size:
         cmd += " size {0}".format(str(size))
 
     if interval:
         cmd += " interval {0}".format(str(interval))
 
     return cmd
 
 
 def parse_rate(rate_info):
     rate_re = re.compile(
         r"(?P<tx>\d+) (?:\w+) (?:\w+), (?P<rx>\d+) (?:\w+), (?P<pkt_loss>\d+)% (?:\w+) (?:\w+), (?:\w+) (?P<time>\d+)"
     )
     rate_err_re = re.compile(
         r"(?P<tx>\d+) (?:\w+) (?:\w+), (?P<rx>\d+) (?:\w+), (?:[+-])(?P<err>\d+) (?:\w+), (?P<pkt_loss>\d+)% (?:\w+) (?:\w+), (?:\w+) (?P<time>\d+)"
     )
 
     if rate_re.match(rate_info):
         rate = rate_re.match(rate_info)
     elif rate_err_re.match(rate_info):
         rate = rate_err_re.match(rate_info)
 
     return rate.group("pkt_loss"), rate.group("rx"), rate.group("tx")
 
 
 def parse_rtt(rtt_info):
     rtt_re = re.compile(
         r"rtt (?:.*)=(?:\s*)(?P<min>\d*).(?:\d*)/(?P<avg>\d*).(?:\d*)/(?P<max>\d+).(?:\d*)/(?P<mdev>\d*)"
     )
     rtt = rtt_re.match(rtt_info)
 
     return rtt.groupdict()
 
 
 def validate_results(module, loss, results):
     state = module.params["state"]
     if state == "present" and int(loss) == 100:
         module.fail_json(msg="Ping failed unexpectedly", **results)
     elif state == "absent" and int(loss) < 100:
         module.fail_json(msg="Ping succeeded unexpectedly", **results)
 
 
 if __name__ == "__main__":
     main()
diff --git a/plugins/modules/vyos_static_route.py b/plugins/modules/vyos_static_route.py
index b7307ef..564a257 100644
--- a/plugins/modules/vyos_static_route.py
+++ b/plugins/modules/vyos_static_route.py
@@ -1,290 +1,291 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
 
 # (c) 2017, Ansible by Red Hat, inc
 #
 # This file is part of Ansible by Red Hat
 #
 # Ansible is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
 # Ansible is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 ANSIBLE_METADATA = {
     "metadata_version": "1.1",
     "status": ["preview"],
     "supported_by": "network",
 }
 
 
 DOCUMENTATION = """
 ---
 module: vyos_static_route
 version_added: "2.4"
 author: "Trishna Guha (@trishnaguha)"
 short_description: Manage static IP routes on Vyatta VyOS network devices
 description:
   - This module provides declarative management of static
     IP routes on Vyatta VyOS network devices.
 notes:
-  - Tested against VYOS 1.1.7
+  - Tested against VyOS 1.1.8 (helium).
+  - This module works with connection C(network_cli). See L(the VyOS OS Platform Options,../network/user_guide/platform_vyos.html).
 options:
   prefix:
     description:
       - Network prefix of the static route.
         C(mask) param should be ignored if C(prefix) is provided
         with C(mask) value C(prefix/mask).
   mask:
     description:
       - Network prefix mask of the static route.
   next_hop:
     description:
       - Next hop IP of the static route.
   admin_distance:
     description:
       - Admin distance of the static route.
   aggregate:
     description: List of static route definitions
   state:
     description:
       - State of the static route configuration.
     default: present
     choices: ['present', 'absent']
 extends_documentation_fragment: vyos
 """
 
 EXAMPLES = """
 - name: configure static route
   vyos_static_route:
     prefix: 192.168.2.0
     mask: 24
     next_hop: 10.0.0.1
 
 - name: configure static route prefix/mask
   vyos_static_route:
     prefix: 192.168.2.0/16
     next_hop: 10.0.0.1
 
 - name: remove configuration
   vyos_static_route:
     prefix: 192.168.2.0
     mask: 16
     next_hop: 10.0.0.1
     state: absent
 
 - name: configure aggregates of static routes
   vyos_static_route:
     aggregate:
       - { prefix: 192.168.2.0, mask: 24, next_hop: 10.0.0.1 }
       - { prefix: 192.168.3.0, mask: 16, next_hop: 10.0.2.1 }
       - { prefix: 192.168.3.0/16, next_hop: 10.0.2.1 }
 
 - name: Remove static route collections
   vyos_static_route:
     aggregate:
       - { prefix: 172.24.1.0/24, next_hop: 192.168.42.64 }
       - { prefix: 172.24.3.0/24, next_hop: 192.168.42.64 }
     state: absent
 """
 
 RETURN = """
 commands:
   description: The list of configuration mode commands to send to the device
   returned: always
   type: list
   sample:
     - set protocols static route 192.168.2.0/16 next-hop 10.0.0.1
 """
 import re
 
 from copy import deepcopy
 
 from ansible.module_utils.basic import AnsibleModule
 from ansible.module_utils.network.common.utils import remove_default_spec
 from ansible_collections.vyos.vyos.plugins.module_utils.network.vyos.vyos import (
     get_config,
     load_config,
 )
 from ansible_collections.vyos.vyos.plugins.module_utils.network.vyos.vyos import (
     vyos_argument_spec,
 )
 
 
 def spec_to_commands(updates, module):
     commands = list()
     want, have = updates
     for w in want:
         prefix = w["prefix"]
         mask = w["mask"]
         next_hop = w["next_hop"]
         admin_distance = w["admin_distance"]
         state = w["state"]
         del w["state"]
 
         if state == "absent" and w in have:
             commands.append(
                 "delete protocols static route %s/%s" % (prefix, mask)
             )
         elif state == "present" and w not in have:
             cmd = "set protocols static route %s/%s next-hop %s" % (
                 prefix,
                 mask,
                 next_hop,
             )
             if admin_distance != "None":
                 cmd += " distance %s" % (admin_distance)
             commands.append(cmd)
 
     return commands
 
 
 def config_to_dict(module):
     data = get_config(module)
     obj = []
 
     for line in data.split("\n"):
         if line.startswith("set protocols static route"):
             match = re.search(r"static route (\S+)", line, re.M)
             prefix = match.group(1).split("/")[0]
             mask = match.group(1).split("/")[1]
             if "next-hop" in line:
                 match_hop = re.search(r"next-hop (\S+)", line, re.M)
                 next_hop = match_hop.group(1).strip("'")
 
                 match_distance = re.search(r"distance (\S+)", line, re.M)
                 if match_distance is not None:
                     admin_distance = match_distance.group(1)[1:-1]
                 else:
                     admin_distance = None
 
                 if admin_distance is not None:
                     obj.append(
                         {
                             "prefix": prefix,
                             "mask": mask,
                             "next_hop": next_hop,
                             "admin_distance": admin_distance,
                         }
                     )
                 else:
                     obj.append(
                         {
                             "prefix": prefix,
                             "mask": mask,
                             "next_hop": next_hop,
                             "admin_distance": "None",
                         }
                     )
 
     return obj
 
 
 def map_params_to_obj(module, required_together=None):
     obj = []
     aggregate = module.params.get("aggregate")
     if aggregate:
         for item in aggregate:
             for key in item:
                 if item.get(key) is None:
                     item[key] = module.params[key]
 
             module._check_required_together(required_together, item)
             d = item.copy()
             if "/" in d["prefix"]:
                 d["mask"] = d["prefix"].split("/")[1]
                 d["prefix"] = d["prefix"].split("/")[0]
 
             if "admin_distance" in d:
                 d["admin_distance"] = str(d["admin_distance"])
 
             obj.append(d)
     else:
         prefix = module.params["prefix"].strip()
         if "/" in prefix:
             mask = prefix.split("/")[1]
             prefix = prefix.split("/")[0]
         else:
             mask = module.params["mask"].strip()
         next_hop = module.params["next_hop"].strip()
         admin_distance = str(module.params["admin_distance"])
         state = module.params["state"]
 
         obj.append(
             {
                 "prefix": prefix,
                 "mask": mask,
                 "next_hop": next_hop,
                 "admin_distance": admin_distance,
                 "state": state,
             }
         )
 
     return obj
 
 
 def main():
     """ main entry point for module execution
     """
     element_spec = dict(
         prefix=dict(type="str"),
         mask=dict(type="str"),
         next_hop=dict(type="str"),
         admin_distance=dict(type="int"),
         state=dict(default="present", choices=["present", "absent"]),
     )
 
     aggregate_spec = deepcopy(element_spec)
     aggregate_spec["prefix"] = dict(required=True)
 
     # remove default in aggregate spec, to handle common arguments
     remove_default_spec(aggregate_spec)
 
     argument_spec = dict(
         aggregate=dict(type="list", elements="dict", options=aggregate_spec)
     )
 
     argument_spec.update(element_spec)
     argument_spec.update(vyos_argument_spec)
 
     required_one_of = [["aggregate", "prefix"]]
     required_together = [["prefix", "next_hop"]]
     mutually_exclusive = [["aggregate", "prefix"]]
 
     module = AnsibleModule(
         argument_spec=argument_spec,
         required_one_of=required_one_of,
         required_together=required_together,
         mutually_exclusive=mutually_exclusive,
         supports_check_mode=True,
     )
 
     warnings = list()
 
     result = {"changed": False}
     if warnings:
         result["warnings"] = warnings
     want = map_params_to_obj(module, required_together=required_together)
     have = config_to_dict(module)
 
     commands = spec_to_commands((want, have), module)
     result["commands"] = commands
 
     if commands:
         commit = not module.check_mode
         load_config(module, commands, commit=commit)
         result["changed"] = True
 
     module.exit_json(**result)
 
 
 if __name__ == "__main__":
     main()
diff --git a/plugins/modules/vyos_system.py b/plugins/modules/vyos_system.py
index 9fee88f..30694a6 100644
--- a/plugins/modules/vyos_system.py
+++ b/plugins/modules/vyos_system.py
@@ -1,224 +1,225 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
 #
 # This file is part of Ansible
 #
 # Ansible is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
 # Ansible is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 ANSIBLE_METADATA = {
     "metadata_version": "1.1",
     "status": ["preview"],
     "supported_by": "network",
 }
 
 
 DOCUMENTATION = """
 ---
 module: "vyos_system"
 version_added: "2.3"
 author: "Nathaniel Case (@Qalthos)"
 short_description: Run `set system` commands on VyOS devices
 description:
   - Runs one or more commands on remote devices running VyOS.
     This module can also be introspected to validate key parameters before
     returning successfully.
 extends_documentation_fragment: vyos
 notes:
-  - Tested against VYOS 1.1.7
+  - Tested against VyOS 1.1.8 (helium).
+  - This module works with connection C(network_cli). See L(the VyOS OS Platform Options,../network/user_guide/platform_vyos.html).
 options:
   host_name:
     description:
       - Configure the device hostname parameter. This option takes an ASCII string value.
   domain_name:
     description:
       - The new domain name to apply to the device.
   name_servers:
     description:
       - A list of name servers to use with the device. Mutually exclusive with
         I(domain_search)
     aliases: ['name_server']
   domain_search:
     description:
       - A list of domain names to search. Mutually exclusive with
         I(name_server)
   state:
     description:
       - Whether to apply (C(present)) or remove (C(absent)) the settings.
     default: present
     choices: ['present', 'absent']
 """
 
 RETURN = """
 commands:
   description: The list of configuration mode commands to send to the device
   returned: always
   type: list
   sample:
     - set system hostname vyos01
     - set system domain-name foo.example.com
 """
 
 EXAMPLES = """
 - name: configure hostname and domain-name
   vyos_system:
     host_name: vyos01
     domain_name: test.example.com
 
 - name: remove all configuration
   vyos_system:
     state: absent
 
 - name: configure name servers
   vyos_system:
     name_servers
       - 8.8.8.8
       - 8.8.4.4
 
 - name: configure domain search suffixes
   vyos_system:
     domain_search:
       - sub1.example.com
       - sub2.example.com
 """
 
 from ansible.module_utils.basic import AnsibleModule
 from ansible_collections.vyos.vyos.plugins.module_utils.network.vyos.vyos import (
     get_config,
     load_config,
 )
 from ansible_collections.vyos.vyos.plugins.module_utils.network.vyos.vyos import (
     vyos_argument_spec,
 )
 
 
 def spec_key_to_device_key(key):
     device_key = key.replace("_", "-")
 
     # domain-search is longer than just it's key
     if device_key == "domain-search":
         device_key += " domain"
 
     return device_key
 
 
 def config_to_dict(module):
     data = get_config(module)
 
     config = {"domain_search": [], "name_server": []}
 
     for line in data.split("\n"):
         if line.startswith("set system host-name"):
             config["host_name"] = line[22:-1]
         elif line.startswith("set system domain-name"):
             config["domain_name"] = line[24:-1]
         elif line.startswith("set system domain-search domain"):
             config["domain_search"].append(line[33:-1])
         elif line.startswith("set system name-server"):
             config["name_server"].append(line[24:-1])
 
     return config
 
 
 def spec_to_commands(want, have):
     commands = []
 
     state = want.pop("state")
 
     # state='absent' by itself has special meaning
     if state == "absent" and all(v is None for v in want.values()):
         # Clear everything
         for key in have:
             commands.append("delete system %s" % spec_key_to_device_key(key))
 
     for key in want:
         if want[key] is None:
             continue
 
         current = have.get(key)
         proposed = want[key]
         device_key = spec_key_to_device_key(key)
 
         # These keys are lists which may need to  be reconciled with the device
         if key in ["domain_search", "name_server"]:
             if not proposed:
                 # Empty list was passed, delete all values
                 commands.append("delete system %s" % device_key)
             for config in proposed:
                 if state == "absent" and config in current:
                     commands.append(
                         "delete system %s '%s'" % (device_key, config)
                     )
                 elif state == "present" and config not in current:
                     commands.append(
                         "set system %s '%s'" % (device_key, config)
                     )
         else:
             if state == "absent" and current and proposed:
                 commands.append("delete system %s" % device_key)
             elif state == "present" and proposed and proposed != current:
                 commands.append("set system %s '%s'" % (device_key, proposed))
 
     return commands
 
 
 def map_param_to_obj(module):
     return {
         "host_name": module.params["host_name"],
         "domain_name": module.params["domain_name"],
         "domain_search": module.params["domain_search"],
         "name_server": module.params["name_server"],
         "state": module.params["state"],
     }
 
 
 def main():
     argument_spec = dict(
         host_name=dict(type="str"),
         domain_name=dict(type="str"),
         domain_search=dict(type="list"),
         name_server=dict(type="list", aliases=["name_servers"]),
         state=dict(
             type="str", default="present", choices=["present", "absent"]
         ),
     )
 
     argument_spec.update(vyos_argument_spec)
 
     module = AnsibleModule(
         argument_spec=argument_spec,
         supports_check_mode=True,
         mutually_exclusive=[("domain_name", "domain_search")],
     )
 
     warnings = list()
 
     result = {"changed": False, "warnings": warnings}
 
     want = map_param_to_obj(module)
     have = config_to_dict(module)
 
     commands = spec_to_commands(want, have)
     result["commands"] = commands
 
     if commands:
         commit = not module.check_mode
         load_config(module, commands, commit=commit)
         result["changed"] = True
 
     module.exit_json(**result)
 
 
 if __name__ == "__main__":
     main()
diff --git a/plugins/modules/vyos_user.py b/plugins/modules/vyos_user.py
index 2a1181a..eb71c58 100644
--- a/plugins/modules/vyos_user.py
+++ b/plugins/modules/vyos_user.py
@@ -1,359 +1,360 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
 
 # (c) 2017, Ansible by Red Hat, inc
 #
 # This file is part of Ansible by Red Hat
 #
 # Ansible is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
 # Ansible is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 ANSIBLE_METADATA = {
     "metadata_version": "1.1",
     "status": ["preview"],
     "supported_by": "network",
 }
 
 DOCUMENTATION = """
 ---
 module: vyos_user
 version_added: "2.4"
 author: "Trishna Guha (@trishnaguha)"
 short_description: Manage the collection of local users on VyOS device
 description:
   - This module provides declarative management of the local usernames
     configured on network devices. It allows playbooks to manage
     either individual usernames or the collection of usernames in the
     current running config. It also supports purging usernames from the
     configuration that are not explicitly defined.
 notes:
-  - Tested against VYOS 1.1.7
+  - Tested against VyOS 1.1.8 (helium).
+  - This module works with connection C(network_cli). See L(the VyOS OS Platform Options,../network/user_guide/platform_vyos.html).
 options:
   aggregate:
     description:
       - The set of username objects to be configured on the remote
         VyOS device. The list entries can either be the username or
         a hash of username and properties. This argument is mutually
         exclusive with the C(name) argument.
     aliases: ['users', 'collection']
   name:
     description:
       - The username to be configured on the VyOS device.
         This argument accepts a string value and is mutually exclusive
         with the C(aggregate) argument.
         Please note that this option is not same as C(provider username).
   full_name:
     description:
       - The C(full_name) argument provides the full name of the user
         account to be created on the remote device. This argument accepts
         any text string value.
   configured_password:
     description:
       - The password to be configured on the VyOS device. The
         password needs to be provided in clear and it will be encrypted
         on the device.
         Please note that this option is not same as C(provider password).
   update_password:
     description:
       - Since passwords are encrypted in the device running config, this
         argument will instruct the module when to change the password.  When
         set to C(always), the password will always be updated in the device
         and when set to C(on_create) the password will be updated only if
         the username is created.
     default: always
     choices: ['on_create', 'always']
   level:
     description:
       - The C(level) argument configures the level of the user when logged
         into the system. This argument accepts string values admin or operator.
     aliases: ['role']
   purge:
     description:
       - Instructs the module to consider the
         resource definition absolute. It will remove any previously
         configured usernames on the device with the exception of the
         `admin` user (the current defined set of users).
     type: bool
     default: false
   state:
     description:
       - Configures the state of the username definition
         as it relates to the device operational configuration. When set
         to I(present), the username(s) should be configured in the device active
         configuration and when set to I(absent) the username(s) should not be
         in the device active configuration
     default: present
     choices: ['present', 'absent']
 extends_documentation_fragment: vyos
 """
 
 EXAMPLES = """
 - name: create a new user
   vyos_user:
     name: ansible
     configured_password: password
     state: present
 - name: remove all users except admin
   vyos_user:
     purge: yes
 - name: set multiple users to level operator
   vyos_user:
     aggregate:
       - name: netop
       - name: netend
     level: operator
     state: present
 - name: Change Password for User netop
   vyos_user:
     name: netop
     configured_password: "{{ new_password }}"
     update_password: always
     state: present
 """
 
 RETURN = """
 commands:
   description: The list of configuration mode commands to send to the device
   returned: always
   type: list
   sample:
     - set system login user test level operator
     - set system login user authentication plaintext-password password
 """
 
 import re
 
 from copy import deepcopy
 from functools import partial
 
 from ansible.module_utils.basic import AnsibleModule
 from ansible.module_utils.network.common.utils import remove_default_spec
 from ansible_collections.vyos.vyos.plugins.module_utils.network.vyos.vyos import (
     get_config,
     load_config,
 )
 from ansible.module_utils.six import iteritems
 from ansible_collections.vyos.vyos.plugins.module_utils.network.vyos.vyos import (
     vyos_argument_spec,
 )
 
 
 def validate_level(value, module):
     if value not in ("admin", "operator"):
         module.fail_json(
             msg="level must be either admin or operator, got %s" % value
         )
 
 
 def spec_to_commands(updates, module):
     commands = list()
     update_password = module.params["update_password"]
 
     def needs_update(want, have, x):
         return want.get(x) and (want.get(x) != have.get(x))
 
     def add(command, want, x):
         command.append("set system login user %s %s" % (want["name"], x))
 
     for update in updates:
         want, have = update
 
         if want["state"] == "absent":
             commands.append("delete system login user %s" % want["name"])
             continue
 
         if needs_update(want, have, "level"):
             add(commands, want, "level %s" % want["level"])
 
         if needs_update(want, have, "full_name"):
             add(commands, want, "full-name %s" % want["full_name"])
 
         if needs_update(want, have, "configured_password"):
             if update_password == "always" or not have:
                 add(
                     commands,
                     want,
                     "authentication plaintext-password %s"
                     % want["configured_password"],
                 )
 
     return commands
 
 
 def parse_level(data):
     match = re.search(r"level (\S+)", data, re.M)
     if match:
         level = match.group(1)[1:-1]
         return level
 
 
 def parse_full_name(data):
     match = re.search(r"full-name (\S+)", data, re.M)
     if match:
         full_name = match.group(1)[1:-1]
         return full_name
 
 
 def config_to_dict(module):
     data = get_config(module)
 
     match = re.findall(r"^set system login user (\S+)", data, re.M)
     if not match:
         return list()
 
     instances = list()
 
     for user in set(match):
         regex = r" %s .+$" % user
         cfg = re.findall(regex, data, re.M)
         cfg = "\n".join(cfg)
         obj = {
             "name": user,
             "state": "present",
             "configured_password": None,
             "level": parse_level(cfg),
             "full_name": parse_full_name(cfg),
         }
         instances.append(obj)
 
     return instances
 
 
 def get_param_value(key, item, module):
     # if key doesn't exist in the item, get it from module.params
     if not item.get(key):
         value = module.params[key]
 
     # validate the param value (if validator func exists)
     validator = globals().get("validate_%s" % key)
     if all((value, validator)):
         validator(value, module)
 
     return value
 
 
 def map_params_to_obj(module):
     aggregate = module.params["aggregate"]
     if not aggregate:
         if not module.params["name"] and module.params["purge"]:
             return list()
         else:
             users = [{"name": module.params["name"]}]
     else:
         users = list()
         for item in aggregate:
             if not isinstance(item, dict):
                 users.append({"name": item})
             else:
                 users.append(item)
 
     objects = list()
 
     for item in users:
         get_value = partial(get_param_value, item=item, module=module)
         item["configured_password"] = get_value("configured_password")
         item["full_name"] = get_value("full_name")
         item["level"] = get_value("level")
         item["state"] = get_value("state")
         objects.append(item)
 
     return objects
 
 
 def update_objects(want, have):
     updates = list()
     for entry in want:
         item = next((i for i in have if i["name"] == entry["name"]), None)
         if item is None:
             updates.append((entry, {}))
         elif item:
             for key, value in iteritems(entry):
                 if value and value != item[key]:
                     updates.append((entry, item))
     return updates
 
 
 def main():
     """ main entry point for module execution
     """
     element_spec = dict(
         name=dict(),
         full_name=dict(),
         level=dict(aliases=["role"]),
         configured_password=dict(no_log=True),
         update_password=dict(
             default="always", choices=["on_create", "always"]
         ),
         state=dict(default="present", choices=["present", "absent"]),
     )
 
     aggregate_spec = deepcopy(element_spec)
     aggregate_spec["name"] = dict(required=True)
 
     # remove default in aggregate spec, to handle common arguments
     remove_default_spec(aggregate_spec)
 
     argument_spec = dict(
         aggregate=dict(
             type="list",
             elements="dict",
             options=aggregate_spec,
             aliases=["users", "collection"],
         ),
         purge=dict(type="bool", default=False),
     )
 
     argument_spec.update(element_spec)
     argument_spec.update(vyos_argument_spec)
 
     mutually_exclusive = [("name", "aggregate")]
     module = AnsibleModule(
         argument_spec=argument_spec,
         mutually_exclusive=mutually_exclusive,
         supports_check_mode=True,
     )
 
     warnings = list()
     if module.params["password"] and not module.params["configured_password"]:
         warnings.append(
             'The "password" argument is used to authenticate the current connection. '
             + 'To set a user password use "configured_password" instead.'
         )
 
     result = {"changed": False}
     if warnings:
         result["warnings"] = warnings
 
     want = map_params_to_obj(module)
     have = config_to_dict(module)
     commands = spec_to_commands(update_objects(want, have), module)
 
     if module.params["purge"]:
         want_users = [x["name"] for x in want]
         have_users = [x["name"] for x in have]
         for item in set(have_users).difference(want_users):
             commands.append("delete system login user %s" % item)
 
     result["commands"] = commands
 
     if commands:
         commit = not module.check_mode
         load_config(module, commands, commit=commit)
         result["changed"] = True
 
     module.exit_json(**result)
 
 
 if __name__ == "__main__":
     main()
diff --git a/plugins/modules/vyos_vlan.py b/plugins/modules/vyos_vlan.py
index 10eaecd..4564749 100644
--- a/plugins/modules/vyos_vlan.py
+++ b/plugins/modules/vyos_vlan.py
@@ -1,365 +1,366 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
 
 # Copyright: (c) 2017, Ansible by Red Hat, inc
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 from __future__ import absolute_import, division, print_function
 
 __metaclass__ = type
 
 
 ANSIBLE_METADATA = {
     "metadata_version": "1.1",
     "status": ["preview"],
     "supported_by": "network",
 }
 
 DOCUMENTATION = """
 ---
 module: vyos_vlan
 version_added: "2.5"
 author: "Trishna Guha (@trishnaguha)"
 short_description: Manage VLANs on VyOS network devices
 description:
   - This module provides declarative management of VLANs
     on VyOS network devices.
 notes:
-  - Tested against VYOS 1.1.7
+  - Tested against VyOS 1.1.8 (helium).
+  - This module works with connection C(network_cli). See L(the VyOS OS Platform Options,../network/user_guide/platform_vyos.html).
 options:
   name:
     description:
       - Name of the VLAN.
   address:
     description:
       - Configure Virtual interface address.
   vlan_id:
     description:
       - ID of the VLAN. Range 0-4094.
     required: true
   interfaces:
     description:
       - List of interfaces that should be associated to the VLAN.
     required: true
   associated_interfaces:
     description:
       - This is a intent option and checks the operational state of the for given vlan C(name)
         for associated interfaces. If the value in the C(associated_interfaces) does not match with
         the operational state of vlan on device it will result in failure.
     version_added: "2.5"
   delay:
     description:
       - Delay the play should wait to check for declarative intent params values.
     default: 10
   aggregate:
     description: List of VLANs definitions.
   purge:
     description:
       - Purge VLANs not defined in the I(aggregate) parameter.
     default: no
     type: bool
   state:
     description:
       - State of the VLAN configuration.
     default: present
     choices: ['present', 'absent']
 extends_documentation_fragment: vyos
 """
 
 EXAMPLES = """
 - name: Create vlan
   vyos_vlan:
     vlan_id: 100
     name: vlan-100
     interfaces: eth1
     state: present
 
 - name: Add interfaces to VLAN
   vyos_vlan:
     vlan_id: 100
     interfaces:
       - eth1
       - eth2
 
 - name: Configure virtual interface address
   vyos_vlan:
     vlan_id: 100
     interfaces: eth1
     address: 172.26.100.37/24
 
 - name: vlan interface config + intent
   vyos_vlan:
     vlan_id: 100
     interfaces: eth0
     associated_interfaces:
     - eth0
 
 - name: vlan intent check
   vyos_vlan:
     vlan_id: 100
     associated_interfaces:
     - eth3
     - eth4
 
 - name: Delete vlan
   vyos_vlan:
     vlan_id: 100
     interfaces: eth1
     state: absent
 """
 
 RETURN = """
 commands:
   description: The list of configuration mode commands to send to the device
   returned: always
   type: list
   sample:
     - set interfaces ethernet eth1 vif 100 description VLAN 100
     - set interfaces ethernet eth1 vif 100 address 172.26.100.37/24
     - delete interfaces ethernet eth1 vif 100
 """
 import re
 import time
 
 from copy import deepcopy
 
 from ansible.module_utils.basic import AnsibleModule
 from ansible.module_utils.network.common.utils import remove_default_spec
 from ansible_collections.vyos.vyos.plugins.module_utils.network.vyos.vyos import (
     load_config,
     run_commands,
 )
 from ansible_collections.vyos.vyos.plugins.module_utils.network.vyos.vyos import (
     vyos_argument_spec,
 )
 
 
 def search_obj_in_list(vlan_id, lst):
     obj = list()
     for o in lst:
         if o["vlan_id"] == vlan_id:
             obj.append(o)
     return obj
 
 
 def map_obj_to_commands(updates, module):
     commands = list()
     want, have = updates
     purge = module.params["purge"]
 
     for w in want:
         vlan_id = w["vlan_id"]
         name = w["name"]
         address = w["address"]
         state = w["state"]
 
         obj_in_have = search_obj_in_list(vlan_id, have)
 
         if state == "absent":
             if obj_in_have:
                 for obj in obj_in_have:
                     for i in obj["interfaces"]:
                         commands.append(
                             "delete interfaces ethernet {0} vif {1}".format(
                                 i, vlan_id
                             )
                         )
 
         elif state == "present":
             if not obj_in_have:
                 if w["interfaces"] and w["vlan_id"]:
                     for i in w["interfaces"]:
                         cmd = "set interfaces ethernet {0} vif {1}".format(
                             i, vlan_id
                         )
                         if w["name"]:
                             commands.append(
                                 cmd + " description {0}".format(name)
                             )
                         elif w["address"]:
                             commands.append(
                                 cmd + " address {0}".format(address)
                             )
                         else:
                             commands.append(cmd)
 
     if purge:
         for h in have:
             obj_in_want = search_obj_in_list(h["vlan_id"], want)
             if not obj_in_want:
                 for i in h["interfaces"]:
                     commands.append(
                         "delete interfaces ethernet {0} vif {1}".format(
                             i, h["vlan_id"]
                         )
                     )
 
     return commands
 
 
 def map_params_to_obj(module):
     obj = []
     aggregate = module.params.get("aggregate")
     if aggregate:
         for item in aggregate:
             for key in item:
                 if item.get(key) is None:
                     item[key] = module.params[key]
 
             d = item.copy()
 
             if not d["vlan_id"]:
                 module.fail_json(msg="vlan_id is required")
 
             d["vlan_id"] = str(d["vlan_id"])
             module._check_required_one_of(module.required_one_of, item)
 
             obj.append(d)
     else:
         obj.append(
             {
                 "vlan_id": str(module.params["vlan_id"]),
                 "name": module.params["name"],
                 "address": module.params["address"],
                 "state": module.params["state"],
                 "interfaces": module.params["interfaces"],
                 "associated_interfaces": module.params[
                     "associated_interfaces"
                 ],
             }
         )
 
     return obj
 
 
 def map_config_to_obj(module):
     objs = []
 
     output = run_commands(module, "show interfaces")
     lines = output[0].strip().splitlines()[3:]
 
     for l in lines:
         splitted_line = re.split(r"\s{2,}", l.strip())
         obj = {}
 
         eth = splitted_line[0].strip("'")
         if eth.startswith("eth"):
             obj["interfaces"] = []
             if "." in eth:
                 interface = eth.split(".")[0]
                 obj["interfaces"].append(interface)
                 obj["vlan_id"] = eth.split(".")[-1]
             else:
                 obj["interfaces"].append(eth)
                 obj["vlan_id"] = None
 
             if splitted_line[1].strip("'") != "-":
                 obj["address"] = splitted_line[1].strip("'")
 
             if len(splitted_line) > 3:
                 obj["name"] = splitted_line[3].strip("'")
             obj["state"] = "present"
             objs.append(obj)
 
     return objs
 
 
 def check_declarative_intent_params(want, module, result):
 
     have = None
     obj_interface = list()
     is_delay = False
 
     for w in want:
         if w.get("associated_interfaces") is None:
             continue
 
         if result["changed"] and not is_delay:
             time.sleep(module.params["delay"])
             is_delay = True
 
         if have is None:
             have = map_config_to_obj(module)
 
         obj_in_have = search_obj_in_list(w["vlan_id"], have)
         if obj_in_have:
             for obj in obj_in_have:
                 obj_interface.extend(obj["interfaces"])
 
     for w in want:
         if w.get("associated_interfaces") is None:
             continue
         for i in w["associated_interfaces"]:
             if (set(obj_interface) - set(w["associated_interfaces"])) != set(
                 []
             ):
                 module.fail_json(
                     msg="Interface {0} not configured on vlan {1}".format(
                         i, w["vlan_id"]
                     )
                 )
 
 
 def main():
     """ main entry point for module execution
     """
     element_spec = dict(
         vlan_id=dict(type="int"),
         name=dict(),
         address=dict(),
         interfaces=dict(type="list"),
         associated_interfaces=dict(type="list"),
         delay=dict(default=10, type="int"),
         state=dict(default="present", choices=["present", "absent"]),
     )
 
     aggregate_spec = deepcopy(element_spec)
 
     # remove default in aggregate spec, to handle common arguments
     remove_default_spec(aggregate_spec)
 
     argument_spec = dict(
         aggregate=dict(type="list", elements="dict", options=aggregate_spec),
         purge=dict(default=False, type="bool"),
     )
 
     argument_spec.update(element_spec)
     argument_spec.update(vyos_argument_spec)
 
     required_one_of = [
         ["vlan_id", "aggregate"],
         ["aggregate", "interfaces", "associated_interfaces"],
     ]
 
     mutually_exclusive = [["vlan_id", "aggregate"]]
     module = AnsibleModule(
         argument_spec=argument_spec,
         supports_check_mode=True,
         required_one_of=required_one_of,
         mutually_exclusive=mutually_exclusive,
     )
 
     warnings = list()
     result = {"changed": False}
 
     if warnings:
         result["warnings"] = warnings
 
     want = map_params_to_obj(module)
     have = map_config_to_obj(module)
 
     commands = map_obj_to_commands((want, have), module)
     result["commands"] = commands
 
     if commands:
         commit = not module.check_mode
         load_config(module, commands, commit=commit)
         result["changed"] = True
 
     check_declarative_intent_params(want, module, result)
 
     module.exit_json(**result)
 
 
 if __name__ == "__main__":
     main()
diff --git a/test/integration/integration_config.yml b/test/integration/integration_config.yml
deleted file mode 100644
index 6b47a35..0000000
--- a/test/integration/integration_config.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-win_output_dir: 'C:\ansible_testing'
-output_dir: ~/ansible_testing
diff --git a/test/integration/target-prefixes.network b/test/integration/target-prefixes.network
index 2d0f40c..0c45eba 100644
--- a/test/integration/target-prefixes.network
+++ b/test/integration/target-prefixes.network
@@ -1 +1 @@
-vyos
+vyos
\ No newline at end of file
diff --git a/test/integration/targets/prepare_vyos_tests/tasks/main.yaml b/test/integration/targets/prepare_vyos_tests/tasks/main.yaml
index a156ea4..1a81fb1 100644
--- a/test/integration/targets/prepare_vyos_tests/tasks/main.yaml
+++ b/test/integration/targets/prepare_vyos_tests/tasks/main.yaml
@@ -1,11 +1,13 @@
 ---
 - name: Ensure required interfaces are present in running-config
   network.cli.cli_config:
     config: "{{ lines }}"
   vars:
     lines: |
       set interfaces ethernet eth0 address dhcp
+      set interfaces ethernet eth0 speed auto
+      set interfaces ethernet eth0 duplex auto
       set interfaces ethernet eth1
       set interfaces ethernet eth2
       delete interfaces loopback lo
   ignore_errors: yes
diff --git a/test/integration/targets/vyos_lldp_interfaces/defaults/main.yaml b/test/integration/targets/vyos_lldp_interfaces/defaults/main.yaml
new file mode 100644
index 0000000..164afea
--- /dev/null
+++ b/test/integration/targets/vyos_lldp_interfaces/defaults/main.yaml
@@ -0,0 +1,3 @@
+---
+testcase: "[^_].*"
+test_items: []
diff --git a/test/integration/targets/vyos_lldp_interfaces/meta/main.yaml b/test/integration/targets/vyos_lldp_interfaces/meta/main.yaml
new file mode 100644
index 0000000..f88bce5
--- /dev/null
+++ b/test/integration/targets/vyos_lldp_interfaces/meta/main.yaml
@@ -0,0 +1,2 @@
+dependencies:
+  - prepare_vyos_tests
diff --git a/test/integration/targets/vyos_lldp_interfaces/tasks/cli.yaml b/test/integration/targets/vyos_lldp_interfaces/tasks/cli.yaml
new file mode 100644
index 0000000..655e51e
--- /dev/null
+++ b/test/integration/targets/vyos_lldp_interfaces/tasks/cli.yaml
@@ -0,0 +1,19 @@
+---
+- name: Collect all cli test cases
+  find:
+    paths: "{{ role_path }}/tests/cli"
+    patterns: "{{ testcase }}.yaml"
+    use_regex: true
+  register: test_cases
+  delegate_to: localhost
+
+- name: Set test_items
+  set_fact: test_items="{{ test_cases.files | map(attribute='path') | list }}"
+
+- name: Run test case (connection=network_cli)
+  include: "{{ test_case_to_run }}"
+  vars:
+    ansible_connection: network_cli
+  with_items: "{{ test_items }}"
+  loop_control:
+    loop_var: test_case_to_run
diff --git a/test/integration/targets/vyos_lldp_interfaces/tasks/main.yaml b/test/integration/targets/vyos_lldp_interfaces/tasks/main.yaml
new file mode 100644
index 0000000..415c99d
--- /dev/null
+++ b/test/integration/targets/vyos_lldp_interfaces/tasks/main.yaml
@@ -0,0 +1,2 @@
+---
+- { include: cli.yaml, tags: ['cli'] }
diff --git a/test/integration/targets/vyos_lldp_interfaces/tests/cli/_populate.yaml b/test/integration/targets/vyos_lldp_interfaces/tests/cli/_populate.yaml
new file mode 100644
index 0000000..80f7d1a
--- /dev/null
+++ b/test/integration/targets/vyos_lldp_interfaces/tests/cli/_populate.yaml
@@ -0,0 +1,14 @@
+---
+- name: Setup
+  network.cli.cli_config:
+    config: "{{ lines }}"
+  vars:
+    lines: |
+      set service lldp interface eth1
+      set service lldp interface eth1 location civic-based country-code US
+      set service lldp interface eth1 location civic-based ca-type 0 ca-value ENGLISH
+      set service lldp interface eth2
+      set service lldp interface eth2 location coordinate-based latitude 33.524449N
+      set service lldp interface eth2 location coordinate-based altitude 2200
+      set service lldp interface eth2 location coordinate-based datum WGS84
+      set service lldp interface eth2 location coordinate-based longitude 222.267255W
diff --git a/test/integration/targets/vyos_lldp_interfaces/tests/cli/_populate_intf.yaml b/test/integration/targets/vyos_lldp_interfaces/tests/cli/_populate_intf.yaml
new file mode 100644
index 0000000..ee9a9bd
--- /dev/null
+++ b/test/integration/targets/vyos_lldp_interfaces/tests/cli/_populate_intf.yaml
@@ -0,0 +1,10 @@
+---
+- name: Setup
+  network.cli.cli_config:
+    config: "{{ lines }}"
+  vars:
+    lines: |
+      set service lldp interface eth2
+      set service lldp interface eth2 location civic-based country-code US
+      set service lldp interface eth2 location civic-based ca-type 0 ca-value ENGLISH
+      set service lldp interface eth2 disable
diff --git a/test/integration/targets/vyos_lldp_interfaces/tests/cli/_remove_config.yaml b/test/integration/targets/vyos_lldp_interfaces/tests/cli/_remove_config.yaml
new file mode 100644
index 0000000..e3abbdb
--- /dev/null
+++ b/test/integration/targets/vyos_lldp_interfaces/tests/cli/_remove_config.yaml
@@ -0,0 +1,8 @@
+---
+- name: Remove Config
+  network.cli.cli_config:
+    config: "{{ lines }}"
+  vars:
+    lines: |
+      delete service lldp interface
+      delete service lldp 
diff --git a/test/integration/targets/vyos_lldp_interfaces/tests/cli/deleted.yaml b/test/integration/targets/vyos_lldp_interfaces/tests/cli/deleted.yaml
new file mode 100644
index 0000000..bd7c713
--- /dev/null
+++ b/test/integration/targets/vyos_lldp_interfaces/tests/cli/deleted.yaml
@@ -0,0 +1,46 @@
+---
+- debug:
+    msg: "Start vyos_lldp_interfaces deleted integration tests ansible_connection={{ ansible_connection }}"
+
+- include_tasks: _populate.yaml
+
+- block:
+  - name: Delete attributes of given LLDP interfaces.
+    vyos.vyos.vyos_lldp_interfaces: &deleted
+      config:
+        - name: 'eth1'
+        - name: 'eth2'
+      state: deleted
+    register: result
+
+  - name: Assert that the before dicts were correctly generated
+    assert:
+      that:
+        - "{{ populate | symmetric_difference(result['before']) |length == 0 }}"
+
+  - name: Assert that the correct set of commands were generated
+    assert:
+      that:
+        - "{{ deleted['commands'] | symmetric_difference(result['commands']) |length == 0 }}"
+
+  - name: Assert that the after dicts were correctly generated
+    assert:
+      that:
+        - "{{ deleted['after'] | symmetric_difference(result['after']) |length == 0 }}"
+
+  - name: Delete attributes of given interfaces (IDEMPOTENT)
+    vyos.vyos.vyos_lldp_interfaces: *deleted
+    register: result
+
+  - name: Assert that the previous task was idempotent
+    assert:
+      that:
+        - "result.changed == false"
+        - "result.commands|length == 0"
+
+  - name: Assert that the before dicts were correctly generated
+    assert:
+      that:
+        - "{{ deleted['after'] | symmetric_difference(result['before']) |length == 0 }}"
+  always:
+  - include_tasks: _remove_config.yaml
diff --git a/test/integration/targets/vyos_lldp_interfaces/tests/cli/merged.yaml b/test/integration/targets/vyos_lldp_interfaces/tests/cli/merged.yaml
new file mode 100644
index 0000000..ae5b10b
--- /dev/null
+++ b/test/integration/targets/vyos_lldp_interfaces/tests/cli/merged.yaml
@@ -0,0 +1,58 @@
+---
+- debug:
+      msg: "START vyos_lldp_interfaces merged integration tests on connection={{ ansible_connection }}"
+
+- include_tasks: _remove_config.yaml
+
+- block:
+  - name: Merge the provided configuration with the exisiting running configuration
+    vyos.vyos.vyos_lldp_interfaces: &merged
+        config:
+           - name: 'eth1'
+             location:
+               civic_based: 
+                 country_code: 'US' 
+                 ca_info:
+                   - ca_type: 0 
+                     ca_value: 'ENGLISH'  
+
+           - name: 'eth2'
+             location:
+               coordinate_based: 
+                altitude: 2200 
+                datum: 'WGS84'
+                longitude: '222.267255W'
+                latitude: '33.524449N'      
+        state: merged
+    register: result
+
+  - name: Assert that before dicts were correctly generated
+    assert:
+        that: "{{ merged['before'] | symmetric_difference(result['before']) |length == 0 }}"
+
+  - name: Assert that correct set of commands were generated
+    assert:
+        that:
+            - "{{ merged['commands'] | symmetric_difference(result['commands']) |length == 0 }}"
+
+  - name: Assert that after dicts was correctly generated
+    assert:
+        that:
+            - "{{ merged['after'] | symmetric_difference(result['after']) |length == 0 }}"
+
+  - name: Merge the provided configuration with the existing running configuration (IDEMPOTENT)
+    vyos.vyos.vyos_lldp_interfaces: *merged
+    register: result
+
+  - name: Assert that the previous task was idempotent
+    assert:
+        that:
+            - "result['changed'] == false"
+
+  - name: Assert that before dicts were correctly generated
+    assert:
+        that:
+            - "{{ merged['after'] | symmetric_difference(result['before']) |length == 0 }}"
+
+  always:
+  - include_tasks: _remove_config.yaml
diff --git a/test/integration/targets/vyos_lldp_interfaces/tests/cli/overridden.yaml b/test/integration/targets/vyos_lldp_interfaces/tests/cli/overridden.yaml
new file mode 100644
index 0000000..eedb563
--- /dev/null
+++ b/test/integration/targets/vyos_lldp_interfaces/tests/cli/overridden.yaml
@@ -0,0 +1,49 @@
+---
+- debug:
+      msg: "START vyos_lldp_interfaces overridden integration tests on connection={{ ansible_connection }}"
+
+- include_tasks: _remove_config.yaml
+
+- include_tasks: _populate_intf.yaml
+
+- block:
+  - name: Overrides all device configuration with provided configuration
+    vyos.vyos.vyos_lldp_interfaces: &overridden
+       config:
+        - name: 'eth2'
+          location:
+            elin: '0000000911'
+       state: overridden
+    register: result
+
+  - name: Assert that before dicts were correctly generated
+    assert:
+        that:
+            - "{{ populate_intf | symmetric_difference(result['before']) |length == 0 }}"
+
+  - name: Assert that correct commands were generated
+    assert:
+        that:
+            - "{{ overridden['commands'] | symmetric_difference(result['commands']) |length == 0 }}"
+
+  - name: Assert that after dicts were correctly generated
+    assert:
+        that:
+            - "{{ overridden['after'] | symmetric_difference(result['after']) |length == 0 }}"
+
+  - name: Overrides all device configuration with provided configurations (IDEMPOTENT)
+    vyos.vyos.vyos_lldp_interfaces: *overridden
+    register: result
+
+  - name: Assert that the previous task was idempotent
+    assert:
+        that:
+            - "result['changed'] == false"
+
+  - name: Assert that before dicts were correctly generated
+    assert:
+        that:
+            - "{{ overridden['after'] | symmetric_difference(result['before']) |length == 0 }}"
+
+  always:
+  - include_tasks: _remove_config.yaml
diff --git a/test/integration/targets/vyos_lldp_interfaces/tests/cli/replaced.yaml b/test/integration/targets/vyos_lldp_interfaces/tests/cli/replaced.yaml
new file mode 100644
index 0000000..07fec9e
--- /dev/null
+++ b/test/integration/targets/vyos_lldp_interfaces/tests/cli/replaced.yaml
@@ -0,0 +1,63 @@
+---
+- debug:
+      msg: "START vyos_lldp_interfaces replaced integration tests on connection={{ ansible_connection }}"
+
+- include_tasks: _remove_config.yaml
+
+- include_tasks: _populate.yaml
+
+- block:
+  - name: Replace device configurations of listed LLDP interfaces with provided configurations
+    vyos.vyos.vyos_lldp_interfaces: &replaced
+        config:
+           - name: 'eth2'
+             enable: false
+             location:
+               civic_based: 
+                 country_code: 'US' 
+                 ca_info:
+                   - ca_type: 0 
+                     ca_value: 'ENGLISH'
+
+           - name: 'eth1'
+             enable: false
+             location:
+               coordinate_based: 
+                altitude: 2200 
+                datum: 'WGS84'
+                longitude: '222.267255W'
+                latitude: '33.524449N'
+        state: replaced
+    register: result
+
+  - name: Assert that correct set of commands were generated
+    assert:
+        that:
+            - "{{ replaced['commands'] | symmetric_difference(result['commands']) |length == 0 }}"
+
+  - name: Assert that before dicts are correctly generated
+    assert:
+        that:
+            - "{{ populate | symmetric_difference(result['before']) |length == 0 }}"
+
+  - name: Assert that after dict is correctly generated
+    assert:
+        that:
+            - "{{ replaced['after'] | symmetric_difference(result['after']) |length == 0 }}"
+
+  - name: Replace device configurations of listed LLDP interfaces with provided configurarions (IDEMPOTENT)
+    vyos.vyos.vyos_lldp_interfaces: *replaced
+    register: result
+
+  - name: Assert that task was idempotent
+    assert:
+        that:
+            - "result['changed'] == false"
+
+  - name: Assert that before dict is correctly generated
+    assert:
+        that:
+            - "{{ replaced['after'] | symmetric_difference(result['before']) |length == 0 }}"
+
+  always:
+  - include_tasks: _remove_config.yaml
diff --git a/test/integration/targets/vyos_lldp_interfaces/tests/cli/rtt.yaml b/test/integration/targets/vyos_lldp_interfaces/tests/cli/rtt.yaml
new file mode 100644
index 0000000..d97cf9c
--- /dev/null
+++ b/test/integration/targets/vyos_lldp_interfaces/tests/cli/rtt.yaml
@@ -0,0 +1,57 @@
+---
+- debug:
+    msg: "START vyos_lldp_interfaces round trip integration tests on connection={{ ansible_connection }}"
+
+- include_tasks: _remove_config.yaml
+
+- block:
+  - name: Apply the provided configuration (base config)
+    vyos.vyos.vyos_lldp_interfaces:
+      config:
+        - name: 'eth1'
+          location:
+            civic_based: 
+              country_code: 'US' 
+              ca_info:
+                - ca_type: 0 
+                  ca_value: 'ENGLISH'
+
+      state: merged
+    register: base_config
+
+  - name: Gather lldp_interfaces facts
+    vyos.vyos.vyos_facts:
+      gather_subset:
+        - default
+      gather_network_resources:
+        - lldp_interfaces
+
+  - name: Apply the provided configuration (config to be reverted)
+    vyos.vyos.vyos_lldp_interfaces:
+      config:
+        - name: 'eth2'
+          location:
+            coordinate_based: 
+             altitude: 2200 
+             datum: 'WGS84'
+             longitude: '222.267255W'
+             latitude: '33.524449N'        
+      state: merged
+    register: result
+
+  - name: Assert that changes were applied
+    assert:
+      that: "{{ round_trip['after'] | symmetric_difference(result['after']) |length == 0 }}"
+
+  - name: Revert back to base config using facts round trip
+    vyos.vyos.vyos_lldp_interfaces:
+      config: "{{ ansible_facts['network_resources']['lldp_interfaces'] }}"
+      state: overridden
+    register: revert
+
+  - name: Assert that config was reverted
+    assert:
+      that: "{{ base_config['after'] | symmetric_difference(revert['after']) |length == 0 }}"
+
+  always:
+  - include_tasks: _remove_config.yaml
diff --git a/test/integration/targets/vyos_lldp_interfaces/vars/main.yaml b/test/integration/targets/vyos_lldp_interfaces/vars/main.yaml
new file mode 100644
index 0000000..6f33343
--- /dev/null
+++ b/test/integration/targets/vyos_lldp_interfaces/vars/main.yaml
@@ -0,0 +1,130 @@
+---
+merged:
+  before: []
+
+
+  commands:
+    - "set service lldp interface eth1 location civic-based country-code 'US'"
+    - "set service lldp interface eth1 location civic-based ca-type 0 ca-value 'ENGLISH'"
+    - "set service lldp interface eth1"
+    - "set service lldp interface eth2 location coordinate-based latitude '33.524449N'"
+    - "set service lldp interface eth2 location coordinate-based altitude '2200'"
+    - "set service lldp interface eth2 location coordinate-based datum 'WGS84'"
+    - "set service lldp interface eth2 location coordinate-based longitude '222.267255W'"
+    - "set service lldp interface eth2 location coordinate-based latitude '33.524449N'"
+    - "set service lldp interface eth2 location coordinate-based altitude '2200'"
+    - "set service lldp interface eth2 location coordinate-based datum 'WGS84'"
+    - "set service lldp interface eth2 location coordinate-based longitude '222.267255W'"
+    - "set service lldp interface eth2"
+
+  after:
+    - name: 'eth1'
+      location:
+        civic_based: 
+          country_code: 'US' 
+          ca_info:
+            - ca_type: 0 
+              ca_value: 'ENGLISH'  
+
+    - name: 'eth2'
+      location:
+        coordinate_based: 
+         altitude: 2200 
+         datum: 'WGS84'
+         longitude: '222.267255W'
+         latitude: '33.524449N'  
+
+populate:
+  - name: 'eth1'
+    location:
+      civic_based: 
+        country_code: 'US' 
+        ca_info:
+          - ca_type: 0 
+            ca_value: 'ENGLISH'  
+
+  - name: 'eth2'
+    location:
+      coordinate_based: 
+       altitude: 2200 
+       datum: 'WGS84'
+       longitude: '222.267255W'
+       latitude: '33.524449N'  
+
+replaced:
+  commands:
+    - "delete service lldp interface eth2 location"
+    - "set service lldp interface eth2 'disable'"
+    - "set service lldp interface eth2 location civic-based country-code 'US'"
+    - "set service lldp interface eth2 location civic-based ca-type 0 ca-value 'ENGLISH'"
+    - "delete service lldp interface eth1 location"
+    - "set service lldp interface eth1 'disable'"
+    - "set service lldp interface eth1 location coordinate-based latitude '33.524449N'"
+    - "set service lldp interface eth1 location coordinate-based altitude '2200'"
+    - "set service lldp interface eth1 location coordinate-based datum 'WGS84'"
+    - "set service lldp interface eth1 location coordinate-based longitude '222.267255W'"
+
+  after:
+    - name: 'eth2'
+      enable: false
+      location:
+        civic_based: 
+          country_code: 'US' 
+          ca_info:
+            - ca_type: 0 
+              ca_value: 'ENGLISH'  
+
+    - name: 'eth1'
+      enable: false
+      location:
+        coordinate_based: 
+         altitude: 2200 
+         datum: 'WGS84'
+         longitude: '222.267255W'
+         latitude: '33.524449N'  
+
+populate_intf:
+  - name: 'eth2'
+    enable: false
+    location:
+      civic_based: 
+        country_code: 'US' 
+        ca_info:
+          - ca_type: 0 
+            ca_value: 'ENGLISH'  
+
+overridden:
+  commands:
+    - "delete service lldp interface eth2 location" 
+    - "delete service lldp interface eth2 'disable'" 
+    - "set service lldp interface eth2 location elin '0000000911'"
+
+  after:
+    - name: 'eth2'
+      location:
+        elin: 0000000911
+
+deleted:
+  commands:
+    - "delete service lldp interface eth1"
+    - "delete service lldp interface eth2"
+
+  after: []
+
+round_trip:
+  after:
+    - name: 'eth1'
+      location:
+        civic_based: 
+          country_code: 'US' 
+          ca_info:
+            - ca_type: 0 
+              ca_value: 'ENGLISH'
+
+    - name: 'eth2'
+      location:
+        coordinate_based: 
+         altitude: 2200 
+         datum: 'WGS84'
+         longitude: '222.267255W'
+         latitude: '33.524449N'