pass over files using isort

daemon/.pre-commit-config.yaml

@@ -5,5 +5,5 @@ repos:
     name: isort
     stages: [commit]
     language: system
-    entry: bash -c 'cd daemon && pipenv run isort --atomic'
+    entry: bash -c 'cd daemon && pipenv run isort --atomic -y'
     types: [python]

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
 
 

daemon/core/emane/bypass.py

@@ -1,8 +1,7 @@
 """
 EMANE Bypass model for CORE
 """
-from core.config import ConfigGroup
-from core.config import Configuration
+from core.config import ConfigGroup, Configuration
 from core.emane import emanemodel
 from core.emulator.enumerations import ConfigDataTypes
 

daemon/core/emane/commeffect.py

@@ -4,12 +4,12 @@ commeffect.py: EMANE CommEffect model for CORE
 
 import logging
 import os
+
 from lxml import etree
 from past.builtins import basestring
 
 from core.config import ConfigGroup
-from core.emane import emanemanifest
-from core.emane import emanemodel
+from core.emane import emanemanifest, emanemodel
 from core.xml import emanexml
 
 try:

daemon/core/emane/emanemanager.py

@@ -7,13 +7,9 @@ import logging
 import os
 import threading
 
-from core import CoreCommandError, utils
-from core import constants
+from core import CoreCommandError, constants, utils
 from core.api.tlv import coreapi, dataconversion
-from core.config import ConfigGroup
-from core.config import ConfigShim
-from core.config import Configuration
-from core.config import ModelManager
+from core.config import ConfigGroup, ConfigShim, Configuration, ModelManager
 from core.emane import emanemanifest
 from core.emane.bypass import EmaneBypassModel
 from core.emane.commeffect import EmaneCommEffectModel
@@ -21,13 +17,15 @@ from core.emane.emanemodel import EmaneModel
 from core.emane.ieee80211abg import EmaneIeee80211abgModel
 from core.emane.rfpipe import EmaneRfPipeModel
 from core.emane.tdma import EmaneTdmaModel
-from core.emulator.enumerations import ConfigDataTypes
-from core.emulator.enumerations import ConfigFlags
-from core.emulator.enumerations import ConfigTlvs
-from core.emulator.enumerations import MessageFlags
-from core.emulator.enumerations import MessageTypes
-from core.emulator.enumerations import NodeTypes
-from core.emulator.enumerations import RegisterTlvs
+from core.emulator.enumerations import (
+    ConfigDataTypes,
+    ConfigFlags,
+    ConfigTlvs,
+    MessageFlags,
+    MessageTypes,
+    NodeTypes,
+    RegisterTlvs,
+)
 from core.nodes import nodeutils
 from core.xml import emanexml
 

daemon/core/emane/emanemodel.py

@@ -4,8 +4,7 @@ Defines Emane Models used within CORE.
 import logging
 import os
 
-from core.config import ConfigGroup
-from core.config import Configuration
+from core.config import ConfigGroup, Configuration
 from core.emane import emanemanifest
 from core.emulator.enumerations import ConfigDataTypes
 from core.location.mobility import WirelessModel

daemon/core/emane/nodes.py

@@ -6,10 +6,8 @@ share the same MAC+PHY model.
 
 import logging
 
+from core.emulator.enumerations import LinkTypes, NodeTypes, RegisterTlvs
 from core.nodes.base import CoreNetworkBase
-from core.emulator.enumerations import LinkTypes
-from core.emulator.enumerations import NodeTypes
-from core.emulator.enumerations import RegisterTlvs
 
 try:
     from emane.events import LocationEvent

daemon/core/emulator/coreemu.py

@@ -7,8 +7,7 @@ import sys
 import core.services
 from core.emulator.emudata import IdGen
 from core.emulator.session import Session
-from core.nodes import nodemaps
-from core.nodes import nodeutils
+from core.nodes import nodemaps, nodeutils
 from core.services.coreservices import ServiceManager
 
 

daemon/core/emulator/emudata.py

@@ -1,10 +1,7 @@
-from core.emulator.enumerations import LinkTypes
-from core.emulator.enumerations import NodeTypes
+from core.emulator.enumerations import LinkTypes, NodeTypes
 from core.nodes import nodeutils
 from core.nodes.base import CoreNetworkBase
