Merge pull request #84 from altor/release_0.6.2

Release 0.6.5

Author: altor

powerapi/__init__.py

@@ -27,4 +27,4 @@
 # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-__version__ = "0.6.4"
+__version__ = "0.6.5"

powerapi/cli/tools.py

@@ -32,6 +32,7 @@
 import logging
 
 from functools import reduce
+from powerapi.exception import PowerAPIException
 from powerapi.cli.parser import MainParser, ComponentSubParser
 from powerapi.cli.parser import store_true
 from powerapi.cli.parser import BadValueException, MissingValueException
@@ -186,6 +187,20 @@ def _gen_actor(self, component_name, component_config, main_config):
         raise NotImplementedError()
 
 
+class ModelNameAlreadyUsed(PowerAPIException):
+    """
+    Exception raised when attempting to add to a DBActorGenerator a model factory with a name already bound to another
+    model factory in the DBActorGenerator
+    """
+
+
+class ModelNameAlreadyUsed(PowerAPIException):
+    """
+    Exception raised when attempting to add to a DBActorGenerator a database factory with a name already bound to another
+    database factory in the DBActorGenerator
+    """
+
+
 class DBActorGenerator(Generator):
 
     def __init__(self, component_group_name):
@@ -203,6 +218,16 @@ def __init__(self, component_group_name):
             'opentsdb': lambda db_config: OpenTSDB(db_config['uri'], db_config['port'], db_config['metric_name']),
         }
 
+    def add_model_factory(self, model_name, model_factory):
+        if model_name in self.model_factory:
+            raise ModelNameAlreadyUsed()
+        self.model_factory[model_name] = model_factory
+
+    def add_db_factory(self, db_name, db_factory):
+        if db_name in self.model_factory:
+            raise ModelNameAlreadyUsed()
+        self.model_factory[db_name] = db_factory
+
     def _generate_db(self, db_name, db_config, main_config):
         return self.db_factory[db_name](db_config)