3 files changed, 43 insertions, 70 deletions
diff --git a/qtip/runner/__init__.py b/qtip/runner/__init__.py
index e69de29b..eab81156 100644
--- a/qtip/runner/__init__.py
+++ b/qtip/runner/__init__.py
@@ -0,0 +1,43 @@
+##############################################################################
+# Copyright (c) 2016 ZTE Corp and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+
+from qtip.base.constant import PkgName, PropName
+from qtip.base.error import NotFound
+from qtip.collector.stdout import StdoutCollector
+from qtip.driver.random import RandomDriver
+from qtip.reporter.console import ConsoleReporter
+
+
+class Runner(object):
+    def __init__(self, spec, config=None):
+        if config is None:
+            config = spec[PropName.CONFIG]
+
+        driver_name = config[PropName.DRIVER]
+        collector_name = config[PropName.COLLECTOR]
+        reporter_name = config[PropName.REPORTER]
+
+        # TODO(yujunz) dynamically load modules by name
+
+        if driver_name == 'random':
+            self.driver = RandomDriver()
+        else:
+            raise NotFound(driver_name, package=PkgName.DRIVER)
+
+        if collector_name == 'stdout':
+            self.collector = StdoutCollector()
+        else:
+            raise NotFound(collector_name,
+                           package=PkgName.COLLECTOR)
+
+        if reporter_name == 'console':
+            self.reporter = ConsoleReporter()
+        else:
+            raise NotFound(reporter_name,
+                           package=PkgName.REPORTER)
diff --git a/qtip/runner/base.py b/qtip/runner/base.py
deleted file mode 100644
index 07fba104..00000000
--- a/qtip/runner/base.py
+++ /dev/null
@@ -1,45 +0,0 @@
-##############################################################################
-# Copyright (c) 2016 ZTE Corp and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
-from qtip.base.constant import PkgName, PropName
-from qtip.base.error import NotFound
-from qtip.collector.logfile import LogfileCollector
-from qtip.driver.sample import SampleDriver
-from qtip.loader.base import BaseLoader
-from qtip.reporter.console import ConsoleReporter
-
-
-class BaseRunner(BaseLoader):
-    def __init__(self, name, paths=None, config=None):
-        super(BaseRunner, self).__init__(name, paths=paths)
-        if config is None:
-            config = self.content[PropName.CONFIG]
-
-        driver_name = config[PropName.DRIVER]
-        collector_name = config[PropName.COLLECTOR]
-        reporter_name = config[PropName.REPORTER]
-
-        # TODO(yujunz) dynamically load modules by name
-
-        if driver_name == 'sample':
-            self.driver = SampleDriver()
-        else:
-            raise NotFound(driver_name, package=PkgName.DRIVER)
-
-        if collector_name == 'logfile':
-            self.collector = LogfileCollector()
-        else:
-            raise NotFound(collector_name,
-                           package=PkgName.COLLECTOR)
-
-        if reporter_name == 'console':
-            self.reporter = ConsoleReporter()
-        else:
-            raise NotFound(reporter_name,
-                           package=PkgName.REPORTER)
diff --git a/qtip/runner/plan.py b/qtip/runner/plan.py
deleted file mode 100644
index f6c1c3bb..00000000
--- a/qtip/runner/plan.py
+++ /dev/null
@@ -1,25 +0,0 @@
-##############################################################################
-# Copyright (c) 2016 ZTE Corp and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
-from qtip.base.constant import PropName
-from qtip.runner.base import BaseRunner
-from qtip.loader.qpi import QPISpec
-
-
-class Plan(BaseRunner):
-    """
-    a benchmark plan is consist of configuration and a QPI list
-    """
-
-    DEFAULT_DIR = 'plan'
-
-    def __init__(self, name, paths=None):
-        super(Plan, self).__init__(name, paths)
-        self.qpis = [QPISpec(qpi, paths=paths)
-                     for qpi in self.content[PropName.QPIS]]