diff --git a/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-add-template/cloud-nodes-add-template.component.html b/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-add-template/cloud-nodes-add-template.component.html index 89cf0f0c..9f45ad6b 100644 --- a/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-add-template/cloud-nodes-add-template.component.html +++ b/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-add-template/cloud-nodes-add-template.component.html @@ -10,13 +10,6 @@ Run the cloud node locally - Run the cloud node on the GNS3 VM
diff --git a/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-add-template/cloud-nodes-add-template.component.ts b/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-add-template/cloud-nodes-add-template.component.ts index 9910b72d..47146b34 100644 --- a/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-add-template/cloud-nodes-add-template.component.ts +++ b/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-add-template/cloud-nodes-add-template.component.ts @@ -20,9 +20,6 @@ export class CloudNodesAddTemplateComponent implements OnInit { server: Server; templateName: string = ''; formGroup: FormGroup; - - isGns3VmAvailable: boolean = false; - isGns3VmChosen: boolean = false; isLocalComputerChosen: boolean = true; constructor( @@ -44,19 +41,11 @@ export class CloudNodesAddTemplateComponent implements OnInit { const server_id = this.route.snapshot.paramMap.get('server_id'); this.serverService.get(parseInt(server_id, 10)).then((server: Server) => { this.server = server; - - this.computeService.getComputes(server).subscribe((computes: Compute[]) => { - if (computes.filter((compute) => compute.compute_id === 'vm').length > 0) this.isGns3VmAvailable = true; - }); }); } setServerType(serverType: string) { - if (serverType === 'gns3 vm' && this.isGns3VmAvailable) { - this.isGns3VmChosen = true; - this.isLocalComputerChosen = false; - } else { - this.isGns3VmChosen = false; + if (serverType === 'local') { this.isLocalComputerChosen = true; } } @@ -75,7 +64,7 @@ export class CloudNodesAddTemplateComponent implements OnInit { cloudTemplate.template_id = uuid(); cloudTemplate.name = this.formGroup.get('templateName').value; - cloudTemplate.compute_id = this.isGns3VmChosen ? 'vm' : 'local'; + cloudTemplate.compute_id = 'local'; this.builtInTemplatesService.addTemplate(this.server, cloudTemplate).subscribe((cloudNodeTemplate) => { this.goBack(); diff --git a/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-add-template/ethernet-hubs-add-template.component.html b/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-add-template/ethernet-hubs-add-template.component.html index 0e90b602..f1bcac9a 100644 --- a/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-add-template/ethernet-hubs-add-template.component.html +++ b/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-add-template/ethernet-hubs-add-template.component.html @@ -10,13 +10,6 @@ Run the Ethernet Hub locally - Run the Ethernet Hub on the GNS3 VM diff --git a/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-add-template/ethernet-hubs-add-template.component.ts b/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-add-template/ethernet-hubs-add-template.component.ts index 7a3d4da8..025aa407 100644 --- a/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-add-template/ethernet-hubs-add-template.component.ts +++ b/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-add-template/ethernet-hubs-add-template.component.ts @@ -20,9 +20,6 @@ export class EthernetHubsAddTemplateComponent implements OnInit { server: Server; templateName: string = ''; formGroup: FormGroup; - - isGns3VmAvailable: boolean = false; - isGns3VmChosen: boolean = false; isLocalComputerChosen: boolean = true; constructor( @@ -45,19 +42,11 @@ export class EthernetHubsAddTemplateComponent implements OnInit { const server_id = this.route.snapshot.paramMap.get('server_id'); this.serverService.get(parseInt(server_id, 10)).then((server: Server) => { this.server = server; - - this.computeService.getComputes(server).subscribe((computes: Compute[]) => { - if (computes.filter((compute) => compute.compute_id === 'vm').length > 0) this.isGns3VmAvailable = true; - }); }); } setServerType(serverType: string) { - if (serverType === 'gns3 vm' && this.isGns3VmAvailable) { - this.isGns3VmChosen = true; - this.isLocalComputerChosen = false; - } else { - this.isGns3VmChosen = false; + if (serverType === 'local') { this.isLocalComputerChosen = true; } } @@ -76,7 +65,7 @@ export class EthernetHubsAddTemplateComponent implements OnInit { ethernetHubTemplate.template_id = uuid(); ethernetHubTemplate.name = this.formGroup.get('templateName').value; - ethernetHubTemplate.compute_id = this.isGns3VmChosen ? 'vm' : 'local'; + ethernetHubTemplate.compute_id = 'local'; for (let i = 0; i < this.formGroup.get('numberOfPorts').value; i++) { ethernetHubTemplate.ports_mapping.push({ diff --git a/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-add-template/ethernet-switches-add-template.component.html b/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-add-template/ethernet-switches-add-template.component.html index ca42cf47..f032d679 100644 --- a/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-add-template/ethernet-switches-add-template.component.html +++ b/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-add-template/ethernet-switches-add-template.component.html @@ -10,13 +10,6 @@ Run the Ethernet switch locally - Run the Ethernet switch on the GNS3 VM diff --git a/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-add-template/ethernet-switches-add-template.component.ts b/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-add-template/ethernet-switches-add-template.component.ts index 4bfd638c..0b22cd28 100644 --- a/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-add-template/ethernet-switches-add-template.component.ts +++ b/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-add-template/ethernet-switches-add-template.component.ts @@ -20,9 +20,6 @@ export class EthernetSwitchesAddTemplateComponent implements OnInit { server: Server; templateName: string = ''; formGroup: FormGroup; - - isGns3VmAvailable: boolean = false; - isGns3VmChosen: boolean = false; isLocalComputerChosen: boolean = true; constructor( @@ -45,10 +42,6 @@ export class EthernetSwitchesAddTemplateComponent implements OnInit { const server_id = this.route.snapshot.paramMap.get('server_id'); this.serverService.get(parseInt(server_id, 10)).then((server: Server) => { this.server = server; - - this.computeService.getComputes(server).subscribe((computes: Compute[]) => { - if (computes.filter((compute) => compute.compute_id === 'vm').length > 0) this.isGns3VmAvailable = true; - }); }); } @@ -57,11 +50,7 @@ export class EthernetSwitchesAddTemplateComponent implements OnInit { } setServerType(serverType: string) { - if (serverType === 'gns3 vm' && this.isGns3VmAvailable) { - this.isGns3VmChosen = true; - this.isLocalComputerChosen = false; - } else { - this.isGns3VmChosen = false; + if (serverType === 'local') { this.isLocalComputerChosen = true; } } @@ -76,7 +65,7 @@ export class EthernetSwitchesAddTemplateComponent implements OnInit { ethernetSwitchTemplate.template_id = uuid(); ethernetSwitchTemplate.name = this.formGroup.get('templateName').value; - ethernetSwitchTemplate.compute_id = this.isGns3VmChosen ? 'vm' : 'local'; + ethernetSwitchTemplate.compute_id = 'local'; for (let i = 0; i < this.formGroup.get('numberOfPorts').value; i++) { ethernetSwitchTemplate.ports_mapping.push({ 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 6742275e..07694078 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 @@ -7,19 +7,12 @@
- + Run this Docker container locally - Run this Docker container on the GNS3 VM 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 f7d0529d..e496b159 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 @@ -30,9 +30,6 @@ export class AddDockerTemplateComponent implements OnInit { virtualMachineForm: FormGroup; containerNameForm: FormGroup; networkAdaptersForm: FormGroup; - - isGns3VmAvailable: boolean = false; - isGns3VmChosen: boolean = false; isLocalComputerChosen: boolean = true; constructor( @@ -72,10 +69,6 @@ export class AddDockerTemplateComponent implements OnInit { this.dockerTemplate = dockerTemplate; }); - this.computeService.getComputes(server).subscribe((computes: Compute[]) => { - if (computes.filter((compute) => compute.compute_id === 'vm').length > 0) this.isGns3VmAvailable = true; - }); - this.dockerService.getImages(server).subscribe((images) => { this.dockerImages = images; }); @@ -83,11 +76,7 @@ export class AddDockerTemplateComponent implements OnInit { } setServerType(serverType: string) { - if (serverType === 'gns3 vm' && this.isGns3VmAvailable) { - this.isGns3VmChosen = true; - this.isLocalComputerChosen = false; - } else { - this.isGns3VmChosen = false; + if (serverType === 'local') { this.isLocalComputerChosen = true; } } @@ -116,7 +105,7 @@ export class AddDockerTemplateComponent implements OnInit { this.dockerTemplate.name = this.containerNameForm.get('templateName').value; this.dockerTemplate.adapters = +this.networkAdaptersForm.get('adapters').value; - this.dockerTemplate.compute_id = this.isGns3VmChosen ? 'vm' : 'local'; + this.dockerTemplate.compute_id = 'local'; this.dockerService.addTemplate(this.server, this.dockerTemplate).subscribe((template: DockerTemplate) => { this.goBack(); diff --git a/src/app/components/preferences/dynamips/add-ios-template/add-ios-template.component.html b/src/app/components/preferences/dynamips/add-ios-template/add-ios-template.component.html index 1b41b969..b51d4bf1 100644 --- a/src/app/components/preferences/dynamips/add-ios-template/add-ios-template.component.html +++ b/src/app/components/preferences/dynamips/add-ios-template/add-ios-template.component.html @@ -7,18 +7,11 @@
- + Run this IOS router locally - Run this IOS router on the GNS3 VM diff --git a/src/app/components/preferences/dynamips/add-ios-template/add-ios-template.component.ts b/src/app/components/preferences/dynamips/add-ios-template/add-ios-template.component.ts index f420859a..6b3118e2 100644 --- a/src/app/components/preferences/dynamips/add-ios-template/add-ios-template.component.ts +++ b/src/app/components/preferences/dynamips/add-ios-template/add-ios-template.component.ts @@ -45,9 +45,6 @@ export class AddIosTemplateComponent implements OnInit { ciscoUrl: string = 'https://cfn.cloudapps.cisco.com/ITDIT/CFN/jsp/SearchBySoftware.jsp'; uploader: FileUploader; - - isGns3VmAvailable: boolean = false; - isGns3VmChosen: boolean = false; isLocalComputerChosen: boolean = true; constructor( @@ -114,19 +111,11 @@ export class AddIosTemplateComponent implements OnInit { this.chassis = this.iosConfigurationService.getChassis(); this.defaultRam = this.iosConfigurationService.getDefaultRamSettings(); }); - - this.computeService.getComputes(server).subscribe((computes: Compute[]) => { - if (computes.filter((compute) => compute.compute_id === 'vm').length > 0) this.isGns3VmAvailable = true; - }); }); } setServerType(serverType: string) { - if (serverType === 'gns3 vm' && this.isGns3VmAvailable) { - this.isGns3VmChosen = true; - this.isLocalComputerChosen = false; - } else { - this.isGns3VmChosen = false; + if (serverType === 'local') { this.isLocalComputerChosen = true; } } @@ -174,8 +163,7 @@ export class AddIosTemplateComponent implements OnInit { if (this.networkAdaptersForTemplate.length > 0) this.completeAdaptersData(); if (this.networkModulesForTemplate.length > 0) this.completeModulesData(); - - this.iosTemplate.compute_id = this.isGns3VmChosen ? 'vm' : 'local'; + this.iosTemplate.compute_id = 'local'; this.iosService.addTemplate(this.server, this.iosTemplate).subscribe((template: IosTemplate) => { this.goBack(); diff --git a/src/app/components/preferences/ios-on-unix/add-iou-template/add-iou-template.component.html b/src/app/components/preferences/ios-on-unix/add-iou-template/add-iou-template.component.html index 28c73807..1b6e2b02 100644 --- a/src/app/components/preferences/ios-on-unix/add-iou-template/add-iou-template.component.html +++ b/src/app/components/preferences/ios-on-unix/add-iou-template/add-iou-template.component.html @@ -7,18 +7,11 @@
- + Run this IOU device locally - Run this IOU device on the GNS3 VM diff --git a/src/app/components/preferences/ios-on-unix/add-iou-template/add-iou-template.component.ts b/src/app/components/preferences/ios-on-unix/add-iou-template/add-iou-template.component.ts index 13a7568c..61b55071 100644 --- a/src/app/components/preferences/ios-on-unix/add-iou-template/add-iou-template.component.ts +++ b/src/app/components/preferences/ios-on-unix/add-iou-template/add-iou-template.component.ts @@ -30,9 +30,6 @@ export class AddIouTemplateComponent implements OnInit { templateNameForm: FormGroup; imageForm: FormGroup; - - isGns3VmAvailable: boolean = false; - isGns3VmChosen: boolean = false; isLocalComputerChosen: boolean = true; constructor( @@ -82,10 +79,6 @@ export class AddIouTemplateComponent implements OnInit { this.templateMocksService.getIouTemplate().subscribe((iouTemplate: IouTemplate) => { this.iouTemplate = iouTemplate; }); - - this.computeService.getComputes(server).subscribe((computes: Compute[]) => { - if (computes.filter((compute) => compute.compute_id === 'vm').length > 0) this.isGns3VmAvailable = true; - }); }); } @@ -96,11 +89,7 @@ export class AddIouTemplateComponent implements OnInit { } setServerType(serverType: string) { - if (serverType === 'gns3 vm' && this.isGns3VmAvailable) { - this.isGns3VmChosen = true; - this.isLocalComputerChosen = false; - } else { - this.isGns3VmChosen = false; + if (serverType === 'local') { this.isLocalComputerChosen = true; } } @@ -134,7 +123,7 @@ export class AddIouTemplateComponent implements OnInit { this.iouTemplate.template_id = uuid(); this.iouTemplate.name = this.templateNameForm.get('templateName').value; if (this.newImageSelected) this.iouTemplate.path = this.imageForm.get('imageName').value; - this.iouTemplate.compute_id = this.isGns3VmChosen ? 'vm' : 'local'; + this.iouTemplate.compute_id = 'local'; if (this.selectedType === 'L2 image') { this.iouTemplate.ethernet_adapters = 4; 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 3620769c..a55c007b 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 @@ -7,18 +7,11 @@
- + Run this QEMU VM locally - Run this QEMU VM on the GNS3 VM 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 739844fb..9c3a98ae 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 @@ -36,9 +36,6 @@ export class AddQemuVmTemplateComponent implements OnInit { nameForm: FormGroup; memoryForm: FormGroup; diskForm: FormGroup; - - isGns3VmAvailable: boolean = false; - isGns3VmChosen: boolean = false; isLocalComputerChosen: boolean = true; constructor( @@ -105,19 +102,11 @@ export class AddQemuVmTemplateComponent implements OnInit { }); this.consoleTypes = this.configurationService.getConsoleTypes(); - - this.computeService.getComputes(server).subscribe((computes: Compute[]) => { - if (computes.filter((compute) => compute.compute_id === 'vm').length > 0) this.isGns3VmAvailable = true; - }); }); } setServerType(serverType: string) { - if (serverType === 'gns3 vm' && this.isGns3VmAvailable) { - this.isGns3VmChosen = true; - this.isLocalComputerChosen = false; - } else { - this.isGns3VmChosen = false; + if (serverType === 'local') { this.isLocalComputerChosen = true; } } @@ -154,7 +143,7 @@ export class AddQemuVmTemplateComponent implements OnInit { } this.qemuTemplate.template_id = uuid(); this.qemuTemplate.name = this.nameForm.get('templateName').value; - this.qemuTemplate.compute_id = this.isGns3VmChosen ? 'vm' : 'local'; + this.qemuTemplate.compute_id = 'local'; this.qemuService.addTemplate(this.server, this.qemuTemplate).subscribe((template: QemuTemplate) => { this.goBack(); diff --git a/src/app/components/preferences/vpcs/add-vpcs-template/add-vpcs-template.component.html b/src/app/components/preferences/vpcs/add-vpcs-template/add-vpcs-template.component.html index f650eb76..dd9b61f3 100644 --- a/src/app/components/preferences/vpcs/add-vpcs-template/add-vpcs-template.component.html +++ b/src/app/components/preferences/vpcs/add-vpcs-template/add-vpcs-template.component.html @@ -10,13 +10,6 @@ Run the VPCS node locally - Run the VPCS node on the GNS3 VM diff --git a/src/app/components/preferences/vpcs/add-vpcs-template/add-vpcs-template.component.ts b/src/app/components/preferences/vpcs/add-vpcs-template/add-vpcs-template.component.ts index 72feec80..964b3f9b 100644 --- a/src/app/components/preferences/vpcs/add-vpcs-template/add-vpcs-template.component.ts +++ b/src/app/components/preferences/vpcs/add-vpcs-template/add-vpcs-template.component.ts @@ -20,9 +20,6 @@ export class AddVpcsTemplateComponent implements OnInit { server: Server; templateName: string = ''; templateNameForm: FormGroup; - - isGns3VmAvailable: boolean = false; - isGns3VmChosen: boolean = false; isLocalComputerChosen: boolean = true; constructor( @@ -44,19 +41,11 @@ export class AddVpcsTemplateComponent implements OnInit { const server_id = this.route.snapshot.paramMap.get('server_id'); this.serverService.get(parseInt(server_id, 10)).then((server: Server) => { this.server = server; - - this.computeService.getComputes(server).subscribe((computes: Compute[]) => { - if (computes.filter((compute) => compute.compute_id === 'vm').length > 0) this.isGns3VmAvailable = true; - }); }); } setServerType(serverType: string) { - if (serverType === 'gns3 vm' && this.isGns3VmAvailable) { - this.isGns3VmChosen = true; - this.isLocalComputerChosen = false; - } else { - this.isGns3VmChosen = false; + if (serverType === 'local') { this.isLocalComputerChosen = true; } } @@ -76,8 +65,8 @@ export class AddVpcsTemplateComponent implements OnInit { }); (vpcsTemplate.template_id = uuid()), - (vpcsTemplate.name = this.templateName), - (vpcsTemplate.compute_id = this.isGns3VmChosen ? 'vm' : 'local'); + (vpcsTemplate.name = this.templateName), + (vpcsTemplate.compute_id = 'local'); this.vpcsService.addTemplate(this.server, vpcsTemplate).subscribe(() => { this.goBack();