Creado nuevo grant_type en Auth2 para permitir autenticar los clientes de opengnsys

Modificado los ficheros de trazas para que sean rotativos por días, máx 31 fichero.
Correcciones menores en el código de peticiones de cliente
Cambiado nombre de las tablas. Homogeneizar.

37 files changed, 116 insertions, 67 deletions

diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Controller/Api/ClientController.php b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Controller/Api/ClientController.php
index 7b4ed58e..f7f19544 100644
--- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Controller/Api/ClientController.php
+++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Controller/Api/ClientController.php
@@ -14,6 +14,7 @@ use Opengnsys\ServerBundle\Entity\Client;
 use Opengnsys\ServerBundle\Form\Type\Api\ClientType;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Symfony\Component\Form\FormTypeInterface;
 
@@ -374,13 +375,18 @@ class ClientController extends ApiController
 
         $data = $request->request->all();
         $ip = $data['ip'];
+        $mac = $data['mac'];
         $config = $data['config'];
 
         $logger->info("----------- CLIENT CONFIG -----------");
-        $logger->info("ip: " . $ip);
-        $logger->info("config: " . $config);
+        $logger->info("ip: " . $ip. " - mac: ". $mac." - config: " . $config );
+
+        $client = $clientRepository->findOneBy(array("ip"=>$ip, "mac"=>$mac));
+
+        if (!$client) {
+            throw new AccessDeniedHttpException();
+        }
 
-        $client = $clientRepository->findOneBy(array("ip"=>$ip));
         $config = explode(';', $config);
 
         $serialno = $config[0];
@@ -403,7 +409,7 @@ class ClientController extends ApiController
 
             // Si el Filesystem / PartitionCode es Cache leer la información del contenido de la cache.
             if($partition->getFilesystem() === "CACHE"){
-                $path = $this->getParameter('path_client');
+                $path = $this->container->getParameter('path_client');
                 $file = $ip.".cache.txt";
                 $filePath = $path.$file;
                 if(file_exists($filePath)) {
diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/BaseEntity.php b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/BaseEntity.php
index 20f4915b..6fe80f28 100644
--- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/BaseEntity.php
+++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/BaseEntity.php
@@ -3,8 +3,8 @@
 /*
  * This file is part of the Opengnsys Project package.
  *
- * Created by Opengnsys on 06/02/19. <info@globunet.com>
- * Copyright (c) 2019 Opengnsys Soluciones Tecnológicas, SL. All rights reserved.
+ * Created by Miguel Angel de Vega Alcantara on 06/02/19. <miguelangel.devega@sic.uhu.es>
+ * Copyright (c) 2019 Opengnsys. All rights reserved.
  *
  */
 
diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Client.php b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Client.php
index 74755429..78d6b4a9 100644
--- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Client.php
+++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Client.php
@@ -99,6 +99,11 @@ class Client extends BaseEntity
     private $netboot;
 
     /**
+     * @var string|null
+     */
+    private $agentToken;
+
+    /**
      * Constructor
      */
     public function __construct()
@@ -107,6 +112,22 @@ class Client extends BaseEntity
     }
 
     /**
+     * Get partitions
+     *
+     * @return \Doctrine\Common\Collections\Collection
+     */
+    public function getPartition($key)
+    {
+        $partition = null;
+        if(!$partition = $this->partitions->get($key)){
+            $partition = new Partition();
+            $partition->setClient($this);
+            $this->partitions[$key] = $partition;
+        }
+        return $partition;
+    }
+
+    /**
      * Set name.
      *
      * @param string|null $name
@@ -535,4 +556,28 @@ class Client extends BaseEntity
     {
         return $this->netboot;
     }
+
+    /**
+     * Set agentToken.
+     *
+     * @param string|null $agentToken
+     *
+     * @return Client
+     */
+    public function setAgentToken($agentToken = null)
+    {
+        $this->agentToken = $agentToken;
+
+        return $this;
+    }
+
+    /**
+     * Get agentToken.
+     *
+     * @return string|null
+     */
+    public function getAgentToken()
+    {
+        return $this->agentToken;
+    }
 }
diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/ClientRepository.php b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/ClientRepository.php
index 6477f18e..61bf9380 100644
--- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/ClientRepository.php
+++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/ClientRepository.php
@@ -3,8 +3,8 @@
 /*
  * This file is part of the Opengnsys Project package.
  *
- * Created by Opengnsys on 01/10/18. <info@globunet.com>
- * Copyright (c) 2015 Opengnsys Soluciones Tecnológicas, SL. All rights reserved.
+ * Created by Miguel Angel de Vega Alcantara on 01/10/18. <miguelangel.devega@sic.uhu.es>
+ * Copyright (c) 2015 Opengnsys. All rights reserved.
  *
  */
 
diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/CommandRepository.php b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/CommandRepository.php
index 4d7cb637..1eb908f9 100644
--- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/CommandRepository.php
+++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/CommandRepository.php
@@ -3,8 +3,8 @@
 /*
  * This file is part of the Opengnsys Project package.
  *
- * Created by Opengnsys on 01/10/18. <info@globunet.com>
- * Copyright (c) 2015 Opengnsys Soluciones Tecnológicas, SL. All rights reserved.
+ * Created by Miguel Angel de Vega Alcantara on 01/10/18. <miguelangel.devega@sic.uhu.es>
+ * Copyright (c) 2015 Opengnsys. All rights reserved.
  *
  */
 
diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/HardwareProfileRepository.php b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/HardwareProfileRepository.php
index 9c27b702..0ff30cc0 100644
--- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/HardwareProfileRepository.php
+++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/HardwareProfileRepository.php
@@ -3,8 +3,8 @@
 /*
  * This file is part of the Opengnsys Project package.
  *
- * Created by Opengnsys on 01/10/18. <info@globunet.com>
- * Copyright (c) 2015 Opengnsys Soluciones Tecnológicas, SL. All rights reserved.
+ * Created by Miguel Angel de Vega Alcantara on 01/10/18. <miguelangel.devega@sic.uhu.es>
+ * Copyright (c) 2015 Opengnsys. All rights reserved.
  *
  */
 
diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/HardwareRepository.php b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/HardwareRepository.php
index 54026622..6c9fcce5 100644
--- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/HardwareRepository.php
+++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/HardwareRepository.php
@@ -3,8 +3,8 @@
 /*
  * This file is part of the Opengnsys Project package.
  *
- * Created by Opengnsys on 01/10/18. <info@globunet.com>
- * Copyright (c) 2015 Opengnsys Soluciones Tecnológicas, SL. All rights reserved.
+ * Created by Miguel Angel de Vega Alcantara on 01/10/18. <miguelangel.devega@sic.uhu.es>
+ * Copyright (c) 2015 Opengnsys. All rights reserved.
  *
  */
 
diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/ImageRepository.php b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/ImageRepository.php
index ef26e21e..1d473c86 100644
--- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/ImageRepository.php
+++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/ImageRepository.php
@@ -3,8 +3,8 @@
 /*
  * This file is part of the Opengnsys Project package.
  *
- * Created by Opengnsys on 01/10/18. <info@globunet.com>
- * Copyright (c) 2015 Opengnsys Soluciones Tecnológicas, SL. All rights reserved.
+ * Created by Miguel Angel de Vega Alcantara on 01/10/18. <miguelangel.devega@sic.uhu.es>
+ * Copyright (c) 2015 Opengnsys. All rights reserved.
  *
  */
 
diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/MenuRepository.php b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/MenuRepository.php
index ffa6889d..ff8e81b8 100644
--- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/MenuRepository.php
+++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/MenuRepository.php
@@ -3,8 +3,8 @@
 /*
  * This file is part of the Opengnsys Project package.
  *
- * Created by Opengnsys on 01/10/18. <info@globunet.com>
- * Copyright (c) 2015 Opengnsys Soluciones Tecnológicas, SL. All rights reserved.
+ * Created by Miguel Angel de Vega Alcantara on 01/10/18. <miguelangel.devega@sic.uhu.es>
+ * Copyright (c) 2015 Opengnsys. All rights reserved.
  *
  */
 
diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/NetbootRepository.php b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/NetbootRepository.php
index 49d1b9c0..cd2808c6 100644
--- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/NetbootRepository.php
+++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/NetbootRepository.php
@@ -3,8 +3,8 @@
 /*
  * This file is part of the Opengnsys Project package.
  *
- * Created by Opengnsys on 01/10/18. <info@globunet.com>
- * Copyright (c) 2015 Opengnsys Soluciones Tecnológicas, SL. All rights reserved.
+ * Created by Miguel Angel de Vega Alcantara on 01/10/18. <miguelangel.devega@sic.uhu.es>
+ * Copyright (c) 2015 Opengnsys. All rights reserved.
  *
  */
 
diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/NetworkSettingsRepository.php b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/NetworkSettingsRepository.php
index b43e7af2..ba7c5caf 100644
--- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/NetworkSettingsRepository.php
+++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/NetworkSettingsRepository.php
@@ -3,8 +3,8 @@
 /*
  * This file is part of the Opengnsys Project package.
  *
- * Created by Opengnsys on 01/10/18. <info@globunet.com>
- * Copyright (c) 2015 Opengnsys Soluciones Tecnológicas, SL. All rights reserved.
+ * Created by Miguel Angel de Vega Alcantara on 01/10/18. <miguelangel.devega@sic.uhu.es>
+ * Copyright (c) 2015 Opengnsys. All rights reserved.
  *
  */
 
diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/OrganizationalUnitRepository.php b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/OrganizationalUnitRepository.php
index 24767ec1..c5cea8aa 100644
--- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/OrganizationalUnitRepository.php
+++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/OrganizationalUnitRepository.php
@@ -3,8 +3,8 @@
 /*
  * This file is part of the Opengnsys Project package.
  *
- * Created by Opengnsys on 01/10/18. <info@globunet.com>
- * Copyright (c) 2015 Opengnsys Soluciones Tecnológicas, SL. All rights reserved.
+ * Created by Miguel Angel de Vega Alcantara on 01/10/18. <miguelangel.devega@sic.uhu.es>
+ * Copyright (c) 2015 Opengnsys. All rights reserved.
  *
  */
 
diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/PartitionRepository.php b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/PartitionRepository.php
index caec9aaf..497f6c30 100644
--- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/PartitionRepository.php
+++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/PartitionRepository.php
@@ -3,8 +3,8 @@
 /*
  * This file is part of the Opengnsys Project package.
  *
- * Created by Opengnsys on 01/10/18. <info@globunet.com>
- * Copyright (c) 2015 Opengnsys Soluciones Tecnológicas, SL. All rights reserved.
+ * Created by Miguel Angel de Vega Alcantara on 01/10/18. <miguelangel.devega@sic.uhu.es>
+ * Copyright (c) 2015 Opengnsys. All rights reserved.
  *
  */
 
diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/RepositoryRepository.php b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/RepositoryRepository.php
index c32664db..9a543251 100644
--- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/RepositoryRepository.php
+++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/RepositoryRepository.php
@@ -3,8 +3,8 @@
 /*
  * This file is part of the Opengnsys Project package.
  *
- * Created by Opengnsys on 01/10/18. <info@globunet.com>
- * Copyright (c) 2015 Opengnsys Soluciones Tecnológicas, SL. All rights reserved.
+ * Created by Miguel Angel de Vega Alcantara on 01/10/18. <miguelangel.devega@sic.uhu.es>
+ * Copyright (c) 2015 Opengnsys. All rights reserved.
  *
  */
 
diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/SoftwareProfileRepository.php b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/SoftwareProfileRepository.php
index c9d4aca9..332dc588 100644
--- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/SoftwareProfileRepository.php
+++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/SoftwareProfileRepository.php
@@ -3,8 +3,8 @@
 /*
  * This file is part of the Opengnsys Project package.
  *
- * Created by Opengnsys on 01/10/18. <info@globunet.com>
- * Copyright (c) 2015 Opengnsys Soluciones Tecnológicas, SL. All rights reserved.
+ * Created by Miguel Angel de Vega Alcantara on 01/10/18. <miguelangel.devega@sic.uhu.es>
+ * Copyright (c) 2015 Opengnsys. All rights reserved.
  *
  */
 
diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/SoftwareRepository.php b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/SoftwareRepository.php
index df8f7ec3..6fe4be8d 100644
--- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/SoftwareRepository.php
+++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/SoftwareRepository.php
@@ -3,8 +3,8 @@
 /*
  * This file is part of the Opengnsys Project package.
  *
- * Created by Opengnsys on 01/10/18. <info@globunet.com>
- * Copyright (c) 2015 Opengnsys Soluciones Tecnológicas, SL. All rights reserved.
+ * Created by Miguel Angel de Vega Alcantara on 01/10/18. <miguelangel.devega@sic.uhu.es>
+ * Copyright (c) 2015 Opengnsys. All rights reserved.
  *
  */
 
diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/TaskRepository.php b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/TaskRepository.php
index 77460f42..4226be63 100644
--- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/TaskRepository.php
+++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/TaskRepository.php
@@ -3,8 +3,8 @@
 /*
  * This file is part of the Opengnsys Project package.
  *
- * Created by Opengnsys on 01/10/18. <info@globunet.com>
- * Copyright (c) 2015 Opengnsys Soluciones Tecnológicas, SL. All rights reserved.
+ * Created by Miguel Angel de Vega Alcantara on 01/10/18. <miguelangel.devega@sic.uhu.es>
+ * Copyright (c) 2015 Opengnsys. All rights reserved.
  *
  */
 
diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/TraceRepository.php b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/TraceRepository.php
index 347fa21d..f3d8c02f 100644
--- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/TraceRepository.php
+++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/TraceRepository.php
@@ -3,8 +3,8 @@
 /*
  * This file is part of the Opengnsys Project package.
  *
- * Created by Opengnsys on 01/10/18. <info@globunet.com>
- * Copyright (c) 2015 Opengnsys Soluciones Tecnológicas, SL. All rights reserved.
+ * Created by Miguel Angel de Vega Alcantara on 01/10/18. <miguelangel.devega@sic.uhu.es>
+ * Copyright (c) 2015 Opengnsys. All rights reserved.
  *
  */
 
diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/ViewRepository.php b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/ViewRepository.php
index a3ee373d..ec672229 100644
--- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/ViewRepository.php
+++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Repository/ViewRepository.php
@@ -3,8 +3,8 @@
 /*
  * This file is part of the Opengnsys Project package.
  *
- * Created by Opengnsys on 01/10/18. <info@globunet.com>
- * Copyright (c) 2015 Opengnsys Soluciones Tecnológicas, SL. All rights reserved.
+ * Created by Miguel Angel de Vega Alcantara on 01/10/18. <miguelangel.devega@sic.uhu.es>
+ * Copyright (c) 2015 Opengnsys. All rights reserved.
  *
  */
 
diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Client.orm.xml b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Client.orm.xml
index a2a14100..f66884a5 100644
--- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Client.orm.xml
+++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Client.orm.xml
@@ -3,7 +3,7 @@
                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                   xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
 
-    <entity name="Opengnsys\ServerBundle\Entity\Client" table="og_clients"
+    <entity name="Opengnsys\ServerBundle\Entity\Client" table="og_server__clients"
             repository-class="Opengnsys\ServerBundle\Entity\Repository\ClientRepository">
 
         <id name="id" type="integer" column="id">
@@ -20,9 +20,15 @@
         <field name="status" type="string" column="status" length="50" nullable="true"/>
 
         <field name="cache" type="integer" column="cache" nullable="true"/>
