Merge pull request #23 from petevg/bug/instance-placement-bug

[osm/N2VC.git] / juju / application.py

diff --git a/juju/application.py b/juju/application.py
index 42dae71..83c2275 100644 (file)
--- a/juju/application.py
+++ b/juju/application.py
@@ -3,6 +3,7 @@ import logging
 
 from . import model
 from .client import client
+from .placement import parse as parse_placement
 
 log = logging.getLogger(__name__)
 
@@ -49,6 +50,10 @@ class Application(model.ModelEntity):
         """
         return self.data['status']['message']
 
+    @property
+    def tag(self):
+        return 'application-%s' % self.name
+
     async def add_relation(self, local_relation, remote_relation):
         """Add a relation to another application.
 
@@ -83,7 +88,7 @@ class Application(model.ModelEntity):
 
         result = await app_facade.AddUnits(
             application=self.name,
-            placement=to,
+            placement=[parse_placement(to)],
             num_units=count,
         )
 
@@ -193,7 +198,8 @@ class Application(model.ModelEntity):
         log.debug(
             'Getting constraints for %s', self.name)
 
-        return vars((await app_facade.Get(self.name)).constraints)
+        result = (await app_facade.Get(self.name)).constraints
+        return vars(result) if result else result
 
     def get_actions(self, schema=False):
         """Get actions defined for this application.
@@ -212,14 +218,27 @@ class Application(model.ModelEntity):
         """
         pass
 
-    def run(self, command, timeout=None):
+    async def run(self, command, timeout=None):
         """Run command on all units for this application.
 
         :param str command: The command to run
         :param int timeout: Time to wait before command is considered failed
 
         """
-        pass
+        action = client.ActionFacade()
+        action.connect(self.connection)
+
+        log.debug(
+            'Running `%s` on all units of %s', command, self.name)
+
+        # TODO this should return a list of Actions
+        return await action.Run(
+            [self.name],
+            command,
+            [],
+            timeout,
+            [],
+        )
 
     async def set_annotations(self, annotations):
         """Set annotations on this application.
@@ -239,22 +258,34 @@ class Application(model.ModelEntity):
         )
         return await self.ann_facade.Set([ann])
 
-    def set_config(self, to_default=False, **config):
+    async def set_config(self, config, to_default=False):
         """Set configuration options for this application.
 
+        :param config: Dict of configuration to set
         :param bool to_default: Set application options to default values
-        :param \*\*config: Config key/values
 
         """
-        pass
+        app_facade = client.ApplicationFacade()
+        app_facade.connect(self.connection)
 
-    def set_constraints(self, constraints):
+        log.debug(
+            'Setting config for %s: %s', self.name, config)
+
+        return await app_facade.Set(self.name, config)
+
+    async def set_constraints(self, constraints):
         """Set machine constraints for this application.
 
-        :param :class:`juju.Constraints` constraints: Machine constraints
+        :param dict constraints: Dict of machine constraints
 
         """
-        pass
+        app_facade = client.ApplicationFacade()
+        app_facade.connect(self.connection)
+
+        log.debug(
+            'Setting constraints for %s: %s', self.name, constraints)
+
+        return await app_facade.SetConstraints(self.name, constraints)
 
     def set_meter_status(self, status, info=None):
         """Set the meter status on this status.
@@ -311,3 +342,6 @@ class Application(model.ModelEntity):
 
         """
         pass
+
+    async def get_metrics(self):
+        return await self.model.get_metrics(self.tag)