Merge branch '2.0' into 2.1

gns3server/controller/__init__.py

@@ -55,16 +55,21 @@ class Controller:
     def start(self):
         log.info("Start controller")
         self.load_base_files()
-        yield from self.load()
         server_config = Config.instance().get_section_config("Server")
         host = server_config.get("host", "localhost")
+
         # If console_host is 0.0.0.0 client will use the ip they use
         # to connect to the controller
         console_host = host
         if host == "0.0.0.0":
             host = "127.0.0.1"
+
+        name = socket.gethostname()
+        if name == "gns3vm":
+            name = "Main server"
+
         yield from self.add_compute(compute_id="local",
-                                    name=socket.gethostname(),
+                                    name=name,
                                     protocol=server_config.get("protocol", "http"),
                                     host=host,
                                     console_host=console_host,
@@ -72,6 +77,7 @@ class Controller:
                                     user=server_config.get("user", ""),
                                     password=server_config.get("password", ""),
                                     force=True)
+        yield from self._load_controller_settings()
         yield from self.load_projects()
         yield from self.gns3vm.auto_start_vm()
         yield from self._project_auto_open()
@@ -118,7 +124,7 @@ class Controller:
             json.dump(data, f, indent=4)
 
     @asyncio.coroutine
-    def load(self):
+    def _load_controller_settings(self):
         """
         Reload the controller configuration from disk
         """
@@ -279,7 +285,7 @@ class Controller:
                 return None
 
             for compute in self._computes.values():
-                if name and compute.name == name:
+                if name and compute.name == name and not force:
                     raise aiohttp.web.HTTPConflict(text='Compute name "{}" already exists'.format(name))
 
             compute = Compute(compute_id=compute_id, controller=self, name=name, **kwargs)

gns3server/controller/compute.py

@@ -426,7 +426,7 @@ class Compute:
             except aiohttp.errors.WSServerHandshakeError:
                 self._ws = None
                 break
-            if response.tp == aiohttp.MsgType.closed or response.tp == aiohttp.MsgType.error:
+            if response.tp == aiohttp.MsgType.closed or response.tp == aiohttp.MsgType.error or response.data is None:
                 self._connected = False
                 break
             msg = json.loads(response.data)

gns3server/controller/drawing.py

@@ -43,6 +43,7 @@ class Drawing:
             self._id = str(uuid.uuid4())
         else:
             self._id = drawing_id
+        self._svg = "<svg></svg>"
         self.svg = svg
         self._x = x
         self._y = y

gns3server/controller/export_project.py

