X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=examples%2Frelate.py;h=8f1e7082b2ebaf198e4f54144a3d94d746bdc142;hb=d23810d57aa7f0fa67070781645f4898e20db0ed;hp=1952ffea06afc6e44ff31050cc381e4668838adc;hpb=d47bd509191abc8217a5568a6c73324467355036;p=osm%2FN2VC.git

diff --git a/examples/relate.py b/examples/relate.py
index 1952ffe..8f1e708 100644
--- a/examples/relate.py
+++ b/examples/relate.py
@@ -11,6 +11,7 @@ import asyncio
 import logging
 
 from juju.model import Model, ModelObserver
+from juju import loop
 
 
 class MyRemoveObserver(ModelObserver):
@@ -35,10 +36,9 @@ class MyModelObserver(ModelObserver):
             logging.debug('All units idle, disconnecting')
             await model.reset(force=True)
             await model.disconnect()
-            model.loop.stop()
 
 
-async def run():
+async def main():
     model = Model()
     await model.connect_current()
 
@@ -48,7 +48,7 @@ async def run():
 
     ubuntu_app = await model.deploy(
         'ubuntu',
-        service_name='ubuntu',
+        application_name='ubuntu',
         series='trusty',
         channel='stable',
     )
@@ -75,9 +75,10 @@ async def run():
     ))
     await model.deploy(
         'nrpe',
-        service_name='nrpe',
+        application_name='nrpe',
         series='trusty',
         channel='stable',
+        # subordinates must be deployed without units
         num_units=0,
     )
     my_relation = await model.add_relation(
@@ -89,10 +90,9 @@ async def run():
             print('Relation removed: {}'.format(old_rel.endpoints))
     ))
 
-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())