X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FN2VC.git;a=blobdiff_plain;f=n2vc%2Fjuju_observer.py;h=25c1c1f6588c7906ce25ec795a1b985ad9494bf7;hp=ac40f34dcb122b43ed0de5580fdd7daefb25ee24;hb=18046070fb9abe4f21be255e533c2a96c047e50c;hpb=9ae4d929c2b739d146e3e27388dc4825ca046e50 diff --git a/n2vc/juju_observer.py b/n2vc/juju_observer.py index ac40f34..25c1c1f 100644 --- a/n2vc/juju_observer.py +++ b/n2vc/juju_observer.py @@ -52,7 +52,12 @@ class JujuModelObserver(ModelObserver): self.actions = dict() def register_machine(self, machine: Machine, db_dict: dict): - entity_id = machine.entity_id + try: + entity_id = machine.entity_id + except Exception as e: + # no entity_id aatribute, try machine attribute + entity_id = machine.machine + self.n2vc.debug(msg='Registering machine for changes notifications: {}'.format(entity_id)) entity = _Entity(entity_id=entity_id, entity_type='machine', obj=machine, db_dict=db_dict) self.machines[entity_id] = entity @@ -65,6 +70,7 @@ class JujuModelObserver(ModelObserver): def register_application(self, application: Application, db_dict: dict): entity_id = application.entity_id + self.n2vc.debug(msg='Registering application for changes notifications: {}'.format(entity_id)) entity = _Entity(entity_id=entity_id, entity_type='application', obj=application, db_dict=db_dict) self.applications[entity_id] = entity @@ -77,6 +83,7 @@ class JujuModelObserver(ModelObserver): def register_action(self, action: Action, db_dict: dict): entity_id = action.entity_id + self.n2vc.debug(msg='Registering action for changes notifications: {}'.format(entity_id)) entity = _Entity(entity_id=entity_id, entity_type='action', obj=action, db_dict=db_dict) self.actions[entity_id] = entity