-from core.nodes.ipaddress import Ipv4Prefix
-from core.nodes.ipaddress import Ipv6Prefix
-from core.nodes.ipaddress import MacAddress
+from core.nodes.ipaddress import Ipv4Prefix, Ipv6Prefix, MacAddress
 
 
 class IdGen(object):

daemon/core/emulator/session.py

@@ -15,23 +15,21 @@ import time
 from multiprocessing.pool import ThreadPool
 
 import core.nodes.base
-from core import constants
-from core import utils
+from core import constants, utils
 from core.api.tlv import coreapi
 from core.api.tlv.broker import CoreBroker
 from core.emane.emanemanager import EmaneManager
-from core.emulator.data import EventData, NodeData
-from core.emulator.data import ExceptionData
-from core.emulator.emudata import IdGen
-from core.emulator.emudata import LinkOptions, NodeOptions
-from core.emulator.emudata import create_interface
-from core.emulator.emudata import is_net_node
-from core.emulator.emudata import link_config
-from core.emulator.enumerations import EventTypes, LinkTypes
-from core.emulator.enumerations import ExceptionLevels
-from core.emulator.enumerations import NodeTypes
-from core.emulator.sessionconfig import SessionConfig
-from core.emulator.sessionconfig import SessionMetaData
+from core.emulator.data import EventData, ExceptionData, NodeData
+from core.emulator.emudata import (
+    IdGen,
+    LinkOptions,
+    NodeOptions,
+    create_interface,
+    is_net_node,
+    link_config,
+)
+from core.emulator.enumerations import EventTypes, ExceptionLevels, LinkTypes, NodeTypes
+from core.emulator.sessionconfig import SessionConfig, SessionMetaData
 from core.location.corelocation import CoreLocation
 from core.location.event import EventLoop
 from core.location.mobility import MobilityManager
@@ -40,8 +38,7 @@ from core.nodes.base import CoreNodeBase
 from core.nodes.ipaddress import MacAddress
 from core.plugins.sdt import Sdt
 from core.services.coreservices import CoreServices
-from core.xml import corexml
-from core.xml import corexmldeployment
+from core.xml import corexml, corexmldeployment
 from core.xml.corexml import CoreXmlReader, CoreXmlWriter
 
 

daemon/core/emulator/sessionconfig.py

@@ -1,8 +1,5 @@
-from core.config import ConfigurableManager
-from core.config import ConfigurableOptions
-from core.config import Configuration
-from core.emulator.enumerations import ConfigDataTypes
-from core.emulator.enumerations import RegisterTlvs
+from core.config import ConfigurableManager, ConfigurableOptions, Configuration
+from core.emulator.enumerations import ConfigDataTypes, RegisterTlvs
 from core.plugins.sdt import Sdt
 
 

daemon/core/location/event.py

@@ -5,6 +5,7 @@ event.py: event loop implementation using a heap queue and threads.
 import heapq
 import threading
 import time
+
 from past.builtins import cmp
 
 

daemon/core/location/mobility.py

@@ -12,19 +12,17 @@ from builtins import int
 from functools import total_ordering
 
 from core import utils
-from core.config import ConfigGroup
-from core.config import ConfigurableOptions
-from core.config import Configuration
-from core.config import ModelManager
-from core.emulator.data import EventData
-from core.emulator.data import LinkData
-from core.emulator.enumerations import ConfigDataTypes
-from core.emulator.enumerations import EventTypes
-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 RegisterTlvs
+from core.config import ConfigGroup, ConfigurableOptions, Configuration, ModelManager
+from core.emulator.data import EventData, LinkData
+from core.emulator.enumerations import (
+    ConfigDataTypes,
+    EventTypes,
+    LinkTypes,
+    MessageFlags,
+    MessageTypes,
+    NodeTlvs,
+    RegisterTlvs,
+)
 from core.nodes.base import CoreNodeBase
 from core.nodes.ipaddress import IpAddress
 

daemon/core/nodes/base.py

@@ -11,17 +11,14 @@ import signal
 import socket
 import string
 import threading
+from builtins import range
 from socket import AF_INET, AF_INET6
 
-from builtins import range
-
-from core import CoreCommandError, utils
-from core import constants
-from core.emulator.data import NodeData, LinkData
-from core.emulator.enumerations import NodeTypes, LinkTypes
-from core.nodes import client, nodeutils, ipaddress
-from core.nodes.interface import TunTap, CoreInterface
-from core.nodes.interface import Veth
+from core import CoreCommandError, constants, utils
+from core.emulator.data import LinkData, NodeData
+from core.emulator.enumerations import LinkTypes, NodeTypes
+from core.nodes import client, ipaddress, nodeutils
+from core.nodes.interface import CoreInterface, TunTap, Veth
 
 _DEFAULT_MTU = 1500
 