@@ -47,6 +47,9 @@ def export_project(project, temporary_dir, include_images=False, keep_compute_id
     if project.is_running():
         raise aiohttp.web.HTTPConflict(text="Running topology could not be exported")
 
+    # Make sure we save the project
+    project.dump()
+
     z = zipstream.ZipFile(allowZip64=True)
 
     if not os.path.exists(project._path):

gns3server/controller/gns3vm/__init__.py

@@ -222,8 +222,14 @@ class GNS3VM:
         """
         engine = self._get_engine(engine)
         vms = []
-        for vm in (yield from engine.list()):
-            vms.append({"vmname": vm["vmname"]})
+        try:
+            for vm in (yield from engine.list()):
+                vms.append({"vmname": vm["vmname"]})
+        except GNS3VMError as e:
+            # We raise error only if user activated the GNS3 VM
+            # otherwise you have noise when VMware is not installed
+            if self.enable:
+                raise e
         return vms
 
     @asyncio.coroutine
@@ -267,6 +273,7 @@ class GNS3VM:
             engine.vmname = self._settings["vmname"]
             engine.ram = self._settings["ram"]
             engine.vpcus = self._settings["vcpus"]
+            engine.headless = self._settings["headless"]
             compute = yield from self._controller.add_compute(compute_id="vm",
                                                               name="GNS3 VM is starting ({})".format(engine.vmname),
                                                               host=None,
@@ -277,6 +284,7 @@ class GNS3VM:
             except Exception as e:
                 yield from self._controller.delete_compute("vm")
                 log.error("Can't start the GNS3 VM: {}", str(e))
+                yield from compute.update(name="GNS3 VM ({})".format(engine.vmname))
                 raise e
             yield from compute.update(name="GNS3 VM ({})".format(engine.vmname),
                                       protocol=self.protocol,

gns3server/controller/gns3vm/virtualbox_gns3_vm.py

@@ -221,7 +221,7 @@ class VirtualBoxGNS3VM(BaseGNS3VM):
         second to a GNS3 endpoint in order to get the list of the interfaces and
         their IP and after that match it with VirtualBox host only.
         """
-        remaining_try = 240
+        remaining_try = 300
         while remaining_try > 0:
             json_data = None
             session = aiohttp.ClientSession()

gns3server/controller/ports/port_factory.py

@@ -15,6 +15,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+import aiohttp
+
 from .atm_port import ATMPort
 from .frame_relay_port import FrameRelayPort
 from .gigabitethernet_port import GigabitEthernetPort
@@ -64,11 +66,14 @@ class StandardPortFactory:
                     port_name = first_port_name
                     port = PortFactory(port_name, segment_number, adapter_number, port_number, "ethernet")
                 else:
-                    port_name = port_name_format.format(
-                        interface_number,
-                        segment_number,
-                        adapter=adapter_number,
-                        **cls._generate_replacement(interface_number, segment_number))
+                    try:
+                        port_name = port_name_format.format(
+                            interface_number,
+                            segment_number,
+                            adapter=adapter_number,
+                            **cls._generate_replacement(interface_number, segment_number))
+                    except (ValueError, KeyError) as e:
+                        raise aiohttp.web.HTTPConflict(text="Invalid port name format {}: {}".format(port_name_format, str(e)))
                     port = PortFactory(port_name, segment_number, adapter_number, port_number, "ethernet")
                     interface_number += 1
                     if port_segment_size:

gns3server/controller/project.py

@@ -293,6 +293,8 @@ class Project:
                     name = base_name.format(number, id=number, name="Node")
                 except KeyError as e:
                     raise aiohttp.web.HTTPConflict(text="{" + e.args[0] + "} is not a valid replacement string in the node name")
+                except ValueError as e:
+                    raise aiohttp.web.HTTPConflict(text="{} is not a valid replacement string in the node name".format(base_name))
                 if name not in self._allocated_node_names:
                     self._allocated_node_names.add(name)
                     return name

gns3server/controller/symbols.py

@@ -39,16 +39,17 @@ class Symbols:
     def list(self):
         self._symbols_path = {}
         symbols = []
-        for file in os.listdir(get_resource("symbols")):
-            if file.startswith('.'):
-                continue
-            symbol_id = ':/symbols/' + file
-            symbols.append({
-                'symbol_id': symbol_id,
-                'filename': file,
-                'builtin': True,
-            })
-            self._symbols_path[symbol_id] = os.path.join(get_resource("symbols"), file)
+        if get_resource("symbols"):
+            for file in os.listdir(get_resource("symbols")):
+                if file.startswith('.'):
+                    continue
+                symbol_id = ':/symbols/' + file
+                symbols.append({
+                    'symbol_id': symbol_id,
+                    'filename': file,
+                    'builtin': True,
+                })
+                self._symbols_path[symbol_id] = os.path.join(get_resource("symbols"), file)
         directory = self.symbols_path()
         if directory:
             for file in os.listdir(directory):

gns3server/controller/topology.py

@@ -363,6 +363,14 @@ def _convert_1_3_later(topo, topo_path):
                 node["symbol"] = ":/symbols/vbox_guest.svg"
         elif old_node["type"] == "IOUDevice":
             node["node_type"] = "iou"
+            node["port_name_format"] = old_node.get("port_name_format", "Ethernet{segment0}/{port0}")
+            node["port_segment_size"] = int(old_node.get("port_segment_size", "4"))
+            if node["symbol"] is None:
+                if "l2" in node["properties"].get("path", ""):
+                    node["symbol"] = ":/symbols/multilayer_switch.svg"
+                else:
+                    node["symbol"] = ":/symbols/router.svg"
+
         elif old_node["type"] == "Cloud":
             old_node["ports"] = _create_cloud(node, old_node, ":/symbols/cloud.svg")
         elif old_node["type"] == "Host":