Adds various python3 fixes

Issues:
None

Problem:
There are various python3 changes that need to be made to allow for
supporting both python 2 and 3.

Analysis:
This patch includes a variety of those patches and is a preogressive
enhancement

Tests:
none

Author: caphrim007

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

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'):

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'

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):

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):

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"]}'
 
 

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):

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):

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):

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: