Skip to content

Commit 5c2dfa9

Browse files
jujubotjujubot
authored
Merge pull request #491 from tlm/2.9.1-facades
#491 Updates facades to Juju 2.9.1
2 parents b24e750 + 5bcb895 commit 5c2dfa9

12 files changed

Lines changed: 47518 additions & 43 deletions

‎juju/client/_client1.py‎

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2833,6 +2833,7 @@ class CAASModelOperatorFacade(Type):
28332833
'type': 'object'},
28342834
'Address': {'additionalProperties': False,
28352835
'properties': {'cidr': {'type': 'string'},
2836+
'config-type': {'type': 'string'},
28362837
'is-secondary': {'type': 'boolean'},
28372838
'scope': {'type': 'string'},
28382839
'space-id': {'type': 'string'},
@@ -2870,6 +2871,7 @@ class CAASModelOperatorFacade(Type):
28702871
'HostPort': {'additionalProperties': False,
28712872
'properties': {'Address': {'$ref': '#/definitions/Address'},
28722873
'cidr': {'type': 'string'},
2874+
'config-type': {'type': 'string'},
28732875
'is-secondary': {'type': 'boolean'},
28742876
'port': {'type': 'integer'},
28752877
'scope': {'type': 'string'},
@@ -3108,6 +3110,7 @@ class CAASOperatorFacade(Type):
31083110
'type': 'object'},
31093111
'Address': {'additionalProperties': False,
31103112
'properties': {'cidr': {'type': 'string'},
3113+
'config-type': {'type': 'string'},
31113114
'is-secondary': {'type': 'boolean'},
31123115
'scope': {'type': 'string'},
31133116
'space-id': {'type': 'string'},
@@ -3208,6 +3211,7 @@ class CAASOperatorFacade(Type):
32083211
'HostPort': {'additionalProperties': False,
32093212
'properties': {'Address': {'$ref': '#/definitions/Address'},
32103213
'cidr': {'type': 'string'},
3214+
'config-type': {'type': 'string'},
32113215
'is-secondary': {'type': 'boolean'},
32123216
'port': {'type': 'integer'},
32133217
'scope': {'type': 'string'},
@@ -3729,6 +3733,7 @@ class CAASOperatorProvisionerFacade(Type):
37293733
'type': 'object'},
37303734
'Address': {'additionalProperties': False,
37313735
'properties': {'cidr': {'type': 'string'},
3736+
'config-type': {'type': 'string'},
37323737
'is-secondary': {'type': 'boolean'},
37333738
'scope': {'type': 'string'},
37343739
'space-id': {'type': 'string'},
@@ -3775,6 +3780,7 @@ class CAASOperatorProvisionerFacade(Type):
37753780
'HostPort': {'additionalProperties': False,
37763781
'properties': {'Address': {'$ref': '#/definitions/Address'},
37773782
'cidr': {'type': 'string'},
3783+
'config-type': {'type': 'string'},
37783784
'is-secondary': {'type': 'boolean'},
37793785
'port': {'type': 'integer'},
37803786
'scope': {'type': 'string'},
@@ -7590,6 +7596,7 @@ class DeployerFacade(Type):
75907596
'type': 'object'},
75917597
'Address': {'additionalProperties': False,
75927598
'properties': {'cidr': {'type': 'string'},
7599+
'config-type': {'type': 'string'},
75937600
'is-secondary': {'type': 'boolean'},
75947601
'scope': {'type': 'string'},
75957602
'space-id': {'type': 'string'},
@@ -7653,6 +7660,7 @@ class DeployerFacade(Type):
76537660
'HostPort': {'additionalProperties': False,
76547661
'properties': {'Address': {'$ref': '#/definitions/Address'},
76557662
'cidr': {'type': 'string'},
7663+
'config-type': {'type': 'string'},
76567664
'is-secondary': {'type': 'boolean'},
76577665
'port': {'type': 'integer'},
76587666
'scope': {'type': 'string'},
@@ -14857,7 +14865,8 @@ class UndertakerFacade(Type):
1485714865
'required': ['entities'],
1485814866
'type': 'object'},
1485914867
'UndertakerModelInfo': {'additionalProperties': False,
14860-
'properties': {'force-destroyed': {'type': 'boolean'},
14868+
'properties': {'destroy-timeout': {'type': 'integer'},
14869+
'force-destroyed': {'type': 'boolean'},
1486114870
'global-name': {'type': 'string'},
1486214871
'is-system': {'type': 'boolean'},
1486314872
'life': {'type': 'string'},
@@ -14867,8 +14876,7 @@ class UndertakerFacade(Type):
1486714876
'name',
1486814877
'global-name',
1486914878
'is-system',
14870-
'life',
14871-
'force-destroyed'],
14879+
'life'],
1487214880
'type': 'object'},
1487314881
'UndertakerModelInfoResult': {'additionalProperties': False,
1487414882
'properties': {'error': {'$ref': '#/definitions/Error'},
@@ -14920,7 +14928,8 @@ class UndertakerFacade(Type):
1492014928
'changes to the '
1492114929
'lifecycle of an\n'
1492214930
"model's machines and "
14923-
'services.',
14931+
'applications and '
14932+
'storage.',
1492414933
'properties': {'Result': {'$ref': '#/definitions/NotifyWatchResults'}},
1492514934
'type': 'object'}},
1492614935
'type': 'object'}
@@ -15064,7 +15073,7 @@ async def UpdateStatus(self, entities=None):
1506415073
async def WatchModelResources(self):
1506515074
'''
1506615075
WatchModelResources creates watchers for changes to the lifecycle of an
15067-
model's machines and services.
15076+
model's machines and applications and storage.
1506815077

1506915078

1507015079
Returns -> NotifyWatchResults
@@ -15788,12 +15797,10 @@ class UpgraderFacade(Type):
1578815797
'required': ['version', 'url', 'size'],
1578915798
'type': 'object'},
1579015799
'ToolsResult': {'additionalProperties': False,
15791-
'properties': {'disable-ssl-hostname-verification': {'type': 'boolean'},
15792-
'error': {'$ref': '#/definitions/Error'},
15800+
'properties': {'error': {'$ref': '#/definitions/Error'},
1579315801
'tools': {'items': {'$ref': '#/definitions/Tools'},
1579415802
'type': 'array'}},
15795-
'required': ['tools',
15796-
'disable-ssl-hostname-verification'],
15803+
'required': ['tools'],
1579715804
'type': 'object'},
1579815805
'ToolsResults': {'additionalProperties': False,
1579915806
'properties': {'results': {'items': {'$ref': '#/definitions/ToolsResult'},

‎juju/client/_client11.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1564,6 +1564,7 @@ class ProvisionerFacade(Type):
15641564
'type': 'object'},
15651565
'Address': {'additionalProperties': False,
15661566
'properties': {'cidr': {'type': 'string'},
1567+
'config-type': {'type': 'string'},
15671568
'is-secondary': {'type': 'boolean'},
15681569
'scope': {'type': 'string'},
15691570
'space-id': {'type': 'string'},
@@ -1834,6 +1835,7 @@ class ProvisionerFacade(Type):
18341835
'HostPort': {'additionalProperties': False,
18351836
'properties': {'Address': {'$ref': '#/definitions/Address'},
18361837
'cidr': {'type': 'string'},
1838+
'config-type': {'type': 'string'},
18371839
'is-secondary': {'type': 'boolean'},
18381840
'port': {'type': 'integer'},
18391841
'scope': {'type': 'string'},
@@ -2191,12 +2193,10 @@ class ProvisionerFacade(Type):
21912193
'required': ['version', 'url', 'size'],
21922194
'type': 'object'},
21932195
'ToolsResult': {'additionalProperties': False,
2194-
'properties': {'disable-ssl-hostname-verification': {'type': 'boolean'},
2195-
'error': {'$ref': '#/definitions/Error'},
2196+
'properties': {'error': {'$ref': '#/definitions/Error'},
21962197
'tools': {'items': {'$ref': '#/definitions/Tools'},
21972198
'type': 'array'}},
2198-
'required': ['tools',
2199-
'disable-ssl-hostname-verification'],
2199+
'required': ['tools'],
22002200
'type': 'object'},
22012201
'ToolsResults': {'additionalProperties': False,
22022202
'properties': {'results': {'items': {'$ref': '#/definitions/ToolsResult'},

‎juju/client/_client17.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ class UniterFacade(Type):
7070
'type': 'object'},
7171
'Address': {'additionalProperties': False,
7272
'properties': {'cidr': {'type': 'string'},
73+
'config-type': {'type': 'string'},
7374
'is-secondary': {'type': 'boolean'},
7475
'scope': {'type': 'string'},
7576
'space-id': {'type': 'string'},
@@ -307,6 +308,7 @@ class UniterFacade(Type):
307308
'HostPort': {'additionalProperties': False,
308309
'properties': {'Address': {'$ref': '#/definitions/Address'},
309310
'cidr': {'type': 'string'},
311+
'config-type': {'type': 'string'},
310312
'is-secondary': {'type': 'boolean'},
311313
'port': {'type': 'integer'},
312314
'scope': {'type': 'string'},

‎juju/client/_client2.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3020,6 +3020,7 @@ class CAASUnitProvisionerFacade(Type):
30203020
version = 2
30213021
schema = {'definitions': {'Address': {'additionalProperties': False,
30223022
'properties': {'cidr': {'type': 'string'},
3023+
'config-type': {'type': 'string'},
30233024
'is-secondary': {'type': 'boolean'},
30243025
'scope': {'type': 'string'},
30253026
'space-id': {'type': 'string'},

‎juju/client/_client3.py‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -456,6 +456,7 @@ class AdminFacade(Type):
456456
version = 3
457457
schema = {'definitions': {'Address': {'additionalProperties': False,
458458
'properties': {'cidr': {'type': 'string'},
459+
'config-type': {'type': 'string'},
459460
'is-secondary': {'type': 'boolean'},
460461
'scope': {'type': 'string'},
461462
'space-id': {'type': 'string'},
@@ -486,6 +487,7 @@ class AdminFacade(Type):
486487
'HostPort': {'additionalProperties': False,
487488
'properties': {'Address': {'$ref': '#/definitions/Address'},
488489
'cidr': {'type': 'string'},
490+
'config-type': {'type': 'string'},
489491
'is-secondary': {'type': 'boolean'},
490492
'port': {'type': 'integer'},
491493
'scope': {'type': 'string'},
@@ -2656,6 +2658,7 @@ class ClientFacade(Type):
26562658
'type': 'object'},
26572659
'Address': {'additionalProperties': False,
26582660
'properties': {'cidr': {'type': 'string'},
2661+
'config-type': {'type': 'string'},
26592662
'is-secondary': {'type': 'boolean'},
26602663
'scope': {'type': 'string'},
26612664
'space-id': {'type': 'string'},
@@ -2949,6 +2952,7 @@ class ClientFacade(Type):
29492952
'HostPort': {'additionalProperties': False,
29502953
'properties': {'Address': {'$ref': '#/definitions/Address'},
29512954
'cidr': {'type': 'string'},
2955+
'config-type': {'type': 'string'},
29522956
'is-secondary': {'type': 'boolean'},
29532957
'port': {'type': 'integer'},
29542958
'scope': {'type': 'string'},

‎juju/client/_client4.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1502,7 +1502,8 @@ class CharmsFacade(Type):
15021502
'Macaroon': {'additionalProperties': False, 'type': 'object'},
15031503
'ResolveCharmWithChannel': {'additionalProperties': False,
15041504
'properties': {'charm-origin': {'$ref': '#/definitions/CharmOrigin'},
1505-
'reference': {'type': 'string'}},
1505+
'reference': {'type': 'string'},
1506+
'switch-charm': {'type': 'boolean'}},
15061507
'required': ['reference',
15071508
'charm-origin'],
15081509
'type': 'object'},
@@ -1887,6 +1888,7 @@ class InstancePollerFacade(Type):
18871888
version = 4
18881889
schema = {'definitions': {'Address': {'additionalProperties': False,
18891890
'properties': {'cidr': {'type': 'string'},
1891+
'config-type': {'type': 'string'},
18901892
'is-secondary': {'type': 'boolean'},
18911893
'scope': {'type': 'string'},
18921894
'space-id': {'type': 'string'},

‎juju/client/_client5.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4408,6 +4408,7 @@ class MachinerFacade(Type):
44084408
'type': 'object'},
44094409
'Address': {'additionalProperties': False,
44104410
'properties': {'cidr': {'type': 'string'},
4411+
'config-type': {'type': 'string'},
44114412
'is-secondary': {'type': 'boolean'},
44124413
'scope': {'type': 'string'},
44134414
'space-id': {'type': 'string'},
@@ -4456,6 +4457,7 @@ class MachinerFacade(Type):
44564457
'HostPort': {'additionalProperties': False,
44574458
'properties': {'Address': {'$ref': '#/definitions/Address'},
44584459
'cidr': {'type': 'string'},
4460+
'config-type': {'type': 'string'},
44594461
'is-secondary': {'type': 'boolean'},
44604462
'port': {'type': 'integer'},
44614463
'scope': {'type': 'string'},

‎juju/client/_client6.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,7 @@ class ActionFacade(Type):
145145
'enqueued': {'format': 'date-time',
146146
'type': 'string'},
147147
'error': {'$ref': '#/definitions/Error'},
148+
'fail': {'type': 'string'},
148149
'operation': {'type': 'string'},
149150
'started': {'format': 'date-time',
150151
'type': 'string'},
@@ -2708,6 +2709,7 @@ class MachineManagerFacade(Type):
27082709
'type': 'object'},
27092710
'Address': {'additionalProperties': False,
27102711
'properties': {'cidr': {'type': 'string'},
2712+
'config-type': {'type': 'string'},
27112713
'is-secondary': {'type': 'boolean'},
27122714
'scope': {'type': 'string'},
27132715
'space-id': {'type': 'string'},

‎juju/client/_client9.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2560,7 +2560,8 @@ class ModelManagerFacade(Type):
25602560
'properties': {'destroy-storage': {'type': 'boolean'},
25612561
'force': {'type': 'boolean'},
25622562
'max-wait': {'type': 'integer'},
2563-
'model-tag': {'type': 'string'}},
2563+
'model-tag': {'type': 'string'},
2564+
'timeout': {'type': 'integer'}},
25642565
'required': ['model-tag'],
25652566
'type': 'object'},
25662567
'DestroyModelsParams': {'additionalProperties': False,

0 commit comments

Comments
 (0)