pass over files using isort

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