X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=juju%2Fcontroller.py;h=f0ef3b9e8f37474166f9d2df19ddb73cfacdd7f4;hb=a8b2f06681b3cc5e76eef00a73eedc425f74af2b;hp=2d8b4faa7294e1e1926a9c52350b5f6ee47ad24e;hpb=f706324286abe99e13524f272fb792287d53ced4;p=osm%2FN2VC.git

diff --git a/juju/controller.py b/juju/controller.py
index 2d8b4fa..f0ef3b9 100644
--- a/juju/controller.py
+++ b/juju/controller.py
@@ -67,15 +67,27 @@ class Controller(object):
 
         """Destroy a model to this controller.
 
-        :param str : model-<UUID>
+        :param str : <UUID> of the Model
+        param accepts string of <UUID> only OR `model-<UUID>`
+
 
         """
         model_facade = client.ModelManagerFacade()
         model_facade.connect(self.connection)
 
-        for arg in args:
+        #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)
-            await model_facade.DestroyModels([client.Entity(arg)])
+
+        await model_facade.DestroyModels(arglist)
 
     def add_user(self, username, display_name=None, acl=None, models=None):
         """Add a user to this controller.