internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-06 13:22:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove f5-sdk and add qinq ethertype (#48006)

Browse Source 
This patch removes the f5-sdk from bigip trunk and adds the qinq
ethertype parameter
This commit is contained in:
Tim Rupp
2018-11-02 12:47:58 -07:00
committed by GitHub
parent b4af058c55
commit 24be9c030c
2 changed files with 103 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
test/units/modules/network/f5/test_bigip_trunk.py
View File

@@ -15,9 +15,6 @@ from nose.plugins.skip import SkipTest
if sys.version_info < (2, 7):
raise SkipTest("F5 Ansible modules require Python >= 2.7")
from units.compat import unittest
from units.compat.mock import Mock
from units.compat.mock import patch
from ansible.module_utils.basic import AnsibleModule
try:
@@ -25,17 +22,25 @@ try:
from library.modules.bigip_trunk import ModuleParameters
from library.modules.bigip_trunk import ModuleManager
from library.modules.bigip_trunk import ArgumentSpec
from library.module_utils.network.f5.common import F5ModuleError
from library.module_utils.network.f5.common import iControlUnexpectedHTTPError
from test.unit.modules.utils import set_module_args
# In Ansible 2.8, Ansible changed import paths.
from test.units.compat import unittest
from test.units.compat.mock import Mock
from test.units.compat.mock import patch
from test.units.modules.utils import set_module_args
except ImportError:
try:
from ansible.modules.network.f5.bigip_trunk import ApiParameters
from ansible.modules.network.f5.bigip_trunk import ModuleParameters
from ansible.modules.network.f5.bigip_trunk import ModuleManager
from ansible.modules.network.f5.bigip_trunk import ArgumentSpec
from ansible.module_utils.network.f5.common import F5ModuleError
from ansible.module_utils.network.f5.common import iControlUnexpectedHTTPError
# Ansible 2.8 imports
from units.compat import unittest
from units.compat.mock import Mock
from units.compat.mock import patch
from units.modules.utils import set_module_args
except ImportError:
raise SkipTest("F5 Ansible modules require the f5-sdk Python library")