Merge pull request #652 from jasonrahm/bugfix.ifiles_tests

iFiles tests cleanup for issue #635

Author: caphrim007

conftest.py

@@ -224,7 +224,7 @@ def teardown():
 
 @pytest.fixture
 def IFILE(mgmt_root):
-    ntf = NamedTemporaryFile()
+    ntf = NamedTemporaryFile(delete=False)
     ntf_basename = os.path.basename(ntf.name)
     ntf.write('this is a test file')
     ntf.seek(0)

f5/bigip/tm/ltm/test/test_ifile.py

@@ -16,25 +16,23 @@
 import mock
 import pytest
 
-from f5.bigip import ManagementRoot
 from f5.bigip.resource import MissingRequiredCreationParameter
 from f5.bigip.tm.ltm.ifile import Ifile
 
 
 @pytest.fixture
-def FakeIfile():
+def FakeLtmIfile():
     fake_ifile_s = mock.MagicMock()
     fake_ifile = Ifile(fake_ifile_s)
     return fake_ifile
 
 
-class TestCreate(object):
-    def test_create_two(self, fakeicontrolsession):
-        mgmt = ManagementRoot('172.16.44.15', 'admin', 'admin')
-        r1 = mgmt.tm.ltm.ifiles.ifile
-        r2 = mgmt.tm.ltm.ifiles.ifile
-        assert r1 is not r2
+def test_create_no_args(FakeLtmIfile):
+    with pytest.raises(MissingRequiredCreationParameter):
+        FakeLtmIfile.create()
 
-    def test_create_no_args(self, FakeIfile):
-        with pytest.raises(MissingRequiredCreationParameter):
-            FakeIfile.create()
+
+def test_create_missing_arg(FakeLtmIfile):
+    with pytest.raises(MissingRequiredCreationParameter) as ex:
+        FakeLtmIfile.create(name='test_ifile')
+        assert 'fileName' in ex.value.message

f5/bigip/tm/sys/file.py

@@ -29,6 +29,7 @@
 from f5.bigip.resource import Collection
 from f5.bigip.resource import OrganizingCollection
 from f5.bigip.resource import Resource
+from f5.sdk_exception import UnsupportedMethod
 
 
 class File(OrganizingCollection):
@@ -76,6 +77,15 @@ def __init__(self, ifiles):
         self._meta_data['required_creation_parameters'].update(
             ('name', 'sourcePath'))
 
+    def modify(self, **kwargs):
+        '''Modify is not supported for iFiles
+
+        :raises: UnsupportedOperation
+        '''
+        raise UnsupportedMethod(
+            "%s does not support the update method" % self.__class__.__name__
+        )
+
 
 class Ssl_Certs(Collection):
     def __init__(self, File):

f5/bigip/tm/sys/test/test_file.py

@@ -13,7 +13,6 @@
 # limitations under the License.
 #
 
-from distutils.version import LooseVersion
 import mock
 import pytest
 
@@ -23,6 +22,7 @@
 from f5.bigip.tm.sys.file import Ssl_Crl
 from f5.bigip.tm.sys.file import Ssl_Csr
 from f5.bigip.tm.sys.file import Ssl_Key
+from f5.sdk_exception import UnsupportedMethod
 
 
 @pytest.fixture
@@ -43,6 +43,11 @@ def test_ifile_create_missing_arg(FakeSysIfile):
         assert 'sourcePath' in ex.value.message
 
 
+def test_ifile_modify(FakeSysIfile):
+    with pytest.raises(UnsupportedMethod):
+        FakeSysIfile.modify(value='Fake')
+
+
 @pytest.fixture
 def FakeSysCert():
     fake_cert_s = mock.MagicMock()
@@ -86,23 +91,11 @@ def FakeSysCsr():
     return fake_csr
 
 
-@pytest.mark.skipif(
-    LooseVersion(
-        pytest.config.getoption('--release')
-    ) < LooseVersion('12.0.0'),
-    reason='csr management is only supported in 12.0.0 or greater.'
-)
 def test_csr_create_no_args(FakeSysCsr):
     with pytest.raises(MissingRequiredCreationParameter):
         FakeSysCsr.create()
 
 
-@pytest.mark.skipif(
-    LooseVersion(
-        pytest.config.getoption('--release')
-    ) < LooseVersion('12.0.0'),
-    reason='csr management is only supported in 12.0.0 or greater.'
-)
 def test_csr_create_missing_arg(FakeSysCsr):
     with pytest.raises(MissingRequiredCreationParameter) as ex:
         FakeSysCsr.create(name='test_csr')

test/functional/tm/ltm/test_ifile.py

@@ -13,6 +13,7 @@
 # limitations under the License.
 #
 
+import copy
 from f5.bigip.resource import MissingRequiredCreationParameter
 import pytest
 from requests.exceptions import HTTPError
@@ -44,48 +45,70 @@ def teardown():
     request.addfinalizer(teardown)
 
 
-def setup_basic_test(request, mgmt_root, name, partition, IFILE):
+def setup_basic_test(request, mgmt_root, name, partition, IFILE, **kwargs):
     def teardown():
         delete_ifile(mgmt_root, name, partition, IFILE)
 
     ifile1 = mgmt_root.tm.ltm.ifiles.ifile.create(
-        name='ifile1', partition='Common', fileName=IFILE.name)
+        name='ifile1', partition='Common', fileName=IFILE.name, **kwargs)
 
     request.addfinalizer(teardown)
     return ifile1
 
 
