opengnsys
/
ogcore
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

develop #31

Merged
maranda merged 22 commits from develop into main 2025-05-13 09:22:10 +02:00
Conversation 0 Commits 22 Files Changed 112
112 changed files with 3533 additions and 463 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
CHANGELOG.md
View File

@ -1,7 +1,22 @@
# Changelog
<<<<<<< HEAD
## [0.12.0] - 2025-05-13
### Added
- Se ha añadido nueva API para poder gestionar las tareas y acciones programadas.
- Se ha añadido un nuevo campo en plantillas (defecto) el cual nos permite tener una plantilla por defecto en caso de que se elimine una.
- Se ha comenzado la integracion con ogGit.
## Improved
- Mejorado el comportamiento de la API al crear una imagen. Ahora se guardan datos del pc de origen.
## Fixed
- Se ha corregido el bug en la creacion de clientes masivos donde no se le asignaba la plantilla PXE.
- Se ha corregido un bug en el DTO de clientes, que hacia que PHP diera un timeout por bucle infinito.
=======
## [0.11.2] - 2025-04-23
### Fixed
- Se ha cambiado la forma en guardar la fecha al recibir "ping" de los clientes.
>>>>>>> main
---
## [0.11.1] - 2025-04-16

32
config/api_platform/CommandTaskSchedule.yaml
View File

@ -0,0 +1,32 @@
resources:
App\Entity\CommandTaskSchedule:
processor: App\State\Processor\CommandTaskScheduleProcessor
input: App\Dto\Input\CommandTaskScheduleInput
output: App\Dto\Output\CommandTaskScheduleOutput
normalizationContext:
groups: ['default', 'command-task-schedule:read']
denormalizationContext:
groups: ['command-task-schedule:write']
operations:
ApiPlatform\Metadata\GetCollection:
provider: App\State\Provider\CommandTaskScheduleProvider
filters:
- 'api_platform.filter.command_task_schedule.order'
- 'api_platform.filter.command_task_schedule.search'
- 'api_platform.filter.command_task_schedule.boolean'
ApiPlatform\Metadata\Get:
provider: App\State\Provider\CommandTaskScheduleProvider
ApiPlatform\Metadata\Put:
provider: App\State\Provider\CommandTaskScheduleProvider
ApiPlatform\Metadata\Patch:
provider: App\State\Provider\CommandTaskScheduleProvider
ApiPlatform\Metadata\Post: ~
ApiPlatform\Metadata\Delete: ~
properties:
App\Entity\CommandTaskSchedule:
id:
identifier: false
uuid:
identifier: true

32
config/api_platform/CommandTaskScript.yaml 100644
View File

@ -0,0 +1,32 @@
resources:
App\Entity\CommandTaskScript:
processor: App\State\Processor\CommandTaskScriptProcessor
input: App\Dto\Input\CommandTaskScriptInput
output: App\Dto\Output\CommandTaskScriptOutput
normalizationContext:
groups: ['default', 'command-task-script:read']
denormalizationContext:
groups: ['command-task-script:write']
operations:
ApiPlatform\Metadata\GetCollection:
provider: App\State\Provider\CommandTaskScriptProvider
filters:
- 'api_platform.filter.command_task_script.order'
- 'api_platform.filter.command_task_script.search'
- 'api_platform.filter.command_task_script.boolean'
ApiPlatform\Metadata\Get:
provider: App\State\Provider\CommandTaskScriptProvider
ApiPlatform\Metadata\Put:
provider: App\State\Provider\CommandTaskScriptProvider
ApiPlatform\Metadata\Patch:
provider: App\State\Provider\CommandTaskScriptProvider
ApiPlatform\Metadata\Post: ~
ApiPlatform\Metadata\Delete: ~
properties:
App\Entity\CommandTaskScript:
id:
identifier: false
uuid:
identifier: true

50
config/api_platform/GitImageRepository.yaml 100644
View File

@ -0,0 +1,50 @@
resources:
App\Entity\GitImageRepository:
processor: App\State\Processor\GitImageRepositoryProcessor
input: App\Dto\Input\GitImageRepositoryInput
output: App\Dto\Output\GitImageRepositoryOutput
normalizationContext:
groups: ['default', 'git-image-repository:read']
denormalizationContext:
groups: ['git-image-repository:write']
operations:
ApiPlatform\Metadata\GetCollection:
provider: App\State\Provider\GitImageRepositoryProvider
filters:
- 'api_platform.filter.image_image_repository.order'
- 'api_platform.filter.image_image_repository.search'
ApiPlatform\Metadata\Get:
provider: App\State\Provider\GitImageRepositoryProvider
ApiPlatform\Metadata\Put:
provider: App\State\Provider\GitImageRepositoryProvider
ApiPlatform\Metadata\Patch:
provider: App\State\Provider\GitImageRepositoryProvider
ApiPlatform\Metadata\Post: ~
ApiPlatform\Metadata\Delete: ~
get_image_ogrepository:
shortName: OgRepository Server
description: Get image in OgRepository
class: ApiPlatform\Metadata\Get
method: GET
input: false
uriTemplate: /image-image-repositories/server/{uuid}/get
controller: App\Controller\OgRepository\Image\GetAction
get_image_tags:
shortName: OgRepository Server
description: Get image tags in OgRepository
class: ApiPlatform\Metadata\Get
method: GET
input: false
uriTemplate: /git-image-repositories/server/{uuid}/get-tags
controller: App\Controller\OgRepository\Git\GetTagsAction
properties:
App\Entity\GitImageRepository:
id:
identifier: false
uuid:
identifier: true

21
config/api_platform/ImageRepository.yaml
View File

@ -30,7 +30,7 @@ resources:
method: POST
input: false
uriTemplate: /image-repositories/server/{uuid}/sync
controller: App\Controller\OgRepository\SyncAction
controller: App\Controller\OgRepository\Image\SyncAction
wol_client:
class: ApiPlatform\Metadata\Post
@ -46,7 +46,7 @@ resources:
method: POST
input: false
uriTemplate: /image-repositories/server/{uuid}/get-collection
controller: App\Controller\OgRepository\GetCollectionAction
controller: App\Controller\OgRepository\Image\GetCollectionAction
images_ogrepository_status:
shortName: OgRepository Server
@ -75,6 +75,23 @@ resources:
uriTemplate: /image-repositories/{uuid}/convert-image
controller: App\Controller\OgRepository\Image\ConvertAction
get_collection_images_oggit:
shortName: OgRepository Server
description: Get collection of image in OgRepository
class: ApiPlatform\Metadata\Post
method: POST
input: false
uriTemplate: /image-repositories/server/git/{uuid}/get-collection
controller: App\Controller\OgRepository\Git\GetCollectionAction
git_image_ogrepository_sync:
shortName: OgRepository Server
class: ApiPlatform\Metadata\Post
method: POST
input: false
uriTemplate: /image-repositories/server/git/{uuid}/sync
controller: App\Controller\OgRepository\Git\SyncAction
properties:
App\Entity\ImageRepository:
id:

15
config/services.yaml
View File

@ -156,3 +156,18 @@ services:
bind:
$collectionProvider: '@api_platform.doctrine.orm.state.collection_provider'
$itemProvider: '@api_platform.doctrine.orm.state.item_provider'
App\State\Provider\CommandTaskScheduleProvider:
bind:
$collectionProvider: '@api_platform.doctrine.orm.state.collection_provider'
$itemProvider: '@api_platform.doctrine.orm.state.item_provider'
App\State\Provider\CommandTaskScriptProvider:
bind:
$collectionProvider: '@api_platform.doctrine.orm.state.collection_provider'
$itemProvider: '@api_platform.doctrine.orm.state.item_provider'
App\State\Provider\GitImageRepositoryProvider:
bind:
$collectionProvider: '@api_platform.doctrine.orm.state.collection_provider'
$itemProvider: '@api_platform.doctrine.orm.state.item_provider'

52
config/services/api_platform.yaml
View File

@ -45,6 +45,52 @@ services:
arguments: [ { 'enabled': ~, 'readOnly': ~ } ]
tags: [ 'api_platform.filter' ]
api_platform.filter.command_task.order:
parent: 'api_platform.doctrine.orm.order_filter'
arguments:
$properties: { 'id': ~, 'name': ~ }
$orderParameterName: 'order'
tags: [ 'api_platform.filter' ]
api_platform.filter.command_task.search:
parent: 'api_platform.doctrine.orm.search_filter'
arguments: [ { 'id': 'exact', 'name': 'partial' } ]
tags: [ 'api_platform.filter' ]
api_platform.filter.command_task_schedule.order:
parent: 'api_platform.doctrine.orm.order_filter'
arguments:
$properties: { 'id': ~, 'name': ~ }
$orderParameterName: 'order'
tags: [ 'api_platform.filter' ]
api_platform.filter.command_task_schedule.search:
parent: 'api_platform.doctrine.orm.search_filter'
arguments: [ { 'id': 'exact', 'name': 'partial', 'commandTask.id': 'exact' } ]
tags: [ 'api_platform.filter' ]
api_platform.filter.command_task_schedule.boolean:
parent: 'api_platform.doctrine.orm.boolean_filter'
arguments: [ { 'enabled': ~} ]
tags: [ 'api_platform.filter' ]
api_platform.filter.command_task_script.order:
parent: 'api_platform.doctrine.orm.order_filter'
arguments:
$properties: { 'id': ~, 'name': ~ }
$orderParameterName: 'order'
tags: [ 'api_platform.filter' ]
api_platform.filter.command_task_script.search:
parent: 'api_platform.doctrine.orm.search_filter'
arguments: [ { 'id': 'exact', 'name': 'partial', 'commandTask.id': 'exact' } ]
tags: [ 'api_platform.filter' ]
api_platform.filter.command_task_script.boolean:
parent: 'api_platform.doctrine.orm.boolean_filter'
arguments: [ { 'enabled': ~ } ]
tags: [ 'api_platform.filter' ]
api_platform.filter.hardware.order:
parent: 'api_platform.doctrine.orm.order_filter'
arguments:
@ -61,7 +107,7 @@ services:
api_platform.filter.image.search:
parent: 'api_platform.doctrine.orm.search_filter'
arguments: [ { 'id': 'exact', 'name': 'partial', 'repository.id': 'exact', status: 'exact'} ]
arguments: [ { 'id': 'exact', 'name': 'partial', 'repository.id': 'exact', status: 'exact', type: 'exact' } ]
tags: [ 'api_platform.filter' ]
api_platform.filter.image.boolean:
@ -167,7 +213,7 @@ services:
api_platform.filter.pxe_template.boolean:
parent: 'api_platform.doctrine.orm.boolean_filter'
arguments: [ { 'synchronized': ~ } ]
arguments: [ { 'synchronized': ~, 'isDefault': ~ } ]
tags: [ 'api_platform.filter' ]
api_platform.filter.remote_calendar.order:
@ -248,7 +294,7 @@ services:
api_platform.filter.trace.search:
parent: 'api_platform.doctrine.orm.search_filter'
arguments: [ { 'id': 'exact', 'command.id': 'exact', 'client.id': 'exact', status: 'exact' } ]
arguments: [ { 'id': 'exact', 'command': 'exact', 'client.id': 'exact', status: 'exact' } ]
tags: [ 'api_platform.filter' ]
api_platform.filter.trace.order:

31
migrations/Version20250421122715.php 100644
View File

@ -0,0 +1,31 @@
<?php
declare(strict_types=1);
namespace DoctrineMigrations;
use Doctrine\DBAL\Schema\Schema;
use Doctrine\Migrations\AbstractMigration;
/**
* Auto-generated Migration: Please modify to your needs!
*/
final class Version20250421122715 extends AbstractMigration
{
public function getDescription(): string
{
return '';
}
public function up(Schema $schema): void
{
// this up() migration is auto-generated, please modify it to your needs
$this->addSql('ALTER TABLE command_task ADD parameters LONGTEXT DEFAULT NULL COMMENT \'(DC2Type:array)\'');
}
public function down(Schema $schema): void
{
// this down() migration is auto-generated, please modify it to your needs
$this->addSql('ALTER TABLE command_task DROP parameters');
}
}

35
migrations/Version20250422092348.php 100644
View File

@ -0,0 +1,35 @@
<?php
declare(strict_types=1);
namespace DoctrineMigrations;
use Doctrine\DBAL\Schema\Schema;
use Doctrine\Migrations\AbstractMigration;
/**
* Auto-generated Migration: Please modify to your needs!
*/
final class Version20250422092348 extends AbstractMigration
{
public function getDescription(): string
{
return '';
}
public function up(Schema $schema): void
{
// this up() migration is auto-generated, please modify it to your needs
$this->addSql('ALTER TABLE network_settings ADD pxe_template_id INT DEFAULT NULL');
$this->addSql('ALTER TABLE network_settings ADD CONSTRAINT FK_48869B543BD7665C FOREIGN KEY (pxe_template_id) REFERENCES pxe_template (id)');
$this->addSql('CREATE INDEX IDX_48869B543BD7665C ON network_settings (pxe_template_id)');
}
public function down(Schema $schema): void
{
// this down() migration is auto-generated, please modify it to your needs
$this->addSql('ALTER TABLE network_settings DROP FOREIGN KEY FK_48869B543BD7665C');
$this->addSql('DROP INDEX IDX_48869B543BD7665C ON network_settings');
$this->addSql('ALTER TABLE network_settings DROP pxe_template_id');
}
}

31
migrations/Version20250422140927.php 100644
View File

@ -0,0 +1,31 @@
<?php
declare(strict_types=1);
namespace DoctrineMigrations;
use Doctrine\DBAL\Schema\Schema;
use Doctrine\Migrations\AbstractMigration;
/**
* Auto-generated Migration: Please modify to your needs!
*/
final class Version20250422140927 extends AbstractMigration
{
public function getDescription(): string
{
return '';
}
public function up(Schema $schema): void
{
// this up() migration is auto-generated, please modify it to your needs
$this->addSql('ALTER TABLE command_task ADD name VARCHAR(255) NOT NULL');
}
public function down(Schema $schema): void
{
// this down() migration is auto-generated, please modify it to your needs
$this->addSql('ALTER TABLE command_task DROP name');
}
}

31
migrations/Version20250423070720.php 100644
View File

@ -0,0 +1,31 @@
<?php
declare(strict_types=1);
namespace DoctrineMigrations;
use Doctrine\DBAL\Schema\Schema;
use Doctrine\Migrations\AbstractMigration;
/**
* Auto-generated Migration: Please modify to your needs!
*/
final class Version20250423070720 extends AbstractMigration
{
public function getDescription(): string
{
return '';
}
public function up(Schema $schema): void
{
// this up() migration is auto-generated, please modify it to your needs
$this->addSql('ALTER TABLE command_task DROP datetime');
}
public function down(Schema $schema): void
{
// this down() migration is auto-generated, please modify it to your needs
$this->addSql('ALTER TABLE command_task ADD datetime DATETIME NOT NULL');
}
}

35
migrations/Version20250423071243.php 100644
View File

@ -0,0 +1,35 @@
<?php
declare(strict_types=1);
namespace DoctrineMigrations;
use Doctrine\DBAL\Schema\Schema;
use Doctrine\Migrations\AbstractMigration;
/**
* Auto-generated Migration: Please modify to your needs!
*/
final class Version20250423071243 extends AbstractMigration
{
public function getDescription(): string
{
return '';
}
public function up(Schema $schema): void
{
// this up() migration is auto-generated, please modify it to your needs
$this->addSql('ALTER TABLE command_task ADD organizational_unit_id INT DEFAULT NULL');
$this->addSql('ALTER TABLE command_task ADD CONSTRAINT FK_F3D475A8FB84408A FOREIGN KEY (organizational_unit_id) REFERENCES organizational_unit (id)');
$this->addSql('CREATE INDEX IDX_F3D475A8FB84408A ON command_task (organizational_unit_id)');
}
public function down(Schema $schema): void
{
// this down() migration is auto-generated, please modify it to your needs
$this->addSql('ALTER TABLE command_task DROP FOREIGN KEY FK_F3D475A8FB84408A');
$this->addSql('DROP INDEX IDX_F3D475A8FB84408A ON command_task');
$this->addSql('ALTER TABLE command_task DROP organizational_unit_id');
}
}

33
migrations/Version20250423092037.php 100644
View File

@ -0,0 +1,33 @@
<?php
declare(strict_types=1);
namespace DoctrineMigrations;
use Doctrine\DBAL\Schema\Schema;
use Doctrine\Migrations\AbstractMigration;
/**
* Auto-generated Migration: Please modify to your needs!
*/
final class Version20250423092037 extends AbstractMigration
{
public function getDescription(): string
{
return '';
}
public function up(Schema $schema): void
{
// this up() migration is auto-generated, please modify it to your needs
$this->addSql('CREATE TABLE command_task_schedule (id INT AUTO_INCREMENT NOT NULL, command_task_id INT NOT NULL, uuid CHAR(36) NOT NULL COMMENT \'(DC2Type:uuid)\', migration_id VARCHAR(255) DEFAULT NULL, created_at DATETIME NOT NULL, updated_at DATETIME NOT NULL, created_by VARCHAR(255) DEFAULT NULL, updated_by VARCHAR(255) DEFAULT NULL, recurrence_type VARCHAR(255) NOT NULL, start_time DATETIME NOT NULL, recurrence_details JSON DEFAULT NULL COMMENT \'(DC2Type:json)\', UNIQUE INDEX UNIQ_3BEA77AD17F50A6 (uuid), INDEX IDX_3BEA77A62DC5265 (command_task_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_unicode_ci` ENGINE = InnoDB');
$this->addSql('ALTER TABLE command_task_schedule ADD CONSTRAINT FK_3BEA77A62DC5265 FOREIGN KEY (command_task_id) REFERENCES command_task (id)');
}
public function down(Schema $schema): void
{
// this down() migration is auto-generated, please modify it to your needs
$this->addSql('ALTER TABLE command_task_schedule DROP FOREIGN KEY FK_3BEA77A62DC5265');
$this->addSql('DROP TABLE command_task_schedule');
}
}

