afonso/core-extra
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

pass over files using isort

Browse source
This commit is contained in:
bharnden 2019-09-10 14:20:51 -07:00
parent a004285514
commit d5055f85d3
70 changed files with 260 additions and 307 deletions
Download patch file Download diff file Expand all files Collapse all files

15
daemon/core/nodes/base.py
View file

@ -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

6
daemon/core/nodes/client.py
View file

@ -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):

2
daemon/core/nodes/docker.py
View file

@ -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

6
daemon/core/nodes/interface.py
View file

@ -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

6
daemon/core/nodes/ipaddress.py
View file

@ -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):

2
daemon/core/nodes/lxd.py
View file

@ -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

10
daemon/core/nodes/network.py
View file

@ -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,

5
daemon/core/nodes/nodemaps.py
View file

@ -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 = {

18
daemon/core/nodes/openvswitch.py
View file

@ -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

8
daemon/core/nodes/physical.py
View file

@ -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):