diff --git a/gns3server/controller/symbol_themes.py b/gns3server/controller/symbol_themes.py index 68937ce6..81c0d941 100644 --- a/gns3server/controller/symbol_themes.py +++ b/gns3server/controller/symbol_themes.py @@ -17,6 +17,7 @@ CLASSIC_SYMBOL_THEME = {"cloud": ":/symbols/classic/cloud.svg", + "nat": ":/symbols/classic/nat.svg", "ethernet_switch": ":/symbols/classic/ethernet_switch.svg", "ethernet_hub": ":/symbols/classic/hub.svg", "frame_relay_switch": ":/symbols/classic/frame_relay_switch.svg", @@ -32,6 +33,7 @@ CLASSIC_SYMBOL_THEME = {"cloud": ":/symbols/classic/cloud.svg", "docker_guest": ":/symbols/classic/docker_guest.svg"} AFFINITY_SQUARE_BLUE_SYMBOL_THEME = {"cloud": ":/symbols/affinity/square/blue/cloud.svg", + "nat": ":/symbols/affinity/square/blue/nat.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", @@ -47,6 +49,7 @@ AFFINITY_SQUARE_BLUE_SYMBOL_THEME = {"cloud": ":/symbols/affinity/square/blue/cl "docker_guest": ":/symbols/affinity/square/blue/docker.svg"} AFFINITY_SQUARE_RED_SYMBOL_THEME = {"cloud": ":/symbols/affinity/square/red/cloud.svg", + "nat": ":/symbols/affinity/square/red/nat.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", @@ -62,6 +65,7 @@ AFFINITY_SQUARE_RED_SYMBOL_THEME = {"cloud": ":/symbols/affinity/square/red/clou "docker_guest": ":/symbols/affinity/square/red/docker.svg"} AFFINITY_SQUARE_GRAY_SYMBOL_THEME = {"cloud": ":/symbols/affinity/square/gray/cloud.svg", + "nat": ":/symbols/affinity/square/gray/nat.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", @@ -77,6 +81,7 @@ AFFINITY_SQUARE_GRAY_SYMBOL_THEME = {"cloud": ":/symbols/affinity/square/gray/cl "docker_guest": ":/symbols/affinity/square/gray/docker.svg"} AFFINITY_CIRCLE_BLUE_SYMBOL_THEME = {"cloud": ":/symbols/affinity/circle/blue/cloud.svg", + "nat": ":/symbols/affinity/circle/blue/nat.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", @@ -92,6 +97,7 @@ AFFINITY_CIRCLE_BLUE_SYMBOL_THEME = {"cloud": ":/symbols/affinity/circle/blue/cl "docker_guest": ":/symbols/affinity/circle/blue/docker.svg"} AFFINITY_CIRCLE_RED_SYMBOL_THEME = {"cloud": ":/symbols/affinity/circle/red/cloud.svg", + "nat": ":/symbols/affinity/circle/red/nat.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", @@ -107,6 +113,7 @@ AFFINITY_CIRCLE_RED_SYMBOL_THEME = {"cloud": ":/symbols/affinity/circle/red/clou "docker_guest": ":/symbols/affinity/circle/red/docker.svg"} AFFINITY_CIRCLE_GRAY_SYMBOL_THEME = {"cloud": ":/symbols/affinity/circle/gray/cloud.svg", + "nat": ":/symbols/affinity/circle/gray/nat.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", diff --git a/gns3server/controller/template_manager.py b/gns3server/controller/template_manager.py index b3224188..383a4592 100644 --- a/gns3server/controller/template_manager.py +++ b/gns3server/controller/template_manager.py @@ -63,7 +63,7 @@ class TemplateManager: builtins = [] if Config.instance().get_section_config("Server").getboolean("enable_builtin_templates", True): builtins.append(Template(uuid.uuid3(uuid.NAMESPACE_DNS, "cloud"), {"template_type": "cloud", "name": "Cloud", "default_name_format": "Cloud{0}", "category": 2, "symbol": ":/symbols/cloud.svg"}, builtin=True)) - builtins.append(Template(uuid.uuid3(uuid.NAMESPACE_DNS, "nat"), {"template_type": "nat", "name": "NAT", "default_name_format": "NAT{0}", "category": 2, "symbol": ":/symbols/cloud.svg"}, builtin=True)) + builtins.append(Template(uuid.uuid3(uuid.NAMESPACE_DNS, "nat"), {"template_type": "nat", "name": "NAT", "default_name_format": "NAT{0}", "category": 2, "symbol": ":/symbols/nat.svg"}, builtin=True)) builtins.append(Template(uuid.uuid3(uuid.NAMESPACE_DNS, "vpcs"), {"template_type": "vpcs", "name": "VPCS", "default_name_format": "PC{0}", "category": 2, "symbol": ":/symbols/vpcs_guest.svg", "properties": {"base_script_file": "vpcs_base_config.txt"}}, builtin=True)) builtins.append(Template(uuid.uuid3(uuid.NAMESPACE_DNS, "ethernet_switch"), {"template_type": "ethernet_switch", "console_type": "none", "name": "Ethernet switch", "default_name_format": "Switch{0}", "category": 1, "symbol": ":/symbols/ethernet_switch.svg"}, builtin=True)) builtins.append(Template(uuid.uuid3(uuid.NAMESPACE_DNS, "ethernet_hub"), {"template_type": "ethernet_hub", "name": "Ethernet hub", "default_name_format": "Hub{0}", "category": 1, "symbol": ":/symbols/hub.svg"}, builtin=True)) diff --git a/gns3server/symbols/affinity/circle/blue/nat.svg b/gns3server/symbols/affinity/circle/blue/nat.svg new file mode 100644 index 00000000..7a050ddb --- /dev/null +++ b/gns3server/symbols/affinity/circle/blue/nat.svg @@ -0,0 +1,60 @@ + + + + + + diff --git a/gns3server/symbols/affinity/circle/blue/nat2.svg b/gns3server/symbols/affinity/circle/blue/nat2.svg new file mode 100644 index 00000000..a0e26a03 --- /dev/null +++ b/gns3server/symbols/affinity/circle/blue/nat2.svg @@ -0,0 +1,55 @@ + + + + + + diff --git a/gns3server/symbols/affinity/circle/gray/nat.svg b/gns3server/symbols/affinity/circle/gray/nat.svg new file mode 100644 index 00000000..27fb9e30 --- /dev/null +++ b/gns3server/symbols/affinity/circle/gray/nat.svg @@ -0,0 +1,60 @@ + + + + + + diff --git a/gns3server/symbols/affinity/circle/gray/nat2.svg b/gns3server/symbols/affinity/circle/gray/nat2.svg new file mode 100644 index 00000000..761d03ea --- /dev/null +++ b/gns3server/symbols/affinity/circle/gray/nat2.svg @@ -0,0 +1,55 @@ + + + + + + diff --git a/gns3server/symbols/affinity/circle/green/nat.svg b/gns3server/symbols/affinity/circle/green/nat.svg new file mode 100644 index 00000000..84e63c6b --- /dev/null +++ b/gns3server/symbols/affinity/circle/green/nat.svg @@ -0,0 +1,60 @@ + + + + + + diff --git a/gns3server/symbols/affinity/circle/green/nat2.svg b/gns3server/symbols/affinity/circle/green/nat2.svg new file mode 100644 index 00000000..9f474397 --- /dev/null +++ b/gns3server/symbols/affinity/circle/green/nat2.svg @@ -0,0 +1,55 @@ + + + + + + diff --git a/gns3server/symbols/affinity/circle/red/nat.svg b/gns3server/symbols/affinity/circle/red/nat.svg new file mode 100644 index 00000000..c01a4a59 --- /dev/null +++ b/gns3server/symbols/affinity/circle/red/nat.svg @@ -0,0 +1,60 @@ + + + + + + diff --git a/gns3server/symbols/affinity/circle/red/nat2.svg b/gns3server/symbols/affinity/circle/red/nat2.svg new file mode 100644 index 00000000..56d0198d --- /dev/null +++ b/gns3server/symbols/affinity/circle/red/nat2.svg @@ -0,0 +1,55 @@ + + + + + + diff --git a/gns3server/symbols/affinity/square/blue/nat.svg b/gns3server/symbols/affinity/square/blue/nat.svg new file mode 100644 index 00000000..399b6977 --- /dev/null +++ b/gns3server/symbols/affinity/square/blue/nat.svg @@ -0,0 +1,58 @@ + + + + + + diff --git a/gns3server/symbols/affinity/square/blue/nat2.svg b/gns3server/symbols/affinity/square/blue/nat2.svg new file mode 100644 index 00000000..7e04844f --- /dev/null +++ b/gns3server/symbols/affinity/square/blue/nat2.svg @@ -0,0 +1,74 @@ + + + + + + + + + + + + + diff --git a/gns3server/symbols/affinity/square/gray/nat.svg b/gns3server/symbols/affinity/square/gray/nat.svg new file mode 100644 index 00000000..6ee3c872 --- /dev/null +++ b/gns3server/symbols/affinity/square/gray/nat.svg @@ -0,0 +1,58 @@ + + + + + + diff --git a/gns3server/symbols/affinity/square/gray/nat2.svg b/gns3server/symbols/affinity/square/gray/nat2.svg new file mode 100644 index 00000000..20b0dc75 --- /dev/null +++ b/gns3server/symbols/affinity/square/gray/nat2.svg @@ -0,0 +1,74 @@ + + + + + + + + + + + + + diff --git a/gns3server/symbols/affinity/square/green/nat.svg b/gns3server/symbols/affinity/square/green/nat.svg new file mode 100644 index 00000000..fc3ed801 --- /dev/null +++ b/gns3server/symbols/affinity/square/green/nat.svg @@ -0,0 +1,58 @@ + + + + + + diff --git a/gns3server/symbols/affinity/square/green/nat2.svg b/gns3server/symbols/affinity/square/green/nat2.svg new file mode 100644 index 00000000..86011922 --- /dev/null +++ b/gns3server/symbols/affinity/square/green/nat2.svg @@ -0,0 +1,74 @@ + + + + + + + + + + + + + diff --git a/gns3server/symbols/affinity/square/red/nat.svg b/gns3server/symbols/affinity/square/red/nat.svg new file mode 100644 index 00000000..62a3bd66 --- /dev/null +++ b/gns3server/symbols/affinity/square/red/nat.svg @@ -0,0 +1,58 @@ + + + + + + diff --git a/gns3server/symbols/affinity/square/red/nat2.svg b/gns3server/symbols/affinity/square/red/nat2.svg new file mode 100644 index 00000000..ba10b5c9 --- /dev/null +++ b/gns3server/symbols/affinity/square/red/nat2.svg @@ -0,0 +1,74 @@ + + + + + + + + + + + + + diff --git a/gns3server/symbols/classic/nat.svg b/gns3server/symbols/classic/nat.svg new file mode 100644 index 00000000..0f134772 --- /dev/null +++ b/gns3server/symbols/classic/nat.svg @@ -0,0 +1,207 @@ + + + + + + + + + image/svg+xml + + + + + Jeremy Grossmann + + + + + GNS-3 + + + Created for the GNS-3 project (www.gns3.net) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +