Skip to content

Update to the latest 2.9-beta1 schema #448

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jujubot merged 1 commit into from
Oct 6, 2020
Merged

Update to the latest 2.9-beta1 schema #448

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 7 additions & 2 deletions juju/client/_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

from juju.client._definitions import *

from juju.client import _client2, _client1, _client3, _client4, _client5, _client8, _client7, _client9, _client10, _client6, _client12, _client11, _client13, _client15, _client16
from juju.client import _client2, _client1, _client3, _client4, _client5, _client8, _client7, _client9, _client10, _client6, _client12, _client11, _client13, _client15, _client16, _client17


CLIENTS = {
Expand All @@ -21,7 +21,8 @@
"11": _client11,
"13": _client13,
"15": _client15,
"16": _client16
"16": _client16,
"17": _client17
}


Expand Down Expand Up @@ -177,6 +178,10 @@ class CAASUnitProvisionerFacade(TypeFactory):
pass


class CharmHubFacade(TypeFactory):
pass


class CharmRevisionUpdaterFacade(TypeFactory):
pass

Expand Down
196 changes: 195 additions & 1 deletion juju/client/_client1.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2996,7 +2996,8 @@ class CAASUnitProvisionerFacade(Type):
'required': ['units'],
'type': 'object'},
'Value': {'additionalProperties': False,
'properties': {'arch': {'type': 'string'},
'properties': {'allocate-public-ip': {'type': 'boolean'},
'arch': {'type': 'string'},
'container': {'type': 'string'},
'cores': {'type': 'integer'},
'cpu-power': {'type': 'integer'},
Expand Down Expand Up @@ -3391,6 +3392,199 @@ async def WatchPodSpec(self, entities=None):



class CharmHubFacade(Type):
name = 'CharmHub'
version = 1
schema = {'definitions': {'BundleCharm': {'additionalProperties': False,
'properties': {'name': {'type': 'string'},
'revision': {'type': 'integer'}},
'required': ['name', 'revision'],
'type': 'object'},
'Channel': {'additionalProperties': False,
'properties': {'platforms': {'items': {'$ref': '#/definitions/Platform'},
'type': 'array'},
'released-at': {'type': 'string'},
'revision': {'type': 'integer'},
'risk': {'type': 'string'},
'size': {'type': 'integer'},
'track': {'type': 'string'},
'version': {'type': 'string'}},
'required': ['released-at',
'track',
'risk',
'revision',
'size',
'version',
'platforms'],
'type': 'object'},
'CharmHubBundle': {'additionalProperties': False,
'properties': {'charms': {'items': {'$ref': '#/definitions/BundleCharm'},
'type': 'array'}},
'required': ['charms'],
'type': 'object'},
'CharmHubCharm': {'additionalProperties': False,
'properties': {'config': {'patternProperties': {'.*': {'$ref': '#/definitions/CharmOption'}},
'type': 'object'},
'relations': {'patternProperties': {'.*': {'patternProperties': {'.*': {'type': 'string'}},
'type': 'object'}},
'type': 'object'},
'subordinate': {'type': 'boolean'},
'used-by': {'items': {'type': 'string'},
'type': 'array'}},
'required': ['config',
'relations',
'subordinate',
'used-by'],
'type': 'object'},
'CharmHubEntityFindResult': {'additionalProperties': False,
'properties': {'errors': {'$ref': '#/definitions/ErrorResponse'},
'result': {'items': {'$ref': '#/definitions/FindResponse'},
'type': 'array'}},
'required': ['result', 'errors'],
'type': 'object'},
'CharmHubEntityInfoResult': {'additionalProperties': False,
'properties': {'errors': {'$ref': '#/definitions/ErrorResponse'},
'result': {'$ref': '#/definitions/InfoResponse'}},
'required': ['result', 'errors'],
'type': 'object'},
'CharmHubError': {'additionalProperties': False,
'properties': {'code': {'type': 'string'},
'message': {'type': 'string'}},
'required': ['code', 'message'],
'type': 'object'},
'CharmOption': {'additionalProperties': False,
'properties': {'default': {'additionalProperties': True,
'type': 'object'},
'description': {'type': 'string'},
'type': {'type': 'string'}},
'required': ['type'],
'type': 'object'},
'Entity': {'additionalProperties': False,
'properties': {'tag': {'type': 'string'}},
'required': ['tag'],
'type': 'object'},
'ErrorResponse': {'additionalProperties': False,
'properties': {'error-list': {'$ref': '#/definitions/CharmHubError'}},
'required': ['error-list'],
'type': 'object'},
'FindResponse': {'additionalProperties': False,
'properties': {'id': {'type': 'string'},
'name': {'type': 'string'},
'publisher': {'type': 'string'},
'series': {'items': {'type': 'string'},
'type': 'array'},
'store-url': {'type': 'string'},
'summary': {'type': 'string'},
'type': {'type': 'string'},
'version': {'type': 'string'}},
'required': ['type',
'id',
'name',
'publisher',
'summary',
'version',
'series',
'store-url'],
'type': 'object'},
'InfoResponse': {'additionalProperties': False,
'properties': {'bundle': {'$ref': '#/definitions/CharmHubBundle'},
'channel-map': {'patternProperties': {'.*': {'$ref': '#/definitions/Channel'}},
'type': 'object'},
'charm': {'$ref': '#/definitions/CharmHubCharm'},
'description': {'type': 'string'},
'id': {'type': 'string'},
'name': {'type': 'string'},
'publisher': {'type': 'string'},
'series': {'items': {'type': 'string'},
'type': 'array'},
'store-url': {'type': 'string'},
'summary': {'type': 'string'},
'tags': {'items': {'type': 'string'},
'type': 'array'},
'tracks': {'items': {'type': 'string'},
'type': 'array'},
'type': {'type': 'string'}},
'required': ['type',
'id',
'name',
'description',
'publisher',
'summary',
'series',
'store-url',
'tags',
'channel-map',
'tracks'],
'type': 'object'},
'Platform': {'additionalProperties': False,
'properties': {'architecture': {'type': 'string'},
'os': {'type': 'string'},
'series': {'type': 'string'}},
'required': ['architecture', 'os', 'series'],
'type': 'object'},
'Query': {'additionalProperties': False,
'properties': {'query': {'type': 'string'}},
'required': ['query'],
'type': 'object'}},
'properties': {'Find': {'description': 'Find queries the CharmHub API with a '
'given entity ID.',
'properties': {'Params': {'$ref': '#/definitions/Query'},
'Result': {'$ref': '#/definitions/CharmHubEntityFindResult'}},
'type': 'object'},
'Info': {'description': 'Info queries the CharmHub API with a '
'given entity ID.',
'properties': {'Params': {'$ref': '#/definitions/Entity'},
'Result': {'$ref': '#/definitions/CharmHubEntityInfoResult'}},
'type': 'object'}},
'type': 'object'}


@ReturnMapping(CharmHubEntityFindResult)
async def Find(self, query=None):
'''
Find queries the CharmHub API with a given entity ID.

query : str
Returns -> CharmHubEntityFindResult
'''
if query is not None and not isinstance(query, (bytes, str)):
raise Exception("Expected query to be a str, received: {}".format(type(query)))

# map input types to rpc msg
_params = dict()
msg = dict(type='CharmHub',
request='Find',
version=1,
params=_params)
_params['query'] = query
reply = await self.rpc(msg)
return reply



@ReturnMapping(CharmHubEntityInfoResult)
async def Info(self, tag=None):
'''
Info queries the CharmHub API with a given entity ID.

tag : str
Returns -> CharmHubEntityInfoResult
'''
if tag is not None and not isinstance(tag, (bytes, str)):
raise Exception("Expected tag to be a str, received: {}".format(type(tag)))

# map input types to rpc msg
_params = dict()
msg = dict(type='CharmHub',
request='Info',
version=1,
params=_params)
_params['tag'] = tag
reply = await self.rpc(msg)
return reply



class ClientFacade(Type):
name = 'Client'
version = 1
Expand Down
4 changes: 3 additions & 1 deletion juju/client/_client11.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1953,6 +1953,7 @@ class ProvisionerFacade(Type):
'type': 'array'},
'shadow-addresses': {'items': {'$ref': '#/definitions/Address'},
'type': 'array'},
'virtual-port-type': {'type': 'string'},
'vlan-tag': {'type': 'integer'}},
'required': ['device-index',
'mac-address',
Expand Down Expand Up @@ -2201,7 +2202,8 @@ class ProvisionerFacade(Type):
'enable-os-upgrade'],
'type': 'object'},
'Value': {'additionalProperties': False,
'properties': {'arch': {'type': 'string'},
'properties': {'allocate-public-ip': {'type': 'boolean'},
'arch': {'type': 'string'},
'container': {'type': 'string'},
'cores': {'type': 'integer'},
'cpu-power': {'type': 'integer'},
Expand Down
Loading