45
migrations/Version20250427110103.php 100644
View File

@ -0,0 +1,45 @@
<?php
declare(strict_types=1);
namespace DoctrineMigrations;
use Doctrine\DBAL\Schema\Schema;
use Doctrine\Migrations\AbstractMigration;
/**
* Auto-generated Migration: Please modify to your needs!
*/
final class Version20250427110103 extends AbstractMigration
{
public function getDescription(): string
{
return '';
}
public function up(Schema $schema): void
{
// this up() migration is auto-generated, please modify it to your needs
$this->addSql('CREATE TABLE command_task_scripts (id INT AUTO_INCREMENT NOT NULL, command_task_id INT NOT NULL, uuid CHAR(36) NOT NULL COMMENT \'(DC2Type:uuid)\', migration_id VARCHAR(255) DEFAULT NULL, created_at DATETIME NOT NULL, updated_at DATETIME NOT NULL, created_by VARCHAR(255) DEFAULT NULL, updated_by VARCHAR(255) DEFAULT NULL, content VARCHAR(255) NOT NULL, execution_order INT NOT NULL, UNIQUE INDEX UNIQ_E8950142D17F50A6 (uuid), INDEX IDX_E895014262DC5265 (command_task_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_unicode_ci` ENGINE = InnoDB');
$this->addSql('ALTER TABLE command_task_scripts ADD CONSTRAINT FK_E895014262DC5265 FOREIGN KEY (command_task_id) REFERENCES command_task (id)');
$this->addSql('ALTER TABLE command_task_command_group DROP FOREIGN KEY FK_C43618BD62DC5265');
$this->addSql('ALTER TABLE command_task_command_group DROP FOREIGN KEY FK_C43618BDC7B800D6');
$this->addSql('ALTER TABLE command_task_command DROP FOREIGN KEY FK_BB417CA862DC5265');
$this->addSql('ALTER TABLE command_task_command DROP FOREIGN KEY FK_BB417CA833E1689A');
$this->addSql('DROP TABLE command_task_command_group');
$this->addSql('DROP TABLE command_task_command');
}
public function down(Schema $schema): void
{
// this down() migration is auto-generated, please modify it to your needs
$this->addSql('CREATE TABLE command_task_command_group (command_task_id INT NOT NULL, command_group_id INT NOT NULL, INDEX IDX_C43618BD62DC5265 (command_task_id), INDEX IDX_C43618BDC7B800D6 (command_group_id), PRIMARY KEY(command_task_id, command_group_id)) DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_unicode_ci` ENGINE = InnoDB COMMENT = \'\' ');
$this->addSql('CREATE TABLE command_task_command (command_task_id INT NOT NULL, command_id INT NOT NULL, INDEX IDX_BB417CA862DC5265 (command_task_id), INDEX IDX_BB417CA833E1689A (command_id), PRIMARY KEY(command_task_id, command_id)) DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_unicode_ci` ENGINE = InnoDB COMMENT = \'\' ');
$this->addSql('ALTER TABLE command_task_command_group ADD CONSTRAINT FK_C43618BD62DC5265 FOREIGN KEY (command_task_id) REFERENCES command_task (id) ON DELETE CASCADE');
$this->addSql('ALTER TABLE command_task_command_group ADD CONSTRAINT FK_C43618BDC7B800D6 FOREIGN KEY (command_group_id) REFERENCES command_group (id) ON DELETE CASCADE');
$this->addSql('ALTER TABLE command_task_command ADD CONSTRAINT FK_BB417CA862DC5265 FOREIGN KEY (command_task_id) REFERENCES command_task (id) ON DELETE CASCADE');
$this->addSql('ALTER TABLE command_task_command ADD CONSTRAINT FK_BB417CA833E1689A FOREIGN KEY (command_id) REFERENCES command (id) ON DELETE CASCADE');
$this->addSql('ALTER TABLE command_task_scripts DROP FOREIGN KEY FK_E895014262DC5265');
$this->addSql('DROP TABLE command_task_scripts');
}
}

37
migrations/Version20250427125746.php 100644
View File

@ -0,0 +1,37 @@
<?php
declare(strict_types=1);
namespace DoctrineMigrations;
use Doctrine\DBAL\Schema\Schema;
use Doctrine\Migrations\AbstractMigration;
/**
* Auto-generated Migration: Please modify to your needs!
*/
final class Version20250427125746 extends AbstractMigration
{
public function getDescription(): string
{
return '';
}
public function up(Schema $schema): void
{
// this up() migration is auto-generated, please modify it to your needs
$this->addSql('CREATE TABLE command_task_script (id INT AUTO_INCREMENT NOT NULL, command_task_id INT NOT NULL, uuid CHAR(36) NOT NULL COMMENT \'(DC2Type:uuid)\', migration_id VARCHAR(255) DEFAULT NULL, created_at DATETIME NOT NULL, updated_at DATETIME NOT NULL, created_by VARCHAR(255) DEFAULT NULL, updated_by VARCHAR(255) DEFAULT NULL, content VARCHAR(255) NOT NULL, execution_order INT NOT NULL, UNIQUE INDEX UNIQ_22BF0112D17F50A6 (uuid), INDEX IDX_22BF011262DC5265 (command_task_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_unicode_ci` ENGINE = InnoDB');
$this->addSql('ALTER TABLE command_task_script ADD CONSTRAINT FK_22BF011262DC5265 FOREIGN KEY (command_task_id) REFERENCES command_task (id)');
$this->addSql('ALTER TABLE command_task_scripts DROP FOREIGN KEY FK_E895014262DC5265');
$this->addSql('DROP TABLE command_task_scripts');
}
public function down(Schema $schema): void
{
// this down() migration is auto-generated, please modify it to your needs
$this->addSql('CREATE TABLE command_task_scripts (id INT AUTO_INCREMENT NOT NULL, command_task_id INT NOT NULL, uuid CHAR(36) CHARACTER SET utf8mb4 NOT NULL COLLATE `utf8mb4_unicode_ci` COMMENT \'(DC2Type:uuid)\', migration_id VARCHAR(255) CHARACTER SET utf8mb4 DEFAULT NULL COLLATE `utf8mb4_unicode_ci`, created_at DATETIME NOT NULL, updated_at DATETIME NOT NULL, created_by VARCHAR(255) CHARACTER SET utf8mb4 DEFAULT NULL COLLATE `utf8mb4_unicode_ci`, updated_by VARCHAR(255) CHARACTER SET utf8mb4 DEFAULT NULL COLLATE `utf8mb4_unicode_ci`, content VARCHAR(255) CHARACTER SET utf8mb4 NOT NULL COLLATE `utf8mb4_unicode_ci`, execution_order INT NOT NULL, INDEX IDX_E895014262DC5265 (command_task_id), UNIQUE INDEX UNIQ_E8950142D17F50A6 (uuid), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_unicode_ci` ENGINE = InnoDB COMMENT = \'\' ');
$this->addSql('ALTER TABLE command_task_scripts ADD CONSTRAINT FK_E895014262DC5265 FOREIGN KEY (command_task_id) REFERENCES command_task (id)');
$this->addSql('ALTER TABLE command_task_script DROP FOREIGN KEY FK_22BF011262DC5265');
$this->addSql('DROP TABLE command_task_script');
}
}

31
migrations/Version20250428065311.php 100644
View File

@ -0,0 +1,31 @@
<?php
declare(strict_types=1);
namespace DoctrineMigrations;
use Doctrine\DBAL\Schema\Schema;
use Doctrine\Migrations\AbstractMigration;
/**
* Auto-generated Migration: Please modify to your needs!
*/
final class Version20250428065311 extends AbstractMigration
{
public function getDescription(): string
{
return '';
}
public function up(Schema $schema): void
{
// this up() migration is auto-generated, please modify it to your needs
$this->addSql('ALTER TABLE command_task_schedule ADD execution_date DATE NOT NULL, ADD execution_time TIME NOT NULL, DROP start_time');
}
public function down(Schema $schema): void
{
// this down() migration is auto-generated, please modify it to your needs
$this->addSql('ALTER TABLE command_task_schedule ADD start_time DATETIME NOT NULL, DROP execution_date, DROP execution_time');
}
}

31
migrations/Version20250428065937.php 100644
View File

@ -0,0 +1,31 @@
<?php
declare(strict_types=1);
namespace DoctrineMigrations;
use Doctrine\DBAL\Schema\Schema;
use Doctrine\Migrations\AbstractMigration;
/**
* Auto-generated Migration: Please modify to your needs!
*/
final class Version20250428065937 extends AbstractMigration
{
public function getDescription(): string
{
return '';
}
public function up(Schema $schema): void
{
// this up() migration is auto-generated, please modify it to your needs
$this->addSql('ALTER TABLE command_task_schedule ADD enabled TINYINT(1) NOT NULL');
}
public function down(Schema $schema): void
{
// this down() migration is auto-generated, please modify it to your needs
$this->addSql('ALTER TABLE command_task_schedule DROP enabled');
}
}

31
migrations/Version20250428070851.php 100644
View File

@ -0,0 +1,31 @@
<?php
declare(strict_types=1);
namespace DoctrineMigrations;
use Doctrine\DBAL\Schema\Schema;
use Doctrine\Migrations\AbstractMigration;
/**
* Auto-generated Migration: Please modify to your needs!
*/
final class Version20250428070851 extends AbstractMigration
{
public function getDescription(): string
{
return '';
}
public function up(Schema $schema): void
{
// this up() migration is auto-generated, please modify it to your needs
$this->addSql('ALTER TABLE command_task_schedule CHANGE execution_date execution_date DATE DEFAULT NULL, CHANGE execution_time execution_time TIME DEFAULT NULL');
}
public function down(Schema $schema): void
{
// this down() migration is auto-generated, please modify it to your needs
$this->addSql('ALTER TABLE command_task_schedule CHANGE execution_date execution_date DATE NOT NULL, CHANGE execution_time execution_time TIME NOT NULL');
}
}

31
migrations/Version20250429065612.php 100644
View File

@ -0,0 +1,31 @@
<?php
declare(strict_types=1);
namespace DoctrineMigrations;
use Doctrine\DBAL\Schema\Schema;
use Doctrine\Migrations\AbstractMigration;
/**
* Auto-generated Migration: Please modify to your needs!
*/
final class Version20250429065612 extends AbstractMigration
{
public function getDescription(): string
{
return '';
}
public function up(Schema $schema): void
{
// this up() migration is auto-generated, please modify it to your needs
$this->addSql('ALTER TABLE command_task ADD last_execution DATETIME DEFAULT NULL, ADD next_execution DATETIME DEFAULT NULL');
}
public function down(Schema $schema): void
{
// this down() migration is auto-generated, please modify it to your needs
$this->addSql('ALTER TABLE command_task DROP last_execution, DROP next_execution');
}
}

31
migrations/Version20250429091808.php 100644
View File

@ -0,0 +1,31 @@
<?php
declare(strict_types=1);
namespace DoctrineMigrations;
use Doctrine\DBAL\Schema\Schema;
use Doctrine\Migrations\AbstractMigration;
/**
* Auto-generated Migration: Please modify to your needs!
*/
final class Version20250429091808 extends AbstractMigration
{
public function getDescription(): string
{
return '';
}
public function up(Schema $schema): void
{
// this up() migration is auto-generated, please modify it to your needs
$this->addSql('ALTER TABLE command_task ADD scope VARCHAR(255) NOT NULL');
}
public function down(Schema $schema): void
{
// this down() migration is auto-generated, please modify it to your needs
$this->addSql('ALTER TABLE command_task DROP scope');
}
}

31
migrations/Version20250430052434.php 100644
View File

@ -0,0 +1,31 @@
<?php
declare(strict_types=1);
namespace DoctrineMigrations;
use Doctrine\DBAL\Schema\Schema;
use Doctrine\Migrations\AbstractMigration;
/**
* Auto-generated Migration: Please modify to your needs!
*/
final class Version20250430052434 extends AbstractMigration
{
public function getDescription(): string
{
return '';
}
public function up(Schema $schema): void
{
// this up() migration is auto-generated, please modify it to your needs
$this->addSql('ALTER TABLE command_task_script ADD type VARCHAR(255) NOT NULL');
}
public function down(Schema $schema): void
{
// this down() migration is auto-generated, please modify it to your needs
$this->addSql('ALTER TABLE command_task_script DROP type');
}
}

31
migrations/Version20250430053742.php 100644
View File

@ -0,0 +1,31 @@
<?php
declare(strict_types=1);
namespace DoctrineMigrations;
use Doctrine\DBAL\Schema\Schema;
use Doctrine\Migrations\AbstractMigration;
/**
* Auto-generated Migration: Please modify to your needs!
*/
final class Version20250430053742 extends AbstractMigration
{
public function getDescription(): string
{
return '';
}
public function up(Schema $schema): void
{
// this up() migration is auto-generated, please modify it to your needs
$this->addSql('ALTER TABLE command_task_script ADD parameters LONGTEXT DEFAULT NULL COMMENT \'(DC2Type:array)\'');
}
public function down(Schema $schema): void
{
// this down() migration is auto-generated, please modify it to your needs
$this->addSql('ALTER TABLE command_task_script DROP parameters');
}
}

31
migrations/Version20250430054513.php 100644
View File

@ -0,0 +1,31 @@
<?php
declare(strict_types=1);
namespace DoctrineMigrations;
use Doctrine\DBAL\Schema\Schema;
use Doctrine\Migrations\AbstractMigration;
/**
* Auto-generated Migration: Please modify to your needs!
*/
final class Version20250430054513 extends AbstractMigration
{
public function getDescription(): string
{
return '';
}
public function up(Schema $schema): void
{
// this up() migration is auto-generated, please modify it to your needs
$this->addSql('ALTER TABLE command_task_script CHANGE content content VARCHAR(255) DEFAULT NULL');
}
public function down(Schema $schema): void
{
// this down() migration is auto-generated, please modify it to your needs
$this->addSql('ALTER TABLE command_task_script CHANGE content content VARCHAR(255) NOT NULL');
}
}

31
migrations/Version20250430094459.php 100644
View File

@ -0,0 +1,31 @@
<?php
declare(strict_types=1);
namespace DoctrineMigrations;
use Doctrine\DBAL\Schema\Schema;
use Doctrine\Migrations\AbstractMigration;
/**
* Auto-generated Migration: Please modify to your needs!
*/
final class Version20250430094459 extends AbstractMigration
{
public function getDescription(): string
{
return '';
}
public function up(Schema $schema): void
{
// this up() migration is auto-generated, please modify it to your needs
$this->addSql('ALTER TABLE command_task DROP status');
}
public function down(Schema $schema): void
{
// this down() migration is auto-generated, please modify it to your needs
$this->addSql('ALTER TABLE command_task ADD status VARCHAR(255) NOT NULL');
}
}

33
migrations/Version20250430135412.php 100644
View File

@ -0,0 +1,33 @@
<?php
declare(strict_types=1);
namespace DoctrineMigrations;
use Doctrine\DBAL\Schema\Schema;
use Doctrine\Migrations\AbstractMigration;
/**
* Auto-generated Migration: Please modify to your needs!
*/
final class Version20250430135412 extends AbstractMigration
{
public function getDescription(): string
{
return '';
}
public function up(Schema $schema): void
{
// this up() migration is auto-generated, please modify it to your needs
$this->addSql('CREATE TABLE git_image_repository (id INT AUTO_INCREMENT NOT NULL, image_id INT NOT NULL, uuid CHAR(36) NOT NULL COMMENT \'(DC2Type:uuid)\', migration_id VARCHAR(255) DEFAULT NULL, created_at DATETIME NOT NULL, updated_at DATETIME NOT NULL, created_by VARCHAR(255) DEFAULT NULL, updated_by VARCHAR(255) DEFAULT NULL, status VARCHAR(255) NOT NULL, branch VARCHAR(255) NOT NULL, created TINYINT(1) NOT NULL, UNIQUE INDEX UNIQ_E6944D5ED17F50A6 (uuid), INDEX IDX_E6944D5E3DA5256D (image_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8mb4 COLLATE `utf8mb4_unicode_ci` ENGINE = InnoDB');
$this->addSql('ALTER TABLE git_image_repository ADD CONSTRAINT FK_E6944D5E3DA5256D FOREIGN KEY (image_id) REFERENCES image (id)');
}
public function down(Schema $schema): void
{
// this down() migration is auto-generated, please modify it to your needs
$this->addSql('ALTER TABLE git_image_repository DROP FOREIGN KEY FK_E6944D5E3DA5256D');
$this->addSql('DROP TABLE git_image_repository');
}
}

35
migrations/Version20250430140218.php 100644
View File

@ -0,0 +1,35 @@
<?php
declare(strict_types=1);
namespace DoctrineMigrations;
use Doctrine\DBAL\Schema\Schema;
use Doctrine\Migrations\AbstractMigration;
/**
* Auto-generated Migration: Please modify to your needs!
*/
final class Version20250430140218 extends AbstractMigration
{
public function getDescription(): string
{
return '';
}
public function up(Schema $schema): void
{
// this up() migration is auto-generated, please modify it to your needs
$this->addSql('ALTER TABLE git_image_repository ADD image_repository_id INT DEFAULT NULL');
$this->addSql('ALTER TABLE git_image_repository ADD CONSTRAINT FK_E6944D5E14C736FC FOREIGN KEY (image_repository_id) REFERENCES image_repository (id)');
$this->addSql('CREATE INDEX IDX_E6944D5E14C736FC ON git_image_repository (image_repository_id)');
}
public function down(Schema $schema): void
{
// this down() migration is auto-generated, please modify it to your needs
$this->addSql('ALTER TABLE git_image_repository DROP FOREIGN KEY FK_E6944D5E14C736FC');
$this->addSql('DROP INDEX IDX_E6944D5E14C736FC ON git_image_repository');
$this->addSql('ALTER TABLE git_image_repository DROP image_repository_id');
}
}