daemon/core/nodes/client.py

@@ -6,11 +6,9 @@ The control channel can be accessed via calls using the vcmd shell.
 
 import logging
 import os
+from subprocess import PIPE, Popen
 
-from subprocess import Popen, PIPE
-
-from core import CoreCommandError, utils
-from core import constants
+from core import CoreCommandError, constants, utils
 
 
 class VnodeClient(object):

daemon/core/nodes/docker.py

@@ -2,7 +2,7 @@ import json
 import logging
 import os
 
-from core import utils, CoreCommandError
+from core import CoreCommandError, utils
 from core.emulator.enumerations import NodeTypes
 from core.nodes.base import CoreNode
 

daemon/core/nodes/interface.py

@@ -4,11 +4,9 @@ virtual ethernet classes that implement the interfaces available under Linux.
 
 import logging
 import time
-from builtins import int
-from builtins import range
+from builtins import int, range
 
-from core import CoreCommandError, utils
-from core import constants
+from core import CoreCommandError, constants, utils
 from core.emulator.enumerations import NodeTypes
 from core.nodes import nodeutils
 

daemon/core/nodes/ipaddress.py

@@ -6,10 +6,8 @@ import logging
 import random
 import socket
 import struct
-from builtins import bytes
-from builtins import range
-from socket import AF_INET
-from socket import AF_INET6
+from builtins import bytes, range
+from socket import AF_INET, AF_INET6
 
 
 class MacAddress(object):

daemon/core/nodes/lxd.py

@@ -3,7 +3,7 @@ import logging
 import os
 import time
 
-from core import utils, CoreCommandError
+from core import CoreCommandError, utils
 from core.emulator.enumerations import NodeTypes
 from core.nodes.base import CoreNode
 

daemon/core/nodes/network.py

@@ -9,14 +9,12 @@ import threading
 import time
 from socket import AF_INET, AF_INET6
 
-from core import CoreCommandError, utils
-from core import constants
-from core.nodes.base import CoreNetworkBase
+from core import CoreCommandError, constants, utils
 from core.emulator.data import LinkData
-from core.emulator.enumerations import NodeTypes, LinkTypes, RegisterTlvs
+from core.emulator.enumerations import LinkTypes, NodeTypes, RegisterTlvs
 from core.nodes import ipaddress
