Revision 7365fb51
Suppression du dossier "vigiboard.model".
Toutes les références à ce dossier doivent être remplacées par des références à "vigilo.models".
Cas particulier: DBSession doit être importé explicitement depuis "vigilo.models.session".
Adpatation du reste du code de l'appli pour tenir compte de ce changement.
git-svn-id: https://vigilo-dev.si.c-s.fr/svn@1756 b22e2e97-25c9-44ff-b637-2e5ceca36478
vigiboard/config/app_cfg.py | ||
---|---|---|
14 | 14 |
|
15 | 15 |
""" |
16 | 16 |
|
17 |
from vigilo import models |
|
18 |
from vigilo.models.session import DBSession |
|
19 |
from vigilo.models.vigilo_bdd_config import metadata |
|
20 |
metadata.bind = DBSession.bind |
|
21 |
|
|
17 | 22 |
from vigilo.turbogears import VigiloAppConfig |
18 | 23 |
from pylons.i18n import lazy_ugettext as l_ |
19 | 24 |
|
20 | 25 |
import vigiboard |
21 |
from vigiboard import model |
|
22 | 26 |
from vigiboard.lib import app_globals, helpers |
23 | 27 |
|
28 |
|
|
24 | 29 |
base_config = VigiloAppConfig('vigiboard') |
25 | 30 |
base_config.renderers = [] |
26 | 31 |
|
... | ... | |
36 | 41 |
|
37 | 42 |
#Configure the base SQLALchemy Setup |
38 | 43 |
base_config.use_sqlalchemy = True |
39 |
base_config.model = model |
|
40 |
base_config.DBSession = model.DBSession
|
|
44 |
base_config.model = models
|
|
45 |
base_config.DBSession = DBSession |
|
41 | 46 |
|
42 | 47 |
# Configure the authentication backend |
43 | 48 |
base_config.auth_backend = 'sqlalchemy' |
44 |
base_config.sa_auth.dbsession = model.DBSession
|
|
49 |
base_config.sa_auth.dbsession = DBSession |
|
45 | 50 |
# what is the class you want to use to search for users in the database |
46 |
base_config.sa_auth.user_class = model.User |
|
51 |
base_config.sa_auth.user_class = models.User
|
|
47 | 52 |
# what is the class you want to use to search for groups in the database |
48 |
base_config.sa_auth.group_class = model.UserGroup |
|
53 |
base_config.sa_auth.group_class = models.UserGroup
|
|
49 | 54 |
# what is the class you want to use to search for permissions in the database |
50 |
base_config.sa_auth.permission_class = model.Permission |
|
55 |
base_config.sa_auth.permission_class = models.Permission
|
|
51 | 56 |
# The name "groups" is already used for groups of hosts. |
52 | 57 |
# We use "usergroups" when referering to users to avoid confusion. |
53 | 58 |
base_config.sa_auth.translations.groups = 'usergroups' |
vigiboard/controllers/root.py | ||
---|---|---|
2 | 2 |
# vim:set expandtab tabstop=4 shiftwidth=4: |
3 | 3 |
"""Vigiboard Controller""" |
4 | 4 |
|
5 |
from datetime import datetime |
|
6 |
from time import mktime |
|
7 |
import math |
|
8 |
import urllib |
|
9 |
|
|
5 | 10 |
from tg.exceptions import HTTPNotFound |
6 | 11 |
from tg import expose, validate, require, flash, \ |
7 | 12 |
tmpl_context, request, config, session, redirect, url |
... | ... | |
13 | 18 |
from sqlalchemy.orm import aliased |
14 | 19 |
from sqlalchemy.sql import func |
15 | 20 |
from sqlalchemy.sql.expression import union |
16 |
from datetime import datetime |
|
17 |
from time import mktime |
|
18 |
import math |
|
19 |
import urllib |
|
21 |
from repoze.what.predicates import Any, not_anonymous |
|
20 | 22 |
|
21 |
from vigiboard.model import DBSession
|
|
22 |
from vigiboard.model import Event, EventHistory, CorrEvent, \
|
|
23 |
from vigilo.models.session import DBSession
|
|
24 |
from vigilo.models import Event, EventHistory, CorrEvent, SupItem, \
|
|
23 | 25 |
Host, HostGroup, ServiceGroup, \ |
24 | 26 |
StateName, User, LowLevelService |
25 |
from vigilo.models import SupItem |
|
26 |
from repoze.what.predicates import Any, not_anonymous |
|
27 |
from vigiboard.widgets.edit_event import edit_event_status_options |
|
28 |
from vigiboard.controllers.vigiboardrequest import VigiboardRequest |
|
29 |
from vigiboard.controllers.vigiboard_controller import VigiboardRootController |
|
30 |
from vigilo.turbogears.controllers.autocomplete import AutoCompleteController |
|
31 | 27 |
from vigilo.models.functions import sql_escape_like |
32 | 28 |
from vigilo.models.secondary_tables import HOST_GROUP_TABLE, \ |
33 | 29 |
SERVICE_GROUP_TABLE |
30 |
|
|
31 |
from vigilo.turbogears.controllers.autocomplete import AutoCompleteController |
|
32 |
from vigiboard.controllers.vigiboardrequest import VigiboardRequest |
|
33 |
from vigiboard.controllers.vigiboard_controller import VigiboardRootController |
|
34 |
from vigiboard.widgets.edit_event import edit_event_status_options |
|
34 | 35 |
from vigiboard.lib.base import BaseController |
35 | 36 |
|
36 | 37 |
__all__ = ('RootController', 'get_last_modification_timestamp', |
vigiboard/controllers/vigiboard_controller.py | ||
---|---|---|
9 | 9 |
from pylons.i18n import ugettext as _, lazy_ugettext as l_ |
10 | 10 |
from repoze.what import predicates |
11 | 11 |
|
12 |
from vigilo.models.session import DBSession |
|
13 |
from vigilo.models import ApplicationLog |
|
14 |
|
|
12 | 15 |
from vigiboard.lib.base import BaseController |
13 |
from vigiboard.model import DBSession, ApplicationLog |
|
14 | 16 |
from vigiboard.controllers.error import ErrorController |
15 | 17 |
|
16 | 18 |
class VigiboardRootController(BaseController): |
vigiboard/controllers/vigiboard_plugin/shn.py | ||
---|---|---|
8 | 8 |
from tg import url |
9 | 9 |
from sqlalchemy.sql import functions |
10 | 10 |
|
11 |
from vigiboard.controllers.vigiboard_plugin import \
|
|
12 |
VigiboardRequestPlugin
|
|
13 |
from vigiboard.model import DBSession, HighLevelService, \
|
|
14 |
CorrEvent, Event, \ |
|
11 |
from vigiboard.controllers.vigiboard_plugin import VigiboardRequestPlugin
|
|
12 |
from vigilo.models.session import DBSession
|
|
13 |
from vigilo.models import HighLevelService, \
|
|
14 |
CorrEvent, Event, SupItem, \
|
|
15 | 15 |
ImpactedHLS, ImpactedPath |
16 |
from vigilo.models.supitem import SupItem |
|
17 | 16 |
from vigilo.models.secondary_tables import EVENTSAGGREGATE_TABLE |
18 | 17 |
|
19 | 18 |
class PluginSHN(VigiboardRequestPlugin): |
vigiboard/controllers/vigiboard_plugin/tests.py | ||
---|---|---|
4 | 4 |
Plugin for tests |
5 | 5 |
""" |
6 | 6 |
|
7 |
from vigiboard.controllers.vigiboard_plugin import \ |
|
8 |
VigiboardRequestPlugin |
|
9 |
from vigiboard.model import EventHistory, Event |
|
7 |
from vigiboard.controllers.vigiboard_plugin import VigiboardRequestPlugin |
|
8 |
from vigilo.models import EventHistory, Event |
|
10 | 9 |
|
11 | 10 |
class MonPlugin(VigiboardRequestPlugin): |
12 | 11 |
"""Plugin de test""" |
vigiboard/controllers/vigiboardrequest.py | ||
---|---|---|
2 | 2 |
# vim:set expandtab tabstop=4 shiftwidth=4: |
3 | 3 |
"""Gestion de la requête, des plugins et de l'affichage du Vigiboard""" |
4 | 4 |
|
5 |
from vigiboard.model import Event, CorrEvent, EventHistory, \ |
|
6 |
Host, HostGroup, LowLevelService, ServiceGroup, \ |
|
7 |
StateName |
|
8 |
from vigilo.models import SupItem |
|
9 |
from vigilo.models.secondary_tables import HOST_GROUP_TABLE, \ |
|
10 |
SERVICE_GROUP_TABLE |
|
5 |
from time import mktime |
|
6 |
from logging import getLogger |
|
7 |
|
|
11 | 8 |
from tg import url, config, tmpl_context |
12 |
from vigiboard.model import DBSession |
|
9 |
from tg.i18n import get_lang |
|
10 |
from pylons.i18n import ugettext as _ |
|
13 | 11 |
from sqlalchemy import not_, and_, asc, desc, sql |
14 | 12 |
from sqlalchemy.sql.expression import or_, null as expr_null, union |
15 | 13 |
from sqlalchemy.orm import aliased |
14 |
|
|
15 |
from vigilo.models.session import DBSession |
|
16 |
from vigilo.models import SupItem, Event, CorrEvent, EventHistory, \ |
|
17 |
Host, HostGroup, LowLevelService, ServiceGroup, \ |
|
18 |
StateName |
|
19 |
from vigilo.models.secondary_tables import HOST_GROUP_TABLE, \ |
|
20 |
SERVICE_GROUP_TABLE |
|
16 | 21 |
from vigiboard.widgets.edit_event import EditEventForm |
17 | 22 |
from vigiboard.widgets.search_form import SearchForm |
18 | 23 |
from vigiboard.controllers.vigiboard_plugin import VigiboardRequestPlugin |
19 | 24 |
from vigilo.common.conf import settings |
20 |
from tg.i18n import get_lang |
|
21 |
from pylons.i18n import ugettext as _ |
|
22 |
from time import mktime |
|
25 |
|
|
26 |
LOGGER = getLogger(__name__) |
|
23 | 27 |
|
24 | 28 |
class VigiboardRequest(): |
25 | 29 |
""" |
... | ... | |
174 | 178 |
'vigiboard.controllers.vigiboard_plugin.' +\ |
175 | 179 |
plug[0], globals(), locals(), [plug[1]], -1) |
176 | 180 |
self.add_plugin(getattr(mypac, plug[1])()) |
177 |
except: |
|
178 |
raise |
|
181 |
except ImportError: |
|
182 |
# On loggue l'erreur et on ignore le plugin. |
|
183 |
LOGGER.error(_('No such plugin "%s"') % plug[0]) |
|
179 | 184 |
|
180 | 185 |
self.join.extend([ |
181 | 186 |
(self.items, Event.idsupitem == self.items.c.idsupitem), |
vigiboard/lib/base.py | ||
---|---|---|
7 | 7 |
from tg import request |
8 | 8 |
from pylons.i18n import _, ungettext, N_ |
9 | 9 |
from tw.api import WidgetBunch |
10 |
import vigiboard.model as model |
|
11 | 10 |
|
12 | 11 |
__all__ = ['Controller', 'BaseController'] |
13 | 12 |
|
vigiboard/model/__init__.py | ||
---|---|---|
1 |
# -*- coding: utf-8 -*- |
|
2 |
"""The application's model objects""" |
|
3 |
|
|
4 |
from vigilo.models.session import DBSession |
|
5 |
from vigilo.models.vigilo_bdd_config import metadata |
|
6 |
|
|
7 |
metadata.bind = DBSession.bind |
|
8 |
|
|
9 |
|
|
10 |
from vigilo.models import User, UserGroup, Permission |
|
11 |
from vigilo.models import Event, EventHistory, CorrEvent |
|
12 |
from vigilo.models import Version, StateName, ApplicationLog |
|
13 |
from vigilo.models import Host, HostGroup |
|
14 |
from vigilo.models import LowLevelService, HighLevelService, ServiceGroup |
|
15 |
from vigilo.models import ImpactedHLS, ImpactedPath |
|
16 |
|
vigiboard/model/model.template | ||
---|---|---|
1 |
# -*- coding: utf-8 -*- |
|
2 |
"""Sample model module.""" |
|
3 |
|
|
4 |
from sqlalchemy import * |
|
5 |
from sqlalchemy.orm import mapper, relation |
|
6 |
from sqlalchemy import Table, ForeignKey, Column |
|
7 |
from sqlalchemy.types import Integer, Unicode |
|
8 |
#from sqlalchemy.orm import relation, backref |
|
9 |
|
|
10 |
from vigiboard.model import DeclarativeBase, metadata, DBSession |
|
11 |
|
|
12 |
|
|
13 |
class SampleModel(DeclarativeBase): |
|
14 |
__tablename__ = 'sample_model' |
|
15 |
|
|
16 |
#{ Columns |
|
17 |
|
|
18 |
id = Column(Integer, primary_key=True) |
|
19 |
|
|
20 |
data = Column(Unicode(255), nullable=False) |
|
21 |
|
|
22 |
#} |
vigiboard/tests/__init__.py | ||
---|---|---|
13 | 13 |
from nose.tools import eq_, nottest |
14 | 14 |
|
15 | 15 |
from vigilo.common.conf import settings |
16 |
from vigiboard import model |
|
16 |
from vigilo.models.vigilo_bdd_config import metadata |
|
17 |
from vigilo.models.session import DBSession |
|
18 |
|
|
19 |
metadata.bind = DBSession.bind |
|
17 | 20 |
|
18 | 21 |
__all__ = ['setup_db', 'teardown_db', 'TestController', 'url_for'] |
19 | 22 |
|
20 | 23 |
def setup_db(): |
21 | 24 |
"""Method used to build a database""" |
22 |
model.metadata.create_all()
|
|
25 |
metadata.create_all() |
|
23 | 26 |
|
24 | 27 |
def teardown_db(): |
25 | 28 |
"""Method used to destroy a database""" |
26 |
model.metadata.drop_all()
|
|
29 |
metadata.drop_all() |
|
27 | 30 |
|
28 | 31 |
|
29 | 32 |
class TestController(object): |
vigiboard/tests/functional/test_event_table.py | ||
---|---|---|
9 | 9 |
import tg |
10 | 10 |
import transaction |
11 | 11 |
|
12 |
from vigiboard.model import DBSession, \
|
|
13 |
Event, EventHistory, CorrEvent, \
|
|
14 |
Permission, User, StateName, \ |
|
15 |
Host, HostGroup, LowLevelService, ServiceGroup |
|
12 |
from vigilo.models.session import DBSession
|
|
13 |
from vigilo.models import Event, EventHistory, CorrEvent, \
|
|
14 |
Permission, User, StateName, \
|
|
15 |
Host, HostGroup, LowLevelService, ServiceGroup
|
|
16 | 16 |
from vigiboard.tests import TestController |
17 | 17 |
from vigiboard.controllers.vigiboardrequest import VigiboardRequest |
18 | 18 |
from vigiboard.controllers.vigiboard_plugin.tests import MonPlugin |
19 | 19 |
|
20 |
|
|
21 |
class TestEventTable(TestController): |
|
22 |
""" |
|
23 |
Test du tableau d'événements de Vigiboard |
|
24 |
""" |
|
25 |
|
|
26 | 20 |
def populate_DB(): |
27 | 21 |
""" Peuple la base de données. """ |
28 | 22 |
|
... | ... | |
73 | 67 |
'weight': 42, |
74 | 68 |
} |
75 | 69 |
|
76 |
service1 = ServiceLowLevel(
|
|
70 |
service1 = LowLevelService(
|
|
77 | 71 |
host=managerhost, |
78 | 72 |
servicename=u'managerservice', |
79 | 73 |
**service_template |
80 | 74 |
) |
81 | 75 |
|
82 |
service2 = ServiceLowLevel(
|
|
76 |
service2 = LowLevelService(
|
|
83 | 77 |
host=editorhost, |
84 | 78 |
servicename=u'managerservice', |
85 | 79 |
**service_template |
86 | 80 |
) |
87 | 81 |
|
88 |
service3 = ServiceLowLevel(
|
|
82 |
service3 = LowLevelService(
|
|
89 | 83 |
host=managerhost, |
90 | 84 |
servicename=u'editorservice', |
91 | 85 |
**service_template |
92 | 86 |
) |
93 | 87 |
|
94 |
service4 = ServiceLowLevel(
|
|
88 |
service4 = LowLevelService(
|
|
95 | 89 |
host=editorhost, |
96 | 90 |
servicename=u'editorservice', |
97 | 91 |
**service_template |
... | ... | |
152 | 146 |
DBSession.flush() |
153 | 147 |
transaction.commit() |
154 | 148 |
|
149 |
class TestEventTable(TestController): |
|
150 |
""" |
|
151 |
Test du tableau d'événements de Vigiboard |
|
152 |
""" |
|
153 |
|
|
155 | 154 |
def test_event_table(self): |
156 | 155 |
""" |
157 | 156 |
Test du tableau d'évènements de la page d'accueil de Vigiboard. |
... | ... | |
189 | 188 |
print "There are %d columns in the result set" % len(cols) |
190 | 189 |
assert_true(len(cols) > 1) |
191 | 190 |
|
192 |
|
|
193 |
|
vigiboard/tests/functional/test_history_form.py | ||
---|---|---|
8 | 8 |
import transaction |
9 | 9 |
|
10 | 10 |
from vigiboard.tests import TestController |
11 |
from vigiboard.model import DBSession, ServiceGroup, HostGroup, \ |
|
11 |
from vigilo.models.session import DBSession |
|
12 |
from vigilo.models import ServiceGroup, HostGroup, \ |
|
12 | 13 |
Host, Permission, StateName, \ |
13 | 14 |
LowLevelService, Event, CorrEvent |
14 | 15 |
|
vigiboard/tests/functional/test_history_tables.py | ||
---|---|---|
9 | 9 |
import tg |
10 | 10 |
import transaction |
11 | 11 |
|
12 |
from vigiboard.model import DBSession, \
|
|
13 |
Event, EventHistory, CorrEvent, \
|
|
14 |
Permission, User, StateName, \ |
|
15 |
Host, HostGroup, LowLevelService, ServiceGroup |
|
12 |
from vigilo.models.session import DBSession
|
|
13 |
from vigilo.models import Event, EventHistory, CorrEvent, \
|
|
14 |
Permission, User, StateName, \
|
|
15 |
Host, HostGroup, LowLevelService, ServiceGroup
|
|
16 | 16 |
from vigiboard.tests import TestController |
17 | 17 |
from vigiboard.controllers.vigiboardrequest import VigiboardRequest |
18 | 18 |
from vigiboard.controllers.vigiboard_plugin.tests import MonPlugin |
vigiboard/tests/functional/test_host_vigiboardrequest.py | ||
---|---|---|
9 | 9 |
import tg |
10 | 10 |
import transaction |
11 | 11 |
|
12 |
from vigiboard.model import DBSession, \
|
|
13 |
Event, EventHistory, CorrEvent, \
|
|
14 |
Permission, User, StateName, \ |
|
15 |
Host, HostGroup, LowLevelService, ServiceGroup |
|
12 |
from vigilo.models.session import DBSession
|
|
13 |
from vigilo.models import Event, EventHistory, CorrEvent, \
|
|
14 |
Permission, User, StateName, \
|
|
15 |
Host, HostGroup, LowLevelService, ServiceGroup
|
|
16 | 16 |
from vigiboard.tests import TestController |
17 | 17 |
from vigiboard.controllers.vigiboardrequest import VigiboardRequest |
18 | 18 |
from vigiboard.controllers.vigiboard_plugin.tests import MonPlugin |
vigiboard/tests/functional/test_search_form_host.py | ||
---|---|---|
8 | 8 |
import transaction |
9 | 9 |
|
10 | 10 |
from vigiboard.tests import TestController |
11 |
from vigiboard.model import DBSession, HostGroup, \
|
|
12 |
Host, Permission, \
|
|
13 |
Event, CorrEvent, StateName
|
|
11 |
from vigilo.models.session import DBSession
|
|
12 |
from vigilo.models 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_hostgroup.py | ||
---|---|---|
7 | 7 |
import transaction |
8 | 8 |
|
9 | 9 |
from vigiboard.tests import TestController |
10 |
from vigiboard.model import DBSession, HostGroup, Host, Permission, \ |
|
11 |
LowLevelService, Event, CorrEvent, StateName |
|
10 |
from vigilo.models.session import DBSession |
|
11 |
from vigilo.models import HostGroup, Host, Permission, \ |
|
12 |
LowLevelService, Event, CorrEvent, StateName |
|
12 | 13 |
|
13 | 14 |
def insert_deps(): |
14 | 15 |
"""Insère les dépendances nécessaires aux tests.""" |
vigiboard/tests/functional/test_search_form_misc.py | ||
---|---|---|
7 | 7 |
import transaction |
8 | 8 |
|
9 | 9 |
from vigiboard.tests import TestController |
10 |
from vigiboard.model import DBSession, HostGroup, \
|
|
11 |
Host, Permission, \
|
|
10 |
from vigilo.models.session import DBSession
|
|
11 |
from vigilo.models import HostGroup, Host, Permission, \
|
|
12 | 12 |
Event, CorrEvent, StateName |
13 | 13 |
|
14 | 14 |
def insert_deps(): |
vigiboard/tests/functional/test_search_form_service.py | ||
---|---|---|
7 | 7 |
import transaction |
8 | 8 |
|
9 | 9 |
from vigiboard.tests import TestController |
10 |
from vigiboard.model import DBSession, ServiceGroup, HostGroup, \ |
|
10 |
from vigilo.models.session import DBSession |
|
11 |
from vigilo.models import ServiceGroup, HostGroup, \ |
|
11 | 12 |
Host, Permission, StateName, \ |
12 | 13 |
LowLevelService, Event, CorrEvent |
13 | 14 |
|
vigiboard/tests/functional/test_search_form_servicegroup.py | ||
---|---|---|
7 | 7 |
import transaction |
8 | 8 |
|
9 | 9 |
from vigiboard.tests import TestController |
10 |
from vigiboard.model import DBSession, ServiceGroup, Host, Permission, \ |
|
11 |
LowLevelService, Event, CorrEvent, StateName |
|
10 |
from vigilo.models.session import DBSession |
|
11 |
from vigilo.models import ServiceGroup, Host, Permission, Event, \ |
|
12 |
LowLevelService, CorrEvent, StateName |
|
12 | 13 |
|
13 | 14 |
def insert_deps(): |
14 | 15 |
"""Insère les dépendances nécessaires aux tests.""" |
vigiboard/tests/functional/test_userutils.py | ||
---|---|---|
7 | 7 |
import transaction |
8 | 8 |
from nose.tools import assert_true |
9 | 9 |
|
10 |
from vigiboard.model import DBSession, HostGroup, Permission, User |
|
10 |
from vigilo.models.session import DBSession |
|
11 |
from vigilo.models import HostGroup, Permission, User |
|
11 | 12 |
from vigiboard.tests import TestController |
12 | 13 |
|
13 | 14 |
class TestGroupPermissionsInheritance(TestController): |
vigiboard/tests/functional/test_vigiboardrequest.py | ||
---|---|---|
9 | 9 |
import tg |
10 | 10 |
import transaction |
11 | 11 |
|
12 |
from vigiboard.model import DBSession, \
|
|
13 |
Event, EventHistory, CorrEvent, \
|
|
14 |
Permission, User, StateName, \ |
|
15 |
Host, HostGroup, LowLevelService, ServiceGroup |
|
12 |
from vigilo.models.session import DBSession
|
|
13 |
from vigilo.models import Event, EventHistory, CorrEvent, \
|
|
14 |
Permission, User, StateName, \
|
|
15 |
Host, HostGroup, LowLevelService, ServiceGroup
|
|
16 | 16 |
from vigiboard.tests import TestController |
17 | 17 |
from vigiboard.controllers.vigiboardrequest import VigiboardRequest |
18 | 18 |
from vigiboard.controllers.vigiboard_plugin.tests import MonPlugin |
Also available in: Unified diff