initial changes to use f strings
This commit is contained in:
Blake Harnden
parent
da946f1f56
commit
c9326b6a97
8 changed files with 70 additions and 72 deletions
|
|
@ -41,7 +41,7 @@ class LinuxNetClient(object):
|
|||
:param str name: name for hostname
|
||||
:return: nothing
|
||||
"""
|
||||
self.run("hostname %s" % name)
|
||||
self.run(f"hostname {name}")
|
||||
|
||||
def create_route(self, route, device):
|
||||
"""
|
||||
|
|
@ -51,7 +51,7 @@ class LinuxNetClient(object):
|
|||
:param str device: device to add route to
|
||||
:return: nothing
|
||||
"""
|
||||
self.run("%s route add %s dev %s" % (IP_BIN, route, device))
|
||||
self.run(f"{IP_BIN} route add {route} dev {device}")
|
||||
|
||||
def device_up(self, device):
|
||||
"""
|
||||
|
|
@ -60,7 +60,7 @@ class LinuxNetClient(object):
|
|||
:param str device: device to bring up
|
||||
:return: nothing
|
||||
"""
|
||||
self.run("%s link set %s up" % (IP_BIN, device))
|
||||
self.run(f"{IP_BIN} link set {device} up")
|
||||
|
||||
def device_down(self, device):
|
||||
"""
|
||||
|
|
@ -69,7 +69,7 @@ class LinuxNetClient(object):
|
|||
:param str device: device to bring down
|
||||
:return: nothing
|
||||
"""
|
||||
self.run("%s link set %s down" % (IP_BIN, device))
|
||||
self.run(f"{IP_BIN} link set {device} down")
|
||||
|
||||
def device_name(self, device, name):
|
||||
"""
|
||||
|
|
@ -79,7 +79,7 @@ class LinuxNetClient(object):
|
|||
:param str name: name to set
|
||||
:return: nothing
|
||||
"""
|
||||
self.run("%s link set %s name %s" % (IP_BIN, device, name))
|
||||
self.run(f"{IP_BIN} link set {device} name {name}")
|
||||
|
||||
def device_show(self, device):
|
||||
"""
|
||||
|
|
@ -89,7 +89,7 @@ class LinuxNetClient(object):
|
|||
:return: device information
|
||||
:rtype: str
|
||||
"""
|
||||
return self.run("%s link show %s" % (IP_BIN, device))
|
||||
return self.run(f"{IP_BIN} link show {device}")
|
||||
|
||||
def device_ns(self, device, namespace):
|
||||
"""
|
||||
|
|
@ -99,7 +99,7 @@ class LinuxNetClient(object):
|
|||
:param str namespace: namespace to set device to
|
||||
:return: nothing
|
||||
"""
|
||||
self.run("%s link set %s netns %s" % (IP_BIN, device, namespace))
|
||||
self.run(f"{IP_BIN} link set {device} netns {namespace}")
|
||||
|
||||
def device_flush(self, device):
|
||||
"""
|
||||
|
|
@ -108,7 +108,7 @@ class LinuxNetClient(object):
|
|||
:param str device: device to flush
|
||||
:return: nothing
|
||||
"""
|
||||
self.run("%s -6 address flush dev %s" % (IP_BIN, device))
|
||||
self.run(f"{IP_BIN} -6 address flush dev {device}")
|
||||
|
||||
def device_mac(self, device, mac):
|
||||
"""
|
||||
|
|
@ -118,7 +118,7 @@ class LinuxNetClient(object):
|
|||
:param str mac: mac to set
|
||||
:return: nothing
|
||||
"""
|
||||
self.run("%s link set dev %s address %s" % (IP_BIN, device, mac))
|
||||
self.run(f"{IP_BIN} link set dev {device} address {mac}")
|
||||
|
||||
def delete_device(self, device):
|
||||
"""
|
||||
|
|
@ -127,7 +127,7 @@ class LinuxNetClient(object):
|
|||
:param str device: device to delete
|
||||
:return: nothing
|
||||
"""
|
||||
self.run("%s link delete %s" % (IP_BIN, device))
|
||||
self.run(f"{IP_BIN} link delete {device}")
|
||||
|
||||
def delete_tc(self, device):
|
||||
"""
|
||||
|
|
@ -136,7 +136,7 @@ class LinuxNetClient(object):
|
|||
:param str device: device to remove tc
|
||||
:return: nothing
|
||||
"""
|
||||
self.run("%s qdisc delete dev %s root" % (TC_BIN, device))
|
||||
self.run(f"{TC_BIN} qdisc delete dev {device} root")
|
||||
|
||||
def checksums_off(self, interface_name):
|
||||
"""
|
||||
|
|
@ -145,7 +145,7 @@ class LinuxNetClient(object):
|
|||
:param str interface_name: interface to update
|
||||
:return: nothing
|
||||
"""
|
||||
self.run("%s -K %s rx off tx off" % (ETHTOOL_BIN, interface_name))
|
||||
self.run(f"{ETHTOOL_BIN} -K {interface_name} rx off tx off")
|
||||
|
||||
def create_address(self, device, address, broadcast=None):
|
||||
"""
|
||||
|
|
@ -158,11 +158,10 @@ class LinuxNetClient(object):
|
|||
"""
|
||||
if broadcast is not None:
|
||||
self.run(
|
||||
"%s address add %s broadcast %s dev %s"
|
||||
% (IP_BIN, address, broadcast, device)
|
||||
f"{IP_BIN} address add {address} broadcast {broadcast} dev {device}"
|
||||
)
|
||||
else:
|
||||
self.run("%s address add %s dev %s" % (IP_BIN, address, device))
|
||||
self.run(f"{IP_BIN} address add {address} dev {device}")
|
||||
|
||||
def delete_address(self, device, address):
|
||||
"""
|
||||
|
|
@ -172,7 +171,7 @@ class LinuxNetClient(object):
|
|||
:param str address: address to remove
|
||||
:return: nothing
|
||||
"""
|
||||
self.run("%s address delete %s dev %s" % (IP_BIN, address, device))
|
||||
self.run(f"{IP_BIN} address delete {address} dev {device}")
|
||||
|
||||
def create_veth(self, name, peer):
|
||||
"""
|
||||
|
|
@ -182,7 +181,7 @@ class LinuxNetClient(object):
|
|||
:param str peer: peer name
|
||||
:return: nothing
|
||||
"""
|
||||
self.run("%s link add name %s type veth peer name %s" % (IP_BIN, name, peer))
|
||||
self.run(f"{IP_BIN} link add name {name} type veth peer name {peer}")
|
||||
|
||||
def create_gretap(self, device, address, local, ttl, key):
|
||||
"""
|
||||
|
|
@ -195,13 +194,13 @@ class LinuxNetClient(object):
|
|||
:param int key: key for tap
|
||||
:return: nothing
|
||||
"""
|
||||
cmd = "%s link add %s type gretap remote %s" % (IP_BIN, device, address)
|
||||
cmd = f"{IP_BIN} link add {device} type gretap remote {address}"
|
||||
if local is not None:
|
||||
cmd += " local %s" % local
|
||||
cmd += f" local {local}"
|
||||
if ttl is not None:
|
||||
cmd += " ttl %s" % ttl
|
||||
cmd += f" ttl {ttl}"
|
||||
if key is not None:
|
||||
cmd += " key %s" % key
|
||||
cmd += f" key {key}"
|
||||
self.run(cmd)
|
||||
|
||||
def create_bridge(self, name):
|
||||
|
|
@ -211,13 +210,13 @@ class LinuxNetClient(object):
|
|||
:param str name: bridge name
|
||||
:return: nothing
|
||||
"""
|
||||
self.run("%s addbr %s" % (BRCTL_BIN, name))
|
||||
self.run("%s stp %s off" % (BRCTL_BIN, name))
|
||||
self.run("%s setfd %s 0" % (BRCTL_BIN, name))
|
||||
self.run(f"{BRCTL_BIN} addbr {name}")
|
||||
self.run(f"{BRCTL_BIN} stp {name} off")
|
||||
self.run(f"{BRCTL_BIN} setfd {name} 0")
|
||||
self.device_up(name)
|
||||
|
||||
# turn off multicast snooping so forwarding occurs w/o IGMP joins
|
||||
snoop = "/sys/devices/virtual/net/%s/bridge/multicast_snooping" % name
|
||||
snoop = f"/sys/devices/virtual/net/{name}/bridge/multicast_snooping"
|
||||
if os.path.exists(snoop):
|
||||
with open(snoop, "w") as f:
|
||||
f.write("0")
|
||||
|
|
@ -230,7 +229,7 @@ class LinuxNetClient(object):
|
|||
:return: nothing
|
||||
"""
|
||||
self.device_down(name)
|
||||
self.run("%s delbr %s" % (BRCTL_BIN, name))
|
||||
self.run(f"{BRCTL_BIN} delbr {name}")
|
||||
|
||||
def create_interface(self, bridge_name, interface_name):
|
||||
"""
|
||||
|
|
@ -240,7 +239,7 @@ class LinuxNetClient(object):
|
|||
:param str interface_name: interface name
|
||||
:return: nothing
|
||||
"""
|
||||
self.run("%s addif %s %s" % (BRCTL_BIN, bridge_name, interface_name))
|
||||
self.run(f"{BRCTL_BIN} addif {bridge_name} {interface_name}")
|
||||
self.device_up(interface_name)
|
||||
|
||||
def delete_interface(self, bridge_name, interface_name):
|
||||
|
|
@ -251,7 +250,7 @@ class LinuxNetClient(object):
|
|||
:param str interface_name: interface name
|
||||
:return: nothing
|
||||
"""
|
||||
self.run("%s delif %s %s" % (BRCTL_BIN, bridge_name, interface_name))
|
||||
self.run(f"{BRCTL_BIN} delif {bridge_name} {interface_name}")
|
||||
|
||||
def existing_bridges(self, _id):
|
||||
"""
|
||||
|
|
@ -259,7 +258,7 @@ class LinuxNetClient(object):
|
|||
|
||||
:param _id: node id to check bridges for
|
||||
"""
|
||||
output = self.run("%s show" % BRCTL_BIN)
|
||||
output = self.run(f"{BRCTL_BIN} show")
|
||||
lines = output.split("\n")
|
||||
for line in lines[1:]:
|
||||
columns = line.split()
|
||||
|
|
@ -278,7 +277,7 @@ class LinuxNetClient(object):
|
|||
:param str name: bridge name
|
||||
:return: nothing
|
||||
"""
|
||||
self.run("%s setageing %s 0" % (BRCTL_BIN, name))
|
||||
self.run(f"{BRCTL_BIN} setageing {name} 0")
|
||||
|
||||
|
||||
class OvsNetClient(LinuxNetClient):
|
||||
|
|
@ -293,10 +292,10 @@ class OvsNetClient(LinuxNetClient):
|
|||
:param str name: bridge name
|
||||
:return: nothing
|
||||
"""
|
||||
self.run("%s add-br %s" % (OVS_BIN, name))
|
||||
self.run("%s set bridge %s stp_enable=false" % (OVS_BIN, name))
|
||||
self.run("%s set bridge %s other_config:stp-max-age=6" % (OVS_BIN, name))
|
||||
self.run("%s set bridge %s other_config:stp-forward-delay=4" % (OVS_BIN, name))
|
||||
self.run(f"{OVS_BIN} add-br {name}")
|
||||
self.run(f"{OVS_BIN} set bridge {name} stp_enable=false")
|
||||
self.run(f"{OVS_BIN} set bridge {name} other_config:stp-max-age=6")
|
||||
self.run(f"{OVS_BIN} set bridge {name} other_config:stp-forward-delay=4")
|
||||
self.device_up(name)
|
||||
|
||||
def delete_bridge(self, name):
|
||||
|
|
@ -307,7 +306,7 @@ class OvsNetClient(LinuxNetClient):
|
|||
:return: nothing
|
||||
"""
|
||||
self.device_down(name)
|
||||
self.run("%s del-br %s" % (OVS_BIN, name))
|
||||
self.run(f"{OVS_BIN} del-br {name}")
|
||||
|
||||
def create_interface(self, bridge_name, interface_name):
|
||||
"""
|
||||
|
|
@ -317,7 +316,7 @@ class OvsNetClient(LinuxNetClient):
|
|||
:param str interface_name: interface name
|
||||
:return: nothing
|
||||
"""
|
||||
self.run("%s add-port %s %s" % (OVS_BIN, bridge_name, interface_name))
|
||||
self.run(f"{OVS_BIN} add-port {bridge_name} {interface_name}")
|
||||
self.device_up(interface_name)
|
||||
|
||||
def delete_interface(self, bridge_name, interface_name):
|
||||
|
|
@ -328,7 +327,7 @@ class OvsNetClient(LinuxNetClient):
|
|||
:param str interface_name: interface name
|
||||
:return: nothing
|
||||
"""
|
||||
self.run("%s del-port %s %s" % (OVS_BIN, bridge_name, interface_name))
|
||||
self.run(f"{OVS_BIN} del-port {bridge_name} {interface_name}")
|
||||
|
||||
def existing_bridges(self, _id):
|
||||
"""
|
||||
|
|
@ -336,7 +335,7 @@ class OvsNetClient(LinuxNetClient):
|
|||
|
||||
:param _id: node id to check bridges for
|
||||
"""
|
||||
output = self.run("%s list-br" % OVS_BIN)
|
||||
output = self.run(f"{OVS_BIN} list-br")
|
||||
if output:
|
||||
for line in output.split("\n"):
|
||||
fields = line.split(".")
|
||||
|
|
@ -351,4 +350,4 @@ class OvsNetClient(LinuxNetClient):
|
|||
:param str name: bridge name
|
||||
:return: nothing
|
||||
"""
|
||||
self.run("%s set bridge %s other_config:mac-aging-time=0" % (OVS_BIN, name))
|
||||
self.run(f"{OVS_BIN} set bridge {name} other_config:mac-aging-time=0")
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue