Add new features to gtm server module (#48507)

Remove the f5-sdk. Fix unit tests. Add new prober parameters
This commit is contained in:
Tim Rupp
2018-11-10 18:34:48 -08:00
committed by GitHub
parent 364ed4e660
commit 4a74c1fec6
2 changed files with 722 additions and 87 deletions

View File

@@ -8,16 +8,12 @@ __metaclass__ = type
import os
import json
import pytest
import sys
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:
@@ -27,9 +23,13 @@ try:
from library.modules.bigip_gtm_server import V1Manager
from library.modules.bigip_gtm_server import V2Manager
from library.modules.bigip_gtm_server 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_gtm_server import ApiParameters
@@ -38,8 +38,12 @@ except ImportError:
from ansible.modules.network.f5.bigip_gtm_server import V1Manager
from ansible.modules.network.f5.bigip_gtm_server import V2Manager
from ansible.modules.network.f5.bigip_gtm_server 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")
@@ -138,6 +142,28 @@ class TestV1Manager(unittest.TestCase):
def setUp(self):
self.spec = ArgumentSpec()
try:
self.p1 = patch('library.modules.bigip_gtm_server.module_provisioned')
self.m1 = self.p1.start()
self.m1.return_value = True
except Exception:
self.p1 = patch('ansible.modules.network.f5.bigip_gtm_server.module_provisioned')
self.m1 = self.p1.start()
self.m1.return_value = True
try:
self.p2 = patch('library.modules.bigip_gtm_server.tmos_version')
self.m2 = self.p2.start()
self.m2.return_value = '13.0.0'
except Exception:
self.p2 = patch('ansible.modules.network.f5.bigip_gtm_server.tmos_version')
self.m2 = self.p2.start()
self.m2.return_value = '13.0.0'
def tearDown(self):
self.p1.stop()
self.p2.stop()
def test_create(self, *args):
set_module_args(dict(
server='lb.mydomain.com',
@@ -204,6 +230,7 @@ class TestV1Manager(unittest.TestCase):
mm.get_manager = Mock(return_value=m1)
mm.version_is_less_than = Mock(return_value=True)
mm.gtm_provisioned = Mock(return_value=True)
mm.module_provisioned = Mock(return_value=True)
results = mm.exec_module()
@@ -216,6 +243,28 @@ class TestV2Manager(unittest.TestCase):
def setUp(self):
self.spec = ArgumentSpec()
try:
self.p1 = patch('library.modules.bigip_gtm_server.module_provisioned')
self.m1 = self.p1.start()
self.m1.return_value = True
except Exception:
self.p1 = patch('ansible.modules.network.f5.bigip_gtm_server.module_provisioned')
self.m1 = self.p1.start()
self.m1.return_value = True
try:
self.p2 = patch('library.modules.bigip_gtm_server.tmos_version')
self.m2 = self.p2.start()
self.m2.return_value = '13.0.0'
except Exception:
self.p2 = patch('ansible.modules.network.f5.bigip_gtm_server.tmos_version')
self.m2 = self.p2.start()
self.m2.return_value = '13.0.0'
def tearDown(self):
self.p1.stop()
self.p2.stop()
def test_create(self, *args):
set_module_args(dict(
server='lb.mydomain.com',
@@ -282,6 +331,7 @@ class TestV2Manager(unittest.TestCase):
mm.get_manager = Mock(return_value=m1)
mm.version_is_less_than = Mock(return_value=False)
mm.gtm_provisioned = Mock(return_value=True)
mm.module_provisioned = Mock(return_value=True)
results = mm.exec_module()