munet: fix check for str type to use correct variable

Signed-off-by: Christian Hopps <chopps@labn.net>

Author: choppsv1

munet/native.py

@@ -7,6 +7,7 @@
 #
 # pylint: disable=protected-access
 """A module that defines objects for standalone use."""
+
 import asyncio
 import base64
 import errno
@@ -25,7 +26,6 @@
 from copy import deepcopy
 from pathlib import Path
 
-
 try:
     # We only want to require yaml for the gen cloud image feature
     import yaml
@@ -54,7 +54,6 @@
 from .config import merge_kind_config
 from .watchlog import WatchLog
 
-
 AUTO_LOOPBACK_IPV4_BASE = ipaddress.ip_interface("10.255.0.0/32")
 AUTO_LOOPBACK_IPV6_BASE = ipaddress.ip_interface("fcfe::0/128")
 
@@ -75,7 +74,7 @@ def get_loopback_ips(c, nid):
     if ipv6 := c.get("ipv6"):
         if ipv6 == "auto":
             ips.append(AUTO_LOOPBACK_IPV6_BASE + nid)
-        elif isinstance(ip, str):
+        elif isinstance(ipv6, str):
             ips.append(ipaddress.ip_interface(ipv6))
         else:
             ips.extend([ipaddress.ip_interface(x) for x in ipv6])
@@ -833,15 +832,13 @@ def __init__(self, *args, unet=None, **kwargs):
         # Create a hosts file to map our name
         hosts_file = os.path.join(self.rundir, "hosts.txt")
         with open(hosts_file, "w", encoding="ascii") as hf:
-            hf.write(
-                f"""127.0.0.1\tlocalhost {self.name}
+            hf.write(f"""127.0.0.1\tlocalhost {self.name}
 ::1\tip6-localhost ip6-loopback
 fe00::0\tip6-localnet
 ff00::0\tip6-mcastprefix
 ff02::1\tip6-allnodes
 ff02::2\tip6-allrouters
-"""
-            )
+""")
         if hasattr(self, "bind_mount"):
             self.bind_mount(hosts_file, "/etc/hosts")
 
@@ -3046,15 +3043,13 @@ def __init__(
 
         hosts_file = os.path.join(self.rundir, "hosts.txt")
         with open(hosts_file, "w", encoding="ascii") as hf:
-            hf.write(
-                f"""127.0.0.1\tlocalhost {self.name}
+            hf.write(f"""127.0.0.1\tlocalhost {self.name}
 ::1\tip6-localhost ip6-loopback
 fe00::0\tip6-localnet
 ff00::0\tip6-mcastprefix
 ff02::1\tip6-allnodes
 ff02::2\tip6-allrouters
-"""
-            )
+""")
         self.bind_mount(hosts_file, "/etc/hosts")
 
         # Common CLI commands for any topology
@@ -3467,9 +3462,7 @@ async def coverage_finish(self):
 
         # Create .gcno symlinks if they don't already exist, for kernel they will
         self.logger.info("Creating .gcno symlinks from '%s' to '%s'", gcdadir, bdir)
-        commander.cmd_raises(
-            f'cd "{gcdadir}"; bdir="{bdir}"'
-            + """
+        commander.cmd_raises(f'cd "{gcdadir}"; bdir="{bdir}"' + """
 for f in $(find . -name '*.gcda'); do
     f=${f#./};
     f=${f%.gcda}.gcno;
@@ -3478,8 +3471,7 @@ async def coverage_finish(self):
         touch -h -r $bdir/$f $f;
         echo $f;
     fi;
-done"""
-        )
+done""")
 
         # Get the results into a summary file
         data_file = rundir / "coverage.info"

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "munet"
-version = "0.17.2"
+version = "0.17.3"
 description = "A package to facilitate network simulations"
 readme = {file = "README.org", content-type = "text/plain"}
 requires-python = ">=3.9"