diff --git a/src/Cacic/CommonBundle/Controller/AgenteController.php b/src/Cacic/CommonBundle/Controller/AgenteController.php
index efb7865..fa843d6 100644
--- a/src/Cacic/CommonBundle/Controller/AgenteController.php
+++ b/src/Cacic/CommonBundle/Controller/AgenteController.php
@@ -115,7 +115,7 @@ class AgenteController extends Controller {
         $current = @basename(@readlink($windowsDir."current"));
         $saida['windows']['live_version'] = $current;
 
-        $logger->debug("4444444444444444444444444444444444 ".print_r($saida, true));
+        //$logger->debug("4444444444444444444444444444444444 ".print_r($saida, true));
 
         if ( $request->isMethod('POST') )
         {
diff --git a/src/Cacic/CommonBundle/Controller/TipoSoController.php b/src/Cacic/CommonBundle/Controller/TipoSoController.php
new file mode 100644
index 0000000..cbd0262
--- /dev/null
+++ b/src/Cacic/CommonBundle/Controller/TipoSoController.php
@@ -0,0 +1,95 @@
+<?php
+
+namespace Cacic\CommonBundle\Controller;
+
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+use Cacic\CommonBundle\Entity\TipoSo;
+use Cacic\CommonBundle\Form\Type\TipoSoType;
+
+
+class TipoSoController extends Controller
+{
+    public function indexAction( $page )
+    {
+        $arrso = $this->getDoctrine()->getRepository( 'CacicCommonBundle:TipoSo' )->paginar( $this->get( 'knp_paginator' ), $page );
+        return $this->render( 'CacicCommonBundle:TipoSo:index.html.twig', array( 'So' => $arrso ) );
+
+    }
+    public function cadastrarAction(Request $request)
+    {
+        $so = new TipoSo();
+        $form = $this->createForm(new TipoSoType(), $so);
+
+        if ( $request->isMethod('POST') )
+        {
+            $form->bind( $request );
+            if ( $form->isValid() )
+            {
+                $this->getDoctrine()->getManager()->persist( $so );
+                $this->getDoctrine()->getManager()->flush(); //Persiste os dados do sistema operacional
+
+                $this->get('session')->getFlashBag()->add('success', 'Dados salvos com sucesso!');
+
+                return $this->redirect( $this->generateUrl( 'cacic_sistemaoperacional_index') );
+            }
+        }
+
+        return $this->render( 'CacicCommonBundle:So:cadastrar.html.twig', array( 'form' => $form->createView() ) );
+    }
+    /**
+     *  Página de editar dados do sistema operacional
+     *  @param int $idSo
+     */
+    public function editarAction( $idTipoSo, Request $request )
+    {
+        $so = $this->getDoctrine()->getRepository('CacicCommonBundle:TipoSo')->find( $idTipoSo );
+        if ( ! $so )
+            throw $this->createNotFoundException( 'Tipo de sistema operacional não encontrado' );
+        $form = $this->createForm( new TipoSoType(), $so);
+
+        if ( $request->isMethod('POST') )
+        {
+            $form->bind( $request );
+
+            if ( $form->isValid() )
+            {
+                $this->getDoctrine()->getManager()->persist( $so );
+                $this->getDoctrine()->getManager()->flush();// Efetuar a edição do sistema operacional
+
+
+                $this->get('session')->getFlashBag()->add('success', 'Dados salvos com sucesso!');
+
+                return $this->redirect($this->generateUrl('cacic_tiposo_editar', array( 'idTipoSo' => $so->getIdTipoSo() ) ) );
+            }
+        }
+
+        return $this->render( 'CacicCommonBundle:TipoSo:cadastrar.html.twig', array( 'form' => $form->createView() ) );
+    }
+
+    /**
+     *
+     * [AJAX] Exclusão de tipo de sistema operacional já cadastrado
+     * @param integer $idTipoSo
+     */
+    public function excluirAction( Request $request )
+    {
+        if ( ! $request->isXmlHttpRequest() ) // Verifica se se trata de uma requisição AJAX
+            throw $this->createNotFoundException( 'Página não encontrada' );
+
+        $So = $this->getDoctrine()->getRepository('CacicCommonBundle:TipoSo')->find( $request->get('id') );
+        if ( ! $So )
+            throw $this->createNotFoundException( 'Tipo de sistema operacional não encontrado' );
+
+        $em = $this->getDoctrine()->getManager();
+        $em->remove( $So );
+        $em->flush();
+
+        $response = new Response( json_encode( array('status' => 'ok') ) );
+        $response->headers->set('Content-Type', 'application/json');
+
+        return $response;
+    }
+
+}
\ No newline at end of file
diff --git a/src/Cacic/CommonBundle/Entity/RedeRepository.php b/src/Cacic/CommonBundle/Entity/RedeRepository.php
index eafc107..da7222a 100644
--- a/src/Cacic/CommonBundle/Entity/RedeRepository.php
+++ b/src/Cacic/CommonBundle/Entity/RedeRepository.php
@@ -224,6 +224,12 @@ class RedeRepository extends EntityRepository
         return $qb->getQuery()->execute();
     }
 
+    /**
+     * Computadores por subredes
+     *
+     * @return mixed
+     */
+
     public function computadoresSubredes(){
         $rsm = new ResultSetMapping();
 
@@ -256,4 +262,18 @@ class RedeRepository extends EntityRepository
 
         return $query->execute();
     }
+
+    /**
+     * Retorna lista de servidores de atualização
+     *
+     * @return \Doctrine\ORM\QueryBuilder
+     */
+
+    public function getServUpdateList() {
+
+        $qb = $this->createQueryBuilder('rede')
+            ->select('DISTINCT (rede.teServUpdates) as teServUpdates');
+
+        return $qb;
+    }
 }
\ No newline at end of file
diff --git a/src/Cacic/CommonBundle/Entity/So.php b/src/Cacic/CommonBundle/Entity/So.php
index 5cb1694..ffc98dd 100644
--- a/src/Cacic/CommonBundle/Entity/So.php
+++ b/src/Cacic/CommonBundle/Entity/So.php
@@ -158,4 +158,32 @@ class So
     {
     	return $this->teDescSo . ' ('. $this->sgSo .')';
     }
