- Modificado restrucciones de la DB.

- Simplificado Estructura de directorio.
- Eliminado algunos atributos que eran innecesarios.

55 files changed, 160 insertions, 622 deletions

diff --git a/admin/WebConsole3/backend/src/Opengnsys/MigrationBundle/Command/MigrateCommand.php b/admin/WebConsole3/backend/src/Opengnsys/MigrationBundle/Command/MigrateCommand.php
index dc3ed3d1..b1fd66b5 100644
--- a/admin/WebConsole3/backend/src/Opengnsys/MigrationBundle/Command/MigrateCommand.php
+++ b/admin/WebConsole3/backend/src/Opengnsys/MigrationBundle/Command/MigrateCommand.php
@@ -170,7 +170,7 @@ class MigrateCommand extends ContainerAwareCommand
             }
             $repository->setName($repositorio->getNombrerepositorio());
             $repository->setIp($repositorio->getIp());
-            $repository->setPassword($repositorio->getPassguor());
+            //$repository->setPassword($repositorio->getPassguor());
             $repository->setConfigurationpath("-");
             $repository->setAdminpath("-");
             $repository->setPxepath("-");
@@ -296,10 +296,7 @@ class MigrateCommand extends ContainerAwareCommand
 
             // Netboot
 
-            // ValidationSettings
             //$migrateId = ""
-            //$validationSettings = $validationSettingsRepository->findOneByNotes($migrateId);
-            //$client->setValidationSettings($validationSettings);
 
             // HardwareProfile
             $migrateId = "perfilHardware:".$ordenador->getIdperfilhard();
diff --git a/admin/WebConsole3/backend/src/Opengnsys/RepositoryBundle/Controller/Api/ImageController.php b/admin/WebConsole3/backend/src/Opengnsys/RepositoryBundle/Controller/Api/ImageController.php
index 8ec774ed..b3a2b64b 100644
--- a/admin/WebConsole3/backend/src/Opengnsys/RepositoryBundle/Controller/Api/ImageController.php
+++ b/admin/WebConsole3/backend/src/Opengnsys/RepositoryBundle/Controller/Api/ImageController.php
@@ -12,7 +12,7 @@ namespace Opengnsys\RepositoryBundle\Controller\Api;
 
 use FOS\RestBundle\Context\Context;
 use Opengnsys\ServerBundle\Entity\Image;
-use Opengnsys\ServerBundle\Form\Type\Api\ImageType;
+use Opengnsys\ServerBundle\Form\Type\ImageType;
 use Symfony\Component\Filesystem\Filesystem;
 use Symfony\Component\Finder\Finder;
 use Symfony\Component\HttpFoundation\Request;
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 f7f19544..8beb6c83 100644
--- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Controller/Api/ClientController.php
+++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Controller/Api/ClientController.php
@@ -11,7 +11,7 @@
 namespace Opengnsys\ServerBundle\Controller\Api;
 
 use Opengnsys\ServerBundle\Entity\Client;
