Ensure we can talk to old controllers

The following changes ensures that if we talk to older controllers we
can correctly deploy bundles as well.

Author: SimonRichardson

examples/deploy_bundle.py

@@ -6,35 +6,41 @@
 3. Destroys the units and applications
 
 """
+from juju.controller import Controller
 from juju import loop
-from juju.model import Model
 
 
 async def main():
-    model = Model()
-    print('Connecting to model')
-    # Connect to current model with current user, per Juju CLI
-    await model.connect()
-
-    try:
-        print('Deploying bundle')
-        applications = await model.deploy(
-            'cs:~juju-qa/bundle/basic-0',
-            channel='beta',
-        )
-
-        print('Waiting for active')
-        await model.block_until(
-            lambda: all(unit.workload_status == 'active'
-                        for application in applications for unit in application.units))
-        print("Successfully deployed!")
-        print('Removing bundle')
-        for application in applications:
-            await application.remove()
-    finally:
-        print('Disconnecting from model')
-        await model.disconnect()
-        print("Success")
+    controller = Controller()
+    # connect to current controller with current user, per Juju CLI
+    await controller.connect()
+
+    bundles = [('juju-qa-bundle-test', None), ('cs:~juju-qa/bundle/basic-0', 'beta')]
+    for i in range(len(bundles)): 
+        deployment = bundles[i]
+        model = await controller.add_model('model{}'.format(i))
+
+        try:
+            print('Deploying bundle')
+            applications = await model.deploy(
+                deployment[0],
+                channel=deployment[1],
+            )
+
+            print('Waiting for active')
+            await model.block_until(
+                lambda: all(unit.workload_status == 'active'
+                            for application in applications for unit in application.units))
+            print("Successfully deployed!")
+            print('Removing bundle')
+            for application in applications:
+                await application.remove()
+        finally:
+            print('Disconnecting from model')
+            await model.disconnect()
+            print("Success")
+
+    await controller.disconnect()
 
 
 if __name__ == '__main__':

juju/bundle.py

@@ -16,6 +16,7 @@
 from .errors import JujuError
 from .origin import Channel
 from .url import Schema, URL
+from .version import LTS_RELEASES
 
 log = logging.getLogger(__name__)
 
@@ -230,7 +231,6 @@ async def _resolve_charms(self):
                 if is_local_charm(spec['charm']):
                     spec.charm = self.model.applications[name]
                     continue
-
                 if spec['charm'] == app.charm_url:
                     continue
 
@@ -239,14 +239,13 @@ async def _resolve_charms(self):
             if is_local_charm(spec['charm']):
                 continue
 
+            charm_url = URL.parse(spec['charm'])
+            channel = None
+            track, risk = '', ''
+            if 'channel' in spec:
+                channel = Channel.parse(spec['channel'])
+                track, risk = channel.track, channel.risk
             if self.charms_facade is not None:
-                charm_url = URL.parse(spec['charm'])
-                channel = None
-                track, risk = '', ''
-                if 'channel' in spec:
-                    channel = Channel.parse(spec['channel'])
-                    track, risk = channel.track, channel.risk
-
                 if cons is not None and cons['arch'] != '':
                     architecture = cons['arch']
                 else:
@@ -259,13 +258,15 @@ async def _resolve_charms(self):
                 charm_url, charm_origin = await self.model._resolve_charm(charm_url, origin)
 
                 spec['charm'] = str(charm_url)
-
-                if str(channel) not in self.origins:
-                    self.origins[str(charm_url)] = {}
-                self.origins[str(charm_url)][str(channel)] = charm_origin
             else:
-                await self.client_facade.ResolveCharms(references=[spec['charm']])
-                # TODO (stickupkid): Ensure that this works as expected.
+                results = await self.model.charmstore.entity(str(charm_url))
+                charm_origin = client.CharmOrigin(source="charm-store",
+                                                  risk=risk,
+                                                  track=track)
+
+            if str(channel) not in self.origins:
+                self.origins[str(charm_url)] = {}
+            self.origins[str(charm_url)][str(channel)] = charm_origin
 
     async def execute_plan(self):
         await self._resolve_charms()
@@ -471,7 +472,7 @@ async def run(self, context):
             resources = {}
 
         channel = None
-        if self.channel is not None:
+        if self.channel is not None and self.channel != "":
             channel = Channel.parse(self.channel).normalize()
 
         origin = context.origins[str(url)][str(channel)]
@@ -575,6 +576,7 @@ async def run(self, context):
             log.debug('Adding %s', entity_id)
             await context.client_facade.AddCharm(channel=None, url=entity_id, force=False)
             identifier = entity_id
+            origin = client.CharmOrigin(source="charm-store", risk="stable")
 
         elif Schema.CHARM_HUB.matches(url.schema):
             ch = Channel('latest', 'stable')

juju/model.py

@@ -39,6 +39,7 @@
 from .placement import parse as parse_placement
 from .tag import application as application_tag
 from .url import URL, Schema
+from .version import DEFAULT_ARCHITECTURE
 
 log = logging.getLogger(__name__)
 
@@ -1602,7 +1603,7 @@ async def _resolve_architecture(self, url):
         if 'arch' in constraints:
             return constraints['arch']
 
-        return "amd64"
+        return DEFAULT_ARCHITECTURE
 
     async def _add_store_resources(self, application, entity_url,
                                    overrides=None, entity=None):

juju/url.py

@@ -52,15 +52,18 @@ def parse(s):
         return c
 
     def with_revision(self, rev):
-        return URL(self.schema, self.user, self.name, rev, self.series)
+        return URL(self.schema, self.user, self.name, rev, self.series, self.architecture)
+
+    def with_series(self, series):
+        return URL(self.schema, self.user, self.name, self.revision, series, self.architecture)
 
     def path(self):
         parts = []
-        if self.user:
+        if self.user is not None:
             parts.append("~{}".format(self.user))
-        if self.architecture:
+        if self.architecture is not None:
             parts.append(self.architecture)
-        if self.series:
+        if self.series is not None:
             parts.append(self.series)
         if self.revision is not None and self.revision >= 0:
             parts.append("{}-{}".format(self.name, self.revision))
@@ -74,7 +77,8 @@ def __eq__(self, other):
                 self.user == other.user and \
                 self.name == other.name and \
                 self.revision == other.revision and \
-                self.series == other.series
+                self.series == other.series and \
+                self.architecture == other.architecture
         return False
 
     def __str__(self):

juju/version.py

@@ -0,0 +1,4 @@
+
+LTS_RELEASES = ["focal", "bionic", "xenial", "trusty", "precise"]
+
+DEFAULT_ARCHITECTURE = 'amd64'