[JUJU-3253] add missing force in bundle deployment (#815)

* Propagate force parameter to resolve function to enable force for remote bundles.

Author: juanmanuel-tirado

juju/model.py

@@ -443,7 +443,7 @@ class LocalDeployType:
     """LocalDeployType deals with local only deployments.
     """
 
-    async def resolve(self, url, architecture, app_name=None, channel=None, series=None, entity_url=None):
+    async def resolve(self, url, architecture, app_name=None, channel=None, series=None, entity_url=None, force=False):
         """resolve attempts to resolve a local charm or bundle using the url
         and architecture. If information is missing, it will attempt to backfill
         that information, before sending the result back.
@@ -500,7 +500,7 @@ def _default_app_name(meta):
         suggested_name = meta.get('charm-metadata', {}).get('Name')
         return suggested_name or meta.get('id', {}).get('Name')
 
-    async def resolve(self, url, architecture, app_name=None, channel=None, series=None, entity_url=None):
+    async def resolve(self, url, architecture, app_name=None, channel=None, series=None, entity_url=None, force=False):
         """resolve attempts to resolve charmstore charms or bundles. A request
         to the charmstore is required to get more information about the
         underlying identifier.
@@ -539,7 +539,7 @@ class CharmhubDeployType:
     def __init__(self, charm_resolver):
         self.charm_resolver = charm_resolver
 
-    async def resolve(self, url, architecture, app_name=None, channel=None, series=None, entity_url=None):
+    async def resolve(self, url, architecture, app_name=None, channel=None, series=None, entity_url=None, force=False):
         """resolve attempts to resolve charmhub charms or bundles. A request to
         the charmhub API is required to correctly determine the charm url and
         underlying origin.
@@ -561,7 +561,9 @@ async def resolve(self, url, architecture, app_name=None, channel=None, series=N
             app_name = url.name
 
         if series:
-            if series in supported_series:
+            # Check whether the charm supports this series
+            # or we force it
+            if series in supported_series or force:
                 origin.series = series
                 charm_url.series = series
             else:
@@ -1603,7 +1605,7 @@ async def deploy(
         if str(url.schema) not in self.deploy_types:
             raise JujuError("unknown deploy type {}, expected charmhub, charmstore or local".format(url.schema))
 
-        res = await self.deploy_types[str(url.schema)].resolve(url, architecture, application_name, channel, series, entity_url)
+        res = await self.deploy_types[str(url.schema)].resolve(url, architecture, application_name, channel, series, entity_url, force)
 
         if res.identifier is None:
             raise JujuError('unknown charm or bundle {}'.format(entity_url))
@@ -1705,7 +1707,8 @@ async def deploy(
                 num_units=num_units,
                 placement=parse_placement(to),
                 devices=devices,
-                charm_origin=charm_origin
+                charm_origin=charm_origin,
+                force=force,
             )
 
     async def _add_charm(self, charm_url, origin):
@@ -1922,7 +1925,7 @@ async def add_local_resources(self, application, entity_url, metadata, resources
     async def _deploy(self, charm_url, application, series, config,
                       constraints, endpoint_bindings, resources, storage,
                       channel=None, num_units=None, placement=None,
-                      devices=None, charm_origin=None):
+                      devices=None, charm_origin=None, force=False):
         """Logic shared between `Model.deploy` and `BundleHandler.deploy`.
         """
         log.info('Deploying %s', charm_url)
@@ -1949,6 +1952,7 @@ async def _deploy(self, charm_url, application, series, config,
             storage=storage,
             placement=placement,
             devices=devices,
+            force=force,
         )
         result = await app_facade.Deploy(applications=[app])
         errors = [r.error.message for r in result.results if r.error]