From 9a819cbe51316f4c6002a11fd156d5ce358c73f9 Mon Sep 17 00:00:00 2001 From: jmbardallo Date: Wed, 22 Apr 2026 10:14:50 +0200 Subject: [PATCH] Creacion de plantillas pxe en la propagacion de propiedades de una OU --- config/api_platform/BootServer.yaml | 9 ++++ .../OgBoot/AbstractOgBootController.php | 44 ++++++--------- src/Controller/OgBoot/StatusAction.php | 34 ++++++++++++ .../PropagateNetworkSettingsAction.php | 27 ++++++++++ .../OrganizationalUnitSubscriber.php | 53 +------------------ 5 files changed, 88 insertions(+), 79 deletions(-) create mode 100644 src/Controller/OgBoot/StatusAction.php diff --git a/config/api_platform/BootServer.yaml b/config/api_platform/BootServer.yaml index 39a0e5f..058339d 100644 --- a/config/api_platform/BootServer.yaml +++ b/config/api_platform/BootServer.yaml @@ -71,6 +71,15 @@ resources: uriTemplate: /boot-servers/{uuid}/pxe-templates/get-collection controller: App\Controller\OgBoot\PxeTemplate\GetCollectionAction + boot_server_status: + shortName: BootServer + description: Get status of OgBoot server + class: ApiPlatform\Metadata\Get + method: GET + input: false + uriTemplate: /boot-servers/server/{uuid}/status + controller: App\Controller\OgBoot\StatusAction + properties: App\Entity\BootServer: id: diff --git a/src/Controller/OgBoot/AbstractOgBootController.php b/src/Controller/OgBoot/AbstractOgBootController.php index 611da0f..e1b7b9b 100644 --- a/src/Controller/OgBoot/AbstractOgBootController.php +++ b/src/Controller/OgBoot/AbstractOgBootController.php @@ -69,21 +69,16 @@ abstract class AbstractOgBootController extends AbstractController return json_decode($response->getContent(), true); } catch (ClientExceptionInterface | ServerExceptionInterface $e) { - $this->logger->error(sprintf('Client/Server error in request to %s: %s', $url, $e->getMessage())); - - return [ - 'code' => Response::HTTP_INTERNAL_SERVER_ERROR, - 'error' => 'Client/Server error', - 'details' => $e->getMessage(), - ]; + $response = $e->getResponse(); + $statusCode = $response->getStatusCode(); + $content = json_decode($response->getContent(false), true); + $errorMessage = $content['error'] ?? $content['message'] ?? $e->getMessage(); + + $this->logger->error(sprintf('Client/Server error in request to %s: %s', $url, $errorMessage)); + throw new HttpException($statusCode, "External API Error ($statusCode): $errorMessage"); } catch (TransportExceptionInterface $e) { $this->logger->error(sprintf('Transport error in request to %s: %s', $url, $e->getMessage())); - - return [ - 'code' => Response::HTTP_INTERNAL_SERVER_ERROR, - 'error' => 'Transport error', - 'details' => $e->getMessage(), - ]; + throw new HttpException(Response::HTTP_INTERNAL_SERVER_ERROR, "Transport Error: " . $e->getMessage()); } } @@ -106,22 +101,17 @@ abstract class AbstractOgBootController extends AbstractController $response = $this->httpClient->request($method, 'http://'.$bootServer->getIp().':'.$bootServer->getApiPort().$url, $params); return json_decode($response->getContent(), true); - } catch (ClientExceptionInterface | ServerExceptionInterface | TransportExceptionInterface $e) { - $this->logger->error(sprintf('Client/Server error in request to %s: %s', $url, $e->getMessage())); - - return [ - 'code' => Response::HTTP_INTERNAL_SERVER_ERROR, - 'error' => 'Client/Server error', - 'details' => $e->getMessage(), - ]; + } catch (ClientExceptionInterface | ServerExceptionInterface $e) { + $response = $e->getResponse(); + $statusCode = $response->getStatusCode(); + $content = json_decode($response->getContent(false), true); + $errorMessage = $content['error'] ?? $content['message'] ?? $e->getMessage(); + + $this->logger->error(sprintf('Client/Server error in request to %s: %s', $url, $errorMessage)); + throw new HttpException($statusCode, "External API Error ($statusCode): $errorMessage"); } catch (TransportExceptionInterface $e) { $this->logger->error(sprintf('Transport error in request to %s: %s', $url, $e->getMessage())); - - return [ - 'code' => Response::HTTP_INTERNAL_SERVER_ERROR, - 'error' => 'Transport error', - 'details' => $e->getMessage(), - ]; + throw new HttpException(Response::HTTP_INTERNAL_SERVER_ERROR, "Transport Error: " . $e->getMessage()); } } } diff --git a/src/Controller/OgBoot/StatusAction.php b/src/Controller/OgBoot/StatusAction.php new file mode 100644 index 0000000..d020e02 --- /dev/null +++ b/src/Controller/OgBoot/StatusAction.php @@ -0,0 +1,34 @@ +createRequestFromBootServer($data,'GET', '/ogboot/v1/status'); + + if (isset($content['error'])) { + throw new BadRequestHttpException('An error occurred while fetching the status: ' . ($content['details'] ?? $content['message'] ?? 'Unknown error')); + } + + return new JsonResponse( data: $content, status: Response::HTTP_OK); + } +} diff --git a/src/Controller/PropagateNetworkSettingsAction.php b/src/Controller/PropagateNetworkSettingsAction.php index b7fdcf9..1c5ab51 100644 --- a/src/Controller/PropagateNetworkSettingsAction.php +++ b/src/Controller/PropagateNetworkSettingsAction.php @@ -2,7 +2,10 @@ namespace App\Controller; +use App\Entity\Client; use App\Entity\OrganizationalUnit; +use App\Entity\PxeTemplate; +use App\Repository\ClientRepository; use App\Repository\OrganizationalUnitRepository; use Doctrine\ORM\EntityManagerInterface; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; @@ -15,6 +18,9 @@ class PropagateNetworkSettingsAction extends AbstractController public function __construct( private readonly OrganizationalUnitRepository $organizationalUnitRepository, private readonly EntityManagerInterface $entityManager, + private readonly \App\Controller\OgBoot\PxeBootFile\PostAction $postAction, + private readonly \App\Controller\OgDhcp\Subnet\PutHostAction $putHostAction, + private readonly ClientRepository $clientRepository, ) { } @@ -46,6 +52,27 @@ class PropagateNetworkSettingsAction extends AbstractController $this->entityManager->flush(); + $clients = $this->clientRepository->findClientsByOrganizationalUnitAndDescendants($organizationalUnit->getId(), []); + + /** @var Client $client */ + foreach ($clients as $client) { + $template = $client->getTemplate() ? + $client->getTemplate() : + $client->getOrganizationalUnit()?->getNetworkSettings()?->getPxeTemplate(); + + if ($template === null) { + $template = $this->entityManager->getRepository(PxeTemplate::class)->findOneBy(['isDefault' => true]); + } + + if ($template !== null) { + $this->postAction->__invoke($client, $template); + } + + if ($client->getSubnet()) { + $this->putHostAction->__invoke($client->getMac(), $client); + } + } + return new JsonResponse( data: 'Network settings propagated successfully', status: Response::HTTP_OK diff --git a/src/EventSubscriber/OrganizationalUnitSubscriber.php b/src/EventSubscriber/OrganizationalUnitSubscriber.php index 60022ed..8441283 100644 --- a/src/EventSubscriber/OrganizationalUnitSubscriber.php +++ b/src/EventSubscriber/OrganizationalUnitSubscriber.php @@ -30,57 +30,6 @@ final readonly class OrganizationalUnitSubscriber implements EventSubscriberInte public static function getSubscribedEvents(): array { - return [ - KernelEvents::VIEW => ['updateNetworkSettings', EventPriorities::POST_WRITE], - ]; - } - - /** - * @throws TransportExceptionInterface - * @throws ServerExceptionInterface - * @throws RedirectionExceptionInterface - * @throws ClientExceptionInterface - */ - public function updateNetworkSettings(ViewEvent $event): void - { - $organizationalUnitOutput = $event->getControllerResult(); - $method = $event->getRequest()->getMethod(); - - if (!$organizationalUnitOutput instanceof OrganizationalUnitOutput || - !in_array($method, [Request::METHOD_POST, Request::METHOD_PUT, Request::METHOD_PATCH])) { - return; - } - - /** @var OrganizationalUnit $organizationalUnitEntity */ - $organizationalUnitEntity = $organizationalUnitOutput->getEntity(); - - if ($organizationalUnitEntity->getType() === OrganizationalUnitTypes::CLASSROOM) { - $this->syncOgBoot($organizationalUnitEntity); - } - } - - - /** - * @throws TransportExceptionInterface - * @throws ServerExceptionInterface - * @throws RedirectionExceptionInterface - * @throws ClientExceptionInterface - */ - private function syncOgBoot(OrganizationalUnit $organizationalUnitEntity): void - { - $clients = $this->entityManager->getRepository(Client::class)->findClientsByOrganizationalUnitAndDescendants($organizationalUnitEntity->getId(), []); - - if (empty($clients)) { - return; - } - - /** @var Client $client */ - foreach ($clients as $client) { - if ($client->getTemplate() === null) { - continue; - } - - $this->postAction->__invoke($client, $client->getTemplate()); - } + return []; } } \ No newline at end of file