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

updated usages of super to use python3 variation

Browse source
This commit is contained in:
bharnden 2019-10-23 09:51:52 -07:00
parent 6a0a9e7698
commit 68be311c7a
15 changed files with 33 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
daemon/core/api/grpc/server.py
View file

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

6
daemon/core/api/tlv/coreapi.py
View file

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

2
daemon/core/config.py
View file

@ -309,7 +309,7 @@ class ModelManager(ConfigurableManager):
"""
Creates a ModelManager object.
"""
super(ModelManager, self).__init__()
super().__init__()
self.models = {}
self.node_models = {}

6
daemon/core/emane/emanemanager.py
View file

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

2
daemon/core/emane/ieee80211abg.py
View file

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

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

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

2
daemon/core/emane/rfpipe.py
View file

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

2
daemon/core/emane/tdma.py
View file

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

6
daemon/core/emulator/sessionconfig.py
View file

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

2
daemon/core/location/event.py
View file

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

17
daemon/core/location/mobility.py
View file

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

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

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

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

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

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

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

4
daemon/core/xml/corexml.py
View file

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