pass over files using isort

daemon/core/api/grpc/client.py

@@ -10,8 +10,7 @@ from contextlib import contextmanager
 
 import grpc
 
-from core.api.grpc import core_pb2
-from core.api.grpc import core_pb2_grpc
+from core.api.grpc import core_pb2, core_pb2_grpc
 from core.nodes.ipaddress import Ipv4Prefix, Ipv6Prefix, MacAddress
 
 

daemon/core/api/grpc/server.py

@@ -4,17 +4,16 @@ import os
 import re
 import tempfile
 import time
-
-import grpc
 from builtins import int
 from concurrent import futures
-from queue import Queue, Empty
+from queue import Empty, Queue
 
-from core.api.grpc import core_pb2
-from core.api.grpc import core_pb2_grpc
-from core.emulator.data import NodeData, LinkData, EventData, ConfigData, ExceptionData, FileData
-from core.emulator.emudata import NodeOptions, InterfaceData, LinkOptions
-from core.emulator.enumerations import NodeTypes, EventTypes, LinkTypes
+import grpc
+
+from core.api.grpc import core_pb2, core_pb2_grpc
+from core.emulator.data import ConfigData, EventData, ExceptionData, FileData, LinkData, NodeData
+from core.emulator.emudata import InterfaceData, LinkOptions, NodeOptions
+from core.emulator.enumerations import EventTypes, LinkTypes, NodeTypes
 from core.location.mobility import BasicRangeModel, Ns2ScriptedMobility
 from core.nodes import nodeutils
 from core.nodes.base import CoreNetworkBase

daemon/core/api/tlv/broker.py

@@ -12,23 +12,25 @@ import threading
 
 from core import utils
 from core.api.tlv import coreapi
-from core.nodes.base import CoreNodeBase, CoreNetworkBase
-from core.emulator.enumerations import ConfigDataTypes
-from core.emulator.enumerations import ConfigFlags
-from core.emulator.enumerations import ConfigTlvs
-from core.emulator.enumerations import EventTlvs
-from core.emulator.enumerations import EventTypes
-from core.emulator.enumerations import ExecuteTlvs
-from core.emulator.enumerations import FileTlvs
-from core.emulator.enumerations import LinkTlvs
-from core.emulator.enumerations import MessageFlags
-from core.emulator.enumerations import MessageTypes
-from core.emulator.enumerations import NodeTlvs
-from core.emulator.enumerations import NodeTypes
-from core.emulator.enumerations import RegisterTlvs
+from core.emulator.enumerations import (
+    ConfigDataTypes,
+    ConfigFlags,
+    ConfigTlvs,
+    EventTlvs,
+    EventTypes,
+    ExecuteTlvs,
+    FileTlvs,
+    LinkTlvs,
+    MessageFlags,
+    MessageTypes,
+    NodeTlvs,
+    NodeTypes,
+    RegisterTlvs,
+)
 from core.nodes import nodeutils
-from core.nodes.ipaddress import IpAddress
+from core.nodes.base import CoreNetworkBase, CoreNodeBase
 from core.nodes.interface import GreTap
+from core.nodes.ipaddress import IpAddress
 from core.nodes.network import GreTapBridge
 from core.nodes.physical import PhysicalNode
 

daemon/core/api/tlv/coreapi.py

@@ -7,26 +7,27 @@ CORE API messaging is leveraged for communication with the GUI.
 
 import socket
 import struct
-from past.builtins import basestring
-
 from enum import Enum
 
+from past.builtins import basestring
+
 from core.api.tlv import structutils
