add_model() can accept just a model name

[osm/N2VC.git] / juju / controller.py

diff --git a/juju/controller.py b/juju/controller.py
index e0f8066..6331c12 100644 (file)
--- a/juju/controller.py
+++ b/juju/controller.py
@@ -1,14 +1,137 @@
+import asyncio
+import logging
+
+from . import tag
+from .client import client
+from .client import connection
+from .client import watcher
+from .model import Model
+
+log = logging.getLogger(__name__)
+
+
 class Controller(object):
-    def add_model(self, name, config=None, credential=None, owner=None):
+    def __init__(self, loop=None):
+        """Instantiate a new Controller.
+
+        One of the connect_* methods will need to be called before this
+        object can be used for anything interesting.
+
+        :param loop: an asyncio event loop
+
+        """
+        self.loop = loop or asyncio.get_event_loop()
+        self.connection = None
+
+    async def connect(
+            self, endpoint, username, password, cacert=None, macaroons=None):
+        """Connect to an arbitrary Juju controller.
+
+        """
+        self.connection = await connection.Connection.connect(
+            endpoint, None, username, password, cacert, macaroons)
+
+    async def connect_current(self):
+        """Connect to the current Juju controller.
+
+        """
+        self.connection = (
+            await connection.Connection.connect_current_controller())
+
+    async def connect_controller(self, controller_name):
+        """Connect to a Juju controller by name.
+
+        """
+        self.connection = (
+            await connection.Connection.connect_controller(controller_name))
+
+    async def disconnect(self):
+        """Shut down the watcher task and close websockets.
+
+        """
+        if self.connection and self.connection.is_open:
+            log.debug('Closing controller connection')
+            await self.connection.close()
+            self.connection = None
+
+    async def add_model(
+            self, model_name, cloud_name=None, credential_name=None,
+            owner=None, config=None, region=None):
         """Add a model to this controller.
 
-        :param str name: Name of the model
-        :param dict config: Model configuration
-        :param str credential: e.g. '<cloud>:<credential>'
-        :param str owner: Owner username
+        :param str model_name: Name to give the new model.
+        :param str cloud_name: Name of the cloud in which to create the
+            model, e.g. 'aws'. Defaults to same cloud as controller.
+        :param str credential_name: Name of the credential to use when
+            creating the model. Defaults to current credential. If you
+            pass a credential_name, you must also pass a cloud_name,
+            even if it's the default cloud.
+        :param str owner: Username that will own the model. Defaults to
+            the current user.
+        :param dict config: Model configuration.
+        :param str region: Region in which to create the model.
 
         """
-        pass
+        model_facade = client.ModelManagerFacade()
+        model_facade.connect(self.connection)
+
+        owner = owner or self.connection.info['user-info']['identity']
+
+        # XXX: We should be able to accept a credential_name without
+        # a cloud_name, and just get the cloud_name from the controller.
+        if credential_name and cloud_name:
+            credential = tag.credential(
+                cloud_name,
+                tag.untag('user-', owner),
+                credential_name
+            )
+        else:
+            credential = None
+
+
+        log.debug('Creating model %s', model_name)
+
+        model_info = await model_facade.CreateModel(
+            tag.cloud(cloud_name),
+            config,
+            credential,
+            model_name,
+            owner,
+            region,
+        )
+
+        model = Model()
+        await model.connect(
+            self.connection.endpoint,
+            model_info.uuid,
+            self.connection.username,
+            self.connection.password,
+            self.connection.cacert,
+            self.connection.macaroons,
+        )
+
+        return model
+
+    async def destroy_models(self, *uuids):
+        """Destroy one or more models.
+
+        :param str \*uuids: UUIDs of models to destroy
+
+        """
+        model_facade = client.ModelManagerFacade()
+        model_facade.connect(self.connection)
+
+        log.debug(
+            'Destroying model%s %s',
+            '' if len(uuids) == 1 else 's',
+            ', '.join(uuids)
+        )
+
+        await model_facade.DestroyModels([
+            client.Entity(tag.model(uuid))
+            for uuid in uuids
+        ])
+    destroy_model = destroy_models
 
     def add_user(self, username, display_name=None, acl=None, models=None):
         """Add a user to this controller.