-}
\ No newline at end of file
+    /**
+     * @var \Cacic\CommonBundle\Entity\TipoSo
+     */
+    private $tipo;
+
+
+    /**
+     * Set tipo
+     *
+     * @param \Cacic\CommonBundle\Entity\TipoSo $tipo
+     * @return So
+     */
+    public function setTipo(\Cacic\CommonBundle\Entity\TipoSo $tipo = null)
+    {
+        $this->tipo = $tipo;
+
+        return $this;
+    }
+
+    /**
+     * Get tipo
+     *
+     * @return \Cacic\CommonBundle\Entity\TipoSo 
+     */
+    public function getTipo()
+    {
+        return $this->tipo;
+    }
+}
diff --git a/src/Cacic/CommonBundle/Entity/TipoSo.php b/src/Cacic/CommonBundle/Entity/TipoSo.php
new file mode 100644
index 0000000..ebf1e7e
--- /dev/null
+++ b/src/Cacic/CommonBundle/Entity/TipoSo.php
@@ -0,0 +1,100 @@
+<?php
+
+namespace Cacic\CommonBundle\Entity;
+
+use Doctrine\ORM\Mapping as ORM;
+
+/**
+ * TipoSo
+ */
+class TipoSo
+{
+    /**
+     * @var integer
+     */
+    private $idTipoSo;
+
+    /**
+     * @var string
+     */
+    private $tipo;
+
+
+    /**
+     * Get idTipoSo
+     *
+     * @return integer 
+     */
+    public function getIdTipoSo()
+    {
+        return $this->idTipoSo;
+    }
+
+    /**
+     * Set tipo
+     *
+     * @param string $tipo
+     * @return TipoSo
+     */
+    public function setTipo($tipo)
+    {
+        $this->tipo = $tipo;
+
+        return $this;
+    }
+
+    /**
+     * Get tipo
+     *
+     * @return string 
+     */
+    public function getTipo()
+    {
+        return $this->tipo;
+    }
+    /**
+     * @var \Doctrine\Common\Collections\Collection
+     */
+    private $so;
+
+    /**
+     * Constructor
+     */
+    public function __construct()
+    {
+        $this->so = new \Doctrine\Common\Collections\ArrayCollection();
+    }
+
+    /**
+     * Add so
+     *
+     * @param \Cacic\CommonBundle\Entity\So $so
+     * @return TipoSo
+     */
+    public function addSo(\Cacic\CommonBundle\Entity\So $so)
+    {
+        $this->so[] = $so;
+
+        return $this;
+    }
+
+    /**
+     * Remove so
+     *
+     * @param \Cacic\CommonBundle\Entity\So $so
+     */
+    public function removeSo(\Cacic\CommonBundle\Entity\So $so)
+    {
+        $this->so->removeElement($so);
+    }
+
+    /**
+     * Get so
+     *
+     * @return \Doctrine\Common\Collections\Collection 
+     */
+    public function getSo()
+    {
+        return $this->so;
+    }
+}
diff --git a/src/Cacic/CommonBundle/Entity/TipoSoRepository.php b/src/Cacic/CommonBundle/Entity/TipoSoRepository.php
new file mode 100644
index 0000000..05d896d
--- /dev/null
+++ b/src/Cacic/CommonBundle/Entity/TipoSoRepository.php
@@ -0,0 +1,75 @@
+<?php
+
+namespace Cacic\CommonBundle\Entity;
+
+use Doctrine\ORM\EntityRepository;
+
+use Cacic\CommonBundle\Entity\TipoSo;
+
+/**
+ * TipoSoRepository
+ *
+ * This class was generated by the Doctrine ORM. Add your own custom
+ * repository methods below.
+ */
+class TipoSoRepository extends EntityRepository
+{
+    /**
+     * Paginar
+     *
+     * @param \Knp\Component\Pager\Paginator $paginator
+     * @param int $page
+     * @return \Knp\Component\Pager\Pagination\PaginationInterface
+     */
+    public function paginar( \Knp\Component\Pager\Paginator $paginator, $page = 1 )
+    {
+        $_dql = "SELECT s
+				FROM CacicCommonBundle:TipoSo s
+				ORDER BY s.tipo";
+
+        return $paginator->paginate(
+            $this->getEntityManager()->createQuery( $_dql ),
+            $page,
+            10
+        );
+    }
+
+    /**
+     *
+     * Método de listagem dos Tipo de Software cadastrados e respectivas informações
+     */
+    public function listar()
+    {
+        $_dql = "SELECT s
+				FROM CacicCommonBundle:TipoSo s
+				ORDER BY s.tipo";
+
+        return $this->getEntityManager()->createQuery( $_dql )->getArrayResult();
+    }
+
+    /**
+     * Insere tipo de SO
+     *
+     * @param $te_so
+     * @return TipoSo|null|object
+     */
+
+    public function createIfNotExist( $te_so )
+    {
+        $so = $this->findOneBy( array ( 'tipo' => $te_so ) );
+
+        if( empty( $so ) )
+        {
+            $so = new TipoSo();
+
+            $so->setTipo($te_so);
+            $this->getEntityManager()->persist( $so );
+            $this->getEntityManager()->flush();
+
+        }
+
+        return $so;
+
+    }
+
+}
diff --git a/src/Cacic/CommonBundle/Entity/TipoSoftware.php b/src/Cacic/CommonBundle/Entity/TipoSoftware.php
index c449568..c05696c 100644
--- a/src/Cacic/CommonBundle/Entity/TipoSoftware.php
+++ b/src/Cacic/CommonBundle/Entity/TipoSoftware.php
@@ -62,4 +62,4 @@ class TipoSoftware
     {
     	return $this->getTeDescricaoTipoSoftware();
     }
-}
\ No newline at end of file
+}
diff --git a/src/Cacic/CommonBundle/Form/Type/SoType.php b/src/Cacic/CommonBundle/Form/Type/SoType.php
index 951d717..34c7b5e 100644
--- a/src/Cacic/CommonBundle/Form/Type/SoType.php
+++ b/src/Cacic/CommonBundle/Form/Type/SoType.php
@@ -48,6 +48,15 @@ class SoType extends AbstractType
                     'label'=>'Sistema Operacional MS-Windows'
                     )
         );
+        $builder->add(
+            'tipo',
+            'entity',
+            array(
+                'label' => 'Tipo de Sistema Operacional',
+                'class' => 'CacicCommonBundle:TipoSo',
+                'property' => 'tipo'
+            )
+        );
     }
 
     /**
diff --git a/src/Cacic/CommonBundle/Form/Type/TipoSoType.php b/src/Cacic/CommonBundle/Form/Type/TipoSoType.php
new file mode 100644
index 0000000..a0c1156
--- /dev/null
+++ b/src/Cacic/CommonBundle/Form/Type/TipoSoType.php
@@ -0,0 +1,41 @@
+<?php
+
+namespace Cacic\CommonBundle\Form\Type;
+
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\FormBuilderInterface;
+
+/**
+ *
+ *
+ * @author lightbase
+ *
+ */
+class TipoSoType extends AbstractType
+{
+
+    /**
+     * Adiciona So
+     *
+     * @param FormBuilderInterface $builder
+     * @param array $options
+     */
+    public function buildForm( FormBuilderInterface $builder, array $options )
+    {
+        $builder->add(
+            'tipo',
+            null,
+            array( 'label'=>'Tipo de SO' )
+        );
+    }
+
+    /**
+     * (non-PHPdoc)
+     * @see Symfony\Component\Form.FormTypeInterface::getName()
+     */
+    public function getName()
+    {
+        return 'TipoSo';
+    }
+
+}
\ No newline at end of file
diff --git a/src/Cacic/CommonBundle/Resources/config/doctrine/So.orm.yml b/src/Cacic/CommonBundle/Resources/config/doctrine/So.orm.yml
index 950e60d..0b075bd 100644
--- a/src/Cacic/CommonBundle/Resources/config/doctrine/So.orm.yml
+++ b/src/Cacic/CommonBundle/Resources/config/doctrine/So.orm.yml
@@ -31,4 +31,15 @@ Cacic\CommonBundle\Entity\So:
             fixed: true
             nullable: false
             column: in_mswindows
+    manyToOne:
+        tipo:
+            targetEntity: TipoSo
+            cascade: {  }
+            mappedBy: null
+            inversedBy: null
+            nullable: true
+            joinColumns:
+                id_tipo_so:
+                    referencedColumnName: id_tipo_so
+            orphanRemoval: false
     lifecycleCallbacks: {  }
