Project

General

Profile

Revision 3d0d254c

ID3d0d254cf9f9d1b45e6a3e56a7fcbaad4cc344e4
Parent be29aa96
Child c49defb8

Added by Francois POIROTTE over 14 years ago

Utilisation de idaggregate de préférence par rapport à idevent (permet d'obtenir plus d'informations).
On suppose que la base de données génère les id des events (le corrélateur et le connector-db sont en train d'être modifiés pour suivre ce changement).
Utilisation de HighLevelService plutôt que ServiceHautNiveau.

git-svn-id: https://vigilo-dev.si.c-s.fr/svn@794 b22e2e97-25c9-44ff-b637-2e5ceca36478

View differences:

vigiboard/tests/functional/test_vigiboardrequest.py
84 84
            'message': u'foo',
85 85
        }
86 86

  
87
        event1 = Event(idevent=u'foo42', hostname=u'monhost',
87
        event1 = Event(hostname=u'monhost',
88 88
            servicename=u'monservice', **event_template)
89
        event2 = Event(idevent=u'foo43', hostname=u'monhostuser',
89
        event2 = Event(hostname=u'monhostuser',
90 90
            servicename=u'monservice', **event_template)
91
        event3 = Event(idevent=u'foo44', hostname=u'monhost',
91
        event3 = Event(hostname=u'monhost',
92 92
            servicename=u'monserviceuser', **event_template)
93
        event4 = Event(idevent=u'foo45', hostname=u'monhostuser',
93
        event4 = Event(hostname=u'monhostuser',
94 94
            servicename=u'monserviceuser', **event_template)
95 95

  
96 96
        DBSession.add(event1)
......
125 125
            'severity': 0,
126 126
            'status': u'None',
127 127
        }
128
        self.aggregate1 = EventsAggregate(idcause=u'foo42', **aggregate_template)
129
        self.aggregate2 = EventsAggregate(idcause=u'foo45', **aggregate_template)
128
        self.aggregate1 = EventsAggregate(
129
            idcause=event1.idevent, **aggregate_template)
130
        self.aggregate2 = EventsAggregate(
131
            idcause=event4.idevent, **aggregate_template)
132

  
130 133
        self.aggregate1.events.append(event1)
131 134
        self.aggregate1.events.append(event3)
132 135
        self.aggregate2.events.append(event4)

Also available in: Unified diff