X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=examples%2Fadd_model.py;h=3e46490b20f6f45fcb89a173407c848467b03c74;hb=dbcac620b62e16f9e4b7a763e1400f2f3a79b285;hp=efa325b56fa544701ca0ea001ab82b6f6e6e8001;hpb=c71e189ef6650a0a335c9539c0ceacbce917bd25;p=osm%2FN2VC.git

diff --git a/examples/add_model.py b/examples/add_model.py
index efa325b..3e46490 100644
--- a/examples/add_model.py
+++ b/examples/add_model.py
@@ -11,6 +11,7 @@ from juju import utils
 from juju.controller import Controller
 import asyncio
 from logging import getLogger
+import uuid
 
 LOG = getLogger(__name__)
 
@@ -21,7 +22,8 @@ async def main():
     await controller.connect_current()
 
     try:
-        model_name = "quux"
+        model_name = "addmodeltest-{}".format(uuid.uuid4())
+        print("Adding model {}".format(model_name))
         model = await controller.add_model(model_name)
 
         print('Deploying ubuntu')
@@ -49,10 +51,16 @@ async def main():
         print("Destroying model")
         await controller.destroy_model(model.info.uuid)
 
+    except Exception:
+        LOG.exception(
+            "Test failed! Model {} may not be cleaned up".format(model_name))
+
     finally:
         print('Disconnecting from controller')
-        await model.disconnect()
+        if model:
+            await model.disconnect()
         await controller.disconnect()
 
 
-loop.run(main())
+if __name__ == '__main__':
+    loop.run(main())