Project

General

Profile

Revision 9a05a743

ID9a05a74302739e67d6a15b0471e5e754f212c44e
Parent 6c1a455f
Child c346507a

Added by Francois POIROTTE over 12 years ago

Nettoyage des tests unitaires.

Utilisation des fonctions outils définies vigilo.models.demo.functions
lorsque c'est possible, afin de réduire la taille des tests et de
privilégier la réutilisation du code existant.

Ce changement précède un autre gros changement dans le modèle (pour le
ticket #918) et vise à diminuer la quantité de changements (pour
faciliter la relecture).

Change-Id: I84f1fb3b4b2306f2ef3a4b0070c4fe5330fa4906
Reviewed-on: https://vigilo-dev.si.c-s.fr/review/482
Tested-by: Build system <>
Reviewed-by: Aurelien BOMPARD <>

View differences:

vigiboard/tests/functional/test_raw_events_table.py
12 12
import transaction
13 13

  
14 14
from vigilo.models.session import DBSession
15
from vigilo.models.demo import functions
15 16
from vigilo.models.tables import Event, EventHistory, CorrEvent, User, \
16 17
                            Permission, StateName, Host, UserGroup, \
17 18
                            LowLevelService, SupItemGroup, DataPermission
......
60 61
    ))
61 62
    DBSession.flush()
62 63

  
63
    # On crée un hôte de test, et on l'ajoute au groupe d'hôtes.
64
    managerhost = Host(
65
        name = u'managerhost',
66
        snmpcommunity = u'public',
67
        hosttpl = u'/dev/null',
68
        address = u'192.168.1.1',
69
        snmpport = 42,
70
        weight = 42,
71
    )
72
    DBSession.add(managerhost)
64
    # On crée un hôte de test et on l'ajoute au groupe d'hôtes.
65
    managerhost = functions.add_host(u'managerhost')
73 66
    supitemmanagers.supitems.append(managerhost)
74 67
    DBSession.flush()
75 68

  
76
    # On crée un services de bas niveau, et on l'ajoute au groupe de services.
77
    managerservice = LowLevelService(
78
        host = managerhost,
79
        servicename = u'managerservice',
80
        command = u'halt',
81
        weight = 42,
82
    )
83
    DBSession.add(managerservice)
69
    # On crée un services de bas niveau et on l'ajoute au groupe de services.
70
    managerservice = functions.add_lowlevelservice(
71
                        managerhost, u'managerservice')
84 72
    supitemmanagers.supitems.append(managerservice)
85 73
    DBSession.flush()
86 74

  
87 75
    if caused_by_service:
88
        supitem = managerservice
76
        event = functions.add_event(managerservice, u'WARNING', u'foo')
89 77
    else:
90
        supitem = managerhost
91

  
92
    # Ajout d'un événement
93
    event = Event(
94
        supitem = supitem,
95
        message = u'foo',
96
        current_state = StateName.statename_to_value(u"WARNING"),
97
        timestamp = datetime.now(),
98
    )
99
    DBSession.add(event)
100
    DBSession.flush()
78
        event = functions.add_event(managerhost, u'WARNING', u'foo')
101 79

  
102 80
    # Ajout des historiques
103 81
    DBSession.add(EventHistory(
......
111 89
    DBSession.flush()
112 90

  
113 91
    # Ajout d'un événement corrélé
114
    aggregate = CorrEvent(
115
        idcause = event.idevent,
116
        timestamp_active = datetime.now(),
117
        priority = 1,
118
        ack = CorrEvent.ACK_NONE)
119
    aggregate.events.append(event)
120
    DBSession.add(aggregate)
121
    DBSession.flush()
92
    aggregate = functions.add_correvent([event])
122 93
    return aggregate.idcorrevent
123 94

  
124 95
def add_masked_event(idcorrevent):
......
127 98
    hostmanagers = SupItemGroup.by_group_name(u'managersgroup')
128 99
    nb_hosts = DBSession.query(Host).count()
129 100

  
130
    masked_host = Host(
131
        name = u'masked host #%d' % nb_hosts,
132
        snmpcommunity = u'public',
133
        hosttpl = u'/dev/null',
134
        address = u'192.168.1.%d' % nb_hosts,
135
        snmpport = 42,
136
        weight = 42,
137
    )
138
    DBSession.add(masked_host)
101
    masked_host = functions.add_host(u'masked host #%d' % nb_hosts)
139 102
    hostmanagers.supitems.append(masked_host)
140 103
    DBSession.flush()
141 104

  
142
    event = Event(
143
        supitem = masked_host,
144
        message = u'masked event #%d' % nb_hosts,
145
        current_state = StateName.statename_to_value(u"CRITICAL"),
146
        timestamp = datetime.now(),
147
    )
148
    DBSession.add(event)
149
    DBSession.flush()
105
    event = functions.add_event(masked_host, u'CRITICAL',
106
                                u'masked event #%d' % nb_hosts)
150 107

  
151 108
    aggregate = DBSession.query(CorrEvent).filter(
152 109
        CorrEvent.idcorrevent == idcorrevent).one()

Also available in: Unified diff