fb-vmware 1.6.0__tar.gz → 1.7.0__tar.gz

{fb_vmware-1.6.0 → fb_vmware-1.7.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fb_vmware
-Version: 1.6.0
+Version: 1.7.0
 Summary: @summary: The module for a base vSphere handler object.
 Author-email: Frank Brehm <frank@brehm-online.com>
 Requires-Python: >=3.8

{fb_vmware-1.6.0 → fb_vmware-1.7.0}/pyproject.toml

@@ -50,6 +50,7 @@ directory = "data"
 get-vsphere-host-list = "fb_vmware.app.get_host_list:main"
 get-vsphere-network-list = "fb_vmware.app.get_network_list:main"
 get-vsphere-storage-cluster-list = "fb_vmware.app.get_storage_cluster_list:main"
+get-vsphere-storage-list = "fb_vmware.app.get_storage_list:main"
 get-vsphere-vm-info = "fb_vmware.app.get_vm_info:main"
 get-vsphere-vm-list = "fb_vmware.app.get_vm_list:main"
 

{fb_vmware-1.6.0 → fb_vmware-1.7.0}/src/fb_vmware/__init__.py

@@ -56,7 +56,7 @@ from .vm import VsphereVmList
 from .xlate import XLATOR
 
 
-__version__ = "1.6.0"
+__version__ = "1.7.0"
 
 LOG = logging.getLogger(__name__)
 

{fb_vmware-1.6.0 → fb_vmware-1.7.0}/src/fb_vmware/app/get_host_list.py

@@ -29,7 +29,7 @@ from .. import __version__ as GLOBAL_VERSION
 from ..errors import VSphereExpectedError
 from ..xlate import XLATOR
 
-__version__ = "1.3.0"
+__version__ = "1.4.0"
 LOG = logging.getLogger(__name__)
 
 _ = XLATOR.gettext
@@ -251,6 +251,7 @@ class GetHostsListApplication(BaseVmwareApplication):
         summary = {}
 
         summary["vsphere"] = host.vsphere
+        summary["dc"] = host.dc_name
         summary["cluster"] = host.cluster_name
         summary["name"] = host.name
         summary["connection_state"] = host.connection_state
@@ -279,6 +280,7 @@ class GetHostsListApplication(BaseVmwareApplication):
         """Print on STDOUT all information about all hosts in a human readable format."""
         labels = {
             "vsphere": "vSphere",
+            "dc": "DC",
             "cluster": "Cluster",
             "name": "Host",
             "connection_state": _("Connect state"),
@@ -297,6 +299,7 @@ class GetHostsListApplication(BaseVmwareApplication):
 
         label_list = (
             "name",
+            "dc",
             "vsphere",
             "cluster",
             "vendor",
@@ -384,7 +387,7 @@ class GetHostsListApplication(BaseVmwareApplication):
         hosts = []
 
         vsphere = self.vsphere[vsphere_name]
-        vsphere.get_datacenter()
+        # vsphere.get_datacenter()
 
         re_name = None
         if self.host_pattern is not None:

{fb_vmware-1.6.0 → fb_vmware-1.7.0}/src/fb_vmware/app/get_network_list.py

@@ -28,7 +28,7 @@ from ..network import GeneralNetworksDict
 from ..network import VsphereNetwork
 from ..xlate import XLATOR
 
-__version__ = "1.6.0"
+__version__ = "1.7.0"
 LOG = logging.getLogger(__name__)
 
 _ = XLATOR.gettext
@@ -117,7 +117,7 @@ class GetNetworkListApp(BaseVmwareApplication):
 
         vsphere = self.vsphere[vsphere_name]
         try:
-            vsphere.get_networks()
+            vsphere.get_networks(vsphere_name=vsphere_name)
 
         except VSphereExpectedError as e:
             LOG.error(str(e))
@@ -136,7 +136,7 @@ class GetNetworkListApp(BaseVmwareApplication):
             LOG.debug(_("Get all network-like objects from vSphere {!r} ...").format(vsphere_name))
 
             try:
-                vsphere.get_networks()
+                vsphere.get_networks(vsphere_name=vsphere_name)
             except VSphereExpectedError as e:
                 LOG.error(str(e))
                 self.exit(6)
@@ -229,8 +229,13 @@ class GetNetworkListApp(BaseVmwareApplication):
             for uuid in self.vsphere[vsphere_name].dvs.keys():
                 this_dvs = self.vsphere[vsphere_name].dvs[uuid]
 
+                dc_name = "~"
+                if this_dvs.dc_name:
+                    dc_name = this_dvs.dc_name
+
                 dvs = {
                     "vsphere": vsphere_name,
+                    "dc": dc_name,
                     "name": this_dvs.name,
                     "contact": get_contact(this_dvs),
                     "create_time": this_dvs.create_time.isoformat(sep=" ", timespec="seconds"),
@@ -254,6 +259,7 @@ class GetNetworkListApp(BaseVmwareApplication):
 
         labels = {
             "vsphere": "vSphere",
+            "dc": _("Data Center"),
             "name": _("Name"),
             "contact": _("Contact"),
             "create_time": _("Creation time"),
@@ -266,6 +272,7 @@ class GetNetworkListApp(BaseVmwareApplication):
         label_list = (
             "name",
             "vsphere",
+            "dc",
             "create_time",
             "hosts",
             "ports",
@@ -348,10 +355,20 @@ class GetNetworkListApp(BaseVmwareApplication):
                 if this_dvpg.accessible:
                     accessible = _("Yes")
 
+                dc_name = "~"
+                if this_dvpg.dc_name:
+                    dc_name = this_dvpg.dc_name
+
+                vlan_id = "~"
+                if this_dvpg.vlan_id:
+                    vlan_id = this_dvpg.vlan_id
+
                 dvpg = {
                     "vsphere": vsphere_name,
+                    "dc": dc_name,
                     "name": name,
                     "dvs": dvs_name,
+                    "vlan_id": vlan_id,
                     "network": network,
                     "accessible": accessible,
                     "num_ports": "{:,}".format(this_dvpg.num_ports),
@@ -373,8 +390,10 @@ class GetNetworkListApp(BaseVmwareApplication):
 
         labels = {
             "vsphere": "vSphere",
+            "dc": "DC",
             "name": _("Name"),
             "dvs": "DV Switch",
+            "vlan_id": "VLAN ID",
             "network": _("Network"),
             "accessible": _("Accessible"),
             "num_ports": _("Ports"),
@@ -385,7 +404,9 @@ class GetNetworkListApp(BaseVmwareApplication):
         label_list = (
             "name",
             "vsphere",
+            "dc",
             "dvs",
+            "vlan_id",
             "network",
             "accessible",
             "type",
@@ -422,7 +443,7 @@ class GetNetworkListApp(BaseVmwareApplication):
         for label in label_list:
             if tpl != "":
                 tpl += "  "
-            if label in ("num_ports",):
+            if label in ("num_ports", "vlan_id"):
                 tpl += "{{{la}:>{le}}}".format(la=label, le=str_lengths[label])
             else:
                 tpl += "{{{la}:<{le}}}".format(la=label, le=str_lengths[label])
@@ -458,8 +479,13 @@ class GetNetworkListApp(BaseVmwareApplication):
                 if this_network.accessible:
                     accessible = _("Yes")
 
+                dc_name = "~"
+                if this_network.dc_name:
+                    dc_name = this_network.dc_name
+
                 net = {
                     "vsphere": vsphere_name,
+                    "dc": dc_name,
                     "name": name,
                     "network": network,
                     "accessible": accessible,
@@ -478,11 +504,12 @@ class GetNetworkListApp(BaseVmwareApplication):
 
         labels = {
             "vsphere": "vSphere",
+            "dc": _("Data Center"),
             "name": _("Name"),
             "network": _("Network"),
             "accessible": _("Accessible"),
         }
-        label_list = ("name", "vsphere", "network", "accessible")
+        label_list = ("name", "vsphere", "dc", "network", "accessible")
 
         str_lengths = {}
         for label in labels:

{fb_vmware-1.6.0 → fb_vmware-1.7.0}/src/fb_vmware/app/get_storage_cluster_list.py

@@ -28,12 +28,11 @@ from fb_tools.xlate import format_list
 from . import BaseVmwareApplication
 from . import VmwareAppError
 from .. import __version__ as GLOBAL_VERSION
-# from ..ds_cluster import VsphereDsCluster
 from ..ds_cluster import VsphereDsClusterDict
 from ..errors import VSphereExpectedError
 from ..xlate import XLATOR
 
-__version__ = "1.2.1"
+__version__ = "1.3.1"
 LOG = logging.getLogger(__name__)
 
 _ = XLATOR.gettext
@@ -242,6 +241,7 @@ class GetStorageClusterListApp(BaseVmwareApplication):
                 cluster["cluster_name"] = cluster_name
 
                 cluster["vsphere_name"] = vsphere_name
+                cluster["dc"] = cl.dc_name
 
                 cluster["capacity"] = cl.capacity_gb
                 cluster["capacity_gb"] = format_decimal(cl.capacity_gb, format="#,##0")
@@ -275,6 +275,7 @@ class GetStorageClusterListApp(BaseVmwareApplication):
             self.totals = {
                 "cluster_name": _("Total"),
                 "vsphere_name": "",
+                "dc": "",
                 "is_total": True,
                 "capacity_gb": format_decimal(total_capacity, format="#,##0"),
                 "free_space_gb": format_decimal(total_free, format="#,##0"),
@@ -314,6 +315,7 @@ class GetStorageClusterListApp(BaseVmwareApplication):
         labels = {
             "cluster_name": "Cluster",
             "vsphere_name": "vSphere",
+            "dc": _("Data Center"),
             "capacity_gb": _("Capacity in GB"),
             "free_space_gb": _("Free space in GB"),
             "usage_gb": _("Calculated usage in GB"),
@@ -323,6 +325,7 @@ class GetStorageClusterListApp(BaseVmwareApplication):
         label_list = (
             "cluster_name",
             "vsphere_name",
+            "dc",
             "capacity_gb",
             "usage_gb",
             "usage_pc_out",
@@ -349,7 +352,7 @@ class GetStorageClusterListApp(BaseVmwareApplication):
         for label in label_list:
             if tpl != "":
                 tpl += "  "
-            if label in ("cluster_name", "vsphere_name"):
+            if label in ("cluster_name", "vsphere_name", "dc"):
                 tpl += "{{{la}:<{le}}}".format(la=label, le=field_length[label])
             else:
                 tpl += "{{{la}:>{le}}}".format(la=label, le=field_length[label])
@@ -383,9 +386,9 @@ class GetStorageClusterListApp(BaseVmwareApplication):
             if count:
                 msg = ngettext(
                     "Found one VMware storage cluster.",
-                    "Found {} VMware storage clusters.".format(count),
+                    "Found {} VMware storage clusters.",
                     count,
-                )
+                ).format(count)
             else:
                 msg = _("No VMware storage clusters found.")