31
migrations/Version20250430140326.php 100644
View File

@ -0,0 +1,31 @@
<?php
declare(strict_types=1);
namespace DoctrineMigrations;
use Doctrine\DBAL\Schema\Schema;
use Doctrine\Migrations\AbstractMigration;
/**
* Auto-generated Migration: Please modify to your needs!
*/
final class Version20250430140326 extends AbstractMigration
{
public function getDescription(): string
{
return '';
}
public function up(Schema $schema): void
{
// this up() migration is auto-generated, please modify it to your needs
$this->addSql('ALTER TABLE git_image_repository ADD name VARCHAR(255) NOT NULL');
}
public function down(Schema $schema): void
{
// this down() migration is auto-generated, please modify it to your needs
$this->addSql('ALTER TABLE git_image_repository DROP name');
}
}

31
migrations/Version20250506094654.php 100644
View File

@ -0,0 +1,31 @@
<?php
declare(strict_types=1);
namespace DoctrineMigrations;
use Doctrine\DBAL\Schema\Schema;
use Doctrine\Migrations\AbstractMigration;
/**
* Auto-generated Migration: Please modify to your needs!
*/
final class Version20250506094654 extends AbstractMigration
{
public function getDescription(): string
{
return '';
}
public function up(Schema $schema): void
{
// this up() migration is auto-generated, please modify it to your needs
$this->addSql('ALTER TABLE pxe_template ADD is_default TINYINT(1) DEFAULT NULL');
}
public function down(Schema $schema): void
{
// this down() migration is auto-generated, please modify it to your needs
$this->addSql('ALTER TABLE pxe_template DROP is_default');
}
}

33
migrations/Version20250506141057.php 100644
View File

@ -0,0 +1,33 @@
<?php
declare(strict_types=1);
namespace DoctrineMigrations;
use Doctrine\DBAL\Schema\Schema;
use Doctrine\Migrations\AbstractMigration;
/**
* Auto-generated Migration: Please modify to your needs!
*/
final class Version20250506141057 extends AbstractMigration
{
public function getDescription(): string
{
return '';
}
public function up(Schema $schema): void
{
// this up() migration is auto-generated, please modify it to your needs
$this->addSql('ALTER TABLE client DROP FOREIGN KEY FK_C74404555DA0FB8');
$this->addSql('ALTER TABLE client ADD CONSTRAINT FK_C74404555DA0FB8 FOREIGN KEY (template_id) REFERENCES pxe_template (id) ON DELETE SET NULL');
}
public function down(Schema $schema): void
{
// this down() migration is auto-generated, please modify it to your needs
$this->addSql('ALTER TABLE client DROP FOREIGN KEY FK_C74404555DA0FB8');
$this->addSql('ALTER TABLE client ADD CONSTRAINT FK_C74404555DA0FB8 FOREIGN KEY (template_id) REFERENCES pxe_template (id)');
}
}

33
migrations/Version20250508134732.php 100644
View File

@ -0,0 +1,33 @@
<?php
declare(strict_types=1);
namespace DoctrineMigrations;
use Doctrine\DBAL\Schema\Schema;
use Doctrine\Migrations\AbstractMigration;
/**
* Auto-generated Migration: Please modify to your needs!
*/
final class Version20250508134732 extends AbstractMigration
{
public function getDescription(): string
{
return '';
}
public function up(Schema $schema): void
{
// this up() migration is auto-generated, please modify it to your needs
$this->addSql('ALTER TABLE `partition` DROP FOREIGN KEY FK_9EB910E43DA5256D');
$this->addSql('ALTER TABLE `partition` ADD CONSTRAINT FK_9EB910E43DA5256D FOREIGN KEY (image_id) REFERENCES image_image_repository (id)');
}
public function down(Schema $schema): void
{
// this down() migration is auto-generated, please modify it to your needs
$this->addSql('ALTER TABLE `partition` DROP FOREIGN KEY FK_9EB910E43DA5256D');
$this->addSql('ALTER TABLE `partition` ADD CONSTRAINT FK_9EB910E43DA5256D FOREIGN KEY (image_id) REFERENCES image (id)');
}
}

31
migrations/Version20250508152437.php 100644
View File

@ -0,0 +1,31 @@
<?php
declare(strict_types=1);
namespace DoctrineMigrations;
use Doctrine\DBAL\Schema\Schema;
use Doctrine\Migrations\AbstractMigration;
/**
* Auto-generated Migration: Please modify to your needs!
*/
final class Version20250508152437 extends AbstractMigration
{
public function getDescription(): string
{
return '';
}
public function up(Schema $schema): void
{
// this up() migration is auto-generated, please modify it to your needs
$this->addSql('ALTER TABLE image ADD type VARCHAR(255) NOT NULL, DROP description, DROP comments');
}
public function down(Schema $schema): void
{
// this down() migration is auto-generated, please modify it to your needs
$this->addSql('ALTER TABLE image ADD description VARCHAR(255) DEFAULT NULL, ADD comments VARCHAR(255) DEFAULT NULL, DROP type');
}
}

39
migrations/Version20250512071804.php 100644
View File

@ -0,0 +1,39 @@
<?php
declare(strict_types=1);
namespace DoctrineMigrations;
use Doctrine\DBAL\Schema\Schema;
use Doctrine\Migrations\AbstractMigration;
/**
* Auto-generated Migration: Please modify to your needs!
*/
final class Version20250512071804 extends AbstractMigration
{
public function getDescription(): string
{
return '';
}
public function up(Schema $schema): void
{
// this up() migration is auto-generated, please modify it to your needs
$this->addSql('ALTER TABLE git_image_repository DROP FOREIGN KEY FK_E6944D5E14C736FC');
$this->addSql('DROP INDEX IDX_E6944D5E14C736FC ON git_image_repository');
$this->addSql('ALTER TABLE git_image_repository ADD tag VARCHAR(255) NOT NULL, CHANGE image_repository_id repository_id INT DEFAULT NULL');
$this->addSql('ALTER TABLE git_image_repository ADD CONSTRAINT FK_E6944D5E50C9D4F7 FOREIGN KEY (repository_id) REFERENCES image_repository (id)');
$this->addSql('CREATE INDEX IDX_E6944D5E50C9D4F7 ON git_image_repository (repository_id)');
}
public function down(Schema $schema): void
{
// this down() migration is auto-generated, please modify it to your needs
$this->addSql('ALTER TABLE git_image_repository DROP FOREIGN KEY FK_E6944D5E50C9D4F7');
$this->addSql('DROP INDEX IDX_E6944D5E50C9D4F7 ON git_image_repository');
$this->addSql('ALTER TABLE git_image_repository DROP tag, CHANGE repository_id image_repository_id INT DEFAULT NULL');
$this->addSql('ALTER TABLE git_image_repository ADD CONSTRAINT FK_E6944D5E14C736FC FOREIGN KEY (image_repository_id) REFERENCES image_repository (id)');
$this->addSql('CREATE INDEX IDX_E6944D5E14C736FC ON git_image_repository (image_repository_id)');
}
}

31
migrations/Version20250512075927.php 100644
View File

@ -0,0 +1,31 @@
<?php
declare(strict_types=1);
namespace DoctrineMigrations;
use Doctrine\DBAL\Schema\Schema;
use Doctrine\Migrations\AbstractMigration;
/**
* Auto-generated Migration: Please modify to your needs!
*/
final class Version20250512075927 extends AbstractMigration
{
public function getDescription(): string
{
return '';
}
public function up(Schema $schema): void
{
// this up() migration is auto-generated, please modify it to your needs
$this->addSql('ALTER TABLE git_image_repository CHANGE branch branch VARCHAR(255) DEFAULT NULL');
}
public function down(Schema $schema): void
{
// this down() migration is auto-generated, please modify it to your needs
$this->addSql('ALTER TABLE git_image_repository CHANGE branch branch VARCHAR(255) NOT NULL');
}
}

31
migrations/Version20250512081045.php 100644
View File

@ -0,0 +1,31 @@
<?php
declare(strict_types=1);
namespace DoctrineMigrations;
use Doctrine\DBAL\Schema\Schema;
use Doctrine\Migrations\AbstractMigration;
/**
* Auto-generated Migration: Please modify to your needs!
*/
final class Version20250512081045 extends AbstractMigration
{
public function getDescription(): string
{
return '';
}
public function up(Schema $schema): void
{
// this up() migration is auto-generated, please modify it to your needs
$this->addSql('ALTER TABLE git_image_repository ADD version INT DEFAULT NULL');
}
public function down(Schema $schema): void
{
// this down() migration is auto-generated, please modify it to your needs
$this->addSql('ALTER TABLE git_image_repository DROP version');
}
}

31
migrations/Version20250513050921.php 100644
View File

@ -0,0 +1,31 @@
<?php
declare(strict_types=1);
namespace DoctrineMigrations;
use Doctrine\DBAL\Schema\Schema;
use Doctrine\Migrations\AbstractMigration;
/**
* Auto-generated Migration: Please modify to your needs!
*/
final class Version20250513050921 extends AbstractMigration
{
public function getDescription(): string
{
return '';
}
public function up(Schema $schema): void
{
// this up() migration is auto-generated, please modify it to your needs
$this->addSql('ALTER TABLE git_image_repository ADD description VARCHAR(255) DEFAULT NULL');
}
public function down(Schema $schema): void
{
// this down() migration is auto-generated, please modify it to your needs
$this->addSql('ALTER TABLE git_image_repository DROP description');
}
}

31
migrations/Version20250513055057.php 100644
View File

@ -0,0 +1,31 @@
<?php
declare(strict_types=1);
namespace DoctrineMigrations;
use Doctrine\DBAL\Schema\Schema;
use Doctrine\Migrations\AbstractMigration;
/**
* Auto-generated Migration: Please modify to your needs!
*/
final class Version20250513055057 extends AbstractMigration
{
public function getDescription(): string
{
return '';
}
public function up(Schema $schema): void
{
// this up() migration is auto-generated, please modify it to your needs
$this->addSql('ALTER TABLE image_image_repository ADD partition_info VARCHAR(255) DEFAULT NULL');
}
public function down(Schema $schema): void
{
// this down() migration is auto-generated, please modify it to your needs
$this->addSql('ALTER TABLE image_image_repository DROP partition_info');
}
}

90
src/Command/RunScheduledCommandTasksCommand.php 100644
View File

@ -0,0 +1,90 @@
<?php
declare(strict_types=1);
namespace App\Command;
use App\Controller\OgAgent\DeployImageAction;
use App\Controller\OgAgent\RunScriptAction;
use App\Dto\Input\CommandExecuteInput;
use App\Dto\Input\DeployImageInput;
use App\Dto\Output\ClientOutput;
use App\Entity\CommandTask;
use App\Repository\CommandTaskRepository;
use Doctrine\ORM\EntityManagerInterface;
use Symfony\Component\Console\Attribute\AsCommand;
use Symfony\Component\Console\Command\Command;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Contracts\HttpClient\Exception\TransportExceptionInterface;
#[AsCommand(name: 'opengnsys:run-scheduled-command-tasks', description: 'Run scheduled command tasks')]
class RunScheduledCommandTasksCommand extends Command
{
public function __construct(
private readonly CommandTaskRepository $commandTaskRepository,
private readonly EntityManagerInterface $entityManager,
private readonly RunScriptAction $runScriptAction,
private readonly DeployImageAction $deployImageAction,
)
{
parent::__construct();
}
/**
* @throws \Exception
* @throws TransportExceptionInterface
*/
protected function execute(InputInterface $input, OutputInterface $output): int
{
$now = new \DateTimeImmutable('now +2 hours');
$now->setTimezone(new \DateTimeZone('Europe/Madrid'));
$nowMinute = $now->format('Y-m-d H:i');
$tasks = $this->commandTaskRepository->findAll();
foreach ($tasks as $task) {
/** @var CommandTask $task */
$nextExecution = $task->getNextExecution();
if (!$nextExecution) {
continue;
}
$taskMinute = $nextExecution->format('Y-m-d H:i');
if ($taskMinute === $nowMinute) {
$output->writeln("Ejecutando tarea: " . $task->getName());
$scripts = $task->getCommandTaskScripts()->toArray();
usort($scripts, fn($a, $b) => $a->getExecutionOrder() <=> $b->getExecutionOrder());
foreach ($scripts as $script) {
try {
$output->writeln(" - Ejecutando script de tipo {$script->getType()} con orden {$script->getExecutionOrder()}");
if ($script->getType() === 'run-script') {
$input = new CommandExecuteInput();
foreach ($task->getOrganizationalUnit()?->getClients() as $client) {
$input->clients[] = new ClientOutput($client);
}
$input->script = $script->getContent();
$this->runScriptAction->__invoke($input);
}
} catch (TransportExceptionInterface $e) {
$output->writeln("Error ejecutando script: " . $e->getMessage());
continue;
}
}
$task->setLastExecution(new \DateTime());
$task->setNextExecution($task->calculateNextExecutionDate());
$this->entityManager->persist($task);
}
}
$this->entityManager->flush();
return Command::SUCCESS;
}
}

1
src/Controller/DeployImageAction.php
View File

@ -55,6 +55,7 @@ class DeployImageAction extends AbstractController
'method' => $input->method,
'client' => $client->getEntity()->getUuid(),
'image' => $image->getUuid(),
'imageName' => $image->getName(),
'numDisk' => (string) $input->diskNumber,
'numPartition' => (string) $input->partitionNumber,
];

102
src/Controller/OgAgent/CreateImageAction.php
View File

