Merge pull request #481 from SimonRichardson/merge-master-2.9

#481

Merge 2.9 into master

This is brings in 2.9-rc3 schema as well, so that we're dealing with
the latest changes.

Conflicts:
 _client3.py - just re-ran the `make client` as the code is autogenerated.

5e23162 (upstream/master) Merge pull request #480 from SimonRichardson/release-2.8.6
3e23b74 (origin/master, origin/HEAD, master) Merge pull request #479 from SimonRichardson/schema-update-2.8.10
7f96863 Merge pull request #478 from SimonRichardson/scale-typo
fd1438c Merge pull request #475 from achilleasa/provide-accessor-for-machine-hostname-field
1015f4d Expand wait_for_idle to support waiting for status (#473)
7829fd0 Merge pull request #471 from SimonRichardson/release-2.8.5
fd36c8f Merge pull request #470 from juju/johnsca/bundle-charm-files-and-wait
3d91d6b Merge pull request #469 from juju/johnsca/accept-charm-files
4e4e108 Merge pull request #465 from juju/johnsca/update-websockets/py39
d696937 Merge pull request #467 from gnuoy/issue/466

Author: jujubot

.github/workflows/tox.yaml

@@ -3,15 +3,36 @@ name: Unit Tests
 on: [push, pull_request]
 
 jobs:
+  lint:
+    name: Lint
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python: [3.5, 3.6, 3.7, 3.8, 3.9]
+    steps:
+    - name: Check out code
+      uses: actions/checkout@v2
+    - name: Setup Python
+      uses: actions/setup-python@v2
+      with:
+        python-version: ${{ matrix.python }}
+    - name: Install dependencies
+      run: |
+        pip install tox
+    - name: Run lint
+      run: tox -e lint
   unit-tests:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python: [3.5, 3.6, 3.7, 3.8, 3.9]
     steps:
       - uses: actions/checkout@v2
       - name: Setup Python
         uses: actions/setup-python@v1
         with:
-          python-version: 3.8
-      - name: Install Tox and any other packages
+          python-version: ${{ matrix.python }}
+      - name: Install dependencies
         run: pip install tox
-      - name: Run Lint and Unit Tests
-        run: tox -e lint,py3
+      - name: Run unit tests
+        run: tox -e py3

VERSION

@@ -1 +1 @@
-2.8.4
+2.8.6

docs/changelog.rst

@@ -1,6 +1,27 @@
 Changelog
 ---------
 
+2.8.6
+^^^^^
+
+Tuesday March 23 2021
+
+* Update facade methods for Juju 2.8.10
+* Bug fix - Fix typo in param name for ScaleApplications
+* Introduction of hostname property for Machines
+
+2.8.5
+^^^^^
+
+Monday February 8 2021
+
+ * Implement add_space and get_spaces.
+ * Update facade controllers.
+ * Support already archived (.charm or .zip) local charms.
+ * Introduction of wait_for_bundle method.
+ * Bug fix - Handle None in list_offers results
+ * Bug fix - Update libraries to support Python 3.9+
+
 2.8.4
 ^^^^^
 

examples/machine_hostname.py

@@ -0,0 +1,46 @@
+#!/usr/bin/env python3.5
+
+"""
+This example:
+
+1. Connects to the current model
+2. Creates a machine
+3. Waits for the machine agent to start and prints out the reported machine
+   hostname.
+
+NOTE: this example requires a 2.8.10+ controller.
+"""
+import logging
+
+from juju import loop
+from juju.model import Model
+
+MB = 1
+GB = 1024
+
+
+async def main():
+    model = Model()
+    await model.connect()
+
+    try:
+        # Add a machine and wait until the machine agents starts
+        machine1 = await model.add_machine()
+        await model.block_until(
+            lambda: machine1.agent_status == 'started')
+
+        # At this point we can access the reported hostname via the hostname
+        # property of the machine model.
+        print("machine1 hostname: {}".format(machine1.hostname))
+
+        await machine1.destroy(force=True)
+    finally:
+        await model.disconnect()
+
+
+if __name__ == '__main__':
+    logging.basicConfig(level=logging.DEBUG)
+    ws_logger = logging.getLogger('websockets.protocol')
+    ws_logger.setLevel(logging.INFO)
+
+    loop.run(main())

juju/application.py

@@ -168,9 +168,9 @@ async def scale(self, scale=None, scale_change=None):
             self.name, 'to' if scale else 'by', scale or scale_change)
 
         await app_facade.ScaleApplications(applications=[
-            client.ScaleApplicationParam(application_tag=self.tag,
-                                         scale=scale,
-                                         scale_change=scale_change)
+            client.ScaleApplicationParams(application_tag=self.tag,
+                                          scale=scale,
+                                          scale_change=scale_change)
         ])
 
     def allocate(self, budget, value):

