further f string updates

daemon/core/location/corelocation.py

@@ -128,8 +128,6 @@ class CoreLocation(object):
                 z,
             )
             lat, lon = self.refgeo[:2]
-        # self.info("getgeo(%s,%s,%s) e=%s n=%s zone=%s  lat,lon,alt=" \
-        #          "%.3f,%.3f,%.3f" % (x, y, z, e, n, zone, lat, lon, alt))
         return lat, lon, alt
 
     def getxyz(self, lat, lon, alt):

daemon/core/services/xorp.py

@@ -312,13 +312,6 @@ class XorpRipng(XorpService):
                 continue
             cfg += "\tinterface %s {\n" % ifc.name
             cfg += "\t    vif %s {\n" % ifc.name
-            #            for a in ifc.addrlist:
-            #                if a.find(":") < 0:
-            #                    continue
-            #                addr = a.split("/")[0]
-            #                cfg += "\t\taddress %s {\n" % addr
-            #                cfg += "\t\t    disable: false\n"
-            #                cfg += "\t\t}\n"
             cfg += "\t\taddress %s {\n" % ifc.hwaddr.tolinklocal()
             cfg += "\t\t    disable: false\n"
             cfg += "\t\t}\n"

daemon/examples/myservices/sample.py

@@ -37,7 +37,7 @@ class MyService(CoreService):
     dependencies = ()
     dirs = ()
     configs = ("myservice1.sh", "myservice2.sh")
-    startup = ("sh %s" % configs[0], "sh %s" % configs[1])
+    startup = tuple(f"sh {x}" for x in configs)
     validate = ()
     validation_mode = ServiceMode.NON_BLOCKING
     validation_timer = 5
@@ -81,7 +81,7 @@ class MyService(CoreService):
         if filename == cls.configs[0]:
             cfg += "# auto-generated by MyService (sample.py)\n"
             for ifc in node.netifs():
-                cfg += 'echo "Node %s has interface %s"\n' % (node.name, ifc.name)
+                cfg += f'echo "Node {node.name} has interface {ifc.name}"\n'
         elif filename == cls.configs[1]:
             cfg += "echo hello"
 

daemon/examples/python/parser.py

@@ -24,25 +24,6 @@ def parse_options(name):
 
     options = parser.parse_args()
 
-    # usagestr = "usage: %prog [-h] [options] [args]"
-    # parser = optparse.OptionParser(usage=usagestr)
-    #
-    # parser.add_option("-n", "--nodes", dest="nodes", type=int, default=DEFAULT_NODES,
-    #                   help="number of nodes to create in this example")
-    #
-    # parser.add_option("-t", "--time", dest="time", type=int, default=DEFAULT_TIME,
-    #                   help="example iperf run time in seconds")
-
-    # def usage(msg=None, err=0):
-    #     print
-    #     if msg:
-    #         print "%s\n" % msg
-    #     parser.print_help()
-    #     sys.exit(err)
-
-    # parse command line options
-    # options, args = parser.parse_args()
-
     if options.nodes < 2:
         parser.error("invalid min number of nodes: %s" % options.nodes)
     if options.time < 1:

daemon/tests/conftest.py

@@ -67,11 +67,7 @@ class CoreServerTest(object):
         self.request_handler.handle_message(message)
 
         # add broker server for distributed core