diff --git a/src/Cacic/CommonBundle/Resources/config/doctrine/TipoSo.orm.yml b/src/Cacic/CommonBundle/Resources/config/doctrine/TipoSo.orm.yml
new file mode 100644
index 0000000..6b07905
--- /dev/null
+++ b/src/Cacic/CommonBundle/Resources/config/doctrine/TipoSo.orm.yml
@@ -0,0 +1,23 @@
+Cacic\CommonBundle\Entity\TipoSo:
+    type: entity
+    table: tipo_so
+    repositoryClass: Cacic\CommonBundle\Entity\TipoSoRepository
+    fields:
+        idTipoSo:
+            id: true
+            type: integer
+            unsigned: false
+            nullable: false
+            column: id_tipo_so
+            generator:
+                strategy: IDENTITY
+        tipo:
+            type: text
+            fixed: false
+            nullable: true
+            column: tipo
+    oneToMany:
+        so:
+            targetEntity: So
+            mappedBy: tipo
+    lifecycleCallbacks: {  }
diff --git a/src/Cacic/CommonBundle/Resources/config/routing.yml b/src/Cacic/CommonBundle/Resources/config/routing.yml
index 1cc4d2a..61867d1 100644
--- a/src/Cacic/CommonBundle/Resources/config/routing.yml
+++ b/src/Cacic/CommonBundle/Resources/config/routing.yml
@@ -300,10 +300,6 @@ cacic_grupo_usuario_excluir:
     pattern:  /admin/grupousuario/excluir
     defaults: { _controller: CacicCommonBundle:GrupoUsuario:excluir}
 
-cacic_ateste:
-    pattern:  /admin/ateste/
-    defaults: { _controller: CacicCommonBundle:Ateste:index }
-
 cacic_agente:
     pattern: /admin/agente/
     defaults: { _controller: CacicCommonBundle:Agente:index }
@@ -329,6 +325,10 @@ cacic_atualizacao_subredes:
 # INÍCIO: Usuário com perfil manutenção
 ############################################
 
+cacic_ateste:
+    pattern:  /manutencao/ateste/
+    defaults: { _controller: CacicCommonBundle:Ateste:index }
+
 cacic_aplicativo_index:
     pattern: /manutencao/aplicativo/{page}
     defaults: {_controller: CacicCommonBundle:Aplicativo:index, page: 1 }
@@ -370,6 +370,8 @@ cacic_tiposoftware_excluir:
     pattern:  /manutencao/tiposoftware/excluir
     defaults: { _controller: CacicCommonBundle:TipoSoftware:excluir}
 
+# Sistemas Operacionais
+
 cacic_sistemaoperacional_index:
     pattern: /manutencao/sistemaoperacional/{page}
     defaults: {_controller: CacicCommonBundle:So:index, page: 1 }
@@ -390,6 +392,28 @@ cacic_sistemaoperacional_excluir:
     pattern:  /manutencao/sistemaoperacional/excluir
     defaults: { _controller: CacicCommonBundle:So:excluir}
 
+
+cacic_tiposo_index:
+    pattern: /manutencao/tiposo/{page}
+    defaults: {_controller: CacicCommonBundle:TipoSo:index, page: 1 }
+    requirements:
+        page: \d+
+
+cacic_tiposo_cadastrar:
+    pattern: /manutencao/tiposo/cadastrar
+    defaults: { _controller: CacicCommonBundle:TipoSo:cadastrar}
+
+cacic_tiposo_editar:
+    pattern:  /manutencao/tiposo/editar/{idTipoSo}
+    defaults: { _controller: CacicCommonBundle:TipoSo:editar}
+    requirements:
+        idTipoSo: \d+
+
+cacic_tiposo_excluir:
+    pattern:  /manutencao/tiposo/excluir
+    defaults: { _controller: CacicCommonBundle:TipoSo:excluir}
+
+
 cacic_software_index:
     pattern: /manutencao/software/{page}
     defaults: {_controller: CacicCommonBundle:Software:index, page: 1 }
diff --git a/src/Cacic/CommonBundle/Resources/views/So/index.html.twig b/src/Cacic/CommonBundle/Resources/views/So/index.html.twig
index c152bad..9862b74 100644
--- a/src/Cacic/CommonBundle/Resources/views/So/index.html.twig
+++ b/src/Cacic/CommonBundle/Resources/views/So/index.html.twig
@@ -22,11 +22,12 @@
               <thead>
                 <tr>
                     <th width="15%">{{ "Descrição"|trans }}</th>
-                    <th width="15%" style="text-align: center" >MS-Windows?</th>
+                    <th width="10%" style="text-align: center" >MS-Windows?</th>
                     <th width="15%" style="text-align: center" >{{ "ID Interna"|trans }}</th>
-                    <th width="15%" style="text-align: center">{{ "ID Externa"|trans }}</th>
+                    <th width="10%" style="text-align: center">{{ "ID Externa"|trans }}</th>
                     <th width="15%">{{ "Sigla"|trans }}</th>
                     <th width="15%">{{ "Total de Máquinas"|trans }}</th>
+                    <th width="10%">{{ "Tipo de SO"|trans }}</th>
                     <th style="text-align: center">{{ "Ações"|trans }}</th>
                 </tr>
               </thead>
@@ -41,6 +42,11 @@
                         <td style="text-align: center">{{ so.idSo }}</td>
                         <td>{{ so.sgSo }}</td>
                         <td></td>
+                        {% if so.tipo is empty %}
+                            <td></td>
+                        {% else %}
+                            <td>{{ so.tipo.tipo }}</td>
+                        {% endif %}
                         <td style="text-align: center" class="td-actions">
                             <a href="{{ path('cacic_sistemaoperacional_editar', {'idSo': so.idSo }) }}" class="btn btn-small" title="{{ "Editar Item"|trans }}">
                                 <i class="btn-icon-only icon-edit icon-large"></i>
