add subdirs

17 files changed, 105 insertions, 35 deletions

diff --git a/plugins/modules/_vyos_interface.py b/plugins/modules/_vyos_interface.py
index eea8ef9..e4b989e 100644
--- a/plugins/modules/_vyos_interface.py
+++ b/plugins/modules/_vyos_interface.py
@@ -174,8 +174,12 @@ from ansible.module_utils._text import to_text
 from ansible.module_utils.basic import AnsibleModule
 from ansible.module_utils.connection import exec_command
 from ansible.module_utils.network.common.utils import conditional, remove_default_spec
-from ansible_collections.vyos.vyos.plugins.module_utils.network.vyos.vyos import load_config, get_config
-from ansible_collections.vyos.vyos.plugins.module_utils.network.vyos.vyos import vyos_argument_spec
+from ansible_collections.vyos.vyos.plugins.module_utils.network. \
+  vyos.vyos import load_config, get_config
+
+from ansible_collections.vyos.vyos.plugins.module_utils.network. \
+  vyos.vyos import vyos_argument_spec
+
 
 
 def search_obj_in_list(name, lst):
diff --git a/plugins/modules/_vyos_l3_interface.py b/plugins/modules/_vyos_l3_interface.py
index 8f22d4a..63f0873 100644
--- a/plugins/modules/_vyos_l3_interface.py
+++ b/plugins/modules/_vyos_l3_interface.py
@@ -101,8 +101,12 @@ from copy import deepcopy
 from ansible.module_utils.basic import AnsibleModule
 from ansible.module_utils.network.common.utils import is_masklen, validate_ip_address
 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
+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 is_ipv4(value):
diff --git a/plugins/modules/vyos_banner.py b/plugins/modules/vyos_banner.py
index 06d5a30..1f8816a 100644
--- a/plugins/modules/vyos_banner.py
+++ b/plugins/modules/vyos_banner.py
@@ -86,8 +86,12 @@ commands:
 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
+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):
diff --git a/plugins/modules/vyos_command.py b/plugins/modules/vyos_command.py
index ac79224..3570f20 100644
--- a/plugins/modules/vyos_command.py
+++ b/plugins/modules/vyos_command.py
@@ -142,8 +142,12 @@ 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
+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):
diff --git a/plugins/modules/vyos_config.py b/plugins/modules/vyos_config.py
index 14aea79..7987e14 100644
--- a/plugins/modules/vyos_config.py
+++ b/plugins/modules/vyos_config.py
@@ -187,8 +187,12 @@ 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
+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'
diff --git a/plugins/modules/vyos_facts.py b/plugins/modules/vyos_facts.py
index e4bf669..5c8ac51 100644
--- a/plugins/modules/vyos_facts.py
+++ b/plugins/modules/vyos_facts.py
@@ -135,9 +135,15 @@ ansible_net_gather_network_resources:
 """
 
 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
+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():
diff --git a/plugins/modules/vyos_interfaces.py b/plugins/modules/vyos_interfaces.py
index 4ed2712..a78a983 100644
--- a/plugins/modules/vyos_interfaces.py
+++ b/plugins/modules/vyos_interfaces.py
@@ -855,8 +855,12 @@ commands:
 
 
 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
+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():
diff --git a/plugins/modules/vyos_l3_interfaces.py b/plugins/modules/vyos_l3_interfaces.py
index 7ef020e..c2dd461 100644
--- a/plugins/modules/vyos_l3_interfaces.py
+++ b/plugins/modules/vyos_l3_interfaces.py
@@ -351,8 +351,12 @@ commands:
 
 
 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
+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():
diff --git a/plugins/modules/vyos_linkagg.py b/plugins/modules/vyos_linkagg.py
index 75ffa77..71f46ba 100644
--- a/plugins/modules/vyos_linkagg.py
+++ b/plugins/modules/vyos_linkagg.py
@@ -100,8 +100,12 @@ 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
+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(name, lst):
diff --git a/plugins/modules/vyos_lldp.py b/plugins/modules/vyos_lldp.py
index 213e2ac..fa1ac03 100644
--- a/plugins/modules/vyos_lldp.py
+++ b/plugins/modules/vyos_lldp.py
@@ -63,8 +63,12 @@ commands:
     - set service lldp
 """
 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
+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 has_lldp(module):
diff --git a/plugins/modules/vyos_lldp_interface.py b/plugins/modules/vyos_lldp_interface.py
index f0cad83..86a64e3 100644
--- a/plugins/modules/vyos_lldp_interface.py
+++ b/plugins/modules/vyos_lldp_interface.py
@@ -93,8 +93,12 @@ 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
+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):
diff --git a/plugins/modules/vyos_logging.py b/plugins/modules/vyos_logging.py
index e7be395..a94a8bd 100644
--- a/plugins/modules/vyos_logging.py
+++ b/plugins/modules/vyos_logging.py
@@ -110,8 +110,12 @@ 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
+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):
diff --git a/plugins/modules/vyos_ping.py b/plugins/modules/vyos_ping.py
index 95488ac..762bc80 100644
--- a/plugins/modules/vyos_ping.py
+++ b/plugins/modules/vyos_ping.py
@@ -130,8 +130,12 @@ rtt:
 """
 
 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
+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
 
 
diff --git a/plugins/modules/vyos_static_route.py b/plugins/modules/vyos_static_route.py
index ec1c6c9..3c00bca 100644
--- a/plugins/modules/vyos_static_route.py
+++ b/plugins/modules/vyos_static_route.py
@@ -108,8 +108,12 @@ 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
+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):
diff --git a/plugins/modules/vyos_system.py b/plugins/modules/vyos_system.py
index e0684bf..20cf907 100644
--- a/plugins/modules/vyos_system.py
+++ b/plugins/modules/vyos_system.py
@@ -92,8 +92,12 @@ EXAMPLES = """
 """
 
 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
+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):
diff --git a/plugins/modules/vyos_user.py b/plugins/modules/vyos_user.py
index 2981cef..e670d55 100644
--- a/plugins/modules/vyos_user.py
+++ b/plugins/modules/vyos_user.py
@@ -137,9 +137,13 @@ 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_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
+from ansible_collections.vyos.vyos.plugins.module_utils.network. \
+  vyos.vyos import vyos_argument_spec
+
 
 
 def validate_level(value, module):
diff --git a/plugins/modules/vyos_vlan.py b/plugins/modules/vyos_vlan.py
index ca7bafa..88ab71b 100644
--- a/plugins/modules/vyos_vlan.py
+++ b/plugins/modules/vyos_vlan.py
@@ -122,8 +122,12 @@ 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
+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):