@ -4,8 +4,11 @@ declare(strict_types=1);
namespace App\Controller\OgAgent;
use App\Controller\OgRepository\Git\CreateRepositoryAction;
use App\Controller\OgRepository\Git\CreateTagAction;
use App\Entity\Client;
use App\Entity\Command;
use App\Entity\GitImageRepository;
use App\Entity\Image;
use App\Entity\ImageImageRepository;
use App\Entity\ImageRepository;
@ -38,6 +41,8 @@ class CreateImageAction extends AbstractController
protected readonly HttpClientInterface $httpClient,
protected readonly CreateService $createService,
protected readonly LoggerInterface $logger,
protected readonly CreateRepositoryAction $createRepositoryAction,
protected readonly CreateTagAction $createTagAction,
)
{
}
@ -48,7 +53,7 @@ class CreateImageAction extends AbstractController
* @throws RedirectionExceptionInterface
* @throws ClientExceptionInterface
*/
public function __invoke(Image $image, ?Partition $partition = null): JsonResponse
public function __invoke(Image $image, ?Partition $partition = null, ?Client $client = null): JsonResponse
{
if (!$image->getClient()->getIp()) {
throw new ValidatorException('IP is required');
@ -67,6 +72,7 @@ class CreateImageAction extends AbstractController
$partitionInfo = json_decode($image->getPartitionInfo(), true);
}
if ($image->getType() === 'monolithic') {
$repository = $image->getClient()->getRepository();
$latestImageRepo = $this->entityManager->getRepository(ImageImageRepository::class)->findLatestVersionByImageAndRepository($image, $repository);
@ -76,9 +82,46 @@ class CreateImageAction extends AbstractController
$imageImageRepository->setRepository($repository);
$imageImageRepository->setStatus(ImageStatus::IN_PROGRESS);
$imageImageRepository->setVersion($latestImageRepo ? $latestImageRepo->getVersion() + 1 : 1);
$imageImageRepository->setPartitionInfo(json_encode($partitionInfo));
$this->entityManager->persist($imageImageRepository);
return $this->createMonolithicImage($imageImageRepository, $partitionInfo, $image, $repository, $client);
} else {
$repository = $image->getClient()->getRepository();
$latestImageRepo = $this->entityManager->getRepository(GitImageRepository::class)->findLatestVersionByImageAndRepository($image, $repository);
$gitImageRepository = new GitImageRepository();
$gitImageRepository->setName($image->getName().'_v'.($latestImageRepo ? $latestImageRepo->getVersion() + 1 : 1));
$gitImageRepository->setImage($image);
$gitImageRepository->setRepository($repository);
$gitImageRepository->setStatus(ImageStatus::IN_PROGRESS);
$gitImageRepository->setVersion($latestImageRepo ? $latestImageRepo->getVersion() + 1 : 1);
$gitImageRepository->setTag('v'.($latestImageRepo ? $latestImageRepo->getVersion() + 1 : 1));
$gitImageRepository->setCreated(false);
$this->entityManager->persist($gitImageRepository);
$this->entityManager->persist($image);
$this->entityManager->flush();
return $this->createGitImage($gitImageRepository, $partitionInfo, $image, $repository);
}
}
/**
* @throws TransportExceptionInterface
* @throws ServerExceptionInterface
* @throws RedirectionExceptionInterface
* @throws ClientExceptionInterface
*/
public function createMonolithicImage(
ImageImageRepository $imageImageRepository,
array $partitionInfo,
Image $image,
ImageRepository $repository,
?Client $client = null
): JsonResponse
{
$data = [
'dsk' => (string) $partitionInfo['numDisk'],
'par' => (string) $partitionInfo['numPartition'],
@ -105,8 +148,10 @@ class CreateImageAction extends AbstractController
}
try {
$client = $client ?? $image->getClient();
$this->logger->info('Creating image', ['image' => $image->getId()]);
$response = $this->httpClient->request('POST', 'https://'.$image->getClient()->getIp().':8000/opengnsys/CrearImagen', [
$response = $this->httpClient->request('POST', 'https://'.$client->getIp().':8000/opengnsys/CrearImagen', [
'verify_peer' => false,
'verify_host' => false,
'headers' => [
@ -126,13 +171,62 @@ class CreateImageAction extends AbstractController
$jobId = json_decode($response->getContent(), true)['job_id'];
$client = $image->getClient();
$client->setStatus(ClientStatus::BUSY);
$this->entityManager->persist($client);
$this->entityManager->flush();
$this->createService->__invoke($image->getClient(), CommandTypes::CREATE_IMAGE, TraceStatus::IN_PROGRESS, $jobId, []);
$inputData = [
'method' => 'CrearImagen',
'type' => 'monolithic',
'client' => $client->getUuid(),
'image' => $image->getUuid(),
'partitionCode' => $partitionInfo['partitionCode'],
'partitionType' => $partitionInfo['filesystem'],
'repository' => $repository->getIp(),
'name' => $image->getName().'_v'.$imageImageRepository->getVersion(),
];
$this->createService->__invoke($image->getClient(), CommandTypes::CREATE_IMAGE, TraceStatus::IN_PROGRESS, $jobId, $inputData);
return new JsonResponse(data: $image, status: Response::HTTP_OK);
}
public function createGitImage(
GitImageRepository $gitImageRepository,
array $partitionInfo,
Image $image,
ImageRepository $repository
): JsonResponse
{
if (!isset($partitonInfo)) {
try {
$this->createRepositoryAction->__invoke($image, $repository);
} catch (Exception $e) {
$this->logger->error('Error creating repository', ['repository' => $repository->getId(), 'error' => $e->getMessage()]);
return new JsonResponse(
data: ['error' => $e->getMessage()],
status: Response::HTTP_INTERNAL_SERVER_ERROR
);
}
} else {
try {
$this->createTagAction->__invoke($image, $repository, $gitImageRepository);
} catch (Exception $e) {
$this->logger->error('Error creating tag', ['repository' => $repository->getId(), 'error' => $e->getMessage()]);
return new JsonResponse(
data: ['error' => $e->getMessage()],
status: Response::HTTP_INTERNAL_SERVER_ERROR
);
}
}
return new JsonResponse(
data: ['message' => 'Repository created successfully'],
status: Response::HTTP_OK
);
//TODO: llamar al endpoint del agente.
}
}

18
src/Controller/OgAgent/Webhook/StatusController.php
View File

@ -159,6 +159,24 @@ class StatusController extends AbstractController
$client->setStatus(ClientStatus::OG_LIVE);
$this->entityManager->persist($client);
$this->entityManager->persist($trace);
if ($data['nfn'] === self::RESTORE_IMAGE) {
$partitionData = json_decode(json_encode($trace->getInput()), true);
$numDisk = (int) $partitionData['numDisk'] ?? null;
$numPartition = (int) $partitionData['numPartition'] ?? null;
$imageImageRepository = $this->entityManager->getRepository(ImageImageRepository::class)->findOneBy(['uuid' => $partitionData['image']]);
$partition = $this->entityManager->getRepository(Partition::class)
->findOneBy(['diskNumber' => $numDisk, 'partitionNumber' => $numPartition, 'client' => $client]);
if ($partition) {
$partition->setImage($imageImageRepository);
$this->entityManager->persist($partition);
}
}
$this->entityManager->flush();
}

4
src/Controller/OgBoot/OgLive/Webhook/InstallOgLiveResponseAction.php
View File

@ -30,7 +30,7 @@ class InstallOgLiveResponseAction extends AbstractController
{
public CONST string OG_LIVE_INSTALL_SUCCESS = 'success';
public CONST string OG_LIVE_INSTALL_FAILED = 'failure';
const string OG_BOOT_DIRECTORY = '/opt/opengnsys/ogboot/tftpboot//';
const string OG_BOOT_DIRECTORY = '/opt/opengnsys/ogboot/tftpboot/';
public function __construct(
protected readonly EntityManagerInterface $entityManager,
@ -94,7 +94,7 @@ class InstallOgLiveResponseAction extends AbstractController
private function updateOgLive (OgLive $ogLive, mixed $details, string $status): void
{
if ( is_array($details) && $status === self::OG_LIVE_INSTALL_SUCCESS) {
$ogLive->setName($this->simplifyOgLiveFilenameService->__invoke($details['directory']));
$ogLive->setName($this->simplifyOgLiveFilenameService->__invoke(str_replace(self::OG_BOOT_DIRECTORY, '', $details['directory'])));
$ogLive->setDate(new \DateTime($this->extractOgLiveFilenameDateService->__invoke($details['directory'])));
$ogLive->setFilename(str_replace(self::OG_BOOT_DIRECTORY, '', $details['directory']));
$ogLive->setInstalled(true);

14
src/Controller/OgBoot/PxeTemplate/DeleteAction.php
View File

@ -3,6 +3,7 @@
namespace App\Controller\OgBoot\PxeTemplate;
use App\Controller\OgBoot\AbstractOgBootController;
use App\Entity\Client;
use App\Entity\PxeTemplate;
use Doctrine\ORM\EntityManagerInterface;
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
@ -26,11 +27,20 @@ class DeleteAction extends AbstractOgBootController
*/
public function __invoke(PxeTemplate $data): JsonResponse
{
$content = $this->createRequest('DELETE', 'http://'.$this->ogBootApiUrl.'/ogboot/v1/pxe-templates/'.$data->getName());
$this->entityManager->remove($data);
$this->entityManager->flush();
$content = $this->createRequest('DELETE', 'http://'.$this->ogBootApiUrl.'/ogboot/v1/pxe-templates/'.$data->getName());
$defaultTemplateEntity = $this->entityManager->getRepository(PxeTemplate::class)->findOneBy(['isDefault' => true]);
if ($defaultTemplateEntity === null) {
return new JsonResponse(
'Default template not found',
Response::HTTP_NOT_FOUND
);
}
return new JsonResponse(status: Response::HTTP_OK);
}
}

28
src/Controller/OgBoot/PxeTemplate/SyncAction.php
View File

@ -28,25 +28,35 @@ class SyncAction extends AbstractOgBootController
*/
public function __invoke(): JsonResponse
{
$content = $this->createRequest('GET', 'http://'.$this->ogBootApiUrl . '/ogboot/v1/pxe-templates');
$content = $this->createRequest('GET', 'http://' . $this->ogBootApiUrl . '/ogboot/v1/pxe-templates');
$templateNamesFromApi = $content['message'];
foreach ($content['message'] as $template) {
$templateEntity = $this->entityManager->getRepository(PxeTemplate::class)->findOneBy(['name' => $template]);
$existingTemplates = $this->entityManager->getRepository(PxeTemplate::class)->findAll();
if ($templateEntity) {
$this->entityManager->persist($templateEntity);
} else {
$templateEntity = new PxeTemplate();
$templateEntity->setName($template);
$existingTemplateNames = array_map(fn($t) => $t->getName(), $existingTemplates);
foreach ($existingTemplates as $existingTemplate) {
if (!in_array($existingTemplate->getName(), $templateNamesFromApi, true)) {
$this->entityManager->remove($existingTemplate);
}
}
$templateContent = $this->createRequest('GET', 'http://'.$this->ogBootApiUrl . '/ogboot/v1/pxe-templates/'.$templateEntity->getName());
foreach ($templateNamesFromApi as $templateName) {
$templateEntity = $this->entityManager->getRepository(PxeTemplate::class)->findOneBy(['name' => $templateName]);
if (!$templateEntity) {
$templateEntity = new PxeTemplate();
$templateEntity->setName($templateName);
}
$templateContent = $this->createRequest('GET', 'http://' . $this->ogBootApiUrl . '/ogboot/v1/pxe-templates/' . $templateEntity->getName());
$templateEntity->setTemplateContent($templateContent['template_content']);
$templateEntity->setSynchronized(true);
$this->entityManager->persist($templateEntity);
}
$this->entityManager->flush();
return new JsonResponse(data: $content, status: Response::HTTP_OK);

42
src/Controller/OgRepository/Git/CreateRepositoryAction.php 100644
View File

@ -0,0 +1,42 @@
<?php
namespace App\Controller\OgRepository\Git;
use App\Controller\OgRepository\AbstractOgRepositoryController;
use App\Entity\Image;
use App\Entity\ImageRepository;
use Symfony\Component\HttpKernel\Attribute\AsController;
use Symfony\Component\HttpFoundation\JsonResponse;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\Validator\Exception\ValidatorException;
use Symfony\Contracts\HttpClient\Exception\ClientExceptionInterface;
use Symfony\Contracts\HttpClient\Exception\RedirectionExceptionInterface;
use Symfony\Contracts\HttpClient\Exception\ServerExceptionInterface;
use Symfony\Contracts\HttpClient\Exception\TransportExceptionInterface;
#[AsController]
class CreateRepositoryAction extends AbstractOgRepositoryController
{
/**
* @throws TransportExceptionInterface
* @throws ServerExceptionInterface
* @throws RedirectionExceptionInterface
* @throws ClientExceptionInterface
*/
public function __invoke(Image $image, ImageRepository $repository): JsonResponse
{
$params = [
'json' => [
'name' => $image->getName(),
]
];
$content = $this->createRequest('POST', 'http://'.$repository->getIp().':8006/ogrepository/v1/git/repositories', $params);
if (isset($content['error']) && $content['code'] === Response::HTTP_INTERNAL_SERVER_ERROR ) {
throw new ValidatorException('Error creating repository');
}
return new JsonResponse(data: [], status: Response::HTTP_OK);
}
}

46
src/Controller/OgRepository/Git/CreateTagAction.php 100644
View File

@ -0,0 +1,46 @@
<?php
namespace App\Controller\OgRepository\Git;
use App\Controller\OgRepository\AbstractOgRepositoryController;
use App\Entity\GitImageRepository;
use App\Entity\Image;
use App\Entity\ImageRepository;
use Symfony\Component\HttpFoundation\JsonResponse;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\HttpKernel\Attribute\AsController;
use Symfony\Component\Validator\Exception\ValidatorException;
use Symfony\Contracts\HttpClient\Exception\ClientExceptionInterface;
use Symfony\Contracts\HttpClient\Exception\RedirectionExceptionInterface;
use Symfony\Contracts\HttpClient\Exception\ServerExceptionInterface;
use Symfony\Contracts\HttpClient\Exception\TransportExceptionInterface;
#[AsController]
class CreateTagAction extends AbstractOgRepositoryController
{
/**
* @throws TransportExceptionInterface
* @throws ServerExceptionInterface
* @throws RedirectionExceptionInterface
* @throws ClientExceptionInterface
*/
public function __invoke(Image $image, ImageRepository $repository, GitImageRepository $gitImageRepository): JsonResponse
{
$params = [
'json' => [
'commit' => "HEAD",
'message' => $gitImageRepository->getVersion(),
'name' => $image->getName(),
]
];
$content = $this->createRequest('POST', 'http://'.$repository->getIp().':8006/ogrepository/v1/git/repositories/'.
$image->getName().'/tags', $params);
if (isset($content['error']) && $content['code'] === Response::HTTP_INTERNAL_SERVER_ERROR ) {
throw new ValidatorException('Error creating repository');
}
return new JsonResponse(data: [], status: Response::HTTP_OK);
}
}

31
src/Controller/OgRepository/Git/GetCollectionAction.php 100644
View File

@ -0,0 +1,31 @@
<?php
namespace App\Controller\OgRepository\Git;
use App\Controller\OgRepository\AbstractOgRepositoryController;
use App\Entity\ImageRepository;
use Symfony\Component\HttpFoundation\JsonResponse;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\HttpKernel\Attribute\AsController;
use Symfony\Component\Validator\Exception\ValidatorException;
use Symfony\Contracts\HttpClient\Exception\ClientExceptionInterface;
use Symfony\Contracts\HttpClient\Exception\RedirectionExceptionInterface;
use Symfony\Contracts\HttpClient\Exception\ServerExceptionInterface;
use Symfony\Contracts\HttpClient\Exception\TransportExceptionInterface;
#[AsController]
class GetCollectionAction extends AbstractOgRepositoryController
{
/**
* @throws TransportExceptionInterface
* @throws ServerExceptionInterface
* @throws RedirectionExceptionInterface
* @throws ClientExceptionInterface
*/
public function __invoke(ImageRepository $data): JsonResponse
{
$content = $this->createRequest('GET', 'http://'.$data->getIp().':8006/ogrepository/v1/git/repositories');
return new JsonResponse(data: $content, status: Response::HTTP_OK);
}
}

38
src/Controller/OgRepository/Git/GetTagsAction.php 100644
View File

@ -0,0 +1,38 @@
<?php
namespace App\Controller\OgRepository\Git;
use App\Controller\OgRepository\AbstractOgRepositoryController;
use App\Entity\GitImageRepository;
use Symfony\Component\HttpFoundation\JsonResponse;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\HttpKernel\Attribute\AsController;
use Symfony\Component\Validator\Exception\ValidatorException;
use Symfony\Contracts\HttpClient\Exception\ClientExceptionInterface;
use Symfony\Contracts\HttpClient\Exception\RedirectionExceptionInterface;
use Symfony\Contracts\HttpClient\Exception\ServerExceptionInterface;
use Symfony\Contracts\HttpClient\Exception\TransportExceptionInterface;
#[AsController]
class GetTagsAction extends AbstractOgRepositoryController
{
/**
* @throws TransportExceptionInterface
* @throws ServerExceptionInterface
* @throws RedirectionExceptionInterface
* @throws ClientExceptionInterface
*/
public function __invoke(GitImageRepository $gitImageRepository): JsonResponse
{
$repository = $gitImageRepository->getRepository();
$image = $gitImageRepository->getImage();
$content = $this->createRequest('GET', 'http://'.$repository->getIp().':8006/ogrepository/v1/git/repositories/'.$image->getName().'/tags');
if (isset($content['error']) && $content['code'] === Response::HTTP_INTERNAL_SERVER_ERROR ) {
throw new ValidatorException('Error getting tags');
}
return new JsonResponse(data: $content, status: Response::HTTP_OK);
}
}

73
src/Controller/OgRepository/Git/SyncAction.php 100644
View File

@ -0,0 +1,73 @@
<?php
namespace App\Controller\OgRepository\Git;
use App\Controller\OgRepository\AbstractOgRepositoryController;
use App\Entity\GitImageRepository;
use App\Entity\Image;
use App\Entity\ImageImageRepository;
use App\Entity\ImageRepository;
use App\Model\ImageStatus;
use Symfony\Component\HttpFoundation\JsonResponse;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Contracts\HttpClient\Exception\ClientExceptionInterface;
use Symfony\Contracts\HttpClient\Exception\RedirectionExceptionInterface;
use Symfony\Contracts\HttpClient\Exception\ServerExceptionInterface;
use Symfony\Contracts\HttpClient\Exception\TransportExceptionInterface;
class SyncAction extends AbstractOgRepositoryController
{
/**
* @throws TransportExceptionInterface
* @throws ServerExceptionInterface
* @throws RedirectionExceptionInterface
* @throws ClientExceptionInterface
*/
public function __invoke(ImageRepository $input): JsonResponse
{
$content = $this->createRequest('GET', 'http://' . $input->getIp() . ':8006/ogrepository/v1/git/repositories');
if (!isset($content['repositories'])) {
return new JsonResponse(data: 'No repositories found', status: Response::HTTP_NOT_FOUND);
}
$repository = $this->entityManager->getRepository(GitImageRepository::class);
$existingRepositories = $repository->findBy(['imageRepository' => $input]);
foreach ($content['repositories'] as $repositoryData) {
$gitImageRepositoryEntity = $repository->findOneBy([
'imageRepository' => $input,
'name' => $repositoryData
]);
$imageEntity = $this->entityManager->getRepository(Image::class)->findOneBy(['name' => $repositoryData]);
if (!$imageEntity) {
$imageEntity = new Image();
$imageEntity->setName($repositoryData);
$imageEntity->setRemotePc(false);
$imageEntity->setIsGlobal(false);
$this->entityManager->persist($imageEntity);
}
if (!$gitImageRepositoryEntity) {
$gitImageRepositoryEntity = new GitImageRepository();
$gitImageRepositoryEntity->setName($repositoryData);
$gitImageRepositoryEntity->setStatus(ImageStatus::SUCCESS);
$gitImageRepositoryEntity->setImageRepository($input);
$gitImageRepositoryEntity->setImage($imageEntity);
$gitImageRepositoryEntity->setBranch('main');
$gitImageRepositoryEntity->setCreated(true);
$gitImageRepositoryEntity->setCreatedAt(new \DateTime());
$this->entityManager->persist($gitImageRepositoryEntity);
}
}
$this->entityManager->flush();
return new JsonResponse(data: $content, status: Response::HTTP_OK);
}
}

4
src/Controller/OgRepository/Image/ConvertImageToVirtualAction.php
View File

@ -48,6 +48,10 @@ class ConvertImageToVirtualAction extends AbstractOgRepositoryController
$content = $this->createRequest('PUT', 'http://'.$repository->getIp().':8006/ogrepository/v1/images/virtual', $params);
if (isset($content['error']) && $content['code'] === Response::HTTP_INTERNAL_SERVER_ERROR ) {
throw new ValidatorException('Error converting image');
}
$inputData = [
'imageName' => $image->getName(),
'repositoryUuid' => $repository->getUuid(),

4
src/Controller/OgRepository/GetCollectionAction.php → src/Controller/OgRepository/Image/GetCollectionAction.php
View File

@ -1,7 +1,8 @@
<?php
namespace App\Controller\OgRepository;
namespace App\Controller\OgRepository\Image;
use App\Controller\OgRepository\AbstractOgRepositoryController;
use App\Entity\ImageRepository;
use Symfony\Component\HttpFoundation\JsonResponse;
use Symfony\Component\HttpFoundation\Response;
@ -10,7 +11,6 @@ use Symfony\Contracts\HttpClient\Exception\ClientExceptionInterface;
use Symfony\Contracts\HttpClient\Exception\RedirectionExceptionInterface;
use Symfony\Contracts\HttpClient\Exception\ServerExceptionInterface;
use Symfony\Contracts\HttpClient\Exception\TransportExceptionInterface;
use Symfony\Contracts\HttpClient\HttpClientInterface;
#[AsController]
class GetCollectionAction extends AbstractOgRepositoryController

3
src/Controller/OgRepository/SyncAction.php → src/Controller/OgRepository/Image/SyncAction.php
View File

@ -1,7 +1,8 @@
<?php
namespace App\Controller\OgRepository;
namespace App\Controller\OgRepository\Image;
use App\Controller\OgRepository\AbstractOgRepositoryController;
use App\Entity\Image;
use App\Entity\ImageImageRepository;
use App\Entity\ImageRepository;

6
src/Controller/OgRepository/Image/TransferAction.php
View File

@ -47,12 +47,12 @@ class TransferAction extends AbstractOgRepositoryController
'json' => [
'image' => $imageImageRepository->getName().'.img',
'repo_ip' => $imageImageRepository->getRepository()->getIp(),
'user' => $repository->getUser(),
'ssh_port' => $repository->getSshPort()
'user' => $repository->getUser() ?? 'opengnsys',
'ssh_port' => $repository->getSshPort() ?? '22',
]
];
$this->logger->info('Importing image', ['image' => $image->getName(), 'repository' => $repository->getIp()]);
$this->logger->info('Importing image', ['image' => $imageImageRepository->getName(), 'repository' => $repository->getIp(), 'ssh_port' => $repository->getSshPort(), 'user' => $repository->getUser()]);
$content = $this->createRequest('POST', 'http://'.$repository->getIp().':8006/ogrepository/v1/repo/images', $params);

5
src/Controller/OgRepository/Webhook/ResponseController.php
View File

@ -89,9 +89,12 @@ class ResponseController extends AbstractOgRepositoryController
return $this->jsonResponseError('Action failed', Response::HTTP_BAD_REQUEST, $trace);
}
$latestImageRepo = $this->entityManager->getRepository(ImageImageRepository::class)->findLatestVersionByImageAndRepository($image, $repository);
$newImageRepo = new ImageImageRepository();
$newImageRepo->setName($image->getName().'_v'.($originImageImageRepository->getVersion() + 1));
$newImageRepo->setName($image->getName().'_v'.($latestImageRepo ? $latestImageRepo->getVersion() + 1 : 1));
$newImageRepo->setImage($image);
$newImageRepo->setVersion($latestImageRepo ? $latestImageRepo->getVersion() + 1 : 1);
$newImageRepo->setRepository($repository);
$newImageRepo->setStatus(ImageStatus::SUCCESS);

1
src/Controller/UDS/RemoteCalendarSyncUdsAction.php
View File

@ -17,7 +17,6 @@ class RemoteCalendarSyncUdsAction extends AbstractController
{
public function __construct(
#[Autowire(env: 'UDS_URL')]
private readonly UDSClient $udsClient
)
{

7
src/Dto/Input/ClientInput.php
View File

@ -85,7 +85,7 @@ final class ClientInput
#[ApiProperty(
description: 'La plantilla PXE del cliente'
)]
public ?PxeTemplateOutput $template = null;
public ?PxeTemplateOutput $pxeTemplate = null;
#[Groups(['client:write'])]
#[ApiProperty(
@ -143,7 +143,7 @@ final class ClientInput
}
if ($client->getTemplate()) {
$this->template = new PxeTemplateOutput($client->getTemplate());
$this->pxeTemplate = new PxeTemplateOutput($client->getTemplate());
}
if ($client->getHardwareProfile()) {
@ -165,6 +165,7 @@ final class ClientInput
$ogLive = $this->ogLive?->getEntity() ?? $client->getOrganizationalUnit()?->getNetworkSettings()?->getOgLive();
$hardwareProfile = $this->hardwareProfile?->getEntity() ?? $client->getOrganizationalUnit()?->getNetworkSettings()?->getHardwareProfile();
$repository = $this->repository?->getEntity() ?? $client->getOrganizationalUnit()?->getNetworkSettings()?->getRepository();
$template = $this->pxeTemplate?->getEntity() ?? $client->getOrganizationalUnit()?->getNetworkSettings()?->getPxeTemplate();
$client->setName($this->name);
$client->setSerialNumber($this->serialNumber);
@ -177,7 +178,7 @@ final class ClientInput
$client->setOgLive($ogLive);
$client->setHardwareProfile($hardwareProfile);
$client->setRepository($repository);
$client->setTemplate($this->template?->getEntity());
$client->setTemplate($template);
$client->setPosition($this->position);
$client->setStatus($this->status);
$client->setMaintenance($this->maintenance);

85
src/Dto/Input/CommandTaskInput.php
View File

@ -6,6 +6,7 @@ use ApiPlatform\Metadata\ApiProperty;
use App\Dto\Output\ClientOutput;
use App\Dto\Output\CommandGroupOutput;
use App\Dto\Output\CommandOutput;
use App\Dto\Output\OrganizationalUnitOutput;
use App\Entity\CommandTask;
use App\Model\CommandTaskStatus;
use phpDocumentor\Reflection\Types\Boolean;
@ -14,25 +15,12 @@ use Symfony\Component\Validator\Constraints as Assert;
final class CommandTaskInput
{
/**
* @var CommandOutput[]
*/
#[Groups(['command-task:write'])]
#[ApiProperty(
description: 'Los comandos de la tarea',
example: 'Comandos de la tarea',
description: 'El nombre de la tarea',
example: 'Tarea 1',
)]
public array $commands = [];
/**
* @var CommandGroupOutput[]
*/
#[Groups(['command-task:write'])]
#[ApiProperty(
description: 'Los grupos de comandos de la tarea',
example: 'Grupos de comandos de la tarea',
)]
public array $commandGroups = [];
public ?string $name = null;
/**
* @var ClientOutput[]
@ -44,38 +32,37 @@ final class CommandTaskInput
)]
public array $clients = [];
#[Assert\NotBlank(message: 'validators.command_task.datetime.not_blank')]
#[Groups(['command-task:write'])]
#[ApiProperty(
description: 'La fecha y hora de la tarea',
example: '2021-10-01T00:00:00+00:00',
)]
public ?\DateTimeInterface $dateTime = null;
#[Groups(['command-task:write'])]
#[ApiProperty(
description: 'Los comentarios de la tarea',
example: 'Comentarios de la tarea',
example: 'Ambito de la tarea',
)]
public ?string $notes = null;
#[Groups(['command-task:write'])]
#[ApiProperty(
description: 'El ambito de la tarea',
example: 'Comentarios de la tarea',
)]
public ?string $scope = null;
#[Groups(['command-task:write'])]
public ?OrganizationalUnitOutput $organizationalUnit = null;
#[Groups(['command-task:write'])]
#[ApiProperty(
description: 'Los parámetros de la tarea',
example: 'Parámetros de la tarea',
)]
public ?array $content = null;
public function __construct(?CommandTask $commandTask = null)
{
if (!$commandTask) {
return;
}
if ($commandTask->getCommands()) {
foreach ($commandTask->getCommands() as $command) {
$this->commands[] = new CommandOutput($command);
}
}
if ($commandTask->getCommandGroups()) {
foreach ($commandTask->getCommandGroups() as $commandGroup) {
$this->commandGroups[] = new CommandGroupOutput($commandGroup);
}
}
$this->name = $commandTask->getName();
if ($commandTask->getClients()) {
foreach ($commandTask->getClients() as $client) {
@ -83,37 +70,33 @@ final class CommandTaskInput
}
}
$this->dateTime = $commandTask->getDatetime();
$this->organizationalUnit = new OrganizationalUnitOutput($commandTask->getOrganizationalUnit());
$this->notes = $commandTask->getNotes();
$this->scope = $commandTask->getScope();
$this->content = $commandTask->getParameters();
}
/**
* @throws \Exception
*/
public function createOrUpdateEntity(?CommandTask $commandTask = null): CommandTask
{
if (!$commandTask) {
$commandTask = new CommandTask();
}
foreach ($this->commands as $command) {
$commandsToAdd[] = $command->getEntity();
}
$commandTask->setCommands( $commandsToAdd ?? [] );
foreach ($this->commandGroups as $commandGroup) {
$commandGroupsToAdd[] = $commandGroup->getEntity();
}
$commandTask->setCommandGroups( $commandGroupsToAdd ?? [] );
$commandTask->setName($this->name);
foreach ($this->clients as $client) {
$clientsToAdd[] = $client->getEntity();
}
$commandTask->setOrganizationalUnit($this->organizationalUnit->getEntity());
$commandTask->setClients( $clientsToAdd ?? [] );
$commandTask->setDatetime($this->dateTime);
$commandTask->setStatus(CommandTaskStatus::PENDING);
$commandTask->setNotes($this->notes);
$commandTask->setParameters($this->content);
$commandTask->setScope($this->scope);
$commandTask->setNextExecution($commandTask->calculateNextExecutionDate());
return $commandTask;
}

60
src/Dto/Input/CommandTaskScheduleInput.php
View File

@ -2,7 +2,63 @@
namespace App\Dto\Input;
class CommandTaskScheduleInput
{
use App\Dto\Output\CommandTaskOutput;
use App\Dto\Output\CommandTaskScheduleOutput;
use App\Entity\CommandTaskSchedule;
use Symfony\Component\Serializer\Annotation\Groups;
final class CommandTaskScheduleInput
{
#[Groups(['command-task-schedule:write'])]
public ?CommandTaskOutput $commandTask = null;
#[Groups(['command-task-schedule:write'])]
public ?string $recurrenceType = null;
#[Groups(['command-task-schedule:write'])]
public ?\DateTimeInterface $executionDate = null;
#[Groups(['command-task-schedule:write'])]
public ?\DateTimeInterface $executionTime = null;
#[Groups(['command-task-schedule:write'])]
public ?array $recurrenceDetails = null;
#[Groups(['command-task-schedule:write'])]
public ?bool $enabled = null;
public function __construct(?CommandTaskSchedule $commandTaskSchedule = null)
{
if (!$commandTaskSchedule) {
return;
}
$this->commandTask = new CommandTaskOutput($commandTaskSchedule->getCommandTask());
$this->recurrenceType = $commandTaskSchedule->getRecurrenceType();
$this->executionDate = $commandTaskSchedule->getExecutionDate();
$this->executionTime = $commandTaskSchedule->getExecutionTime();
$this->recurrenceDetails = $commandTaskSchedule->getRecurrenceDetails();
$this->enabled = $commandTaskSchedule->isEnabled();
}
/**
* @throws \Exception
*/
public function createOrUpdateEntity(?CommandTaskSchedule $commandTaskSchedule = null): CommandTaskSchedule
{
if (!$commandTaskSchedule) {
$commandTaskSchedule = new CommandTaskSchedule();
}
if ($this->commandTask) {
$commandTaskSchedule->setCommandTask($this->commandTask->getEntity());
}
$commandTaskSchedule->setRecurrenceType($this->recurrenceType);
$commandTaskSchedule->setExecutionTime($this->executionTime);
$commandTaskSchedule->setExecutionDate($this->executionDate);
$commandTaskSchedule->setRecurrenceDetails($this->recurrenceDetails);
$commandTaskSchedule->setEnabled($this->enabled);
return $commandTaskSchedule;
}
}

57
src/Dto/Input/CommandTaskScriptInput.php 100644
View File

@ -0,0 +1,57 @@
<?php
namespace App\Dto\Input;
use App\Dto\Output\CommandTaskOutput;
use App\Dto\Output\CommandTaskScheduleOutput;
use App\Entity\CommandTaskSchedule;
use App\Entity\CommandTaskScript;
use Symfony\Component\Serializer\Annotation\Groups;
final class CommandTaskScriptInput
{
#[Groups(['command-task-script:write'])]
public ?string $content = null;
#[Groups(['command-task-script:write'])]
public ?string $type = null;
#[Groups(['command-task-script:write'])]
public ?array $parameters = null;
#[Groups(['command-task-script:write'])]
public ?CommandTaskOutput $commandTask = null;
#[Groups(['command-task-script:write'])]
public ?int $order = null;
public function __construct(?CommandTaskScript $commandTaskScript = null)
{
if (!$commandTaskScript) {
return;
}
$this->content = $commandTaskScript->getContent();
$this->type = $commandTaskScript->getType();
$this->order = $commandTaskScript->getExecutionOrder();
$this->parameters = $commandTaskScript->getParameters();
$this->commandTask = new CommandTaskOutput($commandTaskScript->getCommandTask());
}
public function createOrUpdateEntity(?CommandTaskScript $commandTaskScript = null): CommandTaskScript
{
if (!$commandTaskScript) {
$commandTaskScript = new CommandTaskScript();
}
if ($this->commandTask) {
$commandTaskScript->setCommandTask($this->commandTask->getEntity());
}
$commandTaskScript->setType($this->type);
$commandTaskScript->setParameters($this->parameters);
$commandTaskScript->setContent($this->content);
$commandTaskScript->setExecutionOrder($this->order);
return $commandTaskScript;
}
}

33
src/Dto/Input/GitImageRepositoryInput.php 100644
View File

@ -0,0 +1,33 @@
<?php
namespace App\Dto\Input;
use App\Entity\GitImageRepository;
use App\Entity\ImageImageRepository;
use Symfony\Component\Serializer\Annotation\Groups;
final class GitImageRepositoryInput
{
#[Groups(['git-image-repository:write'])]
public ?string $description = '';
public function __construct(?GitImageRepository $gitImageRepository = null)
{
if (!$gitImageRepository) {
return;
}
$this->description = $gitImageRepository->getDescription();
}
public function createOrUpdateEntity(?GitImageRepository $gitImageRepository = null): GitImageRepository
{
if (!$gitImageRepository) {
$gitImageRepository = new GitImageRepository();
}
$gitImageRepository->setDescription($this->description);
return $gitImageRepository;
}
}

16
src/Dto/Input/ImageInput.php
View File

@ -27,16 +27,12 @@ final class ImageInput
public ?string $name = null;
#[Groups(['image:write'])]
#[ApiProperty(description: 'The description of the image', example: "Image 1 description")]
public ?string $description = null;
#[Groups(['image:write'])]
#[ApiProperty(description: 'The comments of the image', example: "Image 1 comments")]
public ?string $comments = null;
#[ApiProperty(description: 'The type of the image', example: "Server")]
public ?string $source = 'input';
#[Groups(['image:write'])]
#[ApiProperty(description: 'The type of the image', example: "Server")]
public ?string $source = 'input';
public ?string $type = '';
#[Groups(['image:write'])]
#[ApiProperty(description: 'The optional selected image')]
@ -84,8 +80,7 @@ final class ImageInput
}
$this->name = $image->getName();
$this->description = $image->getDescription();
$this->comments = $image->getComments();
$this->type = $image->getType();
$this->remotePc = $image->isRemotePc();
$this->isGlobal = $image->isGlobal();
$this->version = $image->getVersion();
@ -114,8 +109,7 @@ final class ImageInput
}
$image->setName($this->name);
$image->setDescription($this->description);
$image->setComments($this->comments);
$image->setType($this->type);
if ($this->softwareProfile) {
$image->setSoftwareProfile($this->softwareProfile->getEntity());

12
src/Dto/Input/NetworkSettingsInput.php
View File

@ -7,6 +7,7 @@ use App\Dto\Output\HardwareProfileOutput;
use App\Dto\Output\ImageRepositoryOutput;
use App\Dto\Output\MenuOutput;
use App\Dto\Output\OgLiveOutput;
use App\Dto\Output\PxeTemplateOutput;
use App\Entity\HardwareProfile;
use App\Entity\Menu;
use App\Entity\NetworkSettings;
@ -80,6 +81,9 @@ class NetworkSettingsInput
#[Groups(['organizational-unit:write'])]
public ?ImageRepositoryOutput $repository = null;
#[Groups(['organizational-unit:write'])]
public ?PxeTemplateOutput $pxeTemplate = null;
#[Groups(['organizational-unit:write'])]
public ?string $ogshare = null;
@ -120,6 +124,10 @@ class NetworkSettingsInput
if ($networkSettings->getRepository()) {
$this->repository = new ImageRepositoryOutput($networkSettings->getRepository());
}
if ($networkSettings->getPxeTemplate()) {
$this->pxeTemplate = new PxeTemplateOutput($networkSettings->getPxeTemplate());
}
}
public function createOrUpdateEntity(?NetworkSettings $networkSettings = null): NetworkSettings
@ -160,6 +168,10 @@ class NetworkSettingsInput
$networkSettings->setRepository($this->repository->getEntity());
}
if ($this->pxeTemplate) {
$networkSettings->setPxeTemplate($this->pxeTemplate->getEntity());
}
return $networkSettings;
}
}

6
src/Dto/Input/PxeTemplateInput.php
View File

@ -18,6 +18,10 @@ final class PxeTemplateInput
#[ApiProperty(description: 'The content of the pxeTemplate', example: "content of the pxeTemplate 1")]
public ?string $templateContent = null;
#[Groups(['pxe-template:write'])]
#[ApiProperty(description: 'The default pxeTemplate', example: "true")]
public ?bool $isDefault = null;
public function __construct(?PxeTemplate $pxeTemplate = null)
{
if (!$pxeTemplate) {
@ -26,6 +30,7 @@ final class PxeTemplateInput
$this->name = $pxeTemplate->getName();
$this->templateContent = $pxeTemplate->getTemplateContent();
$this->isDefault = $pxeTemplate->isDefault();
}
public function createOrUpdateEntity(?PxeTemplate $pxeTemplate = null): PxeTemplate
@ -36,6 +41,7 @@ final class PxeTemplateInput
$pxeTemplate->setName($this->name);
$pxeTemplate->setTemplateContent($this->templateContent);
$pxeTemplate->setDefault($this->isDefault);
return $pxeTemplate;
}

3
src/Dto/Input/RemoteCalendarRuleInput.php
View File

@ -5,9 +5,12 @@ namespace App\Dto\Input;
use ApiPlatform\Metadata\ApiProperty;
use App\Dto\Output\RemoteCalendarOutput;
use App\Entity\RemoteCalendarRule;
use App\Validator\Constraints\RemoteCalendarRuleUnique;
use Symfony\Component\Serializer\Annotation\Groups;
use Symfony\Component\Validator\Constraints as Assert;
#[RemoteCalendarRuleUnique]
final class RemoteCalendarRuleInput
{
#[Assert\NotNull()]

26
src/Dto/Output/ClientOutput.php
View File

@ -57,7 +57,7 @@ final class ClientOutput extends AbstractOutput
#[Groups(['client:read', 'organizational-unit:read', 'pxe-template:read', 'trace:read', 'subnet:read'])]
#[ApiProperty(readableLink: true )]
public ?PxeTemplateOutput $template = null;
public ?PxeTemplateOutput $pxeTemplate = null;
#[Groups(['client:read', 'organizational-unit:read', 'pxe-template:read', 'trace:read', 'subnet:read'])]
#[ApiProperty(readableLink: true )]
@ -106,7 +106,6 @@ final class ClientOutput extends AbstractOutput
$this->menu = $client->getMenu() ? new MenuOutput($client->getMenu()) : null;
$this->position = $client->getPosition();
$this->template = $client->getTemplate() ? new PxeTemplateOutput($client->getTemplate()) : null;
$repository = $client->getRepository()
?? $client->getOrganizationalUnit()?->getNetworkSettings()?->getRepository();
@ -118,12 +117,33 @@ final class ClientOutput extends AbstractOutput
$this->ogLive = $ogLive ? new OgLiveOutput($ogLive) : null;
$template = $client->getTemplate()
?? $client->getOrganizationalUnit()?->getNetworkSettings()?->getPxeTemplate();
$this->pxeTemplate = $template ? new PxeTemplateOutput($template) : null;
$this->hardwareProfile = $client->getHardwareProfile() ? new HardwareProfileOutput($client->getHardwareProfile()) : null;
$this->subnet = $client->getSubnet()?->getIpAddress();
if ($client->getSubnet()){
$this->subnet = $client->getSubnet()?->getIpAddress().'/'
. $this->convertMaskToCIDR($client->getSubnet() ? $client->getSubnet()->getNetmask() : $client->getOrganizationalUnit()->getNetworkSettings()->getNetmask());
}
$this->status = $client->getStatus();
$this->createdAt = $client->getCreatedAt();
$this->createdBy = $client->getCreatedBy();
$this->maintenance = $client->isMaintenance();
$this->pxeSync = $client->isPxeSync();
}
public function convertMaskToCIDR($mask): int
{
$bits = 0;
$mask = explode(".", $mask);
foreach ($mask as $oct)
$bits += strlen(str_replace("0", "", decbin($oct)));
return $bits;
}
}

29
src/Dto/Output/CommandTaskOutput.php
View File

@ -13,22 +13,25 @@ use Symfony\Component\Serializer\Annotation\Groups;
final class CommandTaskOutput extends AbstractOutput
{
#[Groups(['command-task:read'])]
public array $commands = [];
#[Groups(['command-task:read'])]
public array $commandGroups = [];
public ?string $name = null;
#[Groups(['command-task:read'])]
public array $clients = [];
#[Groups(['command-task:read'])]
public \DateTimeInterface $dateTime;
public ?OrganizationalUnitOutput $organizationalUnit = null;
#[Groups(['command-task:read'])]
public ?\DateTimeInterface $lastExecution = null;
#[Groups(['command-task:read'])]
public ?\DateTimeInterface $nextExecution = null;
#[Groups(['command-task:read'])]
public ?string $notes = null;
#[Groups(['command-task:read'])]
public ?string $status = null;
public ?string $scope = null;
#[Groups(['command-task:read'])]
public \DateTime $createdAt;
@ -41,21 +44,17 @@ final class CommandTaskOutput extends AbstractOutput
{
parent::__construct($commandTask);
$this->commands = $commandTask->getCommands()->map(
fn(Command $command) => new CommandOutput($command)
)->toArray();
$this->commandGroups = $commandTask->getCommandGroups()->map(
fn(CommandGroup $commandGroup) => new CommandGroupOutput($commandGroup)
)->toArray();
$this->name = $commandTask->getName();
$this->clients = $commandTask->getClients()->map(
fn(Client $client) => new ClientOutput($client)
)->toArray();
$this->dateTime = $commandTask->getDateTime();
$this->organizationalUnit = new OrganizationalUnitOutput($commandTask->getOrganizationalUnit());
$this->notes = $commandTask->getNotes();
$this->status = $commandTask->getStatus();
$this->scope = $commandTask->getScope();
$this->lastExecution = $commandTask->getLastExecution();
$this->nextExecution = $commandTask->getNextExecution();
$this->createdAt = $commandTask->getCreatedAt();
$this->createdBy = $commandTask->getCreatedBy();
}

37
src/Dto/Output/CommandTaskScheduleOutput.php
View File

@ -2,7 +2,40 @@
namespace App\Dto\Output;
class CommandTaskScheduleOutput
{
use ApiPlatform\Metadata\Get;
use App\Entity\CommandTaskSchedule;
use Symfony\Component\Serializer\Annotation\Groups;
#[Get(shortName: 'CommandTaskSchedule')]
class CommandTaskScheduleOutput extends AbstractOutput
{
#[Groups(['command-task-schedule:read'])]
public ?string $recurrenceType = null;
#[Groups(['command-task-schedule:read'])]
public ?\DateTimeInterface $executionDate = null;
#[Groups(['command-task-schedule:read'])]
public ?\DateTimeInterface $executionTime = null;
#[Groups(['command-task-schedule:read'])]
public ?array $recurrenceDetails = null;
#[Groups(['command-task-schedule:read'])]
public ?bool $enabled = null;
public function __construct(?CommandTaskSchedule $commandTaskSchedule = null)
{
parent::__construct($commandTaskSchedule);
if (!$commandTaskSchedule) {
return;
}
$this->recurrenceType = $commandTaskSchedule->getRecurrenceType();
$this->executionTime = $commandTaskSchedule->getExecutionTime();
$this->executionDate = $commandTaskSchedule->getExecutionDate();
$this->recurrenceDetails = $commandTaskSchedule->getRecurrenceDetails();
$this->enabled = $commandTaskSchedule->isEnabled();
}
}

42
src/Dto/Output/CommandTaskScriptOutput.php 100644
View File

@ -0,0 +1,42 @@
<?php
namespace App\Dto\Output;
use ApiPlatform\Metadata\Get;
use App\Entity\CommandTaskSchedule;
use App\Entity\CommandTaskScript;
use Symfony\Component\Serializer\Annotation\Groups;
#[Get(shortName: 'CommandTaskScript')]
class CommandTaskScriptOutput extends AbstractOutput
{
#[Groups(['command-task-script:read'])]
public ?string $content = null;
#[Groups(['command-task-script:read'])]
public ?string $type = null;
#[Groups(['command-task-script:read'])]
public ?array $parameters = null;
#[Groups(['command-task-script:read'])]
public ?CommandTaskOutput $commandTaskOutput = null;
#[Groups(['command-task-script:read'])]
public ?int $order = null;
public function __construct(?CommandTaskScript $commandTaskScript = null)
{
parent::__construct($commandTaskScript);
if (!$commandTaskScript) {
return;
}
$this->content = $commandTaskScript->getContent();
$this->order = $commandTaskScript->getExecutionOrder();
$this->type = $commandTaskScript->getType();
$this->parameters = $commandTaskScript->getParameters();
$this->commandTaskOutput = new CommandTaskOutput($commandTaskScript->getCommandTask());
}
}

62
src/Dto/Output/GitImageRepositoryOutput.php 100644
View File

@ -0,0 +1,62 @@
<?php
namespace App\Dto\Output;
use ApiPlatform\Metadata\Get;
use App\Entity\GitImageRepository;
use App\Entity\ImageImageRepository;
use Symfony\Component\Serializer\Annotation\Groups;
#[Get(shortName: 'GitImageRepository')]
final class GitImageRepositoryOutput extends AbstractOutput
{
#[Groups(['git-image-repository:read', 'image:read'])]
public ?ImageOutput $image = null;
#[Groups(['git-image-repository:read', 'image:read'])]
public ?ImageRepositoryOutput $imageRepository = null;
#[Groups(['git-image-repository:read', 'image:read'])]
public string $status = '';
#[Groups(['git-image-repository:read', 'image:read'])]
public ?string $description = '';
#[Groups(['git-image-repository:read', 'image:read'])]
public string $name = '';
#[Groups(['git-image-repository:read', 'image:read'])]
public ?string $branch = '';
#[Groups(['git-image-repository:read', 'image:read'])]
public ?string $tag = '';
#[Groups(['git-image-repository:read', 'image:read'])]
public \DateTime $createdAt;
#[Groups(['git-image-repository:read', 'image:read'])]
public ?string $createdBy = null;
public function __construct(GitImageRepository $gitImageRepository, array $context = [])
{
parent::__construct($gitImageRepository);
if (isset($context['groups']) && in_array('git-image-repository:read', $context['groups'])) {
if ($gitImageRepository->getImage()) {
$this->image = new ImageOutput($gitImageRepository->getImage());
}
}
if ($gitImageRepository->getRepository()) {
$this->imageRepository = new ImageRepositoryOutput($gitImageRepository->getRepository());
}
$this->name = $gitImageRepository->getName();
$this->description = $gitImageRepository->getDescription();
$this->status = $gitImageRepository->getStatus();
$this->branch = $gitImageRepository->getBranch();
$this->tag = $gitImageRepository->getTag();
$this->createdAt = $gitImageRepository->getCreatedAt();
$this->createdBy = $gitImageRepository->getCreatedBy();
}
}

8
src/Dto/Output/ImageImageRepositoryOutput.php
View File

@ -13,17 +13,20 @@ class ImageImageRepositoryOutput extends AbstractOutput
public ?ImageOutput $image = null;
#[Groups(['image-image-repository:read', 'image:read'])]
public ?ImageRepositoryOutput $imageRepository= null;
public ?ImageRepositoryOutput $imageRepository = null;
#[Groups(['image-image-repository:read', 'image:read'])]
public string $status;
#[Groups(['image-image-repository:read', 'image:read'])]
#[Groups(['image-image-repository:read', 'image:read', 'partition:read'])]
public string $name;
#[Groups(['image-image-repository:read', 'image:read'])]
public ?string $imageFullsum = null;
#[Groups(['image-image-repository:read', 'image:read'])]
public ?array $partitionInfo = null;
#[Groups(['image-image-repository:read', 'image:read'])]
public ?string $datasize = null;
@ -55,6 +58,7 @@ class ImageImageRepositoryOutput extends AbstractOutput
$this->name = $imageImageRepository->getName();
$this->version = $imageImageRepository->getVersion();
$this->partitionInfo = json_decode($imageImageRepository->getPartitionInfo(), true);
$this->status = $imageImageRepository->getStatus();
$this->imageFullsum = $imageImageRepository->getImageFullsum();
$this->datasize = $imageImageRepository->getDatasize();

15
src/Dto/Output/ImageOutput.php
View File

@ -12,21 +12,17 @@ use Symfony\Component\Serializer\Annotation\Groups;
#[Get(shortName: 'Image')]
final class ImageOutput extends AbstractOutput
{
#[Groups(['image:read', 'image-image-repository:read'])]
#[Groups(['image:read', 'image-image-repository:read', 'git-image-repository:read'])]
public ?string $name = '';
#[Groups(['image:read'])]
public ?string $description = '';
#[Groups(['image:read'])]
public ?string $comments = '';
#[Groups(['image:read', 'image-image-repository:read'])]
public ?bool $remotePc = null;
#[Groups(['image:read', 'image-image-repository:read'])]
public ?bool $isGlobal = null;
#[Groups(['image:read', 'image-image-repository:read'])]
public ?string $type = '';
#[Groups(['image:read'])]
public ?SoftwareProfileOutput $softwareProfile = null;
@ -53,8 +49,6 @@ final class ImageOutput extends AbstractOutput
parent::__construct($image);
$this->name = $image->getName();
$this->description = $image->getDescription();
$this->comments = $image->getComments();
$this->softwareProfile = $image->getSoftwareProfile() ? new SoftwareProfileOutput($image->getSoftwareProfile()) : null;
$this->imageRepositories = $image->getImageImageRepositories()->map(
@ -62,6 +56,7 @@ final class ImageOutput extends AbstractOutput
)->toArray();
$this->version = $image->getVersion();
$this->type = $image->getType();
$this->partitionInfo = json_decode($image->getPartitionInfo(), true);
$this->remotePc = $image->isRemotePc();
$this->isGlobal = $image->isGlobal();

7
src/Dto/Output/NetworkSettingsOutput.php
View File

@ -63,6 +63,9 @@ final class NetworkSettingsOutput extends AbstractOutput
#[Groups(['network-settings:read', "organizational-unit:read", "client:read"])]
public ?ImageRepositoryOutput $repository = null;
#[Groups(['network-settings:read', "organizational-unit:read", "client:read"])]
public ?PxeTemplateOutput $pxeTemplate = null;
#[Groups(['network-settings:read', "organizational-unit:read", "client:read"])]
public ?string $ogshare = null;
@ -108,6 +111,10 @@ final class NetworkSettingsOutput extends AbstractOutput
$this->repository = new ImageRepositoryOutput($networkSettings->getRepository());
}
if ($networkSettings->getPxeTemplate()) {
$this->pxeTemplate = new PxeTemplateOutput($networkSettings->getPxeTemplate());
}
$this->createdAt = $networkSettings->getCreatedAt();
$this->createdBy = $networkSettings->getCreatedBy();
}

2
src/Dto/Output/OgLiveOutput.php
View File

@ -40,7 +40,7 @@ final class OgLiveOutput extends AbstractOutput
#[Groups(['og-live:read', 'client:read', "organizational-unit:read"])]
public ?string $filename = null;
#[Groups(['og-live:read'])]
#[Groups(['og-live:read', 'client:read', "organizational-unit:read"])]
public ?string $kernel = '';
#[Groups(['og-live:read'])]

2
src/Dto/Output/OrganizationalUnitOutput.php
View File

@ -11,7 +11,7 @@ use Symfony\Component\Serializer\Annotation\Groups;
#[Get(shortName: 'OrganizationalUnit')]
final class OrganizationalUnitOutput extends AbstractOutput
{
#[Groups(['organizational-unit:read', "client:read", "user:read", 'organizational-unit:read:collection:short', 'software-profile:read'])]
#[Groups(['organizational-unit:read', "client:read", "user:read", 'organizational-unit:read:collection:short', 'software-profile:read', 'command-task:read'])]
public string $name;
#[Groups(['organizational-unit:read'])]

10
src/Dto/Output/PartitionOutput.php
View File

@ -3,6 +3,7 @@
namespace App\Dto\Output;
use ApiPlatform\Metadata\Get;
use App\Entity\ImageImageRepository;
use App\Entity\Partition;
use Symfony\Component\Serializer\Annotation\Groups;
@ -30,6 +31,9 @@ class PartitionOutput extends AbstractOutput
#[Groups(['partition:read', 'client:read'])]
public ?OperativeSystemOutput $operativeSystem = null;
#[Groups(['partition:read', 'client:read'])]
public ?ImageImageRepositoryOutput $image = null;
#[Groups(['partition:read', 'client:read'])]
public ?int $memoryUsage = null;
@ -43,9 +47,15 @@ class PartitionOutput extends AbstractOutput
$this->size = $partition->getSize() / 1024 ;
$this->cacheContent = $partition->getCacheContent();
$this->filesystem = $partition->getFilesystem();
if ($partition->getOperativeSystem()) {
$this->operativeSystem = new OperativeSystemOutput($partition->getOperativeSystem());
}
if ($partition->getImage()) {
$this->image = new ImageImageRepositoryOutput($partition->getImage());
}
$this->memoryUsage = $partition->getMemoryUsage() / 100;
}
}

4
src/Dto/Output/PxeTemplateOutput.php
View File

@ -20,6 +20,9 @@ final class PxeTemplateOutput extends AbstractOutput
#[Groups(['pxe-template:read'])]
public ?string $templateContent = '';
#[Groups(['pxe-template:read'])]
public ?bool $isDefault = null;
#[Groups(['pxe-template:read'])]
public ?int $clientsLength = 0;
@ -37,6 +40,7 @@ final class PxeTemplateOutput extends AbstractOutput
$this->synchronized = $pxeTemplate->isSynchronized();
$this->templateContent = $pxeTemplate->getTemplateContent();
$this->clientsLength = $pxeTemplate->getClients()->count();
$this->isDefault = $pxeTemplate->isDefault();
$this->createdAt = $pxeTemplate->getCreatedAt();
$this->createdBy = $pxeTemplate->getCreatedBy();
}

