Revision 9cc80ca6
Mise à jour de VigiGraph suite aux changements dans le modèle (r2550).
git-svn-id: https://vigilo-dev.si.c-s.fr/svn@2555 b22e2e97-25c9-44ff-b637-2e5ceca36478
vigigraph/controllers/rpc.py | ||
---|---|---|
6 | 6 |
|
7 | 7 |
from vigigraph.lib.base import BaseController |
8 | 8 |
|
9 |
from vigilo.models.configure import DBSession
|
|
10 |
from vigilo.models import Host, HostGroup |
|
11 |
from vigilo.models import Service, ServiceGroup, LowLevelService |
|
12 |
from vigilo.models import PerfDataSource |
|
13 |
from vigilo.models import Graph |
|
14 |
from vigilo.models import Ventilation, VigiloServer, Application |
|
15 |
|
|
16 |
from vigilo.models.secondary_tables import SERVICE_GROUP_TABLE |
|
17 |
from vigilo.models.secondary_tables import HOST_GROUP_TABLE |
|
18 |
from vigilo.models.secondary_tables import GRAPH_PERFDATASOURCE_TABLE |
|
9 |
from vigilo.models.session import DBSession
|
|
10 |
from vigilo.models.tables import Host, HostGroup
|
|
11 |
from vigilo.models.tables import Service, ServiceGroup, LowLevelService
|
|
12 |
from vigilo.models.tables import PerfDataSource
|
|
13 |
from vigilo.models.tables import Graph
|
|
14 |
from vigilo.models.tables import Ventilation, VigiloServer, Application
|
|
15 |
|
|
16 |
from vigilo.models.tables.secondary_tables import SERVICE_GROUP_TABLE
|
|
17 |
from vigilo.models.tables.secondary_tables import HOST_GROUP_TABLE
|
|
18 |
from vigilo.models.tables.secondary_tables import GRAPH_PERFDATASOURCE_TABLE
|
|
19 | 19 |
|
20 | 20 |
from sqlalchemy.orm import aliased |
21 | 21 |
|
vigigraph/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 |
import nose |
|
13 | 12 |
from nose.tools import eq_ |
14 | 13 |
|
15 |
from vigilo.models.configure import metadata, DBSession
|
|
14 |
from vigilo.models.session import metadata, DBSession
|
|
16 | 15 |
|
17 | 16 |
__all__ = ['setup_db', 'teardown_db', 'TestController', 'url_for'] |
18 | 17 |
|
... | ... | |
28 | 27 |
engine = config['pylons.app_globals'].sa_engine |
29 | 28 |
metadata.drop_all(engine) |
30 | 29 |
|
31 |
|
|
32 | 30 |
class TestController(object): |
33 | 31 |
""" |
34 | 32 |
Base functional test case for the controllers. |
... | ... | |
54 | 52 |
def setUp(self): |
55 | 53 |
"""Method called by nose before running each test""" |
56 | 54 |
# Loading the application: |
55 |
setup_db() |
|
57 | 56 |
conf_dir = config.here |
58 | 57 |
wsgiapp = loadapp('config:test.ini#%s' % self.application_under_test, |
59 | 58 |
relative_to=conf_dir) |
vigigraph/tests/functional/test_nagiosproxy.py | ||
---|---|---|
6 | 6 |
Tests Nagios Proxy |
7 | 7 |
''' |
8 | 8 |
|
9 |
import transaction |
|
9 | 10 |
import unittest |
10 | 11 |
|
11 | 12 |
import urllib |
... | ... | |
15 | 16 |
|
16 | 17 |
from vigigraph.controllers.nagiosproxy import NagiosProxy |
17 | 18 |
|
18 |
from vigilo.models.configure import DBSession
|
|
19 |
from vigilo.models import Host, Ventilation, VigiloServer, Application |
|
19 |
from vigilo.models.session import DBSession
|
|
20 |
from vigilo.models.tables import Host, Ventilation, VigiloServer, Application
|
|
20 | 21 |
|
21 | 22 |
from vigigraph.tests import TestController |
22 | 23 |
|
... | ... | |
70 | 71 |
|
71 | 72 |
server = None |
72 | 73 |
|
73 |
result = DBSession.query \ |
|
74 |
(VigiloServer.name) \ |
|
74 |
result = DBSession.query(VigiloServer.name) \ |
|
75 | 75 |
.filter(VigiloServer.idvigiloserver == Ventilation.idvigiloserver) \ |
76 | 76 |
.filter(Ventilation.idhost == Host.idhost) \ |
77 | 77 |
.filter(Ventilation.idapp == Application.idapp) \ |
... | ... | |
168 | 168 |
if sv1 is not None and ap2 is not None: |
169 | 169 |
create_Ventilation(host, sv1.name, ap2.name) |
170 | 170 |
|
171 |
DBSession.flush() |
|
172 |
transaction.commit() |
|
173 |
|
|
171 | 174 |
def test_acces_url(self): |
172 | 175 |
'''fonction vérification acces url via proxy''' |
173 | 176 |
|
... | ... | |
182 | 185 |
#url = 'http://localhost/nagios/cgi-bin' |
183 | 186 |
server = getServer(host) |
184 | 187 |
url_web_path = config.get('nagios_web_path') |
185 |
url = '%s%s' % (server, url_web_path) |
|
186 |
url = os.path.join(url, 'status.cgi') |
|
188 |
url = '%s%s/%s' % (server, url_web_path, 'status.cgi') |
|
187 | 189 |
|
188 | 190 |
if url is not None and values is not None: |
189 | 191 |
data = urllib.urlencode(values) |
190 | 192 |
|
193 |
print url, data |
|
194 |
|
|
195 |
# Permet de contourner le proxy |
|
196 |
# éventuellement en place. |
|
197 |
del os.environ['http_proxy'] |
|
198 |
|
|
191 | 199 |
handle = urllib2.urlopen(url, data) |
192 | 200 |
bresult = (handle != None) |
193 | 201 |
|
194 | 202 |
if handle: |
195 | 203 |
handle.close() |
196 | 204 |
|
197 |
assert(bresult) |
|
198 |
|
|
199 |
|
|
200 |
if __name__ == "__main__": |
|
205 |
self.assertTrue(bresult) |
|
201 | 206 |
|
207 |
if __name__ == "__main__": |
|
202 | 208 |
unittest.main() |
209 |
|
Also available in: Unified diff