Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prepare un-flatmapping #469

Merged
merged 3 commits into from
Oct 26, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 35 additions & 25 deletions .github/BOTMETA.yml
Original file line number Diff line number Diff line change
Expand Up @@ -153,20 +153,20 @@ files:
$module_utils/_version.py: {}
$module_utils/version.py: {}

$modules/network/a10/a10_server_axapi3.py:
$modules/network/a10/a10_:
maintainers: ericchou1 mischapeters
$modules/network/a10/:
$modules/network/a10/a10_server_axapi3.py:
maintainers: ericchou1 mischapeters
$modules/network/aireos/:
$modules/network/aireos/aireos_:
maintainers: jmighion
labels: cisco networking
ignore: jmighion
$modules/network/apconos/apconos_command.py:
maintainers: davidlee-ap
$modules/network/aruba/:
$modules/network/aruba/aruba_:
maintainers: jmighion $team_aruba
ignore: jmighion
$modules/network/avi/:
$modules/network/avi/avi_:
maintainers: grastogi23 ericsysmin khaltore
$modules/network/avi/avi_api_version.py:
maintainers: vivobg $team_avi
Expand All @@ -178,9 +178,11 @@ files:
maintainers: gitshrikant $team_avi
$modules/network/avi/avi_useraccount.py:
maintainers: chaitanyaavi $team_avi
$modules/network/bigswitch/:
$modules/network/bigswitch/bcf_switch.py:
maintainers: tedelhourani jayakody vuile
$modules/network/bigswitch/bigmon_:
maintainers: tedelhourani jayakody vuile
$modules/network/cloudengine/:
$modules/network/cloudengine/ce_:
maintainers: QijunPan TommyLike edisonxiang freesky-edward hwDCN niuzhenguo xuxiaowei0512 yanzhangi zengchen1024 zhongjun2
labels: huawei networking
$modules/network/cloudengine/ce_command.py:
Expand Down Expand Up @@ -209,20 +211,20 @@ files:
maintainers: numone213 $team_huawei
$modules/network/cloudvision/cv_server_provision.py:
maintainers: mharista
$modules/network/cnos/:
$modules/network/cnos/cnos_:
ignore: amuraleedhar dkasberg
maintainers: $team_lenovo
$modules/network/cnos/cnos_linkagg.py:
maintainers: auraleedhar
$modules/network/cumulus/nclu.py:
maintainers: isharacomix jrrivers
$modules/network/edgeos/:
$modules/network/edgeos/edgeos_:
maintainers: Qalthos samdoran $team_edgeos
$modules/network/edgeos/edgeos_command.py:
maintainers: beardymcbeards samdoran
$modules/network/edgeswitch/:
$modules/network/edgeswitch/edgeswitch_:
maintainers: f-bor
$modules/network/enos/:
$modules/network/enos/enos_:
maintainers: amuraleedhar
$modules/network/eric_eccli/eric_eccli_command.py:
maintainers: itercheng
Expand All @@ -240,46 +242,54 @@ files:
maintainers: JayalakshmiV $team_extreme rdvencioneck
$modules/network/exos/exos_vlans.py:
maintainers: jayalakshmiV $team_extreme rdvencioneck
$modules/network/ftd/:
$modules/network/ftd/ftd_:
maintainers: annikulin
labels: cisco networking
keywords: firepower ftd
$modules/network/icx/:
$modules/network/icx/icx_:
maintainers: Commscope sushma-alethea
$modules/network/illumos/:
$modules/network/illumos/dladm_:
maintainers: xen0l bcoca danowar2k fishman jasperla jpdasma mator scathatheworm troy2914
labels: solaris
keywords: beadm dladm illumos ipadm nexenta omnios openindiana pfexec smartos solaris sunos zfs zpool
$modules/network/illumos/flowadm.py:
maintainers: xen0l bcoca danowar2k fishman jasperla jpdasma mator scathatheworm troy2914
labels: solaris
keywords: beadm dladm illumos ipadm nexenta omnios openindiana pfexec smartos solaris sunos zfs zpool
$modules/network/illumos/ipadm_:
maintainers: xen0l bcoca danowar2k fishman jasperla jpdasma mator scathatheworm troy2914
labels: solaris
keywords: beadm dladm illumos ipadm nexenta omnios openindiana pfexec smartos solaris sunos zfs zpool
$modules/network/ingate/:
$modules/network/ingate/ig_:
maintainers: ingatesystems
$modules/network/ironware/:
$modules/network/ironware/ironware_:
maintainers: paulquack
$modules/network/itential/:
$modules/network/itential/iap_:
maintainers: cma0
$modules/network/netact/netact_cm_command.py:
maintainers: hatuomin
$modules/network/netscaler/:
$modules/network/netscaler/netscaler_:
maintainers: giorgos-nikolopoulos chiradeep
$modules/network/netvisor/:
$modules/network/netvisor/pn_:
maintainers: rajaspachipulusu17 $team_netvisor
$modules/network/nos/:
$modules/network/nos/nos_:
maintainers: LindsayHill ujwalkomarla
$modules/network/nuage/nuage_vspk.py:
maintainers: pdellaert
$modules/network/opx/opx_cps.py:
maintainers: skg-net
$modules/network/ordnance/:
$modules/network/ordnance/ordnance_:
maintainers: alexanderturner djh00t
$modules/network/radware/:
$modules/network/radware/vdirect_:
maintainers: evgenyfedoruk
$modules/network/slxos/:
$modules/network/slxos/slxos_:
maintainers: bigmstone LindsayHill ujwalkomarla
ignore: bigmstone
$modules/network/slxos/slxos_vlan.py:
maintainers: lindsayhill $team_extreme
$modules/network/sros/:
$modules/network/sros/sros_:
maintainers: privateip
$modules/network/voss/:
$modules/network/voss/voss_:
maintainers: LindsayHill
$netconfs/ce.py:
maintainers: $team_huawei
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/plugins/modules/network/aireos/aireos_module.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