1
src/Entity/Client.php
View File

@ -64,6 +64,7 @@ class Client extends AbstractEntity
private ?array $position = ['x' => 0, 'y' => 0];
#[ORM\ManyToOne(inversedBy: 'clients')]
#[ORM\JoinColumn( onDelete: 'SET NULL')]
private ?PxeTemplate $template = null;
#[ORM\ManyToOne()]

7
src/Entity/Command.php
View File

@ -29,12 +29,6 @@ class Command extends AbstractEntity
#[ORM\ManyToMany(targetEntity: CommandGroup::class, mappedBy: 'commands')]
private Collection $commandGroups;
/**
* @var Collection<int, CommandTask>
*/
#[ORM\ManyToMany(targetEntity: CommandTask::class, mappedBy: 'commands')]
private Collection $commandTasks;
#[ORM\Column(nullable: true)]
private ?bool $parameters = null;
@ -42,7 +36,6 @@ class Command extends AbstractEntity
{
parent::__construct();
$this->commandGroups = new ArrayCollection();
$this->commandTasks = new ArrayCollection();
}
public function getScript(): ?string

339
src/Entity/CommandTask.php
View File

@ -11,122 +11,51 @@ use Doctrine\ORM\Mapping as ORM;
#[ORM\Entity(repositoryClass: CommandTaskRepository::class)]
class CommandTask extends AbstractEntity
{
/**
* @var Collection<int, Command>
*/
#[ORM\ManyToMany(targetEntity: Command::class, inversedBy: 'commandTasks')]
private Collection $commands;
/**
* @var Collection<int, CommandGroup>
*/
#[ORM\ManyToMany(targetEntity: CommandGroup::class, inversedBy: 'commandTasks')]
private Collection $commandGroups;
#[ORM\Column(type: Types::DATETIME_MUTABLE)]
private ?\DateTimeInterface $datetime = null;
use NameableTrait;
#[ORM\Column(length: 255, nullable: true)]
private ?string $notes = null;
#[ORM\Column(length: 255)]
private ?string $status = null;
/**
* @var Collection<int, Client>
*/
#[ORM\ManyToMany(targetEntity: Client::class)]
private Collection $clients;
#[ORM\Column(type: Types::ARRAY, nullable: true)]
private ?array $parameters = null;
#[ORM\ManyToOne]
private ?OrganizationalUnit $organizationalUnit = null;
/**
* @var Collection<int, CommandTaskSchedule>
*/
#[ORM\OneToMany(mappedBy: 'commandTask', targetEntity: CommandTaskSchedule::class, cascade: ['persist'], orphanRemoval: true)]
private Collection $commandTaskSchedules;
/**
* @var Collection<int, CommandTaskScript>
*/
#[ORM\OneToMany(mappedBy: 'commandTask', targetEntity: CommandTaskScript::class, cascade: ['persist'], orphanRemoval: true)]
private Collection $commandTaskScripts;
#[ORM\Column(type: Types::DATETIME_MUTABLE, nullable: true)]
private ?\DateTimeInterface $lastExecution = null;
#[ORM\Column(type: Types::DATETIME_MUTABLE, nullable: true)]
private ?\DateTimeInterface $nextExecution = null;
#[ORM\Column(length: 255)]
private ?string $scope = null;
public function __construct()
{
parent::__construct();
$this->commands = new ArrayCollection();
$this->commandGroups = new ArrayCollection();
$this->clients = new ArrayCollection();
}
/**
* @return Collection<int, Command>
*/
public function getCommands(): Collection
{
return $this->commands;
}
public function setCommands(array $commands): static
{
$this->commands->clear();
foreach ($commands as $command){
$this->addCommand($command);
}
return $this;
}
public function addCommand(Command $command): static
{
if (!$this->commands->contains($command)) {
$this->commands->add($command);
}
return $this;
}
public function removeCommand(Command $command): static
{
$this->commands->removeElement($command);
return $this;
}
/**
* @return Collection<int, CommandGroup>
*/
public function getCommandGroups(): Collection
{
return $this->commandGroups;
}
public function setCommandGroups(array $commandGroups): static
{
$this->commandGroups->clear();
foreach ($commandGroups as $commandGroup){
$this->addCommandGroup($commandGroup);
}
return $this;
}
public function addCommandGroup(CommandGroup $commandGroup): static
{
if (!$this->commandGroups->contains($commandGroup)) {
$this->commandGroups->add($commandGroup);
}
return $this;
}
public function removeCommandGroup(CommandGroup $commandGroup): static
{
$this->commandGroups->removeElement($commandGroup);
return $this;
}
public function getDatetime(): ?\DateTimeInterface
{
return $this->datetime;
}
public function setDatetime(\DateTimeInterface $datetime): static
{
$this->datetime = $datetime;
return $this;
$this->commandTaskSchedules = new ArrayCollection();
$this->commandTaskScripts = new ArrayCollection();
}
public function getNotes(): ?string
@ -141,18 +70,6 @@ class CommandTask extends AbstractEntity
return $this;
}
public function getStatus(): ?string
{
return $this->status;
}
public function setStatus(string $status): static
{
$this->status = $status;
return $this;
}
/**
* @return Collection<int, Client>
*/
@ -187,4 +104,200 @@ class CommandTask extends AbstractEntity
return $this;
}
public function getParameters(): ?array
{
return $this->parameters;
}
public function setParameters(?array $parameters): static
{
$this->parameters = $parameters;
return $this;
}
public function getOrganizationalUnit(): ?OrganizationalUnit
{
return $this->organizationalUnit;
}
public function setOrganizationalUnit(?OrganizationalUnit $organizationalUnit): static
{
$this->organizationalUnit = $organizationalUnit;
return $this;
}
/**
* @return Collection<int, CommandTaskSchedule>
*/
public function getCommandTaskSchedules(): Collection
{
return $this->commandTaskSchedules;
}
public function addCommandTaskSchedule(CommandTaskSchedule $commandTaskSchedule): static
{
if (!$this->commandTaskSchedules->contains($commandTaskSchedule)) {
$this->commandTaskSchedules->add($commandTaskSchedule);
$commandTaskSchedule->setCommandTask($this);
}
return $this;
}
public function removeCommandTaskSchedule(CommandTaskSchedule $commandTaskSchedule): static
{
if ($this->commandTaskSchedules->removeElement($commandTaskSchedule)) {
// set the owning side to null (unless already changed)
if ($commandTaskSchedule->getCommandTask() === $this) {
$commandTaskSchedule->setCommandTask(null);
}
}
return $this;
}
/**
* @return Collection<int, CommandTaskScript>
*/
public function getCommandTaskScripts(): Collection
{
return $this->commandTaskScripts;
}
public function addCommandTaskScript(CommandTaskScript $commandTaskScript): static
{
if (!$this->commandTaskScripts->contains($commandTaskScript)) {
$this->commandTaskScripts->add($commandTaskScript);
$commandTaskScript->setCommandTask($this);
}
return $this;
}
public function removeCommandTaskScript(CommandTaskScript $commandTaskScript): static
{
if ($this->commandTaskScripts->removeElement($commandTaskScript)) {
// set the owning side to null (unless already changed)
if ($commandTaskScript->getCommandTask() === $this) {
$commandTaskScript->setCommandTask(null);
}
}
return $this;
}
public function getLastExecution(): ?\DateTimeInterface
{
return $this->lastExecution;
}
public function setLastExecution(?\DateTimeInterface $lastExecution): static
{
$this->lastExecution = $lastExecution;
return $this;
}
public function getNextExecution(): ?\DateTimeInterface
{
return $this->nextExecution;
}
public function setNextExecution(?\DateTimeInterface $nextExecution): static
{
$this->nextExecution = $nextExecution;
return $this;
}
/**
* @throws \Exception
*/
public function calculateNextExecutionDate(): ?\DateTimeInterface
{
$now = new \DateTime();
$closestDateTime = null;
foreach ($this->getCommandTaskSchedules() as $schedule) {
$type = $schedule->getRecurrenceType();
$executionTime = $schedule->getExecutionTime();
if ($type === 'none') {
$execDate = $schedule->getExecutionDate();
if ($execDate !== null && $execDate > $now) {
if ($executionTime !== null) {
$execDateTime = \DateTime::createFromFormat(
'Y-m-d H:i:s',
$execDate->format('Y-m-d') . ' ' . $executionTime->format('H:i:s')
);
} else {
$execDateTime = $execDate;
}
if ($closestDateTime === null || $execDateTime < $closestDateTime) {
$closestDateTime = $execDateTime;
}
}
} else {
$details = $schedule->getRecurrenceDetails();
if ($details === null) {
continue;
}
$init = (new \DateTime($details['initDate'] ?? 'now'))->setTime(0, 0);
$end = (new \DateTime($details['endDate'] ?? '+1 year'))->setTime(0, 0);
$validDays = array_map('mb_strtolower', $details['daysOfWeek'] ?? []);
$validMonths = array_map('mb_strtolower', $details['months'] ?? []);
$current = (new \DateTime())->setTime(0, 0);
while ($current <= $end) {
if ($current < $init) {
$current->modify('+1 day');
continue;
}
$translatedDay = mb_strtolower($current->format('l'));
$translatedMonth = mb_strtolower($current->format('F'));
if (in_array($translatedDay, $validDays, true) && in_array($translatedMonth, $validMonths, true)) {
if ($executionTime !== null) {
$execDateTime = \DateTime::createFromFormat(
'Y-m-d H:i:s',
$current->format('Y-m-d') . ' ' . $executionTime->format('H:i:s')
);
} else {
$execDateTime = clone $current;
}
if ($execDateTime > $now && ($closestDateTime === null || $execDateTime < $closestDateTime)) {
$closestDateTime = $execDateTime;
}
break;
}
$current->modify('+1 day');
}
}
}
return $closestDateTime;
}
public function getScope(): ?string
{
return $this->scope;
}
public function setScope(string $scope): static
{
$this->scope = $scope;
return $this;
}
}

89
src/Entity/CommandTaskSchedule.php 100644
View File

@ -0,0 +1,89 @@
<?php
namespace App\Entity;
use App\Repository\CommandTaskScheduleRepository;
use Doctrine\DBAL\Types\Types;
use Doctrine\ORM\Mapping as ORM;
#[ORM\Entity(repositoryClass: CommandTaskScheduleRepository::class)]
class CommandTaskSchedule extends AbstractEntity
{
use ToggleableTrait;
#[ORM\Column(length: 255)]
private ?string $recurrenceType = null;
#[ORM\Column(type: Types::DATE_MUTABLE, nullable: true)]
private ?\DateTimeInterface $executionDate = null;
#[ORM\Column(nullable: true)]
private ?array $recurrenceDetails = null;
#[ORM\ManyToOne(cascade: ['persist'], inversedBy: 'commandTaskSchedules')]
#[ORM\JoinColumn(nullable: false)]
private ?CommandTask $commandTask = null;
#[ORM\Column(type: Types::TIME_MUTABLE, nullable: true)]
private ?\DateTimeInterface $executionTime = null;
public function getRecurrenceType(): ?string
{
return $this->recurrenceType;
}
public function setRecurrenceType(string $recurrenceType): static
{
$this->recurrenceType = $recurrenceType;
return $this;
}
public function getRecurrenceDetails(): ?array
{
return $this->recurrenceDetails;
}
public function setRecurrenceDetails(?array $recurrenceDetails): static
{
$this->recurrenceDetails = $recurrenceDetails;
return $this;
}
public function getCommandTask(): ?CommandTask
{
return $this->commandTask;
}
public function setCommandTask(?CommandTask $commandTask): static
{
$this->commandTask = $commandTask;
return $this;
}
public function getExecutionTime(): ?\DateTimeInterface
{
return $this->executionTime;
}
public function setExecutionTime(?\DateTimeInterface $executionTime): static
{
$this->executionTime = $executionTime;
return $this;
}
public function getExecutionDate(): ?\DateTimeInterface
{
return $this->executionDate;
}
public function setExecutionDate(?\DateTimeInterface $executionDate): static
{
$this->executionDate = $executionDate;
return $this;
}
}

