X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=examples%2Funitrun.py;h=3dfacd62e4c078592dc984246aabc2ed27cbc413;hb=refs%2Ftags%2F0.4.0;hp=0436259ccb432ab8d5fe728c422e011cce72924b;hpb=b64327bb58139f1e1f770b16492968423f011eab;p=osm%2FN2VC.git

diff --git a/examples/unitrun.py b/examples/unitrun.py
index 0436259..3dfacd6 100644
--- a/examples/unitrun.py
+++ b/examples/unitrun.py
@@ -10,44 +10,38 @@ This example:
 import asyncio
 import logging
 
-from juju.model import Model, ModelObserver
+from juju.model import Model
+from juju import loop
 
-async def run_stuff_on_unit(unit):
-    print('Running command on unit', unit.name)
-
-    # unit.run() returns a client.ActionResults instance
-    action = await unit.run('unit-get public-address')
-
-    print("Action results: {}".format(action.results))
-
-    # Inform asyncio that we're done.
-    await unit.model.disconnect()
-    unit.model.loop.stop()
 
+async def run_command(unit):
+    logging.debug('Running command on unit %s', unit.name)
 
-class MyModelObserver(ModelObserver):
-    async def on_unit_add(self, delta, old, new, model):
-        loop.create_task(run_stuff_on_unit(new))
+    # unit.run() returns a juju.action.Action instance
+    action = await unit.run('unit-get public-address')
+    logging.debug("Action results: %s", action.results)
 
 
-async def run():
+async def main():
     model = Model()
     await model.connect_current()
     await model.reset(force=True)
-    model.add_observer(MyModelObserver())
 
-    await model.deploy(
+    app = await model.deploy(
         'ubuntu-0',
         application_name='ubuntu',
         series='trusty',
         channel='stable',
     )
 
+    for unit in app.units:
+        await run_command(unit)
+
+    await model.disconnect()
+
 
-logging.basicConfig(level=logging.DEBUG)
-ws_logger = logging.getLogger('websockets.protocol')
-ws_logger.setLevel(logging.INFO)
-loop = asyncio.get_event_loop()
-loop.set_debug(False)
-loop.create_task(run())
-loop.run_forever()
+if __name__ == '__main__':
+    logging.basicConfig(level=logging.DEBUG)
+    ws_logger = logging.getLogger('websockets.protocol')
+    ws_logger.setLevel(logging.INFO)
+    loop.run(main())