Merge branch 'master' into JUJU-1564_add_model.name

Author: juanmanuel-tirado

VERSION

@@ -1 +1 @@
-2.9.11
+3.0.1

docs/changelog.rst

@@ -1,13 +1,38 @@
 Changelog
 ---------
+3.0.1
+^^^^^
+
+Thursday August 11 2022
+
+## What's Changed
+* [JUJU-1593] Fix `run_actions` and facade issues by @cderici in https://github.com/juju/python-libjuju/pull/706
+
+3.0.0
+^^^^^
+
+Tuesday August 9 2022
+
+## What's Changed
+
+Switching to semantic versioning. From this release on, at least the major release number matches
+the most recent Juju supported. Hence the jump to `3.0.0` since this release supports `Juju 3.0`.
+(This also means that `python-libjuju <= 2.9.11` only support up to `Juju 2.x`)
+
+* [JUJU-1439] Initial fixes for `test_model` to pass with juju 3.0 by @cderici in https://github.com/juju/python-libjuju/pull/689
+* [JUJU-1464] More fixes for 3.0 compatibility by @cderici in https://github.com/juju/python-libjuju/pull/691
+* [JUJU-1457] Merge 3.0 compatibility branch onto master by @cderici in https://github.com/juju/python-libjuju/pull/692
+* Fix conditional by @sed-i in https://github.com/juju/python-libjuju/pull/696
+* [JUJU-1534] Fix `model.connect_current()` by @cderici in https://github.com/juju/python-libjuju/pull/697
+* [JUJU-1542] Fix run actions on units by @cderici in https://github.com/juju/python-libjuju/pull/698
+* [JUJU-1577] Replace k8s bundles with machine bundles for tests by @cderici in https://github.com/juju/python-libjuju/pull/703
+* [JUJU-1528] Add storage implementation by @cderici in https://github.com/juju/python-libjuju/pull/701
 
 2.9.11
 ^^^^^^
 
 Monday July 11 2022
 
-## What's Changed
-
 * Add REPL quickstart subsection by @sed-i in https://github.com/juju/python-libjuju/pull/676
 * Revision of test onos.charm by @juanmanuel-tirado in https://github.com/juju/python-libjuju/pull/686
 * [JUJU-1353] Parse assume directives. by @juanmanuel-tirado in https://github.com/juju/python-libjuju/pull/685

juju/action.py

@@ -2,9 +2,15 @@
 
 
 class Action(model.ModelEntity):
+
+    def __init__(self, entity_id, model, history_index=-1, connected=True):
+        super().__init__(entity_id, model, history_index, connected)
+        self.results = {}
+
     @property
     def status(self):
         return self.data['status']
 
     async def wait(self):
-        return await self.model.get_action_output(self.id)
+        self.results = await self.model.get_action_output(self.id)
+        return self

juju/application.py

@@ -126,10 +126,12 @@ async def relate(self, local_relation, remote_relation):
 
         return await self.model.relate(local_relation, remote_relation)
 
-    async def add_unit(self, count=1, to=None):
+    async def add_unit(self, count=1, to=None, attach_storage=[]):
         """Add one or more units to this application.
 
         :param int count: Number of units to add
+        :param [str] attach_storage: Existing storage to attach to the deployed unit
+        (not available on k8s models)
         :param str to: Placement directive, e.g.::
             '23' - machine 23
             'lxc:7' - new lxc container on machine 7
@@ -153,6 +155,7 @@ async def add_unit(self, count=1, to=None):
             application=self.name,
             placement=parse_placement(to) if to else None,
             num_units=count,
+            attach_storage=attach_storage,
         )
 
         return await jasyncio.gather(*[

juju/client/_client.py

@@ -4,28 +4,21 @@
 from juju.client._definitions import *
 
 
-from juju.client import _client2, _client1, _client3, _client4, _client5, _client8, _client7, _client9, _client10, _client6, _client12, _client11, _client13, _client15, _client16, _client17, _client18, _client14
+from juju.client import _client7, _client1, _client3, _client2, _client14, _client4, _client6, _client5, _client11, _client9, _client18
 
 
 CLIENTS = {
-    "2": _client2,
+    "7": _client7,
     "1": _client1,
     "3": _client3,
+    "2": _client2,
+    "14": _client14,
     "4": _client4,
-    "5": _client5,
-    "8": _client8,
-    "7": _client7,
-    "9": _client9,
-    "10": _client10,
     "6": _client6,
-    "12": _client12,
+    "5": _client5,
     "11": _client11,
-    "13": _client13,
-    "15": _client15,
-    "16": _client16,
-    "17": _client17,
-    "18": _client18,
-    "14": _client14
+    "9": _client9,
+    "18": _client18
 }
 
 
@@ -127,10 +120,6 @@ class ApplicationOffersFacade(TypeFactory):
     pass
 
 
-class ApplicationRelationsWatcherFacade(TypeFactory):
-    pass
-
-
 class ApplicationScalerFacade(TypeFactory):
     pass
 
@@ -247,10 +236,6 @@ class DeployerFacade(TypeFactory):
     pass
 
 
-class DiscoverSpacesFacade(TypeFactory):
-    pass
-
-
 class DiskManagerFacade(TypeFactory):
     pass
 
@@ -455,10 +440,6 @@ class RelationUnitsWatcherFacade(TypeFactory):
     pass
 
 
-class RemoteApplicationWatcherFacade(TypeFactory):
-    pass
-
-
 class RemoteRelationWatcherFacade(TypeFactory):
     pass
 
@@ -467,10 +448,6 @@ class RemoteRelationsFacade(TypeFactory):
     pass
 
 
-class RemoteRelationsWatcherFacade(TypeFactory):
-    pass
-
-
 class ResourcesFacade(TypeFactory):
     pass