projects
/
osm
/
N2VC.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update docs requirement to fix RTD build
[osm/N2VC.git]
/
juju
/
controller.py
diff --git
a/juju/controller.py
b/juju/controller.py
index
98b3057
..
9b452c7
100644
(file)
--- a/
juju/controller.py
+++ b/
juju/controller.py
@@
-11,7
+11,8
@@
log = logging.getLogger(__name__)
class Controller(object):
class Controller(object):
- def __init__(self, loop=None):
+ def __init__(self, loop=None,
+ max_frame_size=connection.Connection.DEFAULT_FRAME_SIZE):
"""Instantiate a new Controller.
One of the connect_* methods will need to be called before this
"""Instantiate a new Controller.
One of the connect_* methods will need to be called before this
@@
-21,6
+22,7
@@
class Controller(object):
"""
self.loop = loop or asyncio.get_event_loop()
"""
self.loop = loop or asyncio.get_event_loop()
+ self.max_frame_size = None
self.connection = None
self.controller_name = None
self.connection = None
self.controller_name = None
@@
-30,21
+32,24
@@
class Controller(object):
"""
self.connection = await connection.Connection.connect(
"""
self.connection = await connection.Connection.connect(
- endpoint, None, username, password, cacert, macaroons)
+ endpoint, None, username, password, cacert, macaroons,
+ max_frame_size=self.max_frame_size)
async def connect_current(self):
"""Connect to the current Juju controller.
"""
self.connection = (
async def connect_current(self):
"""Connect to the current Juju controller.
"""
self.connection = (
- await connection.Connection.connect_current_controller())
+ await connection.Connection.connect_current_controller(
+ max_frame_size=self.max_frame_size))
async def connect_controller(self, controller_name):
"""Connect to a Juju controller by name.
"""
self.connection = (
async def connect_controller(self, controller_name):
"""Connect to a Juju controller by name.
"""
self.connection = (
- await connection.Connection.connect_controller(controller_name))
+ await connection.Connection.connect_controller(
+ controller_name, max_frame_size=self.max_frame_size))
self.controller_name = controller_name
async def disconnect(self):
self.controller_name = controller_name
async def disconnect(self):
@@
-74,8
+79,8
@@
class Controller(object):
:param str region: Region in which to create the model.
"""
:param str region: Region in which to create the model.
"""
- model_facade = client.ModelManagerFacade
()
-
model_facade.connect(
self.connection)
+ model_facade = client.ModelManagerFacade
.from_connection(
+
self.connection)
owner = owner or self.connection.info['user-info']['identity']
cloud_name = cloud_name or await self.get_cloud()
owner = owner or self.connection.info['user-info']['identity']
cloud_name = cloud_name or await self.get_cloud()
@@
-137,8
+142,8
@@
class Controller(object):
:param str \*uuids: UUIDs of models to destroy
"""
:param str \*uuids: UUIDs of models to destroy
"""
- model_facade = client.ModelManagerFacade
()
-
model_facade.connect(
self.connection)
+ model_facade = client.ModelManagerFacade
.from_connection(
+
self.connection)
log.debug(
'Destroying model%s %s',
log.debug(
'Destroying model%s %s',
@@
-163,8
+168,7
@@
class Controller(object):
"""
if not display_name:
display_name = username
"""
if not display_name:
display_name = username
- user_facade = client.UserManagerFacade()
- user_facade.connect(self.connection)
+ user_facade = client.UserManagerFacade.from_connection(self.connection)
users = [{'display_name': display_name,
'password': password,
'username': username}]
users = [{'display_name': display_name,
'password': password,
'username': username}]
@@
-177,8
+181,7
@@
class Controller(object):
:param str password: New password
"""
:param str password: New password
"""
- user_facade = client.UserManagerFacade()
- user_facade.connect(self.connection)
+ user_facade = client.UserManagerFacade.from_connection(self.connection)
entity = client.EntityPassword(password, tag.user(username))
return await user_facade.SetPassword([entity])
entity = client.EntityPassword(password, tag.user(username))
return await user_facade.SetPassword([entity])
@@
-189,8
+192,8
@@
class Controller(object):
controller.
"""
controller.
"""
- controller_facade = client.ControllerFacade
()
-
controller_facade.connect(
self.connection)
+ controller_facade = client.ControllerFacade
.from_connection(
+
self.connection)
return await controller_facade.DestroyController(destroy_all_models)
async def disable_user(self, username):
return await controller_facade.DestroyController(destroy_all_models)
async def disable_user(self, username):
@@
-199,8
+202,7
@@
class Controller(object):
:param str username: Username
"""
:param str username: Username
"""
- user_facade = client.UserManagerFacade()
- user_facade.connect(self.connection)
+ user_facade = client.UserManagerFacade.from_connection(self.connection)
entity = client.Entity(tag.user(username))
return await user_facade.DisableUser([entity])
entity = client.Entity(tag.user(username))
return await user_facade.DisableUser([entity])
@@
-208,8
+210,7
@@
class Controller(object):
"""Re-enable a previously disabled user.
"""
"""Re-enable a previously disabled user.
"""
- user_facade = client.UserManagerFacade()
- user_facade.connect(self.connection)
+ user_facade = client.UserManagerFacade.from_connection(self.connection)
entity = client.Entity(tag.user(username))
return await user_facade.EnableUser([entity])
entity = client.Entity(tag.user(username))
return await user_facade.EnableUser([entity])
@@
-224,8
+225,7
@@
class Controller(object):
"""
Get the name of the cloud that this controller lives on.
"""
"""
Get the name of the cloud that this controller lives on.
"""
- cloud_facade = client.CloudFacade()
- cloud_facade.connect(self.connection)
+ cloud_facade = client.CloudFacade.from_connection(self.connection)
result = await cloud_facade.Clouds()
cloud = list(result.clouds.keys())[0] # only lives on one cloud
result = await cloud_facade.Clouds()
cloud = list(result.clouds.keys())[0] # only lives on one cloud
@@
-239,11
+239,10
@@
class Controller(object):
:param str username: User for which to list models (admin use only)
"""
:param str username: User for which to list models (admin use only)
"""
- controller_facade = client.ControllerFacade
()
-
controller_facade.connect(
self.connection)
+ controller_facade = client.ControllerFacade
.from_connection(
+
self.connection)
return await controller_facade.AllModels()
return await controller_facade.AllModels()
-
def get_payloads(self, *patterns):
"""Return list of known payloads.
def get_payloads(self, *patterns):
"""Return list of known payloads.
@@
-299,10
+298,11
@@
class Controller(object):
:param str username: Username
"""
:param str username: Username
"""
- client_facade = client.UserManagerFacade
()
-
client_facade.connect(
self.connection)
+ client_facade = client.UserManagerFacade
.from_connection(
+
self.connection)
user = tag.user(username)
user = tag.user(username)
- return await client_facade.UserInfo([client.Entity(user)], include_disabled)
+ return await client_facade.UserInfo([client.Entity(user)],
+ include_disabled)
async def grant(self, username, acl='login'):
"""Set access level of the given user on the controller
async def grant(self, username, acl='login'):
"""Set access level of the given user on the controller
@@
-311,8
+311,8
@@
class Controller(object):
:param str acl: Access control ('login', 'add-model' or 'superuser')
"""
:param str acl: Access control ('login', 'add-model' or 'superuser')
"""
- controller_facade = client.ControllerFacade
()
-
controller_facade.connect(
self.connection)
+ controller_facade = client.ControllerFacade
.from_connection(
+
self.connection)
user = tag.user(username)
await self.revoke(username)
changes = client.ModifyControllerAccess(acl, 'grant', user)
user = tag.user(username)
await self.revoke(username)
changes = client.ModifyControllerAccess(acl, 'grant', user)
@@
-324,8
+324,8
@@
class Controller(object):
:param str username: username
"""
:param str username: username
"""
- controller_facade = client.ControllerFacade
()
-
controller_facade.connect(
self.connection)
+ controller_facade = client.ControllerFacade
.from_connection(
+
self.connection)
user = tag.user(username)
changes = client.ModifyControllerAccess('login', 'revoke', user)
return await controller_facade.ModifyControllerAccess([changes])
user = tag.user(username)
changes = client.ModifyControllerAccess('login', 'revoke', user)
return await controller_facade.ModifyControllerAccess([changes])