fb-vmware 1.5.0__py3-none-any.whl → 1.5.1__py3-none-any.whl

fb_vmware/__init__.py

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

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/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.1'
 __license__ = 'LGPL3+'
 
 # vim: tabstop=4 expandtab shiftwidth=4 softtabstop=4

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.3'
 LOG = logging.getLogger(__name__)
 
 _ = XLATOR.gettext
+ngettext = XLATOR.ngettext
 
 
 # =============================================================================
@@ -386,9 +388,12 @@ class VsphereNetworkDict(TypedDict):
             LOG.debug(_('Empty {what}.').format(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.dist-info → fb_vmware-1.5.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fb_vmware
-Version: 1.5.0
+Version: 1.5.1
 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.dist-info → fb_vmware-1.5.1.dist-info}/RECORD

@@ -1,4 +1,4 @@
-fb_vmware/__init__.py,sha256=svuJ0tPqJze2wynCTBtv1mGwm8_jnUC1tMKuGix3pJg,2285
+fb_vmware/__init__.py,sha256=pHWlsg_HU_fVStFzv7t6H6lVGynVJM-QuahellC3d08,2285
 fb_vmware/about.py,sha256=JU0fuTMC-LtktOz9r05ikvsfe4YJJqE7NXb0YckYO98,11315
 fb_vmware/base.py,sha256=Qac3tadnON4StBvKboL7lH5_jUm4RUvMiE3G-Gn47bE,10333
 fb_vmware/cluster.py,sha256=OPNei0nytjJSZCK4zn-dA52xsHKtipf20zDTBY_9KHU,13667
@@ -9,13 +9,13 @@ fb_vmware/dc.py,sha256=e2b_a53fyvnqjarXWKEDuKj7f4ZtrWxUxR22HumnmaY,8675
 fb_vmware/disk.py,sha256=bW_em07Jmdj3bIld2VrNBMJyvBweazJhoR56utmbgWQ,21053
 fb_vmware/ds_cluster.py,sha256=JxCkjNQCcmLXz6CkhTm5HRYmlr8dBEJ8jW9FhXwYogw,17080
 fb_vmware/dvs.py,sha256=jM_ORaf2khg-918Ce_BEF_Lyo76WqsrzGc5nmvTrh6I,22843
-fb_vmware/errors.py,sha256=hcd9Q5LwDxpSaO3ay5JVWUy0ZZaPOG3acDEBfXWwaBo,11670
+fb_vmware/errors.py,sha256=k3JnlT-U7nIQxb_lNTd0uVkCW1VTbmAOpfZVNgou57U,11907
 fb_vmware/ether.py,sha256=mcwgkZkkKQ4wEgDxB6xUnrOAnuYpNhMf6VGyWtJUuoE,26859
 fb_vmware/host.py,sha256=Av3ni7UAmYDBHPtkyAGqW6od4ODbbgbUA48HweUth1I,32613
 fb_vmware/host_port_group.py,sha256=HsJaSE9M34xVaxEo7EhmgsfXmeNR_FaFs2EPKfV0YTs,15997
 fb_vmware/iface.py,sha256=_XI8naJQ-T1_fin9e4M-kny5FYcQkuJ9C5hQKzUR7CA,5456
-fb_vmware/local_version.py,sha256=H9RvdNQB_4VKqrxFCF2jY1Z3bH3u_Wa2sNgqOOcs3VI,474
-fb_vmware/network.py,sha256=RXpL9JKBcTuodGYQ-CA4VAXwVjHtLV2LbH3XACX4skc,15415
+fb_vmware/local_version.py,sha256=f1VEi2IrlQ743FVbAOL0rD9dITlaTSKoD15w_b35cQE,474
+fb_vmware/network.py,sha256=RdEDVvHFGXMW1jdAeAcH7CXwLo92fOyjxaW3-uQD8j0,15661
 fb_vmware/obj.py,sha256=v5FytnnduhaMRwIfm550qQRlFeXSnTqTz2i5P73yubk,10097
 fb_vmware/typed_dict.py,sha256=UyV1csqnHEff0gCtlDX0i_ePJFKrQq_issJfwMm4s30,11479
 fb_vmware/vm.py,sha256=2X1juOc8XUH7KqxT9F-a5Jzvgq4vyMINX4NqPS1Nqms,29882
@@ -27,15 +27,15 @@ fb_vmware/app/get_storage_cluster_list.py,sha256=VHk14oPZiwayDKySIGcB02sW3huRQcT
 fb_vmware/app/get_vm_info.py,sha256=qwVWwWGJDuEuLO5ounzVxLWvMoAjZa8ig7LkJ37IYj0,10223
 fb_vmware/app/get_vm_list.py,sha256=QY65_s1_mL3lhkCOmwRnBx_5nWypSp10IDU_CCbU29U,17891
 fb_vmware/config/__init__.py,sha256=R_JLzS_HMUIHqEy1YOSqv__efyVEEMfBk9pUOo0wpQU,17681
-fb_vmware-1.5.0.data/data/share/locale/de_DE/LC_MESSAGES/fb_vmware.mo,sha256=SOCsbjynDscDrKDTLuKjs_0qz6vueQI3xOGU1c0aad4,31374
-fb_vmware-1.5.0.data/data/share/locale/en_US/LC_MESSAGES/fb_vmware.mo,sha256=LfvccfolkT1wxFuPmHPhBnNUpABsoB43k53eBqmUK_E,5894
-fb_vmware-1.5.0.data/scripts/get-vsphere-host-list,sha256=RKHE9FC3-Q1_ZYfRYdv65Yfs6GKfMVI7VZIf1Zd0HE0,1998
-fb_vmware-1.5.0.data/scripts/get-vsphere-network-list,sha256=_lfd-rHqRzo1Dfu6NFKB9WFZ2WcOtoRPuJx81sd7wt4,1983
-fb_vmware-1.5.0.data/scripts/get-vsphere-storage-cluster-list,sha256=6LgCVf7IsVyMAy7ZaiC71SD4vVGQJIkZfOo6HtJ-rys,2013
-fb_vmware-1.5.0.data/scripts/get-vsphere-vm-info,sha256=PfOXGALobb6j8p4flxL1qa8x-42fvd7_M_q8gDggOgA,1967
-fb_vmware-1.5.0.data/scripts/get-vsphere-vm-list,sha256=A_fR_Qy6MOoW1jq0nAd5O5GL0z7lIhd3BPwD3lBxFFk,1972
-fb_vmware-1.5.0.dist-info/licenses/LICENSE,sha256=46mU2C5kSwOnkqkw9XQAJlhBL2JAf1_uCD8lVcXyMRg,7652
-fb_vmware-1.5.0.dist-info/METADATA,sha256=UZhrBlIZw8UK5Vx5XdKqwtTPVMNKT3zBJT0gMxv2ajM,1576
-fb_vmware-1.5.0.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-fb_vmware-1.5.0.dist-info/top_level.txt,sha256=HCCKegZiMrBxh1SpUtaFeZK6frAuccMLJtr_K8pRvls,10
-fb_vmware-1.5.0.dist-info/RECORD,,
+fb_vmware-1.5.1.data/data/share/locale/de_DE/LC_MESSAGES/fb_vmware.mo,sha256=SOCsbjynDscDrKDTLuKjs_0qz6vueQI3xOGU1c0aad4,31374
+fb_vmware-1.5.1.data/data/share/locale/en_US/LC_MESSAGES/fb_vmware.mo,sha256=LfvccfolkT1wxFuPmHPhBnNUpABsoB43k53eBqmUK_E,5894
+fb_vmware-1.5.1.data/scripts/get-vsphere-host-list,sha256=RKHE9FC3-Q1_ZYfRYdv65Yfs6GKfMVI7VZIf1Zd0HE0,1998
+fb_vmware-1.5.1.data/scripts/get-vsphere-network-list,sha256=_lfd-rHqRzo1Dfu6NFKB9WFZ2WcOtoRPuJx81sd7wt4,1983
+fb_vmware-1.5.1.data/scripts/get-vsphere-storage-cluster-list,sha256=6LgCVf7IsVyMAy7ZaiC71SD4vVGQJIkZfOo6HtJ-rys,2013
+fb_vmware-1.5.1.data/scripts/get-vsphere-vm-info,sha256=PfOXGALobb6j8p4flxL1qa8x-42fvd7_M_q8gDggOgA,1967
+fb_vmware-1.5.1.data/scripts/get-vsphere-vm-list,sha256=A_fR_Qy6MOoW1jq0nAd5O5GL0z7lIhd3BPwD3lBxFFk,1972
+fb_vmware-1.5.1.dist-info/licenses/LICENSE,sha256=46mU2C5kSwOnkqkw9XQAJlhBL2JAf1_uCD8lVcXyMRg,7652
+fb_vmware-1.5.1.dist-info/METADATA,sha256=ww1Y6FCaq6ZmpAHFcO1i6NGGfTgjzK1kv-V5g7QJ86Q,1576
+fb_vmware-1.5.1.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+fb_vmware-1.5.1.dist-info/top_level.txt,sha256=HCCKegZiMrBxh1SpUtaFeZK6frAuccMLJtr_K8pRvls,10
+fb_vmware-1.5.1.dist-info/RECORD,,