from ansible_collections.community.network.tests.unit.plugins.modules.utils import AnsibleExitJson, AnsibleFailJson, ModuleTestCase

fixture_path = os.path.join(os.path.dirname(__file__), 'fixtures')
fixture_path = os.path.join(os.path.dirname(__file__), 'aireos_fixtures')
fixture_data = {}


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
from ansible_collections.community.network.tests.unit.plugins.modules.utils import AnsibleExitJson, AnsibleFailJson, ModuleTestCase


fixture_path = os.path.join(os.path.dirname(__file__), 'fixtures')
fixture_path = os.path.join(os.path.dirname(__file__), 'apconos_fixtures')
fixture_data = {}


Expand Down
2 changes: 1 addition & 1 deletion tests/unit/plugins/modules/network/aruba/aruba_module.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
from ansible_collections.community.network.tests.unit.plugins.modules.utils import AnsibleExitJson, AnsibleFailJson, ModuleTestCase


fixture_path = os.path.join(os.path.dirname(__file__), 'fixtures')
fixture_path = os.path.join(os.path.dirname(__file__), 'aruba_fixtures')
fixture_data = {}


Expand Down
2 changes: 1 addition & 1 deletion tests/unit/plugins/modules/network/avi/test_avi_user.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
from ansible_collections.community.network.tests.unit.plugins.modules.utils import set_module_args
from ansible_collections.community.network.plugins.modules.network.avi import avi_user

fixture_path = os.path.join(os.path.dirname(__file__), 'fixtures')
fixture_path = os.path.join(os.path.dirname(__file__), 'avi_fixtures')
with open(fixture_path + '/avi_user.json') as json_file:
data = json.load(json_file)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
from ansible_collections.community.network.tests.unit.plugins.modules.utils import AnsibleExitJson, AnsibleFailJson, ModuleTestCase