-        <field name="idproautoexec" type="integer" column="idproautoexec" nullable="false"/>
+        <field name="idproautoexec" type="integer" column="idproautoexec" nullable="true"/>
         <field name="oglive" type="string" length="255" column="oglive" nullable="true"/>
 
+        <field name="agentToken" type="string" column="agent_token" length="32" nullable="true">
+            <options>
+                <option name="fixed"/>
+            </options>
+        </field>
+
         <one-to-many field="partitions" target-entity="\Opengnsys\ServerBundle\Entity\Partition" mapped-by="client">
             <cascade>
                 <cascade-all/>
diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Command.orm.xml b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Command.orm.xml
index 86457065..709d7cd7 100644
--- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Command.orm.xml
+++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Command.orm.xml
@@ -2,7 +2,7 @@
 <doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"
                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                   xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
-    <entity name="Opengnsys\ServerBundle\Entity\Command" table="og_commands"
+    <entity name="Opengnsys\ServerBundle\Entity\Command" table="og_server__commands"
             repository-class="Opengnsys\ServerBundle\Entity\Repository\CommandRepository">
 
         <id name="id" type="integer" column="id">
diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Hardware.orm.xml b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Hardware.orm.xml
index 00c60eaa..17a46a53 100644
--- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Hardware.orm.xml
+++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Hardware.orm.xml
@@ -2,7 +2,7 @@
 <doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"
                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                   xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
-    <entity name="Opengnsys\ServerBundle\Entity\Hardware" table="og_hardwares"
+    <entity name="Opengnsys\ServerBundle\Entity\Hardware" table="og_server__hardwares"
             repository-class="Opengnsys\ServerBundle\Entity\Repository\HardwareRepository">
 
         <id name="id" type="integer" column="id">
diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/HardwareProfile.orm.xml b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/HardwareProfile.orm.xml
index 284fbe5f..1a1ab5b3 100644
--- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/HardwareProfile.orm.xml
+++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/HardwareProfile.orm.xml
@@ -2,7 +2,7 @@
 <doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"
                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                   xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
-    <entity name="Opengnsys\ServerBundle\Entity\HardwareProfile" table="og_hardware_profiles"
+    <entity name="Opengnsys\ServerBundle\Entity\HardwareProfile" table="og_server__hardware_profiles"
             repository-class="Opengnsys\ServerBundle\Entity\Repository\HardwareProfileRepository">
 
         <id name="id" type="integer" column="id">
@@ -23,7 +23,7 @@
                 <cascade-all/>
             </cascade>
 
-            <join-table name="og_hardware_profiles_hardwares">
+            <join-table name="og_server__hardware_profiles_hardwares">
                 <join-columns>
                     <join-column name="hardware_profile_id" referenced-column-name="id"/>
                 </join-columns>
diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Image.orm.xml b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Image.orm.xml
index 76d40740..cc30ec0d 100644
--- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Image.orm.xml
+++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Image.orm.xml
@@ -2,7 +2,7 @@
 <doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"
                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                   xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
-    <entity name="Opengnsys\ServerBundle\Entity\Image" table="og_images"
+    <entity name="Opengnsys\ServerBundle\Entity\Image" table="og_server__images"
             repository-class="Opengnsys\ServerBundle\Entity\Repository\ImageRepository">
 
         <id name="id" type="integer" column="id">
diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Menu.orm.xml b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Menu.orm.xml
index 96ec3f4f..06c0c5f8 100644
--- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Menu.orm.xml
+++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Menu.orm.xml
@@ -2,7 +2,7 @@
 <doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"
                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                   xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
-    <entity name="Opengnsys\ServerBundle\Entity\Menu" table="og_menus"
+    <entity name="Opengnsys\ServerBundle\Entity\Menu" table="og_server__menus"
             repository-class="Opengnsys\ServerBundle\Entity\Repository\MenuRepository">
 
         <id name="id" type="integer" column="id">
diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Netboot.orm.xml b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Netboot.orm.xml
index b0daffd6..c0715ae8 100644
--- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Netboot.orm.xml
+++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Netboot.orm.xml
@@ -2,7 +2,7 @@
 <doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"
                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                   xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