92
src/Entity/CommandTaskScript.php 100644
View File

@ -0,0 +1,92 @@
<?php
namespace App\Entity;
use App\Repository\CommandTaskScriptRepository;
use Doctrine\DBAL\Types\Types;
use Doctrine\ORM\Mapping as ORM;
#[ORM\Entity(repositoryClass: CommandTaskScriptRepository::class)]
class CommandTaskScript extends AbstractEntity
{
#[ORM\Column(length: 255, nullable: true)]
private ?string $content = null;
#[ORM\Column]
private ?int $executionOrder = null;
#[ORM\ManyToOne(cascade: ['persist'], inversedBy: 'commandTaskScripts')]
#[ORM\JoinColumn(nullable: false)]
private ?CommandTask $commandTask = null;
#[ORM\Column(length: 255)]
private ?string $type = null;
#[ORM\Column(type: Types::ARRAY, nullable: true)]
private ?array $parameters = null;
public function getId(): ?int
{
return $this->id;
}
public function getContent(): ?string
{
return $this->content;
}
public function setContent(?string $content): static
{
$this->content = $content;
return $this;
}
public function getExecutionOrder(): ?int
{
return $this->executionOrder;
}
public function setExecutionOrder(int $executionOrder): static
{
$this->executionOrder = $executionOrder;
return $this;
}
public function getCommandTask(): ?CommandTask
{
return $this->commandTask;
}
public function setCommandTask(?CommandTask $commandTask): static
{
$this->commandTask = $commandTask;
return $this;
}
public function getType(): ?string
{
return $this->type;
}
public function setType(string $type): static
{
$this->type = $type;
return $this;
}
public function getParameters(): ?array
{
return $this->parameters;
}
public function setParameters(?array $parameters): static
{
$this->parameters = $parameters;
return $this;
}
}

134
src/Entity/GitImageRepository.php 100644
View File

@ -0,0 +1,134 @@
<?php
namespace App\Entity;
use App\Repository\GitImageRepositoryRepository;
use Doctrine\ORM\Mapping as ORM;
#[ORM\Entity(repositoryClass: GitImageRepositoryRepository::class)]
class GitImageRepository extends AbstractEntity
{
use NameableTrait;
#[ORM\ManyToOne(inversedBy: 'gitImageRepositories')]
#[ORM\JoinColumn(nullable: false)]
private ?Image $image = null;
#[ORM\ManyToOne(inversedBy: 'gitImageRepositories')]
private ?ImageRepository $repository = null;
#[ORM\Column(length: 255)]
private ?string $status = null;
#[ORM\Column(length: 255, nullable: true)]
private ?string $description = null;
#[ORM\Column(length: 255, nullable: true)]
private ?string $branch = null;
#[ORM\Column(length: 255)]
private ?string $tag = null;
#[ORM\Column(nullable: true)]
private ?int $version = null;
#[ORM\Column]
private ?bool $created = null;
public function getImage(): ?Image
{
return $this->image;
}
public function setImage(?Image $image): static
{
$this->image = $image;
return $this;
}
public function getStatus(): ?string
{
return $this->status;
}
public function setStatus(string $status): static
{
$this->status = $status;
return $this;
}
public function getDescription(): ?string
{
return $this->description;
}
public function setDescription(?string $description): static
{
$this->description = $description;
return $this;
}
public function getBranch(): ?string
{
return $this->branch;
}
public function setBranch(?string $branch): static
{
$this->branch = $branch;
return $this;
}
public function getTag(): ?string
{
return $this->tag;
}
public function setTag(?string $tag): static
{
$this->tag = $tag;
return $this;
}
public function getVersion(): ?int
{
return $this->version;
}
public function setVersion(?int $version): static
{
$this->version = $version;
return $this;
}
public function isCreated(): ?bool
{
return $this->created;
}
public function setCreated(bool $created): static
{
$this->created = $created;
return $this;
}
public function getRepository(): ?ImageRepository
{
return $this->repository;
}
public function setRepository(?ImageRepository $imageRepository): static
{
$this->repository = $imageRepository;
return $this;
}
}

82
src/Entity/Image.php
View File

@ -15,12 +15,6 @@ class Image extends AbstractEntity
{
use NameableTrait;
#[ORM\Column(length: 255, nullable: true)]
private ?string $description = null;
#[ORM\Column(length: 255, nullable: true)]
private ?string $comments = null;
#[ORM\ManyToOne]
#[ORM\JoinColumn(nullable: true)]
private ?SoftwareProfile $softwareProfile = null;
@ -49,34 +43,20 @@ class Image extends AbstractEntity
#[ORM\Column(nullable: true)]
private ?int $version = null;
/**
* @var Collection<int, GitImageRepository>
*/
#[ORM\OneToMany(mappedBy: 'image', targetEntity: GitImageRepository::class,cascade: ['persist'], orphanRemoval: true)]
private Collection $gitImageRepositories;
#[ORM\Column(length: 255)]
private ?string $type = null;
public function __construct()
{
parent::__construct();
$this->imageImageRepositories = new ArrayCollection();
}
public function getDescription(): ?string
{
return $this->description;
}
public function setDescription(?string $description): static
{
$this->description = $description;
return $this;
}
public function getComments(): ?string
{
return $this->comments;
}
public function setComments(?string $comments): static
{
$this->comments = $comments;
return $this;
$this->gitImageRepositories = new ArrayCollection();
}
public function getSoftwareProfile(): ?SoftwareProfile
@ -206,4 +186,46 @@ class Image extends AbstractEntity
return $this;
}
/**
* @return Collection<int, GitImageRepository>
*/
public function getGitImageRepositories(): Collection
{
return $this->gitImageRepositories;
}
public function addGitImageRepository(GitImageRepository $gitImageRepository): static
{
if (!$this->gitImageRepositories->contains($gitImageRepository)) {
$this->gitImageRepositories->add($gitImageRepository);
$gitImageRepository->setImage($this);
}
return $this;
}
public function removeGitImageRepository(GitImageRepository $gitImageRepository): static
{
if ($this->gitImageRepositories->removeElement($gitImageRepository)) {
// set the owning side to null (unless already changed)
if ($gitImageRepository->getImage() === $this) {
$gitImageRepository->setImage(null);
}
}
return $this;
}
public function getType(): ?string
{
return $this->type;
}
public function setType(string $type): static
{
$this->type = $type;
return $this;
}
}

