observer and reporter should be valid Resource

- fix observer and reporter attributes to be valid Resource type
- add check that Resource id shortform for initiator and target do
not reference themselves

Fixes: Bug # 1240067
Change-Id: Iab5b6c129d512039073cc8c2ab7b75ac7c819624

1 files changed, 6 insertions, 7 deletions

diff --git a/pycadf/event.py b/pycadf/event.py
index ff39338..e9a91e4 100644
--- a/pycadf/event.py
+++ b/pycadf/event.py
@@ -77,15 +77,16 @@ class Event(cadftype.CADFAbstractType):
                                              lambda x: timestamp.is_valid(x))
     initiator = cadftype.ValidatorDescriptor(
         EVENT_KEYNAME_INITIATOR,
-        (lambda x: isinstance(x, resource.Resource) and
-         x.is_valid()))
+        (lambda x: isinstance(x, resource.Resource) and x.is_valid()
+         and x.id != 'initiator'))
     initiatorId = cadftype.ValidatorDescriptor(
         EVENT_KEYNAME_INITIATORID, lambda x: identifier.is_valid(x))
     action = cadftype.ValidatorDescriptor(
         EVENT_KEYNAME_ACTION, lambda x: cadftaxonomy.is_valid_action(x))
     target = cadftype.ValidatorDescriptor(
-        EVENT_KEYNAME_TARGET, (lambda x: isinstance(x, resource.Resource) and
-                               x.is_valid()))
+        EVENT_KEYNAME_TARGET,
+        (lambda x: isinstance(x, resource.Resource) and x.is_valid()
+         and x.id != 'target'))
     targetId = cadftype.ValidatorDescriptor(
         EVENT_KEYNAME_TARGETID, lambda x: identifier.is_valid(x))
     outcome = cadftype.ValidatorDescriptor(
@@ -98,9 +99,7 @@ class Event(cadftype.CADFAbstractType):
                                                                  basestring))
     observer = cadftype.ValidatorDescriptor(
         EVENT_KEYNAME_OBSERVER,
-        (lambda x: isinstance(x, resource.Resource) or
-         (isinstance(x, basestring) and
-          (x == 'initiator' or x == 'target'))))
+        (lambda x: isinstance(x, resource.Resource) and x.is_valid()))
 
     def __init__(self, eventType=cadftype.EVENTTYPE_ACTIVITY,
                  id=None, eventTime=None,