diff --git a/daemon/core/api/grpc/server.py b/daemon/core/api/grpc/server.py index daf84236..4381184d 100644 --- a/daemon/core/api/grpc/server.py +++ b/daemon/core/api/grpc/server.py @@ -202,7 +202,7 @@ class CoreGrpcServer(core_pb2_grpc.CoreApiServicer): """ def __init__(self, coreemu): - super(CoreGrpcServer, self).__init__() + super().__init__() self.coreemu = coreemu self.running = True self.server = None diff --git a/daemon/core/api/tlv/coreapi.py b/daemon/core/api/tlv/coreapi.py index 95818598..5cb013d8 100644 --- a/daemon/core/api/tlv/coreapi.py +++ b/daemon/core/api/tlv/coreapi.py @@ -94,12 +94,12 @@ class CoreTlvDataObj(CoreTlvData): """ Convenience method for packing custom object data. - :param obj: custom object to pack + :param value: custom object to pack :return: length of data and the packed data itself :rtype: tuple """ value = cls.get_value(value) - return super(CoreTlvDataObj, cls).pack(value) + return super().pack(value) @classmethod def unpack(cls, data): @@ -109,7 +109,7 @@ class CoreTlvDataObj(CoreTlvData): :param data: data to unpack custom object from :return: unpacked custom object """ - data = super(CoreTlvDataObj, cls).unpack(data) + data = super().unpack(data) return cls.new_obj(data) @staticmethod diff --git a/daemon/core/config.py b/daemon/core/config.py index 05ab5183..e8e73300 100644 --- a/daemon/core/config.py +++ b/daemon/core/config.py @@ -309,7 +309,7 @@ class ModelManager(ConfigurableManager): """ Creates a ModelManager object. """ - super(ModelManager, self).__init__() + super().__init__() self.models = {} self.node_models = {} diff --git a/daemon/core/emane/emanemanager.py b/daemon/core/emane/emanemanager.py index ec3691a8..a66f9de7 100644 --- a/daemon/core/emane/emanemanager.py +++ b/daemon/core/emane/emanemanager.py @@ -62,7 +62,7 @@ class EmaneManager(ModelManager): :param core.session.Session session: session this manager is tied to :return: nothing """ - super(EmaneManager, self).__init__() + super().__init__() self.session = session self._emane_nets = {} self._emane_node_lock = threading.Lock() @@ -128,7 +128,7 @@ class EmaneManager(ModelManager): return config def config_reset(self, node_id=None): - super(EmaneManager, self).config_reset(node_id) + super().config_reset(node_id) self.set_configs(self.emane_config.default_values()) def emane_check(self): @@ -871,7 +871,7 @@ class EmaneGlobalModel(EmaneModel): ] def __init__(self, session, _id=None): - super(EmaneGlobalModel, self).__init__(session, _id) + super().__init__(session, _id) def build_xml_files(self, config, interface=None): raise NotImplementedError diff --git a/daemon/core/emane/ieee80211abg.py b/daemon/core/emane/ieee80211abg.py index d4df4282..e7a4d0d7 100644 --- a/daemon/core/emane/ieee80211abg.py +++ b/daemon/core/emane/ieee80211abg.py @@ -19,4 +19,4 @@ class EmaneIeee80211abgModel(emanemodel.EmaneModel): cls.mac_defaults["pcrcurveuri"] = os.path.join( emane_prefix, "share/emane/xml/models/mac/ieee80211abg/ieee80211pcr.xml" ) - super(EmaneIeee80211abgModel, cls).load(emane_prefix) + super().load(emane_prefix) diff --git a/daemon/core/emane/nodes.py b/daemon/core/emane/nodes.py index e0ceee2f..c7817b41 100644 --- a/daemon/core/emane/nodes.py +++ b/daemon/core/emane/nodes.py @@ -30,7 +30,7 @@ class EmaneNet(CoreNetworkBase): is_emane = True def __init__(self, session, _id=None, name=None, start=True, server=None): - super(EmaneNet, self).__init__(session, _id, name, start, server) + super().__init__(session, _id, name, start, server) self.conf = "" self.up = False self.nemidmap = {} diff --git a/daemon/core/emane/rfpipe.py b/daemon/core/emane/rfpipe.py index 312a5bb2..51820b7d 100644 --- a/daemon/core/emane/rfpipe.py +++ b/daemon/core/emane/rfpipe.py @@ -19,4 +19,4 @@ class EmaneRfPipeModel(emanemodel.EmaneModel): cls.mac_defaults["pcrcurveuri"] = os.path.join( emane_prefix, "share/emane/xml/models/mac/rfpipe/rfpipepcr.xml" ) - super(EmaneRfPipeModel, cls).load(emane_prefix) + super().load(emane_prefix) diff --git a/daemon/core/emane/tdma.py b/daemon/core/emane/tdma.py index afad9d10..59ed9e04 100644 --- a/daemon/core/emane/tdma.py +++ b/daemon/core/emane/tdma.py @@ -32,7 +32,7 @@ class EmaneTdmaModel(emanemodel.EmaneModel): emane_prefix, "share/emane/xml/models/mac/tdmaeventscheduler/tdmabasemodelpcr.xml", ) - super(EmaneTdmaModel, cls).load(emane_prefix) + super().load(emane_prefix) cls.mac_config.insert( 0, Configuration( diff --git a/daemon/core/emulator/sessionconfig.py b/daemon/core/emulator/sessionconfig.py index dc5a5133..38373696 100644 --- a/daemon/core/emulator/sessionconfig.py +++ b/daemon/core/emulator/sessionconfig.py @@ -61,7 +61,7 @@ class SessionConfig(ConfigurableManager, ConfigurableOptions): config_type = RegisterTlvs.UTILITY.value def __init__(self): - super(SessionConfig, self).__init__() + super().__init__() self.set_configs(self.default_values()) def get_config( @@ -71,9 +71,7 @@ class SessionConfig(ConfigurableManager, ConfigurableOptions): config_type=ConfigurableManager._default_type, default=None, ): - value = super(SessionConfig, self).get_config( - _id, node_id, config_type, default - ) + value = super().get_config(_id, node_id, config_type, default) if value == "": value = default return value diff --git a/daemon/core/location/event.py b/daemon/core/location/event.py index 146062d1..11e535d3 100644 --- a/daemon/core/location/event.py +++ b/daemon/core/location/event.py @@ -23,7 +23,7 @@ class Timer(threading.Thread): :param args: function arguments :param kwargs: function keyword arguments """ - super(Timer, self).__init__() + super().__init__() self.interval = interval self.function = function diff --git a/daemon/core/location/mobility.py b/daemon/core/location/mobility.py index fd07f0ef..470b2a84 100644 --- a/daemon/core/location/mobility.py +++ b/daemon/core/location/mobility.py @@ -38,7 +38,7 @@ class MobilityManager(ModelManager): :param core.emulator.session.Session session: session this manager is tied to """ - super(MobilityManager, self).__init__() + super().__init__() self.session = session self.models[BasicRangeModel.name] = BasicRangeModel self.models[Ns2ScriptedMobility.name] = Ns2ScriptedMobility @@ -302,7 +302,7 @@ class BasicRangeModel(WirelessModel): :param core.session.Session session: related core session :param int _id: object id """ - super(BasicRangeModel, self).__init__(session=session, _id=_id) + super().__init__(session=session, _id=_id) self.session = session self.wlan = session.get_node(_id) self._netifs = {} @@ -587,8 +587,7 @@ class WayPointMobility(WirelessModel): :param int _id: object id :return: """ - super(WayPointMobility, self).__init__(session=session, _id=_id) - + super().__init__(session=session, _id=_id) self.state = self.STATE_STOPPED self.queue = [] self.queue_copy = [] @@ -945,7 +944,7 @@ class Ns2ScriptedMobility(WayPointMobility): :param core.emulator.session.Session session: CORE session instance :param int _id: object id """ - super(Ns2ScriptedMobility, self).__init__(session=session, _id=_id) + super().__init__(session, _id) self._netifs = {} self._netifslock = threading.Lock() @@ -1137,7 +1136,7 @@ class Ns2ScriptedMobility(WayPointMobility): """ logging.info("starting script") laststate = self.state - super(Ns2ScriptedMobility, self).start() + super().start() if laststate == self.STATE_PAUSED: self.statescript("unpause") @@ -1147,7 +1146,7 @@ class Ns2ScriptedMobility(WayPointMobility): :return: nothing """ - super(Ns2ScriptedMobility, self).run() + super().run() self.statescript("run") def pause(self): @@ -1156,7 +1155,7 @@ class Ns2ScriptedMobility(WayPointMobility): :return: nothing """ - super(Ns2ScriptedMobility, self).pause() + super().pause() self.statescript("pause") def stop(self, move_initial=True): @@ -1166,7 +1165,7 @@ class Ns2ScriptedMobility(WayPointMobility): :param bool move_initial: flag to check if we should move node to initial position :return: nothing """ - super(Ns2ScriptedMobility, self).stop(move_initial=move_initial) + super().stop(move_initial=move_initial) self.statescript("stop") def statescript(self, typestr): diff --git a/daemon/core/nodes/base.py b/daemon/core/nodes/base.py index 0f0840a1..ac67e8de 100644 --- a/daemon/core/nodes/base.py +++ b/daemon/core/nodes/base.py @@ -252,7 +252,7 @@ class CoreNodeBase(NodeBase): :param core.emulator.distributed.DistributedServer server: remote server node will run on, default is None for localhost """ - super(CoreNodeBase, self).__init__(session, _id, name, start, server) + super().__init__(session, _id, name, start, server) self.services = [] self.nodedir = None self.tmpnodedir = False @@ -354,7 +354,7 @@ class CoreNodeBase(NodeBase): :param z: z position :return: nothing """ - changed = super(CoreNodeBase, self).setposition(x, y, z) + changed = super().setposition(x, y, z) if changed: for netif in self.netifs(sort=True): netif.setposition(x, y, z) @@ -432,7 +432,7 @@ class CoreNode(CoreNodeBase): :param core.emulator.distributed.DistributedServer server: remote server node will run on, default is None for localhost """ - super(CoreNode, self).__init__(session, _id, name, start, server) + super().__init__(session, _id, name, start, server) self.nodedir = nodedir self.ctrlchnlname = os.path.abspath( os.path.join(self.session.session_dir, self.name) @@ -629,7 +629,7 @@ class CoreNode(CoreNodeBase): :rtype: int """ with self.lock: - return super(CoreNode, self).newifindex() + return super().newifindex() def newveth(self, ifindex=None, ifname=None): """ @@ -925,7 +925,7 @@ class CoreNetworkBase(NodeBase): :param core.emulator.distributed.DistributedServer server: remote server node will run on, default is None for localhost """ - super(CoreNetworkBase, self).__init__(session, _id, name, start, server) + super().__init__(session, _id, name, start, server) self._linked = {} self._linked_lock = threading.Lock() diff --git a/daemon/core/nodes/docker.py b/daemon/core/nodes/docker.py index d3d76319..20d6ec20 100644 --- a/daemon/core/nodes/docker.py +++ b/daemon/core/nodes/docker.py @@ -96,9 +96,7 @@ class DockerNode(CoreNode): if image is None: image = "ubuntu" self.image = image - super(DockerNode, self).__init__( - session, _id, name, nodedir, bootsh, start, server - ) + super().__init__(session, _id, name, nodedir, bootsh, start, server) def create_node_net_client(self, use_ovs): """ diff --git a/daemon/core/nodes/lxd.py b/daemon/core/nodes/lxd.py index 164fe5f7..fc2ee5cc 100644 --- a/daemon/core/nodes/lxd.py +++ b/daemon/core/nodes/lxd.py @@ -89,9 +89,7 @@ class LxcNode(CoreNode): if image is None: image = "ubuntu" self.image = image - super(LxcNode, self).__init__( - session, _id, name, nodedir, bootsh, start, server - ) + super().__init__(session, _id, name, nodedir, bootsh, start, server) def alive(self): """ @@ -217,6 +215,6 @@ class LxcNode(CoreNode): self.cmd(f"chmod {mode:o} {filename}") def addnetif(self, netif, ifindex): - super(LxcNode, self).addnetif(netif, ifindex) + super().addnetif(netif, ifindex) # adding small delay to allow time for adding addresses to work correctly time.sleep(0.5) diff --git a/daemon/core/xml/corexml.py b/daemon/core/xml/corexml.py index b813c0d8..96d0feff 100644 --- a/daemon/core/xml/corexml.py +++ b/daemon/core/xml/corexml.py @@ -197,7 +197,7 @@ class ServiceElement: class DeviceElement(NodeElement): def __init__(self, session, node): - super(DeviceElement, self).__init__(session, node, "device") + super().__init__(session, node, "device") add_attribute(self.element, "type", node.type) self.add_services() @@ -212,7 +212,7 @@ class DeviceElement(NodeElement): class NetworkElement(NodeElement): def __init__(self, session, node): - super(NetworkElement, self).__init__(session, node, "network") + super().__init__(session, node, "network") model = getattr(self.node, "model", None) if model: add_attribute(self.element, "model", model.name)