Merge pull request #2369 from GNS3/feature/nat-symbols

NAT symbols

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 @@
                         "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 @@
                                      "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 @@
                                     "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 @@
                                      "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 @@
                                      "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 @@
                                     "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",

gns3server/controller/template_manager.py

@@ -63,7 +63,7 @@ def load_templates(self, template_settings=None):
         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))