Merge "Create a constants.py to manage constant variable consistently"

[yardstick.git] / yardstick / benchmark / scenarios / availability / result_checker / result_checker_general.py

diff --git a/yardstick/benchmark/scenarios/availability/result_checker/result_checker_general.py b/yardstick/benchmark/scenarios/availability/result_checker/result_checker_general.py
index 70bf9ae..ae896c2 100644 (file)
--- a/yardstick/benchmark/scenarios/availability/result_checker/result_checker_general.py
+++ b/yardstick/benchmark/scenarios/availability/result_checker/result_checker_general.py
@@ -17,7 +17,6 @@ LOG = logging.getLogger(__name__)
 
 
 class GeneralResultChecker(BaseResultChecker):
-
     __result_checker__type__ = "general-result-checker"
 
     def setup(self):
@@ -25,13 +24,16 @@ class GeneralResultChecker(BaseResultChecker):
         host = self._context.get(self._config['host'], None)
         ip = host.get("ip", None)
         user = host.get("user", "root")
+        ssh_port = host.get("ssh_port", ssh.DEFAULT_PORT)
         key_filename = host.get("key_filename", "~/.ssh/id_rsa")
 
-        self.connection = ssh.SSH(user, ip, key_filename=key_filename)
+        self.connection = ssh.SSH(user, ip, key_filename=key_filename,
+                                  port=ssh_port)
         self.connection.wait(timeout=600)
         LOG.debug("ssh host success!")
 
         self.key = self._config['key']
+        self.resultchecker_key = self._config['checker_key']
         self.type = self._config['checker_type']
         self.condition = self._config['condition']
         self.expectedResult = self._config['expectedValue']
@@ -45,7 +47,7 @@ class GeneralResultChecker(BaseResultChecker):
             self.shell_cmd = str.format(*l)
 
         self.resultchecker_cfgs = BaseResultChecker.resultchecker_cfgs.get(
-            self.key)
+            self.resultchecker_key)
         self.verify_script = self.get_script_fullpath(
             self.resultchecker_cfgs['verify_script'])