juju/bundle.py

@@ -1,6 +1,7 @@
 import asyncio
 import logging
 import os
+import zipfile
 from pathlib import Path
 
 import yaml
@@ -72,7 +73,7 @@ async def _validate_bundle(self, bundle):
                 )
         return bundle
 
-    async def _handle_local_charms(self, bundle):
+    async def _handle_local_charms(self, bundle, bundle_dir):
         """Search for references to local charms (i.e. filesystem paths)
         in the bundle. Upload the local charms to the model, and replace
         the filesystem paths with appropriate 'local:' paths in the bundle.
@@ -89,9 +90,16 @@ async def _handle_local_charms(self, bundle):
         apps_dict = bundle.get('applications', bundle.get('services', {}))
         for app_name in self.applications:
             app_dict = apps_dict[app_name]
-            charm_dir = os.path.abspath(os.path.expanduser(app_dict['charm']))
-            if not os.path.isdir(charm_dir):
-                continue
+            charm_dir = app_dict['charm']
+            try:
+                charm_path = (bundle_dir / charm_dir).resolve()
+                if not (charm_path.is_dir() or
+                        (charm_path.is_file() and
+                         charm_path.suffix in ('.charm', '.zip'))):
+                    continue
+                charm_dir = str(charm_path)
+            except ValueError:
+                pass
             series = (
                 app_dict.get('series') or
                 default_series or
@@ -122,18 +130,24 @@ async def _handle_local_charms(self, bundle):
 
     async def fetch_plan(self, entity_id):
         is_store_url = entity_id.startswith('cs:')
+        is_local = False
+        bundle_dir = None
 
         if not is_store_url and os.path.isfile(entity_id):
             bundle_yaml = Path(entity_id).read_text()
+            is_local = True
+            bundle_dir = Path(entity_id).parent
         elif not is_store_url and os.path.isdir(entity_id):
             bundle_yaml = (Path(entity_id) / "bundle.yaml").read_text()
+            bundle_dir = Path(entity_id)
         else:
             bundle_yaml = await self.charmstore.files(entity_id,
                                                       filename='bundle.yaml',
                                                       read_file=True)
         self.bundle = yaml.safe_load(bundle_yaml)
         self.bundle = await self._validate_bundle(self.bundle)
-        self.bundle = await self._handle_local_charms(self.bundle)
+        if is_local:
+            self.bundle = await self._handle_local_charms(self.bundle, bundle_dir)
 
         self.plan = await self.bundle_facade.GetChanges(
             bundleurl=entity_id,
@@ -179,11 +193,16 @@ def get_charm_series(path):
 
     Returns None if no series can be determined.
     """
-    md = Path(path) / "metadata.yaml"
-    if not md.exists():
-        return None
     try:
-        data = yaml.safe_load(md.open())
+        if path.endswith('.charm'):
+            md = "metadata.yaml in %s" % path
+            with zipfile.ZipFile(path, 'r') as charm_file:
+                data = yaml.safe_load(charm_file.read('metadata.yaml'))
+        else:
+            md = Path(path) / "metadata.yaml"
+            if not md.exists():
+                return None
+            data = yaml.safe_load(md.open())
     except yaml.YAMLError as exc:
         if hasattr(exc, "problem_mark"):
             mark = exc.problem_mark