fixture_path = os.path.join(os.path.dirname(__file__), 'fixtures')
fixture_path = os.path.join(os.path.dirname(__file__), 'ce_fixtures')
fixture_data = {}


Expand Down
2 changes: 1 addition & 1 deletion tests/unit/plugins/modules/network/cnos/cnos_module.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
from ansible.module_utils import basic


fixture_path = os.path.join(os.path.dirname(__file__), 'fixtures')
fixture_path = os.path.join(os.path.dirname(__file__), 'cnos_fixtures')
fixture_data = {}


Expand Down
2 changes: 1 addition & 1 deletion tests/unit/plugins/modules/network/edgeos/edgeos_module.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
from ansible_collections.community.network.tests.unit.plugins.modules.utils import AnsibleExitJson, AnsibleFailJson, ModuleTestCase


fixture_path = os.path.join(os.path.dirname(__file__), 'fixtures')
fixture_path = os.path.join(os.path.dirname(__file__), 'edgeos_fixtures')
fixture_data = {}


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
from ansible_collections.community.network.tests.unit.plugins.modules.utils import AnsibleExitJson, AnsibleFailJson, ModuleTestCase


fixture_path = os.path.join(os.path.dirname(__file__), 'fixtures')
fixture_path = os.path.join(os.path.dirname(__file__), 'edgeswitch_fixtures')
fixture_data = {}


Expand Down
2 changes: 1 addition & 1 deletion tests/unit/plugins/modules/network/enos/enos_module.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
from ansible.module_utils import basic


fixture_path = os.path.join(os.path.dirname(__file__), 'fixtures')
fixture_path = os.path.join(os.path.dirname(__file__), 'enos_fixtures')
fixture_data = {}


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
from ansible_collections.community.network.tests.unit.plugins.modules.utils import AnsibleExitJson, AnsibleFailJson, ModuleTestCase


fixture_path = os.path.join(os.path.dirname(__file__), 'fixtures')
fixture_path = os.path.join(os.path.dirname(__file__), 'eccli_fixtures')
fixture_data = {}


Expand Down
2 changes: 1 addition & 1 deletion tests/unit/plugins/modules/network/exos/exos_module.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
from ansible_collections.community.network.tests.unit.plugins.modules.utils import AnsibleExitJson, AnsibleFailJson, ModuleTestCase


fixture_path = os.path.join(os.path.dirname(__file__), 'fixtures')
fixture_path = os.path.join(os.path.dirname(__file__), 'exos_fixtures')
fixture_data = {}


Expand Down
2 changes: 1 addition & 1 deletion tests/unit/plugins/modules/network/exos/test_exos_facts.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ def load_fixtures(self, commands=None):
def load_from_file(*args, **kwargs):
module, commands = args
output = list()
fixture_path = os.path.join(os.path.dirname(__file__), 'fixtures')
fixture_path = os.path.join(os.path.dirname(__file__), 'exos_fixtures')

for command in commands:
if isinstance(command, Mapping):
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/plugins/modules/network/icx/icx_module.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
from ansible_collections.community.network.tests.unit.plugins.modules.utils import AnsibleExitJson, AnsibleFailJson, ModuleTestCase


fixture_path = os.path.join(os.path.dirname(__file__), 'fixtures')
fixture_path = os.path.join(os.path.dirname(__file__), 'icx_fixtures')
fixture_data = {}


Expand Down
2 changes: 1 addition & 1 deletion tests/unit/plugins/modules/network/ingate/ingate_module.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
from ansible_collections.community.network.tests.unit.plugins.modules.utils import AnsibleExitJson, AnsibleFailJson, ModuleTestCase


fixture_path = os.path.join(os.path.dirname(__file__), 'fixtures')
fixture_path = os.path.join(os.path.dirname(__file__), 'ingate_fixtures')
fixture_data = {}


Expand Down
5 changes: 2 additions & 3 deletions tests/unit/plugins/modules/network/ingate/test_ig_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,8 @@ class TestConfigModule(TestIngateModule):
def setUp(self):
super(TestConfigModule, self).setUp()

