Merge "ubuntu-server-cloudimg-modify.sh: shellcheck fixes"

[yardstick.git] / yardstick / benchmark / scenarios / availability / serviceha.py

diff --git a/yardstick/benchmark/scenarios/availability/serviceha.py b/yardstick/benchmark/scenarios/availability/serviceha.py
index 46a197c..e82e69b 100755 (executable)
--- a/yardstick/benchmark/scenarios/availability/serviceha.py
+++ b/yardstick/benchmark/scenarios/availability/serviceha.py
@@ -6,6 +6,8 @@
 # which accompanies this distribution, and is available at
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
+from __future__ import print_function
+from __future__ import absolute_import
 import logging
 from yardstick.benchmark.scenarios import base
 from yardstick.benchmark.scenarios.availability.monitor import basemonitor
@@ -28,7 +30,7 @@ class ServiceHA(base.Scenario):
         self.setup_done = False
 
     def setup(self):
-        '''scenario setup'''
+        """scenario setup"""
         nodes = self.context_cfg.get("nodes", None)
         if nodes is None:
             LOG.error("the nodes info is none")
@@ -75,13 +77,13 @@ class ServiceHA(base.Scenario):
         return
 
     def teardown(self):
-        '''scenario teardown'''
+        """scenario teardown"""
         for attacker in self.attackers:
             attacker.recover()
 
 
 def _test():    # pragma: no cover
-    '''internal test function'''
+    """internal test function"""
     host = {
         "ip": "10.20.0.5",
         "user": "root",
@@ -109,15 +111,16 @@ def _test():    # pragma: no cover
     sla = {"outage_time": 5}
     args = {"options": options, "sla": sla}
 
-    print "create instance"
+    print("create instance")
     terstInstance = ServiceHA(args, ctx)
 
     terstInstance.setup()
     result = {}
     terstInstance.run(result)
-    print result
+    print(result)
 
     terstInstance.teardown()
 
+
 if __name__ == '__main__':    # pragma: no cover
     _test()