Add Python3 support in functest/ci

Change-Id: If13bfaa196b8dfab1e83feb28c5a4719c7acd8c7
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>

2 files changed, 4 insertions, 3 deletions

diff --git a/functest/ci/check_deployment.py b/functest/ci/check_deployment.py
index ae016a80..8cc522f6 100644
--- a/functest/ci/check_deployment.py
+++ b/functest/ci/check_deployment.py
@@ -19,16 +19,16 @@ import logging
 import logging.config
 import os
 import pkg_resources
+from six.moves.urllib.parse import urlparse
 import socket
-from urlparse import urlparse
 
 from functest.opnfv_tests.openstack.snaps import snaps_utils
 
+from snaps.openstack.tests import openstack_tests
 from snaps.openstack.utils import glance_utils
 from snaps.openstack.utils import keystone_utils
 from snaps.openstack.utils import neutron_utils
 from snaps.openstack.utils import nova_utils
-from snaps.openstack.tests import openstack_tests
 
 __author__ = "Jose Lausuch <jose.lausuch@ericsson.com>"
 
diff --git a/functest/ci/run_tests.py b/functest/ci/run_tests.py
index d476bded..67a6f142 100644
--- a/functest/ci/run_tests.py
+++ b/functest/ci/run_tests.py
@@ -19,6 +19,7 @@ import sys
 import textwrap
 
 import prettytable
+import six
 import yaml
 
 import functest.ci.tier_builder as tb
@@ -118,7 +119,7 @@ class Runner(object):
             raise Exception("RC file %s does not exist..." % rc_file)
         logger.debug("Sourcing the OpenStack RC file...")
         os_utils.source_credentials(rc_file)
-        for key, value in os.environ.iteritems():
+        for key, value in six.iteritems(os.environ):
             if re.search("OS_", key):
                 if key == 'OS_AUTH_URL':
                     CONST.__setattr__('OS_AUTH_URL', value)