Application refresh with resources #960
Merged
Conversation
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
Fixes juju#955 This also implements functionality that allows passing resources argument to application refresh.
cderici
added
hint/2.9
cderici
changed the title
|
/merge |
This was referenced Oct 17, 2023
This was referenced Oct 24, 2023
Merged
jujubot
added a commit
that referenced
this pull request
Oct 26, 2023
#973 #### Description This is a forward port of #960, bringing support for refreshing application with providing `resources` as arguments. Fixes #955 and #883 for 3.x track. #### QA Steps QA steps should be the same with #960: So the fix for the #955 can be tested manually by recreating the scenario above with pylibjuju as follows: ```python $ python -m asyncio >>> import asyncio >>> from juju import model;m=model.Model();await m.connect() >>> await m.deploy('ceph-mon', channel='octopus/stable') ``` Check the resources for that using juju-cli: ```sh $ juju resources ceph-mon No resources to display. ``` Go back to the python repl: ```python >>> await m.applications['ceph-mon'].refresh(channel='quincy/stable') This should succeed ``` And check the resources again external to pylibjuju, you should see the resource is added: ```sh $ juju resources ceph-juju Resource Supplied by Revision alert-rules charmstore 1 ``` Additionally, an integration test for the second part of the PR that adds the resource argument to refresh is added, so just run that, and maybe play with it manually for different charms: ``` tox -e integration -- tests/integration/test_application.py::test_refresh_with_resource_argument ``` All CI tests need to pass. #### Notes & Discussion JUJU-4736
jujubot
added a commit
that referenced
this pull request
Oct 26, 2023
#979 ## What's Changed * Deploy by revision on 2.9 by @cderici in #957 * Application refresh with resources by @cderici in #960 * Improve jujudata to find controller name by endpoint by @cderici in #964 * Allow switch kwarg in refresh to switch to local charms by @jack-w-shaw in #968 * Parse charm URLs consistantly for local charms by @jack-w-shaw in #969 * Fix juju config directory location pointed by XDG_DATA_HOME by @cderici in #975 * [JUJU-4779] Switch to local properly by @jack-w-shaw in #977 #### Notes & Discussion JUJU-4850 [JUJU-4779]: https://warthogs.atlassian.net/browse/JUJU-4779?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ
cderici
removed
the
area/forward-port
1 task
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
This adds two things:
juju-clias well as follows:resourcesargument to application refresh for non-local charms.Fixes #955 and #883
QA Steps
So the fix for the #955 can be tested manually by recreating the scenario above with pylibjuju as follows:
Check the resources for that using juju-cli:
Go back to the python repl:
And check the resources again external to pylibjuju, you should see the resource is added:
Additionally, an integration test for the second part of the PR that adds the resource argument to refresh is added, so just run that, and maybe play with it manually for different charms:
All CI tests need to pass.
Notes & Discussion
JUJU-4736