Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.8.3
2.8.4
9 changes: 9 additions & 0 deletions docs/changelog.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,15 @@
Changelog
---------

2.8.4
^^^^^

Thursday October 1 2020

* Update facade methods for Juju 2.8.3
* Bug fix - Add force and max wait for destroying a model
* Bug fix - Fix derivation of the application status

2.8.3
^^^^^

Expand Down
3 changes: 2 additions & 1 deletion juju/client/_client1.py
Original file line number Diff line number Diff line change
Expand Up @@ -2846,7 +2846,8 @@ class CAASUnitProvisionerFacade(Type):
'provider'],
'type': 'object'},
'KubernetesProvisioningInfo': {'additionalProperties': False,
'properties': {'constraints': {'$ref': '#/definitions/Value'},
'properties': {'charm-modified-version': {'type': 'integer'},
'constraints': {'$ref': '#/definitions/Value'},
'deployment-info': {'$ref': '#/definitions/KubernetesDeploymentInfo'},
'devices': {'items': {'$ref': '#/definitions/KubernetesDeviceParams'},
'type': 'array'},
Expand Down
28 changes: 15 additions & 13 deletions juju/client/_client11.py
Original file line number Diff line number Diff line change
Expand Up @@ -2613,16 +2613,17 @@ class ProvisionerFacade(Type):
'SetObservedNetworkConfig': {'description': 'SetObservedNetworkConfig '
'reads the network '
'config for the '
'machine '
'identified\n'
'by the input '
'args. This config '
'is merged with '
'the new network '
'config supplied\n'
'in the same args '
'and updated if it '
'has changed.',
'machine\n'
'identified by the '
'input args.\n'
'This config is '
'merged with the '
'new network '
'config supplied '
'in the\n'
'same args and '
'updated if it has '
'changed.',
'properties': {'Params': {'$ref': '#/definitions/SetMachineNetworkConfig'}},
'type': 'object'},
'SetPasswords': {'description': 'SetPasswords sets the given '
Expand Down Expand Up @@ -3597,9 +3598,10 @@ async def SetModificationStatus(self, entities=None):
@ReturnMapping(None)
async def SetObservedNetworkConfig(self, config=None, tag=None):
'''
SetObservedNetworkConfig reads the network config for the machine identified
by the input args. This config is merged with the new network config supplied
in the same args and updated if it has changed.
SetObservedNetworkConfig reads the network config for the machine
identified by the input args.
This config is merged with the new network config supplied in the
same args and updated if it has changed.

config : typing.Sequence[~NetworkConfig]
tag : str
Expand Down
647 changes: 647 additions & 0 deletions juju/client/_client3.py

Large diffs are not rendered by default.

28 changes: 15 additions & 13 deletions juju/client/_client4.py
Original file line number Diff line number Diff line change
Expand Up @@ -2074,16 +2074,17 @@ class MachinerFacade(Type):
'SetObservedNetworkConfig': {'description': 'SetObservedNetworkConfig '
'reads the network '
'config for the '
'machine '
'identified\n'
'by the input '
'args. This config '
'is merged with '
'the new network '
'config supplied\n'
'in the same args '
'and updated if it '
'has changed.',
'machine\n'
'identified by the '
'input args.\n'
'This config is '
'merged with the '
'new network '
'config supplied '
'in the\n'
'same args and '
'updated if it has '
'changed.',
'properties': {'Params': {'$ref': '#/definitions/SetMachineNetworkConfig'}},
'type': 'object'},
'SetStatus': {'description': 'SetStatus sets the status of '
Expand Down Expand Up @@ -2300,9 +2301,10 @@ async def SetMachineAddresses(self, machine_addresses=None):
@ReturnMapping(None)
async def SetObservedNetworkConfig(self, config=None, tag=None):
'''
SetObservedNetworkConfig reads the network config for the machine identified
by the input args. This config is merged with the new network config supplied
in the same args and updated if it has changed.
SetObservedNetworkConfig reads the network config for the machine
identified by the input args.
This config is merged with the new network config supplied in the
same args and updated if it has changed.

config : typing.Sequence[~NetworkConfig]
tag : str
Expand Down
12 changes: 9 additions & 3 deletions juju/client/_definitions.py
Original file line number Diff line number Diff line change
Expand Up @@ -10891,10 +10891,11 @@ def __init__(self, attachment=None, attributes=None, provider=None, size=None, s


class KubernetesProvisioningInfo(Type):
_toSchema = {'constraints': 'constraints', 'deployment_info': 'deployment-info', 'devices': 'devices', 'filesystems': 'filesystems', 'operator_image_path': 'operator-image-path', 'pod_spec': 'pod-spec', 'raw_k8s_spec': 'raw-k8s-spec', 'tags': 'tags', 'volumes': 'volumes'}
_toPy = {'constraints': 'constraints', 'deployment-info': 'deployment_info', 'devices': 'devices', 'filesystems': 'filesystems', 'operator-image-path': 'operator_image_path', 'pod-spec': 'pod_spec', 'raw-k8s-spec': 'raw_k8s_spec', 'tags': 'tags', 'volumes': 'volumes'}
def __init__(self, constraints=None, deployment_info=None, devices=None, filesystems=None, operator_image_path=None, pod_spec=None, raw_k8s_spec=None, tags=None, volumes=None, **unknown_fields):
_toSchema = {'charm_modified_version': 'charm-modified-version', 'constraints': 'constraints', 'deployment_info': 'deployment-info', 'devices': 'devices', 'filesystems': 'filesystems', 'operator_image_path': 'operator-image-path', 'pod_spec': 'pod-spec', 'raw_k8s_spec': 'raw-k8s-spec', 'tags': 'tags', 'volumes': 'volumes'}
_toPy = {'charm-modified-version': 'charm_modified_version', 'constraints': 'constraints', 'deployment-info': 'deployment_info', 'devices': 'devices', 'filesystems': 'filesystems', 'operator-image-path': 'operator_image_path', 'pod-spec': 'pod_spec', 'raw-k8s-spec': 'raw_k8s_spec', 'tags': 'tags', 'volumes': 'volumes'}
def __init__(self, charm_modified_version=None, constraints=None, deployment_info=None, devices=None, filesystems=None, operator_image_path=None, pod_spec=None, raw_k8s_spec=None, tags=None, volumes=None, **unknown_fields):
'''
charm_modified_version : int
constraints : Value
deployment_info : KubernetesDeploymentInfo
devices : typing.Sequence[~KubernetesDeviceParams]
Expand All @@ -10905,6 +10906,7 @@ def __init__(self, constraints=None, deployment_info=None, devices=None, filesys
tags : typing.Mapping[str, str]
volumes : typing.Sequence[~KubernetesVolumeParams]
'''
charm_modified_version_ = charm_modified_version
constraints_ = Value.from_json(constraints) if constraints else None
deployment_info_ = KubernetesDeploymentInfo.from_json(deployment_info) if deployment_info else None
devices_ = [KubernetesDeviceParams.from_json(o) for o in devices or []]
Expand All @@ -10916,6 +10918,9 @@ def __init__(self, constraints=None, deployment_info=None, devices=None, filesys
volumes_ = [KubernetesVolumeParams.from_json(o) for o in volumes or []]

# Validate arguments against known Juju API types.
if charm_modified_version_ is not None and not isinstance(charm_modified_version_, int):
raise Exception("Expected charm_modified_version_ to be a int, received: {}".format(type(charm_modified_version_)))

if constraints_ is not None and not isinstance(constraints_, (dict, Value)):
raise Exception("Expected constraints_ to be a Value, received: {}".format(type(constraints_)))

Expand Down Expand Up @@ -10943,6 +10948,7 @@ def __init__(self, constraints=None, deployment_info=None, devices=None, filesys
if volumes_ is not None and not isinstance(volumes_, (bytes, str, list)):
raise Exception("Expected volumes_ to be a Sequence, received: {}".format(type(volumes_)))

self.charm_modified_version = charm_modified_version_
self.constraints = constraints_
self.deployment_info = deployment_info_
self.devices = devices_
Expand Down
Loading