Pass series info into origin for ResolveCharm

Without the series the ResolveCharm will select the latest base for
the charm. E.g. even if we want focal, the ResolveCharm will return
22.04 (jammy) for the base channel in the resulting origin if the
charm supports both jammy and focal.

This communicates the series info with the ResolveCharm via the
inputted origin so the resulting origin will have the correct base
channel.

Fixes #822

Author: cderici

juju/model.py

@@ -515,28 +515,19 @@ async def resolve(self, url, architecture, app_name=None, channel=None, series=N
                                     track=ch.track,
                                     base=base,
                                     revision=revision,
+                                    series=series
                                     )
 
-        charm_url_str, origin, supported_series = await self.charm_resolver(url, origin)
-
         is_bundle = origin.type_ == "bundle"
         if is_bundle and revision and channel:
             raise JujuError('revision and channel are mutually exclusive when deploying a bundle. Please choose one.')
 
-        charm_url = URL.parse(charm_url_str)
+
+        charm_url, origin = await self.charm_resolver(url, origin, force)
 
         if app_name is None:
             app_name = url.name
 
-        if 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:
-                raise JujuError("Series {} not supported for {}. Only {}".format(series, url, supported_series))
-
         return DeployTypeResult(
             identifier=str(charm_url),
             app_name=app_name,
@@ -1799,7 +1790,8 @@ async def _add_charm(self, charm_url, origin):
         client_facade = client.ClientFacade.from_connection(self.connection())
         return await client_facade.AddCharm(channel=str(origin.risk), url=charm_url, force=False)
 
-    async def _resolve_charm(self, url, origin):
+
+    async def _resolve_charm(self, url, origin, force):
         """Calls Charms.ResolveCharms to resolve all the fields of the
         charm_origin and also the url and the supported_series
 
@@ -1826,7 +1818,9 @@ async def _resolve_charm(self, url, origin):
 
         resolve_origin = {'source': source, 'architecture': origin.architecture,
                           'track': origin.track, 'risk': origin.risk,
-                          'base': origin.base}
+                          'base': origin.base, 'series': origin.series,
+                          'revision': origin.revision,
+                          }
 
         resp = await charms_facade.ResolveCharms(resolve=[{
             'reference': str(url),
@@ -1839,7 +1833,18 @@ async def _resolve_charm(self, url, origin):
         if result.error:
             raise JujuError(result.error.message)
 
-        return (result.url, result.charm_origin, result.supported_series)
+        supported_series = result.supported_series
+        charm_url = URL.parse(result.url)
+        if origin.series:
+            # Check whether the charm supports this series
+            # or we force it
+            if origin.series in supported_series or force:
+                result.charm_origin.series = origin.series
+                charm_url.series = origin.series
+            else:
+                raise JujuError("Series {} not supported for {}. Only {}".format(origin.series, result.url, supported_series))
+
+        return charm_url, result.charm_origin
 
     async def _resolve_architecture(self, url):
         if url.architecture: