Project

General

Profile

Revision 348eec2c

ID348eec2c8ba62352cca34c5c4ff27ad5ad5efe78
Parent d7540235
Child 8484b8bd

Added by Gabriel DE PERTHUIS over 14 years ago

Fix broken references to models renamed in svn rev [674].

git grep wEl 'Events|GraphGroups|Groups|HostGroups|ServiceGroups' - \ {vigiboard,models,correlator,connector,glue,vigicore} \ |xargs sed -i -re 's:\<(Event|GraphGroup|Group|HostGroup|ServiceGroup)s\>:\1:g'

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

View differences:

vigiboard/tests/functional/test_vigiboardrequest.py
6 6
from nose.tools import assert_true
7 7

  
8 8
from vigiboard.model import DBSession, \
9
    Events, EventHistory, Permission, \
10
    Groups, Host, HostGroups, Service, ServiceGroups
9
    Event, EventHistory, Permission, \
10
    Group, Host, HostGroup, Service, ServiceGroup
11 11
from vigiboard.tests import TestController
12 12
from vigiboard.controllers.vigiboardrequest import VigiboardRequest
13 13
from vigiboard.controllers.vigiboard_plugin.tests import MonPlugin
......
29 29
        # On commence par peupler la base de donnée actuellement vide
30 30

  
31 31
        # les groups et leurs dépendances
32
        hostmanagers = Groups(name=u'hostmanagers')
33
        hosteditors = Groups(name=u'hosteditors', parent=hostmanagers)
32
        hostmanagers = Group(name=u'hostmanagers')
33
        hosteditors = Group(name=u'hosteditors', parent=hostmanagers)
34 34
        DBSession.add(hostmanagers)
35 35
        DBSession.add(hosteditors)
36 36

  
......
47 47
        DBSession.add(Host(name = "monhostuser"))
48 48
        DBSession.add(Service(name = "monserviceuser"))
49 49
        DBSession.flush()
50
        event1 = Events(hostname = "monhost", servicename = "monservice")
51
        event2 = Events(hostname = "monhostuser", servicename = "monservice")
52
        event3 = Events(hostname = "monhost", servicename = "monserviceuser")
53
        event4 = Events(hostname = "monhostuser",
50
        event1 = Event(hostname = "monhost", servicename = "monservice")
51
        event2 = Event(hostname = "monhostuser", servicename = "monservice")
52
        event3 = Event(hostname = "monhost", servicename = "monserviceuser")
53
        event4 = Event(hostname = "monhostuser",
54 54
                servicename = "monserviceuser")
55 55

  
56 56
        # Les historiques
......
77 77
            idevent = event4.idevent))
78 78
        
79 79
        # Table de jointure entre les hôtes et services et les groups
80
        DBSession.add(HostGroups(hostname = "monhost",
80
        DBSession.add(HostGroup(hostname = "monhost",
81 81
            groupname = "hostmanagers"))
82
        DBSession.add(HostGroups(hostname = "monhostuser",
82
        DBSession.add(HostGroup(hostname = "monhostuser",
83 83
            groupname = "hosteditors"))
84
        DBSession.add(ServiceGroups(servicename = "monservice",
84
        DBSession.add(ServiceGroup(servicename = "monservice",
85 85
            groupname = "hostmanagers"))
86
        DBSession.add(ServiceGroups(servicename = "monserviceuser",
86
        DBSession.add(ServiceGroup(servicename = "monserviceuser",
87 87
            groupname = "hosteditors"))
88 88
        DBSession.flush()
89 89

  

Also available in: Unified diff