mirror of
https://github.com/ansible-collections/community.general.git
synced 2025-07-02 14:40:19 -07:00
Refactor common network shared and platform utils code into package (#33452)
* Refactor common network shared and platform specific code into package (part-1) As per proposal #76 refactor common network shared and platform specific code into sub-package. https://github.com/ansible/proposals/issues/76 * ansible.module_utils.network.common - command shared functions * ansible.module_utils.network.{{ platform }} - where platform is platform specific shared functions * Fix review comments * Fix review comments
This commit is contained in:
parent
18aca48075
commit
11c9ad23d5
483 changed files with 871 additions and 887 deletions
|
@ -26,8 +26,8 @@ from ansible import constants as C
|
|||
from ansible.module_utils._text import to_text
|
||||
from ansible.module_utils.connection import Connection
|
||||
from ansible.plugins.action.normal import ActionModule as _ActionModule
|
||||
from ansible.module_utils.aireos import aireos_provider_spec
|
||||
from ansible.module_utils.network_common import load_provider
|
||||
from ansible.module_utils.network.aireos.aireos import aireos_provider_spec
|
||||
from ansible.module_utils.network.common.utils import load_provider
|
||||
|
||||
|
||||
try:
|
||||
|
|
|
@ -26,8 +26,8 @@ from ansible import constants as C
|
|||
from ansible.module_utils._text import to_text
|
||||
from ansible.module_utils.connection import Connection
|
||||
from ansible.plugins.action.normal import ActionModule as _ActionModule
|
||||
from ansible.module_utils.aruba import aruba_provider_spec
|
||||
from ansible.module_utils.network_common import load_provider
|
||||
from ansible.module_utils.network.aruba.aruba import aruba_provider_spec
|
||||
from ansible.module_utils.network.common.utils import load_provider
|
||||
|
||||
try:
|
||||
from __main__ import display
|
||||
|
|
|
@ -25,8 +25,8 @@ import json
|
|||
|
||||
from ansible import constants as C
|
||||
from ansible.plugins.action.normal import ActionModule as _ActionModule
|
||||
from ansible.module_utils.asa import asa_provider_spec
|
||||
from ansible.module_utils.network_common import load_provider
|
||||
from ansible.module_utils.network.asa.asa import asa_provider_spec
|
||||
from ansible.module_utils.network.common.utils import load_provider
|
||||
from ansible.module_utils.connection import request_builder
|
||||
|
||||
|
||||
|
|
|
@ -26,7 +26,7 @@ from ansible import constants as C
|
|||
from ansible.module_utils._text import to_text
|
||||
from ansible.module_utils.connection import Connection
|
||||
from ansible.module_utils.f5_utils import F5_COMMON_ARGS
|
||||
from ansible.module_utils.network_common import load_provider
|
||||
from ansible.module_utils.network.common.utils import load_provider
|
||||
from ansible.plugins.action.normal import ActionModule as _ActionModule
|
||||
|
||||
try:
|
||||
|
|
|
@ -26,8 +26,8 @@ from ansible import constants as C
|
|||
from ansible.module_utils._text import to_text
|
||||
from ansible.module_utils.connection import Connection
|
||||
from ansible.plugins.action.normal import ActionModule as _ActionModule
|
||||
from ansible.module_utils.ce import ce_provider_spec
|
||||
from ansible.module_utils.network_common import load_provider
|
||||
from ansible.module_utils.network.cloudengine.ce import ce_provider_spec
|
||||
from ansible.module_utils.network.common.utils import load_provider
|
||||
|
||||
|
||||
try:
|
||||
|
|
|
@ -28,8 +28,8 @@ from ansible import constants as C
|
|||
from ansible.module_utils._text import to_text
|
||||
from ansible.module_utils.connection import Connection
|
||||
from ansible.plugins.action.normal import ActionModule as _ActionModule
|
||||
from ansible.module_utils.dellos10 import dellos10_provider_spec
|
||||
from ansible.module_utils.network_common import load_provider
|
||||
from ansible.module_utils.network.dellos10.dellos10 import dellos10_provider_spec
|
||||
from ansible.module_utils.network.common.utils import load_provider
|
||||
|
||||
try:
|
||||
from __main__ import display
|
||||
|
|
|
@ -25,8 +25,8 @@ from ansible import constants as C
|
|||
from ansible.module_utils._text import to_text
|
||||
from ansible.module_utils.connection import Connection
|
||||
from ansible.plugins.action.normal import ActionModule as _ActionModule
|
||||
from ansible.module_utils.dellos6 import dellos6_provider_spec
|
||||
from ansible.module_utils.network_common import load_provider
|
||||
from ansible.module_utils.network.dellos6.dellos6 import dellos6_provider_spec
|
||||
from ansible.module_utils.network.common.utils import load_provider
|
||||
|
||||
try:
|
||||
from __main__ import display
|
||||
|
|
|
@ -28,8 +28,8 @@ from ansible import constants as C
|
|||
from ansible.module_utils._text import to_text
|
||||
from ansible.module_utils.connection import Connection
|
||||
from ansible.plugins.action.normal import ActionModule as _ActionModule
|
||||
from ansible.module_utils.dellos9 import dellos9_provider_spec
|
||||
from ansible.module_utils.network_common import load_provider
|
||||
from ansible.module_utils.network.dellos9.dellos9 import dellos9_provider_spec
|
||||
from ansible.module_utils.network.common.utils import load_provider
|
||||
|
||||
try:
|
||||
from __main__ import display
|
||||
|
|
|
@ -39,8 +39,8 @@ import copy
|
|||
|
||||
from ansible import constants as C
|
||||
from ansible.plugins.action.normal import ActionModule as _ActionModule
|
||||
from ansible.module_utils.enos import enos_provider_spec
|
||||
from ansible.module_utils.network_common import load_provider
|
||||
from ansible.module_utils.network.enos.enos import enos_provider_spec
|
||||
from ansible.module_utils.network.common.utils import load_provider
|
||||
from ansible.module_utils.connection import Connection
|
||||
from ansible.module_utils._text import to_text
|
||||
|
||||
|
|
|
@ -25,9 +25,9 @@ import copy
|
|||
from ansible import constants as C
|
||||
from ansible.module_utils._text import to_text
|
||||
from ansible.module_utils.connection import Connection
|
||||
from ansible.module_utils.eos import eos_provider_spec
|
||||
from ansible.module_utils.network.eos.eos import eos_provider_spec
|
||||
from ansible.plugins.action.normal import ActionModule as _ActionModule
|
||||
from ansible.module_utils.network_common import load_provider
|
||||
from ansible.module_utils.network.common.utils import load_provider
|
||||
|
||||
try:
|
||||
from __main__ import display
|
||||
|
|
|
@ -26,8 +26,8 @@ from ansible import constants as C
|
|||
from ansible.module_utils._text import to_text
|
||||
from ansible.module_utils.connection import Connection
|
||||
from ansible.plugins.action.normal import ActionModule as _ActionModule
|
||||
from ansible.module_utils.network_common import load_provider
|
||||
from ansible.module_utils.ios import ios_provider_spec
|
||||
from ansible.module_utils.network.common.utils import load_provider
|
||||
from ansible.module_utils.network.ios.ios import ios_provider_spec
|
||||
|
||||
try:
|
||||
from __main__ import display
|
||||
|
|
|
@ -25,9 +25,9 @@ import copy
|
|||
from ansible import constants as C
|
||||
from ansible.module_utils._text import to_text
|
||||
from ansible.module_utils.connection import Connection
|
||||
from ansible.module_utils.iosxr import iosxr_provider_spec
|
||||
from ansible.module_utils.network.iosxr.iosxr import iosxr_provider_spec
|
||||
from ansible.plugins.action.normal import ActionModule as _ActionModule
|
||||
from ansible.module_utils.network_common import load_provider
|
||||
from ansible.module_utils.network.common.utils import load_provider
|
||||
|
||||
try:
|
||||
from __main__ import display
|
||||
|
|
|
@ -27,8 +27,8 @@ from ansible import constants as C
|
|||
from ansible.module_utils._text import to_text
|
||||
from ansible.module_utils.connection import Connection
|
||||
from ansible.plugins.action.normal import ActionModule as _ActionModule
|
||||
from ansible.module_utils.network_common import load_provider
|
||||
from ansible.module_utils.ironware import ironware_provider_spec
|
||||
from ansible.module_utils.network.common.utils import load_provider
|
||||
from ansible.module_utils.network.ironware.ironware import ironware_provider_spec
|
||||
|
||||
try:
|
||||
from __main__ import display
|
||||
|
|
|
@ -25,8 +25,8 @@ import copy
|
|||
from ansible import constants as C
|
||||
from ansible.module_utils._text import to_text
|
||||
from ansible.module_utils.connection import Connection
|
||||
from ansible.module_utils.network_common import load_provider
|
||||
from ansible.module_utils.junos import junos_provider_spec
|
||||
from ansible.module_utils.network.common.utils import load_provider
|
||||
from ansible.module_utils.network.junos.junos import junos_provider_spec
|
||||
from ansible.plugins.loader import connection_loader, module_loader
|
||||
from ansible.plugins.action.normal import ActionModule as _ActionModule
|
||||
|
||||
|
|
|
@ -23,11 +23,11 @@ import copy
|
|||
import sys
|
||||
|
||||
from ansible import constants as C
|
||||
from ansible.module_utils.network_common import load_provider
|
||||
from ansible.module_utils.network.common.utils import load_provider
|
||||
from ansible.plugins.action.normal import ActionModule as _ActionModule
|
||||
from ansible.utils.display import Display
|
||||
|
||||
from ansible.module_utils.mlnxos import mlnxos_provider_spec
|
||||
from ansible.module_utils.network.mlnxos.mlnxos import mlnxos_provider_spec
|
||||
|
||||
try:
|
||||
from __main__ import display
|
||||
|
|
|
@ -25,7 +25,7 @@ from ansible.module_utils._text import to_text
|
|||
from ansible.module_utils.connection import Connection
|
||||
from ansible.errors import AnsibleError
|
||||
from ansible.plugins.action import ActionBase
|
||||
from ansible.module_utils.network_common import load_provider
|
||||
from ansible.module_utils.network.common.utils import load_provider
|
||||
|
||||
from imp import find_module, load_module
|
||||
|
||||
|
@ -44,13 +44,13 @@ class ActionModule(ActionBase):
|
|||
play_context.network_os = self._get_network_os(task_vars)
|
||||
|
||||
# we should be able to stream line this a bit by creating a common
|
||||
# provider argument spec in module_utils/network_common.py or another
|
||||
# provider argument spec in module_utils/network/common/utils.py or another
|
||||
# option is that there isn't a need to push provider into the module
|
||||
# since the connection is started in the action handler.
|
||||
f, p, d = find_module('ansible')
|
||||
f2, p2, d2 = find_module('module_utils', [p])
|
||||
f3, p3, d3 = find_module(play_context.network_os, [p2])
|
||||
module = load_module('ansible.module_utils.' + play_context.network_os, f3, p3, d3)
|
||||
module = load_module('ansible.module_utils.{0}.{1}'.format(play_context.network_os, play_context.network_os), f3, p3, d3)
|
||||
|
||||
if play_context.connection == 'local':
|
||||
|
||||
|
|
|
@ -26,8 +26,8 @@ from ansible import constants as C
|
|||
from ansible.module_utils._text import to_text
|
||||
from ansible.module_utils.connection import Connection
|
||||
from ansible.plugins.action.normal import ActionModule as _ActionModule
|
||||
from ansible.module_utils.network_common import load_provider
|
||||
from ansible.module_utils.nxos import nxos_provider_spec
|
||||
from ansible.module_utils.network.common.utils import load_provider
|
||||
from ansible.module_utils.network.nxos.nxos import nxos_provider_spec
|
||||
|
||||
try:
|
||||
from __main__ import display
|
||||
|
|
|
@ -24,8 +24,8 @@ import copy
|
|||
|
||||
from ansible import constants as C
|
||||
from ansible.plugins.action.normal import ActionModule as _ActionModule
|
||||
from ansible.module_utils.sros import sros_provider_spec
|
||||
from ansible.module_utils.network_common import load_provider
|
||||
from ansible.module_utils.network.sros.sros import sros_provider_spec
|
||||
from ansible.module_utils.network.common.utils import load_provider
|
||||
|
||||
try:
|
||||
from __main__ import display
|
||||
|
|
|
@ -26,8 +26,8 @@ from ansible import constants as C
|
|||
from ansible.plugins.action.normal import ActionModule as _ActionModule
|
||||
from ansible.module_utils._text import to_text
|
||||
from ansible.module_utils.connection import Connection
|
||||
from ansible.module_utils.network_common import load_provider
|
||||
from ansible.module_utils.vyos import vyos_provider_spec
|
||||
from ansible.module_utils.network.common.utils import load_provider
|
||||
from ansible.module_utils.network.vyos.vyos import vyos_provider_spec
|
||||
|
||||
try:
|
||||
from __main__ import display
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue