style: sort imports in compute, db and services modules

gns3server/compute/__init__.py

@@ -14,15 +14,15 @@
 # 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 sys
 import os
+import sys
 
 from .builtin import Builtin
-from .vpcs import VPCS
-from .virtualbox import VirtualBox
 from .dynamips import Dynamips
 from .qemu import Qemu
+from .virtualbox import VirtualBox
 from .vmware import VMware
+from .vpcs import VPCS
 
 MODULES = [Builtin, VPCS, VirtualBox, Dynamips, Qemu, VMware]
 

gns3server/compute/base_manager.py

@@ -14,37 +14,38 @@
 # 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 sys
-import os
-import struct
-import stat
 import asyncio
-import aiofiles
-import socket
-import shutil
-import re
-import logging
 import inspect
+import logging
+import os
+import re
+import shutil
+import socket
+import stat
+import struct
+import sys
+
+import aiofiles
 
 log = logging.getLogger(__name__)
 
-from gns3server.utils.asyncio import cancellable_wait_run_in_executor
+from typing import Type
+from uuid import UUID, uuid4
+
 from gns3server.compute.compute_error import ComputeError, ComputeForbiddenError, ComputeNotFoundError
+from gns3server.utils.asyncio import cancellable_wait_run_in_executor
 from gns3server.utils.interfaces import is_interface_up
 
-from uuid import UUID, uuid4
-from typing import Type
 from ..config import Config
 from ..utils import force_unix_path
-from .project_manager import ProjectManager
-from .port_manager import PortManager
+from ..utils.images import default_images_directory, images_directories, list_images, md5sum, remove_checksum
 from .base_node import BaseNode
-
-from .nios.nio_udp import NIOUDP
-from .nios.nio_tap import NIOTAP
+from .error import ImageMissingError, NodeError
 from .nios.nio_ethernet import NIOEthernet
-from ..utils.images import md5sum, remove_checksum, images_directories, default_images_directory, list_images
-from .error import NodeError, ImageMissingError
+from .nios.nio_tap import NIOTAP
+from .nios.nio_udp import NIOUDP
+from .port_manager import PortManager
+from .project_manager import ProjectManager
 
 CHUNK_SIZE = 1024 * 8  # 8KB
 

gns3server/compute/base_node.py

@@ -14,33 +14,34 @@
 # 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 sys
-import os
-import stat
-import shutil
 import asyncio
 import contextlib
 import json
-import struct
-import tempfile
-import psutil
+import logging
+import os
 import platform
 import re
-import asyncssh
+import shutil
+import stat
+import struct
+import sys
+import tempfile
 
+import asyncssh
+import psutil
 from fastapi import WebSocketDisconnect
-from gns3server.utils.interfaces import interfaces
+
 from gns3server.compute.compute_error import ComputeError
-from ..compute.port_manager import PortManager
-from ..utils.asyncio import wait_run_in_executor, locking
-from ..utils.asyncio.ssh_server import AsyncioSSHServer
-from ..utils.asyncio.telnet_server import AsyncioTelnetServer
 from gns3server.compute.ubridge.hypervisor import Hypervisor
 from gns3server.compute.ubridge.ubridge_error import UbridgeError
-from .nios.nio_udp import NIOUDP
-from .error import NodeError
+from gns3server.utils.interfaces import interfaces
 
-import logging
+from ..compute.port_manager import PortManager
+from ..utils.asyncio import locking, wait_run_in_executor
+from ..utils.asyncio.ssh_server import AsyncioSSHServer
+from ..utils.asyncio.telnet_server import AsyncioTelnetServer
+from .error import NodeError
+from .nios.nio_udp import NIOUDP
 
 log = logging.getLogger(__name__)
 

gns3server/compute/builtin/__init__.py

@@ -18,11 +18,11 @@
 Builtin nodes server module.
 """
 
-from ..base_manager import BaseManager
-from .builtin_node_factory import BuiltinNodeFactory, BUILTIN_NODES
-
 import logging
 
+from ..base_manager import BaseManager
+from .builtin_node_factory import BUILTIN_NODES, BuiltinNodeFactory
+
 log = logging.getLogger(__name__)
 
 

gns3server/compute/builtin/builtin_node_factory.py

@@ -15,13 +15,13 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
+import logging
+
 from ..error import NodeError
 from .nodes.cloud import Cloud
-from .nodes.nat import Nat
 from .nodes.ethernet_hub import EthernetHub
 from .nodes.ethernet_switch import EthernetSwitch
-
-import logging
+from .nodes.nat import Nat
 
 log = logging.getLogger(__name__)
 

gns3server/compute/builtin/nodes/cloud.py

@@ -14,18 +14,17 @@
 # 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 sys
+import logging
 import subprocess
+import sys
 
-from ...error import NodeError
-from ...base_node import BaseNode
-from ...nios.nio_udp import NIOUDP
+import gns3server.utils.asyncio
+import gns3server.utils.interfaces
 from gns3server.compute.ubridge.ubridge_error import UbridgeError
 
-import gns3server.utils.interfaces
-import gns3server.utils.asyncio
-
-import logging
+from ...base_node import BaseNode
+from ...error import NodeError
+from ...nios.nio_udp import NIOUDP
 
 log = logging.getLogger(__name__)
 

gns3server/compute/builtin/nodes/ethernet_hub.py

@@ -15,11 +15,10 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import asyncio
+import logging
 
 from ...base_node import BaseNode
 
-import logging
-
 log = logging.getLogger(__name__)
 
 

gns3server/compute/builtin/nodes/ethernet_switch.py

@@ -37,12 +37,13 @@ be the switch). ESW ``access``/``dot1q``/``qinq`` port modes are composed from
 the ``brctl`` VLAN primitives here -- see ``_apply_port_vlan``.
 """
 
-from ...base_node import BaseNode
-from ...nios.nio_udp import NIOUDP
-from ...error import NodeError
+import logging
+
 from gns3server.compute.ubridge.ubridge_error import UbridgeError
 
-import logging
+from ...base_node import BaseNode
+from ...error import NodeError
+from ...nios.nio_udp import NIOUDP
 
 log = logging.getLogger(__name__)
 

gns3server/compute/builtin/nodes/nat.py

@@ -15,15 +15,14 @@
 # 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 logging
 import sys
 
-from .cloud import Cloud
-from ...error import NodeError
-
 import gns3server.utils.interfaces
 from gns3server.config import Config
 
-import logging
+from ...error import NodeError
+from .cloud import Cloud
 
 log = logging.getLogger(__name__)
 

gns3server/compute/port_manager.py

@@ -14,13 +14,14 @@
 # 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 socket
 import ipaddress
-import threading
-from fastapi import HTTPException, status
-from gns3server.config import Config
-
 import logging
+import socket
+import threading
+
+from fastapi import HTTPException, status
+
+from gns3server.config import Config
 
 log = logging.getLogger(__name__)
 

gns3server/compute/project.py

@@ -14,24 +14,24 @@
 # 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 asyncio
+import datetime
+import hashlib
+import logging
 import os
 import shutil
-import magic
-import asyncio
-import hashlib
-import datetime
-
 from uuid import UUID, uuid4
+
+import magic
 from fastapi import HTTPException, status
 
-from gns3server.compute.compute_error import ComputeError, ComputeNotFoundError, ComputeForbiddenError
-from .port_manager import PortManager
-from .notification_manager import NotificationManager
+from gns3server.compute.compute_error import ComputeError, ComputeForbiddenError, ComputeNotFoundError
+
 from ..config import Config
 from ..utils.asyncio import wait_run_in_executor
 from ..utils.path import check_path_allowed, get_default_project_directory
-
-import logging
+from .notification_manager import NotificationManager
+from .port_manager import PortManager
 
 log = logging.getLogger(__name__)
 

gns3server/compute/virtualbox/__init__.py

@@ -18,19 +18,19 @@
 VirtualBox server module.
 """
 
+import asyncio
+import logging
 import os
 import re
-import sys
 import shutil
-import asyncio
 import subprocess
-import logging
+import sys
 
 log = logging.getLogger(__name__)
 
 from ..base_manager import BaseManager
-from .virtualbox_vm import VirtualBoxVM
 from .virtualbox_error import VirtualBoxError
+from .virtualbox_vm import VirtualBoxVM
 
 
 class VirtualBox(BaseManager):

gns3server/compute/virtualbox/virtualbox_vm.py

@@ -18,28 +18,27 @@
 VirtualBox VM instance.
 """
 
-import re
-import os
-import sys
+import asyncio
 import json
-import uuid
+import logging
+import os
+import re
 import shlex
 import shutil
-import asyncio
+import sys
 import tempfile
+import uuid
 import xml.etree.ElementTree as ET
 
-from gns3server.utils import parse_version
-from gns3server.utils.asyncio.ssh_server import AsyncioSSHServer
-from gns3server.utils.asyncio.telnet_server import AsyncioTelnetServer
-from gns3server.utils.asyncio.serial import asyncio_open_serial
-from gns3server.utils.asyncio import locking
-from gns3server.compute.virtualbox.virtualbox_error import VirtualBoxError
-from gns3server.compute.nios.nio_udp import NIOUDP
 from gns3server.compute.adapters.ethernet_adapter import EthernetAdapter
 from gns3server.compute.base_node import BaseNode
-
-import logging
+from gns3server.compute.nios.nio_udp import NIOUDP
+from gns3server.compute.virtualbox.virtualbox_error import VirtualBoxError
+from gns3server.utils import parse_version
+from gns3server.utils.asyncio import locking
+from gns3server.utils.asyncio.serial import asyncio_open_serial
+from gns3server.utils.asyncio.ssh_server import AsyncioSSHServer
+from gns3server.utils.asyncio.telnet_server import AsyncioTelnetServer
 
 log = logging.getLogger(__name__)
 

gns3server/compute/vmware/__init__.py

@@ -18,27 +18,27 @@
 VMware player/workstation server module.
 """
 
-import os
-import sys
-import re
-import shutil
 import asyncio
-import subprocess
-import logging
 import codecs
 import ipaddress
+import logging
+import os
+import re
 import shlex
-
+import shutil
+import subprocess
+import sys
 from collections import OrderedDict
-from gns3server.utils.interfaces import interfaces
-from gns3server.utils.asyncio import subprocess_check_output
+
 from gns3server.utils import parse_version
+from gns3server.utils.asyncio import subprocess_check_output
+from gns3server.utils.interfaces import interfaces
 
 log = logging.getLogger(__name__)
 
 from gns3server.compute.base_manager import BaseManager
-from gns3server.compute.vmware.vmware_vm import VMwareVM
 from gns3server.compute.vmware.vmware_error import VMwareError
+from gns3server.compute.vmware.vmware_vm import VMwareVM
 
 
 class VMware(BaseManager):

gns3server/compute/vmware/vmware_vm.py

@@ -18,25 +18,24 @@
 VMware VM instance.
 """
 
-import sys
-import os
 import asyncio
-import tempfile
+import logging
+import os
 import platform
+import sys
+import tempfile
+from collections import OrderedDict
 
-from gns3server.utils.asyncio.ssh_server import AsyncioSSHServer
-from gns3server.utils.asyncio.telnet_server import AsyncioTelnetServer
-from gns3server.utils.asyncio.serial import asyncio_open_serial
 from gns3server.utils import parse_version
 from gns3server.utils.asyncio import locking
-from collections import OrderedDict
-from .vmware_error import VMwareError
-from ..nios.nio_udp import NIOUDP
+from gns3server.utils.asyncio.serial import asyncio_open_serial
+from gns3server.utils.asyncio.ssh_server import AsyncioSSHServer
+from gns3server.utils.asyncio.telnet_server import AsyncioTelnetServer
+
 from ..adapters.ethernet_adapter import EthernetAdapter
 from ..base_node import BaseNode
-
-
-import logging
+from ..nios.nio_udp import NIOUDP
+from .vmware_error import VMwareError
 
 log = logging.getLogger(__name__)
 

gns3server/compute/vpcs/__init__.py

@@ -18,8 +18,8 @@
 VPCS server module.
 """
 
-import os
 import asyncio
+import os
 
 from ..base_manager import BaseManager
 from .vpcs_error import VPCSError

gns3server/compute/vpcs/vpcs_vm.py

@@ -19,27 +19,23 @@ VPCS VM management (creates command line, processes, files etc.) in
 order to run a VPCS VM.
 """
 
+import asyncio
+import logging
 import os
-import sys
+import re
+import shutil
+import signal
 import socket
 import subprocess
-import signal
-import re
-import asyncio
-import shutil
+import sys
 
-from gns3server.utils.asyncio import wait_for_process_termination
-from gns3server.utils.asyncio import monitor_process
-from gns3server.utils.asyncio import subprocess_check_output
 from gns3server.utils import parse_version
+from gns3server.utils.asyncio import monitor_process, subprocess_check_output, wait_for_process_termination
 
-from .vpcs_error import VPCSError
 from ..adapters.ethernet_adapter import EthernetAdapter
-from ..nios.nio_udp import NIOUDP
 from ..base_node import BaseNode
-
-
-import logging
+from ..nios.nio_udp import NIOUDP
+from .vpcs_error import VPCSError
 
 log = logging.getLogger(__name__)