Merge pull request #80 from altor/release_0.6.2

Release 0.6.2

Author: altor

powerapi/cli/tools.py

@@ -68,8 +68,7 @@ def __init__(self):
         subparser_mongo_input = ComponentSubParser('mongodb')
         subparser_mongo_input.add_argument('u', 'uri', help='sepcify MongoDB uri')
         subparser_mongo_input.add_argument('d', 'db', help='specify MongoDB database name', )
-        subparser_mongo_input.add_argument('c', 'collection', help='specify MongoDB database collection',
-                                           default='sensor')
+        subparser_mongo_input.add_argument('c', 'collection', help='specify MongoDB database collection')
         subparser_mongo_input.add_argument('n', 'name', help='specify puller name', default='puller_mongodb')
         subparser_mongo_input.add_argument('m', 'model', help='specify data type that will be storen in the database',
                                            default='hwpc_report')
@@ -86,12 +85,12 @@ def __init__(self):
         subparser_csv_input.add_argument('n', 'name', help='specify puller name', default='puller_csv')
         self.add_component_subparser('input', subparser_csv_input,
                                      help_str='specify a database input : --db_output database_name ARG1 ARG2 ... ')
-        
+
         subparser_mongo_output = ComponentSubParser('mongodb')
         subparser_mongo_output.add_argument('u', 'uri', help='sepcify MongoDB uri')
         subparser_mongo_output.add_argument('d', 'db', help='specify MongoDB database name')
-        subparser_mongo_output.add_argument('c', 'collection', help='specify MongoDB database collection',
-                                            default='powermeter')
+        subparser_mongo_output.add_argument('c', 'collection', help='specify MongoDB database collection')
+                                            
         subparser_mongo_output.add_argument('m', 'model', help='specify data type that will be storen in the database',
                                             default='power_report')
         subparser_mongo_output.add_argument('n', 'name', help='specify puller name', default='pusher_mongodb')

tests/acceptation/test_simple_architecture_csv.py

@@ -52,7 +52,7 @@
 import logging
 import pytest
 
-from powerapi.cli.tools import CommonCLIParser, generate_pushers, generate_pullers
+from powerapi.cli.tools import CommonCLIParser, PusherGenerator, PullerGenerator
 from powerapi.backendsupervisor import BackendSupervisor
 from powerapi.formula import DummyFormulaActor
 from powerapi.dispatch_rule import HWPCDispatchRule, HWPCDepthLevel
@@ -133,14 +133,15 @@ def test_run(files, supervisor):
 
     config = {'verbose': LOG_LEVEL,
               'stream': False,
-              'input': [{'files': FILES,
-                         'model': 'hwpc_report',
-                         'name': 'puller',
-                         'type': 'csv'}],
-              'output': [{'model': 'power_report', 'name': 'pusher','type': 'csv', 'directory': ROOT_PATH}]}
+              'input': { 'csv' : {'files': FILES,
+                                  'model': 'hwpc_report',
+                                  'name': 'puller',
+                                  }},
+              'output': {'csv': {'model': 'power_report', 'name': 'pusher', 'directory': ROOT_PATH}}}
 
     # Pusher
-    pushers = generate_pushers(config)
+    pusher_generator = PusherGenerator()
+    pushers = pusher_generator.generate(config)
 
     # Formula
     formula_factory = (lambda name,
@@ -157,7 +158,8 @@ def test_run(files, supervisor):
     # Puller
     report_filter = Filter()
     report_filter.filter(lambda msg: True, dispatcher)
-    pullers = generate_pullers(config, report_filter)
+    puller_generator = PullerGenerator(report_filter)
+    pullers = puller_generator.generate(config)
 
     for _, pusher in pushers.items():
         supervisor.launch_actor(pusher)