X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=juju%2Fapplication.py;h=9863d882b067c9eeb27f0d7bc730fe09d695f5d0;hb=07d8f84983e1b97bb01db7c82a8fdbaa90984161;hp=df309b30366a1913d5c050148d3adaf54324606e;hpb=0056d3f87102e50a1c35c05bdfa25124c387440f;p=osm%2FN2VC.git diff --git a/juju/application.py b/juju/application.py index df309b3..9863d88 100644 --- a/juju/application.py +++ b/juju/application.py @@ -41,14 +41,18 @@ class Application(model.ModelEntity): """Get the application status, as set by the charm's leader. """ - return self.data['status']['current'] + return self.safe_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'] + return self.safe_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. @@ -84,7 +88,7 @@ class Application(model.ModelEntity): result = await app_facade.AddUnits( application=self.name, - placement=[parse_placement(to)], + placement=parse_placement(to) if to else None, num_units=count, ) @@ -102,7 +106,7 @@ class Application(model.ModelEntity): :param int value: Budget limit """ - pass + raise NotImplementedError() def attach(self, resource_name, file_path): """Upload a file as a resource for this application. @@ -111,13 +115,13 @@ class Application(model.ModelEntity): :param str file_path: Path to the file to upload """ - pass + raise NotImplementedError() def collect_metrics(self): """Collect metrics on this application. """ - pass + raise NotImplementedError() async def destroy_relation(self, local_relation, remote_relation): """Remove a relation to another application. @@ -203,7 +207,7 @@ class Application(model.ModelEntity): :param bool schema: Return the full action schema """ - pass + raise NotImplementedError() def get_resources(self, details=False): """Return resources for this application. @@ -212,7 +216,7 @@ class Application(model.ModelEntity): unit """ - pass + raise NotImplementedError() async def run(self, command, timeout=None): """Run command on all units for this application. @@ -290,7 +294,7 @@ class Application(model.ModelEntity): :param str info: Extra info message """ - pass + raise NotImplementedError() def set_plan(self, plan_name): """Set the plan for this application, effective immediately. @@ -298,7 +302,7 @@ class Application(model.ModelEntity): :param str plan_name: Name of plan """ - pass + raise NotImplementedError() async def unexpose(self): """Remove public availability over the network for this application. @@ -318,7 +322,7 @@ class Application(model.ModelEntity): :param int allocation: The allocation to set """ - pass + raise NotImplementedError() def upgrade_charm( self, channel=None, force_series=False, force_units=False, @@ -337,4 +341,12 @@ class Application(model.ModelEntity): :param str switch: Crossgrade charm url """ - pass + raise NotImplementedError() + + async def get_metrics(self): + """Get metrics for this application's units. + + :return: Dictionary of unit_name:metrics + + """ + return await self.model.get_metrics(self.tag)