-use Opengnsys\ServerBundle\Form\Type\Api\ClientType;
+use Opengnsys\ServerBundle\Form\Type\ClientType;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
@@ -157,7 +157,7 @@ class ClientController extends ApiController
 	 * @ApiDoc(
 	 *   resource = true,
 	 *   description = "Creates a new object from the submitted data.",
-	 *   input = {"class" = "Opengnsys\ServerBundle\Form\Type\Api\ClientType", "name" = ""},
+	 *   input = {"class" = "Opengnsys\ServerBundle\Form\Type\ClientType", "name" = ""},
 	 *   statusCodes = {
 	 *     200 = "Returned when successful",
 	 *     400 = "Returned when the form has errors"
@@ -205,7 +205,7 @@ class ClientController extends ApiController
 	 *
 	 * @ApiDoc(
 	 *   resource = true,
-	 *   input = {"class" = "Opengnsys\ServerBundle\Form\Type\Api\ClientType", "name" = ""},
+	 *   input = {"class" = "Opengnsys\ServerBundle\Form\Type\ClientType", "name" = ""},
 	 *   statusCodes = {
 	 *     204 = "Returned when successful",
 	 *     400 = "Returned when the form has errors"
@@ -318,7 +318,7 @@ class ClientController extends ApiController
      * @ApiDoc(
      *   resource = true,
      *   description = "Creates a new object from the submitted data.",
-     *   input = {"class" = "Opengnsys\ServerBundle\Form\Type\Api\ClientStatusType", "name" = ""},
+     *   input = {"class" = "Opengnsys\ServerBundle\Form\Type\ClientStatusType", "name" = ""},
      *   statusCodes = {
      *     200 = "Returned when successful",
      *     400 = "Returned when the form has errors"
@@ -356,7 +356,7 @@ class ClientController extends ApiController
      * @ApiDoc(
      *   resource = true,
      *   description = "Creates a new object from the submitted data.",
-     *   input = {"class" = "Opengnsys\ServerBundle\Form\Type\Api\ClientConfigType", "name" = ""},
+     *   input = {"class" = "Opengnsys\ServerBundle\Form\Type\ClientConfigType", "name" = ""},
      *   statusCodes = {
      *     200 = "Returned when successful",
      *     400 = "Returned when the form has errors"
@@ -394,9 +394,15 @@ class ClientController extends ApiController
 
         //$client->setStatus($status);
 
-        array_shift($config);
+        //array_shift($config);
+        // Quitar el último elemento
         array_pop($config);
+
+
+        $partitionsCount = count($client->getPartitions());
+        $logger->info("Client - Partitions: " . $partitionsCount );
         foreach ($config as $key => $part){
+            //$logger->info("key: " . $key. " - part: ". $part );
             $part = explode(':', $part);
             $partition = $client->getPartition($key);
             $partition->setNumDisk($part[0]);
@@ -407,6 +413,8 @@ class ClientController extends ApiController
             $partition->setSize(intval(($part[5]=='')?'0':$part[5]));
             $partition->setUsage(floatval(($part[6]=='')?'0':$part[6]));
 
+            $logger->info("PARTITION ADD/UPDATE - key: ".$key." - id: " . $partition->getId(). " - disk". $partition->getNumDisk(). " - partition ".$partition->getNumPartition(). "  - filesystem: ".$partition->getFilesystem() );
+
             // Si el Filesystem / PartitionCode es Cache leer la información del contenido de la cache.
             if($partition->getFilesystem() === "CACHE"){
                 $path = $this->container->getParameter('path_client');
@@ -429,7 +437,15 @@ class ClientController extends ApiController
                     $partition->setCacheContent($data);
                 }
             }
+            $em->persist($partition);
         }
+        // Borrar las particiones que ya no existe
+        for($index = $key+1; $index < $partitionsCount; $index++){
+            $partition = $client->getPartition($index);
+            $em->remove($partition);
+            $logger->info("PARTITION REMOVE - key: ". $index." - id: " . $partition->getId(). " - disk". $partition->getNumDisk(). " - partition ".$partition->getNumPartition(). "  - filesystem: ".$partition->getFilesystem() );
+        }
+
         $em->flush();
 
         return $this->view($client, Response::HTTP_NO_CONTENT);
diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Controller/Api/CommandController.php b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Controller/Api/CommandController.php
index b5270a96..58533c39 100644
--- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Controller/Api/CommandController.php
+++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Controller/Api/CommandController.php
@@ -15,8 +15,8 @@ use Opengnsys\ServerBundle\Entity\Enum\ClientStatus;
 use Opengnsys\ServerBundle\Entity\Trace;
 use Opengnsys\ServerBundle\Entity\Client;
 use Opengnsys\ServerBundle\Entity\Command;
-use Opengnsys\ServerBundle\Form\Type\Api\CommandExecuteType;
-use Opengnsys\ServerBundle\Form\Type\Api\CommandType;
+use Opengnsys\ServerBundle\Form\Type\CommandExecuteType;
+use Opengnsys\ServerBundle\Form\Type\CommandType;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
@@ -210,7 +210,7 @@ class CommandController extends ApiController
      * @ApiDoc(
      *   resource = true,
      *   description = "Creates a new object from the submitted data.",
-     *   input = {"class" = "Opengnsys\ServerBundle\Form\Type\Api\CommandExecuteType", "name" = ""},
+     *   input = {"class" = "Opengnsys\ServerBundle\Form\Type\CommandExecuteType", "name" = ""},
      *   statusCodes = {
      *     200 = "Returned when successful",
      *     400 = "Returned when the form has errors"
diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Controller/Api/HardwareController.php b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Controller/Api/HardwareController.php
index 91939eb4..b2cd3357 100644
--- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Controller/Api/HardwareController.php
+++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Controller/Api/HardwareController.php
@@ -10,7 +10,7 @@
  
 namespace Opengnsys\ServerBundle\Controller\Api;
 
-use Opengnsys\ServerBundle\Form\Type\Api\HardwareType;
+use Opengnsys\ServerBundle\Form\Type\HardwareType;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Controller/Api/HardwareProfileController.php b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Controller/Api/HardwareProfileController.php
index baeb52db..a8cf6da0 100644
--- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Controller/Api/HardwareProfileController.php
+++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Controller/Api/HardwareProfileController.php
@@ -11,7 +11,7 @@
 namespace Opengnsys\ServerBundle\Controller\Api;
 
 use FOS\RestBundle\Context\Context;
-use Opengnsys\ServerBundle\Form\Type\Api\HardwareProfileType;
+use Opengnsys\ServerBundle\Form\Type\HardwareProfileType;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
@@ -135,7 +135,7 @@ class HardwareProfileController extends ApiController
 	 * @ApiDoc(
 	 *   resource = true,
 	 *   description = "Creates a new object from the submitted data.",
-	 *   input = {"class" = "Opengnsys\ServerBundle\Form\Type\Api\HardwareProfileType", "name" = ""},
+	 *   input = {"class" = "Opengnsys\ServerBundle\Form\Type\HardwareProfileType", "name" = ""},
 	 *   statusCodes = {
 	 *     200 = "Returned when successful",
 	 *     400 = "Returned when the form has errors"
@@ -181,7 +181,7 @@ class HardwareProfileController extends ApiController
 	 *
 	 * @ApiDoc(
 	 *   resource = true,
-	 *   input = {"class" = "Opengnsys\ServerBundle\Form\Type\Api\HardwareProfileType", "name" = ""},
+	 *   input = {"class" = "Opengnsys\ServerBundle\Form\Type\HardwareProfileType", "name" = ""},
 	 *   statusCodes = {
 	 *     204 = "Returned when successful",
 	 *     400 = "Returned when the form has errors"
diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Controller/Api/ImageController.php b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Controller/Api/ImageController.php
index c6c10b71..f42ea782 100644
--- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Controller/Api/ImageController.php
+++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Controller/Api/ImageController.php
@@ -12,7 +12,7 @@ namespace Opengnsys\ServerBundle\Controller\Api;
 
 use FOS\RestBundle\Context\Context;
 use Opengnsys\ServerBundle\Entity\Image;
-use Opengnsys\ServerBundle\Form\Type\Api\ImageType;
+use Opengnsys\ServerBundle\Form\Type\ImageType;
 use Symfony\Component\Filesystem\Filesystem;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Controller/Api/MenuController.php b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Controller/Api/MenuController.php
index 48e35332..63d51474 100644
--- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Controller/Api/MenuController.php
+++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Controller/Api/MenuController.php
@@ -10,7 +10,7 @@
  
 namespace Opengnsys\ServerBundle\Controller\Api;
 
-use Opengnsys\ServerBundle\Form\Type\Api\MenuType;
+use Opengnsys\ServerBundle\Form\Type\MenuType;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
@@ -125,7 +125,7 @@ class MenuController extends ApiController
 	 * @ApiDoc(
 	 *   resource = true,
 	 *   description = "Creates a new object from the submitted data.",
-	 *   input = {"class" = "Opengnsys\ServerBundle\Form\Type\Api\MenuType", "name" = ""},
+	 *   input = {"class" = "Opengnsys\ServerBundle\Form\Type\MenuType", "name" = ""},
 	 *   statusCodes = {
 	 *     200 = "Returned when successful",
 	 *     400 = "Returned when the form has errors"
@@ -163,7 +163,7 @@ class MenuController extends ApiController
 	 *
 	 * @ApiDoc(
 	 *   resource = true,
-	 *   input = {"class" = "Opengnsys\ServerBundle\Form\Type\Api\MenuType", "name" = ""},
+	 *   input = {"class" = "Opengnsys\ServerBundle\Form\Type\MenuType", "name" = ""},
 	 *   statusCodes = {
 	 *     204 = "Returned when successful",
 	 *     400 = "Returned when the form has errors"
diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Controller/Api/NetbootController.php b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Controller/Api/NetbootController.php
index 3f2c4ab0..af2179a6 100644
--- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Controller/Api/NetbootController.php
+++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Controller/Api/NetbootController.php
@@ -12,7 +12,7 @@ namespace Opengnsys\ServerBundle\Controller\Api;
 
 use Opengnsys\ServerBundle\Entity\Client;
 use Opengnsys\ServerBundle\Entity\Netboot;
-use Opengnsys\ServerBundle\Form\Type\Api\NetbootType;
+use Opengnsys\ServerBundle\Form\Type\NetbootType;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
@@ -146,7 +146,7 @@ class NetbootController extends ApiController
 	 * @ApiDoc(
 	 *   resource = true,
 	 *   description = "Creates a new object from the submitted data.",
-	 *   input = {"class" = "Opengnsys\ServerBundle\Form\Type\Api\NetbootType", "name" = ""},
+	 *   input = {"class" = "Opengnsys\ServerBundle\Form\Type\NetbootType", "name" = ""},
 	 *   statusCodes = {
 	 *     200 = "Returned when successful",
 	 *     400 = "Returned when the form has errors"
@@ -184,7 +184,7 @@ class NetbootController extends ApiController
 	 *
 	 * @ApiDoc(
 	 *   resource = true,
-	 *   input = {"class" = "Opengnsys\ServerBundle\Form\Type\Api\NetbootType", "name" = ""},
+	 *   input = {"class" = "Opengnsys\ServerBundle\Form\Type\NetbootType", "name" = ""},
 	 *   statusCodes = {
 	 *     204 = "Returned when successful",
 	 *     400 = "Returned when the form has errors"
diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Controller/Api/NetworkSettingsController.php b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Controller/Api/NetworkSettingsController.php
index 6903b9a8..27cb2dc5 100644
--- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Controller/Api/NetworkSettingsController.php
+++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Controller/Api/NetworkSettingsController.php
@@ -10,7 +10,7 @@
  
 namespace Opengnsys\ServerBundle\Controller\Api;
 
-use Opengnsys\ServerBundle\Form\Type\Api\NetworkSettingsType;
+use Opengnsys\ServerBundle\Form\Type\NetworkSettingsType;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
@@ -125,7 +125,7 @@ class NetworkSettingsController extends ApiController
 	 * @ApiDoc(
 	 *   resource = true,
 	 *   description = "Creates a new object from the submitted data.",
-	 *   input = {"class" = "Opengnsys\ServerBundle\Form\Type\Api\NetworkSettingsType", "name" = ""},
+	 *   input = {"class" = "Opengnsys\ServerBundle\Form\Type\NetworkSettingsType", "name" = ""},
 	 *   statusCodes = {
 	 *     200 = "Returned when successful",
 	 *     400 = "Returned when the form has errors"
@@ -171,7 +171,7 @@ class NetworkSettingsController extends ApiController
 	 *
 	 * @ApiDoc(
 	 *   resource = true,
-	 *   input = {"class" = "Opengnsys\ServerBundle\Form\Type\Api\NetworkSettingsType", "name" = ""},
+	 *   input = {"class" = "Opengnsys\ServerBundle\Form\Type\NetworkSettingsType", "name" = ""},
 	 *   statusCodes = {
 	 *     204 = "Returned when successful",
 	 *     400 = "Returned when the form has errors"
diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Controller/Api/OrganizationalUnitController.php b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Controller/Api/OrganizationalUnitController.php
index 21f6f9ff..1a1e969d 100644
--- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Controller/Api/OrganizationalUnitController.php
+++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Controller/Api/OrganizationalUnitController.php
@@ -12,7 +12,7 @@ namespace Opengnsys\ServerBundle\Controller\Api;
 
 use FOS\RestBundle\Context\Context;
 use Opengnsys\ServerBundle\Entity\OrganizationalUnit;
-use Opengnsys\ServerBundle\Form\Type\Api\OrganizationalUnitType;
+use Opengnsys\ServerBundle\Form\Type\OrganizationalUnitType;
 use Opengnsys\ServerBundle\OpengnsysServerBundle;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
@@ -177,7 +177,7 @@ class OrganizationalUnitController extends ApiController
 	 * @ApiDoc(
 	 *   resource = true,
 	 *   description = "Creates a new object from the submitted data.",
-	 *   input = {"class" = "Opengnsys\ServerBundle\Form\Type\Api\OrganizationalUnitType", "name" = ""},
+	 *   input = {"class" = "Opengnsys\ServerBundle\Form\Type\OrganizationalUnitType", "name" = ""},
 	 *   statusCodes = {
 	 *     200 = "Returned when successful",
 	 *     400 = "Returned when the form has errors"
@@ -223,7 +223,7 @@ class OrganizationalUnitController extends ApiController
 	 *
 	 * @ApiDoc(
 	 *   resource = true,
-	 *   input = {"class" = "Opengnsys\ServerBundle\Form\Type\Api\OrganizationalUnitType", "name" = ""},
+	 *   input = {"class" = "Opengnsys\ServerBundle\Form\Type\OrganizationalUnitType", "name" = ""},
 	 *   statusCodes = {
 	 *     204 = "Returned when successful",
 	 *     400 = "Returned when the form has errors"
diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Controller/Api/PartitionController.php b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Controller/Api/PartitionController.php
index 92097153..8e823351 100644
--- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Controller/Api/PartitionController.php
+++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Controller/Api/PartitionController.php
@@ -10,7 +10,7 @@
  
 namespace Opengnsys\ServerBundle\Controller\Api;
 
-use Opengnsys\ServerBundle\Form\Type\Api\PartitionType;
+use Opengnsys\ServerBundle\Form\Type\PartitionType;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
@@ -125,7 +125,7 @@ class PartitionController extends ApiController
 	 * @ApiDoc(
 	 *   resource = true,
 	 *   description = "Creates a new object from the submitted data.",
-	 *   input = {"class" = "Opengnsys\ServerBundle\Form\Type\Api\PartitionType", "name" = ""},
+	 *   input = {"class" = "Opengnsys\ServerBundle\Form\Type\PartitionType", "name" = ""},
 	 *   statusCodes = {
 	 *     200 = "Returned when successful",
 	 *     400 = "Returned when the form has errors"
@@ -171,7 +171,7 @@ class PartitionController extends ApiController
 	 *
 	 * @ApiDoc(
 	 *   resource = true,
-	 *   input = {"class" = "Opengnsys\ServerBundle\Form\Type\Api\PartitionType", "name" = ""},
+	 *   input = {"class" = "Opengnsys\ServerBundle\Form\Type\PartitionType", "name" = ""},
 	 *   statusCodes = {
 	 *     204 = "Returned when successful",
 	 *     400 = "Returned when the form has errors"
diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Controller/Api/RepositoryController.php b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Controller/Api/RepositoryController.php
index f98afae5..a3cf8bc8 100644
--- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Controller/Api/RepositoryController.php
+++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Controller/Api/RepositoryController.php
@@ -10,7 +10,7 @@
  
 namespace Opengnsys\ServerBundle\Controller\Api;
 
-use Opengnsys\ServerBundle\Form\Type\Api\RepositoryType;
+use Opengnsys\ServerBundle\Form\Type\RepositoryType;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
@@ -124,7 +124,7 @@ class RepositoryController extends ApiController
 	 * @ApiDoc(
 	 *   resource = true,
 	 *   description = "Creates a new object from the submitted data.",
-	 *   input = {"class" = "Opengnsys\ServerBundle\Form\Type\Api\RepositoryType", "name" = ""},
+	 *   input = {"class" = "Opengnsys\ServerBundle\Form\Type\RepositoryType", "name" = ""},
 	 *   statusCodes = {
 	 *     200 = "Returned when successful",
 	 *     400 = "Returned when the form has errors"
@@ -170,7 +170,7 @@ class RepositoryController extends ApiController
 	 *
 	 * @ApiDoc(
 	 *   resource = true,
-	 *   input = {"class" = "Opengnsys\ServerBundle\Form\Type\Api\RepositoryType", "name" = ""},
+	 *   input = {"class" = "Opengnsys\ServerBundle\Form\Type\RepositoryType", "name" = ""},
 	 *   statusCodes = {
 	 *     204 = "Returned when successful",
 	 *     400 = "Returned when the form has errors"
diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Controller/Api/SoftwareController.php b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Controller/Api/SoftwareController.php
index b087f070..73cdcd91 100644
--- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Controller/Api/SoftwareController.php
+++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Controller/Api/SoftwareController.php
@@ -10,7 +10,7 @@
  
 namespace Opengnsys\ServerBundle\Controller\Api;
 
-use Opengnsys\ServerBundle\Form\Type\Api\SoftwareType;
+use Opengnsys\ServerBundle\Form\Type\SoftwareType;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
@@ -125,7 +125,7 @@ class SoftwareController extends ApiController
 	 * @ApiDoc(
 	 *   resource = true,
 	 *   description = "Creates a new object from the submitted data.",
-	 *   input = {"class" = "Opengnsys\ServerBundle\Form\Type\Api\SoftwareType", "name" = ""},
+	 *   input = {"class" = "Opengnsys\ServerBundle\Form\Type\SoftwareType", "name" = ""},
 	 *   statusCodes = {
 	 *     200 = "Returned when successful",
 	 *     400 = "Returned when the form has errors"
@@ -171,7 +171,7 @@ class SoftwareController extends ApiController
 	 *
 	 * @ApiDoc(
 	 *   resource = true,
-	 *   input = {"class" = "Opengnsys\ServerBundle\Form\Type\Api\SoftwareType", "name" = ""},
+	 *   input = {"class" = "Opengnsys\ServerBundle\Form\Type\SoftwareType", "name" = ""},
 	 *   statusCodes = {
 	 *     204 = "Returned when successful",
 	 *     400 = "Returned when the form has errors"
diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Controller/Api/SoftwareProfileController.php b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Controller/Api/SoftwareProfileController.php
index 010ea951..39c4171f 100644
--- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Controller/Api/SoftwareProfileController.php
+++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Controller/Api/SoftwareProfileController.php
@@ -135,7 +135,7 @@ class SoftwareProfileController extends ApiController
 	 * @ApiDoc(
 	 *   resource = true,
 	 *   description = "Creates a new object from the submitted data.",
-	 *   input = {"class" = "Opengnsys\ServerBundle\Form\Type\Api\SoftwareProfileType", "name" = ""},
+	 *   input = {"class" = "Opengnsys\ServerBundle\Form\Type\SoftwareProfileType", "name" = ""},
 	 *   statusCodes = {
 	 *     200 = "Returned when successful",
 	 *     400 = "Returned when the form has errors"
@@ -181,7 +181,7 @@ class SoftwareProfileController extends ApiController
 	 *
 	 * @ApiDoc(
 	 *   resource = true,
-	 *   input = {"class" = "Opengnsys\ServerBundle\Form\Type\Api\SoftwareProfileType", "name" = ""},
+	 *   input = {"class" = "Opengnsys\ServerBundle\Form\Type\SoftwareProfileType", "name" = ""},
 	 *   statusCodes = {
 	 *     204 = "Returned when successful",
 	 *     400 = "Returned when the form has errors"
diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Controller/Api/TraceController.php b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Controller/Api/TraceController.php
index 388c3955..9224626c 100644
--- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Controller/Api/TraceController.php
+++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Controller/Api/TraceController.php
@@ -19,7 +19,7 @@ use Opengnsys\ServerBundle\Entity\Partition;
 use Opengnsys\ServerBundle\Entity\Software;
 use Opengnsys\ServerBundle\Entity\SoftwareProfile;
 use Opengnsys\ServerBundle\Entity\Trace;
-use Opengnsys\ServerBundle\Form\Type\Api\TraceType;
+use Opengnsys\ServerBundle\Form\Type\TraceType;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Controller/Api/UserController.php b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Controller/Api/UserController.php
index 7332888d..1995e2a5 100644
--- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Controller/Api/UserController.php
+++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Controller/Api/UserController.php
@@ -10,7 +10,7 @@
  
 namespace Opengnsys\ServerBundle\Controller\Api;
 
-use Opengnsys\ServerBundle\Form\Type\Api\UserFormType;
+use Opengnsys\ServerBundle\Form\Type\UserFormType;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Controller/Api/ValidationSettingsController.php b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Controller/Api/ValidationSettingsController.php
deleted file mode 100644
index b0d77506..00000000
--- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Controller/Api/ValidationSettingsController.php
+++ /dev/null
@@ -1,258 +0,0 @@
-<?php
-
-/*
- * This file is part of the Opengnsys Project package.
- *
- * Created by Miguel Angel de Vega on 18/03/16. <miguelangel.devega@sic.com>
- * Copyright (c) 2015 Opengnsys. All rights reserved.
- *
- */
- 
-namespace Opengnsys\ServerBundle\Controller\Api;
-
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
-use Symfony\Component\Form\FormTypeInterface;
-
-use FOS\RestBundle\Util\Codes;
-use FOS\RestBundle\Controller\Annotations;
-use FOS\RestBundle\Controller\Annotations\RouteResource;
-use FOS\RestBundle\View\View;
-use FOS\RestBundle\Request\ParamFetcherInterface;
-
-use Nelmio\ApiDocBundle\Annotation\ApiDoc;
-
-use Opengnsys\CoreBundle\Exception\InvalidFormException;
-use Opengnsys\CoreBundle\Controller\ApiController;
-
-/**
- * @RouteResource("ValidationSettings")
- */
-class ValidationSettingsController extends ApiController
-{	
-	
-	/**
-	 * Options a ValidationSettings from the submitted data.
-	 *
-	 * @ApiDoc(
-	 *   resource = true,
-	 *   description = "Options ValidationSettings",
-	 * )
-	 *
-	 * @param Request $request the request object
-	 *
-	 * @return Response
-	 */
-	public function optionsAction(Request $request)
-    {
-        $request->setRequestFormat($request->get('_format'));
-		$array = array();
-		$array['class'] = "opengnsys_server__api_form_type_validation_settings";
-		$array['options'] = array();
-		
-		$options = $this->container->get('nelmio_api_doc.parser.form_type_parser')->parse($array);
-		return $options;
-	}
-	
-	/**
-	 * List all ValidationSettings.
-	 *
-	 * @ApiDoc(
-	 *   resource = true,
-	 *   statusCodes = {
-	 *     200 = "Returned when successful"
-	 *   }
-	 * )
-	 *
-	 * @Annotations\QueryParam(name="offset", requirements="\d+", nullable=true, description="Offset from which to start listing objects.")
-	 * @Annotations\QueryParam(name="limit", requirements="\d+", nullable=true, description="How many objects to return.")
-	 *
-	 * @Annotations\View(templateVar="ValidationSettings", serializerGroups={"opengnsys_server__validation_settings_cget"})
-	 *
-	 * @param Request               $request      the request object
-	 * @param ParamFetcherInterface $paramFetcher param fetcher service
-	 *
-	 * @return array
-	 */
-	public function cgetAction(Request $request, ParamFetcherInterface $paramFetcher)
-	{
-        $request->setRequestFormat($request->get('_format'));
-		$offset = $paramFetcher->get('offset');
-		$offset = null == $offset ? 0 : $offset;
-		$limit = $paramFetcher->get('limit');
-		
-		$matching = $this->filterCriteria($paramFetcher);
-		
-		$objects = $this->container->get('opengnsys_server.validation_settings_manager')->searchBy($limit, $offset, $matching);
-			
-		return $objects;
-	}
-	
-	/**
-	 * Get single ValidationSettings.
-	 *
-	 * @ApiDoc(
-	 *   resource = true,
-	 *   description = "Gets a ValidationSettings for a given id",
-	 *   output = "Opengnsys\ServerBundle\Entity\ValidationSettings",
-	 *   statusCodes = {
-	 *     200 = "Returned when successful",
-	 *     404 = "Returned when the validationSettings is not found"
-	 *   }
-	 * )
-	 *
-	 * @Annotations\View(templateVar="validationSettings", serializerGroups={"opengnsys_server__validation_settings_get"})
-	 *
-	 * @param int     $slug      the validationSettings id
-	 *
-	 * @return array
-	 *
-	 * @throws NotFoundHttpException when validationSettings not exist
-	 */
-	public function getAction(Request $request, $slug)
-	{
-        $request->setRequestFormat($request->get('_format'));
-		$object = $this->getOr404($slug);
-	
-		return $object;
-	}
-	
-	/**
-	 * Create a ValidationSettings from the submitted data.
-	 *
-	 * @ApiDoc(
-	 *   resource = true,
-	 *   description = "Creates a new object from the submitted data.",
-	 *   input = {"class" = "opengnsys_server__api_form_type_validation_settings", "name" = ""},
-	 *   statusCodes = {
-	 *     200 = "Returned when successful",
-	 *     400 = "Returned when the form has errors"
-	 *   }
-	 * )
-	 *
-	 * @Annotations\View(
-	 *  template = "object",
-	 *  serializerGroups={"opengnsys_server__validation_settings_get"},
-	 *  statusCode = Response::HTTP_CREATED
-	 * )
-	 *
-	 * @param Request $request the request object
-	 *
-	 * @return FormTypeInterface|View
-	 */
-	public function cpostAction(Request $request)
-	{
-        $request->setRequestFormat($request->get('_format'));
-		try {
-			$object = $this->container->get('opengnsys_server.validation_settings_manager')->post(
-					$request->request->all()
-			);	
-			
-			/*
-			if (is_object($this->getUser()))
-			{
-				$admin = $this->container->get('globunet_api.admin.object');
-				$admin->createObjectSecurity($object);
-			}
-			*/
-	
-			return $object;
-	
-		} catch (InvalidFormException $exception) {
-	
-			return $exception->getForm();
-		}
-	}
-	
-	/**
-	 * Update existing ValidationSettings from the submitted data or create a new ValidationSettings at a specific location.
-	 *
-	 * @ApiDoc(
-	 *   resource = true,
-	 *   input = {"class" = "opengnsys_server__api_form_type_validation_settings", "name" = ""},
-	 *   statusCodes = {
-	 *     204 = "Returned when successful",
-	 *     400 = "Returned when the form has errors"
-	 *   }
-	 * )
-	 *
-	 * @Annotations\View(
-	 *  template = "object",
-	 *  serializerGroups={"opengnsys_server__validation_settings_get"},
-	 *  statusCode = Response::HTTP_OK
-	 * )
-	 *
-	 * @param Request $request the request object
-	 * @param int     $slug      the validationSettings id
-	 *
-	 * @return FormTypeInterface|View
-	 *
-	 * @throws NotFoundHttpException when ValidationSettings not exist
-	 */
-	public function patchAction(Request $request, $slug)
-	{
-        $request->setRequestFormat($request->get('_format'));
-		try {
-			$object = $this->container->get('opengnsys_server.validation_settings_manager')->patch(
-					$this->getOr404($slug),
-					$request->request->all()
-			);
-	
-			return $object;
-			
-		} catch (InvalidFormException $exception) {
-	
-			return $exception->getForm();
-		}
-	}
-	
-	/**
-	 * Delete single ValidationSettings.
-	 *
-	 * @ApiDoc(
-	 *   resource = true,
-	 *   description = "Delete a ValidationSettings for a given id",
-	 *   output = "Opengnsys\ServerBundle\Entity\ValidationSettings",
-	 *   statusCodes = {
-	 *     200 = "Returned when successful",
-	 *     404 = "Returned when the validationSettings is not found"
-	 *   }
-	 * )
-	 *
-	 * @Annotations\View(templateVar="delete")
-	 *
-	 * @param int $slug the object id
-	 *
-	 * @return array
-	 *
-	 * @throws NotFoundHttpException when object not exist
-	 */
-	public function deleteAction(Request $request, $slug)
-	{
-        $request->setRequestFormat($request->get('_format'));
-		$object = $this->getOr404($slug);
-		
-		$object = $this->container->get('opengnsys_server.validation_settings_manager')->delete($object);
-	
-		return $this->view(null, Response::HTTP_NO_CONTENT);
-	}
-	
-	/**
-	 * Fetch a ValidationSettings or throw an 404 Exception.
-	 *
-	 * @param mixed $slug
-	 *
-	 * @return ValidationSettings
-	 *
-	 * @throws NotFoundHttpException
-	 */
-	protected function getOr404($slug)
-	{
-		if (!($object = $this->container->get('opengnsys_server.validation_settings_manager')->get($slug))) {
-			throw new NotFoundHttpException(sprintf('The resource \'%s\' was not found.',$slug));
-		}
-	
-		return $object;
-	}
-}
diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Client.php b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Client.php
index 78d6b4a9..5d52c3fa 100644
--- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Client.php
+++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Client.php
@@ -69,11 +69,6 @@ class Client extends BaseEntity
     private $partitions;
 
     /**
-     * @var \Opengnsys\ServerBundle\Entity\ValidationSettings
-     */
-    private $validationSettings;
-
-    /**
      * @var \Opengnsys\ServerBundle\Entity\HardwareProfile
      */
     private $hardwareProfile;
@@ -118,8 +113,8 @@ class Client extends BaseEntity
      */
     public function getPartition($key)
     {
-        $partition = null;
-        if(!$partition = $this->partitions->get($key)){
+        $partition = $this->partitions->get($key);
+        if($partition == null){
             $partition = new Partition();
             $partition->setClient($this);
             $this->partitions[$key] = $partition;
@@ -414,30 +409,6 @@ class Client extends BaseEntity
     }
 
     /**
-     * Set validationSettings.
-     *
-     * @param \Opengnsys\ServerBundle\Entity\ValidationSettings|null $validationSettings
-     *
-     * @return Client
-     */
-    public function setValidationSettings(\Opengnsys\ServerBundle\Entity\ValidationSettings $validationSettings = null)
-    {
-        $this->validationSettings = $validationSettings;
-
-        return $this;
-    }
-
-    /**
-     * Get validationSettings.
-     *
-     * @return \Opengnsys\ServerBundle\Entity\ValidationSettings|null
-     */
-    public function getValidationSettings()
-    {
-        return $this->validationSettings;
-    }
-
-    /**
      * Set hardwareProfile.
      *
      * @param \Opengnsys\ServerBundle\Entity\HardwareProfile|null $hardwareProfile
diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Enum/NetbootType.php b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Enum/NetbootType.php
new file mode 100644
index 00000000..2de9966d
--- /dev/null
+++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Enum/NetbootType.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace Opengnsys\ServerBundle\Entity\Enum;
+
+abstract class NetbootType {
+
+    const BIOS = "BIOS";
+    const UEFI = "UEFI";
+
+    protected $name = 'NETBOOT_TYPE';
+    protected $values = array(self::BIOS, self::UEFI);
+
+    public static $options = array(self::BIOS, self::UEFI);
+
+    public function getValues()
+    {
+        return $this->values;
+    }
+}
diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Netboot.php b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Netboot.php
index 14a87ced..7befb73a 100644
--- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Netboot.php
+++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/Netboot.php
@@ -24,6 +24,11 @@ class Netboot extends BaseEntity
     private $template;
 
     /**
+     * @var string|null
+     */
+    private $type;
+
+    /**
      * @var integer
      */
     private $id;
@@ -110,4 +115,28 @@ class Netboot extends BaseEntity
     {
         return $this->id;
     }
+
+    /**
+     * Set type.
+     *
+     * @param string|null $type
+     *
+     * @return Netboot
+     */
+    public function setType($type = null)
+    {
+        $this->type = $type;
+
+        return $this;
+    }
+
+    /**
+     * Get type.
+     *
+     * @return string|null
+     */
+    public function getType()
+    {
+        return $this->type;
+    }
 }
diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/OrganizationalUnit.php b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/OrganizationalUnit.php
index 31ff3276..04262ec7 100644
--- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/OrganizationalUnit.php
+++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/OrganizationalUnit.php
@@ -44,11 +44,6 @@ class OrganizationalUnit extends BaseEntity
     private $parent;
 
     /**
-     * @var \Opengnsys\ServerBundle\Entity\ValidationSettings
-     */
-    private $validationSettings;
-
-    /**
      * @var \Opengnsys\ServerBundle\Entity\NetworkSettings
      */
     private $networkSettings;
@@ -241,30 +236,6 @@ class OrganizationalUnit extends BaseEntity
     }
 
     /**
-     * Set validationSettings.
-     *
-     * @param \Opengnsys\ServerBundle\Entity\ValidationSettings|null $validationSettings
-     *
-     * @return OrganizationalUnit
-     */
-    public function setValidationSettings(\Opengnsys\ServerBundle\Entity\ValidationSettings $validationSettings = null)
-    {
-        $this->validationSettings = $validationSettings;
-
-        return $this;
-    }
-
-    /**
-     * Get validationSettings.
-     *
-     * @return \Opengnsys\ServerBundle\Entity\ValidationSettings|null
-     */
-    public function getValidationSettings()
-    {
-        return $this->validationSettings;
-    }
-
-    /**
      * Set networkSettings.
      *
      * @param \Opengnsys\ServerBundle\Entity\NetworkSettings|null $networkSettings
diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/ValidationSettings.php b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/ValidationSettings.php
deleted file mode 100644
index 3685b00c..00000000
--- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Entity/ValidationSettings.php
+++ /dev/null
@@ -1,112 +0,0 @@
-<?php
-
-namespace Opengnsys\ServerBundle\Entity;
-
-/**
- * ValidationSettings
- */
-class ValidationSettings extends BaseEntity
-{
-    /**
-     * @var string
-     */
-    private $loginpage;
-
-    /**
-     * @var string
-     */
-    private $validationpage;
-
-    /**
-     * @var boolean
-     */
-    private $validation;
-
-    /**
-     * @var integer
-     */
-    private $id;
-
-
-    /**
-     * Set loginpage
-     *
-     * @param string $loginpage
-     *
-     * @return ValidationSettings
-     */
-    public function setLoginpage($loginpage)
-    {
-        $this->loginpage = $loginpage;
-
-        return $this;
-    }
-
-    /**
-     * Get loginpage
-     *
-     * @return string
-     */
-    public function getLoginpage()
-    {
-        return $this->loginpage;
-    }
-
-    /**
-     * Set validationpage
-     *
-     * @param string $validationpage
-     *
-     * @return ValidationSettings
-     */
-    public function setValidationpage($validationpage)
-    {
-        $this->validationpage = $validationpage;
-
-        return $this;
-    }
-
-    /**
-     * Get validationpage
-     *
-     * @return string
-     */
-    public function getValidationpage()
-    {
-        return $this->validationpage;
-    }
-
-    /**
-     * Set validation
-     *
-     * @param boolean $validation
-     *
-     * @return ValidationSettings
-     */
-    public function setValidation($validation)
-    {
-        $this->validation = $validation;
-
-        return $this;
-    }
-
-    /**
-     * Get validation
-     *
-     * @return boolean
-     */
-    public function getValidation()
-    {
-        return $this->validation;
-    }
-
-    /**
-     * Get id
-     *
-     * @return integer
-     */
-    public function getId()
-    {
-        return $this->id;
-    }
-}
diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Form/Type/Api/ValidationSettingsType.php b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Form/Type/Api/ValidationSettingsType.php
deleted file mode 100644
index 33a6ed50..00000000
--- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Form/Type/Api/ValidationSettingsType.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-
-/*
- * This file is part of the Opengnsys Project package.
- *
- * Created by Miguel Angel de Vega on 18/03/16. <miguelangel.devega@sic.com>
- * Copyright (c) 2015 Opengnsys. All rights reserved.
- *
- */
-
-namespace Opengnsys\ServerBundle\Form\Type\Api;
-
-use Opengnsys\ServerBundle\Entity\ValidationSettings;
-use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\OptionsResolver\OptionsResolver;
-
-class ValidationSettingsType extends AbstractType
-{
-	/**
-     * @param FormBuilderInterface $builder
-     * @param array $options
-     */
-    public function buildForm(FormBuilderInterface $builder, array $options)
-    {
-        $builder
-            ->add('loginpage')
-            ->add('validationpage')
-            ->add('validation')
-        ;
-    }
-    
-    /**
-     * @param OptionsResolver $resolver
-     */
-    public function configureOptions(OptionsResolver $resolver)
-    {
-        $resolver->setDefaults(array(
-            'data_class' => ValidationSettings::class,
-            'csrf_protection' => false,
-            'allow_extra_fields' => true
-        ));
-    }
-
-    /**
-     * @return string
-     */
-    public function getName()
-    {
-        return 'opengnsys_server__api_form_type_validation_settings';
-    }    
-}
diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Form/Type/Api/ClientConfigType.php b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Form/Type/ClientConfigType.php
index 7a25a092..9937db57 100644
--- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Form/Type/Api/ClientConfigType.php
+++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Form/Type/ClientConfigType.php
@@ -8,7 +8,7 @@
  *
  */
 
-namespace Opengnsys\ServerBundle\Form\Type\Api;
+namespace Opengnsys\ServerBundle\Form\Type;
 
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Form/Type/Api/ClientStatusType.php b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Form/Type/ClientStatusType.php
index d4031004..b83d33aa 100644
--- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Form/Type/Api/ClientStatusType.php
+++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Form/Type/ClientStatusType.php
@@ -8,7 +8,7 @@
  *
  */
 
-namespace Opengnsys\ServerBundle\Form\Type\Api;
+namespace Opengnsys\ServerBundle\Form\Type;
 
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Form/Type/Api/ClientType.php b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Form/Type/ClientType.php
index c3032b07..4aec6b44 100644
--- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Form/Type/Api/ClientType.php
+++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Form/Type/ClientType.php
@@ -8,7 +8,7 @@
  *
  */
 
-namespace Opengnsys\ServerBundle\Form\Type\Api;
+namespace Opengnsys\ServerBundle\Form\Type;
 
 use Opengnsys\ServerBundle\Entity\Client;
 use Symfony\Component\Form\AbstractType;
diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Form/Type/Api/CommandExecuteType.php b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Form/Type/CommandExecuteType.php
index 82d773f9..be60b97e 100644
--- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Form/Type/Api/CommandExecuteType.php
+++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Form/Type/CommandExecuteType.php
@@ -8,7 +8,7 @@
  *
  */
 
-namespace Opengnsys\ServerBundle\Form\Type\Api;
+namespace Opengnsys\ServerBundle\Form\Type;
 
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Form/Type/Api/CommandType.php b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Form/Type/CommandType.php
index 871f2e28..93bdf1d8 100644
--- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Form/Type/Api/CommandType.php
+++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Form/Type/CommandType.php
@@ -8,7 +8,7 @@
  *
  */
 
-namespace Opengnsys\ServerBundle\Form\Type\Api;
+namespace Opengnsys\ServerBundle\Form\Type;
 
 use Opengnsys\ServerBundle\Entity\Command;
 use Symfony\Component\Form\AbstractType;
diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Form/Type/Api/HardwareProfileType.php b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Form/Type/HardwareProfileType.php
index 46a259bb..fbee4756 100644
--- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Form/Type/Api/HardwareProfileType.php
+++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Form/Type/HardwareProfileType.php
@@ -8,7 +8,7 @@
  *
  */
 
-namespace Opengnsys\ServerBundle\Form\Type\Api;
+namespace Opengnsys\ServerBundle\Form\Type;
 
 use Opengnsys\ServerBundle\Entity\HardwareProfile;
 use Symfony\Component\Form\AbstractType;
diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Form/Type/Api/HardwareType.php b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Form/Type/HardwareType.php
index 876d090a..cd33ede8 100644
--- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Form/Type/Api/HardwareType.php
+++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Form/Type/HardwareType.php
@@ -8,7 +8,7 @@
  *
  */
 
-namespace Opengnsys\ServerBundle\Form\Type\Api;
+namespace Opengnsys\ServerBundle\Form\Type;
 
 use Opengnsys\ServerBundle\Entity\Hardware;
 use Symfony\Component\Form\AbstractType;
diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Form/Type/Api/ImageType.php b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Form/Type/ImageType.php
index a3c2bc65..8049ad58 100644
--- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Form/Type/Api/ImageType.php
+++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Form/Type/ImageType.php
@@ -8,7 +8,7 @@
  *
  */
 
-namespace Opengnsys\ServerBundle\Form\Type\Api;
+namespace Opengnsys\ServerBundle\Form\Type;
 
 use Opengnsys\ServerBundle\Entity\Image;
 use Symfony\Component\Form\AbstractType;
diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Form/Type/Api/MenuType.php b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Form/Type/MenuType.php
index 339a09b0..d117240f 100644
--- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Form/Type/Api/MenuType.php
+++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Form/Type/MenuType.php
@@ -8,7 +8,7 @@
  *
  */
 
-namespace Opengnsys\ServerBundle\Form\Type\Api;
+namespace Opengnsys\ServerBundle\Form\Type;
 
 use Opengnsys\ServerBundle\Entity\Menu;
 use Symfony\Component\Form\AbstractType;
diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Form/Type/Api/NetbootType.php b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Form/Type/NetbootType.php
index 2b5dac87..d4f0f711 100644
--- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Form/Type/Api/NetbootType.php
+++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Form/Type/NetbootType.php
@@ -8,7 +8,7 @@
  *
  */
 
-namespace Opengnsys\ServerBundle\Form\Type\Api;
+namespace Opengnsys\ServerBundle\Form\Type;
 
 use Opengnsys\ServerBundle\Entity\Netboot;
 use Symfony\Component\Form\AbstractType;
@@ -27,6 +27,7 @@ class NetbootType extends AbstractType
             ->add('name', null, array('required'=>true))
             ->add('filename', null, array('required'=>true))
             ->add('template', null, array('required'=>true))
+            ->add('type', null, array('required'=>true))
 
         ;
     }
diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Form/Type/Api/NetworkSettingsType.php b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Form/Type/NetworkSettingsType.php
index 92304f84..f3115e83 100644
--- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Form/Type/Api/NetworkSettingsType.php
+++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Form/Type/NetworkSettingsType.php
@@ -8,7 +8,7 @@
  *
  */
 
-namespace Opengnsys\ServerBundle\Form\Type\Api;
+namespace Opengnsys\ServerBundle\Form\Type;
 
 use Opengnsys\ServerBundle\Entity\NetworkSettings;
 use Symfony\Component\Form\AbstractType;
diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Form/Type/Api/OrganizationalUnitType.php b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Form/Type/OrganizationalUnitType.php
index 9f82b894..fc883740 100644
--- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Form/Type/Api/OrganizationalUnitType.php
+++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Form/Type/OrganizationalUnitType.php
@@ -8,7 +8,7 @@
  *
  */
 
-namespace Opengnsys\ServerBundle\Form\Type\Api;
+namespace Opengnsys\ServerBundle\Form\Type;
 
 use Opengnsys\ServerBundle\Entity\OrganizationalUnit;
 use Symfony\Component\Form\AbstractType;
diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Form/Type/Api/OsNameType.php b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Form/Type/OsNameType.php
index 0dece64c..7a7ce4f9 100644
--- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Form/Type/Api/OsNameType.php
+++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Form/Type/OsNameType.php
@@ -8,7 +8,7 @@
  *
  */
 
-namespace Opengnsys\ServerBundle\Form\Type\Api;
+namespace Opengnsys\ServerBundle\Form\Type;
 
 use Opengnsys\ServerBundle\Entity\OsName;
 use Symfony\Component\Form\AbstractType;
diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Form/Type/Api/PartitionType.php b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Form/Type/PartitionType.php
index 9de6f889..07843249 100644
--- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Form/Type/Api/PartitionType.php
+++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Form/Type/PartitionType.php
@@ -8,7 +8,7 @@
  *
  */
 
-namespace Opengnsys\ServerBundle\Form\Type\Api;
+namespace Opengnsys\ServerBundle\Form\Type;
 
 use Opengnsys\ServerBundle\Entity\Partition;
 use Symfony\Component\Form\AbstractType;
diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Form/Type/Api/RepositoryType.php b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Form/Type/RepositoryType.php
index e562c643..77cd56d6 100644
--- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Form/Type/Api/RepositoryType.php
+++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Form/Type/RepositoryType.php
@@ -8,7 +8,7 @@
  *
  */
 
-namespace Opengnsys\ServerBundle\Form\Type\Api;
+namespace Opengnsys\ServerBundle\Form\Type;
 
 use Opengnsys\ServerBundle\Entity\Repository;
 use Symfony\Component\Form\AbstractType;
diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Form/Type/Api/SoftwareProfileType.php b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Form/Type/SoftwareProfileType.php
index ef4e6ba3..d64ea0e8 100644
--- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Form/Type/Api/SoftwareProfileType.php
+++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Form/Type/SoftwareProfileType.php
@@ -8,7 +8,7 @@
  *
  */
 
-namespace Opengnsys\ServerBundle\Form\Type\Api;
+namespace Opengnsys\ServerBundle\Form\Type;
 
 use Opengnsys\ServerBundle\Entity\SoftwareProfile;
 use Symfony\Component\Form\AbstractType;
diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Form/Type/Api/SoftwareType.php b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Form/Type/SoftwareType.php
index fa8915da..e4ce76e5 100644
--- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Form/Type/Api/SoftwareType.php
+++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Form/Type/SoftwareType.php
@@ -8,7 +8,7 @@
  *
  */
 
-namespace Opengnsys\ServerBundle\Form\Type\Api;
+namespace Opengnsys\ServerBundle\Form\Type;
 
 use Opengnsys\ServerBundle\Entity\Software;
 use Symfony\Component\Form\AbstractType;
diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Form/Type/Api/TraceType.php b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Form/Type/TraceType.php
index b8c3ebd3..dee236b6 100644
--- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Form/Type/Api/TraceType.php
+++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Form/Type/TraceType.php
@@ -8,7 +8,7 @@
  *
  */
 
-namespace Opengnsys\ServerBundle\Form\Type\Api;
+namespace Opengnsys\ServerBundle\Form\Type;
 
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
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 f66884a5..9c65a5c3 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
@@ -35,15 +35,9 @@
             </cascade>
         </one-to-many>
 
-        <many-to-one field="validationSettings" target-entity="\Opengnsys\ServerBundle\Entity\ValidationSettings">
-            <join-columns>
-                <join-column name="validation_settings_id" referenced-column-name="id"/>
-            </join-columns>
-        </many-to-one>
-
         <many-to-one field="hardwareProfile" target-entity="\Opengnsys\ServerBundle\Entity\HardwareProfile">
             <join-columns>
-                <join-column name="hardware_profile_id" referenced-column-name="id"/>
+                <join-column name="hardware_profile_id" referenced-column-name="id" on-delete="SET NULL"/>
             </join-columns>
         </many-to-one>
 
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 1a1ab5b3..55bcdce9 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
@@ -25,10 +25,10 @@
 
             <join-table name="og_server__hardware_profiles_hardwares">
                 <join-columns>
-                    <join-column name="hardware_profile_id" referenced-column-name="id"/>
+                    <join-column name="hardware_profile_id" referenced-column-name="id" on-delete="CASCADE"/>
                 </join-columns>
                 <inverse-join-columns>
-                    <join-column name="hardware_id" referenced-column-name="id" unique="false"/>
+                    <join-column name="hardware_id" referenced-column-name="id" unique="false" on-delete="CASCADE"/>
                 </inverse-join-columns>
             </join-table>
         </many-to-many>
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 cc30ec0d..8ec9db2c 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
@@ -9,7 +9,12 @@
             <generator strategy="AUTO"/>
         </id>
 
-        <field name="canonicalName" type="string" column="canonical_name" length="50" nullable="false" unique="true"/>
+        <unique-constraints>
+            <unique-constraint columns="canonical_name,repository_id" name="unique1_idx" />
+        </unique-constraints>
+
+
+        <field name="canonicalName" type="string" column="canonical_name" length="50" nullable="false"/>
         <field name="description" type="string" column="description" length="250" nullable="false"/>
 
         <field name="comments" type="text" column="comments" length="65535" nullable="true"/>
@@ -27,7 +32,7 @@
 
         <many-to-one field="softwareProfile" target-entity="\Opengnsys\ServerBundle\Entity\SoftwareProfile">
             <join-columns>
-                <join-column name="sotfware_profile_id" referenced-column-name="id"/>
+                <join-column name="sotfware_profile_id" referenced-column-name="id" on-delete="SET NULL"/>
             </join-columns>
         </many-to-one>
 
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 c0715ae8..06f9b567 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
@@ -12,6 +12,7 @@
         <field name="name" type="string" column="name" length="30" nullable="false"/>
         <field name="filename" type="string" column="filename" length="120" nullable="false"/>
         <field name="template" type="text" column="template" nullable="false"/>
+        <field name="type" column="type" type="string" length="64" nullable="true"/>
 
     </entity>
 </doctrine-mapping>
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 3f93b52b..4214a93c 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
@@ -41,12 +41,6 @@
             </join-columns>
         </many-to-one>
 
-        <many-to-one field="validationSettings" target-entity="\Opengnsys\ServerBundle\Entity\ValidationSettings">
-            <join-columns>
-                <join-column name="validation_settings_id" referenced-column-name="id"/>
-            </join-columns>
-        </many-to-one>
-
         <many-to-one field="networkSettings" target-entity="\Opengnsys\ServerBundle\Entity\NetworkSettings">
             <cascade>
                 <cascade-all/>
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 e79262e5..5b40c4c0 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
@@ -17,7 +17,7 @@
         <field name="numPartition" type="integer" column="num_partition" nullable="false"/>
         <field name="size" type="integer" column="size_" nullable="false"/>
         <field name="usage" type="float" column="usage_" nullable="false"/>
-        <field name="cacheContent" type="string" column="cache_content" length="500" nullable="true"/>
+        <field name="cacheContent" type="text" column="cache_content" nullable="true"/>
 
         <field name="filesystem" column="filesystem" type="string" length="50" nullable="true"/>
         <field name="partitionCode" column="partition_code" type="string" length="50" nullable="true"/>
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 6fe7f0ea..353f8b62 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
@@ -26,10 +26,10 @@
 
             <join-table name="og_server__software_profiles_softwares">
                 <join-columns>
-                    <join-column name="software_profile_id" referenced-column-name="id"/>
+                    <join-column name="software_profile_id" referenced-column-name="id" on-delete="CASCADE"/>
                 </join-columns>
                 <inverse-join-columns>
-                    <join-column name="software_id" referenced-column-name="id" unique="false"/>
+                    <join-column name="software_id" referenced-column-name="id" unique="false" on-delete="CASCADE"/>
                 </inverse-join-columns>
             </join-table>
         </many-to-many>
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 ce0308b2..96babbcd 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
@@ -22,7 +22,7 @@
 
         <many-to-one field="client" target-entity="\Opengnsys\ServerBundle\Entity\Client">
             <join-columns>
-                <join-column name="client_id" referenced-column-name="id"/>
+                <join-column name="client_id" referenced-column-name="id" on-delete="CASCADE"/>
             </join-columns>
         </many-to-one>
 
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
deleted file mode 100644
index 5e01464b..00000000
--- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/doctrine/ValidationSettings.orm.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?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_server__validation_settings"
-          repository-class="Opengnsys\ServerBundle\Entity\Repository\ValidationSettingsRepository">
-
-    <id name="id" type="integer" column="id">
-      <generator strategy="AUTO"/>
-    </id>
-
-    <field name="loginpage" type="string" column="loginpage" length="100" nullable="true"/>
-    <field name="validationpage" type="string" column="validationpage" length="100" nullable="true"/>
-    <field name="validation" type="boolean" column="validation" nullable="true"/>
-
-  </entity>
-</doctrine-mapping>
diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/routing/api.yml b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/routing/api.yml
index c7f191af..947e4268 100644
--- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/routing/api.yml
+++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/routing/api.yml
@@ -46,10 +46,6 @@ software_profile:
     type: rest
     resource: Opengnsys\ServerBundle\Controller\Api\SoftwareProfileController
     name_prefix: opengnsys_server__api_
-#validation_settings:
-#    type: rest
-#    resource: Opengnsys\ServerBundle\Controller\Api\ValidationSettingsController
-#    name_prefix: opengnsys_server__api_
 command:
     type: rest
     resource: Opengnsys\ServerBundle\Controller\Api\CommandController
diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/serializer/OpengnsysServerBundle/Entity.Netboot.yml b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/serializer/OpengnsysServerBundle/Entity.Netboot.yml
index e08fa39e..c121148d 100644
--- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/serializer/OpengnsysServerBundle/Entity.Netboot.yml
+++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/serializer/OpengnsysServerBundle/Entity.Netboot.yml
@@ -17,3 +17,7 @@ Opengnsys\ServerBundle\Entity\Netboot:
             groups: [opengnsys_server__netboot_get, opengnsys_server__netboot_cget]
             expose: true
             serialized_name: template
+        type:
+            groups: [opengnsys_server__netboot_get, opengnsys_server__netboot_cget]
+            expose: true
+            serialized_name: type
diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/serializer/OpengnsysServerBundle/Entity.ValidationSettings.yml b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/serializer/OpengnsysServerBundle/Entity.ValidationSettings.yml
deleted file mode 100644
index 8f107e0e..00000000
--- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/serializer/OpengnsysServerBundle/Entity.ValidationSettings.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-Opengnsys\ServerBundle\Entity\ValidationSettings:
-    exclusion_policy: ALL
-    properties:
-        loginpage:
-            groups: [opengnsys_server__validation_settings_get, opengnsys_server__validation_settings_cget]
-            expose: true
-            serialized_name: loginpage
-        validationpage:
-            groups: [opengnsys_server__validation_settings_get, opengnsys_server__validation_settings_cget]
-            expose: true
-            serialized_name: validationpage
-        validation:
-            groups: [opengnsys_server__validation_settings_get, opengnsys_server__validation_settings_cget]
-            expose: true
-            serialized_name: validation
-        id:
-            groups: [opengnsys_server__validation_settings_get, opengnsys_server__validation_settings_cget]
-            expose: true
-            serialized_name: id
\ No newline at end of file
diff --git a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/services.yml b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/services.yml
index 1a90cce8..2d0f05e2 100644
--- a/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/services.yml
+++ b/admin/WebConsole3/backend/src/Opengnsys/ServerBundle/Resources/config/services.yml
@@ -26,65 +26,61 @@ services:
     # MANAGER
     opengnsys_server.client_manager:
         class: Opengnsys\CoreBundle\Domain\ModelExtendedManager
-        arguments: ["@doctrine.orm.entity_manager", "@form.factory", Opengnsys\ServerBundle\Form\Type\Api\ClientType, Opengnsys\ServerBundle\Entity\Client]
+        arguments: ["@doctrine.orm.entity_manager", "@form.factory", Opengnsys\ServerBundle\Form\Type\ClientType, Opengnsys\ServerBundle\Entity\Client]
 
     opengnsys_server.command_manager:
         class: Opengnsys\CoreBundle\Domain\ModelExtendedManager
-        arguments: ["@doctrine.orm.entity_manager", "@form.factory", Opengnsys\ServerBundle\Form\Type\Api\CommandType, Opengnsys\ServerBundle\Entity\Command]
+        arguments: ["@doctrine.orm.entity_manager", "@form.factory", Opengnsys\ServerBundle\Form\Type\CommandType, Opengnsys\ServerBundle\Entity\Command]
 
     opengnsys_server.hardware_manager:
         class: Opengnsys\CoreBundle\Domain\ModelExtendedManager
-        arguments: ["@doctrine.orm.entity_manager", "@form.factory", Opengnsys\ServerBundle\Form\Type\Api\HardwareType, Opengnsys\ServerBundle\Entity\Hardware]
+        arguments: ["@doctrine.orm.entity_manager", "@form.factory", Opengnsys\ServerBundle\Form\Type\HardwareType, Opengnsys\ServerBundle\Entity\Hardware]
 
     opengnsys_server.hardware_profile_manager:
         class: Opengnsys\CoreBundle\Domain\ModelExtendedManager
-        arguments: ["@doctrine.orm.entity_manager", "@form.factory", Opengnsys\ServerBundle\Form\Type\Api\HardwareProfileType, Opengnsys\ServerBundle\Entity\HardwareProfile]
+        arguments: ["@doctrine.orm.entity_manager", "@form.factory", Opengnsys\ServerBundle\Form\Type\HardwareProfileType, Opengnsys\ServerBundle\Entity\HardwareProfile]
 
     opengnsys_server.image_manager:
         class: Opengnsys\CoreBundle\Domain\ModelExtendedManager
-        arguments: ["@doctrine.orm.entity_manager", "@form.factory", Opengnsys\ServerBundle\Form\Type\Api\ImageType, Opengnsys\ServerBundle\Entity\Image]
+        arguments: ["@doctrine.orm.entity_manager", "@form.factory", Opengnsys\ServerBundle\Form\Type\ImageType, Opengnsys\ServerBundle\Entity\Image]
 
     opengnsys_server.menu_manager:
         class: Opengnsys\CoreBundle\Domain\ModelExtendedManager
-        arguments: ["@doctrine.orm.entity_manager", "@form.factory", Opengnsys\ServerBundle\Form\Type\Api\MenuType, Opengnsys\ServerBundle\Entity\Menu]
+        arguments: ["@doctrine.orm.entity_manager", "@form.factory", Opengnsys\ServerBundle\Form\Type\MenuType, Opengnsys\ServerBundle\Entity\Menu]
 
     opengnsys_server.network_settings_manager:
         class: Opengnsys\CoreBundle\Domain\ModelExtendedManager
-        arguments: ["@doctrine.orm.entity_manager", "@form.factory", Opengnsys\ServerBundle\Form\Type\Api\NetworkSettingsType, Opengnsys\ServerBundle\Entity\NetworkSettings]
+        arguments: ["@doctrine.orm.entity_manager", "@form.factory", Opengnsys\ServerBundle\Form\Type\NetworkSettingsType, Opengnsys\ServerBundle\Entity\NetworkSettings]
 
     opengnsys_server.organizational_unit_manager:
         class: Opengnsys\CoreBundle\Domain\ModelExtendedManager
-        arguments: ["@doctrine.orm.entity_manager", "@form.factory", Opengnsys\ServerBundle\Form\Type\Api\OrganizationalUnitType, Opengnsys\ServerBundle\Entity\OrganizationalUnit]
+        arguments: ["@doctrine.orm.entity_manager", "@form.factory", Opengnsys\ServerBundle\Form\Type\OrganizationalUnitType, Opengnsys\ServerBundle\Entity\OrganizationalUnit]
 
     opengnsys_server.os_name_manager:
         class: Opengnsys\CoreBundle\Domain\ModelExtendedManager
-        arguments: ["@doctrine.orm.entity_manager", "@form.factory", Opengnsys\ServerBundle\Form\Type\Api\OsNameType, Opengnsys\ServerBundle\Entity\OsName]
+        arguments: ["@doctrine.orm.entity_manager", "@form.factory", Opengnsys\ServerBundle\Form\Type\OsNameType, Opengnsys\ServerBundle\Entity\OsName]
 
     opengnsys_server.partition_manager:
         class: Opengnsys\CoreBundle\Domain\ModelExtendedManager
-        arguments: ["@doctrine.orm.entity_manager", "@form.factory", Opengnsys\ServerBundle\Form\Type\Api\PartitionType, Opengnsys\ServerBundle\Entity\Partition]
+        arguments: ["@doctrine.orm.entity_manager", "@form.factory", Opengnsys\ServerBundle\Form\Type\PartitionType, Opengnsys\ServerBundle\Entity\Partition]
 
     opengnsys_server.repository_manager:
         class: Opengnsys\CoreBundle\Domain\ModelExtendedManager
-        arguments: ["@doctrine.orm.entity_manager", "@form.factory", Opengnsys\ServerBundle\Form\Type\Api\RepositoryType, Opengnsys\ServerBundle\Entity\Repository]
+        arguments: ["@doctrine.orm.entity_manager", "@form.factory", Opengnsys\ServerBundle\Form\Type\RepositoryType, Opengnsys\ServerBundle\Entity\Repository]
 
     opengnsys_server.software_manager:
         class: Opengnsys\CoreBundle\Domain\ModelExtendedManager
-        arguments: ["@doctrine.orm.entity_manager", "@form.factory", Opengnsys\ServerBundle\Form\Type\Api\SoftwareType, Opengnsys\ServerBundle\Entity\Software]
+        arguments: ["@doctrine.orm.entity_manager", "@form.factory", Opengnsys\ServerBundle\Form\Type\SoftwareType, Opengnsys\ServerBundle\Entity\Software]
 
     opengnsys_server.software_profile_manager:
         class: Opengnsys\CoreBundle\Domain\ModelExtendedManager
-        arguments: ["@doctrine.orm.entity_manager", "@form.factory", Opengnsys\ServerBundle\Form\Type\Api\SoftwareProfileType, Opengnsys\ServerBundle\Entity\SoftwareProfile]
+        arguments: ["@doctrine.orm.entity_manager", "@form.factory", Opengnsys\ServerBundle\Form\Type\SoftwareProfileType, Opengnsys\ServerBundle\Entity\SoftwareProfile]
 
     opengnsys_server.user_type_manager:
         class: Opengnsys\CoreBundle\Domain\ModelExtendedManager
-        arguments: ["@doctrine.orm.entity_manager", "@form.factory", Opengnsys\ServerBundle\Form\Type\Api\UserType, Opengnsys\CoreBundle\Entity\UserType]
-
-    opengnsys_server.validation_settings_manager:
-        class: Opengnsys\CoreBundle\Domain\ModelExtendedManager
-        arguments: ["@doctrine.orm.entity_manager", "@form.factory", Opengnsys\ServerBundle\Form\Type\Api\ValidationSettingsType, Opengnsys\ServerBundle\Entity\ValidationSettings]
+        arguments: ["@doctrine.orm.entity_manager", "@form.factory", Opengnsys\ServerBundle\Form\Type\UserType, Opengnsys\CoreBundle\Entity\UserType]
 
     opengnsys_server.netboot_manager:
         class: Opengnsys\CoreBundle\Domain\ModelExtendedManager
-        arguments: ["@doctrine.orm.entity_manager", "@form.factory", Opengnsys\ServerBundle\Form\Type\Api\NetbootType, Opengnsys\ServerBundle\Entity\Netboot]
+        arguments: ["@doctrine.orm.entity_manager", "@form.factory", Opengnsys\ServerBundle\Form\Type\NetbootType, Opengnsys\ServerBundle\Entity\Netboot]