-
Notifications
You must be signed in to change notification settings - Fork 97
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #706 from cderici/fix-facade-issues-1
#706 #### Description This change attempts to fix the `Unit.run_actions` issue where the resulting object is different based on the used Facade (which is based on whether the `2.9` or `3.0` juju client is being used). With this change both ways will return the same type of object as a result of running the action on the unit. It's also a continuation/possible-regression-fix of #698. Also adding the `EnvironUpgrader` facade that's introduced in `Juju 3.0`, so we shouldn't get the "unexpected facade" warning anymore. Also updating the clients with the latest schema from juju 3.0. In particuılar the Application facade version is bumped up `13` -> `14`. With this #705 should be fixed too. #### QA Steps QA steps for this is sort of a simulation of one of the real world libjuju uses in a function on [mongodb-operator](https://github.com/canonical/mongodb-operator/blob/8796be02e10b84f990da0426ad1cff5922dc506a/tests/integration/helpers.py#L39). Get a controller on a k8s cloud (I did it on `microk8s`). The following then should work fine. Full QA should be done with 2 separate controllers (at least that's what I did): one bootstrapped with `juju 2.9` and another with `juju 3.0`. ```python async def _get_password(): model = Model() await model.connect() await model.deploy('zinc-k8s') await model.wait_for_idle(status="active") unit = model.applications['zinc-k8s'].units[0] action = await unit.run_action("get-admin-password") action = await action.wait() print(action.results["admin-password"]) await model.disconnect() ``` #### Notes & Discussion This is also related (and most likely a fix) to: * openstack-charmers/zaza#545 * openstack-charmers/zaza#546 * https://github.com/canonical/mongodb-operator/runs/7761747331?check_suite_focus=true
- Loading branch information
Showing
20 changed files
with
66,725 additions
and
76,467 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.