-        distributed = "%s:%s:%s" % (
+        distributed = f"{self.distributed_server}:{distributed_address}:{self.port}"
-            self.distributed_server,
-            distributed_address,
-            self.port,
-        )
         message = CoreConfMessage.create(
             0,
             [

daemon/tests/distributed/test_distributed.py

@@ -206,7 +206,7 @@ class TestDistributed:
 
         # test a ping command
         node_one = cored.session.get_node(1)
-        message = command_message(node_one, "ping -c 5 %s" % ip4_address)
+        message = command_message(node_one, f"ping -c 5 {ip4_address}")
         cored.request_handler.dispatch_replies = validate_response
         cored.request_handler.handle_message(message)
 
@@ -259,7 +259,7 @@ class TestDistributed:
 
         # test a ping command
         node_one = cored.session.get_node(1)
-        message = command_message(node_one, "ping -c 5 %s" % ip4_address)
+        message = command_message(node_one, f"ping -c 5 {ip4_address}")
         cored.request_handler.dispatch_replies = validate_response
         cored.request_handler.handle_message(message)
 
@@ -307,7 +307,7 @@ class TestDistributed:
 
         # test a ping command
         node_one = cored.session.get_node(1)
-        message = command_message(node_one, "ping -c 5 %s" % ip4_address)
+        message = command_message(node_one, f"ping -c 5 {ip4_address}")
         cored.request_handler.dispatch_replies = validate_response
         cored.request_handler.handle_message(message)
         cored.request_handler.handle_message(message)

daemon/tests/emane/test_emane.py

@@ -27,7 +27,7 @@ _DIR = os.path.dirname(os.path.abspath(__file__))
 def ping(from_node, to_node, ip_prefixes, count=3):
     address = ip_prefixes.ip4_address(to_node)
     try:
-        from_node.node_net_cmd("ping -c %s %s" % (count, address))
+        from_node.node_net_cmd(f"ping -c {count} {address}")
         status = 0
     except CoreCommandError as e:
         status = e.returncode

daemon/tests/test_core.py

@@ -20,7 +20,7 @@ _WIRED = [NodeTypes.PEER_TO_PEER, NodeTypes.HUB, NodeTypes.SWITCH]
 def ping(from_node, to_node, ip_prefixes):
     address = ip_prefixes.ip4_address(to_node)
     try:
-        from_node.node_net_cmd("ping -c 3 %s" % address)
+        from_node.node_net_cmd(f"ping -c 3 {address}")
         status = 0
     except CoreCommandError as e:
         status = e.returncode

daemon/tests/test_grpc.py

@@ -206,8 +206,7 @@ class TestGrpc:
         # then
         assert response.node.id == node.id
 
-    @pytest.mark.parametrize("node_id, expected", [(1, True), (2, False)])
+    def test_edit_node(self, grpc_server):
-    def test_edit_node(self, grpc_server, node_id, expected):
         # given
         client = CoreGrpcClient()
         session = grpc_server.coreemu.create_session()
@@ -217,11 +216,10 @@ class TestGrpc:
         x, y = 10, 10
         with client.context_connect():
             position = core_pb2.Position(x=x, y=y)
-            response = client.edit_node(session.id, node_id, position)
+            response = client.edit_node(session.id, node.id, position)
 
         # then
-        assert response.result is expected
+        assert response.result is True
-        if expected is True:
         assert node.position.x == x
         assert node.position.y == y
 
@@ -253,7 +251,7 @@ class TestGrpc:
         output = "hello world"
 
         # then
-        command = "echo %s" % output
+        command = f"echo {output}"
         with client.context_connect():
             response = client.node_command(session.id, node.id, command)
 
@@ -863,7 +861,7 @@ class TestGrpc:
             client.events(session.id, handle_event)
             time.sleep(0.1)
             event = EventData(
-                event_type=EventTypes.RUNTIME_STATE.value, time="%s" % time.time()
+                event_type=EventTypes.RUNTIME_STATE.value, time=str(time.time())
             )
             session.broadcast_event(event)
 

daemon/tests/test_gui.py

@@ -29,7 +29,7 @@ from core.nodes.ipaddress import Ipv4Prefix
 
 
 def dict_to_str(values):
-    return "|".join("%s=%s" % (x, values[x]) for x in values)
+    return "|".join(f"{x}={values[x]}" for x in values)
 
 
 class TestGui:
@@ -383,7 +383,7 @@ class TestGui:
         message = coreapi.CoreFileMessage.create(
             MessageFlags.ADD.value,
             [
-                (FileTlvs.TYPE, "hook:%s" % state),
+                (FileTlvs.TYPE, f"hook:{state}"),
                 (FileTlvs.NAME, file_name),
                 (FileTlvs.DATA, file_data),
             ],
@@ -406,7 +406,7 @@ class TestGui:
             MessageFlags.ADD.value,
             [
                 (FileTlvs.NODE, node.id),
-                (FileTlvs.TYPE, "service:%s" % service),
+                (FileTlvs.TYPE, f"service:{service}"),
                 (FileTlvs.NAME, file_name),
                 (FileTlvs.DATA, file_data),
             ],
@@ -760,7 +760,7 @@ class TestGui:
             [
                 (ConfigTlvs.OBJECT, "broker"),
                 (ConfigTlvs.TYPE, ConfigFlags.UPDATE.value),
-                (ConfigTlvs.VALUES, "%s:%s:%s" % (server, host, port)),
+                (ConfigTlvs.VALUES, f"{server}:{host}:{port}"),
             ],
         )
         coreserver.session.distributed.add_server = mock.MagicMock()
@@ -844,7 +844,7 @@ class TestGui:
                 (ConfigTlvs.NODE, node.id),
                 (ConfigTlvs.OBJECT, "services"),
                 (ConfigTlvs.TYPE, ConfigFlags.UPDATE.value),
-                (ConfigTlvs.OPAQUE, "service:%s" % service),
+                (ConfigTlvs.OPAQUE, f"service:{service}"),
                 (ConfigTlvs.VALUES, dict_to_str(values)),
             ],
         )

daemon/tests/test_nodes.py

@@ -67,4 +67,4 @@ class TestNodes:
         # then
         assert node
         assert node.up
-        assert utils.check_cmd("brctl show %s" % node.brname)
+        assert utils.check_cmd(f"brctl show {node.brname}")