-from core.emulator.enumerations import ConfigTlvs
-from core.emulator.enumerations import EventTlvs
-from core.emulator.enumerations import EventTypes
-from core.emulator.enumerations import ExceptionTlvs
-from core.emulator.enumerations import ExecuteTlvs
-from core.emulator.enumerations import FileTlvs
-from core.emulator.enumerations import InterfaceTlvs
-from core.emulator.enumerations import LinkTlvs
-from core.emulator.enumerations import MessageFlags
-from core.emulator.enumerations import MessageTypes
-from core.emulator.enumerations import NodeTlvs
-from core.emulator.enumerations import RegisterTlvs
-from core.emulator.enumerations import SessionTlvs
-from core.nodes.ipaddress import IpAddress
-from core.nodes.ipaddress import MacAddress
+from core.emulator.enumerations import (
+    ConfigTlvs,
+    EventTlvs,
+    EventTypes,
+    ExceptionTlvs,
+    ExecuteTlvs,
+    FileTlvs,
+    InterfaceTlvs,
+    LinkTlvs,
+    MessageFlags,
+    MessageTypes,
+    NodeTlvs,
+    RegisterTlvs,
+    SessionTlvs,
+)
+from core.nodes.ipaddress import IpAddress, MacAddress
 
 
 class CoreTlvData(object):

daemon/core/api/tlv/corehandlers.py

@@ -6,44 +6,40 @@ import logging
 import os
 import shlex
 import shutil
+import socketserver
 import sys
 import threading
 import time
-from itertools import repeat
-
-import socketserver
 from builtins import range
-from queue import Queue, Empty
+from itertools import repeat
+from queue import Empty, Queue
 
 from core import utils
 from core.api.tlv import coreapi, dataconversion, structutils
 from core.config import ConfigShim
-from core.emulator.data import ConfigData, ExceptionData
-from core.emulator.data import EventData
-from core.emulator.data import FileData
-from core.emulator.emudata import InterfaceData
-from core.emulator.emudata import LinkOptions
-from core.emulator.emudata import NodeOptions
-from core.emulator.enumerations import ConfigDataTypes
-from core.emulator.enumerations import ConfigFlags
-from core.emulator.enumerations import ConfigTlvs
-from core.emulator.enumerations import EventTlvs
-from core.emulator.enumerations import EventTypes
-from core.emulator.enumerations import ExceptionTlvs
-from core.emulator.enumerations import ExecuteTlvs
-from core.emulator.enumerations import FileTlvs
-from core.emulator.enumerations import LinkTlvs
-from core.emulator.enumerations import LinkTypes
-from core.emulator.enumerations import MessageFlags
-from core.emulator.enumerations import MessageTypes
-from core.emulator.enumerations import NodeTlvs
-from core.emulator.enumerations import NodeTypes
-from core.emulator.enumerations import RegisterTlvs
-from core.emulator.enumerations import SessionTlvs
+from core.emulator.data import ConfigData, EventData, ExceptionData, FileData
+from core.emulator.emudata import InterfaceData, LinkOptions, NodeOptions
+from core.emulator.enumerations import (
+    ConfigDataTypes,
+    ConfigFlags,
+    ConfigTlvs,
+    EventTlvs,
+    EventTypes,
+    ExceptionTlvs,
+    ExecuteTlvs,
+    FileTlvs,
+    LinkTlvs,
+    LinkTypes,
+    MessageFlags,
+    MessageTypes,
+    NodeTlvs,
+    NodeTypes,
+    RegisterTlvs,
+    SessionTlvs,
+)
 from core.location.mobility import BasicRangeModel
 from core.nodes import nodeutils
-from core.services.coreservices import ServiceManager
-from core.services.coreservices import ServiceShim
+from core.services.coreservices import ServiceManager, ServiceShim
 
 
 class CoreHandler(socketserver.BaseRequestHandler):

daemon/core/api/tlv/dataconversion.py

@@ -3,8 +3,7 @@ Converts CORE data objects into legacy API messages.
 """
 
 from core.api.tlv import coreapi, structutils
-from core.emulator.enumerations import ConfigTlvs
-from core.emulator.enumerations import NodeTlvs
+from core.emulator.enumerations import ConfigTlvs, NodeTlvs
 
 
 def convert_node(node_data):

daemon/core/api/tlv/structutils.py

@@ -3,6 +3,7 @@ Utilities for working with python struct data.
 """
 
 import logging
+
 from past.builtins import basestring