15
src/Entity/ImageImageRepository.php
View File

@ -23,6 +23,9 @@ class ImageImageRepository extends AbstractEntity
#[ORM\Column(nullable: true)]
private ?bool $created = null;
#[ORM\Column(length: 255, nullable: true)]
private ?string $partitionInfo = null;
#[ORM\Column(length: 255, nullable: true)]
private ?string $imageFullsum = null;
@ -86,6 +89,18 @@ class ImageImageRepository extends AbstractEntity
return $this;
}
public function getPartitionInfo(): ?string
{
return $this->partitionInfo;
}
public function setPartitionInfo(?string $partitionInfo): static
{
$this->partitionInfo = $partitionInfo;
return $this;
}
public function getImageFullsum(): ?string
{
return $this->imageFullsum;

37
src/Entity/ImageRepository.php
View File

@ -32,10 +32,17 @@ class ImageRepository extends AbstractEntity
#[ORM\Column(length: 255, nullable: true)]
private ?string $sshPort = null;
/**
* @var Collection<int, GitImageRepository>
*/
#[ORM\OneToMany(mappedBy: 'repository', targetEntity: GitImageRepository::class)]
private Collection $gitImageRepositories;
public function __construct()
{
parent::__construct();
$this->imageImageRepositories = new ArrayCollection();
$this->gitImageRepositories = new ArrayCollection();
}
public function getIp(): ?string
@ -115,4 +122,34 @@ class ImageRepository extends AbstractEntity
return $this;
}
/**
* @return Collection<int, GitImageRepository>
*/
public function getGitImageRepositories(): Collection
{
return $this->gitImageRepositories;
}
public function addGitImageRepository(GitImageRepository $gitImageRepository): static
{
if (!$this->gitImageRepositories->contains($gitImageRepository)) {
$this->gitImageRepositories->add($gitImageRepository);
$gitImageRepository->setImageRepository($this);
}
return $this;
}
public function removeGitImageRepository(GitImageRepository $gitImageRepository): static
{
if ($this->gitImageRepositories->removeElement($gitImageRepository)) {
// set the owning side to null (unless already changed)
if ($gitImageRepository->getImageRepository() === $this) {
$gitImageRepository->setImageRepository(null);
}
}
return $this;
}
}

15
src/Entity/NetworkSettings.php
View File

@ -76,6 +76,9 @@ class NetworkSettings extends AbstractEntity
#[ORM\Column(length: 255, nullable: true)]
private ?string $ogShare = null;
#[ORM\ManyToOne]
private ?PxeTemplate $pxeTemplate = null;
public function __construct()
{
parent::__construct();
@ -337,4 +340,16 @@ class NetworkSettings extends AbstractEntity
return $this;
}
public function getPxeTemplate(): ?PxeTemplate
{
return $this->pxeTemplate;
}
public function setPxeTemplate(?PxeTemplate $pxeTemplate): static
{
$this->pxeTemplate = $pxeTemplate;
return $this;
}
}

6
src/Entity/Partition.php
View File

@ -40,7 +40,7 @@ class Partition extends AbstractEntity
#[ORM\ManyToOne(inversedBy: 'partitions')]
#[ORM\JoinColumn(nullable: true)]
private ?Image $image = null;
private ?ImageImageRepository $image = null;
public function getDiskNumber(): ?int
{
@ -150,12 +150,12 @@ class Partition extends AbstractEntity
return $this;
}
public function getImage(): ?Image
public function getImage(): ?ImageImageRepository
{
return $this->image;
}
public function setImage(?Image $image): static
public function setImage(?ImageImageRepository $image): static
{
$this->image = $image;

15
src/Entity/PxeTemplate.php
View File

@ -26,6 +26,9 @@ class PxeTemplate extends AbstractEntity
#[ORM\OneToMany(mappedBy: 'template', targetEntity: Client::class)]
private Collection $clients;
#[ORM\Column(nullable: true)]
private ?bool $isDefault = null;
public function __construct()
{
parent::__construct();
@ -82,4 +85,16 @@ class PxeTemplate extends AbstractEntity
return $this;
}
public function isDefault(): ?bool
{
return $this->isDefault;
}
public function setDefault(?bool $isDefault): static
{
$this->isDefault = $isDefault;
return $this;
}
}

8
src/EventSubscriber/ClientSubscriber.php
View File

@ -49,10 +49,14 @@ final readonly class ClientSubscriber implements EventSubscriberInterface
/** @var Client $client */
$client = $clientOutput->getEntity();
if ($client->getTemplate() === null) {
$template = !$client->getTemplate() ?
$client->getTemplate() :
$client->getOrganizationalUnit()?->getNetworkSettings()?->getPxeTemplate();
if ($template === null) {
return;
}
$this->postAction->__invoke($client, $client->getTemplate());
$this->postAction->__invoke($client, $template);
}
}

60
src/EventSubscriber/CommandTaskScheduleSubscriber.php 100644
View File

@ -0,0 +1,60 @@
<?php
namespace App\EventSubscriber;
use ApiPlatform\Symfony\EventListener\EventPriorities;
use App\Controller\OgBoot\PxeBootFile\PostAction;
use App\Dto\Output\CommandTaskScheduleOutput;
use App\Entity\CommandTaskSchedule;
use App\Entity\CommandTaskScript;
use Doctrine\ORM\EntityManagerInterface;
use Symfony\Component\EventDispatcher\EventSubscriberInterface;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpKernel\Event\ViewEvent;
use Symfony\Component\HttpKernel\KernelEvents;
final readonly class CommandTaskScheduleSubscriber implements EventSubscriberInterface
{
public function __construct(
private EntityManagerInterface $entityManager,
)
{
}
public static function getSubscribedEvents(): array
{
return [
KernelEvents::VIEW => ['updateCommandTaskNextExecution', EventPriorities::POST_WRITE],
];
}
/**
* @throws \Exception
*/
public function updateCommandTaskNextExecution(ViewEvent $event): void
{
$commandTaskScheduleOutput = $event->getControllerResult();
$method = $event->getRequest()->getMethod();
if (!$commandTaskScheduleOutput instanceof CommandTaskScheduleOutput ||
!in_array($method, [Request::METHOD_POST, Request::METHOD_PUT, Request::METHOD_PATCH, Request::METHOD_DELETE])) {
return;
}
/** @var CommandTaskSchedule $commandTaskSchedule */
$commandTaskSchedule = $commandTaskScheduleOutput->getEntity();
$commandTask = $commandTaskSchedule->getCommandTask();
if ($commandTask === null) {
return;
}
$commandTask->setNextExecution($commandTask->calculateNextExecutionDate());
$this->entityManager->persist($commandTask);
$this->entityManager->flush();
}
}

59
src/EventSubscriber/CommandTaskScriptSubscriber.php 100644
View File

@ -0,0 +1,59 @@
<?php
namespace App\EventSubscriber;
use ApiPlatform\Symfony\EventListener\EventPriorities;
use App\Controller\OgBoot\PxeBootFile\PostAction;
use App\Dto\Output\CommandTaskScriptOutput;
use App\Entity\CommandTaskScript;
use Doctrine\ORM\EntityManagerInterface;
use Symfony\Component\EventDispatcher\EventSubscriberInterface;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpKernel\Event\ViewEvent;
use Symfony\Component\HttpKernel\KernelEvents;
final readonly class CommandTaskScriptSubscriber implements EventSubscriberInterface
{
public function __construct(
private EntityManagerInterface $entityManager,
)
{
}
public static function getSubscribedEvents(): array
{
return [
KernelEvents::VIEW => ['updateCommandTaskNextExecution', EventPriorities::POST_WRITE],
];
}
/**
* @throws \Exception
*/
public function updateCommandTaskNextExecution(ViewEvent $event): void
{
$commandTaskScriptOutput = $event->getControllerResult();
$method = $event->getRequest()->getMethod();
if (!$commandTaskScriptOutput instanceof CommandTaskScriptOutput ||
!in_array($method, [Request::METHOD_POST, Request::METHOD_PUT, Request::METHOD_PATCH, Request::METHOD_DELETE])) {
return;
}
/** @var CommandTaskScript $commandTaskScript */
$commandTaskScript = $commandTaskScriptOutput->getEntity();
$commandTask = $commandTaskScript->getCommandTask();
if ($commandTask === null) {
return;
}
$commandTask->setNextExecution($commandTask->calculateNextExecutionDate());
$this->entityManager->persist($commandTask);
$this->entityManager->flush();
}
}

4
src/EventSubscriber/OrganizationalUnitSubscriber.php
View File

@ -64,7 +64,7 @@ final readonly class OrganizationalUnitSubscriber implements EventSubscriberInte
$this->updateChildrenNetworkSettings($organizationalUnitEntity, $newNetworkSettings);
if ($organizationalUnitEntity->getType() === OrganizationalUnitTypes::CLASSROOM) {
//$this->syncOgBoot($organizationalUnitEntity);
$this->syncOgBoot($organizationalUnitEntity);
}
}
@ -82,6 +82,7 @@ final readonly class OrganizationalUnitSubscriber implements EventSubscriberInte
$client->setOgLive($networkSettings->getOgLive());
$client->setMenu($networkSettings->getMenu());
$client->setRepository($networkSettings->getRepository());
$client->setTemplate($networkSettings->getPxeTemplate());
$this->entityManager->persist($client);
}
@ -116,6 +117,7 @@ final readonly class OrganizationalUnitSubscriber implements EventSubscriberInte
$newNetworkSettings->setMenu($organizationalUnitEntity->getNetworkSettings()->getMenu());
$newNetworkSettings->setRepository($organizationalUnitEntity->getNetworkSettings()->getRepository());
$newNetworkSettings->setOgLive($organizationalUnitEntity->getNetworkSettings()->getOgLive());
$newNetworkSettings->setPxeTemplate($organizationalUnitEntity->getNetworkSettings()->getPxeTemplate());
$newNetworkSettings->setNetiface($organizationalUnitEntity->getNetworkSettings()->getNetiface());
return $newNetworkSettings;

72
src/EventSubscriber/PxeTemplateSubscriber.php 100644
View File

@ -0,0 +1,72 @@
<?php
namespace App\EventSubscriber;
use ApiPlatform\Symfony\EventListener\EventPriorities;
use App\Controller\OgBoot\PxeTemplate\PostAction;
use App\Dto\Output\OrganizationalUnitOutput;
use App\Dto\Output\PxeTemplateOutput;
use App\Entity\Client;
use App\Entity\NetworkSettings;
use App\Entity\OrganizationalUnit;
use App\Entity\PxeTemplate;
use Doctrine\ORM\EntityManagerInterface;
use Symfony\Component\EventDispatcher\EventSubscriberInterface;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpKernel\Event\ViewEvent;
use Symfony\Component\HttpKernel\KernelEvents;
use Symfony\Contracts\HttpClient\Exception\ClientExceptionInterface;
use Symfony\Contracts\HttpClient\Exception\RedirectionExceptionInterface;
use Symfony\Contracts\HttpClient\Exception\ServerExceptionInterface;
use Symfony\Contracts\HttpClient\Exception\TransportExceptionInterface;
final readonly class PxeTemplateSubscriber implements EventSubscriberInterface
{
public function __construct(
private readonly PostAction $postTemplateAction,
private readonly \App\Controller\OgBoot\PxeBootFile\PostAction $postAction,
private readonly EntityManagerInterface $entityManager,
)
{
}
public static function getSubscribedEvents(): array
{
return [
KernelEvents::VIEW => ['syncPxeTemplate', EventPriorities::POST_WRITE],
];
}
/**
* @throws TransportExceptionInterface
* @throws ServerExceptionInterface
* @throws RedirectionExceptionInterface
* @throws ClientExceptionInterface
*/
public function syncPxeTemplate(ViewEvent $event): void
{
$pxeTemplateOutput = $event->getControllerResult();
$method = $event->getRequest()->getMethod();
if (!$pxeTemplateOutput instanceof PxeTemplateOutput ||
!in_array($method, [Request::METHOD_POST, Request::METHOD_PUT, Request::METHOD_PATCH])) {
return;
}
/** @var PxeTemplate $templateEntity */
$templateEntity = $pxeTemplateOutput->getEntity();
try {
$this->postTemplateAction->__invoke($templateEntity);
} catch (\Exception $e) {
return ;
}
$clients = $this->entityManager->getRepository(Client::class)->findBy(['template' => $templateEntity]);
foreach ($clients as $client) {
$this->postAction->__invoke($client, $templateEntity);
}
}
}

6
src/Factory/CommandTaskFactory.php
View File

@ -3,6 +3,7 @@
namespace App\Factory;
use App\Entity\CommandTask;
use App\Model\OrganizationalUnitTypes;
use App\Repository\CommandTaskRepository;
use Zenstruck\Foundry\ModelFactory;
use Zenstruck\Foundry\Persistence\PersistentProxyObjectFactory;
@ -38,8 +39,9 @@ final class CommandTaskFactory extends ModelFactory
{
return [
'createdAt' => self::faker()->dateTime(),
'datetime' => self::faker()->dateTime(),
'status' => self::faker()->text(255),
'name' => self::faker()->text(255),
'organizationalUnit' => OrganizationalUnitFactory::createOne(['type' => OrganizationalUnitTypes::ORGANIZATIONAL_UNIT])->_save(),
'scope' => 'organizational-unit',
'updatedAt' => self::faker()->dateTime()
];
}

1
src/Factory/ImageFactory.php
View File

@ -37,6 +37,7 @@ final class ImageFactory extends ModelFactory
'name' => self::faker()->text(255),
'softwareProfile' => SoftwareProfileFactory::new(),
'updatedAt' => self::faker()->dateTime(),
'type' => 'monolithic',
'remotePc' => self::faker()->boolean(),
'isGlobal' => false,
];

2
src/Factory/PartitionFactory.php
View File

@ -43,7 +43,7 @@ final class PartitionFactory extends ModelFactory
'updatedAt' => self::faker()->dateTime(),
'operativeSystem' => OperativeSystemFactory::new(),
'client' => ClientFactory::new(),
'image' => ImageFactory::new(),
'image' => ImageImageRepositoryFactory::new(),
];
}

18
src/Repository/CommandTaskScheduleRepository.php 100644
View File

@ -0,0 +1,18 @@
<?php
namespace App\Repository;
use App\Entity\CommandTaskSchedule;
use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
use Doctrine\Persistence\ManagerRegistry;
/**
* @extends ServiceEntityRepository<CommandTaskSchedule>
*/
class CommandTaskScheduleRepository extends AbstractRepository
{
public function __construct(ManagerRegistry $registry)
{
parent::__construct($registry, CommandTaskSchedule::class);
}
}

18
src/Repository/CommandTaskScriptRepository.php 100644
View File

@ -0,0 +1,18 @@
<?php
namespace App\Repository;
use App\Entity\CommandTaskScript;
use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
use Doctrine\Persistence\ManagerRegistry;
/**
* @extends ServiceEntityRepository<CommandTaskScript>
*/
class CommandTaskScriptRepository extends AbstractRepository
{
public function __construct(ManagerRegistry $registry)
{
parent::__construct($registry, CommandTaskScript::class);
}
}

33
src/Repository/GitImageRepositoryRepository.php 100644
View File

@ -0,0 +1,33 @@
<?php
namespace App\Repository;
use App\Entity\GitImageRepository;
use App\Entity\Image;
use App\Entity\ImageRepository as Repository;
use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
use Doctrine\Persistence\ManagerRegistry;
/**
* @extends ServiceEntityRepository<GitImageRepository>
*/
class GitImageRepositoryRepository extends AbstractRepository
{
public function __construct(ManagerRegistry $registry)
{
parent::__construct($registry, GitImageRepository::class);
}
public function findLatestVersionByImageAndRepository(Image $image, Repository $repository): ?GitImageRepository
{
return $this->createQueryBuilder('i')
->andWhere('i.image = :imageId')
->setParameter('imageId', $image->getId())
->andWhere('i.repository = :repository')
->setParameter('repository', $repository->getId())
->orderBy('i.version', 'DESC')
->setMaxResults(1)
->getQuery()
->getOneOrNullResult();
}
}

6
src/Service/CreateTraceService.php
View File

@ -21,8 +21,9 @@ readonly class CreateTraceService
foreach ($commandTask->getClients() as $client) {
$trace = new Trace();
$trace->setClient($client);
$trace->setCommand($command);
$trace->setCommand($command->getName());
$trace->setStatus(TraceStatus::PENDING);
$trace->setInput($commandTask->getParameters());
$trace->setExecutedAt($commandTask->getDatetime());
$this->entityManager->persist($trace);
}
@ -33,7 +34,8 @@ readonly class CreateTraceService
foreach ($commandTask->getClients() as $client) {
$trace = new Trace();
$trace->setClient($client);
$trace->setCommand($command);
$trace->setCommand($command->getName());
$trace->setInput($commandTask->getParameters());
$trace->setStatus(TraceStatus::PENDING);
$trace->setExecutedAt($commandTask->getDatetime());
$this->entityManager->persist($trace);

8
src/Service/UDS/UDSClient.php
View File

@ -26,13 +26,13 @@ class UDSClient
private HttpClientInterface $httpClient,
private readonly EntityManagerInterface $entityManager,
#[Autowire(env: 'UDS_URL')]
private string $udsAPIurl,
private readonly string $udsAPIurl,
#[Autowire(env: 'UDS_AUTH_LOGIN')]
private string $udsAuthLogin,
private readonly string $udsAuthLogin,
#[Autowire(env: 'UDS_AUTH_USERNAME')]
private string $udsAuthUsername,
private readonly string $udsAuthUsername,
#[Autowire(env: 'UDS_AUTH_PASSWORD')]
private string $udsAuthPassword,
private readonly string $udsAuthPassword,
)
{
}

Some files were not shown because too many files have changed in this diff Show More