Merge branch '2.2' into 2.3

# Conflicts:
#	gns3server/notification_queue.py
#	gns3server/version.py

CHANGELOG

@@ -1,5 +1,13 @@
 # Change Log
 
+## 2.2.12 07/08/2020
+
+* Release Web-Ui version 2020.3.0-beta.2
+* Catch exception when psutil returns OSError
+* Downgrade psutil to version 5.6.7
+* Use parent directory as working directory for project duplication and snapshots. Fixes https://github.com/GNS3/gns3-gui/issues/2909
+* Fix Key Error "vendor_id" is missing when configuring GNS3 VM with VirtualBox. Fixes https://github.com/GNS3/gns3-gui/issues/3018
+
 ## 2.2.11 09/07/2020
 
 * Fix crash when project sets 'auto_open' option and a remote GNS3 VM is used. Fixes https://github.com/GNS3/gns3-gui/issues/3014

gns3server/appliances/exos.gns3a

@@ -28,6 +28,13 @@
     
     "images": [
 
+		{
+            "filename": "EXOS-VM_v30.7.1.1.qcow2",
+            "version": "30.7.1.1",
+            "md5sum": "c6b67023945102f984b47aa67c67fe33",
+            "filesize": 485687296,
+            "direct_download_url": "https://akamai-ep.extremenetworks.com/Extreme_P/github-en/Virtual_EXOS/EXOS-VM_v30.7.1.1.qcow2"
+        },
 		{
             "filename": "EXOS-VM_v30.6.1.11.qcow2",
             "version": "30.6.1.11",
@@ -89,6 +96,12 @@
     
     "versions": [
 
+        {
+            "name": "30.7.1.1",
+            "images": {
+                "hda_disk_image": "EXOS-VM_v30.7.1.1.qcow2"
+            }
+        },
         {
             "name": "30.6.1.11",
             "images": {

gns3server/appliances/frr.gns3a

@@ -1,41 +1,39 @@
 {
     "name": "FRR",
     "category": "router",
-    "description": "FRRouting (FRR) is an IP routing protocol suite for Linux and Unix platforms which includes protocol daemons for BGP, IS-IS, LDP, OSPF, PIM, and RIP.\n\nFRR’s seamless integration with the native Linux/Unix IP networking stacks makes it applicable to a wide variety of use cases including connecting hosts/VMs/containers to the network, advertising network services, LAN switching and routing, Internet access routers, and Internet peering.\n\nThis is an unofficial VM or FRR.",
+    "description": "FRRouting (FRR) is an IP routing protocol suite for Linux and Unix platforms which includes protocol daemons for BGP, IS-IS, LDP, OSPF, PIM, and RIP.\n\nFRR’s seamless integration with the native Linux/Unix IP networking stacks makes it applicable to a wide variety of use cases including connecting hosts/VMs/containers to the network, advertising network services, LAN switching and routing, Internet access routers, and Internet peering.\n\nThis is an unofficial VM of FRR.",
     "vendor_name": "FRRouting Project",
     "vendor_url": "https://frrouting.org",
     "product_name": "FRR",
     "registry_version": 3,
     "status": "stable",
-    "maintainer": "Andras Dosztal",
+    "maintainer": "GNS3 Team",
     "maintainer_email": "developers@gns3.net",
-    "usage": "Credentials: frradmin / frr\nIf you exit from the router CLI, you can get back by typing 'vtysh' to the console.",
-    "port_name_format": "ens{port3}",
+    "usage": "Credentials: root / root\nIf you exit from the router CLI, you can get back by typing 'vtysh' to the console.",
+    "port_name_format": "eth{0}",
     "qemu": {
-        "adapter_type": "virtio-net-pci",
+        "adapter_type": "e1000",
         "adapters": 8,
-        "ram": 512,
-        "hda_disk_interface": "virtio",
+        "ram": 256,
         "arch": "x86_64",
         "console_type": "telnet",
-        "kvm": "require"
+        "kvm": "allow"
     },
     "images": [
         {
-            "filename": "frr7.1-vm0.4.qcow2",
-            "version": "7.1 - VM0.4",
-            "md5sum": "08390f257203126e5edffb9710e47974",
-            "filesize": 2051801088,
-            "download_url": "https://sourceforge.net/projects/frr/files/",
-            "direct_download_url": "https://sourceforge.net/projects/frr/files/frr7.1-vm0.4.qcow2.bz2/download",
-            "compression": "bzip2"
+            "filename": "frr-7.3.1.qcow2",
+            "version": "7.3.1",
+            "md5sum": "e6bd9591a5c630bfe2c8688dc043b20b",
+            "filesize": 47348224,
+            "download_url": "https://sourceforge.net/projects/gns-3/files/Qemu%20Appliances/",
+            "direct_download_url": "http://downloads.sourceforge.net/project/gns-3/Qemu%20Appliances/frr-7.3.1.qcow2"
         }
     ],
     "versions": [
         {
-            "name": "7.1 - VM0.4",
+            "name": "7.3.1",
             "images": {
-                "hda_disk_image": "frr7.1-vm0.4.qcow2"
+                "hda_disk_image": "frr-7.3.1.qcow2"
             }
         }
     ]

gns3server/crash_report.py

@@ -58,7 +58,7 @@ class CrashReport:
     Report crash to a third party service
     """
 
-    DSN = "https://3f77c7ac33f2402789343e34f0913c0b:11621d9855cb4b92becc111cbb63ccfb@o19455.ingest.sentry.io/38482"
+    DSN = "https://464a18a662fa482bad15b5ea0c899d5d:cef46213853149e7b6633019302e6bfd@o19455.ingest.sentry.io/38482"
     _instance = None
 
     def __init__(self):

gns3server/notification_queue.py

@@ -22,6 +22,9 @@ import psutil
 from gns3server.utils.cpu_percent import CpuPercent
 from gns3server.utils.path import get_default_project_directory
 
+import logging
+log = logging.getLogger(__name__)
+
 
 class NotificationQueue(asyncio.Queue):
     """
@@ -52,11 +55,16 @@ class NotificationQueue(asyncio.Queue):
         """
         Return the content of the ping notification
         """
-        msg = {}
+        msg = {"cpu_usage_percent": 0,
+               "memory_usage_percent": 0,
+               "disk_usage_percent": 0}
         # Non blocking call in order to get cpu usage. First call will return 0
-        msg["cpu_usage_percent"] = CpuPercent.get(interval=None)
-        msg["memory_usage_percent"] = psutil.virtual_memory().percent
-        msg["disk_usage_percent"] = psutil.disk_usage(get_default_project_directory()).percent
+        try:
+            msg["cpu_usage_percent"] = CpuPercent.get(interval=None)
+            msg["memory_usage_percent"] = psutil.virtual_memory().percent
+            msg["disk_usage_percent"] = psutil.disk_usage(get_default_project_directory()).percent
+        except OSError as e:
+            log.warning("Could not get CPU and memory usage from psutil: {}".format(e))
         return msg
 
     async def get_json(self, timeout):

gns3server/static/web-ui/index.html

@@ -33,7 +33,7 @@
         }
       })();
     </script>
-  <link rel="stylesheet" href="styles.d80eef1a632365db5e77.css"></head>
+  <link rel="stylesheet" href="styles.9197b66183f89522181b.css"></head>
   <!-- <body class="mat-app-background" oncontextmenu="return false;"> -->
   <body class="mat-app-background" oncontextmenu="return false;">
     <app-root></app-root>
@@ -48,5 +48,5 @@
 
       gtag('config', 'G-5D6FZL9923');
     </script>
-  <script src="runtime.c51bd5b1c616d9ffddc1.js" defer></script><script src="polyfills-es5.fa7ed98c2915002d6a80.js" nomodule defer></script><script src="polyfills.e3de9c33e285997df00a.js" defer></script><script src="main.80063f7881af8885c52d.js" defer></script></body>
+  <script src="runtime.c51bd5b1c616d9ffddc1.js" defer></script><script src="polyfills-es5.fa7ed98c2915002d6a80.js" nomodule defer></script><script src="polyfills.e3de9c33e285997df00a.js" defer></script><script src="main.2c70c08d7e7ec6933a30.js" defer></script></body>
 </html>

tests/compute/vpcs/test_vpcs_vm.py

@@ -39,7 +39,7 @@ async def manager(loop, port_manager):
 
 
 @pytest.fixture(scope="function")
-async def vm(loop, compute_project, manager, ubridge_path):
+async def vm(loop, compute_project, manager, tmpdir, ubridge_path):
 
     vm = VPCSVM("test", "00010203-0405-0607-0809-0a0b0c0d0e0f", compute_project, manager)
     vm._vpcs_version = parse_version("0.9")