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

[yardstick.git] / yardstick / benchmark / scenarios / storage / storagecapacity.py

diff --git a/yardstick/benchmark/scenarios/storage/storagecapacity.py b/yardstick/benchmark/scenarios/storage/storagecapacity.py
index 49e3a03..bed45fa 100644 (file)
--- a/yardstick/benchmark/scenarios/storage/storagecapacity.py
+++ b/yardstick/benchmark/scenarios/storage/storagecapacity.py
@@ -54,11 +54,13 @@ class StorageCapacity(base.Scenario):
         if host is None:
             raise RuntimeError('No right node.Please check the configuration')
         host_user = host.get('user', 'ubuntu')
+        ssh_port = host.get("ssh_port", ssh.DEFAULT_PORT)
         host_ip = host.get('ip', None)
         host_pwd = host.get('password', 'root')
         LOG.debug("user:%s, host:%s", host_user, host_ip)
 
-        self.client = ssh.SSH(host_user, host_ip, password=host_pwd)
+        self.client = ssh.SSH(host_user, host_ip, password=host_pwd,
+                              port=ssh_port)
         self.client.wait(timeout=600)
 
         # copy script to host