-from core.nodes.interface import GreTap
-from core.nodes.interface import Veth
+from core.nodes.base import CoreNetworkBase
+from core.nodes.interface import GreTap, Veth
 
 utils.check_executables([
     constants.BRCTL_BIN,

daemon/core/nodes/nodemaps.py

@@ -6,11 +6,10 @@ import core.nodes.docker
 import core.nodes.lxd
 import core.nodes.network
 import core.nodes.physical
-from core.emane.nodes import EmaneNet
-from core.emane.nodes import EmaneNode
+from core.emane.nodes import EmaneNet, EmaneNode
 from core.emulator.enumerations import NodeTypes
-from core.nodes.network import GreTapBridge
 from core.nodes import physical
+from core.nodes.network import GreTapBridge
 
 # legacy core nodes, that leverage linux bridges
 NODES = {

daemon/core/nodes/openvswitch.py

@@ -5,21 +5,15 @@ TODO: probably goes away, or implement the usage of "unshare", or docker formal.
 import logging
 import socket
 import threading
-from socket import AF_INET
-from socket import AF_INET6
+from socket import AF_INET, AF_INET6
 
-from core import CoreCommandError, utils
-from core import constants
-from core.nodes.base import CoreNetworkBase
+from core import CoreCommandError, constants, utils
 from core.emulator.data import LinkData
-from core.emulator.enumerations import LinkTypes
-from core.emulator.enumerations import NodeTypes
-from core.emulator.enumerations import RegisterTlvs
+from core.emulator.enumerations import LinkTypes, NodeTypes, RegisterTlvs
 from core.nodes import ipaddress
-from core.nodes.interface import GreTap
-from core.nodes.interface import Veth
-from core.nodes.network import EbtablesQueue
-from core.nodes.network import GreTapBridge
+from core.nodes.base import CoreNetworkBase
+from core.nodes.interface import GreTap, Veth
+from core.nodes.network import EbtablesQueue, GreTapBridge
 
 # a global object because all WLANs share the same queue
 # cannot have multiple threads invoking the ebtables commnd

daemon/core/nodes/physical.py

@@ -7,13 +7,11 @@ import os
 import subprocess
 import threading
 
-from core import CoreCommandError, utils
-from core import constants
+from core import CoreCommandError, constants, utils
+from core.emulator.enumerations import NodeTypes
 from core.nodes.base import CoreNodeBase
 from core.nodes.interface import CoreInterface
-from core.emulator.enumerations import NodeTypes
-from core.nodes.network import GreTap
-from core.nodes.network import CoreNetwork
+from core.nodes.network import CoreNetwork, GreTap
 
 
 class PhysicalNode(CoreNodeBase):

daemon/core/plugins/sdt.py

@@ -4,18 +4,21 @@ sdt.py: Scripted Display Tool (SDT3D) helper
 
 import logging
 import socket
+
 from future.moves.urllib.parse import urlparse
 
 from core import constants
-from core.emulator.enumerations import EventTypes
-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 (
+    EventTypes,
+    LinkTlvs,
+    LinkTypes,
+    MessageFlags,
+    MessageTypes,
+    NodeTlvs,
+    NodeTypes,
+)
 from core.nodes import nodeutils
-from core.nodes.base import NodeBase, CoreNetworkBase
+from core.nodes.base import CoreNetworkBase, NodeBase
 
 
 # TODO: A named tuple may be more appropriate, than abusing a class dict like this

daemon/core/services/coreservices.py

@@ -15,8 +15,7 @@ from multiprocessing.pool import ThreadPool
 from core import CoreCommandError, utils
 from core.constants import which
 from core.emulator.data import FileData
-from core.emulator.enumerations import MessageFlags
-from core.emulator.enumerations import RegisterTlvs
+from core.emulator.enumerations import MessageFlags, RegisterTlvs
 
 
 class ServiceBootError(Exception):

daemon/core/services/dockersvc.py

@@ -99,8 +99,7 @@ Limitations:
 
 import logging
 
-from core.services.coreservices import CoreService
-from core.services.coreservices import ServiceManager
+from core.services.coreservices import CoreService, ServiceManager
 
 try:
     from docker import Client

daemon/core/services/frr.py

@@ -5,7 +5,7 @@ Assumes installation of FRR via https://deb.frrouting.org/
 
 from core import constants
 from core.emulator.enumerations import LinkTypes, NodeTypes
-from core.nodes import nodeutils, ipaddress
+from core.nodes import ipaddress, nodeutils
 from core.services.coreservices import CoreService
 
 

daemon/core/services/quagga.py

@@ -4,7 +4,7 @@ quagga.py: defines routing services provided by Quagga.
 
 from core import constants
 from core.emulator.enumerations import LinkTypes, NodeTypes
-from core.nodes import nodeutils, ipaddress
+from core.nodes import ipaddress, nodeutils
 from core.services.coreservices import CoreService
 
 

daemon/core/services/security.py

@@ -159,4 +159,3 @@ class Nat(CoreService):
                 cfg += cls.generateifcnatrule(ifc)
                 cfg += "\n"
         return cfg
-

daemon/core/services/utility.py

@@ -4,10 +4,8 @@ utility.py: defines miscellaneous utility services.
 
 import os
 
-from core import CoreCommandError, utils
-from core import constants
-from core.nodes.ipaddress import Ipv4Prefix
-from core.nodes.ipaddress import Ipv6Prefix
+from core import CoreCommandError, constants, utils
+from core.nodes.ipaddress import Ipv4Prefix, Ipv6Prefix
 from core.services.coreservices import CoreService
 
 

daemon/core/utils.py

@@ -11,6 +11,7 @@ import os
 import shlex
 import subprocess
 import sys
+
 from past.builtins import basestring
 
 from core import CoreCommandError

daemon/core/xml/corexml.py

@@ -1,14 +1,13 @@
 import logging
-from core.nodes.base import CoreNetworkBase
+
 from lxml import etree
 
 import core.nodes.base
 import core.nodes.physical
-from core.emulator.emudata import InterfaceData
-from core.emulator.emudata import LinkOptions
-from core.emulator.emudata import NodeOptions
+from core.emulator.emudata import InterfaceData, LinkOptions, NodeOptions
 from core.emulator.enumerations import NodeTypes
 from core.nodes import nodeutils
+from core.nodes.base import CoreNetworkBase
 from core.nodes.ipaddress import MacAddress
 
 

daemon/core/xml/corexmldeployment.py

@@ -4,9 +4,9 @@ import socket
 from lxml import etree
 
 from core import constants, utils
-from core.nodes.base import CoreNodeBase
 from core.emulator.enumerations import NodeTypes
-from core.nodes import nodeutils, ipaddress
+from core.nodes import ipaddress, nodeutils
+from core.nodes.base import CoreNodeBase
 
 
 def add_type(parent_element, name):

daemon/examples/api/emane80211.py

@@ -3,9 +3,9 @@
 # Example CORE Python script that attaches N nodes to an EMANE 802.11abg network.
 
 import datetime
+import parser
 from builtins import range
 
-import parser
 from core import load_logging_config
 from core.emane.ieee80211abg import EmaneIeee80211abgModel
 from core.emulator.coreemu import CoreEmu

daemon/examples/api/switch.py

@@ -6,13 +6,13 @@
 # nodestep
 
 import datetime
+import parser
 from builtins import range
 
-import parser
 from core import load_logging_config
 from core.emulator.coreemu import CoreEmu
 from core.emulator.emudata import IpPrefixes
-from core.emulator.enumerations import NodeTypes, EventTypes
+from core.emulator.enumerations import EventTypes, NodeTypes
 
 load_logging_config()
 

daemon/examples/api/switch_inject.py

@@ -8,7 +8,7 @@ from builtins import range
 
 from core import load_logging_config
 from core.emulator.emudata import IpPrefixes
-from core.emulator.enumerations import NodeTypes, EventTypes
+from core.emulator.enumerations import EventTypes, NodeTypes
 
 load_logging_config()
 

daemon/examples/api/wlan.py

@@ -6,13 +6,13 @@
 # nodestep
 
 import datetime
+import parser
 from builtins import range
 
-import parser
 from core import load_logging_config
 from core.emulator.coreemu import CoreEmu
 from core.emulator.emudata import IpPrefixes, NodeOptions
-from core.emulator.enumerations import NodeTypes, EventTypes
+from core.emulator.enumerations import EventTypes, NodeTypes
 from core.location.mobility import BasicRangeModel
 
 load_logging_config()

daemon/examples/docker/docker2core.py

@@ -2,8 +2,7 @@ import logging
 
 from core.emulator.coreemu import CoreEmu
 from core.emulator.emudata import IpPrefixes, NodeOptions
-from core.emulator.enumerations import NodeTypes, EventTypes
-
+from core.emulator.enumerations import EventTypes, NodeTypes
 
 if __name__ == "__main__":
     logging.basicConfig(level=logging.DEBUG)

daemon/examples/docker/docker2docker.py

@@ -2,8 +2,7 @@ import logging
 
 from core.emulator.coreemu import CoreEmu
 from core.emulator.emudata import IpPrefixes, NodeOptions
-from core.emulator.enumerations import NodeTypes, EventTypes
-
+from core.emulator.enumerations import EventTypes, NodeTypes
 
 if __name__ == "__main__":
     logging.basicConfig(level=logging.DEBUG)

daemon/examples/docker/switch.py

@@ -2,8 +2,7 @@ import logging
 
 from core.emulator.coreemu import CoreEmu
 from core.emulator.emudata import IpPrefixes, NodeOptions
-from core.emulator.enumerations import NodeTypes, EventTypes
-
+from core.emulator.enumerations import EventTypes, NodeTypes
 
 if __name__ == "__main__":
     logging.basicConfig(level=logging.DEBUG)

daemon/examples/lxd/lxd2core.py

@@ -2,8 +2,7 @@ import logging
 
 from core.emulator.coreemu import CoreEmu
 from core.emulator.emudata import IpPrefixes, NodeOptions
-from core.emulator.enumerations import NodeTypes, EventTypes
-
+from core.emulator.enumerations import EventTypes, NodeTypes
 
 if __name__ == "__main__":
     logging.basicConfig(level=logging.DEBUG)

daemon/examples/lxd/lxd2lxd.py

@@ -2,8 +2,7 @@ import logging
 
 from core.emulator.coreemu import CoreEmu
 from core.emulator.emudata import IpPrefixes, NodeOptions
-from core.emulator.enumerations import NodeTypes, EventTypes
-
+from core.emulator.enumerations import EventTypes, NodeTypes
 
 if __name__ == "__main__":
     logging.basicConfig(level=logging.DEBUG)

daemon/examples/lxd/switch.py

@@ -2,8 +2,7 @@ import logging
 
 from core.emulator.coreemu import CoreEmu
 from core.emulator.emudata import IpPrefixes, NodeOptions
-from core.emulator.enumerations import NodeTypes, EventTypes
-
+from core.emulator.enumerations import EventTypes, NodeTypes
 
 if __name__ == "__main__":
     logging.basicConfig(level=logging.DEBUG)

daemon/examples/myemane/examplemodel.py

@@ -2,8 +2,7 @@
 Example custom emane model.
 """
 
-from core.emane import emanemanifest
-from core.emane import emanemodel
+from core.emane import emanemanifest, emanemodel
 
 
 class ExampleModel(emanemodel.EmaneModel):

daemon/examples/myservices/sample.py

@@ -2,8 +2,7 @@
 Simple example for a user-defined service.
 """
 
-from core.services.coreservices import CoreService
-from core.services.coreservices import ServiceMode
+from core.services.coreservices import CoreService, ServiceMode
 
 
 class MyService(CoreService):

daemon/examples/netns/daemonnodes.py

@@ -19,14 +19,16 @@ import core.nodes.base
 import core.nodes.network
 from core.api.tlv import coreapi, dataconversion
 from core.api.tlv.coreapi import CoreExecuteTlv
-from core.emulator.enumerations import CORE_API_PORT
-from core.emulator.enumerations import EventTlvs
-from core.emulator.enumerations import EventTypes
-from core.emulator.enumerations import ExecuteTlvs
-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 (
+    CORE_API_PORT,
+    EventTlvs,
+    EventTypes,
+    ExecuteTlvs,
+    LinkTlvs,
+    LinkTypes,
+    MessageFlags,
+    MessageTypes,
+)
 from core.emulator.session import Session
 from core.nodes import ipaddress
 

daemon/examples/netns/distributed.py

@@ -18,7 +18,14 @@ import core.nodes.base
 import core.nodes.network
 from core import constants
 from core.api.tlv import coreapi, dataconversion
-from core.emulator.enumerations import CORE_API_PORT, EventTypes, EventTlvs, LinkTlvs, LinkTypes, MessageFlags
+from core.emulator.enumerations import (
+    CORE_API_PORT,
+    EventTlvs,
+    EventTypes,
+    LinkTlvs,
+    LinkTypes,
+    MessageFlags,
+)
 from core.emulator.session import Session
 from core.nodes import ipaddress
 

daemon/examples/netns/howmanynodes.py

@@ -22,8 +22,8 @@ import time
 import core.nodes.base
 import core.nodes.network
 from core import constants
-from core.nodes import ipaddress
 from core.emulator.session import Session
+from core.nodes import ipaddress
 
 GBD = 1024.0 * 1024.0
 

daemon/examples/netns/wlanemanetests.py

@@ -47,14 +47,11 @@ from core.emulator.session import Session
 from core.nodes import ipaddress
 
 try:
-    import emaneeventservice
-    import emaneeventpathloss
-except Exception as e:
-    try:
-        from emanesh.events import EventService
-        from emanesh.events import PathlossEvent
-    except Exception as e2:
-        raise ImportError("failed to import EMANE Python bindings:\n%s\n%s" % (e, e2))
+    from emane.events import EventService
+    from emane.events import PathlossEvent
+except ImportError:
+    from emanesh.events import EventService
+    from emanesh.events import PathlossEvent
 
 # global Experiment object (for interaction with "python -i")
 exp = None

daemon/examples/stopsession.py

@@ -9,7 +9,7 @@ import optparse
 import socket
 
 from core.api.tlv import coreapi
-from core.emulator.enumerations import MessageFlags, SessionTlvs, CORE_API_PORT
+from core.emulator.enumerations import CORE_API_PORT, MessageFlags, SessionTlvs
 
 
 def main():

daemon/scripts/core-daemon

@@ -10,16 +10,12 @@ import logging
 import sys
 import threading
 import time
-
 from configparser import ConfigParser
 
-from core import constants
-from core import load_logging_config
+from core import constants, load_logging_config
 from core.api.grpc.server import CoreGrpcServer
-from core.api.tlv.corehandlers import CoreHandler
-from core.api.tlv.corehandlers import CoreUdpHandler
-from core.api.tlv.coreserver import CoreServer
-from core.api.tlv.coreserver import CoreUdpServer
+from core.api.tlv.corehandlers import CoreHandler, CoreUdpHandler
+from core.api.tlv.coreserver import CoreServer, CoreUdpServer
 from core.emulator import enumerations
 from core.utils import close_onexec
 

daemon/scripts/coresendmsg

@@ -9,10 +9,7 @@ import socket
 import sys
 
 from core.api.tlv import coreapi
-from core.emulator.enumerations import CORE_API_PORT
-from core.emulator.enumerations import MessageFlags
-from core.emulator.enumerations import MessageTypes
-from core.emulator.enumerations import SessionTlvs
+from core.emulator.enumerations import CORE_API_PORT, MessageFlags, MessageTypes, SessionTlvs
 
 
 def print_available_tlvs(t, tlv_class):

daemon/setup.cfg

@@ -2,6 +2,7 @@
 test=pytest
 
 [isort]
+skip_glob=*_pb2*.py
 multi_line_output=3
 include_trailing_comma=True
 force_grid_wrap=0

daemon/tests/conftest.py

@@ -7,8 +7,6 @@ import threading
 import time
 
 import pytest
-from mock.mock import MagicMock
-
 from core.api.grpc.client import InterfaceHelper
 from core.api.grpc.server import CoreGrpcServer
 from core.api.tlv.coreapi import CoreConfMessage, CoreEventMessage
@@ -16,11 +14,10 @@ from core.api.tlv.corehandlers import CoreHandler
 from core.api.tlv.coreserver import CoreServer
 from core.emulator.coreemu import CoreEmu
 from core.emulator.emudata import IpPrefixes
-from core.emulator.enumerations import CORE_API_PORT, EventTlvs
-from core.emulator.enumerations import ConfigTlvs
-from core.emulator.enumerations import EventTypes
+from core.emulator.enumerations import CORE_API_PORT, ConfigTlvs, EventTlvs, EventTypes
 from core.nodes import ipaddress
 from core.services.coreservices import ServiceManager
+from mock.mock import MagicMock
 
 EMANE_SERVICES = "zebra|OSPFv3MDR|IPForward"
 

daemon/tests/distributed/test_distributed.py

@@ -1,14 +1,27 @@
 """
 Unit tests for testing CORE with distributed networks.
 """
+from core.api.tlv.coreapi import (
+    CoreConfMessage,
+    CoreEventMessage,
+    CoreExecMessage,
+    CoreLinkMessage,
+    CoreNodeMessage,
+)
 from core.emane.ieee80211abg import EmaneIeee80211abgModel
-
-from core.api.tlv.coreapi import CoreExecMessage, CoreNodeMessage, CoreLinkMessage, CoreEventMessage, CoreConfMessage
-from core.emulator.enumerations import EventTypes, NodeTlvs, LinkTlvs, LinkTypes, EventTlvs, ConfigTlvs, ConfigFlags
-from core.emulator.enumerations import ExecuteTlvs
-from core.emulator.enumerations import MessageFlags
-from core.emulator.enumerations import NodeTypes
-from core.nodes.ipaddress import IpAddress, MacAddress, Ipv4Prefix
+from core.emulator.enumerations import (
+    ConfigFlags,
+    ConfigTlvs,
+    EventTlvs,
+    EventTypes,
+    ExecuteTlvs,
+    LinkTlvs,
+    LinkTypes,
+    MessageFlags,
+    NodeTlvs,
+    NodeTypes,
+)
+from core.nodes.ipaddress import IpAddress, Ipv4Prefix, MacAddress
 
 
 def set_emane_model(node_id, model):

daemon/tests/test_conf.py

@@ -1,12 +1,7 @@
 import pytest
-
-from core.config import ConfigurableManager
-from core.config import ConfigurableOptions
-from core.config import Configuration
-from core.config import ModelManager
+from core.config import ConfigurableManager, ConfigurableOptions, Configuration, ModelManager
 from core.emane.ieee80211abg import EmaneIeee80211abgModel
-from core.emulator.enumerations import ConfigDataTypes
-from core.emulator.enumerations import NodeTypes
+from core.emulator.enumerations import ConfigDataTypes, NodeTypes
 from core.location.mobility import BasicRangeModel
 
 

daemon/tests/test_core.py

@@ -8,12 +8,9 @@ import subprocess
 import threading
 
 import pytest
-
 from core.emulator.emudata import NodeOptions
-from core.emulator.enumerations import MessageFlags
-from core.emulator.enumerations import NodeTypes
-from core.location.mobility import BasicRangeModel
-from core.location.mobility import Ns2ScriptedMobility
+from core.emulator.enumerations import MessageFlags, NodeTypes
+from core.location.mobility import BasicRangeModel, Ns2ScriptedMobility
 from core.nodes.client import VnodeClient
 
 _PATH = os.path.abspath(os.path.dirname(__file__))

daemon/tests/test_emane.py

@@ -4,7 +4,6 @@ Unit tests for testing CORE EMANE networks.
 import os
 
 import pytest
-
 from conftest import ping
 from core.emane.bypass import EmaneBypassModel
 from core.emane.commeffect import EmaneCommEffectModel

daemon/tests/test_grpc.py

@@ -1,17 +1,17 @@
 import time
-
-import grpc
-import pytest
 from builtins import int
 from queue import Queue
 
+import grpc
+
+import pytest
 from core.api.grpc import core_pb2
 from core.api.grpc.client import CoreGrpcClient
 from core.config import ConfigShim
 from core.emane.ieee80211abg import EmaneIeee80211abgModel
 from core.emulator.data import EventData
 from core.emulator.emudata import NodeOptions
-from core.emulator.enumerations import NodeTypes, EventTypes, ConfigFlags, ExceptionLevels
+from core.emulator.enumerations import ConfigFlags, EventTypes, ExceptionLevels, NodeTypes
 from core.location.mobility import BasicRangeModel, Ns2ScriptedMobility
 
 

daemon/tests/test_gui.py

@@ -6,15 +6,22 @@ import time
 
 import mock
 import pytest
-
 from core.api.tlv import coreapi
 from core.emane.ieee80211abg import EmaneIeee80211abgModel
-from core.emulator.enumerations import EventTlvs, SessionTlvs, EventTypes, FileTlvs, RegisterTlvs, ConfigTlvs, \
-    ConfigFlags
-from core.emulator.enumerations import ExecuteTlvs
-from core.emulator.enumerations import LinkTlvs
-from core.emulator.enumerations import MessageFlags
-from core.emulator.enumerations import NodeTypes, NodeTlvs
+from core.emulator.enumerations import (
+    ConfigFlags,
+    ConfigTlvs,
+    EventTlvs,
+    EventTypes,
+    ExecuteTlvs,
+    FileTlvs,
+    LinkTlvs,
+    MessageFlags,
+    NodeTlvs,
+    NodeTypes,
+    RegisterTlvs,
+    SessionTlvs,
+)
 from core.location.mobility import BasicRangeModel
 from core.nodes.ipaddress import Ipv4Prefix
 

daemon/tests/test_links.py

@@ -1,6 +1,6 @@
+from core import utils
 from core.emulator.emudata import LinkOptions
 from core.emulator.enumerations import NodeTypes
-from core import utils
 
 
 def create_ptp_network(session, ip_prefixes):

daemon/tests/test_nodes.py

@@ -2,10 +2,9 @@ import os
 import time
 
 import pytest
-
+from core import utils
 from core.emulator.emudata import NodeOptions
 from core.emulator.enumerations import NodeTypes
-from core import utils
 
 MODELS = [
     "router",

daemon/tests/test_services.py

@@ -1,10 +1,7 @@
 import os
 
 import pytest
-
-from core.services.coreservices import CoreService
-from core.services.coreservices import ServiceDependencies
-from core.services.coreservices import ServiceManager
+from core.services.coreservices import CoreService, ServiceDependencies, ServiceManager
 
 _PATH = os.path.abspath(os.path.dirname(__file__))
 _SERVICES_PATH = os.path.join(_PATH, "myservices")

daemon/tests/test_xml.py

@@ -1,9 +1,8 @@
 from xml.etree import ElementTree
 
 import pytest
-
 from core.emane.ieee80211abg import EmaneIeee80211abgModel
-from core.emulator.emudata import NodeOptions, LinkOptions
+from core.emulator.emudata import LinkOptions, NodeOptions
 from core.emulator.enumerations import NodeTypes
 from core.location.mobility import BasicRangeModel
 from core.services.utility import SshService