Merge pull request #697 from caphrim007/bugfix.add-more-py3-support-01

zancas · web-flow · commit 285bb30f8ca6 · 2016-09-16T14:29:36.000-06:00
Adds various python3 fixes
diff --git a/conftest.py b/conftest.py
@@ -23,6 +23,8 @@
 import os
 import pytest
 import requests
+
+from six import itervalues
 from tempfile import NamedTemporaryFile
 
 
@@ -210,9 +212,9 @@ def _setup_boilerplate(bigip, request, pool_records):
                                 name=memconf.memname)
 
         def deleter():
-            for member_instance in members_registry.values():
+            for member_instance in list(itervalues(members_registry)):
                 member_instance.delete()
-            for pool_instance in pool_registry.values():
+            for pool_instance in list(itervalues(pool_registry)):
                 pool_instance.delete()
         request.addfinalizer(deleter)
         return pool_registry, members_registry
diff --git a/devtools/template_engine.py b/devtools/template_engine.py
@@ -1,4 +1,3 @@
-from __future__ import print_function
 # Copyright 2016 F5 Networks Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,14 +12,17 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+from __future__ import print_function
 
 import io
 import jinja2
 import json
 import os
-from pprint import pprint as pp
 import re
 
+from pprint import pprint as pp
+from six import iterkeys
+
 
 class UnexpectedOCItem(Exception):
     pass
@@ -68,10 +70,10 @@ def _consume_directory(self, dirname, consumer):
         os.path.walk(dirname, consumer, self)
 
     def list_templates(self):
-        pp(self.templates.keys())
+        pp(list(iterkeys(self.templates)))
 
     def list_raw_configs(self):
-        pp(self.raw_configs.keys())
+        pp(list(iterkeys(self.raw_configs)))
 
     def process_config_from_fname(self, fname):
         if not fname.endswith('.json'):
diff --git a/f5/bigip/cm/autodeploy/test/test_software_image_uploads.py b/f5/bigip/cm/autodeploy/test/test_software_image_uploads.py
@@ -36,7 +36,7 @@ def test_software_image_uploads_80a(tmpdir, fakeicontrolsessionfactory):
     session_mock = mr._meta_data['icr_session']
     for i in range(4):
         d = session_mock.post.call_args_list[i][1]['data']
-        assert d == 'a'*CHUNKSIZE
+        assert d == b'a'*CHUNKSIZE
 
 
 def test_software_image_uploads_70a(tmpdir, fakeicontrolsessionfactory):
@@ -49,11 +49,10 @@ def test_software_image_uploads_70a(tmpdir, fakeicontrolsessionfactory):
     session_mock = mr._meta_data['icr_session']
     sius.upload_image(str(filepath), chunk_size=CHUNKSIZE)
     for i in range(3):
-        print(i)
         d = session_mock.post.call_args_list[i][1]['data']
-        assert d == 'a'*CHUNKSIZE
+        assert d == b'a'*CHUNKSIZE
     lchunk = session_mock.post.call_args_list[3][1]['data']
-    assert 10*'a' == lchunk
+    assert b'a'*10 == lchunk
 
 
 def test_non_ISO_extension(tmpdir, fakeicontrolsessionfactory):
@@ -63,4 +62,4 @@ def test_non_ISO_extension(tmpdir, fakeicontrolsessionfactory):
     sius = mr.cm.autodeploy.software_image_uploads
     with pytest.raises(ImageFilesMustHaveDotISOExtension) as EIO:
         sius.upload_image(str(filepath), chunk_size=CHUNKSIZE)
-    assert EIO.value.message == 'wrong.name'
+    assert str(EIO.value) == 'wrong.name'
diff --git a/f5/bigip/shared/test/test_file_uploads.py b/f5/bigip/shared/test/test_file_uploads.py
@@ -36,7 +36,7 @@ def test_file_upload_80a(tmpdir, fakeicontrolsession):
     session_mock = mr._meta_data['icr_session']
     for i in range(4):
         d = session_mock.post.call_args_list[i][1]['data']
