Return what is supported by a compute node

Ref https://github.com/GNS3/gns3-gui/issues/1448

gns3server/controller/__init__.py

@@ -18,6 +18,7 @@
 import os
 import sys
 import json
+import socket
 import asyncio
 import aiohttp
 
@@ -64,13 +65,14 @@ class Controller:
         log.info("Start controller")
         yield from self.load()
         server_config = Config.instance().get_section_config("Server")
-        self._computes["local"] = Compute(compute_id="local",
-                                          controller=self,
-                                          protocol=server_config.get("protocol", "http"),
-                                          host=server_config.get("host", "localhost"),
-                                          port=server_config.getint("port", 3080),
-                                          user=server_config.get("user", ""),
-                                          password=server_config.get("password", ""))
+        yield from self.add_compute(compute_id="local",
+                                    name=socket.gethostname(),
+                                    protocol=server_config.get("protocol", "http"),
+                                    host=server_config.get("host", "localhost"),
+                                    port=server_config.getint("port", 3080),
+                                    user=server_config.get("user", ""),
+                                    password=server_config.get("password", ""),
+                                    force=True)
         yield from self.gns3vm.auto_start_vm()
 
     @asyncio.coroutine
@@ -228,8 +230,8 @@ class Controller:
             compute = Compute(compute_id=compute_id, controller=self, name=name, **kwargs)
             self._computes[compute.id] = compute
             self.save()
+            yield from compute.connect()
             self.notification.emit("compute.created", compute.__json__())
-
             return compute
         else:
             self.notification.emit("compute.updated", self._computes[compute_id].__json__())

gns3server/controller/compute.py

@@ -90,9 +90,12 @@ class Compute:
         self._connected = False
         self._controller = controller
         self._set_auth(user, password)
-        self._version = None
         self._cpu_usage_percent = None
         self._memory_usage_percent = None
+        self._capabilities = {
+            "version": None,
+            "node_types": []
+        }
         self.name = name
         # Websocket for notifications
         self._ws = None
@@ -155,13 +158,6 @@ class Compute:
             yield from self._ws.close()
             self._ws = None
 
-    @property
-    def version(self):
-        """
-        :returns: Version of compute node (string or None if not connected)
-        """
-        return self._version
-
     @property
     def name(self):
         """
@@ -173,8 +169,6 @@ class Compute:
     def name(self, name):
         if name is not None:
             self._name = name
-        elif self._id == "local":
-            self._name = socket.gethostname()
         else:
             if self._user:
                 user = self._user
@@ -284,7 +278,8 @@ class Compute:
             "user": self._user,
             "connected": self._connected,
             "cpu_usage_percent": self._cpu_usage_percent,
-            "memory_usage_percent": self._memory_usage_percent
+            "memory_usage_percent": self._memory_usage_percent,
+            "capabilities": self._capabilities
         }
 
     @asyncio.coroutine
@@ -336,24 +331,27 @@ class Compute:
     @asyncio.coroutine
     def http_query(self, method, path, data=None, **kwargs):
         if not self._connected:
-            yield from self._connect()
+            yield from self.connect()
         if not self._connected:
             raise aiohttp.web.HTTPConflict(text="The server {} is not a GNS3 server".format(self._id))
         response = yield from self._run_http_query(method, path, data=data, **kwargs)
         return response
 
     @asyncio.coroutine
-    def _connect(self):
+    def connect(self):
         """
         Check if remote server is accessible
         """
         if not self._connected:
-            response = yield from self._run_http_query("GET", "/version")
+            try:
+                response = yield from self._run_http_query("GET", "/capabilities")
+            except aiohttp.errors.ClientOSError:
+                return
 
             if "version" not in response.json:
                 self._http_session.close()
                 raise aiohttp.web.HTTPConflict(text="The server {} is not a GNS3 server".format(self._id))
-            self._version = response.json["version"]
+            self._capabilities = response.json
             if parse_version(__version__)[:2] != parse_version(response.json["version"])[:2]:
                 self._http_session.close()
                 raise aiohttp.web.HTTPConflict(text="The server {} versions are not compatible {} != {}".format(self._id, __version__, response.json["version"]))

gns3server/controller/gns3vm/vmware_gns3_vm.py

@@ -136,7 +136,7 @@ class VMwareGNS3VM(BaseGNS3VM):
             raise GNS3VMError("No VMX path configured, can't stop the VM")
         try:
             yield from self._execute("stop", [self._vmx_path, "soft"])
-        except VMwareError as e:
+        except GNS3VMError as e:
             log.warning("Error when stopping the VM: {}".format(str(e)))
         log.info("GNS3 VM has been stopped")
         self.running = False