From: Tim Van Steenburgh Date: Fri, 15 Jul 2016 15:07:54 +0000 (-0400) Subject: Get everything working on juju-2.0beta11 X-Git-Tag: 0.1.0~88 X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=173b900fcd95b2436af55df2618302146f4a2f40;p=osm%2FN2VC.git Get everything working on juju-2.0beta11 --- diff --git a/Makefile b/Makefile index 4d10060..0521ac1 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ clean: tox -r --notest client: - $(PY) -m juju.client.facade -s juju/client/schemas-20160608.json -o juju/client/_client.py + $(PY) -m juju.client.facade -s juju/client/schemas.json -o juju/client/_client.py test: tox diff --git a/examples/allwatcher.py b/examples/allwatcher.py index 6c549b4..3f5ea06 100644 --- a/examples/allwatcher.py +++ b/examples/allwatcher.py @@ -1,4 +1,6 @@ import asyncio +import logging +logging.basicConfig(level=logging.DEBUG) from juju.client.connection import Connection from juju.client import watcher diff --git a/examples/fullstatus.py b/examples/fullstatus.py index fb50621..7589c7f 100644 --- a/examples/fullstatus.py +++ b/examples/fullstatus.py @@ -16,7 +16,7 @@ async def status(): status = await client.FullStatus(patterns) await conn.close() - print('Services:', list(status.services.keys())) + print('Applications:', list(status.applications.keys())) print('Machines:', list(status.machines.keys())) print('Relations:', status.relations) diff --git a/examples/unitrun.py b/examples/unitrun.py index 7e3c490..6dbb1b6 100644 --- a/examples/unitrun.py +++ b/examples/unitrun.py @@ -17,16 +17,16 @@ _seen_units = set() async def run_stuff_on_unit(unit): - if unit.Name in _seen_units: + if unit.name in _seen_units: return - print('Running command on unit', unit.Name) + print('Running command on unit', unit.name) # unit.run() returns a client.ActionResults instance action_results = await unit.run('unit-get public-address') - _seen_units.add(unit.Name) + _seen_units.add(unit.name) action_result = action_results.results[0] - print('Results from unit', unit.Name) + print('Results from unit', unit.name) print(action_result.__dict__) diff --git a/juju/client/_client.py b/juju/client/_client.py index a792fd9..af87c85 100644 --- a/juju/client/_client.py +++ b/juju/client/_client.py @@ -5,8 +5,8 @@ from juju.client.facade import Type, ReturnMapping class Action(Type): - _toSchema = {'parameters': 'parameters', 'receiver': 'receiver', 'tag': 'tag', 'name': 'name'} - _toPy = {'parameters': 'parameters', 'receiver': 'receiver', 'tag': 'tag', 'name': 'name'} + _toSchema = {'name': 'name', 'receiver': 'receiver', 'parameters': 'parameters', 'tag': 'tag'} + _toPy = {'name': 'name', 'receiver': 'receiver', 'parameters': 'parameters', 'tag': 'tag'} def __init__(self, name=None, parameters=None, receiver=None, tag=None): ''' name : str @@ -21,8 +21,8 @@ class Action(Type): class ActionResult(Type): - _toSchema = {'action': 'action', 'completed': 'completed', 'output': 'output', 'started': 'started', 'enqueued': 'enqueued', 'message': 'message', 'error': 'error', 'status': 'status'} - _toPy = {'action': 'action', 'completed': 'completed', 'output': 'output', 'started': 'started', 'enqueued': 'enqueued', 'message': 'message', 'error': 'error', 'status': 'status'} + _toSchema = {'started': 'started', 'error': 'error', 'action': 'action', 'enqueued': 'enqueued', 'status': 'status', 'completed': 'completed', 'message': 'message', 'output': 'output'} + _toPy = {'started': 'started', 'error': 'error', 'action': 'action', 'enqueued': 'enqueued', 'status': 'status', 'completed': 'completed', 'message': 'message', 'output': 'output'} def __init__(self, action=None, completed=None, enqueued=None, error=None, message=None, output=None, started=None, status=None): ''' action : Action @@ -55,8 +55,8 @@ class ActionResults(Type): class ActionSpec(Type): - _toSchema = {'description': 'Description', 'params': 'Params'} - _toPy = {'Description': 'description', 'Params': 'params'} + _toSchema = {'params': 'params', 'description': 'description'} + _toPy = {'params': 'params', 'description': 'description'} def __init__(self, description=None, params=None): ''' description : str @@ -67,18 +67,18 @@ class ActionSpec(Type): class Actions(Type): - _toSchema = {'actionspecs': 'ActionSpecs'} - _toPy = {'ActionSpecs': 'actionspecs'} - def __init__(self, actionspecs=None): + _toSchema = {'actions': 'actions'} + _toPy = {'actions': 'actions'} + def __init__(self, actions=None): ''' - actionspecs : typing.Mapping[str, ~ActionSpec] + actions : typing.Sequence[~Action] ''' - self.actionspecs = {k: ActionSpec.from_json(v) for k, v in (actionspecs or dict()).items()} + self.actions = [Action.from_json(o) for o in actions or []] class ActionsByName(Type): - _toSchema = {'name': 'name', 'actions': 'actions', 'error': 'error'} - _toPy = {'name': 'name', 'actions': 'actions', 'error': 'error'} + _toSchema = {'name': 'name', 'error': 'error', 'actions': 'actions'} + _toPy = {'name': 'name', 'error': 'error', 'actions': 'actions'} def __init__(self, actions=None, error=None, name=None): ''' actions : typing.Sequence[~ActionResult] @@ -101,8 +101,8 @@ class ActionsByNames(Type): class ActionsByReceiver(Type): - _toSchema = {'receiver': 'receiver', 'actions': 'actions', 'error': 'error'} - _toPy = {'receiver': 'receiver', 'actions': 'actions', 'error': 'error'} + _toSchema = {'error': 'error', 'receiver': 'receiver', 'actions': 'actions'} + _toPy = {'error': 'error', 'receiver': 'receiver', 'actions': 'actions'} def __init__(self, actions=None, error=None, receiver=None): ''' actions : typing.Sequence[~ActionResult] @@ -125,16 +125,16 @@ class ActionsByReceivers(Type): class ApplicationCharmActionsResult(Type): - _toSchema = {'applicationtag': 'ApplicationTag', 'actions': 'actions', 'error': 'error'} - _toPy = {'actions': 'actions', 'ApplicationTag': 'applicationtag', 'error': 'error'} - def __init__(self, applicationtag=None, actions=None, error=None): + _toSchema = {'error': 'error', 'actions': 'actions', 'application_tag': 'application-tag'} + _toPy = {'error': 'error', 'actions': 'actions', 'application-tag': 'application_tag'} + def __init__(self, actions=None, application_tag=None, error=None): ''' - applicationtag : str - actions : Actions + actions : typing.Mapping[str, ~ActionSpec] + application_tag : str error : Error ''' - self.applicationtag = applicationtag - self.actions = Actions.from_json(actions) if actions else None + self.actions = {k: ActionSpec.from_json(v) for k, v in (actions or dict()).items()} + self.application_tag = application_tag self.error = Error.from_json(error) if error else None @@ -149,8 +149,8 @@ class ApplicationsCharmActionsResults(Type): class Entities(Type): - _toSchema = {'entities': 'Entities'} - _toPy = {'Entities': 'entities'} + _toSchema = {'entities': 'entities'} + _toPy = {'entities': 'entities'} def __init__(self, entities=None): ''' entities : typing.Sequence[~Entity] @@ -159,8 +159,8 @@ class Entities(Type): class Entity(Type): - _toSchema = {'tag': 'Tag'} - _toPy = {'Tag': 'tag'} + _toSchema = {'tag': 'tag'} + _toPy = {'tag': 'tag'} def __init__(self, tag=None): ''' tag : str @@ -169,8 +169,8 @@ class Entity(Type): class Error(Type): - _toSchema = {'code': 'Code', 'message': 'Message', 'info': 'Info'} - _toPy = {'Code': 'code', 'Message': 'message', 'Info': 'info'} + _toSchema = {'code': 'code', 'info': 'info', 'message': 'message'} + _toPy = {'code': 'code', 'info': 'info', 'message': 'message'} def __init__(self, code=None, info=None, message=None): ''' code : str @@ -183,15 +183,15 @@ class Error(Type): class ErrorInfo(Type): - _toSchema = {'macaroonpath': 'MacaroonPath', 'macaroon': 'Macaroon'} - _toPy = {'Macaroon': 'macaroon', 'MacaroonPath': 'macaroonpath'} - def __init__(self, macaroon=None, macaroonpath=None): + _toSchema = {'macaroon_path': 'macaroon-path', 'macaroon': 'macaroon'} + _toPy = {'macaroon-path': 'macaroon_path', 'macaroon': 'macaroon'} + def __init__(self, macaroon=None, macaroon_path=None): ''' macaroon : Macaroon - macaroonpath : str + macaroon_path : str ''' self.macaroon = Macaroon.from_json(macaroon) if macaroon else None - self.macaroonpath = macaroonpath + self.macaroon_path = macaroon_path class FindActionsByNames(Type): @@ -225,26 +225,18 @@ class FindTagsResults(Type): class Macaroon(Type): - _toSchema = {'caveats': 'caveats', 'location': 'location', 'data': 'data', 'id_': 'id', 'sig': 'sig'} - _toPy = {'caveats': 'caveats', 'location': 'location', 'data': 'data', 'sig': 'sig', 'id': 'id_'} - def __init__(self, caveats=None, data=None, id_=None, location=None, sig=None): + _toSchema = {} + _toPy = {} + def __init__(self): ''' - caveats : typing.Sequence[~caveat] - data : typing.Sequence[int] - id_ : packet - location : packet - sig : typing.Sequence[int] + ''' - self.caveats = [caveat.from_json(o) for o in caveats or []] - self.data = data - self.id_ = packet.from_json(id_) if id_ else None - self.location = packet.from_json(location) if location else None - self.sig = sig + pass class RunParams(Type): - _toSchema = {'units': 'Units', 'applications': 'Applications', 'commands': 'Commands', 'machines': 'Machines', 'timeout': 'Timeout'} - _toPy = {'Applications': 'applications', 'Commands': 'commands', 'Timeout': 'timeout', 'Units': 'units', 'Machines': 'machines'} + _toSchema = {'machines': 'machines', 'units': 'units', 'commands': 'commands', 'timeout': 'timeout', 'applications': 'applications'} + _toPy = {'machines': 'machines', 'units': 'units', 'commands': 'commands', 'timeout': 'timeout', 'applications': 'applications'} def __init__(self, applications=None, commands=None, machines=None, timeout=None, units=None): ''' applications : typing.Sequence[str] @@ -260,93 +252,25 @@ class RunParams(Type): self.units = units -class caveat(Type): - _toSchema = {'caveatid': 'caveatId', 'location': 'location', 'verificationid': 'verificationId'} - _toPy = {'verificationId': 'verificationid', 'location': 'location', 'caveatId': 'caveatid'} - def __init__(self, caveatid=None, location=None, verificationid=None): - ''' - caveatid : packet - location : packet - verificationid : packet - ''' - self.caveatid = packet.from_json(caveatid) if caveatid else None - self.location = packet.from_json(location) if location else None - self.verificationid = packet.from_json(verificationid) if verificationid else None - - -class packet(Type): - _toSchema = {'start': 'start', 'totallen': 'totalLen', 'headerlen': 'headerLen'} - _toPy = {'start': 'start', 'totalLen': 'totallen', 'headerLen': 'headerlen'} - def __init__(self, headerlen=None, start=None, totallen=None): - ''' - headerlen : int - start : int - totallen : int - ''' - self.headerlen = headerlen - self.start = start - self.totallen = totallen - - -class BoolResult(Type): - _toSchema = {'result': 'Result', 'error': 'Error'} - _toPy = {'Result': 'result', 'Error': 'error'} - def __init__(self, error=None, result=None): - ''' - error : Error - result : bool - ''' - self.error = Error.from_json(error) if error else None - self.result = result - - -class EntitiesWatchResult(Type): - _toSchema = {'changes': 'Changes', 'error': 'Error', 'entitywatcherid': 'EntityWatcherId'} - _toPy = {'Changes': 'changes', 'Error': 'error', 'EntityWatcherId': 'entitywatcherid'} - def __init__(self, changes=None, entitywatcherid=None, error=None): - ''' - changes : typing.Sequence[str] - entitywatcherid : str - error : Error - ''' - self.changes = changes - self.entitywatcherid = entitywatcherid - self.error = Error.from_json(error) if error else None - - -class ErrorResult(Type): - _toSchema = {'code': 'Code', 'message': 'Message', 'info': 'Info'} - _toPy = {'Code': 'code', 'Message': 'message', 'Info': 'info'} - def __init__(self, code=None, info=None, message=None): - ''' - code : str - info : ErrorInfo - message : str - ''' - self.code = code - self.info = ErrorInfo.from_json(info) if info else None - self.message = message - - class AgentGetEntitiesResult(Type): - _toSchema = {'jobs': 'Jobs', 'life': 'Life', 'error': 'Error', 'containertype': 'ContainerType'} - _toPy = {'Life': 'life', 'ContainerType': 'containertype', 'Error': 'error', 'Jobs': 'jobs'} - def __init__(self, containertype=None, error=None, jobs=None, life=None): + _toSchema = {'jobs': 'jobs', 'error': 'error', 'life': 'life', 'container_type': 'container-type'} + _toPy = {'jobs': 'jobs', 'error': 'error', 'life': 'life', 'container-type': 'container_type'} + def __init__(self, container_type=None, error=None, jobs=None, life=None): ''' - containertype : str + container_type : str error : Error jobs : typing.Sequence[str] life : str ''' - self.containertype = containertype + self.container_type = container_type self.error = Error.from_json(error) if error else None self.jobs = jobs self.life = life class AgentGetEntitiesResults(Type): - _toSchema = {'entities': 'Entities'} - _toPy = {'Entities': 'entities'} + _toSchema = {'entities': 'entities'} + _toPy = {'entities': 'entities'} def __init__(self, entities=None): ''' entities : typing.Sequence[~AgentGetEntitiesResult] @@ -354,9 +278,19 @@ class AgentGetEntitiesResults(Type): self.entities = [AgentGetEntitiesResult.from_json(o) for o in entities or []] +class ControllerConfigResult(Type): + _toSchema = {'config': 'config'} + _toPy = {'config': 'config'} + def __init__(self, config=None): + ''' + config : typing.Mapping[str, typing.Any] + ''' + self.config = config + + class EntityPassword(Type): - _toSchema = {'password': 'Password', 'tag': 'Tag'} - _toPy = {'Tag': 'tag', 'Password': 'password'} + _toSchema = {'password': 'password', 'tag': 'tag'} + _toPy = {'password': 'password', 'tag': 'tag'} def __init__(self, password=None, tag=None): ''' password : str @@ -367,8 +301,8 @@ class EntityPassword(Type): class EntityPasswords(Type): - _toSchema = {'changes': 'Changes'} - _toPy = {'Changes': 'changes'} + _toSchema = {'changes': 'changes'} + _toPy = {'changes': 'changes'} def __init__(self, changes=None): ''' changes : typing.Sequence[~EntityPassword] @@ -376,9 +310,23 @@ class EntityPasswords(Type): self.changes = [EntityPassword.from_json(o) for o in changes or []] +class ErrorResult(Type): + _toSchema = {'code': 'code', 'info': 'info', 'message': 'message'} + _toPy = {'code': 'code', 'info': 'info', 'message': 'message'} + def __init__(self, code=None, info=None, message=None): + ''' + code : str + info : ErrorInfo + message : str + ''' + self.code = code + self.info = ErrorInfo.from_json(info) if info else None + self.message = message + + class ErrorResults(Type): - _toSchema = {'results': 'Results'} - _toPy = {'Results': 'results'} + _toSchema = {'results': 'results'} + _toPy = {'results': 'results'} def __init__(self, results=None): ''' results : typing.Sequence[~ErrorResult] @@ -387,8 +335,8 @@ class ErrorResults(Type): class IsMasterResult(Type): - _toSchema = {'master': 'Master'} - _toPy = {'Master': 'master'} + _toSchema = {'master': 'master'} + _toPy = {'master': 'master'} def __init__(self, master=None): ''' master : bool @@ -397,8 +345,8 @@ class IsMasterResult(Type): class ModelConfigResult(Type): - _toSchema = {'config': 'Config'} - _toPy = {'Config': 'config'} + _toSchema = {'config': 'config'} + _toPy = {'config': 'config'} def __init__(self, config=None): ''' config : typing.Mapping[str, typing.Any] @@ -407,42 +355,42 @@ class ModelConfigResult(Type): class NotifyWatchResult(Type): - _toSchema = {'notifywatcherid': 'NotifyWatcherId', 'error': 'Error'} - _toPy = {'NotifyWatcherId': 'notifywatcherid', 'Error': 'error'} - def __init__(self, error=None, notifywatcherid=None): + _toSchema = {'error': 'error', 'notifywatcherid': 'NotifyWatcherId'} + _toPy = {'error': 'error', 'NotifyWatcherId': 'notifywatcherid'} + def __init__(self, notifywatcherid=None, error=None): ''' - error : Error notifywatcherid : str + error : Error ''' - self.error = Error.from_json(error) if error else None self.notifywatcherid = notifywatcherid + self.error = Error.from_json(error) if error else None class StateServingInfo(Type): - _toSchema = {'apiport': 'APIPort', 'stateport': 'StatePort', 'cert': 'Cert', 'caprivatekey': 'CAPrivateKey', 'systemidentity': 'SystemIdentity', 'sharedsecret': 'SharedSecret', 'privatekey': 'PrivateKey'} - _toPy = {'SharedSecret': 'sharedsecret', 'CAPrivateKey': 'caprivatekey', 'Cert': 'cert', 'PrivateKey': 'privatekey', 'StatePort': 'stateport', 'SystemIdentity': 'systemidentity', 'APIPort': 'apiport'} - def __init__(self, apiport=None, caprivatekey=None, cert=None, privatekey=None, sharedsecret=None, stateport=None, systemidentity=None): + _toSchema = {'private_key': 'private-key', 'cert': 'cert', 'shared_secret': 'shared-secret', 'api_port': 'api-port', 'state_port': 'state-port', 'system_identity': 'system-identity', 'ca_private_key': 'ca-private-key'} + _toPy = {'api-port': 'api_port', 'cert': 'cert', 'shared-secret': 'shared_secret', 'ca-private-key': 'ca_private_key', 'state-port': 'state_port', 'system-identity': 'system_identity', 'private-key': 'private_key'} + def __init__(self, api_port=None, ca_private_key=None, cert=None, private_key=None, shared_secret=None, state_port=None, system_identity=None): ''' - apiport : int - caprivatekey : str + api_port : int + ca_private_key : str cert : str - privatekey : str - sharedsecret : str - stateport : int - systemidentity : str + private_key : str + shared_secret : str + state_port : int + system_identity : str ''' - self.apiport = apiport - self.caprivatekey = caprivatekey + self.api_port = api_port + self.ca_private_key = ca_private_key self.cert = cert - self.privatekey = privatekey - self.sharedsecret = sharedsecret - self.stateport = stateport - self.systemidentity = systemidentity + self.private_key = private_key + self.shared_secret = shared_secret + self.state_port = state_port + self.system_identity = system_identity class AllWatcherNextResults(Type): - _toSchema = {'deltas': 'Deltas'} - _toPy = {'Deltas': 'deltas'} + _toSchema = {'deltas': 'deltas'} + _toPy = {'deltas': 'deltas'} def __init__(self, deltas=None): ''' deltas : typing.Sequence[~Delta] @@ -451,8 +399,8 @@ class AllWatcherNextResults(Type): class Delta(Type): - _toSchema = {'entity': 'Entity', 'removed': 'Removed'} - _toPy = {'Removed': 'removed', 'Entity': 'entity'} + _toSchema = {'removed': 'removed', 'entity': 'entity'} + _toPy = {'removed': 'removed', 'entity': 'entity'} def __init__(self, entity=None, removed=None): ''' entity : typing.Mapping[str, typing.Any] @@ -463,22 +411,22 @@ class Delta(Type): class AnnotationsGetResult(Type): - _toSchema = {'entitytag': 'EntityTag', 'annotations': 'Annotations', 'error': 'Error'} - _toPy = {'Error': 'error', 'Annotations': 'annotations', 'EntityTag': 'entitytag'} - def __init__(self, annotations=None, entitytag=None, error=None): + _toSchema = {'error': 'error', 'annotations': 'annotations', 'entity': 'entity'} + _toPy = {'error': 'error', 'annotations': 'annotations', 'entity': 'entity'} + def __init__(self, annotations=None, entity=None, error=None): ''' annotations : typing.Mapping[str, str] - entitytag : str + entity : str error : ErrorResult ''' self.annotations = annotations - self.entitytag = entitytag + self.entity = entity self.error = ErrorResult.from_json(error) if error else None class AnnotationsGetResults(Type): - _toSchema = {'results': 'Results'} - _toPy = {'Results': 'results'} + _toSchema = {'results': 'results'} + _toPy = {'results': 'results'} def __init__(self, results=None): ''' results : typing.Sequence[~AnnotationsGetResult] @@ -487,8 +435,8 @@ class AnnotationsGetResults(Type): class AnnotationsSet(Type): - _toSchema = {'annotations': 'Annotations'} - _toPy = {'Annotations': 'annotations'} + _toSchema = {'annotations': 'annotations'} + _toPy = {'annotations': 'annotations'} def __init__(self, annotations=None): ''' annotations : typing.Sequence[~EntityAnnotations] @@ -497,34 +445,34 @@ class AnnotationsSet(Type): class EntityAnnotations(Type): - _toSchema = {'entitytag': 'EntityTag', 'annotations': 'Annotations'} - _toPy = {'Annotations': 'annotations', 'EntityTag': 'entitytag'} - def __init__(self, annotations=None, entitytag=None): + _toSchema = {'annotations': 'annotations', 'entity': 'entity'} + _toPy = {'annotations': 'annotations', 'entity': 'entity'} + def __init__(self, annotations=None, entity=None): ''' annotations : typing.Mapping[str, str] - entitytag : str + entity : str ''' self.annotations = annotations - self.entitytag = entitytag + self.entity = entity class AddApplicationUnits(Type): - _toSchema = {'numunits': 'NumUnits', 'applicationname': 'ApplicationName', 'placement': 'Placement'} - _toPy = {'NumUnits': 'numunits', 'Placement': 'placement', 'ApplicationName': 'applicationname'} - def __init__(self, applicationname=None, numunits=None, placement=None): + _toSchema = {'num_units': 'num-units', 'placement': 'placement', 'application': 'application'} + _toPy = {'num-units': 'num_units', 'placement': 'placement', 'application': 'application'} + def __init__(self, application=None, num_units=None, placement=None): ''' - applicationname : str - numunits : int + application : str + num_units : int placement : typing.Sequence[~Placement] ''' - self.applicationname = applicationname - self.numunits = numunits + self.application = application + self.num_units = num_units self.placement = [Placement.from_json(o) for o in placement or []] class AddApplicationUnitsResults(Type): - _toSchema = {'units': 'Units'} - _toPy = {'Units': 'units'} + _toSchema = {'units': 'units'} + _toPy = {'units': 'units'} def __init__(self, units=None): ''' units : typing.Sequence[str] @@ -533,8 +481,8 @@ class AddApplicationUnitsResults(Type): class AddRelation(Type): - _toSchema = {'endpoints': 'Endpoints'} - _toPy = {'Endpoints': 'endpoints'} + _toSchema = {'endpoints': 'endpoints'} + _toPy = {'endpoints': 'endpoints'} def __init__(self, endpoints=None): ''' endpoints : typing.Sequence[str] @@ -543,61 +491,61 @@ class AddRelation(Type): class AddRelationResults(Type): - _toSchema = {'endpoints': 'Endpoints'} - _toPy = {'Endpoints': 'endpoints'} + _toSchema = {'endpoints': 'endpoints'} + _toPy = {'endpoints': 'endpoints'} def __init__(self, endpoints=None): ''' - endpoints : typing.Mapping[str, ~Relation] + endpoints : typing.Mapping[str, ~CharmRelation] ''' - self.endpoints = {k: Relation.from_json(v) for k, v in (endpoints or dict()).items()} + self.endpoints = {k: CharmRelation.from_json(v) for k, v in (endpoints or dict()).items()} class ApplicationCharmRelations(Type): - _toSchema = {'applicationname': 'ApplicationName'} - _toPy = {'ApplicationName': 'applicationname'} - def __init__(self, applicationname=None): + _toSchema = {'application': 'application'} + _toPy = {'application': 'application'} + def __init__(self, application=None): ''' - applicationname : str + application : str ''' - self.applicationname = applicationname + self.application = application class ApplicationCharmRelationsResults(Type): - _toSchema = {'charmrelations': 'CharmRelations'} - _toPy = {'CharmRelations': 'charmrelations'} - def __init__(self, charmrelations=None): + _toSchema = {'charm_relations': 'charm-relations'} + _toPy = {'charm-relations': 'charm_relations'} + def __init__(self, charm_relations=None): ''' - charmrelations : typing.Sequence[str] + charm_relations : typing.Sequence[str] ''' - self.charmrelations = charmrelations + self.charm_relations = charm_relations class ApplicationDeploy(Type): - _toSchema = {'resources': 'Resources', 'channel': 'Channel', 'numunits': 'NumUnits', 'charmurl': 'CharmUrl', 'endpointbindings': 'EndpointBindings', 'configyaml': 'ConfigYAML', 'series': 'Series', 'storage': 'Storage', 'placement': 'Placement', 'config': 'Config', 'constraints': 'Constraints', 'applicationname': 'ApplicationName'} - _toPy = {'Storage': 'storage', 'ApplicationName': 'applicationname', 'Channel': 'channel', 'CharmUrl': 'charmurl', 'Constraints': 'constraints', 'Config': 'config', 'ConfigYAML': 'configyaml', 'Resources': 'resources', 'EndpointBindings': 'endpointbindings', 'NumUnits': 'numunits', 'Placement': 'placement', 'Series': 'series'} - def __init__(self, applicationname=None, channel=None, charmurl=None, config=None, configyaml=None, constraints=None, endpointbindings=None, numunits=None, placement=None, resources=None, series=None, storage=None): + _toSchema = {'placement': 'placement', 'charm_url': 'charm-url', 'series': 'series', 'config_yaml': 'config-yaml', 'storage': 'storage', 'channel': 'channel', 'application': 'application', 'config': 'config', 'constraints': 'constraints', 'num_units': 'num-units', 'resources': 'resources', 'endpoint_bindings': 'endpoint-bindings'} + _toPy = {'placement': 'placement', 'endpoint-bindings': 'endpoint_bindings', 'num-units': 'num_units', 'series': 'series', 'storage': 'storage', 'channel': 'channel', 'application': 'application', 'charm-url': 'charm_url', 'constraints': 'constraints', 'config-yaml': 'config_yaml', 'resources': 'resources', 'config': 'config'} + def __init__(self, application=None, channel=None, charm_url=None, config=None, config_yaml=None, constraints=None, endpoint_bindings=None, num_units=None, placement=None, resources=None, series=None, storage=None): ''' - applicationname : str + application : str channel : str - charmurl : str + charm_url : str config : typing.Mapping[str, str] - configyaml : str + config_yaml : str constraints : Value - endpointbindings : typing.Mapping[str, str] - numunits : int + endpoint_bindings : typing.Mapping[str, str] + num_units : int placement : typing.Sequence[~Placement] resources : typing.Mapping[str, str] series : str storage : typing.Mapping[str, ~Constraints] ''' - self.applicationname = applicationname + self.application = application self.channel = channel - self.charmurl = charmurl + self.charm_url = charm_url self.config = config - self.configyaml = configyaml + self.config_yaml = config_yaml self.constraints = Value.from_json(constraints) if constraints else None - self.endpointbindings = endpointbindings - self.numunits = numunits + self.endpoint_bindings = endpoint_bindings + self.num_units = num_units self.placement = [Placement.from_json(o) for o in placement or []] self.resources = resources self.series = series @@ -605,38 +553,38 @@ class ApplicationDeploy(Type): class ApplicationDestroy(Type): - _toSchema = {'applicationname': 'ApplicationName'} - _toPy = {'ApplicationName': 'applicationname'} - def __init__(self, applicationname=None): + _toSchema = {'application': 'application'} + _toPy = {'application': 'application'} + def __init__(self, application=None): ''' - applicationname : str + application : str ''' - self.applicationname = applicationname + self.application = application class ApplicationExpose(Type): - _toSchema = {'applicationname': 'ApplicationName'} - _toPy = {'ApplicationName': 'applicationname'} - def __init__(self, applicationname=None): + _toSchema = {'application': 'application'} + _toPy = {'application': 'application'} + def __init__(self, application=None): ''' - applicationname : str + application : str ''' - self.applicationname = applicationname + self.application = application class ApplicationGet(Type): - _toSchema = {'applicationname': 'ApplicationName'} - _toPy = {'ApplicationName': 'applicationname'} - def __init__(self, applicationname=None): + _toSchema = {'application': 'application'} + _toPy = {'application': 'application'} + def __init__(self, application=None): ''' - applicationname : str + application : str ''' - self.applicationname = applicationname + self.application = application class ApplicationGetResults(Type): - _toSchema = {'charm': 'Charm', 'config': 'Config', 'application': 'Application', 'constraints': 'Constraints'} - _toPy = {'Constraints': 'constraints', 'Charm': 'charm', 'Application': 'application', 'Config': 'config'} + _toSchema = {'application': 'application', 'config': 'config', 'constraints': 'constraints', 'charm': 'charm'} + _toPy = {'application': 'application', 'config': 'config', 'constraints': 'constraints', 'charm': 'charm'} def __init__(self, application=None, charm=None, config=None, constraints=None): ''' application : str @@ -651,20 +599,20 @@ class ApplicationGetResults(Type): class ApplicationMetricCredential(Type): - _toSchema = {'metriccredentials': 'MetricCredentials', 'applicationname': 'ApplicationName'} - _toPy = {'MetricCredentials': 'metriccredentials', 'ApplicationName': 'applicationname'} - def __init__(self, applicationname=None, metriccredentials=None): + _toSchema = {'metrics_credentials': 'metrics-credentials', 'application': 'application'} + _toPy = {'application': 'application', 'metrics-credentials': 'metrics_credentials'} + def __init__(self, application=None, metrics_credentials=None): ''' - applicationname : str - metriccredentials : typing.Sequence[int] + application : str + metrics_credentials : typing.Sequence[int] ''' - self.applicationname = applicationname - self.metriccredentials = metriccredentials + self.application = application + self.metrics_credentials = metrics_credentials class ApplicationMetricCredentials(Type): - _toSchema = {'creds': 'Creds'} - _toPy = {'Creds': 'creds'} + _toSchema = {'creds': 'creds'} + _toPy = {'creds': 'creds'} def __init__(self, creds=None): ''' creds : typing.Sequence[~ApplicationMetricCredential] @@ -673,86 +621,86 @@ class ApplicationMetricCredentials(Type): class ApplicationSet(Type): - _toSchema = {'options': 'Options', 'applicationname': 'ApplicationName'} - _toPy = {'Options': 'options', 'ApplicationName': 'applicationname'} - def __init__(self, applicationname=None, options=None): + _toSchema = {'options': 'options', 'application': 'application'} + _toPy = {'options': 'options', 'application': 'application'} + def __init__(self, application=None, options=None): ''' - applicationname : str + application : str options : typing.Mapping[str, str] ''' - self.applicationname = applicationname + self.application = application self.options = options class ApplicationSetCharm(Type): - _toSchema = {'forceseries': 'forceseries', 'charmurl': 'charmurl', 'resourceids': 'resourceids', 'forceunits': 'forceunits', 'cs_channel': 'cs-channel', 'applicationname': 'applicationname'} - _toPy = {'forceseries': 'forceseries', 'charmurl': 'charmurl', 'forceunits': 'forceunits', 'cs-channel': 'cs_channel', 'applicationname': 'applicationname', 'resourceids': 'resourceids'} - def __init__(self, applicationname=None, charmurl=None, cs_channel=None, forceseries=None, forceunits=None, resourceids=None): + _toSchema = {'channel': 'channel', 'force_series': 'force-series', 'application': 'application', 'charm_url': 'charm-url', 'resource_ids': 'resource-ids', 'force_units': 'force-units'} + _toPy = {'channel': 'channel', 'force-units': 'force_units', 'application': 'application', 'charm-url': 'charm_url', 'resource-ids': 'resource_ids', 'force-series': 'force_series'} + def __init__(self, application=None, channel=None, charm_url=None, force_series=None, force_units=None, resource_ids=None): ''' - applicationname : str - charmurl : str - cs_channel : str - forceseries : bool - forceunits : bool - resourceids : typing.Mapping[str, str] + application : str + channel : str + charm_url : str + force_series : bool + force_units : bool + resource_ids : typing.Mapping[str, str] ''' - self.applicationname = applicationname - self.charmurl = charmurl - self.cs_channel = cs_channel - self.forceseries = forceseries - self.forceunits = forceunits - self.resourceids = resourceids + self.application = application + self.channel = channel + self.charm_url = charm_url + self.force_series = force_series + self.force_units = force_units + self.resource_ids = resource_ids class ApplicationUnexpose(Type): - _toSchema = {'applicationname': 'ApplicationName'} - _toPy = {'ApplicationName': 'applicationname'} - def __init__(self, applicationname=None): + _toSchema = {'application': 'application'} + _toPy = {'application': 'application'} + def __init__(self, application=None): ''' - applicationname : str + application : str ''' - self.applicationname = applicationname + self.application = application class ApplicationUnset(Type): - _toSchema = {'options': 'Options', 'applicationname': 'ApplicationName'} - _toPy = {'Options': 'options', 'ApplicationName': 'applicationname'} - def __init__(self, applicationname=None, options=None): + _toSchema = {'options': 'options', 'application': 'application'} + _toPy = {'options': 'options', 'application': 'application'} + def __init__(self, application=None, options=None): ''' - applicationname : str + application : str options : typing.Sequence[str] ''' - self.applicationname = applicationname + self.application = application self.options = options class ApplicationUpdate(Type): - _toSchema = {'forceseries': 'ForceSeries', 'charmurl': 'CharmUrl', 'settingsyaml': 'SettingsYAML', 'constraints': 'Constraints', 'forcecharmurl': 'ForceCharmUrl', 'settingsstrings': 'SettingsStrings', 'applicationname': 'ApplicationName', 'minunits': 'MinUnits'} - _toPy = {'Constraints': 'constraints', 'SettingsYAML': 'settingsyaml', 'SettingsStrings': 'settingsstrings', 'ApplicationName': 'applicationname', 'MinUnits': 'minunits', 'ForceCharmUrl': 'forcecharmurl', 'CharmUrl': 'charmurl', 'ForceSeries': 'forceseries'} - def __init__(self, applicationname=None, charmurl=None, constraints=None, forcecharmurl=None, forceseries=None, minunits=None, settingsstrings=None, settingsyaml=None): + _toSchema = {'force_series': 'force-series', 'application': 'application', 'charm_url': 'charm-url', 'constraints': 'constraints', 'min_units': 'min-units', 'settings': 'settings', 'settings_yaml': 'settings-yaml', 'force_charm_url': 'force-charm-url'} + _toPy = {'min-units': 'min_units', 'force-charm-url': 'force_charm_url', 'charm-url': 'charm_url', 'constraints': 'constraints', 'settings-yaml': 'settings_yaml', 'application': 'application', 'settings': 'settings', 'force-series': 'force_series'} + def __init__(self, application=None, charm_url=None, constraints=None, force_charm_url=None, force_series=None, min_units=None, settings=None, settings_yaml=None): ''' - applicationname : str - charmurl : str + application : str + charm_url : str constraints : Value - forcecharmurl : bool - forceseries : bool - minunits : int - settingsstrings : typing.Mapping[str, str] - settingsyaml : str - ''' - self.applicationname = applicationname - self.charmurl = charmurl + force_charm_url : bool + force_series : bool + min_units : int + settings : typing.Mapping[str, str] + settings_yaml : str + ''' + self.application = application + self.charm_url = charm_url self.constraints = Value.from_json(constraints) if constraints else None - self.forcecharmurl = forcecharmurl - self.forceseries = forceseries - self.minunits = minunits - self.settingsstrings = settingsstrings - self.settingsyaml = settingsyaml + self.force_charm_url = force_charm_url + self.force_series = force_series + self.min_units = min_units + self.settings = settings + self.settings_yaml = settings_yaml class ApplicationsDeploy(Type): - _toSchema = {'applications': 'Applications'} - _toPy = {'Applications': 'applications'} + _toSchema = {'applications': 'applications'} + _toPy = {'applications': 'applications'} def __init__(self, applications=None): ''' applications : typing.Sequence[~ApplicationDeploy] @@ -760,9 +708,29 @@ class ApplicationsDeploy(Type): self.applications = [ApplicationDeploy.from_json(o) for o in applications or []] +class CharmRelation(Type): + _toSchema = {'name': 'name', 'limit': 'limit', 'scope': 'scope', 'interface': 'interface', 'optional': 'optional', 'role': 'role'} + _toPy = {'name': 'name', 'limit': 'limit', 'scope': 'scope', 'interface': 'interface', 'optional': 'optional', 'role': 'role'} + def __init__(self, interface=None, limit=None, name=None, optional=None, role=None, scope=None): + ''' + interface : str + limit : int + name : str + optional : bool + role : str + scope : str + ''' + self.interface = interface + self.limit = limit + self.name = name + self.optional = optional + self.role = role + self.scope = scope + + class Constraints(Type): - _toSchema = {'pool': 'Pool', 'size': 'Size', 'count': 'Count'} - _toPy = {'Count': 'count', 'Pool': 'pool', 'Size': 'size'} + _toSchema = {'size': 'Size', 'count': 'Count', 'pool': 'Pool'} + _toPy = {'Pool': 'pool', 'Size': 'size', 'Count': 'count'} def __init__(self, count=None, pool=None, size=None): ''' count : int @@ -775,18 +743,18 @@ class Constraints(Type): class DestroyApplicationUnits(Type): - _toSchema = {'unitnames': 'UnitNames'} - _toPy = {'UnitNames': 'unitnames'} - def __init__(self, unitnames=None): + _toSchema = {'unit_names': 'unit-names'} + _toPy = {'unit-names': 'unit_names'} + def __init__(self, unit_names=None): ''' - unitnames : typing.Sequence[str] + unit_names : typing.Sequence[str] ''' - self.unitnames = unitnames + self.unit_names = unit_names class DestroyRelation(Type): - _toSchema = {'endpoints': 'Endpoints'} - _toPy = {'Endpoints': 'endpoints'} + _toSchema = {'endpoints': 'endpoints'} + _toPy = {'endpoints': 'endpoints'} def __init__(self, endpoints=None): ''' endpoints : typing.Sequence[str] @@ -795,18 +763,18 @@ class DestroyRelation(Type): class GetApplicationConstraints(Type): - _toSchema = {'applicationname': 'ApplicationName'} - _toPy = {'ApplicationName': 'applicationname'} - def __init__(self, applicationname=None): + _toSchema = {'application': 'application'} + _toPy = {'application': 'application'} + def __init__(self, application=None): ''' - applicationname : str + application : str ''' - self.applicationname = applicationname + self.application = application class GetConstraintsResults(Type): - _toSchema = {'root_disk': 'root-disk', 'mem': 'mem', 'container': 'container', 'virt_type': 'virt-type', 'cpu_power': 'cpu-power', 'cpu_cores': 'cpu-cores', 'tags': 'tags', 'arch': 'arch', 'spaces': 'spaces', 'instance_type': 'instance-type'} - _toPy = {'spaces': 'spaces', 'container': 'container', 'cpu-cores': 'cpu_cores', 'instance-type': 'instance_type', 'mem': 'mem', 'cpu-power': 'cpu_power', 'tags': 'tags', 'arch': 'arch', 'root-disk': 'root_disk', 'virt-type': 'virt_type'} + _toSchema = {'tags': 'tags', 'cpu_cores': 'cpu-cores', 'arch': 'arch', 'container': 'container', 'root_disk': 'root-disk', 'mem': 'mem', 'cpu_power': 'cpu-power', 'instance_type': 'instance-type', 'spaces': 'spaces', 'virt_type': 'virt-type'} + _toPy = {'instance-type': 'instance_type', 'cpu-cores': 'cpu_cores', 'tags': 'tags', 'arch': 'arch', 'container': 'container', 'mem': 'mem', 'root-disk': 'root_disk', 'spaces': 'spaces', 'cpu-power': 'cpu_power', 'virt-type': 'virt_type'} def __init__(self, arch=None, container=None, cpu_cores=None, cpu_power=None, instance_type=None, mem=None, root_disk=None, spaces=None, tags=None, virt_type=None): ''' arch : str @@ -833,8 +801,8 @@ class GetConstraintsResults(Type): class Placement(Type): - _toSchema = {'directive': 'Directive', 'scope': 'Scope'} - _toPy = {'Directive': 'directive', 'Scope': 'scope'} + _toSchema = {'scope': 'scope', 'directive': 'directive'} + _toPy = {'scope': 'scope', 'directive': 'directive'} def __init__(self, directive=None, scope=None): ''' directive : str @@ -844,41 +812,21 @@ class Placement(Type): self.scope = scope -class Relation(Type): - _toSchema = {'role': 'Role', 'limit': 'Limit', 'optional': 'Optional', 'name': 'Name', 'scope': 'Scope', 'interface': 'Interface'} - _toPy = {'Name': 'name', 'Role': 'role', 'Scope': 'scope', 'Limit': 'limit', 'Interface': 'interface', 'Optional': 'optional'} - def __init__(self, interface=None, limit=None, name=None, optional=None, role=None, scope=None): - ''' - interface : str - limit : int - name : str - optional : bool - role : str - scope : str - ''' - self.interface = interface - self.limit = limit - self.name = name - self.optional = optional - self.role = role - self.scope = scope - - class SetConstraints(Type): - _toSchema = {'constraints': 'Constraints', 'applicationname': 'ApplicationName'} - _toPy = {'Constraints': 'constraints', 'ApplicationName': 'applicationname'} - def __init__(self, applicationname=None, constraints=None): + _toSchema = {'application': 'application', 'constraints': 'constraints'} + _toPy = {'application': 'application', 'constraints': 'constraints'} + def __init__(self, application=None, constraints=None): ''' - applicationname : str + application : str constraints : Value ''' - self.applicationname = applicationname + self.application = application self.constraints = Value.from_json(constraints) if constraints else None class StringResult(Type): - _toSchema = {'result': 'Result', 'error': 'Error'} - _toPy = {'Result': 'result', 'Error': 'error'} + _toSchema = {'error': 'error', 'result': 'result'} + _toPy = {'error': 'error', 'result': 'result'} def __init__(self, error=None, result=None): ''' error : Error @@ -889,8 +837,8 @@ class StringResult(Type): class Value(Type): - _toSchema = {'root_disk': 'root-disk', 'mem': 'mem', 'container': 'container', 'virt_type': 'virt-type', 'cpu_power': 'cpu-power', 'cpu_cores': 'cpu-cores', 'tags': 'tags', 'arch': 'arch', 'spaces': 'spaces', 'instance_type': 'instance-type'} - _toPy = {'spaces': 'spaces', 'container': 'container', 'cpu-cores': 'cpu_cores', 'instance-type': 'instance_type', 'mem': 'mem', 'cpu-power': 'cpu_power', 'tags': 'tags', 'arch': 'arch', 'root-disk': 'root_disk', 'virt-type': 'virt_type'} + _toSchema = {'tags': 'tags', 'cpu_cores': 'cpu-cores', 'arch': 'arch', 'container': 'container', 'root_disk': 'root-disk', 'mem': 'mem', 'cpu_power': 'cpu-power', 'instance_type': 'instance-type', 'spaces': 'spaces', 'virt_type': 'virt-type'} + _toPy = {'instance-type': 'instance_type', 'cpu-cores': 'cpu_cores', 'tags': 'tags', 'arch': 'arch', 'container': 'container', 'mem': 'mem', 'root-disk': 'root_disk', 'spaces': 'spaces', 'cpu-power': 'cpu_power', 'virt-type': 'virt_type'} def __init__(self, arch=None, container=None, cpu_cores=None, cpu_power=None, instance_type=None, mem=None, root_disk=None, spaces=None, tags=None, virt_type=None): ''' arch : str @@ -917,22 +865,22 @@ class Value(Type): class StringsWatchResult(Type): - _toSchema = {'changes': 'Changes', 'stringswatcherid': 'StringsWatcherId', 'error': 'Error'} - _toPy = {'Changes': 'changes', 'Error': 'error', 'StringsWatcherId': 'stringswatcherid'} - def __init__(self, changes=None, error=None, stringswatcherid=None): + _toSchema = {'error': 'error', 'changes': 'changes', 'watcher_id': 'watcher-id'} + _toPy = {'error': 'error', 'changes': 'changes', 'watcher-id': 'watcher_id'} + def __init__(self, changes=None, error=None, watcher_id=None): ''' changes : typing.Sequence[str] error : Error - stringswatcherid : str + watcher_id : str ''' self.changes = changes self.error = Error.from_json(error) if error else None - self.stringswatcherid = stringswatcherid + self.watcher_id = watcher_id class BackupsCreateArgs(Type): - _toSchema = {'notes': 'Notes'} - _toPy = {'Notes': 'notes'} + _toSchema = {'notes': 'notes'} + _toPy = {'notes': 'notes'} def __init__(self, notes=None): ''' notes : str @@ -941,8 +889,8 @@ class BackupsCreateArgs(Type): class BackupsInfoArgs(Type): - _toSchema = {'id_': 'ID'} - _toPy = {'ID': 'id_'} + _toSchema = {'id_': 'id'} + _toPy = {'id': 'id_'} def __init__(self, id_=None): ''' id_ : str @@ -961,8 +909,8 @@ class BackupsListArgs(Type): class BackupsListResult(Type): - _toSchema = {'list_': 'List'} - _toPy = {'List': 'list_'} + _toSchema = {'list_': 'list'} + _toPy = {'list': 'list_'} def __init__(self, list_=None): ''' list_ : typing.Sequence[~BackupsMetadataResult] @@ -971,14 +919,14 @@ class BackupsListResult(Type): class BackupsMetadataResult(Type): - _toSchema = {'checksumformat': 'ChecksumFormat', 'started': 'Started', 'stored': 'Stored', 'cacert': 'CACert', 'version': 'Version', 'machine': 'Machine', 'checksum': 'Checksum', 'series': 'Series', 'id_': 'ID', 'hostname': 'Hostname', 'size': 'Size', 'finished': 'Finished', 'caprivatekey': 'CAPrivateKey', 'model': 'Model', 'notes': 'Notes'} - _toPy = {'Finished': 'finished', 'ChecksumFormat': 'checksumformat', 'CAPrivateKey': 'caprivatekey', 'Started': 'started', 'ID': 'id_', 'Notes': 'notes', 'Stored': 'stored', 'Hostname': 'hostname', 'Model': 'model', 'Size': 'size', 'Checksum': 'checksum', 'Machine': 'machine', 'Version': 'version', 'CACert': 'cacert', 'Series': 'series'} - def __init__(self, cacert=None, caprivatekey=None, checksum=None, checksumformat=None, finished=None, hostname=None, id_=None, machine=None, model=None, notes=None, series=None, size=None, started=None, stored=None, version=None): + _toSchema = {'version': 'version', 'id_': 'id', 'checksum': 'checksum', 'checksum_format': 'checksum-format', 'machine': 'machine', 'notes': 'notes', 'series': 'series', 'stored': 'stored', 'finished': 'finished', 'started': 'started', 'model': 'model', 'hostname': 'hostname', 'size': 'size', 'ca_cert': 'ca-cert', 'ca_private_key': 'ca-private-key'} + _toPy = {'ca-private-key': 'ca_private_key', 'checksum': 'checksum', 'machine': 'machine', 'id': 'id_', 'notes': 'notes', 'series': 'series', 'checksum-format': 'checksum_format', 'ca-cert': 'ca_cert', 'finished': 'finished', 'started': 'started', 'stored': 'stored', 'model': 'model', 'hostname': 'hostname', 'size': 'size', 'version': 'version'} + def __init__(self, ca_cert=None, ca_private_key=None, checksum=None, checksum_format=None, finished=None, hostname=None, id_=None, machine=None, model=None, notes=None, series=None, size=None, started=None, stored=None, version=None): ''' - cacert : str - caprivatekey : str + ca_cert : str + ca_private_key : str checksum : str - checksumformat : str + checksum_format : str finished : str hostname : str id_ : str @@ -991,10 +939,10 @@ class BackupsMetadataResult(Type): stored : str version : Number ''' - self.cacert = cacert - self.caprivatekey = caprivatekey + self.ca_cert = ca_cert + self.ca_private_key = ca_private_key self.checksum = checksum - self.checksumformat = checksumformat + self.checksum_format = checksum_format self.finished = finished self.hostname = hostname self.id_ = id_ @@ -1009,8 +957,8 @@ class BackupsMetadataResult(Type): class BackupsRemoveArgs(Type): - _toSchema = {'id_': 'ID'} - _toPy = {'ID': 'id_'} + _toSchema = {'id_': 'id'} + _toPy = {'id': 'id_'} def __init__(self, id_=None): ''' id_ : str @@ -1019,8 +967,8 @@ class BackupsRemoveArgs(Type): class Number(Type): - _toSchema = {'minor': 'Minor', 'major': 'Major', 'patch': 'Patch', 'tag': 'Tag', 'build': 'Build'} - _toPy = {'Patch': 'patch', 'Major': 'major', 'Minor': 'minor', 'Tag': 'tag', 'Build': 'build'} + _toSchema = {'patch': 'Patch', 'tag': 'Tag', 'major': 'Major', 'build': 'Build', 'minor': 'Minor'} + _toPy = {'Patch': 'patch', 'Major': 'major', 'Tag': 'tag', 'Minor': 'minor', 'Build': 'build'} def __init__(self, build=None, major=None, minor=None, patch=None, tag=None): ''' build : int @@ -1037,18 +985,18 @@ class Number(Type): class RestoreArgs(Type): - _toSchema = {'backupid': 'BackupId'} - _toPy = {'BackupId': 'backupid'} - def __init__(self, backupid=None): + _toSchema = {'backup_id': 'backup-id'} + _toPy = {'backup-id': 'backup_id'} + def __init__(self, backup_id=None): ''' - backupid : str + backup_id : str ''' - self.backupid = backupid + self.backup_id = backup_id class Block(Type): - _toSchema = {'type_': 'type', 'id_': 'id', 'message': 'message', 'tag': 'tag'} - _toPy = {'type': 'type_', 'id': 'id_', 'message': 'message', 'tag': 'tag'} + _toSchema = {'id_': 'id', 'tag': 'tag', 'message': 'message', 'type_': 'type'} + _toPy = {'type': 'type_', 'id': 'id_', 'tag': 'tag', 'message': 'message'} def __init__(self, id_=None, message=None, tag=None, type_=None): ''' id_ : str @@ -1063,8 +1011,8 @@ class Block(Type): class BlockResult(Type): - _toSchema = {'result': 'result', 'error': 'error'} - _toPy = {'result': 'result', 'error': 'error'} + _toSchema = {'error': 'error', 'result': 'result'} + _toPy = {'error': 'error', 'result': 'result'} def __init__(self, error=None, result=None): ''' error : Error @@ -1096,19 +1044,193 @@ class BlockSwitchParams(Type): self.type_ = type_ +class CharmActionSpec(Type): + _toSchema = {'params': 'params', 'description': 'description'} + _toPy = {'params': 'params', 'description': 'description'} + def __init__(self, description=None, params=None): + ''' + description : str + params : typing.Mapping[str, typing.Any] + ''' + self.description = description + self.params = params + + +class CharmActions(Type): + _toSchema = {'specs': 'specs'} + _toPy = {'specs': 'specs'} + def __init__(self, specs=None): + ''' + specs : typing.Mapping[str, ~CharmActionSpec] + ''' + self.specs = {k: CharmActionSpec.from_json(v) for k, v in (specs or dict()).items()} + + class CharmInfo(Type): - _toSchema = {'charmurl': 'CharmURL'} - _toPy = {'CharmURL': 'charmurl'} - def __init__(self, charmurl=None): + _toSchema = {'metrics': 'metrics', 'actions': 'actions', 'config': 'config', 'url': 'url', 'revision': 'revision', 'meta': 'meta'} + _toPy = {'metrics': 'metrics', 'actions': 'actions', 'config': 'config', 'url': 'url', 'revision': 'revision', 'meta': 'meta'} + def __init__(self, actions=None, config=None, meta=None, metrics=None, revision=None, url=None): + ''' + actions : CharmActions + config : typing.Mapping[str, ~CharmOption] + meta : CharmMeta + metrics : CharmMetrics + revision : int + url : str + ''' + self.actions = CharmActions.from_json(actions) if actions else None + self.config = {k: CharmOption.from_json(v) for k, v in (config or dict()).items()} + self.meta = CharmMeta.from_json(meta) if meta else None + self.metrics = CharmMetrics.from_json(metrics) if metrics else None + self.revision = revision + self.url = url + + +class CharmMeta(Type): + _toSchema = {'name': 'name', 'tags': 'tags', 'subordinate': 'subordinate', 'series': 'series', 'provides': 'provides', 'peers': 'peers', 'storage': 'storage', 'terms': 'terms', 'categories': 'categories', 'description': 'description', 'min_juju_version': 'min-juju-version', 'summary': 'summary', 'resources': 'resources', 'extra_bindings': 'extra-bindings', 'requires': 'requires', 'payload_classes': 'payload-classes'} + _toPy = {'name': 'name', 'payload-classes': 'payload_classes', 'tags': 'tags', 'min-juju-version': 'min_juju_version', 'subordinate': 'subordinate', 'series': 'series', 'provides': 'provides', 'peers': 'peers', 'storage': 'storage', 'terms': 'terms', 'extra-bindings': 'extra_bindings', 'categories': 'categories', 'description': 'description', 'summary': 'summary', 'resources': 'resources', 'requires': 'requires'} + def __init__(self, categories=None, description=None, extra_bindings=None, min_juju_version=None, name=None, payload_classes=None, peers=None, provides=None, requires=None, resources=None, series=None, storage=None, subordinate=None, summary=None, tags=None, terms=None): + ''' + categories : typing.Sequence[str] + description : str + extra_bindings : typing.Mapping[str, str] + min_juju_version : str + name : str + payload_classes : typing.Mapping[str, ~CharmPayloadClass] + peers : typing.Mapping[str, ~CharmRelation] + provides : typing.Mapping[str, ~CharmRelation] + requires : typing.Mapping[str, ~CharmRelation] + resources : typing.Mapping[str, ~CharmResourceMeta] + series : typing.Sequence[str] + storage : typing.Mapping[str, ~CharmStorage] + subordinate : bool + summary : str + tags : typing.Sequence[str] + terms : typing.Sequence[str] + ''' + self.categories = categories + self.description = description + self.extra_bindings = extra_bindings + self.min_juju_version = min_juju_version + self.name = name + self.payload_classes = {k: CharmPayloadClass.from_json(v) for k, v in (payload_classes or dict()).items()} + self.peers = {k: CharmRelation.from_json(v) for k, v in (peers or dict()).items()} + self.provides = {k: CharmRelation.from_json(v) for k, v in (provides or dict()).items()} + self.requires = {k: CharmRelation.from_json(v) for k, v in (requires or dict()).items()} + self.resources = {k: CharmResourceMeta.from_json(v) for k, v in (resources or dict()).items()} + self.series = series + self.storage = {k: CharmStorage.from_json(v) for k, v in (storage or dict()).items()} + self.subordinate = subordinate + self.summary = summary + self.tags = tags + self.terms = terms + + +class CharmMetric(Type): + _toSchema = {'description': 'description', 'type_': 'type'} + _toPy = {'type': 'type_', 'description': 'description'} + def __init__(self, description=None, type_=None): + ''' + description : str + type_ : str + ''' + self.description = description + self.type_ = type_ + + +class CharmMetrics(Type): + _toSchema = {'metrics': 'metrics'} + _toPy = {'metrics': 'metrics'} + def __init__(self, metrics=None): + ''' + metrics : typing.Mapping[str, ~CharmMetric] + ''' + self.metrics = {k: CharmMetric.from_json(v) for k, v in (metrics or dict()).items()} + + +class CharmOption(Type): + _toSchema = {'default': 'default', 'description': 'description', 'type_': 'type'} + _toPy = {'type': 'type_', 'default': 'default', 'description': 'description'} + def __init__(self, default=None, description=None, type_=None): + ''' + default : typing.Mapping[str, typing.Any] + description : str + type_ : str ''' - charmurl : str + self.default = default + self.description = description + self.type_ = type_ + + +class CharmPayloadClass(Type): + _toSchema = {'name': 'name', 'type_': 'type'} + _toPy = {'name': 'name', 'type': 'type_'} + def __init__(self, name=None, type_=None): + ''' + name : str + type_ : str + ''' + self.name = name + self.type_ = type_ + + +class CharmResourceMeta(Type): + _toSchema = {'name': 'name', 'path': 'path', 'description': 'description', 'type_': 'type'} + _toPy = {'name': 'name', 'type': 'type_', 'path': 'path', 'description': 'description'} + def __init__(self, description=None, name=None, path=None, type_=None): + ''' + description : str + name : str + path : str + type_ : str + ''' + self.description = description + self.name = name + self.path = path + self.type_ = type_ + + +class CharmStorage(Type): + _toSchema = {'name': 'name', 'location': 'location', 'count_max': 'count-max', 'description': 'description', 'read_only': 'read-only', 'properties': 'properties', 'shared': 'shared', 'count_min': 'count-min', 'minimum_size': 'minimum-size', 'type_': 'type'} + _toPy = {'name': 'name', 'location': 'location', 'count-min': 'count_min', 'description': 'description', 'properties': 'properties', 'type': 'type_', 'read-only': 'read_only', 'count-max': 'count_max', 'shared': 'shared', 'minimum-size': 'minimum_size'} + def __init__(self, count_max=None, count_min=None, description=None, location=None, minimum_size=None, name=None, properties=None, read_only=None, shared=None, type_=None): + ''' + count_max : int + count_min : int + description : str + location : str + minimum_size : int + name : str + properties : typing.Sequence[str] + read_only : bool + shared : bool + type_ : str ''' - self.charmurl = charmurl + self.count_max = count_max + self.count_min = count_min + self.description = description + self.location = location + self.minimum_size = minimum_size + self.name = name + self.properties = properties + self.read_only = read_only + self.shared = shared + self.type_ = type_ + + +class CharmURL(Type): + _toSchema = {'url': 'url'} + _toPy = {'url': 'url'} + def __init__(self, url=None): + ''' + url : str + ''' + self.url = url class CharmsList(Type): - _toSchema = {'names': 'Names'} - _toPy = {'Names': 'names'} + _toSchema = {'names': 'names'} + _toPy = {'names': 'names'} def __init__(self, names=None): ''' names : typing.Sequence[str] @@ -1117,18 +1239,18 @@ class CharmsList(Type): class CharmsListResult(Type): - _toSchema = {'charmurls': 'CharmURLs'} - _toPy = {'CharmURLs': 'charmurls'} - def __init__(self, charmurls=None): + _toSchema = {'charm_urls': 'charm-urls'} + _toPy = {'charm-urls': 'charm_urls'} + def __init__(self, charm_urls=None): ''' - charmurls : typing.Sequence[str] + charm_urls : typing.Sequence[str] ''' - self.charmurls = charmurls + self.charm_urls = charm_urls class IsMeteredResult(Type): - _toSchema = {'metered': 'Metered'} - _toPy = {'Metered': 'metered'} + _toSchema = {'metered': 'metered'} + _toPy = {'metered': 'metered'} def __init__(self, metered=None): ''' metered : bool @@ -1137,8 +1259,8 @@ class IsMeteredResult(Type): class APIHostPortsResult(Type): - _toSchema = {'servers': 'Servers'} - _toPy = {'Servers': 'servers'} + _toSchema = {'servers': 'servers'} + _toPy = {'servers': 'servers'} def __init__(self, servers=None): ''' servers : typing.Sequence[~HostPort] @@ -1147,8 +1269,8 @@ class APIHostPortsResult(Type): class AddCharm(Type): - _toSchema = {'url': 'URL', 'channel': 'Channel'} - _toPy = {'URL': 'url', 'Channel': 'channel'} + _toSchema = {'channel': 'channel', 'url': 'url'} + _toPy = {'channel': 'channel', 'url': 'url'} def __init__(self, channel=None, url=None): ''' channel : str @@ -1159,62 +1281,62 @@ class AddCharm(Type): class AddCharmWithAuthorization(Type): - _toSchema = {'url': 'URL', 'channel': 'Channel', 'charmstoremacaroon': 'CharmStoreMacaroon'} - _toPy = {'URL': 'url', 'CharmStoreMacaroon': 'charmstoremacaroon', 'Channel': 'channel'} - def __init__(self, channel=None, charmstoremacaroon=None, url=None): + _toSchema = {'channel': 'channel', 'url': 'url', 'macaroon': 'macaroon'} + _toPy = {'channel': 'channel', 'url': 'url', 'macaroon': 'macaroon'} + def __init__(self, channel=None, macaroon=None, url=None): ''' channel : str - charmstoremacaroon : Macaroon + macaroon : Macaroon url : str ''' self.channel = channel - self.charmstoremacaroon = Macaroon.from_json(charmstoremacaroon) if charmstoremacaroon else None + self.macaroon = Macaroon.from_json(macaroon) if macaroon else None self.url = url class AddMachineParams(Type): - _toSchema = {'jobs': 'Jobs', 'series': 'Series', 'hardwarecharacteristics': 'HardwareCharacteristics', 'nonce': 'Nonce', 'containertype': 'ContainerType', 'constraints': 'Constraints', 'disks': 'Disks', 'placement': 'Placement', 'instanceid': 'InstanceId', 'parentid': 'ParentId', 'addrs': 'Addrs'} - _toPy = {'Constraints': 'constraints', 'InstanceId': 'instanceid', 'ContainerType': 'containertype', 'Nonce': 'nonce', 'Disks': 'disks', 'Addrs': 'addrs', 'HardwareCharacteristics': 'hardwarecharacteristics', 'Series': 'series', 'ParentId': 'parentid', 'Placement': 'placement', 'Jobs': 'jobs'} - def __init__(self, addrs=None, constraints=None, containertype=None, disks=None, hardwarecharacteristics=None, instanceid=None, jobs=None, nonce=None, parentid=None, placement=None, series=None): + _toSchema = {'jobs': 'jobs', 'placement': 'placement', 'disks': 'disks', 'instance_id': 'instance-id', 'constraints': 'constraints', 'hardware_characteristics': 'hardware-characteristics', 'parent_id': 'parent-id', 'nonce': 'nonce', 'container_type': 'container-type', 'addresses': 'addresses', 'series': 'series'} + _toPy = {'jobs': 'jobs', 'constraints': 'constraints', 'disks': 'disks', 'hardware-characteristics': 'hardware_characteristics', 'container-type': 'container_type', 'placement': 'placement', 'parent-id': 'parent_id', 'instance-id': 'instance_id', 'nonce': 'nonce', 'addresses': 'addresses', 'series': 'series'} + def __init__(self, addresses=None, constraints=None, container_type=None, disks=None, hardware_characteristics=None, instance_id=None, jobs=None, nonce=None, parent_id=None, placement=None, series=None): ''' - addrs : typing.Sequence[~Address] + addresses : typing.Sequence[~Address] constraints : Value - containertype : str + container_type : str disks : typing.Sequence[~Constraints] - hardwarecharacteristics : HardwareCharacteristics - instanceid : str + hardware_characteristics : HardwareCharacteristics + instance_id : str jobs : typing.Sequence[str] nonce : str - parentid : str + parent_id : str placement : Placement series : str ''' - self.addrs = [Address.from_json(o) for o in addrs or []] + self.addresses = [Address.from_json(o) for o in addresses or []] self.constraints = Value.from_json(constraints) if constraints else None - self.containertype = containertype + self.container_type = container_type self.disks = [Constraints.from_json(o) for o in disks or []] - self.hardwarecharacteristics = HardwareCharacteristics.from_json(hardwarecharacteristics) if hardwarecharacteristics else None - self.instanceid = instanceid + self.hardware_characteristics = HardwareCharacteristics.from_json(hardware_characteristics) if hardware_characteristics else None + self.instance_id = instance_id self.jobs = jobs self.nonce = nonce - self.parentid = parentid + self.parent_id = parent_id self.placement = Placement.from_json(placement) if placement else None self.series = series class AddMachines(Type): - _toSchema = {'machineparams': 'MachineParams'} - _toPy = {'MachineParams': 'machineparams'} - def __init__(self, machineparams=None): + _toSchema = {'params': 'params'} + _toPy = {'params': 'params'} + def __init__(self, params=None): ''' - machineparams : typing.Sequence[~AddMachineParams] + params : typing.Sequence[~AddMachineParams] ''' - self.machineparams = [AddMachineParams.from_json(o) for o in machineparams or []] + self.params = [AddMachineParams.from_json(o) for o in params or []] class AddMachinesResult(Type): - _toSchema = {'error': 'Error', 'machine': 'Machine'} - _toPy = {'Error': 'error', 'Machine': 'machine'} + _toSchema = {'error': 'error', 'machine': 'machine'} + _toPy = {'error': 'error', 'machine': 'machine'} def __init__(self, error=None, machine=None): ''' error : Error @@ -1225,8 +1347,8 @@ class AddMachinesResult(Type): class AddMachinesResults(Type): - _toSchema = {'machines': 'Machines'} - _toPy = {'Machines': 'machines'} + _toSchema = {'machines': 'machines'} + _toPy = {'machines': 'machines'} def __init__(self, machines=None): ''' machines : typing.Sequence[~AddMachinesResult] @@ -1235,24 +1357,24 @@ class AddMachinesResults(Type): class Address(Type): - _toSchema = {'value': 'Value', 'type_': 'Type', 'spacename': 'SpaceName', 'scope': 'Scope'} - _toPy = {'Value': 'value', 'Type': 'type_', 'SpaceName': 'spacename', 'Scope': 'scope'} - def __init__(self, scope=None, spacename=None, type_=None, value=None): + _toSchema = {'scope': 'scope', 'type_': 'type', 'value': 'value', 'space_name': 'space-name'} + _toPy = {'type': 'type_', 'scope': 'scope', 'value': 'value', 'space-name': 'space_name'} + def __init__(self, scope=None, space_name=None, type_=None, value=None): ''' scope : str - spacename : str + space_name : str type_ : str value : str ''' self.scope = scope - self.spacename = spacename + self.space_name = space_name self.type_ = type_ self.value = value class AgentVersionResult(Type): - _toSchema = {'minor': 'Minor', 'major': 'Major', 'patch': 'Patch', 'tag': 'Tag', 'build': 'Build'} - _toPy = {'Patch': 'patch', 'Major': 'major', 'Minor': 'minor', 'Tag': 'tag', 'Build': 'build'} + _toSchema = {'patch': 'Patch', 'tag': 'Tag', 'major': 'Major', 'build': 'Build', 'minor': 'Minor'} + _toPy = {'Patch': 'patch', 'Major': 'major', 'Tag': 'tag', 'Minor': 'minor', 'Build': 'build'} def __init__(self, build=None, major=None, minor=None, patch=None, tag=None): ''' build : int @@ -1269,45 +1391,49 @@ class AgentVersionResult(Type): class AllWatcherId(Type): - _toSchema = {'allwatcherid': 'AllWatcherId'} - _toPy = {'AllWatcherId': 'allwatcherid'} - def __init__(self, allwatcherid=None): + _toSchema = {'watcher_id': 'watcher-id'} + _toPy = {'watcher-id': 'watcher_id'} + def __init__(self, watcher_id=None): ''' - allwatcherid : str + watcher_id : str ''' - self.allwatcherid = allwatcherid + self.watcher_id = watcher_id class ApplicationStatus(Type): - _toSchema = {'charm': 'Charm', 'exposed': 'Exposed', 'err': 'Err', 'meterstatuses': 'MeterStatuses', 'relations': 'Relations', 'units': 'Units', 'life': 'Life', 'canupgradeto': 'CanUpgradeTo', 'subordinateto': 'SubordinateTo', 'status': 'Status'} - _toPy = {'Charm': 'charm', 'Err': 'err', 'Units': 'units', 'MeterStatuses': 'meterstatuses', 'CanUpgradeTo': 'canupgradeto', 'Status': 'status', 'SubordinateTo': 'subordinateto', 'Life': 'life', 'Relations': 'relations', 'Exposed': 'exposed'} - def __init__(self, canupgradeto=None, charm=None, err=None, exposed=None, life=None, meterstatuses=None, relations=None, status=None, subordinateto=None, units=None): + _toSchema = {'status': 'status', 'subordinate_to': 'subordinate-to', 'err': 'err', 'series': 'series', 'life': 'life', 'can_upgrade_to': 'can-upgrade-to', 'meter_statuses': 'meter-statuses', 'units': 'units', 'workload_version': 'workload-version', 'exposed': 'exposed', 'relations': 'relations', 'charm': 'charm'} + _toPy = {'status': 'status', 'can-upgrade-to': 'can_upgrade_to', 'err': 'err', 'series': 'series', 'life': 'life', 'exposed': 'exposed', 'subordinate-to': 'subordinate_to', 'units': 'units', 'workload-version': 'workload_version', 'meter-statuses': 'meter_statuses', 'relations': 'relations', 'charm': 'charm'} + def __init__(self, can_upgrade_to=None, charm=None, err=None, exposed=None, life=None, meter_statuses=None, relations=None, series=None, status=None, subordinate_to=None, units=None, workload_version=None): ''' - canupgradeto : str + can_upgrade_to : str charm : str err : typing.Mapping[str, typing.Any] exposed : bool life : str - meterstatuses : typing.Mapping[str, ~MeterStatus] + meter_statuses : typing.Mapping[str, ~MeterStatus] relations : typing.Sequence[str] + series : str status : DetailedStatus - subordinateto : typing.Sequence[str] + subordinate_to : typing.Sequence[str] units : typing.Mapping[str, ~UnitStatus] + workload_version : str ''' - self.canupgradeto = canupgradeto + self.can_upgrade_to = can_upgrade_to self.charm = charm self.err = err self.exposed = exposed self.life = life - self.meterstatuses = {k: MeterStatus.from_json(v) for k, v in (meterstatuses or dict()).items()} + self.meter_statuses = {k: MeterStatus.from_json(v) for k, v in (meter_statuses or dict()).items()} self.relations = relations + self.series = series self.status = DetailedStatus.from_json(status) if status else None - self.subordinateto = subordinateto + self.subordinate_to = subordinate_to self.units = {k: UnitStatus.from_json(v) for k, v in (units or dict()).items()} + self.workload_version = workload_version class Binary(Type): - _toSchema = {'number': 'Number', 'series': 'Series', 'arch': 'Arch'} + _toSchema = {'series': 'Series', 'arch': 'Arch', 'number': 'Number'} _toPy = {'Number': 'number', 'Arch': 'arch', 'Series': 'series'} def __init__(self, arch=None, number=None, series=None): ''' @@ -1321,8 +1447,8 @@ class Binary(Type): class BundleChangesChange(Type): - _toSchema = {'method': 'method', 'args': 'args', 'requires': 'requires', 'id_': 'id'} - _toPy = {'method': 'method', 'id': 'id_', 'args': 'args', 'requires': 'requires'} + _toSchema = {'args': 'args', 'id_': 'id', 'requires': 'requires', 'method': 'method'} + _toPy = {'args': 'args', 'requires': 'requires', 'id': 'id_', 'method': 'method'} def __init__(self, args=None, id_=None, method=None, requires=None): ''' args : typing.Sequence[typing.Any] @@ -1336,21 +1462,33 @@ class BundleChangesChange(Type): self.requires = requires +class ConfigValue(Type): + _toSchema = {'source': 'source', 'value': 'value'} + _toPy = {'source': 'source', 'value': 'value'} + def __init__(self, source=None, value=None): + ''' + source : str + value : typing.Mapping[str, typing.Any] + ''' + self.source = source + self.value = value + + class DestroyMachines(Type): - _toSchema = {'force': 'Force', 'machinenames': 'MachineNames'} - _toPy = {'Force': 'force', 'MachineNames': 'machinenames'} - def __init__(self, force=None, machinenames=None): + _toSchema = {'force': 'force', 'machine_names': 'machine-names'} + _toPy = {'force': 'force', 'machine-names': 'machine_names'} + def __init__(self, force=None, machine_names=None): ''' force : bool - machinenames : typing.Sequence[str] + machine_names : typing.Sequence[str] ''' self.force = force - self.machinenames = machinenames + self.machine_names = machine_names class DetailedStatus(Type): - _toSchema = {'since': 'Since', 'data': 'Data', 'life': 'Life', 'version': 'Version', 'err': 'Err', 'kind': 'Kind', 'info': 'Info', 'status': 'Status'} - _toPy = {'Err': 'err', 'Data': 'data', 'Since': 'since', 'Status': 'status', 'Info': 'info', 'Life': 'life', 'Version': 'version', 'Kind': 'kind'} + _toSchema = {'status': 'status', 'info': 'info', 'err': 'err', 'kind': 'kind', 'since': 'since', 'life': 'life', 'data': 'data', 'version': 'version'} + _toPy = {'status': 'status', 'info': 'info', 'err': 'err', 'kind': 'kind', 'since': 'since', 'life': 'life', 'data': 'data', 'version': 'version'} def __init__(self, data=None, err=None, info=None, kind=None, life=None, since=None, status=None, version=None): ''' data : typing.Mapping[str, typing.Any] @@ -1373,24 +1511,24 @@ class DetailedStatus(Type): class EndpointStatus(Type): - _toSchema = {'role': 'Role', 'subordinate': 'Subordinate', 'applicationname': 'ApplicationName', 'name': 'Name'} - _toPy = {'Subordinate': 'subordinate', 'Name': 'name', 'Role': 'role', 'ApplicationName': 'applicationname'} - def __init__(self, applicationname=None, name=None, role=None, subordinate=None): + _toSchema = {'name': 'name', 'role': 'role', 'subordinate': 'subordinate', 'application': 'application'} + _toPy = {'name': 'name', 'role': 'role', 'subordinate': 'subordinate', 'application': 'application'} + def __init__(self, application=None, name=None, role=None, subordinate=None): ''' - applicationname : str + application : str name : str role : str subordinate : bool ''' - self.applicationname = applicationname + self.application = application self.name = name self.role = role self.subordinate = subordinate class EntityStatus(Type): - _toSchema = {'since': 'Since', 'data': 'Data', 'info': 'Info', 'status': 'Status'} - _toPy = {'Since': 'since', 'Status': 'status', 'Data': 'data', 'Info': 'info'} + _toSchema = {'status': 'status', 'info': 'info', 'data': 'data', 'since': 'since'} + _toPy = {'status': 'status', 'info': 'info', 'data': 'data', 'since': 'since'} def __init__(self, data=None, info=None, since=None, status=None): ''' data : typing.Mapping[str, typing.Any] @@ -1405,26 +1543,26 @@ class EntityStatus(Type): class FindToolsParams(Type): - _toSchema = {'minorversion': 'MinorVersion', 'number': 'Number', 'series': 'Series', 'arch': 'Arch', 'majorversion': 'MajorVersion'} - _toPy = {'Number': 'number', 'Series': 'series', 'Arch': 'arch', 'MinorVersion': 'minorversion', 'MajorVersion': 'majorversion'} - def __init__(self, arch=None, majorversion=None, minorversion=None, number=None, series=None): + _toSchema = {'number': 'number', 'arch': 'arch', 'major': 'major', 'series': 'series', 'minor': 'minor'} + _toPy = {'number': 'number', 'arch': 'arch', 'major': 'major', 'series': 'series', 'minor': 'minor'} + def __init__(self, arch=None, major=None, minor=None, number=None, series=None): ''' arch : str - majorversion : int - minorversion : int + major : int + minor : int number : Number series : str ''' self.arch = arch - self.majorversion = majorversion - self.minorversion = minorversion + self.major = major + self.minor = minor self.number = Number.from_json(number) if number else None self.series = series class FindToolsResult(Type): - _toSchema = {'error': 'Error', 'list_': 'List'} - _toPy = {'List': 'list_', 'Error': 'error'} + _toSchema = {'error': 'error', 'list_': 'list'} + _toPy = {'error': 'error', 'list': 'list_'} def __init__(self, error=None, list_=None): ''' error : Error @@ -1435,20 +1573,18 @@ class FindToolsResult(Type): class FullStatus(Type): - _toSchema = {'modelname': 'ModelName', 'availableversion': 'AvailableVersion', 'applications': 'Applications', 'relations': 'Relations', 'machines': 'Machines'} - _toPy = {'Applications': 'applications', 'Machines': 'machines', 'AvailableVersion': 'availableversion', 'ModelName': 'modelname', 'Relations': 'relations'} - def __init__(self, applications=None, availableversion=None, machines=None, modelname=None, relations=None): + _toSchema = {'machines': 'machines', 'model': 'model', 'relations': 'relations', 'applications': 'applications'} + _toPy = {'machines': 'machines', 'model': 'model', 'relations': 'relations', 'applications': 'applications'} + def __init__(self, applications=None, machines=None, model=None, relations=None): ''' applications : typing.Mapping[str, ~ApplicationStatus] - availableversion : str machines : typing.Mapping[str, ~MachineStatus] - modelname : str + model : ModelStatusInfo relations : typing.Sequence[~RelationStatus] ''' self.applications = {k: ApplicationStatus.from_json(v) for k, v in (applications or dict()).items()} - self.availableversion = availableversion self.machines = {k: MachineStatus.from_json(v) for k, v in (machines or dict()).items()} - self.modelname = modelname + self.model = ModelStatusInfo.from_json(model) if model else None self.relations = [RelationStatus.from_json(o) for o in relations or []] @@ -1475,30 +1611,30 @@ class GetBundleChangesResults(Type): class HardwareCharacteristics(Type): - _toSchema = {'rootdisk': 'RootDisk', 'cpucores': 'CpuCores', 'mem': 'Mem', 'tags': 'Tags', 'arch': 'Arch', 'availabilityzone': 'AvailabilityZone', 'cpupower': 'CpuPower'} - _toPy = {'CpuPower': 'cpupower', 'RootDisk': 'rootdisk', 'AvailabilityZone': 'availabilityzone', 'Mem': 'mem', 'CpuCores': 'cpucores', 'Tags': 'tags', 'Arch': 'arch'} - def __init__(self, arch=None, availabilityzone=None, cpucores=None, cpupower=None, mem=None, rootdisk=None, tags=None): + _toSchema = {'tags': 'tags', 'cpu_cores': 'cpu-cores', 'arch': 'arch', 'root_disk': 'root-disk', 'mem': 'mem', 'cpu_power': 'cpu-power', 'availability_zone': 'availability-zone'} + _toPy = {'cpu-cores': 'cpu_cores', 'tags': 'tags', 'arch': 'arch', 'mem': 'mem', 'root-disk': 'root_disk', 'availability-zone': 'availability_zone', 'cpu-power': 'cpu_power'} + def __init__(self, arch=None, availability_zone=None, cpu_cores=None, cpu_power=None, mem=None, root_disk=None, tags=None): ''' arch : str - availabilityzone : str - cpucores : int - cpupower : int + availability_zone : str + cpu_cores : int + cpu_power : int mem : int - rootdisk : int + root_disk : int tags : typing.Sequence[str] ''' self.arch = arch - self.availabilityzone = availabilityzone - self.cpucores = cpucores - self.cpupower = cpupower + self.availability_zone = availability_zone + self.cpu_cores = cpu_cores + self.cpu_power = cpu_power self.mem = mem - self.rootdisk = rootdisk + self.root_disk = root_disk self.tags = tags class History(Type): - _toSchema = {'error': 'Error', 'statuses': 'Statuses'} - _toPy = {'Error': 'error', 'Statuses': 'statuses'} + _toSchema = {'error': 'error', 'statuses': 'statuses'} + _toPy = {'error': 'error', 'statuses': 'statuses'} def __init__(self, error=None, statuses=None): ''' error : Error @@ -1509,8 +1645,8 @@ class History(Type): class HostPort(Type): - _toSchema = {'address': 'Address', 'port': 'Port'} - _toPy = {'Port': 'port', 'Address': 'address'} + _toSchema = {'address': 'Address', 'port': 'port'} + _toPy = {'Address': 'address', 'port': 'port'} def __init__(self, address=None, port=None): ''' address : Address @@ -1521,38 +1657,38 @@ class HostPort(Type): class MachineStatus(Type): - _toSchema = {'dnsname': 'DNSName', 'hardware': 'Hardware', 'series': 'Series', 'id_': 'Id', 'hasvote': 'HasVote', 'jobs': 'Jobs', 'containers': 'Containers', 'agentstatus': 'AgentStatus', 'instanceid': 'InstanceId', 'wantsvote': 'WantsVote', 'instancestatus': 'InstanceStatus'} - _toPy = {'AgentStatus': 'agentstatus', 'InstanceId': 'instanceid', 'Hardware': 'hardware', 'HasVote': 'hasvote', 'Containers': 'containers', 'Id': 'id_', 'WantsVote': 'wantsvote', 'Series': 'series', 'DNSName': 'dnsname', 'InstanceStatus': 'instancestatus', 'Jobs': 'jobs'} - def __init__(self, agentstatus=None, containers=None, dnsname=None, hardware=None, hasvote=None, id_=None, instanceid=None, instancestatus=None, jobs=None, series=None, wantsvote=None): + _toSchema = {'jobs': 'jobs', 'id_': 'id', 'instance_status': 'instance-status', 'instance_id': 'instance-id', 'series': 'series', 'has_vote': 'has-vote', 'hardware': 'hardware', 'agent_status': 'agent-status', 'dns_name': 'dns-name', 'containers': 'containers', 'wants_vote': 'wants-vote'} + _toPy = {'has-vote': 'has_vote', 'jobs': 'jobs', 'wants-vote': 'wants_vote', 'instance-status': 'instance_status', 'id': 'id_', 'hardware': 'hardware', 'agent-status': 'agent_status', 'instance-id': 'instance_id', 'dns-name': 'dns_name', 'containers': 'containers', 'series': 'series'} + def __init__(self, agent_status=None, containers=None, dns_name=None, hardware=None, has_vote=None, id_=None, instance_id=None, instance_status=None, jobs=None, series=None, wants_vote=None): ''' - agentstatus : DetailedStatus + agent_status : DetailedStatus containers : typing.Mapping[str, ~MachineStatus] - dnsname : str + dns_name : str hardware : str - hasvote : bool + has_vote : bool id_ : str - instanceid : str - instancestatus : DetailedStatus + instance_id : str + instance_status : DetailedStatus jobs : typing.Sequence[str] series : str - wantsvote : bool + wants_vote : bool ''' - self.agentstatus = DetailedStatus.from_json(agentstatus) if agentstatus else None + self.agent_status = DetailedStatus.from_json(agent_status) if agent_status else None self.containers = {k: MachineStatus.from_json(v) for k, v in (containers or dict()).items()} - self.dnsname = dnsname + self.dns_name = dns_name self.hardware = hardware - self.hasvote = hasvote + self.has_vote = has_vote self.id_ = id_ - self.instanceid = instanceid - self.instancestatus = DetailedStatus.from_json(instancestatus) if instancestatus else None + self.instance_id = instance_id + self.instance_status = DetailedStatus.from_json(instance_status) if instance_status else None self.jobs = jobs self.series = series - self.wantsvote = wantsvote + self.wants_vote = wants_vote class MeterStatus(Type): - _toSchema = {'color': 'Color', 'message': 'Message'} - _toPy = {'Message': 'message', 'Color': 'color'} + _toSchema = {'message': 'message', 'color': 'color'} + _toPy = {'message': 'message', 'color': 'color'} def __init__(self, color=None, message=None): ''' color : str @@ -1563,46 +1699,50 @@ class MeterStatus(Type): class ModelConfigResults(Type): - _toSchema = {'config': 'Config'} - _toPy = {'Config': 'config'} + _toSchema = {'config': 'config'} + _toPy = {'config': 'config'} def __init__(self, config=None): ''' - config : typing.Mapping[str, typing.Any] + config : typing.Mapping[str, ~ConfigValue] ''' - self.config = config + self.config = {k: ConfigValue.from_json(v) for k, v in (config or dict()).items()} class ModelInfo(Type): - _toSchema = {'uuid': 'UUID', 'cloud': 'Cloud', 'life': 'Life', 'users': 'Users', 'name': 'Name', 'serveruuid': 'ServerUUID', 'defaultseries': 'DefaultSeries', 'ownertag': 'OwnerTag', 'providertype': 'ProviderType', 'status': 'Status'} - _toPy = {'OwnerTag': 'ownertag', 'Cloud': 'cloud', 'DefaultSeries': 'defaultseries', 'Name': 'name', 'UUID': 'uuid', 'Status': 'status', 'ServerUUID': 'serveruuid', 'Users': 'users', 'Life': 'life', 'ProviderType': 'providertype'} - def __init__(self, cloud=None, defaultseries=None, life=None, name=None, ownertag=None, providertype=None, serveruuid=None, status=None, uuid=None, users=None): + _toSchema = {'name': 'name', 'status': 'status', 'provider_type': 'provider-type', 'uuid': 'uuid', 'cloud': 'cloud', 'controller_uuid': 'controller-uuid', 'life': 'life', 'cloud_region': 'cloud-region', 'users': 'users', 'cloud_credential': 'cloud-credential', 'owner_tag': 'owner-tag', 'default_series': 'default-series'} + _toPy = {'name': 'name', 'status': 'status', 'users': 'users', 'cloud': 'cloud', 'provider-type': 'provider_type', 'uuid': 'uuid', 'controller-uuid': 'controller_uuid', 'owner-tag': 'owner_tag', 'cloud-credential': 'cloud_credential', 'default-series': 'default_series', 'life': 'life', 'cloud-region': 'cloud_region'} + def __init__(self, cloud=None, cloud_credential=None, cloud_region=None, controller_uuid=None, default_series=None, life=None, name=None, owner_tag=None, provider_type=None, status=None, users=None, uuid=None): ''' cloud : str - defaultseries : str + cloud_credential : str + cloud_region : str + controller_uuid : str + default_series : str life : str name : str - ownertag : str - providertype : str - serveruuid : str + owner_tag : str + provider_type : str status : EntityStatus - uuid : str users : typing.Sequence[~ModelUserInfo] + uuid : str ''' self.cloud = cloud - self.defaultseries = defaultseries + self.cloud_credential = cloud_credential + self.cloud_region = cloud_region + self.controller_uuid = controller_uuid + self.default_series = default_series self.life = life self.name = name - self.ownertag = ownertag - self.providertype = providertype - self.serveruuid = serveruuid + self.owner_tag = owner_tag + self.provider_type = provider_type self.status = EntityStatus.from_json(status) if status else None - self.uuid = uuid self.users = [ModelUserInfo.from_json(o) for o in users or []] + self.uuid = uuid class ModelSet(Type): - _toSchema = {'config': 'Config'} - _toPy = {'Config': 'config'} + _toSchema = {'config': 'config'} + _toPy = {'config': 'config'} def __init__(self, config=None): ''' config : typing.Mapping[str, typing.Any] @@ -1610,9 +1750,27 @@ class ModelSet(Type): self.config = config +class ModelStatusInfo(Type): + _toSchema = {'name': 'name', 'version': 'version', 'region': 'region', 'cloud': 'cloud', 'available_version': 'available-version'} + _toPy = {'name': 'name', 'available-version': 'available_version', 'region': 'region', 'cloud': 'cloud', 'version': 'version'} + def __init__(self, available_version=None, cloud=None, name=None, region=None, version=None): + ''' + available_version : str + cloud : str + name : str + region : str + version : str + ''' + self.available_version = available_version + self.cloud = cloud + self.name = name + self.region = region + self.version = version + + class ModelUnset(Type): - _toSchema = {'keys': 'Keys'} - _toPy = {'Keys': 'keys'} + _toSchema = {'keys': 'keys'} + _toPy = {'keys': 'keys'} def __init__(self, keys=None): ''' keys : typing.Sequence[str] @@ -1621,24 +1779,24 @@ class ModelUnset(Type): class ModelUserInfo(Type): - _toSchema = {'displayname': 'displayname', 'user': 'user', 'lastconnection': 'lastconnection', 'access': 'access'} - _toPy = {'displayname': 'displayname', 'user': 'user', 'lastconnection': 'lastconnection', 'access': 'access'} - def __init__(self, access=None, displayname=None, lastconnection=None, user=None): + _toSchema = {'access': 'access', 'display_name': 'display-name', 'last_connection': 'last-connection', 'user': 'user'} + _toPy = {'access': 'access', 'user': 'user', 'display-name': 'display_name', 'last-connection': 'last_connection'} + def __init__(self, access=None, display_name=None, last_connection=None, user=None): ''' access : str - displayname : str - lastconnection : str + display_name : str + last_connection : str user : str ''' self.access = access - self.displayname = displayname - self.lastconnection = lastconnection + self.display_name = display_name + self.last_connection = last_connection self.user = user class ModelUserInfoResult(Type): - _toSchema = {'result': 'result', 'error': 'error'} - _toPy = {'result': 'result', 'error': 'error'} + _toSchema = {'error': 'error', 'result': 'result'} + _toPy = {'error': 'error', 'result': 'result'} def __init__(self, error=None, result=None): ''' error : Error @@ -1659,8 +1817,8 @@ class ModelUserInfoResults(Type): class PrivateAddress(Type): - _toSchema = {'target': 'Target'} - _toPy = {'Target': 'target'} + _toSchema = {'target': 'target'} + _toPy = {'target': 'target'} def __init__(self, target=None): ''' target : str @@ -1669,34 +1827,34 @@ class PrivateAddress(Type): class PrivateAddressResults(Type): - _toSchema = {'privateaddress': 'PrivateAddress'} - _toPy = {'PrivateAddress': 'privateaddress'} - def __init__(self, privateaddress=None): + _toSchema = {'private_address': 'private-address'} + _toPy = {'private-address': 'private_address'} + def __init__(self, private_address=None): ''' - privateaddress : str + private_address : str ''' - self.privateaddress = privateaddress + self.private_address = private_address class ProvisioningScriptParams(Type): - _toSchema = {'disablepackagecommands': 'DisablePackageCommands', 'machineid': 'MachineId', 'datadir': 'DataDir', 'nonce': 'Nonce'} - _toPy = {'MachineId': 'machineid', 'DisablePackageCommands': 'disablepackagecommands', 'DataDir': 'datadir', 'Nonce': 'nonce'} - def __init__(self, datadir=None, disablepackagecommands=None, machineid=None, nonce=None): + _toSchema = {'nonce': 'nonce', 'disable_package_commands': 'disable-package-commands', 'machine_id': 'machine-id', 'data_dir': 'data-dir'} + _toPy = {'machine-id': 'machine_id', 'nonce': 'nonce', 'disable-package-commands': 'disable_package_commands', 'data-dir': 'data_dir'} + def __init__(self, data_dir=None, disable_package_commands=None, machine_id=None, nonce=None): ''' - datadir : str - disablepackagecommands : bool - machineid : str + data_dir : str + disable_package_commands : bool + machine_id : str nonce : str ''' - self.datadir = datadir - self.disablepackagecommands = disablepackagecommands - self.machineid = machineid + self.data_dir = data_dir + self.disable_package_commands = disable_package_commands + self.machine_id = machine_id self.nonce = nonce class ProvisioningScriptResult(Type): - _toSchema = {'script': 'Script'} - _toPy = {'Script': 'script'} + _toSchema = {'script': 'script'} + _toPy = {'script': 'script'} def __init__(self, script=None): ''' script : str @@ -1705,8 +1863,8 @@ class ProvisioningScriptResult(Type): class PublicAddress(Type): - _toSchema = {'target': 'Target'} - _toPy = {'Target': 'target'} + _toSchema = {'target': 'target'} + _toPy = {'target': 'target'} def __init__(self, target=None): ''' target : str @@ -1715,18 +1873,18 @@ class PublicAddress(Type): class PublicAddressResults(Type): - _toSchema = {'publicaddress': 'PublicAddress'} - _toPy = {'PublicAddress': 'publicaddress'} - def __init__(self, publicaddress=None): + _toSchema = {'public_address': 'public-address'} + _toPy = {'public-address': 'public_address'} + def __init__(self, public_address=None): ''' - publicaddress : str + public_address : str ''' - self.publicaddress = publicaddress + self.public_address = public_address class RelationStatus(Type): - _toSchema = {'key': 'Key', 'endpoints': 'Endpoints', 'scope': 'Scope', 'id_': 'Id', 'interface': 'Interface'} - _toPy = {'Key': 'key', 'Interface': 'interface', 'Id': 'id_', 'Endpoints': 'endpoints', 'Scope': 'scope'} + _toSchema = {'id_': 'id', 'key': 'key', 'endpoints': 'endpoints', 'interface': 'interface', 'scope': 'scope'} + _toPy = {'id': 'id_', 'key': 'key', 'endpoints': 'endpoints', 'interface': 'interface', 'scope': 'scope'} def __init__(self, endpoints=None, id_=None, interface=None, key=None, scope=None): ''' endpoints : typing.Sequence[~EndpointStatus] @@ -1743,20 +1901,20 @@ class RelationStatus(Type): class ResolveCharmResult(Type): - _toSchema = {'error': 'Error', 'url': 'URL'} - _toPy = {'URL': 'url', 'Error': 'error'} + _toSchema = {'error': 'error', 'url': 'url'} + _toPy = {'error': 'error', 'url': 'url'} def __init__(self, error=None, url=None): ''' error : str - url : URL + url : str ''' self.error = error - self.url = URL.from_json(url) if url else None + self.url = url class ResolveCharmResults(Type): - _toSchema = {'urls': 'URLs'} - _toPy = {'URLs': 'urls'} + _toSchema = {'urls': 'urls'} + _toPy = {'urls': 'urls'} def __init__(self, urls=None): ''' urls : typing.Sequence[~ResolveCharmResult] @@ -1765,30 +1923,30 @@ class ResolveCharmResults(Type): class ResolveCharms(Type): - _toSchema = {'references': 'References'} - _toPy = {'References': 'references'} + _toSchema = {'references': 'references'} + _toPy = {'references': 'references'} def __init__(self, references=None): ''' - references : typing.Sequence[~URL] + references : typing.Sequence[str] ''' - self.references = [URL.from_json(o) for o in references or []] + self.references = references class Resolved(Type): - _toSchema = {'unitname': 'UnitName', 'retry': 'Retry'} - _toPy = {'UnitName': 'unitname', 'Retry': 'retry'} - def __init__(self, retry=None, unitname=None): + _toSchema = {'unit_name': 'unit-name', 'retry': 'retry'} + _toPy = {'unit-name': 'unit_name', 'retry': 'retry'} + def __init__(self, retry=None, unit_name=None): ''' retry : bool - unitname : str + unit_name : str ''' self.retry = retry - self.unitname = unitname + self.unit_name = unit_name class SetModelAgentVersion(Type): - _toSchema = {'minor': 'Minor', 'major': 'Major', 'patch': 'Patch', 'tag': 'Tag', 'build': 'Build'} - _toPy = {'Patch': 'patch', 'Major': 'major', 'Minor': 'minor', 'Tag': 'tag', 'Build': 'build'} + _toSchema = {'patch': 'Patch', 'tag': 'Tag', 'major': 'Major', 'build': 'Build', 'minor': 'Minor'} + _toPy = {'Patch': 'patch', 'Major': 'major', 'Tag': 'tag', 'Minor': 'minor', 'Build': 'build'} def __init__(self, build=None, major=None, minor=None, patch=None, tag=None): ''' build : int @@ -1805,8 +1963,8 @@ class SetModelAgentVersion(Type): class StatusHistoryFilter(Type): - _toSchema = {'delta': 'Delta', 'date': 'Date', 'size': 'Size'} - _toPy = {'Delta': 'delta', 'Date': 'date', 'Size': 'size'} + _toSchema = {'size': 'size', 'delta': 'delta', 'date': 'date'} + _toPy = {'size': 'size', 'delta': 'delta', 'date': 'date'} def __init__(self, date=None, delta=None, size=None): ''' date : str @@ -1819,8 +1977,8 @@ class StatusHistoryFilter(Type): class StatusHistoryRequest(Type): - _toSchema = {'historykind': 'HistoryKind', 'filter_': 'Filter', 'tag': 'Tag', 'size': 'Size'} - _toPy = {'Tag': 'tag', 'Size': 'size', 'Filter': 'filter_', 'HistoryKind': 'historykind'} + _toSchema = {'size': 'size', 'historykind': 'historyKind', 'tag': 'tag', 'filter_': 'filter'} + _toPy = {'historyKind': 'historykind', 'tag': 'tag', 'size': 'size', 'filter': 'filter_'} def __init__(self, filter_=None, historykind=None, size=None, tag=None): ''' filter_ : StatusHistoryFilter @@ -1835,103 +1993,251 @@ class StatusHistoryRequest(Type): class StatusHistoryRequests(Type): - _toSchema = {'requests': 'Requests'} - _toPy = {'Requests': 'requests'} + _toSchema = {'requests': 'requests'} + _toPy = {'requests': 'requests'} def __init__(self, requests=None): ''' - requests : typing.Sequence[~StatusHistoryRequest] + requests : typing.Sequence[~StatusHistoryRequest] + ''' + self.requests = [StatusHistoryRequest.from_json(o) for o in requests or []] + + +class StatusHistoryResult(Type): + _toSchema = {'error': 'error', 'history': 'history'} + _toPy = {'error': 'error', 'history': 'history'} + def __init__(self, error=None, history=None): + ''' + error : Error + history : History + ''' + self.error = Error.from_json(error) if error else None + self.history = History.from_json(history) if history else None + + +class StatusHistoryResults(Type): + _toSchema = {'results': 'results'} + _toPy = {'results': 'results'} + def __init__(self, results=None): + ''' + results : typing.Sequence[~StatusHistoryResult] + ''' + self.results = [StatusHistoryResult.from_json(o) for o in results or []] + + +class StatusParams(Type): + _toSchema = {'patterns': 'patterns'} + _toPy = {'patterns': 'patterns'} + def __init__(self, patterns=None): + ''' + patterns : typing.Sequence[str] + ''' + self.patterns = patterns + + +class Tools(Type): + _toSchema = {'sha256': 'sha256', 'size': 'size', 'url': 'url', 'version': 'version'} + _toPy = {'sha256': 'sha256', 'size': 'size', 'url': 'url', 'version': 'version'} + def __init__(self, sha256=None, size=None, url=None, version=None): + ''' + sha256 : str + size : int + url : str + version : Binary + ''' + self.sha256 = sha256 + self.size = size + self.url = url + self.version = Binary.from_json(version) if version else None + + +class UnitStatus(Type): + _toSchema = {'workload_status': 'workload-status', 'workload_version': 'workload-version', 'machine': 'machine', 'opened_ports': 'opened-ports', 'public_address': 'public-address', 'agent_status': 'agent-status', 'subordinates': 'subordinates', 'charm': 'charm'} + _toPy = {'opened-ports': 'opened_ports', 'machine': 'machine', 'subordinates': 'subordinates', 'agent-status': 'agent_status', 'workload-version': 'workload_version', 'workload-status': 'workload_status', 'public-address': 'public_address', 'charm': 'charm'} + def __init__(self, agent_status=None, charm=None, machine=None, opened_ports=None, public_address=None, subordinates=None, workload_status=None, workload_version=None): + ''' + agent_status : DetailedStatus + charm : str + machine : str + opened_ports : typing.Sequence[str] + public_address : str + subordinates : typing.Mapping[str, ~UnitStatus] + workload_status : DetailedStatus + workload_version : str + ''' + self.agent_status = DetailedStatus.from_json(agent_status) if agent_status else None + self.charm = charm + self.machine = machine + self.opened_ports = opened_ports + self.public_address = public_address + self.subordinates = {k: UnitStatus.from_json(v) for k, v in (subordinates or dict()).items()} + self.workload_status = DetailedStatus.from_json(workload_status) if workload_status else None + self.workload_version = workload_version + + +class Cloud(Type): + _toSchema = {'auth_types': 'auth-types', 'regions': 'regions', 'type_': 'type', 'endpoint': 'endpoint'} + _toPy = {'type': 'type_', 'regions': 'regions', 'auth-types': 'auth_types', 'endpoint': 'endpoint'} + def __init__(self, auth_types=None, endpoint=None, regions=None, type_=None): + ''' + auth_types : typing.Sequence[str] + endpoint : str + regions : typing.Sequence[~CloudRegion] + type_ : str + ''' + self.auth_types = auth_types + self.endpoint = endpoint + self.regions = [CloudRegion.from_json(o) for o in regions or []] + self.type_ = type_ + + +class CloudCredential(Type): + _toSchema = {'auth_type': 'auth-type', 'attrs': 'attrs'} + _toPy = {'auth-type': 'auth_type', 'attrs': 'attrs'} + def __init__(self, attrs=None, auth_type=None): + ''' + attrs : typing.Mapping[str, str] + auth_type : str + ''' + self.attrs = attrs + self.auth_type = auth_type + + +class CloudCredentialsResult(Type): + _toSchema = {'credentials': 'credentials', 'error': 'error'} + _toPy = {'credentials': 'credentials', 'error': 'error'} + def __init__(self, credentials=None, error=None): + ''' + credentials : typing.Mapping[str, ~CloudCredential] + error : Error + ''' + self.credentials = {k: CloudCredential.from_json(v) for k, v in (credentials or dict()).items()} + self.error = Error.from_json(error) if error else None + + +class CloudCredentialsResults(Type): + _toSchema = {'results': 'results'} + _toPy = {'results': 'results'} + def __init__(self, results=None): + ''' + results : typing.Sequence[~CloudCredentialsResult] + ''' + self.results = [CloudCredentialsResult.from_json(o) for o in results or []] + + +class CloudDefaults(Type): + _toSchema = {'region': 'region', 'credential': 'credential', 'cloud_tag': 'cloud-tag'} + _toPy = {'region': 'region', 'credential': 'credential', 'cloud-tag': 'cloud_tag'} + def __init__(self, cloud_tag=None, credential=None, region=None): + ''' + cloud_tag : str + credential : str + region : str + ''' + self.cloud_tag = cloud_tag + self.credential = credential + self.region = region + + +class CloudDefaultsResult(Type): + _toSchema = {'error': 'error', 'result': 'result'} + _toPy = {'error': 'error', 'result': 'result'} + def __init__(self, error=None, result=None): + ''' + error : Error + result : CloudDefaults + ''' + self.error = Error.from_json(error) if error else None + self.result = CloudDefaults.from_json(result) if result else None + + +class CloudDefaultsResults(Type): + _toSchema = {'results': 'results'} + _toPy = {'results': 'results'} + def __init__(self, results=None): + ''' + results : typing.Sequence[~CloudDefaultsResult] + ''' + self.results = [CloudDefaultsResult.from_json(o) for o in results or []] + + +class CloudRegion(Type): + _toSchema = {'name': 'name', 'endpoint': 'endpoint'} + _toPy = {'name': 'name', 'endpoint': 'endpoint'} + def __init__(self, endpoint=None, name=None): + ''' + endpoint : str + name : str ''' - self.requests = [StatusHistoryRequest.from_json(o) for o in requests or []] + self.endpoint = endpoint + self.name = name -class StatusHistoryResult(Type): - _toSchema = {'history': 'History', 'error': 'Error'} - _toPy = {'History': 'history', 'Error': 'error'} - def __init__(self, error=None, history=None): +class CloudResult(Type): + _toSchema = {'error': 'error', 'cloud': 'cloud'} + _toPy = {'error': 'error', 'cloud': 'cloud'} + def __init__(self, cloud=None, error=None): ''' + cloud : Cloud error : Error - history : History ''' + self.cloud = Cloud.from_json(cloud) if cloud else None self.error = Error.from_json(error) if error else None - self.history = History.from_json(history) if history else None -class StatusHistoryResults(Type): - _toSchema = {'results': 'Results'} - _toPy = {'Results': 'results'} +class CloudResults(Type): + _toSchema = {'results': 'results'} + _toPy = {'results': 'results'} def __init__(self, results=None): ''' - results : typing.Sequence[~StatusHistoryResult] + results : typing.Sequence[~CloudResult] ''' - self.results = [StatusHistoryResult.from_json(o) for o in results or []] + self.results = [CloudResult.from_json(o) for o in results or []] -class StatusParams(Type): - _toSchema = {'patterns': 'Patterns'} - _toPy = {'Patterns': 'patterns'} - def __init__(self, patterns=None): +class UserCloud(Type): + _toSchema = {'user_tag': 'user-tag', 'cloud_tag': 'cloud-tag'} + _toPy = {'user-tag': 'user_tag', 'cloud-tag': 'cloud_tag'} + def __init__(self, cloud_tag=None, user_tag=None): ''' - patterns : typing.Sequence[str] + cloud_tag : str + user_tag : str ''' - self.patterns = patterns + self.cloud_tag = cloud_tag + self.user_tag = user_tag -class Tools(Type): - _toSchema = {'sha256': 'sha256', 'url': 'url', 'size': 'size', 'version': 'version'} - _toPy = {'sha256': 'sha256', 'url': 'url', 'size': 'size', 'version': 'version'} - def __init__(self, sha256=None, size=None, url=None, version=None): +class UserCloudCredentials(Type): + _toSchema = {'credentials': 'credentials', 'user_tag': 'user-tag', 'cloud_tag': 'cloud-tag'} + _toPy = {'credentials': 'credentials', 'user-tag': 'user_tag', 'cloud-tag': 'cloud_tag'} + def __init__(self, cloud_tag=None, credentials=None, user_tag=None): ''' - sha256 : str - size : int - url : str - version : Binary + cloud_tag : str + credentials : typing.Mapping[str, ~CloudCredential] + user_tag : str ''' - self.sha256 = sha256 - self.size = size - self.url = url - self.version = Binary.from_json(version) if version else None + self.cloud_tag = cloud_tag + self.credentials = {k: CloudCredential.from_json(v) for k, v in (credentials or dict()).items()} + self.user_tag = user_tag -class URL(Type): - _toSchema = {'revision': 'Revision', 'series': 'Series', 'schema': 'Schema', 'channel': 'Channel', 'name': 'Name', 'user': 'User'} - _toPy = {'Name': 'name', 'Revision': 'revision', 'User': 'user', 'Schema': 'schema', 'Channel': 'channel', 'Series': 'series'} - def __init__(self, channel=None, name=None, revision=None, schema=None, series=None, user=None): +class UserClouds(Type): + _toSchema = {'user_clouds': 'user-clouds'} + _toPy = {'user-clouds': 'user_clouds'} + def __init__(self, user_clouds=None): ''' - channel : str - name : str - revision : int - schema : str - series : str - user : str + user_clouds : typing.Sequence[~UserCloud] ''' - self.channel = channel - self.name = name - self.revision = revision - self.schema = schema - self.series = series - self.user = user + self.user_clouds = [UserCloud.from_json(o) for o in user_clouds or []] -class UnitStatus(Type): - _toSchema = {'charm': 'Charm', 'publicaddress': 'PublicAddress', 'openedports': 'OpenedPorts', 'agentstatus': 'AgentStatus', 'subordinates': 'Subordinates', 'workloadstatus': 'WorkloadStatus', 'machine': 'Machine'} - _toPy = {'AgentStatus': 'agentstatus', 'Charm': 'charm', 'OpenedPorts': 'openedports', 'WorkloadStatus': 'workloadstatus', 'PublicAddress': 'publicaddress', 'Machine': 'machine', 'Subordinates': 'subordinates'} - def __init__(self, agentstatus=None, charm=None, machine=None, openedports=None, publicaddress=None, subordinates=None, workloadstatus=None): +class UsersCloudCredentials(Type): + _toSchema = {'users': 'users'} + _toPy = {'users': 'users'} + def __init__(self, users=None): ''' - agentstatus : DetailedStatus - charm : str - machine : str - openedports : typing.Sequence[str] - publicaddress : str - subordinates : typing.Mapping[str, ~UnitStatus] - workloadstatus : DetailedStatus + users : typing.Sequence[~UserCloudCredentials] ''' - self.agentstatus = DetailedStatus.from_json(agentstatus) if agentstatus else None - self.charm = charm - self.machine = machine - self.openedports = openedports - self.publicaddress = publicaddress - self.subordinates = {k: UnitStatus.from_json(v) for k, v in (subordinates or dict()).items()} - self.workloadstatus = DetailedStatus.from_json(workloadstatus) if workloadstatus else None + self.users = [UserCloudCredentials.from_json(o) for o in users or []] class DestroyControllerArgs(Type): @@ -1955,8 +2261,8 @@ class InitiateModelMigrationArgs(Type): class InitiateModelMigrationResult(Type): - _toSchema = {'id_': 'id', 'model_tag': 'model-tag', 'error': 'error'} - _toPy = {'id': 'id_', 'error': 'error', 'model-tag': 'model_tag'} + _toSchema = {'error': 'error', 'model_tag': 'model-tag', 'id_': 'id'} + _toPy = {'error': 'error', 'id': 'id_', 'model-tag': 'model_tag'} def __init__(self, error=None, id_=None, model_tag=None): ''' error : Error @@ -1979,22 +2285,22 @@ class InitiateModelMigrationResults(Type): class Model(Type): - _toSchema = {'uuid': 'UUID', 'ownertag': 'OwnerTag', 'name': 'Name'} - _toPy = {'OwnerTag': 'ownertag', 'Name': 'name', 'UUID': 'uuid'} - def __init__(self, name=None, ownertag=None, uuid=None): + _toSchema = {'name': 'name', 'uuid': 'uuid', 'owner_tag': 'owner-tag'} + _toPy = {'name': 'name', 'uuid': 'uuid', 'owner-tag': 'owner_tag'} + def __init__(self, name=None, owner_tag=None, uuid=None): ''' name : str - ownertag : str + owner_tag : str uuid : str ''' self.name = name - self.ownertag = ownertag + self.owner_tag = owner_tag self.uuid = uuid class ModelBlockInfo(Type): - _toSchema = {'blocks': 'blocks', 'model_uuid': 'model-uuid', 'owner_tag': 'owner-tag', 'name': 'name'} - _toPy = {'owner-tag': 'owner_tag', 'blocks': 'blocks', 'model-uuid': 'model_uuid', 'name': 'name'} + _toSchema = {'name': 'name', 'model_uuid': 'model-uuid', 'owner_tag': 'owner-tag', 'blocks': 'blocks'} + _toPy = {'name': 'name', 'owner-tag': 'owner_tag', 'blocks': 'blocks', 'model-uuid': 'model_uuid'} def __init__(self, blocks=None, model_uuid=None, name=None, owner_tag=None): ''' blocks : typing.Sequence[str] @@ -2019,7 +2325,7 @@ class ModelBlockInfoList(Type): class ModelMigrationSpec(Type): - _toSchema = {'model_tag': 'model-tag', 'target_info': 'target-info'} + _toSchema = {'target_info': 'target-info', 'model_tag': 'model-tag'} _toPy = {'model-tag': 'model_tag', 'target-info': 'target_info'} def __init__(self, model_tag=None, target_info=None): ''' @@ -2031,8 +2337,8 @@ class ModelMigrationSpec(Type): class ModelMigrationTargetInfo(Type): - _toSchema = {'auth_tag': 'auth-tag', 'ca_cert': 'ca-cert', 'controller_tag': 'controller-tag', 'password': 'password', 'addrs': 'addrs'} - _toPy = {'ca-cert': 'ca_cert', 'auth-tag': 'auth_tag', 'password': 'password', 'controller-tag': 'controller_tag', 'addrs': 'addrs'} + _toSchema = {'controller_tag': 'controller-tag', 'auth_tag': 'auth-tag', 'password': 'password', 'ca_cert': 'ca-cert', 'addrs': 'addrs'} + _toPy = {'password': 'password', 'auth-tag': 'auth_tag', 'ca-cert': 'ca_cert', 'addrs': 'addrs', 'controller-tag': 'controller_tag'} def __init__(self, addrs=None, auth_tag=None, ca_cert=None, controller_tag=None, password=None): ''' addrs : typing.Sequence[str] @@ -2049,8 +2355,8 @@ class ModelMigrationTargetInfo(Type): class ModelStatus(Type): - _toSchema = {'model_tag': 'model-tag', 'life': 'life', 'application_count': 'application-count', 'hosted_machine_count': 'hosted-machine-count', 'owner_tag': 'owner-tag'} - _toPy = {'life': 'life', 'application-count': 'application_count', 'hosted-machine-count': 'hosted_machine_count', 'model-tag': 'model_tag', 'owner-tag': 'owner_tag'} + _toSchema = {'hosted_machine_count': 'hosted-machine-count', 'life': 'life', 'application_count': 'application-count', 'model_tag': 'model-tag', 'owner_tag': 'owner-tag'} + _toPy = {'model-tag': 'model_tag', 'life': 'life', 'hosted-machine-count': 'hosted_machine_count', 'owner-tag': 'owner_tag', 'application-count': 'application_count'} def __init__(self, application_count=None, hosted_machine_count=None, life=None, model_tag=None, owner_tag=None): ''' application_count : int @@ -2087,30 +2393,30 @@ class RemoveBlocksArgs(Type): class UserModel(Type): - _toSchema = {'model': 'Model', 'lastconnection': 'LastConnection'} - _toPy = {'Model': 'model', 'LastConnection': 'lastconnection'} - def __init__(self, lastconnection=None, model=None): + _toSchema = {'last_connection': 'last-connection', 'model': 'model'} + _toPy = {'model': 'model', 'last-connection': 'last_connection'} + def __init__(self, last_connection=None, model=None): ''' - lastconnection : str + last_connection : str model : Model ''' - self.lastconnection = lastconnection + self.last_connection = last_connection self.model = Model.from_json(model) if model else None class UserModelList(Type): - _toSchema = {'usermodels': 'UserModels'} - _toPy = {'UserModels': 'usermodels'} - def __init__(self, usermodels=None): + _toSchema = {'user_models': 'user-models'} + _toPy = {'user-models': 'user_models'} + def __init__(self, user_models=None): ''' - usermodels : typing.Sequence[~UserModel] + user_models : typing.Sequence[~UserModel] ''' - self.usermodels = [UserModel.from_json(o) for o in usermodels or []] + self.user_models = [UserModel.from_json(o) for o in user_models or []] class BytesResult(Type): - _toSchema = {'result': 'Result'} - _toPy = {'Result': 'result'} + _toSchema = {'result': 'result'} + _toPy = {'result': 'result'} def __init__(self, result=None): ''' result : typing.Sequence[int] @@ -2119,20 +2425,20 @@ class BytesResult(Type): class DeployerConnectionValues(Type): - _toSchema = {'stateaddresses': 'StateAddresses', 'apiaddresses': 'APIAddresses'} - _toPy = {'StateAddresses': 'stateaddresses', 'APIAddresses': 'apiaddresses'} - def __init__(self, apiaddresses=None, stateaddresses=None): + _toSchema = {'api_addresses': 'api-addresses', 'state_addresses': 'state-addresses'} + _toPy = {'state-addresses': 'state_addresses', 'api-addresses': 'api_addresses'} + def __init__(self, api_addresses=None, state_addresses=None): ''' - apiaddresses : typing.Sequence[str] - stateaddresses : typing.Sequence[str] + api_addresses : typing.Sequence[str] + state_addresses : typing.Sequence[str] ''' - self.apiaddresses = apiaddresses - self.stateaddresses = stateaddresses + self.api_addresses = api_addresses + self.state_addresses = state_addresses class LifeResult(Type): - _toSchema = {'life': 'Life', 'error': 'Error'} - _toPy = {'Life': 'life', 'Error': 'error'} + _toSchema = {'error': 'error', 'life': 'life'} + _toPy = {'error': 'error', 'life': 'life'} def __init__(self, error=None, life=None): ''' error : Error @@ -2143,8 +2449,8 @@ class LifeResult(Type): class LifeResults(Type): - _toSchema = {'results': 'Results'} - _toPy = {'Results': 'results'} + _toSchema = {'results': 'results'} + _toPy = {'results': 'results'} def __init__(self, results=None): ''' results : typing.Sequence[~LifeResult] @@ -2153,8 +2459,8 @@ class LifeResults(Type): class StringsResult(Type): - _toSchema = {'result': 'Result', 'error': 'Error'} - _toPy = {'Result': 'result', 'Error': 'error'} + _toSchema = {'error': 'error', 'result': 'result'} + _toPy = {'error': 'error', 'result': 'result'} def __init__(self, error=None, result=None): ''' error : Error @@ -2165,8 +2471,8 @@ class StringsResult(Type): class StringsWatchResults(Type): - _toSchema = {'results': 'Results'} - _toPy = {'Results': 'results'} + _toSchema = {'results': 'results'} + _toPy = {'results': 'results'} def __init__(self, results=None): ''' results : typing.Sequence[~StringsWatchResult] @@ -2175,24 +2481,24 @@ class StringsWatchResults(Type): class AddSubnetParams(Type): - _toSchema = {'subnetproviderid': 'SubnetProviderId', 'spacetag': 'SpaceTag', 'subnettag': 'SubnetTag', 'zones': 'Zones'} - _toPy = {'SubnetTag': 'subnettag', 'SpaceTag': 'spacetag', 'Zones': 'zones', 'SubnetProviderId': 'subnetproviderid'} - def __init__(self, spacetag=None, subnetproviderid=None, subnettag=None, zones=None): + _toSchema = {'space_tag': 'space-tag', 'subnet_provider_id': 'subnet-provider-id', 'subnet_tag': 'subnet-tag', 'zones': 'zones'} + _toPy = {'space-tag': 'space_tag', 'subnet-tag': 'subnet_tag', 'subnet-provider-id': 'subnet_provider_id', 'zones': 'zones'} + def __init__(self, space_tag=None, subnet_provider_id=None, subnet_tag=None, zones=None): ''' - spacetag : str - subnetproviderid : str - subnettag : str + space_tag : str + subnet_provider_id : str + subnet_tag : str zones : typing.Sequence[str] ''' - self.spacetag = spacetag - self.subnetproviderid = subnetproviderid - self.subnettag = subnettag + self.space_tag = space_tag + self.subnet_provider_id = subnet_provider_id + self.subnet_tag = subnet_tag self.zones = zones class AddSubnetsParams(Type): - _toSchema = {'subnets': 'Subnets'} - _toPy = {'Subnets': 'subnets'} + _toSchema = {'subnets': 'subnets'} + _toPy = {'subnets': 'subnets'} def __init__(self, subnets=None): ''' subnets : typing.Sequence[~AddSubnetParams] @@ -2201,24 +2507,24 @@ class AddSubnetsParams(Type): class CreateSpaceParams(Type): - _toSchema = {'providerid': 'ProviderId', 'public': 'Public', 'spacetag': 'SpaceTag', 'subnettags': 'SubnetTags'} - _toPy = {'Public': 'public', 'SpaceTag': 'spacetag', 'SubnetTags': 'subnettags', 'ProviderId': 'providerid'} - def __init__(self, providerid=None, public=None, spacetag=None, subnettags=None): + _toSchema = {'space_tag': 'space-tag', 'public': 'public', 'provider_id': 'provider-id', 'subnet_tags': 'subnet-tags'} + _toPy = {'space-tag': 'space_tag', 'provider-id': 'provider_id', 'subnet-tags': 'subnet_tags', 'public': 'public'} + def __init__(self, provider_id=None, public=None, space_tag=None, subnet_tags=None): ''' - providerid : str + provider_id : str public : bool - spacetag : str - subnettags : typing.Sequence[str] + space_tag : str + subnet_tags : typing.Sequence[str] ''' - self.providerid = providerid + self.provider_id = provider_id self.public = public - self.spacetag = spacetag - self.subnettags = subnettags + self.space_tag = space_tag + self.subnet_tags = subnet_tags class CreateSpacesParams(Type): - _toSchema = {'spaces': 'Spaces'} - _toPy = {'Spaces': 'spaces'} + _toSchema = {'spaces': 'spaces'} + _toPy = {'spaces': 'spaces'} def __init__(self, spaces=None): ''' spaces : typing.Sequence[~CreateSpaceParams] @@ -2227,8 +2533,8 @@ class CreateSpacesParams(Type): class DiscoverSpacesResults(Type): - _toSchema = {'results': 'Results'} - _toPy = {'Results': 'results'} + _toSchema = {'results': 'results'} + _toPy = {'results': 'results'} def __init__(self, results=None): ''' results : typing.Sequence[~ProviderSpace] @@ -2237,8 +2543,8 @@ class DiscoverSpacesResults(Type): class ListSubnetsResults(Type): - _toSchema = {'results': 'Results'} - _toPy = {'Results': 'results'} + _toSchema = {'results': 'results'} + _toPy = {'results': 'results'} def __init__(self, results=None): ''' results : typing.Sequence[~Subnet] @@ -2247,62 +2553,58 @@ class ListSubnetsResults(Type): class ProviderSpace(Type): - _toSchema = {'providerid': 'ProviderId', 'subnets': 'Subnets', 'error': 'Error', 'name': 'Name'} - _toPy = {'ProviderId': 'providerid', 'Subnets': 'subnets', 'Error': 'error', 'Name': 'name'} - def __init__(self, error=None, name=None, providerid=None, subnets=None): + _toSchema = {'name': 'name', 'error': 'error', 'subnets': 'subnets', 'provider_id': 'provider-id'} + _toPy = {'name': 'name', 'error': 'error', 'subnets': 'subnets', 'provider-id': 'provider_id'} + def __init__(self, error=None, name=None, provider_id=None, subnets=None): ''' error : Error name : str - providerid : str + provider_id : str subnets : typing.Sequence[~Subnet] ''' self.error = Error.from_json(error) if error else None self.name = name - self.providerid = providerid + self.provider_id = provider_id self.subnets = [Subnet.from_json(o) for o in subnets or []] class Subnet(Type): - _toSchema = {'staticrangelowip': 'StaticRangeLowIP', 'spacetag': 'SpaceTag', 'cidr': 'CIDR', 'providerid': 'ProviderId', 'life': 'Life', 'staticrangehighip': 'StaticRangeHighIP', 'zones': 'Zones', 'vlantag': 'VLANTag', 'status': 'Status'} - _toPy = {'StaticRangeHighIP': 'staticrangehighip', 'VLANTag': 'vlantag', 'Zones': 'zones', 'SpaceTag': 'spacetag', 'Life': 'life', 'Status': 'status', 'ProviderId': 'providerid', 'StaticRangeLowIP': 'staticrangelowip', 'CIDR': 'cidr'} - def __init__(self, cidr=None, life=None, providerid=None, spacetag=None, staticrangehighip=None, staticrangelowip=None, status=None, vlantag=None, zones=None): + _toSchema = {'status': 'status', 'vlan_tag': 'vlan-tag', 'cidr': 'cidr', 'provider_id': 'provider-id', 'life': 'life', 'space_tag': 'space-tag', 'zones': 'zones'} + _toPy = {'space-tag': 'space_tag', 'status': 'status', 'cidr': 'cidr', 'vlan-tag': 'vlan_tag', 'provider-id': 'provider_id', 'life': 'life', 'zones': 'zones'} + def __init__(self, cidr=None, life=None, provider_id=None, space_tag=None, status=None, vlan_tag=None, zones=None): ''' cidr : str life : str - providerid : str - spacetag : str - staticrangehighip : typing.Sequence[int] - staticrangelowip : typing.Sequence[int] + provider_id : str + space_tag : str status : str - vlantag : int + vlan_tag : int zones : typing.Sequence[str] ''' self.cidr = cidr self.life = life - self.providerid = providerid - self.spacetag = spacetag - self.staticrangehighip = staticrangehighip - self.staticrangelowip = staticrangelowip + self.provider_id = provider_id + self.space_tag = space_tag self.status = status - self.vlantag = vlantag + self.vlan_tag = vlan_tag self.zones = zones class SubnetsFilters(Type): - _toSchema = {'spacetag': 'SpaceTag', 'zone': 'Zone'} - _toPy = {'SpaceTag': 'spacetag', 'Zone': 'zone'} - def __init__(self, spacetag=None, zone=None): + _toSchema = {'space_tag': 'space-tag', 'zone': 'zone'} + _toPy = {'space-tag': 'space_tag', 'zone': 'zone'} + def __init__(self, space_tag=None, zone=None): ''' - spacetag : str + space_tag : str zone : str ''' - self.spacetag = spacetag + self.space_tag = space_tag self.zone = zone class BlockDevice(Type): - _toSchema = {'inuse': 'InUse', 'busaddress': 'BusAddress', 'devicename': 'DeviceName', 'size': 'Size', 'filesystemtype': 'FilesystemType', 'uuid': 'UUID', 'hardwareid': 'HardwareId', 'label': 'Label', 'mountpoint': 'MountPoint', 'devicelinks': 'DeviceLinks'} - _toPy = {'FilesystemType': 'filesystemtype', 'Label': 'label', 'Size': 'size', 'UUID': 'uuid', 'MountPoint': 'mountpoint', 'BusAddress': 'busaddress', 'InUse': 'inuse', 'DeviceName': 'devicename', 'DeviceLinks': 'devicelinks', 'HardwareId': 'hardwareid'} + _toSchema = {'devicelinks': 'DeviceLinks', 'filesystemtype': 'FilesystemType', 'inuse': 'InUse', 'devicename': 'DeviceName', 'hardwareid': 'HardwareId', 'label': 'Label', 'uuid': 'UUID', 'size': 'Size', 'mountpoint': 'MountPoint', 'busaddress': 'BusAddress'} + _toPy = {'UUID': 'uuid', 'BusAddress': 'busaddress', 'HardwareId': 'hardwareid', 'DeviceName': 'devicename', 'DeviceLinks': 'devicelinks', 'InUse': 'inuse', 'MountPoint': 'mountpoint', 'Label': 'label', 'FilesystemType': 'filesystemtype', 'Size': 'size'} def __init__(self, busaddress=None, devicelinks=None, devicename=None, filesystemtype=None, hardwareid=None, inuse=None, label=None, mountpoint=None, size=None, uuid=None): ''' busaddress : str @@ -2329,56 +2631,82 @@ class BlockDevice(Type): class MachineBlockDevices(Type): - _toSchema = {'blockdevices': 'blockdevices', 'machine': 'machine'} - _toPy = {'blockdevices': 'blockdevices', 'machine': 'machine'} - def __init__(self, blockdevices=None, machine=None): + _toSchema = {'block_devices': 'block-devices', 'machine': 'machine'} + _toPy = {'machine': 'machine', 'block-devices': 'block_devices'} + def __init__(self, block_devices=None, machine=None): ''' - blockdevices : typing.Sequence[~BlockDevice] + block_devices : typing.Sequence[~BlockDevice] machine : str ''' - self.blockdevices = [BlockDevice.from_json(o) for o in blockdevices or []] + self.block_devices = [BlockDevice.from_json(o) for o in block_devices or []] self.machine = machine class SetMachineBlockDevices(Type): - _toSchema = {'machineblockdevices': 'machineblockdevices'} - _toPy = {'machineblockdevices': 'machineblockdevices'} - def __init__(self, machineblockdevices=None): + _toSchema = {'machine_block_devices': 'machine-block-devices'} + _toPy = {'machine-block-devices': 'machine_block_devices'} + def __init__(self, machine_block_devices=None): + ''' + machine_block_devices : typing.Sequence[~MachineBlockDevices] + ''' + self.machine_block_devices = [MachineBlockDevices.from_json(o) for o in machine_block_devices or []] + + +class EntitiesWatchResult(Type): + _toSchema = {'error': 'error', 'changes': 'changes', 'watcher_id': 'watcher-id'} + _toPy = {'error': 'error', 'changes': 'changes', 'watcher-id': 'watcher_id'} + def __init__(self, changes=None, error=None, watcher_id=None): ''' - machineblockdevices : typing.Sequence[~MachineBlockDevices] + changes : typing.Sequence[str] + error : Error + watcher_id : str ''' - self.machineblockdevices = [MachineBlockDevices.from_json(o) for o in machineblockdevices or []] + self.changes = changes + self.error = Error.from_json(error) if error else None + self.watcher_id = watcher_id class MachineStorageId(Type): - _toSchema = {'attachmenttag': 'attachmenttag', 'machinetag': 'machinetag'} - _toPy = {'attachmenttag': 'attachmenttag', 'machinetag': 'machinetag'} - def __init__(self, attachmenttag=None, machinetag=None): + _toSchema = {'attachment_tag': 'attachment-tag', 'machine_tag': 'machine-tag'} + _toPy = {'machine-tag': 'machine_tag', 'attachment-tag': 'attachment_tag'} + def __init__(self, attachment_tag=None, machine_tag=None): ''' - attachmenttag : str - machinetag : str + attachment_tag : str + machine_tag : str ''' - self.attachmenttag = attachmenttag - self.machinetag = machinetag + self.attachment_tag = attachment_tag + self.machine_tag = machine_tag class MachineStorageIdsWatchResult(Type): - _toSchema = {'changes': 'Changes', 'machinestorageidswatcherid': 'MachineStorageIdsWatcherId', 'error': 'Error'} - _toPy = {'Changes': 'changes', 'Error': 'error', 'MachineStorageIdsWatcherId': 'machinestorageidswatcherid'} - def __init__(self, changes=None, error=None, machinestorageidswatcherid=None): + _toSchema = {'error': 'error', 'changes': 'changes', 'watcher_id': 'watcher-id'} + _toPy = {'error': 'error', 'changes': 'changes', 'watcher-id': 'watcher_id'} + def __init__(self, changes=None, error=None, watcher_id=None): ''' changes : typing.Sequence[~MachineStorageId] error : Error - machinestorageidswatcherid : str + watcher_id : str ''' self.changes = [MachineStorageId.from_json(o) for o in changes or []] self.error = Error.from_json(error) if error else None - self.machinestorageidswatcherid = machinestorageidswatcherid + self.watcher_id = watcher_id + + +class BoolResult(Type): + _toSchema = {'error': 'error', 'result': 'result'} + _toPy = {'error': 'error', 'result': 'result'} + def __init__(self, error=None, result=None): + ''' + error : Error + result : bool + ''' + self.error = Error.from_json(error) if error else None + self.result = result class BoolResults(Type): - _toSchema = {'results': 'Results'} - _toPy = {'Results': 'results'} + _toSchema = {'results': 'results'} + _toPy = {'results': 'results'} def __init__(self, results=None): ''' results : typing.Sequence[~BoolResult] @@ -2387,34 +2715,34 @@ class BoolResults(Type): class MachinePortRange(Type): - _toSchema = {'unittag': 'UnitTag', 'portrange': 'PortRange', 'relationtag': 'RelationTag'} - _toPy = {'RelationTag': 'relationtag', 'UnitTag': 'unittag', 'PortRange': 'portrange'} - def __init__(self, portrange=None, relationtag=None, unittag=None): + _toSchema = {'unit_tag': 'unit-tag', 'relation_tag': 'relation-tag', 'port_range': 'port-range'} + _toPy = {'unit-tag': 'unit_tag', 'port-range': 'port_range', 'relation-tag': 'relation_tag'} + def __init__(self, port_range=None, relation_tag=None, unit_tag=None): ''' - portrange : PortRange - relationtag : str - unittag : str + port_range : PortRange + relation_tag : str + unit_tag : str ''' - self.portrange = PortRange.from_json(portrange) if portrange else None - self.relationtag = relationtag - self.unittag = unittag + self.port_range = PortRange.from_json(port_range) if port_range else None + self.relation_tag = relation_tag + self.unit_tag = unit_tag class MachinePorts(Type): - _toSchema = {'subnettag': 'SubnetTag', 'machinetag': 'MachineTag'} - _toPy = {'MachineTag': 'machinetag', 'SubnetTag': 'subnettag'} - def __init__(self, machinetag=None, subnettag=None): + _toSchema = {'machine_tag': 'machine-tag', 'subnet_tag': 'subnet-tag'} + _toPy = {'machine-tag': 'machine_tag', 'subnet-tag': 'subnet_tag'} + def __init__(self, machine_tag=None, subnet_tag=None): ''' - machinetag : str - subnettag : str + machine_tag : str + subnet_tag : str ''' - self.machinetag = machinetag - self.subnettag = subnettag + self.machine_tag = machine_tag + self.subnet_tag = subnet_tag class MachinePortsParams(Type): - _toSchema = {'params': 'Params'} - _toPy = {'Params': 'params'} + _toSchema = {'params': 'params'} + _toPy = {'params': 'params'} def __init__(self, params=None): ''' params : typing.Sequence[~MachinePorts] @@ -2423,8 +2751,8 @@ class MachinePortsParams(Type): class MachinePortsResult(Type): - _toSchema = {'ports': 'Ports', 'error': 'Error'} - _toPy = {'Error': 'error', 'Ports': 'ports'} + _toSchema = {'error': 'error', 'ports': 'ports'} + _toPy = {'error': 'error', 'ports': 'ports'} def __init__(self, error=None, ports=None): ''' error : Error @@ -2435,8 +2763,8 @@ class MachinePortsResult(Type): class MachinePortsResults(Type): - _toSchema = {'results': 'Results'} - _toPy = {'Results': 'results'} + _toSchema = {'results': 'results'} + _toPy = {'results': 'results'} def __init__(self, results=None): ''' results : typing.Sequence[~MachinePortsResult] @@ -2445,8 +2773,8 @@ class MachinePortsResults(Type): class NotifyWatchResults(Type): - _toSchema = {'results': 'Results'} - _toPy = {'Results': 'results'} + _toSchema = {'results': 'results'} + _toPy = {'results': 'results'} def __init__(self, results=None): ''' results : typing.Sequence[~NotifyWatchResult] @@ -2455,22 +2783,22 @@ class NotifyWatchResults(Type): class PortRange(Type): - _toSchema = {'toport': 'ToPort', 'fromport': 'FromPort', 'protocol': 'Protocol'} - _toPy = {'FromPort': 'fromport', 'Protocol': 'protocol', 'ToPort': 'toport'} - def __init__(self, fromport=None, protocol=None, toport=None): + _toSchema = {'from_port': 'from-port', 'to_port': 'to-port', 'protocol': 'protocol'} + _toPy = {'to-port': 'to_port', 'protocol': 'protocol', 'from-port': 'from_port'} + def __init__(self, from_port=None, protocol=None, to_port=None): ''' - fromport : int + from_port : int protocol : str - toport : int + to_port : int ''' - self.fromport = fromport + self.from_port = from_port self.protocol = protocol - self.toport = toport + self.to_port = to_port class StringResults(Type): - _toSchema = {'results': 'Results'} - _toPy = {'Results': 'results'} + _toSchema = {'results': 'results'} + _toPy = {'results': 'results'} def __init__(self, results=None): ''' results : typing.Sequence[~StringResult] @@ -2479,8 +2807,8 @@ class StringResults(Type): class StringsResults(Type): - _toSchema = {'results': 'Results'} - _toPy = {'Results': 'results'} + _toSchema = {'results': 'results'} + _toPy = {'results': 'results'} def __init__(self, results=None): ''' results : typing.Sequence[~StringsResult] @@ -2489,8 +2817,8 @@ class StringsResults(Type): class ControllersChangeResult(Type): - _toSchema = {'result': 'Result', 'error': 'Error'} - _toPy = {'Result': 'result', 'Error': 'error'} + _toSchema = {'error': 'error', 'result': 'result'} + _toPy = {'error': 'error', 'result': 'result'} def __init__(self, error=None, result=None): ''' error : Error @@ -2501,8 +2829,8 @@ class ControllersChangeResult(Type): class ControllersChangeResults(Type): - _toSchema = {'results': 'Results'} - _toPy = {'Results': 'results'} + _toSchema = {'results': 'results'} + _toPy = {'results': 'results'} def __init__(self, results=None): ''' results : typing.Sequence[~ControllersChangeResult] @@ -2511,8 +2839,8 @@ class ControllersChangeResults(Type): class ControllersChanges(Type): - _toSchema = {'maintained': 'maintained', 'added': 'added', 'removed': 'removed', 'promoted': 'promoted', 'converted': 'converted', 'demoted': 'demoted'} - _toPy = {'maintained': 'maintained', 'added': 'added', 'removed': 'removed', 'promoted': 'promoted', 'converted': 'converted', 'demoted': 'demoted'} + _toSchema = {'removed': 'removed', 'maintained': 'maintained', 'promoted': 'promoted', 'added': 'added', 'converted': 'converted', 'demoted': 'demoted'} + _toPy = {'removed': 'removed', 'maintained': 'maintained', 'promoted': 'promoted', 'added': 'added', 'converted': 'converted', 'demoted': 'demoted'} def __init__(self, added=None, converted=None, demoted=None, maintained=None, promoted=None, removed=None): ''' added : typing.Sequence[str] @@ -2531,26 +2859,26 @@ class ControllersChanges(Type): class ControllersSpec(Type): - _toSchema = {'constraints': 'constraints', 'modeltag': 'ModelTag', 'num_controllers': 'num-controllers', 'placement': 'placement', 'series': 'series'} - _toPy = {'ModelTag': 'modeltag', 'series': 'series', 'num-controllers': 'num_controllers', 'placement': 'placement', 'constraints': 'constraints'} - def __init__(self, modeltag=None, constraints=None, num_controllers=None, placement=None, series=None): + _toSchema = {'placement': 'placement', 'num_controllers': 'num-controllers', 'model_tag': 'model-tag', 'constraints': 'constraints', 'series': 'series'} + _toPy = {'model-tag': 'model_tag', 'num-controllers': 'num_controllers', 'series': 'series', 'constraints': 'constraints', 'placement': 'placement'} + def __init__(self, constraints=None, model_tag=None, num_controllers=None, placement=None, series=None): ''' - modeltag : str constraints : Value + model_tag : str num_controllers : int placement : typing.Sequence[str] series : str ''' - self.modeltag = modeltag self.constraints = Value.from_json(constraints) if constraints else None + self.model_tag = model_tag self.num_controllers = num_controllers self.placement = placement self.series = series class ControllersSpecs(Type): - _toSchema = {'specs': 'Specs'} - _toPy = {'Specs': 'specs'} + _toSchema = {'specs': 'specs'} + _toPy = {'specs': 'specs'} def __init__(self, specs=None): ''' specs : typing.Sequence[~ControllersSpec] @@ -2559,22 +2887,22 @@ class ControllersSpecs(Type): class HAMember(Type): - _toSchema = {'publicaddress': 'PublicAddress', 'series': 'Series', 'tag': 'Tag'} - _toPy = {'Tag': 'tag', 'PublicAddress': 'publicaddress', 'Series': 'series'} - def __init__(self, publicaddress=None, series=None, tag=None): + _toSchema = {'series': 'series', 'tag': 'tag', 'public_address': 'public-address'} + _toPy = {'series': 'series', 'tag': 'tag', 'public-address': 'public_address'} + def __init__(self, public_address=None, series=None, tag=None): ''' - publicaddress : Address + public_address : Address series : str tag : str ''' - self.publicaddress = Address.from_json(publicaddress) if publicaddress else None + self.public_address = Address.from_json(public_address) if public_address else None self.series = series self.tag = tag class Member(Type): - _toSchema = {'priority': 'Priority', 'slavedelay': 'SlaveDelay', 'id_': 'Id', 'hidden': 'Hidden', 'votes': 'Votes', 'buildindexes': 'BuildIndexes', 'address': 'Address', 'tags': 'Tags', 'arbiter': 'Arbiter'} - _toPy = {'Hidden': 'hidden', 'Priority': 'priority', 'SlaveDelay': 'slavedelay', 'Id': 'id_', 'Arbiter': 'arbiter', 'Votes': 'votes', 'Tags': 'tags', 'Address': 'address', 'BuildIndexes': 'buildindexes'} + _toSchema = {'address': 'Address', 'hidden': 'Hidden', 'tags': 'Tags', 'arbiter': 'Arbiter', 'buildindexes': 'BuildIndexes', 'id_': 'Id', 'priority': 'Priority', 'votes': 'Votes', 'slavedelay': 'SlaveDelay'} + _toPy = {'SlaveDelay': 'slavedelay', 'Hidden': 'hidden', 'Address': 'address', 'Priority': 'priority', 'Votes': 'votes', 'Tags': 'tags', 'Arbiter': 'arbiter', 'BuildIndexes': 'buildindexes', 'Id': 'id_'} def __init__(self, address=None, arbiter=None, buildindexes=None, hidden=None, id_=None, priority=None, slavedelay=None, tags=None, votes=None): ''' address : str @@ -2599,22 +2927,22 @@ class Member(Type): class MongoUpgradeResults(Type): - _toSchema = {'members': 'Members', 'master': 'Master', 'rsmembers': 'RsMembers'} - _toPy = {'Master': 'master', 'Members': 'members', 'RsMembers': 'rsmembers'} - def __init__(self, master=None, members=None, rsmembers=None): + _toSchema = {'rs_members': 'rs-members', 'master': 'master', 'ha_members': 'ha-members'} + _toPy = {'rs-members': 'rs_members', 'master': 'master', 'ha-members': 'ha_members'} + def __init__(self, ha_members=None, master=None, rs_members=None): ''' + ha_members : typing.Sequence[~HAMember] master : HAMember - members : typing.Sequence[~HAMember] - rsmembers : typing.Sequence[~Member] + rs_members : typing.Sequence[~Member] ''' + self.ha_members = [HAMember.from_json(o) for o in ha_members or []] self.master = HAMember.from_json(master) if master else None - self.members = [HAMember.from_json(o) for o in members or []] - self.rsmembers = [Member.from_json(o) for o in rsmembers or []] + self.rs_members = [Member.from_json(o) for o in rs_members or []] class ResumeReplicationParams(Type): - _toSchema = {'members': 'Members'} - _toPy = {'Members': 'members'} + _toSchema = {'members': 'members'} + _toPy = {'members': 'members'} def __init__(self, members=None): ''' members : typing.Sequence[~Member] @@ -2623,8 +2951,8 @@ class ResumeReplicationParams(Type): class UpgradeMongoParams(Type): - _toSchema = {'minor': 'Minor', 'storageengine': 'StorageEngine', 'patch': 'Patch', 'major': 'Major'} - _toPy = {'Patch': 'patch', 'Major': 'major', 'StorageEngine': 'storageengine', 'Minor': 'minor'} + _toSchema = {'patch': 'Patch', 'storageengine': 'StorageEngine', 'major': 'Major', 'minor': 'Minor'} + _toPy = {'Patch': 'patch', 'StorageEngine': 'storageengine', 'Major': 'major', 'Minor': 'minor'} def __init__(self, major=None, minor=None, patch=None, storageengine=None): ''' major : int @@ -2639,8 +2967,8 @@ class UpgradeMongoParams(Type): class Version(Type): - _toSchema = {'minor': 'Minor', 'storageengine': 'StorageEngine', 'patch': 'Patch', 'major': 'Major'} - _toPy = {'Patch': 'patch', 'Major': 'major', 'StorageEngine': 'storageengine', 'Minor': 'minor'} + _toSchema = {'patch': 'Patch', 'storageengine': 'StorageEngine', 'major': 'Major', 'minor': 'Minor'} + _toPy = {'Patch': 'patch', 'StorageEngine': 'storageengine', 'Major': 'major', 'Minor': 'minor'} def __init__(self, major=None, minor=None, patch=None, storageengine=None): ''' major : int @@ -2666,7 +2994,7 @@ class SSHHostKeySet(Type): class SSHHostKeys(Type): _toSchema = {'public_keys': 'public-keys', 'tag': 'tag'} - _toPy = {'public-keys': 'public_keys', 'tag': 'tag'} + _toPy = {'tag': 'tag', 'public-keys': 'public_keys'} def __init__(self, public_keys=None, tag=None): ''' public_keys : typing.Sequence[str] @@ -2687,8 +3015,8 @@ class ImageFilterParams(Type): class ImageMetadata(Type): - _toSchema = {'created': 'created', 'arch': 'arch', 'kind': 'kind', 'series': 'series', 'url': 'url'} - _toPy = {'created': 'created', 'arch': 'arch', 'kind': 'kind', 'series': 'series', 'url': 'url'} + _toSchema = {'created': 'created', 'kind': 'kind', 'url': 'url', 'arch': 'arch', 'series': 'series'} + _toPy = {'created': 'created', 'kind': 'kind', 'url': 'url', 'arch': 'arch', 'series': 'series'} def __init__(self, arch=None, created=None, kind=None, series=None, url=None): ''' arch : str @@ -2705,8 +3033,8 @@ class ImageMetadata(Type): class ImageSpec(Type): - _toSchema = {'series': 'series', 'arch': 'arch', 'kind': 'kind'} - _toPy = {'series': 'series', 'arch': 'arch', 'kind': 'kind'} + _toSchema = {'series': 'series', 'kind': 'kind', 'arch': 'arch'} + _toPy = {'series': 'series', 'kind': 'kind', 'arch': 'arch'} def __init__(self, arch=None, kind=None, series=None): ''' arch : str @@ -2729,8 +3057,8 @@ class ListImageResult(Type): class CloudImageMetadata(Type): - _toSchema = {'image_id': 'image_id', 'priority': 'priority', 'series': 'series', 'region': 'region', 'virt_type': 'virt_type', 'version': 'version', 'root_storage_size': 'root_storage_size', 'stream': 'stream', 'arch': 'arch', 'source': 'source', 'root_storage_type': 'root_storage_type'} - _toPy = {'image_id': 'image_id', 'priority': 'priority', 'series': 'series', 'region': 'region', 'virt_type': 'virt_type', 'version': 'version', 'root_storage_size': 'root_storage_size', 'stream': 'stream', 'arch': 'arch', 'source': 'source', 'root_storage_type': 'root_storage_type'} + _toSchema = {'root_storage_type': 'root-storage-type', 'root_storage_size': 'root-storage-size', 'arch': 'arch', 'version': 'version', 'series': 'series', 'image_id': 'image-id', 'priority': 'priority', 'source': 'source', 'region': 'region', 'virt_type': 'virt-type', 'stream': 'stream'} + _toPy = {'version': 'version', 'stream': 'stream', 'source': 'source', 'arch': 'arch', 'virt-type': 'virt_type', 'priority': 'priority', 'image-id': 'image_id', 'root-storage-size': 'root_storage_size', 'region': 'region', 'series': 'series', 'root-storage-type': 'root_storage_type'} def __init__(self, arch=None, image_id=None, priority=None, region=None, root_storage_size=None, root_storage_type=None, series=None, source=None, stream=None, version=None, virt_type=None): ''' arch : str @@ -2769,8 +3097,8 @@ class CloudImageMetadataList(Type): class ImageMetadataFilter(Type): - _toSchema = {'virt_type': 'virt_type', 'series': 'series', 'region': 'region', 'arches': 'arches', 'stream': 'stream', 'root_storage_type': 'root-storage-type'} - _toPy = {'virt_type': 'virt_type', 'series': 'series', 'region': 'region', 'arches': 'arches', 'stream': 'stream', 'root-storage-type': 'root_storage_type'} + _toSchema = {'root_storage_type': 'root-storage-type', 'arches': 'arches', 'region': 'region', 'stream': 'stream', 'series': 'series', 'virt_type': 'virt-type'} + _toPy = {'arches': 'arches', 'region': 'region', 'virt-type': 'virt_type', 'stream': 'stream', 'series': 'series', 'root-storage-type': 'root_storage_type'} def __init__(self, arches=None, region=None, root_storage_type=None, series=None, stream=None, virt_type=None): ''' arches : typing.Sequence[str] @@ -2799,8 +3127,8 @@ class ListCloudImageMetadataResult(Type): class MetadataImageIds(Type): - _toSchema = {'image_ids': 'image_ids'} - _toPy = {'image_ids': 'image_ids'} + _toSchema = {'image_ids': 'image-ids'} + _toPy = {'image-ids': 'image_ids'} def __init__(self, image_ids=None): ''' image_ids : typing.Sequence[str] @@ -2819,8 +3147,8 @@ class MetadataSaveParams(Type): class EntityStatusArgs(Type): - _toSchema = {'data': 'Data', 'tag': 'Tag', 'info': 'Info', 'status': 'Status'} - _toPy = {'Tag': 'tag', 'Status': 'status', 'Data': 'data', 'Info': 'info'} + _toSchema = {'status': 'status', 'info': 'info', 'tag': 'tag', 'data': 'data'} + _toPy = {'status': 'status', 'info': 'info', 'tag': 'tag', 'data': 'data'} def __init__(self, data=None, info=None, status=None, tag=None): ''' data : typing.Mapping[str, typing.Any] @@ -2835,8 +3163,8 @@ class EntityStatusArgs(Type): class MachineAddresses(Type): - _toSchema = {'addresses': 'Addresses', 'tag': 'Tag'} - _toPy = {'Addresses': 'addresses', 'Tag': 'tag'} + _toSchema = {'tag': 'tag', 'addresses': 'addresses'} + _toPy = {'tag': 'tag', 'addresses': 'addresses'} def __init__(self, addresses=None, tag=None): ''' addresses : typing.Sequence[~Address] @@ -2847,8 +3175,8 @@ class MachineAddresses(Type): class MachineAddressesResult(Type): - _toSchema = {'addresses': 'Addresses', 'error': 'Error'} - _toPy = {'Addresses': 'addresses', 'Error': 'error'} + _toSchema = {'error': 'error', 'addresses': 'addresses'} + _toPy = {'error': 'error', 'addresses': 'addresses'} def __init__(self, addresses=None, error=None): ''' addresses : typing.Sequence[~Address] @@ -2859,8 +3187,8 @@ class MachineAddressesResult(Type): class MachineAddressesResults(Type): - _toSchema = {'results': 'Results'} - _toPy = {'Results': 'results'} + _toSchema = {'results': 'results'} + _toPy = {'results': 'results'} def __init__(self, results=None): ''' results : typing.Sequence[~MachineAddressesResult] @@ -2869,18 +3197,18 @@ class MachineAddressesResults(Type): class SetMachinesAddresses(Type): - _toSchema = {'machineaddresses': 'MachineAddresses'} - _toPy = {'MachineAddresses': 'machineaddresses'} - def __init__(self, machineaddresses=None): + _toSchema = {'machine_addresses': 'machine-addresses'} + _toPy = {'machine-addresses': 'machine_addresses'} + def __init__(self, machine_addresses=None): ''' - machineaddresses : typing.Sequence[~MachineAddresses] + machine_addresses : typing.Sequence[~MachineAddresses] ''' - self.machineaddresses = [MachineAddresses.from_json(o) for o in machineaddresses or []] + self.machine_addresses = [MachineAddresses.from_json(o) for o in machine_addresses or []] class SetStatus(Type): - _toSchema = {'entities': 'Entities'} - _toPy = {'Entities': 'entities'} + _toSchema = {'entities': 'entities'} + _toPy = {'entities': 'entities'} def __init__(self, entities=None): ''' entities : typing.Sequence[~EntityStatusArgs] @@ -2889,8 +3217,8 @@ class SetStatus(Type): class StatusResult(Type): - _toSchema = {'since': 'Since', 'data': 'Data', 'info': 'Info', 'life': 'Life', 'error': 'Error', 'id_': 'Id', 'status': 'Status'} - _toPy = {'Id': 'id_', 'Data': 'data', 'Since': 'since', 'Error': 'error', 'Life': 'life', 'Status': 'status', 'Info': 'info'} + _toSchema = {'status': 'status', 'error': 'error', 'info': 'info', 'id_': 'id', 'life': 'life', 'since': 'since', 'data': 'data'} + _toPy = {'status': 'status', 'error': 'error', 'info': 'info', 'since': 'since', 'life': 'life', 'id': 'id_', 'data': 'data'} def __init__(self, data=None, error=None, id_=None, info=None, life=None, since=None, status=None): ''' data : typing.Mapping[str, typing.Any] @@ -2911,8 +3239,8 @@ class StatusResult(Type): class StatusResults(Type): - _toSchema = {'results': 'Results'} - _toPy = {'Results': 'results'} + _toSchema = {'results': 'results'} + _toPy = {'results': 'results'} def __init__(self, results=None): ''' results : typing.Sequence[~StatusResult] @@ -2921,8 +3249,8 @@ class StatusResults(Type): class ListSSHKeys(Type): - _toSchema = {'mode': 'Mode', 'entities': 'Entities'} - _toPy = {'Entities': 'entities', 'Mode': 'mode'} + _toSchema = {'entities': 'entities', 'mode': 'mode'} + _toPy = {'entities': 'entities', 'mode': 'mode'} def __init__(self, entities=None, mode=None): ''' entities : Entities @@ -2933,14 +3261,14 @@ class ListSSHKeys(Type): class ModifyUserSSHKeys(Type): - _toSchema = {'keys': 'Keys', 'user': 'User'} - _toPy = {'User': 'user', 'Keys': 'keys'} - def __init__(self, keys=None, user=None): + _toSchema = {'ssh_keys': 'ssh-keys', 'user': 'user'} + _toPy = {'user': 'user', 'ssh-keys': 'ssh_keys'} + def __init__(self, ssh_keys=None, user=None): ''' - keys : typing.Sequence[str] + ssh_keys : typing.Sequence[str] user : str ''' - self.keys = keys + self.ssh_keys = ssh_keys self.user = user @@ -2955,8 +3283,8 @@ class ApplicationTag(Type): class ClaimLeadershipBulkParams(Type): - _toSchema = {'params': 'Params'} - _toPy = {'Params': 'params'} + _toSchema = {'params': 'params'} + _toPy = {'params': 'params'} def __init__(self, params=None): ''' params : typing.Sequence[~ClaimLeadershipParams] @@ -2965,8 +3293,8 @@ class ClaimLeadershipBulkParams(Type): class ClaimLeadershipBulkResults(Type): - _toSchema = {'results': 'Results'} - _toPy = {'Results': 'results'} + _toSchema = {'results': 'results'} + _toPy = {'results': 'results'} def __init__(self, results=None): ''' results : typing.Sequence[~ErrorResult] @@ -2975,30 +3303,96 @@ class ClaimLeadershipBulkResults(Type): class ClaimLeadershipParams(Type): - _toSchema = {'unittag': 'UnitTag', 'applicationtag': 'ApplicationTag', 'durationseconds': 'DurationSeconds'} - _toPy = {'UnitTag': 'unittag', 'DurationSeconds': 'durationseconds', 'ApplicationTag': 'applicationtag'} - def __init__(self, applicationtag=None, durationseconds=None, unittag=None): + _toSchema = {'unit_tag': 'unit-tag', 'duration': 'duration', 'application_tag': 'application-tag'} + _toPy = {'unit-tag': 'unit_tag', 'duration': 'duration', 'application-tag': 'application_tag'} + def __init__(self, application_tag=None, duration=None, unit_tag=None): + ''' + application_tag : str + duration : float + unit_tag : str + ''' + self.application_tag = application_tag + self.duration = duration + self.unit_tag = unit_tag + + +class LogForwardingGetLastSentParams(Type): + _toSchema = {'ids': 'ids'} + _toPy = {'ids': 'ids'} + def __init__(self, ids=None): + ''' + ids : typing.Sequence[~LogForwardingID] + ''' + self.ids = [LogForwardingID.from_json(o) for o in ids or []] + + +class LogForwardingGetLastSentResult(Type): + _toSchema = {'record_id': 'record-id', 'err': 'err'} + _toPy = {'record-id': 'record_id', 'err': 'err'} + def __init__(self, err=None, record_id=None): + ''' + err : Error + record_id : int + ''' + self.err = Error.from_json(err) if err else None + self.record_id = record_id + + +class LogForwardingGetLastSentResults(Type): + _toSchema = {'results': 'results'} + _toPy = {'results': 'results'} + def __init__(self, results=None): + ''' + results : typing.Sequence[~LogForwardingGetLastSentResult] ''' - applicationtag : str - durationseconds : float - unittag : str + self.results = [LogForwardingGetLastSentResult.from_json(o) for o in results or []] + + +class LogForwardingID(Type): + _toSchema = {'sink': 'sink', 'model': 'model'} + _toPy = {'sink': 'sink', 'model': 'model'} + def __init__(self, model=None, sink=None): + ''' + model : str + sink : str + ''' + self.model = model + self.sink = sink + + +class LogForwardingSetLastSentParam(Type): + _toSchema = {'record_id': 'record-id', 'logforwardingid': 'LogForwardingID'} + _toPy = {'record-id': 'record_id', 'LogForwardingID': 'logforwardingid'} + def __init__(self, logforwardingid=None, record_id=None): ''' - self.applicationtag = applicationtag - self.durationseconds = durationseconds - self.unittag = unittag + logforwardingid : LogForwardingID + record_id : int + ''' + self.logforwardingid = LogForwardingID.from_json(logforwardingid) if logforwardingid else None + self.record_id = record_id + + +class LogForwardingSetLastSentParams(Type): + _toSchema = {'params': 'params'} + _toPy = {'params': 'params'} + def __init__(self, params=None): + ''' + params : typing.Sequence[~LogForwardingSetLastSentParam] + ''' + self.params = [LogForwardingSetLastSentParam.from_json(o) for o in params or []] class ActionExecutionResult(Type): - _toSchema = {'message': 'message', 'results': 'results', 'actiontag': 'actiontag', 'status': 'status'} - _toPy = {'message': 'message', 'results': 'results', 'actiontag': 'actiontag', 'status': 'status'} - def __init__(self, actiontag=None, message=None, results=None, status=None): + _toSchema = {'status': 'status', 'action_tag': 'action-tag', 'results': 'results', 'message': 'message'} + _toPy = {'status': 'status', 'results': 'results', 'message': 'message', 'action-tag': 'action_tag'} + def __init__(self, action_tag=None, message=None, results=None, status=None): ''' - actiontag : str + action_tag : str message : str results : typing.Mapping[str, typing.Any] status : str ''' - self.actiontag = actiontag + self.action_tag = action_tag self.message = message self.results = results self.status = status @@ -3015,8 +3409,8 @@ class ActionExecutionResults(Type): class JobsResult(Type): - _toSchema = {'jobs': 'Jobs', 'error': 'Error'} - _toPy = {'Error': 'error', 'Jobs': 'jobs'} + _toSchema = {'jobs': 'jobs', 'error': 'error'} + _toPy = {'jobs': 'jobs', 'error': 'error'} def __init__(self, error=None, jobs=None): ''' error : Error @@ -3027,8 +3421,8 @@ class JobsResult(Type): class JobsResults(Type): - _toSchema = {'results': 'Results'} - _toPy = {'Results': 'results'} + _toSchema = {'results': 'results'} + _toPy = {'results': 'results'} def __init__(self, results=None): ''' results : typing.Sequence[~JobsResult] @@ -3037,56 +3431,56 @@ class JobsResults(Type): class NetworkConfig(Type): - _toSchema = {'mtu': 'MTU', 'disabled': 'Disabled', 'interfacename': 'InterfaceName', 'dnsservers': 'DNSServers', 'providerid': 'ProviderId', 'providersubnetid': 'ProviderSubnetId', 'deviceindex': 'DeviceIndex', 'vlantag': 'VLANTag', 'provideraddressid': 'ProviderAddressId', 'dnssearchdomains': 'DNSSearchDomains', 'noautostart': 'NoAutoStart', 'macaddress': 'MACAddress', 'address': 'Address', 'cidr': 'CIDR', 'interfacetype': 'InterfaceType', 'parentinterfacename': 'ParentInterfaceName', 'gatewayaddress': 'GatewayAddress', 'providervlanid': 'ProviderVLANId', 'configtype': 'ConfigType', 'providerspaceid': 'ProviderSpaceId'} - _toPy = {'InterfaceType': 'interfacetype', 'ConfigType': 'configtype', 'ProviderVLANId': 'providervlanid', 'ProviderAddressId': 'provideraddressid', 'Disabled': 'disabled', 'ProviderSpaceId': 'providerspaceid', 'GatewayAddress': 'gatewayaddress', 'InterfaceName': 'interfacename', 'ProviderSubnetId': 'providersubnetid', 'MTU': 'mtu', 'VLANTag': 'vlantag', 'NoAutoStart': 'noautostart', 'DNSServers': 'dnsservers', 'DNSSearchDomains': 'dnssearchdomains', 'DeviceIndex': 'deviceindex', 'Address': 'address', 'ProviderId': 'providerid', 'MACAddress': 'macaddress', 'CIDR': 'cidr', 'ParentInterfaceName': 'parentinterfacename'} - def __init__(self, address=None, cidr=None, configtype=None, dnssearchdomains=None, dnsservers=None, deviceindex=None, disabled=None, gatewayaddress=None, interfacename=None, interfacetype=None, macaddress=None, mtu=None, noautostart=None, parentinterfacename=None, provideraddressid=None, providerid=None, providerspaceid=None, providersubnetid=None, providervlanid=None, vlantag=None): + _toSchema = {'vlan_tag': 'vlan-tag', 'address': 'address', 'provider_space_id': 'provider-space-id', 'no_auto_start': 'no-auto-start', 'config_type': 'config-type', 'interface_name': 'interface-name', 'parent_interface_name': 'parent-interface-name', 'provider_vlan_id': 'provider-vlan-id', 'provider_address_id': 'provider-address-id', 'device_index': 'device-index', 'mac_address': 'mac-address', 'provider_id': 'provider-id', 'cidr': 'cidr', 'mtu': 'mtu', 'dns_search_domains': 'dns-search-domains', 'interface_type': 'interface-type', 'provider_subnet_id': 'provider-subnet-id', 'gateway_address': 'gateway-address', 'disabled': 'disabled', 'dns_servers': 'dns-servers'} + _toPy = {'address': 'address', 'device-index': 'device_index', 'provider-vlan-id': 'provider_vlan_id', 'provider-space-id': 'provider_space_id', 'vlan-tag': 'vlan_tag', 'mac-address': 'mac_address', 'provider-id': 'provider_id', 'provider-subnet-id': 'provider_subnet_id', 'provider-address-id': 'provider_address_id', 'no-auto-start': 'no_auto_start', 'interface-name': 'interface_name', 'mtu': 'mtu', 'dns-search-domains': 'dns_search_domains', 'interface-type': 'interface_type', 'cidr': 'cidr', 'dns-servers': 'dns_servers', 'config-type': 'config_type', 'gateway-address': 'gateway_address', 'parent-interface-name': 'parent_interface_name', 'disabled': 'disabled'} + def __init__(self, address=None, cidr=None, config_type=None, device_index=None, disabled=None, dns_search_domains=None, dns_servers=None, gateway_address=None, interface_name=None, interface_type=None, mac_address=None, mtu=None, no_auto_start=None, parent_interface_name=None, provider_address_id=None, provider_id=None, provider_space_id=None, provider_subnet_id=None, provider_vlan_id=None, vlan_tag=None): ''' address : str cidr : str - configtype : str - dnssearchdomains : typing.Sequence[str] - dnsservers : typing.Sequence[str] - deviceindex : int + config_type : str + device_index : int disabled : bool - gatewayaddress : str - interfacename : str - interfacetype : str - macaddress : str + dns_search_domains : typing.Sequence[str] + dns_servers : typing.Sequence[str] + gateway_address : str + interface_name : str + interface_type : str + mac_address : str mtu : int - noautostart : bool - parentinterfacename : str - provideraddressid : str - providerid : str - providerspaceid : str - providersubnetid : str - providervlanid : str - vlantag : int + no_auto_start : bool + parent_interface_name : str + provider_address_id : str + provider_id : str + provider_space_id : str + provider_subnet_id : str + provider_vlan_id : str + vlan_tag : int ''' self.address = address self.cidr = cidr - self.configtype = configtype - self.dnssearchdomains = dnssearchdomains - self.dnsservers = dnsservers - self.deviceindex = deviceindex + self.config_type = config_type + self.device_index = device_index self.disabled = disabled - self.gatewayaddress = gatewayaddress - self.interfacename = interfacename - self.interfacetype = interfacetype - self.macaddress = macaddress + self.dns_search_domains = dns_search_domains + self.dns_servers = dns_servers + self.gateway_address = gateway_address + self.interface_name = interface_name + self.interface_type = interface_type + self.mac_address = mac_address self.mtu = mtu - self.noautostart = noautostart - self.parentinterfacename = parentinterfacename - self.provideraddressid = provideraddressid - self.providerid = providerid - self.providerspaceid = providerspaceid - self.providersubnetid = providersubnetid - self.providervlanid = providervlanid - self.vlantag = vlantag + self.no_auto_start = no_auto_start + self.parent_interface_name = parent_interface_name + self.provider_address_id = provider_address_id + self.provider_id = provider_id + self.provider_space_id = provider_space_id + self.provider_subnet_id = provider_subnet_id + self.provider_vlan_id = provider_vlan_id + self.vlan_tag = vlan_tag class SetMachineNetworkConfig(Type): - _toSchema = {'config': 'Config', 'tag': 'Tag'} - _toPy = {'Tag': 'tag', 'Config': 'config'} + _toSchema = {'config': 'config', 'tag': 'tag'} + _toPy = {'config': 'config', 'tag': 'tag'} def __init__(self, config=None, tag=None): ''' config : typing.Sequence[~NetworkConfig] @@ -3097,8 +3491,8 @@ class SetMachineNetworkConfig(Type): class MeterStatusResult(Type): - _toSchema = {'code': 'Code', 'error': 'Error', 'info': 'Info'} - _toPy = {'Code': 'code', 'Error': 'error', 'Info': 'info'} + _toSchema = {'code': 'code', 'error': 'error', 'info': 'info'} + _toPy = {'code': 'code', 'error': 'error', 'info': 'info'} def __init__(self, code=None, error=None, info=None): ''' code : str @@ -3111,8 +3505,8 @@ class MeterStatusResult(Type): class MeterStatusResults(Type): - _toSchema = {'results': 'Results'} - _toPy = {'Results': 'results'} + _toSchema = {'results': 'results'} + _toPy = {'results': 'results'} def __init__(self, results=None): ''' results : typing.Sequence[~MeterStatusResult] @@ -3121,8 +3515,8 @@ class MeterStatusResults(Type): class Metric(Type): - _toSchema = {'key': 'Key', 'time': 'Time', 'value': 'Value'} - _toPy = {'Value': 'value', 'Key': 'key', 'Time': 'time'} + _toSchema = {'key': 'key', 'time': 'time', 'value': 'value'} + _toPy = {'key': 'key', 'time': 'time', 'value': 'value'} def __init__(self, key=None, time=None, value=None): ''' key : str @@ -3135,24 +3529,24 @@ class Metric(Type): class MetricBatch(Type): - _toSchema = {'charmurl': 'CharmURL', 'uuid': 'UUID', 'created': 'Created', 'metrics': 'Metrics'} - _toPy = {'CharmURL': 'charmurl', 'Metrics': 'metrics', 'Created': 'created', 'UUID': 'uuid'} - def __init__(self, charmurl=None, created=None, metrics=None, uuid=None): + _toSchema = {'created': 'created', 'uuid': 'uuid', 'charm_url': 'charm-url', 'metrics': 'metrics'} + _toPy = {'created': 'created', 'uuid': 'uuid', 'charm-url': 'charm_url', 'metrics': 'metrics'} + def __init__(self, charm_url=None, created=None, metrics=None, uuid=None): ''' - charmurl : str + charm_url : str created : str metrics : typing.Sequence[~Metric] uuid : str ''' - self.charmurl = charmurl + self.charm_url = charm_url self.created = created self.metrics = [Metric.from_json(o) for o in metrics or []] self.uuid = uuid class MetricBatchParam(Type): - _toSchema = {'batch': 'Batch', 'tag': 'Tag'} - _toPy = {'Tag': 'tag', 'Batch': 'batch'} + _toSchema = {'batch': 'batch', 'tag': 'tag'} + _toPy = {'batch': 'batch', 'tag': 'tag'} def __init__(self, batch=None, tag=None): ''' batch : MetricBatch @@ -3163,8 +3557,8 @@ class MetricBatchParam(Type): class MetricBatchParams(Type): - _toSchema = {'batches': 'Batches'} - _toPy = {'Batches': 'batches'} + _toSchema = {'batches': 'batches'} + _toPy = {'batches': 'batches'} def __init__(self, batches=None): ''' batches : typing.Sequence[~MetricBatchParam] @@ -3185,8 +3579,8 @@ class EntityMetrics(Type): class MeterStatusParam(Type): - _toSchema = {'code': 'code', 'tag': 'tag', 'info': 'info'} - _toPy = {'code': 'code', 'tag': 'tag', 'info': 'info'} + _toSchema = {'code': 'code', 'info': 'info', 'tag': 'tag'} + _toPy = {'code': 'code', 'info': 'info', 'tag': 'tag'} def __init__(self, code=None, info=None, tag=None): ''' code : str @@ -3233,8 +3627,8 @@ class MetricResults(Type): class PhaseResult(Type): - _toSchema = {'error': 'Error', 'phase': 'phase'} - _toPy = {'Error': 'error', 'phase': 'phase'} + _toSchema = {'error': 'error', 'phase': 'phase'} + _toPy = {'error': 'error', 'phase': 'phase'} def __init__(self, error=None, phase=None): ''' error : Error @@ -3245,8 +3639,8 @@ class PhaseResult(Type): class PhaseResults(Type): - _toSchema = {'results': 'Results'} - _toPy = {'Results': 'results'} + _toSchema = {'results': 'results'} + _toPy = {'results': 'results'} def __init__(self, results=None): ''' results : typing.Sequence[~PhaseResult] @@ -3255,8 +3649,8 @@ class PhaseResults(Type): class FullMigrationStatus(Type): - _toSchema = {'attempt': 'attempt', 'phase': 'phase', 'spec': 'spec'} - _toPy = {'attempt': 'attempt', 'phase': 'phase', 'spec': 'spec'} + _toSchema = {'phase': 'phase', 'spec': 'spec', 'attempt': 'attempt'} + _toPy = {'phase': 'phase', 'spec': 'spec', 'attempt': 'attempt'} def __init__(self, attempt=None, phase=None, spec=None): ''' attempt : int @@ -3289,8 +3683,8 @@ class SetMigrationPhaseArgs(Type): class MigrationStatus(Type): - _toSchema = {'attempt': 'attempt', 'source_api_addrs': 'source-api-addrs', 'target_api_addrs': 'target-api-addrs', 'source_ca_cert': 'source-ca-cert', 'phase': 'phase', 'target_ca_cert': 'target-ca-cert'} - _toPy = {'target-ca-cert': 'target_ca_cert', 'source-ca-cert': 'source_ca_cert', 'attempt': 'attempt', 'source-api-addrs': 'source_api_addrs', 'phase': 'phase', 'target-api-addrs': 'target_api_addrs'} + _toSchema = {'target_ca_cert': 'target-ca-cert', 'source_ca_cert': 'source-ca-cert', 'phase': 'phase', 'source_api_addrs': 'source-api-addrs', 'target_api_addrs': 'target-api-addrs', 'attempt': 'attempt'} + _toPy = {'phase': 'phase', 'source-ca-cert': 'source_ca_cert', 'source-api-addrs': 'source_api_addrs', 'target-api-addrs': 'target_api_addrs', 'target-ca-cert': 'target_ca_cert', 'attempt': 'attempt'} def __init__(self, attempt=None, phase=None, source_api_addrs=None, source_ca_cert=None, target_api_addrs=None, target_ca_cert=None): ''' attempt : int @@ -3319,22 +3713,26 @@ class ModelArgs(Type): class ModelCreateArgs(Type): - _toSchema = {'account': 'Account', 'ownertag': 'OwnerTag', 'config': 'Config'} - _toPy = {'Account': 'account', 'OwnerTag': 'ownertag', 'Config': 'config'} - def __init__(self, account=None, config=None, ownertag=None): + _toSchema = {'name': 'name', 'region': 'region', 'owner_tag': 'owner-tag', 'credential': 'credential', 'config': 'config'} + _toPy = {'name': 'name', 'region': 'region', 'owner-tag': 'owner_tag', 'credential': 'credential', 'config': 'config'} + def __init__(self, config=None, credential=None, name=None, owner_tag=None, region=None): ''' - account : typing.Mapping[str, typing.Any] config : typing.Mapping[str, typing.Any] - ownertag : str + credential : str + name : str + owner_tag : str + region : str ''' - self.account = account self.config = config - self.ownertag = ownertag + self.credential = credential + self.name = name + self.owner_tag = owner_tag + self.region = region class ModelInfoResult(Type): - _toSchema = {'result': 'result', 'error': 'error'} - _toPy = {'result': 'result', 'error': 'error'} + _toSchema = {'error': 'error', 'result': 'result'} + _toPy = {'error': 'error', 'result': 'result'} def __init__(self, error=None, result=None): ''' error : Error @@ -3354,21 +3752,9 @@ class ModelInfoResults(Type): self.results = [ModelInfoResult.from_json(o) for o in results or []] -class ModelSkeletonConfigArgs(Type): - _toSchema = {'region': 'Region', 'provider': 'Provider'} - _toPy = {'Provider': 'provider', 'Region': 'region'} - def __init__(self, provider=None, region=None): - ''' - provider : str - region : str - ''' - self.provider = provider - self.region = region - - class ModifyModelAccess(Type): - _toSchema = {'action': 'action', 'model_tag': 'model-tag', 'user_tag': 'user-tag', 'access': 'access'} - _toPy = {'user-tag': 'user_tag', 'action': 'action', 'model-tag': 'model_tag', 'access': 'access'} + _toSchema = {'access': 'access', 'user_tag': 'user-tag', 'model_tag': 'model-tag', 'action': 'action'} + _toPy = {'access': 'access', 'model-tag': 'model_tag', 'action': 'action', 'user-tag': 'user_tag'} def __init__(self, access=None, action=None, model_tag=None, user_tag=None): ''' access : str @@ -3393,8 +3779,8 @@ class ModifyModelAccessRequest(Type): class ConstraintsResult(Type): - _toSchema = {'constraints': 'Constraints', 'error': 'Error'} - _toPy = {'Constraints': 'constraints', 'Error': 'error'} + _toSchema = {'error': 'error', 'constraints': 'constraints'} + _toPy = {'error': 'error', 'constraints': 'constraints'} def __init__(self, constraints=None, error=None): ''' constraints : Value @@ -3405,8 +3791,8 @@ class ConstraintsResult(Type): class ConstraintsResults(Type): - _toSchema = {'results': 'Results'} - _toPy = {'Results': 'results'} + _toSchema = {'results': 'results'} + _toPy = {'results': 'results'} def __init__(self, results=None): ''' results : typing.Sequence[~ConstraintsResult] @@ -3415,42 +3801,40 @@ class ConstraintsResults(Type): class ContainerConfig(Type): - _toSchema = {'allowlxcloopmounts': 'AllowLXCLoopMounts', 'updatebehavior': 'UpdateBehavior', 'aptmirror': 'AptMirror', 'authorizedkeys': 'AuthorizedKeys', 'sslhostnameverification': 'SSLHostnameVerification', 'aptproxy': 'AptProxy', 'providertype': 'ProviderType', 'proxy': 'Proxy'} - _toPy = {'UpdateBehavior': 'updatebehavior', 'SSLHostnameVerification': 'sslhostnameverification', 'AptMirror': 'aptmirror', 'Proxy': 'proxy', 'AptProxy': 'aptproxy', 'AuthorizedKeys': 'authorizedkeys', 'AllowLXCLoopMounts': 'allowlxcloopmounts', 'ProviderType': 'providertype'} - def __init__(self, allowlxcloopmounts=None, aptmirror=None, aptproxy=None, authorizedkeys=None, providertype=None, proxy=None, sslhostnameverification=None, updatebehavior=None): - ''' - allowlxcloopmounts : bool - aptmirror : str - aptproxy : Settings - authorizedkeys : str - providertype : str - proxy : Settings - sslhostnameverification : bool + _toSchema = {'apt_proxy': 'apt-proxy', 'updatebehavior': 'UpdateBehavior', 'proxy': 'proxy', 'provider_type': 'provider-type', 'apt_mirror': 'apt-mirror', 'ssl_hostname_verification': 'ssl-hostname-verification', 'authorized_keys': 'authorized-keys'} + _toPy = {'proxy': 'proxy', 'UpdateBehavior': 'updatebehavior', 'provider-type': 'provider_type', 'authorized-keys': 'authorized_keys', 'ssl-hostname-verification': 'ssl_hostname_verification', 'apt-proxy': 'apt_proxy', 'apt-mirror': 'apt_mirror'} + def __init__(self, updatebehavior=None, apt_mirror=None, apt_proxy=None, authorized_keys=None, provider_type=None, proxy=None, ssl_hostname_verification=None): + ''' updatebehavior : UpdateBehavior + apt_mirror : str + apt_proxy : Settings + authorized_keys : str + provider_type : str + proxy : Settings + ssl_hostname_verification : bool ''' - self.allowlxcloopmounts = allowlxcloopmounts - self.aptmirror = aptmirror - self.aptproxy = Settings.from_json(aptproxy) if aptproxy else None - self.authorizedkeys = authorizedkeys - self.providertype = providertype - self.proxy = Settings.from_json(proxy) if proxy else None - self.sslhostnameverification = sslhostnameverification self.updatebehavior = UpdateBehavior.from_json(updatebehavior) if updatebehavior else None + self.apt_mirror = apt_mirror + self.apt_proxy = Settings.from_json(apt_proxy) if apt_proxy else None + self.authorized_keys = authorized_keys + self.provider_type = provider_type + self.proxy = Settings.from_json(proxy) if proxy else None + self.ssl_hostname_verification = ssl_hostname_verification class ContainerManagerConfig(Type): - _toSchema = {'managerconfig': 'ManagerConfig'} - _toPy = {'ManagerConfig': 'managerconfig'} - def __init__(self, managerconfig=None): + _toSchema = {'config': 'config'} + _toPy = {'config': 'config'} + def __init__(self, config=None): ''' - managerconfig : typing.Mapping[str, str] + config : typing.Mapping[str, str] ''' - self.managerconfig = managerconfig + self.config = config class ContainerManagerConfigParams(Type): - _toSchema = {'type_': 'Type'} - _toPy = {'Type': 'type_'} + _toSchema = {'type_': 'type'} + _toPy = {'type': 'type_'} def __init__(self, type_=None): ''' type_ : str @@ -3459,8 +3843,8 @@ class ContainerManagerConfigParams(Type): class DistributionGroupResult(Type): - _toSchema = {'result': 'Result', 'error': 'Error'} - _toPy = {'Result': 'result', 'Error': 'error'} + _toSchema = {'error': 'error', 'result': 'result'} + _toPy = {'error': 'error', 'result': 'result'} def __init__(self, error=None, result=None): ''' error : Error @@ -3471,8 +3855,8 @@ class DistributionGroupResult(Type): class DistributionGroupResults(Type): - _toSchema = {'results': 'Results'} - _toPy = {'Results': 'results'} + _toSchema = {'results': 'results'} + _toPy = {'results': 'results'} def __init__(self, results=None): ''' results : typing.Sequence[~DistributionGroupResult] @@ -3481,30 +3865,30 @@ class DistributionGroupResults(Type): class InstanceInfo(Type): - _toSchema = {'networkconfig': 'NetworkConfig', 'nonce': 'Nonce', 'characteristics': 'Characteristics', 'volumeattachments': 'VolumeAttachments', 'instanceid': 'InstanceId', 'tag': 'Tag', 'volumes': 'Volumes'} - _toPy = {'Characteristics': 'characteristics', 'InstanceId': 'instanceid', 'Volumes': 'volumes', 'Nonce': 'nonce', 'VolumeAttachments': 'volumeattachments', 'Tag': 'tag', 'NetworkConfig': 'networkconfig'} - def __init__(self, characteristics=None, instanceid=None, networkconfig=None, nonce=None, tag=None, volumeattachments=None, volumes=None): + _toSchema = {'network_config': 'network-config', 'volume_attachments': 'volume-attachments', 'nonce': 'nonce', 'tag': 'tag', 'characteristics': 'characteristics', 'volumes': 'volumes', 'instance_id': 'instance-id'} + _toPy = {'nonce': 'nonce', 'tag': 'tag', 'network-config': 'network_config', 'characteristics': 'characteristics', 'instance-id': 'instance_id', 'volume-attachments': 'volume_attachments', 'volumes': 'volumes'} + def __init__(self, characteristics=None, instance_id=None, network_config=None, nonce=None, tag=None, volume_attachments=None, volumes=None): ''' characteristics : HardwareCharacteristics - instanceid : str - networkconfig : typing.Sequence[~NetworkConfig] + instance_id : str + network_config : typing.Sequence[~NetworkConfig] nonce : str tag : str - volumeattachments : typing.Mapping[str, ~VolumeAttachmentInfo] + volume_attachments : typing.Mapping[str, ~VolumeAttachmentInfo] volumes : typing.Sequence[~Volume] ''' self.characteristics = HardwareCharacteristics.from_json(characteristics) if characteristics else None - self.instanceid = instanceid - self.networkconfig = [NetworkConfig.from_json(o) for o in networkconfig or []] + self.instance_id = instance_id + self.network_config = [NetworkConfig.from_json(o) for o in network_config or []] self.nonce = nonce self.tag = tag - self.volumeattachments = {k: VolumeAttachmentInfo.from_json(v) for k, v in (volumeattachments or dict()).items()} + self.volume_attachments = {k: VolumeAttachmentInfo.from_json(v) for k, v in (volume_attachments or dict()).items()} self.volumes = [Volume.from_json(o) for o in volumes or []] class InstancesInfo(Type): - _toSchema = {'machines': 'Machines'} - _toPy = {'Machines': 'machines'} + _toSchema = {'machines': 'machines'} + _toPy = {'machines': 'machines'} def __init__(self, machines=None): ''' machines : typing.Sequence[~InstanceInfo] @@ -3513,20 +3897,20 @@ class InstancesInfo(Type): class MachineContainers(Type): - _toSchema = {'containertypes': 'ContainerTypes', 'machinetag': 'MachineTag'} - _toPy = {'MachineTag': 'machinetag', 'ContainerTypes': 'containertypes'} - def __init__(self, containertypes=None, machinetag=None): + _toSchema = {'machine_tag': 'machine-tag', 'container_types': 'container-types'} + _toPy = {'machine-tag': 'machine_tag', 'container-types': 'container_types'} + def __init__(self, container_types=None, machine_tag=None): ''' - containertypes : typing.Sequence[str] - machinetag : str + container_types : typing.Sequence[str] + machine_tag : str ''' - self.containertypes = containertypes - self.machinetag = machinetag + self.container_types = container_types + self.machine_tag = machine_tag class MachineContainersParams(Type): - _toSchema = {'params': 'Params'} - _toPy = {'Params': 'params'} + _toSchema = {'params': 'params'} + _toPy = {'params': 'params'} def __init__(self, params=None): ''' params : typing.Sequence[~MachineContainers] @@ -3535,8 +3919,8 @@ class MachineContainersParams(Type): class MachineNetworkConfigResult(Type): - _toSchema = {'info': 'Info', 'error': 'Error'} - _toPy = {'Error': 'error', 'Info': 'info'} + _toSchema = {'error': 'error', 'info': 'info'} + _toPy = {'error': 'error', 'info': 'info'} def __init__(self, error=None, info=None): ''' error : Error @@ -3547,8 +3931,8 @@ class MachineNetworkConfigResult(Type): class MachineNetworkConfigResults(Type): - _toSchema = {'results': 'Results'} - _toPy = {'Results': 'results'} + _toSchema = {'results': 'results'} + _toPy = {'results': 'results'} def __init__(self, results=None): ''' results : typing.Sequence[~MachineNetworkConfigResult] @@ -3557,34 +3941,36 @@ class MachineNetworkConfigResults(Type): class ProvisioningInfo(Type): - _toSchema = {'jobs': 'Jobs', 'series': 'Series', 'imagemetadata': 'ImageMetadata', 'placement': 'Placement', 'subnetstozones': 'SubnetsToZones', 'constraints': 'Constraints', 'tags': 'Tags', 'endpointbindings': 'EndpointBindings', 'volumes': 'Volumes'} - _toPy = {'Constraints': 'constraints', 'ImageMetadata': 'imagemetadata', 'SubnetsToZones': 'subnetstozones', 'Series': 'series', 'Volumes': 'volumes', 'Tags': 'tags', 'EndpointBindings': 'endpointbindings', 'Placement': 'placement', 'Jobs': 'jobs'} - def __init__(self, constraints=None, endpointbindings=None, imagemetadata=None, jobs=None, placement=None, series=None, subnetstozones=None, tags=None, volumes=None): + _toSchema = {'image_metadata': 'image-metadata', 'jobs': 'jobs', 'tags': 'tags', 'constraints': 'constraints', 'placement': 'placement', 'volumes': 'volumes', 'series': 'series', 'subnets_to_zones': 'subnets-to-zones', 'controller_config': 'controller-config', 'endpoint_bindings': 'endpoint-bindings'} + _toPy = {'jobs': 'jobs', 'placement': 'placement', 'tags': 'tags', 'subnets-to-zones': 'subnets_to_zones', 'constraints': 'constraints', 'endpoint-bindings': 'endpoint_bindings', 'image-metadata': 'image_metadata', 'controller-config': 'controller_config', 'series': 'series', 'volumes': 'volumes'} + def __init__(self, constraints=None, controller_config=None, endpoint_bindings=None, image_metadata=None, jobs=None, placement=None, series=None, subnets_to_zones=None, tags=None, volumes=None): ''' constraints : Value - endpointbindings : typing.Mapping[str, str] - imagemetadata : typing.Sequence[~CloudImageMetadata] + controller_config : typing.Mapping[str, typing.Any] + endpoint_bindings : typing.Mapping[str, str] + image_metadata : typing.Sequence[~CloudImageMetadata] jobs : typing.Sequence[str] placement : str series : str - subnetstozones : typing.Sequence[str] + subnets_to_zones : typing.Sequence[str] tags : typing.Mapping[str, str] volumes : typing.Sequence[~VolumeParams] ''' self.constraints = Value.from_json(constraints) if constraints else None - self.endpointbindings = endpointbindings - self.imagemetadata = [CloudImageMetadata.from_json(o) for o in imagemetadata or []] + self.controller_config = controller_config + self.endpoint_bindings = endpoint_bindings + self.image_metadata = [CloudImageMetadata.from_json(o) for o in image_metadata or []] self.jobs = jobs self.placement = placement self.series = series - self.subnetstozones = subnetstozones + self.subnets_to_zones = subnets_to_zones self.tags = tags self.volumes = [VolumeParams.from_json(o) for o in volumes or []] class ProvisioningInfoResult(Type): - _toSchema = {'result': 'Result', 'error': 'Error'} - _toPy = {'Result': 'result', 'Error': 'error'} + _toSchema = {'error': 'error', 'result': 'result'} + _toPy = {'error': 'error', 'result': 'result'} def __init__(self, error=None, result=None): ''' error : Error @@ -3595,8 +3981,8 @@ class ProvisioningInfoResult(Type): class ProvisioningInfoResults(Type): - _toSchema = {'results': 'Results'} - _toPy = {'Results': 'results'} + _toSchema = {'results': 'results'} + _toPy = {'results': 'results'} def __init__(self, results=None): ''' results : typing.Sequence[~ProvisioningInfoResult] @@ -3605,8 +3991,8 @@ class ProvisioningInfoResults(Type): class Settings(Type): - _toSchema = {'ftp': 'Ftp', 'noproxy': 'NoProxy', 'http': 'Http', 'https': 'Https'} - _toPy = {'Http': 'http', 'Https': 'https', 'NoProxy': 'noproxy', 'Ftp': 'ftp'} + _toSchema = {'ftp': 'Ftp', 'https': 'Https', 'http': 'Http', 'noproxy': 'NoProxy'} + _toPy = {'Ftp': 'ftp', 'Http': 'http', 'Https': 'https', 'NoProxy': 'noproxy'} def __init__(self, ftp=None, http=None, https=None, noproxy=None): ''' ftp : str @@ -3621,22 +4007,22 @@ class Settings(Type): class ToolsResult(Type): - _toSchema = {'toolslist': 'ToolsList', 'disablesslhostnameverification': 'DisableSSLHostnameVerification', 'error': 'Error'} - _toPy = {'Error': 'error', 'DisableSSLHostnameVerification': 'disablesslhostnameverification', 'ToolsList': 'toolslist'} - def __init__(self, disablesslhostnameverification=None, error=None, toolslist=None): + _toSchema = {'tools': 'tools', 'disable_ssl_hostname_verification': 'disable-ssl-hostname-verification', 'error': 'error'} + _toPy = {'disable-ssl-hostname-verification': 'disable_ssl_hostname_verification', 'error': 'error', 'tools': 'tools'} + def __init__(self, disable_ssl_hostname_verification=None, error=None, tools=None): ''' - disablesslhostnameverification : bool + disable_ssl_hostname_verification : bool error : Error - toolslist : typing.Sequence[~Tools] + tools : typing.Sequence[~Tools] ''' - self.disablesslhostnameverification = disablesslhostnameverification + self.disable_ssl_hostname_verification = disable_ssl_hostname_verification self.error = Error.from_json(error) if error else None - self.toolslist = [Tools.from_json(o) for o in toolslist or []] + self.tools = [Tools.from_json(o) for o in tools or []] class ToolsResults(Type): - _toSchema = {'results': 'Results'} - _toPy = {'Results': 'results'} + _toSchema = {'results': 'results'} + _toPy = {'results': 'results'} def __init__(self, results=None): ''' results : typing.Sequence[~ToolsResult] @@ -3645,116 +4031,116 @@ class ToolsResults(Type): class UpdateBehavior(Type): - _toSchema = {'enableosupgrade': 'EnableOSUpgrade', 'enableosrefreshupdate': 'EnableOSRefreshUpdate'} - _toPy = {'EnableOSRefreshUpdate': 'enableosrefreshupdate', 'EnableOSUpgrade': 'enableosupgrade'} - def __init__(self, enableosrefreshupdate=None, enableosupgrade=None): + _toSchema = {'enable_os_upgrade': 'enable-os-upgrade', 'enable_os_refresh_update': 'enable-os-refresh-update'} + _toPy = {'enable-os-upgrade': 'enable_os_upgrade', 'enable-os-refresh-update': 'enable_os_refresh_update'} + def __init__(self, enable_os_refresh_update=None, enable_os_upgrade=None): ''' - enableosrefreshupdate : bool - enableosupgrade : bool + enable_os_refresh_update : bool + enable_os_upgrade : bool ''' - self.enableosrefreshupdate = enableosrefreshupdate - self.enableosupgrade = enableosupgrade + self.enable_os_refresh_update = enable_os_refresh_update + self.enable_os_upgrade = enable_os_upgrade class Volume(Type): - _toSchema = {'volumetag': 'volumetag', 'info': 'info'} - _toPy = {'volumetag': 'volumetag', 'info': 'info'} - def __init__(self, info=None, volumetag=None): + _toSchema = {'info': 'info', 'volume_tag': 'volume-tag'} + _toPy = {'volume-tag': 'volume_tag', 'info': 'info'} + def __init__(self, info=None, volume_tag=None): ''' info : VolumeInfo - volumetag : str + volume_tag : str ''' self.info = VolumeInfo.from_json(info) if info else None - self.volumetag = volumetag + self.volume_tag = volume_tag class VolumeAttachmentInfo(Type): - _toSchema = {'read_only': 'read-only', 'devicelink': 'devicelink', 'busaddress': 'busaddress', 'devicename': 'devicename'} - _toPy = {'devicelink': 'devicelink', 'busaddress': 'busaddress', 'devicename': 'devicename', 'read-only': 'read_only'} - def __init__(self, busaddress=None, devicelink=None, devicename=None, read_only=None): + _toSchema = {'bus_address': 'bus-address', 'device_link': 'device-link', 'read_only': 'read-only', 'device_name': 'device-name'} + _toPy = {'device-link': 'device_link', 'bus-address': 'bus_address', 'device-name': 'device_name', 'read-only': 'read_only'} + def __init__(self, bus_address=None, device_link=None, device_name=None, read_only=None): ''' - busaddress : str - devicelink : str - devicename : str + bus_address : str + device_link : str + device_name : str read_only : bool ''' - self.busaddress = busaddress - self.devicelink = devicelink - self.devicename = devicename + self.bus_address = bus_address + self.device_link = device_link + self.device_name = device_name self.read_only = read_only class VolumeAttachmentParams(Type): - _toSchema = {'volumetag': 'volumetag', 'read_only': 'read-only', 'provider': 'provider', 'volumeid': 'volumeid', 'instanceid': 'instanceid', 'machinetag': 'machinetag'} - _toPy = {'volumetag': 'volumetag', 'provider': 'provider', 'read-only': 'read_only', 'volumeid': 'volumeid', 'instanceid': 'instanceid', 'machinetag': 'machinetag'} - def __init__(self, instanceid=None, machinetag=None, provider=None, read_only=None, volumeid=None, volumetag=None): + _toSchema = {'volume_id': 'volume-id', 'machine_tag': 'machine-tag', 'instance_id': 'instance-id', 'provider': 'provider', 'volume_tag': 'volume-tag', 'read_only': 'read-only'} + _toPy = {'machine-tag': 'machine_tag', 'volume-tag': 'volume_tag', 'volume-id': 'volume_id', 'provider': 'provider', 'read-only': 'read_only', 'instance-id': 'instance_id'} + def __init__(self, instance_id=None, machine_tag=None, provider=None, read_only=None, volume_id=None, volume_tag=None): ''' - instanceid : str - machinetag : str + instance_id : str + machine_tag : str provider : str read_only : bool - volumeid : str - volumetag : str + volume_id : str + volume_tag : str ''' - self.instanceid = instanceid - self.machinetag = machinetag + self.instance_id = instance_id + self.machine_tag = machine_tag self.provider = provider self.read_only = read_only - self.volumeid = volumeid - self.volumetag = volumetag + self.volume_id = volume_id + self.volume_tag = volume_tag class VolumeInfo(Type): - _toSchema = {'hardwareid': 'hardwareid', 'persistent': 'persistent', 'size': 'size', 'volumeid': 'volumeid'} - _toPy = {'hardwareid': 'hardwareid', 'persistent': 'persistent', 'size': 'size', 'volumeid': 'volumeid'} - def __init__(self, hardwareid=None, persistent=None, size=None, volumeid=None): + _toSchema = {'volume_id': 'volume-id', 'persistent': 'persistent', 'size': 'size', 'hardware_id': 'hardware-id'} + _toPy = {'hardware-id': 'hardware_id', 'persistent': 'persistent', 'size': 'size', 'volume-id': 'volume_id'} + def __init__(self, hardware_id=None, persistent=None, size=None, volume_id=None): ''' - hardwareid : str + hardware_id : str persistent : bool size : int - volumeid : str + volume_id : str ''' - self.hardwareid = hardwareid + self.hardware_id = hardware_id self.persistent = persistent self.size = size - self.volumeid = volumeid + self.volume_id = volume_id class VolumeParams(Type): - _toSchema = {'attachment': 'attachment', 'attributes': 'attributes', 'size': 'size', 'volumetag': 'volumetag', 'tags': 'tags', 'provider': 'provider'} - _toPy = {'attachment': 'attachment', 'attributes': 'attributes', 'size': 'size', 'volumetag': 'volumetag', 'tags': 'tags', 'provider': 'provider'} - def __init__(self, attachment=None, attributes=None, provider=None, size=None, tags=None, volumetag=None): + _toSchema = {'tags': 'tags', 'provider': 'provider', 'size': 'size', 'attachment': 'attachment', 'attributes': 'attributes', 'volume_tag': 'volume-tag'} + _toPy = {'volume-tag': 'volume_tag', 'tags': 'tags', 'provider': 'provider', 'size': 'size', 'attachment': 'attachment', 'attributes': 'attributes'} + def __init__(self, attachment=None, attributes=None, provider=None, size=None, tags=None, volume_tag=None): ''' attachment : VolumeAttachmentParams attributes : typing.Mapping[str, typing.Any] provider : str size : int tags : typing.Mapping[str, str] - volumetag : str + volume_tag : str ''' self.attachment = VolumeAttachmentParams.from_json(attachment) if attachment else None self.attributes = attributes self.provider = provider self.size = size self.tags = tags - self.volumetag = volumetag + self.volume_tag = volume_tag class WatchContainer(Type): - _toSchema = {'machinetag': 'MachineTag', 'containertype': 'ContainerType'} - _toPy = {'MachineTag': 'machinetag', 'ContainerType': 'containertype'} - def __init__(self, containertype=None, machinetag=None): + _toSchema = {'machine_tag': 'machine-tag', 'container_type': 'container-type'} + _toPy = {'machine-tag': 'machine_tag', 'container-type': 'container_type'} + def __init__(self, container_type=None, machine_tag=None): ''' - containertype : str - machinetag : str + container_type : str + machine_tag : str ''' - self.containertype = containertype - self.machinetag = machinetag + self.container_type = container_type + self.machine_tag = machine_tag class WatchContainers(Type): - _toSchema = {'params': 'Params'} - _toPy = {'Params': 'params'} + _toSchema = {'params': 'params'} + _toPy = {'params': 'params'} def __init__(self, params=None): ''' params : typing.Sequence[~WatchContainer] @@ -3763,38 +4149,38 @@ class WatchContainers(Type): class ProxyConfig(Type): - _toSchema = {'ftp': 'FTP', 'noproxy': 'NoProxy', 'http': 'HTTP', 'https': 'HTTPS'} - _toPy = {'NoProxy': 'noproxy', 'FTP': 'ftp', 'HTTPS': 'https', 'HTTP': 'http'} - def __init__(self, ftp=None, http=None, https=None, noproxy=None): + _toSchema = {'ftp': 'ftp', 'no_proxy': 'no-proxy', 'https': 'https', 'http': 'http'} + _toPy = {'ftp': 'ftp', 'no-proxy': 'no_proxy', 'https': 'https', 'http': 'http'} + def __init__(self, ftp=None, http=None, https=None, no_proxy=None): ''' ftp : str http : str https : str - noproxy : str + no_proxy : str ''' self.ftp = ftp self.http = http self.https = https - self.noproxy = noproxy + self.no_proxy = no_proxy class ProxyConfigResult(Type): - _toSchema = {'proxysettings': 'ProxySettings', 'aptproxysettings': 'APTProxySettings', 'error': 'Error'} - _toPy = {'ProxySettings': 'proxysettings', 'APTProxySettings': 'aptproxysettings', 'Error': 'error'} - def __init__(self, aptproxysettings=None, error=None, proxysettings=None): + _toSchema = {'error': 'error', 'proxy_settings': 'proxy-settings', 'apt_proxy_settings': 'apt-proxy-settings'} + _toPy = {'proxy-settings': 'proxy_settings', 'error': 'error', 'apt-proxy-settings': 'apt_proxy_settings'} + def __init__(self, apt_proxy_settings=None, error=None, proxy_settings=None): ''' - aptproxysettings : ProxyConfig + apt_proxy_settings : ProxyConfig error : Error - proxysettings : ProxyConfig + proxy_settings : ProxyConfig ''' - self.aptproxysettings = ProxyConfig.from_json(aptproxysettings) if aptproxysettings else None + self.apt_proxy_settings = ProxyConfig.from_json(apt_proxy_settings) if apt_proxy_settings else None self.error = Error.from_json(error) if error else None - self.proxysettings = ProxyConfig.from_json(proxysettings) if proxysettings else None + self.proxy_settings = ProxyConfig.from_json(proxy_settings) if proxy_settings else None class ProxyConfigResults(Type): - _toSchema = {'results': 'Results'} - _toPy = {'Results': 'results'} + _toSchema = {'results': 'results'} + _toPy = {'results': 'results'} def __init__(self, results=None): ''' results : typing.Sequence[~ProxyConfigResult] @@ -3803,8 +4189,8 @@ class ProxyConfigResults(Type): class RebootActionResult(Type): - _toSchema = {'result': 'result', 'error': 'error'} - _toPy = {'result': 'result', 'error': 'error'} + _toSchema = {'error': 'error', 'result': 'result'} + _toPy = {'error': 'error', 'result': 'result'} def __init__(self, error=None, result=None): ''' error : Error @@ -3825,8 +4211,8 @@ class RebootActionResults(Type): class RelationUnitsChange(Type): - _toSchema = {'departed': 'Departed', 'changed': 'Changed'} - _toPy = {'Changed': 'changed', 'Departed': 'departed'} + _toSchema = {'changed': 'changed', 'departed': 'departed'} + _toPy = {'changed': 'changed', 'departed': 'departed'} def __init__(self, changed=None, departed=None): ''' changed : typing.Mapping[str, ~UnitSettings] @@ -3837,22 +4223,22 @@ class RelationUnitsChange(Type): class RelationUnitsWatchResult(Type): - _toSchema = {'changes': 'Changes', 'relationunitswatcherid': 'RelationUnitsWatcherId', 'error': 'Error'} - _toPy = {'Changes': 'changes', 'RelationUnitsWatcherId': 'relationunitswatcherid', 'Error': 'error'} - def __init__(self, changes=None, error=None, relationunitswatcherid=None): + _toSchema = {'error': 'error', 'changes': 'changes', 'watcher_id': 'watcher-id'} + _toPy = {'error': 'error', 'changes': 'changes', 'watcher-id': 'watcher_id'} + def __init__(self, changes=None, error=None, watcher_id=None): ''' changes : RelationUnitsChange error : Error - relationunitswatcherid : str + watcher_id : str ''' self.changes = RelationUnitsChange.from_json(changes) if changes else None self.error = Error.from_json(error) if error else None - self.relationunitswatcherid = relationunitswatcherid + self.watcher_id = watcher_id class UnitSettings(Type): - _toSchema = {'version': 'Version'} - _toPy = {'Version': 'version'} + _toSchema = {'version': 'version'} + _toPy = {'version': 'version'} def __init__(self, version=None): ''' version : int @@ -3861,26 +4247,26 @@ class UnitSettings(Type): class RetryStrategy(Type): - _toSchema = {'jitterretrytime': 'JitterRetryTime', 'shouldretry': 'ShouldRetry', 'minretrytime': 'MinRetryTime', 'retrytimefactor': 'RetryTimeFactor', 'maxretrytime': 'MaxRetryTime'} - _toPy = {'MinRetryTime': 'minretrytime', 'JitterRetryTime': 'jitterretrytime', 'RetryTimeFactor': 'retrytimefactor', 'MaxRetryTime': 'maxretrytime', 'ShouldRetry': 'shouldretry'} - def __init__(self, jitterretrytime=None, maxretrytime=None, minretrytime=None, retrytimefactor=None, shouldretry=None): + _toSchema = {'min_retry_time': 'min-retry-time', 'should_retry': 'should-retry', 'retry_time_factor': 'retry-time-factor', 'max_retry_time': 'max-retry-time', 'jitter_retry_time': 'jitter-retry-time'} + _toPy = {'retry-time-factor': 'retry_time_factor', 'min-retry-time': 'min_retry_time', 'jitter-retry-time': 'jitter_retry_time', 'should-retry': 'should_retry', 'max-retry-time': 'max_retry_time'} + def __init__(self, jitter_retry_time=None, max_retry_time=None, min_retry_time=None, retry_time_factor=None, should_retry=None): ''' - jitterretrytime : bool - maxretrytime : int - minretrytime : int - retrytimefactor : int - shouldretry : bool + jitter_retry_time : bool + max_retry_time : int + min_retry_time : int + retry_time_factor : int + should_retry : bool ''' - self.jitterretrytime = jitterretrytime - self.maxretrytime = maxretrytime - self.minretrytime = minretrytime - self.retrytimefactor = retrytimefactor - self.shouldretry = shouldretry + self.jitter_retry_time = jitter_retry_time + self.max_retry_time = max_retry_time + self.min_retry_time = min_retry_time + self.retry_time_factor = retry_time_factor + self.should_retry = should_retry class RetryStrategyResult(Type): - _toSchema = {'result': 'Result', 'error': 'Error'} - _toPy = {'Result': 'result', 'Error': 'error'} + _toSchema = {'error': 'error', 'result': 'result'} + _toPy = {'error': 'error', 'result': 'result'} def __init__(self, error=None, result=None): ''' error : Error @@ -3891,8 +4277,8 @@ class RetryStrategyResult(Type): class RetryStrategyResults(Type): - _toSchema = {'results': 'Results'} - _toPy = {'Results': 'results'} + _toSchema = {'results': 'results'} + _toPy = {'results': 'results'} def __init__(self, results=None): ''' results : typing.Sequence[~RetryStrategyResult] @@ -3933,8 +4319,8 @@ class SSHProxyResult(Type): class SSHPublicKeysResult(Type): - _toSchema = {'public_keys': 'public-keys', 'error': 'error'} - _toPy = {'public-keys': 'public_keys', 'error': 'error'} + _toSchema = {'error': 'error', 'public_keys': 'public-keys'} + _toPy = {'error': 'error', 'public-keys': 'public_keys'} def __init__(self, error=None, public_keys=None): ''' error : Error @@ -3955,22 +4341,22 @@ class SSHPublicKeysResults(Type): class SingularClaim(Type): - _toSchema = {'controllertag': 'ControllerTag', 'duration': 'Duration', 'modeltag': 'ModelTag'} - _toPy = {'ModelTag': 'modeltag', 'ControllerTag': 'controllertag', 'Duration': 'duration'} - def __init__(self, controllertag=None, duration=None, modeltag=None): + _toSchema = {'model_tag': 'model-tag', 'duration': 'duration', 'controller_tag': 'controller-tag'} + _toPy = {'model-tag': 'model_tag', 'duration': 'duration', 'controller-tag': 'controller_tag'} + def __init__(self, controller_tag=None, duration=None, model_tag=None): ''' - controllertag : str + controller_tag : str duration : int - modeltag : str + model_tag : str ''' - self.controllertag = controllertag + self.controller_tag = controller_tag self.duration = duration - self.modeltag = modeltag + self.model_tag = model_tag class SingularClaims(Type): - _toSchema = {'claims': 'Claims'} - _toPy = {'Claims': 'claims'} + _toSchema = {'claims': 'claims'} + _toPy = {'claims': 'claims'} def __init__(self, claims=None): ''' claims : typing.Sequence[~SingularClaim] @@ -3979,8 +4365,8 @@ class SingularClaims(Type): class ListSpacesResults(Type): - _toSchema = {'results': 'Results'} - _toPy = {'Results': 'results'} + _toSchema = {'results': 'results'} + _toPy = {'results': 'results'} def __init__(self, results=None): ''' results : typing.Sequence[~Space] @@ -3989,8 +4375,8 @@ class ListSpacesResults(Type): class Space(Type): - _toSchema = {'subnets': 'Subnets', 'error': 'Error', 'name': 'Name'} - _toPy = {'Subnets': 'subnets', 'Error': 'error', 'Name': 'name'} + _toSchema = {'name': 'name', 'error': 'error', 'subnets': 'subnets'} + _toPy = {'name': 'name', 'error': 'error', 'subnets': 'subnets'} def __init__(self, error=None, name=None, subnets=None): ''' error : Error @@ -4003,52 +4389,52 @@ class Space(Type): class StatusHistoryPruneArgs(Type): - _toSchema = {'maxhistorytime': 'MaxHistoryTime', 'maxhistorymb': 'MaxHistoryMB'} - _toPy = {'MaxHistoryTime': 'maxhistorytime', 'MaxHistoryMB': 'maxhistorymb'} - def __init__(self, maxhistorymb=None, maxhistorytime=None): + _toSchema = {'max_history_mb': 'max-history-mb', 'max_history_time': 'max-history-time'} + _toPy = {'max-history-mb': 'max_history_mb', 'max-history-time': 'max_history_time'} + def __init__(self, max_history_mb=None, max_history_time=None): ''' - maxhistorymb : int - maxhistorytime : int + max_history_mb : int + max_history_time : int ''' - self.maxhistorymb = maxhistorymb - self.maxhistorytime = maxhistorytime + self.max_history_mb = max_history_mb + self.max_history_time = max_history_time class FilesystemAttachmentInfo(Type): - _toSchema = {'mountpoint': 'mountpoint', 'read_only': 'read-only'} - _toPy = {'mountpoint': 'mountpoint', 'read-only': 'read_only'} - def __init__(self, mountpoint=None, read_only=None): + _toSchema = {'mount_point': 'mount-point', 'read_only': 'read-only'} + _toPy = {'read-only': 'read_only', 'mount-point': 'mount_point'} + def __init__(self, mount_point=None, read_only=None): ''' - mountpoint : str + mount_point : str read_only : bool ''' - self.mountpoint = mountpoint + self.mount_point = mount_point self.read_only = read_only class FilesystemDetails(Type): - _toSchema = {'machineattachments': 'machineattachments', 'info': 'info', 'volumetag': 'volumetag', 'filesystemtag': 'filesystemtag', 'storage': 'storage', 'status': 'status'} - _toPy = {'machineattachments': 'machineattachments', 'info': 'info', 'volumetag': 'volumetag', 'filesystemtag': 'filesystemtag', 'storage': 'storage', 'status': 'status'} - def __init__(self, filesystemtag=None, info=None, machineattachments=None, status=None, storage=None, volumetag=None): + _toSchema = {'status': 'status', 'filesystem_tag': 'filesystem-tag', 'info': 'info', 'storage': 'storage', 'machine_attachments': 'machine-attachments', 'volume_tag': 'volume-tag'} + _toPy = {'status': 'status', 'volume-tag': 'volume_tag', 'info': 'info', 'filesystem-tag': 'filesystem_tag', 'machine-attachments': 'machine_attachments', 'storage': 'storage'} + def __init__(self, filesystem_tag=None, info=None, machine_attachments=None, status=None, storage=None, volume_tag=None): ''' - filesystemtag : str + filesystem_tag : str info : FilesystemInfo - machineattachments : typing.Mapping[str, ~FilesystemAttachmentInfo] + machine_attachments : typing.Mapping[str, ~FilesystemAttachmentInfo] status : EntityStatus storage : StorageDetails - volumetag : str + volume_tag : str ''' - self.filesystemtag = filesystemtag + self.filesystem_tag = filesystem_tag self.info = FilesystemInfo.from_json(info) if info else None - self.machineattachments = {k: FilesystemAttachmentInfo.from_json(v) for k, v in (machineattachments or dict()).items()} + self.machine_attachments = {k: FilesystemAttachmentInfo.from_json(v) for k, v in (machine_attachments or dict()).items()} self.status = EntityStatus.from_json(status) if status else None self.storage = StorageDetails.from_json(storage) if storage else None - self.volumetag = volumetag + self.volume_tag = volume_tag class FilesystemDetailsListResult(Type): - _toSchema = {'result': 'result', 'error': 'error'} - _toPy = {'result': 'result', 'error': 'error'} + _toSchema = {'error': 'error', 'result': 'result'} + _toPy = {'error': 'error', 'result': 'result'} def __init__(self, error=None, result=None): ''' error : Error @@ -4089,50 +4475,50 @@ class FilesystemFilters(Type): class FilesystemInfo(Type): - _toSchema = {'filesystemid': 'filesystemid', 'size': 'size'} - _toPy = {'filesystemid': 'filesystemid', 'size': 'size'} - def __init__(self, filesystemid=None, size=None): + _toSchema = {'filesystem_id': 'filesystem-id', 'size': 'size'} + _toPy = {'filesystem-id': 'filesystem_id', 'size': 'size'} + def __init__(self, filesystem_id=None, size=None): ''' - filesystemid : str + filesystem_id : str size : int ''' - self.filesystemid = filesystemid + self.filesystem_id = filesystem_id self.size = size class StorageAddParams(Type): - _toSchema = {'storage': 'storage', 'storagename': 'StorageName', 'unit': 'unit'} - _toPy = {'StorageName': 'storagename', 'storage': 'storage', 'unit': 'unit'} - def __init__(self, storagename=None, storage=None, unit=None): + _toSchema = {'name': 'name', 'unit': 'unit', 'storage': 'storage'} + _toPy = {'name': 'name', 'unit': 'unit', 'storage': 'storage'} + def __init__(self, name=None, storage=None, unit=None): ''' - storagename : str + name : str storage : StorageConstraints unit : str ''' - self.storagename = storagename + self.name = name self.storage = StorageConstraints.from_json(storage) if storage else None self.unit = unit class StorageAttachmentDetails(Type): - _toSchema = {'unittag': 'unittag', 'storagetag': 'storagetag', 'location': 'location', 'machinetag': 'machinetag'} - _toPy = {'unittag': 'unittag', 'storagetag': 'storagetag', 'location': 'location', 'machinetag': 'machinetag'} - def __init__(self, location=None, machinetag=None, storagetag=None, unittag=None): + _toSchema = {'storage_tag': 'storage-tag', 'location': 'location', 'unit_tag': 'unit-tag', 'machine_tag': 'machine-tag'} + _toPy = {'machine-tag': 'machine_tag', 'location': 'location', 'storage-tag': 'storage_tag', 'unit-tag': 'unit_tag'} + def __init__(self, location=None, machine_tag=None, storage_tag=None, unit_tag=None): ''' location : str - machinetag : str - storagetag : str - unittag : str + machine_tag : str + storage_tag : str + unit_tag : str ''' self.location = location - self.machinetag = machinetag - self.storagetag = storagetag - self.unittag = unittag + self.machine_tag = machine_tag + self.storage_tag = storage_tag + self.unit_tag = unit_tag class StorageConstraints(Type): - _toSchema = {'pool': 'Pool', 'size': 'Size', 'count': 'Count'} - _toPy = {'Count': 'count', 'Pool': 'pool', 'Size': 'size'} + _toSchema = {'size': 'size', 'count': 'count', 'pool': 'pool'} + _toPy = {'size': 'size', 'count': 'count', 'pool': 'pool'} def __init__(self, count=None, pool=None, size=None): ''' count : int @@ -4145,28 +4531,28 @@ class StorageConstraints(Type): class StorageDetails(Type): - _toSchema = {'persistent': 'Persistent', 'storagetag': 'storagetag', 'kind': 'kind', 'ownertag': 'ownertag', 'attachments': 'attachments', 'status': 'status'} - _toPy = {'storagetag': 'storagetag', 'kind': 'kind', 'Persistent': 'persistent', 'ownertag': 'ownertag', 'attachments': 'attachments', 'status': 'status'} - def __init__(self, persistent=None, attachments=None, kind=None, ownertag=None, status=None, storagetag=None): + _toSchema = {'status': 'status', 'persistent': 'persistent', 'storage_tag': 'storage-tag', 'kind': 'kind', 'owner_tag': 'owner-tag', 'attachments': 'attachments'} + _toPy = {'status': 'status', 'persistent': 'persistent', 'storage-tag': 'storage_tag', 'kind': 'kind', 'owner-tag': 'owner_tag', 'attachments': 'attachments'} + def __init__(self, attachments=None, kind=None, owner_tag=None, persistent=None, status=None, storage_tag=None): ''' - persistent : bool attachments : typing.Mapping[str, ~StorageAttachmentDetails] kind : int - ownertag : str + owner_tag : str + persistent : bool status : EntityStatus - storagetag : str + storage_tag : str ''' - self.persistent = persistent self.attachments = {k: StorageAttachmentDetails.from_json(v) for k, v in (attachments or dict()).items()} self.kind = kind - self.ownertag = ownertag + self.owner_tag = owner_tag + self.persistent = persistent self.status = EntityStatus.from_json(status) if status else None - self.storagetag = storagetag + self.storage_tag = storage_tag class StorageDetailsListResult(Type): - _toSchema = {'result': 'result', 'error': 'error'} - _toPy = {'result': 'result', 'error': 'error'} + _toSchema = {'error': 'error', 'result': 'result'} + _toPy = {'error': 'error', 'result': 'result'} def __init__(self, error=None, result=None): ''' error : Error @@ -4187,8 +4573,8 @@ class StorageDetailsListResults(Type): class StorageDetailsResult(Type): - _toSchema = {'result': 'result', 'error': 'error'} - _toPy = {'result': 'result', 'error': 'error'} + _toSchema = {'error': 'error', 'result': 'result'} + _toPy = {'error': 'error', 'result': 'result'} def __init__(self, error=None, result=None): ''' error : Error @@ -4229,8 +4615,8 @@ class StorageFilters(Type): class StoragePool(Type): - _toSchema = {'provider': 'provider', 'attrs': 'attrs', 'name': 'name'} - _toPy = {'provider': 'provider', 'attrs': 'attrs', 'name': 'name'} + _toSchema = {'name': 'name', 'provider': 'provider', 'attrs': 'attrs'} + _toPy = {'name': 'name', 'provider': 'provider', 'attrs': 'attrs'} def __init__(self, attrs=None, name=None, provider=None): ''' attrs : typing.Mapping[str, typing.Any] @@ -4243,8 +4629,8 @@ class StoragePool(Type): class StoragePoolFilter(Type): - _toSchema = {'providers': 'providers', 'names': 'names'} - _toPy = {'providers': 'providers', 'names': 'names'} + _toSchema = {'names': 'names', 'providers': 'providers'} + _toPy = {'names': 'names', 'providers': 'providers'} def __init__(self, names=None, providers=None): ''' names : typing.Sequence[str] @@ -4265,15 +4651,15 @@ class StoragePoolFilters(Type): class StoragePoolsResult(Type): - _toSchema = {'error': 'error', 'storagepools': 'storagepools'} - _toPy = {'error': 'error', 'storagepools': 'storagepools'} - def __init__(self, error=None, storagepools=None): + _toSchema = {'error': 'error', 'storage_pools': 'storage-pools'} + _toPy = {'error': 'error', 'storage-pools': 'storage_pools'} + def __init__(self, error=None, storage_pools=None): ''' error : Error - storagepools : typing.Sequence[~StoragePool] + storage_pools : typing.Sequence[~StoragePool] ''' self.error = Error.from_json(error) if error else None - self.storagepools = [StoragePool.from_json(o) for o in storagepools or []] + self.storage_pools = [StoragePool.from_json(o) for o in storage_pools or []] class StoragePoolsResults(Type): @@ -4297,26 +4683,26 @@ class StoragesAddParams(Type): class VolumeDetails(Type): - _toSchema = {'machineattachments': 'machineattachments', 'volumetag': 'volumetag', 'info': 'info', 'storage': 'storage', 'status': 'status'} - _toPy = {'machineattachments': 'machineattachments', 'volumetag': 'volumetag', 'info': 'info', 'storage': 'storage', 'status': 'status'} - def __init__(self, info=None, machineattachments=None, status=None, storage=None, volumetag=None): + _toSchema = {'status': 'status', 'storage': 'storage', 'info': 'info', 'machine_attachments': 'machine-attachments', 'volume_tag': 'volume-tag'} + _toPy = {'status': 'status', 'volume-tag': 'volume_tag', 'info': 'info', 'storage': 'storage', 'machine-attachments': 'machine_attachments'} + def __init__(self, info=None, machine_attachments=None, status=None, storage=None, volume_tag=None): ''' info : VolumeInfo - machineattachments : typing.Mapping[str, ~VolumeAttachmentInfo] + machine_attachments : typing.Mapping[str, ~VolumeAttachmentInfo] status : EntityStatus storage : StorageDetails - volumetag : str + volume_tag : str ''' self.info = VolumeInfo.from_json(info) if info else None - self.machineattachments = {k: VolumeAttachmentInfo.from_json(v) for k, v in (machineattachments or dict()).items()} + self.machine_attachments = {k: VolumeAttachmentInfo.from_json(v) for k, v in (machine_attachments or dict()).items()} self.status = EntityStatus.from_json(status) if status else None self.storage = StorageDetails.from_json(storage) if storage else None - self.volumetag = volumetag + self.volume_tag = volume_tag class VolumeDetailsListResult(Type): - _toSchema = {'result': 'result', 'error': 'error'} - _toPy = {'result': 'result', 'error': 'error'} + _toSchema = {'error': 'error', 'result': 'result'} + _toPy = {'error': 'error', 'result': 'result'} def __init__(self, error=None, result=None): ''' error : Error @@ -4357,8 +4743,8 @@ class VolumeFilters(Type): class BlockDeviceResult(Type): - _toSchema = {'result': 'result', 'error': 'error'} - _toPy = {'result': 'result', 'error': 'error'} + _toSchema = {'error': 'error', 'result': 'result'} + _toPy = {'error': 'error', 'result': 'result'} def __init__(self, error=None, result=None): ''' error : Error @@ -4379,58 +4765,58 @@ class BlockDeviceResults(Type): class Filesystem(Type): - _toSchema = {'filesystemtag': 'filesystemtag', 'volumetag': 'volumetag', 'info': 'info'} - _toPy = {'filesystemtag': 'filesystemtag', 'volumetag': 'volumetag', 'info': 'info'} - def __init__(self, filesystemtag=None, info=None, volumetag=None): + _toSchema = {'filesystem_tag': 'filesystem-tag', 'info': 'info', 'volume_tag': 'volume-tag'} + _toPy = {'volume-tag': 'volume_tag', 'info': 'info', 'filesystem-tag': 'filesystem_tag'} + def __init__(self, filesystem_tag=None, info=None, volume_tag=None): ''' - filesystemtag : str + filesystem_tag : str info : FilesystemInfo - volumetag : str + volume_tag : str ''' - self.filesystemtag = filesystemtag + self.filesystem_tag = filesystem_tag self.info = FilesystemInfo.from_json(info) if info else None - self.volumetag = volumetag + self.volume_tag = volume_tag class FilesystemAttachment(Type): - _toSchema = {'filesystemtag': 'filesystemtag', 'info': 'info', 'machinetag': 'machinetag'} - _toPy = {'filesystemtag': 'filesystemtag', 'info': 'info', 'machinetag': 'machinetag'} - def __init__(self, filesystemtag=None, info=None, machinetag=None): + _toSchema = {'filesystem_tag': 'filesystem-tag', 'info': 'info', 'machine_tag': 'machine-tag'} + _toPy = {'machine-tag': 'machine_tag', 'info': 'info', 'filesystem-tag': 'filesystem_tag'} + def __init__(self, filesystem_tag=None, info=None, machine_tag=None): ''' - filesystemtag : str + filesystem_tag : str info : FilesystemAttachmentInfo - machinetag : str + machine_tag : str ''' - self.filesystemtag = filesystemtag + self.filesystem_tag = filesystem_tag self.info = FilesystemAttachmentInfo.from_json(info) if info else None - self.machinetag = machinetag + self.machine_tag = machine_tag class FilesystemAttachmentParams(Type): - _toSchema = {'filesystemtag': 'filesystemtag', 'mountpoint': 'mountpoint', 'read_only': 'read-only', 'provider': 'provider', 'filesystemid': 'filesystemid', 'instanceid': 'instanceid', 'machinetag': 'machinetag'} - _toPy = {'filesystemtag': 'filesystemtag', 'mountpoint': 'mountpoint', 'provider': 'provider', 'read-only': 'read_only', 'filesystemid': 'filesystemid', 'instanceid': 'instanceid', 'machinetag': 'machinetag'} - def __init__(self, filesystemid=None, filesystemtag=None, instanceid=None, machinetag=None, mountpoint=None, provider=None, read_only=None): - ''' - filesystemid : str - filesystemtag : str - instanceid : str - machinetag : str - mountpoint : str + _toSchema = {'mount_point': 'mount-point', 'filesystem_tag': 'filesystem-tag', 'machine_tag': 'machine-tag', 'instance_id': 'instance-id', 'provider': 'provider', 'filesystem_id': 'filesystem-id', 'read_only': 'read-only'} + _toPy = {'machine-tag': 'machine_tag', 'filesystem-id': 'filesystem_id', 'provider': 'provider', 'filesystem-tag': 'filesystem_tag', 'mount-point': 'mount_point', 'instance-id': 'instance_id', 'read-only': 'read_only'} + def __init__(self, filesystem_id=None, filesystem_tag=None, instance_id=None, machine_tag=None, mount_point=None, provider=None, read_only=None): + ''' + filesystem_id : str + filesystem_tag : str + instance_id : str + machine_tag : str + mount_point : str provider : str read_only : bool ''' - self.filesystemid = filesystemid - self.filesystemtag = filesystemtag - self.instanceid = instanceid - self.machinetag = machinetag - self.mountpoint = mountpoint + self.filesystem_id = filesystem_id + self.filesystem_tag = filesystem_tag + self.instance_id = instance_id + self.machine_tag = machine_tag + self.mount_point = mount_point self.provider = provider self.read_only = read_only class FilesystemAttachmentParamsResult(Type): - _toSchema = {'result': 'result', 'error': 'error'} - _toPy = {'result': 'result', 'error': 'error'} + _toSchema = {'error': 'error', 'result': 'result'} + _toPy = {'error': 'error', 'result': 'result'} def __init__(self, error=None, result=None): ''' error : Error @@ -4451,8 +4837,8 @@ class FilesystemAttachmentParamsResults(Type): class FilesystemAttachmentResult(Type): - _toSchema = {'result': 'result', 'error': 'error'} - _toPy = {'result': 'result', 'error': 'error'} + _toSchema = {'error': 'error', 'result': 'result'} + _toPy = {'error': 'error', 'result': 'result'} def __init__(self, error=None, result=None): ''' error : Error @@ -4473,40 +4859,40 @@ class FilesystemAttachmentResults(Type): class FilesystemAttachments(Type): - _toSchema = {'filesystemattachments': 'filesystemattachments'} - _toPy = {'filesystemattachments': 'filesystemattachments'} - def __init__(self, filesystemattachments=None): + _toSchema = {'filesystem_attachments': 'filesystem-attachments'} + _toPy = {'filesystem-attachments': 'filesystem_attachments'} + def __init__(self, filesystem_attachments=None): ''' - filesystemattachments : typing.Sequence[~FilesystemAttachment] + filesystem_attachments : typing.Sequence[~FilesystemAttachment] ''' - self.filesystemattachments = [FilesystemAttachment.from_json(o) for o in filesystemattachments or []] + self.filesystem_attachments = [FilesystemAttachment.from_json(o) for o in filesystem_attachments or []] class FilesystemParams(Type): - _toSchema = {'attachment': 'attachment', 'attributes': 'attributes', 'size': 'size', 'volumetag': 'volumetag', 'filesystemtag': 'filesystemtag', 'tags': 'tags', 'provider': 'provider'} - _toPy = {'attachment': 'attachment', 'attributes': 'attributes', 'size': 'size', 'volumetag': 'volumetag', 'filesystemtag': 'filesystemtag', 'tags': 'tags', 'provider': 'provider'} - def __init__(self, attachment=None, attributes=None, filesystemtag=None, provider=None, size=None, tags=None, volumetag=None): + _toSchema = {'filesystem_tag': 'filesystem-tag', 'tags': 'tags', 'provider': 'provider', 'size': 'size', 'attachment': 'attachment', 'attributes': 'attributes', 'volume_tag': 'volume-tag'} + _toPy = {'volume-tag': 'volume_tag', 'tags': 'tags', 'filesystem-tag': 'filesystem_tag', 'provider': 'provider', 'size': 'size', 'attachment': 'attachment', 'attributes': 'attributes'} + def __init__(self, attachment=None, attributes=None, filesystem_tag=None, provider=None, size=None, tags=None, volume_tag=None): ''' attachment : FilesystemAttachmentParams attributes : typing.Mapping[str, typing.Any] - filesystemtag : str + filesystem_tag : str provider : str size : int tags : typing.Mapping[str, str] - volumetag : str + volume_tag : str ''' self.attachment = FilesystemAttachmentParams.from_json(attachment) if attachment else None self.attributes = attributes - self.filesystemtag = filesystemtag + self.filesystem_tag = filesystem_tag self.provider = provider self.size = size self.tags = tags - self.volumetag = volumetag + self.volume_tag = volume_tag class FilesystemParamsResult(Type): - _toSchema = {'result': 'result', 'error': 'error'} - _toPy = {'result': 'result', 'error': 'error'} + _toSchema = {'error': 'error', 'result': 'result'} + _toPy = {'error': 'error', 'result': 'result'} def __init__(self, error=None, result=None): ''' error : Error @@ -4527,8 +4913,8 @@ class FilesystemParamsResults(Type): class FilesystemResult(Type): - _toSchema = {'result': 'result', 'error': 'error'} - _toPy = {'result': 'result', 'error': 'error'} + _toSchema = {'error': 'error', 'result': 'result'} + _toPy = {'error': 'error', 'result': 'result'} def __init__(self, error=None, result=None): ''' error : Error @@ -4569,8 +4955,8 @@ class MachineStorageIds(Type): class MachineStorageIdsWatchResults(Type): - _toSchema = {'results': 'Results'} - _toPy = {'Results': 'results'} + _toSchema = {'results': 'results'} + _toPy = {'results': 'results'} def __init__(self, results=None): ''' results : typing.Sequence[~MachineStorageIdsWatchResult] @@ -4579,22 +4965,22 @@ class MachineStorageIdsWatchResults(Type): class VolumeAttachment(Type): - _toSchema = {'volumetag': 'volumetag', 'info': 'info', 'machinetag': 'machinetag'} - _toPy = {'volumetag': 'volumetag', 'info': 'info', 'machinetag': 'machinetag'} - def __init__(self, info=None, machinetag=None, volumetag=None): + _toSchema = {'info': 'info', 'machine_tag': 'machine-tag', 'volume_tag': 'volume-tag'} + _toPy = {'machine-tag': 'machine_tag', 'volume-tag': 'volume_tag', 'info': 'info'} + def __init__(self, info=None, machine_tag=None, volume_tag=None): ''' info : VolumeAttachmentInfo - machinetag : str - volumetag : str + machine_tag : str + volume_tag : str ''' self.info = VolumeAttachmentInfo.from_json(info) if info else None - self.machinetag = machinetag - self.volumetag = volumetag + self.machine_tag = machine_tag + self.volume_tag = volume_tag class VolumeAttachmentParamsResult(Type): - _toSchema = {'result': 'result', 'error': 'error'} - _toPy = {'result': 'result', 'error': 'error'} + _toSchema = {'error': 'error', 'result': 'result'} + _toPy = {'error': 'error', 'result': 'result'} def __init__(self, error=None, result=None): ''' error : Error @@ -4615,8 +5001,8 @@ class VolumeAttachmentParamsResults(Type): class VolumeAttachmentResult(Type): - _toSchema = {'result': 'result', 'error': 'error'} - _toPy = {'result': 'result', 'error': 'error'} + _toSchema = {'error': 'error', 'result': 'result'} + _toPy = {'error': 'error', 'result': 'result'} def __init__(self, error=None, result=None): ''' error : Error @@ -4637,18 +5023,18 @@ class VolumeAttachmentResults(Type): class VolumeAttachments(Type): - _toSchema = {'volumeattachments': 'volumeattachments'} - _toPy = {'volumeattachments': 'volumeattachments'} - def __init__(self, volumeattachments=None): + _toSchema = {'volume_attachments': 'volume-attachments'} + _toPy = {'volume-attachments': 'volume_attachments'} + def __init__(self, volume_attachments=None): ''' - volumeattachments : typing.Sequence[~VolumeAttachment] + volume_attachments : typing.Sequence[~VolumeAttachment] ''' - self.volumeattachments = [VolumeAttachment.from_json(o) for o in volumeattachments or []] + self.volume_attachments = [VolumeAttachment.from_json(o) for o in volume_attachments or []] class VolumeParamsResult(Type): - _toSchema = {'result': 'result', 'error': 'error'} - _toPy = {'result': 'result', 'error': 'error'} + _toSchema = {'error': 'error', 'result': 'result'} + _toPy = {'error': 'error', 'result': 'result'} def __init__(self, error=None, result=None): ''' error : Error @@ -4669,8 +5055,8 @@ class VolumeParamsResults(Type): class VolumeResult(Type): - _toSchema = {'result': 'result', 'error': 'error'} - _toPy = {'result': 'result', 'error': 'error'} + _toSchema = {'error': 'error', 'result': 'result'} + _toPy = {'error': 'error', 'result': 'result'} def __init__(self, error=None, result=None): ''' error : Error @@ -4701,8 +5087,8 @@ class Volumes(Type): class SpaceResult(Type): - _toSchema = {'error': 'Error', 'tag': 'Tag'} - _toPy = {'Tag': 'tag', 'Error': 'error'} + _toSchema = {'error': 'error', 'tag': 'tag'} + _toPy = {'error': 'error', 'tag': 'tag'} def __init__(self, error=None, tag=None): ''' error : Error @@ -4713,8 +5099,8 @@ class SpaceResult(Type): class SpaceResults(Type): - _toSchema = {'results': 'Results'} - _toPy = {'Results': 'results'} + _toSchema = {'results': 'results'} + _toPy = {'results': 'results'} def __init__(self, results=None): ''' results : typing.Sequence[~SpaceResult] @@ -4723,8 +5109,8 @@ class SpaceResults(Type): class ZoneResult(Type): - _toSchema = {'error': 'Error', 'available': 'Available', 'name': 'Name'} - _toPy = {'Error': 'error', 'Available': 'available', 'Name': 'name'} + _toSchema = {'name': 'name', 'available': 'available', 'error': 'error'} + _toPy = {'name': 'name', 'available': 'available', 'error': 'error'} def __init__(self, available=None, error=None, name=None): ''' available : bool @@ -4737,8 +5123,8 @@ class ZoneResult(Type): class ZoneResults(Type): - _toSchema = {'results': 'Results'} - _toPy = {'Results': 'results'} + _toSchema = {'results': 'results'} + _toPy = {'results': 'results'} def __init__(self, results=None): ''' results : typing.Sequence[~ZoneResult] @@ -4747,26 +5133,26 @@ class ZoneResults(Type): class UndertakerModelInfo(Type): - _toSchema = {'globalname': 'GlobalName', 'uuid': 'UUID', 'life': 'Life', 'issystem': 'IsSystem', 'name': 'Name'} - _toPy = {'GlobalName': 'globalname', 'IsSystem': 'issystem', 'Life': 'life', 'Name': 'name', 'UUID': 'uuid'} - def __init__(self, globalname=None, issystem=None, life=None, name=None, uuid=None): + _toSchema = {'name': 'name', 'uuid': 'uuid', 'is_system': 'is-system', 'global_name': 'global-name', 'life': 'life'} + _toPy = {'name': 'name', 'is-system': 'is_system', 'life': 'life', 'global-name': 'global_name', 'uuid': 'uuid'} + def __init__(self, global_name=None, is_system=None, life=None, name=None, uuid=None): ''' - globalname : str - issystem : bool + global_name : str + is_system : bool life : str name : str uuid : str ''' - self.globalname = globalname - self.issystem = issystem + self.global_name = global_name + self.is_system = is_system self.life = life self.name = name self.uuid = uuid class UndertakerModelInfoResult(Type): - _toSchema = {'result': 'Result', 'error': 'Error'} - _toPy = {'Result': 'result', 'Error': 'error'} + _toSchema = {'error': 'error', 'result': 'result'} + _toPy = {'error': 'error', 'result': 'result'} def __init__(self, error=None, result=None): ''' error : Error @@ -4777,8 +5163,8 @@ class UndertakerModelInfoResult(Type): class ApplicationStatusResult(Type): - _toSchema = {'units': 'Units', 'application': 'Application', 'error': 'Error'} - _toPy = {'Error': 'error', 'Application': 'application', 'Units': 'units'} + _toSchema = {'error': 'error', 'units': 'units', 'application': 'application'} + _toPy = {'error': 'error', 'units': 'units', 'application': 'application'} def __init__(self, application=None, error=None, units=None): ''' application : StatusResult @@ -4791,8 +5177,8 @@ class ApplicationStatusResult(Type): class ApplicationStatusResults(Type): - _toSchema = {'results': 'Results'} - _toPy = {'Results': 'results'} + _toSchema = {'results': 'results'} + _toPy = {'results': 'results'} def __init__(self, results=None): ''' results : typing.Sequence[~ApplicationStatusResult] @@ -4800,19 +5186,9 @@ class ApplicationStatusResults(Type): self.results = [ApplicationStatusResult.from_json(o) for o in results or []] -class CharmURL(Type): - _toSchema = {'url': 'URL'} - _toPy = {'URL': 'url'} - def __init__(self, url=None): - ''' - url : str - ''' - self.url = url - - class CharmURLs(Type): - _toSchema = {'urls': 'URLs'} - _toPy = {'URLs': 'urls'} + _toSchema = {'urls': 'urls'} + _toPy = {'urls': 'urls'} def __init__(self, urls=None): ''' urls : typing.Sequence[~CharmURL] @@ -4821,8 +5197,8 @@ class CharmURLs(Type): class ConfigSettingsResult(Type): - _toSchema = {'settings': 'Settings', 'error': 'Error'} - _toPy = {'Settings': 'settings', 'Error': 'error'} + _toSchema = {'error': 'error', 'settings': 'settings'} + _toPy = {'error': 'error', 'settings': 'settings'} def __init__(self, error=None, settings=None): ''' error : Error @@ -4833,8 +5209,8 @@ class ConfigSettingsResult(Type): class ConfigSettingsResults(Type): - _toSchema = {'results': 'Results'} - _toPy = {'Results': 'results'} + _toSchema = {'results': 'results'} + _toPy = {'results': 'results'} def __init__(self, results=None): ''' results : typing.Sequence[~ConfigSettingsResult] @@ -4843,20 +5219,20 @@ class ConfigSettingsResults(Type): class Endpoint(Type): - _toSchema = {'relation': 'Relation', 'applicationname': 'ApplicationName'} - _toPy = {'Relation': 'relation', 'ApplicationName': 'applicationname'} - def __init__(self, applicationname=None, relation=None): + _toSchema = {'relation': 'relation', 'application_name': 'application-name'} + _toPy = {'relation': 'relation', 'application-name': 'application_name'} + def __init__(self, application_name=None, relation=None): ''' - applicationname : str - relation : Relation + application_name : str + relation : CharmRelation ''' - self.applicationname = applicationname - self.relation = Relation.from_json(relation) if relation else None + self.application_name = application_name + self.relation = CharmRelation.from_json(relation) if relation else None class EntitiesCharmURL(Type): - _toSchema = {'entities': 'Entities'} - _toPy = {'Entities': 'entities'} + _toSchema = {'entities': 'entities'} + _toPy = {'entities': 'entities'} def __init__(self, entities=None): ''' entities : typing.Sequence[~EntityCharmURL] @@ -4865,8 +5241,8 @@ class EntitiesCharmURL(Type): class EntitiesPortRanges(Type): - _toSchema = {'entities': 'Entities'} - _toPy = {'Entities': 'entities'} + _toSchema = {'entities': 'entities'} + _toPy = {'entities': 'entities'} def __init__(self, entities=None): ''' entities : typing.Sequence[~EntityPortRange] @@ -4875,36 +5251,58 @@ class EntitiesPortRanges(Type): class EntityCharmURL(Type): - _toSchema = {'charmurl': 'CharmURL', 'tag': 'Tag'} - _toPy = {'CharmURL': 'charmurl', 'Tag': 'tag'} - def __init__(self, charmurl=None, tag=None): + _toSchema = {'tag': 'tag', 'charm_url': 'charm-url'} + _toPy = {'charm-url': 'charm_url', 'tag': 'tag'} + def __init__(self, charm_url=None, tag=None): ''' - charmurl : str + charm_url : str tag : str ''' - self.charmurl = charmurl + self.charm_url = charm_url self.tag = tag class EntityPortRange(Type): - _toSchema = {'toport': 'ToPort', 'fromport': 'FromPort', 'protocol': 'Protocol', 'tag': 'Tag'} - _toPy = {'FromPort': 'fromport', 'Tag': 'tag', 'Protocol': 'protocol', 'ToPort': 'toport'} - def __init__(self, fromport=None, protocol=None, tag=None, toport=None): + _toSchema = {'from_port': 'from-port', 'to_port': 'to-port', 'tag': 'tag', 'protocol': 'protocol'} + _toPy = {'to-port': 'to_port', 'protocol': 'protocol', 'tag': 'tag', 'from-port': 'from_port'} + def __init__(self, from_port=None, protocol=None, tag=None, to_port=None): ''' - fromport : int + from_port : int protocol : str tag : str - toport : int + to_port : int ''' - self.fromport = fromport + self.from_port = from_port self.protocol = protocol self.tag = tag - self.toport = toport + self.to_port = to_port + + +class EntityWorkloadVersion(Type): + _toSchema = {'tag': 'tag', 'workload_version': 'workload-version'} + _toPy = {'tag': 'tag', 'workload-version': 'workload_version'} + def __init__(self, tag=None, workload_version=None): + ''' + tag : str + workload_version : str + ''' + self.tag = tag + self.workload_version = workload_version + + +class EntityWorkloadVersions(Type): + _toSchema = {'entities': 'entities'} + _toPy = {'entities': 'entities'} + def __init__(self, entities=None): + ''' + entities : typing.Sequence[~EntityWorkloadVersion] + ''' + self.entities = [EntityWorkloadVersion.from_json(o) for o in entities or []] class GetLeadershipSettingsBulkResults(Type): - _toSchema = {'results': 'Results'} - _toPy = {'Results': 'results'} + _toSchema = {'results': 'results'} + _toPy = {'results': 'results'} def __init__(self, results=None): ''' results : typing.Sequence[~GetLeadershipSettingsResult] @@ -4913,8 +5311,8 @@ class GetLeadershipSettingsBulkResults(Type): class GetLeadershipSettingsResult(Type): - _toSchema = {'settings': 'Settings', 'error': 'Error'} - _toPy = {'Settings': 'settings', 'Error': 'error'} + _toSchema = {'error': 'error', 'settings': 'settings'} + _toPy = {'error': 'error', 'settings': 'settings'} def __init__(self, error=None, settings=None): ''' error : Error @@ -4925,8 +5323,8 @@ class GetLeadershipSettingsResult(Type): class IntResult(Type): - _toSchema = {'result': 'Result', 'error': 'Error'} - _toPy = {'Result': 'result', 'Error': 'error'} + _toSchema = {'error': 'error', 'result': 'result'} + _toPy = {'error': 'error', 'result': 'result'} def __init__(self, error=None, result=None): ''' error : Error @@ -4937,8 +5335,8 @@ class IntResult(Type): class IntResults(Type): - _toSchema = {'results': 'Results'} - _toPy = {'Results': 'results'} + _toSchema = {'results': 'results'} + _toPy = {'results': 'results'} def __init__(self, results=None): ''' results : typing.Sequence[~IntResult] @@ -4947,8 +5345,8 @@ class IntResults(Type): class MergeLeadershipSettingsBulkParams(Type): - _toSchema = {'params': 'Params'} - _toPy = {'Params': 'params'} + _toSchema = {'params': 'params'} + _toPy = {'params': 'params'} def __init__(self, params=None): ''' params : typing.Sequence[~MergeLeadershipSettingsParam] @@ -4957,20 +5355,20 @@ class MergeLeadershipSettingsBulkParams(Type): class MergeLeadershipSettingsParam(Type): - _toSchema = {'applicationtag': 'ApplicationTag', 'settings': 'Settings'} - _toPy = {'Settings': 'settings', 'ApplicationTag': 'applicationtag'} - def __init__(self, applicationtag=None, settings=None): + _toSchema = {'application_tag': 'application-tag', 'settings': 'settings'} + _toPy = {'settings': 'settings', 'application-tag': 'application_tag'} + def __init__(self, application_tag=None, settings=None): ''' - applicationtag : str + application_tag : str settings : typing.Mapping[str, str] ''' - self.applicationtag = applicationtag + self.application_tag = application_tag self.settings = settings class ModelResult(Type): - _toSchema = {'uuid': 'UUID', 'error': 'Error', 'name': 'Name'} - _toPy = {'Error': 'error', 'Name': 'name', 'UUID': 'uuid'} + _toSchema = {'name': 'name', 'error': 'error', 'uuid': 'uuid'} + _toPy = {'name': 'name', 'error': 'error', 'uuid': 'uuid'} def __init__(self, error=None, name=None, uuid=None): ''' error : Error @@ -4983,18 +5381,18 @@ class ModelResult(Type): class RelationIds(Type): - _toSchema = {'relationids': 'RelationIds'} - _toPy = {'RelationIds': 'relationids'} - def __init__(self, relationids=None): + _toSchema = {'relation_ids': 'relation-ids'} + _toPy = {'relation-ids': 'relation_ids'} + def __init__(self, relation_ids=None): ''' - relationids : typing.Sequence[int] + relation_ids : typing.Sequence[int] ''' - self.relationids = relationids + self.relation_ids = relation_ids class RelationResult(Type): - _toSchema = {'key': 'Key', 'life': 'Life', 'id_': 'Id', 'endpoint': 'Endpoint', 'error': 'Error'} - _toPy = {'Endpoint': 'endpoint', 'Id': 'id_', 'Error': 'error', 'Key': 'key', 'Life': 'life'} + _toSchema = {'error': 'error', 'life': 'life', 'key': 'key', 'endpoint': 'endpoint', 'id_': 'id'} + _toPy = {'error': 'error', 'life': 'life', 'key': 'key', 'id': 'id_', 'endpoint': 'endpoint'} def __init__(self, endpoint=None, error=None, id_=None, key=None, life=None): ''' endpoint : Endpoint @@ -5011,8 +5409,8 @@ class RelationResult(Type): class RelationResults(Type): - _toSchema = {'results': 'Results'} - _toPy = {'Results': 'results'} + _toSchema = {'results': 'results'} + _toPy = {'results': 'results'} def __init__(self, results=None): ''' results : typing.Sequence[~RelationResult] @@ -5021,8 +5419,8 @@ class RelationResults(Type): class RelationUnit(Type): - _toSchema = {'relation': 'Relation', 'unit': 'Unit'} - _toPy = {'Relation': 'relation', 'Unit': 'unit'} + _toSchema = {'relation': 'relation', 'unit': 'unit'} + _toPy = {'relation': 'relation', 'unit': 'unit'} def __init__(self, relation=None, unit=None): ''' relation : str @@ -5033,32 +5431,32 @@ class RelationUnit(Type): class RelationUnitPair(Type): - _toSchema = {'localunit': 'LocalUnit', 'relation': 'Relation', 'remoteunit': 'RemoteUnit'} - _toPy = {'RemoteUnit': 'remoteunit', 'Relation': 'relation', 'LocalUnit': 'localunit'} - def __init__(self, localunit=None, relation=None, remoteunit=None): + _toSchema = {'remote_unit': 'remote-unit', 'local_unit': 'local-unit', 'relation': 'relation'} + _toPy = {'relation': 'relation', 'local-unit': 'local_unit', 'remote-unit': 'remote_unit'} + def __init__(self, local_unit=None, relation=None, remote_unit=None): ''' - localunit : str + local_unit : str relation : str - remoteunit : str + remote_unit : str ''' - self.localunit = localunit + self.local_unit = local_unit self.relation = relation - self.remoteunit = remoteunit + self.remote_unit = remote_unit class RelationUnitPairs(Type): - _toSchema = {'relationunitpairs': 'RelationUnitPairs'} - _toPy = {'RelationUnitPairs': 'relationunitpairs'} - def __init__(self, relationunitpairs=None): + _toSchema = {'relation_unit_pairs': 'relation-unit-pairs'} + _toPy = {'relation-unit-pairs': 'relation_unit_pairs'} + def __init__(self, relation_unit_pairs=None): ''' - relationunitpairs : typing.Sequence[~RelationUnitPair] + relation_unit_pairs : typing.Sequence[~RelationUnitPair] ''' - self.relationunitpairs = [RelationUnitPair.from_json(o) for o in relationunitpairs or []] + self.relation_unit_pairs = [RelationUnitPair.from_json(o) for o in relation_unit_pairs or []] class RelationUnitSettings(Type): - _toSchema = {'settings': 'Settings', 'relation': 'Relation', 'unit': 'Unit'} - _toPy = {'Settings': 'settings', 'Relation': 'relation', 'Unit': 'unit'} + _toSchema = {'relation': 'relation', 'unit': 'unit', 'settings': 'settings'} + _toPy = {'relation': 'relation', 'unit': 'unit', 'settings': 'settings'} def __init__(self, relation=None, settings=None, unit=None): ''' relation : str @@ -5071,28 +5469,28 @@ class RelationUnitSettings(Type): class RelationUnits(Type): - _toSchema = {'relationunits': 'RelationUnits'} - _toPy = {'RelationUnits': 'relationunits'} - def __init__(self, relationunits=None): + _toSchema = {'relation_units': 'relation-units'} + _toPy = {'relation-units': 'relation_units'} + def __init__(self, relation_units=None): ''' - relationunits : typing.Sequence[~RelationUnit] + relation_units : typing.Sequence[~RelationUnit] ''' - self.relationunits = [RelationUnit.from_json(o) for o in relationunits or []] + self.relation_units = [RelationUnit.from_json(o) for o in relation_units or []] class RelationUnitsSettings(Type): - _toSchema = {'relationunits': 'RelationUnits'} - _toPy = {'RelationUnits': 'relationunits'} - def __init__(self, relationunits=None): + _toSchema = {'relation_units': 'relation-units'} + _toPy = {'relation-units': 'relation_units'} + def __init__(self, relation_units=None): ''' - relationunits : typing.Sequence[~RelationUnitSettings] + relation_units : typing.Sequence[~RelationUnitSettings] ''' - self.relationunits = [RelationUnitSettings.from_json(o) for o in relationunits or []] + self.relation_units = [RelationUnitSettings.from_json(o) for o in relation_units or []] class RelationUnitsWatchResults(Type): - _toSchema = {'results': 'Results'} - _toPy = {'Results': 'results'} + _toSchema = {'results': 'results'} + _toPy = {'results': 'results'} def __init__(self, results=None): ''' results : typing.Sequence[~RelationUnitsWatchResult] @@ -5101,8 +5499,8 @@ class RelationUnitsWatchResults(Type): class ResolvedModeResult(Type): - _toSchema = {'mode': 'Mode', 'error': 'Error'} - _toPy = {'Error': 'error', 'Mode': 'mode'} + _toSchema = {'error': 'error', 'mode': 'mode'} + _toPy = {'error': 'error', 'mode': 'mode'} def __init__(self, error=None, mode=None): ''' error : Error @@ -5113,8 +5511,8 @@ class ResolvedModeResult(Type): class ResolvedModeResults(Type): - _toSchema = {'results': 'Results'} - _toPy = {'Results': 'results'} + _toSchema = {'results': 'results'} + _toPy = {'results': 'results'} def __init__(self, results=None): ''' results : typing.Sequence[~ResolvedModeResult] @@ -5123,8 +5521,8 @@ class ResolvedModeResults(Type): class SettingsResult(Type): - _toSchema = {'settings': 'Settings', 'error': 'Error'} - _toPy = {'Settings': 'settings', 'Error': 'error'} + _toSchema = {'error': 'error', 'settings': 'settings'} + _toPy = {'error': 'error', 'settings': 'settings'} def __init__(self, error=None, settings=None): ''' error : Error @@ -5135,8 +5533,8 @@ class SettingsResult(Type): class SettingsResults(Type): - _toSchema = {'results': 'Results'} - _toPy = {'Results': 'results'} + _toSchema = {'results': 'results'} + _toPy = {'results': 'results'} def __init__(self, results=None): ''' results : typing.Sequence[~SettingsResult] @@ -5145,35 +5543,35 @@ class SettingsResults(Type): class StorageAttachment(Type): - _toSchema = {'storagetag': 'StorageTag', 'location': 'Location', 'life': 'Life', 'unittag': 'UnitTag', 'ownertag': 'OwnerTag', 'kind': 'Kind'} - _toPy = {'OwnerTag': 'ownertag', 'StorageTag': 'storagetag', 'UnitTag': 'unittag', 'Life': 'life', 'Location': 'location', 'Kind': 'kind'} - def __init__(self, kind=None, life=None, location=None, ownertag=None, storagetag=None, unittag=None): + _toSchema = {'unit_tag': 'unit-tag', 'location': 'location', 'storage_tag': 'storage-tag', 'kind': 'kind', 'owner_tag': 'owner-tag', 'life': 'life'} + _toPy = {'location': 'location', 'owner-tag': 'owner_tag', 'storage-tag': 'storage_tag', 'unit-tag': 'unit_tag', 'kind': 'kind', 'life': 'life'} + def __init__(self, kind=None, life=None, location=None, owner_tag=None, storage_tag=None, unit_tag=None): ''' kind : int life : str location : str - ownertag : str - storagetag : str - unittag : str + owner_tag : str + storage_tag : str + unit_tag : str ''' self.kind = kind self.life = life self.location = location - self.ownertag = ownertag - self.storagetag = storagetag - self.unittag = unittag + self.owner_tag = owner_tag + self.storage_tag = storage_tag + self.unit_tag = unit_tag class StorageAttachmentId(Type): - _toSchema = {'unittag': 'unittag', 'storagetag': 'storagetag'} - _toPy = {'unittag': 'unittag', 'storagetag': 'storagetag'} - def __init__(self, storagetag=None, unittag=None): + _toSchema = {'storage_tag': 'storage-tag', 'unit_tag': 'unit-tag'} + _toPy = {'unit-tag': 'unit_tag', 'storage-tag': 'storage_tag'} + def __init__(self, storage_tag=None, unit_tag=None): ''' - storagetag : str - unittag : str + storage_tag : str + unit_tag : str ''' - self.storagetag = storagetag - self.unittag = unittag + self.storage_tag = storage_tag + self.unit_tag = unit_tag class StorageAttachmentIds(Type): @@ -5187,8 +5585,8 @@ class StorageAttachmentIds(Type): class StorageAttachmentIdsResult(Type): - _toSchema = {'result': 'result', 'error': 'error'} - _toPy = {'result': 'result', 'error': 'error'} + _toSchema = {'error': 'error', 'result': 'result'} + _toPy = {'error': 'error', 'result': 'result'} def __init__(self, error=None, result=None): ''' error : Error @@ -5209,8 +5607,8 @@ class StorageAttachmentIdsResults(Type): class StorageAttachmentResult(Type): - _toSchema = {'result': 'result', 'error': 'error'} - _toPy = {'result': 'result', 'error': 'error'} + _toSchema = {'error': 'error', 'result': 'result'} + _toPy = {'error': 'error', 'result': 'result'} def __init__(self, error=None, result=None): ''' error : Error @@ -5231,8 +5629,8 @@ class StorageAttachmentResults(Type): class StringBoolResult(Type): - _toSchema = {'result': 'Result', 'ok': 'Ok', 'error': 'Error'} - _toPy = {'Result': 'result', 'Error': 'error', 'Ok': 'ok'} + _toSchema = {'ok': 'ok', 'error': 'error', 'result': 'result'} + _toPy = {'ok': 'ok', 'error': 'error', 'result': 'result'} def __init__(self, error=None, ok=None, result=None): ''' error : Error @@ -5245,8 +5643,8 @@ class StringBoolResult(Type): class StringBoolResults(Type): - _toSchema = {'results': 'Results'} - _toPy = {'Results': 'results'} + _toSchema = {'results': 'results'} + _toPy = {'results': 'results'} def __init__(self, results=None): ''' results : typing.Sequence[~StringBoolResult] @@ -5255,20 +5653,20 @@ class StringBoolResults(Type): class UnitNetworkConfig(Type): - _toSchema = {'unittag': 'UnitTag', 'bindingname': 'BindingName'} - _toPy = {'BindingName': 'bindingname', 'UnitTag': 'unittag'} - def __init__(self, bindingname=None, unittag=None): + _toSchema = {'unit_tag': 'unit-tag', 'binding_name': 'binding-name'} + _toPy = {'unit-tag': 'unit_tag', 'binding-name': 'binding_name'} + def __init__(self, binding_name=None, unit_tag=None): ''' - bindingname : str - unittag : str + binding_name : str + unit_tag : str ''' - self.bindingname = bindingname - self.unittag = unittag + self.binding_name = binding_name + self.unit_tag = unit_tag class UnitNetworkConfigResult(Type): - _toSchema = {'info': 'Info', 'error': 'Error'} - _toPy = {'Error': 'error', 'Info': 'info'} + _toSchema = {'error': 'error', 'info': 'info'} + _toPy = {'error': 'error', 'info': 'info'} def __init__(self, error=None, info=None): ''' error : Error @@ -5279,8 +5677,8 @@ class UnitNetworkConfigResult(Type): class UnitNetworkConfigResults(Type): - _toSchema = {'results': 'Results'} - _toPy = {'Results': 'results'} + _toSchema = {'results': 'results'} + _toPy = {'results': 'results'} def __init__(self, results=None): ''' results : typing.Sequence[~UnitNetworkConfigResult] @@ -5289,8 +5687,8 @@ class UnitNetworkConfigResults(Type): class UnitsNetworkConfig(Type): - _toSchema = {'args': 'Args'} - _toPy = {'Args': 'args'} + _toSchema = {'args': 'args'} + _toPy = {'args': 'args'} def __init__(self, args=None): ''' args : typing.Sequence[~UnitNetworkConfig] @@ -5299,18 +5697,18 @@ class UnitsNetworkConfig(Type): class EntitiesVersion(Type): - _toSchema = {'agenttools': 'AgentTools'} - _toPy = {'AgentTools': 'agenttools'} - def __init__(self, agenttools=None): + _toSchema = {'agent_tools': 'agent-tools'} + _toPy = {'agent-tools': 'agent_tools'} + def __init__(self, agent_tools=None): ''' - agenttools : typing.Sequence[~EntityVersion] + agent_tools : typing.Sequence[~EntityVersion] ''' - self.agenttools = [EntityVersion.from_json(o) for o in agenttools or []] + self.agent_tools = [EntityVersion.from_json(o) for o in agent_tools or []] class EntityVersion(Type): - _toSchema = {'tools': 'Tools', 'tag': 'Tag'} - _toPy = {'Tag': 'tag', 'Tools': 'tools'} + _toSchema = {'tools': 'tools', 'tag': 'tag'} + _toPy = {'tools': 'tools', 'tag': 'tag'} def __init__(self, tag=None, tools=None): ''' tag : str @@ -5321,8 +5719,8 @@ class EntityVersion(Type): class VersionResult(Type): - _toSchema = {'error': 'Error', 'version': 'Version'} - _toPy = {'Error': 'error', 'Version': 'version'} + _toSchema = {'error': 'error', 'version': 'version'} + _toPy = {'error': 'error', 'version': 'version'} def __init__(self, error=None, version=None): ''' error : Error @@ -5333,8 +5731,8 @@ class VersionResult(Type): class VersionResults(Type): - _toSchema = {'results': 'Results'} - _toPy = {'Results': 'results'} + _toSchema = {'results': 'results'} + _toPy = {'results': 'results'} def __init__(self, results=None): ''' results : typing.Sequence[~VersionResult] @@ -5343,8 +5741,8 @@ class VersionResults(Type): class AddUser(Type): - _toSchema = {'model_access_permission': 'model-access-permission', 'shared_model_tags': 'shared-model-tags', 'password': 'password', 'username': 'username', 'display_name': 'display-name'} - _toPy = {'model-access-permission': 'model_access_permission', 'password': 'password', 'username': 'username', 'shared-model-tags': 'shared_model_tags', 'display-name': 'display_name'} + _toSchema = {'display_name': 'display-name', 'shared_model_tags': 'shared-model-tags', 'password': 'password', 'model_access_permission': 'model-access-permission', 'username': 'username'} + _toPy = {'username': 'username', 'display-name': 'display_name', 'password': 'password', 'model-access-permission': 'model_access_permission', 'shared-model-tags': 'shared_model_tags'} def __init__(self, display_name=None, model_access_permission=None, password=None, shared_model_tags=None, username=None): ''' display_name : str @@ -5361,7 +5759,7 @@ class AddUser(Type): class AddUserResult(Type): - _toSchema = {'tag': 'tag', 'error': 'error', 'secret_key': 'secret-key'} + _toSchema = {'error': 'error', 'secret_key': 'secret-key', 'tag': 'tag'} _toPy = {'error': 'error', 'tag': 'tag', 'secret-key': 'secret_key'} def __init__(self, error=None, secret_key=None, tag=None): ''' @@ -5395,8 +5793,8 @@ class AddUsers(Type): class MacaroonResult(Type): - _toSchema = {'result': 'result', 'error': 'error'} - _toPy = {'result': 'result', 'error': 'error'} + _toSchema = {'error': 'error', 'result': 'result'} + _toPy = {'error': 'error', 'result': 'result'} def __init__(self, error=None, result=None): ''' error : Error @@ -5417,8 +5815,8 @@ class MacaroonResults(Type): class UserInfo(Type): - _toSchema = {'date_created': 'date-created', 'last_connection': 'last-connection', 'disabled': 'disabled', 'display_name': 'display-name', 'created_by': 'created-by', 'username': 'username'} - _toPy = {'last-connection': 'last_connection', 'date-created': 'date_created', 'disabled': 'disabled', 'created-by': 'created_by', 'username': 'username', 'display-name': 'display_name'} + _toSchema = {'display_name': 'display-name', 'username': 'username', 'date_created': 'date-created', 'created_by': 'created-by', 'last_connection': 'last-connection', 'disabled': 'disabled'} + _toPy = {'username': 'username', 'display-name': 'display_name', 'created-by': 'created_by', 'last-connection': 'last_connection', 'disabled': 'disabled', 'date-created': 'date_created'} def __init__(self, created_by=None, date_created=None, disabled=None, display_name=None, last_connection=None, username=None): ''' created_by : str @@ -5437,8 +5835,8 @@ class UserInfo(Type): class UserInfoRequest(Type): - _toSchema = {'include_disabled': 'include-disabled', 'entities': 'entities'} - _toPy = {'include-disabled': 'include_disabled', 'entities': 'entities'} + _toSchema = {'entities': 'entities', 'include_disabled': 'include-disabled'} + _toPy = {'entities': 'entities', 'include-disabled': 'include_disabled'} def __init__(self, entities=None, include_disabled=None): ''' entities : typing.Sequence[~Entity] @@ -5449,8 +5847,8 @@ class UserInfoRequest(Type): class UserInfoResult(Type): - _toSchema = {'result': 'result', 'error': 'error'} - _toPy = {'result': 'result', 'error': 'error'} + _toSchema = {'error': 'error', 'result': 'result'} + _toPy = {'error': 'error', 'result': 'result'} def __init__(self, error=None, result=None): ''' error : Error @@ -5502,16 +5900,15 @@ class ActionFacade(Type): 'type': 'array'}}, 'type': 'object'}, 'ActionSpec': {'additionalProperties': False, - 'properties': {'Description': {'type': 'string'}, - 'Params': {'patternProperties': {'.*': {'additionalProperties': True, + 'properties': {'description': {'type': 'string'}, + 'params': {'patternProperties': {'.*': {'additionalProperties': True, 'type': 'object'}}, 'type': 'object'}}, - 'required': ['Description', 'Params'], + 'required': ['description', 'params'], 'type': 'object'}, 'Actions': {'additionalProperties': False, - 'properties': {'ActionSpecs': {'patternProperties': {'.*': {'$ref': '#/definitions/ActionSpec'}}, - 'type': 'object'}}, - 'required': ['ActionSpecs'], + 'properties': {'actions': {'items': {'$ref': '#/definitions/Action'}, + 'type': 'array'}}, 'type': 'object'}, 'ActionsByName': {'additionalProperties': False, 'properties': {'actions': {'items': {'$ref': '#/definitions/ActionResult'}, @@ -5534,8 +5931,9 @@ class ActionFacade(Type): 'type': 'array'}}, 'type': 'object'}, 'ApplicationCharmActionsResult': {'additionalProperties': False, - 'properties': {'ApplicationTag': {'type': 'string'}, - 'actions': {'$ref': '#/definitions/Actions'}, + 'properties': {'actions': {'patternProperties': {'.*': {'$ref': '#/definitions/ActionSpec'}}, + 'type': 'object'}, + 'application-tag': {'type': 'string'}, 'error': {'$ref': '#/definitions/Error'}}, 'type': 'object'}, 'ApplicationsCharmActionsResults': {'additionalProperties': False, @@ -5543,23 +5941,23 @@ class ActionFacade(Type): 'type': 'array'}}, 'type': 'object'}, 'Entities': {'additionalProperties': False, - 'properties': {'Entities': {'items': {'$ref': '#/definitions/Entity'}, + 'properties': {'entities': {'items': {'$ref': '#/definitions/Entity'}, 'type': 'array'}}, - 'required': ['Entities'], + 'required': ['entities'], 'type': 'object'}, 'Entity': {'additionalProperties': False, - 'properties': {'Tag': {'type': 'string'}}, - 'required': ['Tag'], + 'properties': {'tag': {'type': 'string'}}, + 'required': ['tag'], 'type': 'object'}, 'Error': {'additionalProperties': False, - 'properties': {'Code': {'type': 'string'}, - 'Info': {'$ref': '#/definitions/ErrorInfo'}, - 'Message': {'type': 'string'}}, - 'required': ['Message', 'Code'], + 'properties': {'code': {'type': 'string'}, + 'info': {'$ref': '#/definitions/ErrorInfo'}, + 'message': {'type': 'string'}}, + 'required': ['message', 'code'], 'type': 'object'}, 'ErrorInfo': {'additionalProperties': False, - 'properties': {'Macaroon': {'$ref': '#/definitions/Macaroon'}, - 'MacaroonPath': {'type': 'string'}}, + 'properties': {'macaroon': {'$ref': '#/definitions/Macaroon'}, + 'macaroon-path': {'type': 'string'}}, 'type': 'object'}, 'FindActionsByNames': {'additionalProperties': False, 'properties': {'names': {'items': {'type': 'string'}, @@ -5576,50 +5974,18 @@ class ActionFacade(Type): 'type': 'object'}}, 'required': ['matches'], 'type': 'object'}, - 'Macaroon': {'additionalProperties': False, - 'properties': {'caveats': {'items': {'$ref': '#/definitions/caveat'}, - 'type': 'array'}, - 'data': {'items': {'type': 'integer'}, - 'type': 'array'}, - 'id': {'$ref': '#/definitions/packet'}, - 'location': {'$ref': '#/definitions/packet'}, - 'sig': {'items': {'type': 'integer'}, - 'type': 'array'}}, - 'required': ['data', - 'location', - 'id', - 'caveats', - 'sig'], - 'type': 'object'}, + 'Macaroon': {'additionalProperties': False, 'type': 'object'}, 'RunParams': {'additionalProperties': False, - 'properties': {'Applications': {'items': {'type': 'string'}, + 'properties': {'applications': {'items': {'type': 'string'}, 'type': 'array'}, - 'Commands': {'type': 'string'}, - 'Machines': {'items': {'type': 'string'}, + 'commands': {'type': 'string'}, + 'machines': {'items': {'type': 'string'}, 'type': 'array'}, - 'Timeout': {'type': 'integer'}, - 'Units': {'items': {'type': 'string'}, + 'timeout': {'type': 'integer'}, + 'units': {'items': {'type': 'string'}, 'type': 'array'}}, - 'required': ['Commands', - 'Timeout', - 'Machines', - 'Applications', - 'Units'], - 'type': 'object'}, - 'caveat': {'additionalProperties': False, - 'properties': {'caveatId': {'$ref': '#/definitions/packet'}, - 'location': {'$ref': '#/definitions/packet'}, - 'verificationId': {'$ref': '#/definitions/packet'}}, - 'required': ['location', - 'caveatId', - 'verificationId'], - 'type': 'object'}, - 'packet': {'additionalProperties': False, - 'properties': {'headerLen': {'type': 'integer'}, - 'start': {'type': 'integer'}, - 'totalLen': {'type': 'integer'}}, - 'required': ['start', 'totalLen', 'headerLen'], - 'type': 'object'}}, + 'required': ['commands', 'timeout'], + 'type': 'object'}}, 'properties': {'Actions': {'properties': {'Params': {'$ref': '#/definitions/Entities'}, 'Result': {'$ref': '#/definitions/ActionResults'}}, 'type': 'object'}, @@ -5668,7 +6034,7 @@ class ActionFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Action', Request='Actions', Version=2, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -5683,7 +6049,7 @@ class ActionFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Action', Request='ApplicationsCharmsActions', Version=2, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -5698,22 +6064,22 @@ class ActionFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Action', Request='Cancel', Version=2, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @ReturnMapping(ActionResults) - async def Enqueue(self, actionspecs): + async def Enqueue(self, actions): ''' - actionspecs : typing.Mapping[str, ~ActionSpec] + actions : typing.Sequence[~Action] Returns -> typing.Sequence[~ActionResult] ''' # map input types to rpc msg params = dict() msg = dict(Type='Action', Request='Enqueue', Version=2, Params=params) - params['ActionSpecs'] = actionspecs + params['actions'] = actions reply = await self.rpc(msg) return reply @@ -5758,7 +6124,7 @@ class ActionFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Action', Request='ListAll', Version=2, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -5773,7 +6139,7 @@ class ActionFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Action', Request='ListCompleted', Version=2, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -5788,7 +6154,7 @@ class ActionFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Action', Request='ListPending', Version=2, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -5803,7 +6169,7 @@ class ActionFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Action', Request='ListRunning', Version=2, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -5822,11 +6188,11 @@ class ActionFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Action', Request='Run', Version=2, Params=params) - params['Applications'] = applications - params['Commands'] = commands - params['Machines'] = machines - params['Timeout'] = timeout - params['Units'] = units + params['applications'] = applications + params['commands'] = commands + params['machines'] = machines + params['timeout'] = timeout + params['units'] = units reply = await self.rpc(msg) return reply @@ -5845,124 +6211,11 @@ class ActionFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Action', Request='RunOnAllMachines', Version=2, Params=params) - params['Applications'] = applications - params['Commands'] = commands - params['Machines'] = machines - params['Timeout'] = timeout - params['Units'] = units - reply = await self.rpc(msg) - return reply - - -class AddresserFacade(Type): - name = 'Addresser' - version = 2 - schema = {'definitions': {'BoolResult': {'additionalProperties': False, - 'properties': {'Error': {'$ref': '#/definitions/Error'}, - 'Result': {'type': 'boolean'}}, - 'required': ['Error', 'Result'], - 'type': 'object'}, - 'EntitiesWatchResult': {'additionalProperties': False, - 'properties': {'Changes': {'items': {'type': 'string'}, - 'type': 'array'}, - 'EntityWatcherId': {'type': 'string'}, - 'Error': {'$ref': '#/definitions/Error'}}, - 'required': ['EntityWatcherId', - 'Changes', - 'Error'], - 'type': 'object'}, - 'Error': {'additionalProperties': False, - 'properties': {'Code': {'type': 'string'}, - 'Info': {'$ref': '#/definitions/ErrorInfo'}, - 'Message': {'type': 'string'}}, - 'required': ['Message', 'Code'], - 'type': 'object'}, - 'ErrorInfo': {'additionalProperties': False, - 'properties': {'Macaroon': {'$ref': '#/definitions/Macaroon'}, - 'MacaroonPath': {'type': 'string'}}, - 'type': 'object'}, - 'ErrorResult': {'additionalProperties': False, - 'properties': {'Error': {'$ref': '#/definitions/Error'}}, - 'required': ['Error'], - 'type': 'object'}, - 'Macaroon': {'additionalProperties': False, - 'properties': {'caveats': {'items': {'$ref': '#/definitions/caveat'}, - 'type': 'array'}, - 'data': {'items': {'type': 'integer'}, - 'type': 'array'}, - 'id': {'$ref': '#/definitions/packet'}, - 'location': {'$ref': '#/definitions/packet'}, - 'sig': {'items': {'type': 'integer'}, - 'type': 'array'}}, - 'required': ['data', - 'location', - 'id', - 'caveats', - 'sig'], - 'type': 'object'}, - 'caveat': {'additionalProperties': False, - 'properties': {'caveatId': {'$ref': '#/definitions/packet'}, - 'location': {'$ref': '#/definitions/packet'}, - 'verificationId': {'$ref': '#/definitions/packet'}}, - 'required': ['location', - 'caveatId', - 'verificationId'], - 'type': 'object'}, - 'packet': {'additionalProperties': False, - 'properties': {'headerLen': {'type': 'integer'}, - 'start': {'type': 'integer'}, - 'totalLen': {'type': 'integer'}}, - 'required': ['start', 'totalLen', 'headerLen'], - 'type': 'object'}}, - 'properties': {'CanDeallocateAddresses': {'properties': {'Result': {'$ref': '#/definitions/BoolResult'}}, - 'type': 'object'}, - 'CleanupIPAddresses': {'properties': {'Result': {'$ref': '#/definitions/ErrorResult'}}, - 'type': 'object'}, - 'WatchIPAddresses': {'properties': {'Result': {'$ref': '#/definitions/EntitiesWatchResult'}}, - 'type': 'object'}}, - 'type': 'object'} - - - @ReturnMapping(BoolResult) - async def CanDeallocateAddresses(self): - ''' - - Returns -> typing.Union[_ForwardRef('Error'), bool] - ''' - # map input types to rpc msg - params = dict() - msg = dict(Type='Addresser', Request='CanDeallocateAddresses', Version=2, Params=params) - - reply = await self.rpc(msg) - return reply - - - - @ReturnMapping(ErrorResult) - async def CleanupIPAddresses(self): - ''' - - Returns -> Error - ''' - # map input types to rpc msg - params = dict() - msg = dict(Type='Addresser', Request='CleanupIPAddresses', Version=2, Params=params) - - reply = await self.rpc(msg) - return reply - - - - @ReturnMapping(EntitiesWatchResult) - async def WatchIPAddresses(self): - ''' - - Returns -> typing.Union[typing.Sequence[str], _ForwardRef('Error')] - ''' - # map input types to rpc msg - params = dict() - msg = dict(Type='Addresser', Request='WatchIPAddresses', Version=2, Params=params) - + params['applications'] = applications + params['commands'] = commands + params['machines'] = machines + params['timeout'] = timeout + params['units'] = units reply = await self.rpc(msg) return reply @@ -5971,122 +6224,100 @@ class AgentFacade(Type): name = 'Agent' version = 2 schema = {'definitions': {'AgentGetEntitiesResult': {'additionalProperties': False, - 'properties': {'ContainerType': {'type': 'string'}, - 'Error': {'$ref': '#/definitions/Error'}, - 'Jobs': {'items': {'type': 'string'}, + 'properties': {'container-type': {'type': 'string'}, + 'error': {'$ref': '#/definitions/Error'}, + 'jobs': {'items': {'type': 'string'}, 'type': 'array'}, - 'Life': {'type': 'string'}}, - 'required': ['Life', - 'Jobs', - 'ContainerType', - 'Error'], + 'life': {'type': 'string'}}, + 'required': ['life', + 'jobs', + 'container-type'], 'type': 'object'}, 'AgentGetEntitiesResults': {'additionalProperties': False, - 'properties': {'Entities': {'items': {'$ref': '#/definitions/AgentGetEntitiesResult'}, + 'properties': {'entities': {'items': {'$ref': '#/definitions/AgentGetEntitiesResult'}, 'type': 'array'}}, - 'required': ['Entities'], + 'required': ['entities'], 'type': 'object'}, + 'ControllerConfigResult': {'additionalProperties': False, + 'properties': {'config': {'patternProperties': {'.*': {'additionalProperties': True, + 'type': 'object'}}, + 'type': 'object'}}, + 'required': ['config'], + 'type': 'object'}, 'Entities': {'additionalProperties': False, - 'properties': {'Entities': {'items': {'$ref': '#/definitions/Entity'}, + 'properties': {'entities': {'items': {'$ref': '#/definitions/Entity'}, 'type': 'array'}}, - 'required': ['Entities'], + 'required': ['entities'], 'type': 'object'}, 'Entity': {'additionalProperties': False, - 'properties': {'Tag': {'type': 'string'}}, - 'required': ['Tag'], + 'properties': {'tag': {'type': 'string'}}, + 'required': ['tag'], 'type': 'object'}, 'EntityPassword': {'additionalProperties': False, - 'properties': {'Password': {'type': 'string'}, - 'Tag': {'type': 'string'}}, - 'required': ['Tag', 'Password'], + 'properties': {'password': {'type': 'string'}, + 'tag': {'type': 'string'}}, + 'required': ['tag', 'password'], 'type': 'object'}, 'EntityPasswords': {'additionalProperties': False, - 'properties': {'Changes': {'items': {'$ref': '#/definitions/EntityPassword'}, + 'properties': {'changes': {'items': {'$ref': '#/definitions/EntityPassword'}, 'type': 'array'}}, - 'required': ['Changes'], + 'required': ['changes'], 'type': 'object'}, 'Error': {'additionalProperties': False, - 'properties': {'Code': {'type': 'string'}, - 'Info': {'$ref': '#/definitions/ErrorInfo'}, - 'Message': {'type': 'string'}}, - 'required': ['Message', 'Code'], + 'properties': {'code': {'type': 'string'}, + 'info': {'$ref': '#/definitions/ErrorInfo'}, + 'message': {'type': 'string'}}, + 'required': ['message', 'code'], 'type': 'object'}, 'ErrorInfo': {'additionalProperties': False, - 'properties': {'Macaroon': {'$ref': '#/definitions/Macaroon'}, - 'MacaroonPath': {'type': 'string'}}, + 'properties': {'macaroon': {'$ref': '#/definitions/Macaroon'}, + 'macaroon-path': {'type': 'string'}}, 'type': 'object'}, 'ErrorResult': {'additionalProperties': False, - 'properties': {'Error': {'$ref': '#/definitions/Error'}}, - 'required': ['Error'], + 'properties': {'error': {'$ref': '#/definitions/Error'}}, 'type': 'object'}, 'ErrorResults': {'additionalProperties': False, - 'properties': {'Results': {'items': {'$ref': '#/definitions/ErrorResult'}, + 'properties': {'results': {'items': {'$ref': '#/definitions/ErrorResult'}, 'type': 'array'}}, - 'required': ['Results'], + 'required': ['results'], 'type': 'object'}, 'IsMasterResult': {'additionalProperties': False, - 'properties': {'Master': {'type': 'boolean'}}, - 'required': ['Master'], + 'properties': {'master': {'type': 'boolean'}}, + 'required': ['master'], 'type': 'object'}, - 'Macaroon': {'additionalProperties': False, - 'properties': {'caveats': {'items': {'$ref': '#/definitions/caveat'}, - 'type': 'array'}, - 'data': {'items': {'type': 'integer'}, - 'type': 'array'}, - 'id': {'$ref': '#/definitions/packet'}, - 'location': {'$ref': '#/definitions/packet'}, - 'sig': {'items': {'type': 'integer'}, - 'type': 'array'}}, - 'required': ['data', - 'location', - 'id', - 'caveats', - 'sig'], - 'type': 'object'}, + 'Macaroon': {'additionalProperties': False, 'type': 'object'}, 'ModelConfigResult': {'additionalProperties': False, - 'properties': {'Config': {'patternProperties': {'.*': {'additionalProperties': True, + 'properties': {'config': {'patternProperties': {'.*': {'additionalProperties': True, 'type': 'object'}}, 'type': 'object'}}, - 'required': ['Config'], + 'required': ['config'], 'type': 'object'}, 'NotifyWatchResult': {'additionalProperties': False, - 'properties': {'Error': {'$ref': '#/definitions/Error'}, - 'NotifyWatcherId': {'type': 'string'}}, - 'required': ['NotifyWatcherId', 'Error'], + 'properties': {'NotifyWatcherId': {'type': 'string'}, + 'error': {'$ref': '#/definitions/Error'}}, + 'required': ['NotifyWatcherId'], 'type': 'object'}, 'StateServingInfo': {'additionalProperties': False, - 'properties': {'APIPort': {'type': 'integer'}, - 'CAPrivateKey': {'type': 'string'}, - 'Cert': {'type': 'string'}, - 'PrivateKey': {'type': 'string'}, - 'SharedSecret': {'type': 'string'}, - 'StatePort': {'type': 'integer'}, - 'SystemIdentity': {'type': 'string'}}, - 'required': ['APIPort', - 'StatePort', - 'Cert', - 'PrivateKey', - 'CAPrivateKey', - 'SharedSecret', - 'SystemIdentity'], - 'type': 'object'}, - 'caveat': {'additionalProperties': False, - 'properties': {'caveatId': {'$ref': '#/definitions/packet'}, - 'location': {'$ref': '#/definitions/packet'}, - 'verificationId': {'$ref': '#/definitions/packet'}}, - 'required': ['location', - 'caveatId', - 'verificationId'], - 'type': 'object'}, - 'packet': {'additionalProperties': False, - 'properties': {'headerLen': {'type': 'integer'}, - 'start': {'type': 'integer'}, - 'totalLen': {'type': 'integer'}}, - 'required': ['start', 'totalLen', 'headerLen'], - 'type': 'object'}}, + 'properties': {'api-port': {'type': 'integer'}, + 'ca-private-key': {'type': 'string'}, + 'cert': {'type': 'string'}, + 'private-key': {'type': 'string'}, + 'shared-secret': {'type': 'string'}, + 'state-port': {'type': 'integer'}, + 'system-identity': {'type': 'string'}}, + 'required': ['api-port', + 'state-port', + 'cert', + 'private-key', + 'ca-private-key', + 'shared-secret', + 'system-identity'], + 'type': 'object'}}, 'properties': {'ClearReboot': {'properties': {'Params': {'$ref': '#/definitions/Entities'}, 'Result': {'$ref': '#/definitions/ErrorResults'}}, 'type': 'object'}, + 'ControllerConfig': {'properties': {'Result': {'$ref': '#/definitions/ControllerConfigResult'}}, + 'type': 'object'}, 'GetEntities': {'properties': {'Params': {'$ref': '#/definitions/Entities'}, 'Result': {'$ref': '#/definitions/AgentGetEntitiesResults'}}, 'type': 'object'}, @@ -6113,7 +6344,22 @@ class AgentFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Agent', Request='ClearReboot', Version=2, Params=params) - params['Entities'] = entities + params['entities'] = entities + reply = await self.rpc(msg) + return reply + + + + @ReturnMapping(ControllerConfigResult) + async def ControllerConfig(self): + ''' + + Returns -> typing.Mapping[str, typing.Any] + ''' + # map input types to rpc msg + params = dict() + msg = dict(Type='Agent', Request='ControllerConfig', Version=2, Params=params) + reply = await self.rpc(msg) return reply @@ -6128,7 +6374,7 @@ class AgentFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Agent', Request='GetEntities', Version=2, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -6173,7 +6419,7 @@ class AgentFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Agent', Request='SetPasswords', Version=2, Params=params) - params['Changes'] = changes + params['changes'] = changes reply = await self.rpc(msg) return reply @@ -6198,7 +6444,7 @@ class AgentFacade(Type): async def WatchForModelConfigChanges(self): ''' - Returns -> typing.Union[_ForwardRef('Error'), str] + Returns -> typing.Union[str, _ForwardRef('Error')] ''' # map input types to rpc msg params = dict() @@ -6232,15 +6478,15 @@ class AllModelWatcherFacade(Type): name = 'AllModelWatcher' version = 2 schema = {'definitions': {'AllWatcherNextResults': {'additionalProperties': False, - 'properties': {'Deltas': {'items': {'$ref': '#/definitions/Delta'}, + 'properties': {'deltas': {'items': {'$ref': '#/definitions/Delta'}, 'type': 'array'}}, - 'required': ['Deltas'], + 'required': ['deltas'], 'type': 'object'}, 'Delta': {'additionalProperties': False, - 'properties': {'Entity': {'additionalProperties': True, + 'properties': {'entity': {'additionalProperties': True, 'type': 'object'}, - 'Removed': {'type': 'boolean'}}, - 'required': ['Removed', 'Entity'], + 'removed': {'type': 'boolean'}}, + 'required': ['removed', 'entity'], 'type': 'object'}}, 'properties': {'Next': {'properties': {'Result': {'$ref': '#/definitions/AllWatcherNextResults'}}, 'type': 'object'}, @@ -6281,15 +6527,15 @@ class AllWatcherFacade(Type): name = 'AllWatcher' version = 1 schema = {'definitions': {'AllWatcherNextResults': {'additionalProperties': False, - 'properties': {'Deltas': {'items': {'$ref': '#/definitions/Delta'}, + 'properties': {'deltas': {'items': {'$ref': '#/definitions/Delta'}, 'type': 'array'}}, - 'required': ['Deltas'], + 'required': ['deltas'], 'type': 'object'}, 'Delta': {'additionalProperties': False, - 'properties': {'Entity': {'additionalProperties': True, + 'properties': {'entity': {'additionalProperties': True, 'type': 'object'}, - 'Removed': {'type': 'boolean'}}, - 'required': ['Removed', 'Entity'], + 'removed': {'type': 'boolean'}}, + 'required': ['removed', 'entity'], 'type': 'object'}}, 'properties': {'Next': {'properties': {'Result': {'$ref': '#/definitions/AllWatcherNextResults'}}, 'type': 'object'}, @@ -6330,87 +6576,56 @@ class AnnotationsFacade(Type): name = 'Annotations' version = 2 schema = {'definitions': {'AnnotationsGetResult': {'additionalProperties': False, - 'properties': {'Annotations': {'patternProperties': {'.*': {'type': 'string'}}, + 'properties': {'annotations': {'patternProperties': {'.*': {'type': 'string'}}, 'type': 'object'}, - 'EntityTag': {'type': 'string'}, - 'Error': {'$ref': '#/definitions/ErrorResult'}}, - 'required': ['EntityTag', - 'Annotations', - 'Error'], + 'entity': {'type': 'string'}, + 'error': {'$ref': '#/definitions/ErrorResult'}}, + 'required': ['entity', 'annotations'], 'type': 'object'}, 'AnnotationsGetResults': {'additionalProperties': False, - 'properties': {'Results': {'items': {'$ref': '#/definitions/AnnotationsGetResult'}, + 'properties': {'results': {'items': {'$ref': '#/definitions/AnnotationsGetResult'}, 'type': 'array'}}, - 'required': ['Results'], + 'required': ['results'], 'type': 'object'}, 'AnnotationsSet': {'additionalProperties': False, - 'properties': {'Annotations': {'items': {'$ref': '#/definitions/EntityAnnotations'}, + 'properties': {'annotations': {'items': {'$ref': '#/definitions/EntityAnnotations'}, 'type': 'array'}}, - 'required': ['Annotations'], + 'required': ['annotations'], 'type': 'object'}, 'Entities': {'additionalProperties': False, - 'properties': {'Entities': {'items': {'$ref': '#/definitions/Entity'}, + 'properties': {'entities': {'items': {'$ref': '#/definitions/Entity'}, 'type': 'array'}}, - 'required': ['Entities'], + 'required': ['entities'], 'type': 'object'}, 'Entity': {'additionalProperties': False, - 'properties': {'Tag': {'type': 'string'}}, - 'required': ['Tag'], + 'properties': {'tag': {'type': 'string'}}, + 'required': ['tag'], 'type': 'object'}, 'EntityAnnotations': {'additionalProperties': False, - 'properties': {'Annotations': {'patternProperties': {'.*': {'type': 'string'}}, + 'properties': {'annotations': {'patternProperties': {'.*': {'type': 'string'}}, 'type': 'object'}, - 'EntityTag': {'type': 'string'}}, - 'required': ['EntityTag', 'Annotations'], + 'entity': {'type': 'string'}}, + 'required': ['entity', 'annotations'], 'type': 'object'}, 'Error': {'additionalProperties': False, - 'properties': {'Code': {'type': 'string'}, - 'Info': {'$ref': '#/definitions/ErrorInfo'}, - 'Message': {'type': 'string'}}, - 'required': ['Message', 'Code'], + 'properties': {'code': {'type': 'string'}, + 'info': {'$ref': '#/definitions/ErrorInfo'}, + 'message': {'type': 'string'}}, + 'required': ['message', 'code'], 'type': 'object'}, 'ErrorInfo': {'additionalProperties': False, - 'properties': {'Macaroon': {'$ref': '#/definitions/Macaroon'}, - 'MacaroonPath': {'type': 'string'}}, + 'properties': {'macaroon': {'$ref': '#/definitions/Macaroon'}, + 'macaroon-path': {'type': 'string'}}, 'type': 'object'}, 'ErrorResult': {'additionalProperties': False, - 'properties': {'Error': {'$ref': '#/definitions/Error'}}, - 'required': ['Error'], + 'properties': {'error': {'$ref': '#/definitions/Error'}}, 'type': 'object'}, 'ErrorResults': {'additionalProperties': False, - 'properties': {'Results': {'items': {'$ref': '#/definitions/ErrorResult'}, + 'properties': {'results': {'items': {'$ref': '#/definitions/ErrorResult'}, 'type': 'array'}}, - 'required': ['Results'], + 'required': ['results'], 'type': 'object'}, - 'Macaroon': {'additionalProperties': False, - 'properties': {'caveats': {'items': {'$ref': '#/definitions/caveat'}, - 'type': 'array'}, - 'data': {'items': {'type': 'integer'}, - 'type': 'array'}, - 'id': {'$ref': '#/definitions/packet'}, - 'location': {'$ref': '#/definitions/packet'}, - 'sig': {'items': {'type': 'integer'}, - 'type': 'array'}}, - 'required': ['data', - 'location', - 'id', - 'caveats', - 'sig'], - 'type': 'object'}, - 'caveat': {'additionalProperties': False, - 'properties': {'caveatId': {'$ref': '#/definitions/packet'}, - 'location': {'$ref': '#/definitions/packet'}, - 'verificationId': {'$ref': '#/definitions/packet'}}, - 'required': ['location', - 'caveatId', - 'verificationId'], - 'type': 'object'}, - 'packet': {'additionalProperties': False, - 'properties': {'headerLen': {'type': 'integer'}, - 'start': {'type': 'integer'}, - 'totalLen': {'type': 'integer'}}, - 'required': ['start', 'totalLen', 'headerLen'], - 'type': 'object'}}, + 'Macaroon': {'additionalProperties': False, 'type': 'object'}}, 'properties': {'Get': {'properties': {'Params': {'$ref': '#/definitions/Entities'}, 'Result': {'$ref': '#/definitions/AnnotationsGetResults'}}, 'type': 'object'}, @@ -6429,7 +6644,7 @@ class AnnotationsFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Annotations', Request='Get', Version=2, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -6444,7 +6659,7 @@ class AnnotationsFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Annotations', Request='Set', Version=2, Params=params) - params['Annotations'] = annotations + params['annotations'] = annotations reply = await self.rpc(msg) return reply @@ -6453,161 +6668,165 @@ class ApplicationFacade(Type): name = 'Application' version = 1 schema = {'definitions': {'AddApplicationUnits': {'additionalProperties': False, - 'properties': {'ApplicationName': {'type': 'string'}, - 'NumUnits': {'type': 'integer'}, - 'Placement': {'items': {'$ref': '#/definitions/Placement'}, + 'properties': {'application': {'type': 'string'}, + 'num-units': {'type': 'integer'}, + 'placement': {'items': {'$ref': '#/definitions/Placement'}, 'type': 'array'}}, - 'required': ['ApplicationName', - 'NumUnits', - 'Placement'], + 'required': ['application', + 'num-units', + 'placement'], 'type': 'object'}, 'AddApplicationUnitsResults': {'additionalProperties': False, - 'properties': {'Units': {'items': {'type': 'string'}, + 'properties': {'units': {'items': {'type': 'string'}, 'type': 'array'}}, - 'required': ['Units'], + 'required': ['units'], 'type': 'object'}, 'AddRelation': {'additionalProperties': False, - 'properties': {'Endpoints': {'items': {'type': 'string'}, + 'properties': {'endpoints': {'items': {'type': 'string'}, 'type': 'array'}}, - 'required': ['Endpoints'], + 'required': ['endpoints'], 'type': 'object'}, 'AddRelationResults': {'additionalProperties': False, - 'properties': {'Endpoints': {'patternProperties': {'.*': {'$ref': '#/definitions/Relation'}}, + 'properties': {'endpoints': {'patternProperties': {'.*': {'$ref': '#/definitions/CharmRelation'}}, 'type': 'object'}}, - 'required': ['Endpoints'], + 'required': ['endpoints'], 'type': 'object'}, 'ApplicationCharmRelations': {'additionalProperties': False, - 'properties': {'ApplicationName': {'type': 'string'}}, - 'required': ['ApplicationName'], + 'properties': {'application': {'type': 'string'}}, + 'required': ['application'], 'type': 'object'}, 'ApplicationCharmRelationsResults': {'additionalProperties': False, - 'properties': {'CharmRelations': {'items': {'type': 'string'}, - 'type': 'array'}}, - 'required': ['CharmRelations'], + 'properties': {'charm-relations': {'items': {'type': 'string'}, + 'type': 'array'}}, + 'required': ['charm-relations'], 'type': 'object'}, 'ApplicationDeploy': {'additionalProperties': False, - 'properties': {'ApplicationName': {'type': 'string'}, - 'Channel': {'type': 'string'}, - 'CharmUrl': {'type': 'string'}, - 'Config': {'patternProperties': {'.*': {'type': 'string'}}, + 'properties': {'application': {'type': 'string'}, + 'channel': {'type': 'string'}, + 'charm-url': {'type': 'string'}, + 'config': {'patternProperties': {'.*': {'type': 'string'}}, 'type': 'object'}, - 'ConfigYAML': {'type': 'string'}, - 'Constraints': {'$ref': '#/definitions/Value'}, - 'EndpointBindings': {'patternProperties': {'.*': {'type': 'string'}}, - 'type': 'object'}, - 'NumUnits': {'type': 'integer'}, - 'Placement': {'items': {'$ref': '#/definitions/Placement'}, + 'config-yaml': {'type': 'string'}, + 'constraints': {'$ref': '#/definitions/Value'}, + 'endpoint-bindings': {'patternProperties': {'.*': {'type': 'string'}}, + 'type': 'object'}, + 'num-units': {'type': 'integer'}, + 'placement': {'items': {'$ref': '#/definitions/Placement'}, 'type': 'array'}, - 'Resources': {'patternProperties': {'.*': {'type': 'string'}}, + 'resources': {'patternProperties': {'.*': {'type': 'string'}}, 'type': 'object'}, - 'Series': {'type': 'string'}, - 'Storage': {'patternProperties': {'.*': {'$ref': '#/definitions/Constraints'}}, + 'series': {'type': 'string'}, + 'storage': {'patternProperties': {'.*': {'$ref': '#/definitions/Constraints'}}, 'type': 'object'}}, - 'required': ['ApplicationName', - 'Series', - 'CharmUrl', - 'Channel', - 'NumUnits', - 'Config', - 'ConfigYAML', - 'Constraints', - 'Placement', - 'Storage', - 'EndpointBindings', - 'Resources'], + 'required': ['application', + 'series', + 'charm-url', + 'channel', + 'num-units', + 'config-yaml', + 'constraints'], 'type': 'object'}, 'ApplicationDestroy': {'additionalProperties': False, - 'properties': {'ApplicationName': {'type': 'string'}}, - 'required': ['ApplicationName'], + 'properties': {'application': {'type': 'string'}}, + 'required': ['application'], 'type': 'object'}, 'ApplicationExpose': {'additionalProperties': False, - 'properties': {'ApplicationName': {'type': 'string'}}, - 'required': ['ApplicationName'], + 'properties': {'application': {'type': 'string'}}, + 'required': ['application'], 'type': 'object'}, 'ApplicationGet': {'additionalProperties': False, - 'properties': {'ApplicationName': {'type': 'string'}}, - 'required': ['ApplicationName'], + 'properties': {'application': {'type': 'string'}}, + 'required': ['application'], 'type': 'object'}, 'ApplicationGetResults': {'additionalProperties': False, - 'properties': {'Application': {'type': 'string'}, - 'Charm': {'type': 'string'}, - 'Config': {'patternProperties': {'.*': {'additionalProperties': True, + 'properties': {'application': {'type': 'string'}, + 'charm': {'type': 'string'}, + 'config': {'patternProperties': {'.*': {'additionalProperties': True, 'type': 'object'}}, 'type': 'object'}, - 'Constraints': {'$ref': '#/definitions/Value'}}, - 'required': ['Application', - 'Charm', - 'Config', - 'Constraints'], + 'constraints': {'$ref': '#/definitions/Value'}}, + 'required': ['application', + 'charm', + 'config', + 'constraints'], 'type': 'object'}, 'ApplicationMetricCredential': {'additionalProperties': False, - 'properties': {'ApplicationName': {'type': 'string'}, - 'MetricCredentials': {'items': {'type': 'integer'}, - 'type': 'array'}}, - 'required': ['ApplicationName', - 'MetricCredentials'], + 'properties': {'application': {'type': 'string'}, + 'metrics-credentials': {'items': {'type': 'integer'}, + 'type': 'array'}}, + 'required': ['application', + 'metrics-credentials'], 'type': 'object'}, 'ApplicationMetricCredentials': {'additionalProperties': False, - 'properties': {'Creds': {'items': {'$ref': '#/definitions/ApplicationMetricCredential'}, + 'properties': {'creds': {'items': {'$ref': '#/definitions/ApplicationMetricCredential'}, 'type': 'array'}}, - 'required': ['Creds'], + 'required': ['creds'], 'type': 'object'}, 'ApplicationSet': {'additionalProperties': False, - 'properties': {'ApplicationName': {'type': 'string'}, - 'Options': {'patternProperties': {'.*': {'type': 'string'}}, + 'properties': {'application': {'type': 'string'}, + 'options': {'patternProperties': {'.*': {'type': 'string'}}, 'type': 'object'}}, - 'required': ['ApplicationName', 'Options'], + 'required': ['application', 'options'], 'type': 'object'}, 'ApplicationSetCharm': {'additionalProperties': False, - 'properties': {'applicationname': {'type': 'string'}, - 'charmurl': {'type': 'string'}, - 'cs-channel': {'type': 'string'}, - 'forceseries': {'type': 'boolean'}, - 'forceunits': {'type': 'boolean'}, - 'resourceids': {'patternProperties': {'.*': {'type': 'string'}}, - 'type': 'object'}}, - 'required': ['applicationname', - 'charmurl', - 'cs-channel', - 'forceunits', - 'forceseries', - 'resourceids'], + 'properties': {'application': {'type': 'string'}, + 'channel': {'type': 'string'}, + 'charm-url': {'type': 'string'}, + 'force-series': {'type': 'boolean'}, + 'force-units': {'type': 'boolean'}, + 'resource-ids': {'patternProperties': {'.*': {'type': 'string'}}, + 'type': 'object'}}, + 'required': ['application', + 'charm-url', + 'channel', + 'force-units', + 'force-series'], 'type': 'object'}, 'ApplicationUnexpose': {'additionalProperties': False, - 'properties': {'ApplicationName': {'type': 'string'}}, - 'required': ['ApplicationName'], + 'properties': {'application': {'type': 'string'}}, + 'required': ['application'], 'type': 'object'}, 'ApplicationUnset': {'additionalProperties': False, - 'properties': {'ApplicationName': {'type': 'string'}, - 'Options': {'items': {'type': 'string'}, + 'properties': {'application': {'type': 'string'}, + 'options': {'items': {'type': 'string'}, 'type': 'array'}}, - 'required': ['ApplicationName', - 'Options'], + 'required': ['application', 'options'], 'type': 'object'}, 'ApplicationUpdate': {'additionalProperties': False, - 'properties': {'ApplicationName': {'type': 'string'}, - 'CharmUrl': {'type': 'string'}, - 'Constraints': {'$ref': '#/definitions/Value'}, - 'ForceCharmUrl': {'type': 'boolean'}, - 'ForceSeries': {'type': 'boolean'}, - 'MinUnits': {'type': 'integer'}, - 'SettingsStrings': {'patternProperties': {'.*': {'type': 'string'}}, - 'type': 'object'}, - 'SettingsYAML': {'type': 'string'}}, - 'required': ['ApplicationName', - 'CharmUrl', - 'ForceCharmUrl', - 'ForceSeries', - 'MinUnits', - 'SettingsStrings', - 'SettingsYAML', - 'Constraints'], + 'properties': {'application': {'type': 'string'}, + 'charm-url': {'type': 'string'}, + 'constraints': {'$ref': '#/definitions/Value'}, + 'force-charm-url': {'type': 'boolean'}, + 'force-series': {'type': 'boolean'}, + 'min-units': {'type': 'integer'}, + 'settings': {'patternProperties': {'.*': {'type': 'string'}}, + 'type': 'object'}, + 'settings-yaml': {'type': 'string'}}, + 'required': ['application', + 'charm-url', + 'force-charm-url', + 'force-series', + 'settings-yaml'], 'type': 'object'}, 'ApplicationsDeploy': {'additionalProperties': False, - 'properties': {'Applications': {'items': {'$ref': '#/definitions/ApplicationDeploy'}, + 'properties': {'applications': {'items': {'$ref': '#/definitions/ApplicationDeploy'}, 'type': 'array'}}, - 'required': ['Applications'], + 'required': ['applications'], 'type': 'object'}, + 'CharmRelation': {'additionalProperties': False, + 'properties': {'interface': {'type': 'string'}, + 'limit': {'type': 'integer'}, + 'name': {'type': 'string'}, + 'optional': {'type': 'boolean'}, + 'role': {'type': 'string'}, + 'scope': {'type': 'string'}}, + 'required': ['name', + 'role', + 'interface', + 'optional', + 'limit', + 'scope'], + 'type': 'object'}, 'Constraints': {'additionalProperties': False, 'properties': {'Count': {'type': 'integer'}, 'Pool': {'type': 'string'}, @@ -6615,86 +6834,56 @@ class ApplicationFacade(Type): 'required': ['Pool', 'Size', 'Count'], 'type': 'object'}, 'DestroyApplicationUnits': {'additionalProperties': False, - 'properties': {'UnitNames': {'items': {'type': 'string'}, - 'type': 'array'}}, - 'required': ['UnitNames'], + 'properties': {'unit-names': {'items': {'type': 'string'}, + 'type': 'array'}}, + 'required': ['unit-names'], 'type': 'object'}, 'DestroyRelation': {'additionalProperties': False, - 'properties': {'Endpoints': {'items': {'type': 'string'}, + 'properties': {'endpoints': {'items': {'type': 'string'}, 'type': 'array'}}, - 'required': ['Endpoints'], + 'required': ['endpoints'], 'type': 'object'}, 'Error': {'additionalProperties': False, - 'properties': {'Code': {'type': 'string'}, - 'Info': {'$ref': '#/definitions/ErrorInfo'}, - 'Message': {'type': 'string'}}, - 'required': ['Message', 'Code'], + 'properties': {'code': {'type': 'string'}, + 'info': {'$ref': '#/definitions/ErrorInfo'}, + 'message': {'type': 'string'}}, + 'required': ['message', 'code'], 'type': 'object'}, 'ErrorInfo': {'additionalProperties': False, - 'properties': {'Macaroon': {'$ref': '#/definitions/Macaroon'}, - 'MacaroonPath': {'type': 'string'}}, + 'properties': {'macaroon': {'$ref': '#/definitions/Macaroon'}, + 'macaroon-path': {'type': 'string'}}, 'type': 'object'}, 'ErrorResult': {'additionalProperties': False, - 'properties': {'Error': {'$ref': '#/definitions/Error'}}, - 'required': ['Error'], + 'properties': {'error': {'$ref': '#/definitions/Error'}}, 'type': 'object'}, 'ErrorResults': {'additionalProperties': False, - 'properties': {'Results': {'items': {'$ref': '#/definitions/ErrorResult'}, + 'properties': {'results': {'items': {'$ref': '#/definitions/ErrorResult'}, 'type': 'array'}}, - 'required': ['Results'], + 'required': ['results'], 'type': 'object'}, 'GetApplicationConstraints': {'additionalProperties': False, - 'properties': {'ApplicationName': {'type': 'string'}}, - 'required': ['ApplicationName'], + 'properties': {'application': {'type': 'string'}}, + 'required': ['application'], 'type': 'object'}, 'GetConstraintsResults': {'additionalProperties': False, - 'properties': {'Constraints': {'$ref': '#/definitions/Value'}}, - 'required': ['Constraints'], + 'properties': {'constraints': {'$ref': '#/definitions/Value'}}, + 'required': ['constraints'], 'type': 'object'}, - 'Macaroon': {'additionalProperties': False, - 'properties': {'caveats': {'items': {'$ref': '#/definitions/caveat'}, - 'type': 'array'}, - 'data': {'items': {'type': 'integer'}, - 'type': 'array'}, - 'id': {'$ref': '#/definitions/packet'}, - 'location': {'$ref': '#/definitions/packet'}, - 'sig': {'items': {'type': 'integer'}, - 'type': 'array'}}, - 'required': ['data', - 'location', - 'id', - 'caveats', - 'sig'], - 'type': 'object'}, + 'Macaroon': {'additionalProperties': False, 'type': 'object'}, 'Placement': {'additionalProperties': False, - 'properties': {'Directive': {'type': 'string'}, - 'Scope': {'type': 'string'}}, - 'required': ['Scope', 'Directive'], + 'properties': {'directive': {'type': 'string'}, + 'scope': {'type': 'string'}}, + 'required': ['scope', 'directive'], 'type': 'object'}, - 'Relation': {'additionalProperties': False, - 'properties': {'Interface': {'type': 'string'}, - 'Limit': {'type': 'integer'}, - 'Name': {'type': 'string'}, - 'Optional': {'type': 'boolean'}, - 'Role': {'type': 'string'}, - 'Scope': {'type': 'string'}}, - 'required': ['Name', - 'Role', - 'Interface', - 'Optional', - 'Limit', - 'Scope'], - 'type': 'object'}, 'SetConstraints': {'additionalProperties': False, - 'properties': {'ApplicationName': {'type': 'string'}, - 'Constraints': {'$ref': '#/definitions/Value'}}, - 'required': ['ApplicationName', - 'Constraints'], + 'properties': {'application': {'type': 'string'}, + 'constraints': {'$ref': '#/definitions/Value'}}, + 'required': ['application', 'constraints'], 'type': 'object'}, 'StringResult': {'additionalProperties': False, - 'properties': {'Error': {'$ref': '#/definitions/Error'}, - 'Result': {'type': 'string'}}, - 'required': ['Error', 'Result'], + 'properties': {'error': {'$ref': '#/definitions/Error'}, + 'result': {'type': 'string'}}, + 'required': ['result'], 'type': 'object'}, 'Value': {'additionalProperties': False, 'properties': {'arch': {'type': 'string'}, @@ -6709,21 +6898,7 @@ class ApplicationFacade(Type): 'tags': {'items': {'type': 'string'}, 'type': 'array'}, 'virt-type': {'type': 'string'}}, - 'type': 'object'}, - 'caveat': {'additionalProperties': False, - 'properties': {'caveatId': {'$ref': '#/definitions/packet'}, - 'location': {'$ref': '#/definitions/packet'}, - 'verificationId': {'$ref': '#/definitions/packet'}}, - 'required': ['location', - 'caveatId', - 'verificationId'], - 'type': 'object'}, - 'packet': {'additionalProperties': False, - 'properties': {'headerLen': {'type': 'integer'}, - 'start': {'type': 'integer'}, - 'totalLen': {'type': 'integer'}}, - 'required': ['start', 'totalLen', 'headerLen'], - 'type': 'object'}}, + 'type': 'object'}}, 'properties': {'AddRelation': {'properties': {'Params': {'$ref': '#/definitions/AddRelation'}, 'Result': {'$ref': '#/definitions/AddRelationResults'}}, 'type': 'object'}, @@ -6775,46 +6950,46 @@ class ApplicationFacade(Type): async def AddRelation(self, endpoints): ''' endpoints : typing.Sequence[str] - Returns -> typing.Mapping[str, ~Relation] + Returns -> typing.Mapping[str, ~CharmRelation] ''' # map input types to rpc msg params = dict() msg = dict(Type='Application', Request='AddRelation', Version=1, Params=params) - params['Endpoints'] = endpoints + params['endpoints'] = endpoints reply = await self.rpc(msg) return reply @ReturnMapping(AddApplicationUnitsResults) - async def AddUnits(self, applicationname, numunits, placement): + async def AddUnits(self, application, num_units, placement): ''' - applicationname : str - numunits : int + application : str + num_units : int placement : typing.Sequence[~Placement] Returns -> typing.Sequence[str] ''' # map input types to rpc msg params = dict() msg = dict(Type='Application', Request='AddUnits', Version=1, Params=params) - params['ApplicationName'] = applicationname - params['NumUnits'] = numunits - params['Placement'] = placement + params['application'] = application + params['num-units'] = num_units + params['placement'] = placement reply = await self.rpc(msg) return reply @ReturnMapping(ApplicationCharmRelationsResults) - async def CharmRelations(self, applicationname): + async def CharmRelations(self, application): ''' - applicationname : str + application : str Returns -> typing.Sequence[str] ''' # map input types to rpc msg params = dict() msg = dict(Type='Application', Request='CharmRelations', Version=1, Params=params) - params['ApplicationName'] = applicationname + params['application'] = application reply = await self.rpc(msg) return reply @@ -6829,22 +7004,22 @@ class ApplicationFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Application', Request='Deploy', Version=1, Params=params) - params['Applications'] = applications + params['applications'] = applications reply = await self.rpc(msg) return reply @ReturnMapping(None) - async def Destroy(self, applicationname): + async def Destroy(self, application): ''' - applicationname : str + application : str Returns -> None ''' # map input types to rpc msg params = dict() msg = dict(Type='Application', Request='Destroy', Version=1, Params=params) - params['ApplicationName'] = applicationname + params['application'] = application reply = await self.rpc(msg) return reply @@ -6859,141 +7034,141 @@ class ApplicationFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Application', Request='DestroyRelation', Version=1, Params=params) - params['Endpoints'] = endpoints + params['endpoints'] = endpoints reply = await self.rpc(msg) return reply @ReturnMapping(None) - async def DestroyUnits(self, unitnames): + async def DestroyUnits(self, unit_names): ''' - unitnames : typing.Sequence[str] + unit_names : typing.Sequence[str] Returns -> None ''' # map input types to rpc msg params = dict() msg = dict(Type='Application', Request='DestroyUnits', Version=1, Params=params) - params['UnitNames'] = unitnames + params['unit-names'] = unit_names reply = await self.rpc(msg) return reply @ReturnMapping(None) - async def Expose(self, applicationname): + async def Expose(self, application): ''' - applicationname : str + application : str Returns -> None ''' # map input types to rpc msg params = dict() msg = dict(Type='Application', Request='Expose', Version=1, Params=params) - params['ApplicationName'] = applicationname + params['application'] = application reply = await self.rpc(msg) return reply @ReturnMapping(ApplicationGetResults) - async def Get(self, applicationname): + async def Get(self, application): ''' - applicationname : str + application : str Returns -> typing.Union[str, typing.Mapping[str, typing.Any], _ForwardRef('Value')] ''' # map input types to rpc msg params = dict() msg = dict(Type='Application', Request='Get', Version=1, Params=params) - params['ApplicationName'] = applicationname + params['application'] = application reply = await self.rpc(msg) return reply @ReturnMapping(StringResult) - async def GetCharmURL(self, applicationname): + async def GetCharmURL(self, application): ''' - applicationname : str + application : str Returns -> typing.Union[_ForwardRef('Error'), str] ''' # map input types to rpc msg params = dict() msg = dict(Type='Application', Request='GetCharmURL', Version=1, Params=params) - params['ApplicationName'] = applicationname + params['application'] = application reply = await self.rpc(msg) return reply @ReturnMapping(GetConstraintsResults) - async def GetConstraints(self, applicationname): + async def GetConstraints(self, application): ''' - applicationname : str + application : str Returns -> Value ''' # map input types to rpc msg params = dict() msg = dict(Type='Application', Request='GetConstraints', Version=1, Params=params) - params['ApplicationName'] = applicationname + params['application'] = application reply = await self.rpc(msg) return reply @ReturnMapping(None) - async def Set(self, applicationname, options): + async def Set(self, application, options): ''' - applicationname : str + application : str options : typing.Mapping[str, str] Returns -> None ''' # map input types to rpc msg params = dict() msg = dict(Type='Application', Request='Set', Version=1, Params=params) - params['ApplicationName'] = applicationname - params['Options'] = options + params['application'] = application + params['options'] = options reply = await self.rpc(msg) return reply @ReturnMapping(None) - async def SetCharm(self, applicationname, charmurl, cs_channel, forceseries, forceunits, resourceids): - ''' - applicationname : str - charmurl : str - cs_channel : str - forceseries : bool - forceunits : bool - resourceids : typing.Mapping[str, str] + async def SetCharm(self, application, channel, charm_url, force_series, force_units, resource_ids): + ''' + application : str + channel : str + charm_url : str + force_series : bool + force_units : bool + resource_ids : typing.Mapping[str, str] Returns -> None ''' # map input types to rpc msg params = dict() msg = dict(Type='Application', Request='SetCharm', Version=1, Params=params) - params['applicationname'] = applicationname - params['charmurl'] = charmurl - params['cs-channel'] = cs_channel - params['forceseries'] = forceseries - params['forceunits'] = forceunits - params['resourceids'] = resourceids + params['application'] = application + params['channel'] = channel + params['charm-url'] = charm_url + params['force-series'] = force_series + params['force-units'] = force_units + params['resource-ids'] = resource_ids reply = await self.rpc(msg) return reply @ReturnMapping(None) - async def SetConstraints(self, applicationname, constraints): + async def SetConstraints(self, application, constraints): ''' - applicationname : str + application : str constraints : Value Returns -> None ''' # map input types to rpc msg params = dict() msg = dict(Type='Application', Request='SetConstraints', Version=1, Params=params) - params['ApplicationName'] = applicationname - params['Constraints'] = constraints + params['application'] = application + params['constraints'] = constraints reply = await self.rpc(msg) return reply @@ -7008,68 +7183,68 @@ class ApplicationFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Application', Request='SetMetricCredentials', Version=1, Params=params) - params['Creds'] = creds + params['creds'] = creds reply = await self.rpc(msg) return reply @ReturnMapping(None) - async def Unexpose(self, applicationname): + async def Unexpose(self, application): ''' - applicationname : str + application : str Returns -> None ''' # map input types to rpc msg params = dict() msg = dict(Type='Application', Request='Unexpose', Version=1, Params=params) - params['ApplicationName'] = applicationname + params['application'] = application reply = await self.rpc(msg) return reply @ReturnMapping(None) - async def Unset(self, applicationname, options): + async def Unset(self, application, options): ''' - applicationname : str + application : str options : typing.Sequence[str] Returns -> None ''' # map input types to rpc msg params = dict() msg = dict(Type='Application', Request='Unset', Version=1, Params=params) - params['ApplicationName'] = applicationname - params['Options'] = options + params['application'] = application + params['options'] = options reply = await self.rpc(msg) return reply @ReturnMapping(None) - async def Update(self, applicationname, charmurl, constraints, forcecharmurl, forceseries, minunits, settingsstrings, settingsyaml): + async def Update(self, application, charm_url, constraints, force_charm_url, force_series, min_units, settings, settings_yaml): ''' - applicationname : str - charmurl : str + application : str + charm_url : str constraints : Value - forcecharmurl : bool - forceseries : bool - minunits : int - settingsstrings : typing.Mapping[str, str] - settingsyaml : str + force_charm_url : bool + force_series : bool + min_units : int + settings : typing.Mapping[str, str] + settings_yaml : str Returns -> None ''' # map input types to rpc msg params = dict() msg = dict(Type='Application', Request='Update', Version=1, Params=params) - params['ApplicationName'] = applicationname - params['CharmUrl'] = charmurl - params['Constraints'] = constraints - params['ForceCharmUrl'] = forcecharmurl - params['ForceSeries'] = forceseries - params['MinUnits'] = minunits - params['SettingsStrings'] = settingsstrings - params['SettingsYAML'] = settingsyaml + params['application'] = application + params['charm-url'] = charm_url + params['constraints'] = constraints + params['force-charm-url'] = force_charm_url + params['force-series'] = force_series + params['min-units'] = min_units + params['settings'] = settings + params['settings-yaml'] = settings_yaml reply = await self.rpc(msg) return reply @@ -7078,71 +7253,40 @@ class ApplicationScalerFacade(Type): name = 'ApplicationScaler' version = 1 schema = {'definitions': {'Entities': {'additionalProperties': False, - 'properties': {'Entities': {'items': {'$ref': '#/definitions/Entity'}, + 'properties': {'entities': {'items': {'$ref': '#/definitions/Entity'}, 'type': 'array'}}, - 'required': ['Entities'], + 'required': ['entities'], 'type': 'object'}, 'Entity': {'additionalProperties': False, - 'properties': {'Tag': {'type': 'string'}}, - 'required': ['Tag'], + 'properties': {'tag': {'type': 'string'}}, + 'required': ['tag'], 'type': 'object'}, 'Error': {'additionalProperties': False, - 'properties': {'Code': {'type': 'string'}, - 'Info': {'$ref': '#/definitions/ErrorInfo'}, - 'Message': {'type': 'string'}}, - 'required': ['Message', 'Code'], + 'properties': {'code': {'type': 'string'}, + 'info': {'$ref': '#/definitions/ErrorInfo'}, + 'message': {'type': 'string'}}, + 'required': ['message', 'code'], 'type': 'object'}, 'ErrorInfo': {'additionalProperties': False, - 'properties': {'Macaroon': {'$ref': '#/definitions/Macaroon'}, - 'MacaroonPath': {'type': 'string'}}, + 'properties': {'macaroon': {'$ref': '#/definitions/Macaroon'}, + 'macaroon-path': {'type': 'string'}}, 'type': 'object'}, 'ErrorResult': {'additionalProperties': False, - 'properties': {'Error': {'$ref': '#/definitions/Error'}}, - 'required': ['Error'], + 'properties': {'error': {'$ref': '#/definitions/Error'}}, 'type': 'object'}, 'ErrorResults': {'additionalProperties': False, - 'properties': {'Results': {'items': {'$ref': '#/definitions/ErrorResult'}, + 'properties': {'results': {'items': {'$ref': '#/definitions/ErrorResult'}, 'type': 'array'}}, - 'required': ['Results'], + 'required': ['results'], 'type': 'object'}, - 'Macaroon': {'additionalProperties': False, - 'properties': {'caveats': {'items': {'$ref': '#/definitions/caveat'}, - 'type': 'array'}, - 'data': {'items': {'type': 'integer'}, - 'type': 'array'}, - 'id': {'$ref': '#/definitions/packet'}, - 'location': {'$ref': '#/definitions/packet'}, - 'sig': {'items': {'type': 'integer'}, - 'type': 'array'}}, - 'required': ['data', - 'location', - 'id', - 'caveats', - 'sig'], - 'type': 'object'}, + 'Macaroon': {'additionalProperties': False, 'type': 'object'}, 'StringsWatchResult': {'additionalProperties': False, - 'properties': {'Changes': {'items': {'type': 'string'}, + 'properties': {'changes': {'items': {'type': 'string'}, 'type': 'array'}, - 'Error': {'$ref': '#/definitions/Error'}, - 'StringsWatcherId': {'type': 'string'}}, - 'required': ['StringsWatcherId', - 'Changes', - 'Error'], - 'type': 'object'}, - 'caveat': {'additionalProperties': False, - 'properties': {'caveatId': {'$ref': '#/definitions/packet'}, - 'location': {'$ref': '#/definitions/packet'}, - 'verificationId': {'$ref': '#/definitions/packet'}}, - 'required': ['location', - 'caveatId', - 'verificationId'], - 'type': 'object'}, - 'packet': {'additionalProperties': False, - 'properties': {'headerLen': {'type': 'integer'}, - 'start': {'type': 'integer'}, - 'totalLen': {'type': 'integer'}}, - 'required': ['start', 'totalLen', 'headerLen'], - 'type': 'object'}}, + 'error': {'$ref': '#/definitions/Error'}, + 'watcher-id': {'type': 'string'}}, + 'required': ['watcher-id'], + 'type': 'object'}}, 'properties': {'Rescale': {'properties': {'Params': {'$ref': '#/definitions/Entities'}, 'Result': {'$ref': '#/definitions/ErrorResults'}}, 'type': 'object'}, @@ -7160,7 +7304,7 @@ class ApplicationScalerFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='ApplicationScaler', Request='Rescale', Version=1, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -7184,58 +7328,58 @@ class BackupsFacade(Type): name = 'Backups' version = 1 schema = {'definitions': {'BackupsCreateArgs': {'additionalProperties': False, - 'properties': {'Notes': {'type': 'string'}}, - 'required': ['Notes'], + 'properties': {'notes': {'type': 'string'}}, + 'required': ['notes'], 'type': 'object'}, 'BackupsInfoArgs': {'additionalProperties': False, - 'properties': {'ID': {'type': 'string'}}, - 'required': ['ID'], + 'properties': {'id': {'type': 'string'}}, + 'required': ['id'], 'type': 'object'}, 'BackupsListArgs': {'additionalProperties': False, 'type': 'object'}, 'BackupsListResult': {'additionalProperties': False, - 'properties': {'List': {'items': {'$ref': '#/definitions/BackupsMetadataResult'}, + 'properties': {'list': {'items': {'$ref': '#/definitions/BackupsMetadataResult'}, 'type': 'array'}}, - 'required': ['List'], + 'required': ['list'], 'type': 'object'}, 'BackupsMetadataResult': {'additionalProperties': False, - 'properties': {'CACert': {'type': 'string'}, - 'CAPrivateKey': {'type': 'string'}, - 'Checksum': {'type': 'string'}, - 'ChecksumFormat': {'type': 'string'}, - 'Finished': {'format': 'date-time', + 'properties': {'ca-cert': {'type': 'string'}, + 'ca-private-key': {'type': 'string'}, + 'checksum': {'type': 'string'}, + 'checksum-format': {'type': 'string'}, + 'finished': {'format': 'date-time', 'type': 'string'}, - 'Hostname': {'type': 'string'}, - 'ID': {'type': 'string'}, - 'Machine': {'type': 'string'}, - 'Model': {'type': 'string'}, - 'Notes': {'type': 'string'}, - 'Series': {'type': 'string'}, - 'Size': {'type': 'integer'}, - 'Started': {'format': 'date-time', + 'hostname': {'type': 'string'}, + 'id': {'type': 'string'}, + 'machine': {'type': 'string'}, + 'model': {'type': 'string'}, + 'notes': {'type': 'string'}, + 'series': {'type': 'string'}, + 'size': {'type': 'integer'}, + 'started': {'format': 'date-time', 'type': 'string'}, - 'Stored': {'format': 'date-time', + 'stored': {'format': 'date-time', 'type': 'string'}, - 'Version': {'$ref': '#/definitions/Number'}}, - 'required': ['ID', - 'Checksum', - 'ChecksumFormat', - 'Size', - 'Stored', - 'Started', - 'Finished', - 'Notes', - 'Model', - 'Machine', - 'Hostname', - 'Version', - 'Series', - 'CACert', - 'CAPrivateKey'], + 'version': {'$ref': '#/definitions/Number'}}, + 'required': ['id', + 'checksum', + 'checksum-format', + 'size', + 'stored', + 'started', + 'finished', + 'notes', + 'model', + 'machine', + 'hostname', + 'version', + 'series', + 'ca-cert', + 'ca-private-key'], 'type': 'object'}, 'BackupsRemoveArgs': {'additionalProperties': False, - 'properties': {'ID': {'type': 'string'}}, - 'required': ['ID'], + 'properties': {'id': {'type': 'string'}}, + 'required': ['id'], 'type': 'object'}, 'Number': {'additionalProperties': False, 'properties': {'Build': {'type': 'integer'}, @@ -7250,8 +7394,8 @@ class BackupsFacade(Type): 'Build'], 'type': 'object'}, 'RestoreArgs': {'additionalProperties': False, - 'properties': {'BackupId': {'type': 'string'}}, - 'required': ['BackupId'], + 'properties': {'backup-id': {'type': 'string'}}, + 'required': ['backup-id'], 'type': 'object'}}, 'properties': {'Create': {'properties': {'Params': {'$ref': '#/definitions/BackupsCreateArgs'}, 'Result': {'$ref': '#/definitions/BackupsMetadataResult'}}, @@ -7280,7 +7424,7 @@ class BackupsFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Backups', Request='Create', Version=1, Params=params) - params['Notes'] = notes + params['notes'] = notes reply = await self.rpc(msg) return reply @@ -7310,7 +7454,7 @@ class BackupsFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Backups', Request='Info', Version=1, Params=params) - params['ID'] = id_ + params['id'] = id_ reply = await self.rpc(msg) return reply @@ -7355,22 +7499,22 @@ class BackupsFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Backups', Request='Remove', Version=1, Params=params) - params['ID'] = id_ + params['id'] = id_ reply = await self.rpc(msg) return reply @ReturnMapping(None) - async def Restore(self, backupid): + async def Restore(self, backup_id): ''' - backupid : str + backup_id : str Returns -> None ''' # map input types to rpc msg params = dict() msg = dict(Type='Backups', Request='Restore', Version=1, Params=params) - params['BackupId'] = backupid + params['backup-id'] = backup_id reply = await self.rpc(msg) return reply @@ -7400,48 +7544,19 @@ class BlockFacade(Type): 'required': ['type'], 'type': 'object'}, 'Error': {'additionalProperties': False, - 'properties': {'Code': {'type': 'string'}, - 'Info': {'$ref': '#/definitions/ErrorInfo'}, - 'Message': {'type': 'string'}}, - 'required': ['Message', 'Code'], + 'properties': {'code': {'type': 'string'}, + 'info': {'$ref': '#/definitions/ErrorInfo'}, + 'message': {'type': 'string'}}, + 'required': ['message', 'code'], 'type': 'object'}, 'ErrorInfo': {'additionalProperties': False, - 'properties': {'Macaroon': {'$ref': '#/definitions/Macaroon'}, - 'MacaroonPath': {'type': 'string'}}, + 'properties': {'macaroon': {'$ref': '#/definitions/Macaroon'}, + 'macaroon-path': {'type': 'string'}}, 'type': 'object'}, 'ErrorResult': {'additionalProperties': False, - 'properties': {'Error': {'$ref': '#/definitions/Error'}}, - 'required': ['Error'], + 'properties': {'error': {'$ref': '#/definitions/Error'}}, 'type': 'object'}, - 'Macaroon': {'additionalProperties': False, - 'properties': {'caveats': {'items': {'$ref': '#/definitions/caveat'}, - 'type': 'array'}, - 'data': {'items': {'type': 'integer'}, - 'type': 'array'}, - 'id': {'$ref': '#/definitions/packet'}, - 'location': {'$ref': '#/definitions/packet'}, - 'sig': {'items': {'type': 'integer'}, - 'type': 'array'}}, - 'required': ['data', - 'location', - 'id', - 'caveats', - 'sig'], - 'type': 'object'}, - 'caveat': {'additionalProperties': False, - 'properties': {'caveatId': {'$ref': '#/definitions/packet'}, - 'location': {'$ref': '#/definitions/packet'}, - 'verificationId': {'$ref': '#/definitions/packet'}}, - 'required': ['location', - 'caveatId', - 'verificationId'], - 'type': 'object'}, - 'packet': {'additionalProperties': False, - 'properties': {'headerLen': {'type': 'integer'}, - 'start': {'type': 'integer'}, - 'totalLen': {'type': 'integer'}}, - 'required': ['start', 'totalLen', 'headerLen'], - 'type': 'object'}}, + 'Macaroon': {'additionalProperties': False, 'type': 'object'}}, 'properties': {'List': {'properties': {'Result': {'$ref': '#/definitions/BlockResults'}}, 'type': 'object'}, 'SwitchBlockOff': {'properties': {'Params': {'$ref': '#/definitions/BlockSwitchParams'}, @@ -7505,48 +7620,19 @@ class CharmRevisionUpdaterFacade(Type): name = 'CharmRevisionUpdater' version = 2 schema = {'definitions': {'Error': {'additionalProperties': False, - 'properties': {'Code': {'type': 'string'}, - 'Info': {'$ref': '#/definitions/ErrorInfo'}, - 'Message': {'type': 'string'}}, - 'required': ['Message', 'Code'], + 'properties': {'code': {'type': 'string'}, + 'info': {'$ref': '#/definitions/ErrorInfo'}, + 'message': {'type': 'string'}}, + 'required': ['message', 'code'], 'type': 'object'}, 'ErrorInfo': {'additionalProperties': False, - 'properties': {'Macaroon': {'$ref': '#/definitions/Macaroon'}, - 'MacaroonPath': {'type': 'string'}}, + 'properties': {'macaroon': {'$ref': '#/definitions/Macaroon'}, + 'macaroon-path': {'type': 'string'}}, 'type': 'object'}, 'ErrorResult': {'additionalProperties': False, - 'properties': {'Error': {'$ref': '#/definitions/Error'}}, - 'required': ['Error'], + 'properties': {'error': {'$ref': '#/definitions/Error'}}, 'type': 'object'}, - 'Macaroon': {'additionalProperties': False, - 'properties': {'caveats': {'items': {'$ref': '#/definitions/caveat'}, - 'type': 'array'}, - 'data': {'items': {'type': 'integer'}, - 'type': 'array'}, - 'id': {'$ref': '#/definitions/packet'}, - 'location': {'$ref': '#/definitions/packet'}, - 'sig': {'items': {'type': 'integer'}, - 'type': 'array'}}, - 'required': ['data', - 'location', - 'id', - 'caveats', - 'sig'], - 'type': 'object'}, - 'caveat': {'additionalProperties': False, - 'properties': {'caveatId': {'$ref': '#/definitions/packet'}, - 'location': {'$ref': '#/definitions/packet'}, - 'verificationId': {'$ref': '#/definitions/packet'}}, - 'required': ['location', - 'caveatId', - 'verificationId'], - 'type': 'object'}, - 'packet': {'additionalProperties': False, - 'properties': {'headerLen': {'type': 'integer'}, - 'start': {'type': 'integer'}, - 'totalLen': {'type': 'integer'}}, - 'required': ['start', 'totalLen', 'headerLen'], - 'type': 'object'}}, + 'Macaroon': {'additionalProperties': False, 'type': 'object'}}, 'properties': {'UpdateLatestRevisions': {'properties': {'Result': {'$ref': '#/definitions/ErrorResult'}}, 'type': 'object'}}, 'type': 'object'} @@ -7569,28 +7655,149 @@ class CharmRevisionUpdaterFacade(Type): class CharmsFacade(Type): name = 'Charms' version = 2 - schema = {'definitions': {'CharmInfo': {'additionalProperties': False, - 'properties': {'CharmURL': {'type': 'string'}}, - 'required': ['CharmURL'], + schema = {'definitions': {'CharmActionSpec': {'additionalProperties': False, + 'properties': {'description': {'type': 'string'}, + 'params': {'patternProperties': {'.*': {'additionalProperties': True, + 'type': 'object'}}, + 'type': 'object'}}, + 'required': ['description', 'params'], + 'type': 'object'}, + 'CharmActions': {'additionalProperties': False, + 'properties': {'specs': {'patternProperties': {'.*': {'$ref': '#/definitions/CharmActionSpec'}}, + 'type': 'object'}}, + 'type': 'object'}, + 'CharmInfo': {'additionalProperties': False, + 'properties': {'actions': {'$ref': '#/definitions/CharmActions'}, + 'config': {'patternProperties': {'.*': {'$ref': '#/definitions/CharmOption'}}, + 'type': 'object'}, + 'meta': {'$ref': '#/definitions/CharmMeta'}, + 'metrics': {'$ref': '#/definitions/CharmMetrics'}, + 'revision': {'type': 'integer'}, + 'url': {'type': 'string'}}, + 'required': ['revision', 'url', 'config'], + 'type': 'object'}, + 'CharmMeta': {'additionalProperties': False, + 'properties': {'categories': {'items': {'type': 'string'}, + 'type': 'array'}, + 'description': {'type': 'string'}, + 'extra-bindings': {'patternProperties': {'.*': {'type': 'string'}}, + 'type': 'object'}, + 'min-juju-version': {'type': 'string'}, + 'name': {'type': 'string'}, + 'payload-classes': {'patternProperties': {'.*': {'$ref': '#/definitions/CharmPayloadClass'}}, + 'type': 'object'}, + 'peers': {'patternProperties': {'.*': {'$ref': '#/definitions/CharmRelation'}}, + 'type': 'object'}, + 'provides': {'patternProperties': {'.*': {'$ref': '#/definitions/CharmRelation'}}, + 'type': 'object'}, + 'requires': {'patternProperties': {'.*': {'$ref': '#/definitions/CharmRelation'}}, + 'type': 'object'}, + 'resources': {'patternProperties': {'.*': {'$ref': '#/definitions/CharmResourceMeta'}}, + 'type': 'object'}, + 'series': {'items': {'type': 'string'}, + 'type': 'array'}, + 'storage': {'patternProperties': {'.*': {'$ref': '#/definitions/CharmStorage'}}, + 'type': 'object'}, + 'subordinate': {'type': 'boolean'}, + 'summary': {'type': 'string'}, + 'tags': {'items': {'type': 'string'}, + 'type': 'array'}, + 'terms': {'items': {'type': 'string'}, + 'type': 'array'}}, + 'required': ['name', + 'summary', + 'description', + 'subordinate'], 'type': 'object'}, + 'CharmMetric': {'additionalProperties': False, + 'properties': {'description': {'type': 'string'}, + 'type': {'type': 'string'}}, + 'required': ['type', 'description'], + 'type': 'object'}, + 'CharmMetrics': {'additionalProperties': False, + 'properties': {'metrics': {'patternProperties': {'.*': {'$ref': '#/definitions/CharmMetric'}}, + 'type': 'object'}}, + 'required': ['metrics'], + 'type': 'object'}, + 'CharmOption': {'additionalProperties': False, + 'properties': {'default': {'additionalProperties': True, + 'type': 'object'}, + 'description': {'type': 'string'}, + 'type': {'type': 'string'}}, + 'required': ['type'], + 'type': 'object'}, + 'CharmPayloadClass': {'additionalProperties': False, + 'properties': {'name': {'type': 'string'}, + 'type': {'type': 'string'}}, + 'required': ['name', 'type'], + 'type': 'object'}, + 'CharmRelation': {'additionalProperties': False, + 'properties': {'interface': {'type': 'string'}, + 'limit': {'type': 'integer'}, + 'name': {'type': 'string'}, + 'optional': {'type': 'boolean'}, + 'role': {'type': 'string'}, + 'scope': {'type': 'string'}}, + 'required': ['name', + 'role', + 'interface', + 'optional', + 'limit', + 'scope'], + 'type': 'object'}, + 'CharmResourceMeta': {'additionalProperties': False, + 'properties': {'description': {'type': 'string'}, + 'name': {'type': 'string'}, + 'path': {'type': 'string'}, + 'type': {'type': 'string'}}, + 'required': ['name', + 'type', + 'path', + 'description'], + 'type': 'object'}, + 'CharmStorage': {'additionalProperties': False, + 'properties': {'count-max': {'type': 'integer'}, + 'count-min': {'type': 'integer'}, + 'description': {'type': 'string'}, + 'location': {'type': 'string'}, + 'minimum-size': {'type': 'integer'}, + 'name': {'type': 'string'}, + 'properties': {'items': {'type': 'string'}, + 'type': 'array'}, + 'read-only': {'type': 'boolean'}, + 'shared': {'type': 'boolean'}, + 'type': {'type': 'string'}}, + 'required': ['name', + 'description', + 'type', + 'shared', + 'read-only', + 'count-min', + 'count-max', + 'minimum-size'], + 'type': 'object'}, + 'CharmURL': {'additionalProperties': False, + 'properties': {'url': {'type': 'string'}}, + 'required': ['url'], + 'type': 'object'}, 'CharmsList': {'additionalProperties': False, - 'properties': {'Names': {'items': {'type': 'string'}, + 'properties': {'names': {'items': {'type': 'string'}, 'type': 'array'}}, - 'required': ['Names'], + 'required': ['names'], 'type': 'object'}, 'CharmsListResult': {'additionalProperties': False, - 'properties': {'CharmURLs': {'items': {'type': 'string'}, - 'type': 'array'}}, - 'required': ['CharmURLs'], + 'properties': {'charm-urls': {'items': {'type': 'string'}, + 'type': 'array'}}, + 'required': ['charm-urls'], 'type': 'object'}, 'IsMeteredResult': {'additionalProperties': False, - 'properties': {'Metered': {'type': 'boolean'}}, - 'required': ['Metered'], + 'properties': {'metered': {'type': 'boolean'}}, + 'required': ['metered'], 'type': 'object'}}, - 'properties': {'CharmInfo': {'properties': {'Params': {'$ref': '#/definitions/CharmInfo'}, + 'properties': {'CharmInfo': {'properties': {'Params': {'$ref': '#/definitions/CharmURL'}, 'Result': {'$ref': '#/definitions/CharmInfo'}}, 'type': 'object'}, - 'IsMetered': {'properties': {'Params': {'$ref': '#/definitions/CharmInfo'}, + 'IsMetered': {'properties': {'Params': {'$ref': '#/definitions/CharmURL'}, 'Result': {'$ref': '#/definitions/IsMeteredResult'}}, 'type': 'object'}, 'List': {'properties': {'Params': {'$ref': '#/definitions/CharmsList'}, @@ -7600,30 +7807,30 @@ class CharmsFacade(Type): @ReturnMapping(CharmInfo) - async def CharmInfo(self, charmurl): + async def CharmInfo(self, url): ''' - charmurl : str - Returns -> str + url : str + Returns -> typing.Union[_ForwardRef('CharmActions'), typing.Mapping[str, ~CharmOption], _ForwardRef('CharmMeta'), _ForwardRef('CharmMetrics'), int, str] ''' # map input types to rpc msg params = dict() msg = dict(Type='Charms', Request='CharmInfo', Version=2, Params=params) - params['CharmURL'] = charmurl + params['url'] = url reply = await self.rpc(msg) return reply @ReturnMapping(IsMeteredResult) - async def IsMetered(self, charmurl): + async def IsMetered(self, url): ''' - charmurl : str + url : str Returns -> bool ''' # map input types to rpc msg params = dict() msg = dict(Type='Charms', Request='IsMetered', Version=2, Params=params) - params['CharmURL'] = charmurl + params['url'] = url reply = await self.rpc(msg) return reply @@ -7638,7 +7845,7 @@ class CharmsFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Charms', Request='List', Version=2, Params=params) - params['Names'] = names + params['names'] = names reply = await self.rpc(msg) return reply @@ -7647,49 +7854,21 @@ class CleanerFacade(Type): name = 'Cleaner' version = 2 schema = {'definitions': {'Error': {'additionalProperties': False, - 'properties': {'Code': {'type': 'string'}, - 'Info': {'$ref': '#/definitions/ErrorInfo'}, - 'Message': {'type': 'string'}}, - 'required': ['Message', 'Code'], + 'properties': {'code': {'type': 'string'}, + 'info': {'$ref': '#/definitions/ErrorInfo'}, + 'message': {'type': 'string'}}, + 'required': ['message', 'code'], 'type': 'object'}, 'ErrorInfo': {'additionalProperties': False, - 'properties': {'Macaroon': {'$ref': '#/definitions/Macaroon'}, - 'MacaroonPath': {'type': 'string'}}, + 'properties': {'macaroon': {'$ref': '#/definitions/Macaroon'}, + 'macaroon-path': {'type': 'string'}}, 'type': 'object'}, - 'Macaroon': {'additionalProperties': False, - 'properties': {'caveats': {'items': {'$ref': '#/definitions/caveat'}, - 'type': 'array'}, - 'data': {'items': {'type': 'integer'}, - 'type': 'array'}, - 'id': {'$ref': '#/definitions/packet'}, - 'location': {'$ref': '#/definitions/packet'}, - 'sig': {'items': {'type': 'integer'}, - 'type': 'array'}}, - 'required': ['data', - 'location', - 'id', - 'caveats', - 'sig'], - 'type': 'object'}, + 'Macaroon': {'additionalProperties': False, 'type': 'object'}, 'NotifyWatchResult': {'additionalProperties': False, - 'properties': {'Error': {'$ref': '#/definitions/Error'}, - 'NotifyWatcherId': {'type': 'string'}}, - 'required': ['NotifyWatcherId', 'Error'], - 'type': 'object'}, - 'caveat': {'additionalProperties': False, - 'properties': {'caveatId': {'$ref': '#/definitions/packet'}, - 'location': {'$ref': '#/definitions/packet'}, - 'verificationId': {'$ref': '#/definitions/packet'}}, - 'required': ['location', - 'caveatId', - 'verificationId'], - 'type': 'object'}, - 'packet': {'additionalProperties': False, - 'properties': {'headerLen': {'type': 'integer'}, - 'start': {'type': 'integer'}, - 'totalLen': {'type': 'integer'}}, - 'required': ['start', 'totalLen', 'headerLen'], - 'type': 'object'}}, + 'properties': {'NotifyWatcherId': {'type': 'string'}, + 'error': {'$ref': '#/definitions/Error'}}, + 'required': ['NotifyWatcherId'], + 'type': 'object'}}, 'properties': {'Cleanup': {'type': 'object'}, 'WatchCleanups': {'properties': {'Result': {'$ref': '#/definitions/NotifyWatchResult'}}, 'type': 'object'}}, @@ -7715,7 +7894,7 @@ class CleanerFacade(Type): async def WatchCleanups(self): ''' - Returns -> typing.Union[_ForwardRef('Error'), str] + Returns -> typing.Union[str, _ForwardRef('Error')] ''' # map input types to rpc msg params = dict() @@ -7729,108 +7908,109 @@ class ClientFacade(Type): name = 'Client' version = 1 schema = {'definitions': {'APIHostPortsResult': {'additionalProperties': False, - 'properties': {'Servers': {'items': {'items': {'$ref': '#/definitions/HostPort'}, + 'properties': {'servers': {'items': {'items': {'$ref': '#/definitions/HostPort'}, 'type': 'array'}, 'type': 'array'}}, - 'required': ['Servers'], + 'required': ['servers'], 'type': 'object'}, 'AddCharm': {'additionalProperties': False, - 'properties': {'Channel': {'type': 'string'}, - 'URL': {'type': 'string'}}, - 'required': ['URL', 'Channel'], + 'properties': {'channel': {'type': 'string'}, + 'url': {'type': 'string'}}, + 'required': ['url', 'channel'], 'type': 'object'}, 'AddCharmWithAuthorization': {'additionalProperties': False, - 'properties': {'Channel': {'type': 'string'}, - 'CharmStoreMacaroon': {'$ref': '#/definitions/Macaroon'}, - 'URL': {'type': 'string'}}, - 'required': ['URL', - 'Channel', - 'CharmStoreMacaroon'], + 'properties': {'channel': {'type': 'string'}, + 'macaroon': {'$ref': '#/definitions/Macaroon'}, + 'url': {'type': 'string'}}, + 'required': ['url', + 'channel', + 'macaroon'], 'type': 'object'}, 'AddMachineParams': {'additionalProperties': False, - 'properties': {'Addrs': {'items': {'$ref': '#/definitions/Address'}, - 'type': 'array'}, - 'Constraints': {'$ref': '#/definitions/Value'}, - 'ContainerType': {'type': 'string'}, - 'Disks': {'items': {'$ref': '#/definitions/Constraints'}, + 'properties': {'addresses': {'items': {'$ref': '#/definitions/Address'}, + 'type': 'array'}, + 'constraints': {'$ref': '#/definitions/Value'}, + 'container-type': {'type': 'string'}, + 'disks': {'items': {'$ref': '#/definitions/Constraints'}, 'type': 'array'}, - 'HardwareCharacteristics': {'$ref': '#/definitions/HardwareCharacteristics'}, - 'InstanceId': {'type': 'string'}, - 'Jobs': {'items': {'type': 'string'}, + 'hardware-characteristics': {'$ref': '#/definitions/HardwareCharacteristics'}, + 'instance-id': {'type': 'string'}, + 'jobs': {'items': {'type': 'string'}, 'type': 'array'}, - 'Nonce': {'type': 'string'}, - 'ParentId': {'type': 'string'}, - 'Placement': {'$ref': '#/definitions/Placement'}, - 'Series': {'type': 'string'}}, - 'required': ['Series', - 'Constraints', - 'Jobs', - 'Disks', - 'Placement', - 'ParentId', - 'ContainerType', - 'InstanceId', - 'Nonce', - 'HardwareCharacteristics', - 'Addrs'], + 'nonce': {'type': 'string'}, + 'parent-id': {'type': 'string'}, + 'placement': {'$ref': '#/definitions/Placement'}, + 'series': {'type': 'string'}}, + 'required': ['series', + 'constraints', + 'jobs', + 'parent-id', + 'container-type', + 'instance-id', + 'nonce', + 'hardware-characteristics', + 'addresses'], 'type': 'object'}, 'AddMachines': {'additionalProperties': False, - 'properties': {'MachineParams': {'items': {'$ref': '#/definitions/AddMachineParams'}, - 'type': 'array'}}, - 'required': ['MachineParams'], + 'properties': {'params': {'items': {'$ref': '#/definitions/AddMachineParams'}, + 'type': 'array'}}, + 'required': ['params'], 'type': 'object'}, 'AddMachinesResult': {'additionalProperties': False, - 'properties': {'Error': {'$ref': '#/definitions/Error'}, - 'Machine': {'type': 'string'}}, - 'required': ['Machine', 'Error'], + 'properties': {'error': {'$ref': '#/definitions/Error'}, + 'machine': {'type': 'string'}}, + 'required': ['machine'], 'type': 'object'}, 'AddMachinesResults': {'additionalProperties': False, - 'properties': {'Machines': {'items': {'$ref': '#/definitions/AddMachinesResult'}, + 'properties': {'machines': {'items': {'$ref': '#/definitions/AddMachinesResult'}, 'type': 'array'}}, - 'required': ['Machines'], + 'required': ['machines'], 'type': 'object'}, 'Address': {'additionalProperties': False, - 'properties': {'Scope': {'type': 'string'}, - 'SpaceName': {'type': 'string'}, - 'Type': {'type': 'string'}, - 'Value': {'type': 'string'}}, - 'required': ['Value', 'Type', 'Scope'], + 'properties': {'scope': {'type': 'string'}, + 'space-name': {'type': 'string'}, + 'type': {'type': 'string'}, + 'value': {'type': 'string'}}, + 'required': ['value', 'type', 'scope'], 'type': 'object'}, 'AgentVersionResult': {'additionalProperties': False, - 'properties': {'Version': {'$ref': '#/definitions/Number'}}, - 'required': ['Version'], + 'properties': {'version': {'$ref': '#/definitions/Number'}}, + 'required': ['version'], 'type': 'object'}, 'AllWatcherId': {'additionalProperties': False, - 'properties': {'AllWatcherId': {'type': 'string'}}, - 'required': ['AllWatcherId'], + 'properties': {'watcher-id': {'type': 'string'}}, + 'required': ['watcher-id'], 'type': 'object'}, 'ApplicationStatus': {'additionalProperties': False, - 'properties': {'CanUpgradeTo': {'type': 'string'}, - 'Charm': {'type': 'string'}, - 'Err': {'additionalProperties': True, + 'properties': {'can-upgrade-to': {'type': 'string'}, + 'charm': {'type': 'string'}, + 'err': {'additionalProperties': True, 'type': 'object'}, - 'Exposed': {'type': 'boolean'}, - 'Life': {'type': 'string'}, - 'MeterStatuses': {'patternProperties': {'.*': {'$ref': '#/definitions/MeterStatus'}}, - 'type': 'object'}, - 'Relations': {'patternProperties': {'.*': {'items': {'type': 'string'}, + 'exposed': {'type': 'boolean'}, + 'life': {'type': 'string'}, + 'meter-statuses': {'patternProperties': {'.*': {'$ref': '#/definitions/MeterStatus'}}, + 'type': 'object'}, + 'relations': {'patternProperties': {'.*': {'items': {'type': 'string'}, 'type': 'array'}}, 'type': 'object'}, - 'Status': {'$ref': '#/definitions/DetailedStatus'}, - 'SubordinateTo': {'items': {'type': 'string'}, - 'type': 'array'}, - 'Units': {'patternProperties': {'.*': {'$ref': '#/definitions/UnitStatus'}}, - 'type': 'object'}}, - 'required': ['Err', - 'Charm', - 'Exposed', - 'Life', - 'Relations', - 'CanUpgradeTo', - 'SubordinateTo', - 'Units', - 'MeterStatuses', - 'Status'], + 'series': {'type': 'string'}, + 'status': {'$ref': '#/definitions/DetailedStatus'}, + 'subordinate-to': {'items': {'type': 'string'}, + 'type': 'array'}, + 'units': {'patternProperties': {'.*': {'$ref': '#/definitions/UnitStatus'}}, + 'type': 'object'}, + 'workload-version': {'type': 'string'}}, + 'required': ['charm', + 'series', + 'exposed', + 'life', + 'relations', + 'can-upgrade-to', + 'subordinate-to', + 'units', + 'meter-statuses', + 'status', + 'workload-version'], 'type': 'object'}, 'Binary': {'additionalProperties': False, 'properties': {'Arch': {'type': 'string'}, @@ -7851,10 +8031,12 @@ class ClientFacade(Type): 'args', 'requires'], 'type': 'object'}, - 'CharmInfo': {'additionalProperties': False, - 'properties': {'CharmURL': {'type': 'string'}}, - 'required': ['CharmURL'], - 'type': 'object'}, + 'ConfigValue': {'additionalProperties': False, + 'properties': {'source': {'type': 'string'}, + 'value': {'additionalProperties': True, + 'type': 'object'}}, + 'required': ['value', 'source'], + 'type': 'object'}, 'Constraints': {'additionalProperties': False, 'properties': {'Count': {'type': 'integer'}, 'Pool': {'type': 'string'}, @@ -7862,116 +8044,109 @@ class ClientFacade(Type): 'required': ['Pool', 'Size', 'Count'], 'type': 'object'}, 'DestroyMachines': {'additionalProperties': False, - 'properties': {'Force': {'type': 'boolean'}, - 'MachineNames': {'items': {'type': 'string'}, - 'type': 'array'}}, - 'required': ['MachineNames', 'Force'], + 'properties': {'force': {'type': 'boolean'}, + 'machine-names': {'items': {'type': 'string'}, + 'type': 'array'}}, + 'required': ['machine-names', 'force'], 'type': 'object'}, 'DetailedStatus': {'additionalProperties': False, - 'properties': {'Data': {'patternProperties': {'.*': {'additionalProperties': True, + 'properties': {'data': {'patternProperties': {'.*': {'additionalProperties': True, 'type': 'object'}}, 'type': 'object'}, - 'Err': {'additionalProperties': True, + 'err': {'additionalProperties': True, 'type': 'object'}, - 'Info': {'type': 'string'}, - 'Kind': {'type': 'string'}, - 'Life': {'type': 'string'}, - 'Since': {'format': 'date-time', + 'info': {'type': 'string'}, + 'kind': {'type': 'string'}, + 'life': {'type': 'string'}, + 'since': {'format': 'date-time', 'type': 'string'}, - 'Status': {'type': 'string'}, - 'Version': {'type': 'string'}}, - 'required': ['Status', - 'Info', - 'Data', - 'Since', - 'Kind', - 'Version', - 'Life', - 'Err'], + 'status': {'type': 'string'}, + 'version': {'type': 'string'}}, + 'required': ['status', + 'info', + 'data', + 'since', + 'kind', + 'version', + 'life'], 'type': 'object'}, 'EndpointStatus': {'additionalProperties': False, - 'properties': {'ApplicationName': {'type': 'string'}, - 'Name': {'type': 'string'}, - 'Role': {'type': 'string'}, - 'Subordinate': {'type': 'boolean'}}, - 'required': ['ApplicationName', - 'Name', - 'Role', - 'Subordinate'], + 'properties': {'application': {'type': 'string'}, + 'name': {'type': 'string'}, + 'role': {'type': 'string'}, + 'subordinate': {'type': 'boolean'}}, + 'required': ['application', + 'name', + 'role', + 'subordinate'], 'type': 'object'}, 'Entities': {'additionalProperties': False, - 'properties': {'Entities': {'items': {'$ref': '#/definitions/Entity'}, + 'properties': {'entities': {'items': {'$ref': '#/definitions/Entity'}, 'type': 'array'}}, - 'required': ['Entities'], + 'required': ['entities'], 'type': 'object'}, 'Entity': {'additionalProperties': False, - 'properties': {'Tag': {'type': 'string'}}, - 'required': ['Tag'], + 'properties': {'tag': {'type': 'string'}}, + 'required': ['tag'], 'type': 'object'}, 'EntityStatus': {'additionalProperties': False, - 'properties': {'Data': {'patternProperties': {'.*': {'additionalProperties': True, + 'properties': {'data': {'patternProperties': {'.*': {'additionalProperties': True, 'type': 'object'}}, 'type': 'object'}, - 'Info': {'type': 'string'}, - 'Since': {'format': 'date-time', + 'info': {'type': 'string'}, + 'since': {'format': 'date-time', 'type': 'string'}, - 'Status': {'type': 'string'}}, - 'required': ['Status', - 'Info', - 'Data', - 'Since'], + 'status': {'type': 'string'}}, + 'required': ['status', 'info', 'since'], 'type': 'object'}, 'Error': {'additionalProperties': False, - 'properties': {'Code': {'type': 'string'}, - 'Info': {'$ref': '#/definitions/ErrorInfo'}, - 'Message': {'type': 'string'}}, - 'required': ['Message', 'Code'], + 'properties': {'code': {'type': 'string'}, + 'info': {'$ref': '#/definitions/ErrorInfo'}, + 'message': {'type': 'string'}}, + 'required': ['message', 'code'], 'type': 'object'}, 'ErrorInfo': {'additionalProperties': False, - 'properties': {'Macaroon': {'$ref': '#/definitions/Macaroon'}, - 'MacaroonPath': {'type': 'string'}}, + 'properties': {'macaroon': {'$ref': '#/definitions/Macaroon'}, + 'macaroon-path': {'type': 'string'}}, 'type': 'object'}, 'ErrorResult': {'additionalProperties': False, - 'properties': {'Error': {'$ref': '#/definitions/Error'}}, - 'required': ['Error'], + 'properties': {'error': {'$ref': '#/definitions/Error'}}, 'type': 'object'}, 'ErrorResults': {'additionalProperties': False, - 'properties': {'Results': {'items': {'$ref': '#/definitions/ErrorResult'}, + 'properties': {'results': {'items': {'$ref': '#/definitions/ErrorResult'}, 'type': 'array'}}, - 'required': ['Results'], + 'required': ['results'], 'type': 'object'}, 'FindToolsParams': {'additionalProperties': False, - 'properties': {'Arch': {'type': 'string'}, - 'MajorVersion': {'type': 'integer'}, - 'MinorVersion': {'type': 'integer'}, - 'Number': {'$ref': '#/definitions/Number'}, - 'Series': {'type': 'string'}}, - 'required': ['Number', - 'MajorVersion', - 'MinorVersion', - 'Arch', - 'Series'], + 'properties': {'arch': {'type': 'string'}, + 'major': {'type': 'integer'}, + 'minor': {'type': 'integer'}, + 'number': {'$ref': '#/definitions/Number'}, + 'series': {'type': 'string'}}, + 'required': ['number', + 'major', + 'minor', + 'arch', + 'series'], 'type': 'object'}, 'FindToolsResult': {'additionalProperties': False, - 'properties': {'Error': {'$ref': '#/definitions/Error'}, - 'List': {'items': {'$ref': '#/definitions/Tools'}, + 'properties': {'error': {'$ref': '#/definitions/Error'}, + 'list': {'items': {'$ref': '#/definitions/Tools'}, 'type': 'array'}}, - 'required': ['List', 'Error'], + 'required': ['list'], 'type': 'object'}, 'FullStatus': {'additionalProperties': False, - 'properties': {'Applications': {'patternProperties': {'.*': {'$ref': '#/definitions/ApplicationStatus'}}, + 'properties': {'applications': {'patternProperties': {'.*': {'$ref': '#/definitions/ApplicationStatus'}}, 'type': 'object'}, - 'AvailableVersion': {'type': 'string'}, - 'Machines': {'patternProperties': {'.*': {'$ref': '#/definitions/MachineStatus'}}, + 'machines': {'patternProperties': {'.*': {'$ref': '#/definitions/MachineStatus'}}, 'type': 'object'}, - 'ModelName': {'type': 'string'}, - 'Relations': {'items': {'$ref': '#/definitions/RelationStatus'}, + 'model': {'$ref': '#/definitions/ModelStatusInfo'}, + 'relations': {'items': {'$ref': '#/definitions/RelationStatus'}, 'type': 'array'}}, - 'required': ['ModelName', - 'AvailableVersion', - 'Machines', - 'Applications', - 'Relations'], + 'required': ['model', + 'machines', + 'applications', + 'relations'], 'type': 'object'}, 'GetBundleChangesParams': {'additionalProperties': False, 'properties': {'yaml': {'type': 'string'}}, @@ -7984,125 +8159,123 @@ class ClientFacade(Type): 'type': 'array'}}, 'type': 'object'}, 'GetConstraintsResults': {'additionalProperties': False, - 'properties': {'Constraints': {'$ref': '#/definitions/Value'}}, - 'required': ['Constraints'], + 'properties': {'constraints': {'$ref': '#/definitions/Value'}}, + 'required': ['constraints'], 'type': 'object'}, 'HardwareCharacteristics': {'additionalProperties': False, - 'properties': {'Arch': {'type': 'string'}, - 'AvailabilityZone': {'type': 'string'}, - 'CpuCores': {'type': 'integer'}, - 'CpuPower': {'type': 'integer'}, - 'Mem': {'type': 'integer'}, - 'RootDisk': {'type': 'integer'}, - 'Tags': {'items': {'type': 'string'}, + 'properties': {'arch': {'type': 'string'}, + 'availability-zone': {'type': 'string'}, + 'cpu-cores': {'type': 'integer'}, + 'cpu-power': {'type': 'integer'}, + 'mem': {'type': 'integer'}, + 'root-disk': {'type': 'integer'}, + 'tags': {'items': {'type': 'string'}, 'type': 'array'}}, 'type': 'object'}, 'History': {'additionalProperties': False, - 'properties': {'Error': {'$ref': '#/definitions/Error'}, - 'Statuses': {'items': {'$ref': '#/definitions/DetailedStatus'}, + 'properties': {'error': {'$ref': '#/definitions/Error'}, + 'statuses': {'items': {'$ref': '#/definitions/DetailedStatus'}, 'type': 'array'}}, - 'required': ['Statuses'], + 'required': ['statuses'], 'type': 'object'}, 'HostPort': {'additionalProperties': False, 'properties': {'Address': {'$ref': '#/definitions/Address'}, - 'Port': {'type': 'integer'}}, - 'required': ['Address', 'Port'], - 'type': 'object'}, - 'Macaroon': {'additionalProperties': False, - 'properties': {'caveats': {'items': {'$ref': '#/definitions/caveat'}, - 'type': 'array'}, - 'data': {'items': {'type': 'integer'}, - 'type': 'array'}, - 'id': {'$ref': '#/definitions/packet'}, - 'location': {'$ref': '#/definitions/packet'}, - 'sig': {'items': {'type': 'integer'}, - 'type': 'array'}}, - 'required': ['data', - 'location', - 'id', - 'caveats', - 'sig'], + 'port': {'type': 'integer'}}, + 'required': ['Address', 'port'], 'type': 'object'}, + 'Macaroon': {'additionalProperties': False, 'type': 'object'}, 'MachineStatus': {'additionalProperties': False, - 'properties': {'AgentStatus': {'$ref': '#/definitions/DetailedStatus'}, - 'Containers': {'patternProperties': {'.*': {'$ref': '#/definitions/MachineStatus'}}, + 'properties': {'agent-status': {'$ref': '#/definitions/DetailedStatus'}, + 'containers': {'patternProperties': {'.*': {'$ref': '#/definitions/MachineStatus'}}, 'type': 'object'}, - 'DNSName': {'type': 'string'}, - 'Hardware': {'type': 'string'}, - 'HasVote': {'type': 'boolean'}, - 'Id': {'type': 'string'}, - 'InstanceId': {'type': 'string'}, - 'InstanceStatus': {'$ref': '#/definitions/DetailedStatus'}, - 'Jobs': {'items': {'type': 'string'}, + 'dns-name': {'type': 'string'}, + 'hardware': {'type': 'string'}, + 'has-vote': {'type': 'boolean'}, + 'id': {'type': 'string'}, + 'instance-id': {'type': 'string'}, + 'instance-status': {'$ref': '#/definitions/DetailedStatus'}, + 'jobs': {'items': {'type': 'string'}, 'type': 'array'}, - 'Series': {'type': 'string'}, - 'WantsVote': {'type': 'boolean'}}, - 'required': ['AgentStatus', - 'InstanceStatus', - 'DNSName', - 'InstanceId', - 'Series', - 'Id', - 'Containers', - 'Hardware', - 'Jobs', - 'HasVote', - 'WantsVote'], + 'series': {'type': 'string'}, + 'wants-vote': {'type': 'boolean'}}, + 'required': ['agent-status', + 'instance-status', + 'dns-name', + 'instance-id', + 'series', + 'id', + 'containers', + 'hardware', + 'jobs', + 'has-vote', + 'wants-vote'], 'type': 'object'}, 'MeterStatus': {'additionalProperties': False, - 'properties': {'Color': {'type': 'string'}, - 'Message': {'type': 'string'}}, - 'required': ['Color', 'Message'], + 'properties': {'color': {'type': 'string'}, + 'message': {'type': 'string'}}, + 'required': ['color', 'message'], 'type': 'object'}, 'ModelConfigResults': {'additionalProperties': False, - 'properties': {'Config': {'patternProperties': {'.*': {'additionalProperties': True, - 'type': 'object'}}, + 'properties': {'config': {'patternProperties': {'.*': {'$ref': '#/definitions/ConfigValue'}}, 'type': 'object'}}, - 'required': ['Config'], + 'required': ['config'], 'type': 'object'}, 'ModelInfo': {'additionalProperties': False, - 'properties': {'Cloud': {'type': 'string'}, - 'DefaultSeries': {'type': 'string'}, - 'Life': {'type': 'string'}, - 'Name': {'type': 'string'}, - 'OwnerTag': {'type': 'string'}, - 'ProviderType': {'type': 'string'}, - 'ServerUUID': {'type': 'string'}, - 'Status': {'$ref': '#/definitions/EntityStatus'}, - 'UUID': {'type': 'string'}, - 'Users': {'items': {'$ref': '#/definitions/ModelUserInfo'}, - 'type': 'array'}}, - 'required': ['Name', - 'UUID', - 'ServerUUID', - 'ProviderType', - 'DefaultSeries', - 'Cloud', - 'OwnerTag', - 'Life', - 'Status', - 'Users'], + 'properties': {'cloud': {'type': 'string'}, + 'cloud-credential': {'type': 'string'}, + 'cloud-region': {'type': 'string'}, + 'controller-uuid': {'type': 'string'}, + 'default-series': {'type': 'string'}, + 'life': {'type': 'string'}, + 'name': {'type': 'string'}, + 'owner-tag': {'type': 'string'}, + 'provider-type': {'type': 'string'}, + 'status': {'$ref': '#/definitions/EntityStatus'}, + 'users': {'items': {'$ref': '#/definitions/ModelUserInfo'}, + 'type': 'array'}, + 'uuid': {'type': 'string'}}, + 'required': ['name', + 'uuid', + 'controller-uuid', + 'provider-type', + 'default-series', + 'cloud', + 'owner-tag', + 'life', + 'status', + 'users'], 'type': 'object'}, 'ModelSet': {'additionalProperties': False, - 'properties': {'Config': {'patternProperties': {'.*': {'additionalProperties': True, + 'properties': {'config': {'patternProperties': {'.*': {'additionalProperties': True, 'type': 'object'}}, 'type': 'object'}}, - 'required': ['Config'], + 'required': ['config'], 'type': 'object'}, + 'ModelStatusInfo': {'additionalProperties': False, + 'properties': {'available-version': {'type': 'string'}, + 'cloud': {'type': 'string'}, + 'name': {'type': 'string'}, + 'region': {'type': 'string'}, + 'version': {'type': 'string'}}, + 'required': ['name', + 'cloud', + 'version', + 'available-version'], + 'type': 'object'}, 'ModelUnset': {'additionalProperties': False, - 'properties': {'Keys': {'items': {'type': 'string'}, + 'properties': {'keys': {'items': {'type': 'string'}, 'type': 'array'}}, - 'required': ['Keys'], + 'required': ['keys'], 'type': 'object'}, 'ModelUserInfo': {'additionalProperties': False, 'properties': {'access': {'type': 'string'}, - 'displayname': {'type': 'string'}, - 'lastconnection': {'format': 'date-time', - 'type': 'string'}, + 'display-name': {'type': 'string'}, + 'last-connection': {'format': 'date-time', + 'type': 'string'}, 'user': {'type': 'string'}}, 'required': ['user', - 'displayname', - 'lastconnection', + 'display-name', + 'last-connection', 'access'], 'type': 'object'}, 'ModelUserInfoResult': {'additionalProperties': False, @@ -8127,118 +8300,117 @@ class ClientFacade(Type): 'Build'], 'type': 'object'}, 'Placement': {'additionalProperties': False, - 'properties': {'Directive': {'type': 'string'}, - 'Scope': {'type': 'string'}}, - 'required': ['Scope', 'Directive'], + 'properties': {'directive': {'type': 'string'}, + 'scope': {'type': 'string'}}, + 'required': ['scope', 'directive'], 'type': 'object'}, 'PrivateAddress': {'additionalProperties': False, - 'properties': {'Target': {'type': 'string'}}, - 'required': ['Target'], + 'properties': {'target': {'type': 'string'}}, + 'required': ['target'], 'type': 'object'}, 'PrivateAddressResults': {'additionalProperties': False, - 'properties': {'PrivateAddress': {'type': 'string'}}, - 'required': ['PrivateAddress'], + 'properties': {'private-address': {'type': 'string'}}, + 'required': ['private-address'], 'type': 'object'}, 'ProvisioningScriptParams': {'additionalProperties': False, - 'properties': {'DataDir': {'type': 'string'}, - 'DisablePackageCommands': {'type': 'boolean'}, - 'MachineId': {'type': 'string'}, - 'Nonce': {'type': 'string'}}, - 'required': ['MachineId', - 'Nonce', - 'DataDir', - 'DisablePackageCommands'], + 'properties': {'data-dir': {'type': 'string'}, + 'disable-package-commands': {'type': 'boolean'}, + 'machine-id': {'type': 'string'}, + 'nonce': {'type': 'string'}}, + 'required': ['machine-id', + 'nonce', + 'data-dir', + 'disable-package-commands'], 'type': 'object'}, 'ProvisioningScriptResult': {'additionalProperties': False, - 'properties': {'Script': {'type': 'string'}}, - 'required': ['Script'], + 'properties': {'script': {'type': 'string'}}, + 'required': ['script'], 'type': 'object'}, 'PublicAddress': {'additionalProperties': False, - 'properties': {'Target': {'type': 'string'}}, - 'required': ['Target'], + 'properties': {'target': {'type': 'string'}}, + 'required': ['target'], 'type': 'object'}, 'PublicAddressResults': {'additionalProperties': False, - 'properties': {'PublicAddress': {'type': 'string'}}, - 'required': ['PublicAddress'], + 'properties': {'public-address': {'type': 'string'}}, + 'required': ['public-address'], 'type': 'object'}, 'RelationStatus': {'additionalProperties': False, - 'properties': {'Endpoints': {'items': {'$ref': '#/definitions/EndpointStatus'}, + 'properties': {'endpoints': {'items': {'$ref': '#/definitions/EndpointStatus'}, 'type': 'array'}, - 'Id': {'type': 'integer'}, - 'Interface': {'type': 'string'}, - 'Key': {'type': 'string'}, - 'Scope': {'type': 'string'}}, - 'required': ['Id', - 'Key', - 'Interface', - 'Scope', - 'Endpoints'], + 'id': {'type': 'integer'}, + 'interface': {'type': 'string'}, + 'key': {'type': 'string'}, + 'scope': {'type': 'string'}}, + 'required': ['id', + 'key', + 'interface', + 'scope', + 'endpoints'], 'type': 'object'}, 'ResolveCharmResult': {'additionalProperties': False, - 'properties': {'Error': {'type': 'string'}, - 'URL': {'$ref': '#/definitions/URL'}}, + 'properties': {'error': {'type': 'string'}, + 'url': {'type': 'string'}}, 'type': 'object'}, 'ResolveCharmResults': {'additionalProperties': False, - 'properties': {'URLs': {'items': {'$ref': '#/definitions/ResolveCharmResult'}, + 'properties': {'urls': {'items': {'$ref': '#/definitions/ResolveCharmResult'}, 'type': 'array'}}, - 'required': ['URLs'], + 'required': ['urls'], 'type': 'object'}, 'ResolveCharms': {'additionalProperties': False, - 'properties': {'References': {'items': {'$ref': '#/definitions/URL'}, + 'properties': {'references': {'items': {'type': 'string'}, 'type': 'array'}}, - 'required': ['References'], + 'required': ['references'], 'type': 'object'}, 'Resolved': {'additionalProperties': False, - 'properties': {'Retry': {'type': 'boolean'}, - 'UnitName': {'type': 'string'}}, - 'required': ['UnitName', 'Retry'], + 'properties': {'retry': {'type': 'boolean'}, + 'unit-name': {'type': 'string'}}, + 'required': ['unit-name', 'retry'], 'type': 'object'}, 'SetConstraints': {'additionalProperties': False, - 'properties': {'ApplicationName': {'type': 'string'}, - 'Constraints': {'$ref': '#/definitions/Value'}}, - 'required': ['ApplicationName', - 'Constraints'], + 'properties': {'application': {'type': 'string'}, + 'constraints': {'$ref': '#/definitions/Value'}}, + 'required': ['application', 'constraints'], 'type': 'object'}, 'SetModelAgentVersion': {'additionalProperties': False, - 'properties': {'Version': {'$ref': '#/definitions/Number'}}, - 'required': ['Version'], + 'properties': {'version': {'$ref': '#/definitions/Number'}}, + 'required': ['version'], 'type': 'object'}, 'StatusHistoryFilter': {'additionalProperties': False, - 'properties': {'Date': {'format': 'date-time', + 'properties': {'date': {'format': 'date-time', 'type': 'string'}, - 'Delta': {'type': 'integer'}, - 'Size': {'type': 'integer'}}, - 'required': ['Size', 'Date', 'Delta'], + 'delta': {'type': 'integer'}, + 'size': {'type': 'integer'}}, + 'required': ['size', 'date', 'delta'], 'type': 'object'}, 'StatusHistoryRequest': {'additionalProperties': False, - 'properties': {'Filter': {'$ref': '#/definitions/StatusHistoryFilter'}, - 'HistoryKind': {'type': 'string'}, - 'Size': {'type': 'integer'}, - 'Tag': {'type': 'string'}}, - 'required': ['HistoryKind', - 'Size', - 'Filter', - 'Tag'], + 'properties': {'filter': {'$ref': '#/definitions/StatusHistoryFilter'}, + 'historyKind': {'type': 'string'}, + 'size': {'type': 'integer'}, + 'tag': {'type': 'string'}}, + 'required': ['historyKind', + 'size', + 'filter', + 'tag'], 'type': 'object'}, 'StatusHistoryRequests': {'additionalProperties': False, - 'properties': {'Requests': {'items': {'$ref': '#/definitions/StatusHistoryRequest'}, + 'properties': {'requests': {'items': {'$ref': '#/definitions/StatusHistoryRequest'}, 'type': 'array'}}, - 'required': ['Requests'], + 'required': ['requests'], 'type': 'object'}, 'StatusHistoryResult': {'additionalProperties': False, - 'properties': {'Error': {'$ref': '#/definitions/Error'}, - 'History': {'$ref': '#/definitions/History'}}, - 'required': ['History'], + 'properties': {'error': {'$ref': '#/definitions/Error'}, + 'history': {'$ref': '#/definitions/History'}}, + 'required': ['history'], 'type': 'object'}, 'StatusHistoryResults': {'additionalProperties': False, - 'properties': {'Results': {'items': {'$ref': '#/definitions/StatusHistoryResult'}, + 'properties': {'results': {'items': {'$ref': '#/definitions/StatusHistoryResult'}, 'type': 'array'}}, - 'required': ['Results'], + 'required': ['results'], 'type': 'object'}, 'StatusParams': {'additionalProperties': False, - 'properties': {'Patterns': {'items': {'type': 'string'}, + 'properties': {'patterns': {'items': {'type': 'string'}, 'type': 'array'}}, - 'required': ['Patterns'], + 'required': ['patterns'], 'type': 'object'}, 'Tools': {'additionalProperties': False, 'properties': {'sha256': {'type': 'string'}, @@ -8247,37 +8419,25 @@ class ClientFacade(Type): 'version': {'$ref': '#/definitions/Binary'}}, 'required': ['version', 'url', 'size'], 'type': 'object'}, - 'URL': {'additionalProperties': False, - 'properties': {'Channel': {'type': 'string'}, - 'Name': {'type': 'string'}, - 'Revision': {'type': 'integer'}, - 'Schema': {'type': 'string'}, - 'Series': {'type': 'string'}, - 'User': {'type': 'string'}}, - 'required': ['Schema', - 'User', - 'Name', - 'Revision', - 'Series', - 'Channel'], - 'type': 'object'}, 'UnitStatus': {'additionalProperties': False, - 'properties': {'AgentStatus': {'$ref': '#/definitions/DetailedStatus'}, - 'Charm': {'type': 'string'}, - 'Machine': {'type': 'string'}, - 'OpenedPorts': {'items': {'type': 'string'}, - 'type': 'array'}, - 'PublicAddress': {'type': 'string'}, - 'Subordinates': {'patternProperties': {'.*': {'$ref': '#/definitions/UnitStatus'}}, + 'properties': {'agent-status': {'$ref': '#/definitions/DetailedStatus'}, + 'charm': {'type': 'string'}, + 'machine': {'type': 'string'}, + 'opened-ports': {'items': {'type': 'string'}, + 'type': 'array'}, + 'public-address': {'type': 'string'}, + 'subordinates': {'patternProperties': {'.*': {'$ref': '#/definitions/UnitStatus'}}, 'type': 'object'}, - 'WorkloadStatus': {'$ref': '#/definitions/DetailedStatus'}}, - 'required': ['AgentStatus', - 'WorkloadStatus', - 'Machine', - 'OpenedPorts', - 'PublicAddress', - 'Charm', - 'Subordinates'], + 'workload-status': {'$ref': '#/definitions/DetailedStatus'}, + 'workload-version': {'type': 'string'}}, + 'required': ['agent-status', + 'workload-status', + 'workload-version', + 'machine', + 'opened-ports', + 'public-address', + 'charm', + 'subordinates'], 'type': 'object'}, 'Value': {'additionalProperties': False, 'properties': {'arch': {'type': 'string'}, @@ -8292,21 +8452,7 @@ class ClientFacade(Type): 'tags': {'items': {'type': 'string'}, 'type': 'array'}, 'virt-type': {'type': 'string'}}, - 'type': 'object'}, - 'caveat': {'additionalProperties': False, - 'properties': {'caveatId': {'$ref': '#/definitions/packet'}, - 'location': {'$ref': '#/definitions/packet'}, - 'verificationId': {'$ref': '#/definitions/packet'}}, - 'required': ['location', - 'caveatId', - 'verificationId'], - 'type': 'object'}, - 'packet': {'additionalProperties': False, - 'properties': {'headerLen': {'type': 'integer'}, - 'start': {'type': 'integer'}, - 'totalLen': {'type': 'integer'}}, - 'required': ['start', 'totalLen', 'headerLen'], - 'type': 'object'}}, + 'type': 'object'}}, 'properties': {'APIHostPorts': {'properties': {'Result': {'$ref': '#/definitions/APIHostPortsResult'}}, 'type': 'object'}, 'AbortCurrentUpgrade': {'type': 'object'}, @@ -8322,12 +8468,8 @@ class ClientFacade(Type): 'type': 'object'}, 'AgentVersion': {'properties': {'Result': {'$ref': '#/definitions/AgentVersionResult'}}, 'type': 'object'}, - 'CharmInfo': {'properties': {'Params': {'$ref': '#/definitions/CharmInfo'}, - 'Result': {'$ref': '#/definitions/CharmInfo'}}, - 'type': 'object'}, 'DestroyMachines': {'properties': {'Params': {'$ref': '#/definitions/DestroyMachines'}}, 'type': 'object'}, - 'DestroyModel': {'type': 'object'}, 'FindTools': {'properties': {'Params': {'$ref': '#/definitions/FindToolsParams'}, 'Result': {'$ref': '#/definitions/FindToolsResult'}}, 'type': 'object'}, @@ -8421,57 +8563,57 @@ class ClientFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Client', Request='AddCharm', Version=1, Params=params) - params['Channel'] = channel - params['URL'] = url + params['channel'] = channel + params['url'] = url reply = await self.rpc(msg) return reply @ReturnMapping(None) - async def AddCharmWithAuthorization(self, channel, charmstoremacaroon, url): + async def AddCharmWithAuthorization(self, channel, macaroon, url): ''' channel : str - charmstoremacaroon : Macaroon + macaroon : Macaroon url : str Returns -> None ''' # map input types to rpc msg params = dict() msg = dict(Type='Client', Request='AddCharmWithAuthorization', Version=1, Params=params) - params['Channel'] = channel - params['CharmStoreMacaroon'] = charmstoremacaroon - params['URL'] = url + params['channel'] = channel + params['macaroon'] = macaroon + params['url'] = url reply = await self.rpc(msg) return reply @ReturnMapping(AddMachinesResults) - async def AddMachines(self, machineparams): + async def AddMachines(self, params): ''' - machineparams : typing.Sequence[~AddMachineParams] + params : typing.Sequence[~AddMachineParams] Returns -> typing.Sequence[~AddMachinesResult] ''' # map input types to rpc msg params = dict() msg = dict(Type='Client', Request='AddMachines', Version=1, Params=params) - params['MachineParams'] = machineparams + params['params'] = params reply = await self.rpc(msg) return reply @ReturnMapping(AddMachinesResults) - async def AddMachinesV2(self, machineparams): + async def AddMachinesV2(self, params): ''' - machineparams : typing.Sequence[~AddMachineParams] + params : typing.Sequence[~AddMachineParams] Returns -> typing.Sequence[~AddMachinesResult] ''' # map input types to rpc msg params = dict() msg = dict(Type='Client', Request='AddMachinesV2', Version=1, Params=params) - params['MachineParams'] = machineparams + params['params'] = params reply = await self.rpc(msg) return reply @@ -8492,59 +8634,29 @@ class ClientFacade(Type): - @ReturnMapping(CharmInfo) - async def CharmInfo(self, charmurl): - ''' - charmurl : str - Returns -> str - ''' - # map input types to rpc msg - params = dict() - msg = dict(Type='Client', Request='CharmInfo', Version=1, Params=params) - params['CharmURL'] = charmurl - reply = await self.rpc(msg) - return reply - - - @ReturnMapping(None) - async def DestroyMachines(self, force, machinenames): + async def DestroyMachines(self, force, machine_names): ''' force : bool - machinenames : typing.Sequence[str] + machine_names : typing.Sequence[str] Returns -> None ''' # map input types to rpc msg params = dict() msg = dict(Type='Client', Request='DestroyMachines', Version=1, Params=params) - params['Force'] = force - params['MachineNames'] = machinenames - reply = await self.rpc(msg) - return reply - - - - @ReturnMapping(None) - async def DestroyModel(self): - ''' - - Returns -> None - ''' - # map input types to rpc msg - params = dict() - msg = dict(Type='Client', Request='DestroyModel', Version=1, Params=params) - + params['force'] = force + params['machine-names'] = machine_names reply = await self.rpc(msg) return reply @ReturnMapping(FindToolsResult) - async def FindTools(self, arch, majorversion, minorversion, number, series): + async def FindTools(self, arch, major, minor, number, series): ''' arch : str - majorversion : int - minorversion : int + major : int + minor : int number : Number series : str Returns -> typing.Union[_ForwardRef('Error'), typing.Sequence[~Tools]] @@ -8552,11 +8664,11 @@ class ClientFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Client', Request='FindTools', Version=1, Params=params) - params['Arch'] = arch - params['MajorVersion'] = majorversion - params['MinorVersion'] = minorversion - params['Number'] = number - params['Series'] = series + params['arch'] = arch + params['major'] = major + params['minor'] = minor + params['number'] = number + params['series'] = series reply = await self.rpc(msg) return reply @@ -8566,12 +8678,12 @@ class ClientFacade(Type): async def FullStatus(self, patterns): ''' patterns : typing.Sequence[str] - Returns -> typing.Union[typing.Mapping[str, ~MachineStatus], typing.Sequence[~RelationStatus]] + Returns -> typing.Union[typing.Mapping[str, ~MachineStatus], _ForwardRef('ModelStatusInfo'), typing.Sequence[~RelationStatus]] ''' # map input types to rpc msg params = dict() msg = dict(Type='Client', Request='FullStatus', Version=1, Params=params) - params['Patterns'] = patterns + params['patterns'] = patterns reply = await self.rpc(msg) return reply @@ -8608,15 +8720,15 @@ class ClientFacade(Type): @ReturnMapping(AddMachinesResults) - async def InjectMachines(self, machineparams): + async def InjectMachines(self, params): ''' - machineparams : typing.Sequence[~AddMachineParams] + params : typing.Sequence[~AddMachineParams] Returns -> typing.Sequence[~AddMachinesResult] ''' # map input types to rpc msg params = dict() msg = dict(Type='Client', Request='InjectMachines', Version=1, Params=params) - params['MachineParams'] = machineparams + params['params'] = params reply = await self.rpc(msg) return reply @@ -8626,7 +8738,7 @@ class ClientFacade(Type): async def ModelGet(self): ''' - Returns -> typing.Mapping[str, typing.Any] + Returns -> typing.Mapping[str, ~ConfigValue] ''' # map input types to rpc msg params = dict() @@ -8661,7 +8773,7 @@ class ClientFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Client', Request='ModelSet', Version=1, Params=params) - params['Config'] = config + params['config'] = config reply = await self.rpc(msg) return reply @@ -8676,7 +8788,7 @@ class ClientFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Client', Request='ModelUnset', Version=1, Params=params) - params['Keys'] = keys + params['keys'] = keys reply = await self.rpc(msg) return reply @@ -8706,28 +8818,28 @@ class ClientFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Client', Request='PrivateAddress', Version=1, Params=params) - params['Target'] = target + params['target'] = target reply = await self.rpc(msg) return reply @ReturnMapping(ProvisioningScriptResult) - async def ProvisioningScript(self, datadir, disablepackagecommands, machineid, nonce): + async def ProvisioningScript(self, data_dir, disable_package_commands, machine_id, nonce): ''' - datadir : str - disablepackagecommands : bool - machineid : str + data_dir : str + disable_package_commands : bool + machine_id : str nonce : str Returns -> str ''' # map input types to rpc msg params = dict() msg = dict(Type='Client', Request='ProvisioningScript', Version=1, Params=params) - params['DataDir'] = datadir - params['DisablePackageCommands'] = disablepackagecommands - params['MachineId'] = machineid - params['Nonce'] = nonce + params['data-dir'] = data_dir + params['disable-package-commands'] = disable_package_commands + params['machine-id'] = machine_id + params['nonce'] = nonce reply = await self.rpc(msg) return reply @@ -8742,7 +8854,7 @@ class ClientFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Client', Request='PublicAddress', Version=1, Params=params) - params['Target'] = target + params['target'] = target reply = await self.rpc(msg) return reply @@ -8751,30 +8863,30 @@ class ClientFacade(Type): @ReturnMapping(ResolveCharmResults) async def ResolveCharms(self, references): ''' - references : typing.Sequence[~URL] + references : typing.Sequence[str] Returns -> typing.Sequence[~ResolveCharmResult] ''' # map input types to rpc msg params = dict() msg = dict(Type='Client', Request='ResolveCharms', Version=1, Params=params) - params['References'] = references + params['references'] = references reply = await self.rpc(msg) return reply @ReturnMapping(None) - async def Resolved(self, retry, unitname): + async def Resolved(self, retry, unit_name): ''' retry : bool - unitname : str + unit_name : str Returns -> None ''' # map input types to rpc msg params = dict() msg = dict(Type='Client', Request='Resolved', Version=1, Params=params) - params['Retry'] = retry - params['UnitName'] = unitname + params['retry'] = retry + params['unit-name'] = unit_name reply = await self.rpc(msg) return reply @@ -8789,7 +8901,7 @@ class ClientFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Client', Request='RetryProvisioning', Version=1, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -8819,17 +8931,17 @@ class ClientFacade(Type): @ReturnMapping(None) - async def SetModelConstraints(self, applicationname, constraints): + async def SetModelConstraints(self, application, constraints): ''' - applicationname : str + application : str constraints : Value Returns -> None ''' # map input types to rpc msg params = dict() msg = dict(Type='Client', Request='SetModelConstraints', Version=1, Params=params) - params['ApplicationName'] = applicationname - params['Constraints'] = constraints + params['application'] = application + params['constraints'] = constraints reply = await self.rpc(msg) return reply @@ -8844,7 +8956,7 @@ class ClientFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Client', Request='StatusHistory', Version=1, Params=params) - params['Requests'] = requests + params['requests'] = requests reply = await self.rpc(msg) return reply @@ -8864,35 +8976,227 @@ class ClientFacade(Type): return reply +class CloudFacade(Type): + name = 'Cloud' + version = 1 + schema = {'definitions': {'Cloud': {'additionalProperties': False, + 'properties': {'auth-types': {'items': {'type': 'string'}, + 'type': 'array'}, + 'endpoint': {'type': 'string'}, + 'regions': {'items': {'$ref': '#/definitions/CloudRegion'}, + 'type': 'array'}, + 'type': {'type': 'string'}}, + 'required': ['type'], + 'type': 'object'}, + 'CloudCredential': {'additionalProperties': False, + 'properties': {'attrs': {'patternProperties': {'.*': {'type': 'string'}}, + 'type': 'object'}, + 'auth-type': {'type': 'string'}}, + 'required': ['auth-type'], + 'type': 'object'}, + 'CloudCredentialsResult': {'additionalProperties': False, + 'properties': {'credentials': {'patternProperties': {'.*': {'$ref': '#/definitions/CloudCredential'}}, + 'type': 'object'}, + 'error': {'$ref': '#/definitions/Error'}}, + 'type': 'object'}, + 'CloudCredentialsResults': {'additionalProperties': False, + 'properties': {'results': {'items': {'$ref': '#/definitions/CloudCredentialsResult'}, + 'type': 'array'}}, + 'type': 'object'}, + 'CloudDefaults': {'additionalProperties': False, + 'properties': {'cloud-tag': {'type': 'string'}, + 'credential': {'type': 'string'}, + 'region': {'type': 'string'}}, + 'required': ['cloud-tag'], + 'type': 'object'}, + 'CloudDefaultsResult': {'additionalProperties': False, + 'properties': {'error': {'$ref': '#/definitions/Error'}, + 'result': {'$ref': '#/definitions/CloudDefaults'}}, + 'required': ['error'], + 'type': 'object'}, + 'CloudDefaultsResults': {'additionalProperties': False, + 'properties': {'results': {'items': {'$ref': '#/definitions/CloudDefaultsResult'}, + 'type': 'array'}}, + 'type': 'object'}, + 'CloudRegion': {'additionalProperties': False, + 'properties': {'endpoint': {'type': 'string'}, + 'name': {'type': 'string'}}, + 'required': ['name'], + 'type': 'object'}, + 'CloudResult': {'additionalProperties': False, + 'properties': {'cloud': {'$ref': '#/definitions/Cloud'}, + 'error': {'$ref': '#/definitions/Error'}}, + 'type': 'object'}, + 'CloudResults': {'additionalProperties': False, + 'properties': {'results': {'items': {'$ref': '#/definitions/CloudResult'}, + 'type': 'array'}}, + 'type': 'object'}, + 'Entities': {'additionalProperties': False, + 'properties': {'entities': {'items': {'$ref': '#/definitions/Entity'}, + 'type': 'array'}}, + 'required': ['entities'], + 'type': 'object'}, + 'Entity': {'additionalProperties': False, + 'properties': {'tag': {'type': 'string'}}, + 'required': ['tag'], + 'type': 'object'}, + 'Error': {'additionalProperties': False, + 'properties': {'code': {'type': 'string'}, + 'info': {'$ref': '#/definitions/ErrorInfo'}, + 'message': {'type': 'string'}}, + 'required': ['message', 'code'], + 'type': 'object'}, + 'ErrorInfo': {'additionalProperties': False, + 'properties': {'macaroon': {'$ref': '#/definitions/Macaroon'}, + 'macaroon-path': {'type': 'string'}}, + 'type': 'object'}, + 'ErrorResult': {'additionalProperties': False, + 'properties': {'error': {'$ref': '#/definitions/Error'}}, + 'type': 'object'}, + 'ErrorResults': {'additionalProperties': False, + 'properties': {'results': {'items': {'$ref': '#/definitions/ErrorResult'}, + 'type': 'array'}}, + 'required': ['results'], + 'type': 'object'}, + 'Macaroon': {'additionalProperties': False, 'type': 'object'}, + 'UserCloud': {'additionalProperties': False, + 'properties': {'cloud-tag': {'type': 'string'}, + 'user-tag': {'type': 'string'}}, + 'required': ['user-tag', 'cloud-tag'], + 'type': 'object'}, + 'UserCloudCredentials': {'additionalProperties': False, + 'properties': {'cloud-tag': {'type': 'string'}, + 'credentials': {'patternProperties': {'.*': {'$ref': '#/definitions/CloudCredential'}}, + 'type': 'object'}, + 'user-tag': {'type': 'string'}}, + 'required': ['user-tag', + 'cloud-tag', + 'credentials'], + 'type': 'object'}, + 'UserClouds': {'additionalProperties': False, + 'properties': {'user-clouds': {'items': {'$ref': '#/definitions/UserCloud'}, + 'type': 'array'}}, + 'type': 'object'}, + 'UsersCloudCredentials': {'additionalProperties': False, + 'properties': {'users': {'items': {'$ref': '#/definitions/UserCloudCredentials'}, + 'type': 'array'}}, + 'required': ['users'], + 'type': 'object'}}, + 'properties': {'Cloud': {'properties': {'Params': {'$ref': '#/definitions/Entities'}, + 'Result': {'$ref': '#/definitions/CloudResults'}}, + 'type': 'object'}, + 'CloudDefaults': {'properties': {'Params': {'$ref': '#/definitions/Entities'}, + 'Result': {'$ref': '#/definitions/CloudDefaultsResults'}}, + 'type': 'object'}, + 'Credentials': {'properties': {'Params': {'$ref': '#/definitions/UserClouds'}, + 'Result': {'$ref': '#/definitions/CloudCredentialsResults'}}, + 'type': 'object'}, + 'UpdateCredentials': {'properties': {'Params': {'$ref': '#/definitions/UsersCloudCredentials'}, + 'Result': {'$ref': '#/definitions/ErrorResults'}}, + 'type': 'object'}}, + 'type': 'object'} + + + @ReturnMapping(CloudResults) + async def Cloud(self, entities): + ''' + entities : typing.Sequence[~Entity] + Returns -> typing.Sequence[~CloudResult] + ''' + # map input types to rpc msg + params = dict() + msg = dict(Type='Cloud', Request='Cloud', Version=1, Params=params) + params['entities'] = entities + reply = await self.rpc(msg) + return reply + + + + @ReturnMapping(CloudDefaultsResults) + async def CloudDefaults(self, entities): + ''' + entities : typing.Sequence[~Entity] + Returns -> typing.Sequence[~CloudDefaultsResult] + ''' + # map input types to rpc msg + params = dict() + msg = dict(Type='Cloud', Request='CloudDefaults', Version=1, Params=params) + params['entities'] = entities + reply = await self.rpc(msg) + return reply + + + + @ReturnMapping(CloudCredentialsResults) + async def Credentials(self, user_clouds): + ''' + user_clouds : typing.Sequence[~UserCloud] + Returns -> typing.Sequence[~CloudCredentialsResult] + ''' + # map input types to rpc msg + params = dict() + msg = dict(Type='Cloud', Request='Credentials', Version=1, Params=params) + params['user-clouds'] = user_clouds + reply = await self.rpc(msg) + return reply + + + + @ReturnMapping(ErrorResults) + async def UpdateCredentials(self, users): + ''' + users : typing.Sequence[~UserCloudCredentials] + Returns -> typing.Sequence[~ErrorResult] + ''' + # map input types to rpc msg + params = dict() + msg = dict(Type='Cloud', Request='UpdateCredentials', Version=1, Params=params) + params['users'] = users + reply = await self.rpc(msg) + return reply + + class ControllerFacade(Type): name = 'Controller' version = 3 schema = {'definitions': {'AllWatcherId': {'additionalProperties': False, - 'properties': {'AllWatcherId': {'type': 'string'}}, - 'required': ['AllWatcherId'], + 'properties': {'watcher-id': {'type': 'string'}}, + 'required': ['watcher-id'], 'type': 'object'}, + 'ConfigValue': {'additionalProperties': False, + 'properties': {'source': {'type': 'string'}, + 'value': {'additionalProperties': True, + 'type': 'object'}}, + 'required': ['value', 'source'], + 'type': 'object'}, + 'ControllerConfigResult': {'additionalProperties': False, + 'properties': {'config': {'patternProperties': {'.*': {'additionalProperties': True, + 'type': 'object'}}, + 'type': 'object'}}, + 'required': ['config'], + 'type': 'object'}, 'DestroyControllerArgs': {'additionalProperties': False, 'properties': {'destroy-models': {'type': 'boolean'}}, 'required': ['destroy-models'], 'type': 'object'}, 'Entities': {'additionalProperties': False, - 'properties': {'Entities': {'items': {'$ref': '#/definitions/Entity'}, + 'properties': {'entities': {'items': {'$ref': '#/definitions/Entity'}, 'type': 'array'}}, - 'required': ['Entities'], + 'required': ['entities'], 'type': 'object'}, 'Entity': {'additionalProperties': False, - 'properties': {'Tag': {'type': 'string'}}, - 'required': ['Tag'], + 'properties': {'tag': {'type': 'string'}}, + 'required': ['tag'], 'type': 'object'}, 'Error': {'additionalProperties': False, - 'properties': {'Code': {'type': 'string'}, - 'Info': {'$ref': '#/definitions/ErrorInfo'}, - 'Message': {'type': 'string'}}, - 'required': ['Message', 'Code'], + 'properties': {'code': {'type': 'string'}, + 'info': {'$ref': '#/definitions/ErrorInfo'}, + 'message': {'type': 'string'}}, + 'required': ['message', 'code'], 'type': 'object'}, 'ErrorInfo': {'additionalProperties': False, - 'properties': {'Macaroon': {'$ref': '#/definitions/Macaroon'}, - 'MacaroonPath': {'type': 'string'}}, + 'properties': {'macaroon': {'$ref': '#/definitions/Macaroon'}, + 'macaroon-path': {'type': 'string'}}, 'type': 'object'}, 'InitiateModelMigrationArgs': {'additionalProperties': False, 'properties': {'specs': {'items': {'$ref': '#/definitions/ModelMigrationSpec'}, @@ -8904,7 +9208,6 @@ class ControllerFacade(Type): 'id': {'type': 'string'}, 'model-tag': {'type': 'string'}}, 'required': ['model-tag', - 'error', 'id'], 'type': 'object'}, 'InitiateModelMigrationResults': {'additionalProperties': False, @@ -8912,26 +9215,12 @@ class ControllerFacade(Type): 'type': 'array'}}, 'required': ['results'], 'type': 'object'}, - 'Macaroon': {'additionalProperties': False, - 'properties': {'caveats': {'items': {'$ref': '#/definitions/caveat'}, - 'type': 'array'}, - 'data': {'items': {'type': 'integer'}, - 'type': 'array'}, - 'id': {'$ref': '#/definitions/packet'}, - 'location': {'$ref': '#/definitions/packet'}, - 'sig': {'items': {'type': 'integer'}, - 'type': 'array'}}, - 'required': ['data', - 'location', - 'id', - 'caveats', - 'sig'], - 'type': 'object'}, + 'Macaroon': {'additionalProperties': False, 'type': 'object'}, 'Model': {'additionalProperties': False, - 'properties': {'Name': {'type': 'string'}, - 'OwnerTag': {'type': 'string'}, - 'UUID': {'type': 'string'}}, - 'required': ['Name', 'UUID', 'OwnerTag'], + 'properties': {'name': {'type': 'string'}, + 'owner-tag': {'type': 'string'}, + 'uuid': {'type': 'string'}}, + 'required': ['name', 'uuid', 'owner-tag'], 'type': 'object'}, 'ModelBlockInfo': {'additionalProperties': False, 'properties': {'blocks': {'items': {'type': 'string'}, @@ -8949,10 +9238,9 @@ class ControllerFacade(Type): 'type': 'array'}}, 'type': 'object'}, 'ModelConfigResults': {'additionalProperties': False, - 'properties': {'Config': {'patternProperties': {'.*': {'additionalProperties': True, - 'type': 'object'}}, + 'properties': {'config': {'patternProperties': {'.*': {'$ref': '#/definitions/ConfigValue'}}, 'type': 'object'}}, - 'required': ['Config'], + 'required': ['config'], 'type': 'object'}, 'ModelMigrationSpec': {'additionalProperties': False, 'properties': {'model-tag': {'type': 'string'}, @@ -8995,32 +9283,20 @@ class ControllerFacade(Type): 'required': ['all'], 'type': 'object'}, 'UserModel': {'additionalProperties': False, - 'properties': {'LastConnection': {'format': 'date-time', - 'type': 'string'}, - 'Model': {'$ref': '#/definitions/Model'}}, - 'required': ['Model', 'LastConnection'], + 'properties': {'last-connection': {'format': 'date-time', + 'type': 'string'}, + 'model': {'$ref': '#/definitions/Model'}}, + 'required': ['model', 'last-connection'], 'type': 'object'}, 'UserModelList': {'additionalProperties': False, - 'properties': {'UserModels': {'items': {'$ref': '#/definitions/UserModel'}, - 'type': 'array'}}, - 'required': ['UserModels'], - 'type': 'object'}, - 'caveat': {'additionalProperties': False, - 'properties': {'caveatId': {'$ref': '#/definitions/packet'}, - 'location': {'$ref': '#/definitions/packet'}, - 'verificationId': {'$ref': '#/definitions/packet'}}, - 'required': ['location', - 'caveatId', - 'verificationId'], - 'type': 'object'}, - 'packet': {'additionalProperties': False, - 'properties': {'headerLen': {'type': 'integer'}, - 'start': {'type': 'integer'}, - 'totalLen': {'type': 'integer'}}, - 'required': ['start', 'totalLen', 'headerLen'], - 'type': 'object'}}, + 'properties': {'user-models': {'items': {'$ref': '#/definitions/UserModel'}, + 'type': 'array'}}, + 'required': ['user-models'], + 'type': 'object'}}, 'properties': {'AllModels': {'properties': {'Result': {'$ref': '#/definitions/UserModelList'}}, 'type': 'object'}, + 'ControllerConfig': {'properties': {'Result': {'$ref': '#/definitions/ControllerConfigResult'}}, + 'type': 'object'}, 'DestroyController': {'properties': {'Params': {'$ref': '#/definitions/DestroyControllerArgs'}}, 'type': 'object'}, 'InitiateModelMigration': {'properties': {'Params': {'$ref': '#/definitions/InitiateModelMigrationArgs'}, @@ -9055,6 +9331,21 @@ class ControllerFacade(Type): + @ReturnMapping(ControllerConfigResult) + async def ControllerConfig(self): + ''' + + Returns -> typing.Mapping[str, typing.Any] + ''' + # map input types to rpc msg + params = dict() + msg = dict(Type='Controller', Request='ControllerConfig', Version=3, Params=params) + + reply = await self.rpc(msg) + return reply + + + @ReturnMapping(None) async def DestroyController(self, destroy_models): ''' @@ -9104,7 +9395,7 @@ class ControllerFacade(Type): async def ModelConfig(self): ''' - Returns -> typing.Mapping[str, typing.Any] + Returns -> typing.Mapping[str, ~ConfigValue] ''' # map input types to rpc msg params = dict() @@ -9124,7 +9415,7 @@ class ControllerFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Controller', Request='ModelStatus', Version=3, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -9163,143 +9454,111 @@ class DeployerFacade(Type): name = 'Deployer' version = 1 schema = {'definitions': {'APIHostPortsResult': {'additionalProperties': False, - 'properties': {'Servers': {'items': {'items': {'$ref': '#/definitions/HostPort'}, + 'properties': {'servers': {'items': {'items': {'$ref': '#/definitions/HostPort'}, 'type': 'array'}, 'type': 'array'}}, - 'required': ['Servers'], + 'required': ['servers'], 'type': 'object'}, 'Address': {'additionalProperties': False, - 'properties': {'Scope': {'type': 'string'}, - 'SpaceName': {'type': 'string'}, - 'Type': {'type': 'string'}, - 'Value': {'type': 'string'}}, - 'required': ['Value', 'Type', 'Scope'], + 'properties': {'scope': {'type': 'string'}, + 'space-name': {'type': 'string'}, + 'type': {'type': 'string'}, + 'value': {'type': 'string'}}, + 'required': ['value', 'type', 'scope'], 'type': 'object'}, 'BytesResult': {'additionalProperties': False, - 'properties': {'Result': {'items': {'type': 'integer'}, + 'properties': {'result': {'items': {'type': 'integer'}, 'type': 'array'}}, - 'required': ['Result'], + 'required': ['result'], 'type': 'object'}, 'DeployerConnectionValues': {'additionalProperties': False, - 'properties': {'APIAddresses': {'items': {'type': 'string'}, - 'type': 'array'}, - 'StateAddresses': {'items': {'type': 'string'}, - 'type': 'array'}}, - 'required': ['StateAddresses', - 'APIAddresses'], + 'properties': {'api-addresses': {'items': {'type': 'string'}, + 'type': 'array'}, + 'state-addresses': {'items': {'type': 'string'}, + 'type': 'array'}}, + 'required': ['state-addresses', + 'api-addresses'], 'type': 'object'}, 'Entities': {'additionalProperties': False, - 'properties': {'Entities': {'items': {'$ref': '#/definitions/Entity'}, + 'properties': {'entities': {'items': {'$ref': '#/definitions/Entity'}, 'type': 'array'}}, - 'required': ['Entities'], + 'required': ['entities'], 'type': 'object'}, 'Entity': {'additionalProperties': False, - 'properties': {'Tag': {'type': 'string'}}, - 'required': ['Tag'], + 'properties': {'tag': {'type': 'string'}}, + 'required': ['tag'], 'type': 'object'}, 'EntityPassword': {'additionalProperties': False, - 'properties': {'Password': {'type': 'string'}, - 'Tag': {'type': 'string'}}, - 'required': ['Tag', 'Password'], + 'properties': {'password': {'type': 'string'}, + 'tag': {'type': 'string'}}, + 'required': ['tag', 'password'], 'type': 'object'}, 'EntityPasswords': {'additionalProperties': False, - 'properties': {'Changes': {'items': {'$ref': '#/definitions/EntityPassword'}, + 'properties': {'changes': {'items': {'$ref': '#/definitions/EntityPassword'}, 'type': 'array'}}, - 'required': ['Changes'], + 'required': ['changes'], 'type': 'object'}, 'Error': {'additionalProperties': False, - 'properties': {'Code': {'type': 'string'}, - 'Info': {'$ref': '#/definitions/ErrorInfo'}, - 'Message': {'type': 'string'}}, - 'required': ['Message', 'Code'], + 'properties': {'code': {'type': 'string'}, + 'info': {'$ref': '#/definitions/ErrorInfo'}, + 'message': {'type': 'string'}}, + 'required': ['message', 'code'], 'type': 'object'}, 'ErrorInfo': {'additionalProperties': False, - 'properties': {'Macaroon': {'$ref': '#/definitions/Macaroon'}, - 'MacaroonPath': {'type': 'string'}}, + 'properties': {'macaroon': {'$ref': '#/definitions/Macaroon'}, + 'macaroon-path': {'type': 'string'}}, 'type': 'object'}, 'ErrorResult': {'additionalProperties': False, - 'properties': {'Error': {'$ref': '#/definitions/Error'}}, - 'required': ['Error'], + 'properties': {'error': {'$ref': '#/definitions/Error'}}, 'type': 'object'}, 'ErrorResults': {'additionalProperties': False, - 'properties': {'Results': {'items': {'$ref': '#/definitions/ErrorResult'}, + 'properties': {'results': {'items': {'$ref': '#/definitions/ErrorResult'}, 'type': 'array'}}, - 'required': ['Results'], + 'required': ['results'], 'type': 'object'}, 'HostPort': {'additionalProperties': False, 'properties': {'Address': {'$ref': '#/definitions/Address'}, - 'Port': {'type': 'integer'}}, - 'required': ['Address', 'Port'], + 'port': {'type': 'integer'}}, + 'required': ['Address', 'port'], 'type': 'object'}, 'LifeResult': {'additionalProperties': False, - 'properties': {'Error': {'$ref': '#/definitions/Error'}, - 'Life': {'type': 'string'}}, - 'required': ['Life', 'Error'], + 'properties': {'error': {'$ref': '#/definitions/Error'}, + 'life': {'type': 'string'}}, + 'required': ['life'], 'type': 'object'}, 'LifeResults': {'additionalProperties': False, - 'properties': {'Results': {'items': {'$ref': '#/definitions/LifeResult'}, + 'properties': {'results': {'items': {'$ref': '#/definitions/LifeResult'}, 'type': 'array'}}, - 'required': ['Results'], + 'required': ['results'], 'type': 'object'}, - 'Macaroon': {'additionalProperties': False, - 'properties': {'caveats': {'items': {'$ref': '#/definitions/caveat'}, - 'type': 'array'}, - 'data': {'items': {'type': 'integer'}, - 'type': 'array'}, - 'id': {'$ref': '#/definitions/packet'}, - 'location': {'$ref': '#/definitions/packet'}, - 'sig': {'items': {'type': 'integer'}, - 'type': 'array'}}, - 'required': ['data', - 'location', - 'id', - 'caveats', - 'sig'], - 'type': 'object'}, + 'Macaroon': {'additionalProperties': False, 'type': 'object'}, 'NotifyWatchResult': {'additionalProperties': False, - 'properties': {'Error': {'$ref': '#/definitions/Error'}, - 'NotifyWatcherId': {'type': 'string'}}, - 'required': ['NotifyWatcherId', 'Error'], + 'properties': {'NotifyWatcherId': {'type': 'string'}, + 'error': {'$ref': '#/definitions/Error'}}, + 'required': ['NotifyWatcherId'], 'type': 'object'}, 'StringResult': {'additionalProperties': False, - 'properties': {'Error': {'$ref': '#/definitions/Error'}, - 'Result': {'type': 'string'}}, - 'required': ['Error', 'Result'], + 'properties': {'error': {'$ref': '#/definitions/Error'}, + 'result': {'type': 'string'}}, + 'required': ['result'], 'type': 'object'}, 'StringsResult': {'additionalProperties': False, - 'properties': {'Error': {'$ref': '#/definitions/Error'}, - 'Result': {'items': {'type': 'string'}, + 'properties': {'error': {'$ref': '#/definitions/Error'}, + 'result': {'items': {'type': 'string'}, 'type': 'array'}}, - 'required': ['Error', 'Result'], 'type': 'object'}, 'StringsWatchResult': {'additionalProperties': False, - 'properties': {'Changes': {'items': {'type': 'string'}, + 'properties': {'changes': {'items': {'type': 'string'}, 'type': 'array'}, - 'Error': {'$ref': '#/definitions/Error'}, - 'StringsWatcherId': {'type': 'string'}}, - 'required': ['StringsWatcherId', - 'Changes', - 'Error'], + 'error': {'$ref': '#/definitions/Error'}, + 'watcher-id': {'type': 'string'}}, + 'required': ['watcher-id'], 'type': 'object'}, 'StringsWatchResults': {'additionalProperties': False, - 'properties': {'Results': {'items': {'$ref': '#/definitions/StringsWatchResult'}, + 'properties': {'results': {'items': {'$ref': '#/definitions/StringsWatchResult'}, 'type': 'array'}}, - 'required': ['Results'], - 'type': 'object'}, - 'caveat': {'additionalProperties': False, - 'properties': {'caveatId': {'$ref': '#/definitions/packet'}, - 'location': {'$ref': '#/definitions/packet'}, - 'verificationId': {'$ref': '#/definitions/packet'}}, - 'required': ['location', - 'caveatId', - 'verificationId'], - 'type': 'object'}, - 'packet': {'additionalProperties': False, - 'properties': {'headerLen': {'type': 'integer'}, - 'start': {'type': 'integer'}, - 'totalLen': {'type': 'integer'}}, - 'required': ['start', 'totalLen', 'headerLen'], - 'type': 'object'}}, + 'required': ['results'], + 'type': 'object'}}, 'properties': {'APIAddresses': {'properties': {'Result': {'$ref': '#/definitions/StringsResult'}}, 'type': 'object'}, 'APIHostPorts': {'properties': {'Result': {'$ref': '#/definitions/APIHostPortsResult'}}, @@ -9398,7 +9657,7 @@ class DeployerFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Deployer', Request='Life', Version=1, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -9428,7 +9687,7 @@ class DeployerFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Deployer', Request='Remove', Version=1, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -9443,7 +9702,7 @@ class DeployerFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Deployer', Request='SetPasswords', Version=1, Params=params) - params['Changes'] = changes + params['changes'] = changes reply = await self.rpc(msg) return reply @@ -9468,7 +9727,7 @@ class DeployerFacade(Type): async def WatchAPIHostPorts(self): ''' - Returns -> typing.Union[_ForwardRef('Error'), str] + Returns -> typing.Union[str, _ForwardRef('Error')] ''' # map input types to rpc msg params = dict() @@ -9488,7 +9747,7 @@ class DeployerFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Deployer', Request='WatchUnits', Version=1, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -9497,130 +9756,97 @@ class DiscoverSpacesFacade(Type): name = 'DiscoverSpaces' version = 2 schema = {'definitions': {'AddSubnetParams': {'additionalProperties': False, - 'properties': {'SpaceTag': {'type': 'string'}, - 'SubnetProviderId': {'type': 'string'}, - 'SubnetTag': {'type': 'string'}, - 'Zones': {'items': {'type': 'string'}, + 'properties': {'space-tag': {'type': 'string'}, + 'subnet-provider-id': {'type': 'string'}, + 'subnet-tag': {'type': 'string'}, + 'zones': {'items': {'type': 'string'}, 'type': 'array'}}, - 'required': ['SpaceTag'], + 'required': ['space-tag'], 'type': 'object'}, 'AddSubnetsParams': {'additionalProperties': False, - 'properties': {'Subnets': {'items': {'$ref': '#/definitions/AddSubnetParams'}, + 'properties': {'subnets': {'items': {'$ref': '#/definitions/AddSubnetParams'}, 'type': 'array'}}, - 'required': ['Subnets'], + 'required': ['subnets'], 'type': 'object'}, 'CreateSpaceParams': {'additionalProperties': False, - 'properties': {'ProviderId': {'type': 'string'}, - 'Public': {'type': 'boolean'}, - 'SpaceTag': {'type': 'string'}, - 'SubnetTags': {'items': {'type': 'string'}, - 'type': 'array'}}, - 'required': ['SubnetTags', - 'SpaceTag', - 'Public'], + 'properties': {'provider-id': {'type': 'string'}, + 'public': {'type': 'boolean'}, + 'space-tag': {'type': 'string'}, + 'subnet-tags': {'items': {'type': 'string'}, + 'type': 'array'}}, + 'required': ['subnet-tags', + 'space-tag', + 'public'], 'type': 'object'}, 'CreateSpacesParams': {'additionalProperties': False, - 'properties': {'Spaces': {'items': {'$ref': '#/definitions/CreateSpaceParams'}, + 'properties': {'spaces': {'items': {'$ref': '#/definitions/CreateSpaceParams'}, 'type': 'array'}}, - 'required': ['Spaces'], + 'required': ['spaces'], 'type': 'object'}, 'DiscoverSpacesResults': {'additionalProperties': False, - 'properties': {'Results': {'items': {'$ref': '#/definitions/ProviderSpace'}, + 'properties': {'results': {'items': {'$ref': '#/definitions/ProviderSpace'}, 'type': 'array'}}, - 'required': ['Results'], + 'required': ['results'], 'type': 'object'}, 'Error': {'additionalProperties': False, - 'properties': {'Code': {'type': 'string'}, - 'Info': {'$ref': '#/definitions/ErrorInfo'}, - 'Message': {'type': 'string'}}, - 'required': ['Message', 'Code'], + 'properties': {'code': {'type': 'string'}, + 'info': {'$ref': '#/definitions/ErrorInfo'}, + 'message': {'type': 'string'}}, + 'required': ['message', 'code'], 'type': 'object'}, 'ErrorInfo': {'additionalProperties': False, - 'properties': {'Macaroon': {'$ref': '#/definitions/Macaroon'}, - 'MacaroonPath': {'type': 'string'}}, + 'properties': {'macaroon': {'$ref': '#/definitions/Macaroon'}, + 'macaroon-path': {'type': 'string'}}, 'type': 'object'}, 'ErrorResult': {'additionalProperties': False, - 'properties': {'Error': {'$ref': '#/definitions/Error'}}, - 'required': ['Error'], + 'properties': {'error': {'$ref': '#/definitions/Error'}}, 'type': 'object'}, 'ErrorResults': {'additionalProperties': False, - 'properties': {'Results': {'items': {'$ref': '#/definitions/ErrorResult'}, + 'properties': {'results': {'items': {'$ref': '#/definitions/ErrorResult'}, 'type': 'array'}}, - 'required': ['Results'], + 'required': ['results'], 'type': 'object'}, 'ListSubnetsResults': {'additionalProperties': False, - 'properties': {'Results': {'items': {'$ref': '#/definitions/Subnet'}, + 'properties': {'results': {'items': {'$ref': '#/definitions/Subnet'}, 'type': 'array'}}, - 'required': ['Results'], + 'required': ['results'], 'type': 'object'}, - 'Macaroon': {'additionalProperties': False, - 'properties': {'caveats': {'items': {'$ref': '#/definitions/caveat'}, - 'type': 'array'}, - 'data': {'items': {'type': 'integer'}, - 'type': 'array'}, - 'id': {'$ref': '#/definitions/packet'}, - 'location': {'$ref': '#/definitions/packet'}, - 'sig': {'items': {'type': 'integer'}, - 'type': 'array'}}, - 'required': ['data', - 'location', - 'id', - 'caveats', - 'sig'], - 'type': 'object'}, + 'Macaroon': {'additionalProperties': False, 'type': 'object'}, 'ModelConfigResult': {'additionalProperties': False, - 'properties': {'Config': {'patternProperties': {'.*': {'additionalProperties': True, + 'properties': {'config': {'patternProperties': {'.*': {'additionalProperties': True, 'type': 'object'}}, 'type': 'object'}}, - 'required': ['Config'], + 'required': ['config'], 'type': 'object'}, 'ProviderSpace': {'additionalProperties': False, - 'properties': {'Error': {'$ref': '#/definitions/Error'}, - 'Name': {'type': 'string'}, - 'ProviderId': {'type': 'string'}, - 'Subnets': {'items': {'$ref': '#/definitions/Subnet'}, + 'properties': {'error': {'$ref': '#/definitions/Error'}, + 'name': {'type': 'string'}, + 'provider-id': {'type': 'string'}, + 'subnets': {'items': {'$ref': '#/definitions/Subnet'}, 'type': 'array'}}, - 'required': ['Name', - 'ProviderId', - 'Subnets'], + 'required': ['name', + 'provider-id', + 'subnets'], 'type': 'object'}, 'Subnet': {'additionalProperties': False, - 'properties': {'CIDR': {'type': 'string'}, - 'Life': {'type': 'string'}, - 'ProviderId': {'type': 'string'}, - 'SpaceTag': {'type': 'string'}, - 'StaticRangeHighIP': {'items': {'type': 'integer'}, - 'type': 'array'}, - 'StaticRangeLowIP': {'items': {'type': 'integer'}, - 'type': 'array'}, - 'Status': {'type': 'string'}, - 'VLANTag': {'type': 'integer'}, - 'Zones': {'items': {'type': 'string'}, + 'properties': {'cidr': {'type': 'string'}, + 'life': {'type': 'string'}, + 'provider-id': {'type': 'string'}, + 'space-tag': {'type': 'string'}, + 'status': {'type': 'string'}, + 'vlan-tag': {'type': 'integer'}, + 'zones': {'items': {'type': 'string'}, 'type': 'array'}}, - 'required': ['CIDR', - 'VLANTag', - 'Life', - 'SpaceTag', - 'Zones'], + 'required': ['cidr', + 'vlan-tag', + 'life', + 'space-tag', + 'zones'], 'type': 'object'}, 'SubnetsFilters': {'additionalProperties': False, - 'properties': {'SpaceTag': {'type': 'string'}, - 'Zone': {'type': 'string'}}, - 'type': 'object'}, - 'caveat': {'additionalProperties': False, - 'properties': {'caveatId': {'$ref': '#/definitions/packet'}, - 'location': {'$ref': '#/definitions/packet'}, - 'verificationId': {'$ref': '#/definitions/packet'}}, - 'required': ['location', - 'caveatId', - 'verificationId'], - 'type': 'object'}, - 'packet': {'additionalProperties': False, - 'properties': {'headerLen': {'type': 'integer'}, - 'start': {'type': 'integer'}, - 'totalLen': {'type': 'integer'}}, - 'required': ['start', 'totalLen', 'headerLen'], - 'type': 'object'}}, + 'properties': {'space-tag': {'type': 'string'}, + 'zone': {'type': 'string'}}, + 'type': 'object'}}, 'properties': {'AddSubnets': {'properties': {'Params': {'$ref': '#/definitions/AddSubnetsParams'}, 'Result': {'$ref': '#/definitions/ErrorResults'}}, 'type': 'object'}, @@ -9646,7 +9872,7 @@ class DiscoverSpacesFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='DiscoverSpaces', Request='AddSubnets', Version=2, Params=params) - params['Subnets'] = subnets + params['subnets'] = subnets reply = await self.rpc(msg) return reply @@ -9661,7 +9887,7 @@ class DiscoverSpacesFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='DiscoverSpaces', Request='CreateSpaces', Version=2, Params=params) - params['Spaces'] = spaces + params['spaces'] = spaces reply = await self.rpc(msg) return reply @@ -9683,17 +9909,17 @@ class DiscoverSpacesFacade(Type): @ReturnMapping(ListSubnetsResults) - async def ListSubnets(self, spacetag, zone): + async def ListSubnets(self, space_tag, zone): ''' - spacetag : str + space_tag : str zone : str Returns -> typing.Sequence[~Subnet] ''' # map input types to rpc msg params = dict() msg = dict(Type='DiscoverSpaces', Request='ListSubnets', Version=2, Params=params) - params['SpaceTag'] = spacetag - params['Zone'] = zone + params['space-tag'] = space_tag + params['zone'] = zone reply = await self.rpc(msg) return reply @@ -9740,64 +9966,35 @@ class DiskManagerFacade(Type): 'MountPoint'], 'type': 'object'}, 'Error': {'additionalProperties': False, - 'properties': {'Code': {'type': 'string'}, - 'Info': {'$ref': '#/definitions/ErrorInfo'}, - 'Message': {'type': 'string'}}, - 'required': ['Message', 'Code'], + 'properties': {'code': {'type': 'string'}, + 'info': {'$ref': '#/definitions/ErrorInfo'}, + 'message': {'type': 'string'}}, + 'required': ['message', 'code'], 'type': 'object'}, 'ErrorInfo': {'additionalProperties': False, - 'properties': {'Macaroon': {'$ref': '#/definitions/Macaroon'}, - 'MacaroonPath': {'type': 'string'}}, + 'properties': {'macaroon': {'$ref': '#/definitions/Macaroon'}, + 'macaroon-path': {'type': 'string'}}, 'type': 'object'}, 'ErrorResult': {'additionalProperties': False, - 'properties': {'Error': {'$ref': '#/definitions/Error'}}, - 'required': ['Error'], + 'properties': {'error': {'$ref': '#/definitions/Error'}}, 'type': 'object'}, 'ErrorResults': {'additionalProperties': False, - 'properties': {'Results': {'items': {'$ref': '#/definitions/ErrorResult'}, + 'properties': {'results': {'items': {'$ref': '#/definitions/ErrorResult'}, 'type': 'array'}}, - 'required': ['Results'], + 'required': ['results'], 'type': 'object'}, - 'Macaroon': {'additionalProperties': False, - 'properties': {'caveats': {'items': {'$ref': '#/definitions/caveat'}, - 'type': 'array'}, - 'data': {'items': {'type': 'integer'}, - 'type': 'array'}, - 'id': {'$ref': '#/definitions/packet'}, - 'location': {'$ref': '#/definitions/packet'}, - 'sig': {'items': {'type': 'integer'}, - 'type': 'array'}}, - 'required': ['data', - 'location', - 'id', - 'caveats', - 'sig'], - 'type': 'object'}, + 'Macaroon': {'additionalProperties': False, 'type': 'object'}, 'MachineBlockDevices': {'additionalProperties': False, - 'properties': {'blockdevices': {'items': {'$ref': '#/definitions/BlockDevice'}, - 'type': 'array'}, + 'properties': {'block-devices': {'items': {'$ref': '#/definitions/BlockDevice'}, + 'type': 'array'}, 'machine': {'type': 'string'}}, 'required': ['machine'], 'type': 'object'}, 'SetMachineBlockDevices': {'additionalProperties': False, - 'properties': {'machineblockdevices': {'items': {'$ref': '#/definitions/MachineBlockDevices'}, - 'type': 'array'}}, - 'required': ['machineblockdevices'], - 'type': 'object'}, - 'caveat': {'additionalProperties': False, - 'properties': {'caveatId': {'$ref': '#/definitions/packet'}, - 'location': {'$ref': '#/definitions/packet'}, - 'verificationId': {'$ref': '#/definitions/packet'}}, - 'required': ['location', - 'caveatId', - 'verificationId'], - 'type': 'object'}, - 'packet': {'additionalProperties': False, - 'properties': {'headerLen': {'type': 'integer'}, - 'start': {'type': 'integer'}, - 'totalLen': {'type': 'integer'}}, - 'required': ['start', 'totalLen', 'headerLen'], - 'type': 'object'}}, + 'properties': {'machine-block-devices': {'items': {'$ref': '#/definitions/MachineBlockDevices'}, + 'type': 'array'}}, + 'required': ['machine-block-devices'], + 'type': 'object'}}, 'properties': {'SetMachineBlockDevices': {'properties': {'Params': {'$ref': '#/definitions/SetMachineBlockDevices'}, 'Result': {'$ref': '#/definitions/ErrorResults'}}, 'type': 'object'}}, @@ -9805,15 +10002,15 @@ class DiskManagerFacade(Type): @ReturnMapping(ErrorResults) - async def SetMachineBlockDevices(self, machineblockdevices): + async def SetMachineBlockDevices(self, machine_block_devices): ''' - machineblockdevices : typing.Sequence[~MachineBlockDevices] + machine_block_devices : typing.Sequence[~MachineBlockDevices] Returns -> typing.Sequence[~ErrorResult] ''' # map input types to rpc msg params = dict() msg = dict(Type='DiskManager', Request='SetMachineBlockDevices', Version=2, Params=params) - params['machineblockdevices'] = machineblockdevices + params['machine-block-devices'] = machine_block_devices reply = await self.rpc(msg) return reply @@ -9822,53 +10019,23 @@ class EntityWatcherFacade(Type): name = 'EntityWatcher' version = 2 schema = {'definitions': {'EntitiesWatchResult': {'additionalProperties': False, - 'properties': {'Changes': {'items': {'type': 'string'}, + 'properties': {'changes': {'items': {'type': 'string'}, 'type': 'array'}, - 'EntityWatcherId': {'type': 'string'}, - 'Error': {'$ref': '#/definitions/Error'}}, - 'required': ['EntityWatcherId', - 'Changes', - 'Error'], + 'error': {'$ref': '#/definitions/Error'}, + 'watcher-id': {'type': 'string'}}, + 'required': ['watcher-id'], 'type': 'object'}, 'Error': {'additionalProperties': False, - 'properties': {'Code': {'type': 'string'}, - 'Info': {'$ref': '#/definitions/ErrorInfo'}, - 'Message': {'type': 'string'}}, - 'required': ['Message', 'Code'], + 'properties': {'code': {'type': 'string'}, + 'info': {'$ref': '#/definitions/ErrorInfo'}, + 'message': {'type': 'string'}}, + 'required': ['message', 'code'], 'type': 'object'}, 'ErrorInfo': {'additionalProperties': False, - 'properties': {'Macaroon': {'$ref': '#/definitions/Macaroon'}, - 'MacaroonPath': {'type': 'string'}}, + 'properties': {'macaroon': {'$ref': '#/definitions/Macaroon'}, + 'macaroon-path': {'type': 'string'}}, 'type': 'object'}, - 'Macaroon': {'additionalProperties': False, - 'properties': {'caveats': {'items': {'$ref': '#/definitions/caveat'}, - 'type': 'array'}, - 'data': {'items': {'type': 'integer'}, - 'type': 'array'}, - 'id': {'$ref': '#/definitions/packet'}, - 'location': {'$ref': '#/definitions/packet'}, - 'sig': {'items': {'type': 'integer'}, - 'type': 'array'}}, - 'required': ['data', - 'location', - 'id', - 'caveats', - 'sig'], - 'type': 'object'}, - 'caveat': {'additionalProperties': False, - 'properties': {'caveatId': {'$ref': '#/definitions/packet'}, - 'location': {'$ref': '#/definitions/packet'}, - 'verificationId': {'$ref': '#/definitions/packet'}}, - 'required': ['location', - 'caveatId', - 'verificationId'], - 'type': 'object'}, - 'packet': {'additionalProperties': False, - 'properties': {'headerLen': {'type': 'integer'}, - 'start': {'type': 'integer'}, - 'totalLen': {'type': 'integer'}}, - 'required': ['start', 'totalLen', 'headerLen'], - 'type': 'object'}}, + 'Macaroon': {'additionalProperties': False, 'type': 'object'}}, 'properties': {'Next': {'properties': {'Result': {'$ref': '#/definitions/EntitiesWatchResult'}}, 'type': 'object'}, 'Stop': {'type': 'object'}}, @@ -9908,59 +10075,30 @@ class FilesystemAttachmentsWatcherFacade(Type): name = 'FilesystemAttachmentsWatcher' version = 2 schema = {'definitions': {'Error': {'additionalProperties': False, - 'properties': {'Code': {'type': 'string'}, - 'Info': {'$ref': '#/definitions/ErrorInfo'}, - 'Message': {'type': 'string'}}, - 'required': ['Message', 'Code'], + 'properties': {'code': {'type': 'string'}, + 'info': {'$ref': '#/definitions/ErrorInfo'}, + 'message': {'type': 'string'}}, + 'required': ['message', 'code'], 'type': 'object'}, 'ErrorInfo': {'additionalProperties': False, - 'properties': {'Macaroon': {'$ref': '#/definitions/Macaroon'}, - 'MacaroonPath': {'type': 'string'}}, + 'properties': {'macaroon': {'$ref': '#/definitions/Macaroon'}, + 'macaroon-path': {'type': 'string'}}, 'type': 'object'}, - 'Macaroon': {'additionalProperties': False, - 'properties': {'caveats': {'items': {'$ref': '#/definitions/caveat'}, - 'type': 'array'}, - 'data': {'items': {'type': 'integer'}, - 'type': 'array'}, - 'id': {'$ref': '#/definitions/packet'}, - 'location': {'$ref': '#/definitions/packet'}, - 'sig': {'items': {'type': 'integer'}, - 'type': 'array'}}, - 'required': ['data', - 'location', - 'id', - 'caveats', - 'sig'], - 'type': 'object'}, + 'Macaroon': {'additionalProperties': False, 'type': 'object'}, 'MachineStorageId': {'additionalProperties': False, - 'properties': {'attachmenttag': {'type': 'string'}, - 'machinetag': {'type': 'string'}}, - 'required': ['machinetag', - 'attachmenttag'], + 'properties': {'attachment-tag': {'type': 'string'}, + 'machine-tag': {'type': 'string'}}, + 'required': ['machine-tag', + 'attachment-tag'], 'type': 'object'}, 'MachineStorageIdsWatchResult': {'additionalProperties': False, - 'properties': {'Changes': {'items': {'$ref': '#/definitions/MachineStorageId'}, + 'properties': {'changes': {'items': {'$ref': '#/definitions/MachineStorageId'}, 'type': 'array'}, - 'Error': {'$ref': '#/definitions/Error'}, - 'MachineStorageIdsWatcherId': {'type': 'string'}}, - 'required': ['MachineStorageIdsWatcherId', - 'Changes', - 'Error'], - 'type': 'object'}, - 'caveat': {'additionalProperties': False, - 'properties': {'caveatId': {'$ref': '#/definitions/packet'}, - 'location': {'$ref': '#/definitions/packet'}, - 'verificationId': {'$ref': '#/definitions/packet'}}, - 'required': ['location', - 'caveatId', - 'verificationId'], - 'type': 'object'}, - 'packet': {'additionalProperties': False, - 'properties': {'headerLen': {'type': 'integer'}, - 'start': {'type': 'integer'}, - 'totalLen': {'type': 'integer'}}, - 'required': ['start', 'totalLen', 'headerLen'], - 'type': 'object'}}, + 'error': {'$ref': '#/definitions/Error'}, + 'watcher-id': {'type': 'string'}}, + 'required': ['watcher-id', + 'changes'], + 'type': 'object'}}, 'properties': {'Next': {'properties': {'Result': {'$ref': '#/definitions/MachineStorageIdsWatchResult'}}, 'type': 'object'}, 'Stop': {'type': 'object'}}, @@ -10000,159 +10138,128 @@ class FirewallerFacade(Type): name = 'Firewaller' version = 3 schema = {'definitions': {'BoolResult': {'additionalProperties': False, - 'properties': {'Error': {'$ref': '#/definitions/Error'}, - 'Result': {'type': 'boolean'}}, - 'required': ['Error', 'Result'], + 'properties': {'error': {'$ref': '#/definitions/Error'}, + 'result': {'type': 'boolean'}}, + 'required': ['result'], 'type': 'object'}, 'BoolResults': {'additionalProperties': False, - 'properties': {'Results': {'items': {'$ref': '#/definitions/BoolResult'}, + 'properties': {'results': {'items': {'$ref': '#/definitions/BoolResult'}, 'type': 'array'}}, - 'required': ['Results'], + 'required': ['results'], 'type': 'object'}, 'Entities': {'additionalProperties': False, - 'properties': {'Entities': {'items': {'$ref': '#/definitions/Entity'}, + 'properties': {'entities': {'items': {'$ref': '#/definitions/Entity'}, 'type': 'array'}}, - 'required': ['Entities'], + 'required': ['entities'], 'type': 'object'}, 'Entity': {'additionalProperties': False, - 'properties': {'Tag': {'type': 'string'}}, - 'required': ['Tag'], + 'properties': {'tag': {'type': 'string'}}, + 'required': ['tag'], 'type': 'object'}, 'Error': {'additionalProperties': False, - 'properties': {'Code': {'type': 'string'}, - 'Info': {'$ref': '#/definitions/ErrorInfo'}, - 'Message': {'type': 'string'}}, - 'required': ['Message', 'Code'], + 'properties': {'code': {'type': 'string'}, + 'info': {'$ref': '#/definitions/ErrorInfo'}, + 'message': {'type': 'string'}}, + 'required': ['message', 'code'], 'type': 'object'}, 'ErrorInfo': {'additionalProperties': False, - 'properties': {'Macaroon': {'$ref': '#/definitions/Macaroon'}, - 'MacaroonPath': {'type': 'string'}}, + 'properties': {'macaroon': {'$ref': '#/definitions/Macaroon'}, + 'macaroon-path': {'type': 'string'}}, 'type': 'object'}, 'LifeResult': {'additionalProperties': False, - 'properties': {'Error': {'$ref': '#/definitions/Error'}, - 'Life': {'type': 'string'}}, - 'required': ['Life', 'Error'], + 'properties': {'error': {'$ref': '#/definitions/Error'}, + 'life': {'type': 'string'}}, + 'required': ['life'], 'type': 'object'}, 'LifeResults': {'additionalProperties': False, - 'properties': {'Results': {'items': {'$ref': '#/definitions/LifeResult'}, + 'properties': {'results': {'items': {'$ref': '#/definitions/LifeResult'}, 'type': 'array'}}, - 'required': ['Results'], + 'required': ['results'], 'type': 'object'}, - 'Macaroon': {'additionalProperties': False, - 'properties': {'caveats': {'items': {'$ref': '#/definitions/caveat'}, - 'type': 'array'}, - 'data': {'items': {'type': 'integer'}, - 'type': 'array'}, - 'id': {'$ref': '#/definitions/packet'}, - 'location': {'$ref': '#/definitions/packet'}, - 'sig': {'items': {'type': 'integer'}, - 'type': 'array'}}, - 'required': ['data', - 'location', - 'id', - 'caveats', - 'sig'], - 'type': 'object'}, + 'Macaroon': {'additionalProperties': False, 'type': 'object'}, 'MachinePortRange': {'additionalProperties': False, - 'properties': {'PortRange': {'$ref': '#/definitions/PortRange'}, - 'RelationTag': {'type': 'string'}, - 'UnitTag': {'type': 'string'}}, - 'required': ['UnitTag', - 'RelationTag', - 'PortRange'], + 'properties': {'port-range': {'$ref': '#/definitions/PortRange'}, + 'relation-tag': {'type': 'string'}, + 'unit-tag': {'type': 'string'}}, + 'required': ['unit-tag', + 'relation-tag', + 'port-range'], 'type': 'object'}, 'MachinePorts': {'additionalProperties': False, - 'properties': {'MachineTag': {'type': 'string'}, - 'SubnetTag': {'type': 'string'}}, - 'required': ['MachineTag', 'SubnetTag'], + 'properties': {'machine-tag': {'type': 'string'}, + 'subnet-tag': {'type': 'string'}}, + 'required': ['machine-tag', 'subnet-tag'], 'type': 'object'}, 'MachinePortsParams': {'additionalProperties': False, - 'properties': {'Params': {'items': {'$ref': '#/definitions/MachinePorts'}, + 'properties': {'params': {'items': {'$ref': '#/definitions/MachinePorts'}, 'type': 'array'}}, - 'required': ['Params'], + 'required': ['params'], 'type': 'object'}, 'MachinePortsResult': {'additionalProperties': False, - 'properties': {'Error': {'$ref': '#/definitions/Error'}, - 'Ports': {'items': {'$ref': '#/definitions/MachinePortRange'}, + 'properties': {'error': {'$ref': '#/definitions/Error'}, + 'ports': {'items': {'$ref': '#/definitions/MachinePortRange'}, 'type': 'array'}}, - 'required': ['Error', 'Ports'], + 'required': ['ports'], 'type': 'object'}, 'MachinePortsResults': {'additionalProperties': False, - 'properties': {'Results': {'items': {'$ref': '#/definitions/MachinePortsResult'}, + 'properties': {'results': {'items': {'$ref': '#/definitions/MachinePortsResult'}, 'type': 'array'}}, - 'required': ['Results'], + 'required': ['results'], 'type': 'object'}, 'ModelConfigResult': {'additionalProperties': False, - 'properties': {'Config': {'patternProperties': {'.*': {'additionalProperties': True, + 'properties': {'config': {'patternProperties': {'.*': {'additionalProperties': True, 'type': 'object'}}, 'type': 'object'}}, - 'required': ['Config'], + 'required': ['config'], 'type': 'object'}, 'NotifyWatchResult': {'additionalProperties': False, - 'properties': {'Error': {'$ref': '#/definitions/Error'}, - 'NotifyWatcherId': {'type': 'string'}}, - 'required': ['NotifyWatcherId', 'Error'], + 'properties': {'NotifyWatcherId': {'type': 'string'}, + 'error': {'$ref': '#/definitions/Error'}}, + 'required': ['NotifyWatcherId'], 'type': 'object'}, 'NotifyWatchResults': {'additionalProperties': False, - 'properties': {'Results': {'items': {'$ref': '#/definitions/NotifyWatchResult'}, + 'properties': {'results': {'items': {'$ref': '#/definitions/NotifyWatchResult'}, 'type': 'array'}}, - 'required': ['Results'], + 'required': ['results'], 'type': 'object'}, 'PortRange': {'additionalProperties': False, - 'properties': {'FromPort': {'type': 'integer'}, - 'Protocol': {'type': 'string'}, - 'ToPort': {'type': 'integer'}}, - 'required': ['FromPort', 'ToPort', 'Protocol'], + 'properties': {'from-port': {'type': 'integer'}, + 'protocol': {'type': 'string'}, + 'to-port': {'type': 'integer'}}, + 'required': ['from-port', 'to-port', 'protocol'], 'type': 'object'}, 'StringResult': {'additionalProperties': False, - 'properties': {'Error': {'$ref': '#/definitions/Error'}, - 'Result': {'type': 'string'}}, - 'required': ['Error', 'Result'], + 'properties': {'error': {'$ref': '#/definitions/Error'}, + 'result': {'type': 'string'}}, + 'required': ['result'], 'type': 'object'}, 'StringResults': {'additionalProperties': False, - 'properties': {'Results': {'items': {'$ref': '#/definitions/StringResult'}, + 'properties': {'results': {'items': {'$ref': '#/definitions/StringResult'}, 'type': 'array'}}, - 'required': ['Results'], + 'required': ['results'], 'type': 'object'}, 'StringsResult': {'additionalProperties': False, - 'properties': {'Error': {'$ref': '#/definitions/Error'}, - 'Result': {'items': {'type': 'string'}, + 'properties': {'error': {'$ref': '#/definitions/Error'}, + 'result': {'items': {'type': 'string'}, 'type': 'array'}}, - 'required': ['Error', 'Result'], 'type': 'object'}, 'StringsResults': {'additionalProperties': False, - 'properties': {'Results': {'items': {'$ref': '#/definitions/StringsResult'}, + 'properties': {'results': {'items': {'$ref': '#/definitions/StringsResult'}, 'type': 'array'}}, - 'required': ['Results'], + 'required': ['results'], 'type': 'object'}, 'StringsWatchResult': {'additionalProperties': False, - 'properties': {'Changes': {'items': {'type': 'string'}, + 'properties': {'changes': {'items': {'type': 'string'}, 'type': 'array'}, - 'Error': {'$ref': '#/definitions/Error'}, - 'StringsWatcherId': {'type': 'string'}}, - 'required': ['StringsWatcherId', - 'Changes', - 'Error'], + 'error': {'$ref': '#/definitions/Error'}, + 'watcher-id': {'type': 'string'}}, + 'required': ['watcher-id'], 'type': 'object'}, 'StringsWatchResults': {'additionalProperties': False, - 'properties': {'Results': {'items': {'$ref': '#/definitions/StringsWatchResult'}, + 'properties': {'results': {'items': {'$ref': '#/definitions/StringsWatchResult'}, 'type': 'array'}}, - 'required': ['Results'], - 'type': 'object'}, - 'caveat': {'additionalProperties': False, - 'properties': {'caveatId': {'$ref': '#/definitions/packet'}, - 'location': {'$ref': '#/definitions/packet'}, - 'verificationId': {'$ref': '#/definitions/packet'}}, - 'required': ['location', - 'caveatId', - 'verificationId'], - 'type': 'object'}, - 'packet': {'additionalProperties': False, - 'properties': {'headerLen': {'type': 'integer'}, - 'start': {'type': 'integer'}, - 'totalLen': {'type': 'integer'}}, - 'required': ['start', 'totalLen', 'headerLen'], - 'type': 'object'}}, + 'required': ['results'], + 'type': 'object'}}, 'properties': {'GetAssignedMachine': {'properties': {'Params': {'$ref': '#/definitions/Entities'}, 'Result': {'$ref': '#/definitions/StringResults'}}, 'type': 'object'}, @@ -10198,7 +10305,7 @@ class FirewallerFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Firewaller', Request='GetAssignedMachine', Version=3, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -10213,7 +10320,7 @@ class FirewallerFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Firewaller', Request='GetExposed', Version=3, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -10228,7 +10335,7 @@ class FirewallerFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Firewaller', Request='GetMachineActiveSubnets', Version=3, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -10243,7 +10350,7 @@ class FirewallerFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Firewaller', Request='GetMachinePorts', Version=3, Params=params) - params['Params'] = params + params['params'] = params reply = await self.rpc(msg) return reply @@ -10258,7 +10365,7 @@ class FirewallerFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Firewaller', Request='InstanceId', Version=3, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -10273,7 +10380,7 @@ class FirewallerFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Firewaller', Request='Life', Version=3, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -10303,7 +10410,7 @@ class FirewallerFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Firewaller', Request='Watch', Version=3, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -10313,7 +10420,7 @@ class FirewallerFacade(Type): async def WatchForModelConfigChanges(self): ''' - Returns -> typing.Union[_ForwardRef('Error'), str] + Returns -> typing.Union[str, _ForwardRef('Error')] ''' # map input types to rpc msg params = dict() @@ -10348,7 +10455,7 @@ class FirewallerFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Firewaller', Request='WatchOpenedPorts', Version=3, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -10363,7 +10470,7 @@ class FirewallerFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Firewaller', Request='WatchUnits', Version=3, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -10384,14 +10491,14 @@ class HighAvailabilityFacade(Type): 'SpaceProviderId'], 'type': 'object'}, 'ControllersChangeResult': {'additionalProperties': False, - 'properties': {'Error': {'$ref': '#/definitions/Error'}, - 'Result': {'$ref': '#/definitions/ControllersChanges'}}, - 'required': ['Result', 'Error'], + 'properties': {'error': {'$ref': '#/definitions/Error'}, + 'result': {'$ref': '#/definitions/ControllersChanges'}}, + 'required': ['result'], 'type': 'object'}, 'ControllersChangeResults': {'additionalProperties': False, - 'properties': {'Results': {'items': {'$ref': '#/definitions/ControllersChangeResult'}, + 'properties': {'results': {'items': {'$ref': '#/definitions/ControllersChangeResult'}, 'type': 'array'}}, - 'required': ['Results'], + 'required': ['results'], 'type': 'object'}, 'ControllersChanges': {'additionalProperties': False, 'properties': {'added': {'items': {'type': 'string'}, @@ -10408,51 +10515,37 @@ class HighAvailabilityFacade(Type): 'type': 'array'}}, 'type': 'object'}, 'ControllersSpec': {'additionalProperties': False, - 'properties': {'ModelTag': {'type': 'string'}, - 'constraints': {'$ref': '#/definitions/Value'}, + 'properties': {'constraints': {'$ref': '#/definitions/Value'}, + 'model-tag': {'type': 'string'}, 'num-controllers': {'type': 'integer'}, 'placement': {'items': {'type': 'string'}, 'type': 'array'}, 'series': {'type': 'string'}}, - 'required': ['ModelTag', + 'required': ['model-tag', 'num-controllers'], 'type': 'object'}, 'ControllersSpecs': {'additionalProperties': False, - 'properties': {'Specs': {'items': {'$ref': '#/definitions/ControllersSpec'}, + 'properties': {'specs': {'items': {'$ref': '#/definitions/ControllersSpec'}, 'type': 'array'}}, - 'required': ['Specs'], + 'required': ['specs'], 'type': 'object'}, 'Error': {'additionalProperties': False, - 'properties': {'Code': {'type': 'string'}, - 'Info': {'$ref': '#/definitions/ErrorInfo'}, - 'Message': {'type': 'string'}}, - 'required': ['Message', 'Code'], + 'properties': {'code': {'type': 'string'}, + 'info': {'$ref': '#/definitions/ErrorInfo'}, + 'message': {'type': 'string'}}, + 'required': ['message', 'code'], 'type': 'object'}, 'ErrorInfo': {'additionalProperties': False, - 'properties': {'Macaroon': {'$ref': '#/definitions/Macaroon'}, - 'MacaroonPath': {'type': 'string'}}, + 'properties': {'macaroon': {'$ref': '#/definitions/Macaroon'}, + 'macaroon-path': {'type': 'string'}}, 'type': 'object'}, 'HAMember': {'additionalProperties': False, - 'properties': {'PublicAddress': {'$ref': '#/definitions/Address'}, - 'Series': {'type': 'string'}, - 'Tag': {'type': 'string'}}, - 'required': ['Tag', 'PublicAddress', 'Series'], - 'type': 'object'}, - 'Macaroon': {'additionalProperties': False, - 'properties': {'caveats': {'items': {'$ref': '#/definitions/caveat'}, - 'type': 'array'}, - 'data': {'items': {'type': 'integer'}, - 'type': 'array'}, - 'id': {'$ref': '#/definitions/packet'}, - 'location': {'$ref': '#/definitions/packet'}, - 'sig': {'items': {'type': 'integer'}, - 'type': 'array'}}, - 'required': ['data', - 'location', - 'id', - 'caveats', - 'sig'], + 'properties': {'public-address': {'$ref': '#/definitions/Address'}, + 'series': {'type': 'string'}, + 'tag': {'type': 'string'}}, + 'required': ['tag', 'public-address', 'series'], 'type': 'object'}, + 'Macaroon': {'additionalProperties': False, 'type': 'object'}, 'Member': {'additionalProperties': False, 'properties': {'Address': {'type': 'string'}, 'Arbiter': {'type': 'boolean'}, @@ -10475,23 +10568,23 @@ class HighAvailabilityFacade(Type): 'Votes'], 'type': 'object'}, 'MongoUpgradeResults': {'additionalProperties': False, - 'properties': {'Master': {'$ref': '#/definitions/HAMember'}, - 'Members': {'items': {'$ref': '#/definitions/HAMember'}, - 'type': 'array'}, - 'RsMembers': {'items': {'$ref': '#/definitions/Member'}, - 'type': 'array'}}, - 'required': ['RsMembers', - 'Master', - 'Members'], + 'properties': {'ha-members': {'items': {'$ref': '#/definitions/HAMember'}, + 'type': 'array'}, + 'master': {'$ref': '#/definitions/HAMember'}, + 'rs-members': {'items': {'$ref': '#/definitions/Member'}, + 'type': 'array'}}, + 'required': ['rs-members', + 'master', + 'ha-members'], 'type': 'object'}, 'ResumeReplicationParams': {'additionalProperties': False, - 'properties': {'Members': {'items': {'$ref': '#/definitions/Member'}, + 'properties': {'members': {'items': {'$ref': '#/definitions/Member'}, 'type': 'array'}}, - 'required': ['Members'], + 'required': ['members'], 'type': 'object'}, 'UpgradeMongoParams': {'additionalProperties': False, - 'properties': {'Target': {'$ref': '#/definitions/Version'}}, - 'required': ['Target'], + 'properties': {'target': {'$ref': '#/definitions/Version'}}, + 'required': ['target'], 'type': 'object'}, 'Value': {'additionalProperties': False, 'properties': {'arch': {'type': 'string'}, @@ -10516,21 +10609,7 @@ class HighAvailabilityFacade(Type): 'Minor', 'Patch', 'StorageEngine'], - 'type': 'object'}, - 'caveat': {'additionalProperties': False, - 'properties': {'caveatId': {'$ref': '#/definitions/packet'}, - 'location': {'$ref': '#/definitions/packet'}, - 'verificationId': {'$ref': '#/definitions/packet'}}, - 'required': ['location', - 'caveatId', - 'verificationId'], - 'type': 'object'}, - 'packet': {'additionalProperties': False, - 'properties': {'headerLen': {'type': 'integer'}, - 'start': {'type': 'integer'}, - 'totalLen': {'type': 'integer'}}, - 'required': ['start', 'totalLen', 'headerLen'], - 'type': 'object'}}, + 'type': 'object'}}, 'properties': {'EnableHA': {'properties': {'Params': {'$ref': '#/definitions/ControllersSpecs'}, 'Result': {'$ref': '#/definitions/ControllersChangeResults'}}, 'type': 'object'}, @@ -10551,7 +10630,7 @@ class HighAvailabilityFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='HighAvailability', Request='EnableHA', Version=2, Params=params) - params['Specs'] = specs + params['specs'] = specs reply = await self.rpc(msg) return reply @@ -10566,7 +10645,7 @@ class HighAvailabilityFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='HighAvailability', Request='ResumeHAReplicationAfterUpgrade', Version=2, Params=params) - params['Members'] = members + params['members'] = members reply = await self.rpc(msg) return reply @@ -10596,39 +10675,24 @@ class HostKeyReporterFacade(Type): name = 'HostKeyReporter' version = 1 schema = {'definitions': {'Error': {'additionalProperties': False, - 'properties': {'Code': {'type': 'string'}, - 'Info': {'$ref': '#/definitions/ErrorInfo'}, - 'Message': {'type': 'string'}}, - 'required': ['Message', 'Code'], + 'properties': {'code': {'type': 'string'}, + 'info': {'$ref': '#/definitions/ErrorInfo'}, + 'message': {'type': 'string'}}, + 'required': ['message', 'code'], 'type': 'object'}, 'ErrorInfo': {'additionalProperties': False, - 'properties': {'Macaroon': {'$ref': '#/definitions/Macaroon'}, - 'MacaroonPath': {'type': 'string'}}, + 'properties': {'macaroon': {'$ref': '#/definitions/Macaroon'}, + 'macaroon-path': {'type': 'string'}}, 'type': 'object'}, 'ErrorResult': {'additionalProperties': False, - 'properties': {'Error': {'$ref': '#/definitions/Error'}}, - 'required': ['Error'], + 'properties': {'error': {'$ref': '#/definitions/Error'}}, 'type': 'object'}, 'ErrorResults': {'additionalProperties': False, - 'properties': {'Results': {'items': {'$ref': '#/definitions/ErrorResult'}, + 'properties': {'results': {'items': {'$ref': '#/definitions/ErrorResult'}, 'type': 'array'}}, - 'required': ['Results'], + 'required': ['results'], 'type': 'object'}, - 'Macaroon': {'additionalProperties': False, - 'properties': {'caveats': {'items': {'$ref': '#/definitions/caveat'}, - 'type': 'array'}, - 'data': {'items': {'type': 'integer'}, - 'type': 'array'}, - 'id': {'$ref': '#/definitions/packet'}, - 'location': {'$ref': '#/definitions/packet'}, - 'sig': {'items': {'type': 'integer'}, - 'type': 'array'}}, - 'required': ['data', - 'location', - 'id', - 'caveats', - 'sig'], - 'type': 'object'}, + 'Macaroon': {'additionalProperties': False, 'type': 'object'}, 'SSHHostKeySet': {'additionalProperties': False, 'properties': {'entity-keys': {'items': {'$ref': '#/definitions/SSHHostKeys'}, 'type': 'array'}}, @@ -10639,21 +10703,7 @@ class HostKeyReporterFacade(Type): 'type': 'array'}, 'tag': {'type': 'string'}}, 'required': ['tag', 'public-keys'], - 'type': 'object'}, - 'caveat': {'additionalProperties': False, - 'properties': {'caveatId': {'$ref': '#/definitions/packet'}, - 'location': {'$ref': '#/definitions/packet'}, - 'verificationId': {'$ref': '#/definitions/packet'}}, - 'required': ['location', - 'caveatId', - 'verificationId'], - 'type': 'object'}, - 'packet': {'additionalProperties': False, - 'properties': {'headerLen': {'type': 'integer'}, - 'start': {'type': 'integer'}, - 'totalLen': {'type': 'integer'}}, - 'required': ['start', 'totalLen', 'headerLen'], - 'type': 'object'}}, + 'type': 'object'}}, 'properties': {'ReportKeys': {'properties': {'Params': {'$ref': '#/definitions/SSHHostKeySet'}, 'Result': {'$ref': '#/definitions/ErrorResults'}}, 'type': 'object'}}, @@ -10678,23 +10728,22 @@ class ImageManagerFacade(Type): name = 'ImageManager' version = 2 schema = {'definitions': {'Error': {'additionalProperties': False, - 'properties': {'Code': {'type': 'string'}, - 'Info': {'$ref': '#/definitions/ErrorInfo'}, - 'Message': {'type': 'string'}}, - 'required': ['Message', 'Code'], + 'properties': {'code': {'type': 'string'}, + 'info': {'$ref': '#/definitions/ErrorInfo'}, + 'message': {'type': 'string'}}, + 'required': ['message', 'code'], 'type': 'object'}, 'ErrorInfo': {'additionalProperties': False, - 'properties': {'Macaroon': {'$ref': '#/definitions/Macaroon'}, - 'MacaroonPath': {'type': 'string'}}, + 'properties': {'macaroon': {'$ref': '#/definitions/Macaroon'}, + 'macaroon-path': {'type': 'string'}}, 'type': 'object'}, 'ErrorResult': {'additionalProperties': False, - 'properties': {'Error': {'$ref': '#/definitions/Error'}}, - 'required': ['Error'], + 'properties': {'error': {'$ref': '#/definitions/Error'}}, 'type': 'object'}, 'ErrorResults': {'additionalProperties': False, - 'properties': {'Results': {'items': {'$ref': '#/definitions/ErrorResult'}, + 'properties': {'results': {'items': {'$ref': '#/definitions/ErrorResult'}, 'type': 'array'}}, - 'required': ['Results'], + 'required': ['results'], 'type': 'object'}, 'ImageFilterParams': {'additionalProperties': False, 'properties': {'images': {'items': {'$ref': '#/definitions/ImageSpec'}, @@ -10725,35 +10774,7 @@ class ImageManagerFacade(Type): 'type': 'array'}}, 'required': ['result'], 'type': 'object'}, - 'Macaroon': {'additionalProperties': False, - 'properties': {'caveats': {'items': {'$ref': '#/definitions/caveat'}, - 'type': 'array'}, - 'data': {'items': {'type': 'integer'}, - 'type': 'array'}, - 'id': {'$ref': '#/definitions/packet'}, - 'location': {'$ref': '#/definitions/packet'}, - 'sig': {'items': {'type': 'integer'}, - 'type': 'array'}}, - 'required': ['data', - 'location', - 'id', - 'caveats', - 'sig'], - 'type': 'object'}, - 'caveat': {'additionalProperties': False, - 'properties': {'caveatId': {'$ref': '#/definitions/packet'}, - 'location': {'$ref': '#/definitions/packet'}, - 'verificationId': {'$ref': '#/definitions/packet'}}, - 'required': ['location', - 'caveatId', - 'verificationId'], - 'type': 'object'}, - 'packet': {'additionalProperties': False, - 'properties': {'headerLen': {'type': 'integer'}, - 'start': {'type': 'integer'}, - 'totalLen': {'type': 'integer'}}, - 'required': ['start', 'totalLen', 'headerLen'], - 'type': 'object'}}, + 'Macaroon': {'additionalProperties': False, 'type': 'object'}}, 'properties': {'DeleteImages': {'properties': {'Params': {'$ref': '#/definitions/ImageFilterParams'}, 'Result': {'$ref': '#/definitions/ErrorResults'}}, 'type': 'object'}, @@ -10797,17 +10818,17 @@ class ImageMetadataFacade(Type): version = 2 schema = {'definitions': {'CloudImageMetadata': {'additionalProperties': False, 'properties': {'arch': {'type': 'string'}, - 'image_id': {'type': 'string'}, + 'image-id': {'type': 'string'}, 'priority': {'type': 'integer'}, 'region': {'type': 'string'}, - 'root_storage_size': {'type': 'integer'}, - 'root_storage_type': {'type': 'string'}, + 'root-storage-size': {'type': 'integer'}, + 'root-storage-type': {'type': 'string'}, 'series': {'type': 'string'}, 'source': {'type': 'string'}, 'stream': {'type': 'string'}, 'version': {'type': 'string'}, - 'virt_type': {'type': 'string'}}, - 'required': ['image_id', + 'virt-type': {'type': 'string'}}, + 'required': ['image-id', 'region', 'version', 'series', @@ -10820,23 +10841,22 @@ class ImageMetadataFacade(Type): 'type': 'array'}}, 'type': 'object'}, 'Error': {'additionalProperties': False, - 'properties': {'Code': {'type': 'string'}, - 'Info': {'$ref': '#/definitions/ErrorInfo'}, - 'Message': {'type': 'string'}}, - 'required': ['Message', 'Code'], + 'properties': {'code': {'type': 'string'}, + 'info': {'$ref': '#/definitions/ErrorInfo'}, + 'message': {'type': 'string'}}, + 'required': ['message', 'code'], 'type': 'object'}, 'ErrorInfo': {'additionalProperties': False, - 'properties': {'Macaroon': {'$ref': '#/definitions/Macaroon'}, - 'MacaroonPath': {'type': 'string'}}, + 'properties': {'macaroon': {'$ref': '#/definitions/Macaroon'}, + 'macaroon-path': {'type': 'string'}}, 'type': 'object'}, 'ErrorResult': {'additionalProperties': False, - 'properties': {'Error': {'$ref': '#/definitions/Error'}}, - 'required': ['Error'], + 'properties': {'error': {'$ref': '#/definitions/Error'}}, 'type': 'object'}, 'ErrorResults': {'additionalProperties': False, - 'properties': {'Results': {'items': {'$ref': '#/definitions/ErrorResult'}, + 'properties': {'results': {'items': {'$ref': '#/definitions/ErrorResult'}, 'type': 'array'}}, - 'required': ['Results'], + 'required': ['results'], 'type': 'object'}, 'ImageMetadataFilter': {'additionalProperties': False, 'properties': {'arches': {'items': {'type': 'string'}, @@ -10846,51 +10866,23 @@ class ImageMetadataFacade(Type): 'series': {'items': {'type': 'string'}, 'type': 'array'}, 'stream': {'type': 'string'}, - 'virt_type': {'type': 'string'}}, + 'virt-type': {'type': 'string'}}, 'type': 'object'}, 'ListCloudImageMetadataResult': {'additionalProperties': False, 'properties': {'result': {'items': {'$ref': '#/definitions/CloudImageMetadata'}, 'type': 'array'}}, 'required': ['result'], 'type': 'object'}, - 'Macaroon': {'additionalProperties': False, - 'properties': {'caveats': {'items': {'$ref': '#/definitions/caveat'}, - 'type': 'array'}, - 'data': {'items': {'type': 'integer'}, - 'type': 'array'}, - 'id': {'$ref': '#/definitions/packet'}, - 'location': {'$ref': '#/definitions/packet'}, - 'sig': {'items': {'type': 'integer'}, - 'type': 'array'}}, - 'required': ['data', - 'location', - 'id', - 'caveats', - 'sig'], - 'type': 'object'}, + 'Macaroon': {'additionalProperties': False, 'type': 'object'}, 'MetadataImageIds': {'additionalProperties': False, - 'properties': {'image_ids': {'items': {'type': 'string'}, + 'properties': {'image-ids': {'items': {'type': 'string'}, 'type': 'array'}}, - 'required': ['image_ids'], + 'required': ['image-ids'], 'type': 'object'}, 'MetadataSaveParams': {'additionalProperties': False, 'properties': {'metadata': {'items': {'$ref': '#/definitions/CloudImageMetadataList'}, 'type': 'array'}}, - 'type': 'object'}, - 'caveat': {'additionalProperties': False, - 'properties': {'caveatId': {'$ref': '#/definitions/packet'}, - 'location': {'$ref': '#/definitions/packet'}, - 'verificationId': {'$ref': '#/definitions/packet'}}, - 'required': ['location', - 'caveatId', - 'verificationId'], - 'type': 'object'}, - 'packet': {'additionalProperties': False, - 'properties': {'headerLen': {'type': 'integer'}, - 'start': {'type': 'integer'}, - 'totalLen': {'type': 'integer'}}, - 'required': ['start', 'totalLen', 'headerLen'], - 'type': 'object'}}, + 'type': 'object'}}, 'properties': {'Delete': {'properties': {'Params': {'$ref': '#/definitions/MetadataImageIds'}, 'Result': {'$ref': '#/definitions/ErrorResults'}}, 'type': 'object'}, @@ -10913,7 +10905,7 @@ class ImageMetadataFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='ImageMetadata', Request='Delete', Version=2, Params=params) - params['image_ids'] = image_ids + params['image-ids'] = image_ids reply = await self.rpc(msg) return reply @@ -10938,7 +10930,7 @@ class ImageMetadataFacade(Type): params['root-storage-type'] = root_storage_type params['series'] = series params['stream'] = stream - params['virt_type'] = virt_type + params['virt-type'] = virt_type reply = await self.rpc(msg) return reply @@ -10977,182 +10969,150 @@ class InstancePollerFacade(Type): name = 'InstancePoller' version = 3 schema = {'definitions': {'Address': {'additionalProperties': False, - 'properties': {'Scope': {'type': 'string'}, - 'SpaceName': {'type': 'string'}, - 'Type': {'type': 'string'}, - 'Value': {'type': 'string'}}, - 'required': ['Value', 'Type', 'Scope'], + 'properties': {'scope': {'type': 'string'}, + 'space-name': {'type': 'string'}, + 'type': {'type': 'string'}, + 'value': {'type': 'string'}}, + 'required': ['value', 'type', 'scope'], 'type': 'object'}, 'BoolResult': {'additionalProperties': False, - 'properties': {'Error': {'$ref': '#/definitions/Error'}, - 'Result': {'type': 'boolean'}}, - 'required': ['Error', 'Result'], + 'properties': {'error': {'$ref': '#/definitions/Error'}, + 'result': {'type': 'boolean'}}, + 'required': ['result'], 'type': 'object'}, 'BoolResults': {'additionalProperties': False, - 'properties': {'Results': {'items': {'$ref': '#/definitions/BoolResult'}, + 'properties': {'results': {'items': {'$ref': '#/definitions/BoolResult'}, 'type': 'array'}}, - 'required': ['Results'], + 'required': ['results'], 'type': 'object'}, 'Entities': {'additionalProperties': False, - 'properties': {'Entities': {'items': {'$ref': '#/definitions/Entity'}, + 'properties': {'entities': {'items': {'$ref': '#/definitions/Entity'}, 'type': 'array'}}, - 'required': ['Entities'], + 'required': ['entities'], 'type': 'object'}, 'Entity': {'additionalProperties': False, - 'properties': {'Tag': {'type': 'string'}}, - 'required': ['Tag'], + 'properties': {'tag': {'type': 'string'}}, + 'required': ['tag'], 'type': 'object'}, 'EntityStatusArgs': {'additionalProperties': False, - 'properties': {'Data': {'patternProperties': {'.*': {'additionalProperties': True, + 'properties': {'data': {'patternProperties': {'.*': {'additionalProperties': True, 'type': 'object'}}, 'type': 'object'}, - 'Info': {'type': 'string'}, - 'Status': {'type': 'string'}, - 'Tag': {'type': 'string'}}, - 'required': ['Tag', - 'Status', - 'Info', - 'Data'], + 'info': {'type': 'string'}, + 'status': {'type': 'string'}, + 'tag': {'type': 'string'}}, + 'required': ['tag', + 'status', + 'info', + 'data'], 'type': 'object'}, 'Error': {'additionalProperties': False, - 'properties': {'Code': {'type': 'string'}, - 'Info': {'$ref': '#/definitions/ErrorInfo'}, - 'Message': {'type': 'string'}}, - 'required': ['Message', 'Code'], + 'properties': {'code': {'type': 'string'}, + 'info': {'$ref': '#/definitions/ErrorInfo'}, + 'message': {'type': 'string'}}, + 'required': ['message', 'code'], 'type': 'object'}, 'ErrorInfo': {'additionalProperties': False, - 'properties': {'Macaroon': {'$ref': '#/definitions/Macaroon'}, - 'MacaroonPath': {'type': 'string'}}, + 'properties': {'macaroon': {'$ref': '#/definitions/Macaroon'}, + 'macaroon-path': {'type': 'string'}}, 'type': 'object'}, 'ErrorResult': {'additionalProperties': False, - 'properties': {'Error': {'$ref': '#/definitions/Error'}}, - 'required': ['Error'], + 'properties': {'error': {'$ref': '#/definitions/Error'}}, 'type': 'object'}, 'ErrorResults': {'additionalProperties': False, - 'properties': {'Results': {'items': {'$ref': '#/definitions/ErrorResult'}, + 'properties': {'results': {'items': {'$ref': '#/definitions/ErrorResult'}, 'type': 'array'}}, - 'required': ['Results'], + 'required': ['results'], 'type': 'object'}, 'LifeResult': {'additionalProperties': False, - 'properties': {'Error': {'$ref': '#/definitions/Error'}, - 'Life': {'type': 'string'}}, - 'required': ['Life', 'Error'], + 'properties': {'error': {'$ref': '#/definitions/Error'}, + 'life': {'type': 'string'}}, + 'required': ['life'], 'type': 'object'}, 'LifeResults': {'additionalProperties': False, - 'properties': {'Results': {'items': {'$ref': '#/definitions/LifeResult'}, + 'properties': {'results': {'items': {'$ref': '#/definitions/LifeResult'}, 'type': 'array'}}, - 'required': ['Results'], + 'required': ['results'], 'type': 'object'}, - 'Macaroon': {'additionalProperties': False, - 'properties': {'caveats': {'items': {'$ref': '#/definitions/caveat'}, - 'type': 'array'}, - 'data': {'items': {'type': 'integer'}, - 'type': 'array'}, - 'id': {'$ref': '#/definitions/packet'}, - 'location': {'$ref': '#/definitions/packet'}, - 'sig': {'items': {'type': 'integer'}, - 'type': 'array'}}, - 'required': ['data', - 'location', - 'id', - 'caveats', - 'sig'], - 'type': 'object'}, + 'Macaroon': {'additionalProperties': False, 'type': 'object'}, 'MachineAddresses': {'additionalProperties': False, - 'properties': {'Addresses': {'items': {'$ref': '#/definitions/Address'}, + 'properties': {'addresses': {'items': {'$ref': '#/definitions/Address'}, 'type': 'array'}, - 'Tag': {'type': 'string'}}, - 'required': ['Tag', 'Addresses'], + 'tag': {'type': 'string'}}, + 'required': ['tag', 'addresses'], 'type': 'object'}, 'MachineAddressesResult': {'additionalProperties': False, - 'properties': {'Addresses': {'items': {'$ref': '#/definitions/Address'}, + 'properties': {'addresses': {'items': {'$ref': '#/definitions/Address'}, 'type': 'array'}, - 'Error': {'$ref': '#/definitions/Error'}}, - 'required': ['Error', 'Addresses'], + 'error': {'$ref': '#/definitions/Error'}}, + 'required': ['addresses'], 'type': 'object'}, 'MachineAddressesResults': {'additionalProperties': False, - 'properties': {'Results': {'items': {'$ref': '#/definitions/MachineAddressesResult'}, + 'properties': {'results': {'items': {'$ref': '#/definitions/MachineAddressesResult'}, 'type': 'array'}}, - 'required': ['Results'], + 'required': ['results'], 'type': 'object'}, 'ModelConfigResult': {'additionalProperties': False, - 'properties': {'Config': {'patternProperties': {'.*': {'additionalProperties': True, + 'properties': {'config': {'patternProperties': {'.*': {'additionalProperties': True, 'type': 'object'}}, 'type': 'object'}}, - 'required': ['Config'], + 'required': ['config'], 'type': 'object'}, 'NotifyWatchResult': {'additionalProperties': False, - 'properties': {'Error': {'$ref': '#/definitions/Error'}, - 'NotifyWatcherId': {'type': 'string'}}, - 'required': ['NotifyWatcherId', 'Error'], + 'properties': {'NotifyWatcherId': {'type': 'string'}, + 'error': {'$ref': '#/definitions/Error'}}, + 'required': ['NotifyWatcherId'], 'type': 'object'}, 'SetMachinesAddresses': {'additionalProperties': False, - 'properties': {'MachineAddresses': {'items': {'$ref': '#/definitions/MachineAddresses'}, - 'type': 'array'}}, - 'required': ['MachineAddresses'], + 'properties': {'machine-addresses': {'items': {'$ref': '#/definitions/MachineAddresses'}, + 'type': 'array'}}, + 'required': ['machine-addresses'], 'type': 'object'}, 'SetStatus': {'additionalProperties': False, - 'properties': {'Entities': {'items': {'$ref': '#/definitions/EntityStatusArgs'}, + 'properties': {'entities': {'items': {'$ref': '#/definitions/EntityStatusArgs'}, 'type': 'array'}}, - 'required': ['Entities'], + 'required': ['entities'], 'type': 'object'}, 'StatusResult': {'additionalProperties': False, - 'properties': {'Data': {'patternProperties': {'.*': {'additionalProperties': True, + 'properties': {'data': {'patternProperties': {'.*': {'additionalProperties': True, 'type': 'object'}}, 'type': 'object'}, - 'Error': {'$ref': '#/definitions/Error'}, - 'Id': {'type': 'string'}, - 'Info': {'type': 'string'}, - 'Life': {'type': 'string'}, - 'Since': {'format': 'date-time', + 'error': {'$ref': '#/definitions/Error'}, + 'id': {'type': 'string'}, + 'info': {'type': 'string'}, + 'life': {'type': 'string'}, + 'since': {'format': 'date-time', 'type': 'string'}, - 'Status': {'type': 'string'}}, - 'required': ['Error', - 'Id', - 'Life', - 'Status', - 'Info', - 'Data', - 'Since'], + 'status': {'type': 'string'}}, + 'required': ['id', + 'life', + 'status', + 'info', + 'data', + 'since'], 'type': 'object'}, 'StatusResults': {'additionalProperties': False, - 'properties': {'Results': {'items': {'$ref': '#/definitions/StatusResult'}, + 'properties': {'results': {'items': {'$ref': '#/definitions/StatusResult'}, 'type': 'array'}}, - 'required': ['Results'], + 'required': ['results'], 'type': 'object'}, 'StringResult': {'additionalProperties': False, - 'properties': {'Error': {'$ref': '#/definitions/Error'}, - 'Result': {'type': 'string'}}, - 'required': ['Error', 'Result'], + 'properties': {'error': {'$ref': '#/definitions/Error'}, + 'result': {'type': 'string'}}, + 'required': ['result'], 'type': 'object'}, 'StringResults': {'additionalProperties': False, - 'properties': {'Results': {'items': {'$ref': '#/definitions/StringResult'}, + 'properties': {'results': {'items': {'$ref': '#/definitions/StringResult'}, 'type': 'array'}}, - 'required': ['Results'], + 'required': ['results'], 'type': 'object'}, 'StringsWatchResult': {'additionalProperties': False, - 'properties': {'Changes': {'items': {'type': 'string'}, + 'properties': {'changes': {'items': {'type': 'string'}, 'type': 'array'}, - 'Error': {'$ref': '#/definitions/Error'}, - 'StringsWatcherId': {'type': 'string'}}, - 'required': ['StringsWatcherId', - 'Changes', - 'Error'], - 'type': 'object'}, - 'caveat': {'additionalProperties': False, - 'properties': {'caveatId': {'$ref': '#/definitions/packet'}, - 'location': {'$ref': '#/definitions/packet'}, - 'verificationId': {'$ref': '#/definitions/packet'}}, - 'required': ['location', - 'caveatId', - 'verificationId'], - 'type': 'object'}, - 'packet': {'additionalProperties': False, - 'properties': {'headerLen': {'type': 'integer'}, - 'start': {'type': 'integer'}, - 'totalLen': {'type': 'integer'}}, - 'required': ['start', 'totalLen', 'headerLen'], - 'type': 'object'}}, + 'error': {'$ref': '#/definitions/Error'}, + 'watcher-id': {'type': 'string'}}, + 'required': ['watcher-id'], + 'type': 'object'}}, 'properties': {'AreManuallyProvisioned': {'properties': {'Params': {'$ref': '#/definitions/Entities'}, 'Result': {'$ref': '#/definitions/BoolResults'}}, 'type': 'object'}, @@ -11195,7 +11155,7 @@ class InstancePollerFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='InstancePoller', Request='AreManuallyProvisioned', Version=3, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -11210,7 +11170,7 @@ class InstancePollerFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='InstancePoller', Request='InstanceId', Version=3, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -11225,7 +11185,7 @@ class InstancePollerFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='InstancePoller', Request='InstanceStatus', Version=3, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -11240,7 +11200,7 @@ class InstancePollerFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='InstancePoller', Request='Life', Version=3, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -11270,7 +11230,7 @@ class InstancePollerFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='InstancePoller', Request='ProviderAddresses', Version=3, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -11285,22 +11245,22 @@ class InstancePollerFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='InstancePoller', Request='SetInstanceStatus', Version=3, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @ReturnMapping(ErrorResults) - async def SetProviderAddresses(self, machineaddresses): + async def SetProviderAddresses(self, machine_addresses): ''' - machineaddresses : typing.Sequence[~MachineAddresses] + machine_addresses : typing.Sequence[~MachineAddresses] Returns -> typing.Sequence[~ErrorResult] ''' # map input types to rpc msg params = dict() msg = dict(Type='InstancePoller', Request='SetProviderAddresses', Version=3, Params=params) - params['MachineAddresses'] = machineaddresses + params['machine-addresses'] = machine_addresses reply = await self.rpc(msg) return reply @@ -11315,7 +11275,7 @@ class InstancePollerFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='InstancePoller', Request='Status', Version=3, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -11325,7 +11285,7 @@ class InstancePollerFacade(Type): async def WatchForModelConfigChanges(self): ''' - Returns -> typing.Union[_ForwardRef('Error'), str] + Returns -> typing.Union[str, _ForwardRef('Error')] ''' # map input types to rpc msg params = dict() @@ -11354,84 +11314,54 @@ class KeyManagerFacade(Type): name = 'KeyManager' version = 1 schema = {'definitions': {'Entities': {'additionalProperties': False, - 'properties': {'Entities': {'items': {'$ref': '#/definitions/Entity'}, + 'properties': {'entities': {'items': {'$ref': '#/definitions/Entity'}, 'type': 'array'}}, - 'required': ['Entities'], + 'required': ['entities'], 'type': 'object'}, 'Entity': {'additionalProperties': False, - 'properties': {'Tag': {'type': 'string'}}, - 'required': ['Tag'], + 'properties': {'tag': {'type': 'string'}}, + 'required': ['tag'], 'type': 'object'}, 'Error': {'additionalProperties': False, - 'properties': {'Code': {'type': 'string'}, - 'Info': {'$ref': '#/definitions/ErrorInfo'}, - 'Message': {'type': 'string'}}, - 'required': ['Message', 'Code'], + 'properties': {'code': {'type': 'string'}, + 'info': {'$ref': '#/definitions/ErrorInfo'}, + 'message': {'type': 'string'}}, + 'required': ['message', 'code'], 'type': 'object'}, 'ErrorInfo': {'additionalProperties': False, - 'properties': {'Macaroon': {'$ref': '#/definitions/Macaroon'}, - 'MacaroonPath': {'type': 'string'}}, + 'properties': {'macaroon': {'$ref': '#/definitions/Macaroon'}, + 'macaroon-path': {'type': 'string'}}, 'type': 'object'}, 'ErrorResult': {'additionalProperties': False, - 'properties': {'Error': {'$ref': '#/definitions/Error'}}, - 'required': ['Error'], + 'properties': {'error': {'$ref': '#/definitions/Error'}}, 'type': 'object'}, 'ErrorResults': {'additionalProperties': False, - 'properties': {'Results': {'items': {'$ref': '#/definitions/ErrorResult'}, + 'properties': {'results': {'items': {'$ref': '#/definitions/ErrorResult'}, 'type': 'array'}}, - 'required': ['Results'], + 'required': ['results'], 'type': 'object'}, 'ListSSHKeys': {'additionalProperties': False, - 'properties': {'Entities': {'$ref': '#/definitions/Entities'}, - 'Mode': {'type': 'boolean'}}, - 'required': ['Entities', 'Mode'], + 'properties': {'entities': {'$ref': '#/definitions/Entities'}, + 'mode': {'type': 'boolean'}}, + 'required': ['entities', 'mode'], 'type': 'object'}, - 'Macaroon': {'additionalProperties': False, - 'properties': {'caveats': {'items': {'$ref': '#/definitions/caveat'}, - 'type': 'array'}, - 'data': {'items': {'type': 'integer'}, - 'type': 'array'}, - 'id': {'$ref': '#/definitions/packet'}, - 'location': {'$ref': '#/definitions/packet'}, - 'sig': {'items': {'type': 'integer'}, - 'type': 'array'}}, - 'required': ['data', - 'location', - 'id', - 'caveats', - 'sig'], - 'type': 'object'}, + 'Macaroon': {'additionalProperties': False, 'type': 'object'}, 'ModifyUserSSHKeys': {'additionalProperties': False, - 'properties': {'Keys': {'items': {'type': 'string'}, - 'type': 'array'}, - 'User': {'type': 'string'}}, - 'required': ['User', 'Keys'], + 'properties': {'ssh-keys': {'items': {'type': 'string'}, + 'type': 'array'}, + 'user': {'type': 'string'}}, + 'required': ['user', 'ssh-keys'], 'type': 'object'}, 'StringsResult': {'additionalProperties': False, - 'properties': {'Error': {'$ref': '#/definitions/Error'}, - 'Result': {'items': {'type': 'string'}, + 'properties': {'error': {'$ref': '#/definitions/Error'}, + 'result': {'items': {'type': 'string'}, 'type': 'array'}}, - 'required': ['Error', 'Result'], 'type': 'object'}, 'StringsResults': {'additionalProperties': False, - 'properties': {'Results': {'items': {'$ref': '#/definitions/StringsResult'}, + 'properties': {'results': {'items': {'$ref': '#/definitions/StringsResult'}, 'type': 'array'}}, - 'required': ['Results'], - 'type': 'object'}, - 'caveat': {'additionalProperties': False, - 'properties': {'caveatId': {'$ref': '#/definitions/packet'}, - 'location': {'$ref': '#/definitions/packet'}, - 'verificationId': {'$ref': '#/definitions/packet'}}, - 'required': ['location', - 'caveatId', - 'verificationId'], - 'type': 'object'}, - 'packet': {'additionalProperties': False, - 'properties': {'headerLen': {'type': 'integer'}, - 'start': {'type': 'integer'}, - 'totalLen': {'type': 'integer'}}, - 'required': ['start', 'totalLen', 'headerLen'], - 'type': 'object'}}, + 'required': ['results'], + 'type': 'object'}}, 'properties': {'AddKeys': {'properties': {'Params': {'$ref': '#/definitions/ModifyUserSSHKeys'}, 'Result': {'$ref': '#/definitions/ErrorResults'}}, 'type': 'object'}, @@ -11448,51 +11378,51 @@ class KeyManagerFacade(Type): @ReturnMapping(ErrorResults) - async def AddKeys(self, keys, user): + async def AddKeys(self, ssh_keys, user): ''' - keys : typing.Sequence[str] + ssh_keys : typing.Sequence[str] user : str Returns -> typing.Sequence[~ErrorResult] ''' # map input types to rpc msg params = dict() msg = dict(Type='KeyManager', Request='AddKeys', Version=1, Params=params) - params['Keys'] = keys - params['User'] = user + params['ssh-keys'] = ssh_keys + params['user'] = user reply = await self.rpc(msg) return reply @ReturnMapping(ErrorResults) - async def DeleteKeys(self, keys, user): + async def DeleteKeys(self, ssh_keys, user): ''' - keys : typing.Sequence[str] + ssh_keys : typing.Sequence[str] user : str Returns -> typing.Sequence[~ErrorResult] ''' # map input types to rpc msg params = dict() msg = dict(Type='KeyManager', Request='DeleteKeys', Version=1, Params=params) - params['Keys'] = keys - params['User'] = user + params['ssh-keys'] = ssh_keys + params['user'] = user reply = await self.rpc(msg) return reply @ReturnMapping(ErrorResults) - async def ImportKeys(self, keys, user): + async def ImportKeys(self, ssh_keys, user): ''' - keys : typing.Sequence[str] + ssh_keys : typing.Sequence[str] user : str Returns -> typing.Sequence[~ErrorResult] ''' # map input types to rpc msg params = dict() msg = dict(Type='KeyManager', Request='ImportKeys', Version=1, Params=params) - params['Keys'] = keys - params['User'] = user + params['ssh-keys'] = ssh_keys + params['user'] = user reply = await self.rpc(msg) return reply @@ -11508,8 +11438,8 @@ class KeyManagerFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='KeyManager', Request='ListKeys', Version=1, Params=params) - params['Entities'] = entities - params['Mode'] = mode + params['entities'] = entities + params['mode'] = mode reply = await self.rpc(msg) return reply @@ -11518,74 +11448,45 @@ class KeyUpdaterFacade(Type): name = 'KeyUpdater' version = 1 schema = {'definitions': {'Entities': {'additionalProperties': False, - 'properties': {'Entities': {'items': {'$ref': '#/definitions/Entity'}, + 'properties': {'entities': {'items': {'$ref': '#/definitions/Entity'}, 'type': 'array'}}, - 'required': ['Entities'], + 'required': ['entities'], 'type': 'object'}, 'Entity': {'additionalProperties': False, - 'properties': {'Tag': {'type': 'string'}}, - 'required': ['Tag'], + 'properties': {'tag': {'type': 'string'}}, + 'required': ['tag'], 'type': 'object'}, 'Error': {'additionalProperties': False, - 'properties': {'Code': {'type': 'string'}, - 'Info': {'$ref': '#/definitions/ErrorInfo'}, - 'Message': {'type': 'string'}}, - 'required': ['Message', 'Code'], + 'properties': {'code': {'type': 'string'}, + 'info': {'$ref': '#/definitions/ErrorInfo'}, + 'message': {'type': 'string'}}, + 'required': ['message', 'code'], 'type': 'object'}, 'ErrorInfo': {'additionalProperties': False, - 'properties': {'Macaroon': {'$ref': '#/definitions/Macaroon'}, - 'MacaroonPath': {'type': 'string'}}, + 'properties': {'macaroon': {'$ref': '#/definitions/Macaroon'}, + 'macaroon-path': {'type': 'string'}}, 'type': 'object'}, - 'Macaroon': {'additionalProperties': False, - 'properties': {'caveats': {'items': {'$ref': '#/definitions/caveat'}, - 'type': 'array'}, - 'data': {'items': {'type': 'integer'}, - 'type': 'array'}, - 'id': {'$ref': '#/definitions/packet'}, - 'location': {'$ref': '#/definitions/packet'}, - 'sig': {'items': {'type': 'integer'}, - 'type': 'array'}}, - 'required': ['data', - 'location', - 'id', - 'caveats', - 'sig'], - 'type': 'object'}, + 'Macaroon': {'additionalProperties': False, 'type': 'object'}, 'NotifyWatchResult': {'additionalProperties': False, - 'properties': {'Error': {'$ref': '#/definitions/Error'}, - 'NotifyWatcherId': {'type': 'string'}}, - 'required': ['NotifyWatcherId', 'Error'], + 'properties': {'NotifyWatcherId': {'type': 'string'}, + 'error': {'$ref': '#/definitions/Error'}}, + 'required': ['NotifyWatcherId'], 'type': 'object'}, 'NotifyWatchResults': {'additionalProperties': False, - 'properties': {'Results': {'items': {'$ref': '#/definitions/NotifyWatchResult'}, + 'properties': {'results': {'items': {'$ref': '#/definitions/NotifyWatchResult'}, 'type': 'array'}}, - 'required': ['Results'], + 'required': ['results'], 'type': 'object'}, 'StringsResult': {'additionalProperties': False, - 'properties': {'Error': {'$ref': '#/definitions/Error'}, - 'Result': {'items': {'type': 'string'}, + 'properties': {'error': {'$ref': '#/definitions/Error'}, + 'result': {'items': {'type': 'string'}, 'type': 'array'}}, - 'required': ['Error', 'Result'], 'type': 'object'}, 'StringsResults': {'additionalProperties': False, - 'properties': {'Results': {'items': {'$ref': '#/definitions/StringsResult'}, + 'properties': {'results': {'items': {'$ref': '#/definitions/StringsResult'}, 'type': 'array'}}, - 'required': ['Results'], - 'type': 'object'}, - 'caveat': {'additionalProperties': False, - 'properties': {'caveatId': {'$ref': '#/definitions/packet'}, - 'location': {'$ref': '#/definitions/packet'}, - 'verificationId': {'$ref': '#/definitions/packet'}}, - 'required': ['location', - 'caveatId', - 'verificationId'], - 'type': 'object'}, - 'packet': {'additionalProperties': False, - 'properties': {'headerLen': {'type': 'integer'}, - 'start': {'type': 'integer'}, - 'totalLen': {'type': 'integer'}}, - 'required': ['start', 'totalLen', 'headerLen'], - 'type': 'object'}}, + 'required': ['results'], + 'type': 'object'}}, 'properties': {'AuthorisedKeys': {'properties': {'Params': {'$ref': '#/definitions/Entities'}, 'Result': {'$ref': '#/definitions/StringsResults'}}, 'type': 'object'}, @@ -11604,7 +11505,7 @@ class KeyUpdaterFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='KeyUpdater', Request='AuthorisedKeys', Version=1, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -11619,7 +11520,7 @@ class KeyUpdaterFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='KeyUpdater', Request='WatchAuthorisedKeys', Version=1, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -11632,66 +11533,37 @@ class LeadershipServiceFacade(Type): 'required': ['Name'], 'type': 'object'}, 'ClaimLeadershipBulkParams': {'additionalProperties': False, - 'properties': {'Params': {'items': {'$ref': '#/definitions/ClaimLeadershipParams'}, + 'properties': {'params': {'items': {'$ref': '#/definitions/ClaimLeadershipParams'}, 'type': 'array'}}, - 'required': ['Params'], + 'required': ['params'], 'type': 'object'}, 'ClaimLeadershipBulkResults': {'additionalProperties': False, - 'properties': {'Results': {'items': {'$ref': '#/definitions/ErrorResult'}, + 'properties': {'results': {'items': {'$ref': '#/definitions/ErrorResult'}, 'type': 'array'}}, - 'required': ['Results'], + 'required': ['results'], 'type': 'object'}, 'ClaimLeadershipParams': {'additionalProperties': False, - 'properties': {'ApplicationTag': {'type': 'string'}, - 'DurationSeconds': {'type': 'number'}, - 'UnitTag': {'type': 'string'}}, - 'required': ['ApplicationTag', - 'UnitTag', - 'DurationSeconds'], + 'properties': {'application-tag': {'type': 'string'}, + 'duration': {'type': 'number'}, + 'unit-tag': {'type': 'string'}}, + 'required': ['application-tag', + 'unit-tag', + 'duration'], 'type': 'object'}, 'Error': {'additionalProperties': False, - 'properties': {'Code': {'type': 'string'}, - 'Info': {'$ref': '#/definitions/ErrorInfo'}, - 'Message': {'type': 'string'}}, - 'required': ['Message', 'Code'], + 'properties': {'code': {'type': 'string'}, + 'info': {'$ref': '#/definitions/ErrorInfo'}, + 'message': {'type': 'string'}}, + 'required': ['message', 'code'], 'type': 'object'}, 'ErrorInfo': {'additionalProperties': False, - 'properties': {'Macaroon': {'$ref': '#/definitions/Macaroon'}, - 'MacaroonPath': {'type': 'string'}}, + 'properties': {'macaroon': {'$ref': '#/definitions/Macaroon'}, + 'macaroon-path': {'type': 'string'}}, 'type': 'object'}, 'ErrorResult': {'additionalProperties': False, - 'properties': {'Error': {'$ref': '#/definitions/Error'}}, - 'required': ['Error'], + 'properties': {'error': {'$ref': '#/definitions/Error'}}, 'type': 'object'}, - 'Macaroon': {'additionalProperties': False, - 'properties': {'caveats': {'items': {'$ref': '#/definitions/caveat'}, - 'type': 'array'}, - 'data': {'items': {'type': 'integer'}, - 'type': 'array'}, - 'id': {'$ref': '#/definitions/packet'}, - 'location': {'$ref': '#/definitions/packet'}, - 'sig': {'items': {'type': 'integer'}, - 'type': 'array'}}, - 'required': ['data', - 'location', - 'id', - 'caveats', - 'sig'], - 'type': 'object'}, - 'caveat': {'additionalProperties': False, - 'properties': {'caveatId': {'$ref': '#/definitions/packet'}, - 'location': {'$ref': '#/definitions/packet'}, - 'verificationId': {'$ref': '#/definitions/packet'}}, - 'required': ['location', - 'caveatId', - 'verificationId'], - 'type': 'object'}, - 'packet': {'additionalProperties': False, - 'properties': {'headerLen': {'type': 'integer'}, - 'start': {'type': 'integer'}, - 'totalLen': {'type': 'integer'}}, - 'required': ['start', 'totalLen', 'headerLen'], - 'type': 'object'}}, + 'Macaroon': {'additionalProperties': False, 'type': 'object'}}, 'properties': {'BlockUntilLeadershipReleased': {'properties': {'Params': {'$ref': '#/definitions/ApplicationTag'}, 'Result': {'$ref': '#/definitions/ErrorResult'}}, 'type': 'object'}, @@ -11725,7 +11597,7 @@ class LeadershipServiceFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='LeadershipService', Request='ClaimLeadership', Version=2, Params=params) - params['Params'] = params + params['params'] = params reply = await self.rpc(msg) return reply @@ -11734,73 +11606,45 @@ class LifeFlagFacade(Type): name = 'LifeFlag' version = 1 schema = {'definitions': {'Entities': {'additionalProperties': False, - 'properties': {'Entities': {'items': {'$ref': '#/definitions/Entity'}, + 'properties': {'entities': {'items': {'$ref': '#/definitions/Entity'}, 'type': 'array'}}, - 'required': ['Entities'], + 'required': ['entities'], 'type': 'object'}, 'Entity': {'additionalProperties': False, - 'properties': {'Tag': {'type': 'string'}}, - 'required': ['Tag'], + 'properties': {'tag': {'type': 'string'}}, + 'required': ['tag'], 'type': 'object'}, 'Error': {'additionalProperties': False, - 'properties': {'Code': {'type': 'string'}, - 'Info': {'$ref': '#/definitions/ErrorInfo'}, - 'Message': {'type': 'string'}}, - 'required': ['Message', 'Code'], + 'properties': {'code': {'type': 'string'}, + 'info': {'$ref': '#/definitions/ErrorInfo'}, + 'message': {'type': 'string'}}, + 'required': ['message', 'code'], 'type': 'object'}, 'ErrorInfo': {'additionalProperties': False, - 'properties': {'Macaroon': {'$ref': '#/definitions/Macaroon'}, - 'MacaroonPath': {'type': 'string'}}, + 'properties': {'macaroon': {'$ref': '#/definitions/Macaroon'}, + 'macaroon-path': {'type': 'string'}}, 'type': 'object'}, 'LifeResult': {'additionalProperties': False, - 'properties': {'Error': {'$ref': '#/definitions/Error'}, - 'Life': {'type': 'string'}}, - 'required': ['Life', 'Error'], + 'properties': {'error': {'$ref': '#/definitions/Error'}, + 'life': {'type': 'string'}}, + 'required': ['life'], 'type': 'object'}, 'LifeResults': {'additionalProperties': False, - 'properties': {'Results': {'items': {'$ref': '#/definitions/LifeResult'}, + 'properties': {'results': {'items': {'$ref': '#/definitions/LifeResult'}, 'type': 'array'}}, - 'required': ['Results'], + 'required': ['results'], 'type': 'object'}, - 'Macaroon': {'additionalProperties': False, - 'properties': {'caveats': {'items': {'$ref': '#/definitions/caveat'}, - 'type': 'array'}, - 'data': {'items': {'type': 'integer'}, - 'type': 'array'}, - 'id': {'$ref': '#/definitions/packet'}, - 'location': {'$ref': '#/definitions/packet'}, - 'sig': {'items': {'type': 'integer'}, - 'type': 'array'}}, - 'required': ['data', - 'location', - 'id', - 'caveats', - 'sig'], - 'type': 'object'}, + 'Macaroon': {'additionalProperties': False, 'type': 'object'}, 'NotifyWatchResult': {'additionalProperties': False, - 'properties': {'Error': {'$ref': '#/definitions/Error'}, - 'NotifyWatcherId': {'type': 'string'}}, - 'required': ['NotifyWatcherId', 'Error'], + 'properties': {'NotifyWatcherId': {'type': 'string'}, + 'error': {'$ref': '#/definitions/Error'}}, + 'required': ['NotifyWatcherId'], 'type': 'object'}, 'NotifyWatchResults': {'additionalProperties': False, - 'properties': {'Results': {'items': {'$ref': '#/definitions/NotifyWatchResult'}, + 'properties': {'results': {'items': {'$ref': '#/definitions/NotifyWatchResult'}, 'type': 'array'}}, - 'required': ['Results'], - 'type': 'object'}, - 'caveat': {'additionalProperties': False, - 'properties': {'caveatId': {'$ref': '#/definitions/packet'}, - 'location': {'$ref': '#/definitions/packet'}, - 'verificationId': {'$ref': '#/definitions/packet'}}, - 'required': ['location', - 'caveatId', - 'verificationId'], - 'type': 'object'}, - 'packet': {'additionalProperties': False, - 'properties': {'headerLen': {'type': 'integer'}, - 'start': {'type': 'integer'}, - 'totalLen': {'type': 'integer'}}, - 'required': ['start', 'totalLen', 'headerLen'], - 'type': 'object'}}, + 'required': ['results'], + 'type': 'object'}}, 'properties': {'Life': {'properties': {'Params': {'$ref': '#/definitions/Entities'}, 'Result': {'$ref': '#/definitions/LifeResults'}}, 'type': 'object'}, @@ -11819,7 +11663,7 @@ class LifeFlagFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='LifeFlag', Request='Life', Version=1, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -11834,7 +11678,99 @@ class LifeFlagFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='LifeFlag', Request='Watch', Version=1, Params=params) - params['Entities'] = entities + params['entities'] = entities + reply = await self.rpc(msg) + return reply + + +class LogForwardingFacade(Type): + name = 'LogForwarding' + version = 1 + schema = {'definitions': {'Error': {'additionalProperties': False, + 'properties': {'code': {'type': 'string'}, + 'info': {'$ref': '#/definitions/ErrorInfo'}, + 'message': {'type': 'string'}}, + 'required': ['message', 'code'], + 'type': 'object'}, + 'ErrorInfo': {'additionalProperties': False, + 'properties': {'macaroon': {'$ref': '#/definitions/Macaroon'}, + 'macaroon-path': {'type': 'string'}}, + 'type': 'object'}, + 'ErrorResult': {'additionalProperties': False, + 'properties': {'error': {'$ref': '#/definitions/Error'}}, + 'type': 'object'}, + 'ErrorResults': {'additionalProperties': False, + 'properties': {'results': {'items': {'$ref': '#/definitions/ErrorResult'}, + 'type': 'array'}}, + 'required': ['results'], + 'type': 'object'}, + 'LogForwardingGetLastSentParams': {'additionalProperties': False, + 'properties': {'ids': {'items': {'$ref': '#/definitions/LogForwardingID'}, + 'type': 'array'}}, + 'required': ['ids'], + 'type': 'object'}, + 'LogForwardingGetLastSentResult': {'additionalProperties': False, + 'properties': {'err': {'$ref': '#/definitions/Error'}, + 'record-id': {'type': 'integer'}}, + 'required': ['record-id', + 'err'], + 'type': 'object'}, + 'LogForwardingGetLastSentResults': {'additionalProperties': False, + 'properties': {'results': {'items': {'$ref': '#/definitions/LogForwardingGetLastSentResult'}, + 'type': 'array'}}, + 'required': ['results'], + 'type': 'object'}, + 'LogForwardingID': {'additionalProperties': False, + 'properties': {'model': {'type': 'string'}, + 'sink': {'type': 'string'}}, + 'required': ['model', 'sink'], + 'type': 'object'}, + 'LogForwardingSetLastSentParam': {'additionalProperties': False, + 'properties': {'LogForwardingID': {'$ref': '#/definitions/LogForwardingID'}, + 'record-id': {'type': 'integer'}}, + 'required': ['LogForwardingID', + 'record-id'], + 'type': 'object'}, + 'LogForwardingSetLastSentParams': {'additionalProperties': False, + 'properties': {'params': {'items': {'$ref': '#/definitions/LogForwardingSetLastSentParam'}, + 'type': 'array'}}, + 'required': ['params'], + 'type': 'object'}, + 'Macaroon': {'additionalProperties': False, 'type': 'object'}}, + 'properties': {'GetLastSent': {'properties': {'Params': {'$ref': '#/definitions/LogForwardingGetLastSentParams'}, + 'Result': {'$ref': '#/definitions/LogForwardingGetLastSentResults'}}, + 'type': 'object'}, + 'SetLastSent': {'properties': {'Params': {'$ref': '#/definitions/LogForwardingSetLastSentParams'}, + 'Result': {'$ref': '#/definitions/ErrorResults'}}, + 'type': 'object'}}, + 'type': 'object'} + + + @ReturnMapping(LogForwardingGetLastSentResults) + async def GetLastSent(self, ids): + ''' + ids : typing.Sequence[~LogForwardingID] + Returns -> typing.Sequence[~LogForwardingGetLastSentResult] + ''' + # map input types to rpc msg + params = dict() + msg = dict(Type='LogForwarding', Request='GetLastSent', Version=1, Params=params) + params['ids'] = ids + reply = await self.rpc(msg) + return reply + + + + @ReturnMapping(ErrorResults) + async def SetLastSent(self, params): + ''' + params : typing.Sequence[~LogForwardingSetLastSentParam] + Returns -> typing.Sequence[~ErrorResult] + ''' + # map input types to rpc msg + params = dict() + msg = dict(Type='LogForwarding', Request='SetLastSent', Version=1, Params=params) + params['params'] = params reply = await self.rpc(msg) return reply @@ -11843,73 +11779,45 @@ class LoggerFacade(Type): name = 'Logger' version = 1 schema = {'definitions': {'Entities': {'additionalProperties': False, - 'properties': {'Entities': {'items': {'$ref': '#/definitions/Entity'}, + 'properties': {'entities': {'items': {'$ref': '#/definitions/Entity'}, 'type': 'array'}}, - 'required': ['Entities'], + 'required': ['entities'], 'type': 'object'}, 'Entity': {'additionalProperties': False, - 'properties': {'Tag': {'type': 'string'}}, - 'required': ['Tag'], + 'properties': {'tag': {'type': 'string'}}, + 'required': ['tag'], 'type': 'object'}, 'Error': {'additionalProperties': False, - 'properties': {'Code': {'type': 'string'}, - 'Info': {'$ref': '#/definitions/ErrorInfo'}, - 'Message': {'type': 'string'}}, - 'required': ['Message', 'Code'], + 'properties': {'code': {'type': 'string'}, + 'info': {'$ref': '#/definitions/ErrorInfo'}, + 'message': {'type': 'string'}}, + 'required': ['message', 'code'], 'type': 'object'}, 'ErrorInfo': {'additionalProperties': False, - 'properties': {'Macaroon': {'$ref': '#/definitions/Macaroon'}, - 'MacaroonPath': {'type': 'string'}}, + 'properties': {'macaroon': {'$ref': '#/definitions/Macaroon'}, + 'macaroon-path': {'type': 'string'}}, 'type': 'object'}, - 'Macaroon': {'additionalProperties': False, - 'properties': {'caveats': {'items': {'$ref': '#/definitions/caveat'}, - 'type': 'array'}, - 'data': {'items': {'type': 'integer'}, - 'type': 'array'}, - 'id': {'$ref': '#/definitions/packet'}, - 'location': {'$ref': '#/definitions/packet'}, - 'sig': {'items': {'type': 'integer'}, - 'type': 'array'}}, - 'required': ['data', - 'location', - 'id', - 'caveats', - 'sig'], - 'type': 'object'}, + 'Macaroon': {'additionalProperties': False, 'type': 'object'}, 'NotifyWatchResult': {'additionalProperties': False, - 'properties': {'Error': {'$ref': '#/definitions/Error'}, - 'NotifyWatcherId': {'type': 'string'}}, - 'required': ['NotifyWatcherId', 'Error'], + 'properties': {'NotifyWatcherId': {'type': 'string'}, + 'error': {'$ref': '#/definitions/Error'}}, + 'required': ['NotifyWatcherId'], 'type': 'object'}, 'NotifyWatchResults': {'additionalProperties': False, - 'properties': {'Results': {'items': {'$ref': '#/definitions/NotifyWatchResult'}, + 'properties': {'results': {'items': {'$ref': '#/definitions/NotifyWatchResult'}, 'type': 'array'}}, - 'required': ['Results'], + 'required': ['results'], 'type': 'object'}, 'StringResult': {'additionalProperties': False, - 'properties': {'Error': {'$ref': '#/definitions/Error'}, - 'Result': {'type': 'string'}}, - 'required': ['Error', 'Result'], + 'properties': {'error': {'$ref': '#/definitions/Error'}, + 'result': {'type': 'string'}}, + 'required': ['result'], 'type': 'object'}, 'StringResults': {'additionalProperties': False, - 'properties': {'Results': {'items': {'$ref': '#/definitions/StringResult'}, + 'properties': {'results': {'items': {'$ref': '#/definitions/StringResult'}, 'type': 'array'}}, - 'required': ['Results'], - 'type': 'object'}, - 'caveat': {'additionalProperties': False, - 'properties': {'caveatId': {'$ref': '#/definitions/packet'}, - 'location': {'$ref': '#/definitions/packet'}, - 'verificationId': {'$ref': '#/definitions/packet'}}, - 'required': ['location', - 'caveatId', - 'verificationId'], - 'type': 'object'}, - 'packet': {'additionalProperties': False, - 'properties': {'headerLen': {'type': 'integer'}, - 'start': {'type': 'integer'}, - 'totalLen': {'type': 'integer'}}, - 'required': ['start', 'totalLen', 'headerLen'], - 'type': 'object'}}, + 'required': ['results'], + 'type': 'object'}}, 'properties': {'LoggingConfig': {'properties': {'Params': {'$ref': '#/definitions/Entities'}, 'Result': {'$ref': '#/definitions/StringResults'}}, 'type': 'object'}, @@ -11928,7 +11836,7 @@ class LoggerFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Logger', Request='LoggingConfig', Version=1, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -11943,7 +11851,7 @@ class LoggerFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Logger', Request='WatchLoggingConfig', Version=1, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -11961,13 +11869,13 @@ class MachineActionsFacade(Type): 'required': ['tag', 'receiver', 'name'], 'type': 'object'}, 'ActionExecutionResult': {'additionalProperties': False, - 'properties': {'actiontag': {'type': 'string'}, + 'properties': {'action-tag': {'type': 'string'}, 'message': {'type': 'string'}, 'results': {'patternProperties': {'.*': {'additionalProperties': True, 'type': 'object'}}, 'type': 'object'}, 'status': {'type': 'string'}}, - 'required': ['actiontag', 'status'], + 'required': ['action-tag', 'status'], 'type': 'object'}, 'ActionExecutionResults': {'additionalProperties': False, 'properties': {'results': {'items': {'$ref': '#/definitions/ActionExecutionResult'}, @@ -12003,76 +11911,45 @@ class MachineActionsFacade(Type): 'type': 'array'}}, 'type': 'object'}, 'Entities': {'additionalProperties': False, - 'properties': {'Entities': {'items': {'$ref': '#/definitions/Entity'}, + 'properties': {'entities': {'items': {'$ref': '#/definitions/Entity'}, 'type': 'array'}}, - 'required': ['Entities'], + 'required': ['entities'], 'type': 'object'}, 'Entity': {'additionalProperties': False, - 'properties': {'Tag': {'type': 'string'}}, - 'required': ['Tag'], + 'properties': {'tag': {'type': 'string'}}, + 'required': ['tag'], 'type': 'object'}, 'Error': {'additionalProperties': False, - 'properties': {'Code': {'type': 'string'}, - 'Info': {'$ref': '#/definitions/ErrorInfo'}, - 'Message': {'type': 'string'}}, - 'required': ['Message', 'Code'], + 'properties': {'code': {'type': 'string'}, + 'info': {'$ref': '#/definitions/ErrorInfo'}, + 'message': {'type': 'string'}}, + 'required': ['message', 'code'], 'type': 'object'}, 'ErrorInfo': {'additionalProperties': False, - 'properties': {'Macaroon': {'$ref': '#/definitions/Macaroon'}, - 'MacaroonPath': {'type': 'string'}}, + 'properties': {'macaroon': {'$ref': '#/definitions/Macaroon'}, + 'macaroon-path': {'type': 'string'}}, 'type': 'object'}, 'ErrorResult': {'additionalProperties': False, - 'properties': {'Error': {'$ref': '#/definitions/Error'}}, - 'required': ['Error'], + 'properties': {'error': {'$ref': '#/definitions/Error'}}, 'type': 'object'}, 'ErrorResults': {'additionalProperties': False, - 'properties': {'Results': {'items': {'$ref': '#/definitions/ErrorResult'}, + 'properties': {'results': {'items': {'$ref': '#/definitions/ErrorResult'}, 'type': 'array'}}, - 'required': ['Results'], + 'required': ['results'], 'type': 'object'}, - 'Macaroon': {'additionalProperties': False, - 'properties': {'caveats': {'items': {'$ref': '#/definitions/caveat'}, - 'type': 'array'}, - 'data': {'items': {'type': 'integer'}, - 'type': 'array'}, - 'id': {'$ref': '#/definitions/packet'}, - 'location': {'$ref': '#/definitions/packet'}, - 'sig': {'items': {'type': 'integer'}, - 'type': 'array'}}, - 'required': ['data', - 'location', - 'id', - 'caveats', - 'sig'], - 'type': 'object'}, + 'Macaroon': {'additionalProperties': False, 'type': 'object'}, 'StringsWatchResult': {'additionalProperties': False, - 'properties': {'Changes': {'items': {'type': 'string'}, + 'properties': {'changes': {'items': {'type': 'string'}, 'type': 'array'}, - 'Error': {'$ref': '#/definitions/Error'}, - 'StringsWatcherId': {'type': 'string'}}, - 'required': ['StringsWatcherId', - 'Changes', - 'Error'], + 'error': {'$ref': '#/definitions/Error'}, + 'watcher-id': {'type': 'string'}}, + 'required': ['watcher-id'], 'type': 'object'}, 'StringsWatchResults': {'additionalProperties': False, - 'properties': {'Results': {'items': {'$ref': '#/definitions/StringsWatchResult'}, + 'properties': {'results': {'items': {'$ref': '#/definitions/StringsWatchResult'}, 'type': 'array'}}, - 'required': ['Results'], - 'type': 'object'}, - 'caveat': {'additionalProperties': False, - 'properties': {'caveatId': {'$ref': '#/definitions/packet'}, - 'location': {'$ref': '#/definitions/packet'}, - 'verificationId': {'$ref': '#/definitions/packet'}}, - 'required': ['location', - 'caveatId', - 'verificationId'], - 'type': 'object'}, - 'packet': {'additionalProperties': False, - 'properties': {'headerLen': {'type': 'integer'}, - 'start': {'type': 'integer'}, - 'totalLen': {'type': 'integer'}}, - 'required': ['start', 'totalLen', 'headerLen'], - 'type': 'object'}}, + 'required': ['results'], + 'type': 'object'}}, 'properties': {'Actions': {'properties': {'Params': {'$ref': '#/definitions/Entities'}, 'Result': {'$ref': '#/definitions/ActionResults'}}, 'type': 'object'}, @@ -12100,7 +11977,7 @@ class MachineActionsFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='MachineActions', Request='Actions', Version=1, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -12115,7 +11992,7 @@ class MachineActionsFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='MachineActions', Request='BeginActions', Version=1, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -12145,7 +12022,7 @@ class MachineActionsFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='MachineActions', Request='RunningActions', Version=1, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -12160,7 +12037,7 @@ class MachineActionsFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='MachineActions', Request='WatchActionNotifications', Version=1, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -12169,53 +12046,51 @@ class MachineManagerFacade(Type): name = 'MachineManager' version = 2 schema = {'definitions': {'AddMachineParams': {'additionalProperties': False, - 'properties': {'Addrs': {'items': {'$ref': '#/definitions/Address'}, - 'type': 'array'}, - 'Constraints': {'$ref': '#/definitions/Value'}, - 'ContainerType': {'type': 'string'}, - 'Disks': {'items': {'$ref': '#/definitions/Constraints'}, + 'properties': {'addresses': {'items': {'$ref': '#/definitions/Address'}, + 'type': 'array'}, + 'constraints': {'$ref': '#/definitions/Value'}, + 'container-type': {'type': 'string'}, + 'disks': {'items': {'$ref': '#/definitions/Constraints'}, 'type': 'array'}, - 'HardwareCharacteristics': {'$ref': '#/definitions/HardwareCharacteristics'}, - 'InstanceId': {'type': 'string'}, - 'Jobs': {'items': {'type': 'string'}, + 'hardware-characteristics': {'$ref': '#/definitions/HardwareCharacteristics'}, + 'instance-id': {'type': 'string'}, + 'jobs': {'items': {'type': 'string'}, 'type': 'array'}, - 'Nonce': {'type': 'string'}, - 'ParentId': {'type': 'string'}, - 'Placement': {'$ref': '#/definitions/Placement'}, - 'Series': {'type': 'string'}}, - 'required': ['Series', - 'Constraints', - 'Jobs', - 'Disks', - 'Placement', - 'ParentId', - 'ContainerType', - 'InstanceId', - 'Nonce', - 'HardwareCharacteristics', - 'Addrs'], + 'nonce': {'type': 'string'}, + 'parent-id': {'type': 'string'}, + 'placement': {'$ref': '#/definitions/Placement'}, + 'series': {'type': 'string'}}, + 'required': ['series', + 'constraints', + 'jobs', + 'parent-id', + 'container-type', + 'instance-id', + 'nonce', + 'hardware-characteristics', + 'addresses'], 'type': 'object'}, 'AddMachines': {'additionalProperties': False, - 'properties': {'MachineParams': {'items': {'$ref': '#/definitions/AddMachineParams'}, - 'type': 'array'}}, - 'required': ['MachineParams'], + 'properties': {'params': {'items': {'$ref': '#/definitions/AddMachineParams'}, + 'type': 'array'}}, + 'required': ['params'], 'type': 'object'}, 'AddMachinesResult': {'additionalProperties': False, - 'properties': {'Error': {'$ref': '#/definitions/Error'}, - 'Machine': {'type': 'string'}}, - 'required': ['Machine', 'Error'], + 'properties': {'error': {'$ref': '#/definitions/Error'}, + 'machine': {'type': 'string'}}, + 'required': ['machine'], 'type': 'object'}, 'AddMachinesResults': {'additionalProperties': False, - 'properties': {'Machines': {'items': {'$ref': '#/definitions/AddMachinesResult'}, + 'properties': {'machines': {'items': {'$ref': '#/definitions/AddMachinesResult'}, 'type': 'array'}}, - 'required': ['Machines'], + 'required': ['machines'], 'type': 'object'}, 'Address': {'additionalProperties': False, - 'properties': {'Scope': {'type': 'string'}, - 'SpaceName': {'type': 'string'}, - 'Type': {'type': 'string'}, - 'Value': {'type': 'string'}}, - 'required': ['Value', 'Type', 'Scope'], + 'properties': {'scope': {'type': 'string'}, + 'space-name': {'type': 'string'}, + 'type': {'type': 'string'}, + 'value': {'type': 'string'}}, + 'required': ['value', 'type', 'scope'], 'type': 'object'}, 'Constraints': {'additionalProperties': False, 'properties': {'Count': {'type': 'integer'}, @@ -12224,44 +12099,30 @@ class MachineManagerFacade(Type): 'required': ['Pool', 'Size', 'Count'], 'type': 'object'}, 'Error': {'additionalProperties': False, - 'properties': {'Code': {'type': 'string'}, - 'Info': {'$ref': '#/definitions/ErrorInfo'}, - 'Message': {'type': 'string'}}, - 'required': ['Message', 'Code'], + 'properties': {'code': {'type': 'string'}, + 'info': {'$ref': '#/definitions/ErrorInfo'}, + 'message': {'type': 'string'}}, + 'required': ['message', 'code'], 'type': 'object'}, 'ErrorInfo': {'additionalProperties': False, - 'properties': {'Macaroon': {'$ref': '#/definitions/Macaroon'}, - 'MacaroonPath': {'type': 'string'}}, + 'properties': {'macaroon': {'$ref': '#/definitions/Macaroon'}, + 'macaroon-path': {'type': 'string'}}, 'type': 'object'}, 'HardwareCharacteristics': {'additionalProperties': False, - 'properties': {'Arch': {'type': 'string'}, - 'AvailabilityZone': {'type': 'string'}, - 'CpuCores': {'type': 'integer'}, - 'CpuPower': {'type': 'integer'}, - 'Mem': {'type': 'integer'}, - 'RootDisk': {'type': 'integer'}, - 'Tags': {'items': {'type': 'string'}, + 'properties': {'arch': {'type': 'string'}, + 'availability-zone': {'type': 'string'}, + 'cpu-cores': {'type': 'integer'}, + 'cpu-power': {'type': 'integer'}, + 'mem': {'type': 'integer'}, + 'root-disk': {'type': 'integer'}, + 'tags': {'items': {'type': 'string'}, 'type': 'array'}}, 'type': 'object'}, - 'Macaroon': {'additionalProperties': False, - 'properties': {'caveats': {'items': {'$ref': '#/definitions/caveat'}, - 'type': 'array'}, - 'data': {'items': {'type': 'integer'}, - 'type': 'array'}, - 'id': {'$ref': '#/definitions/packet'}, - 'location': {'$ref': '#/definitions/packet'}, - 'sig': {'items': {'type': 'integer'}, - 'type': 'array'}}, - 'required': ['data', - 'location', - 'id', - 'caveats', - 'sig'], - 'type': 'object'}, + 'Macaroon': {'additionalProperties': False, 'type': 'object'}, 'Placement': {'additionalProperties': False, - 'properties': {'Directive': {'type': 'string'}, - 'Scope': {'type': 'string'}}, - 'required': ['Scope', 'Directive'], + 'properties': {'directive': {'type': 'string'}, + 'scope': {'type': 'string'}}, + 'required': ['scope', 'directive'], 'type': 'object'}, 'Value': {'additionalProperties': False, 'properties': {'arch': {'type': 'string'}, @@ -12276,21 +12137,7 @@ class MachineManagerFacade(Type): 'tags': {'items': {'type': 'string'}, 'type': 'array'}, 'virt-type': {'type': 'string'}}, - 'type': 'object'}, - 'caveat': {'additionalProperties': False, - 'properties': {'caveatId': {'$ref': '#/definitions/packet'}, - 'location': {'$ref': '#/definitions/packet'}, - 'verificationId': {'$ref': '#/definitions/packet'}}, - 'required': ['location', - 'caveatId', - 'verificationId'], - 'type': 'object'}, - 'packet': {'additionalProperties': False, - 'properties': {'headerLen': {'type': 'integer'}, - 'start': {'type': 'integer'}, - 'totalLen': {'type': 'integer'}}, - 'required': ['start', 'totalLen', 'headerLen'], - 'type': 'object'}}, + 'type': 'object'}}, 'properties': {'AddMachines': {'properties': {'Params': {'$ref': '#/definitions/AddMachines'}, 'Result': {'$ref': '#/definitions/AddMachinesResults'}}, 'type': 'object'}}, @@ -12298,15 +12145,15 @@ class MachineManagerFacade(Type): @ReturnMapping(AddMachinesResults) - async def AddMachines(self, machineparams): + async def AddMachines(self, params): ''' - machineparams : typing.Sequence[~AddMachineParams] + params : typing.Sequence[~AddMachineParams] Returns -> typing.Sequence[~AddMachinesResult] ''' # map input types to rpc msg params = dict() msg = dict(Type='MachineManager', Request='AddMachines', Version=2, Params=params) - params['MachineParams'] = machineparams + params['params'] = params reply = await self.rpc(msg) return reply @@ -12315,199 +12162,169 @@ class MachinerFacade(Type): name = 'Machiner' version = 1 schema = {'definitions': {'APIHostPortsResult': {'additionalProperties': False, - 'properties': {'Servers': {'items': {'items': {'$ref': '#/definitions/HostPort'}, + 'properties': {'servers': {'items': {'items': {'$ref': '#/definitions/HostPort'}, 'type': 'array'}, 'type': 'array'}}, - 'required': ['Servers'], + 'required': ['servers'], 'type': 'object'}, 'Address': {'additionalProperties': False, - 'properties': {'Scope': {'type': 'string'}, - 'SpaceName': {'type': 'string'}, - 'Type': {'type': 'string'}, - 'Value': {'type': 'string'}}, - 'required': ['Value', 'Type', 'Scope'], + 'properties': {'scope': {'type': 'string'}, + 'space-name': {'type': 'string'}, + 'type': {'type': 'string'}, + 'value': {'type': 'string'}}, + 'required': ['value', 'type', 'scope'], 'type': 'object'}, 'BytesResult': {'additionalProperties': False, - 'properties': {'Result': {'items': {'type': 'integer'}, + 'properties': {'result': {'items': {'type': 'integer'}, 'type': 'array'}}, - 'required': ['Result'], + 'required': ['result'], 'type': 'object'}, 'Entities': {'additionalProperties': False, - 'properties': {'Entities': {'items': {'$ref': '#/definitions/Entity'}, + 'properties': {'entities': {'items': {'$ref': '#/definitions/Entity'}, 'type': 'array'}}, - 'required': ['Entities'], + 'required': ['entities'], 'type': 'object'}, 'Entity': {'additionalProperties': False, - 'properties': {'Tag': {'type': 'string'}}, - 'required': ['Tag'], + 'properties': {'tag': {'type': 'string'}}, + 'required': ['tag'], 'type': 'object'}, 'EntityStatusArgs': {'additionalProperties': False, - 'properties': {'Data': {'patternProperties': {'.*': {'additionalProperties': True, + 'properties': {'data': {'patternProperties': {'.*': {'additionalProperties': True, 'type': 'object'}}, 'type': 'object'}, - 'Info': {'type': 'string'}, - 'Status': {'type': 'string'}, - 'Tag': {'type': 'string'}}, - 'required': ['Tag', - 'Status', - 'Info', - 'Data'], + 'info': {'type': 'string'}, + 'status': {'type': 'string'}, + 'tag': {'type': 'string'}}, + 'required': ['tag', + 'status', + 'info', + 'data'], 'type': 'object'}, 'Error': {'additionalProperties': False, - 'properties': {'Code': {'type': 'string'}, - 'Info': {'$ref': '#/definitions/ErrorInfo'}, - 'Message': {'type': 'string'}}, - 'required': ['Message', 'Code'], + 'properties': {'code': {'type': 'string'}, + 'info': {'$ref': '#/definitions/ErrorInfo'}, + 'message': {'type': 'string'}}, + 'required': ['message', 'code'], 'type': 'object'}, 'ErrorInfo': {'additionalProperties': False, - 'properties': {'Macaroon': {'$ref': '#/definitions/Macaroon'}, - 'MacaroonPath': {'type': 'string'}}, + 'properties': {'macaroon': {'$ref': '#/definitions/Macaroon'}, + 'macaroon-path': {'type': 'string'}}, 'type': 'object'}, 'ErrorResult': {'additionalProperties': False, - 'properties': {'Error': {'$ref': '#/definitions/Error'}}, - 'required': ['Error'], + 'properties': {'error': {'$ref': '#/definitions/Error'}}, 'type': 'object'}, 'ErrorResults': {'additionalProperties': False, - 'properties': {'Results': {'items': {'$ref': '#/definitions/ErrorResult'}, + 'properties': {'results': {'items': {'$ref': '#/definitions/ErrorResult'}, 'type': 'array'}}, - 'required': ['Results'], + 'required': ['results'], 'type': 'object'}, 'HostPort': {'additionalProperties': False, 'properties': {'Address': {'$ref': '#/definitions/Address'}, - 'Port': {'type': 'integer'}}, - 'required': ['Address', 'Port'], + 'port': {'type': 'integer'}}, + 'required': ['Address', 'port'], 'type': 'object'}, 'JobsResult': {'additionalProperties': False, - 'properties': {'Error': {'$ref': '#/definitions/Error'}, - 'Jobs': {'items': {'type': 'string'}, + 'properties': {'error': {'$ref': '#/definitions/Error'}, + 'jobs': {'items': {'type': 'string'}, 'type': 'array'}}, - 'required': ['Jobs', 'Error'], + 'required': ['jobs'], 'type': 'object'}, 'JobsResults': {'additionalProperties': False, - 'properties': {'Results': {'items': {'$ref': '#/definitions/JobsResult'}, + 'properties': {'results': {'items': {'$ref': '#/definitions/JobsResult'}, 'type': 'array'}}, - 'required': ['Results'], + 'required': ['results'], 'type': 'object'}, 'LifeResult': {'additionalProperties': False, - 'properties': {'Error': {'$ref': '#/definitions/Error'}, - 'Life': {'type': 'string'}}, - 'required': ['Life', 'Error'], + 'properties': {'error': {'$ref': '#/definitions/Error'}, + 'life': {'type': 'string'}}, + 'required': ['life'], 'type': 'object'}, 'LifeResults': {'additionalProperties': False, - 'properties': {'Results': {'items': {'$ref': '#/definitions/LifeResult'}, + 'properties': {'results': {'items': {'$ref': '#/definitions/LifeResult'}, 'type': 'array'}}, - 'required': ['Results'], + 'required': ['results'], 'type': 'object'}, - 'Macaroon': {'additionalProperties': False, - 'properties': {'caveats': {'items': {'$ref': '#/definitions/caveat'}, - 'type': 'array'}, - 'data': {'items': {'type': 'integer'}, - 'type': 'array'}, - 'id': {'$ref': '#/definitions/packet'}, - 'location': {'$ref': '#/definitions/packet'}, - 'sig': {'items': {'type': 'integer'}, - 'type': 'array'}}, - 'required': ['data', - 'location', - 'id', - 'caveats', - 'sig'], - 'type': 'object'}, + 'Macaroon': {'additionalProperties': False, 'type': 'object'}, 'MachineAddresses': {'additionalProperties': False, - 'properties': {'Addresses': {'items': {'$ref': '#/definitions/Address'}, + 'properties': {'addresses': {'items': {'$ref': '#/definitions/Address'}, 'type': 'array'}, - 'Tag': {'type': 'string'}}, - 'required': ['Tag', 'Addresses'], + 'tag': {'type': 'string'}}, + 'required': ['tag', 'addresses'], 'type': 'object'}, 'NetworkConfig': {'additionalProperties': False, - 'properties': {'Address': {'type': 'string'}, - 'CIDR': {'type': 'string'}, - 'ConfigType': {'type': 'string'}, - 'DNSSearchDomains': {'items': {'type': 'string'}, - 'type': 'array'}, - 'DNSServers': {'items': {'type': 'string'}, - 'type': 'array'}, - 'DeviceIndex': {'type': 'integer'}, - 'Disabled': {'type': 'boolean'}, - 'GatewayAddress': {'type': 'string'}, - 'InterfaceName': {'type': 'string'}, - 'InterfaceType': {'type': 'string'}, - 'MACAddress': {'type': 'string'}, - 'MTU': {'type': 'integer'}, - 'NoAutoStart': {'type': 'boolean'}, - 'ParentInterfaceName': {'type': 'string'}, - 'ProviderAddressId': {'type': 'string'}, - 'ProviderId': {'type': 'string'}, - 'ProviderSpaceId': {'type': 'string'}, - 'ProviderSubnetId': {'type': 'string'}, - 'ProviderVLANId': {'type': 'string'}, - 'VLANTag': {'type': 'integer'}}, - 'required': ['DeviceIndex', - 'MACAddress', - 'CIDR', - 'MTU', - 'ProviderId', - 'ProviderSubnetId', - 'ProviderSpaceId', - 'ProviderAddressId', - 'ProviderVLANId', - 'VLANTag', - 'InterfaceName', - 'ParentInterfaceName', - 'InterfaceType', - 'Disabled'], + 'properties': {'address': {'type': 'string'}, + 'cidr': {'type': 'string'}, + 'config-type': {'type': 'string'}, + 'device-index': {'type': 'integer'}, + 'disabled': {'type': 'boolean'}, + 'dns-search-domains': {'items': {'type': 'string'}, + 'type': 'array'}, + 'dns-servers': {'items': {'type': 'string'}, + 'type': 'array'}, + 'gateway-address': {'type': 'string'}, + 'interface-name': {'type': 'string'}, + 'interface-type': {'type': 'string'}, + 'mac-address': {'type': 'string'}, + 'mtu': {'type': 'integer'}, + 'no-auto-start': {'type': 'boolean'}, + 'parent-interface-name': {'type': 'string'}, + 'provider-address-id': {'type': 'string'}, + 'provider-id': {'type': 'string'}, + 'provider-space-id': {'type': 'string'}, + 'provider-subnet-id': {'type': 'string'}, + 'provider-vlan-id': {'type': 'string'}, + 'vlan-tag': {'type': 'integer'}}, + 'required': ['device-index', + 'mac-address', + 'cidr', + 'mtu', + 'provider-id', + 'provider-subnet-id', + 'provider-space-id', + 'provider-address-id', + 'provider-vlan-id', + 'vlan-tag', + 'interface-name', + 'parent-interface-name', + 'interface-type', + 'disabled'], 'type': 'object'}, 'NotifyWatchResult': {'additionalProperties': False, - 'properties': {'Error': {'$ref': '#/definitions/Error'}, - 'NotifyWatcherId': {'type': 'string'}}, - 'required': ['NotifyWatcherId', 'Error'], + 'properties': {'NotifyWatcherId': {'type': 'string'}, + 'error': {'$ref': '#/definitions/Error'}}, + 'required': ['NotifyWatcherId'], 'type': 'object'}, 'NotifyWatchResults': {'additionalProperties': False, - 'properties': {'Results': {'items': {'$ref': '#/definitions/NotifyWatchResult'}, + 'properties': {'results': {'items': {'$ref': '#/definitions/NotifyWatchResult'}, 'type': 'array'}}, - 'required': ['Results'], + 'required': ['results'], 'type': 'object'}, 'SetMachineNetworkConfig': {'additionalProperties': False, - 'properties': {'Config': {'items': {'$ref': '#/definitions/NetworkConfig'}, + 'properties': {'config': {'items': {'$ref': '#/definitions/NetworkConfig'}, 'type': 'array'}, - 'Tag': {'type': 'string'}}, - 'required': ['Tag', 'Config'], + 'tag': {'type': 'string'}}, + 'required': ['tag', 'config'], 'type': 'object'}, 'SetMachinesAddresses': {'additionalProperties': False, - 'properties': {'MachineAddresses': {'items': {'$ref': '#/definitions/MachineAddresses'}, - 'type': 'array'}}, - 'required': ['MachineAddresses'], + 'properties': {'machine-addresses': {'items': {'$ref': '#/definitions/MachineAddresses'}, + 'type': 'array'}}, + 'required': ['machine-addresses'], 'type': 'object'}, 'SetStatus': {'additionalProperties': False, - 'properties': {'Entities': {'items': {'$ref': '#/definitions/EntityStatusArgs'}, + 'properties': {'entities': {'items': {'$ref': '#/definitions/EntityStatusArgs'}, 'type': 'array'}}, - 'required': ['Entities'], + 'required': ['entities'], 'type': 'object'}, 'StringResult': {'additionalProperties': False, - 'properties': {'Error': {'$ref': '#/definitions/Error'}, - 'Result': {'type': 'string'}}, - 'required': ['Error', 'Result'], + 'properties': {'error': {'$ref': '#/definitions/Error'}, + 'result': {'type': 'string'}}, + 'required': ['result'], 'type': 'object'}, 'StringsResult': {'additionalProperties': False, - 'properties': {'Error': {'$ref': '#/definitions/Error'}, - 'Result': {'items': {'type': 'string'}, + 'properties': {'error': {'$ref': '#/definitions/Error'}, + 'result': {'items': {'type': 'string'}, 'type': 'array'}}, - 'required': ['Error', 'Result'], - 'type': 'object'}, - 'caveat': {'additionalProperties': False, - 'properties': {'caveatId': {'$ref': '#/definitions/packet'}, - 'location': {'$ref': '#/definitions/packet'}, - 'verificationId': {'$ref': '#/definitions/packet'}}, - 'required': ['location', - 'caveatId', - 'verificationId'], - 'type': 'object'}, - 'packet': {'additionalProperties': False, - 'properties': {'headerLen': {'type': 'integer'}, - 'start': {'type': 'integer'}, - 'totalLen': {'type': 'integer'}}, - 'required': ['start', 'totalLen', 'headerLen'], - 'type': 'object'}}, + 'type': 'object'}}, 'properties': {'APIAddresses': {'properties': {'Result': {'$ref': '#/definitions/StringsResult'}}, 'type': 'object'}, 'APIHostPorts': {'properties': {'Result': {'$ref': '#/definitions/APIHostPortsResult'}}, @@ -12601,7 +12418,7 @@ class MachinerFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Machiner', Request='EnsureDead', Version=1, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -12616,7 +12433,7 @@ class MachinerFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Machiner', Request='Jobs', Version=1, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -12631,7 +12448,7 @@ class MachinerFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Machiner', Request='Life', Version=1, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -12653,15 +12470,15 @@ class MachinerFacade(Type): @ReturnMapping(ErrorResults) - async def SetMachineAddresses(self, machineaddresses): + async def SetMachineAddresses(self, machine_addresses): ''' - machineaddresses : typing.Sequence[~MachineAddresses] + machine_addresses : typing.Sequence[~MachineAddresses] Returns -> typing.Sequence[~ErrorResult] ''' # map input types to rpc msg params = dict() msg = dict(Type='Machiner', Request='SetMachineAddresses', Version=1, Params=params) - params['MachineAddresses'] = machineaddresses + params['machine-addresses'] = machine_addresses reply = await self.rpc(msg) return reply @@ -12677,8 +12494,8 @@ class MachinerFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Machiner', Request='SetObservedNetworkConfig', Version=1, Params=params) - params['Config'] = config - params['Tag'] = tag + params['config'] = config + params['tag'] = tag reply = await self.rpc(msg) return reply @@ -12693,7 +12510,7 @@ class MachinerFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Machiner', Request='SetProviderNetworkConfig', Version=1, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -12708,7 +12525,7 @@ class MachinerFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Machiner', Request='SetStatus', Version=1, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -12723,7 +12540,7 @@ class MachinerFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Machiner', Request='UpdateStatus', Version=1, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -12738,7 +12555,7 @@ class MachinerFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Machiner', Request='Watch', Version=1, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -12748,7 +12565,7 @@ class MachinerFacade(Type): async def WatchAPIHostPorts(self): ''' - Returns -> typing.Union[_ForwardRef('Error'), str] + Returns -> typing.Union[str, _ForwardRef('Error')] ''' # map input types to rpc msg params = dict() @@ -12762,74 +12579,46 @@ class MeterStatusFacade(Type): name = 'MeterStatus' version = 1 schema = {'definitions': {'Entities': {'additionalProperties': False, - 'properties': {'Entities': {'items': {'$ref': '#/definitions/Entity'}, + 'properties': {'entities': {'items': {'$ref': '#/definitions/Entity'}, 'type': 'array'}}, - 'required': ['Entities'], + 'required': ['entities'], 'type': 'object'}, 'Entity': {'additionalProperties': False, - 'properties': {'Tag': {'type': 'string'}}, - 'required': ['Tag'], + 'properties': {'tag': {'type': 'string'}}, + 'required': ['tag'], 'type': 'object'}, 'Error': {'additionalProperties': False, - 'properties': {'Code': {'type': 'string'}, - 'Info': {'$ref': '#/definitions/ErrorInfo'}, - 'Message': {'type': 'string'}}, - 'required': ['Message', 'Code'], + 'properties': {'code': {'type': 'string'}, + 'info': {'$ref': '#/definitions/ErrorInfo'}, + 'message': {'type': 'string'}}, + 'required': ['message', 'code'], 'type': 'object'}, 'ErrorInfo': {'additionalProperties': False, - 'properties': {'Macaroon': {'$ref': '#/definitions/Macaroon'}, - 'MacaroonPath': {'type': 'string'}}, + 'properties': {'macaroon': {'$ref': '#/definitions/Macaroon'}, + 'macaroon-path': {'type': 'string'}}, 'type': 'object'}, - 'Macaroon': {'additionalProperties': False, - 'properties': {'caveats': {'items': {'$ref': '#/definitions/caveat'}, - 'type': 'array'}, - 'data': {'items': {'type': 'integer'}, - 'type': 'array'}, - 'id': {'$ref': '#/definitions/packet'}, - 'location': {'$ref': '#/definitions/packet'}, - 'sig': {'items': {'type': 'integer'}, - 'type': 'array'}}, - 'required': ['data', - 'location', - 'id', - 'caveats', - 'sig'], - 'type': 'object'}, + 'Macaroon': {'additionalProperties': False, 'type': 'object'}, 'MeterStatusResult': {'additionalProperties': False, - 'properties': {'Code': {'type': 'string'}, - 'Error': {'$ref': '#/definitions/Error'}, - 'Info': {'type': 'string'}}, - 'required': ['Code', 'Info', 'Error'], + 'properties': {'code': {'type': 'string'}, + 'error': {'$ref': '#/definitions/Error'}, + 'info': {'type': 'string'}}, + 'required': ['code', 'info'], 'type': 'object'}, 'MeterStatusResults': {'additionalProperties': False, - 'properties': {'Results': {'items': {'$ref': '#/definitions/MeterStatusResult'}, + 'properties': {'results': {'items': {'$ref': '#/definitions/MeterStatusResult'}, 'type': 'array'}}, - 'required': ['Results'], + 'required': ['results'], 'type': 'object'}, 'NotifyWatchResult': {'additionalProperties': False, - 'properties': {'Error': {'$ref': '#/definitions/Error'}, - 'NotifyWatcherId': {'type': 'string'}}, - 'required': ['NotifyWatcherId', 'Error'], + 'properties': {'NotifyWatcherId': {'type': 'string'}, + 'error': {'$ref': '#/definitions/Error'}}, + 'required': ['NotifyWatcherId'], 'type': 'object'}, 'NotifyWatchResults': {'additionalProperties': False, - 'properties': {'Results': {'items': {'$ref': '#/definitions/NotifyWatchResult'}, + 'properties': {'results': {'items': {'$ref': '#/definitions/NotifyWatchResult'}, 'type': 'array'}}, - 'required': ['Results'], - 'type': 'object'}, - 'caveat': {'additionalProperties': False, - 'properties': {'caveatId': {'$ref': '#/definitions/packet'}, - 'location': {'$ref': '#/definitions/packet'}, - 'verificationId': {'$ref': '#/definitions/packet'}}, - 'required': ['location', - 'caveatId', - 'verificationId'], - 'type': 'object'}, - 'packet': {'additionalProperties': False, - 'properties': {'headerLen': {'type': 'integer'}, - 'start': {'type': 'integer'}, - 'totalLen': {'type': 'integer'}}, - 'required': ['start', 'totalLen', 'headerLen'], - 'type': 'object'}}, + 'required': ['results'], + 'type': 'object'}}, 'properties': {'GetMeterStatus': {'properties': {'Params': {'$ref': '#/definitions/Entities'}, 'Result': {'$ref': '#/definitions/MeterStatusResults'}}, 'type': 'object'}, @@ -12848,7 +12637,7 @@ class MeterStatusFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='MeterStatus', Request='GetMeterStatus', Version=1, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -12863,7 +12652,7 @@ class MeterStatusFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='MeterStatus', Request='WatchMeterStatus', Version=1, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -12872,82 +12661,53 @@ class MetricsAdderFacade(Type): name = 'MetricsAdder' version = 2 schema = {'definitions': {'Error': {'additionalProperties': False, - 'properties': {'Code': {'type': 'string'}, - 'Info': {'$ref': '#/definitions/ErrorInfo'}, - 'Message': {'type': 'string'}}, - 'required': ['Message', 'Code'], + 'properties': {'code': {'type': 'string'}, + 'info': {'$ref': '#/definitions/ErrorInfo'}, + 'message': {'type': 'string'}}, + 'required': ['message', 'code'], 'type': 'object'}, 'ErrorInfo': {'additionalProperties': False, - 'properties': {'Macaroon': {'$ref': '#/definitions/Macaroon'}, - 'MacaroonPath': {'type': 'string'}}, + 'properties': {'macaroon': {'$ref': '#/definitions/Macaroon'}, + 'macaroon-path': {'type': 'string'}}, 'type': 'object'}, 'ErrorResult': {'additionalProperties': False, - 'properties': {'Error': {'$ref': '#/definitions/Error'}}, - 'required': ['Error'], + 'properties': {'error': {'$ref': '#/definitions/Error'}}, 'type': 'object'}, 'ErrorResults': {'additionalProperties': False, - 'properties': {'Results': {'items': {'$ref': '#/definitions/ErrorResult'}, + 'properties': {'results': {'items': {'$ref': '#/definitions/ErrorResult'}, 'type': 'array'}}, - 'required': ['Results'], + 'required': ['results'], 'type': 'object'}, - 'Macaroon': {'additionalProperties': False, - 'properties': {'caveats': {'items': {'$ref': '#/definitions/caveat'}, - 'type': 'array'}, - 'data': {'items': {'type': 'integer'}, - 'type': 'array'}, - 'id': {'$ref': '#/definitions/packet'}, - 'location': {'$ref': '#/definitions/packet'}, - 'sig': {'items': {'type': 'integer'}, - 'type': 'array'}}, - 'required': ['data', - 'location', - 'id', - 'caveats', - 'sig'], - 'type': 'object'}, + 'Macaroon': {'additionalProperties': False, 'type': 'object'}, 'Metric': {'additionalProperties': False, - 'properties': {'Key': {'type': 'string'}, - 'Time': {'format': 'date-time', + 'properties': {'key': {'type': 'string'}, + 'time': {'format': 'date-time', 'type': 'string'}, - 'Value': {'type': 'string'}}, - 'required': ['Key', 'Value', 'Time'], + 'value': {'type': 'string'}}, + 'required': ['key', 'value', 'time'], 'type': 'object'}, 'MetricBatch': {'additionalProperties': False, - 'properties': {'CharmURL': {'type': 'string'}, - 'Created': {'format': 'date-time', + 'properties': {'charm-url': {'type': 'string'}, + 'created': {'format': 'date-time', 'type': 'string'}, - 'Metrics': {'items': {'$ref': '#/definitions/Metric'}, + 'metrics': {'items': {'$ref': '#/definitions/Metric'}, 'type': 'array'}, - 'UUID': {'type': 'string'}}, - 'required': ['UUID', - 'CharmURL', - 'Created', - 'Metrics'], + 'uuid': {'type': 'string'}}, + 'required': ['uuid', + 'charm-url', + 'created', + 'metrics'], 'type': 'object'}, 'MetricBatchParam': {'additionalProperties': False, - 'properties': {'Batch': {'$ref': '#/definitions/MetricBatch'}, - 'Tag': {'type': 'string'}}, - 'required': ['Tag', 'Batch'], + 'properties': {'batch': {'$ref': '#/definitions/MetricBatch'}, + 'tag': {'type': 'string'}}, + 'required': ['tag', 'batch'], 'type': 'object'}, 'MetricBatchParams': {'additionalProperties': False, - 'properties': {'Batches': {'items': {'$ref': '#/definitions/MetricBatchParam'}, + 'properties': {'batches': {'items': {'$ref': '#/definitions/MetricBatchParam'}, 'type': 'array'}}, - 'required': ['Batches'], - 'type': 'object'}, - 'caveat': {'additionalProperties': False, - 'properties': {'caveatId': {'$ref': '#/definitions/packet'}, - 'location': {'$ref': '#/definitions/packet'}, - 'verificationId': {'$ref': '#/definitions/packet'}}, - 'required': ['location', - 'caveatId', - 'verificationId'], - 'type': 'object'}, - 'packet': {'additionalProperties': False, - 'properties': {'headerLen': {'type': 'integer'}, - 'start': {'type': 'integer'}, - 'totalLen': {'type': 'integer'}}, - 'required': ['start', 'totalLen', 'headerLen'], - 'type': 'object'}}, + 'required': ['batches'], + 'type': 'object'}}, 'properties': {'AddMetricBatches': {'properties': {'Params': {'$ref': '#/definitions/MetricBatchParams'}, 'Result': {'$ref': '#/definitions/ErrorResults'}}, 'type': 'object'}}, @@ -12963,7 +12723,7 @@ class MetricsAdderFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='MetricsAdder', Request='AddMetricBatches', Version=2, Params=params) - params['Batches'] = batches + params['batches'] = batches reply = await self.rpc(msg) return reply @@ -12972,13 +12732,13 @@ class MetricsDebugFacade(Type): name = 'MetricsDebug' version = 2 schema = {'definitions': {'Entities': {'additionalProperties': False, - 'properties': {'Entities': {'items': {'$ref': '#/definitions/Entity'}, + 'properties': {'entities': {'items': {'$ref': '#/definitions/Entity'}, 'type': 'array'}}, - 'required': ['Entities'], + 'required': ['entities'], 'type': 'object'}, 'Entity': {'additionalProperties': False, - 'properties': {'Tag': {'type': 'string'}}, - 'required': ['Tag'], + 'properties': {'tag': {'type': 'string'}}, + 'required': ['tag'], 'type': 'object'}, 'EntityMetrics': {'additionalProperties': False, 'properties': {'error': {'$ref': '#/definitions/Error'}, @@ -12986,39 +12746,24 @@ class MetricsDebugFacade(Type): 'type': 'array'}}, 'type': 'object'}, 'Error': {'additionalProperties': False, - 'properties': {'Code': {'type': 'string'}, - 'Info': {'$ref': '#/definitions/ErrorInfo'}, - 'Message': {'type': 'string'}}, - 'required': ['Message', 'Code'], + 'properties': {'code': {'type': 'string'}, + 'info': {'$ref': '#/definitions/ErrorInfo'}, + 'message': {'type': 'string'}}, + 'required': ['message', 'code'], 'type': 'object'}, 'ErrorInfo': {'additionalProperties': False, - 'properties': {'Macaroon': {'$ref': '#/definitions/Macaroon'}, - 'MacaroonPath': {'type': 'string'}}, + 'properties': {'macaroon': {'$ref': '#/definitions/Macaroon'}, + 'macaroon-path': {'type': 'string'}}, 'type': 'object'}, 'ErrorResult': {'additionalProperties': False, - 'properties': {'Error': {'$ref': '#/definitions/Error'}}, - 'required': ['Error'], + 'properties': {'error': {'$ref': '#/definitions/Error'}}, 'type': 'object'}, 'ErrorResults': {'additionalProperties': False, - 'properties': {'Results': {'items': {'$ref': '#/definitions/ErrorResult'}, + 'properties': {'results': {'items': {'$ref': '#/definitions/ErrorResult'}, 'type': 'array'}}, - 'required': ['Results'], + 'required': ['results'], 'type': 'object'}, - 'Macaroon': {'additionalProperties': False, - 'properties': {'caveats': {'items': {'$ref': '#/definitions/caveat'}, - 'type': 'array'}, - 'data': {'items': {'type': 'integer'}, - 'type': 'array'}, - 'id': {'$ref': '#/definitions/packet'}, - 'location': {'$ref': '#/definitions/packet'}, - 'sig': {'items': {'type': 'integer'}, - 'type': 'array'}}, - 'required': ['data', - 'location', - 'id', - 'caveats', - 'sig'], - 'type': 'object'}, + 'Macaroon': {'additionalProperties': False, 'type': 'object'}, 'MeterStatusParam': {'additionalProperties': False, 'properties': {'code': {'type': 'string'}, 'info': {'type': 'string'}, @@ -13041,21 +12786,7 @@ class MetricsDebugFacade(Type): 'properties': {'results': {'items': {'$ref': '#/definitions/EntityMetrics'}, 'type': 'array'}}, 'required': ['results'], - 'type': 'object'}, - 'caveat': {'additionalProperties': False, - 'properties': {'caveatId': {'$ref': '#/definitions/packet'}, - 'location': {'$ref': '#/definitions/packet'}, - 'verificationId': {'$ref': '#/definitions/packet'}}, - 'required': ['location', - 'caveatId', - 'verificationId'], - 'type': 'object'}, - 'packet': {'additionalProperties': False, - 'properties': {'headerLen': {'type': 'integer'}, - 'start': {'type': 'integer'}, - 'totalLen': {'type': 'integer'}}, - 'required': ['start', 'totalLen', 'headerLen'], - 'type': 'object'}}, + 'type': 'object'}}, 'properties': {'GetMetrics': {'properties': {'Params': {'$ref': '#/definitions/Entities'}, 'Result': {'$ref': '#/definitions/MetricResults'}}, 'type': 'object'}, @@ -13074,7 +12805,7 @@ class MetricsDebugFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='MetricsDebug', Request='GetMetrics', Version=2, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -13098,62 +12829,33 @@ class MetricsManagerFacade(Type): name = 'MetricsManager' version = 1 schema = {'definitions': {'Entities': {'additionalProperties': False, - 'properties': {'Entities': {'items': {'$ref': '#/definitions/Entity'}, + 'properties': {'entities': {'items': {'$ref': '#/definitions/Entity'}, 'type': 'array'}}, - 'required': ['Entities'], + 'required': ['entities'], 'type': 'object'}, 'Entity': {'additionalProperties': False, - 'properties': {'Tag': {'type': 'string'}}, - 'required': ['Tag'], + 'properties': {'tag': {'type': 'string'}}, + 'required': ['tag'], 'type': 'object'}, 'Error': {'additionalProperties': False, - 'properties': {'Code': {'type': 'string'}, - 'Info': {'$ref': '#/definitions/ErrorInfo'}, - 'Message': {'type': 'string'}}, - 'required': ['Message', 'Code'], + 'properties': {'code': {'type': 'string'}, + 'info': {'$ref': '#/definitions/ErrorInfo'}, + 'message': {'type': 'string'}}, + 'required': ['message', 'code'], 'type': 'object'}, 'ErrorInfo': {'additionalProperties': False, - 'properties': {'Macaroon': {'$ref': '#/definitions/Macaroon'}, - 'MacaroonPath': {'type': 'string'}}, + 'properties': {'macaroon': {'$ref': '#/definitions/Macaroon'}, + 'macaroon-path': {'type': 'string'}}, 'type': 'object'}, 'ErrorResult': {'additionalProperties': False, - 'properties': {'Error': {'$ref': '#/definitions/Error'}}, - 'required': ['Error'], + 'properties': {'error': {'$ref': '#/definitions/Error'}}, 'type': 'object'}, 'ErrorResults': {'additionalProperties': False, - 'properties': {'Results': {'items': {'$ref': '#/definitions/ErrorResult'}, - 'type': 'array'}}, - 'required': ['Results'], - 'type': 'object'}, - 'Macaroon': {'additionalProperties': False, - 'properties': {'caveats': {'items': {'$ref': '#/definitions/caveat'}, - 'type': 'array'}, - 'data': {'items': {'type': 'integer'}, - 'type': 'array'}, - 'id': {'$ref': '#/definitions/packet'}, - 'location': {'$ref': '#/definitions/packet'}, - 'sig': {'items': {'type': 'integer'}, - 'type': 'array'}}, - 'required': ['data', - 'location', - 'id', - 'caveats', - 'sig'], - 'type': 'object'}, - 'caveat': {'additionalProperties': False, - 'properties': {'caveatId': {'$ref': '#/definitions/packet'}, - 'location': {'$ref': '#/definitions/packet'}, - 'verificationId': {'$ref': '#/definitions/packet'}}, - 'required': ['location', - 'caveatId', - 'verificationId'], - 'type': 'object'}, - 'packet': {'additionalProperties': False, - 'properties': {'headerLen': {'type': 'integer'}, - 'start': {'type': 'integer'}, - 'totalLen': {'type': 'integer'}}, - 'required': ['start', 'totalLen', 'headerLen'], - 'type': 'object'}}, + 'properties': {'results': {'items': {'$ref': '#/definitions/ErrorResult'}, + 'type': 'array'}}, + 'required': ['results'], + 'type': 'object'}, + 'Macaroon': {'additionalProperties': False, 'type': 'object'}}, 'properties': {'CleanupOldMetrics': {'properties': {'Params': {'$ref': '#/definitions/Entities'}, 'Result': {'$ref': '#/definitions/ErrorResults'}}, 'type': 'object'}, @@ -13172,7 +12874,7 @@ class MetricsManagerFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='MetricsManager', Request='CleanupOldMetrics', Version=1, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -13187,7 +12889,7 @@ class MetricsManagerFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='MetricsManager', Request='SendMetrics', Version=1, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -13196,73 +12898,45 @@ class MigrationFlagFacade(Type): name = 'MigrationFlag' version = 1 schema = {'definitions': {'Entities': {'additionalProperties': False, - 'properties': {'Entities': {'items': {'$ref': '#/definitions/Entity'}, + 'properties': {'entities': {'items': {'$ref': '#/definitions/Entity'}, 'type': 'array'}}, - 'required': ['Entities'], + 'required': ['entities'], 'type': 'object'}, 'Entity': {'additionalProperties': False, - 'properties': {'Tag': {'type': 'string'}}, - 'required': ['Tag'], + 'properties': {'tag': {'type': 'string'}}, + 'required': ['tag'], 'type': 'object'}, 'Error': {'additionalProperties': False, - 'properties': {'Code': {'type': 'string'}, - 'Info': {'$ref': '#/definitions/ErrorInfo'}, - 'Message': {'type': 'string'}}, - 'required': ['Message', 'Code'], + 'properties': {'code': {'type': 'string'}, + 'info': {'$ref': '#/definitions/ErrorInfo'}, + 'message': {'type': 'string'}}, + 'required': ['message', 'code'], 'type': 'object'}, 'ErrorInfo': {'additionalProperties': False, - 'properties': {'Macaroon': {'$ref': '#/definitions/Macaroon'}, - 'MacaroonPath': {'type': 'string'}}, + 'properties': {'macaroon': {'$ref': '#/definitions/Macaroon'}, + 'macaroon-path': {'type': 'string'}}, 'type': 'object'}, - 'Macaroon': {'additionalProperties': False, - 'properties': {'caveats': {'items': {'$ref': '#/definitions/caveat'}, - 'type': 'array'}, - 'data': {'items': {'type': 'integer'}, - 'type': 'array'}, - 'id': {'$ref': '#/definitions/packet'}, - 'location': {'$ref': '#/definitions/packet'}, - 'sig': {'items': {'type': 'integer'}, - 'type': 'array'}}, - 'required': ['data', - 'location', - 'id', - 'caveats', - 'sig'], - 'type': 'object'}, + 'Macaroon': {'additionalProperties': False, 'type': 'object'}, 'NotifyWatchResult': {'additionalProperties': False, - 'properties': {'Error': {'$ref': '#/definitions/Error'}, - 'NotifyWatcherId': {'type': 'string'}}, - 'required': ['NotifyWatcherId', 'Error'], + 'properties': {'NotifyWatcherId': {'type': 'string'}, + 'error': {'$ref': '#/definitions/Error'}}, + 'required': ['NotifyWatcherId'], 'type': 'object'}, 'NotifyWatchResults': {'additionalProperties': False, - 'properties': {'Results': {'items': {'$ref': '#/definitions/NotifyWatchResult'}, + 'properties': {'results': {'items': {'$ref': '#/definitions/NotifyWatchResult'}, 'type': 'array'}}, - 'required': ['Results'], + 'required': ['results'], 'type': 'object'}, 'PhaseResult': {'additionalProperties': False, - 'properties': {'Error': {'$ref': '#/definitions/Error'}, + 'properties': {'error': {'$ref': '#/definitions/Error'}, 'phase': {'type': 'string'}}, - 'required': ['phase', 'Error'], + 'required': ['phase'], 'type': 'object'}, 'PhaseResults': {'additionalProperties': False, - 'properties': {'Results': {'items': {'$ref': '#/definitions/PhaseResult'}, + 'properties': {'results': {'items': {'$ref': '#/definitions/PhaseResult'}, 'type': 'array'}}, - 'required': ['Results'], - 'type': 'object'}, - 'caveat': {'additionalProperties': False, - 'properties': {'caveatId': {'$ref': '#/definitions/packet'}, - 'location': {'$ref': '#/definitions/packet'}, - 'verificationId': {'$ref': '#/definitions/packet'}}, - 'required': ['location', - 'caveatId', - 'verificationId'], - 'type': 'object'}, - 'packet': {'additionalProperties': False, - 'properties': {'headerLen': {'type': 'integer'}, - 'start': {'type': 'integer'}, - 'totalLen': {'type': 'integer'}}, - 'required': ['start', 'totalLen', 'headerLen'], - 'type': 'object'}}, + 'required': ['results'], + 'type': 'object'}}, 'properties': {'Phase': {'properties': {'Params': {'$ref': '#/definitions/Entities'}, 'Result': {'$ref': '#/definitions/PhaseResults'}}, 'type': 'object'}, @@ -13281,7 +12955,7 @@ class MigrationFlagFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='MigrationFlag', Request='Phase', Version=1, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -13296,7 +12970,7 @@ class MigrationFlagFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='MigrationFlag', Request='Watch', Version=1, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -13305,14 +12979,14 @@ class MigrationMasterFacade(Type): name = 'MigrationMaster' version = 1 schema = {'definitions': {'Error': {'additionalProperties': False, - 'properties': {'Code': {'type': 'string'}, - 'Info': {'$ref': '#/definitions/ErrorInfo'}, - 'Message': {'type': 'string'}}, - 'required': ['Message', 'Code'], + 'properties': {'code': {'type': 'string'}, + 'info': {'$ref': '#/definitions/ErrorInfo'}, + 'message': {'type': 'string'}}, + 'required': ['message', 'code'], 'type': 'object'}, 'ErrorInfo': {'additionalProperties': False, - 'properties': {'Macaroon': {'$ref': '#/definitions/Macaroon'}, - 'MacaroonPath': {'type': 'string'}}, + 'properties': {'macaroon': {'$ref': '#/definitions/Macaroon'}, + 'macaroon-path': {'type': 'string'}}, 'type': 'object'}, 'FullMigrationStatus': {'additionalProperties': False, 'properties': {'attempt': {'type': 'integer'}, @@ -13322,21 +12996,7 @@ class MigrationMasterFacade(Type): 'attempt', 'phase'], 'type': 'object'}, - 'Macaroon': {'additionalProperties': False, - 'properties': {'caveats': {'items': {'$ref': '#/definitions/caveat'}, - 'type': 'array'}, - 'data': {'items': {'type': 'integer'}, - 'type': 'array'}, - 'id': {'$ref': '#/definitions/packet'}, - 'location': {'$ref': '#/definitions/packet'}, - 'sig': {'items': {'type': 'integer'}, - 'type': 'array'}}, - 'required': ['data', - 'location', - 'id', - 'caveats', - 'sig'], - 'type': 'object'}, + 'Macaroon': {'additionalProperties': False, 'type': 'object'}, 'ModelMigrationSpec': {'additionalProperties': False, 'properties': {'model-tag': {'type': 'string'}, 'target-info': {'$ref': '#/definitions/ModelMigrationTargetInfo'}}, @@ -13357,9 +13017,9 @@ class MigrationMasterFacade(Type): 'password'], 'type': 'object'}, 'NotifyWatchResult': {'additionalProperties': False, - 'properties': {'Error': {'$ref': '#/definitions/Error'}, - 'NotifyWatcherId': {'type': 'string'}}, - 'required': ['NotifyWatcherId', 'Error'], + 'properties': {'NotifyWatcherId': {'type': 'string'}, + 'error': {'$ref': '#/definitions/Error'}}, + 'required': ['NotifyWatcherId'], 'type': 'object'}, 'SerializedModel': {'additionalProperties': False, 'properties': {'bytes': {'items': {'type': 'integer'}, @@ -13369,21 +13029,7 @@ class MigrationMasterFacade(Type): 'SetMigrationPhaseArgs': {'additionalProperties': False, 'properties': {'phase': {'type': 'string'}}, 'required': ['phase'], - 'type': 'object'}, - 'caveat': {'additionalProperties': False, - 'properties': {'caveatId': {'$ref': '#/definitions/packet'}, - 'location': {'$ref': '#/definitions/packet'}, - 'verificationId': {'$ref': '#/definitions/packet'}}, - 'required': ['location', - 'caveatId', - 'verificationId'], - 'type': 'object'}, - 'packet': {'additionalProperties': False, - 'properties': {'headerLen': {'type': 'integer'}, - 'start': {'type': 'integer'}, - 'totalLen': {'type': 'integer'}}, - 'required': ['start', 'totalLen', 'headerLen'], - 'type': 'object'}}, + 'type': 'object'}}, 'properties': {'Export': {'properties': {'Result': {'$ref': '#/definitions/SerializedModel'}}, 'type': 'object'}, 'GetMigrationStatus': {'properties': {'Result': {'$ref': '#/definitions/FullMigrationStatus'}}, @@ -13444,7 +13090,7 @@ class MigrationMasterFacade(Type): async def Watch(self): ''' - Returns -> typing.Union[_ForwardRef('Error'), str] + Returns -> typing.Union[str, _ForwardRef('Error')] ''' # map input types to rpc msg params = dict() @@ -13458,49 +13104,21 @@ class MigrationMinionFacade(Type): name = 'MigrationMinion' version = 1 schema = {'definitions': {'Error': {'additionalProperties': False, - 'properties': {'Code': {'type': 'string'}, - 'Info': {'$ref': '#/definitions/ErrorInfo'}, - 'Message': {'type': 'string'}}, - 'required': ['Message', 'Code'], + 'properties': {'code': {'type': 'string'}, + 'info': {'$ref': '#/definitions/ErrorInfo'}, + 'message': {'type': 'string'}}, + 'required': ['message', 'code'], 'type': 'object'}, 'ErrorInfo': {'additionalProperties': False, - 'properties': {'Macaroon': {'$ref': '#/definitions/Macaroon'}, - 'MacaroonPath': {'type': 'string'}}, + 'properties': {'macaroon': {'$ref': '#/definitions/Macaroon'}, + 'macaroon-path': {'type': 'string'}}, 'type': 'object'}, - 'Macaroon': {'additionalProperties': False, - 'properties': {'caveats': {'items': {'$ref': '#/definitions/caveat'}, - 'type': 'array'}, - 'data': {'items': {'type': 'integer'}, - 'type': 'array'}, - 'id': {'$ref': '#/definitions/packet'}, - 'location': {'$ref': '#/definitions/packet'}, - 'sig': {'items': {'type': 'integer'}, - 'type': 'array'}}, - 'required': ['data', - 'location', - 'id', - 'caveats', - 'sig'], - 'type': 'object'}, + 'Macaroon': {'additionalProperties': False, 'type': 'object'}, 'NotifyWatchResult': {'additionalProperties': False, - 'properties': {'Error': {'$ref': '#/definitions/Error'}, - 'NotifyWatcherId': {'type': 'string'}}, - 'required': ['NotifyWatcherId', 'Error'], - 'type': 'object'}, - 'caveat': {'additionalProperties': False, - 'properties': {'caveatId': {'$ref': '#/definitions/packet'}, - 'location': {'$ref': '#/definitions/packet'}, - 'verificationId': {'$ref': '#/definitions/packet'}}, - 'required': ['location', - 'caveatId', - 'verificationId'], - 'type': 'object'}, - 'packet': {'additionalProperties': False, - 'properties': {'headerLen': {'type': 'integer'}, - 'start': {'type': 'integer'}, - 'totalLen': {'type': 'integer'}}, - 'required': ['start', 'totalLen', 'headerLen'], - 'type': 'object'}}, + 'properties': {'NotifyWatcherId': {'type': 'string'}, + 'error': {'$ref': '#/definitions/Error'}}, + 'required': ['NotifyWatcherId'], + 'type': 'object'}}, 'properties': {'Watch': {'properties': {'Result': {'$ref': '#/definitions/NotifyWatchResult'}}, 'type': 'object'}}, 'type': 'object'} @@ -13510,7 +13128,7 @@ class MigrationMinionFacade(Type): async def Watch(self): ''' - Returns -> typing.Union[_ForwardRef('Error'), str] + Returns -> typing.Union[str, _ForwardRef('Error')] ''' # map input types to rpc msg params = dict() @@ -13643,107 +13261,83 @@ class ModelManagerFacade(Type): name = 'ModelManager' version = 2 schema = {'definitions': {'Entities': {'additionalProperties': False, - 'properties': {'Entities': {'items': {'$ref': '#/definitions/Entity'}, + 'properties': {'entities': {'items': {'$ref': '#/definitions/Entity'}, 'type': 'array'}}, - 'required': ['Entities'], + 'required': ['entities'], 'type': 'object'}, 'Entity': {'additionalProperties': False, - 'properties': {'Tag': {'type': 'string'}}, - 'required': ['Tag'], + 'properties': {'tag': {'type': 'string'}}, + 'required': ['tag'], 'type': 'object'}, 'EntityStatus': {'additionalProperties': False, - 'properties': {'Data': {'patternProperties': {'.*': {'additionalProperties': True, + 'properties': {'data': {'patternProperties': {'.*': {'additionalProperties': True, 'type': 'object'}}, 'type': 'object'}, - 'Info': {'type': 'string'}, - 'Since': {'format': 'date-time', + 'info': {'type': 'string'}, + 'since': {'format': 'date-time', 'type': 'string'}, - 'Status': {'type': 'string'}}, - 'required': ['Status', - 'Info', - 'Data', - 'Since'], + 'status': {'type': 'string'}}, + 'required': ['status', 'info', 'since'], 'type': 'object'}, 'Error': {'additionalProperties': False, - 'properties': {'Code': {'type': 'string'}, - 'Info': {'$ref': '#/definitions/ErrorInfo'}, - 'Message': {'type': 'string'}}, - 'required': ['Message', 'Code'], + 'properties': {'code': {'type': 'string'}, + 'info': {'$ref': '#/definitions/ErrorInfo'}, + 'message': {'type': 'string'}}, + 'required': ['message', 'code'], 'type': 'object'}, 'ErrorInfo': {'additionalProperties': False, - 'properties': {'Macaroon': {'$ref': '#/definitions/Macaroon'}, - 'MacaroonPath': {'type': 'string'}}, + 'properties': {'macaroon': {'$ref': '#/definitions/Macaroon'}, + 'macaroon-path': {'type': 'string'}}, 'type': 'object'}, 'ErrorResult': {'additionalProperties': False, - 'properties': {'Error': {'$ref': '#/definitions/Error'}}, - 'required': ['Error'], + 'properties': {'error': {'$ref': '#/definitions/Error'}}, 'type': 'object'}, 'ErrorResults': {'additionalProperties': False, - 'properties': {'Results': {'items': {'$ref': '#/definitions/ErrorResult'}, + 'properties': {'results': {'items': {'$ref': '#/definitions/ErrorResult'}, 'type': 'array'}}, - 'required': ['Results'], + 'required': ['results'], 'type': 'object'}, - 'Macaroon': {'additionalProperties': False, - 'properties': {'caveats': {'items': {'$ref': '#/definitions/caveat'}, - 'type': 'array'}, - 'data': {'items': {'type': 'integer'}, - 'type': 'array'}, - 'id': {'$ref': '#/definitions/packet'}, - 'location': {'$ref': '#/definitions/packet'}, - 'sig': {'items': {'type': 'integer'}, - 'type': 'array'}}, - 'required': ['data', - 'location', - 'id', - 'caveats', - 'sig'], - 'type': 'object'}, + 'Macaroon': {'additionalProperties': False, 'type': 'object'}, 'Model': {'additionalProperties': False, - 'properties': {'Name': {'type': 'string'}, - 'OwnerTag': {'type': 'string'}, - 'UUID': {'type': 'string'}}, - 'required': ['Name', 'UUID', 'OwnerTag'], + 'properties': {'name': {'type': 'string'}, + 'owner-tag': {'type': 'string'}, + 'uuid': {'type': 'string'}}, + 'required': ['name', 'uuid', 'owner-tag'], 'type': 'object'}, - 'ModelConfigResult': {'additionalProperties': False, - 'properties': {'Config': {'patternProperties': {'.*': {'additionalProperties': True, - 'type': 'object'}}, - 'type': 'object'}}, - 'required': ['Config'], - 'type': 'object'}, 'ModelCreateArgs': {'additionalProperties': False, - 'properties': {'Account': {'patternProperties': {'.*': {'additionalProperties': True, - 'type': 'object'}}, - 'type': 'object'}, - 'Config': {'patternProperties': {'.*': {'additionalProperties': True, + 'properties': {'config': {'patternProperties': {'.*': {'additionalProperties': True, 'type': 'object'}}, 'type': 'object'}, - 'OwnerTag': {'type': 'string'}}, - 'required': ['OwnerTag', - 'Account', - 'Config'], + 'credential': {'type': 'string'}, + 'name': {'type': 'string'}, + 'owner-tag': {'type': 'string'}, + 'region': {'type': 'string'}}, + 'required': ['name', 'owner-tag'], 'type': 'object'}, 'ModelInfo': {'additionalProperties': False, - 'properties': {'Cloud': {'type': 'string'}, - 'DefaultSeries': {'type': 'string'}, - 'Life': {'type': 'string'}, - 'Name': {'type': 'string'}, - 'OwnerTag': {'type': 'string'}, - 'ProviderType': {'type': 'string'}, - 'ServerUUID': {'type': 'string'}, - 'Status': {'$ref': '#/definitions/EntityStatus'}, - 'UUID': {'type': 'string'}, - 'Users': {'items': {'$ref': '#/definitions/ModelUserInfo'}, - 'type': 'array'}}, - 'required': ['Name', - 'UUID', - 'ServerUUID', - 'ProviderType', - 'DefaultSeries', - 'Cloud', - 'OwnerTag', - 'Life', - 'Status', - 'Users'], + 'properties': {'cloud': {'type': 'string'}, + 'cloud-credential': {'type': 'string'}, + 'cloud-region': {'type': 'string'}, + 'controller-uuid': {'type': 'string'}, + 'default-series': {'type': 'string'}, + 'life': {'type': 'string'}, + 'name': {'type': 'string'}, + 'owner-tag': {'type': 'string'}, + 'provider-type': {'type': 'string'}, + 'status': {'$ref': '#/definitions/EntityStatus'}, + 'users': {'items': {'$ref': '#/definitions/ModelUserInfo'}, + 'type': 'array'}, + 'uuid': {'type': 'string'}}, + 'required': ['name', + 'uuid', + 'controller-uuid', + 'provider-type', + 'default-series', + 'cloud', + 'owner-tag', + 'life', + 'status', + 'users'], 'type': 'object'}, 'ModelInfoResult': {'additionalProperties': False, 'properties': {'error': {'$ref': '#/definitions/Error'}, @@ -13754,20 +13348,15 @@ class ModelManagerFacade(Type): 'type': 'array'}}, 'required': ['results'], 'type': 'object'}, - 'ModelSkeletonConfigArgs': {'additionalProperties': False, - 'properties': {'Provider': {'type': 'string'}, - 'Region': {'type': 'string'}}, - 'required': ['Provider', 'Region'], - 'type': 'object'}, 'ModelUserInfo': {'additionalProperties': False, 'properties': {'access': {'type': 'string'}, - 'displayname': {'type': 'string'}, - 'lastconnection': {'format': 'date-time', - 'type': 'string'}, + 'display-name': {'type': 'string'}, + 'last-connection': {'format': 'date-time', + 'type': 'string'}, 'user': {'type': 'string'}}, 'required': ['user', - 'displayname', - 'lastconnection', + 'display-name', + 'last-connection', 'access'], 'type': 'object'}, 'ModifyModelAccess': {'additionalProperties': False, @@ -13786,36 +13375,20 @@ class ModelManagerFacade(Type): 'required': ['changes'], 'type': 'object'}, 'UserModel': {'additionalProperties': False, - 'properties': {'LastConnection': {'format': 'date-time', - 'type': 'string'}, - 'Model': {'$ref': '#/definitions/Model'}}, - 'required': ['Model', 'LastConnection'], + 'properties': {'last-connection': {'format': 'date-time', + 'type': 'string'}, + 'model': {'$ref': '#/definitions/Model'}}, + 'required': ['model', 'last-connection'], 'type': 'object'}, 'UserModelList': {'additionalProperties': False, - 'properties': {'UserModels': {'items': {'$ref': '#/definitions/UserModel'}, - 'type': 'array'}}, - 'required': ['UserModels'], - 'type': 'object'}, - 'caveat': {'additionalProperties': False, - 'properties': {'caveatId': {'$ref': '#/definitions/packet'}, - 'location': {'$ref': '#/definitions/packet'}, - 'verificationId': {'$ref': '#/definitions/packet'}}, - 'required': ['location', - 'caveatId', - 'verificationId'], - 'type': 'object'}, - 'packet': {'additionalProperties': False, - 'properties': {'headerLen': {'type': 'integer'}, - 'start': {'type': 'integer'}, - 'totalLen': {'type': 'integer'}}, - 'required': ['start', 'totalLen', 'headerLen'], - 'type': 'object'}}, - 'properties': {'ConfigSkeleton': {'properties': {'Params': {'$ref': '#/definitions/ModelSkeletonConfigArgs'}, - 'Result': {'$ref': '#/definitions/ModelConfigResult'}}, - 'type': 'object'}, - 'CreateModel': {'properties': {'Params': {'$ref': '#/definitions/ModelCreateArgs'}, - 'Result': {'$ref': '#/definitions/Model'}}, + 'properties': {'user-models': {'items': {'$ref': '#/definitions/UserModel'}, + 'type': 'array'}}, + 'required': ['user-models'], + 'type': 'object'}}, + 'properties': {'CreateModel': {'properties': {'Params': {'$ref': '#/definitions/ModelCreateArgs'}, + 'Result': {'$ref': '#/definitions/ModelInfo'}}, 'type': 'object'}, + 'DestroyModel': {'type': 'object'}, 'ListModels': {'properties': {'Params': {'$ref': '#/definitions/Entity'}, 'Result': {'$ref': '#/definitions/UserModelList'}}, 'type': 'object'}, @@ -13828,37 +13401,39 @@ class ModelManagerFacade(Type): 'type': 'object'} - @ReturnMapping(ModelConfigResult) - async def ConfigSkeleton(self, provider, region): + @ReturnMapping(ModelInfo) + async def CreateModel(self, config, credential, name, owner_tag, region): ''' - provider : str + config : typing.Mapping[str, typing.Any] + credential : str + name : str + owner_tag : str region : str - Returns -> typing.Mapping[str, typing.Any] + Returns -> typing.Union[_ForwardRef('EntityStatus'), typing.Sequence[~ModelUserInfo]] ''' # map input types to rpc msg params = dict() - msg = dict(Type='ModelManager', Request='ConfigSkeleton', Version=2, Params=params) - params['Provider'] = provider - params['Region'] = region + msg = dict(Type='ModelManager', Request='CreateModel', Version=2, Params=params) + params['config'] = config + params['credential'] = credential + params['name'] = name + params['owner-tag'] = owner_tag + params['region'] = region reply = await self.rpc(msg) return reply - @ReturnMapping(Model) - async def CreateModel(self, account, config, ownertag): + @ReturnMapping(None) + async def DestroyModel(self): ''' - account : typing.Mapping[str, typing.Any] - config : typing.Mapping[str, typing.Any] - ownertag : str - Returns -> + + Returns -> None ''' # map input types to rpc msg params = dict() - msg = dict(Type='ModelManager', Request='CreateModel', Version=2, Params=params) - params['Account'] = account - params['Config'] = config - params['OwnerTag'] = ownertag + msg = dict(Type='ModelManager', Request='DestroyModel', Version=2, Params=params) + reply = await self.rpc(msg) return reply @@ -13873,7 +13448,7 @@ class ModelManagerFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='ModelManager', Request='ListModels', Version=2, Params=params) - params['Tag'] = tag + params['tag'] = tag reply = await self.rpc(msg) return reply @@ -13888,7 +13463,7 @@ class ModelManagerFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='ModelManager', Request='ModelInfo', Version=2, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -13984,17 +13559,17 @@ class ProvisionerFacade(Type): name = 'Provisioner' version = 3 schema = {'definitions': {'APIHostPortsResult': {'additionalProperties': False, - 'properties': {'Servers': {'items': {'items': {'$ref': '#/definitions/HostPort'}, + 'properties': {'servers': {'items': {'items': {'$ref': '#/definitions/HostPort'}, 'type': 'array'}, 'type': 'array'}}, - 'required': ['Servers'], + 'required': ['servers'], 'type': 'object'}, 'Address': {'additionalProperties': False, - 'properties': {'Scope': {'type': 'string'}, - 'SpaceName': {'type': 'string'}, - 'Type': {'type': 'string'}, - 'Value': {'type': 'string'}}, - 'required': ['Value', 'Type', 'Scope'], + 'properties': {'scope': {'type': 'string'}, + 'space-name': {'type': 'string'}, + 'type': {'type': 'string'}, + 'value': {'type': 'string'}}, + 'required': ['value', 'type', 'scope'], 'type': 'object'}, 'Binary': {'additionalProperties': False, 'properties': {'Arch': {'type': 'string'}, @@ -14003,23 +13578,23 @@ class ProvisionerFacade(Type): 'required': ['Number', 'Series', 'Arch'], 'type': 'object'}, 'BytesResult': {'additionalProperties': False, - 'properties': {'Result': {'items': {'type': 'integer'}, + 'properties': {'result': {'items': {'type': 'integer'}, 'type': 'array'}}, - 'required': ['Result'], + 'required': ['result'], 'type': 'object'}, 'CloudImageMetadata': {'additionalProperties': False, 'properties': {'arch': {'type': 'string'}, - 'image_id': {'type': 'string'}, + 'image-id': {'type': 'string'}, 'priority': {'type': 'integer'}, 'region': {'type': 'string'}, - 'root_storage_size': {'type': 'integer'}, - 'root_storage_type': {'type': 'string'}, + 'root-storage-size': {'type': 'integer'}, + 'root-storage-type': {'type': 'string'}, 'series': {'type': 'string'}, 'source': {'type': 'string'}, 'stream': {'type': 'string'}, 'version': {'type': 'string'}, - 'virt_type': {'type': 'string'}}, - 'required': ['image_id', + 'virt-type': {'type': 'string'}}, + 'required': ['image-id', 'region', 'version', 'series', @@ -14028,256 +13603,245 @@ class ProvisionerFacade(Type): 'priority'], 'type': 'object'}, 'ConstraintsResult': {'additionalProperties': False, - 'properties': {'Constraints': {'$ref': '#/definitions/Value'}, - 'Error': {'$ref': '#/definitions/Error'}}, - 'required': ['Error', 'Constraints'], + 'properties': {'constraints': {'$ref': '#/definitions/Value'}, + 'error': {'$ref': '#/definitions/Error'}}, + 'required': ['constraints'], 'type': 'object'}, 'ConstraintsResults': {'additionalProperties': False, - 'properties': {'Results': {'items': {'$ref': '#/definitions/ConstraintsResult'}, + 'properties': {'results': {'items': {'$ref': '#/definitions/ConstraintsResult'}, 'type': 'array'}}, - 'required': ['Results'], + 'required': ['results'], 'type': 'object'}, 'ContainerConfig': {'additionalProperties': False, - 'properties': {'AllowLXCLoopMounts': {'type': 'boolean'}, - 'AptMirror': {'type': 'string'}, - 'AptProxy': {'$ref': '#/definitions/Settings'}, - 'AuthorizedKeys': {'type': 'string'}, - 'ProviderType': {'type': 'string'}, - 'Proxy': {'$ref': '#/definitions/Settings'}, - 'SSLHostnameVerification': {'type': 'boolean'}, - 'UpdateBehavior': {'$ref': '#/definitions/UpdateBehavior'}}, - 'required': ['ProviderType', - 'AuthorizedKeys', - 'SSLHostnameVerification', - 'Proxy', - 'AptProxy', - 'AptMirror', - 'AllowLXCLoopMounts', + 'properties': {'UpdateBehavior': {'$ref': '#/definitions/UpdateBehavior'}, + 'apt-mirror': {'type': 'string'}, + 'apt-proxy': {'$ref': '#/definitions/Settings'}, + 'authorized-keys': {'type': 'string'}, + 'provider-type': {'type': 'string'}, + 'proxy': {'$ref': '#/definitions/Settings'}, + 'ssl-hostname-verification': {'type': 'boolean'}}, + 'required': ['provider-type', + 'authorized-keys', + 'ssl-hostname-verification', + 'proxy', + 'apt-proxy', + 'apt-mirror', 'UpdateBehavior'], 'type': 'object'}, 'ContainerManagerConfig': {'additionalProperties': False, - 'properties': {'ManagerConfig': {'patternProperties': {'.*': {'type': 'string'}}, - 'type': 'object'}}, - 'required': ['ManagerConfig'], + 'properties': {'config': {'patternProperties': {'.*': {'type': 'string'}}, + 'type': 'object'}}, + 'required': ['config'], 'type': 'object'}, 'ContainerManagerConfigParams': {'additionalProperties': False, - 'properties': {'Type': {'type': 'string'}}, - 'required': ['Type'], + 'properties': {'type': {'type': 'string'}}, + 'required': ['type'], 'type': 'object'}, + 'ControllerConfigResult': {'additionalProperties': False, + 'properties': {'config': {'patternProperties': {'.*': {'additionalProperties': True, + 'type': 'object'}}, + 'type': 'object'}}, + 'required': ['config'], + 'type': 'object'}, 'DistributionGroupResult': {'additionalProperties': False, - 'properties': {'Error': {'$ref': '#/definitions/Error'}, - 'Result': {'items': {'type': 'string'}, + 'properties': {'error': {'$ref': '#/definitions/Error'}, + 'result': {'items': {'type': 'string'}, 'type': 'array'}}, - 'required': ['Error', 'Result'], + 'required': ['result'], 'type': 'object'}, 'DistributionGroupResults': {'additionalProperties': False, - 'properties': {'Results': {'items': {'$ref': '#/definitions/DistributionGroupResult'}, + 'properties': {'results': {'items': {'$ref': '#/definitions/DistributionGroupResult'}, 'type': 'array'}}, - 'required': ['Results'], + 'required': ['results'], 'type': 'object'}, 'Entities': {'additionalProperties': False, - 'properties': {'Entities': {'items': {'$ref': '#/definitions/Entity'}, + 'properties': {'entities': {'items': {'$ref': '#/definitions/Entity'}, 'type': 'array'}}, - 'required': ['Entities'], + 'required': ['entities'], 'type': 'object'}, 'Entity': {'additionalProperties': False, - 'properties': {'Tag': {'type': 'string'}}, - 'required': ['Tag'], + 'properties': {'tag': {'type': 'string'}}, + 'required': ['tag'], 'type': 'object'}, 'EntityPassword': {'additionalProperties': False, - 'properties': {'Password': {'type': 'string'}, - 'Tag': {'type': 'string'}}, - 'required': ['Tag', 'Password'], + 'properties': {'password': {'type': 'string'}, + 'tag': {'type': 'string'}}, + 'required': ['tag', 'password'], 'type': 'object'}, 'EntityPasswords': {'additionalProperties': False, - 'properties': {'Changes': {'items': {'$ref': '#/definitions/EntityPassword'}, + 'properties': {'changes': {'items': {'$ref': '#/definitions/EntityPassword'}, 'type': 'array'}}, - 'required': ['Changes'], + 'required': ['changes'], 'type': 'object'}, 'EntityStatusArgs': {'additionalProperties': False, - 'properties': {'Data': {'patternProperties': {'.*': {'additionalProperties': True, + 'properties': {'data': {'patternProperties': {'.*': {'additionalProperties': True, 'type': 'object'}}, 'type': 'object'}, - 'Info': {'type': 'string'}, - 'Status': {'type': 'string'}, - 'Tag': {'type': 'string'}}, - 'required': ['Tag', - 'Status', - 'Info', - 'Data'], + 'info': {'type': 'string'}, + 'status': {'type': 'string'}, + 'tag': {'type': 'string'}}, + 'required': ['tag', + 'status', + 'info', + 'data'], 'type': 'object'}, 'Error': {'additionalProperties': False, - 'properties': {'Code': {'type': 'string'}, - 'Info': {'$ref': '#/definitions/ErrorInfo'}, - 'Message': {'type': 'string'}}, - 'required': ['Message', 'Code'], + 'properties': {'code': {'type': 'string'}, + 'info': {'$ref': '#/definitions/ErrorInfo'}, + 'message': {'type': 'string'}}, + 'required': ['message', 'code'], 'type': 'object'}, 'ErrorInfo': {'additionalProperties': False, - 'properties': {'Macaroon': {'$ref': '#/definitions/Macaroon'}, - 'MacaroonPath': {'type': 'string'}}, + 'properties': {'macaroon': {'$ref': '#/definitions/Macaroon'}, + 'macaroon-path': {'type': 'string'}}, 'type': 'object'}, 'ErrorResult': {'additionalProperties': False, - 'properties': {'Error': {'$ref': '#/definitions/Error'}}, - 'required': ['Error'], + 'properties': {'error': {'$ref': '#/definitions/Error'}}, 'type': 'object'}, 'ErrorResults': {'additionalProperties': False, - 'properties': {'Results': {'items': {'$ref': '#/definitions/ErrorResult'}, + 'properties': {'results': {'items': {'$ref': '#/definitions/ErrorResult'}, 'type': 'array'}}, - 'required': ['Results'], + 'required': ['results'], 'type': 'object'}, 'FindToolsParams': {'additionalProperties': False, - 'properties': {'Arch': {'type': 'string'}, - 'MajorVersion': {'type': 'integer'}, - 'MinorVersion': {'type': 'integer'}, - 'Number': {'$ref': '#/definitions/Number'}, - 'Series': {'type': 'string'}}, - 'required': ['Number', - 'MajorVersion', - 'MinorVersion', - 'Arch', - 'Series'], + 'properties': {'arch': {'type': 'string'}, + 'major': {'type': 'integer'}, + 'minor': {'type': 'integer'}, + 'number': {'$ref': '#/definitions/Number'}, + 'series': {'type': 'string'}}, + 'required': ['number', + 'major', + 'minor', + 'arch', + 'series'], 'type': 'object'}, 'FindToolsResult': {'additionalProperties': False, - 'properties': {'Error': {'$ref': '#/definitions/Error'}, - 'List': {'items': {'$ref': '#/definitions/Tools'}, + 'properties': {'error': {'$ref': '#/definitions/Error'}, + 'list': {'items': {'$ref': '#/definitions/Tools'}, 'type': 'array'}}, - 'required': ['List', 'Error'], + 'required': ['list'], 'type': 'object'}, 'HardwareCharacteristics': {'additionalProperties': False, - 'properties': {'Arch': {'type': 'string'}, - 'AvailabilityZone': {'type': 'string'}, - 'CpuCores': {'type': 'integer'}, - 'CpuPower': {'type': 'integer'}, - 'Mem': {'type': 'integer'}, - 'RootDisk': {'type': 'integer'}, - 'Tags': {'items': {'type': 'string'}, + 'properties': {'arch': {'type': 'string'}, + 'availability-zone': {'type': 'string'}, + 'cpu-cores': {'type': 'integer'}, + 'cpu-power': {'type': 'integer'}, + 'mem': {'type': 'integer'}, + 'root-disk': {'type': 'integer'}, + 'tags': {'items': {'type': 'string'}, 'type': 'array'}}, 'type': 'object'}, 'HostPort': {'additionalProperties': False, 'properties': {'Address': {'$ref': '#/definitions/Address'}, - 'Port': {'type': 'integer'}}, - 'required': ['Address', 'Port'], + 'port': {'type': 'integer'}}, + 'required': ['Address', 'port'], 'type': 'object'}, 'InstanceInfo': {'additionalProperties': False, - 'properties': {'Characteristics': {'$ref': '#/definitions/HardwareCharacteristics'}, - 'InstanceId': {'type': 'string'}, - 'NetworkConfig': {'items': {'$ref': '#/definitions/NetworkConfig'}, - 'type': 'array'}, - 'Nonce': {'type': 'string'}, - 'Tag': {'type': 'string'}, - 'VolumeAttachments': {'patternProperties': {'.*': {'$ref': '#/definitions/VolumeAttachmentInfo'}}, - 'type': 'object'}, - 'Volumes': {'items': {'$ref': '#/definitions/Volume'}, + 'properties': {'characteristics': {'$ref': '#/definitions/HardwareCharacteristics'}, + 'instance-id': {'type': 'string'}, + 'network-config': {'items': {'$ref': '#/definitions/NetworkConfig'}, + 'type': 'array'}, + 'nonce': {'type': 'string'}, + 'tag': {'type': 'string'}, + 'volume-attachments': {'patternProperties': {'.*': {'$ref': '#/definitions/VolumeAttachmentInfo'}}, + 'type': 'object'}, + 'volumes': {'items': {'$ref': '#/definitions/Volume'}, 'type': 'array'}}, - 'required': ['Tag', - 'InstanceId', - 'Nonce', - 'Characteristics', - 'Volumes', - 'VolumeAttachments', - 'NetworkConfig'], + 'required': ['tag', + 'instance-id', + 'nonce', + 'characteristics', + 'volumes', + 'volume-attachments', + 'network-config'], 'type': 'object'}, 'InstancesInfo': {'additionalProperties': False, - 'properties': {'Machines': {'items': {'$ref': '#/definitions/InstanceInfo'}, + 'properties': {'machines': {'items': {'$ref': '#/definitions/InstanceInfo'}, 'type': 'array'}}, - 'required': ['Machines'], + 'required': ['machines'], 'type': 'object'}, 'LifeResult': {'additionalProperties': False, - 'properties': {'Error': {'$ref': '#/definitions/Error'}, - 'Life': {'type': 'string'}}, - 'required': ['Life', 'Error'], + 'properties': {'error': {'$ref': '#/definitions/Error'}, + 'life': {'type': 'string'}}, + 'required': ['life'], 'type': 'object'}, 'LifeResults': {'additionalProperties': False, - 'properties': {'Results': {'items': {'$ref': '#/definitions/LifeResult'}, + 'properties': {'results': {'items': {'$ref': '#/definitions/LifeResult'}, 'type': 'array'}}, - 'required': ['Results'], + 'required': ['results'], 'type': 'object'}, - 'Macaroon': {'additionalProperties': False, - 'properties': {'caveats': {'items': {'$ref': '#/definitions/caveat'}, - 'type': 'array'}, - 'data': {'items': {'type': 'integer'}, - 'type': 'array'}, - 'id': {'$ref': '#/definitions/packet'}, - 'location': {'$ref': '#/definitions/packet'}, - 'sig': {'items': {'type': 'integer'}, - 'type': 'array'}}, - 'required': ['data', - 'location', - 'id', - 'caveats', - 'sig'], - 'type': 'object'}, + 'Macaroon': {'additionalProperties': False, 'type': 'object'}, 'MachineContainers': {'additionalProperties': False, - 'properties': {'ContainerTypes': {'items': {'type': 'string'}, - 'type': 'array'}, - 'MachineTag': {'type': 'string'}}, - 'required': ['MachineTag', - 'ContainerTypes'], + 'properties': {'container-types': {'items': {'type': 'string'}, + 'type': 'array'}, + 'machine-tag': {'type': 'string'}}, + 'required': ['machine-tag', + 'container-types'], 'type': 'object'}, 'MachineContainersParams': {'additionalProperties': False, - 'properties': {'Params': {'items': {'$ref': '#/definitions/MachineContainers'}, + 'properties': {'params': {'items': {'$ref': '#/definitions/MachineContainers'}, 'type': 'array'}}, - 'required': ['Params'], + 'required': ['params'], 'type': 'object'}, 'MachineNetworkConfigResult': {'additionalProperties': False, - 'properties': {'Error': {'$ref': '#/definitions/Error'}, - 'Info': {'items': {'$ref': '#/definitions/NetworkConfig'}, + 'properties': {'error': {'$ref': '#/definitions/Error'}, + 'info': {'items': {'$ref': '#/definitions/NetworkConfig'}, 'type': 'array'}}, - 'required': ['Error', 'Info'], + 'required': ['info'], 'type': 'object'}, 'MachineNetworkConfigResults': {'additionalProperties': False, - 'properties': {'Results': {'items': {'$ref': '#/definitions/MachineNetworkConfigResult'}, + 'properties': {'results': {'items': {'$ref': '#/definitions/MachineNetworkConfigResult'}, 'type': 'array'}}, - 'required': ['Results'], + 'required': ['results'], 'type': 'object'}, 'ModelConfigResult': {'additionalProperties': False, - 'properties': {'Config': {'patternProperties': {'.*': {'additionalProperties': True, + 'properties': {'config': {'patternProperties': {'.*': {'additionalProperties': True, 'type': 'object'}}, 'type': 'object'}}, - 'required': ['Config'], + 'required': ['config'], 'type': 'object'}, 'NetworkConfig': {'additionalProperties': False, - 'properties': {'Address': {'type': 'string'}, - 'CIDR': {'type': 'string'}, - 'ConfigType': {'type': 'string'}, - 'DNSSearchDomains': {'items': {'type': 'string'}, - 'type': 'array'}, - 'DNSServers': {'items': {'type': 'string'}, - 'type': 'array'}, - 'DeviceIndex': {'type': 'integer'}, - 'Disabled': {'type': 'boolean'}, - 'GatewayAddress': {'type': 'string'}, - 'InterfaceName': {'type': 'string'}, - 'InterfaceType': {'type': 'string'}, - 'MACAddress': {'type': 'string'}, - 'MTU': {'type': 'integer'}, - 'NoAutoStart': {'type': 'boolean'}, - 'ParentInterfaceName': {'type': 'string'}, - 'ProviderAddressId': {'type': 'string'}, - 'ProviderId': {'type': 'string'}, - 'ProviderSpaceId': {'type': 'string'}, - 'ProviderSubnetId': {'type': 'string'}, - 'ProviderVLANId': {'type': 'string'}, - 'VLANTag': {'type': 'integer'}}, - 'required': ['DeviceIndex', - 'MACAddress', - 'CIDR', - 'MTU', - 'ProviderId', - 'ProviderSubnetId', - 'ProviderSpaceId', - 'ProviderAddressId', - 'ProviderVLANId', - 'VLANTag', - 'InterfaceName', - 'ParentInterfaceName', - 'InterfaceType', - 'Disabled'], + 'properties': {'address': {'type': 'string'}, + 'cidr': {'type': 'string'}, + 'config-type': {'type': 'string'}, + 'device-index': {'type': 'integer'}, + 'disabled': {'type': 'boolean'}, + 'dns-search-domains': {'items': {'type': 'string'}, + 'type': 'array'}, + 'dns-servers': {'items': {'type': 'string'}, + 'type': 'array'}, + 'gateway-address': {'type': 'string'}, + 'interface-name': {'type': 'string'}, + 'interface-type': {'type': 'string'}, + 'mac-address': {'type': 'string'}, + 'mtu': {'type': 'integer'}, + 'no-auto-start': {'type': 'boolean'}, + 'parent-interface-name': {'type': 'string'}, + 'provider-address-id': {'type': 'string'}, + 'provider-id': {'type': 'string'}, + 'provider-space-id': {'type': 'string'}, + 'provider-subnet-id': {'type': 'string'}, + 'provider-vlan-id': {'type': 'string'}, + 'vlan-tag': {'type': 'integer'}}, + 'required': ['device-index', + 'mac-address', + 'cidr', + 'mtu', + 'provider-id', + 'provider-subnet-id', + 'provider-space-id', + 'provider-address-id', + 'provider-vlan-id', + 'vlan-tag', + 'interface-name', + 'parent-interface-name', + 'interface-type', + 'disabled'], 'type': 'object'}, 'NotifyWatchResult': {'additionalProperties': False, - 'properties': {'Error': {'$ref': '#/definitions/Error'}, - 'NotifyWatcherId': {'type': 'string'}}, - 'required': ['NotifyWatcherId', 'Error'], + 'properties': {'NotifyWatcherId': {'type': 'string'}, + 'error': {'$ref': '#/definitions/Error'}}, + 'required': ['NotifyWatcherId'], 'type': 'object'}, 'Number': {'additionalProperties': False, 'properties': {'Build': {'type': 'integer'}, @@ -14292,46 +13856,44 @@ class ProvisionerFacade(Type): 'Build'], 'type': 'object'}, 'ProvisioningInfo': {'additionalProperties': False, - 'properties': {'Constraints': {'$ref': '#/definitions/Value'}, - 'EndpointBindings': {'patternProperties': {'.*': {'type': 'string'}}, - 'type': 'object'}, - 'ImageMetadata': {'items': {'$ref': '#/definitions/CloudImageMetadata'}, - 'type': 'array'}, - 'Jobs': {'items': {'type': 'string'}, + 'properties': {'constraints': {'$ref': '#/definitions/Value'}, + 'controller-config': {'patternProperties': {'.*': {'additionalProperties': True, + 'type': 'object'}}, + 'type': 'object'}, + 'endpoint-bindings': {'patternProperties': {'.*': {'type': 'string'}}, + 'type': 'object'}, + 'image-metadata': {'items': {'$ref': '#/definitions/CloudImageMetadata'}, + 'type': 'array'}, + 'jobs': {'items': {'type': 'string'}, 'type': 'array'}, - 'Placement': {'type': 'string'}, - 'Series': {'type': 'string'}, - 'SubnetsToZones': {'patternProperties': {'.*': {'items': {'type': 'string'}, - 'type': 'array'}}, - 'type': 'object'}, - 'Tags': {'patternProperties': {'.*': {'type': 'string'}}, + 'placement': {'type': 'string'}, + 'series': {'type': 'string'}, + 'subnets-to-zones': {'patternProperties': {'.*': {'items': {'type': 'string'}, + 'type': 'array'}}, + 'type': 'object'}, + 'tags': {'patternProperties': {'.*': {'type': 'string'}}, 'type': 'object'}, - 'Volumes': {'items': {'$ref': '#/definitions/VolumeParams'}, + 'volumes': {'items': {'$ref': '#/definitions/VolumeParams'}, 'type': 'array'}}, - 'required': ['Constraints', - 'Series', - 'Placement', - 'Jobs', - 'Volumes', - 'Tags', - 'SubnetsToZones', - 'ImageMetadata', - 'EndpointBindings'], + 'required': ['constraints', + 'series', + 'placement', + 'jobs'], 'type': 'object'}, 'ProvisioningInfoResult': {'additionalProperties': False, - 'properties': {'Error': {'$ref': '#/definitions/Error'}, - 'Result': {'$ref': '#/definitions/ProvisioningInfo'}}, - 'required': ['Error', 'Result'], + 'properties': {'error': {'$ref': '#/definitions/Error'}, + 'result': {'$ref': '#/definitions/ProvisioningInfo'}}, + 'required': ['result'], 'type': 'object'}, 'ProvisioningInfoResults': {'additionalProperties': False, - 'properties': {'Results': {'items': {'$ref': '#/definitions/ProvisioningInfoResult'}, + 'properties': {'results': {'items': {'$ref': '#/definitions/ProvisioningInfoResult'}, 'type': 'array'}}, - 'required': ['Results'], + 'required': ['results'], 'type': 'object'}, 'SetStatus': {'additionalProperties': False, - 'properties': {'Entities': {'items': {'$ref': '#/definitions/EntityStatusArgs'}, + 'properties': {'entities': {'items': {'$ref': '#/definitions/EntityStatusArgs'}, 'type': 'array'}}, - 'required': ['Entities'], + 'required': ['entities'], 'type': 'object'}, 'Settings': {'additionalProperties': False, 'properties': {'Ftp': {'type': 'string'}, @@ -14341,58 +13903,54 @@ class ProvisionerFacade(Type): 'required': ['Http', 'Https', 'Ftp', 'NoProxy'], 'type': 'object'}, 'StatusResult': {'additionalProperties': False, - 'properties': {'Data': {'patternProperties': {'.*': {'additionalProperties': True, + 'properties': {'data': {'patternProperties': {'.*': {'additionalProperties': True, 'type': 'object'}}, 'type': 'object'}, - 'Error': {'$ref': '#/definitions/Error'}, - 'Id': {'type': 'string'}, - 'Info': {'type': 'string'}, - 'Life': {'type': 'string'}, - 'Since': {'format': 'date-time', + 'error': {'$ref': '#/definitions/Error'}, + 'id': {'type': 'string'}, + 'info': {'type': 'string'}, + 'life': {'type': 'string'}, + 'since': {'format': 'date-time', 'type': 'string'}, - 'Status': {'type': 'string'}}, - 'required': ['Error', - 'Id', - 'Life', - 'Status', - 'Info', - 'Data', - 'Since'], + 'status': {'type': 'string'}}, + 'required': ['id', + 'life', + 'status', + 'info', + 'data', + 'since'], 'type': 'object'}, 'StatusResults': {'additionalProperties': False, - 'properties': {'Results': {'items': {'$ref': '#/definitions/StatusResult'}, + 'properties': {'results': {'items': {'$ref': '#/definitions/StatusResult'}, 'type': 'array'}}, - 'required': ['Results'], + 'required': ['results'], 'type': 'object'}, 'StringResult': {'additionalProperties': False, - 'properties': {'Error': {'$ref': '#/definitions/Error'}, - 'Result': {'type': 'string'}}, - 'required': ['Error', 'Result'], + 'properties': {'error': {'$ref': '#/definitions/Error'}, + 'result': {'type': 'string'}}, + 'required': ['result'], 'type': 'object'}, 'StringResults': {'additionalProperties': False, - 'properties': {'Results': {'items': {'$ref': '#/definitions/StringResult'}, + 'properties': {'results': {'items': {'$ref': '#/definitions/StringResult'}, 'type': 'array'}}, - 'required': ['Results'], + 'required': ['results'], 'type': 'object'}, 'StringsResult': {'additionalProperties': False, - 'properties': {'Error': {'$ref': '#/definitions/Error'}, - 'Result': {'items': {'type': 'string'}, + 'properties': {'error': {'$ref': '#/definitions/Error'}, + 'result': {'items': {'type': 'string'}, 'type': 'array'}}, - 'required': ['Error', 'Result'], 'type': 'object'}, 'StringsWatchResult': {'additionalProperties': False, - 'properties': {'Changes': {'items': {'type': 'string'}, + 'properties': {'changes': {'items': {'type': 'string'}, 'type': 'array'}, - 'Error': {'$ref': '#/definitions/Error'}, - 'StringsWatcherId': {'type': 'string'}}, - 'required': ['StringsWatcherId', - 'Changes', - 'Error'], + 'error': {'$ref': '#/definitions/Error'}, + 'watcher-id': {'type': 'string'}}, + 'required': ['watcher-id'], 'type': 'object'}, 'StringsWatchResults': {'additionalProperties': False, - 'properties': {'Results': {'items': {'$ref': '#/definitions/StringsWatchResult'}, + 'properties': {'results': {'items': {'$ref': '#/definitions/StringsWatchResult'}, 'type': 'array'}}, - 'required': ['Results'], + 'required': ['results'], 'type': 'object'}, 'Tools': {'additionalProperties': False, 'properties': {'sha256': {'type': 'string'}, @@ -14402,24 +13960,23 @@ class ProvisionerFacade(Type): 'required': ['version', 'url', 'size'], 'type': 'object'}, 'ToolsResult': {'additionalProperties': False, - 'properties': {'DisableSSLHostnameVerification': {'type': 'boolean'}, - 'Error': {'$ref': '#/definitions/Error'}, - 'ToolsList': {'items': {'$ref': '#/definitions/Tools'}, - 'type': 'array'}}, - 'required': ['ToolsList', - 'DisableSSLHostnameVerification', - 'Error'], + 'properties': {'disable-ssl-hostname-verification': {'type': 'boolean'}, + 'error': {'$ref': '#/definitions/Error'}, + 'tools': {'items': {'$ref': '#/definitions/Tools'}, + 'type': 'array'}}, + 'required': ['tools', + 'disable-ssl-hostname-verification'], 'type': 'object'}, 'ToolsResults': {'additionalProperties': False, - 'properties': {'Results': {'items': {'$ref': '#/definitions/ToolsResult'}, + 'properties': {'results': {'items': {'$ref': '#/definitions/ToolsResult'}, 'type': 'array'}}, - 'required': ['Results'], + 'required': ['results'], 'type': 'object'}, 'UpdateBehavior': {'additionalProperties': False, - 'properties': {'EnableOSRefreshUpdate': {'type': 'boolean'}, - 'EnableOSUpgrade': {'type': 'boolean'}}, - 'required': ['EnableOSRefreshUpdate', - 'EnableOSUpgrade'], + 'properties': {'enable-os-refresh-update': {'type': 'boolean'}, + 'enable-os-upgrade': {'type': 'boolean'}}, + 'required': ['enable-os-refresh-update', + 'enable-os-upgrade'], 'type': 'object'}, 'Value': {'additionalProperties': False, 'properties': {'arch': {'type': 'string'}, @@ -14437,32 +13994,32 @@ class ProvisionerFacade(Type): 'type': 'object'}, 'Volume': {'additionalProperties': False, 'properties': {'info': {'$ref': '#/definitions/VolumeInfo'}, - 'volumetag': {'type': 'string'}}, - 'required': ['volumetag', 'info'], + 'volume-tag': {'type': 'string'}}, + 'required': ['volume-tag', 'info'], 'type': 'object'}, 'VolumeAttachmentInfo': {'additionalProperties': False, - 'properties': {'busaddress': {'type': 'string'}, - 'devicelink': {'type': 'string'}, - 'devicename': {'type': 'string'}, + 'properties': {'bus-address': {'type': 'string'}, + 'device-link': {'type': 'string'}, + 'device-name': {'type': 'string'}, 'read-only': {'type': 'boolean'}}, 'type': 'object'}, 'VolumeAttachmentParams': {'additionalProperties': False, - 'properties': {'instanceid': {'type': 'string'}, - 'machinetag': {'type': 'string'}, + 'properties': {'instance-id': {'type': 'string'}, + 'machine-tag': {'type': 'string'}, 'provider': {'type': 'string'}, 'read-only': {'type': 'boolean'}, - 'volumeid': {'type': 'string'}, - 'volumetag': {'type': 'string'}}, - 'required': ['volumetag', - 'machinetag', + 'volume-id': {'type': 'string'}, + 'volume-tag': {'type': 'string'}}, + 'required': ['volume-tag', + 'machine-tag', 'provider'], 'type': 'object'}, 'VolumeInfo': {'additionalProperties': False, - 'properties': {'hardwareid': {'type': 'string'}, + 'properties': {'hardware-id': {'type': 'string'}, 'persistent': {'type': 'boolean'}, 'size': {'type': 'integer'}, - 'volumeid': {'type': 'string'}}, - 'required': ['volumeid', 'size', 'persistent'], + 'volume-id': {'type': 'string'}}, + 'required': ['volume-id', 'size', 'persistent'], 'type': 'object'}, 'VolumeParams': {'additionalProperties': False, 'properties': {'attachment': {'$ref': '#/definitions/VolumeAttachmentParams'}, @@ -14473,33 +14030,22 @@ class ProvisionerFacade(Type): 'size': {'type': 'integer'}, 'tags': {'patternProperties': {'.*': {'type': 'string'}}, 'type': 'object'}, - 'volumetag': {'type': 'string'}}, - 'required': ['volumetag', 'size', 'provider'], + 'volume-tag': {'type': 'string'}}, + 'required': ['volume-tag', + 'size', + 'provider'], 'type': 'object'}, 'WatchContainer': {'additionalProperties': False, - 'properties': {'ContainerType': {'type': 'string'}, - 'MachineTag': {'type': 'string'}}, - 'required': ['MachineTag', 'ContainerType'], + 'properties': {'container-type': {'type': 'string'}, + 'machine-tag': {'type': 'string'}}, + 'required': ['machine-tag', + 'container-type'], 'type': 'object'}, 'WatchContainers': {'additionalProperties': False, - 'properties': {'Params': {'items': {'$ref': '#/definitions/WatchContainer'}, + 'properties': {'params': {'items': {'$ref': '#/definitions/WatchContainer'}, 'type': 'array'}}, - 'required': ['Params'], - 'type': 'object'}, - 'caveat': {'additionalProperties': False, - 'properties': {'caveatId': {'$ref': '#/definitions/packet'}, - 'location': {'$ref': '#/definitions/packet'}, - 'verificationId': {'$ref': '#/definitions/packet'}}, - 'required': ['location', - 'caveatId', - 'verificationId'], - 'type': 'object'}, - 'packet': {'additionalProperties': False, - 'properties': {'headerLen': {'type': 'integer'}, - 'start': {'type': 'integer'}, - 'totalLen': {'type': 'integer'}}, - 'required': ['start', 'totalLen', 'headerLen'], - 'type': 'object'}}, + 'required': ['params'], + 'type': 'object'}}, 'properties': {'APIAddresses': {'properties': {'Result': {'$ref': '#/definitions/StringsResult'}}, 'type': 'object'}, 'APIHostPorts': {'properties': {'Result': {'$ref': '#/definitions/APIHostPortsResult'}}, @@ -14514,6 +14060,8 @@ class ProvisionerFacade(Type): 'ContainerManagerConfig': {'properties': {'Params': {'$ref': '#/definitions/ContainerManagerConfigParams'}, 'Result': {'$ref': '#/definitions/ContainerManagerConfig'}}, 'type': 'object'}, + 'ControllerConfig': {'properties': {'Result': {'$ref': '#/definitions/ControllerConfigResult'}}, + 'type': 'object'}, 'DistributionGroup': {'properties': {'Params': {'$ref': '#/definitions/Entities'}, 'Result': {'$ref': '#/definitions/DistributionGroupResults'}}, 'type': 'object'}, @@ -14653,7 +14201,7 @@ class ProvisionerFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Provisioner', Request='Constraints', Version=3, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -14663,7 +14211,7 @@ class ProvisionerFacade(Type): async def ContainerConfig(self): ''' - Returns -> typing.Union[bool, str, _ForwardRef('Settings'), _ForwardRef('Settings'), _ForwardRef('UpdateBehavior')] + Returns -> typing.Union[_ForwardRef('UpdateBehavior'), str, _ForwardRef('Settings'), _ForwardRef('Settings'), bool] ''' # map input types to rpc msg params = dict() @@ -14683,7 +14231,22 @@ class ProvisionerFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Provisioner', Request='ContainerManagerConfig', Version=3, Params=params) - params['Type'] = type_ + params['type'] = type_ + reply = await self.rpc(msg) + return reply + + + + @ReturnMapping(ControllerConfigResult) + async def ControllerConfig(self): + ''' + + Returns -> typing.Mapping[str, typing.Any] + ''' + # map input types to rpc msg + params = dict() + msg = dict(Type='Provisioner', Request='ControllerConfig', Version=3, Params=params) + reply = await self.rpc(msg) return reply @@ -14698,7 +14261,7 @@ class ProvisionerFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Provisioner', Request='DistributionGroup', Version=3, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -14713,18 +14276,18 @@ class ProvisionerFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Provisioner', Request='EnsureDead', Version=3, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @ReturnMapping(FindToolsResult) - async def FindTools(self, arch, majorversion, minorversion, number, series): + async def FindTools(self, arch, major, minor, number, series): ''' arch : str - majorversion : int - minorversion : int + major : int + minor : int number : Number series : str Returns -> typing.Union[_ForwardRef('Error'), typing.Sequence[~Tools]] @@ -14732,11 +14295,11 @@ class ProvisionerFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Provisioner', Request='FindTools', Version=3, Params=params) - params['Arch'] = arch - params['MajorVersion'] = majorversion - params['MinorVersion'] = minorversion - params['Number'] = number - params['Series'] = series + params['arch'] = arch + params['major'] = major + params['minor'] = minor + params['number'] = number + params['series'] = series reply = await self.rpc(msg) return reply @@ -14751,7 +14314,7 @@ class ProvisionerFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Provisioner', Request='GetContainerInterfaceInfo', Version=3, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -14766,7 +14329,7 @@ class ProvisionerFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Provisioner', Request='InstanceId', Version=3, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -14781,7 +14344,7 @@ class ProvisionerFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Provisioner', Request='InstanceStatus', Version=3, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -14796,7 +14359,7 @@ class ProvisionerFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Provisioner', Request='Life', Version=3, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -14856,7 +14419,7 @@ class ProvisionerFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Provisioner', Request='PrepareContainerInterfaceInfo', Version=3, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -14871,7 +14434,7 @@ class ProvisionerFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Provisioner', Request='ProvisioningInfo', Version=3, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -14886,7 +14449,7 @@ class ProvisionerFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Provisioner', Request='ReleaseContainerAddresses', Version=3, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -14901,7 +14464,7 @@ class ProvisionerFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Provisioner', Request='Remove', Version=3, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -14916,7 +14479,7 @@ class ProvisionerFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Provisioner', Request='Series', Version=3, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -14931,7 +14494,7 @@ class ProvisionerFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Provisioner', Request='SetInstanceInfo', Version=3, Params=params) - params['Machines'] = machines + params['machines'] = machines reply = await self.rpc(msg) return reply @@ -14946,7 +14509,7 @@ class ProvisionerFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Provisioner', Request='SetInstanceStatus', Version=3, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -14961,7 +14524,7 @@ class ProvisionerFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Provisioner', Request='SetPasswords', Version=3, Params=params) - params['Changes'] = changes + params['changes'] = changes reply = await self.rpc(msg) return reply @@ -14976,7 +14539,7 @@ class ProvisionerFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Provisioner', Request='SetStatus', Version=3, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -14991,7 +14554,7 @@ class ProvisionerFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Provisioner', Request='SetSupportedContainers', Version=3, Params=params) - params['Params'] = params + params['params'] = params reply = await self.rpc(msg) return reply @@ -15021,7 +14584,7 @@ class ProvisionerFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Provisioner', Request='Status', Version=3, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -15036,7 +14599,7 @@ class ProvisionerFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Provisioner', Request='Tools', Version=3, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -15051,7 +14614,7 @@ class ProvisionerFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Provisioner', Request='UpdateStatus', Version=3, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -15061,7 +14624,7 @@ class ProvisionerFacade(Type): async def WatchAPIHostPorts(self): ''' - Returns -> typing.Union[_ForwardRef('Error'), str] + Returns -> typing.Union[str, _ForwardRef('Error')] ''' # map input types to rpc msg params = dict() @@ -15081,7 +14644,7 @@ class ProvisionerFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Provisioner', Request='WatchAllContainers', Version=3, Params=params) - params['Params'] = params + params['params'] = params reply = await self.rpc(msg) return reply @@ -15096,7 +14659,7 @@ class ProvisionerFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Provisioner', Request='WatchContainers', Version=3, Params=params) - params['Params'] = params + params['params'] = params reply = await self.rpc(msg) return reply @@ -15106,7 +14669,7 @@ class ProvisionerFacade(Type): async def WatchForModelConfigChanges(self): ''' - Returns -> typing.Union[_ForwardRef('Error'), str] + Returns -> typing.Union[str, _ForwardRef('Error')] ''' # map input types to rpc msg params = dict() @@ -15121,7 +14684,7 @@ class ProvisionerFacade(Type): async def WatchMachineErrorRetry(self): ''' - Returns -> typing.Union[_ForwardRef('Error'), str] + Returns -> typing.Union[str, _ForwardRef('Error')] ''' # map input types to rpc msg params = dict() @@ -15150,85 +14713,57 @@ class ProxyUpdaterFacade(Type): name = 'ProxyUpdater' version = 1 schema = {'definitions': {'Entities': {'additionalProperties': False, - 'properties': {'Entities': {'items': {'$ref': '#/definitions/Entity'}, + 'properties': {'entities': {'items': {'$ref': '#/definitions/Entity'}, 'type': 'array'}}, - 'required': ['Entities'], + 'required': ['entities'], 'type': 'object'}, 'Entity': {'additionalProperties': False, - 'properties': {'Tag': {'type': 'string'}}, - 'required': ['Tag'], + 'properties': {'tag': {'type': 'string'}}, + 'required': ['tag'], 'type': 'object'}, 'Error': {'additionalProperties': False, - 'properties': {'Code': {'type': 'string'}, - 'Info': {'$ref': '#/definitions/ErrorInfo'}, - 'Message': {'type': 'string'}}, - 'required': ['Message', 'Code'], + 'properties': {'code': {'type': 'string'}, + 'info': {'$ref': '#/definitions/ErrorInfo'}, + 'message': {'type': 'string'}}, + 'required': ['message', 'code'], 'type': 'object'}, 'ErrorInfo': {'additionalProperties': False, - 'properties': {'Macaroon': {'$ref': '#/definitions/Macaroon'}, - 'MacaroonPath': {'type': 'string'}}, + 'properties': {'macaroon': {'$ref': '#/definitions/Macaroon'}, + 'macaroon-path': {'type': 'string'}}, 'type': 'object'}, - 'Macaroon': {'additionalProperties': False, - 'properties': {'caveats': {'items': {'$ref': '#/definitions/caveat'}, - 'type': 'array'}, - 'data': {'items': {'type': 'integer'}, - 'type': 'array'}, - 'id': {'$ref': '#/definitions/packet'}, - 'location': {'$ref': '#/definitions/packet'}, - 'sig': {'items': {'type': 'integer'}, - 'type': 'array'}}, - 'required': ['data', - 'location', - 'id', - 'caveats', - 'sig'], - 'type': 'object'}, + 'Macaroon': {'additionalProperties': False, 'type': 'object'}, 'NotifyWatchResult': {'additionalProperties': False, - 'properties': {'Error': {'$ref': '#/definitions/Error'}, - 'NotifyWatcherId': {'type': 'string'}}, - 'required': ['NotifyWatcherId', 'Error'], + 'properties': {'NotifyWatcherId': {'type': 'string'}, + 'error': {'$ref': '#/definitions/Error'}}, + 'required': ['NotifyWatcherId'], 'type': 'object'}, 'NotifyWatchResults': {'additionalProperties': False, - 'properties': {'Results': {'items': {'$ref': '#/definitions/NotifyWatchResult'}, + 'properties': {'results': {'items': {'$ref': '#/definitions/NotifyWatchResult'}, 'type': 'array'}}, - 'required': ['Results'], + 'required': ['results'], 'type': 'object'}, 'ProxyConfig': {'additionalProperties': False, - 'properties': {'FTP': {'type': 'string'}, - 'HTTP': {'type': 'string'}, - 'HTTPS': {'type': 'string'}, - 'NoProxy': {'type': 'string'}}, - 'required': ['HTTP', - 'HTTPS', - 'FTP', - 'NoProxy'], + 'properties': {'ftp': {'type': 'string'}, + 'http': {'type': 'string'}, + 'https': {'type': 'string'}, + 'no-proxy': {'type': 'string'}}, + 'required': ['http', + 'https', + 'ftp', + 'no-proxy'], 'type': 'object'}, 'ProxyConfigResult': {'additionalProperties': False, - 'properties': {'APTProxySettings': {'$ref': '#/definitions/ProxyConfig'}, - 'Error': {'$ref': '#/definitions/Error'}, - 'ProxySettings': {'$ref': '#/definitions/ProxyConfig'}}, - 'required': ['ProxySettings', - 'APTProxySettings'], + 'properties': {'apt-proxy-settings': {'$ref': '#/definitions/ProxyConfig'}, + 'error': {'$ref': '#/definitions/Error'}, + 'proxy-settings': {'$ref': '#/definitions/ProxyConfig'}}, + 'required': ['proxy-settings', + 'apt-proxy-settings'], 'type': 'object'}, 'ProxyConfigResults': {'additionalProperties': False, - 'properties': {'Results': {'items': {'$ref': '#/definitions/ProxyConfigResult'}, + 'properties': {'results': {'items': {'$ref': '#/definitions/ProxyConfigResult'}, 'type': 'array'}}, - 'required': ['Results'], - 'type': 'object'}, - 'caveat': {'additionalProperties': False, - 'properties': {'caveatId': {'$ref': '#/definitions/packet'}, - 'location': {'$ref': '#/definitions/packet'}, - 'verificationId': {'$ref': '#/definitions/packet'}}, - 'required': ['location', - 'caveatId', - 'verificationId'], - 'type': 'object'}, - 'packet': {'additionalProperties': False, - 'properties': {'headerLen': {'type': 'integer'}, - 'start': {'type': 'integer'}, - 'totalLen': {'type': 'integer'}}, - 'required': ['start', 'totalLen', 'headerLen'], - 'type': 'object'}}, + 'required': ['results'], + 'type': 'object'}}, 'properties': {'ProxyConfig': {'properties': {'Params': {'$ref': '#/definitions/Entities'}, 'Result': {'$ref': '#/definitions/ProxyConfigResults'}}, 'type': 'object'}, @@ -15247,7 +14782,7 @@ class ProxyUpdaterFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='ProxyUpdater', Request='ProxyConfig', Version=1, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -15262,7 +14797,7 @@ class ProxyUpdaterFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='ProxyUpdater', Request='WatchForProxyConfigAndAPIHostPortChanges', Version=1, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -15271,52 +14806,37 @@ class RebootFacade(Type): name = 'Reboot' version = 2 schema = {'definitions': {'Entities': {'additionalProperties': False, - 'properties': {'Entities': {'items': {'$ref': '#/definitions/Entity'}, + 'properties': {'entities': {'items': {'$ref': '#/definitions/Entity'}, 'type': 'array'}}, - 'required': ['Entities'], + 'required': ['entities'], 'type': 'object'}, 'Entity': {'additionalProperties': False, - 'properties': {'Tag': {'type': 'string'}}, - 'required': ['Tag'], + 'properties': {'tag': {'type': 'string'}}, + 'required': ['tag'], 'type': 'object'}, 'Error': {'additionalProperties': False, - 'properties': {'Code': {'type': 'string'}, - 'Info': {'$ref': '#/definitions/ErrorInfo'}, - 'Message': {'type': 'string'}}, - 'required': ['Message', 'Code'], + 'properties': {'code': {'type': 'string'}, + 'info': {'$ref': '#/definitions/ErrorInfo'}, + 'message': {'type': 'string'}}, + 'required': ['message', 'code'], 'type': 'object'}, 'ErrorInfo': {'additionalProperties': False, - 'properties': {'Macaroon': {'$ref': '#/definitions/Macaroon'}, - 'MacaroonPath': {'type': 'string'}}, + 'properties': {'macaroon': {'$ref': '#/definitions/Macaroon'}, + 'macaroon-path': {'type': 'string'}}, 'type': 'object'}, 'ErrorResult': {'additionalProperties': False, - 'properties': {'Error': {'$ref': '#/definitions/Error'}}, - 'required': ['Error'], + 'properties': {'error': {'$ref': '#/definitions/Error'}}, 'type': 'object'}, 'ErrorResults': {'additionalProperties': False, - 'properties': {'Results': {'items': {'$ref': '#/definitions/ErrorResult'}, + 'properties': {'results': {'items': {'$ref': '#/definitions/ErrorResult'}, 'type': 'array'}}, - 'required': ['Results'], + 'required': ['results'], 'type': 'object'}, - 'Macaroon': {'additionalProperties': False, - 'properties': {'caveats': {'items': {'$ref': '#/definitions/caveat'}, - 'type': 'array'}, - 'data': {'items': {'type': 'integer'}, - 'type': 'array'}, - 'id': {'$ref': '#/definitions/packet'}, - 'location': {'$ref': '#/definitions/packet'}, - 'sig': {'items': {'type': 'integer'}, - 'type': 'array'}}, - 'required': ['data', - 'location', - 'id', - 'caveats', - 'sig'], - 'type': 'object'}, + 'Macaroon': {'additionalProperties': False, 'type': 'object'}, 'NotifyWatchResult': {'additionalProperties': False, - 'properties': {'Error': {'$ref': '#/definitions/Error'}, - 'NotifyWatcherId': {'type': 'string'}}, - 'required': ['NotifyWatcherId', 'Error'], + 'properties': {'NotifyWatcherId': {'type': 'string'}, + 'error': {'$ref': '#/definitions/Error'}}, + 'required': ['NotifyWatcherId'], 'type': 'object'}, 'RebootActionResult': {'additionalProperties': False, 'properties': {'error': {'$ref': '#/definitions/Error'}, @@ -15325,21 +14845,7 @@ class RebootFacade(Type): 'RebootActionResults': {'additionalProperties': False, 'properties': {'results': {'items': {'$ref': '#/definitions/RebootActionResult'}, 'type': 'array'}}, - 'type': 'object'}, - 'caveat': {'additionalProperties': False, - 'properties': {'caveatId': {'$ref': '#/definitions/packet'}, - 'location': {'$ref': '#/definitions/packet'}, - 'verificationId': {'$ref': '#/definitions/packet'}}, - 'required': ['location', - 'caveatId', - 'verificationId'], - 'type': 'object'}, - 'packet': {'additionalProperties': False, - 'properties': {'headerLen': {'type': 'integer'}, - 'start': {'type': 'integer'}, - 'totalLen': {'type': 'integer'}}, - 'required': ['start', 'totalLen', 'headerLen'], - 'type': 'object'}}, + 'type': 'object'}}, 'properties': {'ClearReboot': {'properties': {'Params': {'$ref': '#/definitions/Entities'}, 'Result': {'$ref': '#/definitions/ErrorResults'}}, 'type': 'object'}, @@ -15363,7 +14869,7 @@ class RebootFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Reboot', Request='ClearReboot', Version=2, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -15378,7 +14884,7 @@ class RebootFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Reboot', Request='GetRebootAction', Version=2, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -15393,7 +14899,7 @@ class RebootFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Reboot', Request='RequestReboot', Version=2, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -15403,7 +14909,7 @@ class RebootFacade(Type): async def WatchForRebootEvent(self): ''' - Returns -> typing.Union[_ForwardRef('Error'), str] + Returns -> typing.Union[str, _ForwardRef('Error')] ''' # map input types to rpc msg params = dict() @@ -15417,63 +14923,34 @@ class RelationUnitsWatcherFacade(Type): name = 'RelationUnitsWatcher' version = 1 schema = {'definitions': {'Error': {'additionalProperties': False, - 'properties': {'Code': {'type': 'string'}, - 'Info': {'$ref': '#/definitions/ErrorInfo'}, - 'Message': {'type': 'string'}}, - 'required': ['Message', 'Code'], + 'properties': {'code': {'type': 'string'}, + 'info': {'$ref': '#/definitions/ErrorInfo'}, + 'message': {'type': 'string'}}, + 'required': ['message', 'code'], 'type': 'object'}, 'ErrorInfo': {'additionalProperties': False, - 'properties': {'Macaroon': {'$ref': '#/definitions/Macaroon'}, - 'MacaroonPath': {'type': 'string'}}, + 'properties': {'macaroon': {'$ref': '#/definitions/Macaroon'}, + 'macaroon-path': {'type': 'string'}}, 'type': 'object'}, - 'Macaroon': {'additionalProperties': False, - 'properties': {'caveats': {'items': {'$ref': '#/definitions/caveat'}, - 'type': 'array'}, - 'data': {'items': {'type': 'integer'}, - 'type': 'array'}, - 'id': {'$ref': '#/definitions/packet'}, - 'location': {'$ref': '#/definitions/packet'}, - 'sig': {'items': {'type': 'integer'}, - 'type': 'array'}}, - 'required': ['data', - 'location', - 'id', - 'caveats', - 'sig'], - 'type': 'object'}, + 'Macaroon': {'additionalProperties': False, 'type': 'object'}, 'RelationUnitsChange': {'additionalProperties': False, - 'properties': {'Changed': {'patternProperties': {'.*': {'$ref': '#/definitions/UnitSettings'}}, + 'properties': {'changed': {'patternProperties': {'.*': {'$ref': '#/definitions/UnitSettings'}}, 'type': 'object'}, - 'Departed': {'items': {'type': 'string'}, + 'departed': {'items': {'type': 'string'}, 'type': 'array'}}, - 'required': ['Changed', 'Departed'], + 'required': ['changed'], 'type': 'object'}, 'RelationUnitsWatchResult': {'additionalProperties': False, - 'properties': {'Changes': {'$ref': '#/definitions/RelationUnitsChange'}, - 'Error': {'$ref': '#/definitions/Error'}, - 'RelationUnitsWatcherId': {'type': 'string'}}, - 'required': ['RelationUnitsWatcherId', - 'Changes', - 'Error'], + 'properties': {'changes': {'$ref': '#/definitions/RelationUnitsChange'}, + 'error': {'$ref': '#/definitions/Error'}, + 'watcher-id': {'type': 'string'}}, + 'required': ['watcher-id', + 'changes'], 'type': 'object'}, 'UnitSettings': {'additionalProperties': False, - 'properties': {'Version': {'type': 'integer'}}, - 'required': ['Version'], - 'type': 'object'}, - 'caveat': {'additionalProperties': False, - 'properties': {'caveatId': {'$ref': '#/definitions/packet'}, - 'location': {'$ref': '#/definitions/packet'}, - 'verificationId': {'$ref': '#/definitions/packet'}}, - 'required': ['location', - 'caveatId', - 'verificationId'], - 'type': 'object'}, - 'packet': {'additionalProperties': False, - 'properties': {'headerLen': {'type': 'integer'}, - 'start': {'type': 'integer'}, - 'totalLen': {'type': 'integer'}}, - 'required': ['start', 'totalLen', 'headerLen'], - 'type': 'object'}}, + 'properties': {'version': {'type': 'integer'}}, + 'required': ['version'], + 'type': 'object'}}, 'properties': {'Next': {'properties': {'Result': {'$ref': '#/definitions/RelationUnitsWatchResult'}}, 'type': 'object'}, 'Stop': {'type': 'object'}}, @@ -15533,85 +15010,56 @@ class RetryStrategyFacade(Type): name = 'RetryStrategy' version = 1 schema = {'definitions': {'Entities': {'additionalProperties': False, - 'properties': {'Entities': {'items': {'$ref': '#/definitions/Entity'}, + 'properties': {'entities': {'items': {'$ref': '#/definitions/Entity'}, 'type': 'array'}}, - 'required': ['Entities'], + 'required': ['entities'], 'type': 'object'}, 'Entity': {'additionalProperties': False, - 'properties': {'Tag': {'type': 'string'}}, - 'required': ['Tag'], + 'properties': {'tag': {'type': 'string'}}, + 'required': ['tag'], 'type': 'object'}, 'Error': {'additionalProperties': False, - 'properties': {'Code': {'type': 'string'}, - 'Info': {'$ref': '#/definitions/ErrorInfo'}, - 'Message': {'type': 'string'}}, - 'required': ['Message', 'Code'], + 'properties': {'code': {'type': 'string'}, + 'info': {'$ref': '#/definitions/ErrorInfo'}, + 'message': {'type': 'string'}}, + 'required': ['message', 'code'], 'type': 'object'}, 'ErrorInfo': {'additionalProperties': False, - 'properties': {'Macaroon': {'$ref': '#/definitions/Macaroon'}, - 'MacaroonPath': {'type': 'string'}}, + 'properties': {'macaroon': {'$ref': '#/definitions/Macaroon'}, + 'macaroon-path': {'type': 'string'}}, 'type': 'object'}, - 'Macaroon': {'additionalProperties': False, - 'properties': {'caveats': {'items': {'$ref': '#/definitions/caveat'}, - 'type': 'array'}, - 'data': {'items': {'type': 'integer'}, - 'type': 'array'}, - 'id': {'$ref': '#/definitions/packet'}, - 'location': {'$ref': '#/definitions/packet'}, - 'sig': {'items': {'type': 'integer'}, - 'type': 'array'}}, - 'required': ['data', - 'location', - 'id', - 'caveats', - 'sig'], - 'type': 'object'}, + 'Macaroon': {'additionalProperties': False, 'type': 'object'}, 'NotifyWatchResult': {'additionalProperties': False, - 'properties': {'Error': {'$ref': '#/definitions/Error'}, - 'NotifyWatcherId': {'type': 'string'}}, - 'required': ['NotifyWatcherId', 'Error'], + 'properties': {'NotifyWatcherId': {'type': 'string'}, + 'error': {'$ref': '#/definitions/Error'}}, + 'required': ['NotifyWatcherId'], 'type': 'object'}, 'NotifyWatchResults': {'additionalProperties': False, - 'properties': {'Results': {'items': {'$ref': '#/definitions/NotifyWatchResult'}, + 'properties': {'results': {'items': {'$ref': '#/definitions/NotifyWatchResult'}, 'type': 'array'}}, - 'required': ['Results'], + 'required': ['results'], 'type': 'object'}, 'RetryStrategy': {'additionalProperties': False, - 'properties': {'JitterRetryTime': {'type': 'boolean'}, - 'MaxRetryTime': {'type': 'integer'}, - 'MinRetryTime': {'type': 'integer'}, - 'RetryTimeFactor': {'type': 'integer'}, - 'ShouldRetry': {'type': 'boolean'}}, - 'required': ['ShouldRetry', - 'MinRetryTime', - 'MaxRetryTime', - 'JitterRetryTime', - 'RetryTimeFactor'], + 'properties': {'jitter-retry-time': {'type': 'boolean'}, + 'max-retry-time': {'type': 'integer'}, + 'min-retry-time': {'type': 'integer'}, + 'retry-time-factor': {'type': 'integer'}, + 'should-retry': {'type': 'boolean'}}, + 'required': ['should-retry', + 'min-retry-time', + 'max-retry-time', + 'jitter-retry-time', + 'retry-time-factor'], 'type': 'object'}, 'RetryStrategyResult': {'additionalProperties': False, - 'properties': {'Error': {'$ref': '#/definitions/Error'}, - 'Result': {'$ref': '#/definitions/RetryStrategy'}}, - 'required': ['Error', 'Result'], + 'properties': {'error': {'$ref': '#/definitions/Error'}, + 'result': {'$ref': '#/definitions/RetryStrategy'}}, 'type': 'object'}, 'RetryStrategyResults': {'additionalProperties': False, - 'properties': {'Results': {'items': {'$ref': '#/definitions/RetryStrategyResult'}, + 'properties': {'results': {'items': {'$ref': '#/definitions/RetryStrategyResult'}, 'type': 'array'}}, - 'required': ['Results'], - 'type': 'object'}, - 'caveat': {'additionalProperties': False, - 'properties': {'caveatId': {'$ref': '#/definitions/packet'}, - 'location': {'$ref': '#/definitions/packet'}, - 'verificationId': {'$ref': '#/definitions/packet'}}, - 'required': ['location', - 'caveatId', - 'verificationId'], - 'type': 'object'}, - 'packet': {'additionalProperties': False, - 'properties': {'headerLen': {'type': 'integer'}, - 'start': {'type': 'integer'}, - 'totalLen': {'type': 'integer'}}, - 'required': ['start', 'totalLen', 'headerLen'], - 'type': 'object'}}, + 'required': ['results'], + 'type': 'object'}}, 'properties': {'RetryStrategy': {'properties': {'Params': {'$ref': '#/definitions/Entities'}, 'Result': {'$ref': '#/definitions/RetryStrategyResults'}}, 'type': 'object'}, @@ -15630,7 +15078,7 @@ class RetryStrategyFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='RetryStrategy', Request='RetryStrategy', Version=1, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -15645,7 +15093,7 @@ class RetryStrategyFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='RetryStrategy', Request='WatchRetryStrategy', Version=1, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -15654,39 +15102,25 @@ class SSHClientFacade(Type): name = 'SSHClient' version = 1 schema = {'definitions': {'Entities': {'additionalProperties': False, - 'properties': {'Entities': {'items': {'$ref': '#/definitions/Entity'}, + 'properties': {'entities': {'items': {'$ref': '#/definitions/Entity'}, 'type': 'array'}}, - 'required': ['Entities'], + 'required': ['entities'], 'type': 'object'}, 'Entity': {'additionalProperties': False, - 'properties': {'Tag': {'type': 'string'}}, - 'required': ['Tag'], + 'properties': {'tag': {'type': 'string'}}, + 'required': ['tag'], 'type': 'object'}, 'Error': {'additionalProperties': False, - 'properties': {'Code': {'type': 'string'}, - 'Info': {'$ref': '#/definitions/ErrorInfo'}, - 'Message': {'type': 'string'}}, - 'required': ['Message', 'Code'], + 'properties': {'code': {'type': 'string'}, + 'info': {'$ref': '#/definitions/ErrorInfo'}, + 'message': {'type': 'string'}}, + 'required': ['message', 'code'], 'type': 'object'}, 'ErrorInfo': {'additionalProperties': False, - 'properties': {'Macaroon': {'$ref': '#/definitions/Macaroon'}, - 'MacaroonPath': {'type': 'string'}}, + 'properties': {'macaroon': {'$ref': '#/definitions/Macaroon'}, + 'macaroon-path': {'type': 'string'}}, 'type': 'object'}, - 'Macaroon': {'additionalProperties': False, - 'properties': {'caveats': {'items': {'$ref': '#/definitions/caveat'}, - 'type': 'array'}, - 'data': {'items': {'type': 'integer'}, - 'type': 'array'}, - 'id': {'$ref': '#/definitions/packet'}, - 'location': {'$ref': '#/definitions/packet'}, - 'sig': {'items': {'type': 'integer'}, - 'type': 'array'}}, - 'required': ['data', - 'location', - 'id', - 'caveats', - 'sig'], - 'type': 'object'}, + 'Macaroon': {'additionalProperties': False, 'type': 'object'}, 'SSHAddressResult': {'additionalProperties': False, 'properties': {'address': {'type': 'string'}, 'error': {'$ref': '#/definitions/Error'}}, @@ -15709,21 +15143,7 @@ class SSHClientFacade(Type): 'properties': {'results': {'items': {'$ref': '#/definitions/SSHPublicKeysResult'}, 'type': 'array'}}, 'required': ['results'], - 'type': 'object'}, - 'caveat': {'additionalProperties': False, - 'properties': {'caveatId': {'$ref': '#/definitions/packet'}, - 'location': {'$ref': '#/definitions/packet'}, - 'verificationId': {'$ref': '#/definitions/packet'}}, - 'required': ['location', - 'caveatId', - 'verificationId'], - 'type': 'object'}, - 'packet': {'additionalProperties': False, - 'properties': {'headerLen': {'type': 'integer'}, - 'start': {'type': 'integer'}, - 'totalLen': {'type': 'integer'}}, - 'required': ['start', 'totalLen', 'headerLen'], - 'type': 'object'}}, + 'type': 'object'}}, 'properties': {'PrivateAddress': {'properties': {'Params': {'$ref': '#/definitions/Entities'}, 'Result': {'$ref': '#/definitions/SSHAddressResults'}}, 'type': 'object'}, @@ -15747,7 +15167,7 @@ class SSHClientFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='SSHClient', Request='PrivateAddress', Version=1, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -15777,7 +15197,7 @@ class SSHClientFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='SSHClient', Request='PublicAddress', Version=1, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -15792,7 +15212,7 @@ class SSHClientFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='SSHClient', Request='PublicKeys', Version=1, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -15801,75 +15221,46 @@ class SingularFacade(Type): name = 'Singular' version = 1 schema = {'definitions': {'Entities': {'additionalProperties': False, - 'properties': {'Entities': {'items': {'$ref': '#/definitions/Entity'}, + 'properties': {'entities': {'items': {'$ref': '#/definitions/Entity'}, 'type': 'array'}}, - 'required': ['Entities'], + 'required': ['entities'], 'type': 'object'}, 'Entity': {'additionalProperties': False, - 'properties': {'Tag': {'type': 'string'}}, - 'required': ['Tag'], + 'properties': {'tag': {'type': 'string'}}, + 'required': ['tag'], 'type': 'object'}, 'Error': {'additionalProperties': False, - 'properties': {'Code': {'type': 'string'}, - 'Info': {'$ref': '#/definitions/ErrorInfo'}, - 'Message': {'type': 'string'}}, - 'required': ['Message', 'Code'], + 'properties': {'code': {'type': 'string'}, + 'info': {'$ref': '#/definitions/ErrorInfo'}, + 'message': {'type': 'string'}}, + 'required': ['message', 'code'], 'type': 'object'}, 'ErrorInfo': {'additionalProperties': False, - 'properties': {'Macaroon': {'$ref': '#/definitions/Macaroon'}, - 'MacaroonPath': {'type': 'string'}}, + 'properties': {'macaroon': {'$ref': '#/definitions/Macaroon'}, + 'macaroon-path': {'type': 'string'}}, 'type': 'object'}, 'ErrorResult': {'additionalProperties': False, - 'properties': {'Error': {'$ref': '#/definitions/Error'}}, - 'required': ['Error'], + 'properties': {'error': {'$ref': '#/definitions/Error'}}, 'type': 'object'}, 'ErrorResults': {'additionalProperties': False, - 'properties': {'Results': {'items': {'$ref': '#/definitions/ErrorResult'}, + 'properties': {'results': {'items': {'$ref': '#/definitions/ErrorResult'}, 'type': 'array'}}, - 'required': ['Results'], + 'required': ['results'], 'type': 'object'}, - 'Macaroon': {'additionalProperties': False, - 'properties': {'caveats': {'items': {'$ref': '#/definitions/caveat'}, - 'type': 'array'}, - 'data': {'items': {'type': 'integer'}, - 'type': 'array'}, - 'id': {'$ref': '#/definitions/packet'}, - 'location': {'$ref': '#/definitions/packet'}, - 'sig': {'items': {'type': 'integer'}, - 'type': 'array'}}, - 'required': ['data', - 'location', - 'id', - 'caveats', - 'sig'], - 'type': 'object'}, + 'Macaroon': {'additionalProperties': False, 'type': 'object'}, 'SingularClaim': {'additionalProperties': False, - 'properties': {'ControllerTag': {'type': 'string'}, - 'Duration': {'type': 'integer'}, - 'ModelTag': {'type': 'string'}}, - 'required': ['ModelTag', - 'ControllerTag', - 'Duration'], + 'properties': {'controller-tag': {'type': 'string'}, + 'duration': {'type': 'integer'}, + 'model-tag': {'type': 'string'}}, + 'required': ['model-tag', + 'controller-tag', + 'duration'], 'type': 'object'}, 'SingularClaims': {'additionalProperties': False, - 'properties': {'Claims': {'items': {'$ref': '#/definitions/SingularClaim'}, + 'properties': {'claims': {'items': {'$ref': '#/definitions/SingularClaim'}, 'type': 'array'}}, - 'required': ['Claims'], - 'type': 'object'}, - 'caveat': {'additionalProperties': False, - 'properties': {'caveatId': {'$ref': '#/definitions/packet'}, - 'location': {'$ref': '#/definitions/packet'}, - 'verificationId': {'$ref': '#/definitions/packet'}}, - 'required': ['location', - 'caveatId', - 'verificationId'], - 'type': 'object'}, - 'packet': {'additionalProperties': False, - 'properties': {'headerLen': {'type': 'integer'}, - 'start': {'type': 'integer'}, - 'totalLen': {'type': 'integer'}}, - 'required': ['start', 'totalLen', 'headerLen'], - 'type': 'object'}}, + 'required': ['claims'], + 'type': 'object'}}, 'properties': {'Claim': {'properties': {'Params': {'$ref': '#/definitions/SingularClaims'}, 'Result': {'$ref': '#/definitions/ErrorResults'}}, 'type': 'object'}, @@ -15888,7 +15279,7 @@ class SingularFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Singular', Request='Claim', Version=1, Params=params) - params['Claims'] = claims + params['claims'] = claims reply = await self.rpc(msg) return reply @@ -15903,7 +15294,7 @@ class SingularFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Singular', Request='Wait', Version=1, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -15912,98 +15303,65 @@ class SpacesFacade(Type): name = 'Spaces' version = 2 schema = {'definitions': {'CreateSpaceParams': {'additionalProperties': False, - 'properties': {'ProviderId': {'type': 'string'}, - 'Public': {'type': 'boolean'}, - 'SpaceTag': {'type': 'string'}, - 'SubnetTags': {'items': {'type': 'string'}, - 'type': 'array'}}, - 'required': ['SubnetTags', - 'SpaceTag', - 'Public'], + 'properties': {'provider-id': {'type': 'string'}, + 'public': {'type': 'boolean'}, + 'space-tag': {'type': 'string'}, + 'subnet-tags': {'items': {'type': 'string'}, + 'type': 'array'}}, + 'required': ['subnet-tags', + 'space-tag', + 'public'], 'type': 'object'}, 'CreateSpacesParams': {'additionalProperties': False, - 'properties': {'Spaces': {'items': {'$ref': '#/definitions/CreateSpaceParams'}, + 'properties': {'spaces': {'items': {'$ref': '#/definitions/CreateSpaceParams'}, 'type': 'array'}}, - 'required': ['Spaces'], + 'required': ['spaces'], 'type': 'object'}, 'Error': {'additionalProperties': False, - 'properties': {'Code': {'type': 'string'}, - 'Info': {'$ref': '#/definitions/ErrorInfo'}, - 'Message': {'type': 'string'}}, - 'required': ['Message', 'Code'], + 'properties': {'code': {'type': 'string'}, + 'info': {'$ref': '#/definitions/ErrorInfo'}, + 'message': {'type': 'string'}}, + 'required': ['message', 'code'], 'type': 'object'}, 'ErrorInfo': {'additionalProperties': False, - 'properties': {'Macaroon': {'$ref': '#/definitions/Macaroon'}, - 'MacaroonPath': {'type': 'string'}}, + 'properties': {'macaroon': {'$ref': '#/definitions/Macaroon'}, + 'macaroon-path': {'type': 'string'}}, 'type': 'object'}, 'ErrorResult': {'additionalProperties': False, - 'properties': {'Error': {'$ref': '#/definitions/Error'}}, - 'required': ['Error'], + 'properties': {'error': {'$ref': '#/definitions/Error'}}, 'type': 'object'}, 'ErrorResults': {'additionalProperties': False, - 'properties': {'Results': {'items': {'$ref': '#/definitions/ErrorResult'}, + 'properties': {'results': {'items': {'$ref': '#/definitions/ErrorResult'}, 'type': 'array'}}, - 'required': ['Results'], + 'required': ['results'], 'type': 'object'}, 'ListSpacesResults': {'additionalProperties': False, - 'properties': {'Results': {'items': {'$ref': '#/definitions/Space'}, + 'properties': {'results': {'items': {'$ref': '#/definitions/Space'}, 'type': 'array'}}, - 'required': ['Results'], + 'required': ['results'], 'type': 'object'}, - 'Macaroon': {'additionalProperties': False, - 'properties': {'caveats': {'items': {'$ref': '#/definitions/caveat'}, - 'type': 'array'}, - 'data': {'items': {'type': 'integer'}, - 'type': 'array'}, - 'id': {'$ref': '#/definitions/packet'}, - 'location': {'$ref': '#/definitions/packet'}, - 'sig': {'items': {'type': 'integer'}, - 'type': 'array'}}, - 'required': ['data', - 'location', - 'id', - 'caveats', - 'sig'], - 'type': 'object'}, + 'Macaroon': {'additionalProperties': False, 'type': 'object'}, 'Space': {'additionalProperties': False, - 'properties': {'Error': {'$ref': '#/definitions/Error'}, - 'Name': {'type': 'string'}, - 'Subnets': {'items': {'$ref': '#/definitions/Subnet'}, + 'properties': {'error': {'$ref': '#/definitions/Error'}, + 'name': {'type': 'string'}, + 'subnets': {'items': {'$ref': '#/definitions/Subnet'}, 'type': 'array'}}, - 'required': ['Name', 'Subnets'], + 'required': ['name', 'subnets'], 'type': 'object'}, 'Subnet': {'additionalProperties': False, - 'properties': {'CIDR': {'type': 'string'}, - 'Life': {'type': 'string'}, - 'ProviderId': {'type': 'string'}, - 'SpaceTag': {'type': 'string'}, - 'StaticRangeHighIP': {'items': {'type': 'integer'}, - 'type': 'array'}, - 'StaticRangeLowIP': {'items': {'type': 'integer'}, - 'type': 'array'}, - 'Status': {'type': 'string'}, - 'VLANTag': {'type': 'integer'}, - 'Zones': {'items': {'type': 'string'}, + 'properties': {'cidr': {'type': 'string'}, + 'life': {'type': 'string'}, + 'provider-id': {'type': 'string'}, + 'space-tag': {'type': 'string'}, + 'status': {'type': 'string'}, + 'vlan-tag': {'type': 'integer'}, + 'zones': {'items': {'type': 'string'}, 'type': 'array'}}, - 'required': ['CIDR', - 'VLANTag', - 'Life', - 'SpaceTag', - 'Zones'], - 'type': 'object'}, - 'caveat': {'additionalProperties': False, - 'properties': {'caveatId': {'$ref': '#/definitions/packet'}, - 'location': {'$ref': '#/definitions/packet'}, - 'verificationId': {'$ref': '#/definitions/packet'}}, - 'required': ['location', - 'caveatId', - 'verificationId'], - 'type': 'object'}, - 'packet': {'additionalProperties': False, - 'properties': {'headerLen': {'type': 'integer'}, - 'start': {'type': 'integer'}, - 'totalLen': {'type': 'integer'}}, - 'required': ['start', 'totalLen', 'headerLen'], + 'required': ['cidr', + 'vlan-tag', + 'life', + 'space-tag', + 'zones'], 'type': 'object'}}, 'properties': {'CreateSpaces': {'properties': {'Params': {'$ref': '#/definitions/CreateSpacesParams'}, 'Result': {'$ref': '#/definitions/ErrorResults'}}, @@ -16022,7 +15380,7 @@ class SpacesFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Spaces', Request='CreateSpaces', Version=2, Params=params) - params['Spaces'] = spaces + params['spaces'] = spaces reply = await self.rpc(msg) return reply @@ -16046,10 +15404,10 @@ class StatusHistoryFacade(Type): name = 'StatusHistory' version = 2 schema = {'definitions': {'StatusHistoryPruneArgs': {'additionalProperties': False, - 'properties': {'MaxHistoryMB': {'type': 'integer'}, - 'MaxHistoryTime': {'type': 'integer'}}, - 'required': ['MaxHistoryTime', - 'MaxHistoryMB'], + 'properties': {'max-history-mb': {'type': 'integer'}, + 'max-history-time': {'type': 'integer'}}, + 'required': ['max-history-time', + 'max-history-mb'], 'type': 'object'}}, 'properties': {'Prune': {'properties': {'Params': {'$ref': '#/definitions/StatusHistoryPruneArgs'}}, 'type': 'object'}}, @@ -16057,17 +15415,17 @@ class StatusHistoryFacade(Type): @ReturnMapping(None) - async def Prune(self, maxhistorymb, maxhistorytime): + async def Prune(self, max_history_mb, max_history_time): ''' - maxhistorymb : int - maxhistorytime : int + max_history_mb : int + max_history_time : int Returns -> None ''' # map input types to rpc msg params = dict() msg = dict(Type='StatusHistory', Request='Prune', Version=2, Params=params) - params['MaxHistoryMB'] = maxhistorymb - params['MaxHistoryTime'] = maxhistorytime + params['max-history-mb'] = max_history_mb + params['max-history-time'] = max_history_time reply = await self.rpc(msg) return reply @@ -16076,59 +15434,55 @@ class StorageFacade(Type): name = 'Storage' version = 2 schema = {'definitions': {'Entities': {'additionalProperties': False, - 'properties': {'Entities': {'items': {'$ref': '#/definitions/Entity'}, + 'properties': {'entities': {'items': {'$ref': '#/definitions/Entity'}, 'type': 'array'}}, - 'required': ['Entities'], + 'required': ['entities'], 'type': 'object'}, 'Entity': {'additionalProperties': False, - 'properties': {'Tag': {'type': 'string'}}, - 'required': ['Tag'], + 'properties': {'tag': {'type': 'string'}}, + 'required': ['tag'], 'type': 'object'}, 'EntityStatus': {'additionalProperties': False, - 'properties': {'Data': {'patternProperties': {'.*': {'additionalProperties': True, + 'properties': {'data': {'patternProperties': {'.*': {'additionalProperties': True, 'type': 'object'}}, 'type': 'object'}, - 'Info': {'type': 'string'}, - 'Since': {'format': 'date-time', + 'info': {'type': 'string'}, + 'since': {'format': 'date-time', 'type': 'string'}, - 'Status': {'type': 'string'}}, - 'required': ['Status', - 'Info', - 'Data', - 'Since'], + 'status': {'type': 'string'}}, + 'required': ['status', 'info', 'since'], 'type': 'object'}, 'Error': {'additionalProperties': False, - 'properties': {'Code': {'type': 'string'}, - 'Info': {'$ref': '#/definitions/ErrorInfo'}, - 'Message': {'type': 'string'}}, - 'required': ['Message', 'Code'], + 'properties': {'code': {'type': 'string'}, + 'info': {'$ref': '#/definitions/ErrorInfo'}, + 'message': {'type': 'string'}}, + 'required': ['message', 'code'], 'type': 'object'}, 'ErrorInfo': {'additionalProperties': False, - 'properties': {'Macaroon': {'$ref': '#/definitions/Macaroon'}, - 'MacaroonPath': {'type': 'string'}}, + 'properties': {'macaroon': {'$ref': '#/definitions/Macaroon'}, + 'macaroon-path': {'type': 'string'}}, 'type': 'object'}, 'ErrorResult': {'additionalProperties': False, - 'properties': {'Error': {'$ref': '#/definitions/Error'}}, - 'required': ['Error'], + 'properties': {'error': {'$ref': '#/definitions/Error'}}, 'type': 'object'}, 'ErrorResults': {'additionalProperties': False, - 'properties': {'Results': {'items': {'$ref': '#/definitions/ErrorResult'}, + 'properties': {'results': {'items': {'$ref': '#/definitions/ErrorResult'}, 'type': 'array'}}, - 'required': ['Results'], + 'required': ['results'], 'type': 'object'}, 'FilesystemAttachmentInfo': {'additionalProperties': False, - 'properties': {'mountpoint': {'type': 'string'}, + 'properties': {'mount-point': {'type': 'string'}, 'read-only': {'type': 'boolean'}}, 'type': 'object'}, 'FilesystemDetails': {'additionalProperties': False, - 'properties': {'filesystemtag': {'type': 'string'}, + 'properties': {'filesystem-tag': {'type': 'string'}, 'info': {'$ref': '#/definitions/FilesystemInfo'}, - 'machineattachments': {'patternProperties': {'.*': {'$ref': '#/definitions/FilesystemAttachmentInfo'}}, - 'type': 'object'}, + 'machine-attachments': {'patternProperties': {'.*': {'$ref': '#/definitions/FilesystemAttachmentInfo'}}, + 'type': 'object'}, 'status': {'$ref': '#/definitions/EntityStatus'}, 'storage': {'$ref': '#/definitions/StorageDetails'}, - 'volumetag': {'type': 'string'}}, - 'required': ['filesystemtag', + 'volume-tag': {'type': 'string'}}, + 'required': ['filesystem-tag', 'info', 'status'], 'type': 'object'}, @@ -16150,61 +15504,44 @@ class StorageFacade(Type): 'type': 'array'}}, 'type': 'object'}, 'FilesystemInfo': {'additionalProperties': False, - 'properties': {'filesystemid': {'type': 'string'}, + 'properties': {'filesystem-id': {'type': 'string'}, 'size': {'type': 'integer'}}, - 'required': ['filesystemid', 'size'], + 'required': ['filesystem-id', 'size'], 'type': 'object'}, - 'Macaroon': {'additionalProperties': False, - 'properties': {'caveats': {'items': {'$ref': '#/definitions/caveat'}, - 'type': 'array'}, - 'data': {'items': {'type': 'integer'}, - 'type': 'array'}, - 'id': {'$ref': '#/definitions/packet'}, - 'location': {'$ref': '#/definitions/packet'}, - 'sig': {'items': {'type': 'integer'}, - 'type': 'array'}}, - 'required': ['data', - 'location', - 'id', - 'caveats', - 'sig'], - 'type': 'object'}, + 'Macaroon': {'additionalProperties': False, 'type': 'object'}, 'StorageAddParams': {'additionalProperties': False, - 'properties': {'StorageName': {'type': 'string'}, + 'properties': {'name': {'type': 'string'}, 'storage': {'$ref': '#/definitions/StorageConstraints'}, 'unit': {'type': 'string'}}, - 'required': ['unit', - 'StorageName', - 'storage'], + 'required': ['unit', 'name', 'storage'], 'type': 'object'}, 'StorageAttachmentDetails': {'additionalProperties': False, 'properties': {'location': {'type': 'string'}, - 'machinetag': {'type': 'string'}, - 'storagetag': {'type': 'string'}, - 'unittag': {'type': 'string'}}, - 'required': ['storagetag', - 'unittag', - 'machinetag'], + 'machine-tag': {'type': 'string'}, + 'storage-tag': {'type': 'string'}, + 'unit-tag': {'type': 'string'}}, + 'required': ['storage-tag', + 'unit-tag', + 'machine-tag'], 'type': 'object'}, 'StorageConstraints': {'additionalProperties': False, - 'properties': {'Count': {'type': 'integer'}, - 'Pool': {'type': 'string'}, - 'Size': {'type': 'integer'}}, - 'required': ['Pool', 'Size', 'Count'], + 'properties': {'count': {'type': 'integer'}, + 'pool': {'type': 'string'}, + 'size': {'type': 'integer'}}, 'type': 'object'}, 'StorageDetails': {'additionalProperties': False, - 'properties': {'Persistent': {'type': 'boolean'}, - 'attachments': {'patternProperties': {'.*': {'$ref': '#/definitions/StorageAttachmentDetails'}}, + 'properties': {'attachments': {'patternProperties': {'.*': {'$ref': '#/definitions/StorageAttachmentDetails'}}, 'type': 'object'}, 'kind': {'type': 'integer'}, - 'ownertag': {'type': 'string'}, + 'owner-tag': {'type': 'string'}, + 'persistent': {'type': 'boolean'}, 'status': {'$ref': '#/definitions/EntityStatus'}, - 'storagetag': {'type': 'string'}}, - 'required': ['storagetag', - 'ownertag', + 'storage-tag': {'type': 'string'}}, + 'required': ['storage-tag', + 'owner-tag', 'kind', 'status', - 'Persistent'], + 'persistent'], 'type': 'object'}, 'StorageDetailsListResult': {'additionalProperties': False, 'properties': {'error': {'$ref': '#/definitions/Error'}, @@ -16249,8 +15586,8 @@ class StorageFacade(Type): 'type': 'object'}, 'StoragePoolsResult': {'additionalProperties': False, 'properties': {'error': {'$ref': '#/definitions/Error'}, - 'storagepools': {'items': {'$ref': '#/definitions/StoragePool'}, - 'type': 'array'}}, + 'storage-pools': {'items': {'$ref': '#/definitions/StoragePool'}, + 'type': 'array'}}, 'type': 'object'}, 'StoragePoolsResults': {'additionalProperties': False, 'properties': {'results': {'items': {'$ref': '#/definitions/StoragePoolsResult'}, @@ -16262,19 +15599,19 @@ class StorageFacade(Type): 'required': ['storages'], 'type': 'object'}, 'VolumeAttachmentInfo': {'additionalProperties': False, - 'properties': {'busaddress': {'type': 'string'}, - 'devicelink': {'type': 'string'}, - 'devicename': {'type': 'string'}, + 'properties': {'bus-address': {'type': 'string'}, + 'device-link': {'type': 'string'}, + 'device-name': {'type': 'string'}, 'read-only': {'type': 'boolean'}}, 'type': 'object'}, 'VolumeDetails': {'additionalProperties': False, 'properties': {'info': {'$ref': '#/definitions/VolumeInfo'}, - 'machineattachments': {'patternProperties': {'.*': {'$ref': '#/definitions/VolumeAttachmentInfo'}}, - 'type': 'object'}, + 'machine-attachments': {'patternProperties': {'.*': {'$ref': '#/definitions/VolumeAttachmentInfo'}}, + 'type': 'object'}, 'status': {'$ref': '#/definitions/EntityStatus'}, 'storage': {'$ref': '#/definitions/StorageDetails'}, - 'volumetag': {'type': 'string'}}, - 'required': ['volumetag', 'info', 'status'], + 'volume-tag': {'type': 'string'}}, + 'required': ['volume-tag', 'info', 'status'], 'type': 'object'}, 'VolumeDetailsListResult': {'additionalProperties': False, 'properties': {'error': {'$ref': '#/definitions/Error'}, @@ -16294,26 +15631,12 @@ class StorageFacade(Type): 'type': 'array'}}, 'type': 'object'}, 'VolumeInfo': {'additionalProperties': False, - 'properties': {'hardwareid': {'type': 'string'}, + 'properties': {'hardware-id': {'type': 'string'}, 'persistent': {'type': 'boolean'}, 'size': {'type': 'integer'}, - 'volumeid': {'type': 'string'}}, - 'required': ['volumeid', 'size', 'persistent'], - 'type': 'object'}, - 'caveat': {'additionalProperties': False, - 'properties': {'caveatId': {'$ref': '#/definitions/packet'}, - 'location': {'$ref': '#/definitions/packet'}, - 'verificationId': {'$ref': '#/definitions/packet'}}, - 'required': ['location', - 'caveatId', - 'verificationId'], - 'type': 'object'}, - 'packet': {'additionalProperties': False, - 'properties': {'headerLen': {'type': 'integer'}, - 'start': {'type': 'integer'}, - 'totalLen': {'type': 'integer'}}, - 'required': ['start', 'totalLen', 'headerLen'], - 'type': 'object'}}, + 'volume-id': {'type': 'string'}}, + 'required': ['volume-id', 'size', 'persistent'], + 'type': 'object'}}, 'properties': {'AddToUnit': {'properties': {'Params': {'$ref': '#/definitions/StoragesAddParams'}, 'Result': {'$ref': '#/definitions/ErrorResults'}}, 'type': 'object'}, @@ -16440,7 +15763,7 @@ class StorageFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Storage', Request='StorageDetails', Version=2, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -16481,73 +15804,72 @@ class StorageProvisionerFacade(Type): 'type': 'array'}}, 'type': 'object'}, 'Entities': {'additionalProperties': False, - 'properties': {'Entities': {'items': {'$ref': '#/definitions/Entity'}, + 'properties': {'entities': {'items': {'$ref': '#/definitions/Entity'}, 'type': 'array'}}, - 'required': ['Entities'], + 'required': ['entities'], 'type': 'object'}, 'Entity': {'additionalProperties': False, - 'properties': {'Tag': {'type': 'string'}}, - 'required': ['Tag'], + 'properties': {'tag': {'type': 'string'}}, + 'required': ['tag'], 'type': 'object'}, 'EntityStatusArgs': {'additionalProperties': False, - 'properties': {'Data': {'patternProperties': {'.*': {'additionalProperties': True, + 'properties': {'data': {'patternProperties': {'.*': {'additionalProperties': True, 'type': 'object'}}, 'type': 'object'}, - 'Info': {'type': 'string'}, - 'Status': {'type': 'string'}, - 'Tag': {'type': 'string'}}, - 'required': ['Tag', - 'Status', - 'Info', - 'Data'], + 'info': {'type': 'string'}, + 'status': {'type': 'string'}, + 'tag': {'type': 'string'}}, + 'required': ['tag', + 'status', + 'info', + 'data'], 'type': 'object'}, 'Error': {'additionalProperties': False, - 'properties': {'Code': {'type': 'string'}, - 'Info': {'$ref': '#/definitions/ErrorInfo'}, - 'Message': {'type': 'string'}}, - 'required': ['Message', 'Code'], + 'properties': {'code': {'type': 'string'}, + 'info': {'$ref': '#/definitions/ErrorInfo'}, + 'message': {'type': 'string'}}, + 'required': ['message', 'code'], 'type': 'object'}, 'ErrorInfo': {'additionalProperties': False, - 'properties': {'Macaroon': {'$ref': '#/definitions/Macaroon'}, - 'MacaroonPath': {'type': 'string'}}, + 'properties': {'macaroon': {'$ref': '#/definitions/Macaroon'}, + 'macaroon-path': {'type': 'string'}}, 'type': 'object'}, 'ErrorResult': {'additionalProperties': False, - 'properties': {'Error': {'$ref': '#/definitions/Error'}}, - 'required': ['Error'], + 'properties': {'error': {'$ref': '#/definitions/Error'}}, 'type': 'object'}, 'ErrorResults': {'additionalProperties': False, - 'properties': {'Results': {'items': {'$ref': '#/definitions/ErrorResult'}, + 'properties': {'results': {'items': {'$ref': '#/definitions/ErrorResult'}, 'type': 'array'}}, - 'required': ['Results'], + 'required': ['results'], 'type': 'object'}, 'Filesystem': {'additionalProperties': False, - 'properties': {'filesystemtag': {'type': 'string'}, + 'properties': {'filesystem-tag': {'type': 'string'}, 'info': {'$ref': '#/definitions/FilesystemInfo'}, - 'volumetag': {'type': 'string'}}, - 'required': ['filesystemtag', 'info'], + 'volume-tag': {'type': 'string'}}, + 'required': ['filesystem-tag', 'info'], 'type': 'object'}, 'FilesystemAttachment': {'additionalProperties': False, - 'properties': {'filesystemtag': {'type': 'string'}, + 'properties': {'filesystem-tag': {'type': 'string'}, 'info': {'$ref': '#/definitions/FilesystemAttachmentInfo'}, - 'machinetag': {'type': 'string'}}, - 'required': ['filesystemtag', - 'machinetag', + 'machine-tag': {'type': 'string'}}, + 'required': ['filesystem-tag', + 'machine-tag', 'info'], 'type': 'object'}, 'FilesystemAttachmentInfo': {'additionalProperties': False, - 'properties': {'mountpoint': {'type': 'string'}, + 'properties': {'mount-point': {'type': 'string'}, 'read-only': {'type': 'boolean'}}, 'type': 'object'}, 'FilesystemAttachmentParams': {'additionalProperties': False, - 'properties': {'filesystemid': {'type': 'string'}, - 'filesystemtag': {'type': 'string'}, - 'instanceid': {'type': 'string'}, - 'machinetag': {'type': 'string'}, - 'mountpoint': {'type': 'string'}, + 'properties': {'filesystem-id': {'type': 'string'}, + 'filesystem-tag': {'type': 'string'}, + 'instance-id': {'type': 'string'}, + 'machine-tag': {'type': 'string'}, + 'mount-point': {'type': 'string'}, 'provider': {'type': 'string'}, 'read-only': {'type': 'boolean'}}, - 'required': ['filesystemtag', - 'machinetag', + 'required': ['filesystem-tag', + 'machine-tag', 'provider'], 'type': 'object'}, 'FilesystemAttachmentParamsResult': {'additionalProperties': False, @@ -16569,27 +15891,27 @@ class StorageProvisionerFacade(Type): 'type': 'array'}}, 'type': 'object'}, 'FilesystemAttachments': {'additionalProperties': False, - 'properties': {'filesystemattachments': {'items': {'$ref': '#/definitions/FilesystemAttachment'}, - 'type': 'array'}}, - 'required': ['filesystemattachments'], + 'properties': {'filesystem-attachments': {'items': {'$ref': '#/definitions/FilesystemAttachment'}, + 'type': 'array'}}, + 'required': ['filesystem-attachments'], 'type': 'object'}, 'FilesystemInfo': {'additionalProperties': False, - 'properties': {'filesystemid': {'type': 'string'}, + 'properties': {'filesystem-id': {'type': 'string'}, 'size': {'type': 'integer'}}, - 'required': ['filesystemid', 'size'], + 'required': ['filesystem-id', 'size'], 'type': 'object'}, 'FilesystemParams': {'additionalProperties': False, 'properties': {'attachment': {'$ref': '#/definitions/FilesystemAttachmentParams'}, 'attributes': {'patternProperties': {'.*': {'additionalProperties': True, 'type': 'object'}}, 'type': 'object'}, - 'filesystemtag': {'type': 'string'}, + 'filesystem-tag': {'type': 'string'}, 'provider': {'type': 'string'}, 'size': {'type': 'integer'}, 'tags': {'patternProperties': {'.*': {'type': 'string'}}, 'type': 'object'}, - 'volumetag': {'type': 'string'}}, - 'required': ['filesystemtag', + 'volume-tag': {'type': 'string'}}, + 'required': ['filesystem-tag', 'size', 'provider'], 'type': 'object'}, @@ -16617,35 +15939,21 @@ class StorageProvisionerFacade(Type): 'required': ['filesystems'], 'type': 'object'}, 'LifeResult': {'additionalProperties': False, - 'properties': {'Error': {'$ref': '#/definitions/Error'}, - 'Life': {'type': 'string'}}, - 'required': ['Life', 'Error'], + 'properties': {'error': {'$ref': '#/definitions/Error'}, + 'life': {'type': 'string'}}, + 'required': ['life'], 'type': 'object'}, 'LifeResults': {'additionalProperties': False, - 'properties': {'Results': {'items': {'$ref': '#/definitions/LifeResult'}, + 'properties': {'results': {'items': {'$ref': '#/definitions/LifeResult'}, 'type': 'array'}}, - 'required': ['Results'], + 'required': ['results'], 'type': 'object'}, - 'Macaroon': {'additionalProperties': False, - 'properties': {'caveats': {'items': {'$ref': '#/definitions/caveat'}, - 'type': 'array'}, - 'data': {'items': {'type': 'integer'}, - 'type': 'array'}, - 'id': {'$ref': '#/definitions/packet'}, - 'location': {'$ref': '#/definitions/packet'}, - 'sig': {'items': {'type': 'integer'}, - 'type': 'array'}}, - 'required': ['data', - 'location', - 'id', - 'caveats', - 'sig'], - 'type': 'object'}, + 'Macaroon': {'additionalProperties': False, 'type': 'object'}, 'MachineStorageId': {'additionalProperties': False, - 'properties': {'attachmenttag': {'type': 'string'}, - 'machinetag': {'type': 'string'}}, - 'required': ['machinetag', - 'attachmenttag'], + 'properties': {'attachment-tag': {'type': 'string'}, + 'machine-tag': {'type': 'string'}}, + 'required': ['machine-tag', + 'attachment-tag'], 'type': 'object'}, 'MachineStorageIds': {'additionalProperties': False, 'properties': {'ids': {'items': {'$ref': '#/definitions/MachineStorageId'}, @@ -16653,92 +15961,89 @@ class StorageProvisionerFacade(Type): 'required': ['ids'], 'type': 'object'}, 'MachineStorageIdsWatchResult': {'additionalProperties': False, - 'properties': {'Changes': {'items': {'$ref': '#/definitions/MachineStorageId'}, + 'properties': {'changes': {'items': {'$ref': '#/definitions/MachineStorageId'}, 'type': 'array'}, - 'Error': {'$ref': '#/definitions/Error'}, - 'MachineStorageIdsWatcherId': {'type': 'string'}}, - 'required': ['MachineStorageIdsWatcherId', - 'Changes', - 'Error'], + 'error': {'$ref': '#/definitions/Error'}, + 'watcher-id': {'type': 'string'}}, + 'required': ['watcher-id', + 'changes'], 'type': 'object'}, 'MachineStorageIdsWatchResults': {'additionalProperties': False, - 'properties': {'Results': {'items': {'$ref': '#/definitions/MachineStorageIdsWatchResult'}, + 'properties': {'results': {'items': {'$ref': '#/definitions/MachineStorageIdsWatchResult'}, 'type': 'array'}}, - 'required': ['Results'], + 'required': ['results'], 'type': 'object'}, 'ModelConfigResult': {'additionalProperties': False, - 'properties': {'Config': {'patternProperties': {'.*': {'additionalProperties': True, + 'properties': {'config': {'patternProperties': {'.*': {'additionalProperties': True, 'type': 'object'}}, 'type': 'object'}}, - 'required': ['Config'], + 'required': ['config'], 'type': 'object'}, 'NotifyWatchResult': {'additionalProperties': False, - 'properties': {'Error': {'$ref': '#/definitions/Error'}, - 'NotifyWatcherId': {'type': 'string'}}, - 'required': ['NotifyWatcherId', 'Error'], + 'properties': {'NotifyWatcherId': {'type': 'string'}, + 'error': {'$ref': '#/definitions/Error'}}, + 'required': ['NotifyWatcherId'], 'type': 'object'}, 'NotifyWatchResults': {'additionalProperties': False, - 'properties': {'Results': {'items': {'$ref': '#/definitions/NotifyWatchResult'}, + 'properties': {'results': {'items': {'$ref': '#/definitions/NotifyWatchResult'}, 'type': 'array'}}, - 'required': ['Results'], + 'required': ['results'], 'type': 'object'}, 'SetStatus': {'additionalProperties': False, - 'properties': {'Entities': {'items': {'$ref': '#/definitions/EntityStatusArgs'}, + 'properties': {'entities': {'items': {'$ref': '#/definitions/EntityStatusArgs'}, 'type': 'array'}}, - 'required': ['Entities'], + 'required': ['entities'], 'type': 'object'}, 'StringResult': {'additionalProperties': False, - 'properties': {'Error': {'$ref': '#/definitions/Error'}, - 'Result': {'type': 'string'}}, - 'required': ['Error', 'Result'], + 'properties': {'error': {'$ref': '#/definitions/Error'}, + 'result': {'type': 'string'}}, + 'required': ['result'], 'type': 'object'}, 'StringResults': {'additionalProperties': False, - 'properties': {'Results': {'items': {'$ref': '#/definitions/StringResult'}, + 'properties': {'results': {'items': {'$ref': '#/definitions/StringResult'}, 'type': 'array'}}, - 'required': ['Results'], + 'required': ['results'], 'type': 'object'}, 'StringsWatchResult': {'additionalProperties': False, - 'properties': {'Changes': {'items': {'type': 'string'}, + 'properties': {'changes': {'items': {'type': 'string'}, 'type': 'array'}, - 'Error': {'$ref': '#/definitions/Error'}, - 'StringsWatcherId': {'type': 'string'}}, - 'required': ['StringsWatcherId', - 'Changes', - 'Error'], + 'error': {'$ref': '#/definitions/Error'}, + 'watcher-id': {'type': 'string'}}, + 'required': ['watcher-id'], 'type': 'object'}, 'StringsWatchResults': {'additionalProperties': False, - 'properties': {'Results': {'items': {'$ref': '#/definitions/StringsWatchResult'}, + 'properties': {'results': {'items': {'$ref': '#/definitions/StringsWatchResult'}, 'type': 'array'}}, - 'required': ['Results'], + 'required': ['results'], 'type': 'object'}, 'Volume': {'additionalProperties': False, 'properties': {'info': {'$ref': '#/definitions/VolumeInfo'}, - 'volumetag': {'type': 'string'}}, - 'required': ['volumetag', 'info'], + 'volume-tag': {'type': 'string'}}, + 'required': ['volume-tag', 'info'], 'type': 'object'}, 'VolumeAttachment': {'additionalProperties': False, 'properties': {'info': {'$ref': '#/definitions/VolumeAttachmentInfo'}, - 'machinetag': {'type': 'string'}, - 'volumetag': {'type': 'string'}}, - 'required': ['volumetag', - 'machinetag', + 'machine-tag': {'type': 'string'}, + 'volume-tag': {'type': 'string'}}, + 'required': ['volume-tag', + 'machine-tag', 'info'], 'type': 'object'}, 'VolumeAttachmentInfo': {'additionalProperties': False, - 'properties': {'busaddress': {'type': 'string'}, - 'devicelink': {'type': 'string'}, - 'devicename': {'type': 'string'}, + 'properties': {'bus-address': {'type': 'string'}, + 'device-link': {'type': 'string'}, + 'device-name': {'type': 'string'}, 'read-only': {'type': 'boolean'}}, 'type': 'object'}, 'VolumeAttachmentParams': {'additionalProperties': False, - 'properties': {'instanceid': {'type': 'string'}, - 'machinetag': {'type': 'string'}, + 'properties': {'instance-id': {'type': 'string'}, + 'machine-tag': {'type': 'string'}, 'provider': {'type': 'string'}, 'read-only': {'type': 'boolean'}, - 'volumeid': {'type': 'string'}, - 'volumetag': {'type': 'string'}}, - 'required': ['volumetag', - 'machinetag', + 'volume-id': {'type': 'string'}, + 'volume-tag': {'type': 'string'}}, + 'required': ['volume-tag', + 'machine-tag', 'provider'], 'type': 'object'}, 'VolumeAttachmentParamsResult': {'additionalProperties': False, @@ -16760,16 +16065,16 @@ class StorageProvisionerFacade(Type): 'type': 'array'}}, 'type': 'object'}, 'VolumeAttachments': {'additionalProperties': False, - 'properties': {'volumeattachments': {'items': {'$ref': '#/definitions/VolumeAttachment'}, - 'type': 'array'}}, - 'required': ['volumeattachments'], + 'properties': {'volume-attachments': {'items': {'$ref': '#/definitions/VolumeAttachment'}, + 'type': 'array'}}, + 'required': ['volume-attachments'], 'type': 'object'}, 'VolumeInfo': {'additionalProperties': False, - 'properties': {'hardwareid': {'type': 'string'}, + 'properties': {'hardware-id': {'type': 'string'}, 'persistent': {'type': 'boolean'}, 'size': {'type': 'integer'}, - 'volumeid': {'type': 'string'}}, - 'required': ['volumeid', 'size', 'persistent'], + 'volume-id': {'type': 'string'}}, + 'required': ['volume-id', 'size', 'persistent'], 'type': 'object'}, 'VolumeParams': {'additionalProperties': False, 'properties': {'attachment': {'$ref': '#/definitions/VolumeAttachmentParams'}, @@ -16780,8 +16085,10 @@ class StorageProvisionerFacade(Type): 'size': {'type': 'integer'}, 'tags': {'patternProperties': {'.*': {'type': 'string'}}, 'type': 'object'}, - 'volumetag': {'type': 'string'}}, - 'required': ['volumetag', 'size', 'provider'], + 'volume-tag': {'type': 'string'}}, + 'required': ['volume-tag', + 'size', + 'provider'], 'type': 'object'}, 'VolumeParamsResult': {'additionalProperties': False, 'properties': {'error': {'$ref': '#/definitions/Error'}, @@ -16805,21 +16112,7 @@ class StorageProvisionerFacade(Type): 'properties': {'volumes': {'items': {'$ref': '#/definitions/Volume'}, 'type': 'array'}}, 'required': ['volumes'], - 'type': 'object'}, - 'caveat': {'additionalProperties': False, - 'properties': {'caveatId': {'$ref': '#/definitions/packet'}, - 'location': {'$ref': '#/definitions/packet'}, - 'verificationId': {'$ref': '#/definitions/packet'}}, - 'required': ['location', - 'caveatId', - 'verificationId'], - 'type': 'object'}, - 'packet': {'additionalProperties': False, - 'properties': {'headerLen': {'type': 'integer'}, - 'start': {'type': 'integer'}, - 'totalLen': {'type': 'integer'}}, - 'required': ['start', 'totalLen', 'headerLen'], - 'type': 'object'}}, + 'type': 'object'}}, 'properties': {'AttachmentLife': {'properties': {'Params': {'$ref': '#/definitions/MachineStorageIds'}, 'Result': {'$ref': '#/definitions/LifeResults'}}, 'type': 'object'}, @@ -16932,7 +16225,7 @@ class StorageProvisionerFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='StorageProvisioner', Request='EnsureDead', Version=2, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -16977,7 +16270,7 @@ class StorageProvisionerFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='StorageProvisioner', Request='FilesystemParams', Version=2, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -16992,7 +16285,7 @@ class StorageProvisionerFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='StorageProvisioner', Request='Filesystems', Version=2, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -17007,7 +16300,7 @@ class StorageProvisionerFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='StorageProvisioner', Request='InstanceId', Version=2, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -17022,7 +16315,7 @@ class StorageProvisionerFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='StorageProvisioner', Request='Life', Version=2, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -17052,7 +16345,7 @@ class StorageProvisionerFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='StorageProvisioner', Request='Remove', Version=2, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -17074,15 +16367,15 @@ class StorageProvisionerFacade(Type): @ReturnMapping(ErrorResults) - async def SetFilesystemAttachmentInfo(self, filesystemattachments): + async def SetFilesystemAttachmentInfo(self, filesystem_attachments): ''' - filesystemattachments : typing.Sequence[~FilesystemAttachment] + filesystem_attachments : typing.Sequence[~FilesystemAttachment] Returns -> typing.Sequence[~ErrorResult] ''' # map input types to rpc msg params = dict() msg = dict(Type='StorageProvisioner', Request='SetFilesystemAttachmentInfo', Version=2, Params=params) - params['filesystemattachments'] = filesystemattachments + params['filesystem-attachments'] = filesystem_attachments reply = await self.rpc(msg) return reply @@ -17112,22 +16405,22 @@ class StorageProvisionerFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='StorageProvisioner', Request='SetStatus', Version=2, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @ReturnMapping(ErrorResults) - async def SetVolumeAttachmentInfo(self, volumeattachments): + async def SetVolumeAttachmentInfo(self, volume_attachments): ''' - volumeattachments : typing.Sequence[~VolumeAttachment] + volume_attachments : typing.Sequence[~VolumeAttachment] Returns -> typing.Sequence[~ErrorResult] ''' # map input types to rpc msg params = dict() msg = dict(Type='StorageProvisioner', Request='SetVolumeAttachmentInfo', Version=2, Params=params) - params['volumeattachments'] = volumeattachments + params['volume-attachments'] = volume_attachments reply = await self.rpc(msg) return reply @@ -17157,7 +16450,7 @@ class StorageProvisionerFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='StorageProvisioner', Request='UpdateStatus', Version=2, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -17217,7 +16510,7 @@ class StorageProvisionerFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='StorageProvisioner', Request='VolumeParams', Version=2, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -17232,7 +16525,7 @@ class StorageProvisionerFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='StorageProvisioner', Request='Volumes', Version=2, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -17247,7 +16540,7 @@ class StorageProvisionerFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='StorageProvisioner', Request='WatchBlockDevices', Version=2, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -17262,7 +16555,7 @@ class StorageProvisionerFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='StorageProvisioner', Request='WatchFilesystemAttachments', Version=2, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -17277,7 +16570,7 @@ class StorageProvisionerFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='StorageProvisioner', Request='WatchFilesystems', Version=2, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -17287,7 +16580,7 @@ class StorageProvisionerFacade(Type): async def WatchForModelConfigChanges(self): ''' - Returns -> typing.Union[_ForwardRef('Error'), str] + Returns -> typing.Union[str, _ForwardRef('Error')] ''' # map input types to rpc msg params = dict() @@ -17307,7 +16600,7 @@ class StorageProvisionerFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='StorageProvisioner', Request='WatchMachines', Version=2, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -17322,7 +16615,7 @@ class StorageProvisionerFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='StorageProvisioner', Request='WatchVolumeAttachments', Version=2, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -17337,7 +16630,7 @@ class StorageProvisionerFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='StorageProvisioner', Request='WatchVolumes', Version=2, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -17346,53 +16639,23 @@ class StringsWatcherFacade(Type): name = 'StringsWatcher' version = 1 schema = {'definitions': {'Error': {'additionalProperties': False, - 'properties': {'Code': {'type': 'string'}, - 'Info': {'$ref': '#/definitions/ErrorInfo'}, - 'Message': {'type': 'string'}}, - 'required': ['Message', 'Code'], + 'properties': {'code': {'type': 'string'}, + 'info': {'$ref': '#/definitions/ErrorInfo'}, + 'message': {'type': 'string'}}, + 'required': ['message', 'code'], 'type': 'object'}, 'ErrorInfo': {'additionalProperties': False, - 'properties': {'Macaroon': {'$ref': '#/definitions/Macaroon'}, - 'MacaroonPath': {'type': 'string'}}, + 'properties': {'macaroon': {'$ref': '#/definitions/Macaroon'}, + 'macaroon-path': {'type': 'string'}}, 'type': 'object'}, - 'Macaroon': {'additionalProperties': False, - 'properties': {'caveats': {'items': {'$ref': '#/definitions/caveat'}, - 'type': 'array'}, - 'data': {'items': {'type': 'integer'}, - 'type': 'array'}, - 'id': {'$ref': '#/definitions/packet'}, - 'location': {'$ref': '#/definitions/packet'}, - 'sig': {'items': {'type': 'integer'}, - 'type': 'array'}}, - 'required': ['data', - 'location', - 'id', - 'caveats', - 'sig'], - 'type': 'object'}, + 'Macaroon': {'additionalProperties': False, 'type': 'object'}, 'StringsWatchResult': {'additionalProperties': False, - 'properties': {'Changes': {'items': {'type': 'string'}, + 'properties': {'changes': {'items': {'type': 'string'}, 'type': 'array'}, - 'Error': {'$ref': '#/definitions/Error'}, - 'StringsWatcherId': {'type': 'string'}}, - 'required': ['StringsWatcherId', - 'Changes', - 'Error'], - 'type': 'object'}, - 'caveat': {'additionalProperties': False, - 'properties': {'caveatId': {'$ref': '#/definitions/packet'}, - 'location': {'$ref': '#/definitions/packet'}, - 'verificationId': {'$ref': '#/definitions/packet'}}, - 'required': ['location', - 'caveatId', - 'verificationId'], - 'type': 'object'}, - 'packet': {'additionalProperties': False, - 'properties': {'headerLen': {'type': 'integer'}, - 'start': {'type': 'integer'}, - 'totalLen': {'type': 'integer'}}, - 'required': ['start', 'totalLen', 'headerLen'], - 'type': 'object'}}, + 'error': {'$ref': '#/definitions/Error'}, + 'watcher-id': {'type': 'string'}}, + 'required': ['watcher-id'], + 'type': 'object'}}, 'properties': {'Next': {'properties': {'Result': {'$ref': '#/definitions/StringsWatchResult'}}, 'type': 'object'}, 'Stop': {'type': 'object'}}, @@ -17432,115 +16695,82 @@ class SubnetsFacade(Type): name = 'Subnets' version = 2 schema = {'definitions': {'AddSubnetParams': {'additionalProperties': False, - 'properties': {'SpaceTag': {'type': 'string'}, - 'SubnetProviderId': {'type': 'string'}, - 'SubnetTag': {'type': 'string'}, - 'Zones': {'items': {'type': 'string'}, + 'properties': {'space-tag': {'type': 'string'}, + 'subnet-provider-id': {'type': 'string'}, + 'subnet-tag': {'type': 'string'}, + 'zones': {'items': {'type': 'string'}, 'type': 'array'}}, - 'required': ['SpaceTag'], + 'required': ['space-tag'], 'type': 'object'}, 'AddSubnetsParams': {'additionalProperties': False, - 'properties': {'Subnets': {'items': {'$ref': '#/definitions/AddSubnetParams'}, + 'properties': {'subnets': {'items': {'$ref': '#/definitions/AddSubnetParams'}, 'type': 'array'}}, - 'required': ['Subnets'], + 'required': ['subnets'], 'type': 'object'}, 'Error': {'additionalProperties': False, - 'properties': {'Code': {'type': 'string'}, - 'Info': {'$ref': '#/definitions/ErrorInfo'}, - 'Message': {'type': 'string'}}, - 'required': ['Message', 'Code'], + 'properties': {'code': {'type': 'string'}, + 'info': {'$ref': '#/definitions/ErrorInfo'}, + 'message': {'type': 'string'}}, + 'required': ['message', 'code'], 'type': 'object'}, 'ErrorInfo': {'additionalProperties': False, - 'properties': {'Macaroon': {'$ref': '#/definitions/Macaroon'}, - 'MacaroonPath': {'type': 'string'}}, + 'properties': {'macaroon': {'$ref': '#/definitions/Macaroon'}, + 'macaroon-path': {'type': 'string'}}, 'type': 'object'}, 'ErrorResult': {'additionalProperties': False, - 'properties': {'Error': {'$ref': '#/definitions/Error'}}, - 'required': ['Error'], + 'properties': {'error': {'$ref': '#/definitions/Error'}}, 'type': 'object'}, 'ErrorResults': {'additionalProperties': False, - 'properties': {'Results': {'items': {'$ref': '#/definitions/ErrorResult'}, + 'properties': {'results': {'items': {'$ref': '#/definitions/ErrorResult'}, 'type': 'array'}}, - 'required': ['Results'], + 'required': ['results'], 'type': 'object'}, 'ListSubnetsResults': {'additionalProperties': False, - 'properties': {'Results': {'items': {'$ref': '#/definitions/Subnet'}, + 'properties': {'results': {'items': {'$ref': '#/definitions/Subnet'}, 'type': 'array'}}, - 'required': ['Results'], + 'required': ['results'], 'type': 'object'}, - 'Macaroon': {'additionalProperties': False, - 'properties': {'caveats': {'items': {'$ref': '#/definitions/caveat'}, - 'type': 'array'}, - 'data': {'items': {'type': 'integer'}, - 'type': 'array'}, - 'id': {'$ref': '#/definitions/packet'}, - 'location': {'$ref': '#/definitions/packet'}, - 'sig': {'items': {'type': 'integer'}, - 'type': 'array'}}, - 'required': ['data', - 'location', - 'id', - 'caveats', - 'sig'], - 'type': 'object'}, + 'Macaroon': {'additionalProperties': False, 'type': 'object'}, 'SpaceResult': {'additionalProperties': False, - 'properties': {'Error': {'$ref': '#/definitions/Error'}, - 'Tag': {'type': 'string'}}, - 'required': ['Error', 'Tag'], + 'properties': {'error': {'$ref': '#/definitions/Error'}, + 'tag': {'type': 'string'}}, + 'required': ['tag'], 'type': 'object'}, 'SpaceResults': {'additionalProperties': False, - 'properties': {'Results': {'items': {'$ref': '#/definitions/SpaceResult'}, + 'properties': {'results': {'items': {'$ref': '#/definitions/SpaceResult'}, 'type': 'array'}}, - 'required': ['Results'], + 'required': ['results'], 'type': 'object'}, 'Subnet': {'additionalProperties': False, - 'properties': {'CIDR': {'type': 'string'}, - 'Life': {'type': 'string'}, - 'ProviderId': {'type': 'string'}, - 'SpaceTag': {'type': 'string'}, - 'StaticRangeHighIP': {'items': {'type': 'integer'}, - 'type': 'array'}, - 'StaticRangeLowIP': {'items': {'type': 'integer'}, - 'type': 'array'}, - 'Status': {'type': 'string'}, - 'VLANTag': {'type': 'integer'}, - 'Zones': {'items': {'type': 'string'}, + 'properties': {'cidr': {'type': 'string'}, + 'life': {'type': 'string'}, + 'provider-id': {'type': 'string'}, + 'space-tag': {'type': 'string'}, + 'status': {'type': 'string'}, + 'vlan-tag': {'type': 'integer'}, + 'zones': {'items': {'type': 'string'}, 'type': 'array'}}, - 'required': ['CIDR', - 'VLANTag', - 'Life', - 'SpaceTag', - 'Zones'], + 'required': ['cidr', + 'vlan-tag', + 'life', + 'space-tag', + 'zones'], 'type': 'object'}, 'SubnetsFilters': {'additionalProperties': False, - 'properties': {'SpaceTag': {'type': 'string'}, - 'Zone': {'type': 'string'}}, + 'properties': {'space-tag': {'type': 'string'}, + 'zone': {'type': 'string'}}, 'type': 'object'}, 'ZoneResult': {'additionalProperties': False, - 'properties': {'Available': {'type': 'boolean'}, - 'Error': {'$ref': '#/definitions/Error'}, - 'Name': {'type': 'string'}}, - 'required': ['Error', 'Name', 'Available'], + 'properties': {'available': {'type': 'boolean'}, + 'error': {'$ref': '#/definitions/Error'}, + 'name': {'type': 'string'}}, + 'required': ['name', 'available'], 'type': 'object'}, 'ZoneResults': {'additionalProperties': False, - 'properties': {'Results': {'items': {'$ref': '#/definitions/ZoneResult'}, + 'properties': {'results': {'items': {'$ref': '#/definitions/ZoneResult'}, 'type': 'array'}}, - 'required': ['Results'], - 'type': 'object'}, - 'caveat': {'additionalProperties': False, - 'properties': {'caveatId': {'$ref': '#/definitions/packet'}, - 'location': {'$ref': '#/definitions/packet'}, - 'verificationId': {'$ref': '#/definitions/packet'}}, - 'required': ['location', - 'caveatId', - 'verificationId'], - 'type': 'object'}, - 'packet': {'additionalProperties': False, - 'properties': {'headerLen': {'type': 'integer'}, - 'start': {'type': 'integer'}, - 'totalLen': {'type': 'integer'}}, - 'required': ['start', 'totalLen', 'headerLen'], - 'type': 'object'}}, + 'required': ['results'], + 'type': 'object'}}, 'properties': {'AddSubnets': {'properties': {'Params': {'$ref': '#/definitions/AddSubnetsParams'}, 'Result': {'$ref': '#/definitions/ErrorResults'}}, 'type': 'object'}, @@ -17563,7 +16793,7 @@ class SubnetsFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Subnets', Request='AddSubnets', Version=2, Params=params) - params['Subnets'] = subnets + params['subnets'] = subnets reply = await self.rpc(msg) return reply @@ -17600,17 +16830,17 @@ class SubnetsFacade(Type): @ReturnMapping(ListSubnetsResults) - async def ListSubnets(self, spacetag, zone): + async def ListSubnets(self, space_tag, zone): ''' - spacetag : str + space_tag : str zone : str Returns -> typing.Sequence[~Subnet] ''' # map input types to rpc msg params = dict() msg = dict(Type='Subnets', Request='ListSubnets', Version=2, Params=params) - params['SpaceTag'] = spacetag - params['Zone'] = zone + params['space-tag'] = space_tag + params['zone'] = zone reply = await self.rpc(msg) return reply @@ -17619,103 +16849,74 @@ class UndertakerFacade(Type): name = 'Undertaker' version = 1 schema = {'definitions': {'EntityStatusArgs': {'additionalProperties': False, - 'properties': {'Data': {'patternProperties': {'.*': {'additionalProperties': True, + 'properties': {'data': {'patternProperties': {'.*': {'additionalProperties': True, 'type': 'object'}}, 'type': 'object'}, - 'Info': {'type': 'string'}, - 'Status': {'type': 'string'}, - 'Tag': {'type': 'string'}}, - 'required': ['Tag', - 'Status', - 'Info', - 'Data'], + 'info': {'type': 'string'}, + 'status': {'type': 'string'}, + 'tag': {'type': 'string'}}, + 'required': ['tag', + 'status', + 'info', + 'data'], 'type': 'object'}, 'Error': {'additionalProperties': False, - 'properties': {'Code': {'type': 'string'}, - 'Info': {'$ref': '#/definitions/ErrorInfo'}, - 'Message': {'type': 'string'}}, - 'required': ['Message', 'Code'], + 'properties': {'code': {'type': 'string'}, + 'info': {'$ref': '#/definitions/ErrorInfo'}, + 'message': {'type': 'string'}}, + 'required': ['message', 'code'], 'type': 'object'}, 'ErrorInfo': {'additionalProperties': False, - 'properties': {'Macaroon': {'$ref': '#/definitions/Macaroon'}, - 'MacaroonPath': {'type': 'string'}}, + 'properties': {'macaroon': {'$ref': '#/definitions/Macaroon'}, + 'macaroon-path': {'type': 'string'}}, 'type': 'object'}, 'ErrorResult': {'additionalProperties': False, - 'properties': {'Error': {'$ref': '#/definitions/Error'}}, - 'required': ['Error'], + 'properties': {'error': {'$ref': '#/definitions/Error'}}, 'type': 'object'}, 'ErrorResults': {'additionalProperties': False, - 'properties': {'Results': {'items': {'$ref': '#/definitions/ErrorResult'}, + 'properties': {'results': {'items': {'$ref': '#/definitions/ErrorResult'}, 'type': 'array'}}, - 'required': ['Results'], + 'required': ['results'], 'type': 'object'}, - 'Macaroon': {'additionalProperties': False, - 'properties': {'caveats': {'items': {'$ref': '#/definitions/caveat'}, - 'type': 'array'}, - 'data': {'items': {'type': 'integer'}, - 'type': 'array'}, - 'id': {'$ref': '#/definitions/packet'}, - 'location': {'$ref': '#/definitions/packet'}, - 'sig': {'items': {'type': 'integer'}, - 'type': 'array'}}, - 'required': ['data', - 'location', - 'id', - 'caveats', - 'sig'], - 'type': 'object'}, + 'Macaroon': {'additionalProperties': False, 'type': 'object'}, 'ModelConfigResult': {'additionalProperties': False, - 'properties': {'Config': {'patternProperties': {'.*': {'additionalProperties': True, + 'properties': {'config': {'patternProperties': {'.*': {'additionalProperties': True, 'type': 'object'}}, 'type': 'object'}}, - 'required': ['Config'], + 'required': ['config'], 'type': 'object'}, 'NotifyWatchResult': {'additionalProperties': False, - 'properties': {'Error': {'$ref': '#/definitions/Error'}, - 'NotifyWatcherId': {'type': 'string'}}, - 'required': ['NotifyWatcherId', 'Error'], + 'properties': {'NotifyWatcherId': {'type': 'string'}, + 'error': {'$ref': '#/definitions/Error'}}, + 'required': ['NotifyWatcherId'], 'type': 'object'}, 'NotifyWatchResults': {'additionalProperties': False, - 'properties': {'Results': {'items': {'$ref': '#/definitions/NotifyWatchResult'}, + 'properties': {'results': {'items': {'$ref': '#/definitions/NotifyWatchResult'}, 'type': 'array'}}, - 'required': ['Results'], + 'required': ['results'], 'type': 'object'}, 'SetStatus': {'additionalProperties': False, - 'properties': {'Entities': {'items': {'$ref': '#/definitions/EntityStatusArgs'}, + 'properties': {'entities': {'items': {'$ref': '#/definitions/EntityStatusArgs'}, 'type': 'array'}}, - 'required': ['Entities'], + 'required': ['entities'], 'type': 'object'}, 'UndertakerModelInfo': {'additionalProperties': False, - 'properties': {'GlobalName': {'type': 'string'}, - 'IsSystem': {'type': 'boolean'}, - 'Life': {'type': 'string'}, - 'Name': {'type': 'string'}, - 'UUID': {'type': 'string'}}, - 'required': ['UUID', - 'Name', - 'GlobalName', - 'IsSystem', - 'Life'], + 'properties': {'global-name': {'type': 'string'}, + 'is-system': {'type': 'boolean'}, + 'life': {'type': 'string'}, + 'name': {'type': 'string'}, + 'uuid': {'type': 'string'}}, + 'required': ['uuid', + 'name', + 'global-name', + 'is-system', + 'life'], 'type': 'object'}, 'UndertakerModelInfoResult': {'additionalProperties': False, - 'properties': {'Error': {'$ref': '#/definitions/Error'}, - 'Result': {'$ref': '#/definitions/UndertakerModelInfo'}}, - 'required': ['Error', 'Result'], - 'type': 'object'}, - 'caveat': {'additionalProperties': False, - 'properties': {'caveatId': {'$ref': '#/definitions/packet'}, - 'location': {'$ref': '#/definitions/packet'}, - 'verificationId': {'$ref': '#/definitions/packet'}}, - 'required': ['location', - 'caveatId', - 'verificationId'], - 'type': 'object'}, - 'packet': {'additionalProperties': False, - 'properties': {'headerLen': {'type': 'integer'}, - 'start': {'type': 'integer'}, - 'totalLen': {'type': 'integer'}}, - 'required': ['start', 'totalLen', 'headerLen'], - 'type': 'object'}}, + 'properties': {'error': {'$ref': '#/definitions/Error'}, + 'result': {'$ref': '#/definitions/UndertakerModelInfo'}}, + 'required': ['result'], + 'type': 'object'}}, 'properties': {'ModelConfig': {'properties': {'Result': {'$ref': '#/definitions/ModelConfigResult'}}, 'type': 'object'}, 'ModelInfo': {'properties': {'Result': {'$ref': '#/definitions/UndertakerModelInfoResult'}}, @@ -17802,7 +17003,7 @@ class UndertakerFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Undertaker', Request='SetStatus', Version=1, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -17817,7 +17018,7 @@ class UndertakerFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Undertaker', Request='UpdateStatus', Version=1, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -17841,88 +17042,57 @@ class UnitAssignerFacade(Type): name = 'UnitAssigner' version = 1 schema = {'definitions': {'Entities': {'additionalProperties': False, - 'properties': {'Entities': {'items': {'$ref': '#/definitions/Entity'}, + 'properties': {'entities': {'items': {'$ref': '#/definitions/Entity'}, 'type': 'array'}}, - 'required': ['Entities'], + 'required': ['entities'], 'type': 'object'}, 'Entity': {'additionalProperties': False, - 'properties': {'Tag': {'type': 'string'}}, - 'required': ['Tag'], + 'properties': {'tag': {'type': 'string'}}, + 'required': ['tag'], 'type': 'object'}, 'EntityStatusArgs': {'additionalProperties': False, - 'properties': {'Data': {'patternProperties': {'.*': {'additionalProperties': True, + 'properties': {'data': {'patternProperties': {'.*': {'additionalProperties': True, 'type': 'object'}}, 'type': 'object'}, - 'Info': {'type': 'string'}, - 'Status': {'type': 'string'}, - 'Tag': {'type': 'string'}}, - 'required': ['Tag', - 'Status', - 'Info', - 'Data'], + 'info': {'type': 'string'}, + 'status': {'type': 'string'}, + 'tag': {'type': 'string'}}, + 'required': ['tag', + 'status', + 'info', + 'data'], 'type': 'object'}, 'Error': {'additionalProperties': False, - 'properties': {'Code': {'type': 'string'}, - 'Info': {'$ref': '#/definitions/ErrorInfo'}, - 'Message': {'type': 'string'}}, - 'required': ['Message', 'Code'], + 'properties': {'code': {'type': 'string'}, + 'info': {'$ref': '#/definitions/ErrorInfo'}, + 'message': {'type': 'string'}}, + 'required': ['message', 'code'], 'type': 'object'}, 'ErrorInfo': {'additionalProperties': False, - 'properties': {'Macaroon': {'$ref': '#/definitions/Macaroon'}, - 'MacaroonPath': {'type': 'string'}}, + 'properties': {'macaroon': {'$ref': '#/definitions/Macaroon'}, + 'macaroon-path': {'type': 'string'}}, 'type': 'object'}, 'ErrorResult': {'additionalProperties': False, - 'properties': {'Error': {'$ref': '#/definitions/Error'}}, - 'required': ['Error'], + 'properties': {'error': {'$ref': '#/definitions/Error'}}, 'type': 'object'}, 'ErrorResults': {'additionalProperties': False, - 'properties': {'Results': {'items': {'$ref': '#/definitions/ErrorResult'}, + 'properties': {'results': {'items': {'$ref': '#/definitions/ErrorResult'}, 'type': 'array'}}, - 'required': ['Results'], + 'required': ['results'], 'type': 'object'}, - 'Macaroon': {'additionalProperties': False, - 'properties': {'caveats': {'items': {'$ref': '#/definitions/caveat'}, - 'type': 'array'}, - 'data': {'items': {'type': 'integer'}, - 'type': 'array'}, - 'id': {'$ref': '#/definitions/packet'}, - 'location': {'$ref': '#/definitions/packet'}, - 'sig': {'items': {'type': 'integer'}, - 'type': 'array'}}, - 'required': ['data', - 'location', - 'id', - 'caveats', - 'sig'], - 'type': 'object'}, + 'Macaroon': {'additionalProperties': False, 'type': 'object'}, 'SetStatus': {'additionalProperties': False, - 'properties': {'Entities': {'items': {'$ref': '#/definitions/EntityStatusArgs'}, + 'properties': {'entities': {'items': {'$ref': '#/definitions/EntityStatusArgs'}, 'type': 'array'}}, - 'required': ['Entities'], + 'required': ['entities'], 'type': 'object'}, 'StringsWatchResult': {'additionalProperties': False, - 'properties': {'Changes': {'items': {'type': 'string'}, + 'properties': {'changes': {'items': {'type': 'string'}, 'type': 'array'}, - 'Error': {'$ref': '#/definitions/Error'}, - 'StringsWatcherId': {'type': 'string'}}, - 'required': ['StringsWatcherId', - 'Changes', - 'Error'], - 'type': 'object'}, - 'caveat': {'additionalProperties': False, - 'properties': {'caveatId': {'$ref': '#/definitions/packet'}, - 'location': {'$ref': '#/definitions/packet'}, - 'verificationId': {'$ref': '#/definitions/packet'}}, - 'required': ['location', - 'caveatId', - 'verificationId'], - 'type': 'object'}, - 'packet': {'additionalProperties': False, - 'properties': {'headerLen': {'type': 'integer'}, - 'start': {'type': 'integer'}, - 'totalLen': {'type': 'integer'}}, - 'required': ['start', 'totalLen', 'headerLen'], - 'type': 'object'}}, + 'error': {'$ref': '#/definitions/Error'}, + 'watcher-id': {'type': 'string'}}, + 'required': ['watcher-id'], + 'type': 'object'}}, 'properties': {'AssignUnits': {'properties': {'Params': {'$ref': '#/definitions/Entities'}, 'Result': {'$ref': '#/definitions/ErrorResults'}}, 'type': 'object'}, @@ -17943,7 +17113,7 @@ class UnitAssignerFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='UnitAssigner', Request='AssignUnits', Version=1, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -17958,7 +17128,7 @@ class UnitAssignerFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='UnitAssigner', Request='SetAgentStatus', Version=1, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -17982,10 +17152,10 @@ class UniterFacade(Type): name = 'Uniter' version = 4 schema = {'definitions': {'APIHostPortsResult': {'additionalProperties': False, - 'properties': {'Servers': {'items': {'items': {'$ref': '#/definitions/HostPort'}, + 'properties': {'servers': {'items': {'items': {'$ref': '#/definitions/HostPort'}, 'type': 'array'}, 'type': 'array'}}, - 'required': ['Servers'], + 'required': ['servers'], 'type': 'object'}, 'Action': {'additionalProperties': False, 'properties': {'name': {'type': 'string'}, @@ -17997,13 +17167,13 @@ class UniterFacade(Type): 'required': ['tag', 'receiver', 'name'], 'type': 'object'}, 'ActionExecutionResult': {'additionalProperties': False, - 'properties': {'actiontag': {'type': 'string'}, + 'properties': {'action-tag': {'type': 'string'}, 'message': {'type': 'string'}, 'results': {'patternProperties': {'.*': {'additionalProperties': True, 'type': 'object'}}, 'type': 'object'}, 'status': {'type': 'string'}}, - 'required': ['actiontag', 'status'], + 'required': ['action-tag', 'status'], 'type': 'object'}, 'ActionExecutionResults': {'additionalProperties': False, 'properties': {'results': {'items': {'$ref': '#/definitions/ActionExecutionResult'}, @@ -18029,490 +17199,480 @@ class UniterFacade(Type): 'type': 'array'}}, 'type': 'object'}, 'Address': {'additionalProperties': False, - 'properties': {'Scope': {'type': 'string'}, - 'SpaceName': {'type': 'string'}, - 'Type': {'type': 'string'}, - 'Value': {'type': 'string'}}, - 'required': ['Value', 'Type', 'Scope'], + 'properties': {'scope': {'type': 'string'}, + 'space-name': {'type': 'string'}, + 'type': {'type': 'string'}, + 'value': {'type': 'string'}}, + 'required': ['value', 'type', 'scope'], 'type': 'object'}, 'ApplicationStatusResult': {'additionalProperties': False, - 'properties': {'Application': {'$ref': '#/definitions/StatusResult'}, - 'Error': {'$ref': '#/definitions/Error'}, - 'Units': {'patternProperties': {'.*': {'$ref': '#/definitions/StatusResult'}}, + 'properties': {'application': {'$ref': '#/definitions/StatusResult'}, + 'error': {'$ref': '#/definitions/Error'}, + 'units': {'patternProperties': {'.*': {'$ref': '#/definitions/StatusResult'}}, 'type': 'object'}}, - 'required': ['Application', - 'Units', - 'Error'], + 'required': ['application', + 'units'], 'type': 'object'}, 'ApplicationStatusResults': {'additionalProperties': False, - 'properties': {'Results': {'items': {'$ref': '#/definitions/ApplicationStatusResult'}, + 'properties': {'results': {'items': {'$ref': '#/definitions/ApplicationStatusResult'}, 'type': 'array'}}, - 'required': ['Results'], + 'required': ['results'], 'type': 'object'}, 'BoolResult': {'additionalProperties': False, - 'properties': {'Error': {'$ref': '#/definitions/Error'}, - 'Result': {'type': 'boolean'}}, - 'required': ['Error', 'Result'], + 'properties': {'error': {'$ref': '#/definitions/Error'}, + 'result': {'type': 'boolean'}}, + 'required': ['result'], 'type': 'object'}, 'BoolResults': {'additionalProperties': False, - 'properties': {'Results': {'items': {'$ref': '#/definitions/BoolResult'}, + 'properties': {'results': {'items': {'$ref': '#/definitions/BoolResult'}, 'type': 'array'}}, - 'required': ['Results'], + 'required': ['results'], 'type': 'object'}, 'BytesResult': {'additionalProperties': False, - 'properties': {'Result': {'items': {'type': 'integer'}, + 'properties': {'result': {'items': {'type': 'integer'}, 'type': 'array'}}, - 'required': ['Result'], + 'required': ['result'], 'type': 'object'}, + 'CharmRelation': {'additionalProperties': False, + 'properties': {'interface': {'type': 'string'}, + 'limit': {'type': 'integer'}, + 'name': {'type': 'string'}, + 'optional': {'type': 'boolean'}, + 'role': {'type': 'string'}, + 'scope': {'type': 'string'}}, + 'required': ['name', + 'role', + 'interface', + 'optional', + 'limit', + 'scope'], + 'type': 'object'}, 'CharmURL': {'additionalProperties': False, - 'properties': {'URL': {'type': 'string'}}, - 'required': ['URL'], + 'properties': {'url': {'type': 'string'}}, + 'required': ['url'], 'type': 'object'}, 'CharmURLs': {'additionalProperties': False, - 'properties': {'URLs': {'items': {'$ref': '#/definitions/CharmURL'}, + 'properties': {'urls': {'items': {'$ref': '#/definitions/CharmURL'}, 'type': 'array'}}, - 'required': ['URLs'], + 'required': ['urls'], 'type': 'object'}, 'ConfigSettingsResult': {'additionalProperties': False, - 'properties': {'Error': {'$ref': '#/definitions/Error'}, - 'Settings': {'patternProperties': {'.*': {'additionalProperties': True, + 'properties': {'error': {'$ref': '#/definitions/Error'}, + 'settings': {'patternProperties': {'.*': {'additionalProperties': True, 'type': 'object'}}, 'type': 'object'}}, - 'required': ['Error', 'Settings'], + 'required': ['settings'], 'type': 'object'}, 'ConfigSettingsResults': {'additionalProperties': False, - 'properties': {'Results': {'items': {'$ref': '#/definitions/ConfigSettingsResult'}, + 'properties': {'results': {'items': {'$ref': '#/definitions/ConfigSettingsResult'}, 'type': 'array'}}, - 'required': ['Results'], + 'required': ['results'], 'type': 'object'}, 'Endpoint': {'additionalProperties': False, - 'properties': {'ApplicationName': {'type': 'string'}, - 'Relation': {'$ref': '#/definitions/Relation'}}, - 'required': ['ApplicationName', 'Relation'], + 'properties': {'application-name': {'type': 'string'}, + 'relation': {'$ref': '#/definitions/CharmRelation'}}, + 'required': ['application-name', 'relation'], 'type': 'object'}, 'Entities': {'additionalProperties': False, - 'properties': {'Entities': {'items': {'$ref': '#/definitions/Entity'}, + 'properties': {'entities': {'items': {'$ref': '#/definitions/Entity'}, 'type': 'array'}}, - 'required': ['Entities'], + 'required': ['entities'], 'type': 'object'}, 'EntitiesCharmURL': {'additionalProperties': False, - 'properties': {'Entities': {'items': {'$ref': '#/definitions/EntityCharmURL'}, + 'properties': {'entities': {'items': {'$ref': '#/definitions/EntityCharmURL'}, 'type': 'array'}}, - 'required': ['Entities'], + 'required': ['entities'], 'type': 'object'}, 'EntitiesPortRanges': {'additionalProperties': False, - 'properties': {'Entities': {'items': {'$ref': '#/definitions/EntityPortRange'}, + 'properties': {'entities': {'items': {'$ref': '#/definitions/EntityPortRange'}, 'type': 'array'}}, - 'required': ['Entities'], + 'required': ['entities'], 'type': 'object'}, 'Entity': {'additionalProperties': False, - 'properties': {'Tag': {'type': 'string'}}, - 'required': ['Tag'], + 'properties': {'tag': {'type': 'string'}}, + 'required': ['tag'], 'type': 'object'}, 'EntityCharmURL': {'additionalProperties': False, - 'properties': {'CharmURL': {'type': 'string'}, - 'Tag': {'type': 'string'}}, - 'required': ['Tag', 'CharmURL'], + 'properties': {'charm-url': {'type': 'string'}, + 'tag': {'type': 'string'}}, + 'required': ['tag', 'charm-url'], 'type': 'object'}, 'EntityPortRange': {'additionalProperties': False, - 'properties': {'FromPort': {'type': 'integer'}, - 'Protocol': {'type': 'string'}, - 'Tag': {'type': 'string'}, - 'ToPort': {'type': 'integer'}}, - 'required': ['Tag', - 'Protocol', - 'FromPort', - 'ToPort'], + 'properties': {'from-port': {'type': 'integer'}, + 'protocol': {'type': 'string'}, + 'tag': {'type': 'string'}, + 'to-port': {'type': 'integer'}}, + 'required': ['tag', + 'protocol', + 'from-port', + 'to-port'], 'type': 'object'}, 'EntityStatusArgs': {'additionalProperties': False, - 'properties': {'Data': {'patternProperties': {'.*': {'additionalProperties': True, + 'properties': {'data': {'patternProperties': {'.*': {'additionalProperties': True, 'type': 'object'}}, 'type': 'object'}, - 'Info': {'type': 'string'}, - 'Status': {'type': 'string'}, - 'Tag': {'type': 'string'}}, - 'required': ['Tag', - 'Status', - 'Info', - 'Data'], + 'info': {'type': 'string'}, + 'status': {'type': 'string'}, + 'tag': {'type': 'string'}}, + 'required': ['tag', + 'status', + 'info', + 'data'], 'type': 'object'}, + 'EntityWorkloadVersion': {'additionalProperties': False, + 'properties': {'tag': {'type': 'string'}, + 'workload-version': {'type': 'string'}}, + 'required': ['tag', + 'workload-version'], + 'type': 'object'}, + 'EntityWorkloadVersions': {'additionalProperties': False, + 'properties': {'entities': {'items': {'$ref': '#/definitions/EntityWorkloadVersion'}, + 'type': 'array'}}, + 'required': ['entities'], + 'type': 'object'}, 'Error': {'additionalProperties': False, - 'properties': {'Code': {'type': 'string'}, - 'Info': {'$ref': '#/definitions/ErrorInfo'}, - 'Message': {'type': 'string'}}, - 'required': ['Message', 'Code'], + 'properties': {'code': {'type': 'string'}, + 'info': {'$ref': '#/definitions/ErrorInfo'}, + 'message': {'type': 'string'}}, + 'required': ['message', 'code'], 'type': 'object'}, 'ErrorInfo': {'additionalProperties': False, - 'properties': {'Macaroon': {'$ref': '#/definitions/Macaroon'}, - 'MacaroonPath': {'type': 'string'}}, + 'properties': {'macaroon': {'$ref': '#/definitions/Macaroon'}, + 'macaroon-path': {'type': 'string'}}, 'type': 'object'}, 'ErrorResult': {'additionalProperties': False, - 'properties': {'Error': {'$ref': '#/definitions/Error'}}, - 'required': ['Error'], + 'properties': {'error': {'$ref': '#/definitions/Error'}}, 'type': 'object'}, 'ErrorResults': {'additionalProperties': False, - 'properties': {'Results': {'items': {'$ref': '#/definitions/ErrorResult'}, + 'properties': {'results': {'items': {'$ref': '#/definitions/ErrorResult'}, 'type': 'array'}}, - 'required': ['Results'], + 'required': ['results'], 'type': 'object'}, 'GetLeadershipSettingsBulkResults': {'additionalProperties': False, - 'properties': {'Results': {'items': {'$ref': '#/definitions/GetLeadershipSettingsResult'}, + 'properties': {'results': {'items': {'$ref': '#/definitions/GetLeadershipSettingsResult'}, 'type': 'array'}}, - 'required': ['Results'], + 'required': ['results'], 'type': 'object'}, 'GetLeadershipSettingsResult': {'additionalProperties': False, - 'properties': {'Error': {'$ref': '#/definitions/Error'}, - 'Settings': {'patternProperties': {'.*': {'type': 'string'}}, + 'properties': {'error': {'$ref': '#/definitions/Error'}, + 'settings': {'patternProperties': {'.*': {'type': 'string'}}, 'type': 'object'}}, - 'required': ['Settings', - 'Error'], + 'required': ['settings'], 'type': 'object'}, 'HostPort': {'additionalProperties': False, 'properties': {'Address': {'$ref': '#/definitions/Address'}, - 'Port': {'type': 'integer'}}, - 'required': ['Address', 'Port'], + 'port': {'type': 'integer'}}, + 'required': ['Address', 'port'], 'type': 'object'}, 'IntResult': {'additionalProperties': False, - 'properties': {'Error': {'$ref': '#/definitions/Error'}, - 'Result': {'type': 'integer'}}, - 'required': ['Error', 'Result'], + 'properties': {'error': {'$ref': '#/definitions/Error'}, + 'result': {'type': 'integer'}}, + 'required': ['result'], 'type': 'object'}, 'IntResults': {'additionalProperties': False, - 'properties': {'Results': {'items': {'$ref': '#/definitions/IntResult'}, + 'properties': {'results': {'items': {'$ref': '#/definitions/IntResult'}, 'type': 'array'}}, - 'required': ['Results'], + 'required': ['results'], 'type': 'object'}, 'LifeResult': {'additionalProperties': False, - 'properties': {'Error': {'$ref': '#/definitions/Error'}, - 'Life': {'type': 'string'}}, - 'required': ['Life', 'Error'], + 'properties': {'error': {'$ref': '#/definitions/Error'}, + 'life': {'type': 'string'}}, + 'required': ['life'], 'type': 'object'}, 'LifeResults': {'additionalProperties': False, - 'properties': {'Results': {'items': {'$ref': '#/definitions/LifeResult'}, + 'properties': {'results': {'items': {'$ref': '#/definitions/LifeResult'}, 'type': 'array'}}, - 'required': ['Results'], + 'required': ['results'], 'type': 'object'}, - 'Macaroon': {'additionalProperties': False, - 'properties': {'caveats': {'items': {'$ref': '#/definitions/caveat'}, - 'type': 'array'}, - 'data': {'items': {'type': 'integer'}, - 'type': 'array'}, - 'id': {'$ref': '#/definitions/packet'}, - 'location': {'$ref': '#/definitions/packet'}, - 'sig': {'items': {'type': 'integer'}, - 'type': 'array'}}, - 'required': ['data', - 'location', - 'id', - 'caveats', - 'sig'], - 'type': 'object'}, + 'Macaroon': {'additionalProperties': False, 'type': 'object'}, 'MachinePortRange': {'additionalProperties': False, - 'properties': {'PortRange': {'$ref': '#/definitions/PortRange'}, - 'RelationTag': {'type': 'string'}, - 'UnitTag': {'type': 'string'}}, - 'required': ['UnitTag', - 'RelationTag', - 'PortRange'], + 'properties': {'port-range': {'$ref': '#/definitions/PortRange'}, + 'relation-tag': {'type': 'string'}, + 'unit-tag': {'type': 'string'}}, + 'required': ['unit-tag', + 'relation-tag', + 'port-range'], 'type': 'object'}, 'MachinePortsResult': {'additionalProperties': False, - 'properties': {'Error': {'$ref': '#/definitions/Error'}, - 'Ports': {'items': {'$ref': '#/definitions/MachinePortRange'}, + 'properties': {'error': {'$ref': '#/definitions/Error'}, + 'ports': {'items': {'$ref': '#/definitions/MachinePortRange'}, 'type': 'array'}}, - 'required': ['Error', 'Ports'], + 'required': ['ports'], 'type': 'object'}, 'MachinePortsResults': {'additionalProperties': False, - 'properties': {'Results': {'items': {'$ref': '#/definitions/MachinePortsResult'}, + 'properties': {'results': {'items': {'$ref': '#/definitions/MachinePortsResult'}, 'type': 'array'}}, - 'required': ['Results'], + 'required': ['results'], 'type': 'object'}, 'MergeLeadershipSettingsBulkParams': {'additionalProperties': False, - 'properties': {'Params': {'items': {'$ref': '#/definitions/MergeLeadershipSettingsParam'}, + 'properties': {'params': {'items': {'$ref': '#/definitions/MergeLeadershipSettingsParam'}, 'type': 'array'}}, - 'required': ['Params'], + 'required': ['params'], 'type': 'object'}, 'MergeLeadershipSettingsParam': {'additionalProperties': False, - 'properties': {'ApplicationTag': {'type': 'string'}, - 'Settings': {'patternProperties': {'.*': {'type': 'string'}}, + 'properties': {'application-tag': {'type': 'string'}, + 'settings': {'patternProperties': {'.*': {'type': 'string'}}, 'type': 'object'}}, - 'required': ['ApplicationTag', - 'Settings'], + 'required': ['application-tag', + 'settings'], 'type': 'object'}, 'MeterStatusResult': {'additionalProperties': False, - 'properties': {'Code': {'type': 'string'}, - 'Error': {'$ref': '#/definitions/Error'}, - 'Info': {'type': 'string'}}, - 'required': ['Code', 'Info', 'Error'], + 'properties': {'code': {'type': 'string'}, + 'error': {'$ref': '#/definitions/Error'}, + 'info': {'type': 'string'}}, + 'required': ['code', 'info'], 'type': 'object'}, 'MeterStatusResults': {'additionalProperties': False, - 'properties': {'Results': {'items': {'$ref': '#/definitions/MeterStatusResult'}, + 'properties': {'results': {'items': {'$ref': '#/definitions/MeterStatusResult'}, 'type': 'array'}}, - 'required': ['Results'], + 'required': ['results'], 'type': 'object'}, 'Metric': {'additionalProperties': False, - 'properties': {'Key': {'type': 'string'}, - 'Time': {'format': 'date-time', + 'properties': {'key': {'type': 'string'}, + 'time': {'format': 'date-time', 'type': 'string'}, - 'Value': {'type': 'string'}}, - 'required': ['Key', 'Value', 'Time'], + 'value': {'type': 'string'}}, + 'required': ['key', 'value', 'time'], 'type': 'object'}, 'MetricBatch': {'additionalProperties': False, - 'properties': {'CharmURL': {'type': 'string'}, - 'Created': {'format': 'date-time', + 'properties': {'charm-url': {'type': 'string'}, + 'created': {'format': 'date-time', 'type': 'string'}, - 'Metrics': {'items': {'$ref': '#/definitions/Metric'}, + 'metrics': {'items': {'$ref': '#/definitions/Metric'}, 'type': 'array'}, - 'UUID': {'type': 'string'}}, - 'required': ['UUID', - 'CharmURL', - 'Created', - 'Metrics'], + 'uuid': {'type': 'string'}}, + 'required': ['uuid', + 'charm-url', + 'created', + 'metrics'], 'type': 'object'}, 'MetricBatchParam': {'additionalProperties': False, - 'properties': {'Batch': {'$ref': '#/definitions/MetricBatch'}, - 'Tag': {'type': 'string'}}, - 'required': ['Tag', 'Batch'], + 'properties': {'batch': {'$ref': '#/definitions/MetricBatch'}, + 'tag': {'type': 'string'}}, + 'required': ['tag', 'batch'], 'type': 'object'}, 'MetricBatchParams': {'additionalProperties': False, - 'properties': {'Batches': {'items': {'$ref': '#/definitions/MetricBatchParam'}, + 'properties': {'batches': {'items': {'$ref': '#/definitions/MetricBatchParam'}, 'type': 'array'}}, - 'required': ['Batches'], + 'required': ['batches'], 'type': 'object'}, 'ModelConfigResult': {'additionalProperties': False, - 'properties': {'Config': {'patternProperties': {'.*': {'additionalProperties': True, + 'properties': {'config': {'patternProperties': {'.*': {'additionalProperties': True, 'type': 'object'}}, 'type': 'object'}}, - 'required': ['Config'], + 'required': ['config'], 'type': 'object'}, 'ModelResult': {'additionalProperties': False, - 'properties': {'Error': {'$ref': '#/definitions/Error'}, - 'Name': {'type': 'string'}, - 'UUID': {'type': 'string'}}, - 'required': ['Error', 'Name', 'UUID'], + 'properties': {'error': {'$ref': '#/definitions/Error'}, + 'name': {'type': 'string'}, + 'uuid': {'type': 'string'}}, + 'required': ['name', 'uuid'], 'type': 'object'}, 'NetworkConfig': {'additionalProperties': False, - 'properties': {'Address': {'type': 'string'}, - 'CIDR': {'type': 'string'}, - 'ConfigType': {'type': 'string'}, - 'DNSSearchDomains': {'items': {'type': 'string'}, - 'type': 'array'}, - 'DNSServers': {'items': {'type': 'string'}, - 'type': 'array'}, - 'DeviceIndex': {'type': 'integer'}, - 'Disabled': {'type': 'boolean'}, - 'GatewayAddress': {'type': 'string'}, - 'InterfaceName': {'type': 'string'}, - 'InterfaceType': {'type': 'string'}, - 'MACAddress': {'type': 'string'}, - 'MTU': {'type': 'integer'}, - 'NoAutoStart': {'type': 'boolean'}, - 'ParentInterfaceName': {'type': 'string'}, - 'ProviderAddressId': {'type': 'string'}, - 'ProviderId': {'type': 'string'}, - 'ProviderSpaceId': {'type': 'string'}, - 'ProviderSubnetId': {'type': 'string'}, - 'ProviderVLANId': {'type': 'string'}, - 'VLANTag': {'type': 'integer'}}, - 'required': ['DeviceIndex', - 'MACAddress', - 'CIDR', - 'MTU', - 'ProviderId', - 'ProviderSubnetId', - 'ProviderSpaceId', - 'ProviderAddressId', - 'ProviderVLANId', - 'VLANTag', - 'InterfaceName', - 'ParentInterfaceName', - 'InterfaceType', - 'Disabled'], + 'properties': {'address': {'type': 'string'}, + 'cidr': {'type': 'string'}, + 'config-type': {'type': 'string'}, + 'device-index': {'type': 'integer'}, + 'disabled': {'type': 'boolean'}, + 'dns-search-domains': {'items': {'type': 'string'}, + 'type': 'array'}, + 'dns-servers': {'items': {'type': 'string'}, + 'type': 'array'}, + 'gateway-address': {'type': 'string'}, + 'interface-name': {'type': 'string'}, + 'interface-type': {'type': 'string'}, + 'mac-address': {'type': 'string'}, + 'mtu': {'type': 'integer'}, + 'no-auto-start': {'type': 'boolean'}, + 'parent-interface-name': {'type': 'string'}, + 'provider-address-id': {'type': 'string'}, + 'provider-id': {'type': 'string'}, + 'provider-space-id': {'type': 'string'}, + 'provider-subnet-id': {'type': 'string'}, + 'provider-vlan-id': {'type': 'string'}, + 'vlan-tag': {'type': 'integer'}}, + 'required': ['device-index', + 'mac-address', + 'cidr', + 'mtu', + 'provider-id', + 'provider-subnet-id', + 'provider-space-id', + 'provider-address-id', + 'provider-vlan-id', + 'vlan-tag', + 'interface-name', + 'parent-interface-name', + 'interface-type', + 'disabled'], 'type': 'object'}, 'NotifyWatchResult': {'additionalProperties': False, - 'properties': {'Error': {'$ref': '#/definitions/Error'}, - 'NotifyWatcherId': {'type': 'string'}}, - 'required': ['NotifyWatcherId', 'Error'], + 'properties': {'NotifyWatcherId': {'type': 'string'}, + 'error': {'$ref': '#/definitions/Error'}}, + 'required': ['NotifyWatcherId'], 'type': 'object'}, 'NotifyWatchResults': {'additionalProperties': False, - 'properties': {'Results': {'items': {'$ref': '#/definitions/NotifyWatchResult'}, + 'properties': {'results': {'items': {'$ref': '#/definitions/NotifyWatchResult'}, 'type': 'array'}}, - 'required': ['Results'], + 'required': ['results'], 'type': 'object'}, 'PortRange': {'additionalProperties': False, - 'properties': {'FromPort': {'type': 'integer'}, - 'Protocol': {'type': 'string'}, - 'ToPort': {'type': 'integer'}}, - 'required': ['FromPort', 'ToPort', 'Protocol'], + 'properties': {'from-port': {'type': 'integer'}, + 'protocol': {'type': 'string'}, + 'to-port': {'type': 'integer'}}, + 'required': ['from-port', 'to-port', 'protocol'], 'type': 'object'}, - 'Relation': {'additionalProperties': False, - 'properties': {'Interface': {'type': 'string'}, - 'Limit': {'type': 'integer'}, - 'Name': {'type': 'string'}, - 'Optional': {'type': 'boolean'}, - 'Role': {'type': 'string'}, - 'Scope': {'type': 'string'}}, - 'required': ['Name', - 'Role', - 'Interface', - 'Optional', - 'Limit', - 'Scope'], - 'type': 'object'}, 'RelationIds': {'additionalProperties': False, - 'properties': {'RelationIds': {'items': {'type': 'integer'}, - 'type': 'array'}}, - 'required': ['RelationIds'], + 'properties': {'relation-ids': {'items': {'type': 'integer'}, + 'type': 'array'}}, + 'required': ['relation-ids'], 'type': 'object'}, 'RelationResult': {'additionalProperties': False, - 'properties': {'Endpoint': {'$ref': '#/definitions/Endpoint'}, - 'Error': {'$ref': '#/definitions/Error'}, - 'Id': {'type': 'integer'}, - 'Key': {'type': 'string'}, - 'Life': {'type': 'string'}}, - 'required': ['Error', - 'Life', - 'Id', - 'Key', - 'Endpoint'], + 'properties': {'endpoint': {'$ref': '#/definitions/Endpoint'}, + 'error': {'$ref': '#/definitions/Error'}, + 'id': {'type': 'integer'}, + 'key': {'type': 'string'}, + 'life': {'type': 'string'}}, + 'required': ['life', + 'id', + 'key', + 'endpoint'], 'type': 'object'}, 'RelationResults': {'additionalProperties': False, - 'properties': {'Results': {'items': {'$ref': '#/definitions/RelationResult'}, + 'properties': {'results': {'items': {'$ref': '#/definitions/RelationResult'}, 'type': 'array'}}, - 'required': ['Results'], + 'required': ['results'], 'type': 'object'}, 'RelationUnit': {'additionalProperties': False, - 'properties': {'Relation': {'type': 'string'}, - 'Unit': {'type': 'string'}}, - 'required': ['Relation', 'Unit'], + 'properties': {'relation': {'type': 'string'}, + 'unit': {'type': 'string'}}, + 'required': ['relation', 'unit'], 'type': 'object'}, 'RelationUnitPair': {'additionalProperties': False, - 'properties': {'LocalUnit': {'type': 'string'}, - 'Relation': {'type': 'string'}, - 'RemoteUnit': {'type': 'string'}}, - 'required': ['Relation', - 'LocalUnit', - 'RemoteUnit'], + 'properties': {'local-unit': {'type': 'string'}, + 'relation': {'type': 'string'}, + 'remote-unit': {'type': 'string'}}, + 'required': ['relation', + 'local-unit', + 'remote-unit'], 'type': 'object'}, 'RelationUnitPairs': {'additionalProperties': False, - 'properties': {'RelationUnitPairs': {'items': {'$ref': '#/definitions/RelationUnitPair'}, - 'type': 'array'}}, - 'required': ['RelationUnitPairs'], + 'properties': {'relation-unit-pairs': {'items': {'$ref': '#/definitions/RelationUnitPair'}, + 'type': 'array'}}, + 'required': ['relation-unit-pairs'], 'type': 'object'}, 'RelationUnitSettings': {'additionalProperties': False, - 'properties': {'Relation': {'type': 'string'}, - 'Settings': {'patternProperties': {'.*': {'type': 'string'}}, + 'properties': {'relation': {'type': 'string'}, + 'settings': {'patternProperties': {'.*': {'type': 'string'}}, 'type': 'object'}, - 'Unit': {'type': 'string'}}, - 'required': ['Relation', - 'Unit', - 'Settings'], + 'unit': {'type': 'string'}}, + 'required': ['relation', + 'unit', + 'settings'], 'type': 'object'}, 'RelationUnits': {'additionalProperties': False, - 'properties': {'RelationUnits': {'items': {'$ref': '#/definitions/RelationUnit'}, - 'type': 'array'}}, - 'required': ['RelationUnits'], + 'properties': {'relation-units': {'items': {'$ref': '#/definitions/RelationUnit'}, + 'type': 'array'}}, + 'required': ['relation-units'], 'type': 'object'}, 'RelationUnitsChange': {'additionalProperties': False, - 'properties': {'Changed': {'patternProperties': {'.*': {'$ref': '#/definitions/UnitSettings'}}, + 'properties': {'changed': {'patternProperties': {'.*': {'$ref': '#/definitions/UnitSettings'}}, 'type': 'object'}, - 'Departed': {'items': {'type': 'string'}, + 'departed': {'items': {'type': 'string'}, 'type': 'array'}}, - 'required': ['Changed', 'Departed'], + 'required': ['changed'], 'type': 'object'}, 'RelationUnitsSettings': {'additionalProperties': False, - 'properties': {'RelationUnits': {'items': {'$ref': '#/definitions/RelationUnitSettings'}, - 'type': 'array'}}, - 'required': ['RelationUnits'], + 'properties': {'relation-units': {'items': {'$ref': '#/definitions/RelationUnitSettings'}, + 'type': 'array'}}, + 'required': ['relation-units'], 'type': 'object'}, 'RelationUnitsWatchResult': {'additionalProperties': False, - 'properties': {'Changes': {'$ref': '#/definitions/RelationUnitsChange'}, - 'Error': {'$ref': '#/definitions/Error'}, - 'RelationUnitsWatcherId': {'type': 'string'}}, - 'required': ['RelationUnitsWatcherId', - 'Changes', - 'Error'], + 'properties': {'changes': {'$ref': '#/definitions/RelationUnitsChange'}, + 'error': {'$ref': '#/definitions/Error'}, + 'watcher-id': {'type': 'string'}}, + 'required': ['watcher-id', + 'changes'], 'type': 'object'}, 'RelationUnitsWatchResults': {'additionalProperties': False, - 'properties': {'Results': {'items': {'$ref': '#/definitions/RelationUnitsWatchResult'}, + 'properties': {'results': {'items': {'$ref': '#/definitions/RelationUnitsWatchResult'}, 'type': 'array'}}, - 'required': ['Results'], + 'required': ['results'], 'type': 'object'}, 'ResolvedModeResult': {'additionalProperties': False, - 'properties': {'Error': {'$ref': '#/definitions/Error'}, - 'Mode': {'type': 'string'}}, - 'required': ['Error', 'Mode'], + 'properties': {'error': {'$ref': '#/definitions/Error'}, + 'mode': {'type': 'string'}}, + 'required': ['mode'], 'type': 'object'}, 'ResolvedModeResults': {'additionalProperties': False, - 'properties': {'Results': {'items': {'$ref': '#/definitions/ResolvedModeResult'}, + 'properties': {'results': {'items': {'$ref': '#/definitions/ResolvedModeResult'}, 'type': 'array'}}, - 'required': ['Results'], + 'required': ['results'], 'type': 'object'}, 'SetStatus': {'additionalProperties': False, - 'properties': {'Entities': {'items': {'$ref': '#/definitions/EntityStatusArgs'}, + 'properties': {'entities': {'items': {'$ref': '#/definitions/EntityStatusArgs'}, 'type': 'array'}}, - 'required': ['Entities'], + 'required': ['entities'], 'type': 'object'}, 'SettingsResult': {'additionalProperties': False, - 'properties': {'Error': {'$ref': '#/definitions/Error'}, - 'Settings': {'patternProperties': {'.*': {'type': 'string'}}, + 'properties': {'error': {'$ref': '#/definitions/Error'}, + 'settings': {'patternProperties': {'.*': {'type': 'string'}}, 'type': 'object'}}, - 'required': ['Error', 'Settings'], + 'required': ['settings'], 'type': 'object'}, 'SettingsResults': {'additionalProperties': False, - 'properties': {'Results': {'items': {'$ref': '#/definitions/SettingsResult'}, + 'properties': {'results': {'items': {'$ref': '#/definitions/SettingsResult'}, 'type': 'array'}}, - 'required': ['Results'], + 'required': ['results'], 'type': 'object'}, 'StatusResult': {'additionalProperties': False, - 'properties': {'Data': {'patternProperties': {'.*': {'additionalProperties': True, + 'properties': {'data': {'patternProperties': {'.*': {'additionalProperties': True, 'type': 'object'}}, 'type': 'object'}, - 'Error': {'$ref': '#/definitions/Error'}, - 'Id': {'type': 'string'}, - 'Info': {'type': 'string'}, - 'Life': {'type': 'string'}, - 'Since': {'format': 'date-time', + 'error': {'$ref': '#/definitions/Error'}, + 'id': {'type': 'string'}, + 'info': {'type': 'string'}, + 'life': {'type': 'string'}, + 'since': {'format': 'date-time', 'type': 'string'}, - 'Status': {'type': 'string'}}, - 'required': ['Error', - 'Id', - 'Life', - 'Status', - 'Info', - 'Data', - 'Since'], + 'status': {'type': 'string'}}, + 'required': ['id', + 'life', + 'status', + 'info', + 'data', + 'since'], 'type': 'object'}, 'StatusResults': {'additionalProperties': False, - 'properties': {'Results': {'items': {'$ref': '#/definitions/StatusResult'}, + 'properties': {'results': {'items': {'$ref': '#/definitions/StatusResult'}, 'type': 'array'}}, - 'required': ['Results'], + 'required': ['results'], 'type': 'object'}, 'StorageAddParams': {'additionalProperties': False, - 'properties': {'StorageName': {'type': 'string'}, + 'properties': {'name': {'type': 'string'}, 'storage': {'$ref': '#/definitions/StorageConstraints'}, 'unit': {'type': 'string'}}, - 'required': ['unit', - 'StorageName', - 'storage'], + 'required': ['unit', 'name', 'storage'], 'type': 'object'}, 'StorageAttachment': {'additionalProperties': False, - 'properties': {'Kind': {'type': 'integer'}, - 'Life': {'type': 'string'}, - 'Location': {'type': 'string'}, - 'OwnerTag': {'type': 'string'}, - 'StorageTag': {'type': 'string'}, - 'UnitTag': {'type': 'string'}}, - 'required': ['StorageTag', - 'OwnerTag', - 'UnitTag', - 'Kind', - 'Location', - 'Life'], + 'properties': {'kind': {'type': 'integer'}, + 'life': {'type': 'string'}, + 'location': {'type': 'string'}, + 'owner-tag': {'type': 'string'}, + 'storage-tag': {'type': 'string'}, + 'unit-tag': {'type': 'string'}}, + 'required': ['storage-tag', + 'owner-tag', + 'unit-tag', + 'kind', + 'location', + 'life'], 'type': 'object'}, 'StorageAttachmentId': {'additionalProperties': False, - 'properties': {'storagetag': {'type': 'string'}, - 'unittag': {'type': 'string'}}, - 'required': ['storagetag', 'unittag'], + 'properties': {'storage-tag': {'type': 'string'}, + 'unit-tag': {'type': 'string'}}, + 'required': ['storage-tag', + 'unit-tag'], 'type': 'object'}, 'StorageAttachmentIds': {'additionalProperties': False, 'properties': {'ids': {'items': {'$ref': '#/definitions/StorageAttachmentId'}, @@ -18538,10 +17698,9 @@ class UniterFacade(Type): 'type': 'array'}}, 'type': 'object'}, 'StorageConstraints': {'additionalProperties': False, - 'properties': {'Count': {'type': 'integer'}, - 'Pool': {'type': 'string'}, - 'Size': {'type': 'integer'}}, - 'required': ['Pool', 'Size', 'Count'], + 'properties': {'count': {'type': 'integer'}, + 'pool': {'type': 'string'}, + 'size': {'type': 'integer'}}, 'type': 'object'}, 'StoragesAddParams': {'additionalProperties': False, 'properties': {'storages': {'items': {'$ref': '#/definitions/StorageAddParams'}, @@ -18549,90 +17708,73 @@ class UniterFacade(Type): 'required': ['storages'], 'type': 'object'}, 'StringBoolResult': {'additionalProperties': False, - 'properties': {'Error': {'$ref': '#/definitions/Error'}, - 'Ok': {'type': 'boolean'}, - 'Result': {'type': 'string'}}, - 'required': ['Error', 'Result', 'Ok'], + 'properties': {'error': {'$ref': '#/definitions/Error'}, + 'ok': {'type': 'boolean'}, + 'result': {'type': 'string'}}, + 'required': ['result', 'ok'], 'type': 'object'}, 'StringBoolResults': {'additionalProperties': False, - 'properties': {'Results': {'items': {'$ref': '#/definitions/StringBoolResult'}, + 'properties': {'results': {'items': {'$ref': '#/definitions/StringBoolResult'}, 'type': 'array'}}, - 'required': ['Results'], + 'required': ['results'], 'type': 'object'}, 'StringResult': {'additionalProperties': False, - 'properties': {'Error': {'$ref': '#/definitions/Error'}, - 'Result': {'type': 'string'}}, - 'required': ['Error', 'Result'], + 'properties': {'error': {'$ref': '#/definitions/Error'}, + 'result': {'type': 'string'}}, + 'required': ['result'], 'type': 'object'}, 'StringResults': {'additionalProperties': False, - 'properties': {'Results': {'items': {'$ref': '#/definitions/StringResult'}, + 'properties': {'results': {'items': {'$ref': '#/definitions/StringResult'}, 'type': 'array'}}, - 'required': ['Results'], + 'required': ['results'], 'type': 'object'}, 'StringsResult': {'additionalProperties': False, - 'properties': {'Error': {'$ref': '#/definitions/Error'}, - 'Result': {'items': {'type': 'string'}, + 'properties': {'error': {'$ref': '#/definitions/Error'}, + 'result': {'items': {'type': 'string'}, 'type': 'array'}}, - 'required': ['Error', 'Result'], 'type': 'object'}, 'StringsResults': {'additionalProperties': False, - 'properties': {'Results': {'items': {'$ref': '#/definitions/StringsResult'}, + 'properties': {'results': {'items': {'$ref': '#/definitions/StringsResult'}, 'type': 'array'}}, - 'required': ['Results'], + 'required': ['results'], 'type': 'object'}, 'StringsWatchResult': {'additionalProperties': False, - 'properties': {'Changes': {'items': {'type': 'string'}, + 'properties': {'changes': {'items': {'type': 'string'}, 'type': 'array'}, - 'Error': {'$ref': '#/definitions/Error'}, - 'StringsWatcherId': {'type': 'string'}}, - 'required': ['StringsWatcherId', - 'Changes', - 'Error'], + 'error': {'$ref': '#/definitions/Error'}, + 'watcher-id': {'type': 'string'}}, + 'required': ['watcher-id'], 'type': 'object'}, 'StringsWatchResults': {'additionalProperties': False, - 'properties': {'Results': {'items': {'$ref': '#/definitions/StringsWatchResult'}, + 'properties': {'results': {'items': {'$ref': '#/definitions/StringsWatchResult'}, 'type': 'array'}}, - 'required': ['Results'], + 'required': ['results'], 'type': 'object'}, 'UnitNetworkConfig': {'additionalProperties': False, - 'properties': {'BindingName': {'type': 'string'}, - 'UnitTag': {'type': 'string'}}, - 'required': ['UnitTag', 'BindingName'], + 'properties': {'binding-name': {'type': 'string'}, + 'unit-tag': {'type': 'string'}}, + 'required': ['unit-tag', 'binding-name'], 'type': 'object'}, 'UnitNetworkConfigResult': {'additionalProperties': False, - 'properties': {'Error': {'$ref': '#/definitions/Error'}, - 'Info': {'items': {'$ref': '#/definitions/NetworkConfig'}, + 'properties': {'error': {'$ref': '#/definitions/Error'}, + 'info': {'items': {'$ref': '#/definitions/NetworkConfig'}, 'type': 'array'}}, - 'required': ['Error', 'Info'], + 'required': ['info'], 'type': 'object'}, 'UnitNetworkConfigResults': {'additionalProperties': False, - 'properties': {'Results': {'items': {'$ref': '#/definitions/UnitNetworkConfigResult'}, + 'properties': {'results': {'items': {'$ref': '#/definitions/UnitNetworkConfigResult'}, 'type': 'array'}}, - 'required': ['Results'], + 'required': ['results'], 'type': 'object'}, 'UnitSettings': {'additionalProperties': False, - 'properties': {'Version': {'type': 'integer'}}, - 'required': ['Version'], + 'properties': {'version': {'type': 'integer'}}, + 'required': ['version'], 'type': 'object'}, 'UnitsNetworkConfig': {'additionalProperties': False, - 'properties': {'Args': {'items': {'$ref': '#/definitions/UnitNetworkConfig'}, + 'properties': {'args': {'items': {'$ref': '#/definitions/UnitNetworkConfig'}, 'type': 'array'}}, - 'required': ['Args'], - 'type': 'object'}, - 'caveat': {'additionalProperties': False, - 'properties': {'caveatId': {'$ref': '#/definitions/packet'}, - 'location': {'$ref': '#/definitions/packet'}, - 'verificationId': {'$ref': '#/definitions/packet'}}, - 'required': ['location', - 'caveatId', - 'verificationId'], - 'type': 'object'}, - 'packet': {'additionalProperties': False, - 'properties': {'headerLen': {'type': 'integer'}, - 'start': {'type': 'integer'}, - 'totalLen': {'type': 'integer'}}, - 'required': ['start', 'totalLen', 'headerLen'], - 'type': 'object'}}, + 'required': ['args'], + 'type': 'object'}}, 'properties': {'APIAddresses': {'properties': {'Result': {'$ref': '#/definitions/StringsResult'}}, 'type': 'object'}, 'APIHostPorts': {'properties': {'Result': {'$ref': '#/definitions/APIHostPortsResult'}}, @@ -18649,9 +17791,6 @@ class UniterFacade(Type): 'AllMachinePorts': {'properties': {'Params': {'$ref': '#/definitions/Entities'}, 'Result': {'$ref': '#/definitions/MachinePortsResults'}}, 'type': 'object'}, - 'ApplicationOwner': {'properties': {'Params': {'$ref': '#/definitions/Entities'}, - 'Result': {'$ref': '#/definitions/StringResults'}}, - 'type': 'object'}, 'ApplicationStatus': {'properties': {'Params': {'$ref': '#/definitions/Entities'}, 'Result': {'$ref': '#/definitions/ApplicationStatusResults'}}, 'type': 'object'}, @@ -18782,6 +17921,9 @@ class UniterFacade(Type): 'SetUnitStatus': {'properties': {'Params': {'$ref': '#/definitions/SetStatus'}, 'Result': {'$ref': '#/definitions/ErrorResults'}}, 'type': 'object'}, + 'SetWorkloadVersion': {'properties': {'Params': {'$ref': '#/definitions/EntityWorkloadVersions'}, + 'Result': {'$ref': '#/definitions/ErrorResults'}}, + 'type': 'object'}, 'StorageAttachmentLife': {'properties': {'Params': {'$ref': '#/definitions/StorageAttachmentIds'}, 'Result': {'$ref': '#/definitions/LifeResults'}}, 'type': 'object'}, @@ -18830,7 +17972,10 @@ class UniterFacade(Type): 'type': 'object'}, 'WatchUnitStorageAttachments': {'properties': {'Params': {'$ref': '#/definitions/Entities'}, 'Result': {'$ref': '#/definitions/StringsWatchResults'}}, - 'type': 'object'}}, + 'type': 'object'}, + 'WorkloadVersion': {'properties': {'Params': {'$ref': '#/definitions/Entities'}, + 'Result': {'$ref': '#/definitions/StringResults'}}, + 'type': 'object'}}, 'type': 'object'} @@ -18873,7 +18018,7 @@ class UniterFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Uniter', Request='Actions', Version=4, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -18888,7 +18033,7 @@ class UniterFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Uniter', Request='AddMetricBatches', Version=4, Params=params) - params['Batches'] = batches + params['batches'] = batches reply = await self.rpc(msg) return reply @@ -18918,22 +18063,7 @@ class UniterFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Uniter', Request='AllMachinePorts', Version=4, Params=params) - params['Entities'] = entities - reply = await self.rpc(msg) - return reply - - - - @ReturnMapping(StringResults) - async def ApplicationOwner(self, entities): - ''' - entities : typing.Sequence[~Entity] - Returns -> typing.Sequence[~StringResult] - ''' - # map input types to rpc msg - params = dict() - msg = dict(Type='Uniter', Request='ApplicationOwner', Version=4, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -18948,7 +18078,7 @@ class UniterFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Uniter', Request='ApplicationStatus', Version=4, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -18963,7 +18093,7 @@ class UniterFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Uniter', Request='AssignedMachine', Version=4, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -18978,7 +18108,7 @@ class UniterFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Uniter', Request='AvailabilityZone', Version=4, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -18993,7 +18123,7 @@ class UniterFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Uniter', Request='BeginActions', Version=4, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -19023,7 +18153,7 @@ class UniterFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Uniter', Request='CharmArchiveSha256', Version=4, Params=params) - params['URLs'] = urls + params['urls'] = urls reply = await self.rpc(msg) return reply @@ -19038,7 +18168,7 @@ class UniterFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Uniter', Request='CharmModifiedVersion', Version=4, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -19053,7 +18183,7 @@ class UniterFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Uniter', Request='CharmURL', Version=4, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -19068,7 +18198,7 @@ class UniterFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Uniter', Request='ClearResolved', Version=4, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -19083,7 +18213,7 @@ class UniterFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Uniter', Request='ClosePorts', Version=4, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -19098,7 +18228,7 @@ class UniterFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Uniter', Request='ConfigSettings', Version=4, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -19128,7 +18258,7 @@ class UniterFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Uniter', Request='Destroy', Version=4, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -19143,7 +18273,7 @@ class UniterFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Uniter', Request='DestroyAllSubordinates', Version=4, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -19158,7 +18288,7 @@ class UniterFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Uniter', Request='DestroyUnitStorageAttachments', Version=4, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -19173,22 +18303,22 @@ class UniterFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Uniter', Request='EnsureDead', Version=4, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @ReturnMapping(ErrorResults) - async def EnterScope(self, relationunits): + async def EnterScope(self, relation_units): ''' - relationunits : typing.Sequence[~RelationUnit] + relation_units : typing.Sequence[~RelationUnit] Returns -> typing.Sequence[~ErrorResult] ''' # map input types to rpc msg params = dict() msg = dict(Type='Uniter', Request='EnterScope', Version=4, Params=params) - params['RelationUnits'] = relationunits + params['relation-units'] = relation_units reply = await self.rpc(msg) return reply @@ -19218,7 +18348,7 @@ class UniterFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Uniter', Request='GetMeterStatus', Version=4, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -19233,7 +18363,7 @@ class UniterFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Uniter', Request='GetPrincipal', Version=4, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -19248,7 +18378,7 @@ class UniterFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Uniter', Request='HasSubordinates', Version=4, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -19263,22 +18393,22 @@ class UniterFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Uniter', Request='JoinedRelations', Version=4, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @ReturnMapping(ErrorResults) - async def LeaveScope(self, relationunits): + async def LeaveScope(self, relation_units): ''' - relationunits : typing.Sequence[~RelationUnit] + relation_units : typing.Sequence[~RelationUnit] Returns -> typing.Sequence[~ErrorResult] ''' # map input types to rpc msg params = dict() msg = dict(Type='Uniter', Request='LeaveScope', Version=4, Params=params) - params['RelationUnits'] = relationunits + params['relation-units'] = relation_units reply = await self.rpc(msg) return reply @@ -19293,7 +18423,7 @@ class UniterFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Uniter', Request='Life', Version=4, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -19308,7 +18438,7 @@ class UniterFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Uniter', Request='Merge', Version=4, Params=params) - params['Params'] = params + params['params'] = params reply = await self.rpc(msg) return reply @@ -19353,7 +18483,7 @@ class UniterFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Uniter', Request='NetworkConfig', Version=4, Params=params) - params['Args'] = args + params['args'] = args reply = await self.rpc(msg) return reply @@ -19368,7 +18498,7 @@ class UniterFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Uniter', Request='OpenPorts', Version=4, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -19383,7 +18513,7 @@ class UniterFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Uniter', Request='PrivateAddress', Version=4, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -19413,7 +18543,7 @@ class UniterFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Uniter', Request='PublicAddress', Version=4, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -19428,67 +18558,67 @@ class UniterFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Uniter', Request='Read', Version=4, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @ReturnMapping(SettingsResults) - async def ReadRemoteSettings(self, relationunitpairs): + async def ReadRemoteSettings(self, relation_unit_pairs): ''' - relationunitpairs : typing.Sequence[~RelationUnitPair] + relation_unit_pairs : typing.Sequence[~RelationUnitPair] Returns -> typing.Sequence[~SettingsResult] ''' # map input types to rpc msg params = dict() msg = dict(Type='Uniter', Request='ReadRemoteSettings', Version=4, Params=params) - params['RelationUnitPairs'] = relationunitpairs + params['relation-unit-pairs'] = relation_unit_pairs reply = await self.rpc(msg) return reply @ReturnMapping(SettingsResults) - async def ReadSettings(self, relationunits): + async def ReadSettings(self, relation_units): ''' - relationunits : typing.Sequence[~RelationUnit] + relation_units : typing.Sequence[~RelationUnit] Returns -> typing.Sequence[~SettingsResult] ''' # map input types to rpc msg params = dict() msg = dict(Type='Uniter', Request='ReadSettings', Version=4, Params=params) - params['RelationUnits'] = relationunits + params['relation-units'] = relation_units reply = await self.rpc(msg) return reply @ReturnMapping(RelationResults) - async def Relation(self, relationunits): + async def Relation(self, relation_units): ''' - relationunits : typing.Sequence[~RelationUnit] + relation_units : typing.Sequence[~RelationUnit] Returns -> typing.Sequence[~RelationResult] ''' # map input types to rpc msg params = dict() msg = dict(Type='Uniter', Request='Relation', Version=4, Params=params) - params['RelationUnits'] = relationunits + params['relation-units'] = relation_units reply = await self.rpc(msg) return reply @ReturnMapping(RelationResults) - async def RelationById(self, relationids): + async def RelationById(self, relation_ids): ''' - relationids : typing.Sequence[int] + relation_ids : typing.Sequence[int] Returns -> typing.Sequence[~RelationResult] ''' # map input types to rpc msg params = dict() msg = dict(Type='Uniter', Request='RelationById', Version=4, Params=params) - params['RelationIds'] = relationids + params['relation-ids'] = relation_ids reply = await self.rpc(msg) return reply @@ -19518,7 +18648,7 @@ class UniterFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Uniter', Request='RequestReboot', Version=4, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -19533,7 +18663,7 @@ class UniterFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Uniter', Request='Resolved', Version=4, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -19548,7 +18678,7 @@ class UniterFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Uniter', Request='SetAgentStatus', Version=4, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -19563,7 +18693,7 @@ class UniterFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Uniter', Request='SetApplicationStatus', Version=4, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -19578,7 +18708,7 @@ class UniterFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Uniter', Request='SetCharmURL', Version=4, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -19593,7 +18723,7 @@ class UniterFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Uniter', Request='SetStatus', Version=4, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -19608,7 +18738,22 @@ class UniterFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Uniter', Request='SetUnitStatus', Version=4, Params=params) - params['Entities'] = entities + params['entities'] = entities + reply = await self.rpc(msg) + return reply + + + + @ReturnMapping(ErrorResults) + async def SetWorkloadVersion(self, entities): + ''' + entities : typing.Sequence[~EntityWorkloadVersion] + Returns -> typing.Sequence[~ErrorResult] + ''' + # map input types to rpc msg + params = dict() + msg = dict(Type='Uniter', Request='SetWorkloadVersion', Version=4, Params=params) + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -19653,7 +18798,7 @@ class UniterFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Uniter', Request='UnitStatus', Version=4, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -19668,22 +18813,22 @@ class UniterFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Uniter', Request='UnitStorageAttachments', Version=4, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @ReturnMapping(ErrorResults) - async def UpdateSettings(self, relationunits): + async def UpdateSettings(self, relation_units): ''' - relationunits : typing.Sequence[~RelationUnitSettings] + relation_units : typing.Sequence[~RelationUnitSettings] Returns -> typing.Sequence[~ErrorResult] ''' # map input types to rpc msg params = dict() msg = dict(Type='Uniter', Request='UpdateSettings', Version=4, Params=params) - params['RelationUnits'] = relationunits + params['relation-units'] = relation_units reply = await self.rpc(msg) return reply @@ -19698,7 +18843,7 @@ class UniterFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Uniter', Request='Watch', Version=4, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -19708,7 +18853,7 @@ class UniterFacade(Type): async def WatchAPIHostPorts(self): ''' - Returns -> typing.Union[_ForwardRef('Error'), str] + Returns -> typing.Union[str, _ForwardRef('Error')] ''' # map input types to rpc msg params = dict() @@ -19728,7 +18873,7 @@ class UniterFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Uniter', Request='WatchActionNotifications', Version=4, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -19743,7 +18888,7 @@ class UniterFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Uniter', Request='WatchApplicationRelations', Version=4, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -19758,7 +18903,7 @@ class UniterFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Uniter', Request='WatchConfigSettings', Version=4, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -19768,7 +18913,7 @@ class UniterFacade(Type): async def WatchForModelConfigChanges(self): ''' - Returns -> typing.Union[_ForwardRef('Error'), str] + Returns -> typing.Union[str, _ForwardRef('Error')] ''' # map input types to rpc msg params = dict() @@ -19788,7 +18933,7 @@ class UniterFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Uniter', Request='WatchLeadershipSettings', Version=4, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -19803,22 +18948,22 @@ class UniterFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Uniter', Request='WatchMeterStatus', Version=4, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @ReturnMapping(RelationUnitsWatchResults) - async def WatchRelationUnits(self, relationunits): + async def WatchRelationUnits(self, relation_units): ''' - relationunits : typing.Sequence[~RelationUnit] + relation_units : typing.Sequence[~RelationUnit] Returns -> typing.Sequence[~RelationUnitsWatchResult] ''' # map input types to rpc msg params = dict() msg = dict(Type='Uniter', Request='WatchRelationUnits', Version=4, Params=params) - params['RelationUnits'] = relationunits + params['relation-units'] = relation_units reply = await self.rpc(msg) return reply @@ -19848,7 +18993,7 @@ class UniterFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Uniter', Request='WatchUnitAddresses', Version=4, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -19863,7 +19008,22 @@ class UniterFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Uniter', Request='WatchUnitStorageAttachments', Version=4, Params=params) - params['Entities'] = entities + params['entities'] = entities + reply = await self.rpc(msg) + return reply + + + + @ReturnMapping(StringResults) + async def WorkloadVersion(self, entities): + ''' + entities : typing.Sequence[~Entity] + Returns -> typing.Sequence[~StringResult] + ''' + # map input types to rpc msg + params = dict() + msg = dict(Type='Uniter', Request='WorkloadVersion', Version=4, Params=params) + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -19878,67 +19038,52 @@ class UpgraderFacade(Type): 'required': ['Number', 'Series', 'Arch'], 'type': 'object'}, 'Entities': {'additionalProperties': False, - 'properties': {'Entities': {'items': {'$ref': '#/definitions/Entity'}, + 'properties': {'entities': {'items': {'$ref': '#/definitions/Entity'}, 'type': 'array'}}, - 'required': ['Entities'], + 'required': ['entities'], 'type': 'object'}, 'EntitiesVersion': {'additionalProperties': False, - 'properties': {'AgentTools': {'items': {'$ref': '#/definitions/EntityVersion'}, - 'type': 'array'}}, - 'required': ['AgentTools'], + 'properties': {'agent-tools': {'items': {'$ref': '#/definitions/EntityVersion'}, + 'type': 'array'}}, + 'required': ['agent-tools'], 'type': 'object'}, 'Entity': {'additionalProperties': False, - 'properties': {'Tag': {'type': 'string'}}, - 'required': ['Tag'], + 'properties': {'tag': {'type': 'string'}}, + 'required': ['tag'], 'type': 'object'}, 'EntityVersion': {'additionalProperties': False, - 'properties': {'Tag': {'type': 'string'}, - 'Tools': {'$ref': '#/definitions/Version'}}, - 'required': ['Tag', 'Tools'], + 'properties': {'tag': {'type': 'string'}, + 'tools': {'$ref': '#/definitions/Version'}}, + 'required': ['tag', 'tools'], 'type': 'object'}, 'Error': {'additionalProperties': False, - 'properties': {'Code': {'type': 'string'}, - 'Info': {'$ref': '#/definitions/ErrorInfo'}, - 'Message': {'type': 'string'}}, - 'required': ['Message', 'Code'], + 'properties': {'code': {'type': 'string'}, + 'info': {'$ref': '#/definitions/ErrorInfo'}, + 'message': {'type': 'string'}}, + 'required': ['message', 'code'], 'type': 'object'}, 'ErrorInfo': {'additionalProperties': False, - 'properties': {'Macaroon': {'$ref': '#/definitions/Macaroon'}, - 'MacaroonPath': {'type': 'string'}}, + 'properties': {'macaroon': {'$ref': '#/definitions/Macaroon'}, + 'macaroon-path': {'type': 'string'}}, 'type': 'object'}, 'ErrorResult': {'additionalProperties': False, - 'properties': {'Error': {'$ref': '#/definitions/Error'}}, - 'required': ['Error'], + 'properties': {'error': {'$ref': '#/definitions/Error'}}, 'type': 'object'}, 'ErrorResults': {'additionalProperties': False, - 'properties': {'Results': {'items': {'$ref': '#/definitions/ErrorResult'}, + 'properties': {'results': {'items': {'$ref': '#/definitions/ErrorResult'}, 'type': 'array'}}, - 'required': ['Results'], + 'required': ['results'], 'type': 'object'}, - 'Macaroon': {'additionalProperties': False, - 'properties': {'caveats': {'items': {'$ref': '#/definitions/caveat'}, - 'type': 'array'}, - 'data': {'items': {'type': 'integer'}, - 'type': 'array'}, - 'id': {'$ref': '#/definitions/packet'}, - 'location': {'$ref': '#/definitions/packet'}, - 'sig': {'items': {'type': 'integer'}, - 'type': 'array'}}, - 'required': ['data', - 'location', - 'id', - 'caveats', - 'sig'], - 'type': 'object'}, + 'Macaroon': {'additionalProperties': False, 'type': 'object'}, 'NotifyWatchResult': {'additionalProperties': False, - 'properties': {'Error': {'$ref': '#/definitions/Error'}, - 'NotifyWatcherId': {'type': 'string'}}, - 'required': ['NotifyWatcherId', 'Error'], + 'properties': {'NotifyWatcherId': {'type': 'string'}, + 'error': {'$ref': '#/definitions/Error'}}, + 'required': ['NotifyWatcherId'], 'type': 'object'}, 'NotifyWatchResults': {'additionalProperties': False, - 'properties': {'Results': {'items': {'$ref': '#/definitions/NotifyWatchResult'}, + 'properties': {'results': {'items': {'$ref': '#/definitions/NotifyWatchResult'}, 'type': 'array'}}, - 'required': ['Results'], + 'required': ['results'], 'type': 'object'}, 'Number': {'additionalProperties': False, 'properties': {'Build': {'type': 'integer'}, @@ -19960,47 +19105,31 @@ class UpgraderFacade(Type): 'required': ['version', 'url', 'size'], 'type': 'object'}, 'ToolsResult': {'additionalProperties': False, - 'properties': {'DisableSSLHostnameVerification': {'type': 'boolean'}, - 'Error': {'$ref': '#/definitions/Error'}, - 'ToolsList': {'items': {'$ref': '#/definitions/Tools'}, - 'type': 'array'}}, - 'required': ['ToolsList', - 'DisableSSLHostnameVerification', - 'Error'], + 'properties': {'disable-ssl-hostname-verification': {'type': 'boolean'}, + 'error': {'$ref': '#/definitions/Error'}, + 'tools': {'items': {'$ref': '#/definitions/Tools'}, + 'type': 'array'}}, + 'required': ['tools', + 'disable-ssl-hostname-verification'], 'type': 'object'}, 'ToolsResults': {'additionalProperties': False, - 'properties': {'Results': {'items': {'$ref': '#/definitions/ToolsResult'}, + 'properties': {'results': {'items': {'$ref': '#/definitions/ToolsResult'}, 'type': 'array'}}, - 'required': ['Results'], + 'required': ['results'], 'type': 'object'}, 'Version': {'additionalProperties': False, - 'properties': {'Version': {'$ref': '#/definitions/Binary'}}, - 'required': ['Version'], + 'properties': {'version': {'$ref': '#/definitions/Binary'}}, + 'required': ['version'], 'type': 'object'}, 'VersionResult': {'additionalProperties': False, - 'properties': {'Error': {'$ref': '#/definitions/Error'}, - 'Version': {'$ref': '#/definitions/Number'}}, - 'required': ['Version', 'Error'], + 'properties': {'error': {'$ref': '#/definitions/Error'}, + 'version': {'$ref': '#/definitions/Number'}}, 'type': 'object'}, 'VersionResults': {'additionalProperties': False, - 'properties': {'Results': {'items': {'$ref': '#/definitions/VersionResult'}, + 'properties': {'results': {'items': {'$ref': '#/definitions/VersionResult'}, 'type': 'array'}}, - 'required': ['Results'], - 'type': 'object'}, - 'caveat': {'additionalProperties': False, - 'properties': {'caveatId': {'$ref': '#/definitions/packet'}, - 'location': {'$ref': '#/definitions/packet'}, - 'verificationId': {'$ref': '#/definitions/packet'}}, - 'required': ['location', - 'caveatId', - 'verificationId'], - 'type': 'object'}, - 'packet': {'additionalProperties': False, - 'properties': {'headerLen': {'type': 'integer'}, - 'start': {'type': 'integer'}, - 'totalLen': {'type': 'integer'}}, - 'required': ['start', 'totalLen', 'headerLen'], - 'type': 'object'}}, + 'required': ['results'], + 'type': 'object'}}, 'properties': {'DesiredVersion': {'properties': {'Params': {'$ref': '#/definitions/Entities'}, 'Result': {'$ref': '#/definitions/VersionResults'}}, 'type': 'object'}, @@ -20025,22 +19154,22 @@ class UpgraderFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Upgrader', Request='DesiredVersion', Version=1, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @ReturnMapping(ErrorResults) - async def SetTools(self, agenttools): + async def SetTools(self, agent_tools): ''' - agenttools : typing.Sequence[~EntityVersion] + agent_tools : typing.Sequence[~EntityVersion] Returns -> typing.Sequence[~ErrorResult] ''' # map input types to rpc msg params = dict() msg = dict(Type='Upgrader', Request='SetTools', Version=1, Params=params) - params['AgentTools'] = agenttools + params['agent-tools'] = agent_tools reply = await self.rpc(msg) return reply @@ -20055,7 +19184,7 @@ class UpgraderFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Upgrader', Request='Tools', Version=1, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -20070,7 +19199,7 @@ class UpgraderFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='Upgrader', Request='WatchAPIVersion', Version=1, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -20106,58 +19235,43 @@ class UserManagerFacade(Type): 'required': ['users'], 'type': 'object'}, 'Entities': {'additionalProperties': False, - 'properties': {'Entities': {'items': {'$ref': '#/definitions/Entity'}, + 'properties': {'entities': {'items': {'$ref': '#/definitions/Entity'}, 'type': 'array'}}, - 'required': ['Entities'], + 'required': ['entities'], 'type': 'object'}, 'Entity': {'additionalProperties': False, - 'properties': {'Tag': {'type': 'string'}}, - 'required': ['Tag'], + 'properties': {'tag': {'type': 'string'}}, + 'required': ['tag'], 'type': 'object'}, 'EntityPassword': {'additionalProperties': False, - 'properties': {'Password': {'type': 'string'}, - 'Tag': {'type': 'string'}}, - 'required': ['Tag', 'Password'], + 'properties': {'password': {'type': 'string'}, + 'tag': {'type': 'string'}}, + 'required': ['tag', 'password'], 'type': 'object'}, 'EntityPasswords': {'additionalProperties': False, - 'properties': {'Changes': {'items': {'$ref': '#/definitions/EntityPassword'}, + 'properties': {'changes': {'items': {'$ref': '#/definitions/EntityPassword'}, 'type': 'array'}}, - 'required': ['Changes'], + 'required': ['changes'], 'type': 'object'}, 'Error': {'additionalProperties': False, - 'properties': {'Code': {'type': 'string'}, - 'Info': {'$ref': '#/definitions/ErrorInfo'}, - 'Message': {'type': 'string'}}, - 'required': ['Message', 'Code'], + 'properties': {'code': {'type': 'string'}, + 'info': {'$ref': '#/definitions/ErrorInfo'}, + 'message': {'type': 'string'}}, + 'required': ['message', 'code'], 'type': 'object'}, 'ErrorInfo': {'additionalProperties': False, - 'properties': {'Macaroon': {'$ref': '#/definitions/Macaroon'}, - 'MacaroonPath': {'type': 'string'}}, + 'properties': {'macaroon': {'$ref': '#/definitions/Macaroon'}, + 'macaroon-path': {'type': 'string'}}, 'type': 'object'}, 'ErrorResult': {'additionalProperties': False, - 'properties': {'Error': {'$ref': '#/definitions/Error'}}, - 'required': ['Error'], + 'properties': {'error': {'$ref': '#/definitions/Error'}}, 'type': 'object'}, 'ErrorResults': {'additionalProperties': False, - 'properties': {'Results': {'items': {'$ref': '#/definitions/ErrorResult'}, + 'properties': {'results': {'items': {'$ref': '#/definitions/ErrorResult'}, 'type': 'array'}}, - 'required': ['Results'], + 'required': ['results'], 'type': 'object'}, - 'Macaroon': {'additionalProperties': False, - 'properties': {'caveats': {'items': {'$ref': '#/definitions/caveat'}, - 'type': 'array'}, - 'data': {'items': {'type': 'integer'}, - 'type': 'array'}, - 'id': {'$ref': '#/definitions/packet'}, - 'location': {'$ref': '#/definitions/packet'}, - 'sig': {'items': {'type': 'integer'}, - 'type': 'array'}}, - 'required': ['data', - 'location', - 'id', - 'caveats', - 'sig'], - 'type': 'object'}, + 'Macaroon': {'additionalProperties': False, 'type': 'object'}, 'MacaroonResult': {'additionalProperties': False, 'properties': {'error': {'$ref': '#/definitions/Error'}, 'result': {'$ref': '#/definitions/Macaroon'}}, @@ -20197,21 +19311,7 @@ class UserManagerFacade(Type): 'properties': {'results': {'items': {'$ref': '#/definitions/UserInfoResult'}, 'type': 'array'}}, 'required': ['results'], - 'type': 'object'}, - 'caveat': {'additionalProperties': False, - 'properties': {'caveatId': {'$ref': '#/definitions/packet'}, - 'location': {'$ref': '#/definitions/packet'}, - 'verificationId': {'$ref': '#/definitions/packet'}}, - 'required': ['location', - 'caveatId', - 'verificationId'], - 'type': 'object'}, - 'packet': {'additionalProperties': False, - 'properties': {'headerLen': {'type': 'integer'}, - 'start': {'type': 'integer'}, - 'totalLen': {'type': 'integer'}}, - 'required': ['start', 'totalLen', 'headerLen'], - 'type': 'object'}}, + 'type': 'object'}}, 'properties': {'AddUser': {'properties': {'Params': {'$ref': '#/definitions/AddUsers'}, 'Result': {'$ref': '#/definitions/AddUserResults'}}, 'type': 'object'}, @@ -20257,7 +19357,7 @@ class UserManagerFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='UserManager', Request='CreateLocalLoginMacaroon', Version=1, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -20272,7 +19372,7 @@ class UserManagerFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='UserManager', Request='DisableUser', Version=1, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -20287,7 +19387,7 @@ class UserManagerFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='UserManager', Request='EnableUser', Version=1, Params=params) - params['Entities'] = entities + params['entities'] = entities reply = await self.rpc(msg) return reply @@ -20302,7 +19402,7 @@ class UserManagerFacade(Type): # map input types to rpc msg params = dict() msg = dict(Type='UserManager', Request='SetPassword', Version=1, Params=params) - params['Changes'] = changes + params['changes'] = changes reply = await self.rpc(msg) return reply @@ -20328,59 +19428,30 @@ class VolumeAttachmentsWatcherFacade(Type): name = 'VolumeAttachmentsWatcher' version = 2 schema = {'definitions': {'Error': {'additionalProperties': False, - 'properties': {'Code': {'type': 'string'}, - 'Info': {'$ref': '#/definitions/ErrorInfo'}, - 'Message': {'type': 'string'}}, - 'required': ['Message', 'Code'], + 'properties': {'code': {'type': 'string'}, + 'info': {'$ref': '#/definitions/ErrorInfo'}, + 'message': {'type': 'string'}}, + 'required': ['message', 'code'], 'type': 'object'}, 'ErrorInfo': {'additionalProperties': False, - 'properties': {'Macaroon': {'$ref': '#/definitions/Macaroon'}, - 'MacaroonPath': {'type': 'string'}}, + 'properties': {'macaroon': {'$ref': '#/definitions/Macaroon'}, + 'macaroon-path': {'type': 'string'}}, 'type': 'object'}, - 'Macaroon': {'additionalProperties': False, - 'properties': {'caveats': {'items': {'$ref': '#/definitions/caveat'}, - 'type': 'array'}, - 'data': {'items': {'type': 'integer'}, - 'type': 'array'}, - 'id': {'$ref': '#/definitions/packet'}, - 'location': {'$ref': '#/definitions/packet'}, - 'sig': {'items': {'type': 'integer'}, - 'type': 'array'}}, - 'required': ['data', - 'location', - 'id', - 'caveats', - 'sig'], - 'type': 'object'}, + 'Macaroon': {'additionalProperties': False, 'type': 'object'}, 'MachineStorageId': {'additionalProperties': False, - 'properties': {'attachmenttag': {'type': 'string'}, - 'machinetag': {'type': 'string'}}, - 'required': ['machinetag', - 'attachmenttag'], + 'properties': {'attachment-tag': {'type': 'string'}, + 'machine-tag': {'type': 'string'}}, + 'required': ['machine-tag', + 'attachment-tag'], 'type': 'object'}, 'MachineStorageIdsWatchResult': {'additionalProperties': False, - 'properties': {'Changes': {'items': {'$ref': '#/definitions/MachineStorageId'}, + 'properties': {'changes': {'items': {'$ref': '#/definitions/MachineStorageId'}, 'type': 'array'}, - 'Error': {'$ref': '#/definitions/Error'}, - 'MachineStorageIdsWatcherId': {'type': 'string'}}, - 'required': ['MachineStorageIdsWatcherId', - 'Changes', - 'Error'], - 'type': 'object'}, - 'caveat': {'additionalProperties': False, - 'properties': {'caveatId': {'$ref': '#/definitions/packet'}, - 'location': {'$ref': '#/definitions/packet'}, - 'verificationId': {'$ref': '#/definitions/packet'}}, - 'required': ['location', - 'caveatId', - 'verificationId'], - 'type': 'object'}, - 'packet': {'additionalProperties': False, - 'properties': {'headerLen': {'type': 'integer'}, - 'start': {'type': 'integer'}, - 'totalLen': {'type': 'integer'}}, - 'required': ['start', 'totalLen', 'headerLen'], - 'type': 'object'}}, + 'error': {'$ref': '#/definitions/Error'}, + 'watcher-id': {'type': 'string'}}, + 'required': ['watcher-id', + 'changes'], + 'type': 'object'}}, 'properties': {'Next': {'properties': {'Result': {'$ref': '#/definitions/MachineStorageIdsWatchResult'}}, 'type': 'object'}, 'Stop': {'type': 'object'}}, diff --git a/juju/client/connection.py b/juju/client/connection.py index 56f9e18..3dcfabf 100644 --- a/juju/client/connection.py +++ b/juju/client/connection.py @@ -4,8 +4,10 @@ import json import logging import os import random +import shlex import ssl import string +import subprocess import websockets import yaml @@ -63,16 +65,16 @@ class Connection: async def rpc(self, msg, encoder=None): self.__request_id__ += 1 - msg['RequestId'] = self.__request_id__ - if'Params' not in msg: - msg['Params'] = {} - if "Version" not in msg: - msg['Version'] = self.facades[msg['Type']] + msg['request-id'] = self.__request_id__ + if'params' not in msg: + msg['params'] = {} + if "version" not in msg: + msg['version'] = self.facades[msg['Type']] outgoing = json.dumps(msg, indent=2, cls=encoder) await self.ws.send(outgoing) result = await self.recv() log.debug("send %s got %s", msg, result) - if result and 'Error' in result: + if result and 'error' in result: raise RuntimeError(result) return result @@ -145,22 +147,22 @@ class Connection: def build_facades(self, info): self.facades.clear() for facade in info: - self.facades[facade['Name']] = facade['Versions'][-1] + self.facades[facade['name']] = facade['versions'][-1] async def login(self, username, password): if not username.startswith('user-'): username = 'user-{}'.format(username) result = await self.rpc({ - "Type": "Admin", - "Request": "Login", - "Version": 3, - "Params": { + "type": "Admin", + "request": "Login", + "version": 3, + "params": { "auth-tag": username, "credentials": password, - "Nonce": "".join(random.sample(string.printable, 12)), + "nonce": "".join(random.sample(string.printable, 12)), }}) - return result['Response'] + return result['response'] class JujuData: @@ -169,13 +171,10 @@ class JujuData: self.path = os.path.abspath(os.path.expanduser(self.path)) def current_controller(self): - try: - filepath = os.path.join(self.path, 'current-controller') - with io.open(filepath, 'rt') as f: - return f.read().strip() - except OSError as e: - log.exception(e) - return None + cmd = shlex.split('juju show-controller --format yaml') + output = subprocess.check_output(cmd) + output = yaml.safe_load(output) + return list(output.keys())[0] def controllers(self): return self._load_yaml('controllers.yaml', 'controllers') diff --git a/juju/client/facade.py b/juju/client/facade.py index 41166c0..59163a9 100644 --- a/juju/client/facade.py +++ b/juju/client/facade.py @@ -308,7 +308,7 @@ def ReturnMapping(cls): reply = await f(*args, **kwargs) if cls is None: return reply - if 'Error' in reply: + if 'error' in reply: cls = classes['Error'] if issubclass(cls, typing.Sequence): result = [] @@ -316,7 +316,7 @@ def ReturnMapping(cls): for item in reply: result.append(item_cls.from_json(item)) else: - result = cls.from_json(reply['Response']) + result = cls.from_json(reply['response']) return result return wrapper diff --git a/juju/client/overrides.py b/juju/client/overrides.py index 6ce2ee1..01c9a60 100644 --- a/juju/client/overrides.py +++ b/juju/client/overrides.py @@ -8,8 +8,8 @@ __all__ = [ class Delta(Type): - _toSchema = {'deltas': 'Deltas'} - _toPy = {'Deltas': 'deltas'} + _toSchema = {'deltas': 'deltas'} + _toPy = {'deltas': 'deltas'} def __init__(self, deltas=None): ''' diff --git a/juju/client/schemas.json b/juju/client/schemas.json index 9edb1fe..cdbe0e2 100644 --- a/juju/client/schemas.json +++ b/juju/client/schemas.json @@ -1,7 +1,7 @@ [ { "Name": "Action", - "Version": 1, + "Version": 2, "Schema": { "type": "object", "properties": { @@ -16,6 +16,17 @@ } } }, + "ApplicationsCharmsActions": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/Entities" + }, + "Result": { + "$ref": "#/definitions/ApplicationsCharmActionsResults" + } + } + }, "Cancel": { "type": "object", "properties": { @@ -125,17 +136,6 @@ "$ref": "#/definitions/ActionResults" } } - }, - "ServicesCharmActions": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/Entities" - }, - "Result": { - "$ref": "#/definitions/ServicesCharmActionsResults" - } - } } }, "definitions": { @@ -219,6 +219,28 @@ }, "additionalProperties": false }, + "ActionSpec": { + "type": "object", + "properties": { + "description": { + "type": "string" + }, + "params": { + "type": "object", + "patternProperties": { + ".*": { + "type": "object", + "additionalProperties": true + } + } + } + }, + "additionalProperties": false, + "required": [ + "description", + "params" + ] + }, "Actions": { "type": "object", "properties": { @@ -291,10 +313,42 @@ }, "additionalProperties": false }, + "ApplicationCharmActionsResult": { + "type": "object", + "properties": { + "actions": { + "type": "object", + "patternProperties": { + ".*": { + "$ref": "#/definitions/ActionSpec" + } + } + }, + "application-tag": { + "type": "string" + }, + "error": { + "$ref": "#/definitions/Error" + } + }, + "additionalProperties": false + }, + "ApplicationsCharmActionsResults": { + "type": "object", + "properties": { + "results": { + "type": "array", + "items": { + "$ref": "#/definitions/ApplicationCharmActionsResult" + } + } + }, + "additionalProperties": false + }, "Entities": { "type": "object", "properties": { - "Entities": { + "entities": { "type": "array", "items": { "$ref": "#/definitions/Entity" @@ -303,47 +357,47 @@ }, "additionalProperties": false, "required": [ - "Entities" + "entities" ] }, "Entity": { "type": "object", "properties": { - "Tag": { + "tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "Tag" + "tag" ] }, "Error": { "type": "object", "properties": { - "Code": { + "code": { "type": "string" }, - "Info": { + "info": { "$ref": "#/definitions/ErrorInfo" }, - "Message": { + "message": { "type": "string" } }, "additionalProperties": false, "required": [ - "Message", - "Code" + "message", + "code" ] }, "ErrorInfo": { "type": "object", "properties": { - "Macaroon": { + "macaroon": { "$ref": "#/definitions/Macaroon" }, - "MacaroonPath": { + "macaroon-path": { "type": "string" } }, @@ -398,63 +452,30 @@ }, "Macaroon": { "type": "object", - "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } - }, - "data": { - "type": "array", - "items": { - "type": "integer" - } - }, - "id": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "sig": { - "type": "array", - "items": { - "type": "integer" - } - } - }, - "additionalProperties": false, - "required": [ - "data", - "location", - "id", - "caveats", - "sig" - ] + "additionalProperties": false }, "RunParams": { "type": "object", "properties": { - "Commands": { - "type": "string" - }, - "Machines": { + "applications": { "type": "array", "items": { "type": "string" } }, - "Services": { + "commands": { + "type": "string" + }, + "machines": { "type": "array", "items": { "type": "string" } }, - "Timeout": { + "timeout": { "type": "integer" }, - "Units": { + "units": { "type": "array", "items": { "type": "string" @@ -463,439 +484,200 @@ }, "additionalProperties": false, "required": [ - "Commands", - "Timeout", - "Machines", - "Services", - "Units" + "commands", + "timeout" ] - }, - "ServiceCharmActionsResult": { + } + } + } + }, + { + "Name": "Agent", + "Version": 2, + "Schema": { + "type": "object", + "properties": { + "ClearReboot": { "type": "object", "properties": { - "actions": { - "$ref": "#/definitions/Actions" - }, - "error": { - "$ref": "#/definitions/Error" + "Params": { + "$ref": "#/definitions/Entities" }, - "servicetag": { - "type": "string" + "Result": { + "$ref": "#/definitions/ErrorResults" } - }, - "additionalProperties": false + } }, - "ServicesCharmActionsResults": { + "ControllerConfig": { "type": "object", "properties": { - "results": { - "type": "array", - "items": { - "$ref": "#/definitions/ServiceCharmActionsResult" - } + "Result": { + "$ref": "#/definitions/ControllerConfigResult" } - }, - "additionalProperties": false + } }, - "caveat": { + "GetEntities": { "type": "object", "properties": { - "caveatId": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" + "Params": { + "$ref": "#/definitions/Entities" }, - "verificationId": { - "$ref": "#/definitions/packet" + "Result": { + "$ref": "#/definitions/AgentGetEntitiesResults" } - }, - "additionalProperties": false, - "required": [ - "location", - "caveatId", - "verificationId" - ] + } }, - "packet": { + "IsMaster": { "type": "object", "properties": { - "headerLen": { - "type": "integer" - }, - "start": { - "type": "integer" - }, - "totalLen": { - "type": "integer" + "Result": { + "$ref": "#/definitions/IsMasterResult" } - }, - "additionalProperties": false, - "required": [ - "start", - "totalLen", - "headerLen" - ] - } - } - } - }, - { - "Name": "Addresser", - "Version": 2, - "Schema": { - "type": "object", - "properties": { - "CanDeallocateAddresses": { + } + }, + "ModelConfig": { + "type": "object", + "properties": { + "Result": { + "$ref": "#/definitions/ModelConfigResult" + } + } + }, + "SetPasswords": { "type": "object", "properties": { + "Params": { + "$ref": "#/definitions/EntityPasswords" + }, "Result": { - "$ref": "#/definitions/BoolResult" + "$ref": "#/definitions/ErrorResults" } } }, - "CleanupIPAddresses": { + "StateServingInfo": { "type": "object", "properties": { "Result": { - "$ref": "#/definitions/ErrorResult" + "$ref": "#/definitions/StateServingInfo" } } }, - "WatchIPAddresses": { + "WatchForModelConfigChanges": { "type": "object", "properties": { "Result": { - "$ref": "#/definitions/EntitiesWatchResult" + "$ref": "#/definitions/NotifyWatchResult" } } } }, "definitions": { - "BoolResult": { + "AgentGetEntitiesResult": { "type": "object", "properties": { - "Error": { + "container-type": { + "type": "string" + }, + "error": { "$ref": "#/definitions/Error" }, - "Result": { - "type": "boolean" + "jobs": { + "type": "array", + "items": { + "type": "string" + } + }, + "life": { + "type": "string" } }, "additionalProperties": false, "required": [ - "Error", - "Result" + "life", + "jobs", + "container-type" ] }, - "EntitiesWatchResult": { + "AgentGetEntitiesResults": { "type": "object", "properties": { - "Changes": { + "entities": { "type": "array", "items": { - "type": "string" + "$ref": "#/definitions/AgentGetEntitiesResult" } - }, - "EntityWatcherId": { - "type": "string" - }, - "Error": { - "$ref": "#/definitions/Error" } }, "additionalProperties": false, "required": [ - "EntityWatcherId", - "Changes", - "Error" + "entities" ] }, - "Error": { + "ControllerConfigResult": { "type": "object", "properties": { - "Code": { - "type": "string" - }, - "Info": { - "$ref": "#/definitions/ErrorInfo" - }, - "Message": { - "type": "string" + "config": { + "type": "object", + "patternProperties": { + ".*": { + "type": "object", + "additionalProperties": true + } + } } }, "additionalProperties": false, "required": [ - "Message", - "Code" + "config" ] }, - "ErrorInfo": { + "Entities": { "type": "object", "properties": { - "Macaroon": { - "$ref": "#/definitions/Macaroon" - }, - "MacaroonPath": { - "type": "string" + "entities": { + "type": "array", + "items": { + "$ref": "#/definitions/Entity" + } } }, - "additionalProperties": false + "additionalProperties": false, + "required": [ + "entities" + ] }, - "ErrorResult": { + "Entity": { "type": "object", "properties": { - "Error": { - "$ref": "#/definitions/Error" + "tag": { + "type": "string" } }, "additionalProperties": false, "required": [ - "Error" + "tag" ] }, - "Macaroon": { + "EntityPassword": { "type": "object", "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } + "password": { + "type": "string" }, - "data": { - "type": "array", - "items": { - "type": "integer" - } - }, - "id": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "sig": { - "type": "array", - "items": { - "type": "integer" - } - } - }, - "additionalProperties": false, - "required": [ - "data", - "location", - "id", - "caveats", - "sig" - ] - }, - "caveat": { - "type": "object", - "properties": { - "caveatId": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "verificationId": { - "$ref": "#/definitions/packet" - } - }, - "additionalProperties": false, - "required": [ - "location", - "caveatId", - "verificationId" - ] - }, - "packet": { - "type": "object", - "properties": { - "headerLen": { - "type": "integer" - }, - "start": { - "type": "integer" - }, - "totalLen": { - "type": "integer" - } - }, - "additionalProperties": false, - "required": [ - "start", - "totalLen", - "headerLen" - ] - } - } - } - }, - { - "Name": "Agent", - "Version": 2, - "Schema": { - "type": "object", - "properties": { - "ClearReboot": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/Entities" - }, - "Result": { - "$ref": "#/definitions/ErrorResults" - } - } - }, - "GetEntities": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/Entities" - }, - "Result": { - "$ref": "#/definitions/AgentGetEntitiesResults" - } - } - }, - "IsMaster": { - "type": "object", - "properties": { - "Result": { - "$ref": "#/definitions/IsMasterResult" - } - } - }, - "ModelConfig": { - "type": "object", - "properties": { - "Result": { - "$ref": "#/definitions/ModelConfigResult" - } - } - }, - "SetPasswords": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/EntityPasswords" - }, - "Result": { - "$ref": "#/definitions/ErrorResults" - } - } - }, - "StateServingInfo": { - "type": "object", - "properties": { - "Result": { - "$ref": "#/definitions/StateServingInfo" - } - } - }, - "WatchForModelConfigChanges": { - "type": "object", - "properties": { - "Result": { - "$ref": "#/definitions/NotifyWatchResult" - } - } - } - }, - "definitions": { - "AgentGetEntitiesResult": { - "type": "object", - "properties": { - "ContainerType": { - "type": "string" - }, - "Error": { - "$ref": "#/definitions/Error" - }, - "Jobs": { - "type": "array", - "items": { - "type": "string" - } - }, - "Life": { - "type": "string" - } - }, - "additionalProperties": false, - "required": [ - "Life", - "Jobs", - "ContainerType", - "Error" - ] - }, - "AgentGetEntitiesResults": { - "type": "object", - "properties": { - "Entities": { - "type": "array", - "items": { - "$ref": "#/definitions/AgentGetEntitiesResult" - } - } - }, - "additionalProperties": false, - "required": [ - "Entities" - ] - }, - "Entities": { - "type": "object", - "properties": { - "Entities": { - "type": "array", - "items": { - "$ref": "#/definitions/Entity" - } - } - }, - "additionalProperties": false, - "required": [ - "Entities" - ] - }, - "Entity": { - "type": "object", - "properties": { - "Tag": { - "type": "string" - } - }, - "additionalProperties": false, - "required": [ - "Tag" - ] - }, - "EntityPassword": { - "type": "object", - "properties": { - "Password": { - "type": "string" - }, - "Tag": { + "tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "Tag", - "Password" + "tag", + "password" ] }, "EntityPasswords": { "type": "object", "properties": { - "Changes": { + "changes": { "type": "array", "items": { "$ref": "#/definitions/EntityPassword" @@ -904,35 +686,35 @@ }, "additionalProperties": false, "required": [ - "Changes" + "changes" ] }, "Error": { "type": "object", "properties": { - "Code": { + "code": { "type": "string" }, - "Info": { + "info": { "$ref": "#/definitions/ErrorInfo" }, - "Message": { + "message": { "type": "string" } }, "additionalProperties": false, "required": [ - "Message", - "Code" + "message", + "code" ] }, "ErrorInfo": { "type": "object", "properties": { - "Macaroon": { + "macaroon": { "$ref": "#/definitions/Macaroon" }, - "MacaroonPath": { + "macaroon-path": { "type": "string" } }, @@ -941,19 +723,16 @@ "ErrorResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" } }, - "additionalProperties": false, - "required": [ - "Error" - ] + "additionalProperties": false }, "ErrorResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/ErrorResult" @@ -962,62 +741,29 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "IsMasterResult": { "type": "object", "properties": { - "Master": { + "master": { "type": "boolean" } }, "additionalProperties": false, "required": [ - "Master" + "master" ] }, "Macaroon": { "type": "object", - "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } - }, - "data": { - "type": "array", - "items": { - "type": "integer" - } - }, - "id": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "sig": { - "type": "array", - "items": { - "type": "integer" - } - } - }, - "additionalProperties": false, - "required": [ - "data", - "location", - "id", - "caveats", - "sig" - ] + "additionalProperties": false }, "ModelConfigResult": { "type": "object", "properties": { - "Config": { + "config": { "type": "object", "patternProperties": { ".*": { @@ -1029,99 +775,58 @@ }, "additionalProperties": false, "required": [ - "Config" + "config" ] }, "NotifyWatchResult": { "type": "object", "properties": { - "Error": { - "$ref": "#/definitions/Error" - }, "NotifyWatcherId": { "type": "string" + }, + "error": { + "$ref": "#/definitions/Error" } }, "additionalProperties": false, "required": [ - "NotifyWatcherId", - "Error" + "NotifyWatcherId" ] }, "StateServingInfo": { "type": "object", "properties": { - "APIPort": { + "api-port": { "type": "integer" }, - "CAPrivateKey": { + "ca-private-key": { "type": "string" }, - "Cert": { + "cert": { "type": "string" }, - "PrivateKey": { + "private-key": { "type": "string" }, - "SharedSecret": { + "shared-secret": { "type": "string" }, - "StatePort": { + "state-port": { "type": "integer" }, - "SystemIdentity": { + "system-identity": { "type": "string" } }, "additionalProperties": false, "required": [ - "APIPort", - "StatePort", - "Cert", - "PrivateKey", - "CAPrivateKey", - "SharedSecret", - "SystemIdentity" - ] - }, - "caveat": { - "type": "object", - "properties": { - "caveatId": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "verificationId": { - "$ref": "#/definitions/packet" - } - }, - "additionalProperties": false, - "required": [ - "location", - "caveatId", - "verificationId" - ] - }, - "packet": { - "type": "object", - "properties": { - "headerLen": { - "type": "integer" - }, - "start": { - "type": "integer" - }, - "totalLen": { - "type": "integer" - } - }, - "additionalProperties": false, - "required": [ - "start", - "totalLen", - "headerLen" + "api-port", + "state-port", + "cert", + "private-key", + "ca-private-key", + "shared-secret", + "system-identity" ] } } @@ -1161,7 +866,7 @@ "AllWatcherNextResults": { "type": "object", "properties": { - "Deltas": { + "deltas": { "type": "array", "items": { "$ref": "#/definitions/Delta" @@ -1170,24 +875,24 @@ }, "additionalProperties": false, "required": [ - "Deltas" + "deltas" ] }, "Delta": { "type": "object", "properties": { - "Entity": { + "entity": { "type": "object", "additionalProperties": true }, - "Removed": { + "removed": { "type": "boolean" } }, "additionalProperties": false, "required": [ - "Removed", - "Entity" + "removed", + "entity" ] } } @@ -1215,7 +920,7 @@ "AllWatcherNextResults": { "type": "object", "properties": { - "Deltas": { + "deltas": { "type": "array", "items": { "$ref": "#/definitions/Delta" @@ -1224,24 +929,24 @@ }, "additionalProperties": false, "required": [ - "Deltas" + "deltas" ] }, "Delta": { "type": "object", "properties": { - "Entity": { + "entity": { "type": "object", "additionalProperties": true }, - "Removed": { + "removed": { "type": "boolean" } }, "additionalProperties": false, "required": [ - "Removed", - "Entity" + "removed", + "entity" ] } } @@ -1280,7 +985,7 @@ "AnnotationsGetResult": { "type": "object", "properties": { - "Annotations": { + "annotations": { "type": "object", "patternProperties": { ".*": { @@ -1288,24 +993,23 @@ } } }, - "EntityTag": { + "entity": { "type": "string" }, - "Error": { + "error": { "$ref": "#/definitions/ErrorResult" } }, "additionalProperties": false, "required": [ - "EntityTag", - "Annotations", - "Error" + "entity", + "annotations" ] }, "AnnotationsGetResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/AnnotationsGetResult" @@ -1314,13 +1018,13 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "AnnotationsSet": { "type": "object", "properties": { - "Annotations": { + "annotations": { "type": "array", "items": { "$ref": "#/definitions/EntityAnnotations" @@ -1329,13 +1033,13 @@ }, "additionalProperties": false, "required": [ - "Annotations" + "annotations" ] }, "Entities": { "type": "object", "properties": { - "Entities": { + "entities": { "type": "array", "items": { "$ref": "#/definitions/Entity" @@ -1344,25 +1048,25 @@ }, "additionalProperties": false, "required": [ - "Entities" + "entities" ] }, "Entity": { "type": "object", "properties": { - "Tag": { + "tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "Tag" + "tag" ] }, "EntityAnnotations": { "type": "object", "properties": { - "Annotations": { + "annotations": { "type": "object", "patternProperties": { ".*": { @@ -1370,42 +1074,42 @@ } } }, - "EntityTag": { + "entity": { "type": "string" } }, "additionalProperties": false, "required": [ - "EntityTag", - "Annotations" + "entity", + "annotations" ] }, "Error": { "type": "object", "properties": { - "Code": { + "code": { "type": "string" }, - "Info": { + "info": { "$ref": "#/definitions/ErrorInfo" }, - "Message": { + "message": { "type": "string" } }, "additionalProperties": false, "required": [ - "Message", - "Code" + "message", + "code" ] }, "ErrorInfo": { "type": "object", "properties": { - "Macaroon": { + "macaroon": { "$ref": "#/definitions/Macaroon" }, - "MacaroonPath": { + "macaroon-path": { "type": "string" } }, @@ -1414,19 +1118,16 @@ "ErrorResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" } }, - "additionalProperties": false, - "required": [ - "Error" - ] + "additionalProperties": false }, "ErrorResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/ErrorResult" @@ -1435,585 +1136,716 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "Macaroon": { + "type": "object", + "additionalProperties": false + } + } + } + }, + { + "Name": "Application", + "Version": 1, + "Schema": { + "type": "object", + "properties": { + "AddRelation": { "type": "object", "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } - }, - "data": { - "type": "array", - "items": { - "type": "integer" - } - }, - "id": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" + "Params": { + "$ref": "#/definitions/AddRelation" }, - "sig": { - "type": "array", - "items": { - "type": "integer" - } + "Result": { + "$ref": "#/definitions/AddRelationResults" } - }, - "additionalProperties": false, - "required": [ - "data", - "location", - "id", - "caveats", - "sig" - ] + } }, - "caveat": { + "AddUnits": { "type": "object", "properties": { - "caveatId": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" + "Params": { + "$ref": "#/definitions/AddApplicationUnits" }, - "verificationId": { - "$ref": "#/definitions/packet" + "Result": { + "$ref": "#/definitions/AddApplicationUnitsResults" } - }, - "additionalProperties": false, - "required": [ - "location", - "caveatId", - "verificationId" - ] + } }, - "packet": { + "CharmRelations": { "type": "object", "properties": { - "headerLen": { - "type": "integer" + "Params": { + "$ref": "#/definitions/ApplicationCharmRelations" }, - "start": { - "type": "integer" + "Result": { + "$ref": "#/definitions/ApplicationCharmRelationsResults" + } + } + }, + "Deploy": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/ApplicationsDeploy" }, - "totalLen": { - "type": "integer" + "Result": { + "$ref": "#/definitions/ErrorResults" } - }, - "additionalProperties": false, - "required": [ - "start", - "totalLen", - "headerLen" - ] - } - } - } - }, - { - "Name": "Backups", - "Version": 1, - "Schema": { - "type": "object", - "properties": { - "Create": { + } + }, + "Destroy": { "type": "object", "properties": { "Params": { - "$ref": "#/definitions/BackupsCreateArgs" + "$ref": "#/definitions/ApplicationDestroy" + } + } + }, + "DestroyRelation": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/DestroyRelation" + } + } + }, + "DestroyUnits": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/DestroyApplicationUnits" + } + } + }, + "Expose": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/ApplicationExpose" + } + } + }, + "Get": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/ApplicationGet" }, "Result": { - "$ref": "#/definitions/BackupsMetadataResult" + "$ref": "#/definitions/ApplicationGetResults" } } }, - "FinishRestore": { - "type": "object" + "GetCharmURL": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/ApplicationGet" + }, + "Result": { + "$ref": "#/definitions/StringResult" + } + } }, - "Info": { + "GetConstraints": { "type": "object", "properties": { "Params": { - "$ref": "#/definitions/BackupsInfoArgs" + "$ref": "#/definitions/GetApplicationConstraints" }, "Result": { - "$ref": "#/definitions/BackupsMetadataResult" + "$ref": "#/definitions/GetConstraintsResults" } } }, - "List": { + "Set": { "type": "object", "properties": { "Params": { - "$ref": "#/definitions/BackupsListArgs" + "$ref": "#/definitions/ApplicationSet" + } + } + }, + "SetCharm": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/ApplicationSetCharm" + } + } + }, + "SetConstraints": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/SetConstraints" + } + } + }, + "SetMetricCredentials": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/ApplicationMetricCredentials" }, "Result": { - "$ref": "#/definitions/BackupsListResult" + "$ref": "#/definitions/ErrorResults" } } }, - "PrepareRestore": { - "type": "object" + "Unexpose": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/ApplicationUnexpose" + } + } }, - "Remove": { + "Unset": { "type": "object", "properties": { "Params": { - "$ref": "#/definitions/BackupsRemoveArgs" + "$ref": "#/definitions/ApplicationUnset" } } }, - "Restore": { + "Update": { "type": "object", "properties": { "Params": { - "$ref": "#/definitions/RestoreArgs" + "$ref": "#/definitions/ApplicationUpdate" } } } }, "definitions": { - "BackupsCreateArgs": { + "AddApplicationUnits": { "type": "object", "properties": { - "Notes": { + "application": { "type": "string" + }, + "num-units": { + "type": "integer" + }, + "placement": { + "type": "array", + "items": { + "$ref": "#/definitions/Placement" + } } }, "additionalProperties": false, "required": [ - "Notes" + "application", + "num-units", + "placement" ] }, - "BackupsInfoArgs": { + "AddApplicationUnitsResults": { "type": "object", "properties": { - "ID": { - "type": "string" + "units": { + "type": "array", + "items": { + "type": "string" + } } }, "additionalProperties": false, "required": [ - "ID" + "units" ] }, - "BackupsListArgs": { - "type": "object", - "additionalProperties": false - }, - "BackupsListResult": { + "AddRelation": { "type": "object", "properties": { - "List": { + "endpoints": { "type": "array", "items": { - "$ref": "#/definitions/BackupsMetadataResult" + "type": "string" } } }, "additionalProperties": false, "required": [ - "List" + "endpoints" ] }, - "BackupsMetadataResult": { + "AddRelationResults": { "type": "object", "properties": { - "CACert": { - "type": "string" - }, - "CAPrivateKey": { - "type": "string" - }, - "Checksum": { - "type": "string" - }, - "ChecksumFormat": { - "type": "string" - }, - "Finished": { - "type": "string", - "format": "date-time" - }, - "Hostname": { - "type": "string" - }, - "ID": { - "type": "string" - }, - "Machine": { - "type": "string" - }, - "Model": { - "type": "string" - }, - "Notes": { - "type": "string" - }, - "Size": { - "type": "integer" - }, - "Started": { - "type": "string", - "format": "date-time" - }, - "Stored": { - "type": "string", - "format": "date-time" - }, - "Version": { - "$ref": "#/definitions/Number" + "endpoints": { + "type": "object", + "patternProperties": { + ".*": { + "$ref": "#/definitions/CharmRelation" + } + } } }, "additionalProperties": false, "required": [ - "ID", - "Checksum", - "ChecksumFormat", - "Size", - "Stored", - "Started", - "Finished", - "Notes", - "Model", - "Machine", - "Hostname", - "Version", - "CACert", - "CAPrivateKey" + "endpoints" ] }, - "BackupsRemoveArgs": { + "ApplicationCharmRelations": { "type": "object", "properties": { - "ID": { + "application": { "type": "string" } }, "additionalProperties": false, "required": [ - "ID" + "application" ] }, - "Number": { + "ApplicationCharmRelationsResults": { "type": "object", "properties": { - "Build": { - "type": "integer" + "charm-relations": { + "type": "array", + "items": { + "type": "string" + } + } + }, + "additionalProperties": false, + "required": [ + "charm-relations" + ] + }, + "ApplicationDeploy": { + "type": "object", + "properties": { + "application": { + "type": "string" }, - "Major": { - "type": "integer" + "channel": { + "type": "string" }, - "Minor": { - "type": "integer" + "charm-url": { + "type": "string" }, - "Patch": { + "config": { + "type": "object", + "patternProperties": { + ".*": { + "type": "string" + } + } + }, + "config-yaml": { + "type": "string" + }, + "constraints": { + "$ref": "#/definitions/Value" + }, + "endpoint-bindings": { + "type": "object", + "patternProperties": { + ".*": { + "type": "string" + } + } + }, + "num-units": { "type": "integer" }, - "Tag": { + "placement": { + "type": "array", + "items": { + "$ref": "#/definitions/Placement" + } + }, + "resources": { + "type": "object", + "patternProperties": { + ".*": { + "type": "string" + } + } + }, + "series": { "type": "string" + }, + "storage": { + "type": "object", + "patternProperties": { + ".*": { + "$ref": "#/definitions/Constraints" + } + } } }, "additionalProperties": false, "required": [ - "Major", - "Minor", - "Tag", - "Patch", - "Build" + "application", + "series", + "charm-url", + "channel", + "num-units", + "config-yaml", + "constraints" ] }, - "RestoreArgs": { + "ApplicationDestroy": { "type": "object", "properties": { - "BackupId": { + "application": { "type": "string" } }, "additionalProperties": false, "required": [ - "BackupId" + "application" ] - } - } - } - }, - { - "Name": "Block", - "Version": 2, - "Schema": { - "type": "object", - "properties": { - "List": { - "type": "object", - "properties": { - "Result": { - "$ref": "#/definitions/BlockResults" - } - } }, - "SwitchBlockOff": { + "ApplicationExpose": { "type": "object", "properties": { - "Params": { - "$ref": "#/definitions/BlockSwitchParams" - }, - "Result": { - "$ref": "#/definitions/ErrorResult" + "application": { + "type": "string" } - } + }, + "additionalProperties": false, + "required": [ + "application" + ] }, - "SwitchBlockOn": { + "ApplicationGet": { "type": "object", "properties": { - "Params": { - "$ref": "#/definitions/BlockSwitchParams" - }, - "Result": { - "$ref": "#/definitions/ErrorResult" + "application": { + "type": "string" } - } - } - }, - "definitions": { - "Block": { + }, + "additionalProperties": false, + "required": [ + "application" + ] + }, + "ApplicationGetResults": { "type": "object", "properties": { - "id": { + "application": { "type": "string" }, - "message": { + "charm": { "type": "string" }, - "tag": { - "type": "string" + "config": { + "type": "object", + "patternProperties": { + ".*": { + "type": "object", + "additionalProperties": true + } + } }, - "type": { - "type": "string" + "constraints": { + "$ref": "#/definitions/Value" } }, "additionalProperties": false, "required": [ - "id", - "tag", - "type" + "application", + "charm", + "config", + "constraints" ] }, - "BlockResult": { + "ApplicationMetricCredential": { "type": "object", "properties": { - "error": { - "$ref": "#/definitions/Error" + "application": { + "type": "string" }, - "result": { - "$ref": "#/definitions/Block" + "metrics-credentials": { + "type": "array", + "items": { + "type": "integer" + } } }, "additionalProperties": false, "required": [ - "result" + "application", + "metrics-credentials" ] }, - "BlockResults": { + "ApplicationMetricCredentials": { "type": "object", "properties": { - "results": { + "creds": { "type": "array", "items": { - "$ref": "#/definitions/BlockResult" + "$ref": "#/definitions/ApplicationMetricCredential" } } }, - "additionalProperties": false + "additionalProperties": false, + "required": [ + "creds" + ] }, - "BlockSwitchParams": { + "ApplicationSet": { "type": "object", "properties": { - "message": { + "application": { "type": "string" }, - "type": { - "type": "string" + "options": { + "type": "object", + "patternProperties": { + ".*": { + "type": "string" + } + } } }, "additionalProperties": false, "required": [ - "type" + "application", + "options" ] }, - "Error": { + "ApplicationSetCharm": { "type": "object", "properties": { - "Code": { + "application": { "type": "string" }, - "Info": { - "$ref": "#/definitions/ErrorInfo" + "channel": { + "type": "string" }, - "Message": { + "charm-url": { "type": "string" + }, + "force-series": { + "type": "boolean" + }, + "force-units": { + "type": "boolean" + }, + "resource-ids": { + "type": "object", + "patternProperties": { + ".*": { + "type": "string" + } + } } }, "additionalProperties": false, "required": [ - "Message", - "Code" + "application", + "charm-url", + "channel", + "force-units", + "force-series" ] }, - "ErrorInfo": { + "ApplicationUnexpose": { "type": "object", "properties": { - "Macaroon": { - "$ref": "#/definitions/Macaroon" - }, - "MacaroonPath": { + "application": { "type": "string" } }, - "additionalProperties": false + "additionalProperties": false, + "required": [ + "application" + ] }, - "ErrorResult": { + "ApplicationUnset": { "type": "object", "properties": { - "Error": { - "$ref": "#/definitions/Error" + "application": { + "type": "string" + }, + "options": { + "type": "array", + "items": { + "type": "string" + } } }, "additionalProperties": false, "required": [ - "Error" + "application", + "options" ] }, - "Macaroon": { + "ApplicationUpdate": { "type": "object", "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } + "application": { + "type": "string" }, - "data": { - "type": "array", - "items": { - "type": "integer" - } + "charm-url": { + "type": "string" }, - "id": { - "$ref": "#/definitions/packet" + "constraints": { + "$ref": "#/definitions/Value" }, - "location": { - "$ref": "#/definitions/packet" + "force-charm-url": { + "type": "boolean" + }, + "force-series": { + "type": "boolean" + }, + "min-units": { + "type": "integer" + }, + "settings": { + "type": "object", + "patternProperties": { + ".*": { + "type": "string" + } + } }, - "sig": { + "settings-yaml": { + "type": "string" + } + }, + "additionalProperties": false, + "required": [ + "application", + "charm-url", + "force-charm-url", + "force-series", + "settings-yaml" + ] + }, + "ApplicationsDeploy": { + "type": "object", + "properties": { + "applications": { "type": "array", "items": { - "type": "integer" + "$ref": "#/definitions/ApplicationDeploy" } } }, "additionalProperties": false, "required": [ - "data", - "location", - "id", - "caveats", - "sig" + "applications" ] }, - "caveat": { + "CharmRelation": { "type": "object", "properties": { - "caveatId": { - "$ref": "#/definitions/packet" + "interface": { + "type": "string" }, - "location": { - "$ref": "#/definitions/packet" + "limit": { + "type": "integer" + }, + "name": { + "type": "string" }, - "verificationId": { - "$ref": "#/definitions/packet" + "optional": { + "type": "boolean" + }, + "role": { + "type": "string" + }, + "scope": { + "type": "string" } }, "additionalProperties": false, "required": [ - "location", - "caveatId", - "verificationId" + "name", + "role", + "interface", + "optional", + "limit", + "scope" ] }, - "packet": { + "Constraints": { "type": "object", "properties": { - "headerLen": { + "Count": { "type": "integer" }, - "start": { - "type": "integer" + "Pool": { + "type": "string" }, - "totalLen": { + "Size": { "type": "integer" } }, "additionalProperties": false, "required": [ - "start", - "totalLen", - "headerLen" + "Pool", + "Size", + "Count" ] - } - } - } - }, - { - "Name": "CharmRevisionUpdater", - "Version": 1, - "Schema": { - "type": "object", - "properties": { - "UpdateLatestRevisions": { + }, + "DestroyApplicationUnits": { "type": "object", "properties": { - "Result": { - "$ref": "#/definitions/ErrorResult" + "unit-names": { + "type": "array", + "items": { + "type": "string" + } } - } - } - }, - "definitions": { + }, + "additionalProperties": false, + "required": [ + "unit-names" + ] + }, + "DestroyRelation": { + "type": "object", + "properties": { + "endpoints": { + "type": "array", + "items": { + "type": "string" + } + } + }, + "additionalProperties": false, + "required": [ + "endpoints" + ] + }, "Error": { "type": "object", "properties": { - "Code": { + "code": { "type": "string" }, - "Info": { + "info": { "$ref": "#/definitions/ErrorInfo" }, - "Message": { + "message": { "type": "string" } }, "additionalProperties": false, "required": [ - "Message", - "Code" + "message", + "code" ] }, "ErrorInfo": { "type": "object", "properties": { - "Macaroon": { + "macaroon": { "$ref": "#/definitions/Macaroon" }, - "MacaroonPath": { + "macaroon-path": { "type": "string" } }, @@ -2022,3299 +1854,3270 @@ "ErrorResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" } }, - "additionalProperties": false, - "required": [ - "Error" - ] + "additionalProperties": false }, - "Macaroon": { + "ErrorResults": { "type": "object", "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } - }, - "data": { - "type": "array", - "items": { - "type": "integer" - } - }, - "id": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "sig": { + "results": { "type": "array", "items": { - "type": "integer" + "$ref": "#/definitions/ErrorResult" } } }, "additionalProperties": false, "required": [ - "data", - "location", - "id", - "caveats", - "sig" + "results" ] }, - "caveat": { + "GetApplicationConstraints": { "type": "object", "properties": { - "caveatId": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "verificationId": { - "$ref": "#/definitions/packet" + "application": { + "type": "string" } }, "additionalProperties": false, "required": [ - "location", - "caveatId", - "verificationId" + "application" ] }, - "packet": { + "GetConstraintsResults": { "type": "object", "properties": { - "headerLen": { - "type": "integer" - }, - "start": { - "type": "integer" - }, - "totalLen": { - "type": "integer" + "constraints": { + "$ref": "#/definitions/Value" } }, "additionalProperties": false, "required": [ - "start", - "totalLen", - "headerLen" + "constraints" ] - } - } - } - }, - { - "Name": "Charms", - "Version": 2, - "Schema": { - "type": "object", - "properties": { - "CharmInfo": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/CharmInfo" - }, - "Result": { - "$ref": "#/definitions/CharmInfo" - } - } }, - "IsMetered": { + "Macaroon": { "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/CharmInfo" - }, - "Result": { - "$ref": "#/definitions/IsMeteredResult" - } - } + "additionalProperties": false }, - "List": { + "Placement": { "type": "object", "properties": { - "Params": { - "$ref": "#/definitions/CharmsList" + "directive": { + "type": "string" }, - "Result": { - "$ref": "#/definitions/CharmsListResult" - } - } - } - }, - "definitions": { - "CharmInfo": { - "type": "object", - "properties": { - "CharmURL": { + "scope": { "type": "string" } }, "additionalProperties": false, "required": [ - "CharmURL" + "scope", + "directive" ] }, - "CharmsList": { + "SetConstraints": { "type": "object", "properties": { - "Names": { - "type": "array", - "items": { - "type": "string" - } + "application": { + "type": "string" + }, + "constraints": { + "$ref": "#/definitions/Value" } }, "additionalProperties": false, "required": [ - "Names" + "application", + "constraints" ] }, - "CharmsListResult": { + "StringResult": { "type": "object", "properties": { - "CharmURLs": { - "type": "array", - "items": { - "type": "string" - } + "error": { + "$ref": "#/definitions/Error" + }, + "result": { + "type": "string" } }, "additionalProperties": false, "required": [ - "CharmURLs" + "result" ] }, - "IsMeteredResult": { + "Value": { "type": "object", "properties": { - "Metered": { - "type": "boolean" + "arch": { + "type": "string" + }, + "container": { + "type": "string" + }, + "cpu-cores": { + "type": "integer" + }, + "cpu-power": { + "type": "integer" + }, + "instance-type": { + "type": "string" + }, + "mem": { + "type": "integer" + }, + "root-disk": { + "type": "integer" + }, + "spaces": { + "type": "array", + "items": { + "type": "string" + } + }, + "tags": { + "type": "array", + "items": { + "type": "string" + } + }, + "virt-type": { + "type": "string" } }, - "additionalProperties": false, - "required": [ - "Metered" - ] + "additionalProperties": false } } } }, { - "Name": "Cleaner", - "Version": 2, + "Name": "ApplicationScaler", + "Version": 1, "Schema": { "type": "object", "properties": { - "Cleanup": { - "type": "object" + "Rescale": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/Entities" + }, + "Result": { + "$ref": "#/definitions/ErrorResults" + } + } }, - "WatchCleanups": { + "Watch": { "type": "object", "properties": { "Result": { - "$ref": "#/definitions/NotifyWatchResult" + "$ref": "#/definitions/StringsWatchResult" } } } }, "definitions": { + "Entities": { + "type": "object", + "properties": { + "entities": { + "type": "array", + "items": { + "$ref": "#/definitions/Entity" + } + } + }, + "additionalProperties": false, + "required": [ + "entities" + ] + }, + "Entity": { + "type": "object", + "properties": { + "tag": { + "type": "string" + } + }, + "additionalProperties": false, + "required": [ + "tag" + ] + }, "Error": { "type": "object", "properties": { - "Code": { + "code": { "type": "string" }, - "Info": { + "info": { "$ref": "#/definitions/ErrorInfo" }, - "Message": { + "message": { "type": "string" } }, "additionalProperties": false, "required": [ - "Message", - "Code" + "message", + "code" ] }, "ErrorInfo": { "type": "object", "properties": { - "Macaroon": { + "macaroon": { "$ref": "#/definitions/Macaroon" }, - "MacaroonPath": { + "macaroon-path": { "type": "string" } }, "additionalProperties": false }, - "Macaroon": { + "ErrorResult": { + "type": "object", + "properties": { + "error": { + "$ref": "#/definitions/Error" + } + }, + "additionalProperties": false + }, + "ErrorResults": { "type": "object", "properties": { - "caveats": { + "results": { "type": "array", "items": { - "$ref": "#/definitions/caveat" + "$ref": "#/definitions/ErrorResult" } - }, - "data": { - "type": "array", - "items": { - "type": "integer" - } - }, - "id": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "sig": { - "type": "array", - "items": { - "type": "integer" - } - } - }, - "additionalProperties": false, - "required": [ - "data", - "location", - "id", - "caveats", - "sig" - ] - }, - "NotifyWatchResult": { - "type": "object", - "properties": { - "Error": { - "$ref": "#/definitions/Error" - }, - "NotifyWatcherId": { - "type": "string" } }, "additionalProperties": false, "required": [ - "NotifyWatcherId", - "Error" + "results" ] }, - "caveat": { + "Macaroon": { "type": "object", - "properties": { - "caveatId": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "verificationId": { - "$ref": "#/definitions/packet" - } - }, - "additionalProperties": false, - "required": [ - "location", - "caveatId", - "verificationId" - ] + "additionalProperties": false }, - "packet": { + "StringsWatchResult": { "type": "object", "properties": { - "headerLen": { - "type": "integer" + "changes": { + "type": "array", + "items": { + "type": "string" + } }, - "start": { - "type": "integer" + "error": { + "$ref": "#/definitions/Error" }, - "totalLen": { - "type": "integer" + "watcher-id": { + "type": "string" } }, "additionalProperties": false, "required": [ - "start", - "totalLen", - "headerLen" + "watcher-id" ] } } } }, { - "Name": "Client", + "Name": "Backups", "Version": 1, "Schema": { "type": "object", "properties": { - "APIHostPorts": { + "Create": { "type": "object", "properties": { + "Params": { + "$ref": "#/definitions/BackupsCreateArgs" + }, "Result": { - "$ref": "#/definitions/APIHostPortsResult" + "$ref": "#/definitions/BackupsMetadataResult" } } }, - "AbortCurrentUpgrade": { + "FinishRestore": { "type": "object" }, - "AddCharm": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/AddCharm" - } - } - }, - "AddCharmWithAuthorization": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/AddCharmWithAuthorization" - } - } - }, - "AddMachines": { + "Info": { "type": "object", "properties": { "Params": { - "$ref": "#/definitions/AddMachines" + "$ref": "#/definitions/BackupsInfoArgs" }, "Result": { - "$ref": "#/definitions/AddMachinesResults" + "$ref": "#/definitions/BackupsMetadataResult" } } }, - "AddMachinesV2": { + "List": { "type": "object", "properties": { "Params": { - "$ref": "#/definitions/AddMachines" + "$ref": "#/definitions/BackupsListArgs" }, "Result": { - "$ref": "#/definitions/AddMachinesResults" + "$ref": "#/definitions/BackupsListResult" } } }, - "AgentVersion": { - "type": "object", - "properties": { - "Result": { - "$ref": "#/definitions/AgentVersionResult" - } - } + "PrepareRestore": { + "type": "object" }, - "CharmInfo": { + "Remove": { "type": "object", "properties": { "Params": { - "$ref": "#/definitions/CharmInfo" - }, - "Result": { - "$ref": "#/definitions/CharmInfo" + "$ref": "#/definitions/BackupsRemoveArgs" } } }, - "DestroyMachines": { + "Restore": { "type": "object", "properties": { "Params": { - "$ref": "#/definitions/DestroyMachines" + "$ref": "#/definitions/RestoreArgs" } } - }, - "DestroyModel": { - "type": "object" - }, - "FindTools": { + } + }, + "definitions": { + "BackupsCreateArgs": { "type": "object", "properties": { - "Params": { - "$ref": "#/definitions/FindToolsParams" - }, - "Result": { - "$ref": "#/definitions/FindToolsResult" + "notes": { + "type": "string" } - } + }, + "additionalProperties": false, + "required": [ + "notes" + ] }, - "FullStatus": { + "BackupsInfoArgs": { "type": "object", "properties": { - "Params": { - "$ref": "#/definitions/StatusParams" - }, - "Result": { - "$ref": "#/definitions/FullStatus" + "id": { + "type": "string" } - } + }, + "additionalProperties": false, + "required": [ + "id" + ] }, - "GetBundleChanges": { + "BackupsListArgs": { "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/GetBundleChangesParams" - }, - "Result": { - "$ref": "#/definitions/GetBundleChangesResults" - } - } + "additionalProperties": false }, - "GetModelConstraints": { + "BackupsListResult": { "type": "object", "properties": { - "Result": { - "$ref": "#/definitions/GetConstraintsResults" + "list": { + "type": "array", + "items": { + "$ref": "#/definitions/BackupsMetadataResult" + } } - } + }, + "additionalProperties": false, + "required": [ + "list" + ] }, - "InjectMachines": { + "BackupsMetadataResult": { "type": "object", "properties": { - "Params": { - "$ref": "#/definitions/AddMachines" + "ca-cert": { + "type": "string" }, - "Result": { - "$ref": "#/definitions/AddMachinesResults" + "ca-private-key": { + "type": "string" + }, + "checksum": { + "type": "string" + }, + "checksum-format": { + "type": "string" + }, + "finished": { + "type": "string", + "format": "date-time" + }, + "hostname": { + "type": "string" + }, + "id": { + "type": "string" + }, + "machine": { + "type": "string" + }, + "model": { + "type": "string" + }, + "notes": { + "type": "string" + }, + "series": { + "type": "string" + }, + "size": { + "type": "integer" + }, + "started": { + "type": "string", + "format": "date-time" + }, + "stored": { + "type": "string", + "format": "date-time" + }, + "version": { + "$ref": "#/definitions/Number" } - } + }, + "additionalProperties": false, + "required": [ + "id", + "checksum", + "checksum-format", + "size", + "stored", + "started", + "finished", + "notes", + "model", + "machine", + "hostname", + "version", + "series", + "ca-cert", + "ca-private-key" + ] }, - "ModelGet": { + "BackupsRemoveArgs": { "type": "object", "properties": { - "Result": { - "$ref": "#/definitions/ModelConfigResults" + "id": { + "type": "string" } - } + }, + "additionalProperties": false, + "required": [ + "id" + ] }, - "ModelInfo": { + "Number": { "type": "object", "properties": { - "Result": { - "$ref": "#/definitions/ModelInfo" + "Build": { + "type": "integer" + }, + "Major": { + "type": "integer" + }, + "Minor": { + "type": "integer" + }, + "Patch": { + "type": "integer" + }, + "Tag": { + "type": "string" } - } - }, - "ModelSet": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/ModelSet" - } - } + }, + "additionalProperties": false, + "required": [ + "Major", + "Minor", + "Tag", + "Patch", + "Build" + ] }, - "ModelUnset": { + "RestoreArgs": { "type": "object", "properties": { - "Params": { - "$ref": "#/definitions/ModelUnset" + "backup-id": { + "type": "string" } - } - }, - "ModelUserInfo": { + }, + "additionalProperties": false, + "required": [ + "backup-id" + ] + } + } + } + }, + { + "Name": "Block", + "Version": 2, + "Schema": { + "type": "object", + "properties": { + "List": { "type": "object", "properties": { "Result": { - "$ref": "#/definitions/ModelUserInfoResults" + "$ref": "#/definitions/BlockResults" } } }, - "PrivateAddress": { + "SwitchBlockOff": { "type": "object", "properties": { "Params": { - "$ref": "#/definitions/PrivateAddress" + "$ref": "#/definitions/BlockSwitchParams" }, "Result": { - "$ref": "#/definitions/PrivateAddressResults" + "$ref": "#/definitions/ErrorResult" } } }, - "ProvisioningScript": { + "SwitchBlockOn": { "type": "object", "properties": { "Params": { - "$ref": "#/definitions/ProvisioningScriptParams" + "$ref": "#/definitions/BlockSwitchParams" }, "Result": { - "$ref": "#/definitions/ProvisioningScriptResult" + "$ref": "#/definitions/ErrorResult" } } - }, - "PublicAddress": { + } + }, + "definitions": { + "Block": { "type": "object", "properties": { - "Params": { - "$ref": "#/definitions/PublicAddress" + "id": { + "type": "string" }, - "Result": { - "$ref": "#/definitions/PublicAddressResults" - } - } - }, - "ResolveCharms": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/ResolveCharms" + "message": { + "type": "string" }, - "Result": { - "$ref": "#/definitions/ResolveCharmResults" - } - } - }, - "Resolved": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/Resolved" - } - } - }, - "RetryProvisioning": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/Entities" + "tag": { + "type": "string" }, - "Result": { - "$ref": "#/definitions/ErrorResults" - } - } - }, - "SetModelAgentVersion": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/SetModelAgentVersion" - } - } - }, - "SetModelConstraints": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/SetConstraints" + "type": { + "type": "string" } - } + }, + "additionalProperties": false, + "required": [ + "id", + "tag", + "type" + ] }, - "StatusHistory": { + "BlockResult": { "type": "object", "properties": { - "Params": { - "$ref": "#/definitions/StatusHistoryArgs" + "error": { + "$ref": "#/definitions/Error" }, - "Result": { - "$ref": "#/definitions/StatusHistoryResults" + "result": { + "$ref": "#/definitions/Block" } - } + }, + "additionalProperties": false, + "required": [ + "result" + ] }, - "WatchAll": { - "type": "object", - "properties": { - "Result": { - "$ref": "#/definitions/AllWatcherId" - } - } - } - }, - "definitions": { - "APIHostPortsResult": { + "BlockResults": { "type": "object", "properties": { - "Servers": { + "results": { "type": "array", "items": { - "type": "array", - "items": { - "$ref": "#/definitions/HostPort" - } + "$ref": "#/definitions/BlockResult" } } }, - "additionalProperties": false, - "required": [ - "Servers" - ] + "additionalProperties": false }, - "AddCharm": { + "BlockSwitchParams": { "type": "object", "properties": { - "Channel": { + "message": { "type": "string" }, - "URL": { + "type": { "type": "string" } }, "additionalProperties": false, "required": [ - "URL", - "Channel" + "type" ] }, - "AddCharmWithAuthorization": { + "Error": { "type": "object", "properties": { - "Channel": { + "code": { "type": "string" }, - "CharmStoreMacaroon": { - "$ref": "#/definitions/Macaroon" + "info": { + "$ref": "#/definitions/ErrorInfo" }, - "URL": { + "message": { "type": "string" } }, "additionalProperties": false, "required": [ - "URL", - "Channel", - "CharmStoreMacaroon" + "message", + "code" ] }, - "AddMachineParams": { + "ErrorInfo": { "type": "object", "properties": { - "Addrs": { - "type": "array", - "items": { - "$ref": "#/definitions/Address" - } - }, - "Constraints": { - "$ref": "#/definitions/Value" - }, - "ContainerType": { - "type": "string" - }, - "Disks": { - "type": "array", - "items": { - "$ref": "#/definitions/Constraints" - } - }, - "HardwareCharacteristics": { - "$ref": "#/definitions/HardwareCharacteristics" - }, - "InstanceId": { - "type": "string" - }, - "Jobs": { - "type": "array", - "items": { - "type": "string" - } - }, - "Nonce": { - "type": "string" - }, - "ParentId": { - "type": "string" - }, - "Placement": { - "$ref": "#/definitions/Placement" + "macaroon": { + "$ref": "#/definitions/Macaroon" }, - "Series": { + "macaroon-path": { "type": "string" } }, - "additionalProperties": false, - "required": [ - "Series", - "Constraints", - "Jobs", - "Disks", - "Placement", - "ParentId", - "ContainerType", - "InstanceId", - "Nonce", - "HardwareCharacteristics", - "Addrs" - ] + "additionalProperties": false }, - "AddMachines": { + "ErrorResult": { "type": "object", "properties": { - "MachineParams": { - "type": "array", - "items": { - "$ref": "#/definitions/AddMachineParams" - } + "error": { + "$ref": "#/definitions/Error" } }, - "additionalProperties": false, - "required": [ - "MachineParams" - ] + "additionalProperties": false }, - "AddMachinesResult": { + "Macaroon": { + "type": "object", + "additionalProperties": false + } + } + } + }, + { + "Name": "CharmRevisionUpdater", + "Version": 2, + "Schema": { + "type": "object", + "properties": { + "UpdateLatestRevisions": { "type": "object", "properties": { - "Error": { - "$ref": "#/definitions/Error" + "Result": { + "$ref": "#/definitions/ErrorResult" + } + } + } + }, + "definitions": { + "Error": { + "type": "object", + "properties": { + "code": { + "type": "string" + }, + "info": { + "$ref": "#/definitions/ErrorInfo" }, - "Machine": { + "message": { "type": "string" } }, "additionalProperties": false, "required": [ - "Machine", - "Error" + "message", + "code" ] }, - "AddMachinesResults": { - "type": "object", - "properties": { - "Machines": { - "type": "array", - "items": { - "$ref": "#/definitions/AddMachinesResult" - } - } - }, - "additionalProperties": false, - "required": [ - "Machines" - ] - }, - "Address": { + "ErrorInfo": { "type": "object", "properties": { - "Scope": { - "type": "string" - }, - "SpaceName": { - "type": "string" - }, - "Type": { - "type": "string" + "macaroon": { + "$ref": "#/definitions/Macaroon" }, - "Value": { + "macaroon-path": { "type": "string" } }, - "additionalProperties": false, - "required": [ - "Value", - "Type", - "Scope" - ] + "additionalProperties": false }, - "AgentVersionResult": { + "ErrorResult": { "type": "object", "properties": { - "Version": { - "$ref": "#/definitions/Number" + "error": { + "$ref": "#/definitions/Error" } }, - "additionalProperties": false, - "required": [ - "Version" - ] + "additionalProperties": false }, - "AllWatcherId": { + "Macaroon": { + "type": "object", + "additionalProperties": false + } + } + } + }, + { + "Name": "Charms", + "Version": 2, + "Schema": { + "type": "object", + "properties": { + "CharmInfo": { "type": "object", "properties": { - "AllWatcherId": { - "type": "string" + "Params": { + "$ref": "#/definitions/CharmURL" + }, + "Result": { + "$ref": "#/definitions/CharmInfo" } - }, - "additionalProperties": false, - "required": [ - "AllWatcherId" - ] + } }, - "Binary": { + "IsMetered": { "type": "object", "properties": { - "Arch": { - "type": "string" - }, - "Number": { - "$ref": "#/definitions/Number" + "Params": { + "$ref": "#/definitions/CharmURL" }, - "Series": { - "type": "string" + "Result": { + "$ref": "#/definitions/IsMeteredResult" } - }, - "additionalProperties": false, - "required": [ - "Number", - "Series", - "Arch" - ] + } }, - "BundleChangesChange": { + "List": { "type": "object", "properties": { - "args": { - "type": "array", - "items": { - "type": "object", - "additionalProperties": true - } - }, - "id": { - "type": "string" + "Params": { + "$ref": "#/definitions/CharmsList" }, - "method": { + "Result": { + "$ref": "#/definitions/CharmsListResult" + } + } + } + }, + "definitions": { + "CharmActionSpec": { + "type": "object", + "properties": { + "description": { "type": "string" }, - "requires": { - "type": "array", - "items": { - "type": "string" + "params": { + "type": "object", + "patternProperties": { + ".*": { + "type": "object", + "additionalProperties": true + } } } }, "additionalProperties": false, "required": [ - "id", - "method", - "args", - "requires" + "description", + "params" ] }, - "CharmInfo": { + "CharmActions": { "type": "object", "properties": { - "CharmURL": { - "type": "string" + "specs": { + "type": "object", + "patternProperties": { + ".*": { + "$ref": "#/definitions/CharmActionSpec" + } + } } }, - "additionalProperties": false, - "required": [ - "CharmURL" - ] + "additionalProperties": false }, - "Constraints": { + "CharmInfo": { "type": "object", "properties": { - "Count": { - "type": "integer" + "actions": { + "$ref": "#/definitions/CharmActions" }, - "Pool": { - "type": "string" + "config": { + "type": "object", + "patternProperties": { + ".*": { + "$ref": "#/definitions/CharmOption" + } + } }, - "Size": { + "meta": { + "$ref": "#/definitions/CharmMeta" + }, + "metrics": { + "$ref": "#/definitions/CharmMetrics" + }, + "revision": { "type": "integer" + }, + "url": { + "type": "string" } }, "additionalProperties": false, "required": [ - "Pool", - "Size", - "Count" + "revision", + "url", + "config" ] }, - "DestroyMachines": { + "CharmMeta": { "type": "object", "properties": { - "Force": { - "type": "boolean" - }, - "MachineNames": { + "categories": { "type": "array", "items": { "type": "string" } - } - }, - "additionalProperties": false, - "required": [ - "MachineNames", - "Force" - ] - }, - "DetailedStatus": { - "type": "object", - "properties": { - "Data": { + }, + "description": { + "type": "string" + }, + "extra-bindings": { "type": "object", "patternProperties": { ".*": { - "type": "object", - "additionalProperties": true + "type": "string" } } }, - "Err": { - "type": "object", - "additionalProperties": true - }, - "Info": { + "min-juju-version": { "type": "string" }, - "Kind": { + "name": { "type": "string" }, - "Life": { - "type": "string" + "payload-classes": { + "type": "object", + "patternProperties": { + ".*": { + "$ref": "#/definitions/CharmPayloadClass" + } + } }, - "Since": { - "type": "string", - "format": "date-time" + "peers": { + "type": "object", + "patternProperties": { + ".*": { + "$ref": "#/definitions/CharmRelation" + } + } }, - "Status": { - "type": "string" + "provides": { + "type": "object", + "patternProperties": { + ".*": { + "$ref": "#/definitions/CharmRelation" + } + } + }, + "requires": { + "type": "object", + "patternProperties": { + ".*": { + "$ref": "#/definitions/CharmRelation" + } + } + }, + "resources": { + "type": "object", + "patternProperties": { + ".*": { + "$ref": "#/definitions/CharmResourceMeta" + } + } + }, + "series": { + "type": "array", + "items": { + "type": "string" + } + }, + "storage": { + "type": "object", + "patternProperties": { + ".*": { + "$ref": "#/definitions/CharmStorage" + } + } + }, + "subordinate": { + "type": "boolean" }, - "Version": { + "summary": { "type": "string" + }, + "tags": { + "type": "array", + "items": { + "type": "string" + } + }, + "terms": { + "type": "array", + "items": { + "type": "string" + } } }, "additionalProperties": false, "required": [ - "Status", - "Info", - "Data", - "Since", - "Kind", - "Version", - "Life", - "Err" + "name", + "summary", + "description", + "subordinate" ] }, - "EndpointStatus": { + "CharmMetric": { "type": "object", "properties": { - "Name": { - "type": "string" - }, - "Role": { + "description": { "type": "string" }, - "ServiceName": { + "type": { "type": "string" - }, - "Subordinate": { - "type": "boolean" } }, "additionalProperties": false, "required": [ - "ServiceName", - "Name", - "Role", - "Subordinate" + "type", + "description" ] }, - "Entities": { + "CharmMetrics": { "type": "object", "properties": { - "Entities": { - "type": "array", - "items": { - "$ref": "#/definitions/Entity" + "metrics": { + "type": "object", + "patternProperties": { + ".*": { + "$ref": "#/definitions/CharmMetric" + } } } }, "additionalProperties": false, "required": [ - "Entities" + "metrics" ] }, - "Entity": { + "CharmOption": { "type": "object", "properties": { - "Tag": { - "type": "string" - } - }, - "additionalProperties": false, - "required": [ - "Tag" - ] - }, - "EntityStatus": { - "type": "object", - "properties": { - "Data": { + "default": { "type": "object", - "patternProperties": { - ".*": { - "type": "object", - "additionalProperties": true - } - } + "additionalProperties": true }, - "Info": { + "description": { "type": "string" }, - "Since": { - "type": "string", - "format": "date-time" - }, - "Status": { + "type": { "type": "string" } }, "additionalProperties": false, "required": [ - "Status", - "Info", - "Data", - "Since" + "type" ] }, - "Error": { + "CharmPayloadClass": { "type": "object", "properties": { - "Code": { - "type": "string" - }, - "Info": { - "$ref": "#/definitions/ErrorInfo" - }, - "Message": { + "name": { "type": "string" - } - }, - "additionalProperties": false, - "required": [ - "Message", - "Code" - ] - }, - "ErrorInfo": { - "type": "object", - "properties": { - "Macaroon": { - "$ref": "#/definitions/Macaroon" }, - "MacaroonPath": { + "type": { "type": "string" } }, - "additionalProperties": false - }, - "ErrorResult": { - "type": "object", - "properties": { - "Error": { - "$ref": "#/definitions/Error" - } - }, - "additionalProperties": false, - "required": [ - "Error" - ] - }, - "ErrorResults": { - "type": "object", - "properties": { - "Results": { - "type": "array", - "items": { - "$ref": "#/definitions/ErrorResult" - } - } - }, "additionalProperties": false, "required": [ - "Results" + "name", + "type" ] }, - "FindToolsParams": { + "CharmRelation": { "type": "object", "properties": { - "Arch": { + "interface": { "type": "string" }, - "MajorVersion": { + "limit": { "type": "integer" }, - "MinorVersion": { - "type": "integer" + "name": { + "type": "string" }, - "Number": { - "$ref": "#/definitions/Number" + "optional": { + "type": "boolean" }, - "Series": { + "role": { + "type": "string" + }, + "scope": { "type": "string" } }, "additionalProperties": false, "required": [ - "Number", - "MajorVersion", - "MinorVersion", - "Arch", - "Series" + "name", + "role", + "interface", + "optional", + "limit", + "scope" ] }, - "FindToolsResult": { + "CharmResourceMeta": { "type": "object", "properties": { - "Error": { - "$ref": "#/definitions/Error" + "description": { + "type": "string" }, - "List": { - "type": "array", - "items": { - "$ref": "#/definitions/Tools" - } + "name": { + "type": "string" + }, + "path": { + "type": "string" + }, + "type": { + "type": "string" } }, "additionalProperties": false, "required": [ - "List", - "Error" + "name", + "type", + "path", + "description" ] }, - "FullStatus": { + "CharmStorage": { "type": "object", "properties": { - "AvailableVersion": { + "count-max": { + "type": "integer" + }, + "count-min": { + "type": "integer" + }, + "description": { "type": "string" }, - "Machines": { - "type": "object", - "patternProperties": { - ".*": { - "$ref": "#/definitions/MachineStatus" - } - } + "location": { + "type": "string" + }, + "minimum-size": { + "type": "integer" }, - "ModelName": { + "name": { "type": "string" }, - "Relations": { + "properties": { "type": "array", "items": { - "$ref": "#/definitions/RelationStatus" + "type": "string" } }, - "Services": { - "type": "object", - "patternProperties": { - ".*": { - "$ref": "#/definitions/ServiceStatus" - } - } + "read-only": { + "type": "boolean" + }, + "shared": { + "type": "boolean" + }, + "type": { + "type": "string" } }, "additionalProperties": false, "required": [ - "ModelName", - "AvailableVersion", - "Machines", - "Services", - "Relations" + "name", + "description", + "type", + "shared", + "read-only", + "count-min", + "count-max", + "minimum-size" ] }, - "GetBundleChangesParams": { + "CharmURL": { "type": "object", "properties": { - "yaml": { + "url": { "type": "string" } }, "additionalProperties": false, "required": [ - "yaml" + "url" ] }, - "GetBundleChangesResults": { + "CharmsList": { "type": "object", "properties": { - "changes": { - "type": "array", - "items": { - "$ref": "#/definitions/BundleChangesChange" - } - }, - "errors": { + "names": { "type": "array", "items": { "type": "string" } } }, - "additionalProperties": false - }, - "GetConstraintsResults": { - "type": "object", - "properties": { - "Constraints": { - "$ref": "#/definitions/Value" - } - }, "additionalProperties": false, "required": [ - "Constraints" + "names" ] }, - "HardwareCharacteristics": { + "CharmsListResult": { "type": "object", "properties": { - "Arch": { - "type": "string" - }, - "AvailabilityZone": { - "type": "string" - }, - "CpuCores": { - "type": "integer" - }, - "CpuPower": { - "type": "integer" - }, - "Mem": { - "type": "integer" - }, - "RootDisk": { - "type": "integer" - }, - "Tags": { + "charm-urls": { "type": "array", "items": { "type": "string" } } }, - "additionalProperties": false - }, - "HostPort": { - "type": "object", - "properties": { - "Address": { - "$ref": "#/definitions/Address" - }, - "Port": { - "type": "integer" - } - }, "additionalProperties": false, "required": [ - "Address", - "Port" + "charm-urls" ] }, - "Macaroon": { + "IsMeteredResult": { "type": "object", "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } - }, - "data": { - "type": "array", - "items": { - "type": "integer" - } - }, - "id": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "sig": { - "type": "array", - "items": { - "type": "integer" - } + "metered": { + "type": "boolean" } }, "additionalProperties": false, "required": [ - "data", - "location", - "id", - "caveats", - "sig" + "metered" ] + } + } + } + }, + { + "Name": "Cleaner", + "Version": 2, + "Schema": { + "type": "object", + "properties": { + "Cleanup": { + "type": "object" }, - "MachineStatus": { + "WatchCleanups": { "type": "object", "properties": { - "AgentStatus": { - "$ref": "#/definitions/DetailedStatus" - }, - "Containers": { - "type": "object", - "patternProperties": { - ".*": { - "$ref": "#/definitions/MachineStatus" - } - } - }, - "DNSName": { - "type": "string" - }, - "Hardware": { - "type": "string" - }, - "HasVote": { - "type": "boolean" - }, - "Id": { - "type": "string" - }, - "InstanceId": { + "Result": { + "$ref": "#/definitions/NotifyWatchResult" + } + } + } + }, + "definitions": { + "Error": { + "type": "object", + "properties": { + "code": { "type": "string" }, - "InstanceStatus": { - "$ref": "#/definitions/DetailedStatus" - }, - "Jobs": { - "type": "array", - "items": { - "type": "string" - } + "info": { + "$ref": "#/definitions/ErrorInfo" }, - "Series": { + "message": { "type": "string" - }, - "WantsVote": { - "type": "boolean" } }, "additionalProperties": false, "required": [ - "AgentStatus", - "InstanceStatus", - "DNSName", - "InstanceId", - "Series", - "Id", - "Containers", - "Hardware", - "Jobs", - "HasVote", - "WantsVote" + "message", + "code" ] }, - "MeterStatus": { + "ErrorInfo": { "type": "object", "properties": { - "Color": { - "type": "string" + "macaroon": { + "$ref": "#/definitions/Macaroon" }, - "Message": { + "macaroon-path": { "type": "string" } }, - "additionalProperties": false, - "required": [ - "Color", - "Message" - ] + "additionalProperties": false }, - "ModelConfigResults": { + "Macaroon": { "type": "object", - "properties": { - "Config": { - "type": "object", - "patternProperties": { - ".*": { - "type": "object", - "additionalProperties": true - } - } - } - }, - "additionalProperties": false, - "required": [ - "Config" - ] + "additionalProperties": false }, - "ModelInfo": { + "NotifyWatchResult": { "type": "object", "properties": { - "DefaultSeries": { - "type": "string" - }, - "Life": { - "type": "string" - }, - "Name": { - "type": "string" - }, - "OwnerTag": { - "type": "string" - }, - "ProviderType": { - "type": "string" - }, - "ServerUUID": { - "type": "string" - }, - "Status": { - "$ref": "#/definitions/EntityStatus" - }, - "UUID": { + "NotifyWatcherId": { "type": "string" }, - "Users": { - "type": "array", - "items": { - "$ref": "#/definitions/ModelUserInfo" - } + "error": { + "$ref": "#/definitions/Error" } }, "additionalProperties": false, "required": [ - "Name", - "UUID", - "ServerUUID", - "ProviderType", - "DefaultSeries", - "OwnerTag", - "Life", - "Status", - "Users" + "NotifyWatcherId" ] + } + } + } + }, + { + "Name": "Client", + "Version": 1, + "Schema": { + "type": "object", + "properties": { + "APIHostPorts": { + "type": "object", + "properties": { + "Result": { + "$ref": "#/definitions/APIHostPortsResult" + } + } }, - "ModelSet": { + "AbortCurrentUpgrade": { + "type": "object" + }, + "AddCharm": { "type": "object", "properties": { - "Config": { - "type": "object", - "patternProperties": { - ".*": { - "type": "object", - "additionalProperties": true - } - } + "Params": { + "$ref": "#/definitions/AddCharm" } - }, - "additionalProperties": false, - "required": [ - "Config" - ] + } }, - "ModelUnset": { + "AddCharmWithAuthorization": { "type": "object", "properties": { - "Keys": { - "type": "array", - "items": { - "type": "string" - } + "Params": { + "$ref": "#/definitions/AddCharmWithAuthorization" } - }, - "additionalProperties": false, - "required": [ - "Keys" - ] + } }, - "ModelUserInfo": { + "AddMachines": { "type": "object", "properties": { - "access": { - "type": "string" - }, - "displayname": { - "type": "string" - }, - "lastconnection": { - "type": "string", - "format": "date-time" + "Params": { + "$ref": "#/definitions/AddMachines" }, - "user": { - "type": "string" + "Result": { + "$ref": "#/definitions/AddMachinesResults" } - }, - "additionalProperties": false, - "required": [ - "user", - "displayname", - "lastconnection", - "access" - ] + } }, - "ModelUserInfoResult": { + "AddMachinesV2": { "type": "object", "properties": { - "error": { - "$ref": "#/definitions/Error" + "Params": { + "$ref": "#/definitions/AddMachines" }, - "result": { - "$ref": "#/definitions/ModelUserInfo" + "Result": { + "$ref": "#/definitions/AddMachinesResults" } - }, - "additionalProperties": false + } }, - "ModelUserInfoResults": { + "AgentVersion": { "type": "object", "properties": { - "results": { - "type": "array", - "items": { - "$ref": "#/definitions/ModelUserInfoResult" - } + "Result": { + "$ref": "#/definitions/AgentVersionResult" } - }, - "additionalProperties": false, - "required": [ - "results" - ] + } }, - "Number": { + "DestroyMachines": { "type": "object", "properties": { - "Build": { - "type": "integer" - }, - "Major": { - "type": "integer" - }, - "Minor": { - "type": "integer" - }, - "Patch": { - "type": "integer" - }, - "Tag": { - "type": "string" + "Params": { + "$ref": "#/definitions/DestroyMachines" } - }, - "additionalProperties": false, - "required": [ - "Major", - "Minor", - "Tag", - "Patch", - "Build" - ] + } }, - "Placement": { + "FindTools": { "type": "object", "properties": { - "Directive": { - "type": "string" + "Params": { + "$ref": "#/definitions/FindToolsParams" }, - "Scope": { - "type": "string" + "Result": { + "$ref": "#/definitions/FindToolsResult" } - }, - "additionalProperties": false, - "required": [ - "Scope", - "Directive" - ] + } }, - "PrivateAddress": { + "FullStatus": { "type": "object", "properties": { - "Target": { - "type": "string" + "Params": { + "$ref": "#/definitions/StatusParams" + }, + "Result": { + "$ref": "#/definitions/FullStatus" } - }, - "additionalProperties": false, - "required": [ - "Target" - ] + } }, - "PrivateAddressResults": { + "GetBundleChanges": { "type": "object", "properties": { - "PrivateAddress": { - "type": "string" + "Params": { + "$ref": "#/definitions/GetBundleChangesParams" + }, + "Result": { + "$ref": "#/definitions/GetBundleChangesResults" } - }, - "additionalProperties": false, - "required": [ - "PrivateAddress" - ] + } }, - "ProvisioningScriptParams": { + "GetModelConstraints": { "type": "object", "properties": { - "DataDir": { - "type": "string" - }, - "DisablePackageCommands": { - "type": "boolean" - }, - "MachineId": { - "type": "string" - }, - "Nonce": { - "type": "string" + "Result": { + "$ref": "#/definitions/GetConstraintsResults" } - }, - "additionalProperties": false, - "required": [ - "MachineId", - "Nonce", - "DataDir", - "DisablePackageCommands" - ] + } }, - "ProvisioningScriptResult": { + "InjectMachines": { "type": "object", "properties": { - "Script": { - "type": "string" + "Params": { + "$ref": "#/definitions/AddMachines" + }, + "Result": { + "$ref": "#/definitions/AddMachinesResults" } - }, - "additionalProperties": false, - "required": [ - "Script" - ] + } }, - "PublicAddress": { + "ModelGet": { "type": "object", "properties": { - "Target": { - "type": "string" + "Result": { + "$ref": "#/definitions/ModelConfigResults" } - }, - "additionalProperties": false, - "required": [ - "Target" - ] + } }, - "PublicAddressResults": { + "ModelInfo": { "type": "object", "properties": { - "PublicAddress": { - "type": "string" + "Result": { + "$ref": "#/definitions/ModelInfo" } - }, - "additionalProperties": false, - "required": [ - "PublicAddress" - ] + } }, - "RelationStatus": { + "ModelSet": { "type": "object", "properties": { - "Endpoints": { - "type": "array", - "items": { - "$ref": "#/definitions/EndpointStatus" - } + "Params": { + "$ref": "#/definitions/ModelSet" + } + } + }, + "ModelUnset": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/ModelUnset" + } + } + }, + "ModelUserInfo": { + "type": "object", + "properties": { + "Result": { + "$ref": "#/definitions/ModelUserInfoResults" + } + } + }, + "PrivateAddress": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/PrivateAddress" }, - "Id": { - "type": "integer" + "Result": { + "$ref": "#/definitions/PrivateAddressResults" + } + } + }, + "ProvisioningScript": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/ProvisioningScriptParams" }, - "Interface": { - "type": "string" + "Result": { + "$ref": "#/definitions/ProvisioningScriptResult" + } + } + }, + "PublicAddress": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/PublicAddress" }, - "Key": { - "type": "string" + "Result": { + "$ref": "#/definitions/PublicAddressResults" + } + } + }, + "ResolveCharms": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/ResolveCharms" }, - "Scope": { - "type": "string" + "Result": { + "$ref": "#/definitions/ResolveCharmResults" } - }, - "additionalProperties": false, - "required": [ - "Id", - "Key", - "Interface", - "Scope", - "Endpoints" - ] + } }, - "ResolveCharmResult": { + "Resolved": { "type": "object", "properties": { - "Error": { - "type": "string" + "Params": { + "$ref": "#/definitions/Resolved" + } + } + }, + "RetryProvisioning": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/Entities" }, - "URL": { - "$ref": "#/definitions/URL" + "Result": { + "$ref": "#/definitions/ErrorResults" } - }, - "additionalProperties": false + } }, - "ResolveCharmResults": { + "SetModelAgentVersion": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/SetModelAgentVersion" + } + } + }, + "SetModelConstraints": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/SetConstraints" + } + } + }, + "StatusHistory": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/StatusHistoryRequests" + }, + "Result": { + "$ref": "#/definitions/StatusHistoryResults" + } + } + }, + "WatchAll": { + "type": "object", + "properties": { + "Result": { + "$ref": "#/definitions/AllWatcherId" + } + } + } + }, + "definitions": { + "APIHostPortsResult": { "type": "object", "properties": { - "URLs": { + "servers": { "type": "array", "items": { - "$ref": "#/definitions/ResolveCharmResult" + "type": "array", + "items": { + "$ref": "#/definitions/HostPort" + } } } }, "additionalProperties": false, "required": [ - "URLs" + "servers" ] }, - "ResolveCharms": { + "AddCharm": { "type": "object", "properties": { - "References": { - "type": "array", - "items": { - "$ref": "#/definitions/URL" - } + "channel": { + "type": "string" + }, + "url": { + "type": "string" } }, "additionalProperties": false, "required": [ - "References" + "url", + "channel" ] }, - "Resolved": { + "AddCharmWithAuthorization": { "type": "object", "properties": { - "Retry": { - "type": "boolean" + "channel": { + "type": "string" + }, + "macaroon": { + "$ref": "#/definitions/Macaroon" }, - "UnitName": { + "url": { "type": "string" } }, "additionalProperties": false, "required": [ - "UnitName", - "Retry" + "url", + "channel", + "macaroon" ] }, - "ServiceStatus": { + "AddMachineParams": { "type": "object", "properties": { - "CanUpgradeTo": { - "type": "string" - }, - "Charm": { - "type": "string" - }, - "Err": { - "type": "object", - "additionalProperties": true + "addresses": { + "type": "array", + "items": { + "$ref": "#/definitions/Address" + } }, - "Exposed": { - "type": "boolean" + "constraints": { + "$ref": "#/definitions/Value" }, - "Life": { + "container-type": { "type": "string" }, - "MeterStatuses": { - "type": "object", - "patternProperties": { - ".*": { - "$ref": "#/definitions/MeterStatus" - } + "disks": { + "type": "array", + "items": { + "$ref": "#/definitions/Constraints" } }, - "Relations": { - "type": "object", - "patternProperties": { - ".*": { - "type": "array", - "items": { - "type": "string" - } - } - } + "hardware-characteristics": { + "$ref": "#/definitions/HardwareCharacteristics" }, - "Status": { - "$ref": "#/definitions/DetailedStatus" + "instance-id": { + "type": "string" }, - "SubordinateTo": { + "jobs": { "type": "array", "items": { "type": "string" } }, - "Units": { - "type": "object", - "patternProperties": { - ".*": { - "$ref": "#/definitions/UnitStatus" - } - } - } - }, - "additionalProperties": false, - "required": [ - "Err", - "Charm", - "Exposed", - "Life", - "Relations", - "CanUpgradeTo", - "SubordinateTo", - "Units", - "MeterStatuses", - "Status" - ] - }, - "SetConstraints": { - "type": "object", - "properties": { - "Constraints": { - "$ref": "#/definitions/Value" + "nonce": { + "type": "string" + }, + "parent-id": { + "type": "string" }, - "ServiceName": { + "placement": { + "$ref": "#/definitions/Placement" + }, + "series": { "type": "string" } }, "additionalProperties": false, "required": [ - "ServiceName", - "Constraints" + "series", + "constraints", + "jobs", + "parent-id", + "container-type", + "instance-id", + "nonce", + "hardware-characteristics", + "addresses" ] }, - "SetModelAgentVersion": { + "AddMachines": { "type": "object", "properties": { - "Version": { - "$ref": "#/definitions/Number" + "params": { + "type": "array", + "items": { + "$ref": "#/definitions/AddMachineParams" + } } }, "additionalProperties": false, "required": [ - "Version" + "params" ] }, - "StatusHistoryArgs": { + "AddMachinesResult": { "type": "object", "properties": { - "Kind": { - "type": "string" + "error": { + "$ref": "#/definitions/Error" }, - "Name": { + "machine": { "type": "string" - }, - "Size": { - "type": "integer" } }, "additionalProperties": false, "required": [ - "Kind", - "Size", - "Name" + "machine" ] }, - "StatusHistoryResults": { + "AddMachinesResults": { "type": "object", "properties": { - "Statuses": { + "machines": { "type": "array", "items": { - "$ref": "#/definitions/DetailedStatus" + "$ref": "#/definitions/AddMachinesResult" } } }, "additionalProperties": false, "required": [ - "Statuses" + "machines" ] }, - "StatusParams": { + "Address": { "type": "object", "properties": { - "Patterns": { - "type": "array", - "items": { - "type": "string" - } - } - }, - "additionalProperties": false, - "required": [ - "Patterns" - ] - }, - "Tools": { - "type": "object", - "properties": { - "sha256": { + "scope": { "type": "string" }, - "size": { - "type": "integer" + "space-name": { + "type": "string" }, - "url": { + "type": { "type": "string" }, - "version": { - "$ref": "#/definitions/Binary" + "value": { + "type": "string" } }, "additionalProperties": false, "required": [ - "version", - "url", - "size" + "value", + "type", + "scope" ] }, - "URL": { + "AgentVersionResult": { "type": "object", "properties": { - "Channel": { - "type": "string" - }, - "Name": { - "type": "string" - }, - "Revision": { - "type": "integer" - }, - "Schema": { - "type": "string" - }, - "Series": { - "type": "string" - }, - "User": { - "type": "string" + "version": { + "$ref": "#/definitions/Number" } }, "additionalProperties": false, "required": [ - "Schema", - "User", - "Name", - "Revision", - "Series", - "Channel" + "version" ] }, - "UnitStatus": { + "AllWatcherId": { "type": "object", "properties": { - "AgentStatus": { - "$ref": "#/definitions/DetailedStatus" - }, - "Charm": { - "type": "string" - }, - "Machine": { + "watcher-id": { "type": "string" - }, - "OpenedPorts": { - "type": "array", - "items": { - "type": "string" - } - }, - "PublicAddress": { - "type": "string" - }, - "Subordinates": { - "type": "object", - "patternProperties": { - ".*": { - "$ref": "#/definitions/UnitStatus" - } - } - }, - "WorkloadStatus": { - "$ref": "#/definitions/DetailedStatus" } }, "additionalProperties": false, "required": [ - "AgentStatus", - "WorkloadStatus", - "Machine", - "OpenedPorts", - "PublicAddress", - "Charm", - "Subordinates" + "watcher-id" ] }, - "Value": { + "ApplicationStatus": { "type": "object", "properties": { - "arch": { + "can-upgrade-to": { "type": "string" }, - "container": { + "charm": { "type": "string" }, - "cpu-cores": { - "type": "integer" + "err": { + "type": "object", + "additionalProperties": true }, - "cpu-power": { - "type": "integer" + "exposed": { + "type": "boolean" }, - "instance-type": { + "life": { "type": "string" }, - "mem": { - "type": "integer" + "meter-statuses": { + "type": "object", + "patternProperties": { + ".*": { + "$ref": "#/definitions/MeterStatus" + } + } }, - "root-disk": { - "type": "integer" + "relations": { + "type": "object", + "patternProperties": { + ".*": { + "type": "array", + "items": { + "type": "string" + } + } + } }, - "spaces": { + "series": { + "type": "string" + }, + "status": { + "$ref": "#/definitions/DetailedStatus" + }, + "subordinate-to": { "type": "array", "items": { "type": "string" } }, - "tags": { - "type": "array", - "items": { - "type": "string" + "units": { + "type": "object", + "patternProperties": { + ".*": { + "$ref": "#/definitions/UnitStatus" + } } }, - "virt-type": { + "workload-version": { "type": "string" } }, - "additionalProperties": false + "additionalProperties": false, + "required": [ + "charm", + "series", + "exposed", + "life", + "relations", + "can-upgrade-to", + "subordinate-to", + "units", + "meter-statuses", + "status", + "workload-version" + ] }, - "caveat": { + "Binary": { "type": "object", "properties": { - "caveatId": { - "$ref": "#/definitions/packet" + "Arch": { + "type": "string" }, - "location": { - "$ref": "#/definitions/packet" + "Number": { + "$ref": "#/definitions/Number" }, - "verificationId": { - "$ref": "#/definitions/packet" + "Series": { + "type": "string" } }, "additionalProperties": false, "required": [ - "location", - "caveatId", - "verificationId" + "Number", + "Series", + "Arch" ] }, - "packet": { + "BundleChangesChange": { "type": "object", "properties": { - "headerLen": { - "type": "integer" + "args": { + "type": "array", + "items": { + "type": "object", + "additionalProperties": true + } }, - "start": { - "type": "integer" + "id": { + "type": "string" }, - "totalLen": { - "type": "integer" + "method": { + "type": "string" + }, + "requires": { + "type": "array", + "items": { + "type": "string" + } } }, "additionalProperties": false, "required": [ - "start", - "totalLen", - "headerLen" + "id", + "method", + "args", + "requires" ] - } - } - } - }, - { - "Name": "Controller", - "Version": 2, - "Schema": { - "type": "object", - "properties": { - "AllModels": { - "type": "object", - "properties": { - "Result": { - "$ref": "#/definitions/UserModelList" - } - } - }, - "DestroyController": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/DestroyControllerArgs" - } - } - }, - "InitiateModelMigration": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/InitiateModelMigrationArgs" - }, - "Result": { - "$ref": "#/definitions/InitiateModelMigrationResults" - } - } - }, - "ListBlockedModels": { - "type": "object", - "properties": { - "Result": { - "$ref": "#/definitions/ModelBlockInfoList" - } - } - }, - "ModelConfig": { - "type": "object", - "properties": { - "Result": { - "$ref": "#/definitions/ModelConfigResults" - } - } - }, - "ModelStatus": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/Entities" - }, - "Result": { - "$ref": "#/definitions/ModelStatusResults" - } - } - }, - "RemoveBlocks": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/RemoveBlocksArgs" - } - } }, - "WatchAllModels": { - "type": "object", - "properties": { - "Result": { - "$ref": "#/definitions/AllWatcherId" - } - } - } - }, - "definitions": { - "AllWatcherId": { + "ConfigValue": { "type": "object", "properties": { - "AllWatcherId": { + "source": { "type": "string" + }, + "value": { + "type": "object", + "additionalProperties": true } }, "additionalProperties": false, "required": [ - "AllWatcherId" + "value", + "source" ] }, - "DestroyControllerArgs": { + "Constraints": { "type": "object", "properties": { - "destroy-models": { - "type": "boolean" + "Count": { + "type": "integer" + }, + "Pool": { + "type": "string" + }, + "Size": { + "type": "integer" } }, "additionalProperties": false, "required": [ - "destroy-models" + "Pool", + "Size", + "Count" ] }, - "Entities": { + "DestroyMachines": { "type": "object", "properties": { - "Entities": { + "force": { + "type": "boolean" + }, + "machine-names": { "type": "array", "items": { - "$ref": "#/definitions/Entity" + "type": "string" } } }, "additionalProperties": false, "required": [ - "Entities" + "machine-names", + "force" ] }, - "Entity": { + "DetailedStatus": { "type": "object", "properties": { - "Tag": { + "data": { + "type": "object", + "patternProperties": { + ".*": { + "type": "object", + "additionalProperties": true + } + } + }, + "err": { + "type": "object", + "additionalProperties": true + }, + "info": { + "type": "string" + }, + "kind": { + "type": "string" + }, + "life": { + "type": "string" + }, + "since": { + "type": "string", + "format": "date-time" + }, + "status": { + "type": "string" + }, + "version": { "type": "string" } }, "additionalProperties": false, "required": [ - "Tag" + "status", + "info", + "data", + "since", + "kind", + "version", + "life" ] }, - "Error": { + "EndpointStatus": { "type": "object", "properties": { - "Code": { + "application": { "type": "string" }, - "Info": { - "$ref": "#/definitions/ErrorInfo" + "name": { + "type": "string" }, - "Message": { + "role": { "type": "string" + }, + "subordinate": { + "type": "boolean" } }, "additionalProperties": false, "required": [ - "Message", - "Code" + "application", + "name", + "role", + "subordinate" ] }, - "ErrorInfo": { - "type": "object", - "properties": { - "Macaroon": { - "$ref": "#/definitions/Macaroon" - }, - "MacaroonPath": { - "type": "string" - } - }, - "additionalProperties": false - }, - "InitiateModelMigrationArgs": { + "Entities": { "type": "object", "properties": { - "specs": { + "entities": { "type": "array", "items": { - "$ref": "#/definitions/ModelMigrationSpec" + "$ref": "#/definitions/Entity" } } }, "additionalProperties": false, "required": [ - "specs" + "entities" ] }, - "InitiateModelMigrationResult": { + "Entity": { "type": "object", "properties": { - "error": { - "$ref": "#/definitions/Error" - }, - "id": { - "type": "string" - }, - "model-tag": { + "tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "model-tag", - "error", - "id" + "tag" ] }, - "InitiateModelMigrationResults": { + "EntityStatus": { "type": "object", "properties": { - "results": { - "type": "array", - "items": { - "$ref": "#/definitions/InitiateModelMigrationResult" + "data": { + "type": "object", + "patternProperties": { + ".*": { + "type": "object", + "additionalProperties": true + } } + }, + "info": { + "type": "string" + }, + "since": { + "type": "string", + "format": "date-time" + }, + "status": { + "type": "string" } }, "additionalProperties": false, "required": [ - "results" + "status", + "info", + "since" ] }, - "Macaroon": { + "Error": { "type": "object", "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } - }, - "data": { - "type": "array", - "items": { - "type": "integer" - } - }, - "id": { - "$ref": "#/definitions/packet" + "code": { + "type": "string" }, - "location": { - "$ref": "#/definitions/packet" + "info": { + "$ref": "#/definitions/ErrorInfo" }, - "sig": { - "type": "array", - "items": { - "type": "integer" - } + "message": { + "type": "string" } }, "additionalProperties": false, "required": [ - "data", - "location", - "id", - "caveats", - "sig" + "message", + "code" ] }, - "Model": { + "ErrorInfo": { "type": "object", "properties": { - "Name": { - "type": "string" - }, - "OwnerTag": { - "type": "string" + "macaroon": { + "$ref": "#/definitions/Macaroon" }, - "UUID": { + "macaroon-path": { "type": "string" } }, - "additionalProperties": false, - "required": [ - "Name", - "UUID", - "OwnerTag" - ] + "additionalProperties": false }, - "ModelBlockInfo": { + "ErrorResult": { "type": "object", "properties": { - "blocks": { + "error": { + "$ref": "#/definitions/Error" + } + }, + "additionalProperties": false + }, + "ErrorResults": { + "type": "object", + "properties": { + "results": { "type": "array", "items": { - "type": "string" + "$ref": "#/definitions/ErrorResult" } - }, - "model-uuid": { + } + }, + "additionalProperties": false, + "required": [ + "results" + ] + }, + "FindToolsParams": { + "type": "object", + "properties": { + "arch": { "type": "string" }, - "name": { - "type": "string" + "major": { + "type": "integer" }, - "owner-tag": { + "minor": { + "type": "integer" + }, + "number": { + "$ref": "#/definitions/Number" + }, + "series": { "type": "string" } }, "additionalProperties": false, "required": [ - "name", - "model-uuid", - "owner-tag", - "blocks" + "number", + "major", + "minor", + "arch", + "series" ] }, - "ModelBlockInfoList": { + "FindToolsResult": { "type": "object", "properties": { - "models": { + "error": { + "$ref": "#/definitions/Error" + }, + "list": { "type": "array", "items": { - "$ref": "#/definitions/ModelBlockInfo" + "$ref": "#/definitions/Tools" } } }, - "additionalProperties": false + "additionalProperties": false, + "required": [ + "list" + ] }, - "ModelConfigResults": { + "FullStatus": { "type": "object", "properties": { - "Config": { + "applications": { "type": "object", "patternProperties": { ".*": { - "type": "object", - "additionalProperties": true + "$ref": "#/definitions/ApplicationStatus" + } + } + }, + "machines": { + "type": "object", + "patternProperties": { + ".*": { + "$ref": "#/definitions/MachineStatus" } } + }, + "model": { + "$ref": "#/definitions/ModelStatusInfo" + }, + "relations": { + "type": "array", + "items": { + "$ref": "#/definitions/RelationStatus" + } } }, "additionalProperties": false, "required": [ - "Config" + "model", + "machines", + "applications", + "relations" ] }, - "ModelMigrationSpec": { + "GetBundleChangesParams": { "type": "object", "properties": { - "model-tag": { + "yaml": { "type": "string" - }, - "target-info": { - "$ref": "#/definitions/ModelMigrationTargetInfo" } }, "additionalProperties": false, "required": [ - "model-tag", - "target-info" + "yaml" ] }, - "ModelMigrationTargetInfo": { + "GetBundleChangesResults": { "type": "object", "properties": { - "addrs": { + "changes": { "type": "array", "items": { - "type": "string" + "$ref": "#/definitions/BundleChangesChange" } }, - "auth-tag": { - "type": "string" - }, - "ca-cert": { - "type": "string" - }, - "controller-tag": { - "type": "string" - }, - "password": { - "type": "string" + "errors": { + "type": "array", + "items": { + "type": "string" + } } }, - "additionalProperties": false, - "required": [ - "controller-tag", - "addrs", - "ca-cert", - "auth-tag", - "password" - ] + "additionalProperties": false }, - "ModelStatus": { + "GetConstraintsResults": { "type": "object", "properties": { - "hosted-machine-count": { - "type": "integer" - }, - "life": { + "constraints": { + "$ref": "#/definitions/Value" + } + }, + "additionalProperties": false, + "required": [ + "constraints" + ] + }, + "HardwareCharacteristics": { + "type": "object", + "properties": { + "arch": { "type": "string" }, - "model-tag": { + "availability-zone": { "type": "string" }, - "owner-tag": { - "type": "string" + "cpu-cores": { + "type": "integer" + }, + "cpu-power": { + "type": "integer" + }, + "mem": { + "type": "integer" }, - "service-count": { + "root-disk": { "type": "integer" + }, + "tags": { + "type": "array", + "items": { + "type": "string" + } } }, - "additionalProperties": false, - "required": [ - "model-tag", - "life", - "hosted-machine-count", - "service-count", - "owner-tag" - ] + "additionalProperties": false }, - "ModelStatusResults": { + "History": { "type": "object", "properties": { - "models": { + "error": { + "$ref": "#/definitions/Error" + }, + "statuses": { "type": "array", "items": { - "$ref": "#/definitions/ModelStatus" + "$ref": "#/definitions/DetailedStatus" } } }, "additionalProperties": false, "required": [ - "models" + "statuses" ] }, - "RemoveBlocksArgs": { + "HostPort": { "type": "object", "properties": { - "all": { - "type": "boolean" + "Address": { + "$ref": "#/definitions/Address" + }, + "port": { + "type": "integer" } }, "additionalProperties": false, "required": [ - "all" + "Address", + "port" ] }, - "UserModel": { + "Macaroon": { + "type": "object", + "additionalProperties": false + }, + "MachineStatus": { "type": "object", "properties": { - "LastConnection": { - "type": "string", - "format": "date-time" + "agent-status": { + "$ref": "#/definitions/DetailedStatus" }, - "Model": { - "$ref": "#/definitions/Model" + "containers": { + "type": "object", + "patternProperties": { + ".*": { + "$ref": "#/definitions/MachineStatus" + } + } + }, + "dns-name": { + "type": "string" + }, + "hardware": { + "type": "string" + }, + "has-vote": { + "type": "boolean" + }, + "id": { + "type": "string" + }, + "instance-id": { + "type": "string" + }, + "instance-status": { + "$ref": "#/definitions/DetailedStatus" + }, + "jobs": { + "type": "array", + "items": { + "type": "string" + } + }, + "series": { + "type": "string" + }, + "wants-vote": { + "type": "boolean" } }, "additionalProperties": false, "required": [ - "Model", - "LastConnection" + "agent-status", + "instance-status", + "dns-name", + "instance-id", + "series", + "id", + "containers", + "hardware", + "jobs", + "has-vote", + "wants-vote" ] }, - "UserModelList": { + "MeterStatus": { "type": "object", "properties": { - "UserModels": { - "type": "array", - "items": { - "$ref": "#/definitions/UserModel" - } + "color": { + "type": "string" + }, + "message": { + "type": "string" } }, "additionalProperties": false, "required": [ - "UserModels" + "color", + "message" ] }, - "caveat": { + "ModelConfigResults": { "type": "object", "properties": { - "caveatId": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "verificationId": { - "$ref": "#/definitions/packet" + "config": { + "type": "object", + "patternProperties": { + ".*": { + "$ref": "#/definitions/ConfigValue" + } + } } }, "additionalProperties": false, "required": [ - "location", - "caveatId", - "verificationId" + "config" ] }, - "packet": { + "ModelInfo": { "type": "object", "properties": { - "headerLen": { - "type": "integer" + "cloud": { + "type": "string" }, - "start": { - "type": "integer" + "cloud-credential": { + "type": "string" }, - "totalLen": { - "type": "integer" + "cloud-region": { + "type": "string" + }, + "controller-uuid": { + "type": "string" + }, + "default-series": { + "type": "string" + }, + "life": { + "type": "string" + }, + "name": { + "type": "string" + }, + "owner-tag": { + "type": "string" + }, + "provider-type": { + "type": "string" + }, + "status": { + "$ref": "#/definitions/EntityStatus" + }, + "users": { + "type": "array", + "items": { + "$ref": "#/definitions/ModelUserInfo" + } + }, + "uuid": { + "type": "string" } }, "additionalProperties": false, "required": [ - "start", - "totalLen", - "headerLen" + "name", + "uuid", + "controller-uuid", + "provider-type", + "default-series", + "cloud", + "owner-tag", + "life", + "status", + "users" ] - } - } - } - }, - { - "Name": "Deployer", - "Version": 1, - "Schema": { - "type": "object", - "properties": { - "APIAddresses": { + }, + "ModelSet": { "type": "object", "properties": { - "Result": { - "$ref": "#/definitions/StringsResult" + "config": { + "type": "object", + "patternProperties": { + ".*": { + "type": "object", + "additionalProperties": true + } + } } - } + }, + "additionalProperties": false, + "required": [ + "config" + ] }, - "APIHostPorts": { + "ModelStatusInfo": { "type": "object", "properties": { - "Result": { - "$ref": "#/definitions/APIHostPortsResult" + "available-version": { + "type": "string" + }, + "cloud": { + "type": "string" + }, + "name": { + "type": "string" + }, + "region": { + "type": "string" + }, + "version": { + "type": "string" } - } + }, + "additionalProperties": false, + "required": [ + "name", + "cloud", + "version", + "available-version" + ] }, - "CACert": { + "ModelUnset": { "type": "object", "properties": { - "Result": { - "$ref": "#/definitions/BytesResult" + "keys": { + "type": "array", + "items": { + "type": "string" + } } - } + }, + "additionalProperties": false, + "required": [ + "keys" + ] }, - "ConnectionInfo": { + "ModelUserInfo": { "type": "object", "properties": { - "Result": { - "$ref": "#/definitions/DeployerConnectionValues" + "access": { + "type": "string" + }, + "display-name": { + "type": "string" + }, + "last-connection": { + "type": "string", + "format": "date-time" + }, + "user": { + "type": "string" } - } + }, + "additionalProperties": false, + "required": [ + "user", + "display-name", + "last-connection", + "access" + ] }, - "Life": { + "ModelUserInfoResult": { "type": "object", "properties": { - "Params": { - "$ref": "#/definitions/Entities" + "error": { + "$ref": "#/definitions/Error" }, - "Result": { - "$ref": "#/definitions/LifeResults" + "result": { + "$ref": "#/definitions/ModelUserInfo" } - } + }, + "additionalProperties": false }, - "ModelUUID": { + "ModelUserInfoResults": { "type": "object", "properties": { - "Result": { - "$ref": "#/definitions/StringResult" + "results": { + "type": "array", + "items": { + "$ref": "#/definitions/ModelUserInfoResult" + } } - } + }, + "additionalProperties": false, + "required": [ + "results" + ] }, - "Remove": { + "Number": { "type": "object", "properties": { - "Params": { - "$ref": "#/definitions/Entities" + "Build": { + "type": "integer" }, - "Result": { - "$ref": "#/definitions/ErrorResults" - } - } - }, - "SetPasswords": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/EntityPasswords" + "Major": { + "type": "integer" }, - "Result": { - "$ref": "#/definitions/ErrorResults" - } - } - }, - "StateAddresses": { - "type": "object", - "properties": { - "Result": { - "$ref": "#/definitions/StringsResult" - } - } - }, - "WatchAPIHostPorts": { - "type": "object", - "properties": { - "Result": { - "$ref": "#/definitions/NotifyWatchResult" - } - } - }, - "WatchUnits": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/Entities" + "Minor": { + "type": "integer" }, - "Result": { - "$ref": "#/definitions/StringsWatchResults" - } - } - } - }, - "definitions": { - "APIHostPortsResult": { - "type": "object", - "properties": { - "Servers": { - "type": "array", - "items": { - "type": "array", - "items": { - "$ref": "#/definitions/HostPort" - } - } + "Patch": { + "type": "integer" + }, + "Tag": { + "type": "string" } }, "additionalProperties": false, "required": [ - "Servers" + "Major", + "Minor", + "Tag", + "Patch", + "Build" ] }, - "Address": { + "Placement": { "type": "object", "properties": { - "Scope": { - "type": "string" - }, - "SpaceName": { - "type": "string" - }, - "Type": { + "directive": { "type": "string" }, - "Value": { + "scope": { "type": "string" } }, "additionalProperties": false, "required": [ - "Value", - "Type", - "Scope" + "scope", + "directive" ] }, - "BytesResult": { + "PrivateAddress": { "type": "object", "properties": { - "Result": { - "type": "array", - "items": { - "type": "integer" - } + "target": { + "type": "string" } }, "additionalProperties": false, "required": [ - "Result" + "target" ] }, - "DeployerConnectionValues": { + "PrivateAddressResults": { "type": "object", "properties": { - "APIAddresses": { - "type": "array", - "items": { - "type": "string" - } - }, - "StateAddresses": { - "type": "array", - "items": { - "type": "string" - } + "private-address": { + "type": "string" } }, "additionalProperties": false, "required": [ - "StateAddresses", - "APIAddresses" + "private-address" ] }, - "Entities": { + "ProvisioningScriptParams": { "type": "object", "properties": { - "Entities": { - "type": "array", - "items": { - "$ref": "#/definitions/Entity" - } + "data-dir": { + "type": "string" + }, + "disable-package-commands": { + "type": "boolean" + }, + "machine-id": { + "type": "string" + }, + "nonce": { + "type": "string" } }, "additionalProperties": false, "required": [ - "Entities" + "machine-id", + "nonce", + "data-dir", + "disable-package-commands" ] }, - "Entity": { + "ProvisioningScriptResult": { "type": "object", "properties": { - "Tag": { + "script": { "type": "string" } }, "additionalProperties": false, "required": [ - "Tag" + "script" ] }, - "EntityPassword": { + "PublicAddress": { "type": "object", "properties": { - "Password": { - "type": "string" - }, - "Tag": { + "target": { "type": "string" } }, "additionalProperties": false, "required": [ - "Tag", - "Password" + "target" ] }, - "EntityPasswords": { + "PublicAddressResults": { "type": "object", "properties": { - "Changes": { - "type": "array", - "items": { - "$ref": "#/definitions/EntityPassword" - } + "public-address": { + "type": "string" } }, "additionalProperties": false, "required": [ - "Changes" + "public-address" ] }, - "Error": { + "RelationStatus": { "type": "object", "properties": { - "Code": { + "endpoints": { + "type": "array", + "items": { + "$ref": "#/definitions/EndpointStatus" + } + }, + "id": { + "type": "integer" + }, + "interface": { "type": "string" }, - "Info": { - "$ref": "#/definitions/ErrorInfo" + "key": { + "type": "string" }, - "Message": { + "scope": { "type": "string" } }, "additionalProperties": false, "required": [ - "Message", - "Code" + "id", + "key", + "interface", + "scope", + "endpoints" ] }, - "ErrorInfo": { + "ResolveCharmResult": { "type": "object", "properties": { - "Macaroon": { - "$ref": "#/definitions/Macaroon" + "error": { + "type": "string" }, - "MacaroonPath": { + "url": { "type": "string" } }, "additionalProperties": false }, - "ErrorResult": { + "ResolveCharmResults": { "type": "object", "properties": { - "Error": { - "$ref": "#/definitions/Error" + "urls": { + "type": "array", + "items": { + "$ref": "#/definitions/ResolveCharmResult" + } } }, "additionalProperties": false, "required": [ - "Error" + "urls" ] }, - "ErrorResults": { + "ResolveCharms": { "type": "object", "properties": { - "Results": { + "references": { "type": "array", "items": { - "$ref": "#/definitions/ErrorResult" + "type": "string" } } }, "additionalProperties": false, "required": [ - "Results" + "references" ] }, - "HostPort": { + "Resolved": { "type": "object", "properties": { - "Address": { - "$ref": "#/definitions/Address" + "retry": { + "type": "boolean" }, - "Port": { - "type": "integer" + "unit-name": { + "type": "string" } }, "additionalProperties": false, "required": [ - "Address", - "Port" + "unit-name", + "retry" ] }, - "LifeResult": { + "SetConstraints": { "type": "object", "properties": { - "Error": { - "$ref": "#/definitions/Error" - }, - "Life": { + "application": { "type": "string" + }, + "constraints": { + "$ref": "#/definitions/Value" } }, "additionalProperties": false, "required": [ - "Life", - "Error" + "application", + "constraints" ] }, - "LifeResults": { + "SetModelAgentVersion": { "type": "object", "properties": { - "Results": { - "type": "array", - "items": { - "$ref": "#/definitions/LifeResult" - } + "version": { + "$ref": "#/definitions/Number" } }, "additionalProperties": false, "required": [ - "Results" + "version" ] }, - "Macaroon": { + "StatusHistoryFilter": { "type": "object", "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } - }, - "data": { - "type": "array", - "items": { - "type": "integer" - } - }, - "id": { - "$ref": "#/definitions/packet" + "date": { + "type": "string", + "format": "date-time" }, - "location": { - "$ref": "#/definitions/packet" + "delta": { + "type": "integer" }, - "sig": { - "type": "array", - "items": { - "type": "integer" - } + "size": { + "type": "integer" } }, "additionalProperties": false, "required": [ - "data", - "location", - "id", - "caveats", - "sig" + "size", + "date", + "delta" ] }, - "NotifyWatchResult": { + "StatusHistoryRequest": { "type": "object", "properties": { - "Error": { - "$ref": "#/definitions/Error" + "filter": { + "$ref": "#/definitions/StatusHistoryFilter" }, - "NotifyWatcherId": { + "historyKind": { + "type": "string" + }, + "size": { + "type": "integer" + }, + "tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "NotifyWatcherId", - "Error" + "historyKind", + "size", + "filter", + "tag" ] }, - "StringResult": { + "StatusHistoryRequests": { "type": "object", "properties": { - "Error": { - "$ref": "#/definitions/Error" - }, - "Result": { - "type": "string" + "requests": { + "type": "array", + "items": { + "$ref": "#/definitions/StatusHistoryRequest" + } } }, "additionalProperties": false, "required": [ - "Error", - "Result" + "requests" ] }, - "StringsResult": { + "StatusHistoryResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" }, - "Result": { - "type": "array", - "items": { - "type": "string" - } + "history": { + "$ref": "#/definitions/History" } }, "additionalProperties": false, "required": [ - "Error", - "Result" + "history" ] }, - "StringsWatchResult": { + "StatusHistoryResults": { "type": "object", "properties": { - "Changes": { + "results": { "type": "array", "items": { - "type": "string" + "$ref": "#/definitions/StatusHistoryResult" } - }, - "Error": { - "$ref": "#/definitions/Error" - }, - "StringsWatcherId": { - "type": "string" } }, "additionalProperties": false, "required": [ - "StringsWatcherId", - "Changes", - "Error" + "results" ] }, - "StringsWatchResults": { + "StatusParams": { "type": "object", "properties": { - "Results": { + "patterns": { "type": "array", "items": { - "$ref": "#/definitions/StringsWatchResult" + "type": "string" } } }, "additionalProperties": false, "required": [ - "Results" + "patterns" ] }, - "caveat": { + "Tools": { "type": "object", "properties": { - "caveatId": { - "$ref": "#/definitions/packet" + "sha256": { + "type": "string" }, - "location": { - "$ref": "#/definitions/packet" + "size": { + "type": "integer" + }, + "url": { + "type": "string" }, - "verificationId": { - "$ref": "#/definitions/packet" + "version": { + "$ref": "#/definitions/Binary" } }, "additionalProperties": false, "required": [ - "location", - "caveatId", - "verificationId" + "version", + "url", + "size" ] }, - "packet": { + "UnitStatus": { "type": "object", "properties": { - "headerLen": { - "type": "integer" + "agent-status": { + "$ref": "#/definitions/DetailedStatus" }, - "start": { - "type": "integer" + "charm": { + "type": "string" }, - "totalLen": { - "type": "integer" + "machine": { + "type": "string" + }, + "opened-ports": { + "type": "array", + "items": { + "type": "string" + } + }, + "public-address": { + "type": "string" + }, + "subordinates": { + "type": "object", + "patternProperties": { + ".*": { + "$ref": "#/definitions/UnitStatus" + } + } + }, + "workload-status": { + "$ref": "#/definitions/DetailedStatus" + }, + "workload-version": { + "type": "string" } }, "additionalProperties": false, "required": [ - "start", - "totalLen", - "headerLen" + "agent-status", + "workload-status", + "workload-version", + "machine", + "opened-ports", + "public-address", + "charm", + "subordinates" ] + }, + "Value": { + "type": "object", + "properties": { + "arch": { + "type": "string" + }, + "container": { + "type": "string" + }, + "cpu-cores": { + "type": "integer" + }, + "cpu-power": { + "type": "integer" + }, + "instance-type": { + "type": "string" + }, + "mem": { + "type": "integer" + }, + "root-disk": { + "type": "integer" + }, + "spaces": { + "type": "array", + "items": { + "type": "string" + } + }, + "tags": { + "type": "array", + "items": { + "type": "string" + } + }, + "virt-type": { + "type": "string" + } + }, + "additionalProperties": false } } } }, { - "Name": "DiscoverSpaces", - "Version": 2, + "Name": "Cloud", + "Version": 1, "Schema": { "type": "object", "properties": { - "AddSubnets": { + "Cloud": { "type": "object", "properties": { "Params": { - "$ref": "#/definitions/AddSubnetsParams" + "$ref": "#/definitions/Entities" }, "Result": { - "$ref": "#/definitions/ErrorResults" + "$ref": "#/definitions/CloudResults" } } }, - "CreateSpaces": { + "CloudDefaults": { "type": "object", "properties": { "Params": { - "$ref": "#/definitions/CreateSpacesParams" + "$ref": "#/definitions/Entities" }, "Result": { - "$ref": "#/definitions/ErrorResults" - } - } - }, - "ListSpaces": { - "type": "object", - "properties": { - "Result": { - "$ref": "#/definitions/DiscoverSpacesResults" + "$ref": "#/definitions/CloudDefaultsResults" } } }, - "ListSubnets": { + "Credentials": { "type": "object", "properties": { "Params": { - "$ref": "#/definitions/SubnetsFilters" + "$ref": "#/definitions/UserClouds" }, "Result": { - "$ref": "#/definitions/ListSubnetsResults" + "$ref": "#/definitions/CloudCredentialsResults" } } }, - "ModelConfig": { + "UpdateCredentials": { "type": "object", "properties": { + "Params": { + "$ref": "#/definitions/UsersCloudCredentials" + }, "Result": { - "$ref": "#/definitions/ModelConfigResult" + "$ref": "#/definitions/ErrorResults" } } } }, "definitions": { - "AddSubnetParams": { + "Cloud": { "type": "object", "properties": { - "SpaceTag": { - "type": "string" - }, - "SubnetProviderId": { - "type": "string" + "auth-types": { + "type": "array", + "items": { + "type": "string" + } }, - "SubnetTag": { + "endpoint": { "type": "string" }, - "Zones": { + "regions": { "type": "array", "items": { - "type": "string" + "$ref": "#/definitions/CloudRegion" } + }, + "type": { + "type": "string" } }, "additionalProperties": false, "required": [ - "SpaceTag" + "type" ] }, - "AddSubnetsParams": { + "CloudCredential": { "type": "object", "properties": { - "Subnets": { - "type": "array", - "items": { - "$ref": "#/definitions/AddSubnetParams" + "attrs": { + "type": "object", + "patternProperties": { + ".*": { + "type": "string" + } } + }, + "auth-type": { + "type": "string" } }, "additionalProperties": false, "required": [ - "Subnets" + "auth-type" ] }, - "CreateSpaceParams": { + "CloudCredentialsResult": { + "type": "object", + "properties": { + "credentials": { + "type": "object", + "patternProperties": { + ".*": { + "$ref": "#/definitions/CloudCredential" + } + } + }, + "error": { + "$ref": "#/definitions/Error" + } + }, + "additionalProperties": false + }, + "CloudCredentialsResults": { + "type": "object", + "properties": { + "results": { + "type": "array", + "items": { + "$ref": "#/definitions/CloudCredentialsResult" + } + } + }, + "additionalProperties": false + }, + "CloudDefaults": { "type": "object", "properties": { - "ProviderId": { + "cloud-tag": { "type": "string" }, - "Public": { - "type": "boolean" + "credential": { + "type": "string" }, - "SpaceTag": { + "region": { "type": "string" + } + }, + "additionalProperties": false, + "required": [ + "cloud-tag" + ] + }, + "CloudDefaultsResult": { + "type": "object", + "properties": { + "error": { + "$ref": "#/definitions/Error" }, - "SubnetTags": { - "type": "array", - "items": { - "type": "string" - } + "result": { + "$ref": "#/definitions/CloudDefaults" } }, "additionalProperties": false, "required": [ - "SubnetTags", - "SpaceTag", - "Public" + "error" ] }, - "CreateSpacesParams": { + "CloudDefaultsResults": { "type": "object", "properties": { - "Spaces": { + "results": { "type": "array", "items": { - "$ref": "#/definitions/CreateSpaceParams" + "$ref": "#/definitions/CloudDefaultsResult" } } }, + "additionalProperties": false + }, + "CloudRegion": { + "type": "object", + "properties": { + "endpoint": { + "type": "string" + }, + "name": { + "type": "string" + } + }, "additionalProperties": false, "required": [ - "Spaces" + "name" ] }, - "DiscoverSpacesResults": { + "CloudResult": { + "type": "object", + "properties": { + "cloud": { + "$ref": "#/definitions/Cloud" + }, + "error": { + "$ref": "#/definitions/Error" + } + }, + "additionalProperties": false + }, + "CloudResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { - "$ref": "#/definitions/ProviderSpace" + "$ref": "#/definitions/CloudResult" + } + } + }, + "additionalProperties": false + }, + "Entities": { + "type": "object", + "properties": { + "entities": { + "type": "array", + "items": { + "$ref": "#/definitions/Entity" } } }, "additionalProperties": false, "required": [ - "Results" + "entities" + ] + }, + "Entity": { + "type": "object", + "properties": { + "tag": { + "type": "string" + } + }, + "additionalProperties": false, + "required": [ + "tag" ] }, "Error": { "type": "object", "properties": { - "Code": { + "code": { "type": "string" }, - "Info": { + "info": { "$ref": "#/definitions/ErrorInfo" }, - "Message": { + "message": { "type": "string" } }, "additionalProperties": false, "required": [ - "Message", - "Code" + "message", + "code" ] }, "ErrorInfo": { "type": "object", "properties": { - "Macaroon": { + "macaroon": { "$ref": "#/definitions/Macaroon" }, - "MacaroonPath": { + "macaroon-path": { "type": "string" } }, @@ -5323,19 +5126,16 @@ "ErrorResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" } }, - "additionalProperties": false, - "required": [ - "Error" - ] + "additionalProperties": false }, "ErrorResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/ErrorResult" @@ -5344,830 +5144,588 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, - "ListSubnetsResults": { + "Macaroon": { + "type": "object", + "additionalProperties": false + }, + "UserCloud": { "type": "object", "properties": { - "Results": { - "type": "array", - "items": { - "$ref": "#/definitions/Subnet" - } - } - }, - "additionalProperties": false, - "required": [ - "Results" - ] - }, - "Macaroon": { - "type": "object", - "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } - }, - "data": { - "type": "array", - "items": { - "type": "integer" - } - }, - "id": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" + "cloud-tag": { + "type": "string" }, - "sig": { - "type": "array", - "items": { - "type": "integer" - } + "user-tag": { + "type": "string" } }, "additionalProperties": false, "required": [ - "data", - "location", - "id", - "caveats", - "sig" + "user-tag", + "cloud-tag" ] }, - "ModelConfigResult": { + "UserCloudCredentials": { "type": "object", "properties": { - "Config": { + "cloud-tag": { + "type": "string" + }, + "credentials": { "type": "object", "patternProperties": { ".*": { - "type": "object", - "additionalProperties": true + "$ref": "#/definitions/CloudCredential" } } + }, + "user-tag": { + "type": "string" } }, "additionalProperties": false, "required": [ - "Config" + "user-tag", + "cloud-tag", + "credentials" ] }, - "ProviderSpace": { + "UserClouds": { "type": "object", "properties": { - "Error": { - "$ref": "#/definitions/Error" - }, - "Name": { - "type": "string" - }, - "ProviderId": { - "type": "string" - }, - "Subnets": { + "user-clouds": { "type": "array", "items": { - "$ref": "#/definitions/Subnet" + "$ref": "#/definitions/UserCloud" } } }, - "additionalProperties": false, - "required": [ - "Name", - "ProviderId", - "Subnets" - ] + "additionalProperties": false }, - "Subnet": { + "UsersCloudCredentials": { "type": "object", "properties": { - "CIDR": { - "type": "string" - }, - "Life": { - "type": "string" - }, - "ProviderId": { - "type": "string" - }, - "SpaceTag": { - "type": "string" - }, - "StaticRangeHighIP": { - "type": "array", - "items": { - "type": "integer" - } - }, - "StaticRangeLowIP": { - "type": "array", - "items": { - "type": "integer" - } - }, - "Status": { - "type": "string" - }, - "VLANTag": { - "type": "integer" - }, - "Zones": { + "users": { "type": "array", "items": { - "type": "string" + "$ref": "#/definitions/UserCloudCredentials" } } }, "additionalProperties": false, "required": [ - "CIDR", - "VLANTag", - "Life", - "SpaceTag", - "Zones" + "users" ] + } + } + } + }, + { + "Name": "Controller", + "Version": 3, + "Schema": { + "type": "object", + "properties": { + "AllModels": { + "type": "object", + "properties": { + "Result": { + "$ref": "#/definitions/UserModelList" + } + } }, - "SubnetsFilters": { + "ControllerConfig": { "type": "object", "properties": { - "SpaceTag": { - "type": "string" - }, - "Zone": { - "type": "string" + "Result": { + "$ref": "#/definitions/ControllerConfigResult" } - }, - "additionalProperties": false + } }, - "caveat": { + "DestroyController": { "type": "object", "properties": { - "caveatId": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "verificationId": { - "$ref": "#/definitions/packet" + "Params": { + "$ref": "#/definitions/DestroyControllerArgs" } - }, - "additionalProperties": false, - "required": [ - "location", - "caveatId", - "verificationId" - ] + } }, - "packet": { + "InitiateModelMigration": { "type": "object", "properties": { - "headerLen": { - "type": "integer" - }, - "start": { - "type": "integer" + "Params": { + "$ref": "#/definitions/InitiateModelMigrationArgs" }, - "totalLen": { - "type": "integer" + "Result": { + "$ref": "#/definitions/InitiateModelMigrationResults" } - }, - "additionalProperties": false, - "required": [ - "start", - "totalLen", - "headerLen" - ] - } - } - } - }, - { - "Name": "DiskManager", - "Version": 2, - "Schema": { - "type": "object", - "properties": { - "SetMachineBlockDevices": { + } + }, + "ListBlockedModels": { + "type": "object", + "properties": { + "Result": { + "$ref": "#/definitions/ModelBlockInfoList" + } + } + }, + "ModelConfig": { + "type": "object", + "properties": { + "Result": { + "$ref": "#/definitions/ModelConfigResults" + } + } + }, + "ModelStatus": { "type": "object", "properties": { "Params": { - "$ref": "#/definitions/SetMachineBlockDevices" + "$ref": "#/definitions/Entities" }, "Result": { - "$ref": "#/definitions/ErrorResults" + "$ref": "#/definitions/ModelStatusResults" + } + } + }, + "RemoveBlocks": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/RemoveBlocksArgs" + } + } + }, + "WatchAllModels": { + "type": "object", + "properties": { + "Result": { + "$ref": "#/definitions/AllWatcherId" } } } }, "definitions": { - "BlockDevice": { + "AllWatcherId": { "type": "object", "properties": { - "BusAddress": { - "type": "string" - }, - "DeviceLinks": { - "type": "array", - "items": { - "type": "string" - } - }, - "DeviceName": { - "type": "string" - }, - "FilesystemType": { - "type": "string" - }, - "HardwareId": { - "type": "string" - }, - "InUse": { - "type": "boolean" - }, - "Label": { - "type": "string" - }, - "MountPoint": { - "type": "string" - }, - "Size": { - "type": "integer" - }, - "UUID": { + "watcher-id": { "type": "string" } }, "additionalProperties": false, "required": [ - "DeviceName", - "DeviceLinks", - "Label", - "UUID", - "HardwareId", - "BusAddress", - "Size", - "FilesystemType", - "InUse", - "MountPoint" + "watcher-id" ] }, - "Error": { + "ConfigValue": { "type": "object", "properties": { - "Code": { + "source": { "type": "string" }, - "Info": { - "$ref": "#/definitions/ErrorInfo" - }, - "Message": { - "type": "string" + "value": { + "type": "object", + "additionalProperties": true } }, "additionalProperties": false, "required": [ - "Message", - "Code" + "value", + "source" ] }, - "ErrorInfo": { + "ControllerConfigResult": { "type": "object", "properties": { - "Macaroon": { - "$ref": "#/definitions/Macaroon" - }, - "MacaroonPath": { - "type": "string" + "config": { + "type": "object", + "patternProperties": { + ".*": { + "type": "object", + "additionalProperties": true + } + } } }, - "additionalProperties": false + "additionalProperties": false, + "required": [ + "config" + ] }, - "ErrorResult": { + "DestroyControllerArgs": { "type": "object", "properties": { - "Error": { - "$ref": "#/definitions/Error" + "destroy-models": { + "type": "boolean" } }, "additionalProperties": false, "required": [ - "Error" + "destroy-models" ] }, - "ErrorResults": { + "Entities": { "type": "object", "properties": { - "Results": { + "entities": { "type": "array", "items": { - "$ref": "#/definitions/ErrorResult" + "$ref": "#/definitions/Entity" } } }, "additionalProperties": false, "required": [ - "Results" + "entities" ] }, - "Macaroon": { + "Entity": { "type": "object", "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } - }, - "data": { - "type": "array", - "items": { - "type": "integer" - } - }, - "id": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "sig": { - "type": "array", - "items": { - "type": "integer" - } + "tag": { + "type": "string" } }, "additionalProperties": false, "required": [ - "data", - "location", - "id", - "caveats", - "sig" + "tag" ] }, - "MachineBlockDevices": { + "Error": { "type": "object", "properties": { - "blockdevices": { - "type": "array", - "items": { - "$ref": "#/definitions/BlockDevice" - } + "code": { + "type": "string" }, - "machine": { + "info": { + "$ref": "#/definitions/ErrorInfo" + }, + "message": { "type": "string" } }, "additionalProperties": false, "required": [ - "machine" + "message", + "code" ] }, - "SetMachineBlockDevices": { + "ErrorInfo": { + "type": "object", + "properties": { + "macaroon": { + "$ref": "#/definitions/Macaroon" + }, + "macaroon-path": { + "type": "string" + } + }, + "additionalProperties": false + }, + "InitiateModelMigrationArgs": { "type": "object", "properties": { - "machineblockdevices": { + "specs": { "type": "array", "items": { - "$ref": "#/definitions/MachineBlockDevices" + "$ref": "#/definitions/ModelMigrationSpec" } } }, "additionalProperties": false, "required": [ - "machineblockdevices" + "specs" ] }, - "caveat": { + "InitiateModelMigrationResult": { "type": "object", "properties": { - "caveatId": { - "$ref": "#/definitions/packet" + "error": { + "$ref": "#/definitions/Error" }, - "location": { - "$ref": "#/definitions/packet" + "id": { + "type": "string" }, - "verificationId": { - "$ref": "#/definitions/packet" + "model-tag": { + "type": "string" } }, "additionalProperties": false, "required": [ - "location", - "caveatId", - "verificationId" + "model-tag", + "id" ] }, - "packet": { + "InitiateModelMigrationResults": { "type": "object", "properties": { - "headerLen": { - "type": "integer" - }, - "start": { - "type": "integer" - }, - "totalLen": { - "type": "integer" + "results": { + "type": "array", + "items": { + "$ref": "#/definitions/InitiateModelMigrationResult" + } } }, "additionalProperties": false, "required": [ - "start", - "totalLen", - "headerLen" + "results" ] - } - } - } - }, - { - "Name": "EntityWatcher", - "Version": 2, - "Schema": { - "type": "object", - "properties": { - "Next": { + }, + "Macaroon": { "type": "object", - "properties": { - "Result": { - "$ref": "#/definitions/EntitiesWatchResult" - } - } + "additionalProperties": false }, - "Stop": { - "type": "object" - } - }, - "definitions": { - "EntitiesWatchResult": { + "Model": { "type": "object", "properties": { - "Changes": { - "type": "array", - "items": { - "type": "string" - } + "name": { + "type": "string" }, - "EntityWatcherId": { + "owner-tag": { "type": "string" }, - "Error": { - "$ref": "#/definitions/Error" + "uuid": { + "type": "string" } }, "additionalProperties": false, "required": [ - "EntityWatcherId", - "Changes", - "Error" + "name", + "uuid", + "owner-tag" ] }, - "Error": { + "ModelBlockInfo": { "type": "object", "properties": { - "Code": { + "blocks": { + "type": "array", + "items": { + "type": "string" + } + }, + "model-uuid": { "type": "string" }, - "Info": { - "$ref": "#/definitions/ErrorInfo" + "name": { + "type": "string" }, - "Message": { + "owner-tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "Message", - "Code" + "name", + "model-uuid", + "owner-tag", + "blocks" ] }, - "ErrorInfo": { + "ModelBlockInfoList": { "type": "object", "properties": { - "Macaroon": { - "$ref": "#/definitions/Macaroon" - }, - "MacaroonPath": { - "type": "string" + "models": { + "type": "array", + "items": { + "$ref": "#/definitions/ModelBlockInfo" + } } }, "additionalProperties": false }, - "Macaroon": { + "ModelConfigResults": { "type": "object", "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } - }, - "data": { - "type": "array", - "items": { - "type": "integer" - } - }, - "id": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "sig": { - "type": "array", - "items": { - "type": "integer" + "config": { + "type": "object", + "patternProperties": { + ".*": { + "$ref": "#/definitions/ConfigValue" + } } } }, "additionalProperties": false, "required": [ - "data", - "location", - "id", - "caveats", - "sig" + "config" ] }, - "caveat": { + "ModelMigrationSpec": { "type": "object", "properties": { - "caveatId": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" + "model-tag": { + "type": "string" }, - "verificationId": { - "$ref": "#/definitions/packet" + "target-info": { + "$ref": "#/definitions/ModelMigrationTargetInfo" } }, "additionalProperties": false, "required": [ - "location", - "caveatId", - "verificationId" + "model-tag", + "target-info" ] }, - "packet": { + "ModelMigrationTargetInfo": { "type": "object", "properties": { - "headerLen": { - "type": "integer" + "addrs": { + "type": "array", + "items": { + "type": "string" + } }, - "start": { - "type": "integer" + "auth-tag": { + "type": "string" }, - "totalLen": { - "type": "integer" + "ca-cert": { + "type": "string" + }, + "controller-tag": { + "type": "string" + }, + "password": { + "type": "string" } }, "additionalProperties": false, "required": [ - "start", - "totalLen", - "headerLen" + "controller-tag", + "addrs", + "ca-cert", + "auth-tag", + "password" ] - } - } - } - }, - { - "Name": "FilesystemAttachmentsWatcher", - "Version": 2, - "Schema": { - "type": "object", - "properties": { - "Next": { - "type": "object", - "properties": { - "Result": { - "$ref": "#/definitions/MachineStorageIdsWatchResult" - } - } }, - "Stop": { - "type": "object" - } - }, - "definitions": { - "Error": { + "ModelStatus": { "type": "object", "properties": { - "Code": { + "application-count": { + "type": "integer" + }, + "hosted-machine-count": { + "type": "integer" + }, + "life": { "type": "string" }, - "Info": { - "$ref": "#/definitions/ErrorInfo" + "model-tag": { + "type": "string" }, - "Message": { + "owner-tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "Message", - "Code" + "model-tag", + "life", + "hosted-machine-count", + "application-count", + "owner-tag" ] }, - "ErrorInfo": { + "ModelStatusResults": { "type": "object", "properties": { - "Macaroon": { - "$ref": "#/definitions/Macaroon" - }, - "MacaroonPath": { - "type": "string" - } - }, - "additionalProperties": false - }, - "Macaroon": { - "type": "object", - "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } - }, - "data": { - "type": "array", - "items": { - "type": "integer" - } - }, - "id": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "sig": { - "type": "array", - "items": { - "type": "integer" - } - } - }, - "additionalProperties": false, - "required": [ - "data", - "location", - "id", - "caveats", - "sig" - ] - }, - "MachineStorageId": { - "type": "object", - "properties": { - "attachmenttag": { - "type": "string" - }, - "machinetag": { - "type": "string" + "models": { + "type": "array", + "items": { + "$ref": "#/definitions/ModelStatus" + } } }, "additionalProperties": false, "required": [ - "machinetag", - "attachmenttag" + "models" ] }, - "MachineStorageIdsWatchResult": { + "RemoveBlocksArgs": { "type": "object", "properties": { - "Changes": { - "type": "array", - "items": { - "$ref": "#/definitions/MachineStorageId" - } - }, - "Error": { - "$ref": "#/definitions/Error" - }, - "MachineStorageIdsWatcherId": { - "type": "string" + "all": { + "type": "boolean" } }, "additionalProperties": false, "required": [ - "MachineStorageIdsWatcherId", - "Changes", - "Error" + "all" ] }, - "caveat": { + "UserModel": { "type": "object", "properties": { - "caveatId": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" + "last-connection": { + "type": "string", + "format": "date-time" }, - "verificationId": { - "$ref": "#/definitions/packet" + "model": { + "$ref": "#/definitions/Model" } }, "additionalProperties": false, "required": [ - "location", - "caveatId", - "verificationId" + "model", + "last-connection" ] }, - "packet": { + "UserModelList": { "type": "object", "properties": { - "headerLen": { - "type": "integer" - }, - "start": { - "type": "integer" - }, - "totalLen": { - "type": "integer" + "user-models": { + "type": "array", + "items": { + "$ref": "#/definitions/UserModel" + } } }, "additionalProperties": false, "required": [ - "start", - "totalLen", - "headerLen" + "user-models" ] } } } }, { - "Name": "Firewaller", - "Version": 2, + "Name": "Deployer", + "Version": 1, "Schema": { "type": "object", "properties": { - "GetAssignedMachine": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/Entities" - }, - "Result": { - "$ref": "#/definitions/StringResults" - } - } - }, - "GetExposed": { + "APIAddresses": { "type": "object", "properties": { - "Params": { - "$ref": "#/definitions/Entities" - }, "Result": { - "$ref": "#/definitions/BoolResults" + "$ref": "#/definitions/StringsResult" } } }, - "GetMachineActiveSubnets": { + "APIHostPorts": { "type": "object", "properties": { - "Params": { - "$ref": "#/definitions/Entities" - }, "Result": { - "$ref": "#/definitions/StringsResults" + "$ref": "#/definitions/APIHostPortsResult" } } }, - "GetMachinePorts": { + "CACert": { "type": "object", "properties": { - "Params": { - "$ref": "#/definitions/MachinePortsParams" - }, "Result": { - "$ref": "#/definitions/MachinePortsResults" + "$ref": "#/definitions/BytesResult" } } }, - "InstanceId": { + "ConnectionInfo": { "type": "object", "properties": { - "Params": { - "$ref": "#/definitions/Entities" - }, "Result": { - "$ref": "#/definitions/StringResults" + "$ref": "#/definitions/DeployerConnectionValues" } } }, @@ -6182,49 +5740,49 @@ } } }, - "ModelConfig": { + "ModelUUID": { "type": "object", "properties": { "Result": { - "$ref": "#/definitions/ModelConfigResult" + "$ref": "#/definitions/StringResult" } } }, - "Watch": { + "Remove": { "type": "object", "properties": { "Params": { "$ref": "#/definitions/Entities" }, "Result": { - "$ref": "#/definitions/NotifyWatchResults" + "$ref": "#/definitions/ErrorResults" } } }, - "WatchForModelConfigChanges": { + "SetPasswords": { "type": "object", "properties": { + "Params": { + "$ref": "#/definitions/EntityPasswords" + }, "Result": { - "$ref": "#/definitions/NotifyWatchResult" + "$ref": "#/definitions/ErrorResults" } } }, - "WatchModelMachines": { + "StateAddresses": { "type": "object", "properties": { "Result": { - "$ref": "#/definitions/StringsWatchResult" + "$ref": "#/definitions/StringsResult" } } }, - "WatchOpenedPorts": { + "WatchAPIHostPorts": { "type": "object", "properties": { - "Params": { - "$ref": "#/definitions/Entities" - }, "Result": { - "$ref": "#/definitions/StringsWatchResults" + "$ref": "#/definitions/NotifyWatchResult" } } }, @@ -6241,41 +5799,88 @@ } }, "definitions": { - "BoolResult": { + "APIHostPortsResult": { "type": "object", "properties": { - "Error": { - "$ref": "#/definitions/Error" + "servers": { + "type": "array", + "items": { + "type": "array", + "items": { + "$ref": "#/definitions/HostPort" + } + } + } + }, + "additionalProperties": false, + "required": [ + "servers" + ] + }, + "Address": { + "type": "object", + "properties": { + "scope": { + "type": "string" }, - "Result": { - "type": "boolean" + "space-name": { + "type": "string" + }, + "type": { + "type": "string" + }, + "value": { + "type": "string" } }, "additionalProperties": false, "required": [ - "Error", - "Result" + "value", + "type", + "scope" ] }, - "BoolResults": { + "BytesResult": { "type": "object", "properties": { - "Results": { + "result": { "type": "array", "items": { - "$ref": "#/definitions/BoolResult" + "type": "integer" + } + } + }, + "additionalProperties": false, + "required": [ + "result" + ] + }, + "DeployerConnectionValues": { + "type": "object", + "properties": { + "api-addresses": { + "type": "array", + "items": { + "type": "string" + } + }, + "state-addresses": { + "type": "array", + "items": { + "type": "string" } } }, "additionalProperties": false, "required": [ - "Results" + "state-addresses", + "api-addresses" ] }, "Entities": { "type": "object", "properties": { - "Entities": { + "entities": { "type": "array", "items": { "$ref": "#/definitions/Entity" @@ -6284,312 +5889,311 @@ }, "additionalProperties": false, "required": [ - "Entities" + "entities" ] }, "Entity": { "type": "object", "properties": { - "Tag": { + "tag": { + "type": "string" + } + }, + "additionalProperties": false, + "required": [ + "tag" + ] + }, + "EntityPassword": { + "type": "object", + "properties": { + "password": { + "type": "string" + }, + "tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "Tag" + "tag", + "password" + ] + }, + "EntityPasswords": { + "type": "object", + "properties": { + "changes": { + "type": "array", + "items": { + "$ref": "#/definitions/EntityPassword" + } + } + }, + "additionalProperties": false, + "required": [ + "changes" ] }, "Error": { "type": "object", "properties": { - "Code": { + "code": { "type": "string" }, - "Info": { + "info": { "$ref": "#/definitions/ErrorInfo" }, - "Message": { + "message": { "type": "string" } }, "additionalProperties": false, "required": [ - "Message", - "Code" + "message", + "code" ] }, "ErrorInfo": { "type": "object", "properties": { - "Macaroon": { + "macaroon": { "$ref": "#/definitions/Macaroon" }, - "MacaroonPath": { + "macaroon-path": { "type": "string" } }, "additionalProperties": false }, - "LifeResult": { + "ErrorResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" - }, - "Life": { - "type": "string" } }, - "additionalProperties": false, - "required": [ - "Life", - "Error" - ] + "additionalProperties": false }, - "LifeResults": { + "ErrorResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { - "$ref": "#/definitions/LifeResult" + "$ref": "#/definitions/ErrorResult" } } }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, - "Macaroon": { + "HostPort": { "type": "object", "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } + "Address": { + "$ref": "#/definitions/Address" }, - "data": { - "type": "array", - "items": { - "type": "integer" - } - }, - "id": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "sig": { - "type": "array", - "items": { - "type": "integer" - } + "port": { + "type": "integer" } }, "additionalProperties": false, "required": [ - "data", - "location", - "id", - "caveats", - "sig" + "Address", + "port" ] }, - "MachinePortRange": { + "LifeResult": { "type": "object", "properties": { - "PortRange": { - "$ref": "#/definitions/PortRange" - }, - "RelationTag": { - "type": "string" + "error": { + "$ref": "#/definitions/Error" }, - "UnitTag": { + "life": { "type": "string" } }, "additionalProperties": false, "required": [ - "UnitTag", - "RelationTag", - "PortRange" + "life" ] }, - "MachinePorts": { + "LifeResults": { "type": "object", "properties": { - "MachineTag": { - "type": "string" - }, - "SubnetTag": { - "type": "string" + "results": { + "type": "array", + "items": { + "$ref": "#/definitions/LifeResult" + } } }, "additionalProperties": false, "required": [ - "MachineTag", - "SubnetTag" + "results" ] }, - "MachinePortsParams": { + "Macaroon": { + "type": "object", + "additionalProperties": false + }, + "NotifyWatchResult": { "type": "object", "properties": { - "Params": { - "type": "array", - "items": { - "$ref": "#/definitions/MachinePorts" - } + "NotifyWatcherId": { + "type": "string" + }, + "error": { + "$ref": "#/definitions/Error" } }, "additionalProperties": false, "required": [ - "Params" + "NotifyWatcherId" ] }, - "MachinePortsResult": { + "StringResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" }, - "Ports": { - "type": "array", - "items": { - "$ref": "#/definitions/MachinePortRange" - } + "result": { + "type": "string" } }, "additionalProperties": false, "required": [ - "Error", - "Ports" + "result" ] }, - "MachinePortsResults": { + "StringsResult": { "type": "object", "properties": { - "Results": { + "error": { + "$ref": "#/definitions/Error" + }, + "result": { "type": "array", "items": { - "$ref": "#/definitions/MachinePortsResult" + "type": "string" } } }, - "additionalProperties": false, - "required": [ - "Results" - ] + "additionalProperties": false }, - "ModelConfigResult": { + "StringsWatchResult": { "type": "object", "properties": { - "Config": { - "type": "object", - "patternProperties": { - ".*": { - "type": "object", - "additionalProperties": true - } + "changes": { + "type": "array", + "items": { + "type": "string" } - } - }, - "additionalProperties": false, - "required": [ - "Config" - ] - }, - "NotifyWatchResult": { - "type": "object", - "properties": { - "Error": { + }, + "error": { "$ref": "#/definitions/Error" }, - "NotifyWatcherId": { + "watcher-id": { "type": "string" } }, "additionalProperties": false, "required": [ - "NotifyWatcherId", - "Error" + "watcher-id" ] }, - "NotifyWatchResults": { + "StringsWatchResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { - "$ref": "#/definitions/NotifyWatchResult" + "$ref": "#/definitions/StringsWatchResult" } } }, "additionalProperties": false, "required": [ - "Results" + "results" ] - }, - "PortRange": { + } + } + } + }, + { + "Name": "DiscoverSpaces", + "Version": 2, + "Schema": { + "type": "object", + "properties": { + "AddSubnets": { "type": "object", "properties": { - "FromPort": { - "type": "integer" - }, - "Protocol": { - "type": "string" + "Params": { + "$ref": "#/definitions/AddSubnetsParams" }, - "ToPort": { - "type": "integer" + "Result": { + "$ref": "#/definitions/ErrorResults" } - }, - "additionalProperties": false, - "required": [ - "FromPort", - "ToPort", - "Protocol" - ] + } }, - "StringResult": { + "CreateSpaces": { "type": "object", "properties": { - "Error": { - "$ref": "#/definitions/Error" + "Params": { + "$ref": "#/definitions/CreateSpacesParams" }, "Result": { - "type": "string" + "$ref": "#/definitions/ErrorResults" } - }, - "additionalProperties": false, - "required": [ - "Error", - "Result" - ] + } }, - "StringResults": { + "ListSpaces": { "type": "object", "properties": { - "Results": { - "type": "array", - "items": { - "$ref": "#/definitions/StringResult" - } + "Result": { + "$ref": "#/definitions/DiscoverSpacesResults" } - }, - "additionalProperties": false, - "required": [ - "Results" - ] + } }, - "StringsResult": { + "ListSubnets": { "type": "object", "properties": { - "Error": { - "$ref": "#/definitions/Error" + "Params": { + "$ref": "#/definitions/SubnetsFilters" }, "Result": { + "$ref": "#/definitions/ListSubnetsResults" + } + } + }, + "ModelConfig": { + "type": "object", + "properties": { + "Result": { + "$ref": "#/definitions/ModelConfigResult" + } + } + } + }, + "definitions": { + "AddSubnetParams": { + "type": "object", + "properties": { + "space-tag": { + "type": "string" + }, + "subnet-provider-id": { + "type": "string" + }, + "subnet-tag": { + "type": "string" + }, + "zones": { "type": "array", "items": { "type": "string" @@ -6598,1225 +6202,1001 @@ }, "additionalProperties": false, "required": [ - "Error", - "Result" + "space-tag" ] }, - "StringsResults": { + "AddSubnetsParams": { "type": "object", "properties": { - "Results": { + "subnets": { "type": "array", "items": { - "$ref": "#/definitions/StringsResult" + "$ref": "#/definitions/AddSubnetParams" } } }, "additionalProperties": false, "required": [ - "Results" + "subnets" ] }, - "StringsWatchResult": { + "CreateSpaceParams": { "type": "object", "properties": { - "Changes": { + "provider-id": { + "type": "string" + }, + "public": { + "type": "boolean" + }, + "space-tag": { + "type": "string" + }, + "subnet-tags": { "type": "array", "items": { "type": "string" } - }, - "Error": { - "$ref": "#/definitions/Error" - }, - "StringsWatcherId": { - "type": "string" } }, "additionalProperties": false, "required": [ - "StringsWatcherId", - "Changes", - "Error" + "subnet-tags", + "space-tag", + "public" ] }, - "StringsWatchResults": { + "CreateSpacesParams": { "type": "object", "properties": { - "Results": { + "spaces": { "type": "array", "items": { - "$ref": "#/definitions/StringsWatchResult" + "$ref": "#/definitions/CreateSpaceParams" } } }, "additionalProperties": false, "required": [ - "Results" + "spaces" ] }, - "caveat": { + "DiscoverSpacesResults": { "type": "object", "properties": { - "caveatId": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "verificationId": { - "$ref": "#/definitions/packet" + "results": { + "type": "array", + "items": { + "$ref": "#/definitions/ProviderSpace" + } } }, "additionalProperties": false, "required": [ - "location", - "caveatId", - "verificationId" + "results" ] }, - "packet": { + "Error": { "type": "object", "properties": { - "headerLen": { - "type": "integer" + "code": { + "type": "string" }, - "start": { - "type": "integer" + "info": { + "$ref": "#/definitions/ErrorInfo" }, - "totalLen": { - "type": "integer" + "message": { + "type": "string" } }, "additionalProperties": false, "required": [ - "start", - "totalLen", - "headerLen" + "message", + "code" ] - } - } - } - }, - { - "Name": "HighAvailability", - "Version": 2, - "Schema": { - "type": "object", - "properties": { - "EnableHA": { + }, + "ErrorInfo": { "type": "object", "properties": { - "Params": { - "$ref": "#/definitions/ControllersSpecs" + "macaroon": { + "$ref": "#/definitions/Macaroon" }, - "Result": { - "$ref": "#/definitions/ControllersChangeResults" + "macaroon-path": { + "type": "string" } - } + }, + "additionalProperties": false }, - "ResumeHAReplicationAfterUpgrade": { + "ErrorResult": { "type": "object", "properties": { - "Params": { - "$ref": "#/definitions/ResumeReplicationParams" + "error": { + "$ref": "#/definitions/Error" } - } + }, + "additionalProperties": false }, - "StopHAReplicationForUpgrade": { + "ErrorResults": { "type": "object", "properties": { - "Params": { - "$ref": "#/definitions/UpgradeMongoParams" - }, - "Result": { - "$ref": "#/definitions/MongoUpgradeResults" - } - } - } - }, - "definitions": { - "Address": { - "type": "object", - "properties": { - "Scope": { - "type": "string" - }, - "SpaceName": { - "type": "string" - }, - "SpaceProviderId": { - "type": "string" - }, - "Type": { - "type": "string" - }, - "Value": { - "type": "string" + "results": { + "type": "array", + "items": { + "$ref": "#/definitions/ErrorResult" + } } }, "additionalProperties": false, "required": [ - "Value", - "Type", - "Scope", - "SpaceName", - "SpaceProviderId" + "results" ] }, - "ControllersChangeResult": { + "ListSubnetsResults": { "type": "object", "properties": { - "Error": { - "$ref": "#/definitions/Error" - }, - "Result": { - "$ref": "#/definitions/ControllersChanges" + "results": { + "type": "array", + "items": { + "$ref": "#/definitions/Subnet" + } } }, "additionalProperties": false, "required": [ - "Result", - "Error" + "results" ] }, - "ControllersChangeResults": { + "Macaroon": { + "type": "object", + "additionalProperties": false + }, + "ModelConfigResult": { "type": "object", "properties": { - "Results": { - "type": "array", - "items": { - "$ref": "#/definitions/ControllersChangeResult" + "config": { + "type": "object", + "patternProperties": { + ".*": { + "type": "object", + "additionalProperties": true + } } } }, "additionalProperties": false, "required": [ - "Results" + "config" ] }, - "ControllersChanges": { + "ProviderSpace": { "type": "object", "properties": { - "added": { - "type": "array", - "items": { - "type": "string" - } - }, - "converted": { - "type": "array", - "items": { - "type": "string" - } - }, - "demoted": { - "type": "array", - "items": { - "type": "string" - } + "error": { + "$ref": "#/definitions/Error" }, - "maintained": { - "type": "array", - "items": { - "type": "string" - } + "name": { + "type": "string" }, - "promoted": { - "type": "array", - "items": { - "type": "string" - } + "provider-id": { + "type": "string" }, - "removed": { + "subnets": { "type": "array", "items": { - "type": "string" + "$ref": "#/definitions/Subnet" } } }, - "additionalProperties": false + "additionalProperties": false, + "required": [ + "name", + "provider-id", + "subnets" + ] }, - "ControllersSpec": { + "Subnet": { "type": "object", "properties": { - "ModelTag": { + "cidr": { "type": "string" }, - "constraints": { - "$ref": "#/definitions/Value" + "life": { + "type": "string" }, - "num-controllers": { + "provider-id": { + "type": "string" + }, + "space-tag": { + "type": "string" + }, + "status": { + "type": "string" + }, + "vlan-tag": { "type": "integer" }, - "placement": { + "zones": { "type": "array", "items": { "type": "string" } - }, - "series": { - "type": "string" } }, "additionalProperties": false, "required": [ - "ModelTag", - "num-controllers" + "cidr", + "vlan-tag", + "life", + "space-tag", + "zones" ] }, - "ControllersSpecs": { + "SubnetsFilters": { "type": "object", "properties": { - "Specs": { + "space-tag": { + "type": "string" + }, + "zone": { + "type": "string" + } + }, + "additionalProperties": false + } + } + } + }, + { + "Name": "DiskManager", + "Version": 2, + "Schema": { + "type": "object", + "properties": { + "SetMachineBlockDevices": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/SetMachineBlockDevices" + }, + "Result": { + "$ref": "#/definitions/ErrorResults" + } + } + } + }, + "definitions": { + "BlockDevice": { + "type": "object", + "properties": { + "BusAddress": { + "type": "string" + }, + "DeviceLinks": { "type": "array", "items": { - "$ref": "#/definitions/ControllersSpec" + "type": "string" } + }, + "DeviceName": { + "type": "string" + }, + "FilesystemType": { + "type": "string" + }, + "HardwareId": { + "type": "string" + }, + "InUse": { + "type": "boolean" + }, + "Label": { + "type": "string" + }, + "MountPoint": { + "type": "string" + }, + "Size": { + "type": "integer" + }, + "UUID": { + "type": "string" } }, "additionalProperties": false, "required": [ - "Specs" + "DeviceName", + "DeviceLinks", + "Label", + "UUID", + "HardwareId", + "BusAddress", + "Size", + "FilesystemType", + "InUse", + "MountPoint" ] }, "Error": { "type": "object", "properties": { - "Code": { + "code": { "type": "string" }, - "Info": { + "info": { "$ref": "#/definitions/ErrorInfo" }, - "Message": { + "message": { "type": "string" } }, "additionalProperties": false, "required": [ - "Message", - "Code" + "message", + "code" ] }, "ErrorInfo": { "type": "object", "properties": { - "Macaroon": { + "macaroon": { "$ref": "#/definitions/Macaroon" }, - "MacaroonPath": { + "macaroon-path": { "type": "string" } }, "additionalProperties": false }, - "HAMember": { + "ErrorResult": { "type": "object", "properties": { - "PublicAddress": { - "$ref": "#/definitions/Address" - }, - "Series": { - "type": "string" - }, - "Tag": { - "type": "string" + "error": { + "$ref": "#/definitions/Error" + } + }, + "additionalProperties": false + }, + "ErrorResults": { + "type": "object", + "properties": { + "results": { + "type": "array", + "items": { + "$ref": "#/definitions/ErrorResult" + } } }, "additionalProperties": false, "required": [ - "Tag", - "PublicAddress", - "Series" + "results" ] }, "Macaroon": { + "type": "object", + "additionalProperties": false + }, + "MachineBlockDevices": { "type": "object", "properties": { - "caveats": { + "block-devices": { "type": "array", "items": { - "$ref": "#/definitions/caveat" - } - }, - "data": { - "type": "array", - "items": { - "type": "integer" + "$ref": "#/definitions/BlockDevice" } }, - "id": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "sig": { - "type": "array", - "items": { - "type": "integer" - } + "machine": { + "type": "string" } }, "additionalProperties": false, "required": [ - "data", - "location", - "id", - "caveats", - "sig" + "machine" ] }, - "Member": { + "SetMachineBlockDevices": { "type": "object", "properties": { - "Address": { - "type": "string" - }, - "Arbiter": { - "type": "boolean" - }, - "BuildIndexes": { - "type": "boolean" - }, - "Hidden": { - "type": "boolean" - }, - "Id": { - "type": "integer" - }, - "Priority": { - "type": "number" - }, - "SlaveDelay": { - "type": "integer" - }, - "Tags": { - "type": "object", - "patternProperties": { - ".*": { - "type": "string" - } - } - }, - "Votes": { - "type": "integer" - } - }, - "additionalProperties": false, - "required": [ - "Id", - "Address", - "Arbiter", - "BuildIndexes", - "Hidden", - "Priority", - "Tags", - "SlaveDelay", - "Votes" - ] - }, - "MongoUpgradeResults": { - "type": "object", - "properties": { - "Master": { - "$ref": "#/definitions/HAMember" - }, - "Members": { - "type": "array", - "items": { - "$ref": "#/definitions/HAMember" - } - }, - "RsMembers": { - "type": "array", - "items": { - "$ref": "#/definitions/Member" - } - } - }, - "additionalProperties": false, - "required": [ - "RsMembers", - "Master", - "Members" - ] - }, - "ResumeReplicationParams": { - "type": "object", - "properties": { - "Members": { + "machine-block-devices": { "type": "array", "items": { - "$ref": "#/definitions/Member" + "$ref": "#/definitions/MachineBlockDevices" } } }, "additionalProperties": false, "required": [ - "Members" + "machine-block-devices" ] - }, - "UpgradeMongoParams": { + } + } + } + }, + { + "Name": "EntityWatcher", + "Version": 2, + "Schema": { + "type": "object", + "properties": { + "Next": { "type": "object", "properties": { - "Target": { - "$ref": "#/definitions/Version" + "Result": { + "$ref": "#/definitions/EntitiesWatchResult" } - }, - "additionalProperties": false, - "required": [ - "Target" - ] + } }, - "Value": { + "Stop": { + "type": "object" + } + }, + "definitions": { + "EntitiesWatchResult": { "type": "object", "properties": { - "arch": { - "type": "string" - }, - "container": { - "type": "string" - }, - "cpu-cores": { - "type": "integer" - }, - "cpu-power": { - "type": "integer" - }, - "instance-type": { - "type": "string" - }, - "mem": { - "type": "integer" - }, - "root-disk": { - "type": "integer" - }, - "spaces": { - "type": "array", - "items": { - "type": "string" - } - }, - "tags": { + "changes": { "type": "array", "items": { "type": "string" } }, - "virt-type": { - "type": "string" - } - }, - "additionalProperties": false - }, - "Version": { - "type": "object", - "properties": { - "Major": { - "type": "integer" - }, - "Minor": { - "type": "integer" - }, - "Patch": { - "type": "string" + "error": { + "$ref": "#/definitions/Error" }, - "StorageEngine": { + "watcher-id": { "type": "string" } }, "additionalProperties": false, "required": [ - "Major", - "Minor", - "Patch", - "StorageEngine" + "watcher-id" ] }, - "caveat": { + "Error": { "type": "object", "properties": { - "caveatId": { - "$ref": "#/definitions/packet" + "code": { + "type": "string" }, - "location": { - "$ref": "#/definitions/packet" + "info": { + "$ref": "#/definitions/ErrorInfo" }, - "verificationId": { - "$ref": "#/definitions/packet" + "message": { + "type": "string" } }, "additionalProperties": false, "required": [ - "location", - "caveatId", - "verificationId" + "message", + "code" ] }, - "packet": { + "ErrorInfo": { "type": "object", "properties": { - "headerLen": { - "type": "integer" - }, - "start": { - "type": "integer" + "macaroon": { + "$ref": "#/definitions/Macaroon" }, - "totalLen": { - "type": "integer" + "macaroon-path": { + "type": "string" } }, - "additionalProperties": false, - "required": [ - "start", - "totalLen", - "headerLen" - ] + "additionalProperties": false + }, + "Macaroon": { + "type": "object", + "additionalProperties": false } } } }, { - "Name": "HostKeyReporter", - "Version": 1, + "Name": "FilesystemAttachmentsWatcher", + "Version": 2, "Schema": { "type": "object", "properties": { - "ReportKeys": { + "Next": { "type": "object", "properties": { - "Params": { - "$ref": "#/definitions/SSHHostKeySet" - }, "Result": { - "$ref": "#/definitions/ErrorResults" + "$ref": "#/definitions/MachineStorageIdsWatchResult" } } + }, + "Stop": { + "type": "object" } }, "definitions": { "Error": { "type": "object", "properties": { - "Code": { + "code": { "type": "string" }, - "Info": { + "info": { "$ref": "#/definitions/ErrorInfo" }, - "Message": { + "message": { "type": "string" } }, "additionalProperties": false, "required": [ - "Message", - "Code" + "message", + "code" ] }, "ErrorInfo": { "type": "object", "properties": { - "Macaroon": { + "macaroon": { "$ref": "#/definitions/Macaroon" }, - "MacaroonPath": { + "macaroon-path": { "type": "string" } }, "additionalProperties": false }, - "ErrorResult": { + "Macaroon": { "type": "object", - "properties": { - "Error": { - "$ref": "#/definitions/Error" - } - }, - "additionalProperties": false, - "required": [ - "Error" - ] + "additionalProperties": false }, - "ErrorResults": { + "MachineStorageId": { "type": "object", "properties": { - "Results": { - "type": "array", - "items": { - "$ref": "#/definitions/ErrorResult" - } + "attachment-tag": { + "type": "string" + }, + "machine-tag": { + "type": "string" } }, "additionalProperties": false, "required": [ - "Results" + "machine-tag", + "attachment-tag" ] }, - "Macaroon": { + "MachineStorageIdsWatchResult": { "type": "object", "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } - }, - "data": { + "changes": { "type": "array", "items": { - "type": "integer" + "$ref": "#/definitions/MachineStorageId" } }, - "id": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" + "error": { + "$ref": "#/definitions/Error" }, - "sig": { - "type": "array", - "items": { - "type": "integer" - } + "watcher-id": { + "type": "string" } }, "additionalProperties": false, "required": [ - "data", - "location", - "id", - "caveats", - "sig" + "watcher-id", + "changes" ] - }, - "SSHHostKeySet": { + } + } + } + }, + { + "Name": "Firewaller", + "Version": 3, + "Schema": { + "type": "object", + "properties": { + "GetAssignedMachine": { "type": "object", "properties": { - "entity-keys": { - "type": "array", - "items": { - "$ref": "#/definitions/SSHHostKeys" - } - } - }, - "additionalProperties": false, - "required": [ - "entity-keys" - ] + "Params": { + "$ref": "#/definitions/Entities" + }, + "Result": { + "$ref": "#/definitions/StringResults" + } + } }, - "SSHHostKeys": { + "GetExposed": { "type": "object", "properties": { - "public-keys": { - "type": "array", - "items": { - "type": "string" - } + "Params": { + "$ref": "#/definitions/Entities" }, - "tag": { - "type": "string" + "Result": { + "$ref": "#/definitions/BoolResults" } - }, - "additionalProperties": false, - "required": [ - "tag", - "public-keys" - ] + } }, - "caveat": { + "GetMachineActiveSubnets": { "type": "object", "properties": { - "caveatId": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" + "Params": { + "$ref": "#/definitions/Entities" }, - "verificationId": { - "$ref": "#/definitions/packet" + "Result": { + "$ref": "#/definitions/StringsResults" } - }, - "additionalProperties": false, - "required": [ - "location", - "caveatId", - "verificationId" - ] + } }, - "packet": { + "GetMachinePorts": { "type": "object", "properties": { - "headerLen": { - "type": "integer" - }, - "start": { - "type": "integer" + "Params": { + "$ref": "#/definitions/MachinePortsParams" }, - "totalLen": { - "type": "integer" + "Result": { + "$ref": "#/definitions/MachinePortsResults" } - }, - "additionalProperties": false, - "required": [ - "start", - "totalLen", - "headerLen" - ] - } - } - } - }, - { - "Name": "ImageManager", - "Version": 2, - "Schema": { - "type": "object", - "properties": { - "DeleteImages": { + } + }, + "InstanceId": { "type": "object", "properties": { "Params": { - "$ref": "#/definitions/ImageFilterParams" + "$ref": "#/definitions/Entities" }, "Result": { - "$ref": "#/definitions/ErrorResults" + "$ref": "#/definitions/StringResults" } } }, - "ListImages": { + "Life": { "type": "object", "properties": { "Params": { - "$ref": "#/definitions/ImageFilterParams" + "$ref": "#/definitions/Entities" }, "Result": { - "$ref": "#/definitions/ListImageResult" + "$ref": "#/definitions/LifeResults" } } - } - }, - "definitions": { - "Error": { + }, + "ModelConfig": { "type": "object", "properties": { - "Code": { - "type": "string" - }, - "Info": { - "$ref": "#/definitions/ErrorInfo" + "Result": { + "$ref": "#/definitions/ModelConfigResult" + } + } + }, + "Watch": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/Entities" }, - "Message": { - "type": "string" + "Result": { + "$ref": "#/definitions/NotifyWatchResults" } - }, - "additionalProperties": false, - "required": [ - "Message", - "Code" - ] + } }, - "ErrorInfo": { + "WatchForModelConfigChanges": { "type": "object", "properties": { - "Macaroon": { - "$ref": "#/definitions/Macaroon" + "Result": { + "$ref": "#/definitions/NotifyWatchResult" + } + } + }, + "WatchModelMachines": { + "type": "object", + "properties": { + "Result": { + "$ref": "#/definitions/StringsWatchResult" + } + } + }, + "WatchOpenedPorts": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/Entities" }, - "MacaroonPath": { - "type": "string" + "Result": { + "$ref": "#/definitions/StringsWatchResults" } - }, - "additionalProperties": false + } }, - "ErrorResult": { + "WatchUnits": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/Entities" + }, + "Result": { + "$ref": "#/definitions/StringsWatchResults" + } + } + } + }, + "definitions": { + "BoolResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" + }, + "result": { + "type": "boolean" } }, "additionalProperties": false, "required": [ - "Error" + "result" ] }, - "ErrorResults": { + "BoolResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { - "$ref": "#/definitions/ErrorResult" + "$ref": "#/definitions/BoolResult" } } }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, - "ImageFilterParams": { + "Entities": { "type": "object", "properties": { - "images": { + "entities": { "type": "array", "items": { - "$ref": "#/definitions/ImageSpec" + "$ref": "#/definitions/Entity" } } }, "additionalProperties": false, "required": [ - "images" + "entities" ] }, - "ImageMetadata": { + "Entity": { "type": "object", "properties": { - "arch": { + "tag": { "type": "string" - }, - "created": { - "type": "string", - "format": "date-time" - }, - "kind": { + } + }, + "additionalProperties": false, + "required": [ + "tag" + ] + }, + "Error": { + "type": "object", + "properties": { + "code": { "type": "string" }, - "series": { - "type": "string" + "info": { + "$ref": "#/definitions/ErrorInfo" }, - "url": { + "message": { "type": "string" } }, "additionalProperties": false, "required": [ - "kind", - "arch", - "series", - "url", - "created" + "message", + "code" ] }, - "ImageSpec": { + "ErrorInfo": { "type": "object", "properties": { - "arch": { - "type": "string" + "macaroon": { + "$ref": "#/definitions/Macaroon" }, - "kind": { + "macaroon-path": { "type": "string" + } + }, + "additionalProperties": false + }, + "LifeResult": { + "type": "object", + "properties": { + "error": { + "$ref": "#/definitions/Error" }, - "series": { + "life": { "type": "string" } }, "additionalProperties": false, "required": [ - "kind", - "arch", - "series" + "life" ] }, - "ListImageResult": { + "LifeResults": { "type": "object", "properties": { - "result": { + "results": { "type": "array", "items": { - "$ref": "#/definitions/ImageMetadata" + "$ref": "#/definitions/LifeResult" } } }, "additionalProperties": false, "required": [ - "result" + "results" ] }, "Macaroon": { + "type": "object", + "additionalProperties": false + }, + "MachinePortRange": { "type": "object", "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } - }, - "data": { - "type": "array", - "items": { - "type": "integer" - } - }, - "id": { - "$ref": "#/definitions/packet" + "port-range": { + "$ref": "#/definitions/PortRange" }, - "location": { - "$ref": "#/definitions/packet" + "relation-tag": { + "type": "string" }, - "sig": { - "type": "array", - "items": { - "type": "integer" - } + "unit-tag": { + "type": "string" } }, "additionalProperties": false, "required": [ - "data", - "location", - "id", - "caveats", - "sig" + "unit-tag", + "relation-tag", + "port-range" ] }, - "caveat": { + "MachinePorts": { "type": "object", "properties": { - "caveatId": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" + "machine-tag": { + "type": "string" }, - "verificationId": { - "$ref": "#/definitions/packet" + "subnet-tag": { + "type": "string" } }, "additionalProperties": false, "required": [ - "location", - "caveatId", - "verificationId" + "machine-tag", + "subnet-tag" ] }, - "packet": { + "MachinePortsParams": { "type": "object", "properties": { - "headerLen": { - "type": "integer" - }, - "start": { - "type": "integer" - }, - "totalLen": { - "type": "integer" + "params": { + "type": "array", + "items": { + "$ref": "#/definitions/MachinePorts" + } } }, "additionalProperties": false, "required": [ - "start", - "totalLen", - "headerLen" + "params" ] - } - } - } - }, - { - "Name": "ImageMetadata", - "Version": 2, - "Schema": { - "type": "object", - "properties": { - "Delete": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/MetadataImageIds" - }, - "Result": { - "$ref": "#/definitions/ErrorResults" - } - } }, - "List": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/ImageMetadataFilter" - }, - "Result": { - "$ref": "#/definitions/ListCloudImageMetadataResult" - } - } - }, - "Save": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/MetadataSaveParams" - }, - "Result": { - "$ref": "#/definitions/ErrorResults" - } - } - }, - "UpdateFromPublishedImages": { - "type": "object" - } - }, - "definitions": { - "CloudImageMetadata": { + "MachinePortsResult": { "type": "object", "properties": { - "arch": { - "type": "string" - }, - "image_id": { - "type": "string" - }, - "priority": { - "type": "integer" - }, - "region": { - "type": "string" - }, - "root_storage_size": { - "type": "integer" - }, - "root_storage_type": { - "type": "string" - }, - "series": { - "type": "string" - }, - "source": { - "type": "string" - }, - "stream": { - "type": "string" - }, - "version": { - "type": "string" + "error": { + "$ref": "#/definitions/Error" }, - "virt_type": { - "type": "string" + "ports": { + "type": "array", + "items": { + "$ref": "#/definitions/MachinePortRange" + } } }, "additionalProperties": false, "required": [ - "image_id", - "region", - "version", - "series", - "arch", - "source", - "priority" + "ports" ] }, - "CloudImageMetadataList": { + "MachinePortsResults": { "type": "object", "properties": { - "metadata": { + "results": { "type": "array", "items": { - "$ref": "#/definitions/CloudImageMetadata" + "$ref": "#/definitions/MachinePortsResult" } } }, - "additionalProperties": false + "additionalProperties": false, + "required": [ + "results" + ] }, - "Error": { + "ModelConfigResult": { "type": "object", "properties": { - "Code": { - "type": "string" - }, - "Info": { - "$ref": "#/definitions/ErrorInfo" - }, - "Message": { - "type": "string" + "config": { + "type": "object", + "patternProperties": { + ".*": { + "type": "object", + "additionalProperties": true + } + } } }, "additionalProperties": false, "required": [ - "Message", - "Code" + "config" ] }, - "ErrorInfo": { + "NotifyWatchResult": { "type": "object", "properties": { - "Macaroon": { - "$ref": "#/definitions/Macaroon" - }, - "MacaroonPath": { + "NotifyWatcherId": { "type": "string" - } - }, - "additionalProperties": false - }, - "ErrorResult": { - "type": "object", - "properties": { - "Error": { + }, + "error": { "$ref": "#/definitions/Error" } }, "additionalProperties": false, "required": [ - "Error" + "NotifyWatcherId" ] }, - "ErrorResults": { + "NotifyWatchResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { - "$ref": "#/definitions/ErrorResult" + "$ref": "#/definitions/NotifyWatchResult" } } }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, - "ImageMetadataFilter": { + "PortRange": { "type": "object", "properties": { - "arches": { - "type": "array", - "items": { - "type": "string" - } - }, - "region": { - "type": "string" - }, - "root-storage-type": { - "type": "string" - }, - "series": { - "type": "array", - "items": { - "type": "string" - } + "from-port": { + "type": "integer" }, - "stream": { + "protocol": { "type": "string" }, - "virt_type": { - "type": "string" + "to-port": { + "type": "integer" } }, - "additionalProperties": false + "additionalProperties": false, + "required": [ + "from-port", + "to-port", + "protocol" + ] }, - "ListCloudImageMetadataResult": { + "StringResult": { "type": "object", "properties": { + "error": { + "$ref": "#/definitions/Error" + }, "result": { - "type": "array", - "items": { - "$ref": "#/definitions/CloudImageMetadata" - } + "type": "string" } }, "additionalProperties": false, @@ -7824,228 +7204,123 @@ "result" ] }, - "Macaroon": { + "StringResults": { "type": "object", "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } - }, - "data": { - "type": "array", - "items": { - "type": "integer" - } - }, - "id": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "sig": { + "results": { "type": "array", "items": { - "type": "integer" + "$ref": "#/definitions/StringResult" } } }, "additionalProperties": false, "required": [ - "data", - "location", - "id", - "caveats", - "sig" + "results" ] }, - "MetadataImageIds": { + "StringsResult": { "type": "object", "properties": { - "image_ids": { + "error": { + "$ref": "#/definitions/Error" + }, + "result": { "type": "array", "items": { "type": "string" } } }, - "additionalProperties": false, - "required": [ - "image_ids" - ] + "additionalProperties": false }, - "MetadataSaveParams": { + "StringsResults": { "type": "object", "properties": { - "metadata": { + "results": { "type": "array", "items": { - "$ref": "#/definitions/CloudImageMetadataList" + "$ref": "#/definitions/StringsResult" } } }, - "additionalProperties": false + "additionalProperties": false, + "required": [ + "results" + ] }, - "caveat": { + "StringsWatchResult": { "type": "object", "properties": { - "caveatId": { - "$ref": "#/definitions/packet" + "changes": { + "type": "array", + "items": { + "type": "string" + } }, - "location": { - "$ref": "#/definitions/packet" + "error": { + "$ref": "#/definitions/Error" }, - "verificationId": { - "$ref": "#/definitions/packet" + "watcher-id": { + "type": "string" } }, "additionalProperties": false, "required": [ - "location", - "caveatId", - "verificationId" + "watcher-id" ] }, - "packet": { + "StringsWatchResults": { "type": "object", "properties": { - "headerLen": { - "type": "integer" - }, - "start": { - "type": "integer" - }, - "totalLen": { - "type": "integer" + "results": { + "type": "array", + "items": { + "$ref": "#/definitions/StringsWatchResult" + } } }, "additionalProperties": false, "required": [ - "start", - "totalLen", - "headerLen" + "results" ] } } } }, { - "Name": "InstancePoller", + "Name": "HighAvailability", "Version": 2, "Schema": { "type": "object", "properties": { - "AreManuallyProvisioned": { + "EnableHA": { "type": "object", "properties": { "Params": { - "$ref": "#/definitions/Entities" + "$ref": "#/definitions/ControllersSpecs" }, "Result": { - "$ref": "#/definitions/BoolResults" - } - } - }, - "InstanceId": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/Entities" - }, - "Result": { - "$ref": "#/definitions/StringResults" - } - } - }, - "InstanceStatus": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/Entities" - }, - "Result": { - "$ref": "#/definitions/StatusResults" - } - } - }, - "Life": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/Entities" - }, - "Result": { - "$ref": "#/definitions/LifeResults" - } - } - }, - "ModelConfig": { - "type": "object", - "properties": { - "Result": { - "$ref": "#/definitions/ModelConfigResult" - } - } - }, - "ProviderAddresses": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/Entities" - }, - "Result": { - "$ref": "#/definitions/MachineAddressesResults" - } - } - }, - "SetInstanceStatus": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/SetStatus" - }, - "Result": { - "$ref": "#/definitions/ErrorResults" + "$ref": "#/definitions/ControllersChangeResults" } } }, - "SetProviderAddresses": { + "ResumeHAReplicationAfterUpgrade": { "type": "object", "properties": { "Params": { - "$ref": "#/definitions/SetMachinesAddresses" - }, - "Result": { - "$ref": "#/definitions/ErrorResults" + "$ref": "#/definitions/ResumeReplicationParams" } } }, - "Status": { + "StopHAReplicationForUpgrade": { "type": "object", "properties": { "Params": { - "$ref": "#/definitions/Entities" + "$ref": "#/definitions/UpgradeMongoParams" }, "Result": { - "$ref": "#/definitions/StatusResults" - } - } - }, - "WatchForModelConfigChanges": { - "type": "object", - "properties": { - "Result": { - "$ref": "#/definitions/NotifyWatchResult" - } - } - }, - "WatchModelMachines": { - "type": "object", - "properties": { - "Result": { - "$ref": "#/definitions/StringsWatchResult" + "$ref": "#/definitions/MongoUpgradeResults" } } } @@ -8060,6 +7335,9 @@ "SpaceName": { "type": "string" }, + "SpaceProviderId": { + "type": "string" + }, "Type": { "type": "string" }, @@ -8071,600 +7349,523 @@ "required": [ "Value", "Type", - "Scope" + "Scope", + "SpaceName", + "SpaceProviderId" ] }, - "BoolResult": { + "ControllersChangeResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" }, - "Result": { - "type": "boolean" + "result": { + "$ref": "#/definitions/ControllersChanges" } }, "additionalProperties": false, "required": [ - "Error", - "Result" + "result" ] }, - "BoolResults": { + "ControllersChangeResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { - "$ref": "#/definitions/BoolResult" + "$ref": "#/definitions/ControllersChangeResult" } } }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, - "Entities": { + "ControllersChanges": { "type": "object", "properties": { - "Entities": { + "added": { "type": "array", "items": { - "$ref": "#/definitions/Entity" + "type": "string" + } + }, + "converted": { + "type": "array", + "items": { + "type": "string" + } + }, + "demoted": { + "type": "array", + "items": { + "type": "string" + } + }, + "maintained": { + "type": "array", + "items": { + "type": "string" + } + }, + "promoted": { + "type": "array", + "items": { + "type": "string" + } + }, + "removed": { + "type": "array", + "items": { + "type": "string" } } }, - "additionalProperties": false, - "required": [ - "Entities" - ] + "additionalProperties": false }, - "Entity": { + "ControllersSpec": { "type": "object", "properties": { - "Tag": { + "constraints": { + "$ref": "#/definitions/Value" + }, + "model-tag": { + "type": "string" + }, + "num-controllers": { + "type": "integer" + }, + "placement": { + "type": "array", + "items": { + "type": "string" + } + }, + "series": { "type": "string" } }, "additionalProperties": false, "required": [ - "Tag" + "model-tag", + "num-controllers" ] }, - "EntityStatusArgs": { + "ControllersSpecs": { "type": "object", "properties": { - "Data": { - "type": "object", - "patternProperties": { - ".*": { - "type": "object", - "additionalProperties": true - } + "specs": { + "type": "array", + "items": { + "$ref": "#/definitions/ControllersSpec" } - }, - "Info": { - "type": "string" - }, - "Status": { - "type": "string" - }, - "Tag": { - "type": "string" } }, "additionalProperties": false, "required": [ - "Tag", - "Status", - "Info", - "Data" + "specs" ] }, "Error": { "type": "object", "properties": { - "Code": { + "code": { "type": "string" }, - "Info": { + "info": { "$ref": "#/definitions/ErrorInfo" }, - "Message": { + "message": { "type": "string" } }, "additionalProperties": false, "required": [ - "Message", - "Code" + "message", + "code" ] }, "ErrorInfo": { "type": "object", "properties": { - "Macaroon": { + "macaroon": { "$ref": "#/definitions/Macaroon" }, - "MacaroonPath": { + "macaroon-path": { "type": "string" } }, "additionalProperties": false }, - "ErrorResult": { + "HAMember": { "type": "object", "properties": { - "Error": { - "$ref": "#/definitions/Error" + "public-address": { + "$ref": "#/definitions/Address" + }, + "series": { + "type": "string" + }, + "tag": { + "type": "string" } }, "additionalProperties": false, "required": [ - "Error" + "tag", + "public-address", + "series" ] }, - "ErrorResults": { + "Macaroon": { "type": "object", - "properties": { - "Results": { - "type": "array", - "items": { - "$ref": "#/definitions/ErrorResult" - } - } - }, - "additionalProperties": false, - "required": [ - "Results" - ] + "additionalProperties": false }, - "LifeResult": { + "Member": { "type": "object", "properties": { - "Error": { - "$ref": "#/definitions/Error" - }, - "Life": { + "Address": { "type": "string" + }, + "Arbiter": { + "type": "boolean" + }, + "BuildIndexes": { + "type": "boolean" + }, + "Hidden": { + "type": "boolean" + }, + "Id": { + "type": "integer" + }, + "Priority": { + "type": "number" + }, + "SlaveDelay": { + "type": "integer" + }, + "Tags": { + "type": "object", + "patternProperties": { + ".*": { + "type": "string" + } + } + }, + "Votes": { + "type": "integer" } }, "additionalProperties": false, "required": [ - "Life", - "Error" - ] - }, - "LifeResults": { - "type": "object", - "properties": { - "Results": { - "type": "array", - "items": { - "$ref": "#/definitions/LifeResult" - } - } - }, - "additionalProperties": false, - "required": [ - "Results" + "Id", + "Address", + "Arbiter", + "BuildIndexes", + "Hidden", + "Priority", + "Tags", + "SlaveDelay", + "Votes" ] }, - "Macaroon": { + "MongoUpgradeResults": { "type": "object", "properties": { - "caveats": { + "ha-members": { "type": "array", "items": { - "$ref": "#/definitions/caveat" - } - }, - "data": { - "type": "array", - "items": { - "type": "integer" + "$ref": "#/definitions/HAMember" } }, - "id": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" + "master": { + "$ref": "#/definitions/HAMember" }, - "sig": { + "rs-members": { "type": "array", "items": { - "type": "integer" + "$ref": "#/definitions/Member" } } }, "additionalProperties": false, "required": [ - "data", - "location", - "id", - "caveats", - "sig" + "rs-members", + "master", + "ha-members" ] }, - "MachineAddresses": { + "ResumeReplicationParams": { "type": "object", "properties": { - "Addresses": { + "members": { "type": "array", "items": { - "$ref": "#/definitions/Address" + "$ref": "#/definitions/Member" } - }, - "Tag": { - "type": "string" } }, "additionalProperties": false, "required": [ - "Tag", - "Addresses" + "members" ] }, - "MachineAddressesResult": { + "UpgradeMongoParams": { "type": "object", "properties": { - "Addresses": { - "type": "array", - "items": { - "$ref": "#/definitions/Address" - } - }, - "Error": { - "$ref": "#/definitions/Error" + "target": { + "$ref": "#/definitions/Version" } }, "additionalProperties": false, "required": [ - "Error", - "Addresses" + "target" ] }, - "MachineAddressesResults": { + "Value": { "type": "object", "properties": { - "Results": { + "arch": { + "type": "string" + }, + "container": { + "type": "string" + }, + "cpu-cores": { + "type": "integer" + }, + "cpu-power": { + "type": "integer" + }, + "instance-type": { + "type": "string" + }, + "mem": { + "type": "integer" + }, + "root-disk": { + "type": "integer" + }, + "spaces": { "type": "array", "items": { - "$ref": "#/definitions/MachineAddressesResult" + "type": "string" + } + }, + "tags": { + "type": "array", + "items": { + "type": "string" } + }, + "virt-type": { + "type": "string" } }, - "additionalProperties": false, - "required": [ - "Results" - ] + "additionalProperties": false }, - "ModelConfigResult": { + "Version": { "type": "object", "properties": { - "Config": { - "type": "object", - "patternProperties": { - ".*": { - "type": "object", - "additionalProperties": true - } - } + "Major": { + "type": "integer" + }, + "Minor": { + "type": "integer" + }, + "Patch": { + "type": "string" + }, + "StorageEngine": { + "type": "string" } }, "additionalProperties": false, "required": [ - "Config" + "Major", + "Minor", + "Patch", + "StorageEngine" ] - }, - "NotifyWatchResult": { + } + } + } + }, + { + "Name": "HostKeyReporter", + "Version": 1, + "Schema": { + "type": "object", + "properties": { + "ReportKeys": { "type": "object", "properties": { - "Error": { - "$ref": "#/definitions/Error" + "Params": { + "$ref": "#/definitions/SSHHostKeySet" }, - "NotifyWatcherId": { - "type": "string" + "Result": { + "$ref": "#/definitions/ErrorResults" } - }, - "additionalProperties": false, - "required": [ - "NotifyWatcherId", - "Error" - ] - }, - "SetMachinesAddresses": { + } + } + }, + "definitions": { + "Error": { "type": "object", "properties": { - "MachineAddresses": { - "type": "array", - "items": { - "$ref": "#/definitions/MachineAddresses" - } + "code": { + "type": "string" + }, + "info": { + "$ref": "#/definitions/ErrorInfo" + }, + "message": { + "type": "string" } }, "additionalProperties": false, "required": [ - "MachineAddresses" + "message", + "code" ] }, - "SetStatus": { + "ErrorInfo": { "type": "object", "properties": { - "Entities": { - "type": "array", - "items": { - "$ref": "#/definitions/EntityStatusArgs" - } + "macaroon": { + "$ref": "#/definitions/Macaroon" + }, + "macaroon-path": { + "type": "string" } }, - "additionalProperties": false, - "required": [ - "Entities" - ] + "additionalProperties": false }, - "StatusResult": { + "ErrorResult": { "type": "object", "properties": { - "Data": { - "type": "object", - "patternProperties": { - ".*": { - "type": "object", - "additionalProperties": true - } - } - }, - "Error": { + "error": { "$ref": "#/definitions/Error" - }, - "Id": { - "type": "string" - }, - "Info": { - "type": "string" - }, - "Life": { - "type": "string" - }, - "Since": { - "type": "string", - "format": "date-time" - }, - "Status": { - "type": "string" } }, - "additionalProperties": false, - "required": [ - "Error", - "Id", - "Life", - "Status", - "Info", - "Data", - "Since" - ] + "additionalProperties": false }, - "StatusResults": { + "ErrorResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { - "$ref": "#/definitions/StatusResult" + "$ref": "#/definitions/ErrorResult" } } }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, - "StringResult": { + "Macaroon": { "type": "object", - "properties": { - "Error": { - "$ref": "#/definitions/Error" - }, - "Result": { - "type": "string" - } - }, - "additionalProperties": false, - "required": [ - "Error", - "Result" - ] + "additionalProperties": false }, - "StringResults": { + "SSHHostKeySet": { "type": "object", "properties": { - "Results": { + "entity-keys": { "type": "array", "items": { - "$ref": "#/definitions/StringResult" + "$ref": "#/definitions/SSHHostKeys" } } }, "additionalProperties": false, "required": [ - "Results" + "entity-keys" ] }, - "StringsWatchResult": { + "SSHHostKeys": { "type": "object", "properties": { - "Changes": { + "public-keys": { "type": "array", "items": { "type": "string" } }, - "Error": { - "$ref": "#/definitions/Error" - }, - "StringsWatcherId": { + "tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "StringsWatcherId", - "Changes", - "Error" + "tag", + "public-keys" ] - }, - "caveat": { + } + } + } + }, + { + "Name": "ImageManager", + "Version": 2, + "Schema": { + "type": "object", + "properties": { + "DeleteImages": { "type": "object", "properties": { - "caveatId": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" + "Params": { + "$ref": "#/definitions/ImageFilterParams" }, - "verificationId": { - "$ref": "#/definitions/packet" - } - }, - "additionalProperties": false, - "required": [ - "location", - "caveatId", - "verificationId" - ] - }, - "packet": { - "type": "object", - "properties": { - "headerLen": { - "type": "integer" - }, - "start": { - "type": "integer" - }, - "totalLen": { - "type": "integer" - } - }, - "additionalProperties": false, - "required": [ - "start", - "totalLen", - "headerLen" - ] - } - } - } - }, - { - "Name": "KeyManager", - "Version": 1, - "Schema": { - "type": "object", - "properties": { - "AddKeys": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/ModifyUserSSHKeys" - }, - "Result": { - "$ref": "#/definitions/ErrorResults" - } - } - }, - "DeleteKeys": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/ModifyUserSSHKeys" - }, - "Result": { - "$ref": "#/definitions/ErrorResults" - } - } - }, - "ImportKeys": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/ModifyUserSSHKeys" - }, - "Result": { - "$ref": "#/definitions/ErrorResults" + "Result": { + "$ref": "#/definitions/ErrorResults" } } }, - "ListKeys": { + "ListImages": { "type": "object", "properties": { "Params": { - "$ref": "#/definitions/ListSSHKeys" + "$ref": "#/definitions/ImageFilterParams" }, "Result": { - "$ref": "#/definitions/StringsResults" + "$ref": "#/definitions/ListImageResult" } } } }, "definitions": { - "Entities": { - "type": "object", - "properties": { - "Entities": { - "type": "array", - "items": { - "$ref": "#/definitions/Entity" - } - } - }, - "additionalProperties": false, - "required": [ - "Entities" - ] - }, - "Entity": { - "type": "object", - "properties": { - "Tag": { - "type": "string" - } - }, - "additionalProperties": false, - "required": [ - "Tag" - ] - }, "Error": { "type": "object", "properties": { - "Code": { + "code": { "type": "string" }, - "Info": { + "info": { "$ref": "#/definitions/ErrorInfo" }, - "Message": { + "message": { "type": "string" } }, "additionalProperties": false, "required": [ - "Message", - "Code" + "message", + "code" ] }, "ErrorInfo": { "type": "object", "properties": { - "Macaroon": { + "macaroon": { "$ref": "#/definitions/Macaroon" }, - "MacaroonPath": { + "macaroon-path": { "type": "string" } }, @@ -8673,19 +7874,16 @@ "ErrorResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" } }, - "additionalProperties": false, - "required": [ - "Error" - ] + "additionalProperties": false }, "ErrorResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/ErrorResult" @@ -8694,640 +7892,510 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, - "ListSSHKeys": { + "ImageFilterParams": { "type": "object", "properties": { - "Entities": { - "$ref": "#/definitions/Entities" - }, - "Mode": { - "type": "boolean" + "images": { + "type": "array", + "items": { + "$ref": "#/definitions/ImageSpec" + } } }, "additionalProperties": false, "required": [ - "Entities", - "Mode" + "images" ] }, - "Macaroon": { + "ImageMetadata": { "type": "object", "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } + "arch": { + "type": "string" }, - "data": { - "type": "array", - "items": { - "type": "integer" - } + "created": { + "type": "string", + "format": "date-time" }, - "id": { - "$ref": "#/definitions/packet" + "kind": { + "type": "string" }, - "location": { - "$ref": "#/definitions/packet" + "series": { + "type": "string" }, - "sig": { - "type": "array", - "items": { - "type": "integer" - } + "url": { + "type": "string" } }, "additionalProperties": false, "required": [ - "data", - "location", - "id", - "caveats", - "sig" + "kind", + "arch", + "series", + "url", + "created" ] }, - "ModifyUserSSHKeys": { + "ImageSpec": { "type": "object", "properties": { - "Keys": { - "type": "array", - "items": { - "type": "string" - } + "arch": { + "type": "string" }, - "User": { + "kind": { "type": "string" - } - }, - "additionalProperties": false, - "required": [ - "User", - "Keys" - ] - }, - "StringsResult": { - "type": "object", - "properties": { - "Error": { - "$ref": "#/definitions/Error" }, - "Result": { - "type": "array", - "items": { - "type": "string" - } + "series": { + "type": "string" } }, "additionalProperties": false, "required": [ - "Error", - "Result" + "kind", + "arch", + "series" ] }, - "StringsResults": { + "ListImageResult": { "type": "object", "properties": { - "Results": { + "result": { "type": "array", "items": { - "$ref": "#/definitions/StringsResult" + "$ref": "#/definitions/ImageMetadata" } } }, "additionalProperties": false, "required": [ - "Results" - ] - }, - "caveat": { - "type": "object", - "properties": { - "caveatId": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "verificationId": { - "$ref": "#/definitions/packet" - } - }, - "additionalProperties": false, - "required": [ - "location", - "caveatId", - "verificationId" + "result" ] }, - "packet": { + "Macaroon": { "type": "object", - "properties": { - "headerLen": { - "type": "integer" - }, - "start": { - "type": "integer" - }, - "totalLen": { - "type": "integer" - } - }, - "additionalProperties": false, - "required": [ - "start", - "totalLen", - "headerLen" - ] + "additionalProperties": false } } } }, { - "Name": "KeyUpdater", - "Version": 1, + "Name": "ImageMetadata", + "Version": 2, "Schema": { "type": "object", "properties": { - "AuthorisedKeys": { + "Delete": { "type": "object", "properties": { "Params": { - "$ref": "#/definitions/Entities" + "$ref": "#/definitions/MetadataImageIds" }, "Result": { - "$ref": "#/definitions/StringsResults" + "$ref": "#/definitions/ErrorResults" } } }, - "WatchAuthorisedKeys": { + "List": { "type": "object", "properties": { "Params": { - "$ref": "#/definitions/Entities" + "$ref": "#/definitions/ImageMetadataFilter" }, "Result": { - "$ref": "#/definitions/NotifyWatchResults" + "$ref": "#/definitions/ListCloudImageMetadataResult" } } - } - }, - "definitions": { - "Entities": { - "type": "object", - "properties": { - "Entities": { - "type": "array", - "items": { - "$ref": "#/definitions/Entity" - } - } - }, - "additionalProperties": false, - "required": [ - "Entities" - ] }, - "Entity": { + "Save": { "type": "object", "properties": { - "Tag": { - "type": "string" + "Params": { + "$ref": "#/definitions/MetadataSaveParams" + }, + "Result": { + "$ref": "#/definitions/ErrorResults" } - }, - "additionalProperties": false, - "required": [ - "Tag" - ] + } }, - "Error": { + "UpdateFromPublishedImages": { + "type": "object" + } + }, + "definitions": { + "CloudImageMetadata": { "type": "object", "properties": { - "Code": { + "arch": { "type": "string" }, - "Info": { - "$ref": "#/definitions/ErrorInfo" + "image-id": { + "type": "string" + }, + "priority": { + "type": "integer" + }, + "region": { + "type": "string" + }, + "root-storage-size": { + "type": "integer" + }, + "root-storage-type": { + "type": "string" + }, + "series": { + "type": "string" + }, + "source": { + "type": "string" + }, + "stream": { + "type": "string" + }, + "version": { + "type": "string" }, - "Message": { + "virt-type": { "type": "string" } }, "additionalProperties": false, "required": [ - "Message", - "Code" + "image-id", + "region", + "version", + "series", + "arch", + "source", + "priority" ] }, - "ErrorInfo": { + "CloudImageMetadataList": { "type": "object", "properties": { - "Macaroon": { - "$ref": "#/definitions/Macaroon" - }, - "MacaroonPath": { - "type": "string" + "metadata": { + "type": "array", + "items": { + "$ref": "#/definitions/CloudImageMetadata" + } } }, "additionalProperties": false }, - "Macaroon": { + "Error": { "type": "object", "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } - }, - "data": { - "type": "array", - "items": { - "type": "integer" - } - }, - "id": { - "$ref": "#/definitions/packet" + "code": { + "type": "string" }, - "location": { - "$ref": "#/definitions/packet" + "info": { + "$ref": "#/definitions/ErrorInfo" }, - "sig": { - "type": "array", - "items": { - "type": "integer" - } + "message": { + "type": "string" } }, "additionalProperties": false, "required": [ - "data", - "location", - "id", - "caveats", - "sig" + "message", + "code" ] }, - "NotifyWatchResult": { + "ErrorInfo": { "type": "object", "properties": { - "Error": { - "$ref": "#/definitions/Error" + "macaroon": { + "$ref": "#/definitions/Macaroon" }, - "NotifyWatcherId": { + "macaroon-path": { "type": "string" } }, - "additionalProperties": false, - "required": [ - "NotifyWatcherId", - "Error" - ] + "additionalProperties": false }, - "NotifyWatchResults": { + "ErrorResult": { + "type": "object", + "properties": { + "error": { + "$ref": "#/definitions/Error" + } + }, + "additionalProperties": false + }, + "ErrorResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { - "$ref": "#/definitions/NotifyWatchResult" + "$ref": "#/definitions/ErrorResult" } } }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, - "StringsResult": { + "ImageMetadataFilter": { "type": "object", "properties": { - "Error": { - "$ref": "#/definitions/Error" + "arches": { + "type": "array", + "items": { + "type": "string" + } }, - "Result": { + "region": { + "type": "string" + }, + "root-storage-type": { + "type": "string" + }, + "series": { "type": "array", "items": { "type": "string" } + }, + "stream": { + "type": "string" + }, + "virt-type": { + "type": "string" } }, - "additionalProperties": false, - "required": [ - "Error", - "Result" - ] + "additionalProperties": false }, - "StringsResults": { + "ListCloudImageMetadataResult": { "type": "object", "properties": { - "Results": { + "result": { "type": "array", "items": { - "$ref": "#/definitions/StringsResult" + "$ref": "#/definitions/CloudImageMetadata" } } }, "additionalProperties": false, "required": [ - "Results" + "result" ] }, - "caveat": { + "Macaroon": { + "type": "object", + "additionalProperties": false + }, + "MetadataImageIds": { "type": "object", "properties": { - "caveatId": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "verificationId": { - "$ref": "#/definitions/packet" + "image-ids": { + "type": "array", + "items": { + "type": "string" + } } }, "additionalProperties": false, "required": [ - "location", - "caveatId", - "verificationId" + "image-ids" ] }, - "packet": { + "MetadataSaveParams": { "type": "object", "properties": { - "headerLen": { - "type": "integer" - }, - "start": { - "type": "integer" - }, - "totalLen": { - "type": "integer" + "metadata": { + "type": "array", + "items": { + "$ref": "#/definitions/CloudImageMetadataList" + } } }, - "additionalProperties": false, - "required": [ - "start", - "totalLen", - "headerLen" - ] + "additionalProperties": false } } } }, { - "Name": "LeadershipService", - "Version": 2, + "Name": "InstancePoller", + "Version": 3, "Schema": { "type": "object", "properties": { - "BlockUntilLeadershipReleased": { + "AreManuallyProvisioned": { "type": "object", "properties": { "Params": { - "$ref": "#/definitions/ServiceTag" + "$ref": "#/definitions/Entities" }, "Result": { - "$ref": "#/definitions/ErrorResult" + "$ref": "#/definitions/BoolResults" } } }, - "ClaimLeadership": { + "InstanceId": { "type": "object", "properties": { "Params": { - "$ref": "#/definitions/ClaimLeadershipBulkParams" + "$ref": "#/definitions/Entities" }, "Result": { - "$ref": "#/definitions/ClaimLeadershipBulkResults" + "$ref": "#/definitions/StringResults" } } - } - }, - "definitions": { - "ClaimLeadershipBulkParams": { + }, + "InstanceStatus": { "type": "object", "properties": { "Params": { - "type": "array", - "items": { - "$ref": "#/definitions/ClaimLeadershipParams" - } + "$ref": "#/definitions/Entities" + }, + "Result": { + "$ref": "#/definitions/StatusResults" } - }, - "additionalProperties": false, - "required": [ - "Params" - ] + } }, - "ClaimLeadershipBulkResults": { + "Life": { "type": "object", "properties": { - "Results": { - "type": "array", - "items": { - "$ref": "#/definitions/ErrorResult" - } + "Params": { + "$ref": "#/definitions/Entities" + }, + "Result": { + "$ref": "#/definitions/LifeResults" } - }, - "additionalProperties": false, - "required": [ - "Results" - ] + } }, - "ClaimLeadershipParams": { + "ModelConfig": { "type": "object", "properties": { - "DurationSeconds": { - "type": "number" - }, - "ServiceTag": { - "type": "string" - }, - "UnitTag": { - "type": "string" + "Result": { + "$ref": "#/definitions/ModelConfigResult" } - }, - "additionalProperties": false, - "required": [ - "ServiceTag", - "UnitTag", - "DurationSeconds" - ] + } }, - "Error": { + "ProviderAddresses": { "type": "object", "properties": { - "Code": { - "type": "string" - }, - "Info": { - "$ref": "#/definitions/ErrorInfo" + "Params": { + "$ref": "#/definitions/Entities" }, - "Message": { - "type": "string" + "Result": { + "$ref": "#/definitions/MachineAddressesResults" } - }, - "additionalProperties": false, - "required": [ - "Message", - "Code" - ] + } }, - "ErrorInfo": { + "SetInstanceStatus": { "type": "object", "properties": { - "Macaroon": { - "$ref": "#/definitions/Macaroon" + "Params": { + "$ref": "#/definitions/SetStatus" }, - "MacaroonPath": { - "type": "string" + "Result": { + "$ref": "#/definitions/ErrorResults" } - }, - "additionalProperties": false + } }, - "ErrorResult": { + "SetProviderAddresses": { "type": "object", "properties": { - "Error": { - "$ref": "#/definitions/Error" + "Params": { + "$ref": "#/definitions/SetMachinesAddresses" + }, + "Result": { + "$ref": "#/definitions/ErrorResults" } - }, - "additionalProperties": false, - "required": [ - "Error" - ] + } }, - "Macaroon": { + "Status": { "type": "object", "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } - }, - "data": { - "type": "array", - "items": { - "type": "integer" - } - }, - "id": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" + "Params": { + "$ref": "#/definitions/Entities" }, - "sig": { - "type": "array", - "items": { - "type": "integer" - } + "Result": { + "$ref": "#/definitions/StatusResults" } - }, - "additionalProperties": false, - "required": [ - "data", - "location", - "id", - "caveats", - "sig" - ] + } }, - "ServiceTag": { + "WatchForModelConfigChanges": { "type": "object", "properties": { - "Name": { - "type": "string" + "Result": { + "$ref": "#/definitions/NotifyWatchResult" } - }, - "additionalProperties": false, - "required": [ - "Name" - ] + } }, - "caveat": { + "WatchModelMachines": { + "type": "object", + "properties": { + "Result": { + "$ref": "#/definitions/StringsWatchResult" + } + } + } + }, + "definitions": { + "Address": { "type": "object", "properties": { - "caveatId": { - "$ref": "#/definitions/packet" + "scope": { + "type": "string" }, - "location": { - "$ref": "#/definitions/packet" + "space-name": { + "type": "string" + }, + "type": { + "type": "string" }, - "verificationId": { - "$ref": "#/definitions/packet" + "value": { + "type": "string" } }, "additionalProperties": false, "required": [ - "location", - "caveatId", - "verificationId" + "value", + "type", + "scope" ] }, - "packet": { + "BoolResult": { "type": "object", "properties": { - "headerLen": { - "type": "integer" - }, - "start": { - "type": "integer" + "error": { + "$ref": "#/definitions/Error" }, - "totalLen": { - "type": "integer" + "result": { + "type": "boolean" } }, "additionalProperties": false, "required": [ - "start", - "totalLen", - "headerLen" + "result" ] - } - } - } - }, - { - "Name": "LifeFlag", - "Version": 1, - "Schema": { - "type": "object", - "properties": { - "Life": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/Entities" - }, - "Result": { - "$ref": "#/definitions/LifeResults" - } - } }, - "Watch": { + "BoolResults": { "type": "object", "properties": { - "Params": { - "$ref": "#/definitions/Entities" - }, - "Result": { - "$ref": "#/definitions/NotifyWatchResults" + "results": { + "type": "array", + "items": { + "$ref": "#/definitions/BoolResult" + } } - } - } - }, - "definitions": { + }, + "additionalProperties": false, + "required": [ + "results" + ] + }, "Entities": { "type": "object", "properties": { - "Entities": { + "entities": { "type": "array", "items": { "$ref": "#/definitions/Entity" @@ -9336,72 +8404,125 @@ }, "additionalProperties": false, "required": [ - "Entities" + "entities" ] }, "Entity": { "type": "object", "properties": { - "Tag": { + "tag": { + "type": "string" + } + }, + "additionalProperties": false, + "required": [ + "tag" + ] + }, + "EntityStatusArgs": { + "type": "object", + "properties": { + "data": { + "type": "object", + "patternProperties": { + ".*": { + "type": "object", + "additionalProperties": true + } + } + }, + "info": { + "type": "string" + }, + "status": { + "type": "string" + }, + "tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "Tag" + "tag", + "status", + "info", + "data" ] }, "Error": { "type": "object", "properties": { - "Code": { + "code": { "type": "string" }, - "Info": { + "info": { "$ref": "#/definitions/ErrorInfo" }, - "Message": { + "message": { "type": "string" } }, "additionalProperties": false, "required": [ - "Message", - "Code" + "message", + "code" ] }, "ErrorInfo": { "type": "object", "properties": { - "Macaroon": { + "macaroon": { "$ref": "#/definitions/Macaroon" }, - "MacaroonPath": { + "macaroon-path": { "type": "string" } }, "additionalProperties": false }, + "ErrorResult": { + "type": "object", + "properties": { + "error": { + "$ref": "#/definitions/Error" + } + }, + "additionalProperties": false + }, + "ErrorResults": { + "type": "object", + "properties": { + "results": { + "type": "array", + "items": { + "$ref": "#/definitions/ErrorResult" + } + } + }, + "additionalProperties": false, + "required": [ + "results" + ] + }, "LifeResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" }, - "Life": { + "life": { "type": "string" } }, "additionalProperties": false, "required": [ - "Life", - "Error" + "life" ] }, "LifeResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/LifeResult" @@ -9410,145 +8531,286 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "Macaroon": { + "type": "object", + "additionalProperties": false + }, + "MachineAddresses": { "type": "object", "properties": { - "caveats": { + "addresses": { "type": "array", "items": { - "$ref": "#/definitions/caveat" + "$ref": "#/definitions/Address" } }, - "data": { + "tag": { + "type": "string" + } + }, + "additionalProperties": false, + "required": [ + "tag", + "addresses" + ] + }, + "MachineAddressesResult": { + "type": "object", + "properties": { + "addresses": { "type": "array", "items": { - "type": "integer" + "$ref": "#/definitions/Address" } }, - "id": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "sig": { + "error": { + "$ref": "#/definitions/Error" + } + }, + "additionalProperties": false, + "required": [ + "addresses" + ] + }, + "MachineAddressesResults": { + "type": "object", + "properties": { + "results": { "type": "array", "items": { - "type": "integer" + "$ref": "#/definitions/MachineAddressesResult" } } }, "additionalProperties": false, "required": [ - "data", - "location", - "id", - "caveats", - "sig" + "results" + ] + }, + "ModelConfigResult": { + "type": "object", + "properties": { + "config": { + "type": "object", + "patternProperties": { + ".*": { + "type": "object", + "additionalProperties": true + } + } + } + }, + "additionalProperties": false, + "required": [ + "config" ] }, "NotifyWatchResult": { "type": "object", "properties": { - "Error": { - "$ref": "#/definitions/Error" - }, "NotifyWatcherId": { "type": "string" + }, + "error": { + "$ref": "#/definitions/Error" } }, "additionalProperties": false, "required": [ - "NotifyWatcherId", - "Error" + "NotifyWatcherId" ] }, - "NotifyWatchResults": { + "SetMachinesAddresses": { "type": "object", "properties": { - "Results": { + "machine-addresses": { "type": "array", "items": { - "$ref": "#/definitions/NotifyWatchResult" + "$ref": "#/definitions/MachineAddresses" } } }, "additionalProperties": false, "required": [ - "Results" + "machine-addresses" ] }, - "caveat": { + "SetStatus": { "type": "object", "properties": { - "caveatId": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "verificationId": { - "$ref": "#/definitions/packet" + "entities": { + "type": "array", + "items": { + "$ref": "#/definitions/EntityStatusArgs" + } } }, "additionalProperties": false, "required": [ - "location", - "caveatId", - "verificationId" + "entities" ] }, - "packet": { + "StatusResult": { "type": "object", "properties": { - "headerLen": { - "type": "integer" + "data": { + "type": "object", + "patternProperties": { + ".*": { + "type": "object", + "additionalProperties": true + } + } }, - "start": { - "type": "integer" + "error": { + "$ref": "#/definitions/Error" }, - "totalLen": { - "type": "integer" + "id": { + "type": "string" + }, + "info": { + "type": "string" + }, + "life": { + "type": "string" + }, + "since": { + "type": "string", + "format": "date-time" + }, + "status": { + "type": "string" + } + }, + "additionalProperties": false, + "required": [ + "id", + "life", + "status", + "info", + "data", + "since" + ] + }, + "StatusResults": { + "type": "object", + "properties": { + "results": { + "type": "array", + "items": { + "$ref": "#/definitions/StatusResult" + } + } + }, + "additionalProperties": false, + "required": [ + "results" + ] + }, + "StringResult": { + "type": "object", + "properties": { + "error": { + "$ref": "#/definitions/Error" + }, + "result": { + "type": "string" + } + }, + "additionalProperties": false, + "required": [ + "result" + ] + }, + "StringResults": { + "type": "object", + "properties": { + "results": { + "type": "array", + "items": { + "$ref": "#/definitions/StringResult" + } + } + }, + "additionalProperties": false, + "required": [ + "results" + ] + }, + "StringsWatchResult": { + "type": "object", + "properties": { + "changes": { + "type": "array", + "items": { + "type": "string" + } + }, + "error": { + "$ref": "#/definitions/Error" + }, + "watcher-id": { + "type": "string" } }, "additionalProperties": false, "required": [ - "start", - "totalLen", - "headerLen" + "watcher-id" ] } } } }, { - "Name": "Logger", + "Name": "KeyManager", "Version": 1, "Schema": { "type": "object", "properties": { - "LoggingConfig": { + "AddKeys": { "type": "object", "properties": { "Params": { - "$ref": "#/definitions/Entities" + "$ref": "#/definitions/ModifyUserSSHKeys" }, "Result": { - "$ref": "#/definitions/StringResults" + "$ref": "#/definitions/ErrorResults" } } }, - "WatchLoggingConfig": { + "DeleteKeys": { "type": "object", "properties": { "Params": { - "$ref": "#/definitions/Entities" + "$ref": "#/definitions/ModifyUserSSHKeys" }, "Result": { - "$ref": "#/definitions/NotifyWatchResults" + "$ref": "#/definitions/ErrorResults" + } + } + }, + "ImportKeys": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/ModifyUserSSHKeys" + }, + "Result": { + "$ref": "#/definitions/ErrorResults" + } + } + }, + "ListKeys": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/ListSSHKeys" + }, + "Result": { + "$ref": "#/definitions/StringsResults" } } } @@ -9557,7 +8819,7 @@ "Entities": { "type": "object", "properties": { - "Entities": { + "entities": { "type": "array", "items": { "$ref": "#/definitions/Entity" @@ -9566,460 +8828,421 @@ }, "additionalProperties": false, "required": [ - "Entities" + "entities" ] }, "Entity": { "type": "object", "properties": { - "Tag": { + "tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "Tag" + "tag" ] }, "Error": { "type": "object", "properties": { - "Code": { + "code": { "type": "string" }, - "Info": { + "info": { "$ref": "#/definitions/ErrorInfo" }, - "Message": { + "message": { "type": "string" } }, "additionalProperties": false, "required": [ - "Message", - "Code" + "message", + "code" ] }, "ErrorInfo": { "type": "object", "properties": { - "Macaroon": { + "macaroon": { "$ref": "#/definitions/Macaroon" }, - "MacaroonPath": { + "macaroon-path": { "type": "string" } }, "additionalProperties": false }, - "Macaroon": { - "type": "object", - "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } - }, - "data": { - "type": "array", - "items": { - "type": "integer" - } - }, - "id": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "sig": { - "type": "array", - "items": { - "type": "integer" - } - } - }, - "additionalProperties": false, - "required": [ - "data", - "location", - "id", - "caveats", - "sig" - ] - }, - "NotifyWatchResult": { + "ErrorResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" - }, - "NotifyWatcherId": { - "type": "string" } }, - "additionalProperties": false, - "required": [ - "NotifyWatcherId", - "Error" - ] + "additionalProperties": false }, - "NotifyWatchResults": { + "ErrorResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { - "$ref": "#/definitions/NotifyWatchResult" + "$ref": "#/definitions/ErrorResult" } } }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, - "StringResult": { + "ListSSHKeys": { "type": "object", "properties": { - "Error": { - "$ref": "#/definitions/Error" + "entities": { + "$ref": "#/definitions/Entities" }, - "Result": { - "type": "string" + "mode": { + "type": "boolean" } }, "additionalProperties": false, "required": [ - "Error", - "Result" + "entities", + "mode" ] }, - "StringResults": { + "Macaroon": { + "type": "object", + "additionalProperties": false + }, + "ModifyUserSSHKeys": { "type": "object", "properties": { - "Results": { + "ssh-keys": { "type": "array", "items": { - "$ref": "#/definitions/StringResult" + "type": "string" } + }, + "user": { + "type": "string" } }, "additionalProperties": false, "required": [ - "Results" + "user", + "ssh-keys" ] }, - "caveat": { + "StringsResult": { "type": "object", "properties": { - "caveatId": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" + "error": { + "$ref": "#/definitions/Error" }, - "verificationId": { - "$ref": "#/definitions/packet" + "result": { + "type": "array", + "items": { + "type": "string" + } } }, - "additionalProperties": false, - "required": [ - "location", - "caveatId", - "verificationId" - ] + "additionalProperties": false }, - "packet": { + "StringsResults": { "type": "object", "properties": { - "headerLen": { - "type": "integer" - }, - "start": { - "type": "integer" - }, - "totalLen": { - "type": "integer" + "results": { + "type": "array", + "items": { + "$ref": "#/definitions/StringsResult" + } } }, "additionalProperties": false, "required": [ - "start", - "totalLen", - "headerLen" + "results" ] } } } }, { - "Name": "MachineActions", + "Name": "KeyUpdater", "Version": 1, "Schema": { "type": "object", "properties": { - "Actions": { + "AuthorisedKeys": { "type": "object", "properties": { "Params": { "$ref": "#/definitions/Entities" }, "Result": { - "$ref": "#/definitions/ActionResults" + "$ref": "#/definitions/StringsResults" } } }, - "BeginActions": { + "WatchAuthorisedKeys": { "type": "object", "properties": { "Params": { "$ref": "#/definitions/Entities" }, "Result": { - "$ref": "#/definitions/ErrorResults" + "$ref": "#/definitions/NotifyWatchResults" } } - }, - "FinishActions": { + } + }, + "definitions": { + "Entities": { "type": "object", "properties": { - "Params": { - "$ref": "#/definitions/ActionExecutionResults" - }, - "Result": { - "$ref": "#/definitions/ErrorResults" - } - } - }, - "RunningActions": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/Entities" - }, - "Result": { - "$ref": "#/definitions/ActionsByReceivers" + "entities": { + "type": "array", + "items": { + "$ref": "#/definitions/Entity" + } } - } + }, + "additionalProperties": false, + "required": [ + "entities" + ] }, - "WatchActionNotifications": { + "Entity": { "type": "object", "properties": { - "Params": { - "$ref": "#/definitions/Entities" - }, - "Result": { - "$ref": "#/definitions/StringsWatchResults" + "tag": { + "type": "string" } - } - } - }, - "definitions": { - "Action": { + }, + "additionalProperties": false, + "required": [ + "tag" + ] + }, + "Error": { "type": "object", "properties": { - "name": { + "code": { "type": "string" }, - "parameters": { - "type": "object", - "patternProperties": { - ".*": { - "type": "object", - "additionalProperties": true - } - } - }, - "receiver": { - "type": "string" + "info": { + "$ref": "#/definitions/ErrorInfo" }, - "tag": { + "message": { "type": "string" } }, "additionalProperties": false, "required": [ - "tag", - "receiver", - "name" + "message", + "code" ] }, - "ActionExecutionResult": { + "ErrorInfo": { "type": "object", "properties": { - "actiontag": { - "type": "string" + "macaroon": { + "$ref": "#/definitions/Macaroon" }, - "message": { + "macaroon-path": { "type": "string" - }, - "results": { - "type": "object", - "patternProperties": { - ".*": { - "type": "object", - "additionalProperties": true - } - } - }, - "status": { + } + }, + "additionalProperties": false + }, + "Macaroon": { + "type": "object", + "additionalProperties": false + }, + "NotifyWatchResult": { + "type": "object", + "properties": { + "NotifyWatcherId": { "type": "string" + }, + "error": { + "$ref": "#/definitions/Error" } }, "additionalProperties": false, "required": [ - "actiontag", - "status" + "NotifyWatcherId" ] }, - "ActionExecutionResults": { + "NotifyWatchResults": { "type": "object", "properties": { "results": { "type": "array", "items": { - "$ref": "#/definitions/ActionExecutionResult" + "$ref": "#/definitions/NotifyWatchResult" } } }, - "additionalProperties": false + "additionalProperties": false, + "required": [ + "results" + ] }, - "ActionResult": { + "StringsResult": { "type": "object", "properties": { - "action": { - "$ref": "#/definitions/Action" - }, - "completed": { - "type": "string", - "format": "date-time" - }, - "enqueued": { - "type": "string", - "format": "date-time" - }, "error": { "$ref": "#/definitions/Error" }, - "message": { - "type": "string" - }, - "output": { - "type": "object", - "patternProperties": { - ".*": { - "type": "object", - "additionalProperties": true - } + "result": { + "type": "array", + "items": { + "type": "string" } - }, - "started": { - "type": "string", - "format": "date-time" - }, - "status": { - "type": "string" } }, "additionalProperties": false }, - "ActionResults": { + "StringsResults": { "type": "object", "properties": { "results": { "type": "array", "items": { - "$ref": "#/definitions/ActionResult" + "$ref": "#/definitions/StringsResult" } } }, - "additionalProperties": false - }, - "ActionsByReceiver": { + "additionalProperties": false, + "required": [ + "results" + ] + } + } + } + }, + { + "Name": "LeadershipService", + "Version": 2, + "Schema": { + "type": "object", + "properties": { + "BlockUntilLeadershipReleased": { "type": "object", "properties": { - "actions": { - "type": "array", - "items": { - "$ref": "#/definitions/ActionResult" - } + "Params": { + "$ref": "#/definitions/ApplicationTag" }, - "error": { - "$ref": "#/definitions/Error" + "Result": { + "$ref": "#/definitions/ErrorResult" + } + } + }, + "ClaimLeadership": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/ClaimLeadershipBulkParams" }, - "receiver": { + "Result": { + "$ref": "#/definitions/ClaimLeadershipBulkResults" + } + } + } + }, + "definitions": { + "ApplicationTag": { + "type": "object", + "properties": { + "Name": { "type": "string" } }, - "additionalProperties": false + "additionalProperties": false, + "required": [ + "Name" + ] }, - "ActionsByReceivers": { + "ClaimLeadershipBulkParams": { "type": "object", "properties": { - "actions": { + "params": { "type": "array", "items": { - "$ref": "#/definitions/ActionsByReceiver" + "$ref": "#/definitions/ClaimLeadershipParams" } } }, - "additionalProperties": false + "additionalProperties": false, + "required": [ + "params" + ] }, - "Entities": { + "ClaimLeadershipBulkResults": { "type": "object", "properties": { - "Entities": { + "results": { "type": "array", "items": { - "$ref": "#/definitions/Entity" + "$ref": "#/definitions/ErrorResult" } } }, "additionalProperties": false, "required": [ - "Entities" + "results" ] }, - "Entity": { + "ClaimLeadershipParams": { "type": "object", "properties": { - "Tag": { + "application-tag": { + "type": "string" + }, + "duration": { + "type": "number" + }, + "unit-tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "Tag" + "application-tag", + "unit-tag", + "duration" ] }, "Error": { "type": "object", "properties": { - "Code": { + "code": { "type": "string" }, - "Info": { + "info": { "$ref": "#/definitions/ErrorInfo" }, - "Message": { + "message": { "type": "string" } }, "additionalProperties": false, "required": [ - "Message", - "Code" + "message", + "code" ] }, "ErrorInfo": { "type": "object", "properties": { - "Macaroon": { + "macaroon": { "$ref": "#/definitions/Macaroon" }, - "MacaroonPath": { + "macaroon-path": { "type": "string" } }, @@ -10028,720 +9251,731 @@ "ErrorResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" } }, - "additionalProperties": false, - "required": [ - "Error" - ] + "additionalProperties": false }, - "ErrorResults": { + "Macaroon": { + "type": "object", + "additionalProperties": false + } + } + } + }, + { + "Name": "LifeFlag", + "Version": 1, + "Schema": { + "type": "object", + "properties": { + "Life": { "type": "object", "properties": { - "Results": { - "type": "array", - "items": { - "$ref": "#/definitions/ErrorResult" - } + "Params": { + "$ref": "#/definitions/Entities" + }, + "Result": { + "$ref": "#/definitions/LifeResults" } - }, - "additionalProperties": false, - "required": [ - "Results" - ] + } }, - "Macaroon": { + "Watch": { "type": "object", "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } + "Params": { + "$ref": "#/definitions/Entities" }, - "data": { + "Result": { + "$ref": "#/definitions/NotifyWatchResults" + } + } + } + }, + "definitions": { + "Entities": { + "type": "object", + "properties": { + "entities": { "type": "array", "items": { - "type": "integer" + "$ref": "#/definitions/Entity" } + } + }, + "additionalProperties": false, + "required": [ + "entities" + ] + }, + "Entity": { + "type": "object", + "properties": { + "tag": { + "type": "string" + } + }, + "additionalProperties": false, + "required": [ + "tag" + ] + }, + "Error": { + "type": "object", + "properties": { + "code": { + "type": "string" }, - "id": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" + "info": { + "$ref": "#/definitions/ErrorInfo" }, - "sig": { - "type": "array", - "items": { - "type": "integer" - } + "message": { + "type": "string" } }, "additionalProperties": false, "required": [ - "data", - "location", - "id", - "caveats", - "sig" + "message", + "code" ] }, - "StringsWatchResult": { + "ErrorInfo": { "type": "object", "properties": { - "Changes": { - "type": "array", - "items": { - "type": "string" - } + "macaroon": { + "$ref": "#/definitions/Macaroon" }, - "Error": { + "macaroon-path": { + "type": "string" + } + }, + "additionalProperties": false + }, + "LifeResult": { + "type": "object", + "properties": { + "error": { "$ref": "#/definitions/Error" }, - "StringsWatcherId": { + "life": { "type": "string" } }, "additionalProperties": false, "required": [ - "StringsWatcherId", - "Changes", - "Error" + "life" ] }, - "StringsWatchResults": { + "LifeResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { - "$ref": "#/definitions/StringsWatchResult" + "$ref": "#/definitions/LifeResult" } } }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, - "caveat": { + "Macaroon": { + "type": "object", + "additionalProperties": false + }, + "NotifyWatchResult": { "type": "object", "properties": { - "caveatId": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" + "NotifyWatcherId": { + "type": "string" }, - "verificationId": { - "$ref": "#/definitions/packet" + "error": { + "$ref": "#/definitions/Error" } }, "additionalProperties": false, "required": [ - "location", - "caveatId", - "verificationId" + "NotifyWatcherId" ] }, - "packet": { + "NotifyWatchResults": { "type": "object", "properties": { - "headerLen": { - "type": "integer" - }, - "start": { - "type": "integer" - }, - "totalLen": { - "type": "integer" + "results": { + "type": "array", + "items": { + "$ref": "#/definitions/NotifyWatchResult" + } } }, "additionalProperties": false, "required": [ - "start", - "totalLen", - "headerLen" + "results" ] } } } }, { - "Name": "MachineManager", - "Version": 2, + "Name": "LogForwarding", + "Version": 1, "Schema": { "type": "object", "properties": { - "AddMachines": { + "GetLastSent": { "type": "object", "properties": { "Params": { - "$ref": "#/definitions/AddMachines" + "$ref": "#/definitions/LogForwardingGetLastSentParams" }, "Result": { - "$ref": "#/definitions/AddMachinesResults" + "$ref": "#/definitions/LogForwardingGetLastSentResults" + } + } + }, + "SetLastSent": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/LogForwardingSetLastSentParams" + }, + "Result": { + "$ref": "#/definitions/ErrorResults" } } } }, "definitions": { - "AddMachineParams": { + "Error": { "type": "object", "properties": { - "Addrs": { - "type": "array", - "items": { - "$ref": "#/definitions/Address" - } - }, - "Constraints": { - "$ref": "#/definitions/Value" - }, - "ContainerType": { + "code": { "type": "string" }, - "Disks": { - "type": "array", - "items": { - "$ref": "#/definitions/Constraints" - } - }, - "HardwareCharacteristics": { - "$ref": "#/definitions/HardwareCharacteristics" + "info": { + "$ref": "#/definitions/ErrorInfo" }, - "InstanceId": { + "message": { "type": "string" + } + }, + "additionalProperties": false, + "required": [ + "message", + "code" + ] + }, + "ErrorInfo": { + "type": "object", + "properties": { + "macaroon": { + "$ref": "#/definitions/Macaroon" }, - "Jobs": { + "macaroon-path": { + "type": "string" + } + }, + "additionalProperties": false + }, + "ErrorResult": { + "type": "object", + "properties": { + "error": { + "$ref": "#/definitions/Error" + } + }, + "additionalProperties": false + }, + "ErrorResults": { + "type": "object", + "properties": { + "results": { "type": "array", "items": { - "type": "string" + "$ref": "#/definitions/ErrorResult" } - }, - "Nonce": { - "type": "string" - }, - "ParentId": { - "type": "string" - }, - "Placement": { - "$ref": "#/definitions/Placement" - }, - "Series": { - "type": "string" } }, "additionalProperties": false, "required": [ - "Series", - "Constraints", - "Jobs", - "Disks", - "Placement", - "ParentId", - "ContainerType", - "InstanceId", - "Nonce", - "HardwareCharacteristics", - "Addrs" + "results" ] }, - "AddMachines": { + "LogForwardingGetLastSentParams": { "type": "object", "properties": { - "MachineParams": { + "ids": { "type": "array", "items": { - "$ref": "#/definitions/AddMachineParams" + "$ref": "#/definitions/LogForwardingID" } } }, "additionalProperties": false, "required": [ - "MachineParams" + "ids" ] }, - "AddMachinesResult": { + "LogForwardingGetLastSentResult": { "type": "object", "properties": { - "Error": { + "err": { "$ref": "#/definitions/Error" }, - "Machine": { - "type": "string" + "record-id": { + "type": "integer" } }, "additionalProperties": false, "required": [ - "Machine", - "Error" + "record-id", + "err" ] }, - "AddMachinesResults": { + "LogForwardingGetLastSentResults": { "type": "object", "properties": { - "Machines": { + "results": { "type": "array", "items": { - "$ref": "#/definitions/AddMachinesResult" + "$ref": "#/definitions/LogForwardingGetLastSentResult" } } }, "additionalProperties": false, "required": [ - "Machines" + "results" ] }, - "Address": { + "LogForwardingID": { "type": "object", "properties": { - "Scope": { + "model": { "type": "string" }, - "SpaceName": { - "type": "string" - }, - "Type": { - "type": "string" - }, - "Value": { + "sink": { "type": "string" } }, "additionalProperties": false, "required": [ - "Value", - "Type", - "Scope" + "model", + "sink" ] }, - "Constraints": { + "LogForwardingSetLastSentParam": { "type": "object", "properties": { - "Count": { - "type": "integer" + "LogForwardingID": { + "$ref": "#/definitions/LogForwardingID" }, - "Pool": { - "type": "string" - }, - "Size": { + "record-id": { "type": "integer" } }, "additionalProperties": false, "required": [ - "Pool", - "Size", - "Count" + "LogForwardingID", + "record-id" ] }, - "Error": { + "LogForwardingSetLastSentParams": { "type": "object", "properties": { - "Code": { - "type": "string" - }, - "Info": { - "$ref": "#/definitions/ErrorInfo" - }, - "Message": { - "type": "string" + "params": { + "type": "array", + "items": { + "$ref": "#/definitions/LogForwardingSetLastSentParam" + } } }, "additionalProperties": false, "required": [ - "Message", - "Code" + "params" ] }, - "ErrorInfo": { + "Macaroon": { + "type": "object", + "additionalProperties": false + } + } + } + }, + { + "Name": "Logger", + "Version": 1, + "Schema": { + "type": "object", + "properties": { + "LoggingConfig": { "type": "object", "properties": { - "Macaroon": { - "$ref": "#/definitions/Macaroon" + "Params": { + "$ref": "#/definitions/Entities" }, - "MacaroonPath": { - "type": "string" + "Result": { + "$ref": "#/definitions/StringResults" } - }, - "additionalProperties": false + } }, - "HardwareCharacteristics": { + "WatchLoggingConfig": { "type": "object", "properties": { - "Arch": { - "type": "string" - }, - "AvailabilityZone": { - "type": "string" - }, - "CpuCores": { - "type": "integer" - }, - "CpuPower": { - "type": "integer" - }, - "Mem": { - "type": "integer" - }, - "RootDisk": { - "type": "integer" + "Params": { + "$ref": "#/definitions/Entities" }, - "Tags": { - "type": "array", - "items": { - "type": "string" - } + "Result": { + "$ref": "#/definitions/NotifyWatchResults" } - }, - "additionalProperties": false - }, - "Macaroon": { + } + } + }, + "definitions": { + "Entities": { "type": "object", "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } - }, - "data": { - "type": "array", - "items": { - "type": "integer" - } - }, - "id": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "sig": { + "entities": { "type": "array", "items": { - "type": "integer" + "$ref": "#/definitions/Entity" } } }, "additionalProperties": false, "required": [ - "data", - "location", - "id", - "caveats", - "sig" + "entities" ] }, - "Placement": { + "Entity": { "type": "object", "properties": { - "Directive": { - "type": "string" - }, - "Scope": { + "tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "Scope", - "Directive" + "tag" ] }, - "Value": { + "Error": { "type": "object", "properties": { - "arch": { - "type": "string" - }, - "container": { + "code": { "type": "string" }, - "cpu-cores": { - "type": "integer" - }, - "cpu-power": { - "type": "integer" + "info": { + "$ref": "#/definitions/ErrorInfo" }, - "instance-type": { + "message": { "type": "string" + } + }, + "additionalProperties": false, + "required": [ + "message", + "code" + ] + }, + "ErrorInfo": { + "type": "object", + "properties": { + "macaroon": { + "$ref": "#/definitions/Macaroon" }, - "mem": { - "type": "integer" - }, - "root-disk": { - "type": "integer" - }, - "spaces": { - "type": "array", - "items": { - "type": "string" - } + "macaroon-path": { + "type": "string" + } + }, + "additionalProperties": false + }, + "Macaroon": { + "type": "object", + "additionalProperties": false + }, + "NotifyWatchResult": { + "type": "object", + "properties": { + "NotifyWatcherId": { + "type": "string" }, - "tags": { + "error": { + "$ref": "#/definitions/Error" + } + }, + "additionalProperties": false, + "required": [ + "NotifyWatcherId" + ] + }, + "NotifyWatchResults": { + "type": "object", + "properties": { + "results": { "type": "array", "items": { - "type": "string" + "$ref": "#/definitions/NotifyWatchResult" } - }, - "virt-type": { - "type": "string" } }, - "additionalProperties": false + "additionalProperties": false, + "required": [ + "results" + ] }, - "caveat": { + "StringResult": { "type": "object", "properties": { - "caveatId": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" + "error": { + "$ref": "#/definitions/Error" }, - "verificationId": { - "$ref": "#/definitions/packet" + "result": { + "type": "string" } }, "additionalProperties": false, "required": [ - "location", - "caveatId", - "verificationId" + "result" ] }, - "packet": { + "StringResults": { "type": "object", "properties": { - "headerLen": { - "type": "integer" - }, - "start": { - "type": "integer" - }, - "totalLen": { - "type": "integer" + "results": { + "type": "array", + "items": { + "$ref": "#/definitions/StringResult" + } } }, "additionalProperties": false, "required": [ - "start", - "totalLen", - "headerLen" + "results" ] } } } }, { - "Name": "Machiner", + "Name": "MachineActions", "Version": 1, "Schema": { "type": "object", "properties": { - "APIAddresses": { - "type": "object", - "properties": { - "Result": { - "$ref": "#/definitions/StringsResult" - } - } - }, - "APIHostPorts": { + "Actions": { "type": "object", "properties": { + "Params": { + "$ref": "#/definitions/Entities" + }, "Result": { - "$ref": "#/definitions/APIHostPortsResult" + "$ref": "#/definitions/ActionResults" } } }, - "CACert": { + "BeginActions": { "type": "object", "properties": { + "Params": { + "$ref": "#/definitions/Entities" + }, "Result": { - "$ref": "#/definitions/BytesResult" + "$ref": "#/definitions/ErrorResults" } } }, - "EnsureDead": { + "FinishActions": { "type": "object", "properties": { "Params": { - "$ref": "#/definitions/Entities" + "$ref": "#/definitions/ActionExecutionResults" }, "Result": { "$ref": "#/definitions/ErrorResults" } } }, - "Jobs": { + "RunningActions": { "type": "object", "properties": { "Params": { "$ref": "#/definitions/Entities" }, "Result": { - "$ref": "#/definitions/JobsResults" + "$ref": "#/definitions/ActionsByReceivers" } } }, - "Life": { + "WatchActionNotifications": { "type": "object", "properties": { "Params": { "$ref": "#/definitions/Entities" }, "Result": { - "$ref": "#/definitions/LifeResults" + "$ref": "#/definitions/StringsWatchResults" } } - }, - "ModelUUID": { + } + }, + "definitions": { + "Action": { "type": "object", "properties": { - "Result": { - "$ref": "#/definitions/StringResult" + "name": { + "type": "string" + }, + "parameters": { + "type": "object", + "patternProperties": { + ".*": { + "type": "object", + "additionalProperties": true + } + } + }, + "receiver": { + "type": "string" + }, + "tag": { + "type": "string" } - } + }, + "additionalProperties": false, + "required": [ + "tag", + "receiver", + "name" + ] }, - "SetMachineAddresses": { + "ActionExecutionResult": { "type": "object", "properties": { - "Params": { - "$ref": "#/definitions/SetMachinesAddresses" + "action-tag": { + "type": "string" }, - "Result": { - "$ref": "#/definitions/ErrorResults" + "message": { + "type": "string" + }, + "results": { + "type": "object", + "patternProperties": { + ".*": { + "type": "object", + "additionalProperties": true + } + } + }, + "status": { + "type": "string" } - } + }, + "additionalProperties": false, + "required": [ + "action-tag", + "status" + ] }, - "SetObservedNetworkConfig": { + "ActionExecutionResults": { "type": "object", "properties": { - "Params": { - "$ref": "#/definitions/SetMachineNetworkConfig" + "results": { + "type": "array", + "items": { + "$ref": "#/definitions/ActionExecutionResult" + } } - } + }, + "additionalProperties": false }, - "SetProviderNetworkConfig": { + "ActionResult": { "type": "object", "properties": { - "Params": { - "$ref": "#/definitions/Entities" + "action": { + "$ref": "#/definitions/Action" }, - "Result": { - "$ref": "#/definitions/ErrorResults" - } - } - }, - "SetStatus": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/SetStatus" + "completed": { + "type": "string", + "format": "date-time" }, - "Result": { - "$ref": "#/definitions/ErrorResults" - } - } - }, - "UpdateStatus": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/SetStatus" + "enqueued": { + "type": "string", + "format": "date-time" }, - "Result": { - "$ref": "#/definitions/ErrorResults" - } - } - }, - "Watch": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/Entities" + "error": { + "$ref": "#/definitions/Error" }, - "Result": { - "$ref": "#/definitions/NotifyWatchResults" + "message": { + "type": "string" + }, + "output": { + "type": "object", + "patternProperties": { + ".*": { + "type": "object", + "additionalProperties": true + } + } + }, + "started": { + "type": "string", + "format": "date-time" + }, + "status": { + "type": "string" } - } + }, + "additionalProperties": false }, - "WatchAPIHostPorts": { - "type": "object", - "properties": { - "Result": { - "$ref": "#/definitions/NotifyWatchResult" - } - } - } - }, - "definitions": { - "APIHostPortsResult": { + "ActionResults": { "type": "object", "properties": { - "Servers": { + "results": { "type": "array", "items": { - "type": "array", - "items": { - "$ref": "#/definitions/HostPort" - } + "$ref": "#/definitions/ActionResult" } } }, - "additionalProperties": false, - "required": [ - "Servers" - ] + "additionalProperties": false }, - "Address": { + "ActionsByReceiver": { "type": "object", "properties": { - "Scope": { - "type": "string" - }, - "SpaceName": { - "type": "string" + "actions": { + "type": "array", + "items": { + "$ref": "#/definitions/ActionResult" + } }, - "Type": { - "type": "string" + "error": { + "$ref": "#/definitions/Error" }, - "Value": { + "receiver": { "type": "string" } }, - "additionalProperties": false, - "required": [ - "Value", - "Type", - "Scope" - ] + "additionalProperties": false }, - "BytesResult": { + "ActionsByReceivers": { "type": "object", "properties": { - "Result": { + "actions": { "type": "array", "items": { - "type": "integer" + "$ref": "#/definitions/ActionsByReceiver" } } }, - "additionalProperties": false, - "required": [ - "Result" - ] + "additionalProperties": false }, "Entities": { "type": "object", "properties": { - "Entities": { + "entities": { "type": "array", "items": { "$ref": "#/definitions/Entity" @@ -10750,77 +9984,47 @@ }, "additionalProperties": false, "required": [ - "Entities" + "entities" ] }, "Entity": { "type": "object", "properties": { - "Tag": { - "type": "string" - } - }, - "additionalProperties": false, - "required": [ - "Tag" - ] - }, - "EntityStatusArgs": { - "type": "object", - "properties": { - "Data": { - "type": "object", - "patternProperties": { - ".*": { - "type": "object", - "additionalProperties": true - } - } - }, - "Info": { - "type": "string" - }, - "Status": { - "type": "string" - }, - "Tag": { + "tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "Tag", - "Status", - "Info", - "Data" + "tag" ] }, "Error": { "type": "object", "properties": { - "Code": { + "code": { "type": "string" }, - "Info": { + "info": { "$ref": "#/definitions/ErrorInfo" }, - "Message": { + "message": { "type": "string" } }, "additionalProperties": false, "required": [ - "Message", - "Code" + "message", + "code" ] }, "ErrorInfo": { "type": "object", "properties": { - "Macaroon": { + "macaroon": { "$ref": "#/definitions/Macaroon" }, - "MacaroonPath": { + "macaroon-path": { "type": "string" } }, @@ -10829,19 +10033,16 @@ "ErrorResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" } }, - "additionalProperties": false, - "required": [ - "Error" - ] + "additionalProperties": false }, "ErrorResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/ErrorResult" @@ -10850,671 +10051,627 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, - "HostPort": { + "Macaroon": { "type": "object", - "properties": { - "Address": { - "$ref": "#/definitions/Address" - }, - "Port": { - "type": "integer" - } - }, - "additionalProperties": false, - "required": [ - "Address", - "Port" - ] + "additionalProperties": false }, - "JobsResult": { + "StringsWatchResult": { "type": "object", "properties": { - "Error": { - "$ref": "#/definitions/Error" - }, - "Jobs": { + "changes": { "type": "array", "items": { "type": "string" } + }, + "error": { + "$ref": "#/definitions/Error" + }, + "watcher-id": { + "type": "string" } }, "additionalProperties": false, "required": [ - "Jobs", - "Error" + "watcher-id" ] }, - "JobsResults": { + "StringsWatchResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { - "$ref": "#/definitions/JobsResult" + "$ref": "#/definitions/StringsWatchResult" } } }, "additionalProperties": false, "required": [ - "Results" + "results" ] - }, - "LifeResult": { + } + } + } + }, + { + "Name": "MachineManager", + "Version": 2, + "Schema": { + "type": "object", + "properties": { + "AddMachines": { "type": "object", "properties": { - "Error": { - "$ref": "#/definitions/Error" + "Params": { + "$ref": "#/definitions/AddMachines" }, - "Life": { - "type": "string" - } - }, - "additionalProperties": false, - "required": [ - "Life", - "Error" - ] - }, - "LifeResults": { - "type": "object", - "properties": { - "Results": { - "type": "array", - "items": { - "$ref": "#/definitions/LifeResult" - } + "Result": { + "$ref": "#/definitions/AddMachinesResults" } - }, - "additionalProperties": false, - "required": [ - "Results" - ] - }, - "Macaroon": { + } + } + }, + "definitions": { + "AddMachineParams": { "type": "object", "properties": { - "caveats": { + "addresses": { "type": "array", "items": { - "$ref": "#/definitions/caveat" + "$ref": "#/definitions/Address" } }, - "data": { + "constraints": { + "$ref": "#/definitions/Value" + }, + "container-type": { + "type": "string" + }, + "disks": { "type": "array", "items": { - "type": "integer" + "$ref": "#/definitions/Constraints" } }, - "id": { - "$ref": "#/definitions/packet" + "hardware-characteristics": { + "$ref": "#/definitions/HardwareCharacteristics" }, - "location": { - "$ref": "#/definitions/packet" + "instance-id": { + "type": "string" }, - "sig": { + "jobs": { "type": "array", "items": { - "type": "integer" + "type": "string" } + }, + "nonce": { + "type": "string" + }, + "parent-id": { + "type": "string" + }, + "placement": { + "$ref": "#/definitions/Placement" + }, + "series": { + "type": "string" } }, "additionalProperties": false, "required": [ - "data", - "location", - "id", - "caveats", - "sig" + "series", + "constraints", + "jobs", + "parent-id", + "container-type", + "instance-id", + "nonce", + "hardware-characteristics", + "addresses" ] }, - "MachineAddresses": { + "AddMachines": { "type": "object", "properties": { - "Addresses": { + "params": { "type": "array", "items": { - "$ref": "#/definitions/Address" + "$ref": "#/definitions/AddMachineParams" } - }, - "Tag": { - "type": "string" } }, "additionalProperties": false, "required": [ - "Tag", - "Addresses" + "params" ] }, - "NetworkConfig": { - "type": "object", - "properties": { - "Address": { - "type": "string" - }, - "CIDR": { - "type": "string" - }, - "ConfigType": { - "type": "string" - }, - "DNSSearchDomains": { - "type": "array", - "items": { - "type": "string" - } - }, - "DNSServers": { - "type": "array", - "items": { - "type": "string" - } - }, - "DeviceIndex": { - "type": "integer" - }, - "Disabled": { - "type": "boolean" - }, - "GatewayAddress": { - "type": "string" - }, - "InterfaceName": { - "type": "string" - }, - "InterfaceType": { - "type": "string" - }, - "MACAddress": { - "type": "string" - }, - "MTU": { - "type": "integer" - }, - "NoAutoStart": { - "type": "boolean" - }, - "ParentInterfaceName": { - "type": "string" - }, - "ProviderAddressId": { - "type": "string" - }, - "ProviderId": { - "type": "string" - }, - "ProviderSpaceId": { - "type": "string" - }, - "ProviderSubnetId": { - "type": "string" - }, - "ProviderVLANId": { - "type": "string" - }, - "VLANTag": { - "type": "integer" - } - }, - "additionalProperties": false, - "required": [ - "DeviceIndex", - "MACAddress", - "CIDR", - "MTU", - "ProviderId", - "ProviderSubnetId", - "ProviderSpaceId", - "ProviderAddressId", - "ProviderVLANId", - "VLANTag", - "InterfaceName", - "ParentInterfaceName", - "InterfaceType", - "Disabled" - ] - }, - "NotifyWatchResult": { + "AddMachinesResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" }, - "NotifyWatcherId": { + "machine": { "type": "string" } }, "additionalProperties": false, "required": [ - "NotifyWatcherId", - "Error" + "machine" ] }, - "NotifyWatchResults": { + "AddMachinesResults": { "type": "object", "properties": { - "Results": { + "machines": { "type": "array", "items": { - "$ref": "#/definitions/NotifyWatchResult" + "$ref": "#/definitions/AddMachinesResult" } } }, "additionalProperties": false, "required": [ - "Results" + "machines" ] }, - "SetMachineNetworkConfig": { + "Address": { "type": "object", "properties": { - "Config": { - "type": "array", - "items": { - "$ref": "#/definitions/NetworkConfig" - } + "scope": { + "type": "string" }, - "Tag": { + "space-name": { + "type": "string" + }, + "type": { + "type": "string" + }, + "value": { "type": "string" } }, "additionalProperties": false, "required": [ - "Tag", - "Config" + "value", + "type", + "scope" ] }, - "SetMachinesAddresses": { + "Constraints": { "type": "object", "properties": { - "MachineAddresses": { - "type": "array", - "items": { - "$ref": "#/definitions/MachineAddresses" - } + "Count": { + "type": "integer" + }, + "Pool": { + "type": "string" + }, + "Size": { + "type": "integer" } }, "additionalProperties": false, "required": [ - "MachineAddresses" + "Pool", + "Size", + "Count" ] }, - "SetStatus": { + "Error": { "type": "object", "properties": { - "Entities": { - "type": "array", - "items": { - "$ref": "#/definitions/EntityStatusArgs" - } + "code": { + "type": "string" + }, + "info": { + "$ref": "#/definitions/ErrorInfo" + }, + "message": { + "type": "string" } }, "additionalProperties": false, "required": [ - "Entities" + "message", + "code" ] }, - "StringResult": { + "ErrorInfo": { "type": "object", "properties": { - "Error": { - "$ref": "#/definitions/Error" + "macaroon": { + "$ref": "#/definitions/Macaroon" }, - "Result": { + "macaroon-path": { "type": "string" } }, - "additionalProperties": false, - "required": [ - "Error", - "Result" - ] + "additionalProperties": false }, - "StringsResult": { + "HardwareCharacteristics": { "type": "object", "properties": { - "Error": { - "$ref": "#/definitions/Error" + "arch": { + "type": "string" }, - "Result": { + "availability-zone": { + "type": "string" + }, + "cpu-cores": { + "type": "integer" + }, + "cpu-power": { + "type": "integer" + }, + "mem": { + "type": "integer" + }, + "root-disk": { + "type": "integer" + }, + "tags": { "type": "array", "items": { "type": "string" } } }, - "additionalProperties": false, - "required": [ - "Error", - "Result" - ] + "additionalProperties": false + }, + "Macaroon": { + "type": "object", + "additionalProperties": false }, - "caveat": { + "Placement": { "type": "object", "properties": { - "caveatId": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" + "directive": { + "type": "string" }, - "verificationId": { - "$ref": "#/definitions/packet" + "scope": { + "type": "string" } }, "additionalProperties": false, "required": [ - "location", - "caveatId", - "verificationId" + "scope", + "directive" ] }, - "packet": { + "Value": { "type": "object", "properties": { - "headerLen": { + "arch": { + "type": "string" + }, + "container": { + "type": "string" + }, + "cpu-cores": { "type": "integer" }, - "start": { + "cpu-power": { + "type": "integer" + }, + "instance-type": { + "type": "string" + }, + "mem": { "type": "integer" }, - "totalLen": { + "root-disk": { "type": "integer" + }, + "spaces": { + "type": "array", + "items": { + "type": "string" + } + }, + "tags": { + "type": "array", + "items": { + "type": "string" + } + }, + "virt-type": { + "type": "string" } }, - "additionalProperties": false, - "required": [ - "start", - "totalLen", - "headerLen" - ] + "additionalProperties": false } } } }, { - "Name": "MeterStatus", + "Name": "Machiner", "Version": 1, "Schema": { "type": "object", "properties": { - "GetMeterStatus": { + "APIAddresses": { "type": "object", "properties": { - "Params": { - "$ref": "#/definitions/Entities" - }, "Result": { - "$ref": "#/definitions/MeterStatusResults" + "$ref": "#/definitions/StringsResult" } } }, - "WatchMeterStatus": { + "APIHostPorts": { "type": "object", "properties": { - "Params": { - "$ref": "#/definitions/Entities" - }, "Result": { - "$ref": "#/definitions/NotifyWatchResults" + "$ref": "#/definitions/APIHostPortsResult" } } - } - }, - "definitions": { - "Entities": { + }, + "CACert": { "type": "object", "properties": { - "Entities": { - "type": "array", - "items": { - "$ref": "#/definitions/Entity" - } + "Result": { + "$ref": "#/definitions/BytesResult" } - }, - "additionalProperties": false, - "required": [ - "Entities" - ] + } }, - "Entity": { + "EnsureDead": { "type": "object", "properties": { - "Tag": { - "type": "string" + "Params": { + "$ref": "#/definitions/Entities" + }, + "Result": { + "$ref": "#/definitions/ErrorResults" } - }, - "additionalProperties": false, - "required": [ - "Tag" - ] + } }, - "Error": { + "Jobs": { "type": "object", "properties": { - "Code": { - "type": "string" - }, - "Info": { - "$ref": "#/definitions/ErrorInfo" + "Params": { + "$ref": "#/definitions/Entities" }, - "Message": { - "type": "string" + "Result": { + "$ref": "#/definitions/JobsResults" } - }, - "additionalProperties": false, - "required": [ - "Message", - "Code" - ] + } }, - "ErrorInfo": { + "Life": { "type": "object", "properties": { - "Macaroon": { - "$ref": "#/definitions/Macaroon" + "Params": { + "$ref": "#/definitions/Entities" }, - "MacaroonPath": { - "type": "string" + "Result": { + "$ref": "#/definitions/LifeResults" } - }, - "additionalProperties": false + } }, - "Macaroon": { + "ModelUUID": { "type": "object", "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } + "Result": { + "$ref": "#/definitions/StringResult" + } + } + }, + "SetMachineAddresses": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/SetMachinesAddresses" }, - "data": { - "type": "array", - "items": { - "type": "integer" - } + "Result": { + "$ref": "#/definitions/ErrorResults" + } + } + }, + "SetObservedNetworkConfig": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/SetMachineNetworkConfig" + } + } + }, + "SetProviderNetworkConfig": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/Entities" }, - "id": { - "$ref": "#/definitions/packet" + "Result": { + "$ref": "#/definitions/ErrorResults" + } + } + }, + "SetStatus": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/SetStatus" }, - "location": { - "$ref": "#/definitions/packet" + "Result": { + "$ref": "#/definitions/ErrorResults" + } + } + }, + "UpdateStatus": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/SetStatus" + }, + "Result": { + "$ref": "#/definitions/ErrorResults" + } + } + }, + "Watch": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/Entities" }, - "sig": { + "Result": { + "$ref": "#/definitions/NotifyWatchResults" + } + } + }, + "WatchAPIHostPorts": { + "type": "object", + "properties": { + "Result": { + "$ref": "#/definitions/NotifyWatchResult" + } + } + } + }, + "definitions": { + "APIHostPortsResult": { + "type": "object", + "properties": { + "servers": { "type": "array", "items": { - "type": "integer" + "type": "array", + "items": { + "$ref": "#/definitions/HostPort" + } } } }, "additionalProperties": false, "required": [ - "data", - "location", - "id", - "caveats", - "sig" + "servers" ] }, - "MeterStatusResult": { + "Address": { "type": "object", "properties": { - "Code": { + "scope": { "type": "string" }, - "Error": { - "$ref": "#/definitions/Error" + "space-name": { + "type": "string" + }, + "type": { + "type": "string" }, - "Info": { + "value": { "type": "string" } }, "additionalProperties": false, "required": [ - "Code", - "Info", - "Error" + "value", + "type", + "scope" ] }, - "MeterStatusResults": { + "BytesResult": { "type": "object", "properties": { - "Results": { + "result": { "type": "array", "items": { - "$ref": "#/definitions/MeterStatusResult" + "type": "integer" } } }, "additionalProperties": false, "required": [ - "Results" - ] - }, - "NotifyWatchResult": { - "type": "object", - "properties": { - "Error": { - "$ref": "#/definitions/Error" - }, - "NotifyWatcherId": { - "type": "string" - } - }, - "additionalProperties": false, - "required": [ - "NotifyWatcherId", - "Error" + "result" ] }, - "NotifyWatchResults": { + "Entities": { "type": "object", "properties": { - "Results": { + "entities": { "type": "array", "items": { - "$ref": "#/definitions/NotifyWatchResult" + "$ref": "#/definitions/Entity" } } }, "additionalProperties": false, "required": [ - "Results" + "entities" ] }, - "caveat": { + "Entity": { "type": "object", "properties": { - "caveatId": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "verificationId": { - "$ref": "#/definitions/packet" + "tag": { + "type": "string" } }, "additionalProperties": false, "required": [ - "location", - "caveatId", - "verificationId" + "tag" ] }, - "packet": { + "EntityStatusArgs": { "type": "object", "properties": { - "headerLen": { - "type": "integer" + "data": { + "type": "object", + "patternProperties": { + ".*": { + "type": "object", + "additionalProperties": true + } + } }, - "start": { - "type": "integer" + "info": { + "type": "string" }, - "totalLen": { - "type": "integer" + "status": { + "type": "string" + }, + "tag": { + "type": "string" } }, "additionalProperties": false, "required": [ - "start", - "totalLen", - "headerLen" + "tag", + "status", + "info", + "data" ] - } - } - } - }, - { - "Name": "MetricsAdder", - "Version": 2, - "Schema": { - "type": "object", - "properties": { - "AddMetricBatches": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/MetricBatchParams" - }, - "Result": { - "$ref": "#/definitions/ErrorResults" - } - } - } - }, - "definitions": { + }, "Error": { "type": "object", "properties": { - "Code": { + "code": { "type": "string" }, - "Info": { + "info": { "$ref": "#/definitions/ErrorInfo" }, - "Message": { + "message": { "type": "string" } }, "additionalProperties": false, "required": [ - "Message", - "Code" + "message", + "code" ] }, "ErrorInfo": { "type": "object", "properties": { - "Macaroon": { + "macaroon": { "$ref": "#/definitions/Macaroon" }, - "MacaroonPath": { + "macaroon-path": { "type": "string" } }, @@ -11523,19 +10680,16 @@ "ErrorResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" } }, - "additionalProperties": false, - "required": [ - "Error" - ] + "additionalProperties": false }, "ErrorResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/ErrorResult" @@ -11544,194 +10698,336 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, - "Macaroon": { + "HostPort": { "type": "object", "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } - }, - "data": { - "type": "array", - "items": { - "type": "integer" - } - }, - "id": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" + "Address": { + "$ref": "#/definitions/Address" }, - "sig": { - "type": "array", - "items": { - "type": "integer" - } + "port": { + "type": "integer" } }, "additionalProperties": false, "required": [ - "data", - "location", - "id", - "caveats", - "sig" + "Address", + "port" ] }, - "Metric": { + "JobsResult": { "type": "object", "properties": { - "Key": { - "type": "string" - }, - "Time": { - "type": "string", - "format": "date-time" + "error": { + "$ref": "#/definitions/Error" }, - "Value": { - "type": "string" + "jobs": { + "type": "array", + "items": { + "type": "string" + } } }, "additionalProperties": false, "required": [ - "Key", - "Value", - "Time" + "jobs" ] }, - "MetricBatch": { + "JobsResults": { "type": "object", "properties": { - "CharmURL": { - "type": "string" - }, - "Created": { - "type": "string", - "format": "date-time" - }, - "Metrics": { + "results": { "type": "array", "items": { - "$ref": "#/definitions/Metric" + "$ref": "#/definitions/JobsResult" } - }, - "UUID": { - "type": "string" } }, "additionalProperties": false, "required": [ - "UUID", - "CharmURL", - "Created", - "Metrics" + "results" ] }, - "MetricBatchParam": { + "LifeResult": { "type": "object", "properties": { - "Batch": { - "$ref": "#/definitions/MetricBatch" + "error": { + "$ref": "#/definitions/Error" }, - "Tag": { + "life": { "type": "string" } }, "additionalProperties": false, "required": [ - "Tag", - "Batch" + "life" ] }, - "MetricBatchParams": { + "LifeResults": { "type": "object", "properties": { - "Batches": { + "results": { "type": "array", "items": { - "$ref": "#/definitions/MetricBatchParam" + "$ref": "#/definitions/LifeResult" } } }, "additionalProperties": false, "required": [ - "Batches" + "results" ] }, - "caveat": { + "Macaroon": { + "type": "object", + "additionalProperties": false + }, + "MachineAddresses": { "type": "object", "properties": { - "caveatId": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" + "addresses": { + "type": "array", + "items": { + "$ref": "#/definitions/Address" + } }, - "verificationId": { - "$ref": "#/definitions/packet" + "tag": { + "type": "string" } }, "additionalProperties": false, "required": [ - "location", - "caveatId", - "verificationId" + "tag", + "addresses" ] }, - "packet": { + "NetworkConfig": { "type": "object", "properties": { - "headerLen": { + "address": { + "type": "string" + }, + "cidr": { + "type": "string" + }, + "config-type": { + "type": "string" + }, + "device-index": { "type": "integer" }, - "start": { + "disabled": { + "type": "boolean" + }, + "dns-search-domains": { + "type": "array", + "items": { + "type": "string" + } + }, + "dns-servers": { + "type": "array", + "items": { + "type": "string" + } + }, + "gateway-address": { + "type": "string" + }, + "interface-name": { + "type": "string" + }, + "interface-type": { + "type": "string" + }, + "mac-address": { + "type": "string" + }, + "mtu": { "type": "integer" }, - "totalLen": { + "no-auto-start": { + "type": "boolean" + }, + "parent-interface-name": { + "type": "string" + }, + "provider-address-id": { + "type": "string" + }, + "provider-id": { + "type": "string" + }, + "provider-space-id": { + "type": "string" + }, + "provider-subnet-id": { + "type": "string" + }, + "provider-vlan-id": { + "type": "string" + }, + "vlan-tag": { "type": "integer" } }, "additionalProperties": false, "required": [ - "start", - "totalLen", - "headerLen" + "device-index", + "mac-address", + "cidr", + "mtu", + "provider-id", + "provider-subnet-id", + "provider-space-id", + "provider-address-id", + "provider-vlan-id", + "vlan-tag", + "interface-name", + "parent-interface-name", + "interface-type", + "disabled" + ] + }, + "NotifyWatchResult": { + "type": "object", + "properties": { + "NotifyWatcherId": { + "type": "string" + }, + "error": { + "$ref": "#/definitions/Error" + } + }, + "additionalProperties": false, + "required": [ + "NotifyWatcherId" + ] + }, + "NotifyWatchResults": { + "type": "object", + "properties": { + "results": { + "type": "array", + "items": { + "$ref": "#/definitions/NotifyWatchResult" + } + } + }, + "additionalProperties": false, + "required": [ + "results" + ] + }, + "SetMachineNetworkConfig": { + "type": "object", + "properties": { + "config": { + "type": "array", + "items": { + "$ref": "#/definitions/NetworkConfig" + } + }, + "tag": { + "type": "string" + } + }, + "additionalProperties": false, + "required": [ + "tag", + "config" + ] + }, + "SetMachinesAddresses": { + "type": "object", + "properties": { + "machine-addresses": { + "type": "array", + "items": { + "$ref": "#/definitions/MachineAddresses" + } + } + }, + "additionalProperties": false, + "required": [ + "machine-addresses" + ] + }, + "SetStatus": { + "type": "object", + "properties": { + "entities": { + "type": "array", + "items": { + "$ref": "#/definitions/EntityStatusArgs" + } + } + }, + "additionalProperties": false, + "required": [ + "entities" + ] + }, + "StringResult": { + "type": "object", + "properties": { + "error": { + "$ref": "#/definitions/Error" + }, + "result": { + "type": "string" + } + }, + "additionalProperties": false, + "required": [ + "result" ] + }, + "StringsResult": { + "type": "object", + "properties": { + "error": { + "$ref": "#/definitions/Error" + }, + "result": { + "type": "array", + "items": { + "type": "string" + } + } + }, + "additionalProperties": false } } } }, { - "Name": "MetricsDebug", + "Name": "MeterStatus", "Version": 1, "Schema": { "type": "object", "properties": { - "GetMetrics": { + "GetMeterStatus": { "type": "object", "properties": { "Params": { "$ref": "#/definitions/Entities" }, "Result": { - "$ref": "#/definitions/MetricResults" + "$ref": "#/definitions/MeterStatusResults" } } }, - "SetMeterStatus": { + "WatchMeterStatus": { "type": "object", "properties": { "Params": { - "$ref": "#/definitions/MeterStatusParams" + "$ref": "#/definitions/Entities" }, "Result": { - "$ref": "#/definitions/ErrorResults" + "$ref": "#/definitions/NotifyWatchResults" } } } @@ -11740,7 +11036,7 @@ "Entities": { "type": "object", "properties": { - "Entities": { + "entities": { "type": "array", "items": { "$ref": "#/definitions/Entity" @@ -11749,167 +11045,202 @@ }, "additionalProperties": false, "required": [ - "Entities" + "entities" ] }, "Entity": { "type": "object", "properties": { - "Tag": { + "tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "Tag" + "tag" ] }, - "EntityMetrics": { - "type": "object", - "properties": { - "error": { - "$ref": "#/definitions/Error" - }, - "metrics": { - "type": "array", - "items": { - "$ref": "#/definitions/MetricResult" - } - } - }, - "additionalProperties": false - }, "Error": { "type": "object", "properties": { - "Code": { + "code": { "type": "string" }, - "Info": { + "info": { "$ref": "#/definitions/ErrorInfo" }, - "Message": { + "message": { "type": "string" } }, "additionalProperties": false, "required": [ - "Message", - "Code" + "message", + "code" ] }, "ErrorInfo": { "type": "object", "properties": { - "Macaroon": { + "macaroon": { "$ref": "#/definitions/Macaroon" }, - "MacaroonPath": { + "macaroon-path": { "type": "string" } }, "additionalProperties": false }, - "ErrorResult": { + "Macaroon": { + "type": "object", + "additionalProperties": false + }, + "MeterStatusResult": { "type": "object", "properties": { - "Error": { + "code": { + "type": "string" + }, + "error": { "$ref": "#/definitions/Error" + }, + "info": { + "type": "string" } }, "additionalProperties": false, "required": [ - "Error" + "code", + "info" ] }, - "ErrorResults": { + "MeterStatusResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { - "$ref": "#/definitions/ErrorResult" + "$ref": "#/definitions/MeterStatusResult" } } }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, - "Macaroon": { + "NotifyWatchResult": { "type": "object", "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } - }, - "data": { - "type": "array", - "items": { - "type": "integer" - } - }, - "id": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" + "NotifyWatcherId": { + "type": "string" }, - "sig": { - "type": "array", - "items": { - "type": "integer" - } + "error": { + "$ref": "#/definitions/Error" } }, "additionalProperties": false, "required": [ - "data", - "location", - "id", - "caveats", - "sig" + "NotifyWatcherId" ] }, - "MeterStatusParam": { + "NotifyWatchResults": { + "type": "object", + "properties": { + "results": { + "type": "array", + "items": { + "$ref": "#/definitions/NotifyWatchResult" + } + } + }, + "additionalProperties": false, + "required": [ + "results" + ] + } + } + } + }, + { + "Name": "MetricsAdder", + "Version": 2, + "Schema": { + "type": "object", + "properties": { + "AddMetricBatches": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/MetricBatchParams" + }, + "Result": { + "$ref": "#/definitions/ErrorResults" + } + } + } + }, + "definitions": { + "Error": { "type": "object", "properties": { "code": { "type": "string" }, "info": { - "type": "string" + "$ref": "#/definitions/ErrorInfo" }, - "tag": { + "message": { "type": "string" } }, "additionalProperties": false, "required": [ - "tag", - "code", - "info" + "message", + "code" ] }, - "MeterStatusParams": { + "ErrorInfo": { "type": "object", "properties": { - "statues": { + "macaroon": { + "$ref": "#/definitions/Macaroon" + }, + "macaroon-path": { + "type": "string" + } + }, + "additionalProperties": false + }, + "ErrorResult": { + "type": "object", + "properties": { + "error": { + "$ref": "#/definitions/Error" + } + }, + "additionalProperties": false + }, + "ErrorResults": { + "type": "object", + "properties": { + "results": { "type": "array", "items": { - "$ref": "#/definitions/MeterStatusParam" + "$ref": "#/definitions/ErrorResult" } } }, "additionalProperties": false, "required": [ - "statues" + "results" ] }, - "MetricResult": { + "Macaroon": { + "type": "object", + "additionalProperties": false + }, + "Metric": { "type": "object", "properties": { "key": { @@ -11925,91 +11256,95 @@ }, "additionalProperties": false, "required": [ - "time", "key", - "value" + "value", + "time" ] }, - "MetricResults": { + "MetricBatch": { "type": "object", "properties": { - "results": { + "charm-url": { + "type": "string" + }, + "created": { + "type": "string", + "format": "date-time" + }, + "metrics": { "type": "array", "items": { - "$ref": "#/definitions/EntityMetrics" + "$ref": "#/definitions/Metric" } + }, + "uuid": { + "type": "string" } }, "additionalProperties": false, "required": [ - "results" + "uuid", + "charm-url", + "created", + "metrics" ] }, - "caveat": { + "MetricBatchParam": { "type": "object", "properties": { - "caveatId": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" + "batch": { + "$ref": "#/definitions/MetricBatch" }, - "verificationId": { - "$ref": "#/definitions/packet" + "tag": { + "type": "string" } }, "additionalProperties": false, "required": [ - "location", - "caveatId", - "verificationId" + "tag", + "batch" ] }, - "packet": { + "MetricBatchParams": { "type": "object", "properties": { - "headerLen": { - "type": "integer" - }, - "start": { - "type": "integer" - }, - "totalLen": { - "type": "integer" + "batches": { + "type": "array", + "items": { + "$ref": "#/definitions/MetricBatchParam" + } } }, "additionalProperties": false, "required": [ - "start", - "totalLen", - "headerLen" + "batches" ] } } } }, { - "Name": "MetricsManager", - "Version": 1, + "Name": "MetricsDebug", + "Version": 2, "Schema": { "type": "object", "properties": { - "CleanupOldMetrics": { + "GetMetrics": { "type": "object", "properties": { "Params": { "$ref": "#/definitions/Entities" }, "Result": { - "$ref": "#/definitions/ErrorResults" + "$ref": "#/definitions/MetricResults" } } }, - "SendMetrics": { + "SetMeterStatus": { "type": "object", "properties": { "Params": { - "$ref": "#/definitions/Entities" + "$ref": "#/definitions/MeterStatusParams" }, "Result": { "$ref": "#/definitions/ErrorResults" @@ -12021,7 +11356,7 @@ "Entities": { "type": "object", "properties": { - "Entities": { + "entities": { "type": "array", "items": { "$ref": "#/definitions/Entity" @@ -12030,47 +11365,62 @@ }, "additionalProperties": false, "required": [ - "Entities" + "entities" ] }, "Entity": { "type": "object", "properties": { - "Tag": { + "tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "Tag" + "tag" ] }, + "EntityMetrics": { + "type": "object", + "properties": { + "error": { + "$ref": "#/definitions/Error" + }, + "metrics": { + "type": "array", + "items": { + "$ref": "#/definitions/MetricResult" + } + } + }, + "additionalProperties": false + }, "Error": { "type": "object", "properties": { - "Code": { + "code": { "type": "string" }, - "Info": { + "info": { "$ref": "#/definitions/ErrorInfo" }, - "Message": { + "message": { "type": "string" } }, "additionalProperties": false, "required": [ - "Message", - "Code" + "message", + "code" ] }, "ErrorInfo": { "type": "object", "properties": { - "Macaroon": { + "macaroon": { "$ref": "#/definitions/Macaroon" }, - "MacaroonPath": { + "macaroon-path": { "type": "string" } }, @@ -12079,19 +11429,16 @@ "ErrorResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" } }, - "additionalProperties": false, - "required": [ - "Error" - ] + "additionalProperties": false }, "ErrorResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/ErrorResult" @@ -12100,114 +11447,112 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "Macaroon": { + "type": "object", + "additionalProperties": false + }, + "MeterStatusParam": { "type": "object", "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } - }, - "data": { - "type": "array", - "items": { - "type": "integer" - } - }, - "id": { - "$ref": "#/definitions/packet" + "code": { + "type": "string" }, - "location": { - "$ref": "#/definitions/packet" + "info": { + "type": "string" }, - "sig": { + "tag": { + "type": "string" + } + }, + "additionalProperties": false, + "required": [ + "tag", + "code", + "info" + ] + }, + "MeterStatusParams": { + "type": "object", + "properties": { + "statues": { "type": "array", "items": { - "type": "integer" + "$ref": "#/definitions/MeterStatusParam" } } }, "additionalProperties": false, "required": [ - "data", - "location", - "id", - "caveats", - "sig" + "statues" ] }, - "caveat": { + "MetricResult": { "type": "object", "properties": { - "caveatId": { - "$ref": "#/definitions/packet" + "key": { + "type": "string" }, - "location": { - "$ref": "#/definitions/packet" + "time": { + "type": "string", + "format": "date-time" }, - "verificationId": { - "$ref": "#/definitions/packet" + "value": { + "type": "string" } }, "additionalProperties": false, "required": [ - "location", - "caveatId", - "verificationId" + "time", + "key", + "value" ] }, - "packet": { + "MetricResults": { "type": "object", "properties": { - "headerLen": { - "type": "integer" - }, - "start": { - "type": "integer" - }, - "totalLen": { - "type": "integer" + "results": { + "type": "array", + "items": { + "$ref": "#/definitions/EntityMetrics" + } } }, "additionalProperties": false, "required": [ - "start", - "totalLen", - "headerLen" + "results" ] } } } }, { - "Name": "MigrationFlag", + "Name": "MetricsManager", "Version": 1, "Schema": { "type": "object", "properties": { - "Phase": { + "CleanupOldMetrics": { "type": "object", "properties": { "Params": { "$ref": "#/definitions/Entities" }, "Result": { - "$ref": "#/definitions/PhaseResults" + "$ref": "#/definitions/ErrorResults" } } }, - "Watch": { + "SendMetrics": { "type": "object", "properties": { "Params": { "$ref": "#/definitions/Entities" }, "Result": { - "$ref": "#/definitions/NotifyWatchResults" + "$ref": "#/definitions/ErrorResults" } } } @@ -12216,7 +11561,7 @@ "Entities": { "type": "object", "properties": { - "Entities": { + "entities": { "type": "array", "items": { "$ref": "#/definitions/Entity" @@ -12225,189 +11570,233 @@ }, "additionalProperties": false, "required": [ - "Entities" + "entities" ] }, "Entity": { "type": "object", "properties": { - "Tag": { + "tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "Tag" + "tag" ] }, "Error": { "type": "object", "properties": { - "Code": { + "code": { "type": "string" }, - "Info": { + "info": { "$ref": "#/definitions/ErrorInfo" }, - "Message": { + "message": { "type": "string" } }, "additionalProperties": false, "required": [ - "Message", - "Code" + "message", + "code" ] }, "ErrorInfo": { "type": "object", "properties": { - "Macaroon": { + "macaroon": { "$ref": "#/definitions/Macaroon" }, - "MacaroonPath": { + "macaroon-path": { "type": "string" } }, "additionalProperties": false }, - "Macaroon": { + "ErrorResult": { "type": "object", "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } - }, - "data": { + "error": { + "$ref": "#/definitions/Error" + } + }, + "additionalProperties": false + }, + "ErrorResults": { + "type": "object", + "properties": { + "results": { "type": "array", "items": { - "type": "integer" + "$ref": "#/definitions/ErrorResult" } + } + }, + "additionalProperties": false, + "required": [ + "results" + ] + }, + "Macaroon": { + "type": "object", + "additionalProperties": false + } + } + } + }, + { + "Name": "MigrationFlag", + "Version": 1, + "Schema": { + "type": "object", + "properties": { + "Phase": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/Entities" }, - "id": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" + "Result": { + "$ref": "#/definitions/PhaseResults" + } + } + }, + "Watch": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/Entities" }, - "sig": { + "Result": { + "$ref": "#/definitions/NotifyWatchResults" + } + } + } + }, + "definitions": { + "Entities": { + "type": "object", + "properties": { + "entities": { "type": "array", "items": { - "type": "integer" + "$ref": "#/definitions/Entity" } } }, "additionalProperties": false, "required": [ - "data", - "location", - "id", - "caveats", - "sig" + "entities" ] }, - "NotifyWatchResult": { + "Entity": { "type": "object", "properties": { - "Error": { - "$ref": "#/definitions/Error" - }, - "NotifyWatcherId": { + "tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "NotifyWatcherId", - "Error" + "tag" ] }, - "NotifyWatchResults": { + "Error": { "type": "object", "properties": { - "Results": { - "type": "array", - "items": { - "$ref": "#/definitions/NotifyWatchResult" - } + "code": { + "type": "string" + }, + "info": { + "$ref": "#/definitions/ErrorInfo" + }, + "message": { + "type": "string" } }, "additionalProperties": false, "required": [ - "Results" + "message", + "code" ] }, - "PhaseResult": { + "ErrorInfo": { "type": "object", "properties": { - "Error": { - "$ref": "#/definitions/Error" + "macaroon": { + "$ref": "#/definitions/Macaroon" }, - "phase": { + "macaroon-path": { + "type": "string" + } + }, + "additionalProperties": false + }, + "Macaroon": { + "type": "object", + "additionalProperties": false + }, + "NotifyWatchResult": { + "type": "object", + "properties": { + "NotifyWatcherId": { "type": "string" + }, + "error": { + "$ref": "#/definitions/Error" } }, "additionalProperties": false, "required": [ - "phase", - "Error" + "NotifyWatcherId" ] }, - "PhaseResults": { + "NotifyWatchResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { - "$ref": "#/definitions/PhaseResult" + "$ref": "#/definitions/NotifyWatchResult" } } }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, - "caveat": { + "PhaseResult": { "type": "object", "properties": { - "caveatId": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" + "error": { + "$ref": "#/definitions/Error" }, - "verificationId": { - "$ref": "#/definitions/packet" + "phase": { + "type": "string" } }, "additionalProperties": false, "required": [ - "location", - "caveatId", - "verificationId" + "phase" ] }, - "packet": { + "PhaseResults": { "type": "object", "properties": { - "headerLen": { - "type": "integer" - }, - "start": { - "type": "integer" - }, - "totalLen": { - "type": "integer" + "results": { + "type": "array", + "items": { + "$ref": "#/definitions/PhaseResult" + } } }, "additionalProperties": false, "required": [ - "start", - "totalLen", - "headerLen" + "results" ] } } @@ -12456,29 +11845,29 @@ "Error": { "type": "object", "properties": { - "Code": { + "code": { "type": "string" }, - "Info": { + "info": { "$ref": "#/definitions/ErrorInfo" }, - "Message": { + "message": { "type": "string" } }, "additionalProperties": false, "required": [ - "Message", - "Code" + "message", + "code" ] }, "ErrorInfo": { "type": "object", "properties": { - "Macaroon": { + "macaroon": { "$ref": "#/definitions/Macaroon" }, - "MacaroonPath": { + "macaroon-path": { "type": "string" } }, @@ -12506,40 +11895,7 @@ }, "Macaroon": { "type": "object", - "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } - }, - "data": { - "type": "array", - "items": { - "type": "integer" - } - }, - "id": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "sig": { - "type": "array", - "items": { - "type": "integer" - } - } - }, - "additionalProperties": false, - "required": [ - "data", - "location", - "id", - "caveats", - "sig" - ] + "additionalProperties": false }, "ModelMigrationSpec": { "type": "object", @@ -12591,17 +11947,16 @@ "NotifyWatchResult": { "type": "object", "properties": { - "Error": { - "$ref": "#/definitions/Error" - }, "NotifyWatcherId": { "type": "string" + }, + "error": { + "$ref": "#/definitions/Error" } }, "additionalProperties": false, "required": [ - "NotifyWatcherId", - "Error" + "NotifyWatcherId" ] }, "SerializedModel": { @@ -12630,46 +11985,6 @@ "required": [ "phase" ] - }, - "caveat": { - "type": "object", - "properties": { - "caveatId": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "verificationId": { - "$ref": "#/definitions/packet" - } - }, - "additionalProperties": false, - "required": [ - "location", - "caveatId", - "verificationId" - ] - }, - "packet": { - "type": "object", - "properties": { - "headerLen": { - "type": "integer" - }, - "start": { - "type": "integer" - }, - "totalLen": { - "type": "integer" - } - }, - "additionalProperties": false, - "required": [ - "start", - "totalLen", - "headerLen" - ] } } } @@ -12693,29 +12008,29 @@ "Error": { "type": "object", "properties": { - "Code": { + "code": { "type": "string" }, - "Info": { + "info": { "$ref": "#/definitions/ErrorInfo" }, - "Message": { + "message": { "type": "string" } }, "additionalProperties": false, "required": [ - "Message", - "Code" + "message", + "code" ] }, "ErrorInfo": { "type": "object", "properties": { - "Macaroon": { + "macaroon": { "$ref": "#/definitions/Macaroon" }, - "MacaroonPath": { + "macaroon-path": { "type": "string" } }, @@ -12723,95 +12038,21 @@ }, "Macaroon": { "type": "object", - "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } - }, - "data": { - "type": "array", - "items": { - "type": "integer" - } - }, - "id": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "sig": { - "type": "array", - "items": { - "type": "integer" - } - } - }, - "additionalProperties": false, - "required": [ - "data", - "location", - "id", - "caveats", - "sig" - ] + "additionalProperties": false }, "NotifyWatchResult": { "type": "object", "properties": { - "Error": { - "$ref": "#/definitions/Error" - }, "NotifyWatcherId": { "type": "string" - } - }, - "additionalProperties": false, - "required": [ - "NotifyWatcherId", - "Error" - ] - }, - "caveat": { - "type": "object", - "properties": { - "caveatId": { - "$ref": "#/definitions/packet" }, - "location": { - "$ref": "#/definitions/packet" - }, - "verificationId": { - "$ref": "#/definitions/packet" - } - }, - "additionalProperties": false, - "required": [ - "location", - "caveatId", - "verificationId" - ] - }, - "packet": { - "type": "object", - "properties": { - "headerLen": { - "type": "integer" - }, - "start": { - "type": "integer" - }, - "totalLen": { - "type": "integer" + "error": { + "$ref": "#/definitions/Error" } }, "additionalProperties": false, "required": [ - "start", - "totalLen", - "headerLen" + "NotifyWatcherId" ] } } @@ -12945,17 +12186,6 @@ "Schema": { "type": "object", "properties": { - "ConfigSkeleton": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/ModelSkeletonConfigArgs" - }, - "Result": { - "$ref": "#/definitions/ModelConfigResult" - } - } - }, "CreateModel": { "type": "object", "properties": { @@ -12963,10 +12193,13 @@ "$ref": "#/definitions/ModelCreateArgs" }, "Result": { - "$ref": "#/definitions/Model" + "$ref": "#/definitions/ModelInfo" } } }, + "DestroyModel": { + "type": "object" + }, "ListModels": { "type": "object", "properties": { @@ -13005,7 +12238,7 @@ "Entities": { "type": "object", "properties": { - "Entities": { + "entities": { "type": "array", "items": { "$ref": "#/definitions/Entity" @@ -13014,25 +12247,25 @@ }, "additionalProperties": false, "required": [ - "Entities" + "entities" ] }, "Entity": { "type": "object", "properties": { - "Tag": { + "tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "Tag" + "tag" ] }, "EntityStatus": { "type": "object", "properties": { - "Data": { + "data": { "type": "object", "patternProperties": { ".*": { @@ -13041,51 +12274,50 @@ } } }, - "Info": { + "info": { "type": "string" }, - "Since": { + "since": { "type": "string", "format": "date-time" }, - "Status": { + "status": { "type": "string" } }, "additionalProperties": false, "required": [ - "Status", - "Info", - "Data", - "Since" + "status", + "info", + "since" ] }, "Error": { "type": "object", "properties": { - "Code": { + "code": { "type": "string" }, - "Info": { + "info": { "$ref": "#/definitions/ErrorInfo" }, - "Message": { + "message": { "type": "string" } }, "additionalProperties": false, "required": [ - "Message", - "Code" + "message", + "code" ] }, "ErrorInfo": { "type": "object", "properties": { - "Macaroon": { + "macaroon": { "$ref": "#/definitions/Macaroon" }, - "MacaroonPath": { + "macaroon-path": { "type": "string" } }, @@ -13094,19 +12326,16 @@ "ErrorResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" } }, - "additionalProperties": false, - "required": [ - "Error" - ] + "additionalProperties": false }, "ErrorResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/ErrorResult" @@ -13115,88 +12344,37 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "Macaroon": { "type": "object", - "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } - }, - "data": { - "type": "array", - "items": { - "type": "integer" - } - }, - "id": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "sig": { - "type": "array", - "items": { - "type": "integer" - } - } - }, - "additionalProperties": false, - "required": [ - "data", - "location", - "id", - "caveats", - "sig" - ] + "additionalProperties": false }, "Model": { "type": "object", "properties": { - "Name": { + "name": { "type": "string" }, - "OwnerTag": { + "owner-tag": { "type": "string" }, - "UUID": { + "uuid": { "type": "string" } }, "additionalProperties": false, "required": [ - "Name", - "UUID", - "OwnerTag" - ] - }, - "ModelConfigResult": { - "type": "object", - "properties": { - "Config": { - "type": "object", - "patternProperties": { - ".*": { - "type": "object", - "additionalProperties": true - } - } - } - }, - "additionalProperties": false, - "required": [ - "Config" + "name", + "uuid", + "owner-tag" ] }, "ModelCreateArgs": { "type": "object", "properties": { - "Account": { + "config": { "type": "object", "patternProperties": { ".*": { @@ -13205,71 +12383,80 @@ } } }, - "Config": { - "type": "object", - "patternProperties": { - ".*": { - "type": "object", - "additionalProperties": true - } - } + "credential": { + "type": "string" + }, + "name": { + "type": "string" }, - "OwnerTag": { + "owner-tag": { + "type": "string" + }, + "region": { "type": "string" } }, "additionalProperties": false, "required": [ - "OwnerTag", - "Account", - "Config" + "name", + "owner-tag" ] }, "ModelInfo": { "type": "object", "properties": { - "DefaultSeries": { + "cloud": { "type": "string" }, - "Life": { + "cloud-credential": { "type": "string" }, - "Name": { + "cloud-region": { + "type": "string" + }, + "controller-uuid": { "type": "string" }, - "OwnerTag": { + "default-series": { "type": "string" }, - "ProviderType": { + "life": { "type": "string" }, - "ServerUUID": { + "name": { "type": "string" }, - "Status": { - "$ref": "#/definitions/EntityStatus" + "owner-tag": { + "type": "string" }, - "UUID": { + "provider-type": { "type": "string" }, - "Users": { + "status": { + "$ref": "#/definitions/EntityStatus" + }, + "users": { "type": "array", "items": { "$ref": "#/definitions/ModelUserInfo" } + }, + "uuid": { + "type": "string" } }, "additionalProperties": false, "required": [ - "Name", - "UUID", - "ServerUUID", - "ProviderType", - "DefaultSeries", - "OwnerTag", - "Life", - "Status", - "Users" + "name", + "uuid", + "controller-uuid", + "provider-type", + "default-series", + "cloud", + "owner-tag", + "life", + "status", + "users" ] }, "ModelInfoResult": { @@ -13299,32 +12486,16 @@ "results" ] }, - "ModelSkeletonConfigArgs": { - "type": "object", - "properties": { - "Provider": { - "type": "string" - }, - "Region": { - "type": "string" - } - }, - "additionalProperties": false, - "required": [ - "Provider", - "Region" - ] - }, "ModelUserInfo": { "type": "object", "properties": { "access": { "type": "string" }, - "displayname": { + "display-name": { "type": "string" }, - "lastconnection": { + "last-connection": { "type": "string", "format": "date-time" }, @@ -13335,8 +12506,8 @@ "additionalProperties": false, "required": [ "user", - "displayname", - "lastconnection", + "display-name", + "last-connection", "access" ] }, @@ -13382,24 +12553,24 @@ "UserModel": { "type": "object", "properties": { - "LastConnection": { + "last-connection": { "type": "string", "format": "date-time" }, - "Model": { + "model": { "$ref": "#/definitions/Model" } }, "additionalProperties": false, "required": [ - "Model", - "LastConnection" + "model", + "last-connection" ] }, "UserModelList": { "type": "object", "properties": { - "UserModels": { + "user-models": { "type": "array", "items": { "$ref": "#/definitions/UserModel" @@ -13408,47 +12579,7 @@ }, "additionalProperties": false, "required": [ - "UserModels" - ] - }, - "caveat": { - "type": "object", - "properties": { - "caveatId": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "verificationId": { - "$ref": "#/definitions/packet" - } - }, - "additionalProperties": false, - "required": [ - "location", - "caveatId", - "verificationId" - ] - }, - "packet": { - "type": "object", - "properties": { - "headerLen": { - "type": "integer" - }, - "start": { - "type": "integer" - }, - "totalLen": { - "type": "integer" - } - }, - "additionalProperties": false, - "required": [ - "start", - "totalLen", - "headerLen" + "user-models" ] } } @@ -13486,7 +12617,7 @@ }, { "Name": "Provisioner", - "Version": 2, + "Version": 3, "Schema": { "type": "object", "properties": { @@ -13544,6 +12675,14 @@ } } }, + "ControllerConfig": { + "type": "object", + "properties": { + "Result": { + "$ref": "#/definitions/ControllerConfigResult" + } + } + }, "DistributionGroup": { "type": "object", "properties": { @@ -13620,2823 +12759,1248 @@ "$ref": "#/definitions/LifeResults" } } - }, - "MachinesWithTransientErrors": { - "type": "object", - "properties": { - "Result": { - "$ref": "#/definitions/StatusResults" - } - } - }, - "ModelConfig": { - "type": "object", - "properties": { - "Result": { - "$ref": "#/definitions/ModelConfigResult" - } - } - }, - "ModelUUID": { - "type": "object", - "properties": { - "Result": { - "$ref": "#/definitions/StringResult" - } - } - }, - "PrepareContainerInterfaceInfo": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/Entities" - }, - "Result": { - "$ref": "#/definitions/MachineNetworkConfigResults" - } - } - }, - "ProvisioningInfo": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/Entities" - }, - "Result": { - "$ref": "#/definitions/ProvisioningInfoResults" - } - } - }, - "ReleaseContainerAddresses": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/Entities" - }, - "Result": { - "$ref": "#/definitions/ErrorResults" - } - } - }, - "Remove": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/Entities" - }, - "Result": { - "$ref": "#/definitions/ErrorResults" - } - } - }, - "Series": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/Entities" - }, - "Result": { - "$ref": "#/definitions/StringResults" - } - } - }, - "SetInstanceInfo": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/InstancesInfo" - }, - "Result": { - "$ref": "#/definitions/ErrorResults" - } - } - }, - "SetInstanceStatus": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/SetStatus" - }, - "Result": { - "$ref": "#/definitions/ErrorResults" - } - } - }, - "SetPasswords": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/EntityPasswords" - }, - "Result": { - "$ref": "#/definitions/ErrorResults" - } - } - }, - "SetStatus": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/SetStatus" - }, - "Result": { - "$ref": "#/definitions/ErrorResults" - } - } - }, - "SetSupportedContainers": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/MachineContainersParams" - }, - "Result": { - "$ref": "#/definitions/ErrorResults" - } - } - }, - "StateAddresses": { - "type": "object", - "properties": { - "Result": { - "$ref": "#/definitions/StringsResult" - } - } - }, - "Status": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/Entities" - }, - "Result": { - "$ref": "#/definitions/StatusResults" - } - } - }, - "Tools": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/Entities" - }, - "Result": { - "$ref": "#/definitions/ToolsResults" - } - } - }, - "UpdateStatus": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/SetStatus" - }, - "Result": { - "$ref": "#/definitions/ErrorResults" - } - } - }, - "WatchAPIHostPorts": { - "type": "object", - "properties": { - "Result": { - "$ref": "#/definitions/NotifyWatchResult" - } - } - }, - "WatchAllContainers": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/WatchContainers" - }, - "Result": { - "$ref": "#/definitions/StringsWatchResults" - } - } - }, - "WatchContainers": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/WatchContainers" - }, - "Result": { - "$ref": "#/definitions/StringsWatchResults" - } - } - }, - "WatchForModelConfigChanges": { - "type": "object", - "properties": { - "Result": { - "$ref": "#/definitions/NotifyWatchResult" - } - } - }, - "WatchMachineErrorRetry": { - "type": "object", - "properties": { - "Result": { - "$ref": "#/definitions/NotifyWatchResult" - } - } - }, - "WatchModelMachines": { - "type": "object", - "properties": { - "Result": { - "$ref": "#/definitions/StringsWatchResult" - } - } - } - }, - "definitions": { - "APIHostPortsResult": { - "type": "object", - "properties": { - "Servers": { - "type": "array", - "items": { - "type": "array", - "items": { - "$ref": "#/definitions/HostPort" - } - } - } - }, - "additionalProperties": false, - "required": [ - "Servers" - ] - }, - "Address": { - "type": "object", - "properties": { - "Scope": { - "type": "string" - }, - "SpaceName": { - "type": "string" - }, - "Type": { - "type": "string" - }, - "Value": { - "type": "string" - } - }, - "additionalProperties": false, - "required": [ - "Value", - "Type", - "Scope" - ] - }, - "Binary": { - "type": "object", - "properties": { - "Arch": { - "type": "string" - }, - "Number": { - "$ref": "#/definitions/Number" - }, - "Series": { - "type": "string" - } - }, - "additionalProperties": false, - "required": [ - "Number", - "Series", - "Arch" - ] - }, - "BytesResult": { - "type": "object", - "properties": { - "Result": { - "type": "array", - "items": { - "type": "integer" - } - } - }, - "additionalProperties": false, - "required": [ - "Result" - ] - }, - "CloudImageMetadata": { - "type": "object", - "properties": { - "arch": { - "type": "string" - }, - "image_id": { - "type": "string" - }, - "priority": { - "type": "integer" - }, - "region": { - "type": "string" - }, - "root_storage_size": { - "type": "integer" - }, - "root_storage_type": { - "type": "string" - }, - "series": { - "type": "string" - }, - "source": { - "type": "string" - }, - "stream": { - "type": "string" - }, - "version": { - "type": "string" - }, - "virt_type": { - "type": "string" - } - }, - "additionalProperties": false, - "required": [ - "image_id", - "region", - "version", - "series", - "arch", - "source", - "priority" - ] - }, - "ConstraintsResult": { - "type": "object", - "properties": { - "Constraints": { - "$ref": "#/definitions/Value" - }, - "Error": { - "$ref": "#/definitions/Error" - } - }, - "additionalProperties": false, - "required": [ - "Error", - "Constraints" - ] - }, - "ConstraintsResults": { - "type": "object", - "properties": { - "Results": { - "type": "array", - "items": { - "$ref": "#/definitions/ConstraintsResult" - } - } - }, - "additionalProperties": false, - "required": [ - "Results" - ] - }, - "ContainerConfig": { - "type": "object", - "properties": { - "AllowLXCLoopMounts": { - "type": "boolean" - }, - "AptMirror": { - "type": "string" - }, - "AptProxy": { - "$ref": "#/definitions/Settings" - }, - "AuthorizedKeys": { - "type": "string" - }, - "PreferIPv6": { - "type": "boolean" - }, - "ProviderType": { - "type": "string" - }, - "Proxy": { - "$ref": "#/definitions/Settings" - }, - "SSLHostnameVerification": { - "type": "boolean" - }, - "UpdateBehavior": { - "$ref": "#/definitions/UpdateBehavior" - } - }, - "additionalProperties": false, - "required": [ - "ProviderType", - "AuthorizedKeys", - "SSLHostnameVerification", - "Proxy", - "AptProxy", - "AptMirror", - "PreferIPv6", - "AllowLXCLoopMounts", - "UpdateBehavior" - ] - }, - "ContainerManagerConfig": { - "type": "object", - "properties": { - "ManagerConfig": { - "type": "object", - "patternProperties": { - ".*": { - "type": "string" - } - } - } - }, - "additionalProperties": false, - "required": [ - "ManagerConfig" - ] - }, - "ContainerManagerConfigParams": { - "type": "object", - "properties": { - "Type": { - "type": "string" - } - }, - "additionalProperties": false, - "required": [ - "Type" - ] - }, - "DistributionGroupResult": { - "type": "object", - "properties": { - "Error": { - "$ref": "#/definitions/Error" - }, - "Result": { - "type": "array", - "items": { - "type": "string" - } - } - }, - "additionalProperties": false, - "required": [ - "Error", - "Result" - ] - }, - "DistributionGroupResults": { - "type": "object", - "properties": { - "Results": { - "type": "array", - "items": { - "$ref": "#/definitions/DistributionGroupResult" - } - } - }, - "additionalProperties": false, - "required": [ - "Results" - ] - }, - "Entities": { - "type": "object", - "properties": { - "Entities": { - "type": "array", - "items": { - "$ref": "#/definitions/Entity" - } - } - }, - "additionalProperties": false, - "required": [ - "Entities" - ] - }, - "Entity": { - "type": "object", - "properties": { - "Tag": { - "type": "string" - } - }, - "additionalProperties": false, - "required": [ - "Tag" - ] - }, - "EntityPassword": { - "type": "object", - "properties": { - "Password": { - "type": "string" - }, - "Tag": { - "type": "string" - } - }, - "additionalProperties": false, - "required": [ - "Tag", - "Password" - ] - }, - "EntityPasswords": { - "type": "object", - "properties": { - "Changes": { - "type": "array", - "items": { - "$ref": "#/definitions/EntityPassword" - } - } - }, - "additionalProperties": false, - "required": [ - "Changes" - ] - }, - "EntityStatusArgs": { - "type": "object", - "properties": { - "Data": { - "type": "object", - "patternProperties": { - ".*": { - "type": "object", - "additionalProperties": true - } - } - }, - "Info": { - "type": "string" - }, - "Status": { - "type": "string" - }, - "Tag": { - "type": "string" - } - }, - "additionalProperties": false, - "required": [ - "Tag", - "Status", - "Info", - "Data" - ] - }, - "Error": { - "type": "object", - "properties": { - "Code": { - "type": "string" - }, - "Info": { - "$ref": "#/definitions/ErrorInfo" - }, - "Message": { - "type": "string" - } - }, - "additionalProperties": false, - "required": [ - "Message", - "Code" - ] - }, - "ErrorInfo": { - "type": "object", - "properties": { - "Macaroon": { - "$ref": "#/definitions/Macaroon" - }, - "MacaroonPath": { - "type": "string" - } - }, - "additionalProperties": false - }, - "ErrorResult": { - "type": "object", - "properties": { - "Error": { - "$ref": "#/definitions/Error" - } - }, - "additionalProperties": false, - "required": [ - "Error" - ] - }, - "ErrorResults": { - "type": "object", - "properties": { - "Results": { - "type": "array", - "items": { - "$ref": "#/definitions/ErrorResult" - } - } - }, - "additionalProperties": false, - "required": [ - "Results" - ] - }, - "FindToolsParams": { - "type": "object", - "properties": { - "Arch": { - "type": "string" - }, - "MajorVersion": { - "type": "integer" - }, - "MinorVersion": { - "type": "integer" - }, - "Number": { - "$ref": "#/definitions/Number" - }, - "Series": { - "type": "string" - } - }, - "additionalProperties": false, - "required": [ - "Number", - "MajorVersion", - "MinorVersion", - "Arch", - "Series" - ] - }, - "FindToolsResult": { - "type": "object", - "properties": { - "Error": { - "$ref": "#/definitions/Error" - }, - "List": { - "type": "array", - "items": { - "$ref": "#/definitions/Tools" - } - } - }, - "additionalProperties": false, - "required": [ - "List", - "Error" - ] - }, - "HardwareCharacteristics": { - "type": "object", - "properties": { - "Arch": { - "type": "string" - }, - "AvailabilityZone": { - "type": "string" - }, - "CpuCores": { - "type": "integer" - }, - "CpuPower": { - "type": "integer" - }, - "Mem": { - "type": "integer" - }, - "RootDisk": { - "type": "integer" - }, - "Tags": { - "type": "array", - "items": { - "type": "string" - } - } - }, - "additionalProperties": false - }, - "HostPort": { - "type": "object", - "properties": { - "Address": { - "$ref": "#/definitions/Address" - }, - "Port": { - "type": "integer" - } - }, - "additionalProperties": false, - "required": [ - "Address", - "Port" - ] - }, - "InstanceInfo": { - "type": "object", - "properties": { - "Characteristics": { - "$ref": "#/definitions/HardwareCharacteristics" - }, - "InstanceId": { - "type": "string" - }, - "NetworkConfig": { - "type": "array", - "items": { - "$ref": "#/definitions/NetworkConfig" - } - }, - "Nonce": { - "type": "string" - }, - "Tag": { - "type": "string" - }, - "VolumeAttachments": { - "type": "object", - "patternProperties": { - ".*": { - "$ref": "#/definitions/VolumeAttachmentInfo" - } - } - }, - "Volumes": { - "type": "array", - "items": { - "$ref": "#/definitions/Volume" - } - } - }, - "additionalProperties": false, - "required": [ - "Tag", - "InstanceId", - "Nonce", - "Characteristics", - "Volumes", - "VolumeAttachments", - "NetworkConfig" - ] - }, - "InstancesInfo": { - "type": "object", - "properties": { - "Machines": { - "type": "array", - "items": { - "$ref": "#/definitions/InstanceInfo" - } - } - }, - "additionalProperties": false, - "required": [ - "Machines" - ] - }, - "LifeResult": { - "type": "object", - "properties": { - "Error": { - "$ref": "#/definitions/Error" - }, - "Life": { - "type": "string" - } - }, - "additionalProperties": false, - "required": [ - "Life", - "Error" - ] - }, - "LifeResults": { - "type": "object", - "properties": { - "Results": { - "type": "array", - "items": { - "$ref": "#/definitions/LifeResult" - } - } - }, - "additionalProperties": false, - "required": [ - "Results" - ] - }, - "Macaroon": { - "type": "object", - "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } - }, - "data": { - "type": "array", - "items": { - "type": "integer" - } - }, - "id": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "sig": { - "type": "array", - "items": { - "type": "integer" - } - } - }, - "additionalProperties": false, - "required": [ - "data", - "location", - "id", - "caveats", - "sig" - ] - }, - "MachineContainers": { - "type": "object", - "properties": { - "ContainerTypes": { - "type": "array", - "items": { - "type": "string" - } - }, - "MachineTag": { - "type": "string" - } - }, - "additionalProperties": false, - "required": [ - "MachineTag", - "ContainerTypes" - ] - }, - "MachineContainersParams": { - "type": "object", - "properties": { - "Params": { - "type": "array", - "items": { - "$ref": "#/definitions/MachineContainers" - } - } - }, - "additionalProperties": false, - "required": [ - "Params" - ] - }, - "MachineNetworkConfigResult": { - "type": "object", - "properties": { - "Error": { - "$ref": "#/definitions/Error" - }, - "Info": { - "type": "array", - "items": { - "$ref": "#/definitions/NetworkConfig" - } - } - }, - "additionalProperties": false, - "required": [ - "Error", - "Info" - ] - }, - "MachineNetworkConfigResults": { - "type": "object", - "properties": { - "Results": { - "type": "array", - "items": { - "$ref": "#/definitions/MachineNetworkConfigResult" - } - } - }, - "additionalProperties": false, - "required": [ - "Results" - ] - }, - "ModelConfigResult": { - "type": "object", - "properties": { - "Config": { - "type": "object", - "patternProperties": { - ".*": { - "type": "object", - "additionalProperties": true - } - } - } - }, - "additionalProperties": false, - "required": [ - "Config" - ] - }, - "NetworkConfig": { - "type": "object", - "properties": { - "Address": { - "type": "string" - }, - "CIDR": { - "type": "string" - }, - "ConfigType": { - "type": "string" - }, - "DNSSearchDomains": { - "type": "array", - "items": { - "type": "string" - } - }, - "DNSServers": { - "type": "array", - "items": { - "type": "string" - } - }, - "DeviceIndex": { - "type": "integer" - }, - "Disabled": { - "type": "boolean" - }, - "GatewayAddress": { - "type": "string" - }, - "InterfaceName": { - "type": "string" - }, - "InterfaceType": { - "type": "string" - }, - "MACAddress": { - "type": "string" - }, - "MTU": { - "type": "integer" - }, - "NoAutoStart": { - "type": "boolean" - }, - "ParentInterfaceName": { - "type": "string" - }, - "ProviderAddressId": { - "type": "string" - }, - "ProviderId": { - "type": "string" - }, - "ProviderSpaceId": { - "type": "string" - }, - "ProviderSubnetId": { - "type": "string" - }, - "ProviderVLANId": { - "type": "string" - }, - "VLANTag": { - "type": "integer" - } - }, - "additionalProperties": false, - "required": [ - "DeviceIndex", - "MACAddress", - "CIDR", - "MTU", - "ProviderId", - "ProviderSubnetId", - "ProviderSpaceId", - "ProviderAddressId", - "ProviderVLANId", - "VLANTag", - "InterfaceName", - "ParentInterfaceName", - "InterfaceType", - "Disabled" - ] - }, - "NotifyWatchResult": { - "type": "object", - "properties": { - "Error": { - "$ref": "#/definitions/Error" - }, - "NotifyWatcherId": { - "type": "string" - } - }, - "additionalProperties": false, - "required": [ - "NotifyWatcherId", - "Error" - ] - }, - "Number": { - "type": "object", - "properties": { - "Build": { - "type": "integer" - }, - "Major": { - "type": "integer" - }, - "Minor": { - "type": "integer" - }, - "Patch": { - "type": "integer" - }, - "Tag": { - "type": "string" - } - }, - "additionalProperties": false, - "required": [ - "Major", - "Minor", - "Tag", - "Patch", - "Build" - ] - }, - "ProvisioningInfo": { - "type": "object", - "properties": { - "Constraints": { - "$ref": "#/definitions/Value" - }, - "EndpointBindings": { - "type": "object", - "patternProperties": { - ".*": { - "type": "string" - } - } - }, - "ImageMetadata": { - "type": "array", - "items": { - "$ref": "#/definitions/CloudImageMetadata" - } - }, - "Jobs": { - "type": "array", - "items": { - "type": "string" - } - }, - "Placement": { - "type": "string" - }, - "Series": { - "type": "string" - }, - "SubnetsToZones": { - "type": "object", - "patternProperties": { - ".*": { - "type": "array", - "items": { - "type": "string" - } - } - } - }, - "Tags": { - "type": "object", - "patternProperties": { - ".*": { - "type": "string" - } - } - }, - "Volumes": { - "type": "array", - "items": { - "$ref": "#/definitions/VolumeParams" - } - } - }, - "additionalProperties": false, - "required": [ - "Constraints", - "Series", - "Placement", - "Jobs", - "Volumes", - "Tags", - "SubnetsToZones", - "ImageMetadata", - "EndpointBindings" - ] - }, - "ProvisioningInfoResult": { - "type": "object", - "properties": { - "Error": { - "$ref": "#/definitions/Error" - }, - "Result": { - "$ref": "#/definitions/ProvisioningInfo" - } - }, - "additionalProperties": false, - "required": [ - "Error", - "Result" - ] - }, - "ProvisioningInfoResults": { - "type": "object", - "properties": { - "Results": { - "type": "array", - "items": { - "$ref": "#/definitions/ProvisioningInfoResult" - } - } - }, - "additionalProperties": false, - "required": [ - "Results" - ] - }, - "SetStatus": { - "type": "object", - "properties": { - "Entities": { - "type": "array", - "items": { - "$ref": "#/definitions/EntityStatusArgs" - } - } - }, - "additionalProperties": false, - "required": [ - "Entities" - ] - }, - "Settings": { - "type": "object", - "properties": { - "Ftp": { - "type": "string" - }, - "Http": { - "type": "string" - }, - "Https": { - "type": "string" - }, - "NoProxy": { - "type": "string" - } - }, - "additionalProperties": false, - "required": [ - "Http", - "Https", - "Ftp", - "NoProxy" - ] - }, - "StatusResult": { - "type": "object", - "properties": { - "Data": { - "type": "object", - "patternProperties": { - ".*": { - "type": "object", - "additionalProperties": true - } - } - }, - "Error": { - "$ref": "#/definitions/Error" - }, - "Id": { - "type": "string" - }, - "Info": { - "type": "string" - }, - "Life": { - "type": "string" - }, - "Since": { - "type": "string", - "format": "date-time" - }, - "Status": { - "type": "string" - } - }, - "additionalProperties": false, - "required": [ - "Error", - "Id", - "Life", - "Status", - "Info", - "Data", - "Since" - ] - }, - "StatusResults": { - "type": "object", - "properties": { - "Results": { - "type": "array", - "items": { - "$ref": "#/definitions/StatusResult" - } - } - }, - "additionalProperties": false, - "required": [ - "Results" - ] - }, - "StringResult": { - "type": "object", - "properties": { - "Error": { - "$ref": "#/definitions/Error" - }, - "Result": { - "type": "string" - } - }, - "additionalProperties": false, - "required": [ - "Error", - "Result" - ] - }, - "StringResults": { - "type": "object", - "properties": { - "Results": { - "type": "array", - "items": { - "$ref": "#/definitions/StringResult" - } - } - }, - "additionalProperties": false, - "required": [ - "Results" - ] - }, - "StringsResult": { - "type": "object", - "properties": { - "Error": { - "$ref": "#/definitions/Error" - }, - "Result": { - "type": "array", - "items": { - "type": "string" - } - } - }, - "additionalProperties": false, - "required": [ - "Error", - "Result" - ] - }, - "StringsWatchResult": { - "type": "object", - "properties": { - "Changes": { - "type": "array", - "items": { - "type": "string" - } - }, - "Error": { - "$ref": "#/definitions/Error" - }, - "StringsWatcherId": { - "type": "string" - } - }, - "additionalProperties": false, - "required": [ - "StringsWatcherId", - "Changes", - "Error" - ] - }, - "StringsWatchResults": { - "type": "object", - "properties": { - "Results": { - "type": "array", - "items": { - "$ref": "#/definitions/StringsWatchResult" - } - } - }, - "additionalProperties": false, - "required": [ - "Results" - ] - }, - "Tools": { - "type": "object", - "properties": { - "sha256": { - "type": "string" - }, - "size": { - "type": "integer" - }, - "url": { - "type": "string" - }, - "version": { - "$ref": "#/definitions/Binary" - } - }, - "additionalProperties": false, - "required": [ - "version", - "url", - "size" - ] - }, - "ToolsResult": { - "type": "object", - "properties": { - "DisableSSLHostnameVerification": { - "type": "boolean" - }, - "Error": { - "$ref": "#/definitions/Error" - }, - "ToolsList": { - "type": "array", - "items": { - "$ref": "#/definitions/Tools" - } - } - }, - "additionalProperties": false, - "required": [ - "ToolsList", - "DisableSSLHostnameVerification", - "Error" - ] - }, - "ToolsResults": { - "type": "object", - "properties": { - "Results": { - "type": "array", - "items": { - "$ref": "#/definitions/ToolsResult" - } - } - }, - "additionalProperties": false, - "required": [ - "Results" - ] - }, - "UpdateBehavior": { - "type": "object", - "properties": { - "EnableOSRefreshUpdate": { - "type": "boolean" - }, - "EnableOSUpgrade": { - "type": "boolean" - } - }, - "additionalProperties": false, - "required": [ - "EnableOSRefreshUpdate", - "EnableOSUpgrade" - ] - }, - "Value": { - "type": "object", - "properties": { - "arch": { - "type": "string" - }, - "container": { - "type": "string" - }, - "cpu-cores": { - "type": "integer" - }, - "cpu-power": { - "type": "integer" - }, - "instance-type": { - "type": "string" - }, - "mem": { - "type": "integer" - }, - "root-disk": { - "type": "integer" - }, - "spaces": { - "type": "array", - "items": { - "type": "string" - } - }, - "tags": { - "type": "array", - "items": { - "type": "string" - } - }, - "virt-type": { - "type": "string" - } - }, - "additionalProperties": false - }, - "Volume": { - "type": "object", - "properties": { - "info": { - "$ref": "#/definitions/VolumeInfo" - }, - "volumetag": { - "type": "string" - } - }, - "additionalProperties": false, - "required": [ - "volumetag", - "info" - ] - }, - "VolumeAttachmentInfo": { - "type": "object", - "properties": { - "busaddress": { - "type": "string" - }, - "devicelink": { - "type": "string" - }, - "devicename": { - "type": "string" - }, - "read-only": { - "type": "boolean" - } - }, - "additionalProperties": false - }, - "VolumeAttachmentParams": { - "type": "object", - "properties": { - "instanceid": { - "type": "string" - }, - "machinetag": { - "type": "string" - }, - "provider": { - "type": "string" - }, - "read-only": { - "type": "boolean" - }, - "volumeid": { - "type": "string" - }, - "volumetag": { - "type": "string" - } - }, - "additionalProperties": false, - "required": [ - "volumetag", - "machinetag", - "provider" - ] - }, - "VolumeInfo": { - "type": "object", - "properties": { - "hardwareid": { - "type": "string" - }, - "persistent": { - "type": "boolean" - }, - "size": { - "type": "integer" - }, - "volumeid": { - "type": "string" - } - }, - "additionalProperties": false, - "required": [ - "volumeid", - "size", - "persistent" - ] - }, - "VolumeParams": { - "type": "object", - "properties": { - "attachment": { - "$ref": "#/definitions/VolumeAttachmentParams" - }, - "attributes": { - "type": "object", - "patternProperties": { - ".*": { - "type": "object", - "additionalProperties": true - } - } - }, - "provider": { - "type": "string" - }, - "size": { - "type": "integer" - }, - "tags": { - "type": "object", - "patternProperties": { - ".*": { - "type": "string" - } - } - }, - "volumetag": { - "type": "string" - } - }, - "additionalProperties": false, - "required": [ - "volumetag", - "size", - "provider" - ] - }, - "WatchContainer": { - "type": "object", - "properties": { - "ContainerType": { - "type": "string" - }, - "MachineTag": { - "type": "string" - } - }, - "additionalProperties": false, - "required": [ - "MachineTag", - "ContainerType" - ] - }, - "WatchContainers": { - "type": "object", - "properties": { - "Params": { - "type": "array", - "items": { - "$ref": "#/definitions/WatchContainer" - } + }, + "MachinesWithTransientErrors": { + "type": "object", + "properties": { + "Result": { + "$ref": "#/definitions/StatusResults" } - }, - "additionalProperties": false, - "required": [ - "Params" - ] + } }, - "caveat": { + "ModelConfig": { "type": "object", "properties": { - "caveatId": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "verificationId": { - "$ref": "#/definitions/packet" + "Result": { + "$ref": "#/definitions/ModelConfigResult" } - }, - "additionalProperties": false, - "required": [ - "location", - "caveatId", - "verificationId" - ] + } }, - "packet": { + "ModelUUID": { "type": "object", "properties": { - "headerLen": { - "type": "integer" - }, - "start": { - "type": "integer" - }, - "totalLen": { - "type": "integer" + "Result": { + "$ref": "#/definitions/StringResult" } - }, - "additionalProperties": false, - "required": [ - "start", - "totalLen", - "headerLen" - ] - } - } - } - }, - { - "Name": "ProxyUpdater", - "Version": 1, - "Schema": { - "type": "object", - "properties": { - "ProxyConfig": { + } + }, + "PrepareContainerInterfaceInfo": { "type": "object", "properties": { "Params": { "$ref": "#/definitions/Entities" }, "Result": { - "$ref": "#/definitions/ProxyConfigResults" + "$ref": "#/definitions/MachineNetworkConfigResults" } } }, - "WatchForProxyConfigAndAPIHostPortChanges": { + "ProvisioningInfo": { "type": "object", "properties": { "Params": { "$ref": "#/definitions/Entities" }, "Result": { - "$ref": "#/definitions/NotifyWatchResults" + "$ref": "#/definitions/ProvisioningInfoResults" } } - } - }, - "definitions": { - "Entities": { - "type": "object", - "properties": { - "Entities": { - "type": "array", - "items": { - "$ref": "#/definitions/Entity" - } - } - }, - "additionalProperties": false, - "required": [ - "Entities" - ] }, - "Entity": { + "ReleaseContainerAddresses": { "type": "object", "properties": { - "Tag": { - "type": "string" + "Params": { + "$ref": "#/definitions/Entities" + }, + "Result": { + "$ref": "#/definitions/ErrorResults" } - }, - "additionalProperties": false, - "required": [ - "Tag" - ] + } }, - "Error": { + "Remove": { "type": "object", "properties": { - "Code": { - "type": "string" - }, - "Info": { - "$ref": "#/definitions/ErrorInfo" + "Params": { + "$ref": "#/definitions/Entities" }, - "Message": { - "type": "string" + "Result": { + "$ref": "#/definitions/ErrorResults" } - }, - "additionalProperties": false, - "required": [ - "Message", - "Code" - ] + } }, - "ErrorInfo": { + "Series": { "type": "object", "properties": { - "Macaroon": { - "$ref": "#/definitions/Macaroon" + "Params": { + "$ref": "#/definitions/Entities" }, - "MacaroonPath": { - "type": "string" + "Result": { + "$ref": "#/definitions/StringResults" } - }, - "additionalProperties": false + } }, - "Macaroon": { + "SetInstanceInfo": { "type": "object", "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } - }, - "data": { - "type": "array", - "items": { - "type": "integer" - } - }, - "id": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" + "Params": { + "$ref": "#/definitions/InstancesInfo" }, - "sig": { - "type": "array", - "items": { - "type": "integer" - } + "Result": { + "$ref": "#/definitions/ErrorResults" } - }, - "additionalProperties": false, - "required": [ - "data", - "location", - "id", - "caveats", - "sig" - ] + } }, - "NotifyWatchResult": { + "SetInstanceStatus": { "type": "object", "properties": { - "Error": { - "$ref": "#/definitions/Error" + "Params": { + "$ref": "#/definitions/SetStatus" }, - "NotifyWatcherId": { - "type": "string" + "Result": { + "$ref": "#/definitions/ErrorResults" } - }, - "additionalProperties": false, - "required": [ - "NotifyWatcherId", - "Error" - ] + } }, - "NotifyWatchResults": { + "SetPasswords": { "type": "object", "properties": { - "Results": { - "type": "array", - "items": { - "$ref": "#/definitions/NotifyWatchResult" - } + "Params": { + "$ref": "#/definitions/EntityPasswords" + }, + "Result": { + "$ref": "#/definitions/ErrorResults" } - }, - "additionalProperties": false, - "required": [ - "Results" - ] + } }, - "ProxyConfig": { + "SetStatus": { "type": "object", "properties": { - "FTP": { - "type": "string" - }, - "HTTP": { - "type": "string" - }, - "HTTPS": { - "type": "string" + "Params": { + "$ref": "#/definitions/SetStatus" }, - "NoProxy": { - "type": "string" + "Result": { + "$ref": "#/definitions/ErrorResults" } - }, - "additionalProperties": false, - "required": [ - "HTTP", - "HTTPS", - "FTP", - "NoProxy" - ] + } }, - "ProxyConfigResult": { + "SetSupportedContainers": { "type": "object", "properties": { - "APTProxySettings": { - "$ref": "#/definitions/ProxyConfig" - }, - "Error": { - "$ref": "#/definitions/Error" + "Params": { + "$ref": "#/definitions/MachineContainersParams" }, - "ProxySettings": { - "$ref": "#/definitions/ProxyConfig" + "Result": { + "$ref": "#/definitions/ErrorResults" } - }, - "additionalProperties": false, - "required": [ - "ProxySettings", - "APTProxySettings" - ] + } }, - "ProxyConfigResults": { + "StateAddresses": { "type": "object", "properties": { - "Results": { - "type": "array", - "items": { - "$ref": "#/definitions/ProxyConfigResult" - } + "Result": { + "$ref": "#/definitions/StringsResult" } - }, - "additionalProperties": false, - "required": [ - "Results" - ] + } }, - "caveat": { + "Status": { "type": "object", "properties": { - "caveatId": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" + "Params": { + "$ref": "#/definitions/Entities" }, - "verificationId": { - "$ref": "#/definitions/packet" + "Result": { + "$ref": "#/definitions/StatusResults" } - }, - "additionalProperties": false, - "required": [ - "location", - "caveatId", - "verificationId" - ] + } }, - "packet": { + "Tools": { "type": "object", "properties": { - "headerLen": { - "type": "integer" - }, - "start": { - "type": "integer" + "Params": { + "$ref": "#/definitions/Entities" }, - "totalLen": { - "type": "integer" - } - }, - "additionalProperties": false, - "required": [ - "start", - "totalLen", - "headerLen" - ] - } - } - } - }, - { - "Name": "Reboot", - "Version": 2, - "Schema": { - "type": "object", - "properties": { - "ClearReboot": { + "Result": { + "$ref": "#/definitions/ToolsResults" + } + } + }, + "UpdateStatus": { "type": "object", "properties": { "Params": { - "$ref": "#/definitions/Entities" + "$ref": "#/definitions/SetStatus" }, "Result": { "$ref": "#/definitions/ErrorResults" } } }, - "GetRebootAction": { + "WatchAPIHostPorts": { + "type": "object", + "properties": { + "Result": { + "$ref": "#/definitions/NotifyWatchResult" + } + } + }, + "WatchAllContainers": { "type": "object", "properties": { "Params": { - "$ref": "#/definitions/Entities" + "$ref": "#/definitions/WatchContainers" }, "Result": { - "$ref": "#/definitions/RebootActionResults" + "$ref": "#/definitions/StringsWatchResults" } } }, - "RequestReboot": { + "WatchContainers": { "type": "object", "properties": { "Params": { - "$ref": "#/definitions/Entities" + "$ref": "#/definitions/WatchContainers" }, "Result": { - "$ref": "#/definitions/ErrorResults" + "$ref": "#/definitions/StringsWatchResults" } } }, - "WatchForRebootEvent": { + "WatchForModelConfigChanges": { + "type": "object", + "properties": { + "Result": { + "$ref": "#/definitions/NotifyWatchResult" + } + } + }, + "WatchMachineErrorRetry": { "type": "object", "properties": { "Result": { "$ref": "#/definitions/NotifyWatchResult" } } + }, + "WatchModelMachines": { + "type": "object", + "properties": { + "Result": { + "$ref": "#/definitions/StringsWatchResult" + } + } } }, "definitions": { - "Entities": { + "APIHostPortsResult": { "type": "object", "properties": { - "Entities": { + "servers": { "type": "array", "items": { - "$ref": "#/definitions/Entity" + "type": "array", + "items": { + "$ref": "#/definitions/HostPort" + } } } }, "additionalProperties": false, "required": [ - "Entities" + "servers" ] }, - "Entity": { + "Address": { "type": "object", "properties": { - "Tag": { + "scope": { "type": "string" - } - }, - "additionalProperties": false, - "required": [ - "Tag" - ] - }, - "Error": { - "type": "object", - "properties": { - "Code": { + }, + "space-name": { "type": "string" }, - "Info": { - "$ref": "#/definitions/ErrorInfo" + "type": { + "type": "string" }, - "Message": { + "value": { "type": "string" } }, "additionalProperties": false, "required": [ - "Message", - "Code" + "value", + "type", + "scope" ] }, - "ErrorInfo": { + "Binary": { "type": "object", "properties": { - "Macaroon": { - "$ref": "#/definitions/Macaroon" + "Arch": { + "type": "string" + }, + "Number": { + "$ref": "#/definitions/Number" }, - "MacaroonPath": { + "Series": { "type": "string" } }, - "additionalProperties": false - }, - "ErrorResult": { - "type": "object", - "properties": { - "Error": { - "$ref": "#/definitions/Error" - } - }, "additionalProperties": false, "required": [ - "Error" + "Number", + "Series", + "Arch" ] }, - "ErrorResults": { + "BytesResult": { "type": "object", "properties": { - "Results": { + "result": { "type": "array", "items": { - "$ref": "#/definitions/ErrorResult" + "type": "integer" } } }, "additionalProperties": false, "required": [ - "Results" + "result" ] }, - "Macaroon": { + "CloudImageMetadata": { "type": "object", "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } + "arch": { + "type": "string" }, - "data": { - "type": "array", - "items": { - "type": "integer" - } + "image-id": { + "type": "string" }, - "id": { - "$ref": "#/definitions/packet" + "priority": { + "type": "integer" }, - "location": { - "$ref": "#/definitions/packet" + "region": { + "type": "string" }, - "sig": { - "type": "array", - "items": { - "type": "integer" - } - } - }, - "additionalProperties": false, - "required": [ - "data", - "location", - "id", - "caveats", - "sig" - ] - }, - "NotifyWatchResult": { - "type": "object", - "properties": { - "Error": { - "$ref": "#/definitions/Error" + "root-storage-size": { + "type": "integer" }, - "NotifyWatcherId": { + "root-storage-type": { + "type": "string" + }, + "series": { + "type": "string" + }, + "source": { + "type": "string" + }, + "stream": { + "type": "string" + }, + "version": { + "type": "string" + }, + "virt-type": { "type": "string" } }, "additionalProperties": false, "required": [ - "NotifyWatcherId", - "Error" + "image-id", + "region", + "version", + "series", + "arch", + "source", + "priority" ] }, - "RebootActionResult": { + "ConstraintsResult": { "type": "object", "properties": { + "constraints": { + "$ref": "#/definitions/Value" + }, "error": { "$ref": "#/definitions/Error" - }, - "result": { - "type": "string" } }, - "additionalProperties": false + "additionalProperties": false, + "required": [ + "constraints" + ] }, - "RebootActionResults": { + "ConstraintsResults": { "type": "object", "properties": { "results": { "type": "array", "items": { - "$ref": "#/definitions/RebootActionResult" + "$ref": "#/definitions/ConstraintsResult" } } }, - "additionalProperties": false + "additionalProperties": false, + "required": [ + "results" + ] }, - "caveat": { + "ContainerConfig": { "type": "object", "properties": { - "caveatId": { - "$ref": "#/definitions/packet" + "UpdateBehavior": { + "$ref": "#/definitions/UpdateBehavior" }, - "location": { - "$ref": "#/definitions/packet" + "apt-mirror": { + "type": "string" + }, + "apt-proxy": { + "$ref": "#/definitions/Settings" + }, + "authorized-keys": { + "type": "string" }, - "verificationId": { - "$ref": "#/definitions/packet" + "provider-type": { + "type": "string" + }, + "proxy": { + "$ref": "#/definitions/Settings" + }, + "ssl-hostname-verification": { + "type": "boolean" } }, "additionalProperties": false, "required": [ - "location", - "caveatId", - "verificationId" + "provider-type", + "authorized-keys", + "ssl-hostname-verification", + "proxy", + "apt-proxy", + "apt-mirror", + "UpdateBehavior" + ] + }, + "ContainerManagerConfig": { + "type": "object", + "properties": { + "config": { + "type": "object", + "patternProperties": { + ".*": { + "type": "string" + } + } + } + }, + "additionalProperties": false, + "required": [ + "config" ] }, - "packet": { + "ContainerManagerConfigParams": { "type": "object", "properties": { - "headerLen": { - "type": "integer" - }, - "start": { - "type": "integer" - }, - "totalLen": { - "type": "integer" + "type": { + "type": "string" } }, "additionalProperties": false, "required": [ - "start", - "totalLen", - "headerLen" + "type" ] - } - } - } - }, - { - "Name": "RelationUnitsWatcher", - "Version": 1, - "Schema": { - "type": "object", - "properties": { - "Next": { + }, + "ControllerConfigResult": { "type": "object", "properties": { - "Result": { - "$ref": "#/definitions/RelationUnitsWatchResult" + "config": { + "type": "object", + "patternProperties": { + ".*": { + "type": "object", + "additionalProperties": true + } + } } - } + }, + "additionalProperties": false, + "required": [ + "config" + ] }, - "Stop": { - "type": "object" - } - }, - "definitions": { - "Error": { + "DistributionGroupResult": { "type": "object", "properties": { - "Code": { - "type": "string" - }, - "Info": { - "$ref": "#/definitions/ErrorInfo" + "error": { + "$ref": "#/definitions/Error" }, - "Message": { - "type": "string" + "result": { + "type": "array", + "items": { + "type": "string" + } } }, "additionalProperties": false, "required": [ - "Message", - "Code" + "result" ] }, - "ErrorInfo": { + "DistributionGroupResults": { "type": "object", "properties": { - "Macaroon": { - "$ref": "#/definitions/Macaroon" - }, - "MacaroonPath": { - "type": "string" + "results": { + "type": "array", + "items": { + "$ref": "#/definitions/DistributionGroupResult" + } } }, - "additionalProperties": false + "additionalProperties": false, + "required": [ + "results" + ] }, - "Macaroon": { + "Entities": { "type": "object", "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } - }, - "data": { - "type": "array", - "items": { - "type": "integer" - } - }, - "id": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "sig": { + "entities": { "type": "array", "items": { - "type": "integer" + "$ref": "#/definitions/Entity" } } }, "additionalProperties": false, "required": [ - "data", - "location", - "id", - "caveats", - "sig" + "entities" ] }, - "RelationUnitsChange": { + "Entity": { "type": "object", "properties": { - "Changed": { - "type": "object", - "patternProperties": { - ".*": { - "$ref": "#/definitions/UnitSettings" - } - } - }, - "Departed": { - "type": "array", - "items": { - "type": "string" - } + "tag": { + "type": "string" } }, "additionalProperties": false, "required": [ - "Changed", - "Departed" + "tag" ] }, - "RelationUnitsWatchResult": { + "EntityPassword": { "type": "object", "properties": { - "Changes": { - "$ref": "#/definitions/RelationUnitsChange" - }, - "Error": { - "$ref": "#/definitions/Error" + "password": { + "type": "string" }, - "RelationUnitsWatcherId": { + "tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "RelationUnitsWatcherId", - "Changes", - "Error" + "tag", + "password" ] }, - "UnitSettings": { + "EntityPasswords": { "type": "object", "properties": { - "Version": { - "type": "integer" + "changes": { + "type": "array", + "items": { + "$ref": "#/definitions/EntityPassword" + } } }, "additionalProperties": false, "required": [ - "Version" + "changes" ] }, - "caveat": { + "EntityStatusArgs": { "type": "object", "properties": { - "caveatId": { - "$ref": "#/definitions/packet" + "data": { + "type": "object", + "patternProperties": { + ".*": { + "type": "object", + "additionalProperties": true + } + } }, - "location": { - "$ref": "#/definitions/packet" + "info": { + "type": "string" + }, + "status": { + "type": "string" }, - "verificationId": { - "$ref": "#/definitions/packet" + "tag": { + "type": "string" } }, "additionalProperties": false, "required": [ - "location", - "caveatId", - "verificationId" + "tag", + "status", + "info", + "data" ] }, - "packet": { + "Error": { "type": "object", "properties": { - "headerLen": { - "type": "integer" + "code": { + "type": "string" }, - "start": { - "type": "integer" + "info": { + "$ref": "#/definitions/ErrorInfo" }, - "totalLen": { - "type": "integer" + "message": { + "type": "string" } }, "additionalProperties": false, "required": [ - "start", - "totalLen", - "headerLen" + "message", + "code" ] - } - } - } - }, - { - "Name": "Resumer", - "Version": 2, - "Schema": { - "type": "object", - "properties": { - "ResumeTransactions": { - "type": "object" - } - } - } - }, - { - "Name": "RetryStrategy", - "Version": 1, - "Schema": { - "type": "object", - "properties": { - "RetryStrategy": { + }, + "ErrorInfo": { "type": "object", "properties": { - "Params": { - "$ref": "#/definitions/Entities" + "macaroon": { + "$ref": "#/definitions/Macaroon" }, - "Result": { - "$ref": "#/definitions/RetryStrategyResults" + "macaroon-path": { + "type": "string" } - } + }, + "additionalProperties": false }, - "WatchRetryStrategy": { + "ErrorResult": { "type": "object", "properties": { - "Params": { - "$ref": "#/definitions/Entities" - }, - "Result": { - "$ref": "#/definitions/NotifyWatchResults" + "error": { + "$ref": "#/definitions/Error" } - } - } - }, - "definitions": { - "Entities": { + }, + "additionalProperties": false + }, + "ErrorResults": { "type": "object", "properties": { - "Entities": { + "results": { "type": "array", "items": { - "$ref": "#/definitions/Entity" + "$ref": "#/definitions/ErrorResult" } } }, "additionalProperties": false, "required": [ - "Entities" + "results" ] }, - "Entity": { + "FindToolsParams": { "type": "object", "properties": { - "Tag": { + "arch": { + "type": "string" + }, + "major": { + "type": "integer" + }, + "minor": { + "type": "integer" + }, + "number": { + "$ref": "#/definitions/Number" + }, + "series": { "type": "string" } }, "additionalProperties": false, "required": [ - "Tag" + "number", + "major", + "minor", + "arch", + "series" ] }, - "Error": { + "FindToolsResult": { "type": "object", "properties": { - "Code": { - "type": "string" - }, - "Info": { - "$ref": "#/definitions/ErrorInfo" + "error": { + "$ref": "#/definitions/Error" }, - "Message": { - "type": "string" + "list": { + "type": "array", + "items": { + "$ref": "#/definitions/Tools" + } } }, "additionalProperties": false, "required": [ - "Message", - "Code" + "list" ] }, - "ErrorInfo": { + "HardwareCharacteristics": { "type": "object", "properties": { - "Macaroon": { - "$ref": "#/definitions/Macaroon" + "arch": { + "type": "string" }, - "MacaroonPath": { + "availability-zone": { "type": "string" + }, + "cpu-cores": { + "type": "integer" + }, + "cpu-power": { + "type": "integer" + }, + "mem": { + "type": "integer" + }, + "root-disk": { + "type": "integer" + }, + "tags": { + "type": "array", + "items": { + "type": "string" + } } }, "additionalProperties": false }, - "Macaroon": { + "HostPort": { "type": "object", "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } + "Address": { + "$ref": "#/definitions/Address" }, - "data": { + "port": { + "type": "integer" + } + }, + "additionalProperties": false, + "required": [ + "Address", + "port" + ] + }, + "InstanceInfo": { + "type": "object", + "properties": { + "characteristics": { + "$ref": "#/definitions/HardwareCharacteristics" + }, + "instance-id": { + "type": "string" + }, + "network-config": { "type": "array", "items": { - "type": "integer" + "$ref": "#/definitions/NetworkConfig" } }, - "id": { - "$ref": "#/definitions/packet" + "nonce": { + "type": "string" }, - "location": { - "$ref": "#/definitions/packet" + "tag": { + "type": "string" + }, + "volume-attachments": { + "type": "object", + "patternProperties": { + ".*": { + "$ref": "#/definitions/VolumeAttachmentInfo" + } + } }, - "sig": { + "volumes": { + "type": "array", + "items": { + "$ref": "#/definitions/Volume" + } + } + }, + "additionalProperties": false, + "required": [ + "tag", + "instance-id", + "nonce", + "characteristics", + "volumes", + "volume-attachments", + "network-config" + ] + }, + "InstancesInfo": { + "type": "object", + "properties": { + "machines": { "type": "array", "items": { - "type": "integer" + "$ref": "#/definitions/InstanceInfo" } } }, "additionalProperties": false, "required": [ - "data", - "location", - "id", - "caveats", - "sig" + "machines" ] }, - "NotifyWatchResult": { + "LifeResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" }, - "NotifyWatcherId": { + "life": { "type": "string" } }, "additionalProperties": false, "required": [ - "NotifyWatcherId", - "Error" + "life" ] }, - "NotifyWatchResults": { + "LifeResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { - "$ref": "#/definitions/NotifyWatchResult" + "$ref": "#/definitions/LifeResult" } } }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, - "RetryStrategy": { + "Macaroon": { + "type": "object", + "additionalProperties": false + }, + "MachineContainers": { "type": "object", "properties": { - "JitterRetryTime": { - "type": "boolean" - }, - "MaxRetryTime": { - "type": "integer" - }, - "MinRetryTime": { - "type": "integer" - }, - "RetryTimeFactor": { - "type": "integer" + "container-types": { + "type": "array", + "items": { + "type": "string" + } }, - "ShouldRetry": { - "type": "boolean" + "machine-tag": { + "type": "string" } }, "additionalProperties": false, "required": [ - "ShouldRetry", - "MinRetryTime", - "MaxRetryTime", - "JitterRetryTime", - "RetryTimeFactor" + "machine-tag", + "container-types" ] }, - "RetryStrategyResult": { + "MachineContainersParams": { + "type": "object", + "properties": { + "params": { + "type": "array", + "items": { + "$ref": "#/definitions/MachineContainers" + } + } + }, + "additionalProperties": false, + "required": [ + "params" + ] + }, + "MachineNetworkConfigResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" }, - "Result": { - "$ref": "#/definitions/RetryStrategy" + "info": { + "type": "array", + "items": { + "$ref": "#/definitions/NetworkConfig" + } } }, "additionalProperties": false, "required": [ - "Error", - "Result" + "info" ] }, - "RetryStrategyResults": { + "MachineNetworkConfigResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { - "$ref": "#/definitions/RetryStrategyResult" + "$ref": "#/definitions/MachineNetworkConfigResult" } } }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, - "caveat": { + "ModelConfigResult": { "type": "object", "properties": { - "caveatId": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "verificationId": { - "$ref": "#/definitions/packet" + "config": { + "type": "object", + "patternProperties": { + ".*": { + "type": "object", + "additionalProperties": true + } + } } }, "additionalProperties": false, "required": [ - "location", - "caveatId", - "verificationId" + "config" ] }, - "packet": { + "NetworkConfig": { "type": "object", "properties": { - "headerLen": { + "address": { + "type": "string" + }, + "cidr": { + "type": "string" + }, + "config-type": { + "type": "string" + }, + "device-index": { "type": "integer" }, - "start": { + "disabled": { + "type": "boolean" + }, + "dns-search-domains": { + "type": "array", + "items": { + "type": "string" + } + }, + "dns-servers": { + "type": "array", + "items": { + "type": "string" + } + }, + "gateway-address": { + "type": "string" + }, + "interface-name": { + "type": "string" + }, + "interface-type": { + "type": "string" + }, + "mac-address": { + "type": "string" + }, + "mtu": { "type": "integer" }, - "totalLen": { + "no-auto-start": { + "type": "boolean" + }, + "parent-interface-name": { + "type": "string" + }, + "provider-address-id": { + "type": "string" + }, + "provider-id": { + "type": "string" + }, + "provider-space-id": { + "type": "string" + }, + "provider-subnet-id": { + "type": "string" + }, + "provider-vlan-id": { + "type": "string" + }, + "vlan-tag": { "type": "integer" } }, "additionalProperties": false, "required": [ - "start", - "totalLen", - "headerLen" + "device-index", + "mac-address", + "cidr", + "mtu", + "provider-id", + "provider-subnet-id", + "provider-space-id", + "provider-address-id", + "provider-vlan-id", + "vlan-tag", + "interface-name", + "parent-interface-name", + "interface-type", + "disabled" ] - } - } - } - }, - { - "Name": "SSHClient", - "Version": 1, - "Schema": { - "type": "object", - "properties": { - "PrivateAddress": { + }, + "NotifyWatchResult": { "type": "object", "properties": { - "Params": { - "$ref": "#/definitions/Entities" + "NotifyWatcherId": { + "type": "string" }, - "Result": { - "$ref": "#/definitions/SSHAddressResults" + "error": { + "$ref": "#/definitions/Error" } - } + }, + "additionalProperties": false, + "required": [ + "NotifyWatcherId" + ] }, - "Proxy": { + "Number": { "type": "object", "properties": { - "Result": { - "$ref": "#/definitions/SSHProxyResult" + "Build": { + "type": "integer" + }, + "Major": { + "type": "integer" + }, + "Minor": { + "type": "integer" + }, + "Patch": { + "type": "integer" + }, + "Tag": { + "type": "string" } - } + }, + "additionalProperties": false, + "required": [ + "Major", + "Minor", + "Tag", + "Patch", + "Build" + ] }, - "PublicAddress": { + "ProvisioningInfo": { "type": "object", "properties": { - "Params": { - "$ref": "#/definitions/Entities" + "constraints": { + "$ref": "#/definitions/Value" }, - "Result": { - "$ref": "#/definitions/SSHAddressResults" + "controller-config": { + "type": "object", + "patternProperties": { + ".*": { + "type": "object", + "additionalProperties": true + } + } + }, + "endpoint-bindings": { + "type": "object", + "patternProperties": { + ".*": { + "type": "string" + } + } + }, + "image-metadata": { + "type": "array", + "items": { + "$ref": "#/definitions/CloudImageMetadata" + } + }, + "jobs": { + "type": "array", + "items": { + "type": "string" + } + }, + "placement": { + "type": "string" + }, + "series": { + "type": "string" + }, + "subnets-to-zones": { + "type": "object", + "patternProperties": { + ".*": { + "type": "array", + "items": { + "type": "string" + } + } + } + }, + "tags": { + "type": "object", + "patternProperties": { + ".*": { + "type": "string" + } + } + }, + "volumes": { + "type": "array", + "items": { + "$ref": "#/definitions/VolumeParams" + } } - } + }, + "additionalProperties": false, + "required": [ + "constraints", + "series", + "placement", + "jobs" + ] }, - "PublicKeys": { + "ProvisioningInfoResult": { "type": "object", "properties": { - "Params": { - "$ref": "#/definitions/Entities" + "error": { + "$ref": "#/definitions/Error" }, - "Result": { - "$ref": "#/definitions/SSHPublicKeysResults" + "result": { + "$ref": "#/definitions/ProvisioningInfo" } - } - } - }, - "definitions": { - "Entities": { + }, + "additionalProperties": false, + "required": [ + "result" + ] + }, + "ProvisioningInfoResults": { "type": "object", "properties": { - "Entities": { + "results": { "type": "array", "items": { - "$ref": "#/definitions/Entity" + "$ref": "#/definitions/ProvisioningInfoResult" } } }, "additionalProperties": false, "required": [ - "Entities" + "results" ] }, - "Entity": { + "SetStatus": { "type": "object", "properties": { - "Tag": { - "type": "string" + "entities": { + "type": "array", + "items": { + "$ref": "#/definitions/EntityStatusArgs" + } } }, "additionalProperties": false, "required": [ - "Tag" + "entities" ] }, - "Error": { + "Settings": { "type": "object", "properties": { - "Code": { + "Ftp": { "type": "string" }, - "Info": { - "$ref": "#/definitions/ErrorInfo" + "Http": { + "type": "string" + }, + "Https": { + "type": "string" }, - "Message": { + "NoProxy": { "type": "string" } }, "additionalProperties": false, "required": [ - "Message", - "Code" + "Http", + "Https", + "Ftp", + "NoProxy" ] }, - "ErrorInfo": { - "type": "object", - "properties": { - "Macaroon": { - "$ref": "#/definitions/Macaroon" - }, - "MacaroonPath": { - "type": "string" - } - }, - "additionalProperties": false - }, - "Macaroon": { + "StatusResult": { "type": "object", "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } - }, "data": { - "type": "array", - "items": { - "type": "integer" + "type": "object", + "patternProperties": { + ".*": { + "type": "object", + "additionalProperties": true + } } }, + "error": { + "$ref": "#/definitions/Error" + }, "id": { - "$ref": "#/definitions/packet" + "type": "string" }, - "location": { - "$ref": "#/definitions/packet" + "info": { + "type": "string" }, - "sig": { - "type": "array", - "items": { - "type": "integer" - } + "life": { + "type": "string" + }, + "since": { + "type": "string", + "format": "date-time" + }, + "status": { + "type": "string" } }, "additionalProperties": false, "required": [ - "data", - "location", "id", - "caveats", - "sig" + "life", + "status", + "info", + "data", + "since" ] }, - "SSHAddressResult": { - "type": "object", - "properties": { - "address": { - "type": "string" - }, - "error": { - "$ref": "#/definitions/Error" - } - }, - "additionalProperties": false - }, - "SSHAddressResults": { + "StatusResults": { "type": "object", "properties": { "results": { "type": "array", "items": { - "$ref": "#/definitions/SSHAddressResult" + "$ref": "#/definitions/StatusResult" } } }, @@ -16445,40 +14009,28 @@ "results" ] }, - "SSHProxyResult": { - "type": "object", - "properties": { - "use-proxy": { - "type": "boolean" - } - }, - "additionalProperties": false, - "required": [ - "use-proxy" - ] - }, - "SSHPublicKeysResult": { + "StringResult": { "type": "object", "properties": { "error": { "$ref": "#/definitions/Error" }, - "public-keys": { - "type": "array", - "items": { - "type": "string" - } + "result": { + "type": "string" } }, - "additionalProperties": false + "additionalProperties": false, + "required": [ + "result" + ] }, - "SSHPublicKeysResults": { + "StringResults": { "type": "object", "properties": { "results": { "type": "array", "items": { - "$ref": "#/definitions/SSHPublicKeysResult" + "$ref": "#/definitions/StringResult" } } }, @@ -16487,1006 +14039,1042 @@ "results" ] }, - "caveat": { + "StringsResult": { "type": "object", "properties": { - "caveatId": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" + "error": { + "$ref": "#/definitions/Error" }, - "verificationId": { - "$ref": "#/definitions/packet" + "result": { + "type": "array", + "items": { + "type": "string" + } } }, - "additionalProperties": false, - "required": [ - "location", - "caveatId", - "verificationId" - ] + "additionalProperties": false }, - "packet": { + "StringsWatchResult": { "type": "object", "properties": { - "headerLen": { - "type": "integer" + "changes": { + "type": "array", + "items": { + "type": "string" + } }, - "start": { - "type": "integer" + "error": { + "$ref": "#/definitions/Error" }, - "totalLen": { - "type": "integer" + "watcher-id": { + "type": "string" } }, "additionalProperties": false, "required": [ - "start", - "totalLen", - "headerLen" + "watcher-id" ] - } - } - } - }, - { - "Name": "Service", - "Version": 3, - "Schema": { - "type": "object", - "properties": { - "AddRelation": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/AddRelation" - }, - "Result": { - "$ref": "#/definitions/AddRelationResults" - } - } - }, - "AddUnits": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/AddServiceUnits" - }, - "Result": { - "$ref": "#/definitions/AddServiceUnitsResults" - } - } - }, - "CharmRelations": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/ServiceCharmRelations" - }, - "Result": { - "$ref": "#/definitions/ServiceCharmRelationsResults" - } - } - }, - "Deploy": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/ServicesDeploy" - }, - "Result": { - "$ref": "#/definitions/ErrorResults" - } - } - }, - "Destroy": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/ServiceDestroy" - } - } - }, - "DestroyRelation": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/DestroyRelation" - } - } - }, - "DestroyUnits": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/DestroyServiceUnits" - } - } - }, - "Expose": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/ServiceExpose" - } - } }, - "Get": { + "StringsWatchResults": { "type": "object", "properties": { - "Params": { - "$ref": "#/definitions/ServiceGet" - }, - "Result": { - "$ref": "#/definitions/ServiceGetResults" + "results": { + "type": "array", + "items": { + "$ref": "#/definitions/StringsWatchResult" + } } - } + }, + "additionalProperties": false, + "required": [ + "results" + ] }, - "GetCharmURL": { + "Tools": { "type": "object", "properties": { - "Params": { - "$ref": "#/definitions/ServiceGet" + "sha256": { + "type": "string" }, - "Result": { - "$ref": "#/definitions/StringResult" + "size": { + "type": "integer" + }, + "url": { + "type": "string" + }, + "version": { + "$ref": "#/definitions/Binary" } - } + }, + "additionalProperties": false, + "required": [ + "version", + "url", + "size" + ] }, - "GetConstraints": { + "ToolsResult": { "type": "object", "properties": { - "Params": { - "$ref": "#/definitions/GetServiceConstraints" + "disable-ssl-hostname-verification": { + "type": "boolean" }, - "Result": { - "$ref": "#/definitions/GetConstraintsResults" + "error": { + "$ref": "#/definitions/Error" + }, + "tools": { + "type": "array", + "items": { + "$ref": "#/definitions/Tools" + } } - } + }, + "additionalProperties": false, + "required": [ + "tools", + "disable-ssl-hostname-verification" + ] }, - "Set": { + "ToolsResults": { "type": "object", "properties": { - "Params": { - "$ref": "#/definitions/ServiceSet" + "results": { + "type": "array", + "items": { + "$ref": "#/definitions/ToolsResult" + } } - } + }, + "additionalProperties": false, + "required": [ + "results" + ] }, - "SetCharm": { + "UpdateBehavior": { "type": "object", "properties": { - "Params": { - "$ref": "#/definitions/ServiceSetCharm" + "enable-os-refresh-update": { + "type": "boolean" + }, + "enable-os-upgrade": { + "type": "boolean" } - } + }, + "additionalProperties": false, + "required": [ + "enable-os-refresh-update", + "enable-os-upgrade" + ] }, - "SetConstraints": { + "Value": { "type": "object", "properties": { - "Params": { - "$ref": "#/definitions/SetConstraints" + "arch": { + "type": "string" + }, + "container": { + "type": "string" + }, + "cpu-cores": { + "type": "integer" + }, + "cpu-power": { + "type": "integer" + }, + "instance-type": { + "type": "string" + }, + "mem": { + "type": "integer" + }, + "root-disk": { + "type": "integer" + }, + "spaces": { + "type": "array", + "items": { + "type": "string" + } + }, + "tags": { + "type": "array", + "items": { + "type": "string" + } + }, + "virt-type": { + "type": "string" } - } + }, + "additionalProperties": false }, - "SetMetricCredentials": { + "Volume": { "type": "object", "properties": { - "Params": { - "$ref": "#/definitions/ServiceMetricCredentials" + "info": { + "$ref": "#/definitions/VolumeInfo" }, - "Result": { - "$ref": "#/definitions/ErrorResults" + "volume-tag": { + "type": "string" } - } + }, + "additionalProperties": false, + "required": [ + "volume-tag", + "info" + ] }, - "Unexpose": { + "VolumeAttachmentInfo": { "type": "object", "properties": { - "Params": { - "$ref": "#/definitions/ServiceUnexpose" + "bus-address": { + "type": "string" + }, + "device-link": { + "type": "string" + }, + "device-name": { + "type": "string" + }, + "read-only": { + "type": "boolean" } - } + }, + "additionalProperties": false }, - "Unset": { + "VolumeAttachmentParams": { "type": "object", "properties": { - "Params": { - "$ref": "#/definitions/ServiceUnset" + "instance-id": { + "type": "string" + }, + "machine-tag": { + "type": "string" + }, + "provider": { + "type": "string" + }, + "read-only": { + "type": "boolean" + }, + "volume-id": { + "type": "string" + }, + "volume-tag": { + "type": "string" } - } + }, + "additionalProperties": false, + "required": [ + "volume-tag", + "machine-tag", + "provider" + ] }, - "Update": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/ServiceUpdate" - } - } - } - }, - "definitions": { - "AddRelation": { + "VolumeInfo": { "type": "object", "properties": { - "Endpoints": { - "type": "array", - "items": { - "type": "string" - } + "hardware-id": { + "type": "string" + }, + "persistent": { + "type": "boolean" + }, + "size": { + "type": "integer" + }, + "volume-id": { + "type": "string" } }, "additionalProperties": false, "required": [ - "Endpoints" + "volume-id", + "size", + "persistent" ] }, - "AddRelationResults": { + "VolumeParams": { "type": "object", "properties": { - "Endpoints": { + "attachment": { + "$ref": "#/definitions/VolumeAttachmentParams" + }, + "attributes": { + "type": "object", + "patternProperties": { + ".*": { + "type": "object", + "additionalProperties": true + } + } + }, + "provider": { + "type": "string" + }, + "size": { + "type": "integer" + }, + "tags": { "type": "object", "patternProperties": { ".*": { - "$ref": "#/definitions/Relation" + "type": "string" } } + }, + "volume-tag": { + "type": "string" } }, "additionalProperties": false, "required": [ - "Endpoints" + "volume-tag", + "size", + "provider" ] }, - "AddServiceUnits": { + "WatchContainer": { "type": "object", "properties": { - "NumUnits": { - "type": "integer" - }, - "Placement": { - "type": "array", - "items": { - "$ref": "#/definitions/Placement" - } + "container-type": { + "type": "string" }, - "ServiceName": { + "machine-tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "ServiceName", - "NumUnits", - "Placement" + "machine-tag", + "container-type" ] }, - "AddServiceUnitsResults": { + "WatchContainers": { "type": "object", "properties": { - "Units": { + "params": { "type": "array", "items": { - "type": "string" + "$ref": "#/definitions/WatchContainer" } } }, "additionalProperties": false, "required": [ - "Units" + "params" ] - }, - "Constraints": { + } + } + } + }, + { + "Name": "ProxyUpdater", + "Version": 1, + "Schema": { + "type": "object", + "properties": { + "ProxyConfig": { "type": "object", "properties": { - "Count": { - "type": "integer" - }, - "Pool": { - "type": "string" + "Params": { + "$ref": "#/definitions/Entities" }, - "Size": { - "type": "integer" + "Result": { + "$ref": "#/definitions/ProxyConfigResults" } - }, - "additionalProperties": false, - "required": [ - "Pool", - "Size", - "Count" - ] + } }, - "DestroyRelation": { + "WatchForProxyConfigAndAPIHostPortChanges": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/Entities" + }, + "Result": { + "$ref": "#/definitions/NotifyWatchResults" + } + } + } + }, + "definitions": { + "Entities": { "type": "object", "properties": { - "Endpoints": { + "entities": { "type": "array", "items": { - "type": "string" + "$ref": "#/definitions/Entity" } } }, "additionalProperties": false, "required": [ - "Endpoints" + "entities" ] }, - "DestroyServiceUnits": { + "Entity": { "type": "object", "properties": { - "UnitNames": { - "type": "array", - "items": { - "type": "string" - } + "tag": { + "type": "string" } }, "additionalProperties": false, "required": [ - "UnitNames" + "tag" ] }, "Error": { "type": "object", "properties": { - "Code": { + "code": { "type": "string" }, - "Info": { + "info": { "$ref": "#/definitions/ErrorInfo" }, - "Message": { + "message": { "type": "string" } }, "additionalProperties": false, "required": [ - "Message", - "Code" + "message", + "code" ] }, "ErrorInfo": { "type": "object", "properties": { - "Macaroon": { + "macaroon": { "$ref": "#/definitions/Macaroon" }, - "MacaroonPath": { + "macaroon-path": { "type": "string" } }, "additionalProperties": false }, - "ErrorResult": { + "Macaroon": { + "type": "object", + "additionalProperties": false + }, + "NotifyWatchResult": { "type": "object", "properties": { - "Error": { + "NotifyWatcherId": { + "type": "string" + }, + "error": { "$ref": "#/definitions/Error" } }, "additionalProperties": false, "required": [ - "Error" + "NotifyWatcherId" ] }, - "ErrorResults": { + "NotifyWatchResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { - "$ref": "#/definitions/ErrorResult" + "$ref": "#/definitions/NotifyWatchResult" } } }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, - "GetConstraintsResults": { + "ProxyConfig": { "type": "object", "properties": { - "Constraints": { - "$ref": "#/definitions/Value" + "ftp": { + "type": "string" + }, + "http": { + "type": "string" + }, + "https": { + "type": "string" + }, + "no-proxy": { + "type": "string" } }, "additionalProperties": false, "required": [ - "Constraints" + "http", + "https", + "ftp", + "no-proxy" ] }, - "GetServiceConstraints": { + "ProxyConfigResult": { "type": "object", "properties": { - "ServiceName": { - "type": "string" + "apt-proxy-settings": { + "$ref": "#/definitions/ProxyConfig" + }, + "error": { + "$ref": "#/definitions/Error" + }, + "proxy-settings": { + "$ref": "#/definitions/ProxyConfig" } }, "additionalProperties": false, "required": [ - "ServiceName" + "proxy-settings", + "apt-proxy-settings" ] }, - "Macaroon": { + "ProxyConfigResults": { "type": "object", "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } - }, - "data": { + "results": { "type": "array", "items": { - "type": "integer" + "$ref": "#/definitions/ProxyConfigResult" } + } + }, + "additionalProperties": false, + "required": [ + "results" + ] + } + } + } + }, + { + "Name": "Reboot", + "Version": 2, + "Schema": { + "type": "object", + "properties": { + "ClearReboot": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/Entities" }, - "id": { - "$ref": "#/definitions/packet" + "Result": { + "$ref": "#/definitions/ErrorResults" + } + } + }, + "GetRebootAction": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/Entities" }, - "location": { - "$ref": "#/definitions/packet" + "Result": { + "$ref": "#/definitions/RebootActionResults" + } + } + }, + "RequestReboot": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/Entities" }, - "sig": { + "Result": { + "$ref": "#/definitions/ErrorResults" + } + } + }, + "WatchForRebootEvent": { + "type": "object", + "properties": { + "Result": { + "$ref": "#/definitions/NotifyWatchResult" + } + } + } + }, + "definitions": { + "Entities": { + "type": "object", + "properties": { + "entities": { "type": "array", "items": { - "type": "integer" + "$ref": "#/definitions/Entity" } } }, "additionalProperties": false, "required": [ - "data", - "location", - "id", - "caveats", - "sig" + "entities" ] }, - "Placement": { + "Entity": { "type": "object", "properties": { - "Directive": { - "type": "string" - }, - "Scope": { + "tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "Scope", - "Directive" + "tag" ] }, - "Relation": { + "Error": { "type": "object", "properties": { - "Interface": { - "type": "string" - }, - "Limit": { - "type": "integer" - }, - "Name": { + "code": { "type": "string" }, - "Optional": { - "type": "boolean" - }, - "Role": { - "type": "string" + "info": { + "$ref": "#/definitions/ErrorInfo" }, - "Scope": { + "message": { "type": "string" } }, "additionalProperties": false, "required": [ - "Name", - "Role", - "Interface", - "Optional", - "Limit", - "Scope" + "message", + "code" ] }, - "ServiceCharmRelations": { + "ErrorInfo": { "type": "object", "properties": { - "ServiceName": { + "macaroon": { + "$ref": "#/definitions/Macaroon" + }, + "macaroon-path": { "type": "string" } }, - "additionalProperties": false, - "required": [ - "ServiceName" - ] + "additionalProperties": false + }, + "ErrorResult": { + "type": "object", + "properties": { + "error": { + "$ref": "#/definitions/Error" + } + }, + "additionalProperties": false }, - "ServiceCharmRelationsResults": { + "ErrorResults": { "type": "object", "properties": { - "CharmRelations": { + "results": { "type": "array", "items": { - "type": "string" + "$ref": "#/definitions/ErrorResult" } } }, "additionalProperties": false, "required": [ - "CharmRelations" + "results" ] }, - "ServiceDeploy": { + "Macaroon": { + "type": "object", + "additionalProperties": false + }, + "NotifyWatchResult": { "type": "object", "properties": { - "Channel": { - "type": "string" - }, - "CharmUrl": { - "type": "string" - }, - "Config": { - "type": "object", - "patternProperties": { - ".*": { - "type": "string" - } - } - }, - "ConfigYAML": { - "type": "string" - }, - "Constraints": { - "$ref": "#/definitions/Value" - }, - "EndpointBindings": { - "type": "object", - "patternProperties": { - ".*": { - "type": "string" - } - } - }, - "NumUnits": { - "type": "integer" - }, - "Placement": { - "type": "array", - "items": { - "$ref": "#/definitions/Placement" - } - }, - "Resources": { - "type": "object", - "patternProperties": { - ".*": { - "type": "string" - } - } - }, - "Series": { - "type": "string" - }, - "ServiceName": { + "NotifyWatcherId": { "type": "string" }, - "Storage": { - "type": "object", - "patternProperties": { - ".*": { - "$ref": "#/definitions/Constraints" - } - } + "error": { + "$ref": "#/definitions/Error" } }, "additionalProperties": false, "required": [ - "ServiceName", - "Series", - "CharmUrl", - "Channel", - "NumUnits", - "Config", - "ConfigYAML", - "Constraints", - "Placement", - "Storage", - "EndpointBindings", - "Resources" + "NotifyWatcherId" ] }, - "ServiceDestroy": { + "RebootActionResult": { + "type": "object", + "properties": { + "error": { + "$ref": "#/definitions/Error" + }, + "result": { + "type": "string" + } + }, + "additionalProperties": false + }, + "RebootActionResults": { + "type": "object", + "properties": { + "results": { + "type": "array", + "items": { + "$ref": "#/definitions/RebootActionResult" + } + } + }, + "additionalProperties": false + } + } + } + }, + { + "Name": "RelationUnitsWatcher", + "Version": 1, + "Schema": { + "type": "object", + "properties": { + "Next": { "type": "object", "properties": { - "ServiceName": { - "type": "string" + "Result": { + "$ref": "#/definitions/RelationUnitsWatchResult" } - }, - "additionalProperties": false, - "required": [ - "ServiceName" - ] + } }, - "ServiceExpose": { + "Stop": { + "type": "object" + } + }, + "definitions": { + "Error": { "type": "object", "properties": { - "ServiceName": { + "code": { + "type": "string" + }, + "info": { + "$ref": "#/definitions/ErrorInfo" + }, + "message": { "type": "string" } }, "additionalProperties": false, "required": [ - "ServiceName" + "message", + "code" ] }, - "ServiceGet": { + "ErrorInfo": { "type": "object", "properties": { - "ServiceName": { + "macaroon": { + "$ref": "#/definitions/Macaroon" + }, + "macaroon-path": { "type": "string" } }, - "additionalProperties": false, - "required": [ - "ServiceName" - ] + "additionalProperties": false + }, + "Macaroon": { + "type": "object", + "additionalProperties": false }, - "ServiceGetResults": { + "RelationUnitsChange": { "type": "object", "properties": { - "Charm": { - "type": "string" - }, - "Config": { + "changed": { "type": "object", "patternProperties": { ".*": { - "type": "object", - "additionalProperties": true + "$ref": "#/definitions/UnitSettings" } } }, - "Constraints": { - "$ref": "#/definitions/Value" - }, - "Service": { - "type": "string" + "departed": { + "type": "array", + "items": { + "type": "string" + } } }, "additionalProperties": false, "required": [ - "Service", - "Charm", - "Config", - "Constraints" + "changed" ] }, - "ServiceMetricCredential": { + "RelationUnitsWatchResult": { "type": "object", "properties": { - "MetricCredentials": { - "type": "array", - "items": { - "type": "integer" - } + "changes": { + "$ref": "#/definitions/RelationUnitsChange" + }, + "error": { + "$ref": "#/definitions/Error" }, - "ServiceName": { + "watcher-id": { "type": "string" } }, "additionalProperties": false, "required": [ - "ServiceName", - "MetricCredentials" + "watcher-id", + "changes" ] }, - "ServiceMetricCredentials": { + "UnitSettings": { "type": "object", "properties": { - "Creds": { - "type": "array", - "items": { - "$ref": "#/definitions/ServiceMetricCredential" - } + "version": { + "type": "integer" } }, "additionalProperties": false, "required": [ - "Creds" + "version" ] - }, - "ServiceSet": { + } + } + } + }, + { + "Name": "Resumer", + "Version": 2, + "Schema": { + "type": "object", + "properties": { + "ResumeTransactions": { + "type": "object" + } + } + } + }, + { + "Name": "RetryStrategy", + "Version": 1, + "Schema": { + "type": "object", + "properties": { + "RetryStrategy": { "type": "object", "properties": { - "Options": { - "type": "object", - "patternProperties": { - ".*": { - "type": "string" - } - } + "Params": { + "$ref": "#/definitions/Entities" }, - "ServiceName": { - "type": "string" + "Result": { + "$ref": "#/definitions/RetryStrategyResults" } - }, - "additionalProperties": false, - "required": [ - "ServiceName", - "Options" - ] + } }, - "ServiceSetCharm": { + "WatchRetryStrategy": { "type": "object", "properties": { - "charmurl": { - "type": "string" - }, - "cs-channel": { - "type": "string" - }, - "forceseries": { - "type": "boolean" - }, - "forceunits": { - "type": "boolean" - }, - "resourceids": { - "type": "object", - "patternProperties": { - ".*": { - "type": "string" - } - } + "Params": { + "$ref": "#/definitions/Entities" }, - "servicename": { - "type": "string" + "Result": { + "$ref": "#/definitions/NotifyWatchResults" } - }, - "additionalProperties": false, - "required": [ - "servicename", - "charmurl", - "cs-channel", - "forceunits", - "forceseries", - "resourceids" - ] - }, - "ServiceUnexpose": { + } + } + }, + "definitions": { + "Entities": { "type": "object", "properties": { - "ServiceName": { - "type": "string" + "entities": { + "type": "array", + "items": { + "$ref": "#/definitions/Entity" + } } }, "additionalProperties": false, "required": [ - "ServiceName" + "entities" ] }, - "ServiceUnset": { + "Entity": { "type": "object", "properties": { - "Options": { - "type": "array", - "items": { - "type": "string" - } - }, - "ServiceName": { + "tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "ServiceName", - "Options" + "tag" ] }, - "ServiceUpdate": { + "Error": { "type": "object", "properties": { - "CharmUrl": { - "type": "string" - }, - "Constraints": { - "$ref": "#/definitions/Value" - }, - "ForceCharmUrl": { - "type": "boolean" - }, - "ForceSeries": { - "type": "boolean" - }, - "MinUnits": { - "type": "integer" - }, - "ServiceName": { + "code": { "type": "string" }, - "SettingsStrings": { - "type": "object", - "patternProperties": { - ".*": { - "type": "string" - } - } + "info": { + "$ref": "#/definitions/ErrorInfo" }, - "SettingsYAML": { + "message": { "type": "string" } }, "additionalProperties": false, "required": [ - "ServiceName", - "CharmUrl", - "ForceCharmUrl", - "ForceSeries", - "MinUnits", - "SettingsStrings", - "SettingsYAML", - "Constraints" + "message", + "code" ] }, - "ServicesDeploy": { + "ErrorInfo": { "type": "object", "properties": { - "Services": { - "type": "array", - "items": { - "$ref": "#/definitions/ServiceDeploy" - } + "macaroon": { + "$ref": "#/definitions/Macaroon" + }, + "macaroon-path": { + "type": "string" } }, - "additionalProperties": false, - "required": [ - "Services" - ] + "additionalProperties": false }, - "SetConstraints": { + "Macaroon": { + "type": "object", + "additionalProperties": false + }, + "NotifyWatchResult": { "type": "object", "properties": { - "Constraints": { - "$ref": "#/definitions/Value" - }, - "ServiceName": { + "NotifyWatcherId": { "type": "string" + }, + "error": { + "$ref": "#/definitions/Error" } }, "additionalProperties": false, "required": [ - "ServiceName", - "Constraints" + "NotifyWatcherId" ] }, - "StringResult": { + "NotifyWatchResults": { "type": "object", "properties": { - "Error": { - "$ref": "#/definitions/Error" - }, - "Result": { - "type": "string" + "results": { + "type": "array", + "items": { + "$ref": "#/definitions/NotifyWatchResult" + } } }, "additionalProperties": false, "required": [ - "Error", - "Result" + "results" ] }, - "Value": { + "RetryStrategy": { "type": "object", "properties": { - "arch": { - "type": "string" - }, - "container": { - "type": "string" - }, - "cpu-cores": { - "type": "integer" + "jitter-retry-time": { + "type": "boolean" }, - "cpu-power": { + "max-retry-time": { "type": "integer" }, - "instance-type": { - "type": "string" - }, - "mem": { + "min-retry-time": { "type": "integer" }, - "root-disk": { + "retry-time-factor": { "type": "integer" }, - "spaces": { - "type": "array", - "items": { - "type": "string" - } - }, - "tags": { - "type": "array", - "items": { - "type": "string" - } - }, - "virt-type": { - "type": "string" + "should-retry": { + "type": "boolean" } }, - "additionalProperties": false + "additionalProperties": false, + "required": [ + "should-retry", + "min-retry-time", + "max-retry-time", + "jitter-retry-time", + "retry-time-factor" + ] }, - "caveat": { + "RetryStrategyResult": { "type": "object", - "properties": { - "caveatId": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" + "properties": { + "error": { + "$ref": "#/definitions/Error" }, - "verificationId": { - "$ref": "#/definitions/packet" + "result": { + "$ref": "#/definitions/RetryStrategy" } }, - "additionalProperties": false, - "required": [ - "location", - "caveatId", - "verificationId" - ] + "additionalProperties": false }, - "packet": { + "RetryStrategyResults": { "type": "object", "properties": { - "headerLen": { - "type": "integer" - }, - "start": { - "type": "integer" - }, - "totalLen": { - "type": "integer" + "results": { + "type": "array", + "items": { + "$ref": "#/definitions/RetryStrategyResult" + } } }, "additionalProperties": false, "required": [ - "start", - "totalLen", - "headerLen" + "results" ] } } } }, { - "Name": "ServiceScaler", + "Name": "SSHClient", "Version": 1, "Schema": { "type": "object", "properties": { - "Rescale": { + "PrivateAddress": { "type": "object", "properties": { "Params": { "$ref": "#/definitions/Entities" }, "Result": { - "$ref": "#/definitions/ErrorResults" + "$ref": "#/definitions/SSHAddressResults" } } }, - "Watch": { + "Proxy": { "type": "object", "properties": { "Result": { - "$ref": "#/definitions/StringsWatchResult" + "$ref": "#/definitions/SSHProxyResult" + } + } + }, + "PublicAddress": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/Entities" + }, + "Result": { + "$ref": "#/definitions/SSHAddressResults" + } + } + }, + "PublicKeys": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/Entities" + }, + "Result": { + "$ref": "#/definitions/SSHPublicKeysResults" } } } @@ -17495,7 +15083,7 @@ "Entities": { "type": "object", "properties": { - "Entities": { + "entities": { "type": "array", "items": { "$ref": "#/definitions/Entity" @@ -17504,177 +15092,123 @@ }, "additionalProperties": false, "required": [ - "Entities" + "entities" ] }, "Entity": { "type": "object", "properties": { - "Tag": { + "tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "Tag" + "tag" ] }, "Error": { "type": "object", "properties": { - "Code": { + "code": { "type": "string" }, - "Info": { + "info": { "$ref": "#/definitions/ErrorInfo" }, - "Message": { + "message": { "type": "string" } }, "additionalProperties": false, "required": [ - "Message", - "Code" + "message", + "code" ] }, "ErrorInfo": { "type": "object", "properties": { - "Macaroon": { + "macaroon": { "$ref": "#/definitions/Macaroon" }, - "MacaroonPath": { + "macaroon-path": { "type": "string" } }, "additionalProperties": false }, - "ErrorResult": { + "Macaroon": { + "type": "object", + "additionalProperties": false + }, + "SSHAddressResult": { "type": "object", "properties": { - "Error": { + "address": { + "type": "string" + }, + "error": { "$ref": "#/definitions/Error" } }, - "additionalProperties": false, - "required": [ - "Error" - ] + "additionalProperties": false }, - "ErrorResults": { + "SSHAddressResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { - "$ref": "#/definitions/ErrorResult" + "$ref": "#/definitions/SSHAddressResult" } } }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, - "Macaroon": { + "SSHProxyResult": { "type": "object", "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } - }, - "data": { - "type": "array", - "items": { - "type": "integer" - } - }, - "id": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "sig": { - "type": "array", - "items": { - "type": "integer" - } + "use-proxy": { + "type": "boolean" } }, "additionalProperties": false, "required": [ - "data", - "location", - "id", - "caveats", - "sig" + "use-proxy" ] }, - "StringsWatchResult": { + "SSHPublicKeysResult": { "type": "object", "properties": { - "Changes": { + "error": { + "$ref": "#/definitions/Error" + }, + "public-keys": { "type": "array", "items": { "type": "string" } - }, - "Error": { - "$ref": "#/definitions/Error" - }, - "StringsWatcherId": { - "type": "string" - } - }, - "additionalProperties": false, - "required": [ - "StringsWatcherId", - "Changes", - "Error" - ] - }, - "caveat": { - "type": "object", - "properties": { - "caveatId": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "verificationId": { - "$ref": "#/definitions/packet" } }, - "additionalProperties": false, - "required": [ - "location", - "caveatId", - "verificationId" - ] + "additionalProperties": false }, - "packet": { + "SSHPublicKeysResults": { "type": "object", "properties": { - "headerLen": { - "type": "integer" - }, - "start": { - "type": "integer" - }, - "totalLen": { - "type": "integer" + "results": { + "type": "array", + "items": { + "$ref": "#/definitions/SSHPublicKeysResult" + } } }, "additionalProperties": false, "required": [ - "start", - "totalLen", - "headerLen" + "results" ] } } @@ -17713,7 +15247,7 @@ "Entities": { "type": "object", "properties": { - "Entities": { + "entities": { "type": "array", "items": { "$ref": "#/definitions/Entity" @@ -17722,47 +15256,47 @@ }, "additionalProperties": false, "required": [ - "Entities" + "entities" ] }, "Entity": { "type": "object", "properties": { - "Tag": { + "tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "Tag" + "tag" ] }, "Error": { "type": "object", "properties": { - "Code": { + "code": { "type": "string" }, - "Info": { + "info": { "$ref": "#/definitions/ErrorInfo" }, - "Message": { + "message": { "type": "string" } }, "additionalProperties": false, "required": [ - "Message", - "Code" + "message", + "code" ] }, "ErrorInfo": { "type": "object", "properties": { - "Macaroon": { + "macaroon": { "$ref": "#/definitions/Macaroon" }, - "MacaroonPath": { + "macaroon-path": { "type": "string" } }, @@ -17771,19 +15305,16 @@ "ErrorResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" } }, - "additionalProperties": false, - "required": [ - "Error" - ] + "additionalProperties": false }, "ErrorResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/ErrorResult" @@ -17792,70 +15323,37 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "Macaroon": { "type": "object", - "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } - }, - "data": { - "type": "array", - "items": { - "type": "integer" - } - }, - "id": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "sig": { - "type": "array", - "items": { - "type": "integer" - } - } - }, - "additionalProperties": false, - "required": [ - "data", - "location", - "id", - "caveats", - "sig" - ] + "additionalProperties": false }, "SingularClaim": { "type": "object", "properties": { - "ControllerTag": { + "controller-tag": { "type": "string" }, - "Duration": { + "duration": { "type": "integer" }, - "ModelTag": { + "model-tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "ModelTag", - "ControllerTag", - "Duration" + "model-tag", + "controller-tag", + "duration" ] }, "SingularClaims": { "type": "object", "properties": { - "Claims": { + "claims": { "type": "array", "items": { "$ref": "#/definitions/SingularClaim" @@ -17864,47 +15362,7 @@ }, "additionalProperties": false, "required": [ - "Claims" - ] - }, - "caveat": { - "type": "object", - "properties": { - "caveatId": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "verificationId": { - "$ref": "#/definitions/packet" - } - }, - "additionalProperties": false, - "required": [ - "location", - "caveatId", - "verificationId" - ] - }, - "packet": { - "type": "object", - "properties": { - "headerLen": { - "type": "integer" - }, - "start": { - "type": "integer" - }, - "totalLen": { - "type": "integer" - } - }, - "additionalProperties": false, - "required": [ - "start", - "totalLen", - "headerLen" + "claims" ] } } @@ -17940,16 +15398,16 @@ "CreateSpaceParams": { "type": "object", "properties": { - "ProviderId": { + "provider-id": { "type": "string" }, - "Public": { + "public": { "type": "boolean" }, - "SpaceTag": { + "space-tag": { "type": "string" }, - "SubnetTags": { + "subnet-tags": { "type": "array", "items": { "type": "string" @@ -17958,15 +15416,15 @@ }, "additionalProperties": false, "required": [ - "SubnetTags", - "SpaceTag", - "Public" + "subnet-tags", + "space-tag", + "public" ] }, "CreateSpacesParams": { "type": "object", "properties": { - "Spaces": { + "spaces": { "type": "array", "items": { "$ref": "#/definitions/CreateSpaceParams" @@ -17975,35 +15433,35 @@ }, "additionalProperties": false, "required": [ - "Spaces" + "spaces" ] }, "Error": { "type": "object", "properties": { - "Code": { + "code": { "type": "string" }, - "Info": { + "info": { "$ref": "#/definitions/ErrorInfo" }, - "Message": { + "message": { "type": "string" } }, "additionalProperties": false, "required": [ - "Message", - "Code" + "message", + "code" ] }, "ErrorInfo": { "type": "object", "properties": { - "Macaroon": { + "macaroon": { "$ref": "#/definitions/Macaroon" }, - "MacaroonPath": { + "macaroon-path": { "type": "string" } }, @@ -18012,19 +15470,16 @@ "ErrorResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" } }, - "additionalProperties": false, - "required": [ - "Error" - ] + "additionalProperties": false }, "ErrorResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/ErrorResult" @@ -18033,71 +15488,38 @@ }, "additionalProperties": false, "required": [ - "Results" - ] - }, - "ListSpacesResults": { - "type": "object", - "properties": { - "Results": { - "type": "array", - "items": { - "$ref": "#/definitions/Space" - } - } - }, - "additionalProperties": false, - "required": [ - "Results" - ] - }, - "Macaroon": { - "type": "object", - "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } - }, - "data": { - "type": "array", - "items": { - "type": "integer" - } - }, - "id": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "sig": { + "results" + ] + }, + "ListSpacesResults": { + "type": "object", + "properties": { + "results": { "type": "array", "items": { - "type": "integer" + "$ref": "#/definitions/Space" } } }, "additionalProperties": false, "required": [ - "data", - "location", - "id", - "caveats", - "sig" + "results" ] }, + "Macaroon": { + "type": "object", + "additionalProperties": false + }, "Space": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" }, - "Name": { + "name": { "type": "string" }, - "Subnets": { + "subnets": { "type": "array", "items": { "$ref": "#/definitions/Subnet" @@ -18106,44 +15528,32 @@ }, "additionalProperties": false, "required": [ - "Name", - "Subnets" + "name", + "subnets" ] }, "Subnet": { "type": "object", "properties": { - "CIDR": { + "cidr": { "type": "string" }, - "Life": { + "life": { "type": "string" }, - "ProviderId": { + "provider-id": { "type": "string" }, - "SpaceTag": { + "space-tag": { "type": "string" }, - "StaticRangeHighIP": { - "type": "array", - "items": { - "type": "integer" - } - }, - "StaticRangeLowIP": { - "type": "array", - "items": { - "type": "integer" - } - }, - "Status": { + "status": { "type": "string" }, - "VLANTag": { + "vlan-tag": { "type": "integer" }, - "Zones": { + "zones": { "type": "array", "items": { "type": "string" @@ -18152,51 +15562,11 @@ }, "additionalProperties": false, "required": [ - "CIDR", - "VLANTag", - "Life", - "SpaceTag", - "Zones" - ] - }, - "caveat": { - "type": "object", - "properties": { - "caveatId": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "verificationId": { - "$ref": "#/definitions/packet" - } - }, - "additionalProperties": false, - "required": [ - "location", - "caveatId", - "verificationId" - ] - }, - "packet": { - "type": "object", - "properties": { - "headerLen": { - "type": "integer" - }, - "start": { - "type": "integer" - }, - "totalLen": { - "type": "integer" - } - }, - "additionalProperties": false, - "required": [ - "start", - "totalLen", - "headerLen" + "cidr", + "vlan-tag", + "life", + "space-tag", + "zones" ] } } @@ -18221,13 +15591,17 @@ "StatusHistoryPruneArgs": { "type": "object", "properties": { - "MaxLogsPerEntity": { + "max-history-mb": { + "type": "integer" + }, + "max-history-time": { "type": "integer" } }, "additionalProperties": false, "required": [ - "MaxLogsPerEntity" + "max-history-time", + "max-history-mb" ] } } @@ -18318,7 +15692,7 @@ "Entities": { "type": "object", "properties": { - "Entities": { + "entities": { "type": "array", "items": { "$ref": "#/definitions/Entity" @@ -18327,25 +15701,25 @@ }, "additionalProperties": false, "required": [ - "Entities" + "entities" ] }, "Entity": { "type": "object", "properties": { - "Tag": { + "tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "Tag" + "tag" ] }, "EntityStatus": { "type": "object", "properties": { - "Data": { + "data": { "type": "object", "patternProperties": { ".*": { @@ -18354,51 +15728,50 @@ } } }, - "Info": { + "info": { "type": "string" }, - "Since": { + "since": { "type": "string", "format": "date-time" }, - "Status": { + "status": { "type": "string" } }, "additionalProperties": false, "required": [ - "Status", - "Info", - "Data", - "Since" + "status", + "info", + "since" ] }, "Error": { "type": "object", "properties": { - "Code": { + "code": { "type": "string" }, - "Info": { + "info": { "$ref": "#/definitions/ErrorInfo" }, - "Message": { + "message": { "type": "string" } }, "additionalProperties": false, "required": [ - "Message", - "Code" + "message", + "code" ] }, "ErrorInfo": { "type": "object", "properties": { - "Macaroon": { + "macaroon": { "$ref": "#/definitions/Macaroon" }, - "MacaroonPath": { + "macaroon-path": { "type": "string" } }, @@ -18407,19 +15780,16 @@ "ErrorResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" } }, - "additionalProperties": false, - "required": [ - "Error" - ] + "additionalProperties": false }, "ErrorResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/ErrorResult" @@ -18428,13 +15798,13 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "FilesystemAttachmentInfo": { "type": "object", "properties": { - "mountpoint": { + "mount-point": { "type": "string" }, "read-only": { @@ -18446,13 +15816,13 @@ "FilesystemDetails": { "type": "object", "properties": { - "filesystemtag": { + "filesystem-tag": { "type": "string" }, "info": { "$ref": "#/definitions/FilesystemInfo" }, - "machineattachments": { + "machine-attachments": { "type": "object", "patternProperties": { ".*": { @@ -18466,13 +15836,13 @@ "storage": { "$ref": "#/definitions/StorageDetails" }, - "volumetag": { + "volume-tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "filesystemtag", + "filesystem-tag", "info", "status" ] @@ -18531,7 +15901,7 @@ "FilesystemInfo": { "type": "object", "properties": { - "filesystemid": { + "filesystem-id": { "type": "string" }, "size": { @@ -18540,51 +15910,18 @@ }, "additionalProperties": false, "required": [ - "filesystemid", + "filesystem-id", "size" ] }, "Macaroon": { "type": "object", - "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } - }, - "data": { - "type": "array", - "items": { - "type": "integer" - } - }, - "id": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "sig": { - "type": "array", - "items": { - "type": "integer" - } - } - }, - "additionalProperties": false, - "required": [ - "data", - "location", - "id", - "caveats", - "sig" - ] + "additionalProperties": false }, "StorageAddParams": { "type": "object", "properties": { - "StorageName": { + "name": { "type": "string" }, "storage": { @@ -18597,7 +15934,7 @@ "additionalProperties": false, "required": [ "unit", - "StorageName", + "name", "storage" ] }, @@ -18607,49 +15944,41 @@ "location": { "type": "string" }, - "machinetag": { + "machine-tag": { "type": "string" }, - "storagetag": { + "storage-tag": { "type": "string" }, - "unittag": { + "unit-tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "storagetag", - "unittag", - "machinetag" + "storage-tag", + "unit-tag", + "machine-tag" ] }, "StorageConstraints": { "type": "object", "properties": { - "Count": { + "count": { "type": "integer" }, - "Pool": { + "pool": { "type": "string" }, - "Size": { + "size": { "type": "integer" } }, - "additionalProperties": false, - "required": [ - "Pool", - "Size", - "Count" - ] + "additionalProperties": false }, "StorageDetails": { "type": "object", "properties": { - "Persistent": { - "type": "boolean" - }, "attachments": { "type": "object", "patternProperties": { @@ -18661,23 +15990,26 @@ "kind": { "type": "integer" }, - "ownertag": { + "owner-tag": { "type": "string" }, + "persistent": { + "type": "boolean" + }, "status": { "$ref": "#/definitions/EntityStatus" }, - "storagetag": { + "storage-tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "storagetag", - "ownertag", + "storage-tag", + "owner-tag", "kind", "status", - "Persistent" + "persistent" ] }, "StorageDetailsListResult": { @@ -18809,7 +16141,7 @@ "error": { "$ref": "#/definitions/Error" }, - "storagepools": { + "storage-pools": { "type": "array", "items": { "$ref": "#/definitions/StoragePool" @@ -18848,13 +16180,13 @@ "VolumeAttachmentInfo": { "type": "object", "properties": { - "busaddress": { + "bus-address": { "type": "string" }, - "devicelink": { + "device-link": { "type": "string" }, - "devicename": { + "device-name": { "type": "string" }, "read-only": { @@ -18869,7 +16201,7 @@ "info": { "$ref": "#/definitions/VolumeInfo" }, - "machineattachments": { + "machine-attachments": { "type": "object", "patternProperties": { ".*": { @@ -18883,13 +16215,13 @@ "storage": { "$ref": "#/definitions/StorageDetails" }, - "volumetag": { + "volume-tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "volumetag", + "volume-tag", "info", "status" ] @@ -18948,7 +16280,7 @@ "VolumeInfo": { "type": "object", "properties": { - "hardwareid": { + "hardware-id": { "type": "string" }, "persistent": { @@ -18957,56 +16289,16 @@ "size": { "type": "integer" }, - "volumeid": { + "volume-id": { "type": "string" } }, "additionalProperties": false, "required": [ - "volumeid", + "volume-id", "size", "persistent" ] - }, - "caveat": { - "type": "object", - "properties": { - "caveatId": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "verificationId": { - "$ref": "#/definitions/packet" - } - }, - "additionalProperties": false, - "required": [ - "location", - "caveatId", - "verificationId" - ] - }, - "packet": { - "type": "object", - "properties": { - "headerLen": { - "type": "integer" - }, - "start": { - "type": "integer" - }, - "totalLen": { - "type": "integer" - } - }, - "additionalProperties": false, - "required": [ - "start", - "totalLen", - "headerLen" - ] } } } @@ -19413,7 +16705,7 @@ "Entities": { "type": "object", "properties": { - "Entities": { + "entities": { "type": "array", "items": { "$ref": "#/definitions/Entity" @@ -19422,25 +16714,25 @@ }, "additionalProperties": false, "required": [ - "Entities" + "entities" ] }, "Entity": { "type": "object", "properties": { - "Tag": { + "tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "Tag" + "tag" ] }, "EntityStatusArgs": { "type": "object", "properties": { - "Data": { + "data": { "type": "object", "patternProperties": { ".*": { @@ -19449,50 +16741,50 @@ } } }, - "Info": { + "info": { "type": "string" }, - "Status": { + "status": { "type": "string" }, - "Tag": { + "tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "Tag", - "Status", - "Info", - "Data" + "tag", + "status", + "info", + "data" ] }, "Error": { "type": "object", "properties": { - "Code": { + "code": { "type": "string" }, - "Info": { + "info": { "$ref": "#/definitions/ErrorInfo" }, - "Message": { + "message": { "type": "string" } }, "additionalProperties": false, "required": [ - "Message", - "Code" + "message", + "code" ] }, "ErrorInfo": { "type": "object", "properties": { - "Macaroon": { + "macaroon": { "$ref": "#/definitions/Macaroon" }, - "MacaroonPath": { + "macaroon-path": { "type": "string" } }, @@ -19501,19 +16793,16 @@ "ErrorResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" } }, - "additionalProperties": false, - "required": [ - "Error" - ] + "additionalProperties": false }, "ErrorResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/ErrorResult" @@ -19522,52 +16811,52 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "Filesystem": { "type": "object", "properties": { - "filesystemtag": { + "filesystem-tag": { "type": "string" }, "info": { "$ref": "#/definitions/FilesystemInfo" }, - "volumetag": { + "volume-tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "filesystemtag", + "filesystem-tag", "info" ] }, "FilesystemAttachment": { "type": "object", "properties": { - "filesystemtag": { + "filesystem-tag": { "type": "string" }, "info": { "$ref": "#/definitions/FilesystemAttachmentInfo" }, - "machinetag": { + "machine-tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "filesystemtag", - "machinetag", + "filesystem-tag", + "machine-tag", "info" ] }, "FilesystemAttachmentInfo": { "type": "object", "properties": { - "mountpoint": { + "mount-point": { "type": "string" }, "read-only": { @@ -19579,19 +16868,19 @@ "FilesystemAttachmentParams": { "type": "object", "properties": { - "filesystemid": { + "filesystem-id": { "type": "string" }, - "filesystemtag": { + "filesystem-tag": { "type": "string" }, - "instanceid": { + "instance-id": { "type": "string" }, - "machinetag": { + "machine-tag": { "type": "string" }, - "mountpoint": { + "mount-point": { "type": "string" }, "provider": { @@ -19603,8 +16892,8 @@ }, "additionalProperties": false, "required": [ - "filesystemtag", - "machinetag", + "filesystem-tag", + "machine-tag", "provider" ] }, @@ -19665,7 +16954,7 @@ "FilesystemAttachments": { "type": "object", "properties": { - "filesystemattachments": { + "filesystem-attachments": { "type": "array", "items": { "$ref": "#/definitions/FilesystemAttachment" @@ -19674,13 +16963,13 @@ }, "additionalProperties": false, "required": [ - "filesystemattachments" + "filesystem-attachments" ] }, "FilesystemInfo": { "type": "object", "properties": { - "filesystemid": { + "filesystem-id": { "type": "string" }, "size": { @@ -19689,7 +16978,7 @@ }, "additionalProperties": false, "required": [ - "filesystemid", + "filesystem-id", "size" ] }, @@ -19708,7 +16997,7 @@ } } }, - "filesystemtag": { + "filesystem-tag": { "type": "string" }, "provider": { @@ -19725,13 +17014,13 @@ } } }, - "volumetag": { + "volume-tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "filesystemtag", + "filesystem-tag", "size", "provider" ] @@ -19808,23 +17097,22 @@ "LifeResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" }, - "Life": { + "life": { "type": "string" } }, "additionalProperties": false, "required": [ - "Life", - "Error" + "life" ] }, "LifeResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/LifeResult" @@ -19833,60 +17121,27 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "Macaroon": { "type": "object", - "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } - }, - "data": { - "type": "array", - "items": { - "type": "integer" - } - }, - "id": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "sig": { - "type": "array", - "items": { - "type": "integer" - } - } - }, - "additionalProperties": false, - "required": [ - "data", - "location", - "id", - "caveats", - "sig" - ] + "additionalProperties": false }, "MachineStorageId": { "type": "object", "properties": { - "attachmenttag": { + "attachment-tag": { "type": "string" }, - "machinetag": { + "machine-tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "machinetag", - "attachmenttag" + "machine-tag", + "attachment-tag" ] }, "MachineStorageIds": { @@ -19907,30 +17162,29 @@ "MachineStorageIdsWatchResult": { "type": "object", "properties": { - "Changes": { + "changes": { "type": "array", "items": { "$ref": "#/definitions/MachineStorageId" } }, - "Error": { + "error": { "$ref": "#/definitions/Error" }, - "MachineStorageIdsWatcherId": { + "watcher-id": { "type": "string" } }, "additionalProperties": false, "required": [ - "MachineStorageIdsWatcherId", - "Changes", - "Error" + "watcher-id", + "changes" ] }, "MachineStorageIdsWatchResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/MachineStorageIdsWatchResult" @@ -19939,13 +17193,13 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "ModelConfigResult": { "type": "object", "properties": { - "Config": { + "config": { "type": "object", "patternProperties": { ".*": { @@ -19957,29 +17211,28 @@ }, "additionalProperties": false, "required": [ - "Config" + "config" ] }, "NotifyWatchResult": { "type": "object", "properties": { - "Error": { - "$ref": "#/definitions/Error" - }, "NotifyWatcherId": { "type": "string" + }, + "error": { + "$ref": "#/definitions/Error" } }, "additionalProperties": false, "required": [ - "NotifyWatcherId", - "Error" + "NotifyWatcherId" ] }, "NotifyWatchResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/NotifyWatchResult" @@ -19988,13 +17241,13 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "SetStatus": { "type": "object", "properties": { - "Entities": { + "entities": { "type": "array", "items": { "$ref": "#/definitions/EntityStatusArgs" @@ -20003,29 +17256,28 @@ }, "additionalProperties": false, "required": [ - "Entities" + "entities" ] }, "StringResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" }, - "Result": { + "result": { "type": "string" } }, "additionalProperties": false, "required": [ - "Error", - "Result" + "result" ] }, "StringResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/StringResult" @@ -20034,36 +17286,34 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "StringsWatchResult": { "type": "object", "properties": { - "Changes": { + "changes": { "type": "array", "items": { "type": "string" } }, - "Error": { + "error": { "$ref": "#/definitions/Error" }, - "StringsWatcherId": { + "watcher-id": { "type": "string" } }, "additionalProperties": false, "required": [ - "StringsWatcherId", - "Changes", - "Error" + "watcher-id" ] }, "StringsWatchResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/StringsWatchResult" @@ -20072,7 +17322,7 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "Volume": { @@ -20081,13 +17331,13 @@ "info": { "$ref": "#/definitions/VolumeInfo" }, - "volumetag": { + "volume-tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "volumetag", + "volume-tag", "info" ] }, @@ -20097,30 +17347,30 @@ "info": { "$ref": "#/definitions/VolumeAttachmentInfo" }, - "machinetag": { + "machine-tag": { "type": "string" }, - "volumetag": { + "volume-tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "volumetag", - "machinetag", + "volume-tag", + "machine-tag", "info" ] }, "VolumeAttachmentInfo": { "type": "object", "properties": { - "busaddress": { + "bus-address": { "type": "string" }, - "devicelink": { + "device-link": { "type": "string" }, - "devicename": { + "device-name": { "type": "string" }, "read-only": { @@ -20132,10 +17382,10 @@ "VolumeAttachmentParams": { "type": "object", "properties": { - "instanceid": { + "instance-id": { "type": "string" }, - "machinetag": { + "machine-tag": { "type": "string" }, "provider": { @@ -20144,17 +17394,17 @@ "read-only": { "type": "boolean" }, - "volumeid": { + "volume-id": { "type": "string" }, - "volumetag": { + "volume-tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "volumetag", - "machinetag", + "volume-tag", + "machine-tag", "provider" ] }, @@ -20215,7 +17465,7 @@ "VolumeAttachments": { "type": "object", "properties": { - "volumeattachments": { + "volume-attachments": { "type": "array", "items": { "$ref": "#/definitions/VolumeAttachment" @@ -20224,13 +17474,13 @@ }, "additionalProperties": false, "required": [ - "volumeattachments" + "volume-attachments" ] }, "VolumeInfo": { "type": "object", "properties": { - "hardwareid": { + "hardware-id": { "type": "string" }, "persistent": { @@ -20239,13 +17489,13 @@ "size": { "type": "integer" }, - "volumeid": { + "volume-id": { "type": "string" } }, "additionalProperties": false, "required": [ - "volumeid", + "volume-id", "size", "persistent" ] @@ -20279,13 +17529,13 @@ } } }, - "volumetag": { + "volume-tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "volumetag", + "volume-tag", "size", "provider" ] @@ -20344,59 +17594,19 @@ }, "additionalProperties": false }, - "Volumes": { - "type": "object", - "properties": { - "volumes": { - "type": "array", - "items": { - "$ref": "#/definitions/Volume" - } - } - }, - "additionalProperties": false, - "required": [ - "volumes" - ] - }, - "caveat": { - "type": "object", - "properties": { - "caveatId": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "verificationId": { - "$ref": "#/definitions/packet" - } - }, - "additionalProperties": false, - "required": [ - "location", - "caveatId", - "verificationId" - ] - }, - "packet": { + "Volumes": { "type": "object", "properties": { - "headerLen": { - "type": "integer" - }, - "start": { - "type": "integer" - }, - "totalLen": { - "type": "integer" + "volumes": { + "type": "array", + "items": { + "$ref": "#/definitions/Volume" + } } }, "additionalProperties": false, "required": [ - "start", - "totalLen", - "headerLen" + "volumes" ] } } @@ -20424,29 +17634,29 @@ "Error": { "type": "object", "properties": { - "Code": { + "code": { "type": "string" }, - "Info": { + "info": { "$ref": "#/definitions/ErrorInfo" }, - "Message": { + "message": { "type": "string" } }, "additionalProperties": false, "required": [ - "Message", - "Code" + "message", + "code" ] }, "ErrorInfo": { "type": "object", "properties": { - "Macaroon": { + "macaroon": { "$ref": "#/definitions/Macaroon" }, - "MacaroonPath": { + "macaroon-path": { "type": "string" } }, @@ -20454,102 +17664,27 @@ }, "Macaroon": { "type": "object", - "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } - }, - "data": { - "type": "array", - "items": { - "type": "integer" - } - }, - "id": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "sig": { - "type": "array", - "items": { - "type": "integer" - } - } - }, - "additionalProperties": false, - "required": [ - "data", - "location", - "id", - "caveats", - "sig" - ] + "additionalProperties": false }, "StringsWatchResult": { "type": "object", "properties": { - "Changes": { + "changes": { "type": "array", "items": { "type": "string" } }, - "Error": { + "error": { "$ref": "#/definitions/Error" }, - "StringsWatcherId": { + "watcher-id": { "type": "string" } }, "additionalProperties": false, "required": [ - "StringsWatcherId", - "Changes", - "Error" - ] - }, - "caveat": { - "type": "object", - "properties": { - "caveatId": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "verificationId": { - "$ref": "#/definitions/packet" - } - }, - "additionalProperties": false, - "required": [ - "location", - "caveatId", - "verificationId" - ] - }, - "packet": { - "type": "object", - "properties": { - "headerLen": { - "type": "integer" - }, - "start": { - "type": "integer" - }, - "totalLen": { - "type": "integer" - } - }, - "additionalProperties": false, - "required": [ - "start", - "totalLen", - "headerLen" + "watcher-id" ] } } @@ -20604,16 +17739,16 @@ "AddSubnetParams": { "type": "object", "properties": { - "SpaceTag": { + "space-tag": { "type": "string" }, - "SubnetProviderId": { + "subnet-provider-id": { "type": "string" }, - "SubnetTag": { + "subnet-tag": { "type": "string" }, - "Zones": { + "zones": { "type": "array", "items": { "type": "string" @@ -20622,13 +17757,13 @@ }, "additionalProperties": false, "required": [ - "SpaceTag" + "space-tag" ] }, "AddSubnetsParams": { "type": "object", "properties": { - "Subnets": { + "subnets": { "type": "array", "items": { "$ref": "#/definitions/AddSubnetParams" @@ -20637,35 +17772,35 @@ }, "additionalProperties": false, "required": [ - "Subnets" + "subnets" ] }, "Error": { "type": "object", "properties": { - "Code": { + "code": { "type": "string" }, - "Info": { + "info": { "$ref": "#/definitions/ErrorInfo" }, - "Message": { + "message": { "type": "string" } }, "additionalProperties": false, "required": [ - "Message", - "Code" + "message", + "code" ] }, "ErrorInfo": { "type": "object", "properties": { - "Macaroon": { + "macaroon": { "$ref": "#/definitions/Macaroon" }, - "MacaroonPath": { + "macaroon-path": { "type": "string" } }, @@ -20674,19 +17809,16 @@ "ErrorResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" } }, - "additionalProperties": false, - "required": [ - "Error" - ] + "additionalProperties": false }, "ErrorResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/ErrorResult" @@ -20695,13 +17827,13 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "ListSubnetsResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/Subnet" @@ -20710,66 +17842,32 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "Macaroon": { "type": "object", - "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } - }, - "data": { - "type": "array", - "items": { - "type": "integer" - } - }, - "id": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "sig": { - "type": "array", - "items": { - "type": "integer" - } - } - }, - "additionalProperties": false, - "required": [ - "data", - "location", - "id", - "caveats", - "sig" - ] + "additionalProperties": false }, "SpaceResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" }, - "Tag": { + "tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "Error", - "Tag" + "tag" ] }, "SpaceResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/SpaceResult" @@ -20778,43 +17876,31 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "Subnet": { "type": "object", "properties": { - "CIDR": { + "cidr": { "type": "string" }, - "Life": { + "life": { "type": "string" }, - "ProviderId": { + "provider-id": { "type": "string" }, - "SpaceTag": { + "space-tag": { "type": "string" }, - "StaticRangeHighIP": { - "type": "array", - "items": { - "type": "integer" - } - }, - "StaticRangeLowIP": { - "type": "array", - "items": { - "type": "integer" - } - }, - "Status": { + "status": { "type": "string" }, - "VLANTag": { + "vlan-tag": { "type": "integer" }, - "Zones": { + "zones": { "type": "array", "items": { "type": "string" @@ -20823,20 +17909,20 @@ }, "additionalProperties": false, "required": [ - "CIDR", - "VLANTag", - "Life", - "SpaceTag", - "Zones" + "cidr", + "vlan-tag", + "life", + "space-tag", + "zones" ] }, "SubnetsFilters": { "type": "object", "properties": { - "SpaceTag": { + "space-tag": { "type": "string" }, - "Zone": { + "zone": { "type": "string" } }, @@ -20845,27 +17931,26 @@ "ZoneResult": { "type": "object", "properties": { - "Available": { + "available": { "type": "boolean" }, - "Error": { + "error": { "$ref": "#/definitions/Error" }, - "Name": { + "name": { "type": "string" } }, "additionalProperties": false, "required": [ - "Error", - "Name", - "Available" + "name", + "available" ] }, "ZoneResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/ZoneResult" @@ -20874,47 +17959,7 @@ }, "additionalProperties": false, "required": [ - "Results" - ] - }, - "caveat": { - "type": "object", - "properties": { - "caveatId": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "verificationId": { - "$ref": "#/definitions/packet" - } - }, - "additionalProperties": false, - "required": [ - "location", - "caveatId", - "verificationId" - ] - }, - "packet": { - "type": "object", - "properties": { - "headerLen": { - "type": "integer" - }, - "start": { - "type": "integer" - }, - "totalLen": { - "type": "integer" - } - }, - "additionalProperties": false, - "required": [ - "start", - "totalLen", - "headerLen" + "results" ] } } @@ -20983,7 +18028,7 @@ "EntityStatusArgs": { "type": "object", "properties": { - "Data": { + "data": { "type": "object", "patternProperties": { ".*": { @@ -20992,50 +18037,50 @@ } } }, - "Info": { + "info": { "type": "string" }, - "Status": { + "status": { "type": "string" }, - "Tag": { + "tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "Tag", - "Status", - "Info", - "Data" + "tag", + "status", + "info", + "data" ] }, "Error": { "type": "object", "properties": { - "Code": { + "code": { "type": "string" }, - "Info": { + "info": { "$ref": "#/definitions/ErrorInfo" }, - "Message": { + "message": { "type": "string" } }, "additionalProperties": false, "required": [ - "Message", - "Code" + "message", + "code" ] }, "ErrorInfo": { "type": "object", "properties": { - "Macaroon": { + "macaroon": { "$ref": "#/definitions/Macaroon" }, - "MacaroonPath": { + "macaroon-path": { "type": "string" } }, @@ -21044,19 +18089,16 @@ "ErrorResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" } }, - "additionalProperties": false, - "required": [ - "Error" - ] + "additionalProperties": false }, "ErrorResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/ErrorResult" @@ -21065,50 +18107,17 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "Macaroon": { "type": "object", - "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } - }, - "data": { - "type": "array", - "items": { - "type": "integer" - } - }, - "id": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "sig": { - "type": "array", - "items": { - "type": "integer" - } - } - }, - "additionalProperties": false, - "required": [ - "data", - "location", - "id", - "caveats", - "sig" - ] + "additionalProperties": false }, "ModelConfigResult": { "type": "object", "properties": { - "Config": { + "config": { "type": "object", "patternProperties": { ".*": { @@ -21120,29 +18129,28 @@ }, "additionalProperties": false, "required": [ - "Config" + "config" ] }, "NotifyWatchResult": { "type": "object", "properties": { - "Error": { - "$ref": "#/definitions/Error" - }, "NotifyWatcherId": { "type": "string" + }, + "error": { + "$ref": "#/definitions/Error" } }, "additionalProperties": false, "required": [ - "NotifyWatcherId", - "Error" + "NotifyWatcherId" ] }, "NotifyWatchResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/NotifyWatchResult" @@ -21151,13 +18159,13 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "SetStatus": { "type": "object", "properties": { - "Entities": { + "entities": { "type": "array", "items": { "$ref": "#/definitions/EntityStatusArgs" @@ -21166,91 +18174,50 @@ }, "additionalProperties": false, "required": [ - "Entities" + "entities" ] }, "UndertakerModelInfo": { "type": "object", "properties": { - "GlobalName": { + "global-name": { "type": "string" }, - "IsSystem": { + "is-system": { "type": "boolean" }, - "Life": { + "life": { "type": "string" }, - "Name": { + "name": { "type": "string" }, - "UUID": { + "uuid": { "type": "string" } }, "additionalProperties": false, "required": [ - "UUID", - "Name", - "GlobalName", - "IsSystem", - "Life" + "uuid", + "name", + "global-name", + "is-system", + "life" ] }, "UndertakerModelInfoResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" }, - "Result": { + "result": { "$ref": "#/definitions/UndertakerModelInfo" } }, "additionalProperties": false, "required": [ - "Error", - "Result" - ] - }, - "caveat": { - "type": "object", - "properties": { - "caveatId": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "verificationId": { - "$ref": "#/definitions/packet" - } - }, - "additionalProperties": false, - "required": [ - "location", - "caveatId", - "verificationId" - ] - }, - "packet": { - "type": "object", - "properties": { - "headerLen": { - "type": "integer" - }, - "start": { - "type": "integer" - }, - "totalLen": { - "type": "integer" - } - }, - "additionalProperties": false, - "required": [ - "start", - "totalLen", - "headerLen" + "result" ] } } @@ -21297,7 +18264,7 @@ "Entities": { "type": "object", "properties": { - "Entities": { + "entities": { "type": "array", "items": { "$ref": "#/definitions/Entity" @@ -21306,25 +18273,25 @@ }, "additionalProperties": false, "required": [ - "Entities" + "entities" ] }, "Entity": { "type": "object", "properties": { - "Tag": { + "tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "Tag" + "tag" ] }, "EntityStatusArgs": { "type": "object", "properties": { - "Data": { + "data": { "type": "object", "patternProperties": { ".*": { @@ -21333,50 +18300,50 @@ } } }, - "Info": { + "info": { "type": "string" }, - "Status": { + "status": { "type": "string" }, - "Tag": { + "tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "Tag", - "Status", - "Info", - "Data" + "tag", + "status", + "info", + "data" ] }, "Error": { "type": "object", "properties": { - "Code": { + "code": { "type": "string" }, - "Info": { + "info": { "$ref": "#/definitions/ErrorInfo" }, - "Message": { + "message": { "type": "string" } }, "additionalProperties": false, "required": [ - "Message", - "Code" + "message", + "code" ] }, "ErrorInfo": { "type": "object", "properties": { - "Macaroon": { + "macaroon": { "$ref": "#/definitions/Macaroon" }, - "MacaroonPath": { + "macaroon-path": { "type": "string" } }, @@ -21385,19 +18352,16 @@ "ErrorResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" } }, - "additionalProperties": false, - "required": [ - "Error" - ] + "additionalProperties": false }, "ErrorResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/ErrorResult" @@ -21406,50 +18370,17 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "Macaroon": { "type": "object", - "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } - }, - "data": { - "type": "array", - "items": { - "type": "integer" - } - }, - "id": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "sig": { - "type": "array", - "items": { - "type": "integer" - } - } - }, - "additionalProperties": false, - "required": [ - "data", - "location", - "id", - "caveats", - "sig" - ] + "additionalProperties": false }, "SetStatus": { "type": "object", "properties": { - "Entities": { + "entities": { "type": "array", "items": { "$ref": "#/definitions/EntityStatusArgs" @@ -21458,70 +18389,28 @@ }, "additionalProperties": false, "required": [ - "Entities" + "entities" ] }, "StringsWatchResult": { "type": "object", "properties": { - "Changes": { + "changes": { "type": "array", "items": { "type": "string" } }, - "Error": { + "error": { "$ref": "#/definitions/Error" }, - "StringsWatcherId": { + "watcher-id": { "type": "string" } }, "additionalProperties": false, "required": [ - "StringsWatcherId", - "Changes", - "Error" - ] - }, - "caveat": { - "type": "object", - "properties": { - "caveatId": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "verificationId": { - "$ref": "#/definitions/packet" - } - }, - "additionalProperties": false, - "required": [ - "location", - "caveatId", - "verificationId" - ] - }, - "packet": { - "type": "object", - "properties": { - "headerLen": { - "type": "integer" - }, - "start": { - "type": "integer" - }, - "totalLen": { - "type": "integer" - } - }, - "additionalProperties": false, - "required": [ - "start", - "totalLen", - "headerLen" + "watcher-id" ] } } @@ -21529,7 +18418,7 @@ }, { "Name": "Uniter", - "Version": 3, + "Version": 4, "Schema": { "type": "object", "properties": { @@ -21593,6 +18482,17 @@ } } }, + "ApplicationStatus": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/Entities" + }, + "Result": { + "$ref": "#/definitions/ApplicationStatusResults" + } + } + }, "AssignedMachine": { "type": "object", "properties": { @@ -22007,29 +18907,18 @@ } } }, - "ServiceOwner": { - "type": "object", - "properties": { - "Params": { - "$ref": "#/definitions/Entities" - }, - "Result": { - "$ref": "#/definitions/StringResults" - } - } - }, - "ServiceStatus": { + "SetAgentStatus": { "type": "object", "properties": { "Params": { - "$ref": "#/definitions/Entities" + "$ref": "#/definitions/SetStatus" }, "Result": { - "$ref": "#/definitions/ServiceStatusResults" + "$ref": "#/definitions/ErrorResults" } } }, - "SetAgentStatus": { + "SetApplicationStatus": { "type": "object", "properties": { "Params": { @@ -22051,7 +18940,7 @@ } } }, - "SetServiceStatus": { + "SetStatus": { "type": "object", "properties": { "Params": { @@ -22062,7 +18951,7 @@ } } }, - "SetStatus": { + "SetUnitStatus": { "type": "object", "properties": { "Params": { @@ -22073,11 +18962,11 @@ } } }, - "SetUnitStatus": { + "SetWorkloadVersion": { "type": "object", "properties": { "Params": { - "$ref": "#/definitions/SetStatus" + "$ref": "#/definitions/EntityWorkloadVersions" }, "Result": { "$ref": "#/definitions/ErrorResults" @@ -22169,6 +19058,17 @@ } } }, + "WatchApplicationRelations": { + "type": "object", + "properties": { + "Params": { + "$ref": "#/definitions/Entities" + }, + "Result": { + "$ref": "#/definitions/StringsWatchResults" + } + } + }, "WatchConfigSettings": { "type": "object", "properties": { @@ -22221,47 +19121,47 @@ } } }, - "WatchServiceRelations": { + "WatchStorageAttachments": { "type": "object", "properties": { "Params": { - "$ref": "#/definitions/Entities" + "$ref": "#/definitions/StorageAttachmentIds" }, "Result": { - "$ref": "#/definitions/StringsWatchResults" + "$ref": "#/definitions/NotifyWatchResults" } } }, - "WatchStorageAttachments": { + "WatchUnitAddresses": { "type": "object", "properties": { "Params": { - "$ref": "#/definitions/StorageAttachmentIds" + "$ref": "#/definitions/Entities" }, "Result": { "$ref": "#/definitions/NotifyWatchResults" } } }, - "WatchUnitAddresses": { + "WatchUnitStorageAttachments": { "type": "object", "properties": { "Params": { "$ref": "#/definitions/Entities" }, "Result": { - "$ref": "#/definitions/NotifyWatchResults" + "$ref": "#/definitions/StringsWatchResults" } } }, - "WatchUnitStorageAttachments": { + "WorkloadVersion": { "type": "object", "properties": { "Params": { "$ref": "#/definitions/Entities" }, "Result": { - "$ref": "#/definitions/StringsWatchResults" + "$ref": "#/definitions/StringResults" } } } @@ -22270,7 +19170,7 @@ "APIHostPortsResult": { "type": "object", "properties": { - "Servers": { + "servers": { "type": "array", "items": { "type": "array", @@ -22282,7 +19182,7 @@ }, "additionalProperties": false, "required": [ - "Servers" + "servers" ] }, "Action": { @@ -22317,7 +19217,7 @@ "ActionExecutionResult": { "type": "object", "properties": { - "actiontag": { + "action-tag": { "type": "string" }, "message": { @@ -22338,7 +19238,7 @@ }, "additionalProperties": false, "required": [ - "actiontag", + "action-tag", "status" ] }, @@ -22408,46 +19308,84 @@ "Address": { "type": "object", "properties": { - "Scope": { + "scope": { "type": "string" }, - "SpaceName": { + "space-name": { "type": "string" }, - "Type": { + "type": { "type": "string" }, - "Value": { + "value": { "type": "string" } }, "additionalProperties": false, "required": [ - "Value", - "Type", - "Scope" + "value", + "type", + "scope" + ] + }, + "ApplicationStatusResult": { + "type": "object", + "properties": { + "application": { + "$ref": "#/definitions/StatusResult" + }, + "error": { + "$ref": "#/definitions/Error" + }, + "units": { + "type": "object", + "patternProperties": { + ".*": { + "$ref": "#/definitions/StatusResult" + } + } + } + }, + "additionalProperties": false, + "required": [ + "application", + "units" + ] + }, + "ApplicationStatusResults": { + "type": "object", + "properties": { + "results": { + "type": "array", + "items": { + "$ref": "#/definitions/ApplicationStatusResult" + } + } + }, + "additionalProperties": false, + "required": [ + "results" ] }, "BoolResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" }, - "Result": { + "result": { "type": "boolean" } }, "additionalProperties": false, "required": [ - "Error", - "Result" + "result" ] }, "BoolResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/BoolResult" @@ -22456,13 +19394,13 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "BytesResult": { "type": "object", "properties": { - "Result": { + "result": { "type": "array", "items": { "type": "integer" @@ -22471,25 +19409,57 @@ }, "additionalProperties": false, "required": [ - "Result" + "result" + ] + }, + "CharmRelation": { + "type": "object", + "properties": { + "interface": { + "type": "string" + }, + "limit": { + "type": "integer" + }, + "name": { + "type": "string" + }, + "optional": { + "type": "boolean" + }, + "role": { + "type": "string" + }, + "scope": { + "type": "string" + } + }, + "additionalProperties": false, + "required": [ + "name", + "role", + "interface", + "optional", + "limit", + "scope" ] }, "CharmURL": { "type": "object", "properties": { - "URL": { + "url": { "type": "string" } }, "additionalProperties": false, "required": [ - "URL" + "url" ] }, "CharmURLs": { "type": "object", "properties": { - "URLs": { + "urls": { "type": "array", "items": { "$ref": "#/definitions/CharmURL" @@ -22498,16 +19468,16 @@ }, "additionalProperties": false, "required": [ - "URLs" + "urls" ] }, "ConfigSettingsResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" }, - "Settings": { + "settings": { "type": "object", "patternProperties": { ".*": { @@ -22519,14 +19489,13 @@ }, "additionalProperties": false, "required": [ - "Error", - "Settings" + "settings" ] }, "ConfigSettingsResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/ConfigSettingsResult" @@ -22535,29 +19504,29 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "Endpoint": { "type": "object", "properties": { - "Relation": { - "$ref": "#/definitions/Relation" - }, - "ServiceName": { + "application-name": { "type": "string" + }, + "relation": { + "$ref": "#/definitions/CharmRelation" } }, "additionalProperties": false, "required": [ - "ServiceName", - "Relation" + "application-name", + "relation" ] }, "Entities": { "type": "object", "properties": { - "Entities": { + "entities": { "type": "array", "items": { "$ref": "#/definitions/Entity" @@ -22566,13 +19535,13 @@ }, "additionalProperties": false, "required": [ - "Entities" + "entities" ] }, "EntitiesCharmURL": { "type": "object", "properties": { - "Entities": { + "entities": { "type": "array", "items": { "$ref": "#/definitions/EntityCharmURL" @@ -22581,13 +19550,13 @@ }, "additionalProperties": false, "required": [ - "Entities" + "entities" ] }, "EntitiesPortRanges": { "type": "object", "properties": { - "Entities": { + "entities": { "type": "array", "items": { "$ref": "#/definitions/EntityPortRange" @@ -22596,117 +19565,148 @@ }, "additionalProperties": false, "required": [ - "Entities" + "entities" ] }, "Entity": { "type": "object", "properties": { - "Tag": { + "tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "Tag" + "tag" ] }, "EntityCharmURL": { "type": "object", "properties": { - "CharmURL": { + "charm-url": { "type": "string" }, - "Tag": { + "tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "Tag", - "CharmURL" + "tag", + "charm-url" ] }, "EntityPortRange": { "type": "object", "properties": { - "FromPort": { + "from-port": { "type": "integer" }, - "Protocol": { + "protocol": { "type": "string" }, - "Tag": { + "tag": { + "type": "string" + }, + "to-port": { + "type": "integer" + } + }, + "additionalProperties": false, + "required": [ + "tag", + "protocol", + "from-port", + "to-port" + ] + }, + "EntityStatusArgs": { + "type": "object", + "properties": { + "data": { + "type": "object", + "patternProperties": { + ".*": { + "type": "object", + "additionalProperties": true + } + } + }, + "info": { + "type": "string" + }, + "status": { + "type": "string" + }, + "tag": { + "type": "string" + } + }, + "additionalProperties": false, + "required": [ + "tag", + "status", + "info", + "data" + ] + }, + "EntityWorkloadVersion": { + "type": "object", + "properties": { + "tag": { "type": "string" }, - "ToPort": { - "type": "integer" + "workload-version": { + "type": "string" } }, "additionalProperties": false, "required": [ - "Tag", - "Protocol", - "FromPort", - "ToPort" + "tag", + "workload-version" ] }, - "EntityStatusArgs": { + "EntityWorkloadVersions": { "type": "object", "properties": { - "Data": { - "type": "object", - "patternProperties": { - ".*": { - "type": "object", - "additionalProperties": true - } + "entities": { + "type": "array", + "items": { + "$ref": "#/definitions/EntityWorkloadVersion" } - }, - "Info": { - "type": "string" - }, - "Status": { - "type": "string" - }, - "Tag": { - "type": "string" } }, "additionalProperties": false, "required": [ - "Tag", - "Status", - "Info", - "Data" + "entities" ] }, "Error": { "type": "object", "properties": { - "Code": { + "code": { "type": "string" }, - "Info": { + "info": { "$ref": "#/definitions/ErrorInfo" }, - "Message": { + "message": { "type": "string" } }, "additionalProperties": false, "required": [ - "Message", - "Code" + "message", + "code" ] }, "ErrorInfo": { "type": "object", "properties": { - "Macaroon": { + "macaroon": { "$ref": "#/definitions/Macaroon" }, - "MacaroonPath": { + "macaroon-path": { "type": "string" } }, @@ -22715,19 +19715,16 @@ "ErrorResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" } }, - "additionalProperties": false, - "required": [ - "Error" - ] + "additionalProperties": false }, "ErrorResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/ErrorResult" @@ -22736,13 +19733,13 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "GetLeadershipSettingsBulkResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/GetLeadershipSettingsResult" @@ -22751,16 +19748,16 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "GetLeadershipSettingsResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" }, - "Settings": { + "settings": { "type": "object", "patternProperties": { ".*": { @@ -22771,8 +19768,7 @@ }, "additionalProperties": false, "required": [ - "Settings", - "Error" + "settings" ] }, "HostPort": { @@ -22781,36 +19777,35 @@ "Address": { "$ref": "#/definitions/Address" }, - "Port": { + "port": { "type": "integer" } }, "additionalProperties": false, "required": [ "Address", - "Port" + "port" ] }, "IntResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" }, - "Result": { + "result": { "type": "integer" } }, "additionalProperties": false, "required": [ - "Error", - "Result" + "result" ] }, "IntResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/IntResult" @@ -22819,29 +19814,28 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "LifeResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" }, - "Life": { + "life": { "type": "string" } }, "additionalProperties": false, "required": [ - "Life", - "Error" + "life" ] }, "LifeResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/LifeResult" @@ -22850,73 +19844,40 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "Macaroon": { "type": "object", - "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } - }, - "data": { - "type": "array", - "items": { - "type": "integer" - } - }, - "id": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "sig": { - "type": "array", - "items": { - "type": "integer" - } - } - }, - "additionalProperties": false, - "required": [ - "data", - "location", - "id", - "caveats", - "sig" - ] + "additionalProperties": false }, "MachinePortRange": { "type": "object", "properties": { - "PortRange": { + "port-range": { "$ref": "#/definitions/PortRange" }, - "RelationTag": { + "relation-tag": { "type": "string" }, - "UnitTag": { + "unit-tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "UnitTag", - "RelationTag", - "PortRange" + "unit-tag", + "relation-tag", + "port-range" ] }, "MachinePortsResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" }, - "Ports": { + "ports": { "type": "array", "items": { "$ref": "#/definitions/MachinePortRange" @@ -22925,14 +19886,13 @@ }, "additionalProperties": false, "required": [ - "Error", - "Ports" + "ports" ] }, "MachinePortsResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/MachinePortsResult" @@ -22941,13 +19901,13 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "MergeLeadershipSettingsBulkParams": { "type": "object", "properties": { - "Params": { + "params": { "type": "array", "items": { "$ref": "#/definitions/MergeLeadershipSettingsParam" @@ -22956,16 +19916,16 @@ }, "additionalProperties": false, "required": [ - "Params" + "params" ] }, "MergeLeadershipSettingsParam": { "type": "object", "properties": { - "ServiceTag": { + "application-tag": { "type": "string" }, - "Settings": { + "settings": { "type": "object", "patternProperties": { ".*": { @@ -22976,34 +19936,33 @@ }, "additionalProperties": false, "required": [ - "ServiceTag", - "Settings" + "application-tag", + "settings" ] }, "MeterStatusResult": { "type": "object", "properties": { - "Code": { + "code": { "type": "string" }, - "Error": { + "error": { "$ref": "#/definitions/Error" }, - "Info": { + "info": { "type": "string" } }, "additionalProperties": false, "required": [ - "Code", - "Info", - "Error" + "code", + "info" ] }, "MeterStatusResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/MeterStatusResult" @@ -23012,78 +19971,78 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "Metric": { "type": "object", "properties": { - "Key": { + "key": { "type": "string" }, - "Time": { + "time": { "type": "string", "format": "date-time" }, - "Value": { + "value": { "type": "string" } }, "additionalProperties": false, "required": [ - "Key", - "Value", - "Time" + "key", + "value", + "time" ] }, "MetricBatch": { "type": "object", "properties": { - "CharmURL": { + "charm-url": { "type": "string" }, - "Created": { + "created": { "type": "string", "format": "date-time" }, - "Metrics": { + "metrics": { "type": "array", "items": { "$ref": "#/definitions/Metric" } }, - "UUID": { + "uuid": { "type": "string" } }, "additionalProperties": false, "required": [ - "UUID", - "CharmURL", - "Created", - "Metrics" + "uuid", + "charm-url", + "created", + "metrics" ] }, "MetricBatchParam": { "type": "object", "properties": { - "Batch": { + "batch": { "$ref": "#/definitions/MetricBatch" }, - "Tag": { + "tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "Tag", - "Batch" + "tag", + "batch" ] }, "MetricBatchParams": { "type": "object", "properties": { - "Batches": { + "batches": { "type": "array", "items": { "$ref": "#/definitions/MetricBatchParam" @@ -23092,13 +20051,13 @@ }, "additionalProperties": false, "required": [ - "Batches" + "batches" ] }, "ModelConfigResult": { "type": "object", "properties": { - "Config": { + "config": { "type": "object", "patternProperties": { ".*": { @@ -23110,137 +20069,135 @@ }, "additionalProperties": false, "required": [ - "Config" + "config" ] }, "ModelResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" }, - "Name": { + "name": { "type": "string" }, - "UUID": { + "uuid": { "type": "string" } }, "additionalProperties": false, "required": [ - "Error", - "Name", - "UUID" + "name", + "uuid" ] }, "NetworkConfig": { "type": "object", "properties": { - "Address": { + "address": { "type": "string" }, - "CIDR": { + "cidr": { "type": "string" }, - "ConfigType": { + "config-type": { "type": "string" }, - "DNSSearchDomains": { + "device-index": { + "type": "integer" + }, + "disabled": { + "type": "boolean" + }, + "dns-search-domains": { "type": "array", "items": { "type": "string" } }, - "DNSServers": { + "dns-servers": { "type": "array", "items": { "type": "string" } }, - "DeviceIndex": { - "type": "integer" - }, - "Disabled": { - "type": "boolean" - }, - "GatewayAddress": { + "gateway-address": { "type": "string" }, - "InterfaceName": { + "interface-name": { "type": "string" }, - "InterfaceType": { + "interface-type": { "type": "string" }, - "MACAddress": { + "mac-address": { "type": "string" }, - "MTU": { + "mtu": { "type": "integer" }, - "NoAutoStart": { + "no-auto-start": { "type": "boolean" }, - "ParentInterfaceName": { + "parent-interface-name": { "type": "string" }, - "ProviderAddressId": { + "provider-address-id": { "type": "string" }, - "ProviderId": { + "provider-id": { "type": "string" }, - "ProviderSpaceId": { + "provider-space-id": { "type": "string" }, - "ProviderSubnetId": { + "provider-subnet-id": { "type": "string" }, - "ProviderVLANId": { + "provider-vlan-id": { "type": "string" }, - "VLANTag": { + "vlan-tag": { "type": "integer" } }, "additionalProperties": false, "required": [ - "DeviceIndex", - "MACAddress", - "CIDR", - "MTU", - "ProviderId", - "ProviderSubnetId", - "ProviderSpaceId", - "ProviderAddressId", - "ProviderVLANId", - "VLANTag", - "InterfaceName", - "ParentInterfaceName", - "InterfaceType", - "Disabled" + "device-index", + "mac-address", + "cidr", + "mtu", + "provider-id", + "provider-subnet-id", + "provider-space-id", + "provider-address-id", + "provider-vlan-id", + "vlan-tag", + "interface-name", + "parent-interface-name", + "interface-type", + "disabled" ] }, "NotifyWatchResult": { "type": "object", "properties": { - "Error": { - "$ref": "#/definitions/Error" - }, "NotifyWatcherId": { "type": "string" + }, + "error": { + "$ref": "#/definitions/Error" } }, "additionalProperties": false, "required": [ - "NotifyWatcherId", - "Error" + "NotifyWatcherId" ] }, "NotifyWatchResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/NotifyWatchResult" @@ -23249,65 +20206,33 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "PortRange": { "type": "object", "properties": { - "FromPort": { + "from-port": { "type": "integer" }, - "Protocol": { - "type": "string" - }, - "ToPort": { - "type": "integer" - } - }, - "additionalProperties": false, - "required": [ - "FromPort", - "ToPort", - "Protocol" - ] - }, - "Relation": { - "type": "object", - "properties": { - "Interface": { + "protocol": { "type": "string" }, - "Limit": { + "to-port": { "type": "integer" - }, - "Name": { - "type": "string" - }, - "Optional": { - "type": "boolean" - }, - "Role": { - "type": "string" - }, - "Scope": { - "type": "string" } }, "additionalProperties": false, "required": [ - "Name", - "Role", - "Interface", - "Optional", - "Limit", - "Scope" + "from-port", + "to-port", + "protocol" ] }, "RelationIds": { "type": "object", "properties": { - "RelationIds": { + "relation-ids": { "type": "array", "items": { "type": "integer" @@ -23316,41 +20241,40 @@ }, "additionalProperties": false, "required": [ - "RelationIds" + "relation-ids" ] }, "RelationResult": { "type": "object", "properties": { - "Endpoint": { + "endpoint": { "$ref": "#/definitions/Endpoint" }, - "Error": { + "error": { "$ref": "#/definitions/Error" }, - "Id": { + "id": { "type": "integer" }, - "Key": { + "key": { "type": "string" }, - "Life": { + "life": { "type": "string" } }, "additionalProperties": false, "required": [ - "Error", - "Life", - "Id", - "Key", - "Endpoint" + "life", + "id", + "key", + "endpoint" ] }, "RelationResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/RelationResult" @@ -23359,49 +20283,49 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "RelationUnit": { "type": "object", "properties": { - "Relation": { + "relation": { "type": "string" }, - "Unit": { + "unit": { "type": "string" } }, "additionalProperties": false, "required": [ - "Relation", - "Unit" + "relation", + "unit" ] }, "RelationUnitPair": { "type": "object", "properties": { - "LocalUnit": { + "local-unit": { "type": "string" }, - "Relation": { + "relation": { "type": "string" }, - "RemoteUnit": { + "remote-unit": { "type": "string" } }, "additionalProperties": false, "required": [ - "Relation", - "LocalUnit", - "RemoteUnit" + "relation", + "local-unit", + "remote-unit" ] }, "RelationUnitPairs": { "type": "object", "properties": { - "RelationUnitPairs": { + "relation-unit-pairs": { "type": "array", "items": { "$ref": "#/definitions/RelationUnitPair" @@ -23410,16 +20334,16 @@ }, "additionalProperties": false, "required": [ - "RelationUnitPairs" + "relation-unit-pairs" ] }, "RelationUnitSettings": { "type": "object", "properties": { - "Relation": { + "relation": { "type": "string" }, - "Settings": { + "settings": { "type": "object", "patternProperties": { ".*": { @@ -23427,21 +20351,21 @@ } } }, - "Unit": { + "unit": { "type": "string" } }, "additionalProperties": false, "required": [ - "Relation", - "Unit", - "Settings" + "relation", + "unit", + "settings" ] }, "RelationUnits": { "type": "object", "properties": { - "RelationUnits": { + "relation-units": { "type": "array", "items": { "$ref": "#/definitions/RelationUnit" @@ -23450,13 +20374,13 @@ }, "additionalProperties": false, "required": [ - "RelationUnits" + "relation-units" ] }, "RelationUnitsChange": { "type": "object", "properties": { - "Changed": { + "changed": { "type": "object", "patternProperties": { ".*": { @@ -23464,7 +20388,7 @@ } } }, - "Departed": { + "departed": { "type": "array", "items": { "type": "string" @@ -23473,14 +20397,13 @@ }, "additionalProperties": false, "required": [ - "Changed", - "Departed" + "changed" ] }, "RelationUnitsSettings": { "type": "object", "properties": { - "RelationUnits": { + "relation-units": { "type": "array", "items": { "$ref": "#/definitions/RelationUnitSettings" @@ -23489,33 +20412,32 @@ }, "additionalProperties": false, "required": [ - "RelationUnits" + "relation-units" ] }, "RelationUnitsWatchResult": { "type": "object", "properties": { - "Changes": { + "changes": { "$ref": "#/definitions/RelationUnitsChange" }, - "Error": { + "error": { "$ref": "#/definitions/Error" }, - "RelationUnitsWatcherId": { + "watcher-id": { "type": "string" } }, "additionalProperties": false, "required": [ - "RelationUnitsWatcherId", - "Changes", - "Error" + "watcher-id", + "changes" ] }, "RelationUnitsWatchResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/RelationUnitsWatchResult" @@ -23524,29 +20446,28 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "ResolvedModeResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" }, - "Mode": { + "mode": { "type": "string" } }, "additionalProperties": false, "required": [ - "Error", - "Mode" + "mode" ] }, "ResolvedModeResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/ResolvedModeResult" @@ -23555,53 +20476,13 @@ }, "additionalProperties": false, "required": [ - "Results" - ] - }, - "ServiceStatusResult": { - "type": "object", - "properties": { - "Error": { - "$ref": "#/definitions/Error" - }, - "Service": { - "$ref": "#/definitions/StatusResult" - }, - "Units": { - "type": "object", - "patternProperties": { - ".*": { - "$ref": "#/definitions/StatusResult" - } - } - } - }, - "additionalProperties": false, - "required": [ - "Service", - "Units", - "Error" - ] - }, - "ServiceStatusResults": { - "type": "object", - "properties": { - "Results": { - "type": "array", - "items": { - "$ref": "#/definitions/ServiceStatusResult" - } - } - }, - "additionalProperties": false, - "required": [ - "Results" + "results" ] }, "SetStatus": { "type": "object", "properties": { - "Entities": { + "entities": { "type": "array", "items": { "$ref": "#/definitions/EntityStatusArgs" @@ -23610,16 +20491,16 @@ }, "additionalProperties": false, "required": [ - "Entities" + "entities" ] }, "SettingsResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" }, - "Settings": { + "settings": { "type": "object", "patternProperties": { ".*": { @@ -23630,14 +20511,13 @@ }, "additionalProperties": false, "required": [ - "Error", - "Settings" + "settings" ] }, "SettingsResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/SettingsResult" @@ -23646,13 +20526,13 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "StatusResult": { "type": "object", "properties": { - "Data": { + "data": { "type": "object", "patternProperties": { ".*": { @@ -23661,41 +20541,40 @@ } } }, - "Error": { + "error": { "$ref": "#/definitions/Error" }, - "Id": { + "id": { "type": "string" }, - "Info": { + "info": { "type": "string" }, - "Life": { + "life": { "type": "string" }, - "Since": { + "since": { "type": "string", "format": "date-time" }, - "Status": { + "status": { "type": "string" } }, "additionalProperties": false, "required": [ - "Error", - "Id", - "Life", - "Status", - "Info", - "Data", - "Since" + "id", + "life", + "status", + "info", + "data", + "since" ] }, "StatusResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/StatusResult" @@ -23704,13 +20583,13 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "StorageAddParams": { "type": "object", "properties": { - "StorageName": { + "name": { "type": "string" }, "storage": { @@ -23723,56 +20602,56 @@ "additionalProperties": false, "required": [ "unit", - "StorageName", + "name", "storage" ] }, "StorageAttachment": { "type": "object", "properties": { - "Kind": { + "kind": { "type": "integer" }, - "Life": { + "life": { "type": "string" }, - "Location": { + "location": { "type": "string" }, - "OwnerTag": { + "owner-tag": { "type": "string" }, - "StorageTag": { + "storage-tag": { "type": "string" }, - "UnitTag": { + "unit-tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "StorageTag", - "OwnerTag", - "UnitTag", - "Kind", - "Location", - "Life" + "storage-tag", + "owner-tag", + "unit-tag", + "kind", + "location", + "life" ] }, "StorageAttachmentId": { "type": "object", "properties": { - "storagetag": { + "storage-tag": { "type": "string" }, - "unittag": { + "unit-tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "storagetag", - "unittag" + "storage-tag", + "unit-tag" ] }, "StorageAttachmentIds": { @@ -23847,22 +20726,17 @@ "StorageConstraints": { "type": "object", "properties": { - "Count": { + "count": { "type": "integer" }, - "Pool": { + "pool": { "type": "string" }, - "Size": { + "size": { "type": "integer" } }, - "additionalProperties": false, - "required": [ - "Pool", - "Size", - "Count" - ] + "additionalProperties": false }, "StoragesAddParams": { "type": "object", @@ -23882,27 +20756,26 @@ "StringBoolResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" }, - "Ok": { + "ok": { "type": "boolean" }, - "Result": { + "result": { "type": "string" } }, "additionalProperties": false, "required": [ - "Error", - "Result", - "Ok" + "result", + "ok" ] }, "StringBoolResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/StringBoolResult" @@ -23911,29 +20784,28 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "StringResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" }, - "Result": { + "result": { "type": "string" } }, "additionalProperties": false, "required": [ - "Error", - "Result" + "result" ] }, "StringResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/StringResult" @@ -23942,32 +20814,28 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "StringsResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" }, - "Result": { + "result": { "type": "array", "items": { "type": "string" } } }, - "additionalProperties": false, - "required": [ - "Error", - "Result" - ] + "additionalProperties": false }, "StringsResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/StringsResult" @@ -23976,36 +20844,34 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "StringsWatchResult": { "type": "object", "properties": { - "Changes": { + "changes": { "type": "array", "items": { "type": "string" } }, - "Error": { + "error": { "$ref": "#/definitions/Error" }, - "StringsWatcherId": { + "watcher-id": { "type": "string" } }, "additionalProperties": false, "required": [ - "StringsWatcherId", - "Changes", - "Error" + "watcher-id" ] }, "StringsWatchResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/StringsWatchResult" @@ -24014,32 +20880,32 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "UnitNetworkConfig": { "type": "object", "properties": { - "BindingName": { + "binding-name": { "type": "string" }, - "UnitTag": { + "unit-tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "UnitTag", - "BindingName" + "unit-tag", + "binding-name" ] }, "UnitNetworkConfigResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" }, - "Info": { + "info": { "type": "array", "items": { "$ref": "#/definitions/NetworkConfig" @@ -24048,14 +20914,13 @@ }, "additionalProperties": false, "required": [ - "Error", - "Info" + "info" ] }, "UnitNetworkConfigResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/UnitNetworkConfigResult" @@ -24064,25 +20929,25 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "UnitSettings": { "type": "object", "properties": { - "Version": { + "version": { "type": "integer" } }, "additionalProperties": false, "required": [ - "Version" + "version" ] }, "UnitsNetworkConfig": { "type": "object", "properties": { - "Args": { + "args": { "type": "array", "items": { "$ref": "#/definitions/UnitNetworkConfig" @@ -24091,47 +20956,7 @@ }, "additionalProperties": false, "required": [ - "Args" - ] - }, - "caveat": { - "type": "object", - "properties": { - "caveatId": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "verificationId": { - "$ref": "#/definitions/packet" - } - }, - "additionalProperties": false, - "required": [ - "location", - "caveatId", - "verificationId" - ] - }, - "packet": { - "type": "object", - "properties": { - "headerLen": { - "type": "integer" - }, - "start": { - "type": "integer" - }, - "totalLen": { - "type": "integer" - } - }, - "additionalProperties": false, - "required": [ - "start", - "totalLen", - "headerLen" + "args" ] } } @@ -24212,7 +21037,7 @@ "Entities": { "type": "object", "properties": { - "Entities": { + "entities": { "type": "array", "items": { "$ref": "#/definitions/Entity" @@ -24221,13 +21046,13 @@ }, "additionalProperties": false, "required": [ - "Entities" + "entities" ] }, "EntitiesVersion": { "type": "object", "properties": { - "AgentTools": { + "agent-tools": { "type": "array", "items": { "$ref": "#/definitions/EntityVersion" @@ -24236,63 +21061,63 @@ }, "additionalProperties": false, "required": [ - "AgentTools" + "agent-tools" ] }, "Entity": { "type": "object", "properties": { - "Tag": { + "tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "Tag" + "tag" ] }, "EntityVersion": { "type": "object", "properties": { - "Tag": { + "tag": { "type": "string" }, - "Tools": { + "tools": { "$ref": "#/definitions/Version" } }, "additionalProperties": false, "required": [ - "Tag", - "Tools" + "tag", + "tools" ] }, "Error": { "type": "object", "properties": { - "Code": { + "code": { "type": "string" }, - "Info": { + "info": { "$ref": "#/definitions/ErrorInfo" }, - "Message": { + "message": { "type": "string" } }, "additionalProperties": false, "required": [ - "Message", - "Code" + "message", + "code" ] }, "ErrorInfo": { "type": "object", "properties": { - "Macaroon": { + "macaroon": { "$ref": "#/definitions/Macaroon" }, - "MacaroonPath": { + "macaroon-path": { "type": "string" } }, @@ -24301,19 +21126,16 @@ "ErrorResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" } }, - "additionalProperties": false, - "required": [ - "Error" - ] + "additionalProperties": false }, "ErrorResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/ErrorResult" @@ -24322,66 +21144,32 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "Macaroon": { "type": "object", - "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } - }, - "data": { - "type": "array", - "items": { - "type": "integer" - } - }, - "id": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "sig": { - "type": "array", - "items": { - "type": "integer" - } - } - }, - "additionalProperties": false, - "required": [ - "data", - "location", - "id", - "caveats", - "sig" - ] + "additionalProperties": false }, "NotifyWatchResult": { "type": "object", "properties": { - "Error": { - "$ref": "#/definitions/Error" - }, "NotifyWatcherId": { "type": "string" + }, + "error": { + "$ref": "#/definitions/Error" } }, "additionalProperties": false, "required": [ - "NotifyWatcherId", - "Error" + "NotifyWatcherId" ] }, "NotifyWatchResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/NotifyWatchResult" @@ -24390,7 +21178,7 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "Number": { @@ -24447,13 +21235,13 @@ "ToolsResult": { "type": "object", "properties": { - "DisableSSLHostnameVerification": { + "disable-ssl-hostname-verification": { "type": "boolean" }, - "Error": { + "error": { "$ref": "#/definitions/Error" }, - "ToolsList": { + "tools": { "type": "array", "items": { "$ref": "#/definitions/Tools" @@ -24462,15 +21250,14 @@ }, "additionalProperties": false, "required": [ - "ToolsList", - "DisableSSLHostnameVerification", - "Error" + "tools", + "disable-ssl-hostname-verification" ] }, "ToolsResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/ToolsResult" @@ -24479,41 +21266,37 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "Version": { "type": "object", "properties": { - "Version": { + "version": { "$ref": "#/definitions/Binary" } }, "additionalProperties": false, "required": [ - "Version" + "version" ] }, "VersionResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" }, - "Version": { + "version": { "$ref": "#/definitions/Number" } }, - "additionalProperties": false, - "required": [ - "Version", - "Error" - ] + "additionalProperties": false }, "VersionResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/VersionResult" @@ -24522,47 +21305,7 @@ }, "additionalProperties": false, "required": [ - "Results" - ] - }, - "caveat": { - "type": "object", - "properties": { - "caveatId": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "verificationId": { - "$ref": "#/definitions/packet" - } - }, - "additionalProperties": false, - "required": [ - "location", - "caveatId", - "verificationId" - ] - }, - "packet": { - "type": "object", - "properties": { - "headerLen": { - "type": "integer" - }, - "start": { - "type": "integer" - }, - "totalLen": { - "type": "integer" - } - }, - "additionalProperties": false, - "required": [ - "start", - "totalLen", - "headerLen" + "results" ] } } @@ -24722,7 +21465,7 @@ "Entities": { "type": "object", "properties": { - "Entities": { + "entities": { "type": "array", "items": { "$ref": "#/definitions/Entity" @@ -24731,41 +21474,41 @@ }, "additionalProperties": false, "required": [ - "Entities" + "entities" ] }, "Entity": { "type": "object", "properties": { - "Tag": { + "tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "Tag" + "tag" ] }, "EntityPassword": { "type": "object", "properties": { - "Password": { + "password": { "type": "string" }, - "Tag": { + "tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "Tag", - "Password" + "tag", + "password" ] }, "EntityPasswords": { "type": "object", "properties": { - "Changes": { + "changes": { "type": "array", "items": { "$ref": "#/definitions/EntityPassword" @@ -24774,35 +21517,35 @@ }, "additionalProperties": false, "required": [ - "Changes" + "changes" ] }, "Error": { "type": "object", "properties": { - "Code": { + "code": { "type": "string" }, - "Info": { + "info": { "$ref": "#/definitions/ErrorInfo" }, - "Message": { + "message": { "type": "string" } }, "additionalProperties": false, "required": [ - "Message", - "Code" + "message", + "code" ] }, "ErrorInfo": { "type": "object", "properties": { - "Macaroon": { + "macaroon": { "$ref": "#/definitions/Macaroon" }, - "MacaroonPath": { + "macaroon-path": { "type": "string" } }, @@ -24811,19 +21554,16 @@ "ErrorResult": { "type": "object", "properties": { - "Error": { + "error": { "$ref": "#/definitions/Error" } }, - "additionalProperties": false, - "required": [ - "Error" - ] + "additionalProperties": false }, "ErrorResults": { "type": "object", "properties": { - "Results": { + "results": { "type": "array", "items": { "$ref": "#/definitions/ErrorResult" @@ -24832,45 +21572,12 @@ }, "additionalProperties": false, "required": [ - "Results" + "results" ] }, "Macaroon": { "type": "object", - "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } - }, - "data": { - "type": "array", - "items": { - "type": "integer" - } - }, - "id": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "sig": { - "type": "array", - "items": { - "type": "integer" - } - } - }, - "additionalProperties": false, - "required": [ - "data", - "location", - "id", - "caveats", - "sig" - ] + "additionalProperties": false }, "MacaroonResult": { "type": "object", @@ -24977,46 +21684,6 @@ "required": [ "results" ] - }, - "caveat": { - "type": "object", - "properties": { - "caveatId": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "verificationId": { - "$ref": "#/definitions/packet" - } - }, - "additionalProperties": false, - "required": [ - "location", - "caveatId", - "verificationId" - ] - }, - "packet": { - "type": "object", - "properties": { - "headerLen": { - "type": "integer" - }, - "start": { - "type": "integer" - }, - "totalLen": { - "type": "integer" - } - }, - "additionalProperties": false, - "required": [ - "start", - "totalLen", - "headerLen" - ] } } } @@ -25043,29 +21710,29 @@ "Error": { "type": "object", "properties": { - "Code": { + "code": { "type": "string" }, - "Info": { + "info": { "$ref": "#/definitions/ErrorInfo" }, - "Message": { + "message": { "type": "string" } }, "additionalProperties": false, "required": [ - "Message", - "Code" + "message", + "code" ] }, "ErrorInfo": { "type": "object", "properties": { - "Macaroon": { + "macaroon": { "$ref": "#/definitions/Macaroon" }, - "MacaroonPath": { + "macaroon-path": { "type": "string" } }, @@ -25073,122 +21740,47 @@ }, "Macaroon": { "type": "object", - "properties": { - "caveats": { - "type": "array", - "items": { - "$ref": "#/definitions/caveat" - } - }, - "data": { - "type": "array", - "items": { - "type": "integer" - } - }, - "id": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "sig": { - "type": "array", - "items": { - "type": "integer" - } - } - }, - "additionalProperties": false, - "required": [ - "data", - "location", - "id", - "caveats", - "sig" - ] + "additionalProperties": false }, "MachineStorageId": { "type": "object", "properties": { - "attachmenttag": { + "attachment-tag": { "type": "string" }, - "machinetag": { + "machine-tag": { "type": "string" } }, "additionalProperties": false, "required": [ - "machinetag", - "attachmenttag" + "machine-tag", + "attachment-tag" ] }, "MachineStorageIdsWatchResult": { "type": "object", "properties": { - "Changes": { + "changes": { "type": "array", "items": { "$ref": "#/definitions/MachineStorageId" } }, - "Error": { + "error": { "$ref": "#/definitions/Error" }, - "MachineStorageIdsWatcherId": { + "watcher-id": { "type": "string" } }, "additionalProperties": false, "required": [ - "MachineStorageIdsWatcherId", - "Changes", - "Error" - ] - }, - "caveat": { - "type": "object", - "properties": { - "caveatId": { - "$ref": "#/definitions/packet" - }, - "location": { - "$ref": "#/definitions/packet" - }, - "verificationId": { - "$ref": "#/definitions/packet" - } - }, - "additionalProperties": false, - "required": [ - "location", - "caveatId", - "verificationId" - ] - }, - "packet": { - "type": "object", - "properties": { - "headerLen": { - "type": "integer" - }, - "start": { - "type": "integer" - }, - "totalLen": { - "type": "integer" - } - }, - "additionalProperties": false, - "required": [ - "start", - "totalLen", - "headerLen" + "watcher-id", + "changes" ] } } } } ] - diff --git a/juju/client/watcher.py b/juju/client/watcher.py index 8d7e15c..64099c8 100644 --- a/juju/client/watcher.py +++ b/juju/client/watcher.py @@ -9,7 +9,7 @@ class AllWatcher(BaseAllWatcher): client.connect(self.connection) result = await client.WatchAll() - self.Id = result.allwatcherid + self.Id = result.watcher_id msg['Id'] = self.Id return await super(AllWatcher, self).rpc(msg) diff --git a/juju/delta.py b/juju/delta.py index 247c81d..c7f694d 100644 --- a/juju/delta.py +++ b/juju/delta.py @@ -14,7 +14,7 @@ def get_entity_delta(d): class EntityDelta(client.Delta): def get_id(self): - return self.data['Id'] + return self.data['id'] def get_entity_class(self): return None @@ -22,7 +22,7 @@ class EntityDelta(client.Delta): class ApplicationDelta(EntityDelta): def get_id(self): - return self.data['Name'] + return self.data['name'] def get_entity_class(self): from .application import Application @@ -37,7 +37,7 @@ class MachineDelta(EntityDelta): class UnitDelta(EntityDelta): def get_id(self): - return self.data['Name'] + return self.data['name'] def get_entity_class(self): from .unit import Unit diff --git a/juju/unit.py b/juju/unit.py index 2b7170e..b540ada 100644 --- a/juju/unit.py +++ b/juju/unit.py @@ -8,7 +8,7 @@ log = logging.getLogger(__name__) class Unit(model.ModelEntity): def _get_tag(self): - return 'unit-{}'.format(self.data['Name'].replace('/', '-')) + return 'unit-{}'.format(self.data['name'].replace('/', '-')) def add_storage(self, name, constraints=None): """Add unit storage dynamically. @@ -62,14 +62,14 @@ class Unit(model.ModelEntity): action.connect(conn) log.debug( - 'Running `%s` on %s', command, self.Name) + 'Running `%s` on %s', command, self.name) return await action.Run( [], command, [], timeout, - [self.Name], + [self.name], ) def run_action(self, action_name, **params):