Merge pull request #483 from SimonRichardson/charmhub-deploy-charm

#483

This PR allows the deploying of charmhub charms and bundles.

There are a few gaps in this PR and those will be filled in future PRs.

 1. resources (oci-images, local, etc)
 2. refresh/upgrade-charm
 3. k8s testing

The replicates as much as the juju go CLI. Although there are gaps in how
we deal with series as we currently don't have as much information as the go
CLI, but that is coming.

## Q&A Steps

Run the examples for bundles and try and deploy a charmhub charm.

Author: jujubot

Makefile

@@ -20,8 +20,10 @@ client:
 	$(PY) -m juju.client.facade -s "juju/client/schemas*" -o juju/client/
 
 .PHONY: test
-test:
-	tox
+test: lint
+	tox -e py3
+	tox -e integration
+
 
 .PHONY: lint
 lint: 

examples/deploy_bundle.py

@@ -6,27 +6,33 @@
 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()
+    controller = Controller()
+    # connect to current controller with current user, per Juju CLI
+    await controller.connect()
+
+    # Deploy charmhub bundle
+    await deploy_bundle(controller, 'juju-qa-bundle-test')
+
+    # Deploy legacy bundle
+    await deploy_bundle(controller, 'cs:~juju-qa/bundle/basic-0', 'beta')
+
+    await controller.disconnect()
+
+
+async def deploy_bundle(controller, url, channel=None):
+    models = await controller.list_models()
+    model = await controller.add_model('model{}'.format(len(models) + 1))
 
     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))
+
+        applications = await deploy_and_wait_for_bundle(model, url, channel)
+
         print("Successfully deployed!")
         print('Removing bundle')
         for application in applications:
@@ -37,5 +43,15 @@ async def main():
         print("Success")
 
 
+async def deploy_and_wait_for_bundle(model, url, channel=None):
+    applications = await model.deploy(url, channel=channel)
+
+    print('Waiting for active')
+    await model.block_until(
+        lambda: all(unit.workload_status == 'active'
+                    for application in applications for unit in application.units))
+
+    return applications
+
 if __name__ == '__main__':
     loop.run(main())

juju/application.py

@@ -481,6 +481,14 @@ async def run(self, command, timeout=None):
             units=[],
         )
 
+    @property
+    def charm_url(self):
+        """Get the charm url for a given application
+
+        :return string: The charm url for an application
+        """
+        return self.safe_data['charm-url']
+
     async def get_annotations(self):
         """Get annotations on this application.