Add support for Python 3

Porting to Python3 using Openstack guidelines:
https://wiki.openstack.org/wiki/Python3

This passes unittests on Python 3.5 and passes opnfv_smoke suite

Updates:
   use six for urlparse and urlopen
   fix exception.message attribute removal
   run unittests on python3
   use unitest.mock on python 3
   fix open mock for vsperf
   fix float division by using delta/eplison comparison
   use unicode in StringIO
   use plugin/sample_config.yaml relative path from test case
   fixed apexlake unittests
   upgraded to mock 2.0.0 to match python3 unittest.mock features
   fixed flake8 issues
   implement safe JSON decode with oslo_serialization.jsonutils.dump_as_bytes()
   implement safe unicode encode/decode with oslo_utils.encodeutils

heat: convert pub key file from bytes to unicode
    pkg_resources returns raw bytes, in python3
    we have to decode this to utf-8 unicode
    so JSON can encode it for heat template

JIRA: YARDSTICK-452

Change-Id: Ib80dd1d0c0eb0592acd832b82f6a7f8f7c20bfda
Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>

1 files changed, 18 insertions, 7 deletions

diff --git a/tests/unit/benchmark/contexts/test_heat.py b/tests/unit/benchmark/contexts/test_heat.py
index dd830a485..f8f349205 100644
--- a/tests/unit/benchmark/contexts/test_heat.py
+++ b/tests/unit/benchmark/contexts/test_heat.py
@@ -11,14 +11,21 @@
 
 # Unittest for yardstick.benchmark.contexts.heat
 
+from __future__ import absolute_import
+
+import logging
 import os
-import mock
 import unittest
+import uuid
+
+import mock
 
-from yardstick.benchmark.contexts import model
 from yardstick.benchmark.contexts import heat
 
 
+LOG = logging.getLogger(__name__)
+
+
 class HeatContextTestCase(unittest.TestCase):
 
     def setUp(self):
@@ -70,7 +77,8 @@ class HeatContextTestCase(unittest.TestCase):
             'bar', self.test_context, networks['bar'])
         self.assertTrue(len(self.test_context.networks) == 1)
 
-        mock_server.assert_called_with('baz', self.test_context, servers['baz'])
+        mock_server.assert_called_with('baz', self.test_context,
+                                       servers['baz'])
         self.assertTrue(len(self.test_context.servers) == 1)
 
         if os.path.exists(self.test_context.key_filename):
@@ -78,7 +86,8 @@ class HeatContextTestCase(unittest.TestCase):
                 os.remove(self.test_context.key_filename)
                 os.remove(self.test_context.key_filename + ".pub")
             except OSError:
-                LOG.exception("key_filename: %s", e.key_filename)
+                LOG.exception("key_filename: %s",
+                              self.test_context.key_filename)
 
     @mock.patch('yardstick.benchmark.contexts.heat.HeatTemplate')
     def test__add_resources_to_template_no_servers(self, mock_template):
@@ -88,8 +97,9 @@ class HeatContextTestCase(unittest.TestCase):
         self.test_context.key_uuid = "2f2e4997-0a8e-4eb7-9fa4-f3f8fbbc393b"
 
         self.test_context._add_resources_to_template(mock_template)
-        mock_template.add_keypair.assert_called_with("foo-key",
-                                                     "2f2e4997-0a8e-4eb7-9fa4-f3f8fbbc393b")
+        mock_template.add_keypair.assert_called_with(
+            "foo-key",
+            "2f2e4997-0a8e-4eb7-9fa4-f3f8fbbc393b")
         mock_template.add_security_group.assert_called_with("foo-secgroup")
 
     @mock.patch('yardstick.benchmark.contexts.heat.HeatTemplate')
@@ -113,12 +123,13 @@ class HeatContextTestCase(unittest.TestCase):
 
         self.assertTrue(mock_template.delete.called)
 
-
     def test__get_server(self):
 
         self.mock_context.name = 'bar'
         self.mock_context.stack.outputs = {'public_ip': '127.0.0.1',
                                            'private_ip': '10.0.0.1'}
+        self.mock_context.key_uuid = uuid.uuid4()
+
         attr_name = {'name': 'foo.bar',
                      'public_ip_attr': 'public_ip',
                      'private_ip_attr': 'private_ip'}