diff --git a/src/Cacic/CommonBundle/Resources/views/TipoSo/cadastrar.html.twig b/src/Cacic/CommonBundle/Resources/views/TipoSo/cadastrar.html.twig
new file mode 100644
index 0000000..f27ca0a
--- /dev/null
+++ b/src/Cacic/CommonBundle/Resources/views/TipoSo/cadastrar.html.twig
@@ -0,0 +1,67 @@
+{% extends 'CacicCommonBundle::base.html.twig' %}
+
+{% block breadcrumb %}
+    <li><a href="{{ path('cacic_tiposo_index') }}">{{ "Sistemas Operacionais"|trans }}</a></li> /
+    <li class="active">{{ "Cadastro"|trans }}</li>
+{% endblock %}
+
+{% block body %}
+
+<div class="row-fluid">
+
+  <div class="span8">
+
+     <div class="box grad_colour_black">
+
+        <h2 class="box_head round_top"><i class="icon-edit icon-large"></i> {{ "Dados do Sistema Operacional"|trans }}</h2>
+
+        <div class="block box_content round_bottom padding_10">
+
+          <form id={{ 'formTipoSo'|trans }} class="form-horizontal" action="{{ path(app.request.attributes.get('_route'), app.request.attributes.get('_route_params')) }}" method="post" {{ form_enctype(form) }}>
+              <div class="tabbable">
+                {{ form_widget(form, {'form_type': 'horizontal'} ) }}
+                {{ form_rest(form) }}
+              </div>
+                <br />
+              <div class="control-group">
+                 <div class="controls">
+                    <button type="reset" class="btn">
+                        <i class="icon-refresh"></i>
+                        {{ "Resetar Valores"|trans }}
+                    </button>
+                    <button type="submit" class="btn btn-primary">
+                        <i class="icon-ok-sign"></i>
+                        {{ "Salvar Dados"|trans }}
+                    </button>
+                </div>
+              </div>
+
+          </form>
+
+           <hr />
+           <div>
+                <a class="btn btn-danger"  href="{{ path('cacic_tiposo_index') }}">
+                    <i class="icon-remove-sign"></i>
+                    {{ "Cancelar"|trans }}
+                </a>
+           </div>
+
+        </div> <!-- /block -->
+     </div> <!-- /box -->
+  </div> <!-- /span8 -->
+  
+  <div class="span4">
+        <div class="box grad_colour_black">
+
+            <h2 class="box_head round_top"><i class="icon-info-sign"></i> {{ "Informações Adicionais"|trans }}</h2>
+                        
+            <div class="block box_content round_bottom padding_10">
+                <p>
+                    {{ "Os itens destacados em"|trans }} <b class="red">{{ "vermelho"|trans }}</b> {{ "são de preenchimento obrigatório"|trans }}.
+                </p>
+            </div> <!-- /block -->
+        </div> <!-- /box -->
+    </div> <!-- span4 -->
+    
+</div> <!-- /row -->
+{% endblock %}
\ No newline at end of file
diff --git a/src/Cacic/CommonBundle/Resources/views/TipoSo/index.html.twig b/src/Cacic/CommonBundle/Resources/views/TipoSo/index.html.twig
new file mode 100644
index 0000000..578e26d
--- /dev/null
+++ b/src/Cacic/CommonBundle/Resources/views/TipoSo/index.html.twig
@@ -0,0 +1,69 @@
+{% extends 'CacicCommonBundle::base.html.twig' %}
+
+{% block breadcrumb %}
+    <li class="active">{{ "Tipos de Sistema Operacional"|trans }}</li>
+{% endblock %}
+
+{% block body %}
+
+<div class="row-fluid">
+   <div class="span12">
+      <div class="box grad_colour_black">
+
+         <h2 class="box_head round_top"><i class="icon-cog"></i> {{ "Tipos de Sistema Operacional"|trans }}</h2>
+
+         <div class="block box_content round_bottom padding_10">
+
+            <h3>{{ "Lista de Tipos de Sistemas Operacionais cadastrados"|trans }}</h3>
+            <p>{{ "Neste módulo deverão ser cadastrados os Tipos de Sistema Operacional"|trans }}</p>
+            <br />
+
+           <table class="table table-striped table-bordered">
+              <thead>
+                <tr>
+                    <th>{{ "Tipo"|trans }}</th>
+                    <th style="text-align: center">{{ "Ações"|trans }}</th>
+                </tr>
+              </thead>
+
+              <tbody>
+
+                {% for so in So %}
+                    <tr id="item_{{ so.idTipoSo }}" class="{{ cycle(['row0', 'row1'], loop.index) }}">
+                        <td id="item_desc_{{ so.idTipoSo }}">{{ so.tipo }}</td>
+                        <td style="text-align: center" class="td-actions">
+                            <a href="{{ path('cacic_tiposo_editar', {'idTipoSo': so.idTipoSo }) }}" class="btn btn-small" title="{{ "Editar Item"|trans }}">
+                                <i class="btn-icon-only icon-edit icon-large"></i>
+                            </a>
+
+                            <a href="{{ path('cacic_tiposo_excluir') }}" class="btn btn-small btn-danger bt-excluir" title="{{ "Excluir Item"|trans }}">
+                                <i class="btn-icon-only icon-trash icon-large"></i>
+                            </a>
+                        </td>
+                    </tr>
+                {% else %}
+                    <tr>
+                        <td style="text-align: center;" colspan="2"><b>{{ "NENHUM REGISTRO ENCONTRADO!"|trans }}</b></td>
+                    </tr>
+                {% endfor %}
+
+              </tbody>
+           </table>
+
+             {# display navigation #}
+             <div class="navigation">
+                 {{ knp_pagination_render(So) }}
+             </div>
+
+           <div align="right">
+                <a class="btn btn-primary bt-adicionar" href="{{ path('cacic_tiposo_cadastrar') }}">
+                    <i class="icon-plus-sign"></i>
+                    {{ "Adicionar Tipo de Sistema Operacional"|trans }}
+                </a>
+           </div>
+         </div> <!-- /block -->
+      </div><!-- /box -->
+
+   </div><!-- /span -->
+</div><!-- /row -->
+{% endblock %}
\ No newline at end of file
diff --git a/src/Cacic/CommonBundle/Resources/views/base.html.twig b/src/Cacic/CommonBundle/Resources/views/base.html.twig
index 93a175a..d9bb7ed 100755
--- a/src/Cacic/CommonBundle/Resources/views/base.html.twig
+++ b/src/Cacic/CommonBundle/Resources/views/base.html.twig
@@ -29,11 +29,11 @@
                         <span class="icon">&nbsp;</span>
                     </a>
                     <ul>
-                        <li><a href="{{ path('cacic_subrede_manutencao') }}">{{ "Atualização de Subrede"|trans }}</a></li>
-                        <li><a href="{{ path('cacic_subrede_computadores') }}">{{ "Computadores e Subredes"|trans }}</a></li>
+                        <li><a href="{{ path('cacic_agente') }}">{{ "Upload de Agentes"|trans }}</a></li>
+                        <li><a href="{{ path('cacic_deploy') }}">{{ "Deploy de software"|trans }}</a></li>
+                        <li><a href="{{ path('cacic_atualizacao_subredes') }}">{{ "Atualização de Subrede"|trans }}</a></li>
                     </ul>
                 </li>
-                <li><a href="{{ path('cacic_modulo_index') }}">{{ "Configurar Módulos"|trans }}</a></li>
 
                 <li class="dropdown-submenu">
                     <a href="javascript:void(0)" class="dropdown-toggle" data-toggle="dropdown">
@@ -45,6 +45,7 @@
                         <li><a href="{{ path('cacic_log_atividade') }}">{{ "Atividades"|trans }}</a></li>
                         <li><a href="{{ path('cacic_log_insucesso_instalacao') }}">{{ "Insucessos Instalação"|trans }}</a></li>
                         <li><a href="{{ path('cacic_log_suporte_remoto') }}">{{ "Suporte Remoto Seguro"|trans }}</a></li>
+                        <li><a href="{{ path('cacic_relatorio_usuario') }}">{{ "Usuário Logado"|trans }}</a></li>
                     </ul>
                 </li>
                 <li class="dropdown-submenu" >
@@ -56,13 +57,20 @@
                         <li><a href="{{ path('cacic_local_index') }}">{{ "Locais"|trans }}</a></li>
                         <li><a href="{{ path('cacic_servidorautenticacao_index') }}">{{ "Servidores Autenticação"|trans }}</a></li>
                         <li><a href="{{ path('cacic_subrede_index') }}">{{ "Sub-redes"|trans }}</a></li>
-                        <li><a href="{{ path('cacic_aplicativo_index') }}">{{ "Aplicativo"|trans }}</a></li>
-                        <li><a href="{{ path('cacic_usuario_index') }}">{{ "Usuários"|trans }}</a></li>
-                        <li><a href="{{ path('cacic_grupo_usuario_index') }}">{{ "Grupo de Usuários"|trans }}</a></li>
-                        <li><a href="{{ path('cacic_tiposoftware_index') }}">{{ "Tipos Softwares"|trans }}</a></li>
+                        <li><a href="{{ path('cacic_aplicativo_index') }}">{{ "Aplicativos Monitorados"|trans }}</a></li>
                         <li><a href="{{ path('cacic_sistemaoperacional_index') }}">{{ "Sistemas Operacionais"|trans }}</a></li>
-                        <li><a href="{{ path('cacic_software_index') }}">{{ "Softwares"|trans }}</a></li>
                         <li><a href="{{ path('cacic_usbdevice_index') }}">{{ "Dispositivos USB"|trans }}</a></li>
+                        <li><a href="{{ path('cacic_subrede_computadores') }}">{{ "Computadores e Subredes"|trans }}</a></li>
+                    </ul>
+                </li>
+                <li class="dropdown-submenu"  >
+                    <a href="javascript:void(0)">
+                        {{ "Usuários"|trans }}
+                        <span class="icon">&nbsp;</span>
+                    </a>
+                    <ul>
+                        <li><a href="{{ path('cacic_usuario_index') }}">{{ "Cadastro de Usuários"|trans }}</a></li>
+                        <li><a href="{{ path('cacic_grupo_usuario_index') }}">{{ "Grupo de Usuários"|trans }}</a></li>
                     </ul>
                 </li>
                 <li class="dropdown-submenu"  >
@@ -71,7 +79,6 @@
                         <span class="icon">&nbsp;</span>
                     </a>
                     <ul>
-                        <li ><a href="{{ path('cacic_patrimonio_index')}}">{{ "Interface"|trans }}</a></li>
                         <li ><a href="{{ path('cacic_uorg_index')}}">{{ "Unidades Organizacionais"|trans }}</a></li>
                         <li ><a href="{{ path('cacic_uorg_type_index')}}">{{ "Tipos de Unidade"|trans }} <br> {{ "Organizacional"|trans }}</a></li>
                         <li ><a href="{{ path('cacic_patrimonio_opcoes')}}">{{ "Opções"|trans }}</a></li>
@@ -87,7 +94,18 @@
                 <span>{{ "Manutenção"|trans }}</span>
                 <span class="icon">&nbsp;</span>
             </a>
-            <ul >
+            <ul>
+                <li class="dropdown-submenu" >
+                    <a href="javascript:void(0)">
+                        <span>{{ "Cadastros"|trans }}</span>
+                        <span class="icon">&nbsp;</span>
+                    </a>
+                    <ul>
+                        <li><a href="{{ path('cacic_tiposo_index') }}">{{ "Tipos de SO"|trans }}</a></li>
+                        <li><a href="{{ path('cacic_sistemaoperacional_index') }}">{{ "Sistemas Operacionais"|trans }}</a></li>
+                        <li><a href="{{ path('cacic_usbdevice_index') }}">{{ "Dispositivos USB"|trans }}</a></li>
+                    </ul>
+                </li>
                 <li class="dropdown-submenu" >
                     <a href="javascript:void(0)">
                         {{ "Classificaçao de software"|trans }}
@@ -103,11 +121,14 @@
                         {{ "Gerência Aquisições"|trans }}
                         <span class="icon">&nbsp;</span>
                     </a>
-                    <ul >
+                    <ul>
+                        <li><a href="{{ path('cacic_tiposoftware_index') }}">{{ "Tipos Softwares"|trans }}</a></li>
+                        <li><a href="{{ path('cacic_software_index') }}">{{ "Classificar software"|trans }}</a></li>
                         <li><a href="{{ path('cacic_aquisicao_index') }}">{{ "Aquisições"|trans }}</a></li>
                         <li><a href="{{ path('cacic_aquisicao_item_index') }}">{{ "Itens adquiridos"|trans }}</a></li>
                         <li><a href="{{ path('cacic_software_estacao_index') }}">{{ "Software por estações"|trans }}</a></li>
                         <li><a href="{{ path('cacic_tipo_licenca_index') }}">{{ "Tipos de Licença"|trans }}</a></li>
+                        <li><a href="{{ path('cacic_relatorio_autorizacoes') }}">{{ "Softwares Autorizados"|trans }}</a></li>
                     </ul>
                 </li>
                 <li class="dropdown-submenu" >
@@ -116,8 +137,8 @@
                         <span class="icon">&nbsp;</span>
                     </a>
                     <ul>
-                        <li><a href="{{ path('cacic_subrede_manutencao') }}">{{ "Atualização de Subrede"|trans }}</a></li>
-                        <li><a href="{{ path('cacic_subrede_computadores') }}">{{ "Computadores e Subredes"|trans }}</a></li>
+                        <li><a href="{{ path('cacic_computador_coletar') }}">{{ "Forçar coleta computador"|trans }}</a></li>
+                        <li><a href="{{ path('cacic_rede_coletar') }}">{{ "Forçar coleta subrede"|trans }}</a></li>
                     </ul>
                 </li>
             </ul>
@@ -134,9 +155,6 @@
                 <li><a href="{{ path('cacic_computador_consultar') }}">{{ "Consultar"|trans }}</a></li>
                 <li><a href="{{ path('cacic_computador_buscar') }}">{{ "Busca avançada"|trans }}</a></li>
                 <li><a href="{{ path('cacic_computador_versaoagente') }}">{{ "Versões Agentes"|trans }}</a></li>
-                <li><a href="{{ path('cacic_computador_coletar') }}">{{ "Forçar coleta computador"|trans }}</a></li>
-                <li><a href="{{ path('cacic_rede_coletar') }}">{{ "Forçar coleta subrede"|trans }}</a></li>
-
             </ul>
         </li>
 
@@ -168,11 +186,10 @@
                     </a>
                     {{ knp_menu_render('CacicRelatorioBundle:Builder:relatorioMenu') }}
                 </li>
-                <li><a class="round_top" href="{{ path('cacic_relatorio_usuario') }}">{{ "Usuário Logado"|trans }}</a></li>
-                <li><a class="round_top" href="{{ path('cacic_relatorio_autorizacoes') }}">{{ "Autorizações"|trans }}</a></li>
                 <li><a class="round_top" href="{{ path('cacic_relatorio_faturamento') }}">{{ "Faturamento"|trans }}</a></li>
                 <li><a class="round_top" href="{{ path('cacic_relatorio_inativos') }}">{{ "Sem Coleta"|trans }}</a></li>
                 <li><a class="round_top" href="{{ path('cacic_relatorio_patrimonio') }}">{{ "Patrimônio"|trans }}</a></li>
+                <li><a class="round_top" href="{{ path('cacic_ateste') }}">{{ "Relatório para Ateste"|trans }}</a></li>
             </ul>
         </li>
 
diff --git a/src/Cacic/WSBundle/Controller/NeoController.php b/src/Cacic/WSBundle/Controller/NeoController.php
index 9884602..c487a47 100644
--- a/src/Cacic/WSBundle/Controller/NeoController.php
+++ b/src/Cacic/WSBundle/Controller/NeoController.php
@@ -381,6 +381,11 @@ class NeoController extends Controller {
         // Pega rede e SO
         $rede = $em->getRepository('CacicCommonBundle:Rede')->getDadosRedePreColeta( $ip_computador, $netmask );
         $so = $em->getRepository('CacicCommonBundle:So')->createIfNotExist($so_json['nomeOs']);
+        if (array_key_exists('tipo', $so_json)) {
+            $tipo_so = $em->getRepository('CacicCommonBundle:TipoSo')->createIfNotExist($so_json['tipo']);
+            $so->setTipo($tipo_so);
+            $em->persist($so);
+        }
 
         // Regra: MAC e SO são únicos e não podem ser nulos
         // Se SO ou MAC forem vazios, tenta atualizar forçadamente
diff --git a/src/Cacic/WSBundle/Tests/Controller/NeoControllerTest.php b/src/Cacic/WSBundle/Tests/Controller/NeoControllerTest.php
index 4cc8109..c9210f1 100644
--- a/src/Cacic/WSBundle/Tests/Controller/NeoControllerTest.php
+++ b/src/Cacic/WSBundle/Tests/Controller/NeoControllerTest.php
@@ -27,6 +27,192 @@ class NeoControllerTest extends BaseTestCase
         $this->client = static::createClient();
         $this->container = $this->client->getContainer();
         $this->apiKey = $this->container->getParameter('test_api_key');
+        $this->computador = '{
+                "computador": {
+                    "networkDevices": [
+                        {
+                            "ipv4": "10.1.0.56",
+                            "ipv6": "fe80::295b:a8db:d433:ebe%4",
+                            "mac": "9C:D2:1E:EA:E0:89",
+                            "netmask_ipv4": "255.255.255.0",
+                            "netmask_ipv6": "ffff:ffff:ffff:ffff::",
+                            "nome": "Wi-Fi"
+                        },
+                        {
+                            "ipv4": "192.168.56.1",
+                            "ipv6": "fe80::19f2:4739:8a9e:45e4%16",
+                            "mac": "08:00:27:00:14:2B",
+                            "netmask_ipv4": "255.255.255.0",
+                            "netmask_ipv6": "ffff:ffff:ffff:ffff::",
+                            "nome": "VirtualBox Host-Only Network"
+                        }
+                    ],
+                    "operatingSystem": {
+                        "idOs": 176,
+                        "nomeOs": "Windows_NT",
+                        "tipo": "Windows-64-bit"
+                    },
+                    "usuario": "Eric Menezes",
+                    "nmComputador": "Notebook-XPTO",
+                    "versaoAgente": "2.8.0"
+                }
+            }';
+        $this->sem_mac = '{
+                "computador": {
+                    "networkDevices": [
+                        {
+                            "ipv4": "10.1.0.56",
+                            "ipv6": "fe80::295b:a8db:d433:ebe%4",
+                            "netmask_ipv4": "255.255.255.0",
+                            "netmask_ipv6": "ffff:ffff:ffff:ffff::",
+                            "nome": "Wi-Fi"
+                        },
+                        {
+                            "ipv4": "192.168.56.1",
+                            "ipv6": "fe80::19f2:4739:8a9e:45e4%16",
+                            "netmask_ipv4": "255.255.255.0",
+                            "netmask_ipv6": "ffff:ffff:ffff:ffff::",
+                            "nome": "VirtualBox Host-Only Network"
+                        }
+                    ],
+                    "operatingSystem": {
+                        "idOs": 176,
+                        "nomeOs": "Windows_NT"
+                    },
+                    "usuario": "Eric Menezes",
+                    "nmComputador": "Notebook-XPTO",
+                    "versaoAgente": "2.8.0"
+                }
+            }';
+        $this->coleta = '{
+                "computador": {
+                    "networkDevices": [
+                        {
+                            "ipv4": "10.1.0.56",
+                            "ipv6": "fe80::295b:a8db:d433:ebe%4",
+                            "mac": "9C:D2:1E:EA:E0:89",
+                            "netmask_ipv4": "255.255.255.0",
+                            "netmask_ipv6": "ffff:ffff:ffff:ffff::",
+                            "nome": "Wi-Fi"
+                        },
+                        {
+                            "ipv4": "192.168.56.1",
+                            "ipv6": "fe80::19f2:4739:8a9e:45e4%16",
+                            "mac": "08:00:27:00:14:2B",
+                            "netmask_ipv4": "255.255.255.0",
+                            "netmask_ipv6": "ffff:ffff:ffff:ffff::",
+                            "nome": "VirtualBox Host-Only Network"
+                        }
+                    ],
+                    "operatingSystem": {
+                        "idOs": 176,
+                        "nomeOs": "Windows_NT"
+                    },
+                    "usuario": "Eric Menezes",
+                    "nmComputador": "Notebook-XPTO",
+                    "versaoAgente": "2.8.0"
+                },
+                "hardware": {
+                    "bios": {
+                        "releaseDate": "11/12/2013",
+                        "romSize": "4096 kB",
+                        "runtimeSize": "128 kB",
+                        "vendor": "Dell Inc.",
+                        "version": "A07"
+                    },
+                    "cpu": {
+                        "clock": "768000000 Hz",
+                        "name": "Intel(R) Core(TM) i7-4500U CPU @ 1.80GHz",
+                        "vendor": "Intel Corp."
+                    },
+                    "ethernet_card": {
+                        "capacity": "100000000 bits/s",
+                        "description": "Ethernet interface",
+                        "logicalname": "eth0",
+                        "product": "RTL8101E/RTL8102E PCI Express Fast Ethernet controller",
+                        "serial": "78:2b:cb:eb:36:24",
+                        "vendor": "Realtek Semiconductor Co., Ltd."
+                    },
+                    "isNotebook": {
+                        "value": "true"
+                    },
+                    "memory": {
+                        "size": "8589934592 bytes"
+                    },
+                    "motherboard": {
+                        "assetTag": "Not Specified",
+                        "manufacturer": "Dell Inc.",
+                        "onboardCapabilities": [
+                            "Video"
+                        ],
+                        "productName": "0YK7DY",
+                        "serialNumber": ".CSQKLZ1.BR1081943R0013.",
+                        "version": "A00"
+                    },
+                    "wireless_card": {
+                        "description": "Wireless interface",
+                        "firmware": "N/A",
+                        "logicalname": "wlan0",
+                        "product": "QCA9565 / AR9565 Wireless Network Adapter",
+                        "serial": "9c:d2:1e:ea:e0:89",
+                        "vendor": "Qualcomm Atheros"
+                    }
+                },
+                "software": {
+                    "": {
+                        "name": ""
+                    },
+                    "account-plugin-aim": {
+                        "description": "Messaging account plugin for AIM",
+                        "installed_size": "941",
+                        "name": "account-plugin-aim",
+                        "url": "http://wiki.gnome.org/Empathy",
+                        "version": "3.8.6-0ubuntu9"
+                    },
+                    "account-plugin-facebook": {
+                        "description": "GNOME Control Center account plugin for single signon - facebook",
+                        "installed_size": "65",
+                        "name": "account-plugin-facebook",
+                        "url": "https://launchpad.net/account-plugins",
+                        "version": "0.11+14.04.20140409.1-0ubuntu1"
+                    },
+                    "account-plugin-flickr": {
+                        "description": "GNOME Control Center account plugin for single signon - flickr",
+                        "installed_size": "64",
+                        "name": "account-plugin-flickr",
+                        "url": "https://launchpad.net/account-plugins",
+                        "version": "0.11+14.04.20140409.1-0ubuntu1"
+                    },
+                    "account-plugin-google": {
+                        "description": "GNOME Control Center account plugin for single signon",
+                        "installed_size": "66",
+                        "name": "account-plugin-google",
+                        "url": "https://launchpad.net/account-plugins",
+                        "version": "0.11+14.04.20140409.1-0ubuntu1"
+                    },
+                    "account-plugin-jabber": {
+                        "description": "Messaging account plugin for Jabber/XMPP",
+                        "installed_size": "941",
+                        "name": "account-plugin-jabber",
+                        "url": "http://wiki.gnome.org/Empathy",
+                        "version": "3.8.6-0ubuntu9"
+                    },
+                    "account-plugin-salut": {
+                        "description": "Messaging account plugin for Local XMPP (Salut)",
+                        "installed_size": "941",
+                        "name": "account-plugin-salut",
+                        "url": "http://wiki.gnome.org/Empathy",
+                        "version": "3.8.6-0ubuntu9"
+                    },
+                    "account-plugin-twitter": {
+                        "description": "GNOME Control Center account plugin for single signon - twitter",
+                        "installed_size": "63",
+                        "name": "account-plugin-twitter",
+                        "url": "https://launchpad.net/account-plugins",
+                        "version": "0.11+14.04.20140409.1-0ubuntu1"
+                    }
+                }
+            }';
     }
 
     /**
@@ -154,35 +340,7 @@ class NeoControllerTest extends BaseTestCase
                 'CONTENT_TYPE'  => 'application/json',
                 //'HTTPS'         => true
             ),
-            '{
-                "computador": {
-                    "networkDevices": [
-                        {
-                            "ipv4": "10.1.0.56",
-                            "ipv6": "fe80::295b:a8db:d433:ebe%4",
-                            "mac": "9C:D2:1E:EA:E0:89",
-                            "netmask_ipv4": "255.255.255.0",
-                            "netmask_ipv6": "ffff:ffff:ffff:ffff::",
-                            "nome": "Wi-Fi"
-                        },
-                        {
-                            "ipv4": "192.168.56.1",
-                            "ipv6": "fe80::19f2:4739:8a9e:45e4%16",
-                            "mac": "08:00:27:00:14:2B",
-                            "netmask_ipv4": "255.255.255.0",
-                            "netmask_ipv6": "ffff:ffff:ffff:ffff::",
-                            "nome": "VirtualBox Host-Only Network"
-                        }
-                    ],
-                    "operatingSystem": {
-                        "idOs": 176,
-                        "nomeOs": "Windows_NT"
-                    },
-                    "usuario": "Eric Menezes",
-                    "nmComputador": "Notebook-XPTO",
-                    "versaoAgente": "2.8.0"
-                }
-            }'
+            $this->computador
         );
         $logger->debug("Dados JSON do computador enviados \n".$this->client->getRequest()->getcontent());
 
@@ -208,35 +366,7 @@ class NeoControllerTest extends BaseTestCase
                 'CONTENT_TYPE'  => 'application/json',
                 //'HTTPS'         => true
             ),
-            '{
-                "computador": {
-                    "networkDevices": [
-                        {
-                            "ipv4": "10.1.0.56",
-                            "ipv6": "fe80::295b:a8db:d433:ebe%4",
-                            "mac": "9C:D2:1E:EA:E0:89",
-                            "netmask_ipv4": "255.255.255.0",
-                            "netmask_ipv6": "ffff:ffff:ffff:ffff::",
-                            "nome": "Wi-Fi"
-                        },
-                        {
-                            "ipv4": "192.168.56.1",
-                            "ipv6": "fe80::19f2:4739:8a9e:45e4%16",
-                            "mac": "08:00:27:00:14:2B",
-                            "netmask_ipv4": "255.255.255.0",
-                            "netmask_ipv6": "ffff:ffff:ffff:ffff::",
-                            "nome": "VirtualBox Host-Only Network"
-                        }
-                    ],
-                    "operatingSystem": {
-                        "idOs": 176,
-                        "nomeOs": "Windows_NT"
-                    },
-                    "usuario": "Eric Menezes",
-                    "nmComputador": "Notebook-XPTO",
-                    "versaoAgente": "2.8.0"
-                }
-            }'
+            $this->computador
         );
         $logger->debug("Dados JSON do computador enviados \n".$this->client->getRequest()->getcontent());
 
@@ -263,33 +393,7 @@ class NeoControllerTest extends BaseTestCase
                 'CONTENT_TYPE'  => 'application/json',
                 //'HTTPS'         => true
             ),
-            '{
-                "computador": {
-                    "networkDevices": [
-                        {
-                            "ipv4": "10.1.0.56",
-                            "ipv6": "fe80::295b:a8db:d433:ebe%4",
-                            "netmask_ipv4": "255.255.255.0",
-                            "netmask_ipv6": "ffff:ffff:ffff:ffff::",
-                            "nome": "Wi-Fi"
-                        },
-                        {
-                            "ipv4": "192.168.56.1",
-                            "ipv6": "fe80::19f2:4739:8a9e:45e4%16",
-                            "netmask_ipv4": "255.255.255.0",
-                            "netmask_ipv6": "ffff:ffff:ffff:ffff::",
-                            "nome": "VirtualBox Host-Only Network"
-                        }
-                    ],
-                    "operatingSystem": {
-                        "idOs": 176,
-                        "nomeOs": "Windows_NT"
-                    },
-                    "usuario": "Eric Menezes",
-                    "nmComputador": "Notebook-XPTO",
-                    "versaoAgente": "2.8.0"
-                }
-            }'
+            $this->sem_mac
         );
         $logger->debug("Dados JSON do computador enviados sem MAC para o getUpdate \n".$this->client->getRequest()->getcontent());
 
@@ -317,35 +421,7 @@ class NeoControllerTest extends BaseTestCase
                 'CONTENT_TYPE'  => 'application/json',
                 //'HTTPS'         => true
             ),
-            '{
-                "computador": {
-                    "networkDevices": [
-                        {
-                            "ipv4": "10.1.0.56",
-                            "ipv6": "fe80::295b:a8db:d433:ebe%4",
-                            "mac": "9C:D2:1E:EA:E0:89",
-                            "netmask_ipv4": "255.255.255.0",
-                            "netmask_ipv6": "ffff:ffff:ffff:ffff::",
-                            "nome": "Wi-Fi"
-                        },
-                        {
-                            "ipv4": "192.168.56.1",
-                            "ipv6": "fe80::19f2:4739:8a9e:45e4%16",
-                            "mac": "08:00:27:00:14:2B",
-                            "netmask_ipv4": "255.255.255.0",
-                            "netmask_ipv6": "ffff:ffff:ffff:ffff::",
-                            "nome": "VirtualBox Host-Only Network"
-                        }
-                    ],
-                    "operatingSystem": {
-                        "idOs": 176,
-                        "nomeOs": "Windows_NT"
-                    },
-                    "usuario": "Eric Menezes",
-                    "nmComputador": "Notebook-XPTO",
-                    "versaoAgente": "2.8.0"
-                }
-            }'
+            $this->computador
         );
         $logger->debug("Dados JSON do computador enviados antes do getUpdate \n".$this->client->getRequest()->getcontent());
 
@@ -365,33 +441,7 @@ class NeoControllerTest extends BaseTestCase
                 'CONTENT_TYPE'  => 'application/json',
                 //'HTTPS'         => true
             ),
-            '{
-                "computador": {
-                    "networkDevices": [
-                        {
-                            "ipv4": "10.1.0.56",
-                            "ipv6": "fe80::295b:a8db:d433:ebe%4",
-                            "netmask_ipv4": "255.255.255.0",
-                            "netmask_ipv6": "ffff:ffff:ffff:ffff::",
-                            "nome": "Wi-Fi"
-                        },
-                        {
-                            "ipv4": "192.168.56.1",
-                            "ipv6": "fe80::19f2:4739:8a9e:45e4%16",
-                            "netmask_ipv4": "255.255.255.0",
-                            "netmask_ipv6": "ffff:ffff:ffff:ffff::",
-                            "nome": "VirtualBox Host-Only Network"
-                        }
-                    ],
-                    "operatingSystem": {
-                        "idOs": 176,
-                        "nomeOs": "Windows_NT"
-                    },
-                    "usuario": "Eric Menezes",
-                    "nmComputador": "Notebook-XPTO",
-                    "versaoAgente": "2.8.0"
-                }
-            }'
+            $this->sem_mac
         );
         $logger->debug("Dados JSON do computador enviados sem MAC para o getUpdate \n".$this->client->getRequest()->getcontent());
 
@@ -418,135 +468,7 @@ class NeoControllerTest extends BaseTestCase
                 'CONTENT_TYPE'  => 'application/json',
                 //'HTTPS'         => true
             ),
-            '{
-                "computador": {
-                    "networkDevices": [
-                        {
-                            "ipv4": "10.1.0.56",
-                            "ipv6": "fe80::295b:a8db:d433:ebe%4",
-                            "mac": "9C:D2:1E:EA:E0:89",
-                            "netmask_ipv4": "255.255.255.0",
-                            "netmask_ipv6": "ffff:ffff:ffff:ffff::",
-                            "nome": "Wi-Fi"
-                        },
-                        {
-                            "ipv4": "192.168.56.1",
-                            "ipv6": "fe80::19f2:4739:8a9e:45e4%16",
-                            "mac": "08:00:27:00:14:2B",
-                            "netmask_ipv4": "255.255.255.0",
-                            "netmask_ipv6": "ffff:ffff:ffff:ffff::",
-                            "nome": "VirtualBox Host-Only Network"
-                        }
-                    ],
-                    "operatingSystem": {
-                        "idOs": 176,
-                        "nomeOs": "Windows_NT"
-                    },
-                    "usuario": "Eric Menezes",
-                    "nmComputador": "Notebook-XPTO",
-                    "versaoAgente": "2.8.0"
-                },
-                "hardware": {
-                    "bios": {
-                        "releaseDate": "11/12/2013",
-                        "romSize": "4096 kB",
-                        "runtimeSize": "128 kB",
-                        "vendor": "Dell Inc.",
-                        "version": "A07"
-                    },
-                    "cpu": {
-                        "clock": "768000000 Hz",
-                        "name": "Intel(R) Core(TM) i7-4500U CPU @ 1.80GHz",
-                        "vendor": "Intel Corp."
-                    },
-                    "ethernet_card": {
-                        "capacity": "100000000 bits/s",
-                        "description": "Ethernet interface",
-                        "logicalname": "eth0",
-                        "product": "RTL8101E/RTL8102E PCI Express Fast Ethernet controller",
-                        "serial": "78:2b:cb:eb:36:24",
-                        "vendor": "Realtek Semiconductor Co., Ltd."
-                    },
-                    "isNotebook": {
-                        "value": "true"
-                    },
-                    "memory": {
-                        "size": "8589934592 bytes"
-                    },
-                    "motherboard": {
-                        "assetTag": "Not Specified",
-                        "manufacturer": "Dell Inc.",
-                        "onboardCapabilities": [
-                            "Video"
-                        ],
-                        "productName": "0YK7DY",
-                        "serialNumber": ".CSQKLZ1.BR1081943R0013.",
-                        "version": "A00"
-                    },
-                    "wireless_card": {
-                        "description": "Wireless interface",
-                        "firmware": "N/A",
-                        "logicalname": "wlan0",
-                        "product": "QCA9565 / AR9565 Wireless Network Adapter",
-                        "serial": "9c:d2:1e:ea:e0:89",
-                        "vendor": "Qualcomm Atheros"
-                    }
-                },
-                "software": {
-                    "": {
-                        "name": ""
-                    },
-                    "account-plugin-aim": {
-                        "description": "Messaging account plugin for AIM",
-                        "installed_size": "941",
-                        "name": "account-plugin-aim",
-                        "url": "http://wiki.gnome.org/Empathy",
-                        "version": "3.8.6-0ubuntu9"
-                    },
-                    "account-plugin-facebook": {
-                        "description": "GNOME Control Center account plugin for single signon - facebook",
-                        "installed_size": "65",
-                        "name": "account-plugin-facebook",
-                        "url": "https://launchpad.net/account-plugins",
-                        "version": "0.11+14.04.20140409.1-0ubuntu1"
-                    },
-                    "account-plugin-flickr": {
-                        "description": "GNOME Control Center account plugin for single signon - flickr",
-                        "installed_size": "64",
-                        "name": "account-plugin-flickr",
-                        "url": "https://launchpad.net/account-plugins",
-                        "version": "0.11+14.04.20140409.1-0ubuntu1"
-                    },
-                    "account-plugin-google": {
-                        "description": "GNOME Control Center account plugin for single signon",
-                        "installed_size": "66",
-                        "name": "account-plugin-google",
-                        "url": "https://launchpad.net/account-plugins",
-                        "version": "0.11+14.04.20140409.1-0ubuntu1"
-                    },
-                    "account-plugin-jabber": {
-                        "description": "Messaging account plugin for Jabber/XMPP",
-                        "installed_size": "941",
-                        "name": "account-plugin-jabber",
-                        "url": "http://wiki.gnome.org/Empathy",
-                        "version": "3.8.6-0ubuntu9"
-                    },
-                    "account-plugin-salut": {
-                        "description": "Messaging account plugin for Local XMPP (Salut)",
-                        "installed_size": "941",
-                        "name": "account-plugin-salut",
-                        "url": "http://wiki.gnome.org/Empathy",
-                        "version": "3.8.6-0ubuntu9"
-                    },
-                    "account-plugin-twitter": {
-                        "description": "GNOME Control Center account plugin for single signon - twitter",
-                        "installed_size": "63",
-                        "name": "account-plugin-twitter",
-                        "url": "https://launchpad.net/account-plugins",
-                        "version": "0.11+14.04.20140409.1-0ubuntu1"
-                    }
-                }
-            }'
+            $this->coleta
         );
         $logger->debug("Dados JSON do computador enviados para a coleta: \n".$this->client->getRequest()->getcontent());
 
--
libgit2 0.21.2