Skip to content

Commit 7dde9a3

Browse files
jujubotjujubot
authored
Merge pull request #446 from SimonRichardson/release-2.8.4
#446 The following includes updating to the latest 2.8.3 release schema json.
2 parents 920debc + 68df7b1 commit 7dde9a3

9 files changed

Lines changed: 43486 additions & 32 deletions

File tree

‎VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.8.3
1+
2.8.4

‎docs/changelog.rst‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,15 @@
11
Changelog
22
---------
33

4+
2.8.4
5+
^^^^^
6+
7+
Thursday October 1 2020
8+
9+
* Update facade methods for Juju 2.8.3
10+
* Bug fix - Add force and max wait for destroying a model
11+
* Bug fix - Fix derivation of the application status
12+
413
2.8.3
514
^^^^^
615

‎juju/client/_client1.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2846,7 +2846,8 @@ class CAASUnitProvisionerFacade(Type):
28462846
'provider'],
28472847
'type': 'object'},
28482848
'KubernetesProvisioningInfo': {'additionalProperties': False,
2849-
'properties': {'constraints': {'$ref': '#/definitions/Value'},
2849+
'properties': {'charm-modified-version': {'type': 'integer'},
2850+
'constraints': {'$ref': '#/definitions/Value'},
28502851
'deployment-info': {'$ref': '#/definitions/KubernetesDeploymentInfo'},
28512852
'devices': {'items': {'$ref': '#/definitions/KubernetesDeviceParams'},
28522853
'type': 'array'},

‎juju/client/_client11.py‎

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2613,16 +2613,17 @@ class ProvisionerFacade(Type):
26132613
'SetObservedNetworkConfig': {'description': 'SetObservedNetworkConfig '
26142614
'reads the network '
26152615
'config for the '
2616-
'machine '
2617-
'identified\n'
2618-
'by the input '
2619-
'args. This config '
2620-
'is merged with '
2621-
'the new network '
2622-
'config supplied\n'
2623-
'in the same args '
2624-
'and updated if it '
2625-
'has changed.',
2616+
'machine\n'
2617+
'identified by the '
2618+
'input args.\n'
2619+
'This config is '
2620+
'merged with the '
2621+
'new network '
2622+
'config supplied '
2623+
'in the\n'
2624+
'same args and '
2625+
'updated if it has '
2626+
'changed.',
26262627
'properties': {'Params': {'$ref': '#/definitions/SetMachineNetworkConfig'}},
26272628
'type': 'object'},
26282629
'SetPasswords': {'description': 'SetPasswords sets the given '
@@ -3597,9 +3598,10 @@ async def SetModificationStatus(self, entities=None):
35973598
@ReturnMapping(None)
35983599
async def SetObservedNetworkConfig(self, config=None, tag=None):
35993600
'''
3600-
SetObservedNetworkConfig reads the network config for the machine identified
3601-
by the input args. This config is merged with the new network config supplied
3602-
in the same args and updated if it has changed.
3601+
SetObservedNetworkConfig reads the network config for the machine
3602+
identified by the input args.
3603+
This config is merged with the new network config supplied in the
3604+
same args and updated if it has changed.
36033605
36043606
config : typing.Sequence[~NetworkConfig]
36053607
tag : str

‎juju/client/_client3.py‎

Lines changed: 647 additions & 0 deletions
Large diffs are not rendered by default.

‎juju/client/_client4.py‎

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2074,16 +2074,17 @@ class MachinerFacade(Type):
20742074
'SetObservedNetworkConfig': {'description': 'SetObservedNetworkConfig '
20752075
'reads the network '
20762076
'config for the '
2077-
'machine '
2078-
'identified\n'
2079-
'by the input '
2080-
'args. This config '
2081-
'is merged with '
2082-
'the new network '
2083-
'config supplied\n'
2084-
'in the same args '
2085-
'and updated if it '
2086-
'has changed.',
2077+
'machine\n'
2078+
'identified by the '
2079+
'input args.\n'
2080+
'This config is '
2081+
'merged with the '
2082+
'new network '
2083+
'config supplied '
2084+
'in the\n'
2085+
'same args and '
2086+
'updated if it has '
2087+
'changed.',
20872088
'properties': {'Params': {'$ref': '#/definitions/SetMachineNetworkConfig'}},
20882089
'type': 'object'},
20892090
'SetStatus': {'description': 'SetStatus sets the status of '
@@ -2300,9 +2301,10 @@ async def SetMachineAddresses(self, machine_addresses=None):
23002301
@ReturnMapping(None)
23012302
async def SetObservedNetworkConfig(self, config=None, tag=None):
23022303
'''
2303-
SetObservedNetworkConfig reads the network config for the machine identified
2304-
by the input args. This config is merged with the new network config supplied
2305-
in the same args and updated if it has changed.
2304+
SetObservedNetworkConfig reads the network config for the machine
2305+
identified by the input args.
2306+
This config is merged with the new network config supplied in the
2307+
same args and updated if it has changed.
23062308
23072309
config : typing.Sequence[~NetworkConfig]
23082310
tag : str

‎juju/client/_definitions.py‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10891,10 +10891,11 @@ def __init__(self, attachment=None, attributes=None, provider=None, size=None, s
1089110891

1089210892

1089310893
class KubernetesProvisioningInfo(Type):
10894-
_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'}
10895-
_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'}
10896-
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):
10894+
_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'}
10895+
_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'}
10896+
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):
1089710897
'''
10898+
charm_modified_version : int
1089810899
constraints : Value
1089910900
deployment_info : KubernetesDeploymentInfo
1090010901
devices : typing.Sequence[~KubernetesDeviceParams]
@@ -10905,6 +10906,7 @@ def __init__(self, constraints=None, deployment_info=None, devices=None, filesys
1090510906
tags : typing.Mapping[str, str]
1090610907
volumes : typing.Sequence[~KubernetesVolumeParams]
1090710908
'''
10909+
charm_modified_version_ = charm_modified_version
1090810910
constraints_ = Value.from_json(constraints) if constraints else None
1090910911
deployment_info_ = KubernetesDeploymentInfo.from_json(deployment_info) if deployment_info else None
1091010912
devices_ = [KubernetesDeviceParams.from_json(o) for o in devices or []]
@@ -10916,6 +10918,9 @@ def __init__(self, constraints=None, deployment_info=None, devices=None, filesys
1091610918
volumes_ = [KubernetesVolumeParams.from_json(o) for o in volumes or []]
1091710919

1091810920
# Validate arguments against known Juju API types.
10921+
if charm_modified_version_ is not None and not isinstance(charm_modified_version_, int):
10922+
raise Exception("Expected charm_modified_version_ to be a int, received: {}".format(type(charm_modified_version_)))
10923+
1091910924
if constraints_ is not None and not isinstance(constraints_, (dict, Value)):
1092010925
raise Exception("Expected constraints_ to be a Value, received: {}".format(type(constraints_)))
1092110926

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

10951+
self.charm_modified_version = charm_modified_version_
1094610952
self.constraints = constraints_
1094710953
self.deployment_info = deployment_info_
1094810954
self.devices = devices_

0 commit comments

Comments
 (0)