fb-vmware 1.5.0__tar.gz → 1.5.3__tar.gz

{fb_vmware-1.5.0/lib/fb_vmware.egg-info → fb_vmware-1.5.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fb_vmware
-Version: 1.5.0
+Version: 1.5.3
 Summary: A wrapper module around the pyvmomi module to simplify work and handling.
 Home-page: https://github.com/fbrehm/fb-vmware
 Author: Frank Brehm

{fb_vmware-1.5.0 → fb_vmware-1.5.3}/lib/fb_vmware/__init__.py

@@ -56,7 +56,7 @@ from .vm import VsphereVmList
 from .xlate import XLATOR
 
 
-__version__ = '1.5.0'
+__version__ = '1.5.3'
 
 LOG = logging.getLogger(__name__)
 

{fb_vmware-1.5.0 → fb_vmware-1.5.3}/lib/fb_vmware/errors.py

@@ -18,7 +18,7 @@ from fb_tools.errors import FbHandlerError
 # Own modules
 from .xlate import XLATOR
 
-__version__ = '1.2.0'
+__version__ = '1.3.0'
 
 _ = XLATOR.gettext
 
@@ -44,6 +44,13 @@ class VSphereHandlerError(BaseVSphereHandlerError):
     pass
 
 
+# =============================================================================
+class VSphereNoNetFoundError(VSphereHandlerError):
+    """Error class used, if no network could be found in a network dict for an IP address."""
+
+    pass
+
+
 # =============================================================================
 class VSphereNoDatastoresFoundError(FbHandlerError):
     """Special error class used, if no appropriate datastore could be found."""

{fb_vmware-1.5.0 → fb_vmware-1.5.3}/lib/fb_vmware/local_version.py

@@ -11,7 +11,7 @@
 __author__ = 'Frank Brehm <frank@brehm-online.com>'
 __copyright__ = '(C) 2025 by Frank Brehm, Berlin'
 __contact__ = 'frank@brehm-online.com'
-__version__ = '1.5.0'
+__version__ = '1.5.3'
 __license__ = 'LGPL3+'
 
 # vim: tabstop=4 expandtab shiftwidth=4 softtabstop=4

{fb_vmware-1.5.0 → fb_vmware-1.5.3}/lib/fb_vmware/network.py

@@ -23,15 +23,17 @@ from fb_tools.xlate import format_list
 from pyVmomi import vim
 
 # Own modules
+from .errors import VSphereNoNetFoundError
 from .obj import DEFAULT_OBJ_STATUS
 from .obj import VsphereObject
 from .typed_dict import TypedDict
 from .xlate import XLATOR
 
-__version__ = '1.8.2'
+__version__ = '1.8.4'
 LOG = logging.getLogger(__name__)
 
 _ = XLATOR.gettext
+ngettext = XLATOR.ngettext
 
 
 # =============================================================================
@@ -383,12 +385,15 @@ class VsphereNetworkDict(TypedDict):
         have a match, will be returned.
         """
         if len(self) < 1:
-            LOG.debug(_('Empty {what}.').format(self.__class__.__name__))
+            LOG.debug(_('Empty {what}.').format(what=self.__class__.__name__))
             return None
 
+        ips_list_str = []
+
         for ip in ips:
             if not ip:
                 continue
+            ips_list_str.append(str(ip))
             LOG.debug(_('Searching VSphere network for address {} ...').format(ip))
             ipa = ipaddress.ip_address(ip)
 
@@ -403,11 +408,14 @@ class VsphereNetworkDict(TypedDict):
             desc = self.value_class.obj_desc_singular
             LOG.debug(_('Could not find {d} for IP {ip}.').format(d=desc, ip=ip))
 
-        ips_str = format_list(str(x) for x in list(filter(bool, ips)))
-        LOG.error(_('Could not find {d} for IP addresses {ips}.').format(
-            d=self.value_class.obj_desc_singular, ips=ips_str))
+        ips_str = format_list(ips_list_str)
+        no_ips = len(ips_list_str)
 
-        return None
+        msg = ngettext(
+            'Could not find {d} for IP address {ips}.',
+            'Could not find {d} for IP addresses {ips}.',
+            no_ips).format(d=self.value_class.obj_desc_singular, ips=ips_str)
+        raise VSphereNoNetFoundError(msg)
 
 
 # =============================================================================

{fb_vmware-1.5.0 → fb_vmware-1.5.3/lib/fb_vmware.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fb_vmware
-Version: 1.5.0
+Version: 1.5.3
 Summary: A wrapper module around the pyvmomi module to simplify work and handling.
 Home-page: https://github.com/fbrehm/fb-vmware
 Author: Frank Brehm