diff --git a/src/app/cartography/models/node.ts b/src/app/cartography/models/node.ts index 7ef7b21d..b7adb8ca 100644 --- a/src/app/cartography/models/node.ts +++ b/src/app/cartography/models/node.ts @@ -14,6 +14,7 @@ export class Properties { headless: boolean; linked_clone: boolean; on_close: string; + aux_type: boolean; aux: number; ram: number; nvram: number; diff --git a/src/app/components/preferences/docker/add-docker-template/add-docker-template.component.html b/src/app/components/preferences/docker/add-docker-template/add-docker-template.component.html index c59350f5..ba2c9be3 100644 --- a/src/app/components/preferences/docker/add-docker-template/add-docker-template.component.html +++ b/src/app/components/preferences/docker/add-docker-template/add-docker-template.component.html @@ -87,6 +87,18 @@ + + + + {{ type }} + + + + diff --git a/src/app/components/preferences/docker/add-docker-template/add-docker-template.component.ts b/src/app/components/preferences/docker/add-docker-template/add-docker-template.component.ts index 65ad0432..7e26455d 100644 --- a/src/app/components/preferences/docker/add-docker-template/add-docker-template.component.ts +++ b/src/app/components/preferences/docker/add-docker-template/add-docker-template.component.ts @@ -22,6 +22,7 @@ export class AddDockerTemplateComponent implements OnInit { controller:Controller ; dockerTemplate: DockerTemplate; consoleTypes: string[] = []; + auxConsoleTypes: string[] = []; isRemoteComputerChosen: boolean = false; dockerImages: DockerImage[] = []; selectedImage: DockerImage; @@ -64,6 +65,7 @@ export class AddDockerTemplateComponent implements OnInit { this.controller = controller; this.consoleTypes = this.configurationService.getConsoleTypes(); + this.auxConsoleTypes = this.configurationService.getAuxConsoleTypes(); this.templateMocksService.getDockerTemplate().subscribe((dockerTemplate: DockerTemplate) => { this.dockerTemplate = dockerTemplate; diff --git a/src/app/components/preferences/docker/docker-template-details/docker-template-details.component.html b/src/app/components/preferences/docker/docker-template-details/docker-template-details.component.html index dcd54a31..dbdd5145 100644 --- a/src/app/components/preferences/docker/docker-template-details/docker-template-details.component.html +++ b/src/app/components/preferences/docker/docker-template-details/docker-template-details.component.html @@ -86,6 +86,17 @@ + + + + {{ type }} + + + Auto start console diff --git a/src/app/components/preferences/docker/docker-template-details/docker-template-details.component.ts b/src/app/components/preferences/docker/docker-template-details/docker-template-details.component.ts index ca2ec96a..5758eca9 100644 --- a/src/app/components/preferences/docker/docker-template-details/docker-template-details.component.ts +++ b/src/app/components/preferences/docker/docker-template-details/docker-template-details.component.ts @@ -21,6 +21,7 @@ export class DockerTemplateDetailsComponent implements OnInit { isSymbolSelectionOpened: boolean = false; consoleTypes: string[] = []; + auxConsoleTypes: string[] = []; consoleResolutions: string[] = []; categories = []; adapters: CustomAdapter[] = []; @@ -60,6 +61,7 @@ export class DockerTemplateDetailsComponent implements OnInit { getConfiguration() { this.consoleTypes = this.configurationService.getConsoleTypes(); + this.auxConsoleTypes = this.configurationService.getAuxConsoleTypes(); this.categories = this.configurationService.getCategories(); this.consoleResolutions = this.configurationService.getConsoleResolutions(); } diff --git a/src/app/components/preferences/dynamips/ios-template-details/ios-template-details.component.html b/src/app/components/preferences/dynamips/ios-template-details/ios-template-details.component.html index 67a9a7a5..726b806f 100644 --- a/src/app/components/preferences/dynamips/ios-template-details/ios-template-details.component.html +++ b/src/app/components/preferences/dynamips/ios-template-details/ios-template-details.component.html @@ -31,8 +31,10 @@ Platform - {{ iosTemplate.platform }}

+
Chassis - {{ iosTemplate.chassis }}

+
+ + + + {{ type }} + + + Auto start console diff --git a/src/app/components/preferences/qemu/add-qemu-vm-template/add-qemu-vm-template.component.html b/src/app/components/preferences/qemu/add-qemu-vm-template/add-qemu-vm-template.component.html index 521079aa..8680514e 100644 --- a/src/app/components/preferences/qemu/add-qemu-vm-template/add-qemu-vm-template.component.html +++ b/src/app/components/preferences/qemu/add-qemu-vm-template/add-qemu-vm-template.component.html @@ -66,6 +66,20 @@
+ + + + + {{ type }} + + + + +
diff --git a/src/app/components/preferences/qemu/add-qemu-vm-template/add-qemu-vm-template.component.ts b/src/app/components/preferences/qemu/add-qemu-vm-template/add-qemu-vm-template.component.ts index 08daeb16..77370875 100644 --- a/src/app/components/preferences/qemu/add-qemu-vm-template/add-qemu-vm-template.component.ts +++ b/src/app/components/preferences/qemu/add-qemu-vm-template/add-qemu-vm-template.component.ts @@ -29,6 +29,7 @@ export class AddQemuVmTemplateComponent implements OnInit { selectedPlatform: string; ramMemory: number; consoleTypes: string[] = []; + auxConsoleTypes: string[] = []; newImageSelected: boolean = false; qemuImages: QemuImage[] = []; selectedImage: QemuImage; @@ -113,6 +114,7 @@ export class AddQemuVmTemplateComponent implements OnInit { this.selectPlatform = this.configurationService.getPlatform(); this.selectedPlatform = this.selectPlatform[0]; this.consoleTypes = this.configurationService.getConsoleTypes(); + this.auxConsoleTypes = this.configurationService.getAuxConsoleTypes(); }); this.uploadServiceService.currentCancelItemDetails.subscribe((isCancel) => { diff --git a/src/app/components/preferences/qemu/qemu-vm-template-details/qemu-vm-template-details.component.html b/src/app/components/preferences/qemu/qemu-vm-template-details/qemu-vm-template-details.component.html index 137b8c89..42db6d79 100644 --- a/src/app/components/preferences/qemu/qemu-vm-template-details/qemu-vm-template-details.component.html +++ b/src/app/components/preferences/qemu/qemu-vm-template-details/qemu-vm-template-details.component.html @@ -90,6 +90,13 @@ + + + + {{ type }} + + + Auto start console diff --git a/src/app/components/preferences/qemu/qemu-vm-template-details/qemu-vm-template-details.component.ts b/src/app/components/preferences/qemu/qemu-vm-template-details/qemu-vm-template-details.component.ts index 39b4050d..5eb6cf2b 100644 --- a/src/app/components/preferences/qemu/qemu-vm-template-details/qemu-vm-template-details.component.ts +++ b/src/app/components/preferences/qemu/qemu-vm-template-details/qemu-vm-template-details.component.ts @@ -21,6 +21,7 @@ export class QemuVmTemplateDetailsComponent implements OnInit { qemuTemplate: QemuTemplate; isSymbolSelectionOpened: boolean = false; consoleTypes: string[] = []; + auxConsoleTypes: string[] = []; diskInterfaces: string[] = []; networkTypes = []; bootPriorities = []; @@ -72,6 +73,7 @@ export class QemuVmTemplateDetailsComponent implements OnInit { getConfiguration() { this.consoleTypes = this.configurationService.getConsoleTypes(); + this.auxConsoleTypes = this.configurationService.getAuxConsoleTypes(); this.diskInterfaces = this.configurationService.getDiskInterfaces(); this.networkTypes = this.configurationService.getNetworkTypes(); this.bootPriorities = this.configurationService.getBootPriorities(); diff --git a/src/app/components/project-map/node-editors/configurator/docker/configurator-docker.component.html b/src/app/components/project-map/node-editors/configurator/docker/configurator-docker.component.html index 15c42a25..06bbf4ab 100644 --- a/src/app/components/project-map/node-editors/configurator/docker/configurator-docker.component.html +++ b/src/app/components/project-map/node-editors/configurator/docker/configurator-docker.component.html @@ -56,6 +56,17 @@ + + + + {{ type }} + + + Auto start console diff --git a/src/app/components/project-map/node-editors/configurator/docker/configurator-docker.component.ts b/src/app/components/project-map/node-editors/configurator/docker/configurator-docker.component.ts index c90e92b5..cdd9ac79 100644 --- a/src/app/components/project-map/node-editors/configurator/docker/configurator-docker.component.ts +++ b/src/app/components/project-map/node-editors/configurator/docker/configurator-docker.component.ts @@ -21,6 +21,7 @@ export class ConfiguratorDialogDockerComponent implements OnInit { name: string; generalSettingsForm: UntypedFormGroup; consoleTypes: string[] = []; + auxConsoleTypes: string[] = []; consoleResolutions: string[] = ['2560x1440', '1920x1080', '1680x1050', '1440x900', '1366x768', '1280x1024', '1280x800', '1024x768', '800x600', '640x480']; private conf = { autoFocus: false, @@ -60,6 +61,7 @@ export class ConfiguratorDialogDockerComponent implements OnInit { getConfiguration() { this.consoleTypes = this.dockerConfigurationService.getConsoleTypes(); + this.auxConsoleTypes = this.dockerConfigurationService.getAuxConsoleTypes(); } configureCustomAdapters() { diff --git a/src/app/components/project-map/node-editors/configurator/ios/configurator-ios.component.html b/src/app/components/project-map/node-editors/configurator/ios/configurator-ios.component.html index cebe922a..135261c3 100644 --- a/src/app/components/project-map/node-editors/configurator/ios/configurator-ios.component.html +++ b/src/app/components/project-map/node-editors/configurator/ios/configurator-ios.component.html @@ -19,6 +19,13 @@ + + + + {{ type }} + + + Auto start console
diff --git a/src/app/components/project-map/node-editors/configurator/qemu/configurator-qemu.component.html b/src/app/components/project-map/node-editors/configurator/qemu/configurator-qemu.component.html index bb8bc3b9..e38a1938 100644 --- a/src/app/components/project-map/node-editors/configurator/qemu/configurator-qemu.component.html +++ b/src/app/components/project-map/node-editors/configurator/qemu/configurator-qemu.component.html @@ -54,6 +54,13 @@ + + + + {{ type }} + + + Auto start console diff --git a/src/app/models/templates/docker-template.ts b/src/app/models/templates/docker-template.ts index db700223..f820c79b 100644 --- a/src/app/models/templates/docker-template.ts +++ b/src/app/models/templates/docker-template.ts @@ -10,6 +10,7 @@ export class DockerTemplate { console_http_port: number; console_resolution: string; console_type: string; + aux_type: string; custom_adapters: CustomAdapter[]; default_name_format: string; environment: string; diff --git a/src/app/models/templates/ios-template.ts b/src/app/models/templates/ios-template.ts index b87063a0..14858e58 100644 --- a/src/app/models/templates/ios-template.ts +++ b/src/app/models/templates/ios-template.ts @@ -6,6 +6,7 @@ export class IosTemplate { compute_id: string; console_auto_start: boolean; console_type: string; + aux_type: string; default_name_format: string; disk0: number; disk1: number; diff --git a/src/app/models/templates/qemu-template.ts b/src/app/models/templates/qemu-template.ts index 9b66cc25..86727834 100644 --- a/src/app/models/templates/qemu-template.ts +++ b/src/app/models/templates/qemu-template.ts @@ -11,6 +11,7 @@ export class QemuTemplate { compute_id: string; console_auto_start: boolean; console_type: string; + aux_type: string; cpu_throttling: number; cpus: number; custom_adapters: CustomAdapter[]; diff --git a/src/app/services/docker-configuration.service.ts b/src/app/services/docker-configuration.service.ts index 37016f92..c6059350 100644 --- a/src/app/services/docker-configuration.service.ts +++ b/src/app/services/docker-configuration.service.ts @@ -6,6 +6,10 @@ export class DockerConfigurationService { return ['telnet', 'vnc', 'http', 'https', 'none']; } + getAuxConsoleTypes() { + return ['telnet', 'none']; + } + getCategories() { let categories = [ ['Default', 'guest'], diff --git a/src/app/services/qemu-configuration.service.ts b/src/app/services/qemu-configuration.service.ts index 30698282..c975acbe 100644 --- a/src/app/services/qemu-configuration.service.ts +++ b/src/app/services/qemu-configuration.service.ts @@ -39,6 +39,10 @@ export class QemuConfigurationService { return ['telnet', 'vnc', 'spice', 'spice+agent', 'none']; } + getAuxConsoleTypes() { + return ['telnet', 'none']; + } + getDiskInterfaces() { return ['ide', 'sata', 'scsi', 'sd', 'mtd', 'floppy', 'pflash', 'virtio', 'nvme', 'none']; } diff --git a/src/app/services/qemu.service.spec.ts b/src/app/services/qemu.service.spec.ts index 30642d41..996b8b76 100644 --- a/src/app/services/qemu.service.spec.ts +++ b/src/app/services/qemu.service.spec.ts @@ -47,6 +47,7 @@ describe('QemuService', () => { compute_id: 'local', console_auto_start: false, console_type: 'telnet', + aux_type: 'none', cpu_throttling: 0, cpus: 1, custom_adapters: [], @@ -102,6 +103,7 @@ describe('QemuService', () => { compute_id: 'local', console_auto_start: false, console_type: 'telnet', + aux_type: 'none', cpu_throttling: 0, cpus: 1, custom_adapters: [], diff --git a/src/app/services/template-mocks.service.ts b/src/app/services/template-mocks.service.ts index d227c426..14e5c208 100644 --- a/src/app/services/template-mocks.service.ts +++ b/src/app/services/template-mocks.service.ts @@ -27,6 +27,7 @@ export class TemplateMocksService { compute_id: 'local', console_auto_start: false, console_type: 'telnet', + aux_type: 'none', cpu_throttling: 0, cpus: 1, custom_adapters: [], @@ -172,6 +173,7 @@ export class TemplateMocksService { compute_id: 'local', console_auto_start: false, console_type: 'telnet', + aux_type: 'none', default_name_format: 'R{0}', disk0: 0, disk1: 0, @@ -239,6 +241,7 @@ export class TemplateMocksService { console_http_port: 80, console_resolution: '1024x768', console_type: 'telnet', + aux_type: 'none', custom_adapters: [], default_name_format: '{name}-{0}', environment: '',