/python-libjuju

Include resources from store when deploying #102

Merged
merged 1 commit into from Apr 3, 2017

Conversation

Reviewers

@battlemidget battlemidget

@petevg petevg

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
3 participants
@johnsca @battlemidget @petevg
@johnsca
Member

johnsca commented Apr 3, 2017

Fixes #77
@johnsca
Include resources from store when deploying

All checks have passed

2 successful checks
continuous-integration/travis-ci/pr — The Travis CI build passed
Details
continuous-integration/travis-ci/push — The Travis CI build passed
Details
5e4fade
juju/client/overrides.py
+ """
+
+ @ReturnMapping(_client.AddPendingResourcesResult)
+ async def AddPendingResources(self, application_tag, charm_url, resources):
@battlemidget

battlemidget Apr 3, 2017

Collaborator

We should start with this but open a bug to the juju team to have these put under the right api code so the generator will pick these up

@johnsca

johnsca Apr 3, 2017

Member

I had discussed this with @mjs so there might be an issue already opened. I'm following up to confirm or get one opened if not.

@petevg

petevg approved these changes Apr 3, 2017
View changes

This all makes sense to me. Like the patches attribute. :-)

@petevg petevg merged commit 6637bf3 into master Apr 3, 2017
2 checks passed

2 checks passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details

@johnsca johnsca referenced this pull request Apr 4, 2017

Merged

Expanding controller.py with basic user functions, get_models and destroy #89

johnsca added a commit that referenced this pull request Apr 6, 2017

@mhmoerma @johnsca
Expanding controller.py with basic user functions, get_models and des… 
…troy (#89)

* Added user functions to controller.py, as well as the get_models call

* Fixes in controller.py

* Added controller.py integration tests

* Small fix in integration test

* Removed typo

* Disabled=False in controller.get_user does not work

* Added grant calls for model and controller, add-ssh, remove-ssh, get-ssh and get-machines

* Added last calls

* Added model.revoke('username')

* Edited docstring

* Added integrationtest for controller.py

* Fixed indentation error

* Added async

* Fixed type

* Fixed typo

* Expanded model integration tests

* Fixed typo

* ssh-key

* Typo

* Fix in remove_ssh_key

* Disconnecting models

* Added missing awaits

* Fixes

* Fixes

* Fixes

* Fixes

* Fixes

* Fixes

* Removed await in model grant

* Corrected remarks

* Typo

* Fixed tab error

* Typo

* Removed typo's

* Removed list from await expression

* Removed not needed await

* Added missing import

* Test

* Added decorators

* Merged #102

* Typo

* Updated _client.py

* Merged another
d23810d
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment