Download as
Browse Code »

Commit 82f75dde7ee16d3184b6e9c9f7b531b47872ac17

Authored by Macieski
2 parents 7517f392 b32bab32
Exists in master

Merge branch 'master' of https://github.com/lightbase/WSCacicNeo

Showing 4 changed files with 55 additions and 26 deletions   Show diff stats
wscacicneo/model/coleta_manual.py
  Diff comments   View file @82f75dd
... ... @@ -20,11 +20,14 @@ class ColetaManualBase():
20 20 """
21 21 Classe para a base de usuários
22 22 """
23   - def __init__(self):
  23 + def __init__(self, rest_url=None):
24 24 """
25 25 Método construtor
26 26 """
27   - self.rest_url = config.REST_URL
  27 + if rest_url is None:
  28 + self.rest_url = config.REST_URL
  29 + else:
  30 + self.rest_url = rest_url
28 31 self.baserest = BaseREST(rest_url=self.rest_url, response_object=True)
29 32 self.documentrest = DocumentREST(rest_url=self.rest_url,
30 33 base=self.lbbase, response_object=False)
... ... @@ -126,9 +129,9 @@ class ColetaManualBase():
126 129 required=True
127 130 ))
128 131 idade_memoria = Field(**dict(
129   - name='idade_memória',
  132 + name='idade_memoria',
130 133 description='Idade do Memória',
131   - alias='idade_memória',
  134 + alias='idade_memoria',
132 135 datatype='Text',
133 136 indices=['Textual'],
134 137 multivalued=False,
... ... @@ -198,6 +201,9 @@ class ColetaManualBase():
198 201  
199 202 sistemaoperacional_metadata = GroupMetadata(
200 203 name='sistemaoperacional',
  204 + alias='sistemaoperacional',
  205 + description='Sistema Operacional',
  206 + multivalued = False
201 207 )
202 208  
203 209 sistemaoperacional = Group(
... ... @@ -214,6 +220,9 @@ class ColetaManualBase():
214 220  
215 221 bios_metadata = GroupMetadata(
216 222 name='bios',
  223 + alias='bios',
  224 + description='Bios',
  225 + multivalued = False
217 226 )
218 227  
219 228 bios = Group(
... ... @@ -231,6 +240,9 @@ class ColetaManualBase():
231 240  
232 241 memoria_metadata = GroupMetadata(
233 242 name='memoria',
  243 + alias='memoria',
  244 + description='Memória',
  245 + multivalued = False
234 246 )
235 247  
236 248 memoria = Group(
... ... @@ -249,6 +261,9 @@ class ColetaManualBase():
249 261  
250 262 hd_metadata = GroupMetadata(
251 263 name='hd',
  264 + alias='hd',
  265 + description='HD',
  266 + multivalued = False
252 267 )
253 268  
254 269 hd = Group(
... ... @@ -266,6 +281,9 @@ class ColetaManualBase():
266 281  
267 282 processador_metadata = GroupMetadata(
268 283 name='processador',
  284 + alias='processador',
  285 + description='Processador',
  286 + multivalued = False
269 287 )
270 288  
271 289 processador = Group(
... ... @@ -273,6 +291,21 @@ class ColetaManualBase():
273 291 content = processador_content
274 292 )
275 293  
  294 + base_metadata = BaseMetadata(
  295 + name='coleta_manual',
  296 + )
  297 +
  298 + content_list = Content()
  299 + content_list.append(processador)
  300 + content_list.append(hd)
  301 + content_list.append(bios)
  302 + content_list.append(memoria)
  303 + content_list.append(sistemaoperacional)
  304 +
  305 + lbbase = Base(
  306 + metadata=base_metadata,
  307 + content=content_list
  308 + )
276 309  
277 310 return lbbase
278 311  
... ...
wscacicneo/model/user.py
  Diff comments   View file @82f75dd
... ... @@ -20,11 +20,14 @@ class UserBase():
20 20 """
21 21 Classe para a base de usuários
22 22 """
23   - def __init__(self):
  23 + def __init__(self, rest_url=None):
24 24 """
25 25 Método construtor
26 26 """
27   - self.rest_url = config.REST_URL
  27 + if rest_url is None:
  28 + self.rest_url = config.REST_URL
  29 + else:
  30 + self.rest_url = rest_url
28 31 self.baserest = BaseREST(rest_url=self.rest_url, response_object=True)
29 32 self.documentrest = DocumentREST(rest_url=self.rest_url,
30 33 base=self.lbbase, response_object=False)
... ...
wscacicneo/test/test_coleta_manual_base.py
  Diff comments   View file @82f75dd
... ... @@ -3,36 +3,29 @@
3 3 __author__ = 'adley'
4 4  
5 5 import unittest
6   -from wscacicneo.model import user
  6 +import configparser
  7 +import os
  8 +from wscacicneo.model import coleta_manual
7 9 from liblightbase.lbbase.struct import Base
8 10 from liblightbase.lbutils import conv
  11 +from pyramid import testing
9 12  
10 13 class TestColetaManualBase(unittest.TestCase):
11   - """
12   - Testa base do órgão no LB
13   - """
  14 +
  15 +
14 16 def setUp(self):
15   - """
16   - Carregando atributos genéricos do teste
17   - """
18   - pass
  17 + self.rest_url = 'http://api.brlight.net/api'
19 18  
20 19 def test_create_base(self):
21 20 """
22 21 Testa criação da base no LB
23 22 """
24   - user_base = user.UserBase()
25   - lbbase = user_base.lbbase
  23 + coletaManualBase = coleta_manual.ColetaManualBase(self.rest_url)
  24 + lbbase = coletaManualBase.lbbase
26 25 self.assertIsInstance(lbbase, Base)
27 26  
28   - retorno = user_base.create_base()
  27 + retorno = coletaManualBase.create_base()
29 28 self.assertIsInstance(retorno, Base)
30 29  
31   - #retorno = user_base.remove_base()
32   - #self.assertTrue(retorno)
33   -
34 30 def tearDown(self):
35   - """
36   - Apaga dados do teste
37   - """
38   - pass
  31 + pass
39 32 \ No newline at end of file
... ...
wscacicneo/test/test_orgao_base.py
  Diff comments   View file @82f75dd
... ... @@ -15,13 +15,13 @@ class TestOrgaoBase(unittest.TestCase):
15 15 """
16 16 Carregando atributos genéricos do teste
17 17 """
18   - pass
  18 + self.rest_url = 'http://api.brlight.net/api'
19 19  
20 20 def test_base(self):
21 21 """
22 22 Testa criação do objeto base no LB
23 23 """
24   - orgao_base = orgao.OrgaoBase()
  24 + orgao_base = orgao.OrgaoBase(self.rest_url)
25 25 lbbase = orgao_base.lbbase
26 26 self.assertIsInstance(lbbase, Base)
27 27  
... ...