From bd118fc4bd3acef19af69d8fcfe88d23c78c27ae Mon Sep 17 00:00:00 2001 From: grossmj Date: Mon, 25 Jul 2022 10:53:09 +0200 Subject: [PATCH] Use generic symbol names --- .../add-ios-template.component.ts | 2 +- ...add-virtual-box-template.component.spec.ts | 2 +- .../built-in-templates.service.spec.ts | 12 +++++------ src/app/services/qemu.service.spec.ts | 4 ++-- src/app/services/template-mocks.service.ts | 20 +++++++++---------- src/app/services/virtual-box.service.spec.ts | 4 ++-- src/app/services/vmware.service.spec.ts | 4 ++-- src/app/services/vpcs.service.spec.ts | 4 ++-- 8 files changed, 26 insertions(+), 26 deletions(-) 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 8da38e5c..86f6bdd4 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 @@ -179,7 +179,7 @@ export class AddIosTemplateComponent implements OnInit, OnDestroy { this.iosTemplate.ram = this.iosMemoryForm.get('memory').value; if (this.isEtherSwitchRouter) { - this.iosTemplate.symbol = ':/symbols/multilayer_switch.svg'; + this.iosTemplate.symbol = 'multilayer_switch'; this.iosTemplate.category = 'switch'; } diff --git a/src/app/components/preferences/virtual-box/add-virtual-box-template/add-virtual-box-template.component.spec.ts b/src/app/components/preferences/virtual-box/add-virtual-box-template/add-virtual-box-template.component.spec.ts index 964e6335..41646446 100644 --- a/src/app/components/preferences/virtual-box/add-virtual-box-template/add-virtual-box-template.component.spec.ts +++ b/src/app/components/preferences/virtual-box/add-virtual-box-template/add-virtual-box-template.component.spec.ts @@ -97,7 +97,7 @@ describe('AddVirtualBoxTemplateComponent', () => { port_name_format: 'Ethernet{0}', port_segment_size: 0, ram: 0, - symbol: ':/symbols/vbox_guest.svg', + symbol: 'vbox_guest', template_id: '', template_type: 'virtualbox', usage: '', diff --git a/src/app/services/built-in-templates.service.spec.ts b/src/app/services/built-in-templates.service.spec.ts index ebf402f9..4aafba6d 100644 --- a/src/app/services/built-in-templates.service.spec.ts +++ b/src/app/services/built-in-templates.service.spec.ts @@ -45,7 +45,7 @@ describe('BuiltInTemplatesService', () => { name: '', ports_mapping: [], remote_console_type: 'none', - symbol: ':/symbols/cloud.svg', + symbol: 'cloud', template_id: '1', template_type: 'cloud', } as CloudTemplate; @@ -65,7 +65,7 @@ describe('BuiltInTemplatesService', () => { default_name_format: 'Hub{0}', name: '', ports_mapping: [], - symbol: ':/symbols/hub.svg', + symbol: 'hub', template_id: '2', template_type: 'ethernet_hub', }; @@ -85,7 +85,7 @@ describe('BuiltInTemplatesService', () => { default_name_format: 'Hub{0}', name: '', ports_mapping: [], - symbol: ':/symbols/hub.svg', + symbol: 'hub', template_id: '3', template_type: 'ethernet_hub', }; @@ -106,7 +106,7 @@ describe('BuiltInTemplatesService', () => { name: '', ports_mapping: [], remote_console_type: 'none', - symbol: ':/symbols/cloud.svg', + symbol: 'cloud', template_id: '1', template_type: 'cloud', } as CloudTemplate; @@ -126,7 +126,7 @@ describe('BuiltInTemplatesService', () => { default_name_format: 'Hub{0}', name: '', ports_mapping: [], - symbol: ':/symbols/hub.svg', + symbol: 'hub', template_id: '2', template_type: 'ethernet_hub', }; @@ -146,7 +146,7 @@ describe('BuiltInTemplatesService', () => { default_name_format: 'Hub{0}', name: '', ports_mapping: [], - symbol: ':/symbols/hub.svg', + symbol: 'hub', template_id: '3', template_type: 'ethernet_hub', }; diff --git a/src/app/services/qemu.service.spec.ts b/src/app/services/qemu.service.spec.ts index 3379270c..96e09ce1 100644 --- a/src/app/services/qemu.service.spec.ts +++ b/src/app/services/qemu.service.spec.ts @@ -74,7 +74,7 @@ describe('QemuService', () => { process_priority: 'normal', qemu_path: '', ram: 256, - symbol: ':/symbols/qemu_guest.svg', + symbol: 'qemu_guest', template_id: '1', template_type: 'qemu', usage: '', @@ -126,7 +126,7 @@ describe('QemuService', () => { process_priority: 'normal', qemu_path: '', ram: 256, - symbol: ':/symbols/qemu_guest.svg', + symbol: 'qemu_guest', template_id: '', template_type: 'qemu', usage: '', diff --git a/src/app/services/template-mocks.service.ts b/src/app/services/template-mocks.service.ts index aed4388c..b18c1b51 100644 --- a/src/app/services/template-mocks.service.ts +++ b/src/app/services/template-mocks.service.ts @@ -54,7 +54,7 @@ export class TemplateMocksService { process_priority: 'normal', qemu_path: '', ram: 256, - symbol: ':/symbols/qemu_guest.svg', + symbol: 'qemu_guest', template_id: '', template_type: 'qemu', usage: '', @@ -73,7 +73,7 @@ export class TemplateMocksService { console_type: 'telnet', default_name_format: 'PC{0}', name: '', - symbol: ':/symbols/vpcs_guest.svg', + symbol: 'vpcs_guest', template_id: '', template_type: 'vpcs', }; @@ -100,7 +100,7 @@ export class TemplateMocksService { port_name_format: 'Ethernet{0}', port_segment_size: 0, ram: 0, - symbol: ':/symbols/vbox_guest.svg', + symbol: 'vbox_guest', template_id: '', template_type: 'virtualbox', usage: '', @@ -120,7 +120,7 @@ export class TemplateMocksService { name: '', ports_mapping: [], remote_console_type: 'none', - symbol: ':/symbols/cloud.svg', + symbol: 'cloud', template_id: '', template_type: 'cloud', } as CloudTemplate; @@ -136,7 +136,7 @@ export class TemplateMocksService { default_name_format: 'Hub{0}', name: '', ports_mapping: [], - symbol: ':/symbols/hub.svg', + symbol: 'hub', template_id: '', template_type: 'ethernet_hub', }; @@ -153,7 +153,7 @@ export class TemplateMocksService { default_name_format: 'Switch{0}', name: '', ports_mapping: [], - symbol: ':/symbols/ethernet_switch.svg', + symbol: 'ethernet_switch', template_id: '', template_type: 'ethernet_switch', }; @@ -186,7 +186,7 @@ export class TemplateMocksService { ram: 128, sparsemem: true, startup_config: '', - symbol: ':/symbols/router.svg', + symbol: 'router', system_id: 'FTX0945W0MY', template_id: '', template_type: 'dynamips', @@ -214,7 +214,7 @@ export class TemplateMocksService { on_close: 'power_off', port_name_format: 'Ethernet{0}', port_segment_size: 0, - symbol: ':/symbols/vmware_guest.svg', + symbol: 'vmware_guest', template_id: '', template_type: 'vmware', usage: '', @@ -243,7 +243,7 @@ export class TemplateMocksService { image: '', name: '', start_command: '', - symbol: ':/symbols/docker_guest.svg', + symbol: 'docker_guest', template_id: '', template_type: 'docker', usage: '', @@ -269,7 +269,7 @@ export class TemplateMocksService { ram: 256, serial_adapters: 0, startup_config: 'iou_l2_base_startup-config.txt', - symbol: ':/symbols/multilayer_switch.svg', + symbol: 'multilayer_switch', template_id: '', template_type: 'iou', usage: '', diff --git a/src/app/services/virtual-box.service.spec.ts b/src/app/services/virtual-box.service.spec.ts index 39aa4c04..b7cab96a 100644 --- a/src/app/services/virtual-box.service.spec.ts +++ b/src/app/services/virtual-box.service.spec.ts @@ -54,7 +54,7 @@ describe('VirtualBoxService', () => { port_name_format: 'Ethernet{0}', port_segment_size: 0, ram: 0, - symbol: ':/symbols/vbox_guest.svg', + symbol: 'vbox_guest', template_id: '1', template_type: 'virtualbox', usage: '', @@ -88,7 +88,7 @@ describe('VirtualBoxService', () => { port_name_format: 'Ethernet{0}', port_segment_size: 0, ram: 0, - symbol: ':/symbols/vbox_guest.svg', + symbol: 'vbox_guest', template_id: '', template_type: 'virtualbox', usage: '', diff --git a/src/app/services/vmware.service.spec.ts b/src/app/services/vmware.service.spec.ts index c82243d6..6019cbdc 100644 --- a/src/app/services/vmware.service.spec.ts +++ b/src/app/services/vmware.service.spec.ts @@ -53,7 +53,7 @@ describe('VmwareService', () => { on_close: 'power-off', port_name_format: 'Ethernet{0}', port_segment_size: 0, - symbol: ':/symbols/vmware_guest.svg', + symbol: 'vmware_guest', template_id: '1', template_type: 'vmware', usage: '', @@ -86,7 +86,7 @@ describe('VmwareService', () => { on_close: 'power-off', port_name_format: 'Ethernet{0}', port_segment_size: 0, - symbol: ':/symbols/vmware_guest.svg', + symbol: 'vmware_guest', template_id: '1', template_type: 'vmware', usage: '', diff --git a/src/app/services/vpcs.service.spec.ts b/src/app/services/vpcs.service.spec.ts index d8f5582b..ba889f01 100644 --- a/src/app/services/vpcs.service.spec.ts +++ b/src/app/services/vpcs.service.spec.ts @@ -45,7 +45,7 @@ describe('VpcsService', () => { console_type: 'telnet', default_name_format: 'PC{0}', name: '', - symbol: ':/symbols/vpcs_guest.svg', + symbol: 'vpcs_guest', template_id: '1', template_type: 'vpcs', }; @@ -67,7 +67,7 @@ describe('VpcsService', () => { console_type: 'telnet', default_name_format: 'PC{0}', name: '', - symbol: ':/symbols/vpcs_guest.svg', + symbol: 'vpcs_guest', template_id: '', template_type: 'vpcs', };