Wait for entity if it doesn't exist yet

[osm/N2VC.git] / juju / model.py

diff --git a/juju/model.py b/juju/model.py
index b168987..5fb45b6 100644 (file)
--- a/juju/model.py
+++ b/juju/model.py
@@ -1325,13 +1325,11 @@ class BundleHandler(object):
             Annotations holds the annotations as key/value pairs.
         """
         entity_id = self.resolve(id_)
-        log.debug('Updating annotations of %s', entity_id)
-        ann = client.EntityAnnotations(
-            entity=entity_id,
-            annotations=annotations,
-        )
-        await self.ann_facade.Set([ann])
-        return None
+        try:
+            entity = self.model.state.get_entity(entity_type, entity_id)
+        except KeyError:
+            entity = await self._wait_for_new(entity_type, entity_id)
+        return await entity.set_annotations(annotations)
 
 
 class CharmStore(object):