Merge "load_gen: Supporting loading of load_gen via loader."

3 files changed, 4 insertions, 2 deletions

diff --git a/tools/load_gen/dummy/__init__.py b/tools/load_gen/dummyloadgen/__init__.py
index 834e9f63..834e9f63 100644
--- a/tools/load_gen/dummy/__init__.py
+++ b/tools/load_gen/dummyloadgen/__init__.py
diff --git a/tools/load_gen/dummy/dummy.py b/tools/load_gen/dummyloadgen/dummyloadgen.py
index 91bef4fa..91bef4fa 100644
--- a/tools/load_gen/dummy/dummy.py
+++ b/tools/load_gen/dummyloadgen/dummyloadgen.py
diff --git a/tools/load_gen/stress/stress.py b/tools/load_gen/stress/stress.py
index 4c69a170..0790d47c 100644
--- a/tools/load_gen/stress/stress.py
+++ b/tools/load_gen/stress/stress.py
@@ -52,8 +52,10 @@ class Stress(ILoadGenerator):
             return
 
         # check if load tool binary is available
-        if not ('tool' in stress_config) or subprocess.call("which " + stress_config['tool'], shell=True) > 0:
-            self._logger.error("stress tool binary '%s' is not available", stress_config['tool'])
+        if subprocess.call("which {}".format(self._process_args['name']),
+                           shell=True) > 0:
+            self._logger.error("stress tool binary '%s' is not available",
+                               self._process_args['name'])
             return
 
         # calculate requested load details and load split among different