X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=juju%2Fcontroller.py;h=6331c12b7c63563b4b9d67f35eb4978a7355112b;hb=0a3b685af80dc92e039241b17e712b15994f5769;hp=95a477137b11e8c5c59ac5e718252150519f4f1d;hpb=5389f71a7619c2929d685f3bdd08a2854125c228;p=osm%2FN2VC.git

diff --git a/juju/controller.py b/juju/controller.py
index 95a4771..6331c12 100644
--- a/juju/controller.py
+++ b/juju/controller.py
@@ -1,6 +1,7 @@
 import asyncio
 import logging
 
+from . import tag
 from .client import client
 from .client import connection
 from .client import watcher
@@ -54,27 +55,48 @@ class Controller(object):
             self.connection = None
 
     async def add_model(
-            self, name, cloud, credential, owner=None,
-            config=None, region=None):
+            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.
 
         """
         model_facade = client.ModelManagerFacade()
         model_facade.connect(self.connection)
 
-        log.debug('Creating model %s', name)
+        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(
-            cloud,
+            tag.cloud(cloud_name),
             config,
             credential,
-            name,
-            owner or self.connection.info['user-info']['identity'],
+            model_name,
+            owner,
             region,
         )
 
@@ -90,31 +112,26 @@ class Controller(object):
 
         return model
 
-    async def destroy_models(self, *args):
-
-        """Destroy a model to this controller.
-
-        :param str : <UUID> of the Model
-        param accepts string of <UUID> only OR `model-<UUID>`
+    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)
 
-        # Generate list of args, pre-pend 'model-'
-        prependarg = list(args)
-        for index, item in enumerate(prependarg):
-            if not item.startswith('model-'):
-                prependarg[index] = "model-%s" % item
-
-        # Create list of objects to pass to DestroyModels()
-        arglist = []
-        for arg in prependarg:
-            arglist.append(client.Entity(arg))
-            log.debug('Destroying Model %s', arg)
+        log.debug(
+            'Destroying model%s %s',
+            '' if len(uuids) == 1 else 's',
+            ', '.join(uuids)
+        )
 
-        await model_facade.DestroyModels(arglist)
+        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.