X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=examples%2Frelate.py;h=01cee3732f451d44f20654556b3f505da298f728;hb=0a3b685af80dc92e039241b17e712b15994f5769;hp=bdfb2d7814d84aaa3c247087410348c069fbf0cf;hpb=46887b86181254efd72f59a8d6be468342afad83;p=osm%2FN2VC.git

diff --git a/examples/relate.py b/examples/relate.py
index bdfb2d7..01cee37 100644
--- a/examples/relate.py
+++ b/examples/relate.py
@@ -27,9 +27,13 @@ class MyRemoveObserver(ModelObserver):
 
 
 class MyModelObserver(ModelObserver):
+    _shutting_down = False
+
     async def on_change(self, delta, old, new, model):
-        if model.all_units_idle():
+        if model.units and model.all_units_idle() and not self._shutting_down:
+            self._shutting_down = True
             logging.debug('All units idle, disconnecting')
+            await model.reset(force=True)
             await model.disconnect()
             model.loop.stop()
 
@@ -42,28 +46,53 @@ async def run():
     await model.reset(force=True)
     model.add_observer(MyModelObserver())
 
-    await model.deploy(
-        'ubuntu-0',
-        service_name='ubuntu',
+    ubuntu_app = await model.deploy(
+        'ubuntu',
+        application_name='ubuntu',
         series='trusty',
         channel='stable',
     )
+    ubuntu_app.on_change(asyncio.coroutine(
+        lambda delta, old_app, new_app, model:
+            print('App changed: {}'.format(new_app.entity_id))
+    ))
+    ubuntu_app.on_remove(asyncio.coroutine(
+        lambda delta, old_app, new_app, model:
+            print('App removed: {}'.format(old_app.entity_id))
+    ))
+    ubuntu_app.on_unit_add(asyncio.coroutine(
+        lambda delta, old_unit, new_unit, model:
+            print('Unit added: {}'.format(new_unit.entity_id))
+    ))
+    ubuntu_app.on_unit_remove(asyncio.coroutine(
+        lambda delta, old_unit, new_unit, model:
+            print('Unit removed: {}'.format(old_unit.entity_id))
+    ))
+    unit_a, unit_b = await ubuntu_app.add_units(count=2)
+    unit_a.on_change(asyncio.coroutine(
+        lambda delta, old_unit, new_unit, model:
+            print('Unit changed: {}'.format(new_unit.entity_id))
+    ))
     await model.deploy(
-        'nrpe-11',
-        service_name='nrpe',
+        'nrpe',
+        application_name='nrpe',
         series='trusty',
         channel='stable',
-        num_units=0,
+        num_units=1,
     )
-    await model.add_relation(
+    my_relation = await model.add_relation(
         'ubuntu',
         'nrpe',
     )
+    my_relation.on_remove(asyncio.coroutine(
+        lambda delta, old_rel, new_rel, model:
+            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.set_debug(True)
 loop.create_task(run())
 loop.run_forever()