X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=juju%2Fapplication.py;h=42dae71c44df1d0b881f3c5edbbb56dac545fdaa;hb=55ae2c120ce031f57ac210f3d7bd203db739f1e9;hp=c3d2f0d643310d09f5d11911ae31cfb06b5f1d0c;hpb=4c1f68ce9871fa965fe9683aeeb5ddd66b42a5bc;p=osm%2FN2VC.git

diff --git a/juju/application.py b/juju/application.py
index c3d2f0d..42dae71 100644
--- a/juju/application.py
+++ b/juju/application.py
@@ -35,7 +35,21 @@ class Application(model.ModelEntity):
             if unit.application == self.name
         ]
 
-    def add_relation(self, local_relation, remote_relation):
+    @property
+    def status(self):
+        """Get the application status, as set by the charm's leader.
+
+        """
+        return self.data['status']['current']
+
+    @property
+    def status_message(self):
+        """Get the application status message, as set by the charm's leader.
+
+        """
+        return self.data['status']['message']
+
+    async def add_relation(self, local_relation, remote_relation):
         """Add a relation to another application.
 
         :param str local_relation: Name of relation on this application
@@ -43,7 +57,10 @@ class Application(model.ModelEntity):
             application in the form '<application>[:<relation_name>]'
 
         """
-        pass
+        if ':' not in local_relation:
+            local_relation = '{}:{}'.format(self.name, local_relation)
+
+        return await self.model.add_relation(local_relation, remote_relation)
 
     async def add_unit(self, count=1, to=None):
         """Add one or more units to this application.
@@ -101,7 +118,7 @@ class Application(model.ModelEntity):
         """
         pass
 
-    def destroy_relation(self, local_relation, remote_relation):
+    async def destroy_relation(self, local_relation, remote_relation):
         """Remove a relation to another application.
 
         :param str local_relation: Name of relation on this application
@@ -109,9 +126,26 @@ class Application(model.ModelEntity):
             application in the form '<application>[:<relation_name>]'
 
         """
-        pass
+        if ':' not in local_relation:
+            local_relation = '{}:{}'.format(self.name, local_relation)
+
+        app_facade = client.ApplicationFacade()
+        app_facade.connect(self.connection)
+
+        log.debug(
+            'Destroying relation %s <-> %s', local_relation, remote_relation)
+
+        return await app_facade.DestroyRelation([
+            local_relation, remote_relation])
     remove_relation = destroy_relation
 
+    async def destroy_unit(self, *unit_names):
+        """Destroy units by name.
+
+        """
+        return await self.model.destroy_units(*unit_names)
+    destroy_units = destroy_unit
+
     async def destroy(self):
         """Remove this application from the model.
 
@@ -137,17 +171,29 @@ class Application(model.ModelEntity):
 
         return await app_facade.Expose(self.name)
 
-    def get_config(self):
-        """Return the configuration settings for this application.
+    async def get_config(self):
+        """Return the configuration settings dict for this application.
 
         """
-        pass
+        app_facade = client.ApplicationFacade()
+        app_facade.connect(self.connection)
+
+        log.debug(
+            'Getting config for %s', self.name)
+
+        return (await app_facade.Get(self.name)).config
 
-    def get_constraints(self):
-        """Return the machine constraints for this application.
+    async def get_constraints(self):
+        """Return the machine constraints dict for this application.
 
         """
-        pass
+        app_facade = client.ApplicationFacade()
+        app_facade.connect(self.connection)
+
+        log.debug(
+            'Getting constraints for %s', self.name)
+
+        return vars((await app_facade.Get(self.name)).constraints)
 
     def get_actions(self, schema=False):
         """Get actions defined for this application.
@@ -185,7 +231,7 @@ class Application(model.ModelEntity):
         log.debug('Updating annotations on application %s', self.name)
 
         self.ann_facade = client.AnnotationsFacade()
-        self.ann_facade.connect(model.connection)
+        self.ann_facade.connect(self.connection)
 
         ann = client.EntityAnnotations(
             entity=self.name,
@@ -227,11 +273,17 @@ class Application(model.ModelEntity):
         """
         pass
 
-    def unexpose(self):
+    async def unexpose(self):
         """Remove public availability over the network for this application.
 
         """
-        pass
+        app_facade = client.ApplicationFacade()
+        app_facade.connect(self.connection)
+
+        log.debug(
+            'Unexposing %s', self.name)
+
+        return await app_facade.Unexpose(self.name)
 
     def update_allocation(self, allocation):
         """Update existing allocation for this application.