-        assert d == 'aaaaaaaaaaaaaaaaaaaa'
+        assert d == b'aaaaaaaaaaaaaaaaaaaa'
 
 
 def test_file_upload_70a(tmpdir, fakeicontrolsession):
@@ -50,9 +50,9 @@ def test_file_upload_70a(tmpdir, fakeicontrolsession):
     for i in range(3):
         print(i)
         d = session_mock.post.call_args_list[i][1]['data']
-        assert d == 'aaaaaaaaaaaaaaaaaaaa'
+        assert d == b'aaaaaaaaaaaaaaaaaaaa'
     lchunk = session_mock.post.call_args_list[3][1]['data']
-    assert 10*'a' == lchunk
+    assert b'a'*10 == lchunk
 
 
 def test_ISO_extension(tmpdir, fakeicontrolsession):
@@ -62,7 +62,7 @@ def test_ISO_extension(tmpdir, fakeicontrolsession):
     ftu = mr.shared.file_transfer.uploads
     with pytest.raises(FileMustNotHaveDotISOExtension) as EIO:
         ftu.upload_file(filepath.__str__(), chunk_size=21)
-    assert EIO.value.message == 'wrongname.iso'
+    assert str(EIO.value) == 'wrongname.iso'
 
 
 def test_stringio_upload_80a(tmpdir, fakeicontrolsession):
diff --git a/f5/bigip/test/test___init__.py b/f5/bigip/test/test___init__.py
@@ -61,7 +61,7 @@ def test___get__attr(FakeBigIP):
 def test_invalid_args():
     with pytest.raises(TypeError) as err:
         BigIP('FakeHostName', 'admin', 'admin', badArgs='foobar')
-    assert 'Unexpected **kwargs' in err.value.message
+    assert 'Unexpected **kwargs' in str(err.value)
 
 
 def test_icontrol_version(FakeBigIPWithPort):
diff --git a/f5/bigip/test/test_mixins.py b/f5/bigip/test/test_mixins.py
@@ -44,7 +44,8 @@ def test_list_and_int():
     MTCobj.x = [1, 'a']
     MTCobj.y = 1
     mtc_as_dict = MTCobj.to_dict()
-    assert json.dumps(mtc_as_dict) == '{"y": 1, "x": [1, "a"]}'
+    assert json.dumps(mtc_as_dict, sort_keys=True) == \
+        '{"x": [1, "a"], "y": 1}'
 
 
 def test_list_and_int_and_list2():
@@ -53,15 +54,17 @@ def test_list_and_int_and_list2():
     MTCobj.y = 1
     MTCobj.z = [1, 'a']
     mtc_as_dict = MTCobj.to_dict()
-    assert json.dumps(mtc_as_dict) == '{"y": 1, "x": [1, "a"], "z": [1, "a"]}'
+    assert json.dumps(mtc_as_dict, sort_keys=True) == \
+        '{"x": [1, "a"], "y": 1, "z": [1, "a"]}'
 
 
 def test_two_refs():
     MTCobj = MixinTestClass()
     MTCobj.x = [1, 'a']
     MTCobj.z = MTCobj.x
     mtc_as_dict = MTCobj.to_dict()
-    assert json.dumps(mtc_as_dict) ==\
+    dict1 = json.dumps(mtc_as_dict, sort_keys=True)
+    assert dict1 ==\
         '{"x": [1, "a"], "z": ["TraversalRecord", "x"]}'
 
 
diff --git a/f5/bigip/tm/gtm/test/test_pool.py b/f5/bigip/tm/gtm/test/test_pool.py
@@ -29,6 +29,8 @@
 from f5.bigip.tm.gtm.pool import PoolCollection
 from f5.bigip.tm.gtm.pool import Srv
 