self.mock_make_request = patch('ansible_collections.community.network.'
'plugins.modules.network.ingate.'
'ig_config.make_request')
self.mock_make_request = patch(
'ansible_collections.community.network.plugins.modules.network.ingate.ig_config.make_request')
self.make_request = self.mock_make_request.start()
# ATM the Ingate Python SDK is not needed in this unit test.
self.module.HAS_INGATESDK = True
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,12 @@ class TestUnitInformationModule(TestIngateModule):
def setUp(self):
super(TestUnitInformationModule, self).setUp()

self.mock_make_request = patch('ansible_collections.community.network.'
'plugins.modules.network.ingate.'
'ig_unit_information.make_request')
self.mock_make_request = patch(
'ansible_collections.community.network.plugins.modules.network.ingate.ig_unit_information.make_request')
self.make_request = self.mock_make_request.start()

self.mock_is_ingatesdk_installed = patch('ansible_collections.community.network.'
'plugins.modules.network.ingate.'
'ig_unit_information.is_ingatesdk_installed')
self.mock_is_ingatesdk_installed = patch(
'ansible_collections.community.network.plugins.modules.network.ingate.ig_unit_information.is_ingatesdk_installed')
self.is_ingatesdk_installed = self.mock_is_ingatesdk_installed.start()

def tearDown(self):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
from ansible_collections.community.network.tests.unit.plugins.modules.utils import AnsibleExitJson, AnsibleFailJson, ModuleTestCase


fixture_path = os.path.join(os.path.dirname(__file__), 'fixtures')
fixture_path = os.path.join(os.path.dirname(__file__), 'ironware_fixtures')
fixture_data = {}


Expand Down
2 changes: 1 addition & 1 deletion tests/unit/plugins/modules/network/netvisor/nvos_module.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
from ansible.module_utils import basic


fixture_path = os.path.join(os.path.dirname(__file__), 'fixtures')
fixture_path = os.path.join(os.path.dirname(__file__), 'nvos_fixtures')
fixture_data = {}


Expand Down
2 changes: 1 addition & 1 deletion tests/unit/plugins/modules/network/nos/nos_module.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
from ansible_collections.community.network.tests.unit.plugins.modules.utils import AnsibleExitJson, AnsibleFailJson, ModuleTestCase


fixture_path = os.path.join(os.path.dirname(__file__), 'fixtures')
fixture_path = os.path.join(os.path.dirname(__file__), 'nos_fixtures')
fixture_data = {}


Expand Down
2 changes: 1 addition & 1 deletion tests/unit/plugins/modules/network/opx/opx_module.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
from ansible_collections.community.network.tests.unit.plugins.modules.utils import AnsibleExitJson, AnsibleFailJson, ModuleTestCase


fixture_path = os.path.join(os.path.dirname(__file__), 'fixtures')
fixture_path = os.path.join(os.path.dirname(__file__), 'opx_fixtures')
fixture_data = {}


Expand Down
2 changes: 1 addition & 1 deletion tests/unit/plugins/modules/network/slxos/slxos_module.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
from ansible_collections.community.network.tests.unit.plugins.modules.utils import AnsibleExitJson, AnsibleFailJson, ModuleTestCase


fixture_path = os.path.join(os.path.dirname(__file__), 'fixtures')
fixture_path = os.path.join(os.path.dirname(__file__), 'slxos_fixtures')
fixture_data = {}


Expand Down
2 changes: 1 addition & 1 deletion tests/unit/plugins/modules/network/voss/voss_module.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
from ansible_collections.community.network.tests.unit.plugins.modules.utils import AnsibleExitJson, AnsibleFailJson, ModuleTestCase


fixture_path = os.path.join(os.path.dirname(__file__), 'fixtures')
fixture_path = os.path.join(os.path.dirname(__file__), 'voss_fixtures')
fixture_data = {}


Expand Down