Revision e7e3d45e
Mise à jour du code de VigiBoard suite aux changements dans le modèle (r2550).
git-svn-id: https://vigilo-dev.si.c-s.fr/svn@2558 b22e2e97-25c9-44ff-b637-2e5ceca36478
vigiboard/controllers/plugins/date.py | ||
---|---|---|
9 | 9 |
from tg import url |
10 | 10 |
|
11 | 11 |
from vigiboard.controllers.plugins import VigiboardRequestPlugin |
12 |
from vigilo.models.configure import DBSession |
|
13 |
from vigilo.models import HighLevelService, \ |
|
14 |
CorrEvent, Event, SupItem |
|
15 | 12 |
|
16 | 13 |
class PluginDate(VigiboardRequestPlugin): |
17 | 14 |
"""Plugin pour l'ajout d'une colonne Date.""" |
vigiboard/controllers/plugins/details.py | ||
---|---|---|
14 | 14 |
|
15 | 15 |
from vigiboard.controllers.vigiboardrequest import VigiboardRequest |
16 | 16 |
from vigiboard.controllers.plugins import VigiboardRequestPlugin |
17 |
from vigilo.models.configure import DBSession
|
|
18 |
from vigilo.models import User, CorrEvent, Event, StateName |
|
17 |
from vigilo.models.session import DBSession
|
|
18 |
from vigilo.models.tables import User, CorrEvent, Event, StateName
|
|
19 | 19 |
|
20 | 20 |
class PluginDetails(VigiboardRequestPlugin): |
21 | 21 |
""" |
vigiboard/controllers/plugins/hls.py | ||
---|---|---|
9 | 9 |
from tg import url |
10 | 10 |
|
11 | 11 |
from vigiboard.controllers.plugins import VigiboardRequestPlugin |
12 |
from vigilo.models.configure import DBSession
|
|
13 |
from vigilo.models import HighLevelService, CorrEvent, Event, SupItem |
|
12 |
from vigilo.models.session import DBSession
|
|
13 |
from vigilo.models.tables import HighLevelService, CorrEvent, Event, SupItem
|
|
14 | 14 |
|
15 | 15 |
class PluginHLS(VigiboardRequestPlugin): |
16 | 16 |
""" |
vigiboard/controllers/root.py | ||
---|---|---|
18 | 18 |
from sqlalchemy.sql import func |
19 | 19 |
from repoze.what.predicates import Any, not_anonymous |
20 | 20 |
|
21 |
from vigilo.models.configure import DBSession
|
|
22 |
from vigilo.models import Event, EventHistory, CorrEvent, SupItem, \ |
|
21 |
from vigilo.models.session import DBSession
|
|
22 |
from vigilo.models.tables import Event, EventHistory, CorrEvent, SupItem, \
|
|
23 | 23 |
HostGroup, ServiceGroup, StateName, User |
24 | 24 |
from vigilo.models.functions import sql_escape_like |
25 |
from vigilo.models.secondary_tables import EVENTSAGGREGATE_TABLE |
|
25 |
from vigilo.models.tables.secondary_tables import EVENTSAGGREGATE_TABLE
|
|
26 | 26 |
|
27 | 27 |
from vigilo.turbogears.controllers.autocomplete \ |
28 | 28 |
import make_autocomplete_controller |
vigiboard/controllers/vigiboardrequest.py | ||
---|---|---|
11 | 11 |
from sqlalchemy import not_, and_, asc, desc |
12 | 12 |
from sqlalchemy.sql.expression import or_, null as expr_null, union |
13 | 13 |
|
14 |
from vigilo.models.configure import DBSession
|
|
15 |
from vigilo.models import Event, CorrEvent, EventHistory, \ |
|
14 |
from vigilo.models.session import DBSession
|
|
15 |
from vigilo.models.tables import Event, CorrEvent, EventHistory, \
|
|
16 | 16 |
Host, LowLevelService, StateName |
17 |
from vigilo.models.secondary_tables import HOST_GROUP_TABLE, \ |
|
17 |
from vigilo.models.tables.secondary_tables import HOST_GROUP_TABLE, \
|
|
18 | 18 |
SERVICE_GROUP_TABLE |
19 | 19 |
from vigiboard.widgets.edit_event import create_edit_event_form, EditEventForm |
20 | 20 |
from vigiboard.widgets.search_form import create_search_form, SearchForm |
vigiboard/tests/__init__.py | ||
---|---|---|
9 | 9 |
from paste.script.appinstall import SetupCommand |
10 | 10 |
from routes import url_for |
11 | 11 |
from webtest import TestApp |
12 |
from nose.tools import eq_, nottest
|
|
12 |
from nose.tools import eq_ |
|
13 | 13 |
|
14 |
from vigilo.models.configure import metadata, DBSession
|
|
14 |
from vigilo.models.session import metadata, DBSession
|
|
15 | 15 |
|
16 | 16 |
__all__ = ['setup_db', 'teardown_db', 'TestController', 'url_for'] |
17 | 17 |
|
vigiboard/tests/functional/plugins/test_plugin_hls.py | ||
---|---|---|
5 | 5 |
import transaction |
6 | 6 |
from nose.tools import assert_equal |
7 | 7 |
|
8 |
from vigilo.models.configure import DBSession
|
|
9 |
from vigilo.models import Permission, StateName, \ |
|
8 |
from vigilo.models.session import DBSession
|
|
9 |
from vigilo.models.tables import Permission, StateName, \
|
|
10 | 10 |
HostGroup, Host, HighLevelService, \ |
11 | 11 |
Event, CorrEvent, ImpactedPath, ImpactedHLS |
12 | 12 |
from vigiboard.tests import TestController |
vigiboard/tests/functional/test_correvents_table.py | ||
---|---|---|
8 | 8 |
from datetime import datetime |
9 | 9 |
import transaction |
10 | 10 |
|
11 |
from vigilo.models.configure import DBSession
|
|
12 |
from vigilo.models import Event, CorrEvent, \ |
|
11 |
from vigilo.models.session import DBSession
|
|
12 |
from vigilo.models.tables import Event, CorrEvent, \
|
|
13 | 13 |
Permission, StateName, \ |
14 | 14 |
Host, HostGroup, LowLevelService |
15 | 15 |
from vigiboard.tests import TestController |
vigiboard/tests/functional/test_details_plugin.py | ||
---|---|---|
8 | 8 |
import transaction |
9 | 9 |
|
10 | 10 |
from vigiboard.tests import TestController |
11 |
from vigilo.models.configure import DBSession
|
|
12 |
from vigilo.models import ServiceGroup, HostGroup, \ |
|
11 |
from vigilo.models.session import DBSession
|
|
12 |
from vigilo.models.tables import ServiceGroup, HostGroup, \
|
|
13 | 13 |
Host, Permission, StateName, \ |
14 | 14 |
LowLevelService, Event, CorrEvent |
15 | 15 |
|
vigiboard/tests/functional/test_history_table.py | ||
---|---|---|
9 | 9 |
from datetime import datetime |
10 | 10 |
import transaction |
11 | 11 |
|
12 |
from vigilo.models.configure import DBSession
|
|
13 |
from vigilo.models import Event, EventHistory, CorrEvent, \ |
|
12 |
from vigilo.models.session import DBSession
|
|
13 |
from vigilo.models.tables import Event, EventHistory, CorrEvent, \
|
|
14 | 14 |
Permission, StateName, \ |
15 | 15 |
Host, HostGroup, LowLevelService, ServiceGroup |
16 | 16 |
from vigiboard.tests import TestController |
vigiboard/tests/functional/test_raw_events_table.py | ||
---|---|---|
8 | 8 |
from datetime import datetime |
9 | 9 |
import transaction |
10 | 10 |
|
11 |
from vigilo.models.configure import DBSession
|
|
12 |
from vigilo.models import Event, EventHistory, CorrEvent, \ |
|
11 |
from vigilo.models.session import DBSession
|
|
12 |
from vigilo.models.tables import Event, EventHistory, CorrEvent, \
|
|
13 | 13 |
Permission, StateName, \ |
14 | 14 |
Host, HostGroup, LowLevelService, ServiceGroup |
15 | 15 |
from vigiboard.tests import TestController |
vigiboard/tests/functional/test_root.py | ||
---|---|---|
15 | 15 |
from time import mktime |
16 | 16 |
import transaction |
17 | 17 |
|
18 |
from vigilo.models.configure import DBSession
|
|
19 |
from vigilo.models import Event, EventHistory, CorrEvent, \ |
|
18 |
from vigilo.models.session import DBSession
|
|
19 |
from vigilo.models.tables import Event, EventHistory, CorrEvent, \
|
|
20 | 20 |
Permission, StateName, \ |
21 | 21 |
Host, HostGroup, ServiceGroup, LowLevelService |
22 | 22 |
|
vigiboard/tests/functional/test_search_form_host.py | ||
---|---|---|
7 | 7 |
import transaction |
8 | 8 |
|
9 | 9 |
from vigiboard.tests import TestController |
10 |
from vigilo.models.configure import DBSession
|
|
11 |
from vigilo.models import HostGroup, Host, Permission, \ |
|
12 |
Event, CorrEvent, StateName |
|
10 |
from vigilo.models.session import DBSession
|
|
11 |
from vigilo.models.tables import HostGroup, Host, Permission, \
|
|
12 |
Event, CorrEvent, StateName
|
|
13 | 13 |
|
14 | 14 |
def insert_deps(): |
15 | 15 |
"""Insère les dépendances nécessaires aux tests.""" |
vigiboard/tests/functional/test_search_form_hostgroup.py | ||
---|---|---|
7 | 7 |
import transaction |
8 | 8 |
|
9 | 9 |
from vigiboard.tests import TestController |
10 |
from vigilo.models.configure import DBSession
|
|
11 |
from vigilo.models import HostGroup, Host, Permission, \ |
|
12 |
Event, CorrEvent, StateName |
|
10 |
from vigilo.models.session import DBSession
|
|
11 |
from vigilo.models.tables import HostGroup, Host, Permission, \
|
|
12 |
Event, CorrEvent, StateName
|
|
13 | 13 |
|
14 | 14 |
def insert_deps(): |
15 | 15 |
"""Insère les dépendances nécessaires aux tests.""" |
vigiboard/tests/functional/test_search_form_misc.py | ||
---|---|---|
8 | 8 |
import transaction |
9 | 9 |
|
10 | 10 |
from vigiboard.tests import TestController |
11 |
from vigilo.models.configure import DBSession
|
|
12 |
from vigilo.models import HostGroup, Host, Permission, \ |
|
13 |
Event, CorrEvent, StateName |
|
11 |
from vigilo.models.session import DBSession
|
|
12 |
from vigilo.models.tables import HostGroup, Host, Permission, \
|
|
13 |
Event, CorrEvent, StateName
|
|
14 | 14 |
|
15 | 15 |
def insert_deps(): |
16 | 16 |
"""Insère les dépendances nécessaires aux tests.""" |
vigiboard/tests/functional/test_search_form_service.py | ||
---|---|---|
7 | 7 |
import transaction |
8 | 8 |
|
9 | 9 |
from vigiboard.tests import TestController |
10 |
from vigilo.models.configure import DBSession
|
|
11 |
from vigilo.models import ServiceGroup, HostGroup, \ |
|
12 |
Host, Permission, StateName, \ |
|
13 |
LowLevelService, Event, CorrEvent |
|
10 |
from vigilo.models.session import DBSession
|
|
11 |
from vigilo.models.tables import ServiceGroup, HostGroup, \
|
|
12 |
Host, Permission, StateName, \
|
|
13 |
LowLevelService, Event, CorrEvent
|
|
14 | 14 |
|
15 | 15 |
def insert_deps(): |
16 | 16 |
"""Insère les dépendances nécessaires aux tests.""" |
vigiboard/tests/functional/test_search_form_servicegroup.py | ||
---|---|---|
7 | 7 |
import transaction |
8 | 8 |
|
9 | 9 |
from vigiboard.tests import TestController |
10 |
from vigilo.models.configure import DBSession
|
|
11 |
from vigilo.models import ServiceGroup, Host, Permission, Event, \ |
|
12 |
LowLevelService, CorrEvent, StateName |
|
10 |
from vigilo.models.session import DBSession
|
|
11 |
from vigilo.models.tables import ServiceGroup, Host, Permission, Event, \
|
|
12 |
LowLevelService, CorrEvent, StateName
|
|
13 | 13 |
|
14 | 14 |
def insert_deps(): |
15 | 15 |
"""Insère les dépendances nécessaires aux tests.""" |
vigiboard/tests/functional/test_userutils.py | ||
---|---|---|
6 | 6 |
import transaction |
7 | 7 |
from nose.tools import assert_true |
8 | 8 |
|
9 |
from vigilo.models.configure import DBSession
|
|
10 |
from vigilo.models import HostGroup, Permission, User |
|
9 |
from vigilo.models.session import DBSession
|
|
10 |
from vigilo.models.tables import HostGroup, Permission, User
|
|
11 | 11 |
from vigiboard.tests import TestController |
12 | 12 |
|
13 | 13 |
class TestGroupPermissionsInheritance(TestController): |
Also available in: Unified diff