X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=juju%2Fapplication.py;h=4e0154aa4cd9505389a6e968ea7dd8020a75a9e1;hb=a0aff95b67e6acf775405633b205fc04e3c4ecd3;hp=53f584af47f256c490dd58957ced797d83dff151;hpb=224a14c0bbd6b0a621a24ae889fea9279755a57b;p=osm%2FN2VC.git diff --git a/juju/application.py b/juju/application.py index 53f584a..4e0154a 100644 --- a/juju/application.py +++ b/juju/application.py @@ -1,3 +1,4 @@ +import asyncio import logging from . import model @@ -34,18 +35,30 @@ class Application(model.ModelEntity): if unit.application == self.name ] + @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'] + def add_relation(self, local_relation, remote_relation): - """Add a relation to another service. + """Add a relation to another application. - :param str local_relation: Name of relation on this service - :param str remote_relation: Name of relation on the other service in - the form '[:]' + :param str local_relation: Name of relation on this application + :param str remote_relation: Name of relation on the other + application in the form '[:]' """ pass - def add_unit(self, count=1, to=None): - """Add one or more units to this service. + async def add_unit(self, count=1, to=None): + """Add one or more units to this application. :param int count: Number of units to add :param str to: Placement directive, e.g.:: @@ -56,11 +69,28 @@ class Application(model.ModelEntity): If None, a new machine is provisioned. """ - pass + app_facade = client.ApplicationFacade() + app_facade.connect(self.connection) + + log.debug( + 'Adding %s unit%s to %s', + count, '' if count == 1 else 's', self.name) + + result = await app_facade.AddUnits( + application=self.name, + placement=to, + num_units=count, + ) + + return await asyncio.gather(*[ + asyncio.ensure_future(self.model._wait_for_new('unit', unit_id)) + for unit_id in result.units + ]) + add_units = add_unit def allocate(self, budget, value): - """Allocate budget to this service. + """Allocate budget to this application. :param str budget: Name of budget :param int value: Budget limit @@ -69,7 +99,7 @@ class Application(model.ModelEntity): pass def attach(self, resource_name, file_path): - """Upload a file as a resource for this service. + """Upload a file as a resource for this application. :param str resource: Name of the resource :param str file_path: Path to the file to upload @@ -78,24 +108,24 @@ class Application(model.ModelEntity): pass def collect_metrics(self): - """Collect metrics on this service. + """Collect metrics on this application. """ pass def destroy_relation(self, local_relation, remote_relation): - """Remove a relation to another service. + """Remove a relation to another application. - :param str local_relation: Name of relation on this service - :param str remote_relation: Name of relation on the other service in - the form '[:]' + :param str local_relation: Name of relation on this application + :param str remote_relation: Name of relation on the other + application in the form '[:]' """ pass remove_relation = destroy_relation async def destroy(self): - """Remove this service from the model. + """Remove this application from the model. """ app_facade = client.ApplicationFacade() @@ -108,7 +138,7 @@ class Application(model.ModelEntity): remove = destroy async def expose(self): - """Make this service publicly available over the network. + """Make this application publicly available over the network. """ app_facade = client.ApplicationFacade() @@ -120,19 +150,19 @@ class Application(model.ModelEntity): return await app_facade.Expose(self.name) def get_config(self): - """Return the configuration settings for this service. + """Return the configuration settings for this application. """ pass def get_constraints(self): - """Return the machine constraints for this service. + """Return the machine constraints for this application. """ pass def get_actions(self, schema=False): - """Get actions defined for this service. + """Get actions defined for this application. :param bool schema: Return the full action schema @@ -140,7 +170,7 @@ class Application(model.ModelEntity): pass def get_resources(self, details=False): - """Return resources for this service. + """Return resources for this application. :param bool details: Include detailed info about resources used by each unit @@ -149,7 +179,7 @@ class Application(model.ModelEntity): pass def run(self, command, timeout=None): - """Run command on all units for this service. + """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 @@ -157,17 +187,35 @@ class Application(model.ModelEntity): """ pass + async def set_annotations(self, annotations): + """Set annotations on this application. + + :param annotations map[string]string: the annotations as key/value + pairs. + + """ + log.debug('Updating annotations on application %s', self.name) + + self.ann_facade = client.AnnotationsFacade() + self.ann_facade.connect(self.connection) + + ann = client.EntityAnnotations( + entity=self.name, + annotations=annotations, + ) + return await self.ann_facade.Set([ann]) + def set_config(self, to_default=False, **config): - """Set configuration options for this service. + """Set configuration options for this application. - :param bool to_default: Set service options to default values + :param bool to_default: Set application options to default values :param \*\*config: Config key/values """ pass def set_constraints(self, constraints): - """Set machine constraints for this service. + """Set machine constraints for this application. :param :class:`juju.Constraints` constraints: Machine constraints @@ -184,7 +232,7 @@ class Application(model.ModelEntity): pass def set_plan(self, plan_name): - """Set the plan for this service, effective immediately. + """Set the plan for this application, effective immediately. :param str plan_name: Name of plan @@ -192,13 +240,13 @@ class Application(model.ModelEntity): pass def unexpose(self): - """Remove public availability over the network for this service. + """Remove public availability over the network for this application. """ pass def update_allocation(self, allocation): - """Update existing allocation for this service. + """Update existing allocation for this application. :param int allocation: The allocation to set @@ -208,12 +256,12 @@ class Application(model.ModelEntity): def upgrade_charm( self, channel=None, force_series=False, force_units=False, path=None, resources=None, revision=-1, switch=None): - """Upgrade the charm for this service. + """Upgrade the charm for this application. :param str channel: Channel to use when getting the charm from the charm store, e.g. 'development' - :param bool force_series: Upgrade even if series of deployed service - is not supported by the new charm + :param bool force_series: Upgrade even if series of deployed + application is not supported by the new charm :param bool force_units: Upgrade all units immediately, even if in error state :param str path: Uprade to a charm located at path