Merge "Update setup.py to include plugin install/remove scripts and rename "script...

[yardstick.git] / yardstick / benchmark / scenarios / availability / monitor / monitor_general.py

diff --git a/yardstick/benchmark/scenarios/availability/monitor/monitor_general.py b/yardstick/benchmark/scenarios/availability/monitor/monitor_general.py
index e7e4d5b..61efc05 100644 (file)
--- a/yardstick/benchmark/scenarios/availability/monitor/monitor_general.py
+++ b/yardstick/benchmark/scenarios/availability/monitor/monitor_general.py
@@ -27,6 +27,7 @@ class GeneralMonitor(basemonitor.BaseMonitor):
         user = host.get("user", "root")
         key_filename = host.get("key_filename", "~/.ssh/id_rsa")
         self.key = self._config["key"]
+        self.monitor_key = self._config["monitor_key"]
         self.monitor_type = self._config["monitor_type"]
 
         if "parameter" in self._config:
@@ -35,7 +36,8 @@ class GeneralMonitor(basemonitor.BaseMonitor):
             l = list(item for item in parameter.values())
             self.cmd_param = str.format(*l)
 
-        self.monitor_cfg = basemonitor.BaseMonitor.monitor_cfgs.get(self.key)
+        self.monitor_cfg = basemonitor.BaseMonitor.monitor_cfgs.get(
+            self.monitor_key)
         self.monitor_script = self.get_script_fullpath(
             self.monitor_cfg['monitor_script'])
         self.connection = ssh.SSH(user, ip, key_filename=key_filename)