gns3-server 3.0.0b2__py3-none-any.whl → 3.0.0b3__py3-none-any.whl

gns3server/compute/iou/iou_vm.py

@@ -661,7 +661,8 @@ class IOUVM(BaseNode):
             self._telnet_server.close()
             await self._telnet_server.wait_closed()
             self._telnet_server = None
-        await self.start_console()
+        if self.is_running():
+            await self.start_console()
 
     @locking
     async def _networking(self):

gns3server/controller/snapshot.py

@@ -51,11 +51,11 @@ class Snapshot:
         self._project = project
         if name:
             self._name = name
-            self._created_at = datetime.now().timestamp()
+            self._created_at = datetime.now(timezone.utc).timestamp()
             filename = (
                 self._name
                 + "_"
-                + datetime.utcfromtimestamp(self._created_at).replace(tzinfo=None).strftime("%d%m%y_%H%M%S")
+                + datetime.fromtimestamp(self._created_at, tz=timezone.utc).replace(tzinfo=None).strftime("%d%m%y_%H%M%S")
                 + ".gns3project"
             )
         else:
@@ -66,7 +66,7 @@ class Snapshot:
                     datetime.strptime(datestring, "%d%m%y_%H%M%S").replace(tzinfo=timezone.utc).timestamp()
                 )
             except ValueError:
-                self._created_at = datetime.utcnow().timestamp()
+                self._created_at = datetime.now(timezone.utc)
         self._path = os.path.join(project.path, "snapshots", filename)
 
     @property

gns3server/controller/symbol_themes.py

@@ -18,6 +18,7 @@
 
 CLASSIC_SYMBOL_THEME = {
     "cloud": ":/symbols/classic/cloud.svg",
+    "nat": ":/symbols/classic/nat.svg",
     "ethernet_switch": ":/symbols/classic/ethernet_switch.svg",
     "hub": ":/symbols/classic/hub.svg",
     "frame_relay_switch": ":/symbols/classic/frame_relay_switch.svg",
@@ -35,6 +36,7 @@ CLASSIC_SYMBOL_THEME = {
 
 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",
     "hub": ":/symbols/affinity/square/blue/hub.svg",
     "frame_relay_switch": ":/symbols/affinity/square/blue/isdn.svg",
@@ -52,6 +54,7 @@ AFFINITY_SQUARE_BLUE_SYMBOL_THEME = {
 
 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",
     "hub": ":/symbols/affinity/square/red/hub.svg",
     "frame_relay_switch": ":/symbols/affinity/square/red/isdn.svg",
@@ -69,6 +72,7 @@ AFFINITY_SQUARE_RED_SYMBOL_THEME = {
 
 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",
     "hub": ":/symbols/affinity/square/gray/hub.svg",
     "frame_relay_switch": ":/symbols/affinity/square/gray/isdn.svg",
@@ -86,6 +90,7 @@ AFFINITY_SQUARE_GRAY_SYMBOL_THEME = {
 
 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",
     "hub": ":/symbols/affinity/circle/blue/hub.svg",
     "frame_relay_switch": ":/symbols/affinity/circle/blue/isdn.svg",
@@ -103,6 +108,7 @@ AFFINITY_CIRCLE_BLUE_SYMBOL_THEME = {
 
 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",
     "hub": ":/symbols/affinity/circle/red/hub.svg",
     "frame_relay_switch": ":/symbols/affinity/circle/red/isdn.svg",
@@ -120,6 +126,7 @@ AFFINITY_CIRCLE_RED_SYMBOL_THEME = {
 
 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",
     "hub": ":/symbols/affinity/circle/gray/hub.svg",
     "frame_relay_switch": ":/symbols/affinity/circle/gray/isdn.svg",

gns3server/controller/udp_link.py

@@ -213,7 +213,7 @@ class UDPLink(Link):
         :returns: Node where the capture should run
         """
 
-        ALWAYS_RUNNING_NODES_TYPE = ("cloud", "nat", "ethernet_switch", "ethernet_hub")
+        ALWAYS_RUNNING_NODES_TYPE = ("cloud", "nat", "ethernet_switch", "ethernet_hub", "frame_relay_switch", "atm_switch")
 
         for node in self._nodes:
             if (

gns3server/crash_report.py

@@ -58,7 +58,7 @@ class CrashReport:
     Report crash to a third party service
     """
 
-    DSN = "https://395af26fb5b2245d4c9810095aa11da9@o19455.ingest.us.sentry.io/38482"
+    DSN = "https://99870c759d1c1d62ceb091d59dbcfa78@o19455.ingest.us.sentry.io/38482"
     _instance = None
 
     def __init__(self):

gns3server/schemas/controller/templates/__init__.py

@@ -45,7 +45,6 @@ class TemplateBase(BaseModel):
     category: Optional[Category] = None
     default_name_format: Optional[str] = None
     symbol: Optional[str] = None
-    builtin: Optional[bool] = None
     template_type: Optional[NodeType] = None
     compute_id: Optional[str] = None
     usage: Optional[str] = ""

gns3server/services/authentication.py

@@ -16,7 +16,7 @@
 
 
 from jose import JWTError, jwt
-from datetime import datetime, timedelta
+from datetime import datetime, timedelta, timezone
 import bcrypt
 
 from typing import Optional
@@ -48,7 +48,7 @@ class AuthService:
 
         if not expires_in:
             expires_in = Config.instance().settings.Controller.jwt_access_token_expire_minutes
-        expire = datetime.utcnow() + timedelta(minutes=expires_in)
+        expire = datetime.now(timezone.utc) + timedelta(minutes=expires_in)
         to_encode = {"sub": username, "exp": expire}
         if secret_key is None:
             secret_key = Config.instance().settings.Controller.jwt_secret_key

gns3server/services/templates.py

@@ -96,7 +96,7 @@ BUILTIN_TEMPLATES = [
         "name": "NAT",
         "default_name_format": "NAT{0}",
         "category": "guest",
-        "symbol": "cloud",
+        "symbol": "nat",
         "compute_id": None,
         "builtin": True,
     },

gns3server/static/web-ui/index.html

@@ -46,6 +46,6 @@
 
       gtag('config', 'G-5D6FZL9923');
     </script>
-  <script src="runtime.24fa95b7061d7056.js" type="module"></script><script src="polyfills.319c79dd175e50d0.js" type="module"></script><script src="main.8e8e3d55e78d84fc.js" type="module"></script>
+  <script src="runtime.24fa95b7061d7056.js" type="module"></script><script src="polyfills.319c79dd175e50d0.js" type="module"></script><script src="main.f3840f9b1c0240e6.js" type="module"></script>
 
 </body></html>