-    <entity name="Opengnsys\ServerBundle\Entity\Netboot" table="og_netboots"
+    <entity name="Opengnsys\ServerBundle\Entity\Netboot" table="og_server__netboots"
             repository-class="Opengnsys\ServerBundle\Entity\Repository\NetbootRepository">
 
         <id name="id" type="integer" column="id">
diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/NetworkSettings.orm.xml b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/NetworkSettings.orm.xml
index 8a5bebc7..17c218bf 100644
--- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/NetworkSettings.orm.xml
+++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/NetworkSettings.orm.xml
@@ -2,7 +2,7 @@
 <doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"
                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                   xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
-    <entity name="Opengnsys\ServerBundle\Entity\NetworkSettings" table="og_network_settings"
+    <entity name="Opengnsys\ServerBundle\Entity\NetworkSettings" table="og_server__network_settings"
             repository-class="Opengnsys\ServerBundle\Entity\Repository\NetworkSettingsRepository">
 
         <id name="id" type="integer" column="id">
diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/OrganizationalUnit.orm.xml b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/OrganizationalUnit.orm.xml
index 51951dfc..3f93b52b 100644
--- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/OrganizationalUnit.orm.xml
+++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/OrganizationalUnit.orm.xml
@@ -2,7 +2,7 @@
 <doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"
                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                   xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
-    <entity name="Opengnsys\ServerBundle\Entity\OrganizationalUnit" table="og_organizational_units"
+    <entity name="Opengnsys\ServerBundle\Entity\OrganizationalUnit" table="og_server__organizational_units"
             repository-class="Opengnsys\ServerBundle\Entity\Repository\OrganizationalUnitRepository">
 
         <id name="id" type="integer" column="id">
diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Partition.orm.xml b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Partition.orm.xml
index e9cfee0c..751b4dad 100644
--- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Partition.orm.xml
+++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Partition.orm.xml
@@ -2,7 +2,7 @@
 <doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"
                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                   xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
-    <entity name="Opengnsys\ServerBundle\Entity\Partition" table="og_partitions"
+    <entity name="Opengnsys\ServerBundle\Entity\Partition" table="og_server__partitions"
             repository-class="Opengnsys\ServerBundle\Entity\Repository\PartitionRepository">
 
         <unique-constraints>
diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Repository.orm.xml b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Repository.orm.xml
index 9036c2cd..a8d741de 100644
--- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Repository.orm.xml
+++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Repository.orm.xml
@@ -2,7 +2,7 @@
 <doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"
                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                   xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
-    <entity name="Opengnsys\ServerBundle\Entity\Repository" table="og_repositories"
+    <entity name="Opengnsys\ServerBundle\Entity\Repository" table="og_server__repositories"
             repository-class="Opengnsys\ServerBundle\Entity\Repository\RepositoryRepository">
 
         <id name="id" type="integer" column="id">
diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Software.orm.xml b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Software.orm.xml
index e60a8917..b4b1ed20 100644
--- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Software.orm.xml
+++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Software.orm.xml
@@ -2,7 +2,7 @@
 <doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"
                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                   xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
-    <entity name="Opengnsys\ServerBundle\Entity\Software" table="og_softwares"
+    <entity name="Opengnsys\ServerBundle\Entity\Software" table="og_server__softwares"
             repository-class="Opengnsys\ServerBundle\Entity\Repository\SoftwareRepository">
 
         <id name="id" type="integer" column="id">
diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/SoftwareProfile.orm.xml b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/SoftwareProfile.orm.xml
index 09499e09..6fe7f0ea 100644
--- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/SoftwareProfile.orm.xml
+++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/SoftwareProfile.orm.xml
@@ -2,7 +2,7 @@
 <doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"
                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                   xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
-    <entity name="Opengnsys\ServerBundle\Entity\SoftwareProfile" table="og_software_profiles"
+    <entity name="Opengnsys\ServerBundle\Entity\SoftwareProfile" table="og_server__software_profiles"
             repository-class="Opengnsys\ServerBundle\Entity\Repository\SoftwareProfileRepository">
 
 
