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
Download patch file Download diff file Expand all files Collapse all files

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)