From 17d070dca7f114b7a83b8a68ae0e4dd8eeb0e90e Mon Sep 17 00:00:00 2001 From: grossmj Date: Fri, 23 Nov 2018 17:27:10 +0700 Subject: [PATCH 1/5] Early support for symbol themes. --- gns3server/controller/gns3vm/__init__.py | 15 +- gns3server/controller/symbol_themes.py | 130 ++++++++++++++++++ gns3server/controller/symbols.py | 48 +++++-- .../handlers/api/controller/symbol_handler.py | 20 ++- .../symbols/affinity/circle/blue/atm.svg | 60 ++++++++ .../blue/{c_camera_blue.svg => camera.svg} | 0 ...c_camera_dome_blue.svg => camera_dome.svg} | 0 .../symbols/affinity/circle/blue/circle.svg | 53 +++++++ .../blue/{c_client_blue.svg => client.svg} | 0 .../{c_client_vm_blue.svg => client_vm.svg} | 0 .../blue/{c_cloud_blue.svg => cloud.svg} | 0 .../circle/blue/{c_cog_blue.svg => cog.svg} | 0 ...unications_blue.svg => communications.svg} | 0 ...conversation_blue.svg => conversation.svg} | 0 .../symbols/affinity/circle/blue/docker.svg | 118 ++++++++++++++++ .../blue/{c_dslam_blue.svg => dslam.svg} | 0 ...c_fingerprint_blue.svg => fingerprint.svg} | 0 .../{c_firewall_blue.svg => firewall.svg} | 0 .../{c_firewall3_blue.svg => firewall3.svg} | 0 .../circle/blue/{c_grid_blue.svg => grid.svg} | 0 .../blue/{c_grid2_blue.svg => grid2.svg} | 0 .../circle/blue/{c_hub_blue.svg => hub.svg} | 0 .../blue/{c_inspect_blue.svg => inspect.svg} | 0 .../{c_inspect3_blue.svg => inspect3.svg} | 0 ...interconnect_blue.svg => interconnect.svg} | 0 .../circle/blue/{c_isdn_blue.svg => isdn.svg} | 0 .../circle/blue/{c_ldap_blue.svg => ldap.svg} | 0 .../{c_light_bulb_blue.svg => light_bulb.svg} | 0 .../circle/blue/{c_link_blue.svg => link.svg} | 0 ...loadbalancer_blue.svg => loadbalancer.svg} | 0 ...tilayer_blue.svg => multilayer_switch.svg} | 0 .../circle/blue/{c_nas_blue.svg => nas.svg} | 0 .../{c_pinpoint_blue.svg => pinpoint.svg} | 0 .../blue/{c_printer_blue.svg => printer.svg} | 0 .../circle/blue/{c_rj45_blue.svg => rj45.svg} | 0 .../blue/{c_router_blue.svg => router.svg} | 0 ...router_cloud_blue.svg => router_cloud.svg} | 0 .../{c_satellite_blue.svg => satellite.svg} | 0 ...llite_dish_blue.svg => satellite_dish.svg} | 0 .../blue/{c_scull_blue.svg => scull.svg} | 0 ...er-cluster_blue.svg => server-cluster.svg} | 0 .../blue/{c_server_blue.svg => server.svg} | 0 .../{c_statistics_blue.svg => statistics.svg} | 0 .../blue/{c_storage_blue.svg => storage.svg} | 0 .../blue/{c_switch_blue.svg => switch.svg} | 0 .../blue/{c_tablet_blue.svg => tablet.svg} | 0 .../circle/blue/{c_tree_blue.svg => tree.svg} | 0 .../circle/blue/{c_user_blue.svg => user.svg} | 0 .../affinity/circle/blue/virtualbox.svg | 60 ++++++++ .../circle/blue/{c_vm_blue.svg => vm.svg} | 0 .../symbols/affinity/circle/blue/vmware.svg | 61 ++++++++ .../circle/blue/{c_wifi_blue.svg => wifi.svg} | 0 .../circle/blue/{c_wlc_blue.svg => wlc.svg} | 0 .../circle/blue/{c_xml_blue.svg => xml.svg} | 0 .../symbols/affinity/circle/gray/atm.svg | 60 ++++++++ .../circle/gray/{c_camera.svg => camera.svg} | 0 .../{c_camera_dome.svg => camera_dome.svg} | 0 .../symbols/affinity/circle/gray/circle.svg | 53 +++++++ .../circle/gray/{c_client.svg => client.svg} | 0 .../gray/{c_client_vm.svg => client_vm.svg} | 0 .../circle/gray/{c_cloud.svg => cloud.svg} | 0 .../circle/gray/{c_cog.svg => cog.svg} | 0 ..._communications.svg => communications.svg} | 0 .../{c_conversation.svg => conversation.svg} | 0 .../symbols/affinity/circle/gray/docker.svg | 118 ++++++++++++++++ .../circle/gray/{c_dslam.svg => dslam.svg} | 0 .../{c_fingerprint.svg => fingerprint.svg} | 0 .../gray/{c_firewall.svg => firewall.svg} | 0 .../gray/{c_firewall3.svg => firewall3.svg} | 0 .../circle/gray/{c_grid.svg => grid.svg} | 0 .../circle/gray/{c_grid2.svg => grid2.svg} | 0 .../circle/gray/{c_hub.svg => hub.svg} | 0 .../gray/{c_inspect.svg => inspect.svg} | 0 .../gray/{c_inspect3.svg => inspect3.svg} | 0 .../{c_interconnect.svg => interconnect.svg} | 0 .../circle/gray/{c_isdn.svg => isdn.svg} | 0 .../circle/gray/{c_ldap.svg => ldap.svg} | 0 .../gray/{c_light_bulb.svg => light_bulb.svg} | 0 .../circle/gray/{c_link.svg => link.svg} | 0 .../{c_loadbalancer.svg => loadbalancer.svg} | 0 .../circle/gray/{c_nas.svg => nas.svg} | 0 .../gray/{c_pinpoint.svg => pinpoint.svg} | 0 .../gray/{c_printer.svg => printer.svg} | 0 .../circle/gray/{c_rj45.svg => rj45.svg} | 0 .../circle/gray/{c_router.svg => router.svg} | 0 .../{c_router_cloud.svg => router_cloud.svg} | 0 .../gray/{c_satellite.svg => satellite.svg} | 0 ..._satellite_dish.svg => satellite_dish.svg} | 0 .../circle/gray/{c_scull.svg => scull.svg} | 0 ..._server-cluster.svg => server-cluster.svg} | 0 .../circle/gray/{c_server.svg => server.svg} | 0 .../gray/{c_statistics.svg => statistics.svg} | 0 .../gray/{c_storage.svg => storage.svg} | 0 .../circle/gray/{c_switch.svg => switch.svg} | 0 ...h_multilayer.svg => switch_multilayer.svg} | 0 .../circle/gray/{c_tablet.svg => tablet.svg} | 0 .../circle/gray/{c_tree.svg => tree.svg} | 0 .../circle/gray/{c_user.svg => user.svg} | 0 .../affinity/circle/gray/virtualbox.svg | 60 ++++++++ .../affinity/circle/gray/{c_vm.svg => vm.svg} | 0 .../symbols/affinity/circle/gray/vmware.svg | 61 ++++++++ .../circle/gray/{c_wifi.svg => wifi.svg} | 0 .../circle/gray/{c_wlc.svg => wlc.svg} | 0 .../circle/gray/{c_xml.svg => xml.svg} | 0 .../symbols/affinity/circle/red/atm.svg | 60 ++++++++ .../red/{c_camera_red.svg => camera.svg} | 0 ...{c_camera_dome_red.svg => camera_dome.svg} | 0 .../symbols/affinity/circle/red/circle.svg | 53 +++++++ .../red/{c_client_red.svg => client.svg} | 0 .../{c_client_vm_red.svg => client_vm.svg} | 0 .../circle/red/{c_cloud_red.svg => cloud.svg} | 0 .../circle/red/{c_cog_red.svg => cog.svg} | 0 ...munications_red.svg => communications.svg} | 0 ..._conversation_red.svg => conversation.svg} | 0 .../symbols/affinity/circle/red/docker.svg | 118 ++++++++++++++++ .../circle/red/{c_dslam_red.svg => dslam.svg} | 0 ...{c_fingerprint_red.svg => fingerprint.svg} | 0 .../red/{c_firewall_red.svg => firewall.svg} | 0 .../{c_firewall3_red.svg => firewall3.svg} | 0 .../circle/red/{c_grid_red.svg => grid.svg} | 0 .../circle/red/{c_grid2_red.svg => grid2.svg} | 0 .../circle/red/{c_hub_red.svg => hub.svg} | 0 .../red/{c_inspect_red.svg => inspect.svg} | 0 .../red/{c_inspect3_red.svg => inspect3.svg} | 0 ..._interconnect_red.svg => interconnect.svg} | 0 .../circle/red/{c_isdn_red.svg => isdn.svg} | 0 .../circle/red/{c_ldap_red.svg => ldap.svg} | 0 .../{c_light_bulb_red.svg => light_bulb.svg} | 0 .../circle/red/{c_link_red.svg => link.svg} | 0 ..._loadbalancer_red.svg => loadbalancer.svg} | 0 .../circle/red/{c_nas_red.svg => nas.svg} | 0 .../red/{c_pinpoint_red.svg => pinpoint.svg} | 0 .../red/{c_printer_red.svg => printer.svg} | 0 .../circle/red/{c_rj45_red.svg => rj45.svg} | 0 .../red/{c_router_red.svg => router.svg} | 0 ..._router_cloud_red.svg => router_cloud.svg} | 0 .../{c_satellite_red.svg => satellite.svg} | 0 ...ellite_dish_red.svg => satellite_dish.svg} | 0 .../circle/red/{c_scull_red.svg => scull.svg} | 0 ...ver-cluster_red.svg => server-cluster.svg} | 0 .../red/{c_server_red.svg => server.svg} | 0 .../{c_statistics_red.svg => statistics.svg} | 0 .../red/{c_storage_red.svg => storage.svg} | 0 .../red/{c_switch_red.svg => switch.svg} | 0 ...ltilayer_red.svg => switch_multilayer.svg} | 0 .../red/{c_tablet_red.svg => tablet.svg} | 0 .../circle/red/{c_tree_red.svg => tree.svg} | 0 .../circle/red/{c_user_red.svg => user.svg} | 0 .../affinity/circle/red/virtualbox.svg | 60 ++++++++ .../circle/red/{c_vm_red.svg => vm.svg} | 0 .../symbols/affinity/circle/red/vmware.svg | 61 ++++++++ .../circle/red/{c_wifi_red.svg => wifi.svg} | 0 .../circle/red/{c_wlc_red.svg => wlc.svg} | 0 .../circle/red/{c_xml_red.svg => xml.svg} | 0 .../symbols/affinity/square/blue/atm.svg | 55 ++++++++ .../blue/{sq_camera_blue.svg => camera.svg} | 0 ...q_camera_dome_blue.svg => camera_dome.svg} | 0 .../blue/{sq_client_blue.svg => client.svg} | 0 .../{sq_client_vm_blue.svg => client_vm.svg} | 0 .../symbols/affinity/square/blue/cloud.svg | 57 ++++++++ .../square/blue/{sq_cog_blue.svg => cog.svg} | 0 ...unications_blue.svg => communications.svg} | 0 ...conversation_blue.svg => conversation.svg} | 0 .../symbols/affinity/square/blue/docker.svg | 106 ++++++++++++++ .../blue/{sq_dslam_blue.svg => dslam.svg} | 0 ...q_fingerprint_blue.svg => fingerprint.svg} | 0 .../{sq_firewall_blue.svg => firewall.svg} | 0 .../{sq_firewall3_blue.svg => firewall3.svg} | 0 .../blue/{sq_grid_blue.svg => grid.svg} | 0 .../blue/{sq_grid2_blue.svg => grid2.svg} | 0 .../square/blue/{sq_hub_blue.svg => hub.svg} | 0 .../{sq_inspect2_blue.svg => inspect2.svg} | 0 .../{sq_inspect3_blue.svg => inspect3.svg} | 0 ...interconnect_blue.svg => interconnect.svg} | 0 .../blue/{sq_isdn_blue.svg => isdn.svg} | 0 .../blue/{sq_ldap_blue.svg => ldap.svg} | 0 ...{sq_light_bulb_blue.svg => light_bulb.svg} | 0 .../blue/{sq_link_blue.svg => link.svg} | 0 .../square/blue/{sq_nas_blue.svg => nas.svg} | 0 .../{sq_pinpoint_blue.svg => pinpoint.svg} | 0 .../blue/{sq_printer_blue.svg => printer.svg} | 0 .../blue/{sq_rj45_blue.svg => rj45.svg} | 0 .../blue/{sq_router_blue.svg => router.svg} | 0 ...router_cloud_blue.svg => router_cloud.svg} | 0 .../{sq_satellite_blue.svg => satellite.svg} | 0 ...llite_dish_blue.svg => satellite_dish.svg} | 0 .../blue/{sq_scull_blue.svg => scull.svg} | 0 ...er-cluster_blue.svg => server-cluster.svg} | 0 .../blue/{sq_server_blue.svg => server.svg} | 0 .../affinity/square/blue/sq_cloud_blue.svg | 61 -------- .../blue/{sq_square_blue.svg => square.svg} | 0 ...{sq_statistics_blue.svg => statistics.svg} | 0 .../blue/{sq_storage_blue.svg => storage.svg} | 0 .../blue/{sq_switch_blue.svg => switch.svg} | 0 ...tilayer_blue.svg => switch_multilayer.svg} | 0 .../blue/{sq_tablet_blue.svg => tablet.svg} | 0 .../blue/{sq_tree_blue.svg => tree.svg} | 0 .../blue/{sq_user_blue.svg => user.svg} | 0 .../affinity/square/blue/virtualbox.svg | 58 ++++++++ .../square/blue/{sq_vm_blue.svg => vm.svg} | 0 .../symbols/affinity/square/blue/vmware.svg | 58 ++++++++ .../blue/{sq_wifi_blue.svg => wifi.svg} | 0 .../square/blue/{sq_wlc_blue.svg => wlc.svg} | 0 .../square/blue/{sq_xml_blue.svg => xml.svg} | 0 .../symbols/affinity/square/gray/atm.svg | 55 ++++++++ .../square/gray/{sq_camera.svg => camera.svg} | 0 .../{sq_camera_dome.svg => camera_dome.svg} | 0 .../square/gray/{sq_client.svg => client.svg} | 0 .../gray/{sq_client_vm.svg => client_vm.svg} | 0 .../symbols/affinity/square/gray/cloud.svg | 57 ++++++++ .../square/gray/{sq_cog.svg => cog.svg} | 0 ..._communications.svg => communications.svg} | 0 .../{sq_conversation.svg => conversation.svg} | 0 .../symbols/affinity/square/gray/docker.svg | 106 ++++++++++++++ .../square/gray/{sq_dslam.svg => dslam.svg} | 0 .../{sq_fingerprint.svg => fingerprint.svg} | 0 .../gray/{sq_firewall.svg => firewall.svg} | 0 .../gray/{sq_firewall3.svg => firewall3.svg} | 0 .../square/gray/{sq_grid.svg => grid.svg} | 0 .../square/gray/{sq_grid2.svg => grid2.svg} | 0 .../square/gray/{sq_hub.svg => hub.svg} | 0 .../gray/{sq_inspect2.svg => inspect2.svg} | 0 .../gray/{sq_inspect3.svg => inspect3.svg} | 0 .../{sq_interconnect.svg => interconnect.svg} | 0 .../square/gray/{sq_isdn.svg => isdn.svg} | 0 .../square/gray/{sq_ldap.svg => ldap.svg} | 0 .../{sq_light_bulb.svg => light_bulb.svg} | 0 .../square/gray/{sq_link.svg => link.svg} | 0 .../square/gray/{sq_nas.svg => nas.svg} | 0 .../gray/{sq_pinpoint.svg => pinpoint.svg} | 0 .../gray/{sq_printer.svg => printer.svg} | 0 .../square/gray/{sq_rj45.svg => rj45.svg} | 0 .../square/gray/{sq_router.svg => router.svg} | 0 .../{sq_router_cloud.svg => router_cloud.svg} | 0 .../gray/{sq_satellite.svg => satellite.svg} | 0 ..._satellite_dish.svg => satellite_dish.svg} | 0 .../square/gray/{sq_scull.svg => scull.svg} | 0 ..._server-cluster.svg => server-cluster.svg} | 0 .../square/gray/{sq_server.svg => server.svg} | 0 .../symbols/affinity/square/gray/sq_cloud.svg | 61 -------- .../square/gray/{sq_square.svg => square.svg} | 0 .../{sq_statistics.svg => statistics.svg} | 0 .../gray/{sq_storage.svg => storage.svg} | 0 .../square/gray/{sq_switch.svg => switch.svg} | 0 ...h_multilayer.svg => switch_multilayer.svg} | 0 .../square/gray/{sq_tablet.svg => tablet.svg} | 0 .../square/gray/{sq_tree.svg => tree.svg} | 0 .../square/gray/{sq_user.svg => user.svg} | 0 .../affinity/square/gray/virtualbox.svg | 58 ++++++++ .../square/gray/{sq_vm.svg => vm.svg} | 0 .../symbols/affinity/square/gray/vmware.svg | 58 ++++++++ .../square/gray/{sq_wifi.svg => wifi.svg} | 0 .../square/gray/{sq_wlc.svg => wlc.svg} | 0 .../square/gray/{sq_xml.svg => xml.svg} | 0 .../symbols/affinity/square/red/atm.svg | 55 ++++++++ .../red/{sq_camera_red.svg => camera.svg} | 0 ...sq_camera_dome_red.svg => camera_dome.svg} | 0 .../red/{sq_client_red.svg => client.svg} | 0 .../{sq_client_vm_red.svg => client_vm.svg} | 0 .../symbols/affinity/square/red/cloud.svg | 57 ++++++++ .../square/red/{sq_cog_red.svg => cog.svg} | 0 ...munications_red.svg => communications.svg} | 0 ..._conversation_red.svg => conversation.svg} | 0 .../symbols/affinity/square/red/docker.svg | 106 ++++++++++++++ .../red/{sq_dslam_red.svg => dslam.svg} | 0 ...sq_fingerprint_red.svg => fingerprint.svg} | 0 .../red/{sq_firewall_red.svg => firewall.svg} | 0 .../{sq_firewall3_red.svg => firewall3.svg} | 0 .../square/red/{sq_grid_red.svg => grid.svg} | 0 .../red/{sq_grid2_red.svg => grid2.svg} | 0 .../square/red/{sq_hub_red.svg => hub.svg} | 0 .../red/{sq_inspect2_red.svg => inspect2.svg} | 0 .../red/{sq_inspect3_red.svg => inspect3.svg} | 0 ..._interconnect_red.svg => interconnect.svg} | 0 .../square/red/{sq_isdn_red.svg => isdn.svg} | 0 .../square/red/{sq_ldap_red.svg => ldap.svg} | 0 .../{sq_light_bulb_red.svg => light_bulb.svg} | 0 .../square/red/{sq_link_red.svg => link.svg} | 0 .../square/red/{sq_nas_red.svg => nas.svg} | 0 .../red/{sq_pinpoint_red.svg => pinpoint.svg} | 0 .../red/{sq_printer_red.svg => printer.svg} | 0 .../square/red/{sq_rj45_red.svg => rj45.svg} | 0 .../red/{sq_router_red.svg => router.svg} | 0 ..._router_cloud_red.svg => router_cloud.svg} | 0 .../{sq_satellite_red.svg => satellite.svg} | 0 ...ellite_dish_red.svg => satellite_dish.svg} | 0 .../red/{sq_scull_red.svg => scull.svg} | 0 ...ver-cluster_red.svg => server-cluster.svg} | 0 .../red/{sq_server_red.svg => server.svg} | 0 .../affinity/square/red/sq_cloud_red.svg | 61 -------- .../red/{sq_square_red.svg => square.svg} | 0 .../{sq_statistics_red.svg => statistics.svg} | 0 .../red/{sq_storage_red.svg => storage.svg} | 0 .../red/{sq_switch_red.svg => switch.svg} | 0 ...ltilayer_red.svg => switch_multilayer.svg} | 0 .../red/{sq_tablet_red.svg => tablet.svg} | 0 .../square/red/{sq_tree_red.svg => tree.svg} | 0 .../square/red/{sq_user_red.svg => user.svg} | 0 .../affinity/square/red/virtualbox.svg | 58 ++++++++ .../square/red/{sq_vm_red.svg => vm.svg} | 0 .../symbols/affinity/square/red/vmware.svg | 58 ++++++++ .../square/red/{sq_wifi_red.svg => wifi.svg} | 0 .../square/red/{sq_wlc_red.svg => wlc.svg} | 0 .../square/red/{sq_xml_red.svg => xml.svg} | 0 gns3server/symbols/{ => classic}/PBX.svg | 0 .../symbols/{ => classic}/PIX_firewall.svg | 0 .../symbols/{ => classic}/access_point.svg | 0 .../symbols/{ => classic}/access_server.svg | 0 gns3server/symbols/{ => classic}/asa.svg | 0 .../symbols/{ => classic}/atm_bridge.svg | 0 .../symbols/{ => classic}/atm_switch.svg | 0 .../symbols/{ => classic}/call_manager.svg | 0 gns3server/symbols/{ => classic}/cloud.svg | 0 gns3server/symbols/{ => classic}/computer.svg | 0 .../symbols/{ => classic}/docker_guest.svg | 0 gns3server/symbols/{ => classic}/dslam.svg | 0 .../edge_label_switch_router.svg | 0 .../symbols/{ => classic}/ethernet_switch.svg | 0 gns3server/symbols/{ => classic}/firewall.svg | 0 .../{ => classic}/frame_relay_switch.svg | 0 gns3server/symbols/{ => classic}/gateway.svg | 0 gns3server/symbols/{ => classic}/hub.svg | 0 gns3server/symbols/{ => classic}/ids.svg | 0 .../symbols/{ => classic}/iosv_l2_virl.svg | 0 .../symbols/{ => classic}/iosv_virl.svg | 0 gns3server/symbols/{ => classic}/ip_phone.svg | 0 .../{ => classic}/label_switch_router.svg | 0 .../symbols/{ => classic}/lightweight_ap.svg | 0 .../{ => classic}/multilayer_switch.svg | 0 .../symbols/{ => classic}/optical_router.svg | 0 gns3server/symbols/{ => classic}/printer.svg | 0 .../symbols/{ => classic}/qemu_guest.svg | 0 .../{ => classic}/route_switch_processor.svg | 0 .../symbols/{ => classic}/router.awp.svg | 0 gns3server/symbols/{ => classic}/router.svg | 0 .../symbols/{ => classic}/router_firewall.svg | 0 .../symbols/{ => classic}/router_netflow.svg | 0 gns3server/symbols/{ => classic}/server.svg | 0 .../symbols/{ => classic}/sip_server.svg | 0 gns3server/symbols/{ => classic}/traceng.svg | 0 .../symbols/{ => classic}/vbox_guest.svg | 0 .../symbols/{ => classic}/vmware_guest.svg | 0 .../{ => classic}/voice_access_server.svg | 0 .../symbols/{ => classic}/voice_router.svg | 0 .../symbols/{ => classic}/vpcs_guest.svg | 0 .../symbols/{ => classic}/wlan_controller.svg | 0 tests/controller/test_node.py | 6 +- tests/controller/test_symbols.py | 12 +- tests/handlers/api/controller/test_symbol.py | 9 +- tests/utils/test_picture.py | 4 +- 350 files changed, 2268 insertions(+), 217 deletions(-) create mode 100644 gns3server/controller/symbol_themes.py create mode 100644 gns3server/symbols/affinity/circle/blue/atm.svg rename gns3server/symbols/affinity/circle/blue/{c_camera_blue.svg => camera.svg} (100%) rename gns3server/symbols/affinity/circle/blue/{c_camera_dome_blue.svg => camera_dome.svg} (100%) create mode 100644 gns3server/symbols/affinity/circle/blue/circle.svg rename gns3server/symbols/affinity/circle/blue/{c_client_blue.svg => client.svg} (100%) rename gns3server/symbols/affinity/circle/blue/{c_client_vm_blue.svg => client_vm.svg} (100%) rename gns3server/symbols/affinity/circle/blue/{c_cloud_blue.svg => cloud.svg} (100%) rename gns3server/symbols/affinity/circle/blue/{c_cog_blue.svg => cog.svg} (100%) rename gns3server/symbols/affinity/circle/blue/{c_communications_blue.svg => communications.svg} (100%) rename gns3server/symbols/affinity/circle/blue/{c_conversation_blue.svg => conversation.svg} (100%) create mode 100644 gns3server/symbols/affinity/circle/blue/docker.svg rename gns3server/symbols/affinity/circle/blue/{c_dslam_blue.svg => dslam.svg} (100%) rename gns3server/symbols/affinity/circle/blue/{c_fingerprint_blue.svg => fingerprint.svg} (100%) rename gns3server/symbols/affinity/circle/blue/{c_firewall_blue.svg => firewall.svg} (100%) rename gns3server/symbols/affinity/circle/blue/{c_firewall3_blue.svg => firewall3.svg} (100%) rename gns3server/symbols/affinity/circle/blue/{c_grid_blue.svg => grid.svg} (100%) rename gns3server/symbols/affinity/circle/blue/{c_grid2_blue.svg => grid2.svg} (100%) rename gns3server/symbols/affinity/circle/blue/{c_hub_blue.svg => hub.svg} (100%) rename gns3server/symbols/affinity/circle/blue/{c_inspect_blue.svg => inspect.svg} (100%) rename gns3server/symbols/affinity/circle/blue/{c_inspect3_blue.svg => inspect3.svg} (100%) rename gns3server/symbols/affinity/circle/blue/{c_interconnect_blue.svg => interconnect.svg} (100%) rename gns3server/symbols/affinity/circle/blue/{c_isdn_blue.svg => isdn.svg} (100%) rename gns3server/symbols/affinity/circle/blue/{c_ldap_blue.svg => ldap.svg} (100%) rename gns3server/symbols/affinity/circle/blue/{c_light_bulb_blue.svg => light_bulb.svg} (100%) rename gns3server/symbols/affinity/circle/blue/{c_link_blue.svg => link.svg} (100%) rename gns3server/symbols/affinity/circle/blue/{c_loadbalancer_blue.svg => loadbalancer.svg} (100%) rename gns3server/symbols/affinity/circle/blue/{c_switch_multilayer_blue.svg => multilayer_switch.svg} (100%) rename gns3server/symbols/affinity/circle/blue/{c_nas_blue.svg => nas.svg} (100%) rename gns3server/symbols/affinity/circle/blue/{c_pinpoint_blue.svg => pinpoint.svg} (100%) rename gns3server/symbols/affinity/circle/blue/{c_printer_blue.svg => printer.svg} (100%) rename gns3server/symbols/affinity/circle/blue/{c_rj45_blue.svg => rj45.svg} (100%) rename gns3server/symbols/affinity/circle/blue/{c_router_blue.svg => router.svg} (100%) rename gns3server/symbols/affinity/circle/blue/{c_router_cloud_blue.svg => router_cloud.svg} (100%) rename gns3server/symbols/affinity/circle/blue/{c_satellite_blue.svg => satellite.svg} (100%) rename gns3server/symbols/affinity/circle/blue/{c_satellite_dish_blue.svg => satellite_dish.svg} (100%) rename gns3server/symbols/affinity/circle/blue/{c_scull_blue.svg => scull.svg} (100%) rename gns3server/symbols/affinity/circle/blue/{c_server-cluster_blue.svg => server-cluster.svg} (100%) rename gns3server/symbols/affinity/circle/blue/{c_server_blue.svg => server.svg} (100%) rename gns3server/symbols/affinity/circle/blue/{c_statistics_blue.svg => statistics.svg} (100%) rename gns3server/symbols/affinity/circle/blue/{c_storage_blue.svg => storage.svg} (100%) rename gns3server/symbols/affinity/circle/blue/{c_switch_blue.svg => switch.svg} (100%) rename gns3server/symbols/affinity/circle/blue/{c_tablet_blue.svg => tablet.svg} (100%) rename gns3server/symbols/affinity/circle/blue/{c_tree_blue.svg => tree.svg} (100%) rename gns3server/symbols/affinity/circle/blue/{c_user_blue.svg => user.svg} (100%) create mode 100644 gns3server/symbols/affinity/circle/blue/virtualbox.svg rename gns3server/symbols/affinity/circle/blue/{c_vm_blue.svg => vm.svg} (100%) create mode 100644 gns3server/symbols/affinity/circle/blue/vmware.svg rename gns3server/symbols/affinity/circle/blue/{c_wifi_blue.svg => wifi.svg} (100%) rename gns3server/symbols/affinity/circle/blue/{c_wlc_blue.svg => wlc.svg} (100%) rename gns3server/symbols/affinity/circle/blue/{c_xml_blue.svg => xml.svg} (100%) create mode 100644 gns3server/symbols/affinity/circle/gray/atm.svg rename gns3server/symbols/affinity/circle/gray/{c_camera.svg => camera.svg} (100%) rename gns3server/symbols/affinity/circle/gray/{c_camera_dome.svg => camera_dome.svg} (100%) create mode 100644 gns3server/symbols/affinity/circle/gray/circle.svg rename gns3server/symbols/affinity/circle/gray/{c_client.svg => client.svg} (100%) rename gns3server/symbols/affinity/circle/gray/{c_client_vm.svg => client_vm.svg} (100%) rename gns3server/symbols/affinity/circle/gray/{c_cloud.svg => cloud.svg} (100%) rename gns3server/symbols/affinity/circle/gray/{c_cog.svg => cog.svg} (100%) rename gns3server/symbols/affinity/circle/gray/{c_communications.svg => communications.svg} (100%) rename gns3server/symbols/affinity/circle/gray/{c_conversation.svg => conversation.svg} (100%) create mode 100644 gns3server/symbols/affinity/circle/gray/docker.svg rename gns3server/symbols/affinity/circle/gray/{c_dslam.svg => dslam.svg} (100%) rename gns3server/symbols/affinity/circle/gray/{c_fingerprint.svg => fingerprint.svg} (100%) rename gns3server/symbols/affinity/circle/gray/{c_firewall.svg => firewall.svg} (100%) rename gns3server/symbols/affinity/circle/gray/{c_firewall3.svg => firewall3.svg} (100%) rename gns3server/symbols/affinity/circle/gray/{c_grid.svg => grid.svg} (100%) rename gns3server/symbols/affinity/circle/gray/{c_grid2.svg => grid2.svg} (100%) rename gns3server/symbols/affinity/circle/gray/{c_hub.svg => hub.svg} (100%) rename gns3server/symbols/affinity/circle/gray/{c_inspect.svg => inspect.svg} (100%) rename gns3server/symbols/affinity/circle/gray/{c_inspect3.svg => inspect3.svg} (100%) rename gns3server/symbols/affinity/circle/gray/{c_interconnect.svg => interconnect.svg} (100%) rename gns3server/symbols/affinity/circle/gray/{c_isdn.svg => isdn.svg} (100%) rename gns3server/symbols/affinity/circle/gray/{c_ldap.svg => ldap.svg} (100%) rename gns3server/symbols/affinity/circle/gray/{c_light_bulb.svg => light_bulb.svg} (100%) rename gns3server/symbols/affinity/circle/gray/{c_link.svg => link.svg} (100%) rename gns3server/symbols/affinity/circle/gray/{c_loadbalancer.svg => loadbalancer.svg} (100%) rename gns3server/symbols/affinity/circle/gray/{c_nas.svg => nas.svg} (100%) rename gns3server/symbols/affinity/circle/gray/{c_pinpoint.svg => pinpoint.svg} (100%) rename gns3server/symbols/affinity/circle/gray/{c_printer.svg => printer.svg} (100%) rename gns3server/symbols/affinity/circle/gray/{c_rj45.svg => rj45.svg} (100%) rename gns3server/symbols/affinity/circle/gray/{c_router.svg => router.svg} (100%) rename gns3server/symbols/affinity/circle/gray/{c_router_cloud.svg => router_cloud.svg} (100%) rename gns3server/symbols/affinity/circle/gray/{c_satellite.svg => satellite.svg} (100%) rename gns3server/symbols/affinity/circle/gray/{c_satellite_dish.svg => satellite_dish.svg} (100%) rename gns3server/symbols/affinity/circle/gray/{c_scull.svg => scull.svg} (100%) rename gns3server/symbols/affinity/circle/gray/{c_server-cluster.svg => server-cluster.svg} (100%) rename gns3server/symbols/affinity/circle/gray/{c_server.svg => server.svg} (100%) rename gns3server/symbols/affinity/circle/gray/{c_statistics.svg => statistics.svg} (100%) rename gns3server/symbols/affinity/circle/gray/{c_storage.svg => storage.svg} (100%) rename gns3server/symbols/affinity/circle/gray/{c_switch.svg => switch.svg} (100%) rename gns3server/symbols/affinity/circle/gray/{c_switch_multilayer.svg => switch_multilayer.svg} (100%) rename gns3server/symbols/affinity/circle/gray/{c_tablet.svg => tablet.svg} (100%) rename gns3server/symbols/affinity/circle/gray/{c_tree.svg => tree.svg} (100%) rename gns3server/symbols/affinity/circle/gray/{c_user.svg => user.svg} (100%) create mode 100644 gns3server/symbols/affinity/circle/gray/virtualbox.svg rename gns3server/symbols/affinity/circle/gray/{c_vm.svg => vm.svg} (100%) create mode 100644 gns3server/symbols/affinity/circle/gray/vmware.svg rename gns3server/symbols/affinity/circle/gray/{c_wifi.svg => wifi.svg} (100%) rename gns3server/symbols/affinity/circle/gray/{c_wlc.svg => wlc.svg} (100%) rename gns3server/symbols/affinity/circle/gray/{c_xml.svg => xml.svg} (100%) create mode 100644 gns3server/symbols/affinity/circle/red/atm.svg rename gns3server/symbols/affinity/circle/red/{c_camera_red.svg => camera.svg} (100%) rename gns3server/symbols/affinity/circle/red/{c_camera_dome_red.svg => camera_dome.svg} (100%) create mode 100644 gns3server/symbols/affinity/circle/red/circle.svg rename gns3server/symbols/affinity/circle/red/{c_client_red.svg => client.svg} (100%) rename gns3server/symbols/affinity/circle/red/{c_client_vm_red.svg => client_vm.svg} (100%) rename gns3server/symbols/affinity/circle/red/{c_cloud_red.svg => cloud.svg} (100%) rename gns3server/symbols/affinity/circle/red/{c_cog_red.svg => cog.svg} (100%) rename gns3server/symbols/affinity/circle/red/{c_communications_red.svg => communications.svg} (100%) rename gns3server/symbols/affinity/circle/red/{c_conversation_red.svg => conversation.svg} (100%) create mode 100644 gns3server/symbols/affinity/circle/red/docker.svg rename gns3server/symbols/affinity/circle/red/{c_dslam_red.svg => dslam.svg} (100%) rename gns3server/symbols/affinity/circle/red/{c_fingerprint_red.svg => fingerprint.svg} (100%) rename gns3server/symbols/affinity/circle/red/{c_firewall_red.svg => firewall.svg} (100%) rename gns3server/symbols/affinity/circle/red/{c_firewall3_red.svg => firewall3.svg} (100%) rename gns3server/symbols/affinity/circle/red/{c_grid_red.svg => grid.svg} (100%) rename gns3server/symbols/affinity/circle/red/{c_grid2_red.svg => grid2.svg} (100%) rename gns3server/symbols/affinity/circle/red/{c_hub_red.svg => hub.svg} (100%) rename gns3server/symbols/affinity/circle/red/{c_inspect_red.svg => inspect.svg} (100%) rename gns3server/symbols/affinity/circle/red/{c_inspect3_red.svg => inspect3.svg} (100%) rename gns3server/symbols/affinity/circle/red/{c_interconnect_red.svg => interconnect.svg} (100%) rename gns3server/symbols/affinity/circle/red/{c_isdn_red.svg => isdn.svg} (100%) rename gns3server/symbols/affinity/circle/red/{c_ldap_red.svg => ldap.svg} (100%) rename gns3server/symbols/affinity/circle/red/{c_light_bulb_red.svg => light_bulb.svg} (100%) rename gns3server/symbols/affinity/circle/red/{c_link_red.svg => link.svg} (100%) rename gns3server/symbols/affinity/circle/red/{c_loadbalancer_red.svg => loadbalancer.svg} (100%) rename gns3server/symbols/affinity/circle/red/{c_nas_red.svg => nas.svg} (100%) rename gns3server/symbols/affinity/circle/red/{c_pinpoint_red.svg => pinpoint.svg} (100%) rename gns3server/symbols/affinity/circle/red/{c_printer_red.svg => printer.svg} (100%) rename gns3server/symbols/affinity/circle/red/{c_rj45_red.svg => rj45.svg} (100%) rename gns3server/symbols/affinity/circle/red/{c_router_red.svg => router.svg} (100%) rename gns3server/symbols/affinity/circle/red/{c_router_cloud_red.svg => router_cloud.svg} (100%) rename gns3server/symbols/affinity/circle/red/{c_satellite_red.svg => satellite.svg} (100%) rename gns3server/symbols/affinity/circle/red/{c_satellite_dish_red.svg => satellite_dish.svg} (100%) rename gns3server/symbols/affinity/circle/red/{c_scull_red.svg => scull.svg} (100%) rename gns3server/symbols/affinity/circle/red/{c_server-cluster_red.svg => server-cluster.svg} (100%) rename gns3server/symbols/affinity/circle/red/{c_server_red.svg => server.svg} (100%) rename gns3server/symbols/affinity/circle/red/{c_statistics_red.svg => statistics.svg} (100%) rename gns3server/symbols/affinity/circle/red/{c_storage_red.svg => storage.svg} (100%) rename gns3server/symbols/affinity/circle/red/{c_switch_red.svg => switch.svg} (100%) rename gns3server/symbols/affinity/circle/red/{c_switch_multilayer_red.svg => switch_multilayer.svg} (100%) rename gns3server/symbols/affinity/circle/red/{c_tablet_red.svg => tablet.svg} (100%) rename gns3server/symbols/affinity/circle/red/{c_tree_red.svg => tree.svg} (100%) rename gns3server/symbols/affinity/circle/red/{c_user_red.svg => user.svg} (100%) create mode 100644 gns3server/symbols/affinity/circle/red/virtualbox.svg rename gns3server/symbols/affinity/circle/red/{c_vm_red.svg => vm.svg} (100%) create mode 100644 gns3server/symbols/affinity/circle/red/vmware.svg rename gns3server/symbols/affinity/circle/red/{c_wifi_red.svg => wifi.svg} (100%) rename gns3server/symbols/affinity/circle/red/{c_wlc_red.svg => wlc.svg} (100%) rename gns3server/symbols/affinity/circle/red/{c_xml_red.svg => xml.svg} (100%) create mode 100644 gns3server/symbols/affinity/square/blue/atm.svg rename gns3server/symbols/affinity/square/blue/{sq_camera_blue.svg => camera.svg} (100%) rename gns3server/symbols/affinity/square/blue/{sq_camera_dome_blue.svg => camera_dome.svg} (100%) rename gns3server/symbols/affinity/square/blue/{sq_client_blue.svg => client.svg} (100%) rename gns3server/symbols/affinity/square/blue/{sq_client_vm_blue.svg => client_vm.svg} (100%) create mode 100644 gns3server/symbols/affinity/square/blue/cloud.svg rename gns3server/symbols/affinity/square/blue/{sq_cog_blue.svg => cog.svg} (100%) rename gns3server/symbols/affinity/square/blue/{sq_communications_blue.svg => communications.svg} (100%) rename gns3server/symbols/affinity/square/blue/{sq_conversation_blue.svg => conversation.svg} (100%) create mode 100644 gns3server/symbols/affinity/square/blue/docker.svg rename gns3server/symbols/affinity/square/blue/{sq_dslam_blue.svg => dslam.svg} (100%) rename gns3server/symbols/affinity/square/blue/{sq_fingerprint_blue.svg => fingerprint.svg} (100%) rename gns3server/symbols/affinity/square/blue/{sq_firewall_blue.svg => firewall.svg} (100%) rename gns3server/symbols/affinity/square/blue/{sq_firewall3_blue.svg => firewall3.svg} (100%) rename gns3server/symbols/affinity/square/blue/{sq_grid_blue.svg => grid.svg} (100%) rename gns3server/symbols/affinity/square/blue/{sq_grid2_blue.svg => grid2.svg} (100%) rename gns3server/symbols/affinity/square/blue/{sq_hub_blue.svg => hub.svg} (100%) rename gns3server/symbols/affinity/square/blue/{sq_inspect2_blue.svg => inspect2.svg} (100%) rename gns3server/symbols/affinity/square/blue/{sq_inspect3_blue.svg => inspect3.svg} (100%) rename gns3server/symbols/affinity/square/blue/{sq_interconnect_blue.svg => interconnect.svg} (100%) rename gns3server/symbols/affinity/square/blue/{sq_isdn_blue.svg => isdn.svg} (100%) rename gns3server/symbols/affinity/square/blue/{sq_ldap_blue.svg => ldap.svg} (100%) rename gns3server/symbols/affinity/square/blue/{sq_light_bulb_blue.svg => light_bulb.svg} (100%) rename gns3server/symbols/affinity/square/blue/{sq_link_blue.svg => link.svg} (100%) rename gns3server/symbols/affinity/square/blue/{sq_nas_blue.svg => nas.svg} (100%) rename gns3server/symbols/affinity/square/blue/{sq_pinpoint_blue.svg => pinpoint.svg} (100%) rename gns3server/symbols/affinity/square/blue/{sq_printer_blue.svg => printer.svg} (100%) rename gns3server/symbols/affinity/square/blue/{sq_rj45_blue.svg => rj45.svg} (100%) rename gns3server/symbols/affinity/square/blue/{sq_router_blue.svg => router.svg} (100%) rename gns3server/symbols/affinity/square/blue/{sq_router_cloud_blue.svg => router_cloud.svg} (100%) rename gns3server/symbols/affinity/square/blue/{sq_satellite_blue.svg => satellite.svg} (100%) rename gns3server/symbols/affinity/square/blue/{sq_satellite_dish_blue.svg => satellite_dish.svg} (100%) rename gns3server/symbols/affinity/square/blue/{sq_scull_blue.svg => scull.svg} (100%) rename gns3server/symbols/affinity/square/blue/{sq_server-cluster_blue.svg => server-cluster.svg} (100%) rename gns3server/symbols/affinity/square/blue/{sq_server_blue.svg => server.svg} (100%) delete mode 100644 gns3server/symbols/affinity/square/blue/sq_cloud_blue.svg rename gns3server/symbols/affinity/square/blue/{sq_square_blue.svg => square.svg} (100%) rename gns3server/symbols/affinity/square/blue/{sq_statistics_blue.svg => statistics.svg} (100%) rename gns3server/symbols/affinity/square/blue/{sq_storage_blue.svg => storage.svg} (100%) rename gns3server/symbols/affinity/square/blue/{sq_switch_blue.svg => switch.svg} (100%) rename gns3server/symbols/affinity/square/blue/{sq_switch_multilayer_blue.svg => switch_multilayer.svg} (100%) rename gns3server/symbols/affinity/square/blue/{sq_tablet_blue.svg => tablet.svg} (100%) rename gns3server/symbols/affinity/square/blue/{sq_tree_blue.svg => tree.svg} (100%) rename gns3server/symbols/affinity/square/blue/{sq_user_blue.svg => user.svg} (100%) create mode 100644 gns3server/symbols/affinity/square/blue/virtualbox.svg rename gns3server/symbols/affinity/square/blue/{sq_vm_blue.svg => vm.svg} (100%) create mode 100644 gns3server/symbols/affinity/square/blue/vmware.svg rename gns3server/symbols/affinity/square/blue/{sq_wifi_blue.svg => wifi.svg} (100%) rename gns3server/symbols/affinity/square/blue/{sq_wlc_blue.svg => wlc.svg} (100%) rename gns3server/symbols/affinity/square/blue/{sq_xml_blue.svg => xml.svg} (100%) create mode 100644 gns3server/symbols/affinity/square/gray/atm.svg rename gns3server/symbols/affinity/square/gray/{sq_camera.svg => camera.svg} (100%) rename gns3server/symbols/affinity/square/gray/{sq_camera_dome.svg => camera_dome.svg} (100%) rename gns3server/symbols/affinity/square/gray/{sq_client.svg => client.svg} (100%) rename gns3server/symbols/affinity/square/gray/{sq_client_vm.svg => client_vm.svg} (100%) create mode 100644 gns3server/symbols/affinity/square/gray/cloud.svg rename gns3server/symbols/affinity/square/gray/{sq_cog.svg => cog.svg} (100%) rename gns3server/symbols/affinity/square/gray/{sq_communications.svg => communications.svg} (100%) rename gns3server/symbols/affinity/square/gray/{sq_conversation.svg => conversation.svg} (100%) create mode 100644 gns3server/symbols/affinity/square/gray/docker.svg rename gns3server/symbols/affinity/square/gray/{sq_dslam.svg => dslam.svg} (100%) rename gns3server/symbols/affinity/square/gray/{sq_fingerprint.svg => fingerprint.svg} (100%) rename gns3server/symbols/affinity/square/gray/{sq_firewall.svg => firewall.svg} (100%) rename gns3server/symbols/affinity/square/gray/{sq_firewall3.svg => firewall3.svg} (100%) rename gns3server/symbols/affinity/square/gray/{sq_grid.svg => grid.svg} (100%) rename gns3server/symbols/affinity/square/gray/{sq_grid2.svg => grid2.svg} (100%) rename gns3server/symbols/affinity/square/gray/{sq_hub.svg => hub.svg} (100%) rename gns3server/symbols/affinity/square/gray/{sq_inspect2.svg => inspect2.svg} (100%) rename gns3server/symbols/affinity/square/gray/{sq_inspect3.svg => inspect3.svg} (100%) rename gns3server/symbols/affinity/square/gray/{sq_interconnect.svg => interconnect.svg} (100%) rename gns3server/symbols/affinity/square/gray/{sq_isdn.svg => isdn.svg} (100%) rename gns3server/symbols/affinity/square/gray/{sq_ldap.svg => ldap.svg} (100%) rename gns3server/symbols/affinity/square/gray/{sq_light_bulb.svg => light_bulb.svg} (100%) rename gns3server/symbols/affinity/square/gray/{sq_link.svg => link.svg} (100%) rename gns3server/symbols/affinity/square/gray/{sq_nas.svg => nas.svg} (100%) rename gns3server/symbols/affinity/square/gray/{sq_pinpoint.svg => pinpoint.svg} (100%) rename gns3server/symbols/affinity/square/gray/{sq_printer.svg => printer.svg} (100%) rename gns3server/symbols/affinity/square/gray/{sq_rj45.svg => rj45.svg} (100%) rename gns3server/symbols/affinity/square/gray/{sq_router.svg => router.svg} (100%) rename gns3server/symbols/affinity/square/gray/{sq_router_cloud.svg => router_cloud.svg} (100%) rename gns3server/symbols/affinity/square/gray/{sq_satellite.svg => satellite.svg} (100%) rename gns3server/symbols/affinity/square/gray/{sq_satellite_dish.svg => satellite_dish.svg} (100%) rename gns3server/symbols/affinity/square/gray/{sq_scull.svg => scull.svg} (100%) rename gns3server/symbols/affinity/square/gray/{sq_server-cluster.svg => server-cluster.svg} (100%) rename gns3server/symbols/affinity/square/gray/{sq_server.svg => server.svg} (100%) delete mode 100644 gns3server/symbols/affinity/square/gray/sq_cloud.svg rename gns3server/symbols/affinity/square/gray/{sq_square.svg => square.svg} (100%) rename gns3server/symbols/affinity/square/gray/{sq_statistics.svg => statistics.svg} (100%) rename gns3server/symbols/affinity/square/gray/{sq_storage.svg => storage.svg} (100%) rename gns3server/symbols/affinity/square/gray/{sq_switch.svg => switch.svg} (100%) rename gns3server/symbols/affinity/square/gray/{sq_switch_multilayer.svg => switch_multilayer.svg} (100%) rename gns3server/symbols/affinity/square/gray/{sq_tablet.svg => tablet.svg} (100%) rename gns3server/symbols/affinity/square/gray/{sq_tree.svg => tree.svg} (100%) rename gns3server/symbols/affinity/square/gray/{sq_user.svg => user.svg} (100%) create mode 100644 gns3server/symbols/affinity/square/gray/virtualbox.svg rename gns3server/symbols/affinity/square/gray/{sq_vm.svg => vm.svg} (100%) create mode 100644 gns3server/symbols/affinity/square/gray/vmware.svg rename gns3server/symbols/affinity/square/gray/{sq_wifi.svg => wifi.svg} (100%) rename gns3server/symbols/affinity/square/gray/{sq_wlc.svg => wlc.svg} (100%) rename gns3server/symbols/affinity/square/gray/{sq_xml.svg => xml.svg} (100%) create mode 100644 gns3server/symbols/affinity/square/red/atm.svg rename gns3server/symbols/affinity/square/red/{sq_camera_red.svg => camera.svg} (100%) rename gns3server/symbols/affinity/square/red/{sq_camera_dome_red.svg => camera_dome.svg} (100%) rename gns3server/symbols/affinity/square/red/{sq_client_red.svg => client.svg} (100%) rename gns3server/symbols/affinity/square/red/{sq_client_vm_red.svg => client_vm.svg} (100%) create mode 100644 gns3server/symbols/affinity/square/red/cloud.svg rename gns3server/symbols/affinity/square/red/{sq_cog_red.svg => cog.svg} (100%) rename gns3server/symbols/affinity/square/red/{sq_communications_red.svg => communications.svg} (100%) rename gns3server/symbols/affinity/square/red/{sq_conversation_red.svg => conversation.svg} (100%) create mode 100644 gns3server/symbols/affinity/square/red/docker.svg rename gns3server/symbols/affinity/square/red/{sq_dslam_red.svg => dslam.svg} (100%) rename gns3server/symbols/affinity/square/red/{sq_fingerprint_red.svg => fingerprint.svg} (100%) rename gns3server/symbols/affinity/square/red/{sq_firewall_red.svg => firewall.svg} (100%) rename gns3server/symbols/affinity/square/red/{sq_firewall3_red.svg => firewall3.svg} (100%) rename gns3server/symbols/affinity/square/red/{sq_grid_red.svg => grid.svg} (100%) rename gns3server/symbols/affinity/square/red/{sq_grid2_red.svg => grid2.svg} (100%) rename gns3server/symbols/affinity/square/red/{sq_hub_red.svg => hub.svg} (100%) rename gns3server/symbols/affinity/square/red/{sq_inspect2_red.svg => inspect2.svg} (100%) rename gns3server/symbols/affinity/square/red/{sq_inspect3_red.svg => inspect3.svg} (100%) rename gns3server/symbols/affinity/square/red/{sq_interconnect_red.svg => interconnect.svg} (100%) rename gns3server/symbols/affinity/square/red/{sq_isdn_red.svg => isdn.svg} (100%) rename gns3server/symbols/affinity/square/red/{sq_ldap_red.svg => ldap.svg} (100%) rename gns3server/symbols/affinity/square/red/{sq_light_bulb_red.svg => light_bulb.svg} (100%) rename gns3server/symbols/affinity/square/red/{sq_link_red.svg => link.svg} (100%) rename gns3server/symbols/affinity/square/red/{sq_nas_red.svg => nas.svg} (100%) rename gns3server/symbols/affinity/square/red/{sq_pinpoint_red.svg => pinpoint.svg} (100%) rename gns3server/symbols/affinity/square/red/{sq_printer_red.svg => printer.svg} (100%) rename gns3server/symbols/affinity/square/red/{sq_rj45_red.svg => rj45.svg} (100%) rename gns3server/symbols/affinity/square/red/{sq_router_red.svg => router.svg} (100%) rename gns3server/symbols/affinity/square/red/{sq_router_cloud_red.svg => router_cloud.svg} (100%) rename gns3server/symbols/affinity/square/red/{sq_satellite_red.svg => satellite.svg} (100%) rename gns3server/symbols/affinity/square/red/{sq_satellite_dish_red.svg => satellite_dish.svg} (100%) rename gns3server/symbols/affinity/square/red/{sq_scull_red.svg => scull.svg} (100%) rename gns3server/symbols/affinity/square/red/{sq_server-cluster_red.svg => server-cluster.svg} (100%) rename gns3server/symbols/affinity/square/red/{sq_server_red.svg => server.svg} (100%) delete mode 100644 gns3server/symbols/affinity/square/red/sq_cloud_red.svg rename gns3server/symbols/affinity/square/red/{sq_square_red.svg => square.svg} (100%) rename gns3server/symbols/affinity/square/red/{sq_statistics_red.svg => statistics.svg} (100%) rename gns3server/symbols/affinity/square/red/{sq_storage_red.svg => storage.svg} (100%) rename gns3server/symbols/affinity/square/red/{sq_switch_red.svg => switch.svg} (100%) rename gns3server/symbols/affinity/square/red/{sq_switch_multilayer_red.svg => switch_multilayer.svg} (100%) rename gns3server/symbols/affinity/square/red/{sq_tablet_red.svg => tablet.svg} (100%) rename gns3server/symbols/affinity/square/red/{sq_tree_red.svg => tree.svg} (100%) rename gns3server/symbols/affinity/square/red/{sq_user_red.svg => user.svg} (100%) create mode 100644 gns3server/symbols/affinity/square/red/virtualbox.svg rename gns3server/symbols/affinity/square/red/{sq_vm_red.svg => vm.svg} (100%) create mode 100644 gns3server/symbols/affinity/square/red/vmware.svg rename gns3server/symbols/affinity/square/red/{sq_wifi_red.svg => wifi.svg} (100%) rename gns3server/symbols/affinity/square/red/{sq_wlc_red.svg => wlc.svg} (100%) rename gns3server/symbols/affinity/square/red/{sq_xml_red.svg => xml.svg} (100%) rename gns3server/symbols/{ => classic}/PBX.svg (100%) rename gns3server/symbols/{ => classic}/PIX_firewall.svg (100%) rename gns3server/symbols/{ => classic}/access_point.svg (100%) rename gns3server/symbols/{ => classic}/access_server.svg (100%) rename gns3server/symbols/{ => classic}/asa.svg (100%) rename gns3server/symbols/{ => classic}/atm_bridge.svg (100%) rename gns3server/symbols/{ => classic}/atm_switch.svg (100%) rename gns3server/symbols/{ => classic}/call_manager.svg (100%) rename gns3server/symbols/{ => classic}/cloud.svg (100%) rename gns3server/symbols/{ => classic}/computer.svg (100%) rename gns3server/symbols/{ => classic}/docker_guest.svg (100%) rename gns3server/symbols/{ => classic}/dslam.svg (100%) rename gns3server/symbols/{ => classic}/edge_label_switch_router.svg (100%) rename gns3server/symbols/{ => classic}/ethernet_switch.svg (100%) rename gns3server/symbols/{ => classic}/firewall.svg (100%) rename gns3server/symbols/{ => classic}/frame_relay_switch.svg (100%) rename gns3server/symbols/{ => classic}/gateway.svg (100%) rename gns3server/symbols/{ => classic}/hub.svg (100%) rename gns3server/symbols/{ => classic}/ids.svg (100%) rename gns3server/symbols/{ => classic}/iosv_l2_virl.svg (100%) rename gns3server/symbols/{ => classic}/iosv_virl.svg (100%) rename gns3server/symbols/{ => classic}/ip_phone.svg (100%) rename gns3server/symbols/{ => classic}/label_switch_router.svg (100%) rename gns3server/symbols/{ => classic}/lightweight_ap.svg (100%) rename gns3server/symbols/{ => classic}/multilayer_switch.svg (100%) rename gns3server/symbols/{ => classic}/optical_router.svg (100%) rename gns3server/symbols/{ => classic}/printer.svg (100%) rename gns3server/symbols/{ => classic}/qemu_guest.svg (100%) rename gns3server/symbols/{ => classic}/route_switch_processor.svg (100%) rename gns3server/symbols/{ => classic}/router.awp.svg (100%) rename gns3server/symbols/{ => classic}/router.svg (100%) rename gns3server/symbols/{ => classic}/router_firewall.svg (100%) rename gns3server/symbols/{ => classic}/router_netflow.svg (100%) rename gns3server/symbols/{ => classic}/server.svg (100%) rename gns3server/symbols/{ => classic}/sip_server.svg (100%) rename gns3server/symbols/{ => classic}/traceng.svg (100%) rename gns3server/symbols/{ => classic}/vbox_guest.svg (100%) rename gns3server/symbols/{ => classic}/vmware_guest.svg (100%) rename gns3server/symbols/{ => classic}/voice_access_server.svg (100%) rename gns3server/symbols/{ => classic}/voice_router.svg (100%) rename gns3server/symbols/{ => classic}/vpcs_guest.svg (100%) rename gns3server/symbols/{ => classic}/wlan_controller.svg (100%) diff --git a/gns3server/controller/gns3vm/__init__.py b/gns3server/controller/gns3vm/__init__.py index 6ed9c3a1..c5fd1d69 100644 --- a/gns3server/controller/gns3vm/__init__.py +++ b/gns3server/controller/gns3vm/__init__.py @@ -312,10 +312,10 @@ class GNS3VM: engine.vcpus = self._settings["vcpus"] engine.headless = self._settings["headless"] compute = await self._controller.add_compute(compute_id="vm", - name="GNS3 VM is starting ({})".format(engine.vmname), - host=None, - force=True, - connect=False) + name="GNS3 VM is starting ({})".format(engine.vmname), + host=None, + force=True, + connect=False) try: await engine.start() @@ -363,8 +363,11 @@ class GNS3VM: if netmask: compute_network = ipaddress.ip_interface("{}/{}".format(compute.host_ip, netmask)).network if vm_network.compare_networks(compute_network) != 0: - msg = "The GNS3 VM ({}) is not on the same network as the {} server ({}), please make sure the local server binding is in the same network as the GNS3 VM".format( - vm_network, compute_id, compute_network) + msg = "The GNS3 VM (IP={}, NETWORK={}) is not on the same network as the {} server (IP={}, NETWORK={}), please make sure the local server binding is in the same network as the GNS3 VM".format(self.ip_address, + vm_network, + compute_id, + compute.host_ip, + compute_network) self._controller.notification.controller_emit("log.warning", {"message": msg}) except ComputeError as e: log.warning("Could not check the VM is in the same subnet as the local server: {}".format(e)) diff --git a/gns3server/controller/symbol_themes.py b/gns3server/controller/symbol_themes.py new file mode 100644 index 00000000..b055fff2 --- /dev/null +++ b/gns3server/controller/symbol_themes.py @@ -0,0 +1,130 @@ +#!/usr/bin/env python +# +# Copyright (C) 2018 GNS3 Technologies Inc. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + + +CLASSIC_SYMBOL_THEME = {"cloud": ":/symbols/classic/cloud.svg", + "ethernet_switch": ":/symbols/classic/ethernet_switch.svg", + "ethernet_hub": ":/symbols/classic/hub.svg", + "frame_relay_switch": ":/symbols/classic/frame_relay_switch.svg", + "atm_switch": ":/symbols/classic/atm_switch.svg", + "router": ":/symbols/classic/router.svg", + "multilayer_switch": ":/symbols/classic/multilayer_switch.svg", + "firewall": ":/symbols/classic/firewall.svg", + "computer": ":/symbols/classic/computer.svg", + "vpcs_guest": ":/symbols/classic/vpcs_guest.svg", + "qemu_guest": ":/symbols/classic/qemu_guest.svg", + "vbox_guest": ":/symbols/classic/vbox_guest.svg", + "vmware_guest": ":/symbols/classic/vmware_guest.svg", + "docker_guest": ":/symbols/classic/docker_guest.svg"} + +INFINITY_SQUARE_BLUE_SYMBOL_THEME = {"cloud": ":/symbols/affinity/square/blue/cloud.svg", + "ethernet_switch": ":/symbols/affinity/square/blue/switch.svg", + "ethernet_hub": ":/symbols/affinity/square/blue/hub.svg", + "frame_relay_switch.svg": ":/symbols/affinity/square/blue/isdn.svg", + "atm_switch": ":/symbols/affinity/square/blue/atm.svg", + "router": ":/symbols/affinity/square/blue/router.svg", + "multilayer_switch": ":/symbols/affinity/square/blue/multilayer_switch.svg", + "firewall": ":/symbols/affinity/square/blue/firewall3.svg", + "computer": ":/symbols/affinity/square/blue/client.svg", + "vpcs_guest": ":/symbols/affinity/square/blue/client.svg", + "qemu_guest": ":/symbols/affinity/square/blue/client_vm.svg", + "vbox_guest": ":/symbols/affinity/square/blue/virtualbox.svg", + "vmware_guest": ":/symbols/affinity/square/blue/vmware.svg", + "docker_guest": ":/symbols/affinity/square/blue/docker.svg"} + +INFINITY_SQUARE_RED_SYMBOL_THEME = {"cloud": ":/symbols/affinity/square/red/cloud.svg", + "ethernet_switch": ":/symbols/affinity/square/red/switch.svg", + "ethernet_hub": ":/symbols/affinity/square/red/hub.svg", + "frame_relay_switch": ":/symbols/affinity/square/red/isdn.svg", + "atm_switch": ":/symbols/affinity/square/red/atm.svg", + "router": ":/symbols/affinity/square/red/router.svg", + "multilayer_switch": ":/symbols/affinity/square/red/multilayer_switch.svg", + "firewall": ":/symbols/affinity/square/red/firewall3.svg", + "computer": ":/symbols/affinity/square/red/client.svg", + "vpcs_guest": ":/symbols/affinity/square/red/client.svg", + "qemu_guest": ":/symbols/affinity/square/red/client_vm.svg", + "vbox_guest": ":/symbols/affinity/square/red/virtualbox.svg", + "vmware_guest": ":/symbols/affinity/square/red/vmware.svg", + "docker_guest": ":/symbols/affinity/square/red/docker.svg"} + +INFINITY_SQUARE_GRAY_SYMBOL_THEME = {"cloud": ":/symbols/affinity/square/gray/cloud.svg", + "ethernet_switch": ":/symbols/affinity/square/gray/switch.svg", + "ethernet_hub": ":/symbols/affinity/square/gray/hub.svg", + "frame_relay_switch": ":/symbols/affinity/square/gray/isdn.svg", + "atm_switch": ":/symbols/affinity/square/gray/atm.svg", + "router": ":/symbols/affinity/square/gray/router.svg", + "multilayer_switch": ":/symbols/affinity/square/gray/multilayer_switch.svg", + "firewall": ":/symbols/affinity/square/gray/firewall3.svg", + "computer": ":/symbols/affinity/square/gray/client.svg", + "vpcs_guest": ":/symbols/affinity/square/gray/client.svg", + "qemu_guest": ":/symbols/affinity/square/gray/client_vm.svg", + "vbox_guest": ":/symbols/affinity/square/gray/virtualbox.svg", + "vmware_guest": ":/symbols/affinity/square/gray/vmware.svg", + "docker_guest": ":/symbols/affinity/square/gray/docker.svg"} + +INFINITY_CIRCLE_BLUE_SYMBOL_THEME = {"cloud": ":/symbols/affinity/circle/blue/cloud.svg", + "ethernet_switch": ":/symbols/affinity/circle/blue/switch.svg", + "ethernet_hub": ":/symbols/affinity/circle/blue/hub.svg", + "frame_relay_switch": ":/symbols/affinity/circle/blue/isdn.svg", + "atm_switch": ":/symbols/affinity/circle/blue/atm.svg", + "router": ":/symbols/affinity/circle/blue/router.svg", + "multilayer_switch": ":/symbols/affinity/circle/blue/multilayer_switch.svg", + "firewall": ":/symbols/affinity/circle/blue/firewall3.svg", + "computer": ":/symbols/affinity/circle/blue/client.svg", + "vpcs_guest": ":/symbols/affinity/circle/blue/client.svg", + "qemu_guest": ":/symbols/affinity/circle/blue/client_vm.svg", + "vbox_guest": ":/symbols/affinity/circle/blue/virtualbox.svg", + "vmware_guest": ":/symbols/affinity/circle/blue/vmware.svg", + "docker_guest": ":/symbols/affinity/circle/blue/docker.svg"} + +INFINITY_CIRCLE_RED_SYMBOL_THEME = {"cloud": ":/symbols/affinity/circle/red/cloud.svg", + "ethernet_switch": ":/symbols/affinity/circle/red/switch.svg", + "ethernet_hub": ":/symbols/affinity/circle/red/hub.svg", + "frame_relay_switch": ":/symbols/affinity/circle/red/isdn.svg", + "atm_switch": ":/symbols/affinity/circle/red/atm.svg", + "router": ":/symbols/affinity/circle/red/router.svg", + "multilayer_switch": ":/symbols/affinity/circle/red/multilayer_switch.svg", + "firewall": ":/symbols/affinity/circle/red/firewall3.svg", + "computer": ":/symbols/affinity/circle/red/client.svg", + "vpcs_guest": ":/symbols/affinity/circle/red/client.svg", + "qemu_guest": ":/symbols/affinity/circle/red/client_vm.svg", + "vbox_guest": ":/symbols/affinity/circle/red/virtualbox.svg", + "vmware_guest": ":/symbols/affinity/circle/red/vmware.svg", + "docker_guest": ":/symbols/affinity/circle/red/docker.svg"} + +INFINITY_CIRCLE_GRAY_SYMBOL_THEME = {"cloud": ":/symbols/affinity/circle/gray/cloud.svg", + "ethernet_switch": ":/symbols/affinity/circle/gray/switch.svg", + "ethernet_hub": ":/symbols/affinity/circle/gray/hub.svg", + "frame_relay_switch": ":/symbols/affinity/circle/gray/isdn.svg", + "atm_switch": ":/symbols/affinity/circle/gray/atm.svg", + "router": ":/symbols/affinity/circle/gray/router.svg", + "multilayer_switch": ":/symbols/affinity/circle/gray/multilayer_switch.svg", + "firewall": ":/symbols/affinity/circle/gray/firewall3.svg", + "computer": ":/symbols/affinity/circle/gray/client.svg", + "vpcs_guest": ":/symbols/affinity/circle/gray/client.svg", + "qemu_guest": ":/symbols/affinity/circle/gray/client_vm.svg", + "vbox_guest": ":/symbols/affinity/circle/gray/virtualbox.svg", + "vmware_guest": ":/symbols/affinity/circle/gray/vmware.svg", + "docker_guest": ":/symbols/affinity/circle/gray/docker.svg"} + +BUILTIN_SYMBOL_THEMES = {"Classic": CLASSIC_SYMBOL_THEME, + "Infinity-square-blue": INFINITY_SQUARE_BLUE_SYMBOL_THEME, + "Infinity-square-red": INFINITY_SQUARE_RED_SYMBOL_THEME, + "Infinity-square-gray": INFINITY_SQUARE_GRAY_SYMBOL_THEME, + "Infinity-circle-blue": INFINITY_CIRCLE_BLUE_SYMBOL_THEME, + "Infinity-circle-red": INFINITY_CIRCLE_RED_SYMBOL_THEME, + "Infinity-circle-gray": INFINITY_CIRCLE_GRAY_SYMBOL_THEME} diff --git a/gns3server/controller/symbols.py b/gns3server/controller/symbols.py index 6189ea0a..d325357a 100644 --- a/gns3server/controller/symbols.py +++ b/gns3server/controller/symbols.py @@ -17,7 +17,7 @@ import os - +from .symbol_themes import BUILTIN_SYMBOL_THEMES from ..utils.get_resource import get_resource from ..utils.picture import get_size from ..config import Config @@ -32,14 +32,32 @@ class Symbols: """ def __init__(self): + try: self.list() - except OSError: # The error will be raised and forward later + except OSError: # The error will be raised and forwarded later pass + # Keep a cache of symbols size self._symbol_size_cache = {} + self._current_theme = "Infinity-square-gray" + self._themes = BUILTIN_SYMBOL_THEMES + + @property + def theme(self): + + return self._current_theme + + @theme.setter + def theme(self, theme): + + if not self._themes.get(theme): + log.error("Could not find symbol theme '{}'".format(theme)) + return + self._current_theme = theme def list(self): + self._symbols_path = {} symbols = [] if get_resource("symbols"): @@ -49,11 +67,9 @@ class Symbols: continue symbol_file = os.path.relpath(os.path.join(root, filename), get_resource("symbols")) symbol_id = ':/symbols/' + symbol_file - symbols.append({ - 'symbol_id': symbol_id, - 'filename': symbol_file, - 'builtin': True, - }) + symbols.append({'symbol_id': symbol_id, + 'filename': symbol_file, + 'builtin': True}) self._symbols_path[symbol_id] = os.path.join(root, filename) directory = self.symbols_path() @@ -63,11 +79,9 @@ class Symbols: if filename.startswith('.'): continue symbol_file = os.path.relpath(os.path.join(root, filename), directory) - symbols.append({ - 'symbol_id': symbol_file, - 'filename': symbol_file, - 'builtin': False, - }) + symbols.append({'symbol_id': symbol_file, + 'filename': symbol_file, + 'builtin': False,}) self._symbols_path[symbol_file] = os.path.join(root, filename) symbols.sort(key=lambda x: x["filename"]) @@ -84,17 +98,21 @@ class Symbols: return directory def get_path(self, symbol_id): + symbol_filename = os.path.splitext(os.path.basename(symbol_id))[0] + theme = self._themes.get(self._current_theme, {}) + if not theme: + log.error("Could not find symbol theme '{}'".format(self._current_theme)) try: - return self._symbols_path[symbol_id] - # Symbol not found, let's refresh the cache + return self._symbols_path[theme.get(symbol_filename, symbol_id)] except KeyError: + # Symbol not found, let's refresh the cache try: self.list() return self._symbols_path[symbol_id] except (OSError, KeyError): log.warning("Could not retrieve symbol '{}'".format(symbol_id)) symbols_path = self._symbols_path - return symbols_path[":/symbols/computer.svg"] + return symbols_path.get(":/symbols/classic/{}".format(os.path.basename(symbol_id)), symbols_path[":/symbols/classic/computer.svg"]) def get_size(self, symbol_id): try: diff --git a/gns3server/handlers/api/controller/symbol_handler.py b/gns3server/handlers/api/controller/symbol_handler.py index 8910e068..e3f7ac29 100644 --- a/gns3server/handlers/api/controller/symbol_handler.py +++ b/gns3server/handlers/api/controller/symbol_handler.py @@ -28,7 +28,9 @@ log = logging.getLogger(__name__) class SymbolHandler: - """API entry points for symbols management.""" + """ + API entry points for symbols management. + """ @Route.get( r"/symbols", @@ -81,3 +83,19 @@ class SymbolHandler: # Reset the symbol list controller.symbols.list() response.set_status(204) + + # @Route.post( + # r"/symbol_theme", + # description="Create a new symbol theme", + # status_codes={ + # 201: "Appliance created", + # 400: "Invalid request" + # }, + # input=APPLIANCE_CREATE_SCHEMA, + # output=APPLIANCE_OBJECT_SCHEMA) + # def create(request, response): + # + # controller = Controller.instance() + # appliance = controller.add_appliance(request.json) + # response.set_status(201) + # response.json(appliance) \ No newline at end of file diff --git a/gns3server/symbols/affinity/circle/blue/atm.svg b/gns3server/symbols/affinity/circle/blue/atm.svg new file mode 100644 index 00000000..987755e8 --- /dev/null +++ b/gns3server/symbols/affinity/circle/blue/atm.svg @@ -0,0 +1,60 @@ + +image/svg+xml \ No newline at end of file diff --git a/gns3server/symbols/affinity/circle/blue/c_camera_blue.svg b/gns3server/symbols/affinity/circle/blue/camera.svg similarity index 100% rename from gns3server/symbols/affinity/circle/blue/c_camera_blue.svg rename to gns3server/symbols/affinity/circle/blue/camera.svg diff --git a/gns3server/symbols/affinity/circle/blue/c_camera_dome_blue.svg b/gns3server/symbols/affinity/circle/blue/camera_dome.svg similarity index 100% rename from gns3server/symbols/affinity/circle/blue/c_camera_dome_blue.svg rename to gns3server/symbols/affinity/circle/blue/camera_dome.svg diff --git a/gns3server/symbols/affinity/circle/blue/circle.svg b/gns3server/symbols/affinity/circle/blue/circle.svg new file mode 100644 index 00000000..83eb7ea8 --- /dev/null +++ b/gns3server/symbols/affinity/circle/blue/circle.svg @@ -0,0 +1,53 @@ + +image/svg+xml \ No newline at end of file diff --git a/gns3server/symbols/affinity/circle/blue/c_client_blue.svg b/gns3server/symbols/affinity/circle/blue/client.svg similarity index 100% rename from gns3server/symbols/affinity/circle/blue/c_client_blue.svg rename to gns3server/symbols/affinity/circle/blue/client.svg diff --git a/gns3server/symbols/affinity/circle/blue/c_client_vm_blue.svg b/gns3server/symbols/affinity/circle/blue/client_vm.svg similarity index 100% rename from gns3server/symbols/affinity/circle/blue/c_client_vm_blue.svg rename to gns3server/symbols/affinity/circle/blue/client_vm.svg diff --git a/gns3server/symbols/affinity/circle/blue/c_cloud_blue.svg b/gns3server/symbols/affinity/circle/blue/cloud.svg similarity index 100% rename from gns3server/symbols/affinity/circle/blue/c_cloud_blue.svg rename to gns3server/symbols/affinity/circle/blue/cloud.svg diff --git a/gns3server/symbols/affinity/circle/blue/c_cog_blue.svg b/gns3server/symbols/affinity/circle/blue/cog.svg similarity index 100% rename from gns3server/symbols/affinity/circle/blue/c_cog_blue.svg rename to gns3server/symbols/affinity/circle/blue/cog.svg diff --git a/gns3server/symbols/affinity/circle/blue/c_communications_blue.svg b/gns3server/symbols/affinity/circle/blue/communications.svg similarity index 100% rename from gns3server/symbols/affinity/circle/blue/c_communications_blue.svg rename to gns3server/symbols/affinity/circle/blue/communications.svg diff --git a/gns3server/symbols/affinity/circle/blue/c_conversation_blue.svg b/gns3server/symbols/affinity/circle/blue/conversation.svg similarity index 100% rename from gns3server/symbols/affinity/circle/blue/c_conversation_blue.svg rename to gns3server/symbols/affinity/circle/blue/conversation.svg diff --git a/gns3server/symbols/affinity/circle/blue/docker.svg b/gns3server/symbols/affinity/circle/blue/docker.svg new file mode 100644 index 00000000..0d52c377 --- /dev/null +++ b/gns3server/symbols/affinity/circle/blue/docker.svg @@ -0,0 +1,118 @@ + +image/svg+xml \ No newline at end of file diff --git a/gns3server/symbols/affinity/circle/blue/c_dslam_blue.svg b/gns3server/symbols/affinity/circle/blue/dslam.svg similarity index 100% rename from gns3server/symbols/affinity/circle/blue/c_dslam_blue.svg rename to gns3server/symbols/affinity/circle/blue/dslam.svg diff --git a/gns3server/symbols/affinity/circle/blue/c_fingerprint_blue.svg b/gns3server/symbols/affinity/circle/blue/fingerprint.svg similarity index 100% rename from gns3server/symbols/affinity/circle/blue/c_fingerprint_blue.svg rename to gns3server/symbols/affinity/circle/blue/fingerprint.svg diff --git a/gns3server/symbols/affinity/circle/blue/c_firewall_blue.svg b/gns3server/symbols/affinity/circle/blue/firewall.svg similarity index 100% rename from gns3server/symbols/affinity/circle/blue/c_firewall_blue.svg rename to gns3server/symbols/affinity/circle/blue/firewall.svg diff --git a/gns3server/symbols/affinity/circle/blue/c_firewall3_blue.svg b/gns3server/symbols/affinity/circle/blue/firewall3.svg similarity index 100% rename from gns3server/symbols/affinity/circle/blue/c_firewall3_blue.svg rename to gns3server/symbols/affinity/circle/blue/firewall3.svg diff --git a/gns3server/symbols/affinity/circle/blue/c_grid_blue.svg b/gns3server/symbols/affinity/circle/blue/grid.svg similarity index 100% rename from gns3server/symbols/affinity/circle/blue/c_grid_blue.svg rename to gns3server/symbols/affinity/circle/blue/grid.svg diff --git a/gns3server/symbols/affinity/circle/blue/c_grid2_blue.svg b/gns3server/symbols/affinity/circle/blue/grid2.svg similarity index 100% rename from gns3server/symbols/affinity/circle/blue/c_grid2_blue.svg rename to gns3server/symbols/affinity/circle/blue/grid2.svg diff --git a/gns3server/symbols/affinity/circle/blue/c_hub_blue.svg b/gns3server/symbols/affinity/circle/blue/hub.svg similarity index 100% rename from gns3server/symbols/affinity/circle/blue/c_hub_blue.svg rename to gns3server/symbols/affinity/circle/blue/hub.svg diff --git a/gns3server/symbols/affinity/circle/blue/c_inspect_blue.svg b/gns3server/symbols/affinity/circle/blue/inspect.svg similarity index 100% rename from gns3server/symbols/affinity/circle/blue/c_inspect_blue.svg rename to gns3server/symbols/affinity/circle/blue/inspect.svg diff --git a/gns3server/symbols/affinity/circle/blue/c_inspect3_blue.svg b/gns3server/symbols/affinity/circle/blue/inspect3.svg similarity index 100% rename from gns3server/symbols/affinity/circle/blue/c_inspect3_blue.svg rename to gns3server/symbols/affinity/circle/blue/inspect3.svg diff --git a/gns3server/symbols/affinity/circle/blue/c_interconnect_blue.svg b/gns3server/symbols/affinity/circle/blue/interconnect.svg similarity index 100% rename from gns3server/symbols/affinity/circle/blue/c_interconnect_blue.svg rename to gns3server/symbols/affinity/circle/blue/interconnect.svg diff --git a/gns3server/symbols/affinity/circle/blue/c_isdn_blue.svg b/gns3server/symbols/affinity/circle/blue/isdn.svg similarity index 100% rename from gns3server/symbols/affinity/circle/blue/c_isdn_blue.svg rename to gns3server/symbols/affinity/circle/blue/isdn.svg diff --git a/gns3server/symbols/affinity/circle/blue/c_ldap_blue.svg b/gns3server/symbols/affinity/circle/blue/ldap.svg similarity index 100% rename from gns3server/symbols/affinity/circle/blue/c_ldap_blue.svg rename to gns3server/symbols/affinity/circle/blue/ldap.svg diff --git a/gns3server/symbols/affinity/circle/blue/c_light_bulb_blue.svg b/gns3server/symbols/affinity/circle/blue/light_bulb.svg similarity index 100% rename from gns3server/symbols/affinity/circle/blue/c_light_bulb_blue.svg rename to gns3server/symbols/affinity/circle/blue/light_bulb.svg diff --git a/gns3server/symbols/affinity/circle/blue/c_link_blue.svg b/gns3server/symbols/affinity/circle/blue/link.svg similarity index 100% rename from gns3server/symbols/affinity/circle/blue/c_link_blue.svg rename to gns3server/symbols/affinity/circle/blue/link.svg diff --git a/gns3server/symbols/affinity/circle/blue/c_loadbalancer_blue.svg b/gns3server/symbols/affinity/circle/blue/loadbalancer.svg similarity index 100% rename from gns3server/symbols/affinity/circle/blue/c_loadbalancer_blue.svg rename to gns3server/symbols/affinity/circle/blue/loadbalancer.svg diff --git a/gns3server/symbols/affinity/circle/blue/c_switch_multilayer_blue.svg b/gns3server/symbols/affinity/circle/blue/multilayer_switch.svg similarity index 100% rename from gns3server/symbols/affinity/circle/blue/c_switch_multilayer_blue.svg rename to gns3server/symbols/affinity/circle/blue/multilayer_switch.svg diff --git a/gns3server/symbols/affinity/circle/blue/c_nas_blue.svg b/gns3server/symbols/affinity/circle/blue/nas.svg similarity index 100% rename from gns3server/symbols/affinity/circle/blue/c_nas_blue.svg rename to gns3server/symbols/affinity/circle/blue/nas.svg diff --git a/gns3server/symbols/affinity/circle/blue/c_pinpoint_blue.svg b/gns3server/symbols/affinity/circle/blue/pinpoint.svg similarity index 100% rename from gns3server/symbols/affinity/circle/blue/c_pinpoint_blue.svg rename to gns3server/symbols/affinity/circle/blue/pinpoint.svg diff --git a/gns3server/symbols/affinity/circle/blue/c_printer_blue.svg b/gns3server/symbols/affinity/circle/blue/printer.svg similarity index 100% rename from gns3server/symbols/affinity/circle/blue/c_printer_blue.svg rename to gns3server/symbols/affinity/circle/blue/printer.svg diff --git a/gns3server/symbols/affinity/circle/blue/c_rj45_blue.svg b/gns3server/symbols/affinity/circle/blue/rj45.svg similarity index 100% rename from gns3server/symbols/affinity/circle/blue/c_rj45_blue.svg rename to gns3server/symbols/affinity/circle/blue/rj45.svg diff --git a/gns3server/symbols/affinity/circle/blue/c_router_blue.svg b/gns3server/symbols/affinity/circle/blue/router.svg similarity index 100% rename from gns3server/symbols/affinity/circle/blue/c_router_blue.svg rename to gns3server/symbols/affinity/circle/blue/router.svg diff --git a/gns3server/symbols/affinity/circle/blue/c_router_cloud_blue.svg b/gns3server/symbols/affinity/circle/blue/router_cloud.svg similarity index 100% rename from gns3server/symbols/affinity/circle/blue/c_router_cloud_blue.svg rename to gns3server/symbols/affinity/circle/blue/router_cloud.svg diff --git a/gns3server/symbols/affinity/circle/blue/c_satellite_blue.svg b/gns3server/symbols/affinity/circle/blue/satellite.svg similarity index 100% rename from gns3server/symbols/affinity/circle/blue/c_satellite_blue.svg rename to gns3server/symbols/affinity/circle/blue/satellite.svg diff --git a/gns3server/symbols/affinity/circle/blue/c_satellite_dish_blue.svg b/gns3server/symbols/affinity/circle/blue/satellite_dish.svg similarity index 100% rename from gns3server/symbols/affinity/circle/blue/c_satellite_dish_blue.svg rename to gns3server/symbols/affinity/circle/blue/satellite_dish.svg diff --git a/gns3server/symbols/affinity/circle/blue/c_scull_blue.svg b/gns3server/symbols/affinity/circle/blue/scull.svg similarity index 100% rename from gns3server/symbols/affinity/circle/blue/c_scull_blue.svg rename to gns3server/symbols/affinity/circle/blue/scull.svg diff --git a/gns3server/symbols/affinity/circle/blue/c_server-cluster_blue.svg b/gns3server/symbols/affinity/circle/blue/server-cluster.svg similarity index 100% rename from gns3server/symbols/affinity/circle/blue/c_server-cluster_blue.svg rename to gns3server/symbols/affinity/circle/blue/server-cluster.svg diff --git a/gns3server/symbols/affinity/circle/blue/c_server_blue.svg b/gns3server/symbols/affinity/circle/blue/server.svg similarity index 100% rename from gns3server/symbols/affinity/circle/blue/c_server_blue.svg rename to gns3server/symbols/affinity/circle/blue/server.svg diff --git a/gns3server/symbols/affinity/circle/blue/c_statistics_blue.svg b/gns3server/symbols/affinity/circle/blue/statistics.svg similarity index 100% rename from gns3server/symbols/affinity/circle/blue/c_statistics_blue.svg rename to gns3server/symbols/affinity/circle/blue/statistics.svg diff --git a/gns3server/symbols/affinity/circle/blue/c_storage_blue.svg b/gns3server/symbols/affinity/circle/blue/storage.svg similarity index 100% rename from gns3server/symbols/affinity/circle/blue/c_storage_blue.svg rename to gns3server/symbols/affinity/circle/blue/storage.svg diff --git a/gns3server/symbols/affinity/circle/blue/c_switch_blue.svg b/gns3server/symbols/affinity/circle/blue/switch.svg similarity index 100% rename from gns3server/symbols/affinity/circle/blue/c_switch_blue.svg rename to gns3server/symbols/affinity/circle/blue/switch.svg diff --git a/gns3server/symbols/affinity/circle/blue/c_tablet_blue.svg b/gns3server/symbols/affinity/circle/blue/tablet.svg similarity index 100% rename from gns3server/symbols/affinity/circle/blue/c_tablet_blue.svg rename to gns3server/symbols/affinity/circle/blue/tablet.svg diff --git a/gns3server/symbols/affinity/circle/blue/c_tree_blue.svg b/gns3server/symbols/affinity/circle/blue/tree.svg similarity index 100% rename from gns3server/symbols/affinity/circle/blue/c_tree_blue.svg rename to gns3server/symbols/affinity/circle/blue/tree.svg diff --git a/gns3server/symbols/affinity/circle/blue/c_user_blue.svg b/gns3server/symbols/affinity/circle/blue/user.svg similarity index 100% rename from gns3server/symbols/affinity/circle/blue/c_user_blue.svg rename to gns3server/symbols/affinity/circle/blue/user.svg diff --git a/gns3server/symbols/affinity/circle/blue/virtualbox.svg b/gns3server/symbols/affinity/circle/blue/virtualbox.svg new file mode 100644 index 00000000..affed969 --- /dev/null +++ b/gns3server/symbols/affinity/circle/blue/virtualbox.svg @@ -0,0 +1,60 @@ + +image/svg+xml \ No newline at end of file diff --git a/gns3server/symbols/affinity/circle/blue/c_vm_blue.svg b/gns3server/symbols/affinity/circle/blue/vm.svg similarity index 100% rename from gns3server/symbols/affinity/circle/blue/c_vm_blue.svg rename to gns3server/symbols/affinity/circle/blue/vm.svg diff --git a/gns3server/symbols/affinity/circle/blue/vmware.svg b/gns3server/symbols/affinity/circle/blue/vmware.svg new file mode 100644 index 00000000..9a03cca6 --- /dev/null +++ b/gns3server/symbols/affinity/circle/blue/vmware.svg @@ -0,0 +1,61 @@ + +image/svg+xml \ No newline at end of file diff --git a/gns3server/symbols/affinity/circle/blue/c_wifi_blue.svg b/gns3server/symbols/affinity/circle/blue/wifi.svg similarity index 100% rename from gns3server/symbols/affinity/circle/blue/c_wifi_blue.svg rename to gns3server/symbols/affinity/circle/blue/wifi.svg diff --git a/gns3server/symbols/affinity/circle/blue/c_wlc_blue.svg b/gns3server/symbols/affinity/circle/blue/wlc.svg similarity index 100% rename from gns3server/symbols/affinity/circle/blue/c_wlc_blue.svg rename to gns3server/symbols/affinity/circle/blue/wlc.svg diff --git a/gns3server/symbols/affinity/circle/blue/c_xml_blue.svg b/gns3server/symbols/affinity/circle/blue/xml.svg similarity index 100% rename from gns3server/symbols/affinity/circle/blue/c_xml_blue.svg rename to gns3server/symbols/affinity/circle/blue/xml.svg diff --git a/gns3server/symbols/affinity/circle/gray/atm.svg b/gns3server/symbols/affinity/circle/gray/atm.svg new file mode 100644 index 00000000..5de13e55 --- /dev/null +++ b/gns3server/symbols/affinity/circle/gray/atm.svg @@ -0,0 +1,60 @@ + +image/svg+xml \ No newline at end of file diff --git a/gns3server/symbols/affinity/circle/gray/c_camera.svg b/gns3server/symbols/affinity/circle/gray/camera.svg similarity index 100% rename from gns3server/symbols/affinity/circle/gray/c_camera.svg rename to gns3server/symbols/affinity/circle/gray/camera.svg diff --git a/gns3server/symbols/affinity/circle/gray/c_camera_dome.svg b/gns3server/symbols/affinity/circle/gray/camera_dome.svg similarity index 100% rename from gns3server/symbols/affinity/circle/gray/c_camera_dome.svg rename to gns3server/symbols/affinity/circle/gray/camera_dome.svg diff --git a/gns3server/symbols/affinity/circle/gray/circle.svg b/gns3server/symbols/affinity/circle/gray/circle.svg new file mode 100644 index 00000000..cd8da99d --- /dev/null +++ b/gns3server/symbols/affinity/circle/gray/circle.svg @@ -0,0 +1,53 @@ + +image/svg+xml \ No newline at end of file diff --git a/gns3server/symbols/affinity/circle/gray/c_client.svg b/gns3server/symbols/affinity/circle/gray/client.svg similarity index 100% rename from gns3server/symbols/affinity/circle/gray/c_client.svg rename to gns3server/symbols/affinity/circle/gray/client.svg diff --git a/gns3server/symbols/affinity/circle/gray/c_client_vm.svg b/gns3server/symbols/affinity/circle/gray/client_vm.svg similarity index 100% rename from gns3server/symbols/affinity/circle/gray/c_client_vm.svg rename to gns3server/symbols/affinity/circle/gray/client_vm.svg diff --git a/gns3server/symbols/affinity/circle/gray/c_cloud.svg b/gns3server/symbols/affinity/circle/gray/cloud.svg similarity index 100% rename from gns3server/symbols/affinity/circle/gray/c_cloud.svg rename to gns3server/symbols/affinity/circle/gray/cloud.svg diff --git a/gns3server/symbols/affinity/circle/gray/c_cog.svg b/gns3server/symbols/affinity/circle/gray/cog.svg similarity index 100% rename from gns3server/symbols/affinity/circle/gray/c_cog.svg rename to gns3server/symbols/affinity/circle/gray/cog.svg diff --git a/gns3server/symbols/affinity/circle/gray/c_communications.svg b/gns3server/symbols/affinity/circle/gray/communications.svg similarity index 100% rename from gns3server/symbols/affinity/circle/gray/c_communications.svg rename to gns3server/symbols/affinity/circle/gray/communications.svg diff --git a/gns3server/symbols/affinity/circle/gray/c_conversation.svg b/gns3server/symbols/affinity/circle/gray/conversation.svg similarity index 100% rename from gns3server/symbols/affinity/circle/gray/c_conversation.svg rename to gns3server/symbols/affinity/circle/gray/conversation.svg diff --git a/gns3server/symbols/affinity/circle/gray/docker.svg b/gns3server/symbols/affinity/circle/gray/docker.svg new file mode 100644 index 00000000..d1e21132 --- /dev/null +++ b/gns3server/symbols/affinity/circle/gray/docker.svg @@ -0,0 +1,118 @@ + +image/svg+xml \ No newline at end of file diff --git a/gns3server/symbols/affinity/circle/gray/c_dslam.svg b/gns3server/symbols/affinity/circle/gray/dslam.svg similarity index 100% rename from gns3server/symbols/affinity/circle/gray/c_dslam.svg rename to gns3server/symbols/affinity/circle/gray/dslam.svg diff --git a/gns3server/symbols/affinity/circle/gray/c_fingerprint.svg b/gns3server/symbols/affinity/circle/gray/fingerprint.svg similarity index 100% rename from gns3server/symbols/affinity/circle/gray/c_fingerprint.svg rename to gns3server/symbols/affinity/circle/gray/fingerprint.svg diff --git a/gns3server/symbols/affinity/circle/gray/c_firewall.svg b/gns3server/symbols/affinity/circle/gray/firewall.svg similarity index 100% rename from gns3server/symbols/affinity/circle/gray/c_firewall.svg rename to gns3server/symbols/affinity/circle/gray/firewall.svg diff --git a/gns3server/symbols/affinity/circle/gray/c_firewall3.svg b/gns3server/symbols/affinity/circle/gray/firewall3.svg similarity index 100% rename from gns3server/symbols/affinity/circle/gray/c_firewall3.svg rename to gns3server/symbols/affinity/circle/gray/firewall3.svg diff --git a/gns3server/symbols/affinity/circle/gray/c_grid.svg b/gns3server/symbols/affinity/circle/gray/grid.svg similarity index 100% rename from gns3server/symbols/affinity/circle/gray/c_grid.svg rename to gns3server/symbols/affinity/circle/gray/grid.svg diff --git a/gns3server/symbols/affinity/circle/gray/c_grid2.svg b/gns3server/symbols/affinity/circle/gray/grid2.svg similarity index 100% rename from gns3server/symbols/affinity/circle/gray/c_grid2.svg rename to gns3server/symbols/affinity/circle/gray/grid2.svg diff --git a/gns3server/symbols/affinity/circle/gray/c_hub.svg b/gns3server/symbols/affinity/circle/gray/hub.svg similarity index 100% rename from gns3server/symbols/affinity/circle/gray/c_hub.svg rename to gns3server/symbols/affinity/circle/gray/hub.svg diff --git a/gns3server/symbols/affinity/circle/gray/c_inspect.svg b/gns3server/symbols/affinity/circle/gray/inspect.svg similarity index 100% rename from gns3server/symbols/affinity/circle/gray/c_inspect.svg rename to gns3server/symbols/affinity/circle/gray/inspect.svg diff --git a/gns3server/symbols/affinity/circle/gray/c_inspect3.svg b/gns3server/symbols/affinity/circle/gray/inspect3.svg similarity index 100% rename from gns3server/symbols/affinity/circle/gray/c_inspect3.svg rename to gns3server/symbols/affinity/circle/gray/inspect3.svg diff --git a/gns3server/symbols/affinity/circle/gray/c_interconnect.svg b/gns3server/symbols/affinity/circle/gray/interconnect.svg similarity index 100% rename from gns3server/symbols/affinity/circle/gray/c_interconnect.svg rename to gns3server/symbols/affinity/circle/gray/interconnect.svg diff --git a/gns3server/symbols/affinity/circle/gray/c_isdn.svg b/gns3server/symbols/affinity/circle/gray/isdn.svg similarity index 100% rename from gns3server/symbols/affinity/circle/gray/c_isdn.svg rename to gns3server/symbols/affinity/circle/gray/isdn.svg diff --git a/gns3server/symbols/affinity/circle/gray/c_ldap.svg b/gns3server/symbols/affinity/circle/gray/ldap.svg similarity index 100% rename from gns3server/symbols/affinity/circle/gray/c_ldap.svg rename to gns3server/symbols/affinity/circle/gray/ldap.svg diff --git a/gns3server/symbols/affinity/circle/gray/c_light_bulb.svg b/gns3server/symbols/affinity/circle/gray/light_bulb.svg similarity index 100% rename from gns3server/symbols/affinity/circle/gray/c_light_bulb.svg rename to gns3server/symbols/affinity/circle/gray/light_bulb.svg diff --git a/gns3server/symbols/affinity/circle/gray/c_link.svg b/gns3server/symbols/affinity/circle/gray/link.svg similarity index 100% rename from gns3server/symbols/affinity/circle/gray/c_link.svg rename to gns3server/symbols/affinity/circle/gray/link.svg diff --git a/gns3server/symbols/affinity/circle/gray/c_loadbalancer.svg b/gns3server/symbols/affinity/circle/gray/loadbalancer.svg similarity index 100% rename from gns3server/symbols/affinity/circle/gray/c_loadbalancer.svg rename to gns3server/symbols/affinity/circle/gray/loadbalancer.svg diff --git a/gns3server/symbols/affinity/circle/gray/c_nas.svg b/gns3server/symbols/affinity/circle/gray/nas.svg similarity index 100% rename from gns3server/symbols/affinity/circle/gray/c_nas.svg rename to gns3server/symbols/affinity/circle/gray/nas.svg diff --git a/gns3server/symbols/affinity/circle/gray/c_pinpoint.svg b/gns3server/symbols/affinity/circle/gray/pinpoint.svg similarity index 100% rename from gns3server/symbols/affinity/circle/gray/c_pinpoint.svg rename to gns3server/symbols/affinity/circle/gray/pinpoint.svg diff --git a/gns3server/symbols/affinity/circle/gray/c_printer.svg b/gns3server/symbols/affinity/circle/gray/printer.svg similarity index 100% rename from gns3server/symbols/affinity/circle/gray/c_printer.svg rename to gns3server/symbols/affinity/circle/gray/printer.svg diff --git a/gns3server/symbols/affinity/circle/gray/c_rj45.svg b/gns3server/symbols/affinity/circle/gray/rj45.svg similarity index 100% rename from gns3server/symbols/affinity/circle/gray/c_rj45.svg rename to gns3server/symbols/affinity/circle/gray/rj45.svg diff --git a/gns3server/symbols/affinity/circle/gray/c_router.svg b/gns3server/symbols/affinity/circle/gray/router.svg similarity index 100% rename from gns3server/symbols/affinity/circle/gray/c_router.svg rename to gns3server/symbols/affinity/circle/gray/router.svg diff --git a/gns3server/symbols/affinity/circle/gray/c_router_cloud.svg b/gns3server/symbols/affinity/circle/gray/router_cloud.svg similarity index 100% rename from gns3server/symbols/affinity/circle/gray/c_router_cloud.svg rename to gns3server/symbols/affinity/circle/gray/router_cloud.svg diff --git a/gns3server/symbols/affinity/circle/gray/c_satellite.svg b/gns3server/symbols/affinity/circle/gray/satellite.svg similarity index 100% rename from gns3server/symbols/affinity/circle/gray/c_satellite.svg rename to gns3server/symbols/affinity/circle/gray/satellite.svg diff --git a/gns3server/symbols/affinity/circle/gray/c_satellite_dish.svg b/gns3server/symbols/affinity/circle/gray/satellite_dish.svg similarity index 100% rename from gns3server/symbols/affinity/circle/gray/c_satellite_dish.svg rename to gns3server/symbols/affinity/circle/gray/satellite_dish.svg diff --git a/gns3server/symbols/affinity/circle/gray/c_scull.svg b/gns3server/symbols/affinity/circle/gray/scull.svg similarity index 100% rename from gns3server/symbols/affinity/circle/gray/c_scull.svg rename to gns3server/symbols/affinity/circle/gray/scull.svg diff --git a/gns3server/symbols/affinity/circle/gray/c_server-cluster.svg b/gns3server/symbols/affinity/circle/gray/server-cluster.svg similarity index 100% rename from gns3server/symbols/affinity/circle/gray/c_server-cluster.svg rename to gns3server/symbols/affinity/circle/gray/server-cluster.svg diff --git a/gns3server/symbols/affinity/circle/gray/c_server.svg b/gns3server/symbols/affinity/circle/gray/server.svg similarity index 100% rename from gns3server/symbols/affinity/circle/gray/c_server.svg rename to gns3server/symbols/affinity/circle/gray/server.svg diff --git a/gns3server/symbols/affinity/circle/gray/c_statistics.svg b/gns3server/symbols/affinity/circle/gray/statistics.svg similarity index 100% rename from gns3server/symbols/affinity/circle/gray/c_statistics.svg rename to gns3server/symbols/affinity/circle/gray/statistics.svg diff --git a/gns3server/symbols/affinity/circle/gray/c_storage.svg b/gns3server/symbols/affinity/circle/gray/storage.svg similarity index 100% rename from gns3server/symbols/affinity/circle/gray/c_storage.svg rename to gns3server/symbols/affinity/circle/gray/storage.svg diff --git a/gns3server/symbols/affinity/circle/gray/c_switch.svg b/gns3server/symbols/affinity/circle/gray/switch.svg similarity index 100% rename from gns3server/symbols/affinity/circle/gray/c_switch.svg rename to gns3server/symbols/affinity/circle/gray/switch.svg diff --git a/gns3server/symbols/affinity/circle/gray/c_switch_multilayer.svg b/gns3server/symbols/affinity/circle/gray/switch_multilayer.svg similarity index 100% rename from gns3server/symbols/affinity/circle/gray/c_switch_multilayer.svg rename to gns3server/symbols/affinity/circle/gray/switch_multilayer.svg diff --git a/gns3server/symbols/affinity/circle/gray/c_tablet.svg b/gns3server/symbols/affinity/circle/gray/tablet.svg similarity index 100% rename from gns3server/symbols/affinity/circle/gray/c_tablet.svg rename to gns3server/symbols/affinity/circle/gray/tablet.svg diff --git a/gns3server/symbols/affinity/circle/gray/c_tree.svg b/gns3server/symbols/affinity/circle/gray/tree.svg similarity index 100% rename from gns3server/symbols/affinity/circle/gray/c_tree.svg rename to gns3server/symbols/affinity/circle/gray/tree.svg diff --git a/gns3server/symbols/affinity/circle/gray/c_user.svg b/gns3server/symbols/affinity/circle/gray/user.svg similarity index 100% rename from gns3server/symbols/affinity/circle/gray/c_user.svg rename to gns3server/symbols/affinity/circle/gray/user.svg diff --git a/gns3server/symbols/affinity/circle/gray/virtualbox.svg b/gns3server/symbols/affinity/circle/gray/virtualbox.svg new file mode 100644 index 00000000..393bf67b --- /dev/null +++ b/gns3server/symbols/affinity/circle/gray/virtualbox.svg @@ -0,0 +1,60 @@ + +image/svg+xml \ No newline at end of file diff --git a/gns3server/symbols/affinity/circle/gray/c_vm.svg b/gns3server/symbols/affinity/circle/gray/vm.svg similarity index 100% rename from gns3server/symbols/affinity/circle/gray/c_vm.svg rename to gns3server/symbols/affinity/circle/gray/vm.svg diff --git a/gns3server/symbols/affinity/circle/gray/vmware.svg b/gns3server/symbols/affinity/circle/gray/vmware.svg new file mode 100644 index 00000000..5e024657 --- /dev/null +++ b/gns3server/symbols/affinity/circle/gray/vmware.svg @@ -0,0 +1,61 @@ + +image/svg+xml \ No newline at end of file diff --git a/gns3server/symbols/affinity/circle/gray/c_wifi.svg b/gns3server/symbols/affinity/circle/gray/wifi.svg similarity index 100% rename from gns3server/symbols/affinity/circle/gray/c_wifi.svg rename to gns3server/symbols/affinity/circle/gray/wifi.svg diff --git a/gns3server/symbols/affinity/circle/gray/c_wlc.svg b/gns3server/symbols/affinity/circle/gray/wlc.svg similarity index 100% rename from gns3server/symbols/affinity/circle/gray/c_wlc.svg rename to gns3server/symbols/affinity/circle/gray/wlc.svg diff --git a/gns3server/symbols/affinity/circle/gray/c_xml.svg b/gns3server/symbols/affinity/circle/gray/xml.svg similarity index 100% rename from gns3server/symbols/affinity/circle/gray/c_xml.svg rename to gns3server/symbols/affinity/circle/gray/xml.svg diff --git a/gns3server/symbols/affinity/circle/red/atm.svg b/gns3server/symbols/affinity/circle/red/atm.svg new file mode 100644 index 00000000..1d6de229 --- /dev/null +++ b/gns3server/symbols/affinity/circle/red/atm.svg @@ -0,0 +1,60 @@ + +image/svg+xml \ No newline at end of file diff --git a/gns3server/symbols/affinity/circle/red/c_camera_red.svg b/gns3server/symbols/affinity/circle/red/camera.svg similarity index 100% rename from gns3server/symbols/affinity/circle/red/c_camera_red.svg rename to gns3server/symbols/affinity/circle/red/camera.svg diff --git a/gns3server/symbols/affinity/circle/red/c_camera_dome_red.svg b/gns3server/symbols/affinity/circle/red/camera_dome.svg similarity index 100% rename from gns3server/symbols/affinity/circle/red/c_camera_dome_red.svg rename to gns3server/symbols/affinity/circle/red/camera_dome.svg diff --git a/gns3server/symbols/affinity/circle/red/circle.svg b/gns3server/symbols/affinity/circle/red/circle.svg new file mode 100644 index 00000000..b4328dee --- /dev/null +++ b/gns3server/symbols/affinity/circle/red/circle.svg @@ -0,0 +1,53 @@ + +image/svg+xml \ No newline at end of file diff --git a/gns3server/symbols/affinity/circle/red/c_client_red.svg b/gns3server/symbols/affinity/circle/red/client.svg similarity index 100% rename from gns3server/symbols/affinity/circle/red/c_client_red.svg rename to gns3server/symbols/affinity/circle/red/client.svg diff --git a/gns3server/symbols/affinity/circle/red/c_client_vm_red.svg b/gns3server/symbols/affinity/circle/red/client_vm.svg similarity index 100% rename from gns3server/symbols/affinity/circle/red/c_client_vm_red.svg rename to gns3server/symbols/affinity/circle/red/client_vm.svg diff --git a/gns3server/symbols/affinity/circle/red/c_cloud_red.svg b/gns3server/symbols/affinity/circle/red/cloud.svg similarity index 100% rename from gns3server/symbols/affinity/circle/red/c_cloud_red.svg rename to gns3server/symbols/affinity/circle/red/cloud.svg diff --git a/gns3server/symbols/affinity/circle/red/c_cog_red.svg b/gns3server/symbols/affinity/circle/red/cog.svg similarity index 100% rename from gns3server/symbols/affinity/circle/red/c_cog_red.svg rename to gns3server/symbols/affinity/circle/red/cog.svg diff --git a/gns3server/symbols/affinity/circle/red/c_communications_red.svg b/gns3server/symbols/affinity/circle/red/communications.svg similarity index 100% rename from gns3server/symbols/affinity/circle/red/c_communications_red.svg rename to gns3server/symbols/affinity/circle/red/communications.svg diff --git a/gns3server/symbols/affinity/circle/red/c_conversation_red.svg b/gns3server/symbols/affinity/circle/red/conversation.svg similarity index 100% rename from gns3server/symbols/affinity/circle/red/c_conversation_red.svg rename to gns3server/symbols/affinity/circle/red/conversation.svg diff --git a/gns3server/symbols/affinity/circle/red/docker.svg b/gns3server/symbols/affinity/circle/red/docker.svg new file mode 100644 index 00000000..48ae1b3b --- /dev/null +++ b/gns3server/symbols/affinity/circle/red/docker.svg @@ -0,0 +1,118 @@ + +image/svg+xml \ No newline at end of file diff --git a/gns3server/symbols/affinity/circle/red/c_dslam_red.svg b/gns3server/symbols/affinity/circle/red/dslam.svg similarity index 100% rename from gns3server/symbols/affinity/circle/red/c_dslam_red.svg rename to gns3server/symbols/affinity/circle/red/dslam.svg diff --git a/gns3server/symbols/affinity/circle/red/c_fingerprint_red.svg b/gns3server/symbols/affinity/circle/red/fingerprint.svg similarity index 100% rename from gns3server/symbols/affinity/circle/red/c_fingerprint_red.svg rename to gns3server/symbols/affinity/circle/red/fingerprint.svg diff --git a/gns3server/symbols/affinity/circle/red/c_firewall_red.svg b/gns3server/symbols/affinity/circle/red/firewall.svg similarity index 100% rename from gns3server/symbols/affinity/circle/red/c_firewall_red.svg rename to gns3server/symbols/affinity/circle/red/firewall.svg diff --git a/gns3server/symbols/affinity/circle/red/c_firewall3_red.svg b/gns3server/symbols/affinity/circle/red/firewall3.svg similarity index 100% rename from gns3server/symbols/affinity/circle/red/c_firewall3_red.svg rename to gns3server/symbols/affinity/circle/red/firewall3.svg diff --git a/gns3server/symbols/affinity/circle/red/c_grid_red.svg b/gns3server/symbols/affinity/circle/red/grid.svg similarity index 100% rename from gns3server/symbols/affinity/circle/red/c_grid_red.svg rename to gns3server/symbols/affinity/circle/red/grid.svg diff --git a/gns3server/symbols/affinity/circle/red/c_grid2_red.svg b/gns3server/symbols/affinity/circle/red/grid2.svg similarity index 100% rename from gns3server/symbols/affinity/circle/red/c_grid2_red.svg rename to gns3server/symbols/affinity/circle/red/grid2.svg diff --git a/gns3server/symbols/affinity/circle/red/c_hub_red.svg b/gns3server/symbols/affinity/circle/red/hub.svg similarity index 100% rename from gns3server/symbols/affinity/circle/red/c_hub_red.svg rename to gns3server/symbols/affinity/circle/red/hub.svg diff --git a/gns3server/symbols/affinity/circle/red/c_inspect_red.svg b/gns3server/symbols/affinity/circle/red/inspect.svg similarity index 100% rename from gns3server/symbols/affinity/circle/red/c_inspect_red.svg rename to gns3server/symbols/affinity/circle/red/inspect.svg diff --git a/gns3server/symbols/affinity/circle/red/c_inspect3_red.svg b/gns3server/symbols/affinity/circle/red/inspect3.svg similarity index 100% rename from gns3server/symbols/affinity/circle/red/c_inspect3_red.svg rename to gns3server/symbols/affinity/circle/red/inspect3.svg diff --git a/gns3server/symbols/affinity/circle/red/c_interconnect_red.svg b/gns3server/symbols/affinity/circle/red/interconnect.svg similarity index 100% rename from gns3server/symbols/affinity/circle/red/c_interconnect_red.svg rename to gns3server/symbols/affinity/circle/red/interconnect.svg diff --git a/gns3server/symbols/affinity/circle/red/c_isdn_red.svg b/gns3server/symbols/affinity/circle/red/isdn.svg similarity index 100% rename from gns3server/symbols/affinity/circle/red/c_isdn_red.svg rename to gns3server/symbols/affinity/circle/red/isdn.svg diff --git a/gns3server/symbols/affinity/circle/red/c_ldap_red.svg b/gns3server/symbols/affinity/circle/red/ldap.svg similarity index 100% rename from gns3server/symbols/affinity/circle/red/c_ldap_red.svg rename to gns3server/symbols/affinity/circle/red/ldap.svg diff --git a/gns3server/symbols/affinity/circle/red/c_light_bulb_red.svg b/gns3server/symbols/affinity/circle/red/light_bulb.svg similarity index 100% rename from gns3server/symbols/affinity/circle/red/c_light_bulb_red.svg rename to gns3server/symbols/affinity/circle/red/light_bulb.svg diff --git a/gns3server/symbols/affinity/circle/red/c_link_red.svg b/gns3server/symbols/affinity/circle/red/link.svg similarity index 100% rename from gns3server/symbols/affinity/circle/red/c_link_red.svg rename to gns3server/symbols/affinity/circle/red/link.svg diff --git a/gns3server/symbols/affinity/circle/red/c_loadbalancer_red.svg b/gns3server/symbols/affinity/circle/red/loadbalancer.svg similarity index 100% rename from gns3server/symbols/affinity/circle/red/c_loadbalancer_red.svg rename to gns3server/symbols/affinity/circle/red/loadbalancer.svg diff --git a/gns3server/symbols/affinity/circle/red/c_nas_red.svg b/gns3server/symbols/affinity/circle/red/nas.svg similarity index 100% rename from gns3server/symbols/affinity/circle/red/c_nas_red.svg rename to gns3server/symbols/affinity/circle/red/nas.svg diff --git a/gns3server/symbols/affinity/circle/red/c_pinpoint_red.svg b/gns3server/symbols/affinity/circle/red/pinpoint.svg similarity index 100% rename from gns3server/symbols/affinity/circle/red/c_pinpoint_red.svg rename to gns3server/symbols/affinity/circle/red/pinpoint.svg diff --git a/gns3server/symbols/affinity/circle/red/c_printer_red.svg b/gns3server/symbols/affinity/circle/red/printer.svg similarity index 100% rename from gns3server/symbols/affinity/circle/red/c_printer_red.svg rename to gns3server/symbols/affinity/circle/red/printer.svg diff --git a/gns3server/symbols/affinity/circle/red/c_rj45_red.svg b/gns3server/symbols/affinity/circle/red/rj45.svg similarity index 100% rename from gns3server/symbols/affinity/circle/red/c_rj45_red.svg rename to gns3server/symbols/affinity/circle/red/rj45.svg diff --git a/gns3server/symbols/affinity/circle/red/c_router_red.svg b/gns3server/symbols/affinity/circle/red/router.svg similarity index 100% rename from gns3server/symbols/affinity/circle/red/c_router_red.svg rename to gns3server/symbols/affinity/circle/red/router.svg diff --git a/gns3server/symbols/affinity/circle/red/c_router_cloud_red.svg b/gns3server/symbols/affinity/circle/red/router_cloud.svg similarity index 100% rename from gns3server/symbols/affinity/circle/red/c_router_cloud_red.svg rename to gns3server/symbols/affinity/circle/red/router_cloud.svg diff --git a/gns3server/symbols/affinity/circle/red/c_satellite_red.svg b/gns3server/symbols/affinity/circle/red/satellite.svg similarity index 100% rename from gns3server/symbols/affinity/circle/red/c_satellite_red.svg rename to gns3server/symbols/affinity/circle/red/satellite.svg diff --git a/gns3server/symbols/affinity/circle/red/c_satellite_dish_red.svg b/gns3server/symbols/affinity/circle/red/satellite_dish.svg similarity index 100% rename from gns3server/symbols/affinity/circle/red/c_satellite_dish_red.svg rename to gns3server/symbols/affinity/circle/red/satellite_dish.svg diff --git a/gns3server/symbols/affinity/circle/red/c_scull_red.svg b/gns3server/symbols/affinity/circle/red/scull.svg similarity index 100% rename from gns3server/symbols/affinity/circle/red/c_scull_red.svg rename to gns3server/symbols/affinity/circle/red/scull.svg diff --git a/gns3server/symbols/affinity/circle/red/c_server-cluster_red.svg b/gns3server/symbols/affinity/circle/red/server-cluster.svg similarity index 100% rename from gns3server/symbols/affinity/circle/red/c_server-cluster_red.svg rename to gns3server/symbols/affinity/circle/red/server-cluster.svg diff --git a/gns3server/symbols/affinity/circle/red/c_server_red.svg b/gns3server/symbols/affinity/circle/red/server.svg similarity index 100% rename from gns3server/symbols/affinity/circle/red/c_server_red.svg rename to gns3server/symbols/affinity/circle/red/server.svg diff --git a/gns3server/symbols/affinity/circle/red/c_statistics_red.svg b/gns3server/symbols/affinity/circle/red/statistics.svg similarity index 100% rename from gns3server/symbols/affinity/circle/red/c_statistics_red.svg rename to gns3server/symbols/affinity/circle/red/statistics.svg diff --git a/gns3server/symbols/affinity/circle/red/c_storage_red.svg b/gns3server/symbols/affinity/circle/red/storage.svg similarity index 100% rename from gns3server/symbols/affinity/circle/red/c_storage_red.svg rename to gns3server/symbols/affinity/circle/red/storage.svg diff --git a/gns3server/symbols/affinity/circle/red/c_switch_red.svg b/gns3server/symbols/affinity/circle/red/switch.svg similarity index 100% rename from gns3server/symbols/affinity/circle/red/c_switch_red.svg rename to gns3server/symbols/affinity/circle/red/switch.svg diff --git a/gns3server/symbols/affinity/circle/red/c_switch_multilayer_red.svg b/gns3server/symbols/affinity/circle/red/switch_multilayer.svg similarity index 100% rename from gns3server/symbols/affinity/circle/red/c_switch_multilayer_red.svg rename to gns3server/symbols/affinity/circle/red/switch_multilayer.svg diff --git a/gns3server/symbols/affinity/circle/red/c_tablet_red.svg b/gns3server/symbols/affinity/circle/red/tablet.svg similarity index 100% rename from gns3server/symbols/affinity/circle/red/c_tablet_red.svg rename to gns3server/symbols/affinity/circle/red/tablet.svg diff --git a/gns3server/symbols/affinity/circle/red/c_tree_red.svg b/gns3server/symbols/affinity/circle/red/tree.svg similarity index 100% rename from gns3server/symbols/affinity/circle/red/c_tree_red.svg rename to gns3server/symbols/affinity/circle/red/tree.svg diff --git a/gns3server/symbols/affinity/circle/red/c_user_red.svg b/gns3server/symbols/affinity/circle/red/user.svg similarity index 100% rename from gns3server/symbols/affinity/circle/red/c_user_red.svg rename to gns3server/symbols/affinity/circle/red/user.svg diff --git a/gns3server/symbols/affinity/circle/red/virtualbox.svg b/gns3server/symbols/affinity/circle/red/virtualbox.svg new file mode 100644 index 00000000..008a7794 --- /dev/null +++ b/gns3server/symbols/affinity/circle/red/virtualbox.svg @@ -0,0 +1,60 @@ + +image/svg+xml \ No newline at end of file diff --git a/gns3server/symbols/affinity/circle/red/c_vm_red.svg b/gns3server/symbols/affinity/circle/red/vm.svg similarity index 100% rename from gns3server/symbols/affinity/circle/red/c_vm_red.svg rename to gns3server/symbols/affinity/circle/red/vm.svg diff --git a/gns3server/symbols/affinity/circle/red/vmware.svg b/gns3server/symbols/affinity/circle/red/vmware.svg new file mode 100644 index 00000000..ac929894 --- /dev/null +++ b/gns3server/symbols/affinity/circle/red/vmware.svg @@ -0,0 +1,61 @@ + +image/svg+xml \ No newline at end of file diff --git a/gns3server/symbols/affinity/circle/red/c_wifi_red.svg b/gns3server/symbols/affinity/circle/red/wifi.svg similarity index 100% rename from gns3server/symbols/affinity/circle/red/c_wifi_red.svg rename to gns3server/symbols/affinity/circle/red/wifi.svg diff --git a/gns3server/symbols/affinity/circle/red/c_wlc_red.svg b/gns3server/symbols/affinity/circle/red/wlc.svg similarity index 100% rename from gns3server/symbols/affinity/circle/red/c_wlc_red.svg rename to gns3server/symbols/affinity/circle/red/wlc.svg diff --git a/gns3server/symbols/affinity/circle/red/c_xml_red.svg b/gns3server/symbols/affinity/circle/red/xml.svg similarity index 100% rename from gns3server/symbols/affinity/circle/red/c_xml_red.svg rename to gns3server/symbols/affinity/circle/red/xml.svg diff --git a/gns3server/symbols/affinity/square/blue/atm.svg b/gns3server/symbols/affinity/square/blue/atm.svg new file mode 100644 index 00000000..c03f2c0d --- /dev/null +++ b/gns3server/symbols/affinity/square/blue/atm.svg @@ -0,0 +1,55 @@ + +image/svg+xml \ No newline at end of file diff --git a/gns3server/symbols/affinity/square/blue/sq_camera_blue.svg b/gns3server/symbols/affinity/square/blue/camera.svg similarity index 100% rename from gns3server/symbols/affinity/square/blue/sq_camera_blue.svg rename to gns3server/symbols/affinity/square/blue/camera.svg diff --git a/gns3server/symbols/affinity/square/blue/sq_camera_dome_blue.svg b/gns3server/symbols/affinity/square/blue/camera_dome.svg similarity index 100% rename from gns3server/symbols/affinity/square/blue/sq_camera_dome_blue.svg rename to gns3server/symbols/affinity/square/blue/camera_dome.svg diff --git a/gns3server/symbols/affinity/square/blue/sq_client_blue.svg b/gns3server/symbols/affinity/square/blue/client.svg similarity index 100% rename from gns3server/symbols/affinity/square/blue/sq_client_blue.svg rename to gns3server/symbols/affinity/square/blue/client.svg diff --git a/gns3server/symbols/affinity/square/blue/sq_client_vm_blue.svg b/gns3server/symbols/affinity/square/blue/client_vm.svg similarity index 100% rename from gns3server/symbols/affinity/square/blue/sq_client_vm_blue.svg rename to gns3server/symbols/affinity/square/blue/client_vm.svg diff --git a/gns3server/symbols/affinity/square/blue/cloud.svg b/gns3server/symbols/affinity/square/blue/cloud.svg new file mode 100644 index 00000000..1625c1a3 --- /dev/null +++ b/gns3server/symbols/affinity/square/blue/cloud.svg @@ -0,0 +1,57 @@ + +image/svg+xml \ No newline at end of file diff --git a/gns3server/symbols/affinity/square/blue/sq_cog_blue.svg b/gns3server/symbols/affinity/square/blue/cog.svg similarity index 100% rename from gns3server/symbols/affinity/square/blue/sq_cog_blue.svg rename to gns3server/symbols/affinity/square/blue/cog.svg diff --git a/gns3server/symbols/affinity/square/blue/sq_communications_blue.svg b/gns3server/symbols/affinity/square/blue/communications.svg similarity index 100% rename from gns3server/symbols/affinity/square/blue/sq_communications_blue.svg rename to gns3server/symbols/affinity/square/blue/communications.svg diff --git a/gns3server/symbols/affinity/square/blue/sq_conversation_blue.svg b/gns3server/symbols/affinity/square/blue/conversation.svg similarity index 100% rename from gns3server/symbols/affinity/square/blue/sq_conversation_blue.svg rename to gns3server/symbols/affinity/square/blue/conversation.svg diff --git a/gns3server/symbols/affinity/square/blue/docker.svg b/gns3server/symbols/affinity/square/blue/docker.svg new file mode 100644 index 00000000..3e2fd6bc --- /dev/null +++ b/gns3server/symbols/affinity/square/blue/docker.svg @@ -0,0 +1,106 @@ + +image/svg+xml \ No newline at end of file diff --git a/gns3server/symbols/affinity/square/blue/sq_dslam_blue.svg b/gns3server/symbols/affinity/square/blue/dslam.svg similarity index 100% rename from gns3server/symbols/affinity/square/blue/sq_dslam_blue.svg rename to gns3server/symbols/affinity/square/blue/dslam.svg diff --git a/gns3server/symbols/affinity/square/blue/sq_fingerprint_blue.svg b/gns3server/symbols/affinity/square/blue/fingerprint.svg similarity index 100% rename from gns3server/symbols/affinity/square/blue/sq_fingerprint_blue.svg rename to gns3server/symbols/affinity/square/blue/fingerprint.svg diff --git a/gns3server/symbols/affinity/square/blue/sq_firewall_blue.svg b/gns3server/symbols/affinity/square/blue/firewall.svg similarity index 100% rename from gns3server/symbols/affinity/square/blue/sq_firewall_blue.svg rename to gns3server/symbols/affinity/square/blue/firewall.svg diff --git a/gns3server/symbols/affinity/square/blue/sq_firewall3_blue.svg b/gns3server/symbols/affinity/square/blue/firewall3.svg similarity index 100% rename from gns3server/symbols/affinity/square/blue/sq_firewall3_blue.svg rename to gns3server/symbols/affinity/square/blue/firewall3.svg diff --git a/gns3server/symbols/affinity/square/blue/sq_grid_blue.svg b/gns3server/symbols/affinity/square/blue/grid.svg similarity index 100% rename from gns3server/symbols/affinity/square/blue/sq_grid_blue.svg rename to gns3server/symbols/affinity/square/blue/grid.svg diff --git a/gns3server/symbols/affinity/square/blue/sq_grid2_blue.svg b/gns3server/symbols/affinity/square/blue/grid2.svg similarity index 100% rename from gns3server/symbols/affinity/square/blue/sq_grid2_blue.svg rename to gns3server/symbols/affinity/square/blue/grid2.svg diff --git a/gns3server/symbols/affinity/square/blue/sq_hub_blue.svg b/gns3server/symbols/affinity/square/blue/hub.svg similarity index 100% rename from gns3server/symbols/affinity/square/blue/sq_hub_blue.svg rename to gns3server/symbols/affinity/square/blue/hub.svg diff --git a/gns3server/symbols/affinity/square/blue/sq_inspect2_blue.svg b/gns3server/symbols/affinity/square/blue/inspect2.svg similarity index 100% rename from gns3server/symbols/affinity/square/blue/sq_inspect2_blue.svg rename to gns3server/symbols/affinity/square/blue/inspect2.svg diff --git a/gns3server/symbols/affinity/square/blue/sq_inspect3_blue.svg b/gns3server/symbols/affinity/square/blue/inspect3.svg similarity index 100% rename from gns3server/symbols/affinity/square/blue/sq_inspect3_blue.svg rename to gns3server/symbols/affinity/square/blue/inspect3.svg diff --git a/gns3server/symbols/affinity/square/blue/sq_interconnect_blue.svg b/gns3server/symbols/affinity/square/blue/interconnect.svg similarity index 100% rename from gns3server/symbols/affinity/square/blue/sq_interconnect_blue.svg rename to gns3server/symbols/affinity/square/blue/interconnect.svg diff --git a/gns3server/symbols/affinity/square/blue/sq_isdn_blue.svg b/gns3server/symbols/affinity/square/blue/isdn.svg similarity index 100% rename from gns3server/symbols/affinity/square/blue/sq_isdn_blue.svg rename to gns3server/symbols/affinity/square/blue/isdn.svg diff --git a/gns3server/symbols/affinity/square/blue/sq_ldap_blue.svg b/gns3server/symbols/affinity/square/blue/ldap.svg similarity index 100% rename from gns3server/symbols/affinity/square/blue/sq_ldap_blue.svg rename to gns3server/symbols/affinity/square/blue/ldap.svg diff --git a/gns3server/symbols/affinity/square/blue/sq_light_bulb_blue.svg b/gns3server/symbols/affinity/square/blue/light_bulb.svg similarity index 100% rename from gns3server/symbols/affinity/square/blue/sq_light_bulb_blue.svg rename to gns3server/symbols/affinity/square/blue/light_bulb.svg diff --git a/gns3server/symbols/affinity/square/blue/sq_link_blue.svg b/gns3server/symbols/affinity/square/blue/link.svg similarity index 100% rename from gns3server/symbols/affinity/square/blue/sq_link_blue.svg rename to gns3server/symbols/affinity/square/blue/link.svg diff --git a/gns3server/symbols/affinity/square/blue/sq_nas_blue.svg b/gns3server/symbols/affinity/square/blue/nas.svg similarity index 100% rename from gns3server/symbols/affinity/square/blue/sq_nas_blue.svg rename to gns3server/symbols/affinity/square/blue/nas.svg diff --git a/gns3server/symbols/affinity/square/blue/sq_pinpoint_blue.svg b/gns3server/symbols/affinity/square/blue/pinpoint.svg similarity index 100% rename from gns3server/symbols/affinity/square/blue/sq_pinpoint_blue.svg rename to gns3server/symbols/affinity/square/blue/pinpoint.svg diff --git a/gns3server/symbols/affinity/square/blue/sq_printer_blue.svg b/gns3server/symbols/affinity/square/blue/printer.svg similarity index 100% rename from gns3server/symbols/affinity/square/blue/sq_printer_blue.svg rename to gns3server/symbols/affinity/square/blue/printer.svg diff --git a/gns3server/symbols/affinity/square/blue/sq_rj45_blue.svg b/gns3server/symbols/affinity/square/blue/rj45.svg similarity index 100% rename from gns3server/symbols/affinity/square/blue/sq_rj45_blue.svg rename to gns3server/symbols/affinity/square/blue/rj45.svg diff --git a/gns3server/symbols/affinity/square/blue/sq_router_blue.svg b/gns3server/symbols/affinity/square/blue/router.svg similarity index 100% rename from gns3server/symbols/affinity/square/blue/sq_router_blue.svg rename to gns3server/symbols/affinity/square/blue/router.svg diff --git a/gns3server/symbols/affinity/square/blue/sq_router_cloud_blue.svg b/gns3server/symbols/affinity/square/blue/router_cloud.svg similarity index 100% rename from gns3server/symbols/affinity/square/blue/sq_router_cloud_blue.svg rename to gns3server/symbols/affinity/square/blue/router_cloud.svg diff --git a/gns3server/symbols/affinity/square/blue/sq_satellite_blue.svg b/gns3server/symbols/affinity/square/blue/satellite.svg similarity index 100% rename from gns3server/symbols/affinity/square/blue/sq_satellite_blue.svg rename to gns3server/symbols/affinity/square/blue/satellite.svg diff --git a/gns3server/symbols/affinity/square/blue/sq_satellite_dish_blue.svg b/gns3server/symbols/affinity/square/blue/satellite_dish.svg similarity index 100% rename from gns3server/symbols/affinity/square/blue/sq_satellite_dish_blue.svg rename to gns3server/symbols/affinity/square/blue/satellite_dish.svg diff --git a/gns3server/symbols/affinity/square/blue/sq_scull_blue.svg b/gns3server/symbols/affinity/square/blue/scull.svg similarity index 100% rename from gns3server/symbols/affinity/square/blue/sq_scull_blue.svg rename to gns3server/symbols/affinity/square/blue/scull.svg diff --git a/gns3server/symbols/affinity/square/blue/sq_server-cluster_blue.svg b/gns3server/symbols/affinity/square/blue/server-cluster.svg similarity index 100% rename from gns3server/symbols/affinity/square/blue/sq_server-cluster_blue.svg rename to gns3server/symbols/affinity/square/blue/server-cluster.svg diff --git a/gns3server/symbols/affinity/square/blue/sq_server_blue.svg b/gns3server/symbols/affinity/square/blue/server.svg similarity index 100% rename from gns3server/symbols/affinity/square/blue/sq_server_blue.svg rename to gns3server/symbols/affinity/square/blue/server.svg diff --git a/gns3server/symbols/affinity/square/blue/sq_cloud_blue.svg b/gns3server/symbols/affinity/square/blue/sq_cloud_blue.svg deleted file mode 100644 index 3039e52b..00000000 --- a/gns3server/symbols/affinity/square/blue/sq_cloud_blue.svg +++ /dev/null @@ -1,61 +0,0 @@ - -image/svg+xml diff --git a/gns3server/symbols/affinity/square/blue/sq_square_blue.svg b/gns3server/symbols/affinity/square/blue/square.svg similarity index 100% rename from gns3server/symbols/affinity/square/blue/sq_square_blue.svg rename to gns3server/symbols/affinity/square/blue/square.svg diff --git a/gns3server/symbols/affinity/square/blue/sq_statistics_blue.svg b/gns3server/symbols/affinity/square/blue/statistics.svg similarity index 100% rename from gns3server/symbols/affinity/square/blue/sq_statistics_blue.svg rename to gns3server/symbols/affinity/square/blue/statistics.svg diff --git a/gns3server/symbols/affinity/square/blue/sq_storage_blue.svg b/gns3server/symbols/affinity/square/blue/storage.svg similarity index 100% rename from gns3server/symbols/affinity/square/blue/sq_storage_blue.svg rename to gns3server/symbols/affinity/square/blue/storage.svg diff --git a/gns3server/symbols/affinity/square/blue/sq_switch_blue.svg b/gns3server/symbols/affinity/square/blue/switch.svg similarity index 100% rename from gns3server/symbols/affinity/square/blue/sq_switch_blue.svg rename to gns3server/symbols/affinity/square/blue/switch.svg diff --git a/gns3server/symbols/affinity/square/blue/sq_switch_multilayer_blue.svg b/gns3server/symbols/affinity/square/blue/switch_multilayer.svg similarity index 100% rename from gns3server/symbols/affinity/square/blue/sq_switch_multilayer_blue.svg rename to gns3server/symbols/affinity/square/blue/switch_multilayer.svg diff --git a/gns3server/symbols/affinity/square/blue/sq_tablet_blue.svg b/gns3server/symbols/affinity/square/blue/tablet.svg similarity index 100% rename from gns3server/symbols/affinity/square/blue/sq_tablet_blue.svg rename to gns3server/symbols/affinity/square/blue/tablet.svg diff --git a/gns3server/symbols/affinity/square/blue/sq_tree_blue.svg b/gns3server/symbols/affinity/square/blue/tree.svg similarity index 100% rename from gns3server/symbols/affinity/square/blue/sq_tree_blue.svg rename to gns3server/symbols/affinity/square/blue/tree.svg diff --git a/gns3server/symbols/affinity/square/blue/sq_user_blue.svg b/gns3server/symbols/affinity/square/blue/user.svg similarity index 100% rename from gns3server/symbols/affinity/square/blue/sq_user_blue.svg rename to gns3server/symbols/affinity/square/blue/user.svg diff --git a/gns3server/symbols/affinity/square/blue/virtualbox.svg b/gns3server/symbols/affinity/square/blue/virtualbox.svg new file mode 100644 index 00000000..73ca6528 --- /dev/null +++ b/gns3server/symbols/affinity/square/blue/virtualbox.svg @@ -0,0 +1,58 @@ + +image/svg+xml \ No newline at end of file diff --git a/gns3server/symbols/affinity/square/blue/sq_vm_blue.svg b/gns3server/symbols/affinity/square/blue/vm.svg similarity index 100% rename from gns3server/symbols/affinity/square/blue/sq_vm_blue.svg rename to gns3server/symbols/affinity/square/blue/vm.svg diff --git a/gns3server/symbols/affinity/square/blue/vmware.svg b/gns3server/symbols/affinity/square/blue/vmware.svg new file mode 100644 index 00000000..025d0d73 --- /dev/null +++ b/gns3server/symbols/affinity/square/blue/vmware.svg @@ -0,0 +1,58 @@ + +image/svg+xml \ No newline at end of file diff --git a/gns3server/symbols/affinity/square/blue/sq_wifi_blue.svg b/gns3server/symbols/affinity/square/blue/wifi.svg similarity index 100% rename from gns3server/symbols/affinity/square/blue/sq_wifi_blue.svg rename to gns3server/symbols/affinity/square/blue/wifi.svg diff --git a/gns3server/symbols/affinity/square/blue/sq_wlc_blue.svg b/gns3server/symbols/affinity/square/blue/wlc.svg similarity index 100% rename from gns3server/symbols/affinity/square/blue/sq_wlc_blue.svg rename to gns3server/symbols/affinity/square/blue/wlc.svg diff --git a/gns3server/symbols/affinity/square/blue/sq_xml_blue.svg b/gns3server/symbols/affinity/square/blue/xml.svg similarity index 100% rename from gns3server/symbols/affinity/square/blue/sq_xml_blue.svg rename to gns3server/symbols/affinity/square/blue/xml.svg diff --git a/gns3server/symbols/affinity/square/gray/atm.svg b/gns3server/symbols/affinity/square/gray/atm.svg new file mode 100644 index 00000000..9546cb67 --- /dev/null +++ b/gns3server/symbols/affinity/square/gray/atm.svg @@ -0,0 +1,55 @@ + +image/svg+xml \ No newline at end of file diff --git a/gns3server/symbols/affinity/square/gray/sq_camera.svg b/gns3server/symbols/affinity/square/gray/camera.svg similarity index 100% rename from gns3server/symbols/affinity/square/gray/sq_camera.svg rename to gns3server/symbols/affinity/square/gray/camera.svg diff --git a/gns3server/symbols/affinity/square/gray/sq_camera_dome.svg b/gns3server/symbols/affinity/square/gray/camera_dome.svg similarity index 100% rename from gns3server/symbols/affinity/square/gray/sq_camera_dome.svg rename to gns3server/symbols/affinity/square/gray/camera_dome.svg diff --git a/gns3server/symbols/affinity/square/gray/sq_client.svg b/gns3server/symbols/affinity/square/gray/client.svg similarity index 100% rename from gns3server/symbols/affinity/square/gray/sq_client.svg rename to gns3server/symbols/affinity/square/gray/client.svg diff --git a/gns3server/symbols/affinity/square/gray/sq_client_vm.svg b/gns3server/symbols/affinity/square/gray/client_vm.svg similarity index 100% rename from gns3server/symbols/affinity/square/gray/sq_client_vm.svg rename to gns3server/symbols/affinity/square/gray/client_vm.svg diff --git a/gns3server/symbols/affinity/square/gray/cloud.svg b/gns3server/symbols/affinity/square/gray/cloud.svg new file mode 100644 index 00000000..f2960e30 --- /dev/null +++ b/gns3server/symbols/affinity/square/gray/cloud.svg @@ -0,0 +1,57 @@ + +image/svg+xml \ No newline at end of file diff --git a/gns3server/symbols/affinity/square/gray/sq_cog.svg b/gns3server/symbols/affinity/square/gray/cog.svg similarity index 100% rename from gns3server/symbols/affinity/square/gray/sq_cog.svg rename to gns3server/symbols/affinity/square/gray/cog.svg diff --git a/gns3server/symbols/affinity/square/gray/sq_communications.svg b/gns3server/symbols/affinity/square/gray/communications.svg similarity index 100% rename from gns3server/symbols/affinity/square/gray/sq_communications.svg rename to gns3server/symbols/affinity/square/gray/communications.svg diff --git a/gns3server/symbols/affinity/square/gray/sq_conversation.svg b/gns3server/symbols/affinity/square/gray/conversation.svg similarity index 100% rename from gns3server/symbols/affinity/square/gray/sq_conversation.svg rename to gns3server/symbols/affinity/square/gray/conversation.svg diff --git a/gns3server/symbols/affinity/square/gray/docker.svg b/gns3server/symbols/affinity/square/gray/docker.svg new file mode 100644 index 00000000..c848f641 --- /dev/null +++ b/gns3server/symbols/affinity/square/gray/docker.svg @@ -0,0 +1,106 @@ + +image/svg+xml \ No newline at end of file diff --git a/gns3server/symbols/affinity/square/gray/sq_dslam.svg b/gns3server/symbols/affinity/square/gray/dslam.svg similarity index 100% rename from gns3server/symbols/affinity/square/gray/sq_dslam.svg rename to gns3server/symbols/affinity/square/gray/dslam.svg diff --git a/gns3server/symbols/affinity/square/gray/sq_fingerprint.svg b/gns3server/symbols/affinity/square/gray/fingerprint.svg similarity index 100% rename from gns3server/symbols/affinity/square/gray/sq_fingerprint.svg rename to gns3server/symbols/affinity/square/gray/fingerprint.svg diff --git a/gns3server/symbols/affinity/square/gray/sq_firewall.svg b/gns3server/symbols/affinity/square/gray/firewall.svg similarity index 100% rename from gns3server/symbols/affinity/square/gray/sq_firewall.svg rename to gns3server/symbols/affinity/square/gray/firewall.svg diff --git a/gns3server/symbols/affinity/square/gray/sq_firewall3.svg b/gns3server/symbols/affinity/square/gray/firewall3.svg similarity index 100% rename from gns3server/symbols/affinity/square/gray/sq_firewall3.svg rename to gns3server/symbols/affinity/square/gray/firewall3.svg diff --git a/gns3server/symbols/affinity/square/gray/sq_grid.svg b/gns3server/symbols/affinity/square/gray/grid.svg similarity index 100% rename from gns3server/symbols/affinity/square/gray/sq_grid.svg rename to gns3server/symbols/affinity/square/gray/grid.svg diff --git a/gns3server/symbols/affinity/square/gray/sq_grid2.svg b/gns3server/symbols/affinity/square/gray/grid2.svg similarity index 100% rename from gns3server/symbols/affinity/square/gray/sq_grid2.svg rename to gns3server/symbols/affinity/square/gray/grid2.svg diff --git a/gns3server/symbols/affinity/square/gray/sq_hub.svg b/gns3server/symbols/affinity/square/gray/hub.svg similarity index 100% rename from gns3server/symbols/affinity/square/gray/sq_hub.svg rename to gns3server/symbols/affinity/square/gray/hub.svg diff --git a/gns3server/symbols/affinity/square/gray/sq_inspect2.svg b/gns3server/symbols/affinity/square/gray/inspect2.svg similarity index 100% rename from gns3server/symbols/affinity/square/gray/sq_inspect2.svg rename to gns3server/symbols/affinity/square/gray/inspect2.svg diff --git a/gns3server/symbols/affinity/square/gray/sq_inspect3.svg b/gns3server/symbols/affinity/square/gray/inspect3.svg similarity index 100% rename from gns3server/symbols/affinity/square/gray/sq_inspect3.svg rename to gns3server/symbols/affinity/square/gray/inspect3.svg diff --git a/gns3server/symbols/affinity/square/gray/sq_interconnect.svg b/gns3server/symbols/affinity/square/gray/interconnect.svg similarity index 100% rename from gns3server/symbols/affinity/square/gray/sq_interconnect.svg rename to gns3server/symbols/affinity/square/gray/interconnect.svg diff --git a/gns3server/symbols/affinity/square/gray/sq_isdn.svg b/gns3server/symbols/affinity/square/gray/isdn.svg similarity index 100% rename from gns3server/symbols/affinity/square/gray/sq_isdn.svg rename to gns3server/symbols/affinity/square/gray/isdn.svg diff --git a/gns3server/symbols/affinity/square/gray/sq_ldap.svg b/gns3server/symbols/affinity/square/gray/ldap.svg similarity index 100% rename from gns3server/symbols/affinity/square/gray/sq_ldap.svg rename to gns3server/symbols/affinity/square/gray/ldap.svg diff --git a/gns3server/symbols/affinity/square/gray/sq_light_bulb.svg b/gns3server/symbols/affinity/square/gray/light_bulb.svg similarity index 100% rename from gns3server/symbols/affinity/square/gray/sq_light_bulb.svg rename to gns3server/symbols/affinity/square/gray/light_bulb.svg diff --git a/gns3server/symbols/affinity/square/gray/sq_link.svg b/gns3server/symbols/affinity/square/gray/link.svg similarity index 100% rename from gns3server/symbols/affinity/square/gray/sq_link.svg rename to gns3server/symbols/affinity/square/gray/link.svg diff --git a/gns3server/symbols/affinity/square/gray/sq_nas.svg b/gns3server/symbols/affinity/square/gray/nas.svg similarity index 100% rename from gns3server/symbols/affinity/square/gray/sq_nas.svg rename to gns3server/symbols/affinity/square/gray/nas.svg diff --git a/gns3server/symbols/affinity/square/gray/sq_pinpoint.svg b/gns3server/symbols/affinity/square/gray/pinpoint.svg similarity index 100% rename from gns3server/symbols/affinity/square/gray/sq_pinpoint.svg rename to gns3server/symbols/affinity/square/gray/pinpoint.svg diff --git a/gns3server/symbols/affinity/square/gray/sq_printer.svg b/gns3server/symbols/affinity/square/gray/printer.svg similarity index 100% rename from gns3server/symbols/affinity/square/gray/sq_printer.svg rename to gns3server/symbols/affinity/square/gray/printer.svg diff --git a/gns3server/symbols/affinity/square/gray/sq_rj45.svg b/gns3server/symbols/affinity/square/gray/rj45.svg similarity index 100% rename from gns3server/symbols/affinity/square/gray/sq_rj45.svg rename to gns3server/symbols/affinity/square/gray/rj45.svg diff --git a/gns3server/symbols/affinity/square/gray/sq_router.svg b/gns3server/symbols/affinity/square/gray/router.svg similarity index 100% rename from gns3server/symbols/affinity/square/gray/sq_router.svg rename to gns3server/symbols/affinity/square/gray/router.svg diff --git a/gns3server/symbols/affinity/square/gray/sq_router_cloud.svg b/gns3server/symbols/affinity/square/gray/router_cloud.svg similarity index 100% rename from gns3server/symbols/affinity/square/gray/sq_router_cloud.svg rename to gns3server/symbols/affinity/square/gray/router_cloud.svg diff --git a/gns3server/symbols/affinity/square/gray/sq_satellite.svg b/gns3server/symbols/affinity/square/gray/satellite.svg similarity index 100% rename from gns3server/symbols/affinity/square/gray/sq_satellite.svg rename to gns3server/symbols/affinity/square/gray/satellite.svg diff --git a/gns3server/symbols/affinity/square/gray/sq_satellite_dish.svg b/gns3server/symbols/affinity/square/gray/satellite_dish.svg similarity index 100% rename from gns3server/symbols/affinity/square/gray/sq_satellite_dish.svg rename to gns3server/symbols/affinity/square/gray/satellite_dish.svg diff --git a/gns3server/symbols/affinity/square/gray/sq_scull.svg b/gns3server/symbols/affinity/square/gray/scull.svg similarity index 100% rename from gns3server/symbols/affinity/square/gray/sq_scull.svg rename to gns3server/symbols/affinity/square/gray/scull.svg diff --git a/gns3server/symbols/affinity/square/gray/sq_server-cluster.svg b/gns3server/symbols/affinity/square/gray/server-cluster.svg similarity index 100% rename from gns3server/symbols/affinity/square/gray/sq_server-cluster.svg rename to gns3server/symbols/affinity/square/gray/server-cluster.svg diff --git a/gns3server/symbols/affinity/square/gray/sq_server.svg b/gns3server/symbols/affinity/square/gray/server.svg similarity index 100% rename from gns3server/symbols/affinity/square/gray/sq_server.svg rename to gns3server/symbols/affinity/square/gray/server.svg diff --git a/gns3server/symbols/affinity/square/gray/sq_cloud.svg b/gns3server/symbols/affinity/square/gray/sq_cloud.svg deleted file mode 100644 index c9dc4368..00000000 --- a/gns3server/symbols/affinity/square/gray/sq_cloud.svg +++ /dev/null @@ -1,61 +0,0 @@ - -image/svg+xml diff --git a/gns3server/symbols/affinity/square/gray/sq_square.svg b/gns3server/symbols/affinity/square/gray/square.svg similarity index 100% rename from gns3server/symbols/affinity/square/gray/sq_square.svg rename to gns3server/symbols/affinity/square/gray/square.svg diff --git a/gns3server/symbols/affinity/square/gray/sq_statistics.svg b/gns3server/symbols/affinity/square/gray/statistics.svg similarity index 100% rename from gns3server/symbols/affinity/square/gray/sq_statistics.svg rename to gns3server/symbols/affinity/square/gray/statistics.svg diff --git a/gns3server/symbols/affinity/square/gray/sq_storage.svg b/gns3server/symbols/affinity/square/gray/storage.svg similarity index 100% rename from gns3server/symbols/affinity/square/gray/sq_storage.svg rename to gns3server/symbols/affinity/square/gray/storage.svg diff --git a/gns3server/symbols/affinity/square/gray/sq_switch.svg b/gns3server/symbols/affinity/square/gray/switch.svg similarity index 100% rename from gns3server/symbols/affinity/square/gray/sq_switch.svg rename to gns3server/symbols/affinity/square/gray/switch.svg diff --git a/gns3server/symbols/affinity/square/gray/sq_switch_multilayer.svg b/gns3server/symbols/affinity/square/gray/switch_multilayer.svg similarity index 100% rename from gns3server/symbols/affinity/square/gray/sq_switch_multilayer.svg rename to gns3server/symbols/affinity/square/gray/switch_multilayer.svg diff --git a/gns3server/symbols/affinity/square/gray/sq_tablet.svg b/gns3server/symbols/affinity/square/gray/tablet.svg similarity index 100% rename from gns3server/symbols/affinity/square/gray/sq_tablet.svg rename to gns3server/symbols/affinity/square/gray/tablet.svg diff --git a/gns3server/symbols/affinity/square/gray/sq_tree.svg b/gns3server/symbols/affinity/square/gray/tree.svg similarity index 100% rename from gns3server/symbols/affinity/square/gray/sq_tree.svg rename to gns3server/symbols/affinity/square/gray/tree.svg diff --git a/gns3server/symbols/affinity/square/gray/sq_user.svg b/gns3server/symbols/affinity/square/gray/user.svg similarity index 100% rename from gns3server/symbols/affinity/square/gray/sq_user.svg rename to gns3server/symbols/affinity/square/gray/user.svg diff --git a/gns3server/symbols/affinity/square/gray/virtualbox.svg b/gns3server/symbols/affinity/square/gray/virtualbox.svg new file mode 100644 index 00000000..f035d6b3 --- /dev/null +++ b/gns3server/symbols/affinity/square/gray/virtualbox.svg @@ -0,0 +1,58 @@ + +image/svg+xml \ No newline at end of file diff --git a/gns3server/symbols/affinity/square/gray/sq_vm.svg b/gns3server/symbols/affinity/square/gray/vm.svg similarity index 100% rename from gns3server/symbols/affinity/square/gray/sq_vm.svg rename to gns3server/symbols/affinity/square/gray/vm.svg diff --git a/gns3server/symbols/affinity/square/gray/vmware.svg b/gns3server/symbols/affinity/square/gray/vmware.svg new file mode 100644 index 00000000..16f994df --- /dev/null +++ b/gns3server/symbols/affinity/square/gray/vmware.svg @@ -0,0 +1,58 @@ + +image/svg+xml \ No newline at end of file diff --git a/gns3server/symbols/affinity/square/gray/sq_wifi.svg b/gns3server/symbols/affinity/square/gray/wifi.svg similarity index 100% rename from gns3server/symbols/affinity/square/gray/sq_wifi.svg rename to gns3server/symbols/affinity/square/gray/wifi.svg diff --git a/gns3server/symbols/affinity/square/gray/sq_wlc.svg b/gns3server/symbols/affinity/square/gray/wlc.svg similarity index 100% rename from gns3server/symbols/affinity/square/gray/sq_wlc.svg rename to gns3server/symbols/affinity/square/gray/wlc.svg diff --git a/gns3server/symbols/affinity/square/gray/sq_xml.svg b/gns3server/symbols/affinity/square/gray/xml.svg similarity index 100% rename from gns3server/symbols/affinity/square/gray/sq_xml.svg rename to gns3server/symbols/affinity/square/gray/xml.svg diff --git a/gns3server/symbols/affinity/square/red/atm.svg b/gns3server/symbols/affinity/square/red/atm.svg new file mode 100644 index 00000000..0a8b0654 --- /dev/null +++ b/gns3server/symbols/affinity/square/red/atm.svg @@ -0,0 +1,55 @@ + +image/svg+xml \ No newline at end of file diff --git a/gns3server/symbols/affinity/square/red/sq_camera_red.svg b/gns3server/symbols/affinity/square/red/camera.svg similarity index 100% rename from gns3server/symbols/affinity/square/red/sq_camera_red.svg rename to gns3server/symbols/affinity/square/red/camera.svg diff --git a/gns3server/symbols/affinity/square/red/sq_camera_dome_red.svg b/gns3server/symbols/affinity/square/red/camera_dome.svg similarity index 100% rename from gns3server/symbols/affinity/square/red/sq_camera_dome_red.svg rename to gns3server/symbols/affinity/square/red/camera_dome.svg diff --git a/gns3server/symbols/affinity/square/red/sq_client_red.svg b/gns3server/symbols/affinity/square/red/client.svg similarity index 100% rename from gns3server/symbols/affinity/square/red/sq_client_red.svg rename to gns3server/symbols/affinity/square/red/client.svg diff --git a/gns3server/symbols/affinity/square/red/sq_client_vm_red.svg b/gns3server/symbols/affinity/square/red/client_vm.svg similarity index 100% rename from gns3server/symbols/affinity/square/red/sq_client_vm_red.svg rename to gns3server/symbols/affinity/square/red/client_vm.svg diff --git a/gns3server/symbols/affinity/square/red/cloud.svg b/gns3server/symbols/affinity/square/red/cloud.svg new file mode 100644 index 00000000..4a0b045c --- /dev/null +++ b/gns3server/symbols/affinity/square/red/cloud.svg @@ -0,0 +1,57 @@ + +image/svg+xml \ No newline at end of file diff --git a/gns3server/symbols/affinity/square/red/sq_cog_red.svg b/gns3server/symbols/affinity/square/red/cog.svg similarity index 100% rename from gns3server/symbols/affinity/square/red/sq_cog_red.svg rename to gns3server/symbols/affinity/square/red/cog.svg diff --git a/gns3server/symbols/affinity/square/red/sq_communications_red.svg b/gns3server/symbols/affinity/square/red/communications.svg similarity index 100% rename from gns3server/symbols/affinity/square/red/sq_communications_red.svg rename to gns3server/symbols/affinity/square/red/communications.svg diff --git a/gns3server/symbols/affinity/square/red/sq_conversation_red.svg b/gns3server/symbols/affinity/square/red/conversation.svg similarity index 100% rename from gns3server/symbols/affinity/square/red/sq_conversation_red.svg rename to gns3server/symbols/affinity/square/red/conversation.svg diff --git a/gns3server/symbols/affinity/square/red/docker.svg b/gns3server/symbols/affinity/square/red/docker.svg new file mode 100644 index 00000000..28ef7689 --- /dev/null +++ b/gns3server/symbols/affinity/square/red/docker.svg @@ -0,0 +1,106 @@ + +image/svg+xml \ No newline at end of file diff --git a/gns3server/symbols/affinity/square/red/sq_dslam_red.svg b/gns3server/symbols/affinity/square/red/dslam.svg similarity index 100% rename from gns3server/symbols/affinity/square/red/sq_dslam_red.svg rename to gns3server/symbols/affinity/square/red/dslam.svg diff --git a/gns3server/symbols/affinity/square/red/sq_fingerprint_red.svg b/gns3server/symbols/affinity/square/red/fingerprint.svg similarity index 100% rename from gns3server/symbols/affinity/square/red/sq_fingerprint_red.svg rename to gns3server/symbols/affinity/square/red/fingerprint.svg diff --git a/gns3server/symbols/affinity/square/red/sq_firewall_red.svg b/gns3server/symbols/affinity/square/red/firewall.svg similarity index 100% rename from gns3server/symbols/affinity/square/red/sq_firewall_red.svg rename to gns3server/symbols/affinity/square/red/firewall.svg diff --git a/gns3server/symbols/affinity/square/red/sq_firewall3_red.svg b/gns3server/symbols/affinity/square/red/firewall3.svg similarity index 100% rename from gns3server/symbols/affinity/square/red/sq_firewall3_red.svg rename to gns3server/symbols/affinity/square/red/firewall3.svg diff --git a/gns3server/symbols/affinity/square/red/sq_grid_red.svg b/gns3server/symbols/affinity/square/red/grid.svg similarity index 100% rename from gns3server/symbols/affinity/square/red/sq_grid_red.svg rename to gns3server/symbols/affinity/square/red/grid.svg diff --git a/gns3server/symbols/affinity/square/red/sq_grid2_red.svg b/gns3server/symbols/affinity/square/red/grid2.svg similarity index 100% rename from gns3server/symbols/affinity/square/red/sq_grid2_red.svg rename to gns3server/symbols/affinity/square/red/grid2.svg diff --git a/gns3server/symbols/affinity/square/red/sq_hub_red.svg b/gns3server/symbols/affinity/square/red/hub.svg similarity index 100% rename from gns3server/symbols/affinity/square/red/sq_hub_red.svg rename to gns3server/symbols/affinity/square/red/hub.svg diff --git a/gns3server/symbols/affinity/square/red/sq_inspect2_red.svg b/gns3server/symbols/affinity/square/red/inspect2.svg similarity index 100% rename from gns3server/symbols/affinity/square/red/sq_inspect2_red.svg rename to gns3server/symbols/affinity/square/red/inspect2.svg diff --git a/gns3server/symbols/affinity/square/red/sq_inspect3_red.svg b/gns3server/symbols/affinity/square/red/inspect3.svg similarity index 100% rename from gns3server/symbols/affinity/square/red/sq_inspect3_red.svg rename to gns3server/symbols/affinity/square/red/inspect3.svg diff --git a/gns3server/symbols/affinity/square/red/sq_interconnect_red.svg b/gns3server/symbols/affinity/square/red/interconnect.svg similarity index 100% rename from gns3server/symbols/affinity/square/red/sq_interconnect_red.svg rename to gns3server/symbols/affinity/square/red/interconnect.svg diff --git a/gns3server/symbols/affinity/square/red/sq_isdn_red.svg b/gns3server/symbols/affinity/square/red/isdn.svg similarity index 100% rename from gns3server/symbols/affinity/square/red/sq_isdn_red.svg rename to gns3server/symbols/affinity/square/red/isdn.svg diff --git a/gns3server/symbols/affinity/square/red/sq_ldap_red.svg b/gns3server/symbols/affinity/square/red/ldap.svg similarity index 100% rename from gns3server/symbols/affinity/square/red/sq_ldap_red.svg rename to gns3server/symbols/affinity/square/red/ldap.svg diff --git a/gns3server/symbols/affinity/square/red/sq_light_bulb_red.svg b/gns3server/symbols/affinity/square/red/light_bulb.svg similarity index 100% rename from gns3server/symbols/affinity/square/red/sq_light_bulb_red.svg rename to gns3server/symbols/affinity/square/red/light_bulb.svg diff --git a/gns3server/symbols/affinity/square/red/sq_link_red.svg b/gns3server/symbols/affinity/square/red/link.svg similarity index 100% rename from gns3server/symbols/affinity/square/red/sq_link_red.svg rename to gns3server/symbols/affinity/square/red/link.svg diff --git a/gns3server/symbols/affinity/square/red/sq_nas_red.svg b/gns3server/symbols/affinity/square/red/nas.svg similarity index 100% rename from gns3server/symbols/affinity/square/red/sq_nas_red.svg rename to gns3server/symbols/affinity/square/red/nas.svg diff --git a/gns3server/symbols/affinity/square/red/sq_pinpoint_red.svg b/gns3server/symbols/affinity/square/red/pinpoint.svg similarity index 100% rename from gns3server/symbols/affinity/square/red/sq_pinpoint_red.svg rename to gns3server/symbols/affinity/square/red/pinpoint.svg diff --git a/gns3server/symbols/affinity/square/red/sq_printer_red.svg b/gns3server/symbols/affinity/square/red/printer.svg similarity index 100% rename from gns3server/symbols/affinity/square/red/sq_printer_red.svg rename to gns3server/symbols/affinity/square/red/printer.svg diff --git a/gns3server/symbols/affinity/square/red/sq_rj45_red.svg b/gns3server/symbols/affinity/square/red/rj45.svg similarity index 100% rename from gns3server/symbols/affinity/square/red/sq_rj45_red.svg rename to gns3server/symbols/affinity/square/red/rj45.svg diff --git a/gns3server/symbols/affinity/square/red/sq_router_red.svg b/gns3server/symbols/affinity/square/red/router.svg similarity index 100% rename from gns3server/symbols/affinity/square/red/sq_router_red.svg rename to gns3server/symbols/affinity/square/red/router.svg diff --git a/gns3server/symbols/affinity/square/red/sq_router_cloud_red.svg b/gns3server/symbols/affinity/square/red/router_cloud.svg similarity index 100% rename from gns3server/symbols/affinity/square/red/sq_router_cloud_red.svg rename to gns3server/symbols/affinity/square/red/router_cloud.svg diff --git a/gns3server/symbols/affinity/square/red/sq_satellite_red.svg b/gns3server/symbols/affinity/square/red/satellite.svg similarity index 100% rename from gns3server/symbols/affinity/square/red/sq_satellite_red.svg rename to gns3server/symbols/affinity/square/red/satellite.svg diff --git a/gns3server/symbols/affinity/square/red/sq_satellite_dish_red.svg b/gns3server/symbols/affinity/square/red/satellite_dish.svg similarity index 100% rename from gns3server/symbols/affinity/square/red/sq_satellite_dish_red.svg rename to gns3server/symbols/affinity/square/red/satellite_dish.svg diff --git a/gns3server/symbols/affinity/square/red/sq_scull_red.svg b/gns3server/symbols/affinity/square/red/scull.svg similarity index 100% rename from gns3server/symbols/affinity/square/red/sq_scull_red.svg rename to gns3server/symbols/affinity/square/red/scull.svg diff --git a/gns3server/symbols/affinity/square/red/sq_server-cluster_red.svg b/gns3server/symbols/affinity/square/red/server-cluster.svg similarity index 100% rename from gns3server/symbols/affinity/square/red/sq_server-cluster_red.svg rename to gns3server/symbols/affinity/square/red/server-cluster.svg diff --git a/gns3server/symbols/affinity/square/red/sq_server_red.svg b/gns3server/symbols/affinity/square/red/server.svg similarity index 100% rename from gns3server/symbols/affinity/square/red/sq_server_red.svg rename to gns3server/symbols/affinity/square/red/server.svg diff --git a/gns3server/symbols/affinity/square/red/sq_cloud_red.svg b/gns3server/symbols/affinity/square/red/sq_cloud_red.svg deleted file mode 100644 index 50b13038..00000000 --- a/gns3server/symbols/affinity/square/red/sq_cloud_red.svg +++ /dev/null @@ -1,61 +0,0 @@ - -image/svg+xml diff --git a/gns3server/symbols/affinity/square/red/sq_square_red.svg b/gns3server/symbols/affinity/square/red/square.svg similarity index 100% rename from gns3server/symbols/affinity/square/red/sq_square_red.svg rename to gns3server/symbols/affinity/square/red/square.svg diff --git a/gns3server/symbols/affinity/square/red/sq_statistics_red.svg b/gns3server/symbols/affinity/square/red/statistics.svg similarity index 100% rename from gns3server/symbols/affinity/square/red/sq_statistics_red.svg rename to gns3server/symbols/affinity/square/red/statistics.svg diff --git a/gns3server/symbols/affinity/square/red/sq_storage_red.svg b/gns3server/symbols/affinity/square/red/storage.svg similarity index 100% rename from gns3server/symbols/affinity/square/red/sq_storage_red.svg rename to gns3server/symbols/affinity/square/red/storage.svg diff --git a/gns3server/symbols/affinity/square/red/sq_switch_red.svg b/gns3server/symbols/affinity/square/red/switch.svg similarity index 100% rename from gns3server/symbols/affinity/square/red/sq_switch_red.svg rename to gns3server/symbols/affinity/square/red/switch.svg diff --git a/gns3server/symbols/affinity/square/red/sq_switch_multilayer_red.svg b/gns3server/symbols/affinity/square/red/switch_multilayer.svg similarity index 100% rename from gns3server/symbols/affinity/square/red/sq_switch_multilayer_red.svg rename to gns3server/symbols/affinity/square/red/switch_multilayer.svg diff --git a/gns3server/symbols/affinity/square/red/sq_tablet_red.svg b/gns3server/symbols/affinity/square/red/tablet.svg similarity index 100% rename from gns3server/symbols/affinity/square/red/sq_tablet_red.svg rename to gns3server/symbols/affinity/square/red/tablet.svg diff --git a/gns3server/symbols/affinity/square/red/sq_tree_red.svg b/gns3server/symbols/affinity/square/red/tree.svg similarity index 100% rename from gns3server/symbols/affinity/square/red/sq_tree_red.svg rename to gns3server/symbols/affinity/square/red/tree.svg diff --git a/gns3server/symbols/affinity/square/red/sq_user_red.svg b/gns3server/symbols/affinity/square/red/user.svg similarity index 100% rename from gns3server/symbols/affinity/square/red/sq_user_red.svg rename to gns3server/symbols/affinity/square/red/user.svg diff --git a/gns3server/symbols/affinity/square/red/virtualbox.svg b/gns3server/symbols/affinity/square/red/virtualbox.svg new file mode 100644 index 00000000..dd89627e --- /dev/null +++ b/gns3server/symbols/affinity/square/red/virtualbox.svg @@ -0,0 +1,58 @@ + +image/svg+xml \ No newline at end of file diff --git a/gns3server/symbols/affinity/square/red/sq_vm_red.svg b/gns3server/symbols/affinity/square/red/vm.svg similarity index 100% rename from gns3server/symbols/affinity/square/red/sq_vm_red.svg rename to gns3server/symbols/affinity/square/red/vm.svg diff --git a/gns3server/symbols/affinity/square/red/vmware.svg b/gns3server/symbols/affinity/square/red/vmware.svg new file mode 100644 index 00000000..c9fef843 --- /dev/null +++ b/gns3server/symbols/affinity/square/red/vmware.svg @@ -0,0 +1,58 @@ + +image/svg+xml \ No newline at end of file diff --git a/gns3server/symbols/affinity/square/red/sq_wifi_red.svg b/gns3server/symbols/affinity/square/red/wifi.svg similarity index 100% rename from gns3server/symbols/affinity/square/red/sq_wifi_red.svg rename to gns3server/symbols/affinity/square/red/wifi.svg diff --git a/gns3server/symbols/affinity/square/red/sq_wlc_red.svg b/gns3server/symbols/affinity/square/red/wlc.svg similarity index 100% rename from gns3server/symbols/affinity/square/red/sq_wlc_red.svg rename to gns3server/symbols/affinity/square/red/wlc.svg diff --git a/gns3server/symbols/affinity/square/red/sq_xml_red.svg b/gns3server/symbols/affinity/square/red/xml.svg similarity index 100% rename from gns3server/symbols/affinity/square/red/sq_xml_red.svg rename to gns3server/symbols/affinity/square/red/xml.svg diff --git a/gns3server/symbols/PBX.svg b/gns3server/symbols/classic/PBX.svg similarity index 100% rename from gns3server/symbols/PBX.svg rename to gns3server/symbols/classic/PBX.svg diff --git a/gns3server/symbols/PIX_firewall.svg b/gns3server/symbols/classic/PIX_firewall.svg similarity index 100% rename from gns3server/symbols/PIX_firewall.svg rename to gns3server/symbols/classic/PIX_firewall.svg diff --git a/gns3server/symbols/access_point.svg b/gns3server/symbols/classic/access_point.svg similarity index 100% rename from gns3server/symbols/access_point.svg rename to gns3server/symbols/classic/access_point.svg diff --git a/gns3server/symbols/access_server.svg b/gns3server/symbols/classic/access_server.svg similarity index 100% rename from gns3server/symbols/access_server.svg rename to gns3server/symbols/classic/access_server.svg diff --git a/gns3server/symbols/asa.svg b/gns3server/symbols/classic/asa.svg similarity index 100% rename from gns3server/symbols/asa.svg rename to gns3server/symbols/classic/asa.svg diff --git a/gns3server/symbols/atm_bridge.svg b/gns3server/symbols/classic/atm_bridge.svg similarity index 100% rename from gns3server/symbols/atm_bridge.svg rename to gns3server/symbols/classic/atm_bridge.svg diff --git a/gns3server/symbols/atm_switch.svg b/gns3server/symbols/classic/atm_switch.svg similarity index 100% rename from gns3server/symbols/atm_switch.svg rename to gns3server/symbols/classic/atm_switch.svg diff --git a/gns3server/symbols/call_manager.svg b/gns3server/symbols/classic/call_manager.svg similarity index 100% rename from gns3server/symbols/call_manager.svg rename to gns3server/symbols/classic/call_manager.svg diff --git a/gns3server/symbols/cloud.svg b/gns3server/symbols/classic/cloud.svg similarity index 100% rename from gns3server/symbols/cloud.svg rename to gns3server/symbols/classic/cloud.svg diff --git a/gns3server/symbols/computer.svg b/gns3server/symbols/classic/computer.svg similarity index 100% rename from gns3server/symbols/computer.svg rename to gns3server/symbols/classic/computer.svg diff --git a/gns3server/symbols/docker_guest.svg b/gns3server/symbols/classic/docker_guest.svg similarity index 100% rename from gns3server/symbols/docker_guest.svg rename to gns3server/symbols/classic/docker_guest.svg diff --git a/gns3server/symbols/dslam.svg b/gns3server/symbols/classic/dslam.svg similarity index 100% rename from gns3server/symbols/dslam.svg rename to gns3server/symbols/classic/dslam.svg diff --git a/gns3server/symbols/edge_label_switch_router.svg b/gns3server/symbols/classic/edge_label_switch_router.svg similarity index 100% rename from gns3server/symbols/edge_label_switch_router.svg rename to gns3server/symbols/classic/edge_label_switch_router.svg diff --git a/gns3server/symbols/ethernet_switch.svg b/gns3server/symbols/classic/ethernet_switch.svg similarity index 100% rename from gns3server/symbols/ethernet_switch.svg rename to gns3server/symbols/classic/ethernet_switch.svg diff --git a/gns3server/symbols/firewall.svg b/gns3server/symbols/classic/firewall.svg similarity index 100% rename from gns3server/symbols/firewall.svg rename to gns3server/symbols/classic/firewall.svg diff --git a/gns3server/symbols/frame_relay_switch.svg b/gns3server/symbols/classic/frame_relay_switch.svg similarity index 100% rename from gns3server/symbols/frame_relay_switch.svg rename to gns3server/symbols/classic/frame_relay_switch.svg diff --git a/gns3server/symbols/gateway.svg b/gns3server/symbols/classic/gateway.svg similarity index 100% rename from gns3server/symbols/gateway.svg rename to gns3server/symbols/classic/gateway.svg diff --git a/gns3server/symbols/hub.svg b/gns3server/symbols/classic/hub.svg similarity index 100% rename from gns3server/symbols/hub.svg rename to gns3server/symbols/classic/hub.svg diff --git a/gns3server/symbols/ids.svg b/gns3server/symbols/classic/ids.svg similarity index 100% rename from gns3server/symbols/ids.svg rename to gns3server/symbols/classic/ids.svg diff --git a/gns3server/symbols/iosv_l2_virl.svg b/gns3server/symbols/classic/iosv_l2_virl.svg similarity index 100% rename from gns3server/symbols/iosv_l2_virl.svg rename to gns3server/symbols/classic/iosv_l2_virl.svg diff --git a/gns3server/symbols/iosv_virl.svg b/gns3server/symbols/classic/iosv_virl.svg similarity index 100% rename from gns3server/symbols/iosv_virl.svg rename to gns3server/symbols/classic/iosv_virl.svg diff --git a/gns3server/symbols/ip_phone.svg b/gns3server/symbols/classic/ip_phone.svg similarity index 100% rename from gns3server/symbols/ip_phone.svg rename to gns3server/symbols/classic/ip_phone.svg diff --git a/gns3server/symbols/label_switch_router.svg b/gns3server/symbols/classic/label_switch_router.svg similarity index 100% rename from gns3server/symbols/label_switch_router.svg rename to gns3server/symbols/classic/label_switch_router.svg diff --git a/gns3server/symbols/lightweight_ap.svg b/gns3server/symbols/classic/lightweight_ap.svg similarity index 100% rename from gns3server/symbols/lightweight_ap.svg rename to gns3server/symbols/classic/lightweight_ap.svg diff --git a/gns3server/symbols/multilayer_switch.svg b/gns3server/symbols/classic/multilayer_switch.svg similarity index 100% rename from gns3server/symbols/multilayer_switch.svg rename to gns3server/symbols/classic/multilayer_switch.svg diff --git a/gns3server/symbols/optical_router.svg b/gns3server/symbols/classic/optical_router.svg similarity index 100% rename from gns3server/symbols/optical_router.svg rename to gns3server/symbols/classic/optical_router.svg diff --git a/gns3server/symbols/printer.svg b/gns3server/symbols/classic/printer.svg similarity index 100% rename from gns3server/symbols/printer.svg rename to gns3server/symbols/classic/printer.svg diff --git a/gns3server/symbols/qemu_guest.svg b/gns3server/symbols/classic/qemu_guest.svg similarity index 100% rename from gns3server/symbols/qemu_guest.svg rename to gns3server/symbols/classic/qemu_guest.svg diff --git a/gns3server/symbols/route_switch_processor.svg b/gns3server/symbols/classic/route_switch_processor.svg similarity index 100% rename from gns3server/symbols/route_switch_processor.svg rename to gns3server/symbols/classic/route_switch_processor.svg diff --git a/gns3server/symbols/router.awp.svg b/gns3server/symbols/classic/router.awp.svg similarity index 100% rename from gns3server/symbols/router.awp.svg rename to gns3server/symbols/classic/router.awp.svg diff --git a/gns3server/symbols/router.svg b/gns3server/symbols/classic/router.svg similarity index 100% rename from gns3server/symbols/router.svg rename to gns3server/symbols/classic/router.svg diff --git a/gns3server/symbols/router_firewall.svg b/gns3server/symbols/classic/router_firewall.svg similarity index 100% rename from gns3server/symbols/router_firewall.svg rename to gns3server/symbols/classic/router_firewall.svg diff --git a/gns3server/symbols/router_netflow.svg b/gns3server/symbols/classic/router_netflow.svg similarity index 100% rename from gns3server/symbols/router_netflow.svg rename to gns3server/symbols/classic/router_netflow.svg diff --git a/gns3server/symbols/server.svg b/gns3server/symbols/classic/server.svg similarity index 100% rename from gns3server/symbols/server.svg rename to gns3server/symbols/classic/server.svg diff --git a/gns3server/symbols/sip_server.svg b/gns3server/symbols/classic/sip_server.svg similarity index 100% rename from gns3server/symbols/sip_server.svg rename to gns3server/symbols/classic/sip_server.svg diff --git a/gns3server/symbols/traceng.svg b/gns3server/symbols/classic/traceng.svg similarity index 100% rename from gns3server/symbols/traceng.svg rename to gns3server/symbols/classic/traceng.svg diff --git a/gns3server/symbols/vbox_guest.svg b/gns3server/symbols/classic/vbox_guest.svg similarity index 100% rename from gns3server/symbols/vbox_guest.svg rename to gns3server/symbols/classic/vbox_guest.svg diff --git a/gns3server/symbols/vmware_guest.svg b/gns3server/symbols/classic/vmware_guest.svg similarity index 100% rename from gns3server/symbols/vmware_guest.svg rename to gns3server/symbols/classic/vmware_guest.svg diff --git a/gns3server/symbols/voice_access_server.svg b/gns3server/symbols/classic/voice_access_server.svg similarity index 100% rename from gns3server/symbols/voice_access_server.svg rename to gns3server/symbols/classic/voice_access_server.svg diff --git a/gns3server/symbols/voice_router.svg b/gns3server/symbols/classic/voice_router.svg similarity index 100% rename from gns3server/symbols/voice_router.svg rename to gns3server/symbols/classic/voice_router.svg diff --git a/gns3server/symbols/vpcs_guest.svg b/gns3server/symbols/classic/vpcs_guest.svg similarity index 100% rename from gns3server/symbols/vpcs_guest.svg rename to gns3server/symbols/classic/vpcs_guest.svg diff --git a/gns3server/symbols/wlan_controller.svg b/gns3server/symbols/classic/wlan_controller.svg similarity index 100% rename from gns3server/symbols/wlan_controller.svg rename to gns3server/symbols/classic/wlan_controller.svg diff --git a/tests/controller/test_node.py b/tests/controller/test_node.py index 715cdbbf..7ca9714a 100644 --- a/tests/controller/test_node.py +++ b/tests/controller/test_node.py @@ -252,10 +252,12 @@ def test_create_base_script(node, config, compute, tmpdir, async_run): compute.post.assert_called_with("/projects/{}/vpcs/nodes".format(node.project.id), data=data, timeout=1200) -def test_symbol(node, symbols_dir): +def test_symbol(node, symbols_dir, controller): """ Change symbol should change the node size """ + + controller.symbols.theme = "Classic" node.symbol = ":/symbols/dslam.svg" assert node.symbol == ":/symbols/dslam.svg" assert node.width == 50 @@ -271,7 +273,7 @@ def test_symbol(node, symbols_dir): assert node.label["y"] == -40 assert node.label["style"] == None#"font-family: TypeWriter;font-size: 10.0;font-weight: bold;fill: #000000;fill-opacity: 1.0;" - shutil.copy(os.path.join("gns3server", "symbols", "cloud.svg"), os.path.join(symbols_dir, "cloud2.svg")) + shutil.copy(os.path.join("gns3server", "symbols", "classic", "cloud.svg"), os.path.join(symbols_dir, "cloud2.svg")) node.symbol = "cloud2.svg" assert node.symbol == "cloud2.svg" assert node.width == 159 diff --git a/tests/controller/test_symbols.py b/tests/controller/test_symbols.py index c4344342..d8c0b9a7 100644 --- a/tests/controller/test_symbols.py +++ b/tests/controller/test_symbols.py @@ -30,8 +30,8 @@ def test_list(symbols_dir): symbols = Symbols() assert { - 'symbol_id': ':/symbols/firewall.svg', - 'filename': 'firewall.svg', + 'symbol_id': ':/symbols/classic/firewall.svg', + 'filename': 'classic/firewall.svg', 'builtin': True } in symbols.list() assert { @@ -42,10 +42,14 @@ def test_list(symbols_dir): def test_get_path(): + symbols = Symbols() - assert symbols.get_path(':/symbols/firewall.svg') == get_resource("symbols/firewall.svg") + symbols.theme = "Classic" + assert symbols.get_path(':/symbols/classic/firewall.svg') == get_resource("symbols/classic/firewall.svg") def test_get_size(): + symbols = Symbols() - assert symbols.get_size(':/symbols/firewall.svg') == (66, 45, 'svg') + symbols.theme = "Classic" + assert symbols.get_size(':/symbols/classic/firewall.svg') == (66, 45, 'svg') diff --git a/tests/handlers/api/controller/test_symbol.py b/tests/handlers/api/controller/test_symbol.py index cd6f15b2..5b5c6b6f 100644 --- a/tests/handlers/api/controller/test_symbol.py +++ b/tests/handlers/api/controller/test_symbol.py @@ -26,14 +26,15 @@ def test_symbols(http_controller): response = http_controller.get('/symbols', example=True) assert response.status == 200 assert { - 'symbol_id': ':/symbols/firewall.svg', - 'filename': 'firewall.svg', + 'symbol_id': ':/symbols/classic/firewall.svg', + 'filename': 'classic/firewall.svg', 'builtin': True } in response.json -def test_get(http_controller): - response = http_controller.get('/symbols/' + urllib.parse.quote(':/symbols/firewall.svg') + '/raw') +def test_get(http_controller, controller): + controller.symbols.theme = "Classic" + response = http_controller.get('/symbols/' + urllib.parse.quote(':/symbols/classic/firewall.svg') + '/raw') assert response.status == 200 assert response.headers['CONTENT-TYPE'] == 'image/svg+xml' assert response.headers['CONTENT-LENGTH'] == '9381' diff --git a/tests/utils/test_picture.py b/tests/utils/test_picture.py index a592d500..7f2a7141 100644 --- a/tests/utils/test_picture.py +++ b/tests/utils/test_picture.py @@ -32,11 +32,11 @@ def test_get_size(): with open("tests/resources/gns3_icon_128x64.png", "rb") as f: res = get_size(f.read()) assert res == (128, 64, "png") - with open("gns3server/symbols/dslam.svg", "rb") as f: + with open("gns3server/symbols/classic/dslam.svg", "rb") as f: res = get_size(f.read()) assert res == (50, 53, "svg") # Symbol using size with cm - with open("gns3server/symbols/cloud.svg", "rb") as f: + with open("gns3server/symbols/classic/cloud.svg", "rb") as f: res = get_size(f.read()) assert res == (159, 71, "svg") # Size with px From 51787295ddc478b01068cf1f72eff2c586b1aa10 Mon Sep 17 00:00:00 2001 From: grossmj Date: Fri, 23 Nov 2018 18:26:04 +0700 Subject: [PATCH 2/5] Use POSIX path for symbol ID. --- gns3server/controller/symbols.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gns3server/controller/symbols.py b/gns3server/controller/symbols.py index d325357a..46664bc4 100644 --- a/gns3server/controller/symbols.py +++ b/gns3server/controller/symbols.py @@ -16,6 +16,7 @@ # along with this program. If not, see . import os +import posixpath from .symbol_themes import BUILTIN_SYMBOL_THEMES from ..utils.get_resource import get_resource @@ -65,7 +66,7 @@ class Symbols: for filename in files: if filename.startswith('.'): continue - symbol_file = os.path.relpath(os.path.join(root, filename), get_resource("symbols")) + symbol_file = posixpath.normpath(os.path.relpath(os.path.join(root, filename), get_resource("symbols"))) symbol_id = ':/symbols/' + symbol_file symbols.append({'symbol_id': symbol_id, 'filename': symbol_file, @@ -78,7 +79,7 @@ class Symbols: for filename in files: if filename.startswith('.'): continue - symbol_file = os.path.relpath(os.path.join(root, filename), directory) + symbol_file = posixpath.normpath(os.path.relpath(os.path.join(root, filename), directory)) symbols.append({'symbol_id': symbol_file, 'filename': symbol_file, 'builtin': False,}) From 9f7f26700ee1efe3bfbd82dea895f881197bbf1f Mon Sep 17 00:00:00 2001 From: grossmj Date: Fri, 23 Nov 2018 18:33:45 +0700 Subject: [PATCH 3/5] Debugging for Windows. --- gns3server/controller/symbols.py | 1 + 1 file changed, 1 insertion(+) diff --git a/gns3server/controller/symbols.py b/gns3server/controller/symbols.py index 46664bc4..671a9fbc 100644 --- a/gns3server/controller/symbols.py +++ b/gns3server/controller/symbols.py @@ -113,6 +113,7 @@ class Symbols: except (OSError, KeyError): log.warning("Could not retrieve symbol '{}'".format(symbol_id)) symbols_path = self._symbols_path + log.warning(symbols_path) return symbols_path.get(":/symbols/classic/{}".format(os.path.basename(symbol_id)), symbols_path[":/symbols/classic/computer.svg"]) def get_size(self, symbol_id): From e0813bfbe82cf9b1c111db652ae8de07aa33728c Mon Sep 17 00:00:00 2001 From: grossmj Date: Fri, 23 Nov 2018 18:47:42 +0700 Subject: [PATCH 4/5] Normalize symbol ID on Windows. --- gns3server/controller/symbols.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gns3server/controller/symbols.py b/gns3server/controller/symbols.py index 671a9fbc..ab59d27d 100644 --- a/gns3server/controller/symbols.py +++ b/gns3server/controller/symbols.py @@ -66,7 +66,7 @@ class Symbols: for filename in files: if filename.startswith('.'): continue - symbol_file = posixpath.normpath(os.path.relpath(os.path.join(root, filename), get_resource("symbols"))) + symbol_file = posixpath.normpath(os.path.relpath(os.path.join(root, filename), get_resource("symbols"))).replace('\\', '/') symbol_id = ':/symbols/' + symbol_file symbols.append({'symbol_id': symbol_id, 'filename': symbol_file, @@ -79,7 +79,7 @@ class Symbols: for filename in files: if filename.startswith('.'): continue - symbol_file = posixpath.normpath(os.path.relpath(os.path.join(root, filename), directory)) + symbol_file = posixpath.normpath(os.path.relpath(os.path.join(root, filename), directory)).replace('\\', '/') symbols.append({'symbol_id': symbol_file, 'filename': symbol_file, 'builtin': False,}) From 219c346187f112d1ce6c4a14730e4f7b2dcbce3c Mon Sep 17 00:00:00 2001 From: grossmj Date: Sat, 24 Nov 2018 17:04:16 +0700 Subject: [PATCH 5/5] Remove useless warning. --- gns3server/controller/symbols.py | 1 - 1 file changed, 1 deletion(-) diff --git a/gns3server/controller/symbols.py b/gns3server/controller/symbols.py index ab59d27d..6177ec71 100644 --- a/gns3server/controller/symbols.py +++ b/gns3server/controller/symbols.py @@ -113,7 +113,6 @@ class Symbols: except (OSError, KeyError): log.warning("Could not retrieve symbol '{}'".format(symbol_id)) symbols_path = self._symbols_path - log.warning(symbols_path) return symbols_path.get(":/symbols/classic/{}".format(os.path.basename(symbol_id)), symbols_path[":/symbols/classic/computer.svg"]) def get_size(self, symbol_id):