Skip to content

Commit 98bb030

Browse files
SimonRichardsonSimonRichardson
committed
Update to the latest schema
The following updates the 2.9 branch to the latest schema. The generated python is the fallout from this.
1 parent eb849e4 commit 98bb030

14 files changed

Lines changed: 50315 additions & 123 deletions

‎juju/client/_client.py‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,18 @@ class CAASAgentFacade(TypeFactory):
154154
pass
155155

156156

157+
class CAASApplicationFacade(TypeFactory):
158+
pass
159+
160+
161+
class CAASApplicationProvisionerFacade(TypeFactory):
162+
pass
163+
164+
165+
class CAASFirewallerEmbeddedFacade(TypeFactory):
166+
pass
167+
168+
157169
class CAASFirewallerFacade(TypeFactory):
158170
pass
159171

‎juju/client/_client1.py‎

Lines changed: 1590 additions & 40 deletions
Large diffs are not rendered by default.

‎juju/client/_client11.py‎

Lines changed: 3 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -2013,6 +2013,7 @@ class ProvisionerFacade(Type):
20132013
'jobs': {'items': {'type': 'string'},
20142014
'type': 'array'},
20152015
'placement': {'type': 'string'},
2016+
'root-disk': {'$ref': '#/definitions/VolumeParams'},
20162017
'series': {'type': 'string'},
20172018
'tags': {'patternProperties': {'.*': {'type': 'string'}},
20182019
'type': 'object'},
@@ -2054,6 +2055,7 @@ class ProvisionerFacade(Type):
20542055
'jobs': {'items': {'type': 'string'},
20552056
'type': 'array'},
20562057
'placement': {'type': 'string'},
2058+
'root-disk': {'$ref': '#/definitions/VolumeParams'},
20572059
'series': {'type': 'string'},
20582060
'space-subnets': {'patternProperties': {'.*': {'items': {'type': 'string'},
20592061
'type': 'array'}},
@@ -2498,7 +2500,6 @@ class ProvisionerFacade(Type):
24982500
'properties': {'Result': {'$ref': '#/definitions/ModelConfigResult'}},
24992501
'type': 'object'},
25002502
'ModelUUID': {'description': 'ModelUUID returns the model UUID '
2501-
'to connect to the model\n'
25022503
'that the current connection is '
25032504
'for.',
25042505
'properties': {'Result': {'$ref': '#/definitions/StringResult'}},
@@ -2648,11 +2649,6 @@ class ProvisionerFacade(Type):
26482649
'properties': {'Params': {'$ref': '#/definitions/MachineContainersParams'},
26492650
'Result': {'$ref': '#/definitions/ErrorResults'}},
26502651
'type': 'object'},
2651-
'StateAddresses': {'description': 'StateAddresses returns the '
2652-
'list of addresses used to '
2653-
'connect to the state.',
2654-
'properties': {'Result': {'$ref': '#/definitions/StringsResult'}},
2655-
'type': 'object'},
26562652
'Status': {'description': 'Status returns the status of each '
26572653
'given entity.',
26582654
'properties': {'Params': {'$ref': '#/definitions/Entities'},
@@ -3331,8 +3327,7 @@ async def ModelConfig(self):
33313327
@ReturnMapping(StringResult)
33323328
async def ModelUUID(self):
33333329
'''
3334-
ModelUUID returns the model UUID to connect to the model
3335-
that the current connection is for.
3330+
ModelUUID returns the model UUID that the current connection is for.
33363331
33373332
33383333
Returns -> StringResult
@@ -3697,27 +3692,6 @@ async def SetSupportedContainers(self, params=None):
36973692

36983693

36993694

3700-
@ReturnMapping(StringsResult)
3701-
async def StateAddresses(self):
3702-
'''
3703-
StateAddresses returns the list of addresses used to connect to the state.
3704-
3705-
3706-
Returns -> StringsResult
3707-
'''
3708-
3709-
# map input types to rpc msg
3710-
_params = dict()
3711-
msg = dict(type='Provisioner',
3712-
request='StateAddresses',
3713-
version=11,
3714-
params=_params)
3715-
3716-
reply = await self.rpc(msg)
3717-
return reply
3718-
3719-
3720-
37213695
@ReturnMapping(StatusResults)
37223696
async def Status(self, entities=None):
37233697
'''

‎juju/client/_client13.py‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -269,13 +269,17 @@ class ApplicationFacade(Type):
269269
'required': ['applications'],
270270
'type': 'object'},
271271
'CharmOrigin': {'additionalProperties': False,
272-
'properties': {'hash': {'type': 'string'},
272+
'properties': {'architecture': {'type': 'string'},
273+
'hash': {'type': 'string'},
273274
'id': {'type': 'string'},
275+
'os': {'type': 'string'},
274276
'revision': {'type': 'integer'},
275277
'risk': {'type': 'string'},
278+
'series': {'type': 'string'},
276279
'source': {'type': 'string'},
277-
'track': {'type': 'string'}},
278-
'required': ['source', 'id'],
280+
'track': {'type': 'string'},
281+
'type': {'type': 'string'}},
282+
'required': ['source', 'type', 'id'],
279283
'type': 'object'},
280284
'CharmRelation': {'additionalProperties': False,
281285
'properties': {'interface': {'type': 'string'},

‎juju/client/_client17.py‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,7 @@ class UniterFacade(Type):
138138
'identity-endpoint': {'type': 'string'},
139139
'name': {'type': 'string'},
140140
'region': {'type': 'string'},
141+
'skip-tls-verify': {'type': 'boolean'},
141142
'storage-endpoint': {'type': 'string'},
142143
'type': {'type': 'string'}},
143144
'required': ['type', 'name'],
@@ -1139,9 +1140,14 @@ class UniterFacade(Type):
11391140
'properties': {'Result': {'$ref': '#/definitions/ModelConfigResult'}},
11401141
'type': 'object'},
11411142
'ModelUUID': {'description': 'ModelUUID returns the model UUID '
1142-
'to connect to the model\n'
1143-
'that the current connection is '
1144-
'for.',
1143+
'that this unit resides in.\n'
1144+
'It is implemented here directly '
1145+
'as a result of removing it from\n'
1146+
'embedded APIAddresser *without* '
1147+
'bumping the facade version.\n'
1148+
'It should be blanked when this '
1149+
'facade version is next '
1150+
'incremented.',
11451151
'properties': {'Result': {'$ref': '#/definitions/StringResult'}},
11461152
'type': 'object'},
11471153
'NetworkInfo': {'description': 'NetworkInfo returns network '
@@ -2637,8 +2643,10 @@ async def ModelConfig(self):
26372643
@ReturnMapping(StringResult)
26382644
async def ModelUUID(self):
26392645
'''
2640-
ModelUUID returns the model UUID to connect to the model
2641-
that the current connection is for.
2646+
ModelUUID returns the model UUID that this unit resides in.
2647+
It is implemented here directly as a result of removing it from
2648+
embedded APIAddresser *without* bumping the facade version.
2649+
It should be blanked when this facade version is next incremented.
26422650
26432651
26442652
Returns -> StringResult

0 commit comments

Comments
 (0)