Merge remote-tracking branch 'origin/unstable' into unstable

gns3server/modules/vmware/vmware_vm.py

@@ -93,11 +93,8 @@ class VMwareVM(BaseVM):
                 "enable_remote_console": self.enable_remote_console,
                 "adapters": self._adapters,
                 "adapter_type": self.adapter_type,
-                "use_any_adapter": self.use_any_adapter}
-        if self._linked_clone:
-            json["vm_directory"] = self.working_dir
-        else:
-            json["vm_directory"] = None
+                "use_any_adapter": self.use_any_adapter,
+                "vm_directory": self.working_dir}
         return json
 
     @property
@@ -347,7 +344,7 @@ class VMwareVM(BaseVM):
                                                                                   stderr=subprocess.STDOUT,
                                                                                   cwd=self.working_dir)
 
-                monitor_process(self._ubridge_process, self._termination_callback)
+                #monitor_process(self._ubridge_process, self._termination_callback)
             log.info("ubridge started PID={}".format(self._ubridge_process.pid))
         except (OSError, subprocess.SubprocessError) as e:
             ubridge_stdout = self.read_ubridge_stdout()

gns3server/utils/interfaces.py

@@ -20,7 +20,6 @@ import sys
 import aiohttp
 import socket
 import struct
-import netifaces
 
 import logging
 log = logging.getLogger(__name__)
@@ -115,10 +114,12 @@ def is_interface_up(interface):
     :returns: boolean
     """
 
-    if interface not in netifaces.interfaces():
-        return False
-
     if sys.platform.startswith("linux"):
+
+        import netifaces
+        if interface not in netifaces.interfaces():
+            return False
+
         import fcntl
         SIOCGIFFLAGS = 0x8913
         try:
@@ -144,6 +145,7 @@ def interfaces():
 
     results = []
     if not sys.platform.startswith("win"):
+        import netifaces
         for interface in netifaces.interfaces():
             ip_address = ""
             ip_addresses = netifaces.ifaddresses(interface)

setup.py

@@ -45,12 +45,14 @@ dependencies = [
     "raven>=5.2.0"
 ]
 
-try:
-    import netifaces
-except ImportError:
-    # add gns3-netifaces only if netifaces isn't already installed
-    # for instance via a Debian package.
-    dependencies.append("gns3-netifaces>=0.10.4.1")
+if not sys.platform.startswith("win"):
+    # netifaces if not used on Windows
+    try:
+        import netifaces
+    except ImportError:
+        # add gns3-netifaces only if netifaces isn't already installed
+        # for instance via a Debian package.
+        dependencies.append("gns3-netifaces>=0.10.4.1")
 
 setup(
     name="gns3-server",