Add support for Python 3

[yardstick.git] / yardstick / benchmark / contexts / heat.py

diff --git a/yardstick/benchmark/contexts/heat.py b/yardstick/benchmark/contexts/heat.py
index 166ca40..0b2fbdc 100644 (file)
--- a/yardstick/benchmark/contexts/heat.py
+++ b/yardstick/benchmark/contexts/heat.py
@@ -7,20 +7,28 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
 
+from __future__ import absolute_import
+from __future__ import print_function
+
+import collections
+import logging
 import os
 import sys
 import uuid
-import pkg_resources
+
 import paramiko
+import pkg_resources
 
 from yardstick.benchmark.contexts.base import Context
-from yardstick.benchmark.contexts.model import Server
-from yardstick.benchmark.contexts.model import PlacementGroup
 from yardstick.benchmark.contexts.model import Network
+from yardstick.benchmark.contexts.model import PlacementGroup
+from yardstick.benchmark.contexts.model import Server
 from yardstick.benchmark.contexts.model import update_scheduler_hints
-from yardstick.orchestrator.heat import HeatTemplate
+from yardstick.orchestrator.heat import HeatTemplate, get_short_key_uuid
 from yardstick.definitions import YARDSTICK_ROOT_PATH
 
+LOG = logging.getLogger(__name__)
+
 
 class HeatContext(Context):
     '''Class that represents a context in the logical model'''
@@ -44,8 +52,9 @@ class HeatContext(Context):
         # generate an uuid to identify yardstick_key
         # the first 8 digits of the uuid will be used
         self.key_uuid = uuid.uuid4()
-        self.key_filename = YARDSTICK_ROOT_PATH + \
-            'yardstick/resources/files/yardstick_key-' + str(self.key_uuid)[:8]
+        self.key_filename = ''.join(
+            [YARDSTICK_ROOT_PATH, 'yardstick/resources/files/yardstick_key-',
+             get_short_key_uuid(self.key_uuid)])
         super(self.__class__, self).__init__()
 
     def init(self, attrs):
@@ -192,7 +201,7 @@ class HeatContext(Context):
 
     def deploy(self):
         '''deploys template into a stack using cloud'''
-        print "Deploying context '%s'" % self.name
+        print("Deploying context '%s'" % self.name)
 
         heat_template = HeatTemplate(self.name, self.template_file,
                                      self.heat_parameters)
@@ -213,29 +222,29 @@ class HeatContext(Context):
         for server in self.servers:
             if len(server.ports) > 0:
                 # TODO(hafe) can only handle one internal network for now
-                port = server.ports.values()[0]
+                port = list(server.ports.values())[0]
                 server.private_ip = self.stack.outputs[port["stack_name"]]
 
             if server.floating_ip:
                 server.public_ip = \
                     self.stack.outputs[server.floating_ip["stack_name"]]
 
-        print "Context '%s' deployed" % self.name
+        print("Context '%s' deployed" % self.name)
 
     def undeploy(self):
         '''undeploys stack from cloud'''
         if self.stack:
-            print "Undeploying context '%s'" % self.name
+            print("Undeploying context '%s'" % self.name)
             self.stack.delete()
             self.stack = None
-            print "Context '%s' undeployed" % self.name
+            print("Context '%s' undeployed" % self.name)
 
         if os.path.exists(self.key_filename):
             try:
                 os.remove(self.key_filename)
                 os.remove(self.key_filename + ".pub")
-            except OSError, e:
-                print ("Error: %s - %s." % (e.key_filename, e.strerror))
+            except OSError:
+                LOG.exception("Key filename %s", self.key_filename)
 
     def _get_server(self, attr_name):
         '''lookup server info by name from context
@@ -243,10 +252,10 @@ class HeatContext(Context):
         with attribute name mapping when using external heat templates
         '''
         key_filename = pkg_resources.resource_filename(
-            'yardstick.resources', 'files/yardstick_key-{:.{width}}'.format(
-                                      self.key_uuid, width=8))
+            'yardstick.resources',
+            'files/yardstick_key-' + get_short_key_uuid(self.key_uuid))
 
-        if type(attr_name) is dict:
+        if isinstance(attr_name, collections.Mapping):
             cname = attr_name["name"].split(".")[1]
             if cname != self.name:
                 return None