+from six import iterkeys
+
 
 @pytest.fixture
 def FakePoolv11():
@@ -83,7 +85,7 @@ def test_pool_attr_exists(self, fakeicontrolsession):
         test_meta = p._meta_data['attribute_registry']
         test_meta2 = p._meta_data['allowed_lazy_attributes']
         kind = 'tm:gtm:pool:poolstate'
-        assert kind in test_meta.keys()
+        assert kind in list(iterkeys(test_meta))
         assert Pool in test_meta2
 
 
@@ -129,7 +131,7 @@ def test_collections(self, fakeicontrolsession_v12, klass):
         test_meta = rc._meta_data['attribute_registry']
         test_meta2 = rc._meta_data['allowed_lazy_attributes']
         kind = self.poolkinds[self.urielementname()]
-        assert kind in test_meta.keys()
+        assert kind in list(iterkeys(test_meta))
         assert klass in test_meta2
 
     def test_create_two_v12(self, fakeicontrolsession_v12):
diff --git a/f5/bigip/tm/gtm/test/test_server.py b/f5/bigip/tm/gtm/test/test_server.py
@@ -21,6 +21,8 @@
 from f5.bigip.tm.gtm.server import Server
 from f5.bigip.tm.gtm.server import Virtual_Servers
 
+from six import iterkeys
+
 
 @pytest.fixture
 def FakeServer():
@@ -63,7 +65,7 @@ def test_vs_attr_exists(self, fakeicontrolsession):
         s = b.tm.gtm.servers.server
         test_meta = s._meta_data['attribute_registry']
         kind = 'tm:gtm:server:virtual-servers:virtual-serverscollectionstate'
-        assert kind in test_meta.keys()
+        assert kind in list(iterkeys(test_meta))
 
     def test_create_no_args(self, FakeVS):
         with pytest.raises(MissingRequiredCreationParameter):
diff --git a/f5/bigip/tm/gtm/test/test_wideip.py b/f5/bigip/tm/gtm/test/test_wideip.py
@@ -29,6 +29,8 @@
 from f5.bigip.tm.gtm.wideip import Wideip
 from f5.bigip.tm.gtm.wideip import WideipCollection
 
+from six import iterkeys
+
 
 @pytest.fixture
 def FakeWideipv11():
@@ -83,7 +85,7 @@ def test_wideip_attr_exists(self, fakeicontrolsession):
         test_meta = w._meta_data['attribute_registry']
         test_meta2 = w._meta_data['allowed_lazy_attributes']
         kind = 'tm:gtm:wideip:wideipstate'
-        assert kind in test_meta.keys()
+        assert kind in list(iterkeys(test_meta))
         assert Wideip in test_meta2
 
 
@@ -129,7 +131,7 @@ def test_collections(self, fakeicontrolsession_v12, klass):
         test_meta = rc._meta_data['attribute_registry']
         test_meta2 = rc._meta_data['allowed_lazy_attributes']
         kind = self.kinds[self.urielementname()]
-        assert kind in test_meta.keys()
+        assert kind in list(iterkeys(test_meta))
         assert klass in test_meta2
 
     def test_create_two_v12(self, fakeicontrolsession_v12):
diff --git a/f5/bigip/tm/ltm/snat.py b/f5/bigip/tm/ltm/snat.py
@@ -31,6 +31,8 @@
 from f5.bigip.resource import MissingRequiredCreationParameter
 from f5.bigip.resource import Resource
 
+from six import iterkeys
+
 
 class RequireOneOf(MissingRequiredCreationParameter):
     pass
