diff --git a/wscacicneo/model/coleta_manual.py b/wscacicneo/model/coleta_manual.py index bf971c4..2aa13cb 100644 --- a/wscacicneo/model/coleta_manual.py +++ b/wscacicneo/model/coleta_manual.py @@ -20,11 +20,14 @@ class ColetaManualBase(): """ Classe para a base de usuários """ - def __init__(self): + def __init__(self, rest_url=None): """ Método construtor """ - self.rest_url = config.REST_URL + if rest_url is None: + self.rest_url = config.REST_URL + else: + self.rest_url = rest_url self.baserest = BaseREST(rest_url=self.rest_url, response_object=True) self.documentrest = DocumentREST(rest_url=self.rest_url, base=self.lbbase, response_object=False) @@ -126,9 +129,9 @@ class ColetaManualBase(): required=True )) idade_memoria = Field(**dict( - name='idade_memória', + name='idade_memoria', description='Idade do Memória', - alias='idade_memória', + alias='idade_memoria', datatype='Text', indices=['Textual'], multivalued=False, @@ -198,6 +201,9 @@ class ColetaManualBase(): sistemaoperacional_metadata = GroupMetadata( name='sistemaoperacional', + alias='sistemaoperacional', + description='Sistema Operacional', + multivalued = False ) sistemaoperacional = Group( @@ -214,6 +220,9 @@ class ColetaManualBase(): bios_metadata = GroupMetadata( name='bios', + alias='bios', + description='Bios', + multivalued = False ) bios = Group( @@ -231,6 +240,9 @@ class ColetaManualBase(): memoria_metadata = GroupMetadata( name='memoria', + alias='memoria', + description='Memória', + multivalued = False ) memoria = Group( @@ -249,6 +261,9 @@ class ColetaManualBase(): hd_metadata = GroupMetadata( name='hd', + alias='hd', + description='HD', + multivalued = False ) hd = Group( @@ -266,6 +281,9 @@ class ColetaManualBase(): processador_metadata = GroupMetadata( name='processador', + alias='processador', + description='Processador', + multivalued = False ) processador = Group( @@ -273,6 +291,21 @@ class ColetaManualBase(): content = processador_content ) + base_metadata = BaseMetadata( + name='coleta_manual', + ) + + content_list = Content() + content_list.append(processador) + content_list.append(hd) + content_list.append(bios) + content_list.append(memoria) + content_list.append(sistemaoperacional) + + lbbase = Base( + metadata=base_metadata, + content=content_list + ) return lbbase diff --git a/wscacicneo/model/user.py b/wscacicneo/model/user.py index 129a49c..5f56937 100755 --- a/wscacicneo/model/user.py +++ b/wscacicneo/model/user.py @@ -20,11 +20,14 @@ class UserBase(): """ Classe para a base de usuários """ - def __init__(self): + def __init__(self, rest_url=None): """ Método construtor """ - self.rest_url = config.REST_URL + if rest_url is None: + self.rest_url = config.REST_URL + else: + self.rest_url = rest_url self.baserest = BaseREST(rest_url=self.rest_url, response_object=True) self.documentrest = DocumentREST(rest_url=self.rest_url, base=self.lbbase, response_object=False) diff --git a/wscacicneo/test/test_coleta_manual_base.py b/wscacicneo/test/test_coleta_manual_base.py index cab08f1..529d5d1 100644 --- a/wscacicneo/test/test_coleta_manual_base.py +++ b/wscacicneo/test/test_coleta_manual_base.py @@ -3,36 +3,29 @@ __author__ = 'adley' import unittest -from wscacicneo.model import user +import configparser +import os +from wscacicneo.model import coleta_manual from liblightbase.lbbase.struct import Base from liblightbase.lbutils import conv +from pyramid import testing class TestColetaManualBase(unittest.TestCase): - """ - Testa base do órgão no LB - """ + + def setUp(self): - """ - Carregando atributos genéricos do teste - """ - pass + self.rest_url = 'http://api.brlight.net/api' def test_create_base(self): """ Testa criação da base no LB """ - user_base = user.UserBase() - lbbase = user_base.lbbase + coletaManualBase = coleta_manual.ColetaManualBase(self.rest_url) + lbbase = coletaManualBase.lbbase self.assertIsInstance(lbbase, Base) - retorno = user_base.create_base() + retorno = coletaManualBase.create_base() self.assertIsInstance(retorno, Base) - #retorno = user_base.remove_base() - #self.assertTrue(retorno) - def tearDown(self): - """ - Apaga dados do teste - """ - pass + pass \ No newline at end of file diff --git a/wscacicneo/test/test_orgao_base.py b/wscacicneo/test/test_orgao_base.py index fe3b366..6e8ef6f 100755 --- a/wscacicneo/test/test_orgao_base.py +++ b/wscacicneo/test/test_orgao_base.py @@ -15,13 +15,13 @@ class TestOrgaoBase(unittest.TestCase): """ Carregando atributos genéricos do teste """ - pass + self.rest_url = 'http://api.brlight.net/api' def test_base(self): """ Testa criação do objeto base no LB """ - orgao_base = orgao.OrgaoBase() + orgao_base = orgao.OrgaoBase(self.rest_url) lbbase = orgao_base.lbbase self.assertIsInstance(lbbase, Base) -- libgit2 0.21.2