ExternalVendorCode/gns3-web-ui
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-web-ui.git synced 2025-06-18 14:58:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix for docker templates

Browse Source
This commit is contained in:
piotrpekala7
2020-06-22 11:36:21 +02:00
parent e7dfa6242b
commit 41e7f1c53e
2 changed files with 82 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/app/components/project-map/new-template-dialog/new-template-dialog.component.html
View File

@ -113,7 +113,12 @@
<mat-step *ngIf="applianceToInstall"> <mat-step *ngIf="applianceToInstall">
<ng-template matStepLabel>{{secondActionTitle}}</ng-template> <ng-template matStepLabel>{{secondActionTitle}}</ng-template>
<mat-card [hidden]="applianceToInstall">
Please select appliance to install first
</mat-card>
<mat-card [hidden]="!applianceToInstall"> <mat-card [hidden]="!applianceToInstall">
<div *ngIf="applianceToInstall.qemu">
<div> <div>
Server type<br/> Server type<br/>
<mat-radio-group class="radio-group"> <mat-radio-group class="radio-group">
@ -151,12 +156,24 @@
[uploader]="uploaderImage"/> [uploader]="uploaderImage"/>
<button class="button" mat-raised-button (click)="file2.click()">Import</button> <button class="button" mat-raised-button (click)="file2.click()">Import</button>
<button class="button" mat-raised-button (click)="downloadImage(image)">Download</button> <button class="button" mat-raised-button (click)="downloadImage(image)">Download</button>
<button class="button" mat-raised-button color="primary" (click)="create(image)">Create</button> <button class="button" mat-raised-button color="primary" (click)="createQemuTemplate(image)">Create</button>
</div> </div>
</div> </div>
</mat-list-item> </mat-list-item>
</mat-list> </mat-list>
</div> </div>
</div>
<div *ngIf="applianceToInstall.docker">
<div>
Server type<br/>
<mat-radio-group class="radio-group">
<mat-radio-button [disabled]="true" class="radio-button" value="1" (click)="setServerType('local')">Install the appliance locally</mat-radio-button>
<mat-radio-button class="radio-button" value="2" checked (click)="setServerType('gns3 vm')">Install the appliance on the GNS3 VM</mat-radio-button>
</mat-radio-group>
</div>
<button mat-raised-button color="primary" (click)="createDockerTemplate()" class="create-button">Create docker template</button>
</div>
</mat-card> </mat-card>
<div> <div>

25
src/app/components/project-map/new-template-dialog/new-template-dialog.component.ts
View File

@ -13,6 +13,8 @@ import { QemuBinary } from '../../../models/qemu/qemu-binary';
import { QemuService } from '../../../services/qemu.service'; import { QemuService } from '../../../services/qemu.service';
import { QemuTemplate } from '../../../models/templates/qemu-template'; import { QemuTemplate } from '../../../models/templates/qemu-template';
import { v4 as uuid } from 'uuid'; import { v4 as uuid } from 'uuid';
import { DockerTemplate } from '../../../models/templates/docker-template';
import { DockerService } from '../../../services/docker.service';
@Component({ @Component({
selector: 'app-new-template-dialog', selector: 'app-new-template-dialog',
@ -64,6 +66,7 @@ export class NewTemplateDialogComponent implements OnInit {
private changeDetector: ChangeDetectorRef, private changeDetector: ChangeDetectorRef,
private toasterService: ToasterService, private toasterService: ToasterService,
private qemuService: QemuService, private qemuService: QemuService,
private dockerService: DockerService,
public dialog: MatDialog public dialog: MatDialog
) {} ) {}
@ -246,7 +249,27 @@ export class NewTemplateDialogComponent implements OnInit {
window.open(image.download_url); window.open(image.download_url);
} }
create(image: Image) { createDockerTemplate() {
let dockerTemplate: DockerTemplate = new DockerTemplate();
dockerTemplate.name = this.applianceToInstall.name;
dockerTemplate.adapters = this.applianceToInstall.docker.adapters;
dockerTemplate.console_type = this.applianceToInstall.docker.console_type;
dockerTemplate.builtin = this.applianceToInstall.builtin;
dockerTemplate.category = this.applianceToInstall.category;
dockerTemplate.default_name_format = this.applianceToInstall.port_name_format;
dockerTemplate.symbol = this.applianceToInstall.symbol;
dockerTemplate.compute_id = this.isGns3VmChosen ? 'vm' : 'local';
dockerTemplate.template_id = uuid();
dockerTemplate.image = this.applianceToInstall.docker.image;
dockerTemplate.template_type = 'docker';
this.dockerService.addTemplate(this.server, dockerTemplate).subscribe(() => {
this.toasterService.success('Template added');
this.dialogRef.close();
});
}
createQemuTemplate(image: Image) {
let qemuTemplate: QemuTemplate = new QemuTemplate(); let qemuTemplate: QemuTemplate = new QemuTemplate();
qemuTemplate.name = this.applianceToInstall.name; qemuTemplate.name = this.applianceToInstall.name;
qemuTemplate.ram = this.applianceToInstall.qemu.ram; qemuTemplate.ram = this.applianceToInstall.qemu.ram;