@@ -24,7 +24,7 @@
                 <cascade-all/>
             </cascade>
 
-            <join-table name="og_software_profiles_softwares">
+            <join-table name="og_server__software_profiles_softwares">
                 <join-columns>
                     <join-column name="software_profile_id" referenced-column-name="id"/>
                 </join-columns>
diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Task.orm.xml b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Task.orm.xml
index 6ff885d3..00b3cea4 100644
--- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Task.orm.xml
+++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Task.orm.xml
@@ -2,7 +2,7 @@
 <doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"
                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                   xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
-    <entity name="Opengnsys\ServerBundle\Entity\Task" table="og_tasks"
+    <entity name="Opengnsys\ServerBundle\Entity\Task" table="og_server__tasks"
             repository-class="Opengnsys\ServerBundle\Entity\Repository\TaskRepository">
 
         <id name="id" type="integer" column="id">
diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Trace.orm.xml b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Trace.orm.xml
index 90e23d59..ce0308b2 100644
--- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Trace.orm.xml
+++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/Trace.orm.xml
@@ -2,7 +2,7 @@
 <doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"
                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                   xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
-    <entity name="Opengnsys\ServerBundle\Entity\Trace" table="og_traces"
+    <entity name="Opengnsys\ServerBundle\Entity\Trace" table="og_server__traces"
             repository-class="Opengnsys\ServerBundle\Entity\Repository\TraceRepository">
 
         <id name="id" type="integer" column="id">
diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/ValidationSettings.orm.xml b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/ValidationSettings.orm.xml
index 1157319e..5e01464b 100644
--- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/ValidationSettings.orm.xml
+++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/ValidationSettings.orm.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
-  <entity name="Opengnsys\ServerBundle\Entity\ValidationSettings" table="og_validation_settings"
+  <entity name="Opengnsys\ServerBundle\Entity\ValidationSettings" table="og_server__validation_settings"
           repository-class="Opengnsys\ServerBundle\Entity\Repository\ValidationSettingsRepository">
 
     <id name="id" type="integer" column="id">
diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/View.orm.xml b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/View.orm.xml
index 89329119..004df1bb 100644
--- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/View.orm.xml
+++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/View.orm.xml
@@ -2,7 +2,7 @@
 <doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"
                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                   xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
-    <entity name="Opengnsys\ServerBundle\Entity\View" table="og_views"
+    <entity name="Opengnsys\ServerBundle\Entity\View" table="og_server__views"
             repository-class="Opengnsys\ServerBundle\Entity\Repository\ViewRepository">
 
         <id name="id" type="integer" column="id">
@@ -24,7 +24,7 @@
         -->
 
         <many-to-many field="client" target-entity="\Opengnsys\ServerBundle\Entity\Client">
-            <join-table name="og_views__clients">
+            <join-table name="og_server__views__clients">
                 <join-columns>
                     <join-column name="views_id" referenced-column-name="id"/>
                 </join-columns>
diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/serializer/OpengnsysServerBundle/Entity.Image.yml b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/serializer/OpengnsysServerBundle/Entity.Image.yml
index bcac998e..c585a89c 100644
--- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/serializer/OpengnsysServerBundle/Entity.Image.yml
+++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/serializer/OpengnsysServerBundle/Entity.Image.yml
@@ -29,14 +29,6 @@ Opengnsys\ServerBundle\Entity\Image:
             groups: [opengnsys_server__image_get, opengnsys_server__image_cget]
             expose: true
             serialized_name: fileSize
-        createdAt:
-            groups: [opengnsys_server__image_get, opengnsys_server__image_cget]
-            expose: true
-            serialized_name: createdAt
-        updatedAt:
-            groups: [opengnsys_server__image_get, opengnsys_server__image_cget]
-            expose: true
-            serialized_name: updatedAt
         id:
             groups: [opengnsys_server__image_get, opengnsys_server__image_cget]
             expose: true