ExternalVendorCode/gns3-web-ui
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-web-ui.git synced 2025-05-25 19:44:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix import/export Dynamips configs

Browse Source
This commit is contained in:
grossmj 2025-02-16 12:57:01 +10:00
parent 097efdcbcd
commit 8ec03968df
No known key found for this signature in database
GPG Key ID: 1E7DD6DBB53FF3D7
6 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/app/cartography/converters/map/map-node-to-node-converter.ts
View File

@ -27,6 +27,7 @@ export class MapNodeToNodeConverter implements Converter<MapNode, Node> {
node.port_name_format = mapNode.portNameFormat; node.port_name_format = mapNode.portNameFormat;
node.port_segment_size = mapNode.portSegmentSize; node.port_segment_size = mapNode.portSegmentSize;
node.ports = mapNode.ports ? mapNode.ports.map((mapPort) => this.mapPortToPort.convert(mapPort)) : []; node.ports = mapNode.ports ? mapNode.ports.map((mapPort) => this.mapPortToPort.convert(mapPort)) : [];
node.properties = mapNode.properties;
node.project_id = mapNode.projectId; node.project_id = mapNode.projectId;
node.status = mapNode.status; node.status = mapNode.status;
node.symbol = mapNode.symbol; node.symbol = mapNode.symbol;

1
src/app/cartography/converters/map/node-to-map-node-converter.ts
View File

@ -38,6 +38,7 @@ export class NodeToMapNodeConverter implements Converter<Node, MapNode> {
mapNode.portNameFormat = node.port_name_format; mapNode.portNameFormat = node.port_name_format;
mapNode.portSegmentSize = node.port_segment_size; mapNode.portSegmentSize = node.port_segment_size;
mapNode.ports = node.ports ? node.ports.map((port) => this.portToMapPort.convert(port)) : []; mapNode.ports = node.ports ? node.ports.map((port) => this.portToMapPort.convert(port)) : [];
mapNode.properties = node.properties;
mapNode.projectId = node.project_id; mapNode.projectId = node.project_id;
mapNode.status = node.status; mapNode.status = node.status;
mapNode.symbol = node.symbol; mapNode.symbol = node.symbol;

2
src/app/cartography/models/map/map-node.ts
View File

@ -1,6 +1,7 @@
import { Indexed } from '../../datasources/map-datasource'; import { Indexed } from '../../datasources/map-datasource';
import { MapLabel } from './map-label'; import { MapLabel } from './map-label';
import { MapPort } from './map-port'; import { MapPort } from './map-port';
import { Properties } from '../node';
export class MapNode implements Indexed { export class MapNode implements Indexed {
id: string; id: string;
@ -19,6 +20,7 @@ export class MapNode implements Indexed {
portNameFormat: string; portNameFormat: string;
portSegmentSize: number; portSegmentSize: number;
ports: MapPort[]; ports: MapPort[];
properties: Properties;
projectId: string; projectId: string;
status: string; status: string;
symbol: string; symbol: string;

1
src/app/cartography/models/node.ts
View File

@ -18,6 +18,7 @@ export class Properties {
aux_type: boolean; aux_type: boolean;
ram: number; ram: number;
system_id: string; system_id: string;
dynamips_id?: number;
npe?: string; npe?: string;
midplane?: string; midplane?: string;
nvram: number; nvram: number;

2
src/app/components/project-map/context-menu/actions/import-config/import-config-action.component.html
View File

@ -1,4 +1,4 @@
<input type="file" accept=".txt, .vpc" class="non-visible" #fileInput (change)="importConfig($event)" /> <input type="file" accept=".txt, .vpc, .cfg" class="non-visible" #fileInput (change)="importConfig($event)" />
<button mat-menu-item (click)="triggerClick()"> <button mat-menu-item (click)="triggerClick()">
<mat-icon>call_received</mat-icon> <mat-icon>call_received</mat-icon>
<span>Import config</span> <span>Import config</span>

8
src/app/services/node.service.ts
View File

@ -189,7 +189,7 @@ export class NodeService {
} else if (node.node_type === 'iou') { } else if (node.node_type === 'iou') {
urlPath += '/files/startup-config.cfg'; urlPath += '/files/startup-config.cfg';
} else if (node.node_type === 'dynamips') { } else if (node.node_type === 'dynamips') {
urlPath += `/files/configs/i${node.node_id}_startup-config.cfg`; urlPath += `/files/configs/i${node.properties.dynamips_id}_startup-config.cfg`;
} }
return this.httpController.get(controller, urlPath, { responseType: 'text' as 'json' }); return this.httpController.get(controller, urlPath, { responseType: 'text' as 'json' });
@ -201,7 +201,7 @@ export class NodeService {
if (node.node_type === 'iou') { if (node.node_type === 'iou') {
urlPath += '/files/private-config.cfg'; urlPath += '/files/private-config.cfg';
} else if (node.node_type === 'dynamips') { } else if (node.node_type === 'dynamips') {
urlPath += `/files/configs/i${node.node_id}_private-config.cfg`; urlPath += `/files/configs/i${node.properties.dynamips_id}_private-config.cfg`;
} }
return this.httpController.get(controller, urlPath, { responseType: 'text' as 'json' }); return this.httpController.get(controller, urlPath, { responseType: 'text' as 'json' });
@ -215,7 +215,7 @@ export class NodeService {
} else if (node.node_type === 'iou') { } else if (node.node_type === 'iou') {
urlPath += '/files/startup-config.cfg'; urlPath += '/files/startup-config.cfg';
} else if (node.node_type === 'dynamips') { } else if (node.node_type === 'dynamips') {
urlPath += `/files/configs/i${node.node_id}_startup-config.cfg`; urlPath += `/files/configs/i${node.properties.dynamips_id}_startup-config.cfg`;
} }
return this.httpController.post(controller, urlPath, configuration); return this.httpController.post(controller, urlPath, configuration);
@ -227,7 +227,7 @@ export class NodeService {
if (node.node_type === 'iou') { if (node.node_type === 'iou') {
urlPath += '/files/private-config.cfg'; urlPath += '/files/private-config.cfg';
} else if (node.node_type === 'dynamips') { } else if (node.node_type === 'dynamips') {
urlPath += `/files/configs/i${node.node_id}_private-config.cfg`; urlPath += `/files/configs/i${node.properties.dynamips_id}_private-config.cfg`;
} }
return this.httpController.post(controller, urlPath, configuration); return this.httpController.post(controller, urlPath, configuration);