X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=juju%2Fapplication.py;h=42dae71c44df1d0b881f3c5edbbb56dac545fdaa;hb=55ae2c120ce031f57ac210f3d7bd203db739f1e9;hp=978500fa321ec445a9c686f7da4a3e9630d31277;hpb=2ed7314a9ea1240883655bc521b6e27f149aa485;p=osm%2FN2VC.git diff --git a/juju/application.py b/juju/application.py index 978500f..42dae71 100644 --- a/juju/application.py +++ b/juju/application.py @@ -1,3 +1,4 @@ +import asyncio import logging from . import model @@ -7,6 +8,26 @@ log = logging.getLogger(__name__) class Application(model.ModelEntity): + @property + def _unit_match_pattern(self): + return r'^{}.*$'.format(self.entity_id) + + def on_unit_add(self, callable_): + """Add a "unit added" observer to this entity, which will be called + whenever a unit is added to this application. + + """ + self.model.add_observer( + callable_, 'unit', 'add', self._unit_match_pattern) + + def on_unit_remove(self, callable_): + """Add a "unit removed" observer to this entity, which will be called + whenever a unit is removed from this application. + + """ + self.model.add_observer( + callable_, 'unit', 'remove', self._unit_match_pattern) + @property def units(self): return [ @@ -14,18 +35,35 @@ class Application(model.ModelEntity): if unit.application == self.name ] - def add_relation(self, local_relation, remote_relation): - """Add a relation to another service. + @property + def status(self): + """Get the application status, as set by the charm's leader. - :param str local_relation: Name of relation on this service - :param str remote_relation: Name of relation on the other service in - the form '[:]' + """ + return self.data['status']['current'] + + @property + def status_message(self): + """Get the application status message, as set by the charm's leader. """ - pass + 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 + :param str remote_relation: Name of relation on the other + application in the form '[:]' + + """ + if ':' not in local_relation: + local_relation = '{}:{}'.format(self.name, local_relation) - def add_unit(self, count=1, to=None): - """Add one or more units to this service. + 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. :param int count: Number of units to add :param str to: Placement directive, e.g.:: @@ -36,11 +74,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 @@ -49,7 +104,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 @@ -58,24 +113,41 @@ 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. + async def destroy_relation(self, local_relation, remote_relation): + """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 + 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 service from the model. + """Remove this application from the model. """ app_facade = client.ApplicationFacade() @@ -87,26 +159,44 @@ class Application(model.ModelEntity): return await app_facade.Destroy(self.name) remove = destroy - def expose(self): - """Make this service publicly available over the network. + async def expose(self): + """Make this application publicly available over the network. """ - pass + app_facade = client.ApplicationFacade() + app_facade.connect(self.connection) + + log.debug( + 'Exposing %s', self.name) + + return await app_facade.Expose(self.name) - def get_config(self): - """Return the configuration settings for this service. + 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 service. + 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 service. + """Get actions defined for this application. :param bool schema: Return the full action schema @@ -114,7 +204,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 @@ -123,7 +213,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 @@ -131,17 +221,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 @@ -158,21 +266,27 @@ 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 """ pass - def unexpose(self): - """Remove public availability over the network for this service. + 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 service. + """Update existing allocation for this application. :param int allocation: The allocation to set @@ -182,12 +296,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