-def test_create_no_args(mgmt_root):
-    with pytest.raises(MissingRequiredCreationParameter):
-        mgmt_root.tm.ltm.ifiles.ifile.create()
-
-
-def test_create_no_filename(mgmt_root):
-    with pytest.raises(MissingRequiredCreationParameter):
-        mgmt_root.tm.ltm.ifiles.ifile.create(name='ifile1', partition='Common')
-
-
-def test_create(request, mgmt_root, IFILE):
-    setup_create_test(request, mgmt_root, 'ifile1', 'Common', IFILE)
-    ifile1 = mgmt_root.tm.ltm.ifiles.ifile.create(
-        name='ifile1', partition='Common', fileName=IFILE.name)
-
-    assert ifile1.name == 'ifile1'
-    assert ifile1.partition == 'Common'
-
-
-def test_delete(request, mgmt_root, IFILE):
-    ifile1 = setup_basic_test(request, mgmt_root, 'ifile1', 'Common', IFILE)
-    ifile1.delete()
-    with pytest.raises(HTTPError) as err:
-        mgmt_root.tm.ltm.ifiles.ifile.load(
-            name='ifile1', partition='Common')
-        assert err.response.status_code == 404
-
-    # not testing this function here; but need to clean it up
-    try:
-        IFILE.delete()
-    except HTTPError as err:
-        if err.response.status_code != 404:
-            raise
-        return
+class TestiFile(object):
+    def test_create_no_args(self, mgmt_root):
+        with pytest.raises(MissingRequiredCreationParameter):
+            mgmt_root.tm.ltm.ifiles.ifile.create()
+
+    def test_create_no_filename(self, mgmt_root):
+        with pytest.raises(MissingRequiredCreationParameter):
+            mgmt_root.tm.ltm.ifiles.ifile.create(
+                name='ifile1', partition='Common')
+
+    def test_create(self, request, mgmt_root, IFILE):
+        setup_create_test(request, mgmt_root, 'ifile1', 'Common', IFILE)
+        ifile1 = mgmt_root.tm.ltm.ifiles.ifile.create(
+            name='ifile1', partition='Common', fileName=IFILE.name)
+
+        assert ifile1.name == 'ifile1'
+        assert ifile1.partition == 'Common'
+
+    def test_delete(self, request, mgmt_root, IFILE):
+        ifile1 = setup_basic_test(
+            request, mgmt_root, 'ifile1', 'Common', IFILE)
+        ifile1.delete()
+        with pytest.raises(HTTPError) as err:
+            mgmt_root.tm.ltm.ifiles.ifile.load(
+                name='ifile1', partition='Common')
+            assert err.response.status_code == 404
+
+        # not testing this function here; but need to clean it up
+        try:
+            IFILE.delete()
+        except HTTPError as err:
+            if err.response.status_code != 404:
+                raise
+            return
+
+    def test_modify(self, request, mgmt_root, IFILE):
+        ifile1 = setup_basic_test(
+            request, mgmt_root, 'ifile1', 'Common', IFILE,
+            description='first_fake')
+        assert ifile1.description == 'first_fake'
+        original_dict = copy.copy(ifile1.__dict__)
+        desc = 'description'
+        ifile1.modify(description='CustomFake')
+        for k, v in original_dict.items():
+            if k != desc:
+                original_dict[k] = ifile1.__dict__[k]
+            elif k == desc:
+                assert ifile1.__dict__[k] == 'CustomFake'
+
+    def test_update(self, request, mgmt_root, IFILE):
+        ifile1 = setup_basic_test(request, mgmt_root, 'ifile1', 'Common',
+                                  IFILE, description='first_fake')
+        assert ifile1.description == 'first_fake'
+        ifile1.description = 'CustomFake'
+        ifile1.update()
+        assert ifile1.description == 'CustomFake'

test/functional/tm/sys/test_file.py

@@ -70,9 +70,10 @@ def create_sslfiles():
     return key, csr, cert
 
 
-def setup_ifile_test(request, mgmt_root, name, sourcepath):
+def setup_ifile_test(request, mgmt_root, name, sourcepath, **kwargs):
     if1 = mgmt_root.tm.sys.file.ifiles.ifile.create(name=name,
-                                                    sourcePath=sourcepath)
+                                                    sourcePath=sourcepath,
+                                                    **kwargs)
 
     def teardown():
         # Remove the ifile.
@@ -88,15 +89,16 @@ def teardown():
 
 def test_CURDL_ifile(request, mgmt_root):
     # Create
-    ntf = NamedTemporaryFile()
+    ntf = NamedTemporaryFile(delete=False)
     ntf_basename = os.path.basename(ntf.name)
     ntf.write('this is a test file')
     ntf.seek(0)
     # Upload the file
     mgmt_root.shared.file_transfer.uploads.upload_file(ntf.name)
 
     tpath_name = 'file:/var/config/rest/downloads/{0}'.format(ntf_basename)
-    if1 = setup_ifile_test(request, mgmt_root, ntf_basename, tpath_name)
+    if1 = setup_ifile_test(request, mgmt_root, ntf_basename, tpath_name,
+                           )
     assert if1.name == ntf_basename
 
     # Load Object