From: Cory Johns Date: Tue, 7 Mar 2017 15:41:29 +0000 (-0600) Subject: Fixes based on review X-Git-Tag: 0.4.0~16^2~1 X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=5db9c4c5f0c88c73f06ac285294f9ab688e5bc97;p=osm%2FN2VC.git Fixes based on review --- diff --git a/juju/client/connection.py b/juju/client/connection.py index c24f8c1..7119292 100644 --- a/juju/client/connection.py +++ b/juju/client/connection.py @@ -34,6 +34,8 @@ class Connection: # Connect to the currently active model client = await Connection.connect_current() + Note: Any connection method or constructor can accept an optional `loop` + argument to override the default event loop from `asyncio.get_event_loop`. """ def __init__( self, endpoint, uuid, username, password, cacert=None, @@ -265,20 +267,24 @@ class Connection: jujudata = JujuData() if ':' in model: + # explicit controller given controller_name, model_name = model.split(':') else: + # use the current controller if one isn't explicitly given controller_name = jujudata.current_controller() model_name = model + accounts = jujudata.accounts()[controller_name] + username = accounts['user'] + # model name must include a user prefix, so add it if it doesn't + if '/' not in model_name: + model_name = '{}/{}'.format(username, model_name) + controller = jujudata.controllers()[controller_name] endpoint = controller['api-endpoints'][0] cacert = controller.get('ca-cert') - accounts = jujudata.accounts()[controller_name] - username = accounts['user'] password = accounts.get('password') models = jujudata.models()[controller_name] - if '/' not in model_name: - model_name = '{}/{}'.format(username, model_name) model_uuid = models['models'][model_name]['uuid'] macaroons = get_macaroons() if not password else None @@ -339,7 +345,9 @@ class JujuData: return output.get('current-controller', '') def current_model(self, controller_name=None): - models = self.models()[controller_name or self.current_controller()] + if not controller_name: + controller_name = self.current_controller() + models = self.models()[controller_name] if 'current-model' not in models: raise JujuError('No current model') return models['current-model'] diff --git a/juju/model.py b/juju/model.py index 7a52ed5..3df2669 100644 --- a/juju/model.py +++ b/juju/model.py @@ -984,8 +984,11 @@ class Model(object): entity_url.startswith('local:') or os.path.isdir(entity_url) ) - entity_id = await self.charmstore.entityId(entity_url) \ - if not is_local else entity_url + if is_local: + entity_id = entity_url + else: + entity = await self.charmstore.entity(entity_url) + entity_id = entity['Id'] client_facade = client.ClientFacade() client_facade.connect(self.connection) @@ -1013,20 +1016,28 @@ class Model(object): if name in handler.applications] else: if not is_local: - parts = entity_id[3:].split('/') - if parts[0].startswith('~'): - parts.pop(0) if not application_name: - application_name = parts[-1].split('-')[0] - if not series: + application_name = entity['Meta']['charm-metadata']['Name'] + if not series and '/' in entity_url: + # try to get the series from the provided charm URL + if entity_url.startswith('cs:'): + parts = entity_url[3:].split('/') + else: + parts = entity_url.split('/') + if parts[0].startswith('~'): + parts.pop(0) if len(parts) > 1: + # series was specified in the URL series = parts[0] - else: - entity = await self.charmstore.entity(entity_id) - ss = entity['Meta']['supported-series'] - series = ss['SupportedSeries'][0] + if not series: + # series was not supplied at all, so use the newest + # supported series according to the charm store + ss = entity['Meta']['supported-series'] + series = ss['SupportedSeries'][0] + if not channel: + channel = 'stable' await client_facade.AddCharm(channel, entity_id) - elif not entity_id.startswith('local:'): + else: # We have a local charm dir that needs to be uploaded charm_dir = os.path.abspath( os.path.expanduser(entity_id)) @@ -1054,35 +1065,37 @@ class Model(object): async def _deploy(self, charm_url, application, series, config, constraints, endpoint_bindings, resources, storage, channel=None, num_units=None, placement=None): - log.info('Deploying %s', charm_url) + """Logic shared between `Model.deploy` and `BundleHandler.deploy`. + """ + log.info('Deploying %s', charm_url) - # stringify all config values for API, and convert to YAML - config = {k: str(v) for k, v in config.items()} - config = yaml.dump({application: config}, - default_flow_style=False) + # stringify all config values for API, and convert to YAML + config = {k: str(v) for k, v in config.items()} + config = yaml.dump({application: config}, + default_flow_style=False) - app_facade = client.ApplicationFacade() - app_facade.connect(self.connection) + app_facade = client.ApplicationFacade() + app_facade.connect(self.connection) - app = client.ApplicationDeploy( - charm_url=charm_url, - application=application, - series=series, - channel=channel, - config_yaml=config, - constraints=parse_constraints(constraints), - endpoint_bindings=endpoint_bindings, - num_units=num_units, - resources=resources, - storage=storage, - placement=placement, - ) + app = client.ApplicationDeploy( + charm_url=charm_url, + application=application, + series=series, + channel=channel, + config_yaml=config, + constraints=parse_constraints(constraints), + endpoint_bindings=endpoint_bindings, + num_units=num_units, + resources=resources, + storage=storage, + placement=placement, + ) - result = await app_facade.Deploy([app]) - errors = [r.error.message for r in result.results if r.error] - if errors: - raise JujuError('\n'.join(errors)) - return await self._wait_for_new('application', application) + result = await app_facade.Deploy([app]) + errors = [r.error.message for r in result.results if r.error] + if errors: + raise JujuError('\n'.join(errors)) + return await self._wait_for_new('application', application) def destroy(self): """Terminate all machines and resources for this model.