param_get() may also return a bool

Signed-off-by: Gaëtan Lehmann <[email protected]>

Author: glehmann

lib/basevm.py

@@ -1,6 +1,6 @@
 import logging
 
-from typing import Any, Optional, TYPE_CHECKING
+from typing import Any, Optional, TYPE_CHECKING, Union
 
 import lib.commands as commands
 if TYPE_CHECKING:
@@ -20,7 +20,7 @@ def __init__(self, uuid, host: 'lib.host.Host'):
         self.host = host
 
     def param_get(self, param_name: str, key: Optional[str] = None,
-                  accept_unknown_key: bool = False) -> Optional[str]:
+                  accept_unknown_key: bool = False) -> Union[str, bool, None]:
         return _param_get(self.host, self.xe_prefix, self.uuid,
                           param_name, key, accept_unknown_key)
 

lib/common.py

@@ -158,7 +158,7 @@ def strtobool(str):
     raise ValueError("invalid truth value '{}'".format(str))
 
 def _param_get(host: 'lib.host.Host', xe_prefix: str, uuid: str, param_name: str, key: Optional[str] = None,
-               accept_unknown_key=False) -> Optional[str]:
+               accept_unknown_key=False) -> Union[str, bool, None]:
     """ Common implementation for param_get. """
     args: Dict[str, Union[str, bool]] = {'uuid': uuid, 'param-name': param_name}
     if key is not None:

lib/vm.py

@@ -2,7 +2,7 @@
 import os
 import subprocess
 import tempfile
-from typing import List, Literal, Optional, Union, overload
+from typing import List, Literal, Optional, Union, cast, overload
 
 import lib.commands as commands
 import lib.efi as efi
@@ -72,7 +72,7 @@ def reboot(self, force=False, verify=False):
         return ret
 
     def try_get_and_store_ip(self):
-        ip = self.param_get('networks', '0/ip', accept_unknown_key=True)
+        ip = cast(str, self.param_get('networks', '0/ip', accept_unknown_key=True))
 
         # An IP that starts with 169.254. is not a real routable IP.
         # VMs may return such an IP before they get an actual one from DHCP.