@@ -84,8 +86,8 @@ def create(self, **kwargs):
         """
         rcp = self._meta_data['required_creation_parameters']
         required_singles = set(('automap', 'snatpool', 'translation'))
-        pre_req_len = len(kwargs.keys())
-        if len(rcp - required_singles) != (pre_req_len-1):
+        pre_req_len = len(list(iterkeys(kwargs)))
+        if len(rcp - required_singles) != (pre_req_len - 1):
             error_message = 'Creation requires one of the provided k,v:\n'
             for req_sing in required_singles:
                 try:
diff --git a/f5/bigip/tm/net/route.py b/f5/bigip/tm/net/route.py
@@ -32,6 +32,8 @@
 from f5.bigip.resource import MissingRequiredCreationParameter
 from f5.bigip.resource import Resource
 
+from six import iterkeys
+
 
 class Routes(Collection):
     """BIG-IP® network route collection"""
@@ -71,7 +73,8 @@ def create(self, **kwargs):
         # required_creation_parameters because it needs to be one of the
         # gateways in the list.
         gateways = ['blackhole', 'gw', 'tmInterface', 'pool']
-        if not [k for k in kwargs.keys() if k in gateways]:
+        kwkeys = list(iterkeys(kwargs))
+        if not [k for k in kwkeys if k in gateways]:
             raise MissingRequiredCreationParameter(
                 "One of %s gateways is required." % gateways
             )
diff --git a/f5/multi_device/trust_domain.py b/f5/multi_device/trust_domain.py
@@ -44,6 +44,7 @@
 
 '''
 from __future__ import print_function
+from six import iteritems
 
 from f5.multi_device.exceptions import DeviceAlreadyInTrustDomain
 from f5.multi_device.exceptions import DeviceNotTrusted
@@ -94,7 +95,7 @@ def validate(self):
         self._populate_domain()
         missing = []
         for domain_device in self.domain:
-            for truster, trustees in self.domain.iteritems():
+            for truster, trustees in iteritems(self.domain):
                 if domain_device not in trustees:
                     missing.append((domain_device, truster, trustees))
 
diff --git a/f5/utils/testutils/registrytools.py b/f5/utils/testutils/registrytools.py
@@ -15,6 +15,7 @@
 
 import logging
 from pprint import pprint as pp
+from six import itervalues
 
 from f5.bigip.mixins import UnsupportedTmosVersion
 from f5.bigip.resource import Collection
@@ -81,7 +82,7 @@ def register_loadbalancer_elements(mgmt_rt):
     virtual_address_s_registry =\
         register_collection_atoms(mgmt_rt.tm.ltm.virtual_address_s)
     member_registry = {}
-    for pool in pool_registry.values():
+    for pool in list(itervalues(pool_registry)):
         mc = pool.members_s
         member_registry.update(register_collection_atoms(mc))
     folder_registry = register_collection_atoms(mgmt_rt.tm.sys.folders)
diff --git a/test/functional/test_requests_params.py b/test/functional/test_requests_params.py
@@ -14,6 +14,8 @@
 #
 
 from collections import namedtuple
+from six import itervalues
+
 PoolConfig = namedtuple('PoolConfig', 'partition name memberconfigs')
 MemberConfig = namedtuple('MemberConfig', 'mempartition memname')
 
@@ -26,7 +28,7 @@ def test_get_collection(request, bigip, pool_factory, opt_release):
     pool_registry, member_registry =\
         pool_factory(bigip, request, test_pools)
     selfLinks = []
-    for pool_inst in pool_registry.values():
+    for pool_inst in list(itervalues(pool_registry)):
         for mem in pool_inst.members_s.get_collection():
             selfLinks.append(mem.selfLink)
     assert selfLinks[0] == u'https://localhost/mgmt/tm/ltm/pool/' +\
diff --git a/test/functional/tm/gtm/test_pool.py b/test/functional/tm/gtm/test_pool.py
@@ -30,7 +30,10 @@
 from f5.bigip.tm.gtm.pool import Srv
 from pprint import pprint as pp
 import pytest
+
 from requests.exceptions import HTTPError
+from six import iteritems
+
 pp(__file__)
 
 
@@ -213,7 +216,7 @@ def test_MCURDL(self, request, mgmt_root, **kwargs):
         pool.__dict__['_meta_data'] = meta_data
         pool.modify(description='MODIFIED')
         desc = 'description'
-        for k, v in pool.__dict__.items():
+        for k, v in iteritems(pool.__dict__):
             if k != desc:
                 start_dict[k] = pool.__dict__[k]
                 assert getattr(pool, k) == start_dict[k]
@@ -305,7 +308,7 @@ def test_members_MCURDL(self, request, mgmt_root, **kwargs):
         member.__dict__['_meta_data'] = meta_data
         member.modify(description='MODIFIED')
         desc = 'description'
-        for k, v in member.__dict__.items():
+        for k, v in iteritems(member.__dict__):
             if k != desc:
                 start_dict[k] = member.__dict__[k]
                 assert getattr(member, k) == start_dict[k]
@@ -654,7 +657,7 @@ def test_modify(self, request, mgmt_root):
         original_dict = copy.copy(p1.__dict__)
         limit = 'limitMaxBpsStatus'
         p1.modify(limitMaxBpsStatus='enabled')
-        for k, v in original_dict.items():
+        for k, v in iteritems(original_dict):
             if k != limit:
                 original_dict[k] = p1.__dict__[k]
             elif k == limit:
@@ -779,7 +782,7 @@ def test_modify(self, request, mgmt_root):
         original_dict = copy.copy(m1.__dict__)
         limit = 'limitMaxBpsStatus'
         m1.modify(limitMaxBpsStatus='enabled')
-        for k, v in original_dict.items():
+        for k, v in iteritems(original_dict):
             if k != limit:
                 original_dict[k] = m1.__dict__[k]
             elif k == limit:
diff --git a/test/functional/tm/gtm/test_server.py b/test/functional/tm/gtm/test_server.py
@@ -19,7 +19,9 @@
 from distutils.version import LooseVersion
 from f5.bigip.tm.gtm.server import Server
 from f5.bigip.tm.gtm.server import Virtual_Servers
+
 from requests.exceptions import HTTPError
+from six import iteritems
 
 
 def delete_server(mgmt_root, name):
@@ -211,7 +213,7 @@ def test_modify(self, request, mgmt_root):
         original_dict = copy.copy(s1.__dict__)
         iqpath = 'iqAllowPath'
         s1.modify(iqAllowPath='no')
-        for k, v in original_dict.items():
+        for k, v in iteritems(original_dict):
             if k != iqpath:
                 original_dict[k] = s1.__dict__[k]
             elif k == iqpath:
@@ -325,7 +327,7 @@ def test_modify(self, request, mgmt_root):
         original_dict = copy.copy(vs1.__dict__)
         limit = 'limitMaxBpsStatus'
         vs1.modify(limitMaxBpsStatus='enabled')
-        for k, v in original_dict.items():
+        for k, v in iteritems(original_dict):
             if k != limit:
                 original_dict[k] = vs1.__dict__[k]
             elif k == limit:
diff --git a/test/functional/tm/gtm/test_wideips.py b/test/functional/tm/gtm/test_wideips.py
diff --git a/test/functional/tm/ltm/test_data_group.py b/test/functional/tm/ltm/test_data_group.py
diff --git a/test/functional/tm/ltm/test_ifile.py b/test/functional/tm/ltm/test_ifile.py
diff --git a/test/functional/tm/ltm/test_pool.py b/test/functional/tm/ltm/test_pool.py
diff --git a/test/functional/tm/ltm/test_profile.py b/test/functional/tm/ltm/test_profile.py
diff --git a/test/functional/tm/ltm/test_virtual.py b/test/functional/tm/ltm/test_virtual.py
diff --git a/test/functional/tm/sys/test_file.py b/test/functional/tm/sys/test_file.py
diff --git a/test/functional/tm/vcmp/test_guest.py b/test/functional/tm/vcmp/test_guest.py
